diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 689b9acbbe7..2dd5fb46ad9 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -22,6 +22,11 @@
 
 /.github/ @villebro @geido @eschutho @rusackas @betodealmeida @nytai @mistercrunch @craig-rueda @kgabryje @dpgaspar @sadpandajoe @hainenber
 
+# Notify PMC members of changes to CI-executed scripts (supply-chain risk:
+# scripts/ files run directly in CI workflows and can execute arbitrary code)
+
+/scripts/ @villebro @geido @eschutho @rusackas @betodealmeida @nytai @mistercrunch @craig-rueda @kgabryje @dpgaspar @sadpandajoe @hainenber
+
 # Notify PMC members of changes to required GitHub Actions
 
 /.asf.yaml @villebro @geido @eschutho @rusackas @betodealmeida @nytai @mistercrunch @craig-rueda @kgabryje @dpgaspar @Antonio-RiveroMartnez
diff --git a/.github/SECURITY.md b/.github/SECURITY.md
index 086ff8c0cad..9c8c68874c3 100644
--- a/.github/SECURITY.md
+++ b/.github/SECURITY.md
@@ -18,10 +18,32 @@ e-mail address [security@superset.apache.org](mailto:security@superset.apache.or
 More details can be found on the ASF website at
 [ASF vulnerability reporting process](https://apache.org/security/#reporting-a-vulnerability)
 
-We kindly ask you to include the following information in your report:
-- Apache Superset version that you are using
-- A sanitized copy of your `superset_config.py` file or any config overrides
-- Detailed steps to reproduce the vulnerability
+**Submission Standards & AI Policy**
+
+To ensure engineering focus remains on verified risks and to manage high reporting volumes, all reports must meet the following criteria:
+- Plain Text Format: In accordance with Apache guidelines, please provide all details in plain text within the email body. Avoid sending PDFs, Word documents, or password-protected archives.
+- Mandatory AI Disclosure: If you utilized Large Language Models (LLMs) or AI tools to identify a flaw or assist in writing a report, you must disclose this in your submission so our triage team can contextualize the findings.
+- Human-Verified PoC: All submissions must include a manual, step-by-step Proof of Concept (PoC) performed on a supported release. Raw AI outputs, hypothetical chat transcripts, or unverified scanner logs will be closed as Invalid.
+
+We kindly ask you to include the following information in your report to assist our developers in triaging and remediating issues efficiently:
+- Version/Commit: The specific version of Apache Superset or the Git commit hash you are using.
+- Configuration: A sanitized copy of your `superset_config.py` file or any config overrides.
+- Environment: Your deployment method (e.g., Docker Compose, Helm, or source) and relevant OS/Browser details.
+- Impacted Component: Identification of the affected area (e.g., Python backend, React frontend, or a specific database connector).
+- Expected vs. Actual Behavior: A clear description of the intended system behavior versus the observed vulnerability.
+- Detailed Reproduction Steps: Clear, manual steps to reproduce the vulnerability.
+
+**Out of Scope Vulnerabilities**
+
+To prioritize engineering efforts on genuine architectural risks, the following scenarios are explicitly out of scope and will not be issued a CVE:
+- Attacks requiring Admin privileges: (e.g., CSS injection, template manipulation, dashboard ownership overrides, or modifying global system settings). Per the CVE vulnerability definition in CNA Operational Rules 4.1, a qualifying vulnerability must allow violation of a security policy. The Admin role is a fully trusted operational boundary defined by Apache Superset's security policy; actions within this boundary do not violate that policy and are therefore considered intended capabilities 'by design,' not vulnerabilities.
+- Brute Force and Rate Limiting: Reports targeting a lack of resource exhaustion protections, generic rate-limiting, or volumetric Denial of Service (DoS) attempts.
+- Theoretical attack vectors: Issues without a demonstrable, reproducible exploit path.
+- Non-Exploitable Findings: Missing security headers, generic banner disclosures, or descriptive error messages that do not lead to a direct, documented exploit.
+
+**Outcome of Reports**
+
+Reports that are deemed out-of-scope for a CVE but represent valid security best practices or hardening opportunities may be converted into public GitHub issues. This allows the community to contribute to the general hardening of the platform even when a specific vulnerability threshold is not met.
 
 Note that Apache Superset is not responsible for any third-party dependencies that may
 have security issues. Any vulnerabilities found in third-party dependencies should be
@@ -29,6 +51,13 @@ reported to the maintainers of those projects. Results from security scans of Ap
 Superset dependencies found on its official Docker image can be remediated at release time
 by extending the image itself.
 
+**Vulnerability Aggregation & CVE Attribution**
+
+In accordance with MITRE CNA Operational Rules (4.1.10, 4.1.11, and 4.2.13), Apache Superset issues CVEs based on the underlying architectural root cause rather than the number of affected endpoints or exploit payloads.
+- Aggregation: If multiple exploit vectors stem from the same programmatic failure or shared vulnerable code, they must be aggregated into a single, comprehensive report.
+- Independent Fixes: Separate CVEs will only be assigned if the vulnerabilities reside in decoupled architectural modules and can be fixed independently of one another.
+Reports that fail to aggregate related findings will be merged during triage to ensure an accurate and defensible CVE record.
+
 **Your responsible disclosure and collaboration are invaluable.**
 
 ## Extra Information
diff --git a/.github/actions/setup-docker/action.yml b/.github/actions/setup-docker/action.yml
index 71a559829f6..91f2c8ce954 100644
--- a/.github/actions/setup-docker/action.yml
+++ b/.github/actions/setup-docker/action.yml
@@ -26,16 +26,16 @@ runs:
 
     - name: Set up QEMU
       if: ${{ inputs.build == 'true' }}
-      uses: docker/setup-qemu-action@v3
+      uses: docker/setup-qemu-action@29109295f81e9208d7d86ff1c6c12d2833863392 # v3.6.0
 
     - name: Set up Docker Buildx
       if: ${{ inputs.build == 'true' }}
-      uses: docker/setup-buildx-action@v3
+      uses: docker/setup-buildx-action@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f # v3.12.0
 
     - name: Try to login to DockerHub
       if: ${{ inputs.login-to-dockerhub == 'true' }}
       continue-on-error: true
-      uses: docker/login-action@v3
+      uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3.7.0
       with:
         username: ${{ inputs.dockerhub-user }}
         password: ${{ inputs.dockerhub-token }}
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 7a1b034d325..86feb412782 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -4,6 +4,10 @@ updates:
 
   - package-ecosystem: "github-actions"
     directory: "/"
+    ignore:
+      # Ignore temporarily as release schedule is too mentally taxing for dep-handling maintainers
+      # Additionally, very few PRs are reviewed by this action.
+      - dependency-name: anthropics/claude-code-action
     schedule:
       interval: "daily"
 
diff --git a/.github/labeler.yml b/.github/labeler.yml
index bda01f0223e..9cb7f3aad4c 100644
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -17,6 +17,11 @@
   - any-glob-to-any-file:
     - 'superset/migrations/**'
 
+"risk:ci-script":
+- changed-files:
+  - any-glob-to-any-file:
+    - 'scripts/**'
+
 ############################################
 # Dependencies
 ############################################
diff --git a/.github/workflows/bump-python-package.yml b/.github/workflows/bump-python-package.yml
index 22bb1844077..d69b17d09e5 100644
--- a/.github/workflows/bump-python-package.yml
+++ b/.github/workflows/bump-python-package.yml
@@ -32,7 +32,7 @@ jobs:
     steps:
 
       - name: "Checkout ${{ github.ref }} ( ${{ github.sha }} )"
-        uses: actions/checkout@v6
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
         with:
           persist-credentials: true
           ref: master
@@ -41,7 +41,7 @@ jobs:
         uses: ./.github/actions/setup-supersetbot/
 
       - name: Set up Python ${{ inputs.python-version }}
-        uses: actions/setup-python@v6
+        uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6
         with:
           python-version: "3.10"
 
@@ -51,27 +51,31 @@ jobs:
       - name: supersetbot bump-python -p "${{ github.event.inputs.package }}"
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          INPUT_PACKAGE: ${{ github.event.inputs.package }}
+          INPUT_GROUP: ${{ github.event.inputs.group }}
+          INPUT_EXTRA_FLAGS: ${{ github.event.inputs.extra-flags }}
+          INPUT_LIMIT: ${{ github.event.inputs.limit }}
         run: |
           git config --global user.email "action@github.com"
           git config --global user.name "GitHub Action"
 
           PACKAGE_OPT=""
-          if [ -n "${{ github.event.inputs.package }}" ]; then
-            PACKAGE_OPT="-p ${{ github.event.inputs.package }}"
+          if [ -n "${INPUT_PACKAGE}" ]; then
+            PACKAGE_OPT="-p ${INPUT_PACKAGE}"
           fi
 
           GROUP_OPT=""
-          if [ -n "${{ github.event.inputs.group }}" ]; then
-            GROUP_OPT="-g ${{ github.event.inputs.group }}"
+          if [ -n "${INPUT_GROUP}" ]; then
+            GROUP_OPT="-g ${INPUT_GROUP}"
           fi
 
-          EXTRA_FLAGS="${{ github.event.inputs.extra-flags }}"
+          EXTRA_FLAGS="${INPUT_EXTRA_FLAGS}"
 
           supersetbot bump-python \
             --verbose \
             --use-current-repo \
             --include-subpackages \
-            --limit ${{ github.event.inputs.limit }} \
+            --limit ${INPUT_LIMIT} \
             $PACKAGE_OPT \
             $GROUP_OPT \
             $EXTRA_FLAGS
diff --git a/.github/workflows/cancel_duplicates.yml b/.github/workflows/cancel_duplicates.yml
index 27b07fee03a..76525767ad0 100644
--- a/.github/workflows/cancel_duplicates.yml
+++ b/.github/workflows/cancel_duplicates.yml
@@ -31,7 +31,7 @@ jobs:
 
       - name: "Checkout ${{ github.ref }} ( ${{ github.sha }} )"
         if: steps.check_queued.outputs.count >= 20
-        uses: actions/checkout@v6
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
 
       - name: Cancel duplicate workflow runs
         if: steps.check_queued.outputs.count >= 20
diff --git a/.github/workflows/check-python-deps.yml b/.github/workflows/check-python-deps.yml
index 4438c09d6cd..844b7bee94e 100644
--- a/.github/workflows/check-python-deps.yml
+++ b/.github/workflows/check-python-deps.yml
@@ -18,7 +18,7 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - name: "Checkout ${{ github.ref }} ( ${{ github.sha }} )"
-        uses: actions/checkout@v6
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
         with:
           persist-credentials: false
           submodules: recursive
diff --git a/.github/workflows/check_db_migration_confict.yml b/.github/workflows/check_db_migration_confict.yml
index e5db0dd5554..fe82cee28dd 100644
--- a/.github/workflows/check_db_migration_confict.yml
+++ b/.github/workflows/check_db_migration_confict.yml
@@ -25,9 +25,9 @@ jobs:
       pull-requests: write
     steps:
       - name: "Checkout ${{ github.ref }} ( ${{ github.sha }} )"
-        uses: actions/checkout@v6
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
       - name: Check and notify
-        uses: actions/github-script@v8
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
         with:
           github-token: ${{ github.token }}
           script: |
diff --git a/.github/workflows/claude.yml b/.github/workflows/claude.yml
index abc8129d788..c52e5b9f980 100644
--- a/.github/workflows/claude.yml
+++ b/.github/workflows/claude.yml
@@ -44,7 +44,7 @@ jobs:
       pull-requests: write
     steps:
       - name: Comment access denied
-        uses: actions/github-script@v8
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
         with:
           script: |
             const message = `👋 Hi @${{ github.event.comment.user.login || github.event.review.user.login || github.event.issue.user.login }}!
@@ -71,12 +71,12 @@ jobs:
       id-token: write
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v6
+      uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
       with:
         fetch-depth: 1
 
     - name: Run Claude PR Action
-      uses: anthropics/claude-code-action@beta
+      uses: anthropics/claude-code-action@5fb899572b81d2bb648d4d187173a2f423a9677c # beta
       with:
         anthropic_api_key: ${{ secrets.ANTHROPIC_API_KEY }}
         timeout_minutes: "60"
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 3dd15400d78..5ae6ebd2c02 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -31,7 +31,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v6
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
 
       - name: Check for file changes
         id: check
diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml
index b7c09bff755..13d05bcbc9a 100644
--- a/.github/workflows/dependency-review.yml
+++ b/.github/workflows/dependency-review.yml
@@ -27,9 +27,9 @@ jobs:
     runs-on: ubuntu-24.04
     steps:
       - name: "Checkout Repository"
-        uses: actions/checkout@v6
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
       - name: "Dependency Review"
-        uses: actions/dependency-review-action@v4
+        uses: actions/dependency-review-action@2031cfc080254a8a887f58cffee85186f0e49e48 # v4.9.0
         continue-on-error: true
         with:
           fail-on-severity: critical
@@ -49,7 +49,7 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - name: "Checkout Repository"
-        uses: actions/checkout@v6
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
 
       - name: Setup Python
         uses: ./.github/actions/setup-backend/
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 94a8de67ccf..930f94b1484 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -42,7 +42,7 @@ jobs:
     steps:
 
       - name: "Checkout ${{ github.ref }} ( ${{ github.sha }} )"
-        uses: actions/checkout@v6
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
         with:
           persist-credentials: false
 
@@ -101,23 +101,6 @@ jobs:
           docker images $IMAGE_TAG
           docker history $IMAGE_TAG
 
-      # Scan for vulnerabilities in built container image after pushes to mainline branch.
-      - name: Run Trivy container image vulnerabity scan
-        if: github.event_name == 'push' && github.ref == 'refs/heads/master' && (steps.check.outputs.python || steps.check.outputs.frontend || steps.check.outputs.docker) && matrix.build_preset == 'lean'
-        uses: aquasecurity/trivy-action@57a97c7e7821a5776cebc9bb87c984fa69cba8f1 # v0.35.0
-        with:
-          image-ref: ${{ env.IMAGE_TAG }}
-          format: 'sarif'
-          output: 'trivy-results.sarif'
-          vuln-type: 'os'
-          severity: 'CRITICAL,HIGH'
-          ignore-unfixed: true
-      - name: Upload Trivy scan results to GitHub Security tab
-        if: github.event_name == 'push' && github.ref == 'refs/heads/master' && (steps.check.outputs.python || steps.check.outputs.frontend || steps.check.outputs.docker) && matrix.build_preset == 'lean'
-        uses: github/codeql-action/upload-sarif@1b168cd39490f61582a9beae412bb7057a6b2c4e # v4.31.8
-        with:
-          sarif_file: 'trivy-results.sarif'
-
       - name: docker-compose sanity check
         if: (steps.check.outputs.python || steps.check.outputs.frontend || steps.check.outputs.docker) && matrix.build_preset == 'dev'
         shell: bash
@@ -134,7 +117,7 @@ jobs:
     runs-on: ubuntu-24.04
     steps:
       - name: "Checkout ${{ github.ref }} ( ${{ github.sha }} )"
-        uses: actions/checkout@v6
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
         with:
           persist-credentials: false
       - name: Check for file changes
diff --git a/.github/workflows/embedded-sdk-release.yml b/.github/workflows/embedded-sdk-release.yml
index ff8efa3b8e5..8bcf42a56be 100644
--- a/.github/workflows/embedded-sdk-release.yml
+++ b/.github/workflows/embedded-sdk-release.yml
@@ -16,10 +16,12 @@ jobs:
         id: check
         shell: bash
         run: |
-          if [ -n "${{ (secrets.NPM_TOKEN != '') || '' }}" ]; then
+          if [ -n "${NPM_TOKEN}" ]; then
             echo "has-secrets=1" >> "$GITHUB_OUTPUT"
           fi
 
+        env:
+          NPM_TOKEN: ${{ (secrets.NPM_TOKEN != '') || '' }}
   build:
     needs: config
     if: needs.config.outputs.has-secrets
@@ -28,8 +30,8 @@ jobs:
       run:
         working-directory: superset-embedded-sdk
     steps:
-      - uses: actions/checkout@v6
-      - uses: actions/setup-node@v6
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+      - uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6
         with:
           node-version-file: './superset-embedded-sdk/.nvmrc'
           registry-url: 'https://registry.npmjs.org'
diff --git a/.github/workflows/embedded-sdk-test.yml b/.github/workflows/embedded-sdk-test.yml
index f31a094fcf1..9d5237fce34 100644
--- a/.github/workflows/embedded-sdk-test.yml
+++ b/.github/workflows/embedded-sdk-test.yml
@@ -18,8 +18,8 @@ jobs:
       run:
         working-directory: superset-embedded-sdk
     steps:
-      - uses: actions/checkout@v6
-      - uses: actions/setup-node@v6
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+      - uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6
         with:
           node-version-file: './superset-embedded-sdk/.nvmrc'
           registry-url: 'https://registry.npmjs.org'
diff --git a/.github/workflows/ephemeral-env-pr-close.yml b/.github/workflows/ephemeral-env-pr-close.yml
index 313c3ae521d..9defe4db1b5 100644
--- a/.github/workflows/ephemeral-env-pr-close.yml
+++ b/.github/workflows/ephemeral-env-pr-close.yml
@@ -20,10 +20,12 @@ jobs:
         id: check
         shell: bash
         run: |
-          if [ -n "${{ (secrets.AWS_ACCESS_KEY_ID != '' && secrets.AWS_SECRET_ACCESS_KEY != '') || '' }}" ]; then
+          if [ -n "${AWS_ACCESS_KEY_ID}" ]; then
             echo "has-secrets=1" >> "$GITHUB_OUTPUT"
           fi
 
+        env:
+          AWS_ACCESS_KEY_ID: ${{ (secrets.AWS_ACCESS_KEY_ID != '' && secrets.AWS_SECRET_ACCESS_KEY != '') || '' }}
   ephemeral-env-cleanup:
     needs: config
     if: needs.config.outputs.has-secrets
@@ -33,7 +35,7 @@ jobs:
       pull-requests: write
     steps:
       - name: Configure AWS credentials
-        uses: aws-actions/configure-aws-credentials@v6
+        uses: aws-actions/configure-aws-credentials@8df5847569e6427dd6c4fb1cf565c83acfa8afa7 # v6
         with:
           aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
           aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
@@ -56,7 +58,7 @@ jobs:
       - name: Login to Amazon ECR
         if: steps.describe-services.outputs.active == 'true'
         id: login-ecr
-        uses: aws-actions/amazon-ecr-login@v2
+        uses: aws-actions/amazon-ecr-login@376925c9d111252e87ae59691e5a442dd100ef6a # v2
 
       - name: Delete ECR image tag
         if: steps.describe-services.outputs.active == 'true'
@@ -69,7 +71,7 @@ jobs:
 
       - name: Comment (success)
         if: steps.describe-services.outputs.active == 'true'
-        uses: actions/github-script@v8
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
         with:
           github-token: ${{github.token}}
           script: |
diff --git a/.github/workflows/ephemeral-env.yml b/.github/workflows/ephemeral-env.yml
index 70311682a8b..7815ddb09b3 100644
--- a/.github/workflows/ephemeral-env.yml
+++ b/.github/workflows/ephemeral-env.yml
@@ -47,7 +47,7 @@ jobs:
         id: eval-label
         run: |
           if [[ "${{ github.event_name }}" == "workflow_dispatch" ]]; then
-            LABEL_NAME="${{ github.event.inputs.label_name }}"
+            LABEL_NAME="${INPUT_LABEL_NAME}"
           else
             LABEL_NAME="${{ github.event.label.name }}"
           fi
@@ -60,10 +60,12 @@ jobs:
             echo "result=noop" >> $GITHUB_OUTPUT
           fi
 
+        env:
+          INPUT_LABEL_NAME: ${{ github.event.inputs.label_name }}
       - name: Get event SHA
         id: get-sha
         if: steps.eval-label.outputs.result == 'up'
-        uses: actions/github-script@v8
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           script: |
@@ -94,7 +96,7 @@ jobs:
             core.setOutput("sha", prSha);
 
       - name: Looking for feature flags in PR description
-        uses: actions/github-script@v8
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
         id: eval-feature-flags
         if: steps.eval-label.outputs.result == 'up'
         with:
@@ -116,7 +118,7 @@ jobs:
             return results;
 
       - name: Reply with confirmation comment
-        uses: actions/github-script@v8
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
         if: steps.eval-label.outputs.result == 'up'
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
@@ -160,7 +162,7 @@ jobs:
     runs-on: ubuntu-24.04
     steps:
       - name: "Checkout ${{ github.ref }} ( ${{ needs.ephemeral-env-label.outputs.sha }} : ${{steps.get-sha.outputs.sha}} )"
-        uses: actions/checkout@v6
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
         with:
           ref: ${{ needs.ephemeral-env-label.outputs.sha }}
           persist-credentials: false
@@ -189,7 +191,7 @@ jobs:
             --extra-flags "--build-arg INCLUDE_CHROMIUM=false"
 
       - name: Configure AWS credentials
-        uses: aws-actions/configure-aws-credentials@v6
+        uses: aws-actions/configure-aws-credentials@8df5847569e6427dd6c4fb1cf565c83acfa8afa7 # v6
         with:
           aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
           aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
@@ -197,7 +199,7 @@ jobs:
 
       - name: Login to Amazon ECR
         id: login-ecr
-        uses: aws-actions/amazon-ecr-login@v2
+        uses: aws-actions/amazon-ecr-login@376925c9d111252e87ae59691e5a442dd100ef6a # v2
 
       - name: Load, tag and push image to ECR
         id: push-image
@@ -220,12 +222,12 @@ jobs:
       pull-requests: write
 
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
         with:
           persist-credentials: false
 
       - name: Configure AWS credentials
-        uses: aws-actions/configure-aws-credentials@v6
+        uses: aws-actions/configure-aws-credentials@8df5847569e6427dd6c4fb1cf565c83acfa8afa7 # v6
         with:
           aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
           aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
@@ -233,7 +235,7 @@ jobs:
 
       - name: Login to Amazon ECR
         id: login-ecr
-        uses: aws-actions/amazon-ecr-login@v2
+        uses: aws-actions/amazon-ecr-login@376925c9d111252e87ae59691e5a442dd100ef6a # v2
 
       - name: Check target image exists in ECR
         id: check-image
@@ -248,7 +250,7 @@ jobs:
 
       - name: Fail on missing container image
         if: steps.check-image.outcome == 'failure'
-        uses: actions/github-script@v8
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
         with:
           github-token: ${{ github.token }}
           script: |
@@ -263,7 +265,7 @@ jobs:
 
       - name: Fill in the new image ID in the Amazon ECS task definition
         id: task-def
-        uses: aws-actions/amazon-ecs-render-task-definition@v1
+        uses: aws-actions/amazon-ecs-render-task-definition@77954e213ba1f9f9cb016b86a1d4f6fcdea0d57e # v1
         with:
           task-definition: .github/workflows/ecs-task-definition.json
           container-name: superset-ci
@@ -276,7 +278,9 @@ jobs:
       - name: Describe ECS service
         id: describe-services
         run: |
-          echo "active=$(aws ecs describe-services --cluster superset-ci --services pr-${{ github.event.inputs.issue_number || github.event.pull_request.number }}-service | jq '.services[] | select(.status == "ACTIVE") | any')" >> $GITHUB_OUTPUT
+          echo "active=$(aws ecs describe-services --cluster superset-ci --services pr-${INPUT_ISSUE_NUMBER}-service | jq '.services[] | select(.status == "ACTIVE") | any')" >> $GITHUB_OUTPUT
+        env:
+          INPUT_ISSUE_NUMBER: ${{ github.event.inputs.issue_number || github.event.pull_request.number }}
       - name: Create ECS service
         id: create-service
         if: steps.describe-services.outputs.active != 'true'
@@ -296,7 +300,7 @@ jobs:
           --tags key=pr,value=$PR_NUMBER key=github_user,value=${{ github.actor }}
       - name: Deploy Amazon ECS task definition
         id: deploy-task
-        uses: aws-actions/amazon-ecs-deploy-task-definition@v2
+        uses: aws-actions/amazon-ecs-deploy-task-definition@fc8fc60f3a60ffd500fcb13b209c59d221ac8c8c # v2
         with:
           task-definition: ${{ steps.task-def.outputs.task-definition }}
           service: pr-${{ github.event.inputs.issue_number || github.event.pull_request.number }}-service
@@ -307,7 +311,9 @@ jobs:
       - name: List tasks
         id: list-tasks
         run: |
-          echo "task=$(aws ecs list-tasks --cluster superset-ci --service-name pr-${{ github.event.inputs.issue_number || github.event.pull_request.number }}-service | jq '.taskArns | first')" >> $GITHUB_OUTPUT
+          echo "task=$(aws ecs list-tasks --cluster superset-ci --service-name pr-${INPUT_ISSUE_NUMBER}-service | jq '.taskArns | first')" >> $GITHUB_OUTPUT
+        env:
+          INPUT_ISSUE_NUMBER: ${{ github.event.inputs.issue_number || github.event.pull_request.number }}
       - name: Get network interface
         id: get-eni
         run: |
@@ -318,7 +324,7 @@ jobs:
           echo "ip=$(aws ec2 describe-network-interfaces --network-interface-ids ${{ steps.get-eni.outputs.eni }} | jq -r '.NetworkInterfaces | first | .Association.PublicIp')" >> $GITHUB_OUTPUT
       - name: Comment (success)
         if: ${{ success() }}
-        uses: actions/github-script@v8
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
         with:
           github-token: ${{github.token}}
           script: |
@@ -331,7 +337,7 @@ jobs:
             });
       - name: Comment (failure)
         if: ${{ failure() }}
-        uses: actions/github-script@v8
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
         with:
           github-token: ${{github.token}}
           script: |
diff --git a/.github/workflows/generate-FOSSA-report.yml b/.github/workflows/generate-FOSSA-report.yml
index 731545453fc..1962626100d 100644
--- a/.github/workflows/generate-FOSSA-report.yml
+++ b/.github/workflows/generate-FOSSA-report.yml
@@ -16,10 +16,12 @@ jobs:
         id: check
         shell: bash
         run: |
-          if [ -n "${{ (secrets.FOSSA_API_KEY != '' ) || '' }}" ]; then
+          if [ -n "${FOSSA_API_KEY}" ]; then
             echo "has-secrets=1" >> "$GITHUB_OUTPUT"
           fi
 
+        env:
+          FOSSA_API_KEY: ${{ (secrets.FOSSA_API_KEY != '' ) || '' }}
   license_check:
     needs: config
     if: needs.config.outputs.has-secrets
@@ -27,12 +29,12 @@ jobs:
     runs-on: ubuntu-24.04
     steps:
       - name: "Checkout ${{ github.ref }} ( ${{ github.sha }} )"
-        uses: actions/checkout@v6
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
         with:
           persist-credentials: false
           submodules: recursive
       - name: Setup Java
-        uses: actions/setup-java@v5
+        uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
         with:
           distribution: "temurin"
           java-version: "11"
diff --git a/.github/workflows/github-action-validator.yml b/.github/workflows/github-action-validator.yml
index 4a36bb304c7..9a341871c76 100644
--- a/.github/workflows/github-action-validator.yml
+++ b/.github/workflows/github-action-validator.yml
@@ -14,10 +14,10 @@ jobs:
     runs-on: ubuntu-24.04
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@v6
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
 
       - name: Set up Node.js
-        uses: actions/setup-node@v6
+        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6
         with:
           node-version: '20'
 
diff --git a/.github/workflows/issue_creation.yml b/.github/workflows/issue_creation.yml
index 16ba0d8b4d2..a0d77f0fc0a 100644
--- a/.github/workflows/issue_creation.yml
+++ b/.github/workflows/issue_creation.yml
@@ -17,7 +17,7 @@ jobs:
     steps:
 
       - name: "Checkout ${{ github.ref }} ( ${{ github.sha }} )"
-        uses: actions/checkout@v6
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
         with:
           persist-credentials: false
 
diff --git a/.github/workflows/latest-release-tag.yml b/.github/workflows/latest-release-tag.yml
index 63601750cf3..97cd73df462 100644
--- a/.github/workflows/latest-release-tag.yml
+++ b/.github/workflows/latest-release-tag.yml
@@ -12,7 +12,7 @@ jobs:
 
     steps:
     - name: "Checkout ${{ github.ref }} ( ${{ github.sha }} )"
-      uses: actions/checkout@v6
+      uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
       with:
         persist-credentials: false
         submodules: recursive
diff --git a/.github/workflows/license-check.yml b/.github/workflows/license-check.yml
index af57d40f46f..b1796c4b07d 100644
--- a/.github/workflows/license-check.yml
+++ b/.github/workflows/license-check.yml
@@ -15,12 +15,12 @@ jobs:
     runs-on: ubuntu-24.04
     steps:
       - name: "Checkout ${{ github.ref }} ( ${{ github.sha }} )"
-        uses: actions/checkout@v6
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
         with:
           persist-credentials: false
           submodules: recursive
       - name: Setup Java
-        uses: actions/setup-java@v5
+        uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
         with:
           distribution: 'temurin'
           java-version: '11'
diff --git a/.github/workflows/no-hold-label.yml b/.github/workflows/no-hold-label.yml
index 021858103dc..32125e22ab9 100644
--- a/.github/workflows/no-hold-label.yml
+++ b/.github/workflows/no-hold-label.yml
@@ -17,7 +17,7 @@ jobs:
     runs-on: ubuntu-24.04
     steps:
     - name: Check for 'hold' label
-      uses: actions/github-script@v8
+      uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
       with:
         github-token: ${{secrets.GITHUB_TOKEN}}
         script: |
diff --git a/.github/workflows/pr-lint.yml b/.github/workflows/pr-lint.yml
index ebe5324ebdf..8a02c6afc36 100644
--- a/.github/workflows/pr-lint.yml
+++ b/.github/workflows/pr-lint.yml
@@ -16,7 +16,7 @@ jobs:
       pull-requests: write
     steps:
       - name: "Checkout ${{ github.ref }} ( ${{ github.sha }} )"
-        uses: actions/checkout@v6
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
         with:
           persist-credentials: false
           submodules: recursive
diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml
index 4af4e743536..d16a729bd21 100644
--- a/.github/workflows/pre-commit.yml
+++ b/.github/workflows/pre-commit.yml
@@ -24,7 +24,7 @@ jobs:
         python-version: ["current", "previous", "next"]
     steps:
       - name: "Checkout ${{ github.ref }} ( ${{ github.sha }} )"
-        uses: actions/checkout@v6
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
         with:
           persist-credentials: false
           submodules: recursive
@@ -42,7 +42,7 @@ jobs:
           echo "HOMEBREW_REPOSITORY=$HOMEBREW_REPOSITORY" >>"${GITHUB_ENV}"
           brew install norwoodj/tap/helm-docs
       - name: Setup Node.js
-        uses: actions/setup-node@v6
+        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6
         with:
           node-version: '20'
 
@@ -57,7 +57,7 @@ jobs:
           yarn install --immutable
 
       - name: Cache pre-commit environments
-        uses: actions/cache@v5
+        uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5
         with:
           path: ~/.cache/pre-commit
           key: pre-commit-v2-${{ runner.os }}-py${{ matrix.python-version }}-${{ hashFiles('.pre-commit-config.yaml') }}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 3932b18e3c2..23e2c0175d3 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -16,17 +16,19 @@ jobs:
         id: check
         shell: bash
         run: |
-          if [ -n "${{ (secrets.NPM_TOKEN != '' && secrets.GH_PERSONAL_ACCESS_TOKEN != '') || '' }}" ]; then
+          if [ -n "${NPM_TOKEN}" ]; then
             echo "has-secrets=1" >> "$GITHUB_OUTPUT"
           fi
 
+        env:
+          NPM_TOKEN: ${{ (secrets.NPM_TOKEN != '' && secrets.GH_PERSONAL_ACCESS_TOKEN != '') || '' }}
   build:
     needs: config
     if: needs.config.outputs.has-secrets
     name: Bump version and publish package(s)
     runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
         with:
           # pulls all commits (needed for lerna / semantic release to correctly version)
           fetch-depth: 0
@@ -42,13 +44,13 @@ jobs:
 
       - name: Install Node.js
         if: env.HAS_TAGS
-        uses: actions/setup-node@v6
+        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6
         with:
           node-version-file: './superset-frontend/.nvmrc'
 
       - name: Cache npm
         if: env.HAS_TAGS
-        uses: actions/cache@v5
+        uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5
         with:
           path: ~/.npm # npm cache files are stored in `~/.npm` on Linux/macOS
           key: ${{ runner.OS }}-node-${{ hashFiles('**/package-lock.json') }}
@@ -62,7 +64,7 @@ jobs:
         run: echo "dir=$(npm config get cache)" >> $GITHUB_OUTPUT
       - name: Cache npm
         if: env.HAS_TAGS
-        uses: actions/cache@v5
+        uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5
         id: npm-cache # use this to check for `cache-hit` (`steps.npm-cache.outputs.cache-hit != 'true'`)
         with:
           path: ${{ steps.npm-cache-dir-path.outputs.dir }}
diff --git a/.github/workflows/showtime-trigger.yml b/.github/workflows/showtime-trigger.yml
index 80454bccd41..1c0da7fd147 100644
--- a/.github/workflows/showtime-trigger.yml
+++ b/.github/workflows/showtime-trigger.yml
@@ -37,7 +37,7 @@ jobs:
     steps:
       - name: Security Check - Authorize Maintainers Only
         id: auth
-        uses: actions/github-script@v8
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
@@ -102,10 +102,12 @@ jobs:
       - name: Install Superset Showtime
         if: steps.auth.outputs.authorized == 'true'
         run: |
-          echo "::notice::Maintainer ${{ github.actor }} triggered deploy for PR ${{ github.event.pull_request.number || github.event.inputs.pr_number }}"
+          echo "::notice::Maintainer ${{ github.actor }} triggered deploy for PR ${PULL_REQUEST_NUMBER}"
           pip install --upgrade superset-showtime
           showtime version
 
+        env:
+          PULL_REQUEST_NUMBER: ${{ github.event.pull_request.number || github.event.inputs.pr_number }}
       - name: Check what actions are needed
         if: steps.auth.outputs.authorized == 'true'
         id: check
@@ -113,12 +115,14 @@ jobs:
           AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          INPUT_PR_NUMBER: ${{ github.event.inputs.pr_number }}
+          INPUT_SHA: ${{ github.event.inputs.sha }}
         run: |
           # Bulletproof PR number extraction
           if [[ -n "${{ github.event.pull_request.number }}" ]]; then
             PR_NUM="${{ github.event.pull_request.number }}"
-          elif [[ -n "${{ github.event.inputs.pr_number }}" ]]; then
-            PR_NUM="${{ github.event.inputs.pr_number }}"
+          elif [[ -n "${INPUT_PR_NUMBER}" ]]; then
+            PR_NUM="${INPUT_PR_NUMBER}"
           else
             echo "❌ No PR number found in event or inputs"
             exit 1
@@ -127,8 +131,8 @@ jobs:
           echo "Using PR number: $PR_NUM"
 
           # Run sync check-only with optional SHA override
-          if [[ -n "${{ github.event.inputs.sha }}" ]]; then
-            OUTPUT=$(python -m showtime sync $PR_NUM --check-only --sha "${{ github.event.inputs.sha }}")
+          if [[ -n "${INPUT_SHA}" ]]; then
+            OUTPUT=$(python -m showtime sync $PR_NUM --check-only --sha "${INPUT_SHA}")
           else
             OUTPUT=$(python -m showtime sync $PR_NUM --check-only)
           fi
@@ -147,7 +151,7 @@ jobs:
 
       - name: Checkout PR code (only if build needed)
         if: steps.auth.outputs.authorized == 'true' && steps.check.outputs.build_needed == 'true'
-        uses: actions/checkout@v6
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
         with:
           ref: ${{ steps.check.outputs.target_sha }}
           persist-credentials: false
diff --git a/.github/workflows/superset-app-cli.yml b/.github/workflows/superset-app-cli.yml
index 3cc839eb285..1c6d8ec9d41 100644
--- a/.github/workflows/superset-app-cli.yml
+++ b/.github/workflows/superset-app-cli.yml
@@ -37,7 +37,7 @@ jobs:
           - 16379:6379
     steps:
       - name: "Checkout ${{ github.ref }} ( ${{ github.sha }} )"
-        uses: actions/checkout@v6
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
         with:
           persist-credentials: false
           submodules: recursive
diff --git a/.github/workflows/superset-docs-deploy.yml b/.github/workflows/superset-docs-deploy.yml
index c7dc57b4426..52e3468dc22 100644
--- a/.github/workflows/superset-docs-deploy.yml
+++ b/.github/workflows/superset-docs-deploy.yml
@@ -27,10 +27,12 @@ jobs:
         id: check
         shell: bash
         run: |
-          if [ -n "${{ (secrets.SUPERSET_SITE_BUILD != '' && secrets.SUPERSET_SITE_BUILD != '') || '' }}" ]; then
+          if [ -n "${SUPERSET_SITE_BUILD}" ]; then
             echo "has-secrets=1" >> "$GITHUB_OUTPUT"
           fi
 
+        env:
+          SUPERSET_SITE_BUILD: ${{ (secrets.SUPERSET_SITE_BUILD != '' && secrets.SUPERSET_SITE_BUILD != '') || '' }}
   build-deploy:
     needs: config
     if: needs.config.outputs.has-secrets
@@ -38,18 +40,18 @@ jobs:
     runs-on: ubuntu-24.04
     steps:
       - name: "Checkout ${{ github.event.workflow_run.head_sha || github.sha }}"
-        uses: actions/checkout@v6
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
         with:
           ref: ${{ github.event.workflow_run.head_sha || github.sha }}
           persist-credentials: false
           submodules: recursive
       - name: Set up Node.js
-        uses: actions/setup-node@v6
+        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6
         with:
           node-version-file: './docs/.nvmrc'
       - name: Setup Python
         uses: ./.github/actions/setup-backend/
-      - uses: actions/setup-java@v5
+      - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
         with:
           distribution: 'zulu'
           java-version: '21'
@@ -68,7 +70,7 @@ jobs:
           yarn install --check-cache
       - name: Download database diagnostics (if triggered by integration tests)
         if: github.event_name == 'workflow_run' && github.event.workflow_run.conclusion == 'success'
-        uses: dawidd6/action-download-artifact@v17
+        uses: dawidd6/action-download-artifact@8305c0f1062bb0d184d09ef4493ecb9288447732 # v20
         continue-on-error: true
         with:
           workflow: superset-python-integrationtest.yml
@@ -77,7 +79,7 @@ jobs:
           path: docs/src/data/
       - name: Try to download latest diagnostics (for push/dispatch triggers)
         if: github.event_name != 'workflow_run'
-        uses: dawidd6/action-download-artifact@v17
+        uses: dawidd6/action-download-artifact@8305c0f1062bb0d184d09ef4493ecb9288447732 # v20
         continue-on-error: true
         with:
           workflow: superset-python-integrationtest.yml
diff --git a/.github/workflows/superset-docs-verify.yml b/.github/workflows/superset-docs-verify.yml
index 1306fec1bf1..9e45258ad9d 100644
--- a/.github/workflows/superset-docs-verify.yml
+++ b/.github/workflows/superset-docs-verify.yml
@@ -24,7 +24,7 @@ jobs:
     name: Link Checking
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
       # Do not bump this linkinator-action version without opening
       # an ASF Infra ticket to allow the new version first!
       - uses: JustinBeckwith/linkinator-action@af984b9f30f63e796ae2ea5be5e07cb587f1bbd9  # v2.3
@@ -67,12 +67,12 @@ jobs:
         working-directory: docs
     steps:
       - name: "Checkout ${{ github.ref }} ( ${{ github.sha }} )"
-        uses: actions/checkout@v6
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
         with:
           persist-credentials: false
           submodules: recursive
       - name: Set up Node.js
-        uses: actions/setup-node@v6
+        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6
         with:
           node-version-file: './docs/.nvmrc'
       - name: yarn install
@@ -98,20 +98,20 @@ jobs:
         working-directory: docs
     steps:
       - name: "Checkout PR head: ${{ github.event.workflow_run.head_sha }}"
-        uses: actions/checkout@v6
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
         with:
           ref: ${{ github.event.workflow_run.head_sha }}
           persist-credentials: false
           submodules: recursive
       - name: Set up Node.js
-        uses: actions/setup-node@v6
+        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6
         with:
           node-version-file: './docs/.nvmrc'
       - name: yarn install
         run: |
           yarn install --check-cache
       - name: Download database diagnostics from integration tests
-        uses: dawidd6/action-download-artifact@v17
+        uses: dawidd6/action-download-artifact@8305c0f1062bb0d184d09ef4493ecb9288447732 # v20
         with:
           workflow: superset-python-integrationtest.yml
           run_id: ${{ github.event.workflow_run.id }}
diff --git a/.github/workflows/superset-e2e.yml b/.github/workflows/superset-e2e.yml
index 4bdbb79e482..43aea2833e3 100644
--- a/.github/workflows/superset-e2e.yml
+++ b/.github/workflows/superset-e2e.yml
@@ -69,21 +69,21 @@ jobs:
       # Conditional checkout based on context
       - name: Checkout for push or pull_request event
         if: github.event_name == 'push' || github.event_name == 'pull_request'
-        uses: actions/checkout@v6
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
         with:
           persist-credentials: false
           submodules: recursive
           ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
       - name: Checkout using ref (workflow_dispatch)
         if: github.event_name == 'workflow_dispatch' && github.event.inputs.ref != ''
-        uses: actions/checkout@v6
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
         with:
           persist-credentials: false
           ref: ${{ github.event.inputs.ref }}
           submodules: recursive
       - name: Checkout using PR ID (workflow_dispatch)
         if: github.event_name == 'workflow_dispatch' && github.event.inputs.pr_id != ''
-        uses: actions/checkout@v6
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
         with:
           persist-credentials: false
           ref: refs/pull/${{ github.event.inputs.pr_id }}/merge
@@ -109,7 +109,7 @@ jobs:
           run: testdata
       - name: Setup Node.js
         if: steps.check.outputs.python || steps.check.outputs.frontend
-        uses: actions/setup-node@v6
+        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6
         with:
           node-version-file: './superset-frontend/.nvmrc'
       - name: Install npm dependencies
@@ -146,7 +146,7 @@ jobs:
           SAFE_APP_ROOT=${APP_ROOT//\//_}
           echo "safe_app_root=$SAFE_APP_ROOT" >> $GITHUB_OUTPUT
       - name: Upload Artifacts
-        uses: actions/upload-artifact@v7
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
         if: failure()
         with:
           path: ${{ github.workspace }}/superset-frontend/cypress-base/cypress/screenshots
@@ -186,21 +186,21 @@ jobs:
       # Conditional checkout based on context (same as Cypress workflow)
       - name: Checkout for push or pull_request event
         if: github.event_name == 'push' || github.event_name == 'pull_request'
-        uses: actions/checkout@v6
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
         with:
           persist-credentials: false
           submodules: recursive
           ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
       - name: Checkout using ref (workflow_dispatch)
         if: github.event_name == 'workflow_dispatch' && github.event.inputs.ref != ''
-        uses: actions/checkout@v6
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
         with:
           persist-credentials: false
           ref: ${{ github.event.inputs.ref }}
           submodules: recursive
       - name: Checkout using PR ID (workflow_dispatch)
         if: github.event_name == 'workflow_dispatch' && github.event.inputs.pr_id != ''
-        uses: actions/checkout@v6
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
         with:
           persist-credentials: false
           ref: refs/pull/${{ github.event.inputs.pr_id }}/merge
@@ -226,7 +226,7 @@ jobs:
           run: playwright_testdata
       - name: Setup Node.js
         if: steps.check.outputs.python || steps.check.outputs.frontend
-        uses: actions/setup-node@v6
+        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6
         with:
           node-version-file: './superset-frontend/.nvmrc'
       - name: Install npm dependencies
@@ -259,7 +259,7 @@ jobs:
           SAFE_APP_ROOT=${APP_ROOT//\//_}
           echo "safe_app_root=$SAFE_APP_ROOT" >> $GITHUB_OUTPUT
       - name: Upload Playwright Artifacts
-        uses: actions/upload-artifact@v7
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
         if: failure()
         with:
           path: |
diff --git a/.github/workflows/superset-extensions-cli.yml b/.github/workflows/superset-extensions-cli.yml
index 698c42d4a1f..da8d12aee58 100644
--- a/.github/workflows/superset-extensions-cli.yml
+++ b/.github/workflows/superset-extensions-cli.yml
@@ -24,7 +24,7 @@ jobs:
         working-directory: superset-extensions-cli
     steps:
       - name: "Checkout ${{ github.ref }} ( ${{ github.sha }} )"
-        uses: actions/checkout@v6
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
         with:
           persist-credentials: false
           submodules: recursive
@@ -49,7 +49,7 @@ jobs:
 
       - name: Upload coverage reports to Codecov
         if: steps.check.outputs.superset-extensions-cli
-        uses: codecov/codecov-action@v5
+        uses: codecov/codecov-action@57e3a136b779b570ffcdbf80b3bdc90e7fab3de2 # v5
         with:
           file: ./coverage.xml
           flags: superset-extensions-cli
@@ -58,7 +58,7 @@ jobs:
 
       - name: Upload HTML coverage report
         if: steps.check.outputs.superset-extensions-cli
-        uses: actions/upload-artifact@v7
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
         with:
           name: superset-extensions-cli-coverage-html
           path: htmlcov/
diff --git a/.github/workflows/superset-frontend.yml b/.github/workflows/superset-frontend.yml
index db22843e30b..a5c5042ba3f 100644
--- a/.github/workflows/superset-frontend.yml
+++ b/.github/workflows/superset-frontend.yml
@@ -23,7 +23,7 @@ jobs:
       should-run: ${{ steps.check.outputs.frontend }}
     steps:
       - name: Checkout Code
-        uses: actions/checkout@v6
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
         with:
           persist-credentials: false
           fetch-depth: 0
@@ -54,14 +54,14 @@ jobs:
       - name: Save Docker Image as Artifact
         if: steps.check.outputs.frontend
         run: |
-          docker save $TAG | gzip > docker-image.tar.gz
+          docker save $TAG | zstd -3 --threads=0 > docker-image.tar.zst
 
       - name: Upload Docker Image Artifact
         if: steps.check.outputs.frontend
-        uses: actions/upload-artifact@v7
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
         with:
           name: docker-image
-          path: docker-image.tar.gz
+          path: docker-image.tar.zst
 
   sharded-jest-tests:
     needs: frontend-build
@@ -73,12 +73,13 @@ jobs:
     runs-on: ubuntu-24.04
     steps:
       - name: Download Docker Image Artifact
-        uses: actions/download-artifact@v8
+        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8
         with:
           name: docker-image
 
       - name: Load Docker Image
-        run: docker load < docker-image.tar.gz
+        run: |
+          zstd -d < docker-image.tar.zst | docker load
 
       - name: npm run test with coverage
         run: |
@@ -90,7 +91,7 @@ jobs:
           "npm run test -- --coverage --shard=${{ matrix.shard }}/8 --coverageReporters=json"
 
       - name: Upload Coverage Artifact
-        uses: actions/upload-artifact@v7
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
         with:
           name: coverage-artifacts-${{ matrix.shard }}
           path: superset-frontend/coverage
@@ -103,14 +104,14 @@ jobs:
       id-token: write
     steps:
       - name: Checkout Code
-        uses: actions/checkout@v6
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
         with:
           persist-credentials: false
           fetch-depth: 0
           ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
 
       - name: Download Coverage Artifacts
-        uses: actions/download-artifact@v8
+        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8
         with:
           pattern: coverage-artifacts-*
           path: coverage/
@@ -127,7 +128,7 @@ jobs:
         run: npx nyc merge coverage/ merged-output/coverage-summary.json
 
       - name: Upload Code Coverage
-        uses: codecov/codecov-action@v5
+        uses: codecov/codecov-action@57e3a136b779b570ffcdbf80b3bdc90e7fab3de2 # v5
         with:
           flags: javascript
           use_oidc: true
@@ -142,13 +143,13 @@ jobs:
     runs-on: ubuntu-24.04
     steps:
       - name: Download Docker Image Artifact
-        uses: actions/download-artifact@v8
+        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8
         with:
           name: docker-image
 
       - name: Load Docker Image
         run: |
-          docker load < docker-image.tar.gz
+          zstd -d < docker-image.tar.zst | docker load
 
       - name: lint
         run: |
@@ -166,12 +167,13 @@ jobs:
     runs-on: ubuntu-24.04
     steps:
       - name: Download Docker Image Artifact
-        uses: actions/download-artifact@v8
+        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8
         with:
           name: docker-image
 
       - name: Load Docker Image
-        run: docker load < docker-image.tar.gz
+        run: |
+          zstd -d < docker-image.tar.zst | docker load
 
       - name: Build Plugins Packages
         run: |
@@ -184,12 +186,13 @@ jobs:
     runs-on: ubuntu-24.04
     steps:
       - name: Download Docker Image Artifact
-        uses: actions/download-artifact@v8
+        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8
         with:
           name: docker-image
 
       - name: Load Docker Image
-        run: docker load < docker-image.tar.gz
+        run: |
+          zstd -d < docker-image.tar.zst | docker load
 
       - name: Build Storybook and Run Tests
         run: |
diff --git a/.github/workflows/superset-helm-lint.yml b/.github/workflows/superset-helm-lint.yml
index 846e36f8f37..b616aedeaf8 100644
--- a/.github/workflows/superset-helm-lint.yml
+++ b/.github/workflows/superset-helm-lint.yml
@@ -16,14 +16,14 @@ jobs:
     runs-on: ubuntu-24.04
     steps:
       - name: "Checkout ${{ github.ref }} ( ${{ github.sha }} )"
-        uses: actions/checkout@v6
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
         with:
           persist-credentials: false
           submodules: recursive
           fetch-depth: 0
 
       - name: Set up Helm
-        uses: azure/setup-helm@v4
+        uses: azure/setup-helm@dda3372f752e03dde6b3237bc9431cdc2f7a02a2 # v5.0.0
         with:
           version: v3.16.4
 
diff --git a/.github/workflows/superset-helm-release.yml b/.github/workflows/superset-helm-release.yml
index d8b02d44c21..732f64ea980 100644
--- a/.github/workflows/superset-helm-release.yml
+++ b/.github/workflows/superset-helm-release.yml
@@ -29,7 +29,7 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v6
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
         with:
           ref: ${{ inputs.ref || github.ref_name }}
           persist-credentials: true
@@ -42,7 +42,7 @@ jobs:
           git config user.email "$GITHUB_ACTOR@users.noreply.github.com"
 
       - name: Install Helm
-        uses: azure/setup-helm@v4
+        uses: azure/setup-helm@dda3372f752e03dde6b3237bc9431cdc2f7a02a2 # v5.0.0
         with:
           version: v3.5.4
 
@@ -101,7 +101,7 @@ jobs:
           CR_RELEASE_NAME_TEMPLATE: "superset-helm-chart-{{ .Version }}"
 
       - name: Open Pull Request
-        uses: actions/github-script@v8
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
         with:
           script: |
             const branchName = '${{ env.branch_name }}';
diff --git a/.github/workflows/superset-playwright.yml b/.github/workflows/superset-playwright.yml
index f26d4aa1649..915833fe3ce 100644
--- a/.github/workflows/superset-playwright.yml
+++ b/.github/workflows/superset-playwright.yml
@@ -60,21 +60,21 @@ jobs:
       # Conditional checkout based on context (same as Cypress workflow)
       - name: Checkout for push or pull_request event
         if: github.event_name == 'push' || github.event_name == 'pull_request'
-        uses: actions/checkout@v6
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
         with:
           persist-credentials: false
           submodules: recursive
           ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
       - name: Checkout using ref (workflow_dispatch)
         if: github.event_name == 'workflow_dispatch' && github.event.inputs.ref != ''
-        uses: actions/checkout@v6
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
         with:
           persist-credentials: false
           ref: ${{ github.event.inputs.ref }}
           submodules: recursive
       - name: Checkout using PR ID (workflow_dispatch)
         if: github.event_name == 'workflow_dispatch' && github.event.inputs.pr_id != ''
-        uses: actions/checkout@v6
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
         with:
           persist-credentials: false
           ref: refs/pull/${{ github.event.inputs.pr_id }}/merge
@@ -100,7 +100,7 @@ jobs:
           run: playwright_testdata
       - name: Setup Node.js
         if: steps.check.outputs.python || steps.check.outputs.frontend
-        uses: actions/setup-node@v6
+        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6
         with:
           node-version-file: './superset-frontend/.nvmrc'
       - name: Install npm dependencies
@@ -133,7 +133,7 @@ jobs:
           SAFE_APP_ROOT=${APP_ROOT//\//_}
           echo "safe_app_root=$SAFE_APP_ROOT" >> $GITHUB_OUTPUT
       - name: Upload Playwright Artifacts
-        uses: actions/upload-artifact@v7
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
         if: failure()
         with:
           path: |
diff --git a/.github/workflows/superset-python-integrationtest.yml b/.github/workflows/superset-python-integrationtest.yml
index d4418fcdd2a..06ae5183945 100644
--- a/.github/workflows/superset-python-integrationtest.yml
+++ b/.github/workflows/superset-python-integrationtest.yml
@@ -16,6 +16,8 @@ concurrency:
 jobs:
   test-mysql:
     runs-on: ubuntu-24.04
+    permissions:
+      id-token: write
     env:
       PYTHONPATH: ${{ github.workspace }}
       SUPERSET_CONFIG: tests.integration_tests.superset_test_config
@@ -41,7 +43,7 @@ jobs:
           - 16379:6379
     steps:
       - name: "Checkout ${{ github.ref }} ( ${{ github.sha }} )"
-        uses: actions/checkout@v6
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
         with:
           persist-credentials: false
           submodules: recursive
@@ -68,11 +70,12 @@ jobs:
         run: |
           ./scripts/python_tests.sh
       - name: Upload code coverage
-        uses: codecov/codecov-action@v5
+        uses: codecov/codecov-action@57e3a136b779b570ffcdbf80b3bdc90e7fab3de2 # v5
         with:
           flags: python,mysql
-          token: ${{ secrets.CODECOV_TOKEN }}
           verbose: true
+          use_oidc: true
+          slug: apache/superset
       - name: Generate database diagnostics for docs
         if: steps.check.outputs.python
         env:
@@ -98,13 +101,15 @@ jobs:
           "
       - name: Upload database diagnostics artifact
         if: steps.check.outputs.python
-        uses: actions/upload-artifact@v7
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
         with:
           name: database-diagnostics
           path: databases-diagnostics.json
           retention-days: 7
   test-postgres:
     runs-on: ubuntu-24.04
+    permissions:
+      id-token: write
     strategy:
       matrix:
         python-version: ["current", "previous", "next"]
@@ -129,7 +134,7 @@ jobs:
           - 16379:6379
     steps:
       - name: "Checkout ${{ github.ref }} ( ${{ github.sha }} )"
-        uses: actions/checkout@v6
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
         with:
           persist-credentials: false
           submodules: recursive
@@ -159,14 +164,17 @@ jobs:
         run: |
           ./scripts/python_tests.sh
       - name: Upload code coverage
-        uses: codecov/codecov-action@v5
+        uses: codecov/codecov-action@57e3a136b779b570ffcdbf80b3bdc90e7fab3de2 # v5
         with:
           flags: python,postgres
-          token: ${{ secrets.CODECOV_TOKEN }}
           verbose: true
+          use_oidc: true
+          slug: apache/superset
 
   test-sqlite:
     runs-on: ubuntu-24.04
+    permissions:
+      id-token: write
     env:
       PYTHONPATH: ${{ github.workspace }}
       SUPERSET_CONFIG: tests.integration_tests.superset_test_config
@@ -182,7 +190,7 @@ jobs:
           - 16379:6379
     steps:
       - name: "Checkout ${{ github.ref }} ( ${{ github.sha }} )"
-        uses: actions/checkout@v6
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
         with:
           persist-credentials: false
           submodules: recursive
@@ -211,8 +219,9 @@ jobs:
         run: |
           ./scripts/python_tests.sh
       - name: Upload code coverage
-        uses: codecov/codecov-action@v5
+        uses: codecov/codecov-action@57e3a136b779b570ffcdbf80b3bdc90e7fab3de2 # v5
         with:
           flags: python,sqlite
-          token: ${{ secrets.CODECOV_TOKEN }}
           verbose: true
+          use_oidc: true
+          slug: apache/superset
diff --git a/.github/workflows/superset-python-presto-hive.yml b/.github/workflows/superset-python-presto-hive.yml
index 762c1a19d45..68157386ec1 100644
--- a/.github/workflows/superset-python-presto-hive.yml
+++ b/.github/workflows/superset-python-presto-hive.yml
@@ -17,6 +17,8 @@ concurrency:
 jobs:
   test-postgres-presto:
     runs-on: ubuntu-24.04
+    permissions:
+      id-token: write
     env:
       PYTHONPATH: ${{ github.workspace }}
       SUPERSET_CONFIG: tests.integration_tests.superset_test_config
@@ -48,7 +50,7 @@ jobs:
           - 16379:6379
     steps:
       - name: "Checkout ${{ github.ref }} ( ${{ github.sha }} )"
-        uses: actions/checkout@v6
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
         with:
           persist-credentials: false
           submodules: recursive
@@ -77,14 +79,17 @@ jobs:
         run: |
           ./scripts/python_tests.sh -m 'chart_data_flow or sql_json_flow'
       - name: Upload code coverage
-        uses: codecov/codecov-action@v5
+        uses: codecov/codecov-action@57e3a136b779b570ffcdbf80b3bdc90e7fab3de2 # v5
         with:
           flags: python,presto
-          token: ${{ secrets.CODECOV_TOKEN }}
           verbose: true
+          use_oidc: true
+          slug: apache/superset
 
   test-postgres-hive:
     runs-on: ubuntu-24.04
+    permissions:
+      id-token: write
     env:
       PYTHONPATH: ${{ github.workspace }}
       SUPERSET_CONFIG: tests.integration_tests.superset_test_config
@@ -108,7 +113,7 @@ jobs:
           - 16379:6379
     steps:
       - name: "Checkout ${{ github.ref }} ( ${{ github.sha }} )"
-        uses: actions/checkout@v6
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
         with:
           persist-credentials: false
           submodules: recursive
@@ -145,8 +150,9 @@ jobs:
           pip install -e .[hive]
           ./scripts/python_tests.sh -m 'chart_data_flow or sql_json_flow'
       - name: Upload code coverage
-        uses: codecov/codecov-action@v5
+        uses: codecov/codecov-action@57e3a136b779b570ffcdbf80b3bdc90e7fab3de2 # v5
         with:
           flags: python,hive
-          token: ${{ secrets.CODECOV_TOKEN }}
           verbose: true
+          use_oidc: true
+          slug: apache/superset
diff --git a/.github/workflows/superset-python-unittest.yml b/.github/workflows/superset-python-unittest.yml
index 1dcf8a82237..4065e81d86c 100644
--- a/.github/workflows/superset-python-unittest.yml
+++ b/.github/workflows/superset-python-unittest.yml
@@ -17,6 +17,8 @@ concurrency:
 jobs:
   unit-tests:
     runs-on: ubuntu-24.04
+    permissions:
+      id-token: write
     strategy:
       matrix:
         python-version: ["previous", "current", "next"]
@@ -24,7 +26,7 @@ jobs:
       PYTHONPATH: ${{ github.workspace }}
     steps:
       - name: "Checkout ${{ github.ref }} ( ${{ github.sha }} )"
-        uses: actions/checkout@v6
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
         with:
           persist-credentials: false
           submodules: recursive
@@ -53,8 +55,9 @@ jobs:
         run: |
           pytest --durations-min=0.5 --cov=superset/sql/ ./tests/unit_tests/sql/ --cache-clear --cov-fail-under=100
       - name: Upload code coverage
-        uses: codecov/codecov-action@v5
+        uses: codecov/codecov-action@57e3a136b779b570ffcdbf80b3bdc90e7fab3de2 # v5
         with:
           flags: python,unit
-          token: ${{ secrets.CODECOV_TOKEN }}
           verbose: true
+          use_oidc: true
+          slug: apache/superset
diff --git a/.github/workflows/superset-translations.yml b/.github/workflows/superset-translations.yml
index 0f1cfd62556..3223eb5fa88 100644
--- a/.github/workflows/superset-translations.yml
+++ b/.github/workflows/superset-translations.yml
@@ -18,7 +18,7 @@ jobs:
     runs-on: ubuntu-24.04
     steps:
       - name: "Checkout ${{ github.ref }} ( ${{ github.sha }} )"
-        uses: actions/checkout@v6
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
         with:
           persist-credentials: false
           submodules: recursive
@@ -31,7 +31,7 @@ jobs:
 
       - name: Setup Node.js
         if: steps.check.outputs.frontend
-        uses: actions/setup-node@v6
+        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6
         with:
           node-version-file:  './superset-frontend/.nvmrc'
       - name: Install dependencies
@@ -49,7 +49,7 @@ jobs:
     runs-on: ubuntu-24.04
     steps:
       - name: "Checkout ${{ github.ref }} ( ${{ github.sha }} )"
-        uses: actions/checkout@v6
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
         with:
           persist-credentials: false
           submodules: recursive
@@ -62,6 +62,10 @@ jobs:
       - name: Setup Python
         if: steps.check.outputs.python
         uses: ./.github/actions/setup-backend/
+
+      - name: Install msgcat
+        run: sudo apt update && sudo apt install gettext
+
       - name: Test babel extraction
         if: steps.check.outputs.python
         run: ./scripts/translations/babel_update.sh
diff --git a/.github/workflows/superset-websocket.yml b/.github/workflows/superset-websocket.yml
index c4e8171dd9a..83458b7a609 100644
--- a/.github/workflows/superset-websocket.yml
+++ b/.github/workflows/superset-websocket.yml
@@ -21,7 +21,7 @@ jobs:
     runs-on: ubuntu-24.04
     steps:
       - name: "Checkout ${{ github.ref }} ( ${{ github.sha }} )"
-        uses: actions/checkout@v6
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
         with:
           persist-credentials: false
       - name: Install dependencies
diff --git a/.github/workflows/supersetbot.yml b/.github/workflows/supersetbot.yml
index 463dedd3824..c187a45040e 100644
--- a/.github/workflows/supersetbot.yml
+++ b/.github/workflows/supersetbot.yml
@@ -26,7 +26,7 @@ jobs:
     steps:
       - name: Quickly add thumbs up!
         if: github.event_name == 'issue_comment' && contains(github.event.comment.body, '@supersetbot')
-        uses: actions/github-script@v8
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
         with:
           script: |
             const [owner, repo] = process.env.GITHUB_REPOSITORY.split('/')
@@ -38,7 +38,7 @@ jobs:
             });
 
       - name: "Checkout ( ${{ github.sha }} )"
-        uses: actions/checkout@v6
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
         with:
           persist-credentials: false
 
diff --git a/.github/workflows/tag-release.yml b/.github/workflows/tag-release.yml
index 444422ff2e8..f97d9aaa449 100644
--- a/.github/workflows/tag-release.yml
+++ b/.github/workflows/tag-release.yml
@@ -31,10 +31,12 @@ jobs:
         id: check
         shell: bash
         run: |
-          if [ -n "${{ (secrets.DOCKERHUB_USER != '' && secrets.DOCKERHUB_TOKEN != '') || '' }}" ]; then
+          if [ -n "${DOCKERHUB_USER}" ]; then
             echo "has-secrets=1" >> "$GITHUB_OUTPUT"
           fi
 
+        env:
+          DOCKERHUB_USER: ${{ (secrets.DOCKERHUB_USER != '' && secrets.DOCKERHUB_TOKEN != '') || '' }}
   docker-release:
     needs: config
     if: needs.config.outputs.has-secrets
@@ -47,7 +49,7 @@ jobs:
     steps:
 
       - name: "Checkout ${{ github.ref }} ( ${{ github.sha }} )"
-        uses: actions/checkout@v6
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
         with:
           fetch-depth: 0
 
@@ -60,7 +62,7 @@ jobs:
           build: "true"
 
       - name: Use Node.js 20
-        uses: actions/setup-node@v6
+        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6
         with:
           node-version: 20
 
@@ -72,17 +74,20 @@ jobs:
           DOCKERHUB_USER: ${{ secrets.DOCKERHUB_USER }}
           DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          INPUT_RELEASE: ${{ github.event.inputs.release }}
+          INPUT_FORCE_LATEST: ${{ github.event.inputs.force-latest }}
+          INPUT_GIT_REF: ${{ github.event.inputs.git-ref }}
         run: |
           RELEASE="${{ github.event.release.tag_name }}"
           FORCE_LATEST=""
           EVENT="${{github.event_name}}"
           if [ "${{ github.event_name }}" = "workflow_dispatch" ]; then
             # in the case of a manually-triggered run, read release from input
-            RELEASE="${{ github.event.inputs.release }}"
-            if [ "${{ github.event.inputs.force-latest }}" = "true" ]; then
+            RELEASE="${INPUT_RELEASE}"
+            if [ "${INPUT_FORCE_LATEST}" = "true" ]; then
               FORCE_LATEST="--force-latest"
             fi
-            git checkout "${{ github.event.inputs.git-ref }}"
+            git checkout "${INPUT_GIT_REF}"
             EVENT="release"
           fi
 
@@ -107,12 +112,12 @@ jobs:
     steps:
 
       - name: "Checkout ${{ github.ref }} ( ${{ github.sha }} )"
-        uses: actions/checkout@v6
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
         with:
           fetch-depth: 0
 
       - name: Use Node.js 20
-        uses: actions/setup-node@v6
+        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6
         with:
           node-version: 20
 
@@ -122,6 +127,7 @@ jobs:
       - name: Label the PRs with the right release-related labels
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          INPUT_RELEASE: ${{ github.event.inputs.release }}
         run: |
           export GITHUB_ACTOR=""
           git fetch --all --tags
@@ -129,6 +135,6 @@ jobs:
           RELEASE="${{ github.event.release.tag_name }}"
           if [ "${{ github.event_name }}" = "workflow_dispatch" ]; then
             # in the case of a manually-triggered run, read release from input
-            RELEASE="${{ github.event.inputs.release }}"
+            RELEASE="${INPUT_RELEASE}"
           fi
           supersetbot release-label $RELEASE
diff --git a/.github/workflows/tech-debt.yml b/.github/workflows/tech-debt.yml
index b83aceb1842..d11ae6d3e1e 100644
--- a/.github/workflows/tech-debt.yml
+++ b/.github/workflows/tech-debt.yml
@@ -19,10 +19,12 @@ jobs:
         id: check
         shell: bash
         run: |
-          if [ -n "${{ (secrets.GSHEET_KEY != '' ) || '' }}" ]; then
+          if [ -n "${GSHEET_KEY}" ]; then
             echo "has-secrets=1" >> "$GITHUB_OUTPUT"
           fi
 
+        env:
+          GSHEET_KEY: ${{ (secrets.GSHEET_KEY != '' ) || '' }}
   process-and-upload:
     needs: config
     if: needs.config.outputs.has-secrets
@@ -30,10 +32,10 @@ jobs:
     name: Generate Reports
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@v6
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
 
       - name: Set up Node.js
-        uses: actions/setup-node@v6
+        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6
         with:
           node-version-file: './superset-frontend/.nvmrc'
 
diff --git a/.gitignore b/.gitignore
index c9699e830dc..851cbab14e3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -62,6 +62,7 @@ rat-results.txt
 superset/app/
 superset-websocket/config.json
 .direnv
+*.log
 
 # Node.js, webpack artifacts, storybook
 *.entry.js
@@ -133,6 +134,7 @@ CLAUDE.local.md
 PROJECT.md
 .aider*
 .claude_rc*
+.claude/settings.local.json
 .env.local
 oxc-custom-build/
 *.code-workspace
diff --git a/RELEASING/README.md b/RELEASING/README.md
index af001ad6af9..d49671c598c 100644
--- a/RELEASING/README.md
+++ b/RELEASING/README.md
@@ -458,7 +458,7 @@ cd ../
 sed -i '' "s/version_string = .*/version_string = \"$SUPERSET_VERSION\"/" setup.py
 
 # build the python distribution
-python setup.py sdist
+python -m build
 ```
 
 Publish to PyPI
diff --git a/RESOURCES/INTHEWILD.yaml b/RESOURCES/INTHEWILD.yaml
index d84ae68c49d..fa193318769 100644
--- a/RESOURCES/INTHEWILD.yaml
+++ b/RESOURCES/INTHEWILD.yaml
@@ -287,6 +287,11 @@ categories:
       url: https://www.gfk.com/home
       contributors: ["@mherr"]
 
+    - name: Hifadih Business & Technology
+      url: https://hifadih.net/en
+      logo: hifadih.png
+      contributors: ["@saintLaurent00"]
+
     # Logo approved by @anmol-hpe on behalf of HPE
     - name: HPE
       url: https://www.hpe.com/in/en/home.html
diff --git a/UPDATING.md b/UPDATING.md
index bbfd509ea44..27fc3428b9e 100644
--- a/UPDATING.md
+++ b/UPDATING.md
@@ -24,6 +24,20 @@ assists people when migrating to a new version.
 
 ## Next
 
+### Granular Export Controls
+
+A new feature flag `GRANULAR_EXPORT_CONTROLS` introduces three fine-grained permissions that replace the legacy `can_csv` permission:
+
+| Permission | Controls |
+|---|---|
+| `can_export_data` | CSV, Excel, JSON exports |
+| `can_export_image` | Screenshot/PDF exports |
+| `can_copy_clipboard` | Copy-to-clipboard operations |
+
+When the feature flag is enabled, these permissions are enforced on both the frontend (disabled buttons with tooltips) and backend (403 responses from API endpoints). When disabled, legacy `can_csv` behavior is preserved.
+
+**Migration behavior:** All three new permissions are granted to every role that currently has `can_csv`, preserving existing access. Admins can then selectively revoke individual export permissions from specific roles as needed.
+
 ### Deck.gl MapBox viewport and opacity controls are functional
 
 The Deck.gl MapBox chart's **Opacity**, **Default longitude**, **Default latitude**, and **Zoom** controls were previously non-functional — changing them had no effect on the rendered map. These controls are now wired up correctly.
@@ -308,13 +322,13 @@ Note: Pillow is now a required dependency (previously optional) to support image
   There's a migration added that can potentially affect a significant number of existing charts.
 - [32317](https://github.com/apache/superset/pull/32317) The horizontal filter bar feature is now out of testing/beta development and its feature flag `HORIZONTAL_FILTER_BAR` has been removed.
 - [31590](https://github.com/apache/superset/pull/31590) Marks the begining of intricate work around supporting dynamic Theming, and breaks support for [THEME_OVERRIDES](https://github.com/apache/superset/blob/732de4ac7fae88e29b7f123b6cbb2d7cd411b0e4/superset/config.py#L671) in favor of a new theming system based on AntD V5. Likely this will be in disrepair until settling over the 5.x lifecycle.
-- [32432](https://github.com/apache/superset/pull/31260) Moves the List Roles FAB view to the frontend and requires `FAB_ADD_SECURITY_API` to be enabled in the configuration and `superset init` to be executed.
+- [32432](https://github.com/apache/superset/pull/32432) Moves the List Roles FAB view to the frontend and requires `FAB_ADD_SECURITY_API` to be enabled in the configuration and `superset init` to be executed.
 - [34319](https://github.com/apache/superset/pull/34319) Drill to Detail and Drill By is now supported in Embedded mode, and also with the `DASHBOARD_RBAC` FF. If you don't want to expose these features in Embedded / `DASHBOARD_RBAC`, make sure the roles used for Embedded / `DASHBOARD_RBAC`don't have the required permissions to perform D2D actions.
 
 ## 5.0.0
 
 - [31976](https://github.com/apache/superset/pull/31976) Removed the `DISABLE_LEGACY_DATASOURCE_EDITOR` feature flag. The previous value of the feature flag was `True` and now the feature is permanently removed.
-- [31959](https://github.com/apache/superset/pull/32000) Removes CSV_UPLOAD_MAX_SIZE config, use your web server to control file upload size.
+- [32000](https://github.com/apache/superset/pull/32000) Removes CSV_UPLOAD_MAX_SIZE config, use your web server to control file upload size.
 - [31959](https://github.com/apache/superset/pull/31959) Removes the following endpoints from data uploads: `/api/v1/database/<id>/<file type>_upload` and `/api/v1/database/<file type>_metadata`, in favour of new one (Details on the PR). And simplifies permissions.
 - [31844](https://github.com/apache/superset/pull/31844) The `ALERT_REPORTS_EXECUTE_AS` and `THUMBNAILS_EXECUTE_AS` config parameters have been renamed to `ALERT_REPORTS_EXECUTORS` and `THUMBNAILS_EXECUTORS` respectively. A new config flag `CACHE_WARMUP_EXECUTORS` has also been introduced to be able to control which user is used to execute cache warmup tasks. Finally, the config flag `THUMBNAILS_SELENIUM_USER` has been removed. To use a fixed executor for async tasks, use the new `FixedExecutor` class. See the config and docs for more info on setting up different executor profiles.
 - [31894](https://github.com/apache/superset/pull/31894) Domain sharding is deprecated in favor of HTTP2. The `SUPERSET_WEBSERVER_DOMAINS` configuration will be removed in the next major version (6.0)
diff --git a/docker-compose-light.yml b/docker-compose-light.yml
index 1d0a4a90be7..458708bd26a 100644
--- a/docker-compose-light.yml
+++ b/docker-compose-light.yml
@@ -115,6 +115,10 @@ services:
       DATABASE_HOST: db-light
       DATABASE_DB: superset_light
       POSTGRES_DB: superset_light
+      EXAMPLES_HOST: db-light
+      EXAMPLES_DB: superset_light
+      EXAMPLES_USER: superset
+      EXAMPLES_PASSWORD: superset
       SUPERSET_CONFIG_PATH: /app/docker/pythonpath_dev/superset_config_docker_light.py
       GITHUB_HEAD_REF: ${GITHUB_HEAD_REF:-}
       GITHUB_SHA: ${GITHUB_SHA:-}
@@ -137,6 +141,10 @@ services:
       DATABASE_HOST: db-light
       DATABASE_DB: superset_light
       POSTGRES_DB: superset_light
+      EXAMPLES_HOST: db-light
+      EXAMPLES_DB: superset_light
+      EXAMPLES_USER: superset
+      EXAMPLES_PASSWORD: superset
       SUPERSET_CONFIG_PATH: /app/docker/pythonpath_dev/superset_config_docker_light.py
     healthcheck:
       disable: true
@@ -157,6 +165,7 @@ services:
       BUILD_SUPERSET_FRONTEND_IN_DOCKER: true
       NPM_RUN_PRUNE: false
       SCARF_ANALYTICS: "${SCARF_ANALYTICS:-}"
+      DISABLE_TS_CHECKER: "${DISABLE_TS_CHECKER:-true}"
       # configuring the dev-server to use the host.docker.internal to connect to the backend
       superset: "http://superset-light:8088"
       # Webpack dev server must bind to 0.0.0.0 to be accessible from outside the container
diff --git a/docker/docker-bootstrap.sh b/docker/docker-bootstrap.sh
index 58d71d25c25..d20f28007f1 100755
--- a/docker/docker-bootstrap.sh
+++ b/docker/docker-bootstrap.sh
@@ -80,7 +80,7 @@ case "${1}" in
     ;;
   app)
     echo "Starting web app (using development server)..."
-    flask run -p $PORT --reload --debugger --without-threads --host=0.0.0.0 --exclude-patterns "*/node_modules/*:*/.venv/*:*/build/*:*/__pycache__/*"
+    flask run -p $PORT --reload --debugger --host=0.0.0.0 --exclude-patterns "*/node_modules/*:*/.venv/*:*/build/*:*/__pycache__/*:*/superset-frontend/*"
     ;;
   app-gunicorn)
     echo "Starting web app..."
diff --git a/docs/admin_docs/configuration/aws-iam.mdx b/docs/admin_docs/configuration/aws-iam.mdx
new file mode 100644
index 00000000000..e3fac57508f
--- /dev/null
+++ b/docs/admin_docs/configuration/aws-iam.mdx
@@ -0,0 +1,162 @@
+{/*
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/}
+
+---
+title: AWS IAM Authentication
+sidebar_label: AWS IAM Authentication
+sidebar_position: 15
+---
+
+# AWS IAM Authentication for AWS Databases
+
+Superset supports IAM-based authentication for **Amazon Aurora** (PostgreSQL and MySQL) and **Amazon Redshift**. IAM auth eliminates the need for database passwords — Superset generates a short-lived auth token using temporary AWS credentials instead.
+
+Cross-account IAM role assumption via STS `AssumeRole` is supported, allowing a Superset deployment in one AWS account to connect to databases in a different account.
+
+## Prerequisites
+
+- Enable the `AWS_DATABASE_IAM_AUTH` feature flag in `superset_config.py`. IAM authentication is gated behind this flag; if it is disabled, connections using `aws_iam` fail with *"AWS IAM database authentication is not enabled."*
+  ```python
+  FEATURE_FLAGS = {
+      "AWS_DATABASE_IAM_AUTH": True,
+  }
+  ```
+- `boto3` must be installed in your Superset environment:
+  ```bash
+  pip install boto3
+  ```
+- The Superset server's IAM role (or static credentials) must have permission to call `sts:AssumeRole` (for cross-account) or the same-account permissions for the target service:
+  - **Aurora (RDS)**: `rds-db:connect`
+  - **Redshift provisioned**: `redshift:GetClusterCredentials`
+  - **Redshift Serverless**: `redshift-serverless:GetCredentials` and `redshift-serverless:GetWorkgroup`
+- SSL must be enabled on the Aurora / Redshift endpoint (required for IAM token auth).
+
+## Configuration
+
+IAM authentication is configured via the **encrypted_extra** field of the database connection. Access this field in the **Advanced** → **Security** section of the database connection form, under **Secure Extra**.
+
+### Aurora PostgreSQL or Aurora MySQL
+
+```json
+{
+  "aws_iam": {
+    "enabled": true,
+    "role_arn": "arn:aws:iam::222222222222:role/SupersetDatabaseAccess",
+    "external_id": "superset-prod-12345",
+    "region": "us-east-1",
+    "db_username": "superset_iam_user",
+    "session_duration": 3600
+  }
+}
+```
+
+| Field | Required | Description |
+|-------|----------|-------------|
+| `enabled` | Yes | Set to `true` to activate IAM auth |
+| `role_arn` | No | ARN of the cross-account IAM role to assume via STS. Omit for same-account auth |
+| `external_id` | No | External ID for the STS `AssumeRole` call, if required by the target role's trust policy |
+| `region` | Yes | AWS region of the database cluster |
+| `db_username` | Yes | The database username associated with the IAM identity |
+| `session_duration` | No | STS session duration in seconds (default: `3600`) |
+
+### Redshift (Serverless)
+
+```json
+{
+  "aws_iam": {
+    "enabled": true,
+    "role_arn": "arn:aws:iam::222222222222:role/SupersetRedshiftAccess",
+    "region": "us-east-1",
+    "workgroup_name": "my-workgroup",
+    "db_name": "dev"
+  }
+}
+```
+
+### Redshift (Provisioned Cluster)
+
+```json
+{
+  "aws_iam": {
+    "enabled": true,
+    "role_arn": "arn:aws:iam::222222222222:role/SupersetRedshiftAccess",
+    "region": "us-east-1",
+    "cluster_identifier": "my-cluster",
+    "db_username": "superset_iam_user",
+    "db_name": "dev"
+  }
+}
+```
+
+## Cross-Account IAM Setup
+
+To connect to a database in Account B from a Superset deployment in Account A:
+
+**1. In Account B — create a database-access role:**
+
+```json
+{
+  "Version": "2012-10-17",
+  "Statement": [
+    {
+      "Effect": "Allow",
+      "Action": ["rds-db:connect"],
+      "Resource": "arn:aws:rds-db:us-east-1:222222222222:dbuser/db-XXXXXXXXXXXX/superset_iam_user"
+    }
+  ]
+}
+```
+
+**Trust policy** (allows Account A's Superset role to assume it):
+
+```json
+{
+  "Version": "2012-10-17",
+  "Statement": [
+    {
+      "Effect": "Allow",
+      "Principal": {
+        "AWS": "arn:aws:iam::111111111111:role/SupersetInstanceRole"
+      },
+      "Action": "sts:AssumeRole",
+      "Condition": {
+        "StringEquals": {
+          "sts:ExternalId": "superset-prod-12345"
+        }
+      }
+    }
+  ]
+}
+```
+
+**2. In Account A — grant Superset's role permission to assume the Account B role:**
+
+```json
+{
+  "Effect": "Allow",
+  "Action": "sts:AssumeRole",
+  "Resource": "arn:aws:iam::222222222222:role/SupersetDatabaseAccess"
+}
+```
+
+**3. Configure the database connection in Superset** using the `role_arn` and `external_id` from the trust policy (as shown in the configuration example above).
+
+## Credential Caching
+
+STS credentials are cached in memory keyed by `(role_arn, region, external_id)` with a 10-minute TTL. This reduces the number of STS API calls when multiple queries are executed with the same connection. Tokens are refreshed automatically before expiry.
diff --git a/docs/admin_docs/configuration/configuring-superset.mdx b/docs/admin_docs/configuration/configuring-superset.mdx
index 657d5d4dc75..3842dd65ee5 100644
--- a/docs/admin_docs/configuration/configuring-superset.mdx
+++ b/docs/admin_docs/configuration/configuring-superset.mdx
@@ -109,6 +109,14 @@ SECRET_KEY = 'YOUR_OWN_RANDOM_GENERATED_SECRET_KEY'
 
 You can generate a strong secure key with `openssl rand -base64 42`.
 
+Alternatively, you can set the secret key using `SUPERSET_SECRET_KEY` environment variable:
+
+On a Unix-based system, such as Linux or macOS, you can do so by running the following command in your terminal:
+
+```bash
+export SUPERSET_SECRET_KEY=$(openssl rand -base64 42)
+```
+
 :::caution Use a strong secret key
 This key will be used for securely signing session cookies and encrypting sensitive information stored in Superset's application metadata database.
 Your deployment must use a complex, unique key.
diff --git a/docs/admin_docs/configuration/importing-exporting-datasources.mdx b/docs/admin_docs/configuration/importing-exporting-datasources.mdx
index 400d64590ad..dadc5e0d4a7 100644
--- a/docs/admin_docs/configuration/importing-exporting-datasources.mdx
+++ b/docs/admin_docs/configuration/importing-exporting-datasources.mdx
@@ -10,6 +10,10 @@ version: 1
 The superset cli allows you to import and export datasources from and to YAML. Datasources include
 databases. The data is expected to be organized in the following hierarchy:
 
+:::info
+Superset's ZIP-based import/export also covers **dashboards**, **charts**, and **saved queries**, exercised through the UI and REST API. The [Dashboard Import Overwrite Behavior](#dashboard-import-overwrite-behavior) and [UUIDs in API Responses](#uuids-in-api-responses) sections below document the behavior shared across all asset types.
+:::
+
 ```text
 ├──databases
 |  ├──database_1
@@ -75,6 +79,29 @@ The optional username flag **-u** sets the user used for the datasource import.
 superset import_datasources -p <path / filename> -u 'admin'
 ```
 
+## Dashboard Import Overwrite Behavior
+
+When importing a dashboard ZIP with the **overwrite** option enabled, any existing charts that are part of the dashboard are **replaced** rather than duplicated. This applies to:
+
+- Charts whose UUID matches a chart already present in the target instance
+- The full chart configuration (query, visualization type, columns, metrics) is replaced by the imported version
+
+If you import without the overwrite flag, existing charts with conflicting UUIDs are left unchanged and the import skips those objects. Use overwrite when you want to push a fully updated dashboard (including chart definitions) from a development or staging environment to production.
+
+## UUIDs in API Responses
+
+The REST API POST endpoints for **datasets**, **charts**, and **dashboards** include the auto-generated `uuid` field in the response body:
+
+```json
+{
+  "id": 42,
+  "uuid": "b8a8d5c3-1234-4abc-8def-0123456789ab",
+  ...
+}
+```
+
+UUIDs remain stable across import/export cycles and can be used for cross-environment workflows — for example, recording a UUID when creating a chart in development and using it to identify the matching chart after importing into production.
+
 ## Legacy Importing Datasources
 
 ### From older versions of Superset to current version
diff --git a/docs/admin_docs/configuration/mcp-server.mdx b/docs/admin_docs/configuration/mcp-server.mdx
index 22a80d645b3..1475f3d6468 100644
--- a/docs/admin_docs/configuration/mcp-server.mdx
+++ b/docs/admin_docs/configuration/mcp-server.mdx
@@ -501,6 +501,7 @@ All MCP settings go in `superset_config.py`. Defaults are defined in `superset/m
 | `MCP_SERVICE_URL` | `None` | Public base URL for MCP-generated links (set this when behind a reverse proxy) |
 | `MCP_DEBUG` | `False` | Enable debug logging |
 | `MCP_DEV_USERNAME` | -- | Superset username for development mode (no auth) |
+| `MCP_PARSE_REQUEST_ENABLED` | `True` | Pre-parse MCP tool inputs from JSON strings into objects. Set to `False` for clients (Claude Desktop, LangChain) that do not double-serialize arguments — this produces cleaner tool schemas for those clients |
 
 ### Authentication
 
@@ -664,6 +665,32 @@ MCP_CSRF_CONFIG = {
 
 ---
 
+## Audit Events
+
+All MCP tool calls are logged to Superset's event logger, the same system used by the web UI (viewable at **Settings → Action Log**). Each event captures:
+
+- **Action**: `mcp.<tool_name>.<phase>` (e.g., `mcp.list_databases.query`)
+- **User**: the resolved Superset username from the JWT or dev config
+- **Timestamp**: when the operation ran
+
+This means MCP activity is auditable alongside normal user activity. No additional configuration is required — logging is on by default whenever the event logger is enabled in your Superset deployment.
+
+## Tool Pagination
+
+MCP list tools (`list_datasets`, `list_charts`, `list_dashboards`, `list_databases`) use **offset pagination** via `page` (1-based) and `page_size` parameters. Responses include `page`, `page_size`, `total_count`, `total_pages`, `has_previous`, and `has_next`. To iterate through all results:
+
+```python
+# Example: fetch all charts across pages
+all_charts = []
+page = 1
+while True:
+    result = mcp.list_charts(page=page, page_size=50)
+    all_charts.extend(result["charts"])
+    if not result.get("has_next"):
+        break
+    page += 1
+```
+
 ## Security Best Practices
 
 - **Use TLS** for all production MCP endpoints -- place the server behind a reverse proxy with HTTPS
diff --git a/docs/admin_docs/configuration/sql-templating.mdx b/docs/admin_docs/configuration/sql-templating.mdx
index 893c1886419..f2c21bcef79 100644
--- a/docs/admin_docs/configuration/sql-templating.mdx
+++ b/docs/admin_docs/configuration/sql-templating.mdx
@@ -22,6 +22,15 @@ While powerful, this feature executes template code on the server. Within the Su
 
 If you grant these permissions to untrusted users, this feature can be exploited as a **Server-Side Template Injection (SSTI)** vulnerability. Do not enable `ENABLE_TEMPLATE_PROCESSING` unless you fully understand and accept the associated security risks.
 
+Additionally:
+
+- The `url_param()` macro allows URL parameters to influence the rendered SQL. Always validate or restrict `url_param()` values in your templates rather than interpolating them directly.
+- `filter.get('val')` returns raw filter values without escaping. Use the safe helpers described below (`|where_in`, `| replace("'", "''")`) rather than concatenating values directly into SQL strings.
+
+:::
+
+:::tip
+`ENABLE_TEMPLATE_PROCESSING` defaults to `False`. Only enable it if your deployment requires Jinja templates and all users with dataset/chart edit access are administrators or fully trusted internal users.
 :::
 
 When templating is enabled, python code can be embedded in virtual datasets and
@@ -324,6 +333,16 @@ cache hit in the future and Superset can retrieve cached data.
 The `{{ url_param('custom_variable') }}` macro lets you define arbitrary URL
 parameters and reference them in your SQL code.
 
+:::warning
+Always treat `url_param()` values as untrusted input. Escaping behaviour varies by context and configuration, so do not rely on it. Restrict values to an explicit allowlist before using them in SQL:
+
+```sql
+{% set cc = url_param('countrycode') %}
+{% if cc not in ('US', 'ES', 'FR') %}{% set cc = 'US' %}{% endif %}
+WHERE country_code = '{{ cc }}'
+```
+:::
+
 Here's a concrete example:
 
 - You write the following query in SQL Lab:
@@ -398,6 +417,16 @@ This is useful if:
 - You want to handle generating custom SQL conditions for a filter
 - You want to have the ability to filter inside the main query for speed purposes
 
+:::warning
+`filter.get('val')` returns the raw filter value without escaping. For multi-value filters, use the `|where_in` Jinja filter, which handles quoting safely. For single-value operators like `LIKE`, escape single quotes before interpolating:
+
+```sql
+{%- if filter.get('op') == 'LIKE' -%}
+    AND full_name LIKE '{{ filter.get('val') | replace("'", "''") }}'
+{%- endif -%}
+```
+:::
+
 Here's a concrete example:
 
 ```sql
@@ -424,7 +453,7 @@ Here's a concrete example:
 
     {%- if filter.get('op') == 'LIKE' -%}
         AND
-        full_name LIKE {{ "'" + filter.get('val') + "'" }}
+        full_name LIKE '{{ filter.get('val') | replace("'", "''") }}'
     {%- endif -%}
 
     {%- endfor -%}
diff --git a/docs/admin_docs/security/security.mdx b/docs/admin_docs/security/security.mdx
index cc68b1241b9..867e3f87986 100644
--- a/docs/admin_docs/security/security.mdx
+++ b/docs/admin_docs/security/security.mdx
@@ -24,6 +24,14 @@ A table with the permissions for these roles can be found at [/RESOURCES/STANDAR
 Admins have all possible rights, including granting or revoking rights from other
 users and altering other people’s slices and dashboards.
 
+>#### Threat Model and Privilege Boundaries: The Admin Role
+>
+>Apache Superset is built with a granular permission model where users assigned the Admin role are considered fully trusted. Admins possess complete control over the application's configuration, UI rendering, and access controls.
+>
+>Consequently, actions performed by an Admin that alter the application's behavior or presentation—such as injecting custom CSS, modifying Jinja templates, or altering security flags—are intended administrative capabilities by design.
+>
+>In accordance with MITRE CNA Rule 4.1, a vulnerability must represent a violation of an explicit security policy. Because the Admin role is defined as a trusted operational boundary, actions executed with Admin privileges do not cross a security perimeter. Therefore, exploit vectors that strictly require Admin access are not classified as security vulnerabilities and are ineligible for CVE assignment.
+
 ### Alpha
 
 Alpha users have access to all data sources, but they cannot grant or revoke access
diff --git a/docs/developer_docs/api.mdx b/docs/developer_docs/api.mdx
index c97f8fb5648..6793408388c 100644
--- a/docs/developer_docs/api.mdx
+++ b/docs/developer_docs/api.mdx
@@ -412,7 +412,7 @@ curl -H "Authorization: Bearer YOUR_ACCESS_TOKEN" \
 |--------|----------|-------------|
 | `GET` | [Get security roles](/developer-docs/api/get-security-roles) | `/api/v1/security/roles/` |
 | `POST` | [Create security roles](/developer-docs/api/create-security-roles) | `/api/v1/security/roles/` |
-| `GET` | [Get security roles  info](/developer-docs/api/get-security-roles-info) | `/api/v1/security/roles/_info` |
+| `GET` | [Get security roles info](/developer-docs/api/get-security-roles-info) | `/api/v1/security/roles/_info` |
 | `DELETE` | [Delete security roles by pk](/developer-docs/api/delete-security-roles-by-pk) | `/api/v1/security/roles/{pk}` |
 | `GET` | [Get security roles by pk](/developer-docs/api/get-security-roles-by-pk) | `/api/v1/security/roles/{pk}` |
 | `PUT` | [Update security roles by pk](/developer-docs/api/update-security-roles-by-pk) | `/api/v1/security/roles/{pk}` |
@@ -430,7 +430,7 @@ curl -H "Authorization: Bearer YOUR_ACCESS_TOKEN" \
 |--------|----------|-------------|
 | `GET` | [Get security users](/developer-docs/api/get-security-users) | `/api/v1/security/users/` |
 | `POST` | [Create security users](/developer-docs/api/create-security-users) | `/api/v1/security/users/` |
-| `GET` | [Get security users  info](/developer-docs/api/get-security-users-info) | `/api/v1/security/users/_info` |
+| `GET` | [Get security users info](/developer-docs/api/get-security-users-info) | `/api/v1/security/users/_info` |
 | `DELETE` | [Delete security users by pk](/developer-docs/api/delete-security-users-by-pk) | `/api/v1/security/users/{pk}` |
 | `GET` | [Get security users by pk](/developer-docs/api/get-security-users-by-pk) | `/api/v1/security/users/{pk}` |
 | `PUT` | [Update security users by pk](/developer-docs/api/update-security-users-by-pk) | `/api/v1/security/users/{pk}` |
@@ -443,7 +443,7 @@ curl -H "Authorization: Bearer YOUR_ACCESS_TOKEN" \
 | Method | Endpoint | Description |
 |--------|----------|-------------|
 | `GET` | [Get security permissions](/developer-docs/api/get-security-permissions) | `/api/v1/security/permissions/` |
-| `GET` | [Get security permissions  info](/developer-docs/api/get-security-permissions-info) | `/api/v1/security/permissions/_info` |
+| `GET` | [Get security permissions info](/developer-docs/api/get-security-permissions-info) | `/api/v1/security/permissions/_info` |
 | `GET` | [Get security permissions by pk](/developer-docs/api/get-security-permissions-by-pk) | `/api/v1/security/permissions/{pk}` |
 
 </details>
@@ -455,7 +455,7 @@ curl -H "Authorization: Bearer YOUR_ACCESS_TOKEN" \
 |--------|----------|-------------|
 | `GET` | [Get security resources](/developer-docs/api/get-security-resources) | `/api/v1/security/resources/` |
 | `POST` | [Create security resources](/developer-docs/api/create-security-resources) | `/api/v1/security/resources/` |
-| `GET` | [Get security resources  info](/developer-docs/api/get-security-resources-info) | `/api/v1/security/resources/_info` |
+| `GET` | [Get security resources info](/developer-docs/api/get-security-resources-info) | `/api/v1/security/resources/_info` |
 | `DELETE` | [Delete security resources by pk](/developer-docs/api/delete-security-resources-by-pk) | `/api/v1/security/resources/{pk}` |
 | `GET` | [Get security resources by pk](/developer-docs/api/get-security-resources-by-pk) | `/api/v1/security/resources/{pk}` |
 | `PUT` | [Update security resources by pk](/developer-docs/api/update-security-resources-by-pk) | `/api/v1/security/resources/{pk}` |
@@ -469,7 +469,7 @@ curl -H "Authorization: Bearer YOUR_ACCESS_TOKEN" \
 |--------|----------|-------------|
 | `GET` | [Get security permissions resources](/developer-docs/api/get-security-permissions-resources) | `/api/v1/security/permissions-resources/` |
 | `POST` | [Create security permissions resources](/developer-docs/api/create-security-permissions-resources) | `/api/v1/security/permissions-resources/` |
-| `GET` | [Get security permissions resources  info](/developer-docs/api/get-security-permissions-resources-info) | `/api/v1/security/permissions-resources/_info` |
+| `GET` | [Get security permissions resources info](/developer-docs/api/get-security-permissions-resources-info) | `/api/v1/security/permissions-resources/_info` |
 | `DELETE` | [Delete security permissions resources by pk](/developer-docs/api/delete-security-permissions-resources-by-pk) | `/api/v1/security/permissions-resources/{pk}` |
 | `GET` | [Get security permissions resources by pk](/developer-docs/api/get-security-permissions-resources-by-pk) | `/api/v1/security/permissions-resources/{pk}` |
 | `PUT` | [Update security permissions resources by pk](/developer-docs/api/update-security-permissions-resources-by-pk) | `/api/v1/security/permissions-resources/{pk}` |
@@ -578,7 +578,29 @@ curl -H "Authorization: Bearer YOUR_ACCESS_TOKEN" \
 
 | Method | Endpoint | Description |
 |--------|----------|-------------|
-| `GET` | [Get api by version  openapi](/developer-docs/api/get-api-by-version-openapi) | `/api/{version}/_openapi` |
+| `GET` | [Get api by version openapi](/developer-docs/api/get-api-by-version-openapi) | `/api/{version}/_openapi` |
+
+</details>
+
+<details>
+<summary><strong>Themes</strong> (14 endpoints) — Manage UI themes for customizing Superset's appearance.</summary>
+
+| Method | Endpoint | Description |
+|--------|----------|-------------|
+| `DELETE` | [Bulk delete themes](/developer-docs/api/bulk-delete-themes) | `/api/v1/theme/` |
+| `GET` | [Get a list of themes](/developer-docs/api/get-a-list-of-themes) | `/api/v1/theme/` |
+| `POST` | [Create a theme](/developer-docs/api/create-a-theme) | `/api/v1/theme/` |
+| `GET` | [Get metadata information about this API resource (theme-info)](/developer-docs/api/get-metadata-information-about-this-api-resource-theme-info) | `/api/v1/theme/_info` |
+| `DELETE` | [Delete a theme](/developer-docs/api/delete-a-theme) | `/api/v1/theme/{pk}` |
+| `GET` | [Get a theme](/developer-docs/api/get-a-theme) | `/api/v1/theme/{pk}` |
+| `PUT` | [Update a theme](/developer-docs/api/update-a-theme) | `/api/v1/theme/{pk}` |
+| `PUT` | [Set a theme as the system dark theme](/developer-docs/api/set-a-theme-as-the-system-dark-theme) | `/api/v1/theme/{pk}/set_system_dark` |
+| `PUT` | [Set a theme as the system default theme](/developer-docs/api/set-a-theme-as-the-system-default-theme) | `/api/v1/theme/{pk}/set_system_default` |
+| `GET` | [Download multiple themes as YAML files](/developer-docs/api/download-multiple-themes-as-yaml-files) | `/api/v1/theme/export/` |
+| `POST` | [Import themes from a ZIP file](/developer-docs/api/import-themes-from-a-zip-file) | `/api/v1/theme/import/` |
+| `GET` | [Get related fields data (theme-related-column-name)](/developer-docs/api/get-related-fields-data-theme-related-column-name) | `/api/v1/theme/related/{column_name}` |
+| `DELETE` | [Clear the system dark theme](/developer-docs/api/clear-the-system-dark-theme) | `/api/v1/theme/unset_system_dark` |
+| `DELETE` | [Clear the system default theme](/developer-docs/api/clear-the-system-default-theme) | `/api/v1/theme/unset_system_default` |
 
 </details>
 
diff --git a/docs/developer_docs/extensions/development.md b/docs/developer_docs/extensions/development.md
index a10f7743110..838db2f1c76 100644
--- a/docs/developer_docs/extensions/development.md
+++ b/docs/developer_docs/extensions/development.md
@@ -49,7 +49,7 @@ superset-extensions update: Updates derived and generated files in the extension
 When creating a new extension with `superset-extensions init`, the CLI generates a standardized folder structure:
 
 ```
-my-org.dataset-references/
+dataset-references/
 ├── extension.json
 ├── frontend/
 │   ├── src/
@@ -80,7 +80,7 @@ my-org.dataset-references/
 ```
 
 **Note**: With publisher `my-org` and name `dataset-references`, the technical names are:
-- Directory name: `my-org.dataset-references` (kebab-case)
+- Directory name: `dataset-references` (kebab-case)
 - Backend Python namespace: `my_org.dataset_references`
 - Backend distribution package: `my_org-dataset_references`
 - Frontend package name: `@my-org/dataset-references` (scoped)
diff --git a/docs/developer_docs/extensions/quick-start.md b/docs/developer_docs/extensions/quick-start.md
index d43e4be6e62..f2c4388b8a5 100644
--- a/docs/developer_docs/extensions/quick-start.md
+++ b/docs/developer_docs/extensions/quick-start.md
@@ -75,7 +75,7 @@ This approach ensures that extensions from different organizations cannot confli
 This creates a complete project structure:
 
 ```
-my-org.hello-world/
+hello-world/
 ├── extension.json           # Extension metadata and configuration
 ├── backend/                 # Backend Python code
 │   ├── src/
diff --git a/docs/developer_docs/testing/backend-testing.md b/docs/developer_docs/testing/backend-testing.md
index 0af638fac5b..e8c8d229fcb 100644
--- a/docs/developer_docs/testing/backend-testing.md
+++ b/docs/developer_docs/testing/backend-testing.md
@@ -63,6 +63,109 @@ pytest tests/unit_tests/
 pytest tests/integration_tests/
 ```
 
+## Testing Alerts & Reports with Celery and MailHog
+
+The Alerts & Reports feature relies on Celery for task scheduling and execution. To test it locally, you need Redis (message broker), Celery Beat (scheduler), a Celery Worker (executor), and an SMTP server to receive email notifications.
+
+### Prerequisites
+
+- Redis running on `localhost:6379`
+- [MailHog](https://github.com/mailhog/MailHog) installed (a local SMTP server with a web UI for viewing caught emails)
+
+### superset_config.py
+
+Your `CeleryConfig` **must** include `beat_schedule`. When you define a custom `CeleryConfig` class in `superset_config.py`, it replaces the default entirely. If you omit `beat_schedule`, Celery Beat will start but never schedule any report tasks.
+
+```python
+from celery.schedules import crontab
+from superset.tasks.types import ExecutorType
+
+REDIS_HOST = "localhost"
+REDIS_PORT = "6379"
+
+class CeleryConfig:
+    broker_url = f"redis://{REDIS_HOST}:{REDIS_PORT}/0"
+    result_backend = f"redis://{REDIS_HOST}:{REDIS_PORT}/0"
+    broker_connection_retry_on_startup = True
+    imports = (
+        "superset.sql_lab",
+        "superset.tasks.scheduler",
+        "superset.tasks.thumbnails",
+        "superset.tasks.cache",
+    )
+    worker_prefetch_multiplier = 10
+    task_acks_late = True
+    beat_schedule = {
+        "reports.scheduler": {
+            "task": "reports.scheduler",
+            "schedule": crontab(minute="*", hour="*"),
+        },
+        "reports.prune_log": {
+            "task": "reports.prune_log",
+            "schedule": crontab(minute=0, hour=0),
+        },
+    }
+
+CELERY_CONFIG = CeleryConfig
+
+# SMTP settings pointing to MailHog
+SMTP_HOST = "localhost"
+SMTP_PORT = 1025
+SMTP_STARTTLS = False
+SMTP_SSL = False
+SMTP_USER = ""
+SMTP_PASSWORD = ""
+SMTP_MAIL_FROM = "superset@localhost"
+
+# Must match where your frontend is running
+WEBDRIVER_BASEURL = "http://localhost:9000/"
+
+ALERT_REPORTS_EXECUTE_AS = [ExecutorType.OWNER]
+
+FEATURE_FLAGS = {
+    "ALERT_REPORTS": True,
+    # Recommended for better screenshot support (WebGL/DeckGL charts)
+    "PLAYWRIGHT_REPORTS_AND_THUMBNAILS": True,
+}
+```
+
+:::note
+Do not include `"superset.tasks.async_queries"` in `CeleryConfig.imports` unless you need Global Async Queries. That module accesses `current_app.config` at import time and will crash the worker with a "Working outside of application context" error.
+:::
+
+### Starting the Services
+
+Start MailHog, then Celery Beat and Worker in separate terminals:
+
+```bash
+# Terminal 1 - MailHog (SMTP on :1025, Web UI on :8025)
+MailHog
+
+# Terminal 2 - Celery Beat (scheduler)
+celery --app=superset.tasks.celery_app:app beat --loglevel=info
+
+# Terminal 3 - Celery Worker (executor)
+celery --app=superset.tasks.celery_app:app worker --concurrency=1 --loglevel=info
+```
+
+Use `--concurrency=1` to limit resource usage on your dev machine.
+
+### Verifying the Setup
+
+1. **Beat** should log `Scheduler: Sending due task reports.scheduler (reports.scheduler)` once per minute
+2. **Worker** should log `Scheduling alert <name> eta: <timestamp>` for each active report
+3. Create a test report in **Settings > Alerts & Reports** with a `* * * * *` cron schedule
+4. Check **http://localhost:8025** (MailHog web UI) for the email within 1-2 minutes
+
+### Troubleshooting
+
+| Problem | Solution |
+|---|---|
+| Beat shows no output | Ensure `beat_schedule` is defined in your `CeleryConfig` and `--loglevel=info` is set |
+| "Report Schedule is still working, refusing to re-compute" | Previous executions are stuck. Reset with: `UPDATE report_schedule SET last_state = 'Not triggered' WHERE id = <id>;` |
+| Task backlog overwhelming the worker | Flush Redis: `redis-cli FLUSHDB`, then restart Beat and Worker |
+| Screenshot timeout | Ensure your frontend dev server is running and `WEBDRIVER_BASEURL` matches its URL |
+
 ---
 
 *This documentation is under active development. Check back soon for updates!*
diff --git a/docs/docs/faq.mdx b/docs/docs/faq.mdx
index e98cd70edc1..2e6ff2fefa8 100644
--- a/docs/docs/faq.mdx
+++ b/docs/docs/faq.mdx
@@ -91,7 +91,7 @@ or a view.
 When working with tables, the solution would be to create a table that contains all the fields
 needed for your analysis, most likely through some scheduled batch process.
 
-A view is a simple logical layer that abstracts an arbitrary SQL queries as a virtual table. This can
+A view is a simple logical layer that abstracts an arbitrary SQL query as a virtual table. This can
 allow you to join and union multiple tables and to apply some transformation using arbitrary SQL
 expressions. The limitation there is your database performance, as Superset effectively will run a
 query on top of your query (view). A good practice may be to limit yourself to joining your main
diff --git a/docs/docs/security/granular-export-controls.mdx b/docs/docs/security/granular-export-controls.mdx
new file mode 100644
index 00000000000..806e21e02cf
--- /dev/null
+++ b/docs/docs/security/granular-export-controls.mdx
@@ -0,0 +1,78 @@
+---
+title: Granular Export Controls
+sidebar_position: 4
+---
+
+# Granular Export Controls
+
+Superset provides granular, permission-based controls for data export, image export, and clipboard operations. These replace the legacy `can_csv` permission with three fine-grained permissions that can be assigned independently to roles.
+
+## Feature Flag
+
+Granular export controls are gated behind the `GRANULAR_EXPORT_CONTROLS` feature flag. When the flag is disabled, the legacy `can_csv` permission behavior is preserved.
+
+```python
+FEATURE_FLAGS = {
+    "GRANULAR_EXPORT_CONTROLS": True,
+}
+```
+
+## Permissions
+
+| Permission           | Resource   | Controls                                                               |
+| -------------------- | ---------- | ---------------------------------------------------------------------- |
+| `can_export_data`    | `Superset` | CSV, Excel, and JSON data exports from charts, dashboards, and SQL Lab |
+| `can_export_image`   | `Superset` | Screenshot (JPEG/PNG) and PDF exports from charts and dashboards       |
+| `can_copy_clipboard` | `Superset` | Copy-to-clipboard operations in SQL Lab and the Explore data pane      |
+
+## Default Role Assignments
+
+The migration grants all three new permissions (`can_export_data`, `can_export_image`, `can_copy_clipboard`) to every role that currently has `can_csv`. This preserves existing behavior — no role loses access during the upgrade.
+
+After the migration, admins can selectively revoke individual export permissions from any role to restrict access. For example, to prevent Gamma users from exporting data or images while still allowing clipboard operations, revoke `can_export_data` and `can_export_image` from the Gamma role.
+
+## Configuration Steps
+
+1. **Enable the feature flag** in `superset_config.py`:
+
+   ```python
+   FEATURE_FLAGS = {
+       "GRANULAR_EXPORT_CONTROLS": True,
+   }
+   ```
+
+2. **Run the database migration** to register the new permissions:
+
+   ```bash
+   superset db upgrade
+   ```
+
+3. **Initialize permissions** so roles are populated:
+
+   ```bash
+   superset init
+   ```
+
+4. **Verify role assignments** in **Settings > List Roles**. Confirm that each role has the expected permissions from the table above.
+
+5. **Customize as needed**: Grant or revoke individual export permissions on any role through the role editor.
+
+## User Experience
+
+When a user lacks a required export permission:
+
+- **Menu items** (CSV, Excel, JSON, screenshot) appear **disabled** with an info tooltip icon explaining the restriction
+- **Buttons** (SQL Lab download, clipboard copy) appear **disabled** with a tooltip on hover
+- **API endpoints** return **403 Forbidden** when the corresponding permission is missing
+
+## API Enforcement
+
+The following API endpoints enforce granular export permissions when the feature flag is enabled:
+
+| Endpoint                                                  | Required Permission |
+| --------------------------------------------------------- | ------------------- |
+| `GET /api/v1/chart/{id}/data/` (CSV/Excel format)         | `can_export_data`   |
+| `GET /api/v1/chart/{id}/cache_screenshot/`                | `can_export_image`  |
+| `POST /api/v1/dashboard/{id}/cache_dashboard_screenshot/` | `can_export_image`  |
+| `GET /api/v1/sqllab/export/{client_id}/`                  | `can_export_data`   |
+| `POST /api/v1/sqllab/export_streaming/`                   | `can_export_data`   |
diff --git a/docs/docs/using-superset/creating-your-first-dashboard.mdx b/docs/docs/using-superset/creating-your-first-dashboard.mdx
index febf3395a6f..99a859818af 100644
--- a/docs/docs/using-superset/creating-your-first-dashboard.mdx
+++ b/docs/docs/using-superset/creating-your-first-dashboard.mdx
@@ -63,6 +63,12 @@ by clicking the **Connect** button in the bottom right corner of the modal windo
 
 Congratulations, you've just added a new data source in Superset!
 
+### Sharing a Database Connection
+
+When adding a new database, you can share the connection with other Superset users. Shared connections appear in other users' database lists, making it easier to collaborate on the same data without requiring each user to configure the same connection separately.
+
+To share a connection, enable the **Share connection with other users** option in the **Advanced** tab of the database connection modal before saving. You can change sharing settings later by editing the database connection.
+
 ### Registering a new table
 
 Now that you’ve configured a data source, you can select specific tables (called **Datasets** in Superset)
@@ -80,6 +86,22 @@ we register the **cleaned_sales_data** table from the **examples** database.
 
 To finish, click the **Add** button in the bottom right corner. You should now see your dataset in the list of datasets.
 
+### Organizing Datasets into Folders
+
+The Datasets list view supports **folders** for organizing datasets into groups. To create and manage folders:
+
+1. In the **Datasets** list, click the **Folders** panel on the left sidebar.
+2. Click **+ New Folder** to create a top-level folder, or drag an existing folder to nest it.
+3. Drag dataset rows onto a folder to move them in, or right-click a dataset and select **Move to folder**.
+
+Folders are per-user organizational aids — they do not affect dataset access permissions or how other users see the datasets.
+
+### Uploading Files via the OS File Manager (PWA)
+
+When Superset is installed as a **Progressive Web App (PWA)** from your browser, your operating system will offer Superset as an option when opening CSV, Excel (`.xls`/`.xlsx`), and Parquet files. Double-clicking or right-clicking a supported file and selecting "Open with Superset" navigates directly to the upload workflow for that file.
+
+To install Superset as a PWA, look for the install icon in your browser's address bar (Chrome, Edge) when visiting your Superset instance over HTTPS. PWA installation requires HTTPS and a valid manifest — your admin needs to confirm the app manifest is served correctly.
+
 ### Customizing column properties
 
 Now that you've registered your dataset, you can configure column properties
@@ -234,6 +256,64 @@ For example, when running the local development build, the following will disabl
 Top Nav and remove the Filter Bar:
 `http://localhost:8088/superset/dashboard/my-dashboard/?standalone=1&show_filters=0`
 
+### AG Grid Interactive Table
+
+The **AG Grid Interactive Table** chart type is Superset's fully-featured data grid, suitable for large paginated datasets where the standard Table chart is not enough.
+
+#### Server-Side Column Filters
+
+AG Grid supports server-side column filters that query the full dataset — not just the loaded page. Filters are applied before data is sent to the browser, so results are correct even across millions of rows.
+
+**Available filter types:**
+
+| Column type | Filter options |
+|---|---|
+| Text | Contains, equals, starts with, ends with |
+| Number | Equals, not equal, less than, greater than, between |
+| Date | Before, after, between, blank |
+| Set | Select from a list of distinct values |
+
+**AND / OR logic:** Each column supports combining multiple conditions with AND or OR. Filters from different columns are always combined with AND.
+
+**Interaction with pagination:** Server-side filters run as WHERE clauses in the underlying SQL query, so pagination always operates over the already-filtered result set.
+
+#### Time Shift (Time Comparison)
+
+AG Grid Interactive Table supports **Time Shift** (time comparison), matching the behavior of the standard Table chart. In the **Advanced Analytics** → **Time Comparison** section of the chart configuration, enter a shift expression (e.g., `1 year ago`, `minus 7 days`) to add comparison columns showing values from the offset period. Dashboard-level time range overrides apply to both the base and comparison periods.
+
+### Dynamic Currency Formatting
+
+Chart metric values can display currencies dynamically rather than using a fixed currency code. To enable:
+
+1. Open the dataset editor for your dataset (**Datasets → Edit**).
+2. In the **Advanced** tab, set **Currency Code Column** to the name of a column in your dataset that contains ISO 4217 currency codes (e.g., `USD`, `EUR`, `GBP`).
+3. In the Explore chart configuration, open the metric's **Number format** section and select **Auto-detect** for currency.
+
+When Auto-detect is active, each row uses the currency code from the designated column, so a single chart can display values in multiple currencies — each formatted correctly for its currency.
+
+### ECharts Option Editor
+
+For ECharts-based chart types (line, bar, area, scatter, pie, and others), Explore includes an advanced **ECharts Option Editor** that accepts raw JSON overrides for the underlying ECharts configuration.
+
+Access it via the **Customize** tab → **ECharts Options** section at the bottom of the panel. The JSON you enter is deep-merged on top of Superset's generated ECharts config, so you can override specific options without rewriting the entire config.
+
+**Example:** override the legend position and add a custom title:
+
+```json
+{
+  "legend": { "orient": "vertical", "right": "5%", "top": "middle" },
+  "title": { "text": "My Custom Title", "left": "center" }
+}
+```
+
+:::caution
+ECharts option overrides bypass Superset's validation layer. Invalid option keys are silently ignored by ECharts. Overrides that conflict with Superset-generated options (e.g., `series`) may produce unexpected results.
+:::
+
+### Table Chart: Exporting Filtered Data
+
+When the **Search Box** is visible in a Table chart, the **Download** action exports only the rows currently visible after the search filter is applied — not the full underlying dataset. This matches the visual output and is intentional. To export the full dataset regardless of search state, use the **Download as CSV** option from the chart's three-dot menu in the dashboard or from the Explore chart toolbar before applying a search filter.
+
 :::resources
 - [Dashboard Customization](https://docs.preset.io/docs/dashboard-customization) - Advanced dashboard styling and layout options
 - [Blog: BI Dashboard Best Practices](https://preset.io/blog/bi-dashboard-best-practices/)
diff --git a/docs/docs/using-superset/embedding.mdx b/docs/docs/using-superset/embedding.mdx
new file mode 100644
index 00000000000..59f561084b6
--- /dev/null
+++ b/docs/docs/using-superset/embedding.mdx
@@ -0,0 +1,130 @@
+{/*
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/}
+
+---
+title: Embedding Superset
+sidebar_position: 6
+---
+
+# Embedding Superset
+
+Superset dashboards can be embedded directly in host applications using the `@superset-ui/embedded-sdk` package.
+
+:::info Prerequisites
+- The `EMBEDDED_SUPERSET` feature flag must be enabled.
+- The embedding domain and allowed origins must be configured by an admin.
+:::
+
+## Quick Start
+
+Install the SDK:
+
+```bash
+npm install @superset-ui/embedded-sdk
+```
+
+Embed a dashboard:
+
+```javascript
+import { embedDashboard } from '@superset-ui/embedded-sdk';
+
+embedDashboard({
+  id: 'dashboard-uuid-here',          // from Dashboard → Embed
+  supersetDomain: 'https://superset.example.com',
+  mountPoint: document.getElementById('superset-container'),
+  fetchGuestToken: () => fetchTokenFromYourBackend(),
+  dashboardUiConfig: {
+    hideTitle: true,
+    filters: { expanded: false },
+  },
+});
+```
+
+`fetchGuestToken` must return a **guest token** obtained from your server by calling Superset's `/api/v1/security/guest_token/` endpoint with a service account. Do not call this endpoint from client-side code.
+
+---
+
+## Callbacks
+
+### `resolvePermalinkUrl`
+
+When a user copies a permalink from an embedded dashboard, Superset generates a URL on its own domain. In an embedded context this URL is usually not meaningful to the host application's users — the dashboard is rendered inside the host app, not at the Superset URL.
+
+The `resolvePermalinkUrl` callback lets the host app intercept permalink generation and return a URL on the host domain instead:
+
+```javascript
+embedDashboard({
+  id: 'my-dashboard-uuid',
+  supersetDomain: 'https://superset.example.com',
+  mountPoint: document.getElementById('superset-container'),
+  fetchGuestToken: () => fetchGuestToken(),
+  /**
+   * Called when Superset generates a permalink.
+   * @param {Object} args - { key: string } — the permalink key
+   * @returns {string | null} - your host URL, or null to use Superset's default
+   */
+  resolvePermalinkUrl: ({ key }) => {
+    return `https://myapp.example.com/dashboard?permalink=${key}`;
+  },
+});
+```
+
+If the callback returns `null` or is not provided, Superset uses its own permalink URL as a fallback.
+
+---
+
+## Feature Flags for Embedded Mode
+
+### `DISABLE_EMBEDDED_SUPERSET_LOGOUT`
+
+Hides the logout button when Superset is embedded in a host application. This is useful when the host application manages the session lifecycle and you do not want users to accidentally log out of the embedded Superset session:
+
+```python
+# superset_config.py
+FEATURE_FLAGS = {
+    "EMBEDDED_SUPERSET": True,
+    "DISABLE_EMBEDDED_SUPERSET_LOGOUT": True,
+}
+```
+
+When enabled, the **Logout** menu item is removed from the user avatar dropdown in the embedded view. The session can still be invalidated server-side by revoking the guest token.
+
+### `EMBEDDED_SUPERSET`
+
+Must be `True` to enable the embedded SDK and the guest token endpoint. Without this flag, `embedDashboard` will fail to load.
+
+---
+
+## URL Parameters
+
+The following URL parameters can be passed through the `urlParams` option in `dashboardUiConfig` or appended to the embedded iframe URL:
+
+| Parameter | Values | Effect |
+|-----------|--------|--------|
+| `standalone` | `0`, `1`, `2`, `3` | `0`: normal; `1`: hide nav; `2`: hide nav + title; `3`: hide nav + title + tabs |
+| `show_filters` | `0`, `1` | Show or hide the native filter bar |
+| `expand_filters` | `0`, `1` | Start with filter bar expanded or collapsed |
+
+---
+
+## Security Notes
+
+- **Guest tokens expire** — their lifetime is controlled by the `GUEST_TOKEN_JWT_EXP_SECONDS` config (default: 5 minutes). Refresh tokens before they expire using a token refresh mechanism in your host app.
+- **Row-level security** — pass `rls` rules in the guest token request to restrict which rows are visible to the embedded user.
+- **Allowed domains** — restrict which host origins can embed a dashboard by setting **Allowed Domains** per-dashboard in the *Embed* settings modal. Superset checks the request's `Referer` header against this list before serving the embedded view; an empty list allows any origin, so configure this explicitly for production.
diff --git a/docs/docs/using-superset/exploring-data.mdx b/docs/docs/using-superset/exploring-data.mdx
index 0cc812382aa..8d83a0c2c63 100644
--- a/docs/docs/using-superset/exploring-data.mdx
+++ b/docs/docs/using-superset/exploring-data.mdx
@@ -329,6 +329,27 @@ various options in this section, refer to the
 Lastly, save your chart as Tutorial Resample and add it to the Tutorial Dashboard. Go to the
 tutorial dashboard to see the four charts side by side and compare the different outputs.
 
+### SQL Lab Tips
+
+**Schema and table browser**: The left-side table browser uses a collapsible treeview — click a schema to expand its tables, and click a table to see its columns and sample data inline. This makes navigating large schemas much faster than the previous flat list.
+
+**Find in editor**: Press **Ctrl+F** (or **Cmd+F** on Mac) to open the Monaco find/replace widget inside the SQL editor without leaving the editor.
+
+**Resizable panels**: The dividers between the SQL editor, schema browser, and results pane are draggable. Adjust them to match your workflow and screen size.
+
+**Dialect-aware Format SQL**: The **Format SQL** button applies the SQL dialect of the currently selected database — Trino, Presto, MySQL, PostgreSQL, etc. — rather than a generic formatter. Switch to a different database in the toolbar and re-format to get dialect-specific output. Jinja template syntax (`{{ }}`, `{% %}`) is preserved during formatting and will not cause format errors.
+
+### Time Range Natural Language Expressions
+
+The **Custom** time range picker accepts natural language expressions alongside specific dates:
+
+- **Relative**: `Last 7 days`, `Last month`, `Last quarter`, `Last year`
+- **Anchored**: `previous calendar week`, `previous calendar month`
+- **"First of" expressions**: `first day of this week`, `first day of this month`, `first day of this quarter`, `first day of this year`, `first week of this year`
+- **Offsets**: `30 days ago`, `1 year ago`, `next week`
+
+These expressions are evaluated at query time, so saved charts always display data relative to the current date.
+
 :::resources
 - [Chart Walkthroughs](https://docs.preset.io/docs/chart-walkthroughs) - Detailed guides for most chart types
 - [Blog: Why Apache ECharts is the Future of Apache Superset](https://preset.io/blog/2021-4-1-why-echarts/)
diff --git a/docs/docs/using-superset/using-ai-with-superset.mdx b/docs/docs/using-superset/using-ai-with-superset.mdx
index 3969042bcd2..67becfd9482 100644
--- a/docs/docs/using-superset/using-ai-with-superset.mdx
+++ b/docs/docs/using-superset/using-ai-with-superset.mdx
@@ -56,8 +56,8 @@ Ask your AI assistant to browse what's available in your Superset instance:
 Describe the visualization you want and AI creates it for you:
 
 - **Create charts from natural language** -- describe what you want to see and AI picks the right chart type, metrics, and dimensions
-- **Preview before saving** -- AI generates a preview so you can review before committing
-- **Modify existing charts** -- update filters, change chart types, add metrics
+- **Preview before saving** -- `generate_chart` defaults to `save_chart=False`, showing the chart in Explore before it's committed. Ask AI to save once you're satisfied.
+- **Modify existing charts** -- `update_chart` also supports preview mode so you can review changes before saving
 - **Get Explore links** -- open any chart in Superset's Explore view for further refinement
 
 **Example prompts:**
@@ -195,27 +195,59 @@ Ask your admin for the MCP server URL and any authentication tokens you need.
 
 ## Available Tools Reference
 
+### Exploration & Discovery
+
 | Tool | Description |
 |------|-------------|
 | `health_check` | Verify the MCP server is running and connected |
 | `get_instance_info` | Get instance statistics (dataset, chart, dashboard counts) |
 | `get_schema` | Discover available charts, datasets, and dashboards with schema info |
+
+### Datasets
+
+| Tool | Description |
+|------|-------------|
 | `list_datasets` | List datasets with filtering and search |
 | `get_dataset_info` | Get dataset metadata (columns, metrics, filters) |
+| `create_virtual_dataset` | Create a virtual dataset from a SQL query |
+
+### Charts
+
+| Tool | Description |
+|------|-------------|
 | `list_charts` | List charts with filtering and search |
 | `get_chart_info` | Get chart metadata and configuration |
 | `get_chart_data` | Retrieve chart data (JSON, CSV, or Excel) |
 | `get_chart_preview` | Generate a chart preview (URL, ASCII, table, or Vega-Lite) |
-| `generate_chart` | Create a new chart from a specification |
-| `update_chart` | Modify an existing chart's configuration |
+| `get_chart_type_schema` | Get the configuration schema for a chart type |
+| `generate_chart` | Create a new chart from a specification (defaults to preview mode — review before saving) |
+| `update_chart` | Modify an existing chart's configuration (pass `generate_preview=False` to persist immediately instead of returning a preview URL) |
 | `update_chart_preview` | Update a cached chart preview without saving |
+| `generate_explore_link` | Generate an Explore URL for interactive visualization |
+
+### Dashboards
+
+| Tool | Description |
+|------|-------------|
 | `list_dashboards` | List dashboards with filtering and search |
 | `get_dashboard_info` | Get dashboard metadata and layout |
 | `generate_dashboard` | Create a new dashboard with specified charts |
 | `add_chart_to_existing_dashboard` | Add a chart to an existing dashboard |
+
+### SQL
+
+| Tool | Description |
+|------|-------------|
 | `execute_sql` | Run a SQL query with RBAC enforcement |
+| `save_sql_query` | Persist a SQL query to SQL Lab's saved queries |
 | `open_sql_lab_with_context` | Open SQL Lab with a pre-populated query |
-| `generate_explore_link` | Generate an Explore URL for interactive visualization |
+
+### Databases
+
+| Tool | Description |
+|------|-------------|
+| `list_databases` | List configured database connections |
+| `get_database_info` | Get details about a specific database connection |
 
 ---
 
diff --git a/docs/package.json b/docs/package.json
index 6261bc5b1e0..496a26b0b49 100644
--- a/docs/package.json
+++ b/docs/package.json
@@ -40,13 +40,13 @@
     "version:remove:components": "node scripts/manage-versions.mjs remove components"
   },
   "dependencies": {
-    "@ant-design/icons": "^6.1.0",
-    "@docusaurus/core": "3.9.2",
-    "@docusaurus/faster": "^3.9.2",
-    "@docusaurus/plugin-client-redirects": "3.9.2",
-    "@docusaurus/preset-classic": "3.9.2",
-    "@docusaurus/theme-live-codeblock": "^3.9.2",
-    "@docusaurus/theme-mermaid": "^3.9.2",
+    "@ant-design/icons": "^6.1.1",
+    "@docusaurus/core": "^3.10.0",
+    "@docusaurus/faster": "^3.10.0",
+    "@docusaurus/plugin-client-redirects": "^3.10.0",
+    "@docusaurus/preset-classic": "3.10.0",
+    "@docusaurus/theme-live-codeblock": "^3.10.0",
+    "@docusaurus/theme-mermaid": "^3.10.0",
     "@emotion/core": "^11.0.0",
     "@emotion/react": "^11.13.3",
     "@emotion/styled": "^11.14.1",
@@ -67,12 +67,12 @@
     "@storybook/preview-api": "^8.6.18",
     "@storybook/theming": "^8.6.15",
     "@superset-ui/core": "^0.20.4",
-    "@swc/core": "^1.15.17",
-    "antd": "^6.3.2",
-    "baseline-browser-mapping": "^2.10.7",
-    "caniuse-lite": "^1.0.30001780",
-    "docusaurus-plugin-openapi-docs": "^4.6.0",
-    "docusaurus-theme-openapi-docs": "^4.6.0",
+    "@swc/core": "^1.15.30",
+    "antd": "^6.3.6",
+    "baseline-browser-mapping": "^2.10.20",
+    "caniuse-lite": "^1.0.30001790",
+    "docusaurus-plugin-openapi-docs": "^5.0.1",
+    "docusaurus-theme-openapi-docs": "^5.0.1",
     "js-yaml": "^4.1.1",
     "js-yaml-loader": "^1.2.2",
     "json-bigint": "^1.0.0",
@@ -86,28 +86,28 @@
     "remark-import-partial": "^0.0.2",
     "reselect": "^5.1.1",
     "storybook": "^8.6.18",
-    "swagger-ui-react": "^5.32.0",
+    "swagger-ui-react": "^5.32.4",
     "swc-loader": "^0.2.7",
     "tinycolor2": "^1.4.2",
     "unist-util-visit": "^5.1.0"
   },
   "devDependencies": {
-    "@docusaurus/module-type-aliases": "^3.9.1",
-    "@docusaurus/tsconfig": "^3.9.2",
+    "@docusaurus/module-type-aliases": "^3.10.0",
+    "@docusaurus/tsconfig": "^3.10.0",
     "@eslint/js": "^9.39.2",
     "@types/js-yaml": "^4.0.9",
     "@types/react": "^19.1.8",
     "@typescript-eslint/eslint-plugin": "^8.52.0",
-    "@typescript-eslint/parser": "^8.56.1",
+    "@typescript-eslint/parser": "^8.59.0",
     "eslint": "^9.39.2",
     "eslint-config-prettier": "^10.1.8",
     "eslint-plugin-prettier": "^5.5.5",
     "eslint-plugin-react": "^7.37.5",
-    "globals": "^17.4.0",
-    "prettier": "^3.8.1",
-    "typescript": "~5.9.3",
-    "typescript-eslint": "^8.57.1",
-    "webpack": "^5.105.4"
+    "globals": "^17.5.0",
+    "prettier": "^3.8.3",
+    "typescript": "~6.0.3",
+    "typescript-eslint": "^8.59.0",
+    "webpack": "^5.106.2"
   },
   "browserslist": {
     "production": [
@@ -124,7 +124,8 @@
   "resolutions": {
     "react-redux": "^9.2.0",
     "@reduxjs/toolkit": "^2.5.0",
-    "baseline-browser-mapping": "^2.9.19"
+    "baseline-browser-mapping": "^2.9.19",
+    "webpackbar": "^7.0.0"
   },
   "packageManager": "yarn@1.22.22+sha1.ac34549e6aa8e7ead463a7407e1c7390f61a6610"
 }
diff --git a/docs/scripts/fix-openapi-spec.py b/docs/scripts/fix-openapi-spec.py
index f2609b38c33..dc850a143ef 100644
--- a/docs/scripts/fix-openapi-spec.py
+++ b/docs/scripts/fix-openapi-spec.py
@@ -129,6 +129,30 @@ def add_missing_schemas(spec: dict[str, Any]) -> tuple[dict[str, Any], list[str]
         }
         fixed.append("DashboardColorsConfigUpdateSchema")
 
+    # DashboardChartCustomizationsConfigUpdateSchema (dashboards/schemas.py)
+    if "DashboardChartCustomizationsConfigUpdateSchema" not in schemas:
+        schemas["DashboardChartCustomizationsConfigUpdateSchema"] = {
+            "type": "object",
+            "properties": {
+                "deleted": {
+                    "type": "array",
+                    "items": {"type": "string"},
+                    "description": "List of deleted chart customization IDs.",
+                },
+                "modified": {
+                    "type": "array",
+                    "items": {"type": "object"},
+                    "description": "List of modified chart customizations.",
+                },
+                "reordered": {
+                    "type": "array",
+                    "items": {"type": "string"},
+                    "description": "List of chart customization IDs in new order.",
+                },
+            },
+        }
+        fixed.append("DashboardChartCustomizationsConfigUpdateSchema")
+
     # FormatQueryPayloadSchema - based on superset/sqllab/schemas.py
     if "FormatQueryPayloadSchema" not in schemas:
         schemas["FormatQueryPayloadSchema"] = {
@@ -295,6 +319,7 @@ TAG_DESCRIPTIONS = {
     "Security Roles": "Manage security roles and their permissions.",
     "Security Users": "Manage user accounts.",
     "Tags": "Organize assets with tags.",
+    "Themes": "Manage UI themes for customizing Superset's appearance.",
     "User": "User profile and preferences.",
 }
 
diff --git a/docs/static/feature-flags.json b/docs/static/feature-flags.json
index 5d7a86994f1..516115ac0ae 100644
--- a/docs/static/feature-flags.json
+++ b/docs/static/feature-flags.json
@@ -51,6 +51,12 @@
         "lifecycle": "development",
         "description": "Enable Superset extensions for custom functionality without modifying core"
       },
+      {
+        "name": "FAB_API_KEY_ENABLED",
+        "default": false,
+        "lifecycle": "development",
+        "description": "Enable API key authentication via FAB SecurityManager When enabled, users can create/manage API keys in the User Info page"
+      },
       {
         "name": "GRANULAR_EXPORT_CONTROLS",
         "default": false,
diff --git a/docs/static/img/logos/hifadih.png b/docs/static/img/logos/hifadih.png
new file mode 100644
index 00000000000..d2923053f99
Binary files /dev/null and b/docs/static/img/logos/hifadih.png differ
diff --git a/docs/static/resources/openapi.json b/docs/static/resources/openapi.json
index 4fa850bd838..75f9d322656 100644
--- a/docs/static/resources/openapi.json
+++ b/docs/static/resources/openapi.json
@@ -276,7 +276,8 @@
               "",
               "opacityLow",
               "opacityMedium",
-              "opacityHigh"
+              "opacityHigh",
+              null
             ],
             "nullable": true,
             "type": "string"
@@ -980,15 +981,7 @@
       "ChartDataDatasource": {
         "properties": {
           "id": {
-            "description": "Datasource id/uuid",
-            "oneOf": [
-              {
-                "type": "integer"
-              },
-              {
-                "type": "string"
-              }
-            ]
+            "description": "Datasource id or uuid"
           },
           "type": {
             "description": "Datasource type",
@@ -1009,6 +1002,14 @@
       },
       "ChartDataExtras": {
         "properties": {
+          "column_order": {
+            "description": "Ordered list of column names for result ordering. Used to preserve user's column reordering (including mixed dimension columns and metrics)",
+            "items": {
+              "type": "string"
+            },
+            "nullable": true,
+            "type": "array"
+          },
           "having": {
             "description": "HAVING clause to be added to aggregate queries using AND operator.",
             "type": "string"
@@ -1055,12 +1056,18 @@
               "1969-12-28T00:00:00Z/P1W",
               "1969-12-29T00:00:00Z/P1W",
               "P1W/1970-01-03T00:00:00Z",
-              "P1W/1970-01-04T00:00:00Z"
+              "P1W/1970-01-04T00:00:00Z",
+              null
             ],
             "example": "P1D",
             "nullable": true,
             "type": "string"
           },
+          "transpile_to_dialect": {
+            "description": "If true, WHERE/HAVING clauses will be transpiled to the target database dialect using SQLGlot.",
+            "nullable": true,
+            "type": "boolean"
+          },
           "where": {
             "description": "WHERE clause to be added to queries using AND operator.",
             "type": "string"
@@ -1095,6 +1102,7 @@
               "LIKE",
               "NOT LIKE",
               "ILIKE",
+              "NOT ILIKE",
               "IS NULL",
               "IS NOT NULL",
               "IN",
@@ -1466,6 +1474,12 @@
             "nullable": true,
             "type": "string"
           },
+          "group_others_when_limit_reached": {
+            "default": false,
+            "description": "When true, groups remaining series into an 'Others' category when series limit is reached. Prevents incomplete data.",
+            "nullable": true,
+            "type": "boolean"
+          },
           "groupby": {
             "description": "Columns by which to group the query. This field is deprecated, use `columns` instead.",
             "items": {},
@@ -1537,7 +1551,8 @@
               "samples",
               "timegrains",
               "post_processed",
-              "drill_detail"
+              "drill_detail",
+              null
             ],
             "nullable": true
           },
@@ -1669,6 +1684,12 @@
             },
             "type": "array"
           },
+          "detected_currency": {
+            "default": null,
+            "description": "Detected ISO 4217 currency code when AUTO mode is used. Returns the currency code if all filtered data contains a single currency or null if multiple currencies are present.",
+            "nullable": true,
+            "type": "string"
+          },
           "error": {
             "description": "Error",
             "nullable": true,
@@ -1683,8 +1704,14 @@
             "description": "Is the result cached",
             "type": "boolean"
           },
+          "queried_dttm": {
+            "description": "UTC timestamp when the query was executed (ISO 8601 format)",
+            "nullable": true,
+            "type": "string"
+          },
           "query": {
-            "description": "The executed query statement",
+            "description": "The executed query statement. May be absent when validation errors occur.",
+            "nullable": true,
             "type": "string"
           },
           "rejected_filters": {
@@ -1727,7 +1754,7 @@
           "cache_timeout",
           "cached_dttm",
           "is_cached",
-          "query"
+          "queried_dttm"
         ],
         "type": "object"
       },
@@ -1745,125 +1772,12 @@
       },
       "ChartDataRestApi.get": {
         "properties": {
-          "cache_timeout": {
-            "nullable": true,
-            "type": "integer"
-          },
-          "certification_details": {
-            "nullable": true,
-            "type": "string"
-          },
-          "certified_by": {
-            "nullable": true,
-            "type": "string"
-          },
-          "changed_on_delta_humanized": {
-            "readOnly": true
-          },
-          "dashboards": {
-            "$ref": "#/components/schemas/ChartDataRestApi.get.Dashboard"
-          },
-          "description": {
-            "nullable": true,
-            "type": "string"
-          },
           "id": {
             "type": "integer"
-          },
-          "is_managed_externally": {
-            "type": "boolean"
-          },
-          "owners": {
-            "$ref": "#/components/schemas/ChartDataRestApi.get.User"
-          },
-          "params": {
-            "nullable": true,
-            "type": "string"
-          },
-          "query_context": {
-            "nullable": true,
-            "type": "string"
-          },
-          "slice_name": {
-            "maxLength": 250,
-            "nullable": true,
-            "type": "string"
-          },
-          "tags": {
-            "$ref": "#/components/schemas/ChartDataRestApi.get.Tag"
-          },
-          "thumbnail_url": {
-            "readOnly": true
-          },
-          "url": {
-            "readOnly": true
-          },
-          "viz_type": {
-            "maxLength": 250,
-            "nullable": true,
-            "type": "string"
           }
         },
         "type": "object"
       },
-      "ChartDataRestApi.get.Dashboard": {
-        "properties": {
-          "dashboard_title": {
-            "maxLength": 500,
-            "nullable": true,
-            "type": "string"
-          },
-          "id": {
-            "type": "integer"
-          },
-          "json_metadata": {
-            "nullable": true,
-            "type": "string"
-          }
-        },
-        "type": "object"
-      },
-      "ChartDataRestApi.get.Tag": {
-        "properties": {
-          "id": {
-            "type": "integer"
-          },
-          "name": {
-            "maxLength": 250,
-            "nullable": true,
-            "type": "string"
-          },
-          "type": {
-            "enum": [
-              1,
-              2,
-              3,
-              4
-            ]
-          }
-        },
-        "type": "object"
-      },
-      "ChartDataRestApi.get.User": {
-        "properties": {
-          "first_name": {
-            "maxLength": 64,
-            "type": "string"
-          },
-          "id": {
-            "type": "integer"
-          },
-          "last_name": {
-            "maxLength": 64,
-            "type": "string"
-          }
-        },
-        "required": [
-          "first_name",
-          "last_name"
-        ],
-        "type": "object"
-      },
       "ChartDataRestApi.get_list": {
         "properties": {
           "cache_timeout": {
@@ -2202,6 +2116,11 @@
             "minLength": 1,
             "type": "string"
           },
+          "uuid": {
+            "format": "uuid",
+            "nullable": true,
+            "type": "string"
+          },
           "viz_type": {
             "description": "The type of chart visualization used.",
             "example": [
@@ -2257,7 +2176,8 @@
               "dataset",
               "query",
               "saved_query",
-              "view"
+              "view",
+              null
             ],
             "nullable": true,
             "type": "string"
@@ -2311,6 +2231,11 @@
             },
             "type": "array"
           },
+          "uuid": {
+            "format": "uuid",
+            "nullable": true,
+            "type": "string"
+          },
           "viz_type": {
             "description": "The type of chart visualization used.",
             "example": [
@@ -2568,127 +2493,97 @@
         },
         "type": "object"
       },
-      "ChartRestApi.get": {
+      "ChartGetResponseSchema": {
         "properties": {
           "cache_timeout": {
-            "nullable": true,
-            "type": "integer"
+            "type": "string"
           },
           "certification_details": {
-            "nullable": true,
             "type": "string"
           },
           "certified_by": {
-            "nullable": true,
             "type": "string"
           },
           "changed_on_delta_humanized": {
-            "readOnly": true
+            "type": "string"
           },
           "dashboards": {
-            "$ref": "#/components/schemas/ChartRestApi.get.Dashboard"
+            "items": {
+              "$ref": "#/components/schemas/Dashboard"
+            },
+            "type": "array"
+          },
+          "datasource_id": {
+            "type": "integer"
+          },
+          "datasource_name_text": {
+            "readOnly": true
+          },
+          "datasource_type": {
+            "type": "string"
+          },
+          "datasource_url": {
+            "readOnly": true
+          },
+          "datasource_uuid": {
+            "format": "uuid",
+            "type": "string"
           },
           "description": {
-            "nullable": true,
             "type": "string"
           },
           "id": {
+            "description": "The id of the chart.",
             "type": "integer"
           },
           "is_managed_externally": {
             "type": "boolean"
           },
           "owners": {
-            "$ref": "#/components/schemas/ChartRestApi.get.User"
+            "items": {
+              "$ref": "#/components/schemas/User"
+            },
+            "type": "array"
           },
           "params": {
-            "nullable": true,
             "type": "string"
           },
           "query_context": {
-            "nullable": true,
             "type": "string"
           },
           "slice_name": {
-            "maxLength": 250,
-            "nullable": true,
             "type": "string"
           },
           "tags": {
-            "$ref": "#/components/schemas/ChartRestApi.get.Tag"
+            "items": {
+              "$ref": "#/components/schemas/Tag"
+            },
+            "type": "array"
           },
           "thumbnail_url": {
-            "readOnly": true
+            "type": "string"
           },
           "url": {
-            "readOnly": true
+            "type": "string"
+          },
+          "uuid": {
+            "format": "uuid",
+            "type": "string"
           },
           "viz_type": {
-            "maxLength": 250,
-            "nullable": true,
             "type": "string"
           }
         },
         "type": "object"
       },
-      "ChartRestApi.get.Dashboard": {
-        "properties": {
-          "dashboard_title": {
-            "maxLength": 500,
-            "nullable": true,
-            "type": "string"
-          },
-          "id": {
-            "type": "integer"
-          },
-          "json_metadata": {
-            "nullable": true,
-            "type": "string"
-          }
-        },
-        "type": "object"
-      },
-      "ChartRestApi.get.Tag": {
+      "ChartRestApi.get": {
         "properties": {
           "id": {
             "type": "integer"
-          },
-          "name": {
-            "maxLength": 250,
-            "nullable": true,
-            "type": "string"
-          },
-          "type": {
-            "enum": [
-              1,
-              2,
-              3,
-              4
-            ]
           }
         },
         "type": "object"
       },
-      "ChartRestApi.get.User": {
-        "properties": {
-          "first_name": {
-            "maxLength": 64,
-            "type": "string"
-          },
-          "id": {
-            "type": "integer"
-          },
-          "last_name": {
-            "maxLength": 64,
-            "type": "string"
-          }
-        },
-        "required": [
-          "first_name",
-          "last_name"
-        ],
-        "type": "object"
-      },
       "ChartRestApi.get_list": {
         "properties": {
           "cache_timeout": {
@@ -3027,6 +2922,11 @@
             "minLength": 1,
             "type": "string"
           },
+          "uuid": {
+            "format": "uuid",
+            "nullable": true,
+            "type": "string"
+          },
           "viz_type": {
             "description": "The type of chart visualization used.",
             "example": [
@@ -3082,7 +2982,8 @@
               "dataset",
               "query",
               "saved_query",
-              "view"
+              "view",
+              null
             ],
             "nullable": true,
             "type": "string"
@@ -3136,6 +3037,11 @@
             },
             "type": "array"
           },
+          "uuid": {
+            "format": "uuid",
+            "nullable": true,
+            "type": "string"
+          },
           "viz_type": {
             "description": "The type of chart visualization used.",
             "example": [
@@ -3316,6 +3222,41 @@
         },
         "type": "object"
       },
+      "CurrentUserPutSchema": {
+        "properties": {
+          "first_name": {
+            "description": "The current user's first name",
+            "maxLength": 64,
+            "minLength": 1,
+            "type": "string"
+          },
+          "last_name": {
+            "description": "The current user's last name",
+            "maxLength": 64,
+            "minLength": 1,
+            "type": "string"
+          },
+          "password": {
+            "description": "The current user's password for authentication",
+            "type": "string"
+          }
+        },
+        "type": "object"
+      },
+      "Dashboard": {
+        "properties": {
+          "dashboard_title": {
+            "type": "string"
+          },
+          "id": {
+            "type": "integer"
+          },
+          "json_metadata": {
+            "type": "string"
+          }
+        },
+        "type": "object"
+      },
       "DashboardCacheScreenshotResponseSchema": {
         "properties": {
           "cache_key": {
@@ -3397,6 +3338,9 @@
             },
             "type": "array"
           },
+          "currency_code_column": {
+            "type": "string"
+          },
           "database": {
             "$ref": "#/components/schemas/Database"
           },
@@ -3525,7 +3469,7 @@
             "type": "string"
           },
           "changed_by": {
-            "$ref": "#/components/schemas/User"
+            "$ref": "#/components/schemas/User1"
           },
           "changed_by_name": {
             "type": "string"
@@ -3545,7 +3489,7 @@
             "type": "array"
           },
           "created_by": {
-            "$ref": "#/components/schemas/User"
+            "$ref": "#/components/schemas/User1"
           },
           "created_on_delta_humanized": {
             "type": "string"
@@ -3554,6 +3498,12 @@
             "description": "Override CSS for the dashboard.",
             "type": "string"
           },
+          "custom_tags": {
+            "items": {
+              "$ref": "#/components/schemas/Tag1"
+            },
+            "type": "array"
+          },
           "dashboard_title": {
             "description": "A title for the dashboard.",
             "type": "string"
@@ -3571,7 +3521,7 @@
           },
           "owners": {
             "items": {
-              "$ref": "#/components/schemas/User"
+              "$ref": "#/components/schemas/User1"
             },
             "type": "array"
           },
@@ -3593,16 +3543,29 @@
           },
           "tags": {
             "items": {
-              "$ref": "#/components/schemas/Tag"
+              "$ref": "#/components/schemas/Tag1"
             },
             "type": "array"
           },
+          "theme": {
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/Theme"
+              }
+            ],
+            "nullable": true
+          },
           "thumbnail_url": {
             "nullable": true,
             "type": "string"
           },
           "url": {
             "type": "string"
+          },
+          "uuid": {
+            "format": "uuid",
+            "nullable": true,
+            "type": "string"
           }
         },
         "type": "object"
@@ -3622,6 +3585,11 @@
             "nullable": true,
             "type": "string"
           },
+          "chartStates": {
+            "description": "Chart-level state for stateful tables (column order, sorting, filtering)",
+            "nullable": true,
+            "type": "object"
+          },
           "dataMask": {
             "description": "Data mask used for native filter state",
             "nullable": true,
@@ -3880,6 +3848,16 @@
             "minLength": 1,
             "nullable": true,
             "type": "string"
+          },
+          "theme_id": {
+            "description": "Theme ID for the dashboard",
+            "nullable": true,
+            "type": "integer"
+          },
+          "uuid": {
+            "format": "uuid",
+            "nullable": true,
+            "type": "string"
           }
         },
         "type": "object"
@@ -3961,6 +3939,42 @@
               "type": "integer"
             },
             "type": "array"
+          },
+          "theme_id": {
+            "description": "Theme ID for the dashboard",
+            "nullable": true,
+            "type": "integer"
+          },
+          "uuid": {
+            "format": "uuid",
+            "nullable": true,
+            "type": "string"
+          }
+        },
+        "type": "object"
+      },
+      "DashboardScreenshotPostSchema": {
+        "properties": {
+          "activeTabs": {
+            "description": "A list representing active tabs.",
+            "items": {
+              "type": "string"
+            },
+            "type": "array"
+          },
+          "anchor": {
+            "description": "A string representing the anchor.",
+            "type": "string"
+          },
+          "dataMask": {
+            "additionalProperties": {},
+            "description": "An object representing the data mask.",
+            "type": "object"
+          },
+          "urlParams": {
+            "description": "A list of tuples, each containing two strings.",
+            "items": {},
+            "type": "array"
           }
         },
         "type": "object"
@@ -4333,6 +4347,11 @@
           "changed_on_delta_humanized": {
             "readOnly": true
           },
+          "configuration_method": {
+            "maxLength": 255,
+            "nullable": true,
+            "type": "string"
+          },
           "created_by": {
             "$ref": "#/components/schemas/DatabaseRestApi.get_list.User1"
           },
@@ -5067,6 +5086,12 @@
             "minLength": 1,
             "type": "string"
           },
+          "datetime_format": {
+            "maxLength": 100,
+            "minLength": 1,
+            "nullable": true,
+            "type": "string"
+          },
           "description": {
             "nullable": true,
             "type": "string"
@@ -5170,6 +5195,21 @@
         ],
         "type": "object"
       },
+      "DatasetMetricCurrencyPut": {
+        "properties": {
+          "symbol": {
+            "maxLength": 128,
+            "minLength": 1,
+            "type": "string"
+          },
+          "symbolPosition": {
+            "maxLength": 128,
+            "minLength": 1,
+            "type": "string"
+          }
+        },
+        "type": "object"
+      },
       "DatasetMetricRestApi.get": {
         "properties": {
           "id": {
@@ -5205,10 +5245,12 @@
       "DatasetMetricsPut": {
         "properties": {
           "currency": {
-            "maxLength": 128,
-            "minLength": 1,
-            "nullable": true,
-            "type": "string"
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/DatasetMetricCurrencyPut"
+              }
+            ],
+            "nullable": true
           },
           "d3format": {
             "maxLength": 128,
@@ -5342,8 +5384,7 @@
             "type": "boolean"
           },
           "cache_timeout": {
-            "nullable": true,
-            "type": "integer"
+            "readOnly": true
           },
           "catalog": {
             "maxLength": 256,
@@ -5378,6 +5419,11 @@
           "created_on_humanized": {
             "readOnly": true
           },
+          "currency_code_column": {
+            "maxLength": 250,
+            "nullable": true,
+            "type": "string"
+          },
           "database": {
             "$ref": "#/components/schemas/DatasetRestApi.get.Database"
           },
@@ -5480,6 +5526,11 @@
           "url": {
             "readOnly": true
           },
+          "uuid": {
+            "format": "uuid",
+            "nullable": true,
+            "type": "string"
+          },
           "verbose_map": {
             "readOnly": true
           }
@@ -5506,6 +5557,11 @@
           },
           "id": {
             "type": "integer"
+          },
+          "uuid": {
+            "format": "uuid",
+            "nullable": true,
+            "type": "string"
           }
         },
         "required": [
@@ -5793,6 +5849,11 @@
           },
           "id": {
             "type": "integer"
+          },
+          "uuid": {
+            "format": "uuid",
+            "nullable": true,
+            "type": "string"
           }
         },
         "required": [
@@ -5887,6 +5948,15 @@
             "maxLength": 250,
             "minLength": 1,
             "type": "string"
+          },
+          "template_params": {
+            "nullable": true,
+            "type": "string"
+          },
+          "uuid": {
+            "format": "uuid",
+            "nullable": true,
+            "type": "string"
           }
         },
         "required": [
@@ -5917,6 +5987,12 @@
             },
             "type": "array"
           },
+          "currency_code_column": {
+            "maxLength": 250,
+            "minLength": 0,
+            "nullable": true,
+            "type": "string"
+          },
           "database_id": {
             "type": "integer"
           },
@@ -6003,6 +6079,11 @@
           "template_params": {
             "nullable": true,
             "type": "string"
+          },
+          "uuid": {
+            "format": "uuid",
+            "nullable": true,
+            "type": "string"
           }
         },
         "type": "object"
@@ -6090,7 +6171,7 @@
             "type": "array"
           },
           "changed_by": {
-            "$ref": "#/components/schemas/User1"
+            "$ref": "#/components/schemas/User2"
           },
           "changed_on": {
             "format": "date-time",
@@ -6214,10 +6295,6 @@
             "nullable": true,
             "type": "boolean"
           },
-          "json": {
-            "nullable": true,
-            "type": "boolean"
-          },
           "queryLimit": {
             "nullable": true,
             "type": "integer"
@@ -6404,6 +6481,31 @@
         ],
         "type": "object"
       },
+      "FormatQueryPayloadSchema": {
+        "properties": {
+          "database_id": {
+            "description": "The database id",
+            "nullable": true,
+            "type": "integer"
+          },
+          "engine": {
+            "nullable": true,
+            "type": "string"
+          },
+          "sql": {
+            "type": "string"
+          },
+          "template_params": {
+            "description": "The SQL query template params as JSON string",
+            "nullable": true,
+            "type": "string"
+          }
+        },
+        "required": [
+          "sql"
+        ],
+        "type": "object"
+      },
       "GetFavStarIdsSchema": {
         "properties": {
           "result": {
@@ -6459,6 +6561,290 @@
         ],
         "type": "object"
       },
+      "GroupApi.get": {
+        "properties": {
+          "description": {
+            "maxLength": 512,
+            "nullable": true,
+            "type": "string"
+          },
+          "id": {
+            "type": "integer"
+          },
+          "label": {
+            "maxLength": 150,
+            "nullable": true,
+            "type": "string"
+          },
+          "name": {
+            "maxLength": 100,
+            "type": "string"
+          },
+          "roles": {
+            "$ref": "#/components/schemas/GroupApi.get.Role"
+          },
+          "users": {
+            "$ref": "#/components/schemas/GroupApi.get.User"
+          }
+        },
+        "required": [
+          "name"
+        ],
+        "type": "object"
+      },
+      "GroupApi.get.Role": {
+        "properties": {
+          "id": {
+            "type": "integer"
+          },
+          "name": {
+            "maxLength": 64,
+            "type": "string"
+          }
+        },
+        "required": [
+          "name"
+        ],
+        "type": "object"
+      },
+      "GroupApi.get.User": {
+        "properties": {
+          "id": {
+            "type": "integer"
+          },
+          "username": {
+            "maxLength": 128,
+            "type": "string"
+          }
+        },
+        "required": [
+          "username"
+        ],
+        "type": "object"
+      },
+      "GroupApi.get_list": {
+        "properties": {
+          "description": {
+            "maxLength": 512,
+            "nullable": true,
+            "type": "string"
+          },
+          "id": {
+            "type": "integer"
+          },
+          "label": {
+            "maxLength": 150,
+            "nullable": true,
+            "type": "string"
+          },
+          "name": {
+            "maxLength": 100,
+            "type": "string"
+          },
+          "roles": {
+            "$ref": "#/components/schemas/GroupApi.get_list.Role"
+          },
+          "users": {
+            "$ref": "#/components/schemas/GroupApi.get_list.User"
+          }
+        },
+        "required": [
+          "name"
+        ],
+        "type": "object"
+      },
+      "GroupApi.get_list.Role": {
+        "properties": {
+          "id": {
+            "type": "integer"
+          },
+          "name": {
+            "maxLength": 64,
+            "type": "string"
+          }
+        },
+        "required": [
+          "name"
+        ],
+        "type": "object"
+      },
+      "GroupApi.get_list.User": {
+        "properties": {
+          "id": {
+            "type": "integer"
+          },
+          "username": {
+            "maxLength": 128,
+            "type": "string"
+          }
+        },
+        "required": [
+          "username"
+        ],
+        "type": "object"
+      },
+      "GroupApi.post": {
+        "properties": {
+          "description": {
+            "description": "Group description",
+            "maxLength": 512,
+            "minLength": 0,
+            "nullable": true,
+            "type": "string"
+          },
+          "label": {
+            "description": "Group label",
+            "maxLength": 150,
+            "minLength": 0,
+            "nullable": true,
+            "type": "string"
+          },
+          "name": {
+            "description": "Group name",
+            "maxLength": 100,
+            "minLength": 1,
+            "type": "string"
+          },
+          "roles": {
+            "description": "Group roles",
+            "items": {
+              "type": "integer"
+            },
+            "type": "array"
+          },
+          "users": {
+            "description": "Group users",
+            "items": {
+              "type": "integer"
+            },
+            "type": "array"
+          }
+        },
+        "required": [
+          "name"
+        ],
+        "type": "object"
+      },
+      "GroupApi.put": {
+        "properties": {
+          "description": {
+            "description": "Group description",
+            "maxLength": 512,
+            "minLength": 0,
+            "nullable": true,
+            "type": "string"
+          },
+          "label": {
+            "description": "Group label",
+            "maxLength": 150,
+            "minLength": 0,
+            "nullable": true,
+            "type": "string"
+          },
+          "name": {
+            "description": "Group name",
+            "maxLength": 100,
+            "minLength": 1,
+            "type": "string"
+          },
+          "roles": {
+            "description": "Group roles",
+            "items": {
+              "type": "integer"
+            },
+            "type": "array"
+          },
+          "users": {
+            "description": "Group users",
+            "items": {
+              "type": "integer"
+            },
+            "type": "array"
+          }
+        },
+        "type": "object"
+      },
+      "GroupPostSchema": {
+        "properties": {
+          "description": {
+            "description": "Group description",
+            "maxLength": 512,
+            "minLength": 0,
+            "nullable": true,
+            "type": "string"
+          },
+          "label": {
+            "description": "Group label",
+            "maxLength": 150,
+            "minLength": 0,
+            "nullable": true,
+            "type": "string"
+          },
+          "name": {
+            "description": "Group name",
+            "maxLength": 100,
+            "minLength": 1,
+            "type": "string"
+          },
+          "roles": {
+            "description": "Group roles",
+            "items": {
+              "type": "integer"
+            },
+            "type": "array"
+          },
+          "users": {
+            "description": "Group users",
+            "items": {
+              "type": "integer"
+            },
+            "type": "array"
+          }
+        },
+        "required": [
+          "name"
+        ],
+        "type": "object"
+      },
+      "GroupPutSchema": {
+        "properties": {
+          "description": {
+            "description": "Group description",
+            "maxLength": 512,
+            "minLength": 0,
+            "nullable": true,
+            "type": "string"
+          },
+          "label": {
+            "description": "Group label",
+            "maxLength": 150,
+            "minLength": 0,
+            "nullable": true,
+            "type": "string"
+          },
+          "name": {
+            "description": "Group name",
+            "maxLength": 100,
+            "minLength": 1,
+            "type": "string"
+          },
+          "roles": {
+            "description": "Group roles",
+            "items": {
+              "type": "integer"
+            },
+            "type": "array"
+          },
+          "users": {
+            "description": "Group users",
+            "items": {
+              "type": "integer"
+            },
+            "type": "array"
+          }
+        },
+        "type": "object"
+      },
       "GuestTokenCreate": {
         "properties": {
           "resources": {
@@ -6474,7 +6860,7 @@
             "type": "array"
           },
           "user": {
-            "$ref": "#/components/schemas/User2"
+            "$ref": "#/components/schemas/User3"
           }
         },
         "required": [
@@ -6504,6 +6890,15 @@
             "nullable": true,
             "type": "integer"
           },
+          "configuration_method": {
+            "default": "sqlalchemy_form",
+            "enum": [
+              "sqlalchemy_form",
+              "dynamic_form",
+              null
+            ],
+            "nullable": true
+          },
           "database_name": {
             "type": "string"
           },
@@ -6593,6 +6988,9 @@
             "additionalProperties": {},
             "type": "object"
           },
+          "per_user_caching": {
+            "type": "boolean"
+          },
           "schema_options": {
             "additionalProperties": {},
             "type": "object"
@@ -6646,21 +7044,28 @@
           "user": {
             "$ref": "#/components/schemas/LogRestApi.get.User"
           },
-          "user_id": {
-            "nullable": true,
-            "type": "integer"
-          }
+          "user_id": {}
         },
         "type": "object"
       },
       "LogRestApi.get.User": {
         "properties": {
-          "username": {
+          "first_name": {
             "maxLength": 64,
             "type": "string"
+          },
+          "last_name": {
+            "maxLength": 64,
+            "type": "string"
+          },
+          "username": {
+            "maxLength": 128,
+            "type": "string"
           }
         },
         "required": [
+          "first_name",
+          "last_name",
           "username"
         ],
         "type": "object"
@@ -6701,21 +7106,28 @@
           "user": {
             "$ref": "#/components/schemas/LogRestApi.get_list.User"
           },
-          "user_id": {
-            "nullable": true,
-            "type": "integer"
-          }
+          "user_id": {}
         },
         "type": "object"
       },
       "LogRestApi.get_list.User": {
         "properties": {
-          "username": {
+          "first_name": {
             "maxLength": 64,
             "type": "string"
+          },
+          "last_name": {
+            "maxLength": 64,
+            "type": "string"
+          },
+          "username": {
+            "maxLength": 128,
+            "type": "string"
           }
         },
         "required": [
+          "first_name",
+          "last_name",
           "username"
         ],
         "type": "object"
@@ -6882,27 +7294,15 @@
       },
       "PermissionViewMenuApi.post": {
         "properties": {
-          "permission_id": {
-            "nullable": true,
-            "type": "integer"
-          },
-          "view_menu_id": {
-            "nullable": true,
-            "type": "integer"
-          }
+          "permission_id": {},
+          "view_menu_id": {}
         },
         "type": "object"
       },
       "PermissionViewMenuApi.put": {
         "properties": {
-          "permission_id": {
-            "nullable": true,
-            "type": "integer"
-          },
-          "view_menu_id": {
-            "nullable": true,
-            "type": "integer"
-          }
+          "permission_id": {},
+          "view_menu_id": {}
         },
         "type": "object"
       },
@@ -7112,7 +7512,7 @@
             "type": "string"
           },
           "user": {
-            "$ref": "#/components/schemas/User"
+            "$ref": "#/components/schemas/User1"
           }
         },
         "type": "object"
@@ -7272,7 +7672,7 @@
       "RLSRestApi.get_list": {
         "properties": {
           "changed_by": {
-            "$ref": "#/components/schemas/User"
+            "$ref": "#/components/schemas/User1"
           },
           "changed_on_delta_humanized": {
             "readOnly": true
@@ -7644,7 +8044,8 @@
             "enum": [
               "Email",
               "Slack",
-              "SlackV2"
+              "SlackV2",
+              "Webhook"
             ],
             "type": "string"
           }
@@ -7896,10 +8297,7 @@
           "changed_on_delta_humanized": {
             "readOnly": true
           },
-          "chart_id": {
-            "nullable": true,
-            "type": "integer"
-          },
+          "chart_id": {},
           "created_by": {
             "$ref": "#/components/schemas/ReportScheduleRestApi.get_list.User1"
           },
@@ -7920,10 +8318,7 @@
           "crontab_humanized": {
             "readOnly": true
           },
-          "dashboard_id": {
-            "nullable": true,
-            "type": "integer"
-          },
+          "dashboard_id": {},
           "description": {
             "nullable": true,
             "type": "string"
@@ -8255,6 +8650,7 @@
               "America/Coral_Harbour",
               "America/Cordoba",
               "America/Costa_Rica",
+              "America/Coyhaique",
               "America/Creston",
               "America/Cuiaba",
               "America/Curacao",
@@ -8807,7 +9203,8 @@
             "enum": [
               "charts",
               "dashboards",
-              "alerts_reports"
+              "alerts_reports",
+              null
             ],
             "nullable": true
           },
@@ -8996,6 +9393,7 @@
               "America/Coral_Harbour",
               "America/Cordoba",
               "America/Costa_Rica",
+              "America/Coyhaique",
               "America/Creston",
               "America/Cuiaba",
               "America/Curacao",
@@ -9511,7 +9909,8 @@
             "description": "Determines when to trigger alert based off value from alert query. Alerts will be triggered with these validator types:\n- Not Null - When the return value is Not NULL, Empty, or 0\n- Operator - When `sql_return_value comparison_operator threshold` is True e.g. `50 <= 75`<br>Supports the comparison operators <, <=, >, >=, ==, and !=",
             "enum": [
               "not null",
-              "operator"
+              "operator",
+              null
             ],
             "nullable": true,
             "type": "string"
@@ -9557,6 +9956,21 @@
         ],
         "type": "object"
       },
+      "RoleGroupPutSchema": {
+        "properties": {
+          "group_ids": {
+            "description": "List of group ids",
+            "items": {
+              "type": "integer"
+            },
+            "type": "array"
+          }
+        },
+        "required": [
+          "group_ids"
+        ],
+        "type": "object"
+      },
       "RolePermissionListSchema": {
         "properties": {
           "id": {
@@ -9831,10 +10245,7 @@
           "database": {
             "$ref": "#/components/schemas/SavedQueryRestApi.get_list.Database"
           },
-          "db_id": {
-            "nullable": true,
-            "type": "integer"
-          },
+          "db_id": {},
           "description": {
             "nullable": true,
             "type": "string"
@@ -9958,10 +10369,7 @@
             "nullable": true,
             "type": "string"
           },
-          "db_id": {
-            "nullable": true,
-            "type": "integer"
-          },
+          "db_id": {},
           "description": {
             "nullable": true,
             "type": "string"
@@ -9998,10 +10406,7 @@
             "nullable": true,
             "type": "string"
           },
-          "db_id": {
-            "nullable": true,
-            "type": "integer"
-          },
+          "db_id": {},
           "description": {
             "nullable": true,
             "type": "string"
@@ -10265,6 +10670,9 @@
             "maxLength": 64,
             "type": "string"
           },
+          "groups": {
+            "$ref": "#/components/schemas/SupersetUserApi.get.Group"
+          },
           "id": {
             "type": "integer"
           },
@@ -10285,7 +10693,7 @@
             "$ref": "#/components/schemas/SupersetUserApi.get.Role"
           },
           "username": {
-            "maxLength": 64,
+            "maxLength": 128,
             "type": "string"
           }
         },
@@ -10297,6 +10705,31 @@
         ],
         "type": "object"
       },
+      "SupersetUserApi.get.Group": {
+        "properties": {
+          "description": {
+            "maxLength": 512,
+            "nullable": true,
+            "type": "string"
+          },
+          "id": {
+            "type": "integer"
+          },
+          "label": {
+            "maxLength": 150,
+            "nullable": true,
+            "type": "string"
+          },
+          "name": {
+            "maxLength": 100,
+            "type": "string"
+          }
+        },
+        "required": [
+          "name"
+        ],
+        "type": "object"
+      },
       "SupersetUserApi.get.Role": {
         "properties": {
           "id": {
@@ -10362,6 +10795,9 @@
             "maxLength": 64,
             "type": "string"
           },
+          "groups": {
+            "$ref": "#/components/schemas/SupersetUserApi.get_list.Group"
+          },
           "id": {
             "type": "integer"
           },
@@ -10382,7 +10818,7 @@
             "$ref": "#/components/schemas/SupersetUserApi.get_list.Role"
           },
           "username": {
-            "maxLength": 64,
+            "maxLength": 128,
             "type": "string"
           }
         },
@@ -10394,6 +10830,31 @@
         ],
         "type": "object"
       },
+      "SupersetUserApi.get_list.Group": {
+        "properties": {
+          "description": {
+            "maxLength": 512,
+            "nullable": true,
+            "type": "string"
+          },
+          "id": {
+            "type": "integer"
+          },
+          "label": {
+            "maxLength": 150,
+            "nullable": true,
+            "type": "string"
+          },
+          "name": {
+            "maxLength": 100,
+            "type": "string"
+          }
+        },
+        "required": [
+          "name"
+        ],
+        "type": "object"
+      },
       "SupersetUserApi.get_list.Role": {
         "properties": {
           "id": {
@@ -10439,6 +10900,13 @@
             "description": "The user's first name",
             "type": "string"
           },
+          "groups": {
+            "description": "The user's roles",
+            "items": {
+              "type": "integer"
+            },
+            "type": "array"
+          },
           "last_name": {
             "description": "The user's last name",
             "type": "string"
@@ -10452,7 +10920,6 @@
             "items": {
               "type": "integer"
             },
-            "minItems": 1,
             "type": "array"
           },
           "username": {
@@ -10467,7 +10934,6 @@
           "first_name",
           "last_name",
           "password",
-          "roles",
           "username"
         ],
         "type": "object"
@@ -10486,6 +10952,13 @@
             "description": "The user's first name",
             "type": "string"
           },
+          "groups": {
+            "description": "The user's roles",
+            "items": {
+              "type": "integer"
+            },
+            "type": "array"
+          },
           "last_name": {
             "description": "The user's last name",
             "type": "string"
@@ -10499,7 +10972,6 @@
             "items": {
               "type": "integer"
             },
-            "minItems": 1,
             "type": "array"
           },
           "username": {
@@ -10817,6 +11289,25 @@
         },
         "type": "object"
       },
+      "Tag1": {
+        "properties": {
+          "id": {
+            "type": "integer"
+          },
+          "name": {
+            "type": "string"
+          },
+          "type": {
+            "enum": [
+              1,
+              2,
+              3,
+              4
+            ]
+          }
+        },
+        "type": "object"
+      },
       "TagGetResponseSchema": {
         "properties": {
           "id": {
@@ -10939,63 +11430,18 @@
       },
       "TagRestApi.get.User1": {
         "properties": {
-          "active": {
-            "nullable": true,
-            "type": "boolean"
-          },
-          "changed_on": {
-            "format": "date-time",
-            "nullable": true,
-            "type": "string"
-          },
-          "created_on": {
-            "format": "date-time",
-            "nullable": true,
-            "type": "string"
-          },
-          "email": {
-            "maxLength": 320,
-            "type": "string"
-          },
-          "fail_login_count": {
-            "nullable": true,
-            "type": "integer"
-          },
           "first_name": {
             "maxLength": 64,
             "type": "string"
           },
-          "id": {
-            "type": "integer"
-          },
-          "last_login": {
-            "format": "date-time",
-            "nullable": true,
-            "type": "string"
-          },
           "last_name": {
             "maxLength": 64,
             "type": "string"
-          },
-          "login_count": {
-            "nullable": true,
-            "type": "integer"
-          },
-          "password": {
-            "maxLength": 256,
-            "nullable": true,
-            "type": "string"
-          },
-          "username": {
-            "maxLength": 64,
-            "type": "string"
           }
         },
         "required": [
-          "email",
           "first_name",
-          "last_name",
-          "username"
+          "last_name"
         ],
         "type": "object"
       },
@@ -11113,7 +11559,7 @@
             "type": "string"
           },
           "created_by": {
-            "$ref": "#/components/schemas/User"
+            "$ref": "#/components/schemas/User1"
           },
           "creator": {
             "type": "string"
@@ -11126,7 +11572,7 @@
           },
           "owners": {
             "items": {
-              "$ref": "#/components/schemas/User1"
+              "$ref": "#/components/schemas/User2"
             },
             "type": "array"
           },
@@ -11169,6 +11615,218 @@
         ],
         "type": "object"
       },
+      "Theme": {
+        "properties": {
+          "id": {
+            "type": "integer"
+          },
+          "json_data": {
+            "type": "string"
+          },
+          "theme_name": {
+            "type": "string"
+          }
+        },
+        "type": "object"
+      },
+      "ThemeRestApi.get": {
+        "properties": {
+          "changed_by": {
+            "$ref": "#/components/schemas/ThemeRestApi.get.User"
+          },
+          "changed_on_delta_humanized": {
+            "readOnly": true
+          },
+          "created_by": {
+            "$ref": "#/components/schemas/ThemeRestApi.get.User1"
+          },
+          "id": {
+            "type": "integer"
+          },
+          "is_system": {
+            "type": "boolean"
+          },
+          "is_system_dark": {
+            "type": "boolean"
+          },
+          "is_system_default": {
+            "type": "boolean"
+          },
+          "json_data": {
+            "nullable": true,
+            "type": "string"
+          },
+          "theme_name": {
+            "maxLength": 250,
+            "nullable": true,
+            "type": "string"
+          },
+          "uuid": {
+            "format": "uuid",
+            "nullable": true,
+            "type": "string"
+          }
+        },
+        "type": "object"
+      },
+      "ThemeRestApi.get.User": {
+        "properties": {
+          "first_name": {
+            "maxLength": 64,
+            "type": "string"
+          },
+          "id": {
+            "type": "integer"
+          },
+          "last_name": {
+            "maxLength": 64,
+            "type": "string"
+          }
+        },
+        "required": [
+          "first_name",
+          "last_name"
+        ],
+        "type": "object"
+      },
+      "ThemeRestApi.get.User1": {
+        "properties": {
+          "first_name": {
+            "maxLength": 64,
+            "type": "string"
+          },
+          "id": {
+            "type": "integer"
+          },
+          "last_name": {
+            "maxLength": 64,
+            "type": "string"
+          }
+        },
+        "required": [
+          "first_name",
+          "last_name"
+        ],
+        "type": "object"
+      },
+      "ThemeRestApi.get_list": {
+        "properties": {
+          "changed_by": {
+            "$ref": "#/components/schemas/ThemeRestApi.get_list.User"
+          },
+          "changed_by_name": {
+            "readOnly": true
+          },
+          "changed_on_delta_humanized": {
+            "readOnly": true
+          },
+          "created_by": {
+            "$ref": "#/components/schemas/ThemeRestApi.get_list.User1"
+          },
+          "created_on": {
+            "format": "date-time",
+            "nullable": true,
+            "type": "string"
+          },
+          "id": {
+            "type": "integer"
+          },
+          "is_system": {
+            "type": "boolean"
+          },
+          "is_system_dark": {
+            "type": "boolean"
+          },
+          "is_system_default": {
+            "type": "boolean"
+          },
+          "json_data": {
+            "nullable": true,
+            "type": "string"
+          },
+          "theme_name": {
+            "maxLength": 250,
+            "nullable": true,
+            "type": "string"
+          },
+          "uuid": {
+            "format": "uuid",
+            "nullable": true,
+            "type": "string"
+          }
+        },
+        "type": "object"
+      },
+      "ThemeRestApi.get_list.User": {
+        "properties": {
+          "first_name": {
+            "maxLength": 64,
+            "type": "string"
+          },
+          "id": {
+            "type": "integer"
+          },
+          "last_name": {
+            "maxLength": 64,
+            "type": "string"
+          }
+        },
+        "required": [
+          "first_name",
+          "last_name"
+        ],
+        "type": "object"
+      },
+      "ThemeRestApi.get_list.User1": {
+        "properties": {
+          "first_name": {
+            "maxLength": 64,
+            "type": "string"
+          },
+          "id": {
+            "type": "integer"
+          },
+          "last_name": {
+            "maxLength": 64,
+            "type": "string"
+          }
+        },
+        "required": [
+          "first_name",
+          "last_name"
+        ],
+        "type": "object"
+      },
+      "ThemeRestApi.post": {
+        "properties": {
+          "json_data": {
+            "type": "string"
+          },
+          "theme_name": {
+            "type": "string"
+          }
+        },
+        "required": [
+          "json_data",
+          "theme_name"
+        ],
+        "type": "object"
+      },
+      "ThemeRestApi.put": {
+        "properties": {
+          "json_data": {
+            "type": "string"
+          },
+          "theme_name": {
+            "type": "string"
+          }
+        },
+        "required": [
+          "json_data",
+          "theme_name"
+        ],
+        "type": "object"
+      },
       "UploadFileMetadata": {
         "properties": {
           "items": {
@@ -11368,9 +12026,6 @@
           },
           "last_name": {
             "type": "string"
-          },
-          "username": {
-            "type": "string"
           }
         },
         "type": "object"
@@ -11380,6 +12035,9 @@
           "first_name": {
             "type": "string"
           },
+          "id": {
+            "type": "integer"
+          },
           "last_name": {
             "type": "string"
           },
@@ -11389,6 +12047,84 @@
         },
         "type": "object"
       },
+      "User3": {
+        "properties": {
+          "first_name": {
+            "type": "string"
+          },
+          "last_name": {
+            "type": "string"
+          },
+          "username": {
+            "type": "string"
+          }
+        },
+        "type": "object"
+      },
+      "UserRegistrationsRestAPI.get": {
+        "properties": {
+          "id": {
+            "type": "integer"
+          }
+        },
+        "type": "object"
+      },
+      "UserRegistrationsRestAPI.get_list": {
+        "properties": {
+          "email": {
+            "maxLength": 320,
+            "type": "string"
+          },
+          "first_name": {
+            "maxLength": 64,
+            "type": "string"
+          },
+          "id": {
+            "type": "integer"
+          },
+          "last_name": {
+            "maxLength": 64,
+            "type": "string"
+          },
+          "registration_date": {
+            "format": "date-time",
+            "nullable": true,
+            "type": "string"
+          },
+          "registration_hash": {
+            "maxLength": 256,
+            "nullable": true,
+            "type": "string"
+          },
+          "username": {
+            "maxLength": 128,
+            "type": "string"
+          }
+        },
+        "required": [
+          "email",
+          "first_name",
+          "last_name",
+          "username"
+        ],
+        "type": "object"
+      },
+      "UserRegistrationsRestAPI.post": {
+        "properties": {
+          "id": {
+            "type": "integer"
+          }
+        },
+        "type": "object"
+      },
+      "UserRegistrationsRestAPI.put": {
+        "properties": {
+          "id": {
+            "type": "integer"
+          }
+        },
+        "type": "object"
+      },
       "UserResponseSchema": {
         "properties": {
           "email": {
@@ -11409,6 +12145,9 @@
           "last_name": {
             "type": "string"
           },
+          "login_count": {
+            "type": "integer"
+          },
           "username": {
             "type": "string"
           }
@@ -11714,6 +12453,19 @@
                       "type": "boolean"
                     },
                     {
+                      "items": {
+                        "anyOf": [
+                          {
+                            "type": "number"
+                          },
+                          {
+                            "type": "string"
+                          },
+                          {
+                            "type": "boolean"
+                          }
+                        ]
+                      },
                       "type": "array"
                     }
                   ]
@@ -11857,39 +12609,6 @@
         },
         "type": "object"
       },
-      "DashboardScreenshotPostSchema": {
-        "type": "object",
-        "properties": {
-          "dataMask": {
-            "type": "object",
-            "description": "An object representing the data mask.",
-            "additionalProperties": true
-          },
-          "activeTabs": {
-            "type": "array",
-            "items": {
-              "type": "string"
-            },
-            "description": "A list representing active tabs."
-          },
-          "anchor": {
-            "type": "string",
-            "description": "A string representing the anchor."
-          },
-          "urlParams": {
-            "type": "array",
-            "items": {
-              "type": "array",
-              "items": {
-                "type": "string"
-              },
-              "minItems": 2,
-              "maxItems": 2
-            },
-            "description": "A list of tuples, each containing two strings."
-          }
-        }
-      },
       "DashboardNativeFiltersConfigUpdateSchema": {
         "type": "object",
         "properties": {
@@ -11959,33 +12678,6 @@
           }
         }
       },
-      "FormatQueryPayloadSchema": {
-        "type": "object",
-        "required": [
-          "sql"
-        ],
-        "properties": {
-          "sql": {
-            "type": "string",
-            "description": "The SQL query to format."
-          },
-          "engine": {
-            "type": "string",
-            "nullable": true,
-            "description": "The database engine."
-          },
-          "database_id": {
-            "type": "integer",
-            "nullable": true,
-            "description": "The database id."
-          },
-          "template_params": {
-            "type": "string",
-            "nullable": true,
-            "description": "The SQL query template params as JSON string."
-          }
-        }
-      },
       "get_slack_channels_schema": {
         "type": "object",
         "properties": {
@@ -12009,6 +12701,32 @@
             "description": "Whether to match channel names exactly."
           }
         }
+      },
+      "DashboardChartCustomizationsConfigUpdateSchema": {
+        "type": "object",
+        "properties": {
+          "deleted": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            },
+            "description": "List of deleted chart customization IDs."
+          },
+          "modified": {
+            "type": "array",
+            "items": {
+              "type": "object"
+            },
+            "description": "List of modified chart customization configurations."
+          },
+          "reordered": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            },
+            "description": "List of chart customization IDs in new order."
+          }
+        }
       }
     },
     "securitySchemes": {
@@ -14185,6 +14903,7 @@
                 "query_context": "string",
                 "query_context_generation": true,
                 "slice_name": "string",
+                "uuid": "550e8400-e29b-41d4-a716-446655440000",
                 "viz_type": [
                   "bar",
                   "area",
@@ -14229,6 +14948,7 @@
                     "query_context": "string",
                     "query_context_generation": true,
                     "slice_name": "string",
+                    "uuid": "550e8400-e29b-41d4-a716-446655440000",
                     "viz_type": [
                       "bar",
                       "area",
@@ -14956,6 +15676,103 @@
         ]
       }
     },
+    "/api/v1/chart/{id_or_uuid}": {
+      "get": {
+        "description": "Get a chart",
+        "parameters": [
+          {
+            "description": "Either the id of the chart, or its uuid",
+            "in": "path",
+            "name": "id_or_uuid",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "content": {
+              "application/json": {
+                "schema": {
+                  "properties": {
+                    "result": {
+                      "$ref": "#/components/schemas/ChartGetResponseSchema"
+                    }
+                  },
+                  "type": "object"
+                },
+                "example": {
+                  "result": {
+                    "cache_timeout": "string",
+                    "certification_details": "string",
+                    "certified_by": "string",
+                    "changed_on_delta_humanized": "string",
+                    "dashboards": [],
+                    "datasource_id": 1,
+                    "datasource_name_text": {},
+                    "datasource_type": "string",
+                    "datasource_url": {},
+                    "datasource_uuid": "550e8400-e29b-41d4-a716-446655440000",
+                    "description": "string",
+                    "id": 1,
+                    "is_managed_externally": true,
+                    "owners": [],
+                    "params": "string",
+                    "query_context": "string",
+                    "slice_name": "string",
+                    "tags": [],
+                    "thumbnail_url": "string",
+                    "url": "string",
+                    "uuid": "550e8400-e29b-41d4-a716-446655440000",
+                    "viz_type": "string"
+                  }
+                }
+              }
+            },
+            "description": "Chart"
+          },
+          "302": {
+            "description": "Redirects to the current digest"
+          },
+          "400": {
+            "$ref": "#/components/responses/400"
+          },
+          "401": {
+            "$ref": "#/components/responses/401"
+          },
+          "404": {
+            "$ref": "#/components/responses/404"
+          }
+        },
+        "security": [
+          {
+            "jwt": []
+          }
+        ],
+        "summary": "Get a chart detail information",
+        "tags": [
+          "Charts"
+        ],
+        "x-codeSamples": [
+          {
+            "lang": "cURL",
+            "label": "cURL",
+            "source": "curl -X GET \"http://localhost:8088/api/v1/chart/{id_or_uuid}\" \\\n  -H \"Authorization: Bearer $ACCESS_TOKEN\""
+          },
+          {
+            "lang": "Python",
+            "label": "Python",
+            "source": "import requests\n\nresponse = requests.get(\n    \"http://localhost:8088/api/v1/chart/{id_or_uuid}\",\n    headers={\"Authorization\": \"Bearer \" + access_token}\n)\nprint(response.json())"
+          },
+          {
+            "lang": "JavaScript",
+            "label": "JavaScript",
+            "source": "const response = await fetch(\n  \"http://localhost:8088/api/v1/chart/{id_or_uuid}\",\n  {\n    headers: {\n      \"Authorization\": `Bearer ${accessToken}`\n    }\n  }\n);\nconst data = await response.json();\nconsole.log(data);"
+          }
+        ]
+      }
+    },
     "/api/v1/chart/{pk}": {
       "delete": {
         "parameters": [
@@ -15030,152 +15847,6 @@
           }
         ]
       },
-      "get": {
-        "description": "Get an item model",
-        "parameters": [
-          {
-            "in": "path",
-            "name": "pk",
-            "required": true,
-            "schema": {
-              "type": "integer"
-            }
-          },
-          {
-            "content": {
-              "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/get_item_schema"
-                }
-              }
-            },
-            "in": "query",
-            "name": "q"
-          }
-        ],
-        "responses": {
-          "200": {
-            "content": {
-              "application/json": {
-                "schema": {
-                  "properties": {
-                    "description_columns": {
-                      "properties": {
-                        "column_name": {
-                          "description": "The description for the column name. Will be translated by babel",
-                          "example": "A Nice description for the column",
-                          "type": "string"
-                        }
-                      },
-                      "type": "object"
-                    },
-                    "id": {
-                      "description": "The item id",
-                      "type": "string"
-                    },
-                    "label_columns": {
-                      "properties": {
-                        "column_name": {
-                          "description": "The label for the column name. Will be translated by babel",
-                          "example": "A Nice label for the column",
-                          "type": "string"
-                        }
-                      },
-                      "type": "object"
-                    },
-                    "result": {
-                      "$ref": "#/components/schemas/ChartRestApi.get"
-                    },
-                    "show_columns": {
-                      "description": "A list of columns",
-                      "items": {
-                        "type": "string"
-                      },
-                      "type": "array"
-                    },
-                    "show_title": {
-                      "description": "A title to render. Will be translated by babel",
-                      "example": "Show Item Details",
-                      "type": "string"
-                    }
-                  },
-                  "type": "object"
-                },
-                "example": {
-                  "description_columns": {
-                    "column_name": "A Nice description for the column"
-                  },
-                  "id": "string",
-                  "label_columns": {
-                    "column_name": "A Nice label for the column"
-                  },
-                  "result": {
-                    "cache_timeout": 1,
-                    "certification_details": "string",
-                    "certified_by": "string",
-                    "changed_on_delta_humanized": {},
-                    "description": "string",
-                    "id": 1,
-                    "is_managed_externally": true,
-                    "params": "string",
-                    "query_context": "string",
-                    "slice_name": "string",
-                    "thumbnail_url": {},
-                    "url": {},
-                    "viz_type": "string"
-                  },
-                  "show_columns": [
-                    "string"
-                  ],
-                  "show_title": "Show Item Details"
-                }
-              }
-            },
-            "description": "Item from Model"
-          },
-          "400": {
-            "$ref": "#/components/responses/400"
-          },
-          "401": {
-            "$ref": "#/components/responses/401"
-          },
-          "404": {
-            "$ref": "#/components/responses/404"
-          },
-          "422": {
-            "$ref": "#/components/responses/422"
-          },
-          "500": {
-            "$ref": "#/components/responses/500"
-          }
-        },
-        "security": [
-          {
-            "jwt": []
-          }
-        ],
-        "summary": "Get a chart detail information",
-        "tags": [
-          "Charts"
-        ],
-        "x-codeSamples": [
-          {
-            "lang": "cURL",
-            "label": "cURL",
-            "source": "curl -X GET \"http://localhost:8088/api/v1/chart/1\" \\\n  -H \"Authorization: Bearer $ACCESS_TOKEN\""
-          },
-          {
-            "lang": "Python",
-            "label": "Python",
-            "source": "import requests\n\nresponse = requests.get(\n    \"http://localhost:8088/api/v1/chart/1\",\n    headers={\"Authorization\": \"Bearer \" + access_token}\n)\nprint(response.json())"
-          },
-          {
-            "lang": "JavaScript",
-            "label": "JavaScript",
-            "source": "const response = await fetch(\n  \"http://localhost:8088/api/v1/chart/1\",\n  {\n    headers: {\n      \"Authorization\": `Bearer ${accessToken}`\n    }\n  }\n);\nconst data = await response.json();\nconsole.log(data);"
-          }
-        ]
-      },
       "put": {
         "parameters": [
           {
@@ -15215,6 +15886,7 @@
                 "tags": [
                   1
                 ],
+                "uuid": "550e8400-e29b-41d4-a716-446655440000",
                 "viz_type": [
                   "bar",
                   "area",
@@ -15259,6 +15931,7 @@
                     "query_context_generation": true,
                     "slice_name": "string",
                     "tags": [],
+                    "uuid": "550e8400-e29b-41d4-a716-446655440000",
                     "viz_type": [
                       "bar",
                       "area",
@@ -16705,59 +17378,17 @@
                 "schema": {
                   "properties": {
                     "count": {
-                      "description": "The total record count on the backend",
-                      "type": "number"
-                    },
-                    "description_columns": {
-                      "properties": {
-                        "column_name": {
-                          "description": "The description for the column name. Will be translated by babel",
-                          "example": "A Nice description for the column",
-                          "type": "string"
-                        }
-                      },
-                      "type": "object"
+                      "type": "integer"
                     },
                     "ids": {
-                      "description": "A list of item ids, useful when you don't know the column id",
                       "items": {
-                        "type": "string"
-                      },
-                      "type": "array"
-                    },
-                    "label_columns": {
-                      "properties": {
-                        "column_name": {
-                          "description": "The label for the column name. Will be translated by babel",
-                          "example": "A Nice label for the column",
-                          "type": "string"
-                        }
-                      },
-                      "type": "object"
-                    },
-                    "list_columns": {
-                      "description": "A list of columns",
-                      "items": {
-                        "type": "string"
-                      },
-                      "type": "array"
-                    },
-                    "list_title": {
-                      "description": "A title to render. Will be translated by babel",
-                      "example": "List Items",
-                      "type": "string"
-                    },
-                    "order_columns": {
-                      "description": "A list of allowed columns to sort",
-                      "items": {
-                        "type": "string"
+                        "type": "integer"
                       },
                       "type": "array"
                     },
                     "result": {
-                      "description": "The result from the get list query",
                       "items": {
-                        "$ref": "#/components/schemas/DashboardRestApi.get_list"
+                        "type": "object"
                       },
                       "type": "array"
                     }
@@ -16765,22 +17396,9 @@
                   "type": "object"
                 },
                 "example": {
-                  "count": 1.0,
-                  "description_columns": {
-                    "column_name": "A Nice description for the column"
-                  },
+                  "count": 1,
                   "ids": [
-                    "string"
-                  ],
-                  "label_columns": {
-                    "column_name": "A Nice label for the column"
-                  },
-                  "list_columns": [
-                    "string"
-                  ],
-                  "list_title": "List Items",
-                  "order_columns": [
-                    "string"
+                    1
                   ],
                   "result": [
                     {}
@@ -16788,7 +17406,7 @@
                 }
               }
             },
-            "description": "Items from Model"
+            "description": "Dashboards"
           },
           "400": {
             "$ref": "#/components/responses/400"
@@ -16853,7 +17471,9 @@
                 "roles": [
                   1
                 ],
-                "slug": "string"
+                "slug": "string",
+                "theme_id": 1,
+                "uuid": "550e8400-e29b-41d4-a716-446655440000"
               }
             }
           },
@@ -16889,7 +17509,9 @@
                     "position_json": "string",
                     "published": true,
                     "roles": [],
-                    "slug": "string"
+                    "slug": "string",
+                    "theme_id": 1,
+                    "uuid": "550e8400-e29b-41d4-a716-446655440000"
                   }
                 }
               }
@@ -17483,6 +18105,7 @@
                     "charts": [],
                     "created_on_delta_humanized": "string",
                     "css": "string",
+                    "custom_tags": [],
                     "dashboard_title": "string",
                     "id": 1,
                     "is_managed_externally": true,
@@ -17493,8 +18116,10 @@
                     "roles": [],
                     "slug": "string",
                     "tags": [],
+                    "theme": {},
                     "thumbnail_url": "string",
-                    "url": "string"
+                    "url": "string",
+                    "uuid": "550e8400-e29b-41d4-a716-446655440000"
                   }
                 }
               }
@@ -18292,7 +18917,9 @@
                 "slug": "string",
                 "tags": [
                   1
-                ]
+                ],
+                "theme_id": 1,
+                "uuid": "550e8400-e29b-41d4-a716-446655440000"
               }
             }
           },
@@ -18333,7 +18960,9 @@
                     "published": true,
                     "roles": [],
                     "slug": "string",
-                    "tags": []
+                    "tags": [],
+                    "theme_id": 1,
+                    "uuid": "550e8400-e29b-41d4-a716-446655440000"
                   }
                 }
               }
@@ -18406,18 +19035,12 @@
                 "$ref": "#/components/schemas/DashboardScreenshotPostSchema"
               },
               "example": {
-                "dataMask": {
-                  "key": "value"
-                },
                 "activeTabs": [
                   "string"
                 ],
                 "anchor": "string",
-                "urlParams": [
-                  [
-                    "string"
-                  ]
-                ]
+                "dataMask": {},
+                "urlParams": []
               }
             }
           }
@@ -18481,6 +19104,106 @@
         ]
       }
     },
+    "/api/v1/dashboard/{pk}/chart_customizations": {
+      "put": {
+        "parameters": [
+          {
+            "in": "path",
+            "name": "pk",
+            "required": true,
+            "schema": {
+              "type": "integer"
+            }
+          }
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/DashboardChartCustomizationsConfigUpdateSchema"
+              },
+              "example": {
+                "deleted": [
+                  "string"
+                ],
+                "modified": [
+                  {}
+                ],
+                "reordered": [
+                  "string"
+                ]
+              }
+            }
+          },
+          "description": "Chart customizations configuration",
+          "required": true
+        },
+        "responses": {
+          "200": {
+            "content": {
+              "application/json": {
+                "schema": {
+                  "properties": {
+                    "result": {
+                      "type": "array"
+                    }
+                  },
+                  "type": "object"
+                },
+                "example": {
+                  "result": []
+                }
+              }
+            },
+            "description": "Dashboard chart customizations updated"
+          },
+          "400": {
+            "$ref": "#/components/responses/400"
+          },
+          "401": {
+            "$ref": "#/components/responses/401"
+          },
+          "403": {
+            "$ref": "#/components/responses/403"
+          },
+          "404": {
+            "$ref": "#/components/responses/404"
+          },
+          "422": {
+            "$ref": "#/components/responses/422"
+          },
+          "500": {
+            "$ref": "#/components/responses/500"
+          }
+        },
+        "security": [
+          {
+            "jwt": []
+          }
+        ],
+        "summary": "Update chart customizations configuration for a dashboard.",
+        "tags": [
+          "Dashboards"
+        ],
+        "x-codeSamples": [
+          {
+            "lang": "cURL",
+            "label": "cURL",
+            "source": "curl -X PUT \"http://localhost:8088/api/v1/dashboard/1/chart_customizations\" \\\n  -H \"Authorization: Bearer $ACCESS_TOKEN\" \\\n  -H \"Content-Type: application/json\" \\\n  -d '{\"key\": \"value\"}'"
+          },
+          {
+            "lang": "Python",
+            "label": "Python",
+            "source": "import requests\n\nresponse = requests.put(\n    \"http://localhost:8088/api/v1/dashboard/1/chart_customizations\",\n    headers={\"Authorization\": \"Bearer \" + access_token},\n    json={\"key\": \"value\"}\n)\nprint(response.json())"
+          },
+          {
+            "lang": "JavaScript",
+            "label": "JavaScript",
+            "source": "const response = await fetch(\n  \"http://localhost:8088/api/v1/dashboard/1/chart_customizations\",\n  {\n    method: \"PUT\",\n    headers: {\n      \"Authorization\": `Bearer ${accessToken}`,\n      \"Content-Type\": \"application/json\"\n    },\n    body: JSON.stringify({ key: \"value\" })\n  }\n);\nconst data = await response.json();\nconsole.log(data);"
+          }
+        ]
+      }
+    },
     "/api/v1/dashboard/{pk}/colors": {
       "put": {
         "parameters": [
@@ -18594,6 +19317,90 @@
         ]
       }
     },
+    "/api/v1/dashboard/{pk}/export_as_example/": {
+      "get": {
+        "description": "Exports a dashboard with its charts and datasets in the example format used by the Superset example loading system. The export includes Parquet data files and YAML configuration files.",
+        "parameters": [
+          {
+            "description": "The dashboard id",
+            "in": "path",
+            "name": "pk",
+            "required": true,
+            "schema": {
+              "type": "integer"
+            }
+          },
+          {
+            "description": "Whether to include Parquet data files",
+            "in": "query",
+            "name": "export_data",
+            "schema": {
+              "default": true,
+              "type": "boolean"
+            }
+          },
+          {
+            "description": "Limit data export to this many rows per dataset",
+            "in": "query",
+            "name": "sample_rows",
+            "schema": {
+              "type": "integer"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "content": {
+              "application/zip": {
+                "schema": {
+                  "format": "binary",
+                  "type": "string"
+                }
+              }
+            },
+            "description": "Example bundle ZIP file"
+          },
+          "401": {
+            "$ref": "#/components/responses/401"
+          },
+          "403": {
+            "$ref": "#/components/responses/403"
+          },
+          "404": {
+            "$ref": "#/components/responses/404"
+          },
+          "500": {
+            "$ref": "#/components/responses/500"
+          }
+        },
+        "security": [
+          {
+            "jwt": []
+          }
+        ],
+        "summary": "Export dashboard as example bundle",
+        "tags": [
+          "Dashboards"
+        ],
+        "x-codeSamples": [
+          {
+            "lang": "cURL",
+            "label": "cURL",
+            "source": "curl -X GET \"http://localhost:8088/api/v1/dashboard/1/export_as_example/\" \\\n  -H \"Authorization: Bearer $ACCESS_TOKEN\""
+          },
+          {
+            "lang": "Python",
+            "label": "Python",
+            "source": "import requests\n\nresponse = requests.get(\n    \"http://localhost:8088/api/v1/dashboard/1/export_as_example/\",\n    headers={\"Authorization\": \"Bearer \" + access_token}\n)\nprint(response.json())"
+          },
+          {
+            "lang": "JavaScript",
+            "label": "JavaScript",
+            "source": "const response = await fetch(\n  \"http://localhost:8088/api/v1/dashboard/1/export_as_example/\",\n  {\n    headers: {\n      \"Authorization\": `Bearer ${accessToken}`\n    }\n  }\n);\nconst data = await response.json();\nconsole.log(data);"
+          }
+        ]
+      }
+    },
     "/api/v1/dashboard/{pk}/favorites/": {
       "delete": {
         "parameters": [
@@ -19422,6 +20229,7 @@
                   "string"
                 ],
                 "anchor": "string",
+                "chartStates": {},
                 "dataMask": {},
                 "urlParams": [
                   {}
@@ -21652,81 +22460,6 @@
         ]
       }
     },
-    "/api/v1/database/{pk}/ssh_tunnel/": {
-      "delete": {
-        "parameters": [
-          {
-            "in": "path",
-            "name": "pk",
-            "required": true,
-            "schema": {
-              "type": "integer"
-            }
-          }
-        ],
-        "responses": {
-          "200": {
-            "content": {
-              "application/json": {
-                "schema": {
-                  "properties": {
-                    "message": {
-                      "type": "string"
-                    }
-                  },
-                  "type": "object"
-                },
-                "example": {
-                  "message": "string"
-                }
-              }
-            },
-            "description": "SSH Tunnel deleted"
-          },
-          "401": {
-            "$ref": "#/components/responses/401"
-          },
-          "403": {
-            "$ref": "#/components/responses/403"
-          },
-          "404": {
-            "$ref": "#/components/responses/404"
-          },
-          "422": {
-            "$ref": "#/components/responses/422"
-          },
-          "500": {
-            "$ref": "#/components/responses/500"
-          }
-        },
-        "security": [
-          {
-            "jwt": []
-          }
-        ],
-        "summary": "Delete a SSH tunnel",
-        "tags": [
-          "Database"
-        ],
-        "x-codeSamples": [
-          {
-            "lang": "cURL",
-            "label": "cURL",
-            "source": "curl -X DELETE \"http://localhost:8088/api/v1/database/1/ssh_tunnel/\" \\\n  -H \"Authorization: Bearer $ACCESS_TOKEN\""
-          },
-          {
-            "lang": "Python",
-            "label": "Python",
-            "source": "import requests\n\nresponse = requests.delete(\n    \"http://localhost:8088/api/v1/database/1/ssh_tunnel/\",\n    headers={\"Authorization\": \"Bearer \" + access_token}\n)\nprint(response.status_code)"
-          },
-          {
-            "lang": "JavaScript",
-            "label": "JavaScript",
-            "source": "const response = await fetch(\n  \"http://localhost:8088/api/v1/database/1/ssh_tunnel/\",\n  {\n    method: \"DELETE\",\n    headers: {\n      \"Authorization\": `Bearer ${accessToken}`\n    }\n  }\n);\nconsole.log(response.status);"
-          }
-        ]
-      }
-    },
     "/api/v1/database/{pk}/sync_permissions/": {
       "post": {
         "parameters": [
@@ -22696,7 +23429,9 @@
                 ],
                 "schema": "string",
                 "sql": "string",
-                "table_name": "string"
+                "table_name": "string",
+                "template_params": "string",
+                "uuid": "550e8400-e29b-41d4-a716-446655440000"
               }
             }
           },
@@ -22730,7 +23465,9 @@
                     "owners": [],
                     "schema": "string",
                     "sql": "string",
-                    "table_name": "string"
+                    "table_name": "string",
+                    "template_params": "string",
+                    "uuid": "550e8400-e29b-41d4-a716-446655440000"
                   }
                 }
               }
@@ -23476,6 +24213,207 @@
         ]
       }
     },
+    "/api/v1/dataset/{id_or_uuid}": {
+      "get": {
+        "description": "Get a dataset by ID",
+        "parameters": [
+          {
+            "description": "Either the id of the dataset, or its uuid",
+            "in": "path",
+            "name": "id_or_uuid",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/get_item_schema"
+                }
+              }
+            },
+            "in": "query",
+            "name": "q"
+          },
+          {
+            "description": "Should Jinja macros from sql, metrics and columns be rendered and included in the response",
+            "in": "query",
+            "name": "include_rendered_sql",
+            "schema": {
+              "type": "boolean"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "content": {
+              "application/json": {
+                "schema": {
+                  "properties": {
+                    "id": {
+                      "description": "The item id",
+                      "type": "string"
+                    },
+                    "result": {
+                      "$ref": "#/components/schemas/DatasetRestApi.get"
+                    }
+                  },
+                  "type": "object"
+                },
+                "example": {
+                  "id": "string",
+                  "result": {
+                    "always_filter_main_dttm": true,
+                    "cache_timeout": {},
+                    "catalog": "string",
+                    "changed_on": "2024-01-15T10:30:00Z",
+                    "changed_on_humanized": {},
+                    "column_formats": {},
+                    "created_on": "2024-01-15T10:30:00Z",
+                    "created_on_humanized": {},
+                    "currency_code_column": "string",
+                    "datasource_name": {},
+                    "datasource_type": {},
+                    "default_endpoint": "string",
+                    "description": "string",
+                    "extra": "string",
+                    "fetch_values_predicate": "string",
+                    "filter_select_enabled": true,
+                    "folders": {},
+                    "granularity_sqla": {},
+                    "id": 1,
+                    "is_managed_externally": true,
+                    "is_sqllab_view": true,
+                    "kind": {},
+                    "main_dttm_col": "string",
+                    "name": {},
+                    "normalize_columns": true,
+                    "offset": 1,
+                    "order_by_choices": {},
+                    "schema": "string",
+                    "select_star": {},
+                    "sql": "string",
+                    "table_name": "string",
+                    "template_params": "string",
+                    "time_grain_sqla": {},
+                    "uid": {},
+                    "url": {},
+                    "uuid": "550e8400-e29b-41d4-a716-446655440000",
+                    "verbose_map": {}
+                  }
+                }
+              }
+            },
+            "description": "Dataset object has been returned."
+          },
+          "400": {
+            "$ref": "#/components/responses/400"
+          },
+          "401": {
+            "$ref": "#/components/responses/401"
+          },
+          "422": {
+            "$ref": "#/components/responses/422"
+          },
+          "500": {
+            "$ref": "#/components/responses/500"
+          }
+        },
+        "security": [
+          {
+            "jwt": []
+          }
+        ],
+        "summary": "Get a dataset",
+        "tags": [
+          "Datasets"
+        ],
+        "x-codeSamples": [
+          {
+            "lang": "cURL",
+            "label": "cURL",
+            "source": "curl -X GET \"http://localhost:8088/api/v1/dataset/{id_or_uuid}\" \\\n  -H \"Authorization: Bearer $ACCESS_TOKEN\""
+          },
+          {
+            "lang": "Python",
+            "label": "Python",
+            "source": "import requests\n\nresponse = requests.get(\n    \"http://localhost:8088/api/v1/dataset/{id_or_uuid}\",\n    headers={\"Authorization\": \"Bearer \" + access_token}\n)\nprint(response.json())"
+          },
+          {
+            "lang": "JavaScript",
+            "label": "JavaScript",
+            "source": "const response = await fetch(\n  \"http://localhost:8088/api/v1/dataset/{id_or_uuid}\",\n  {\n    headers: {\n      \"Authorization\": `Bearer ${accessToken}`\n    }\n  }\n);\nconst data = await response.json();\nconsole.log(data);"
+          }
+        ]
+      }
+    },
+    "/api/v1/dataset/{id_or_uuid}/related_objects": {
+      "get": {
+        "parameters": [
+          {
+            "in": "path",
+            "name": "id_or_uuid",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/DatasetRelatedObjectsResponse"
+                },
+                "example": {
+                  "charts": {},
+                  "dashboards": {}
+                }
+              }
+            },
+            "description": "Query result"
+          },
+          "401": {
+            "$ref": "#/components/responses/401"
+          },
+          "404": {
+            "$ref": "#/components/responses/404"
+          },
+          "500": {
+            "$ref": "#/components/responses/500"
+          }
+        },
+        "security": [
+          {
+            "jwt": []
+          }
+        ],
+        "summary": "Get charts and dashboards count associated to a dataset",
+        "tags": [
+          "Datasets"
+        ],
+        "x-codeSamples": [
+          {
+            "lang": "cURL",
+            "label": "cURL",
+            "source": "curl -X GET \"http://localhost:8088/api/v1/dataset/{id_or_uuid}/related_objects\" \\\n  -H \"Authorization: Bearer $ACCESS_TOKEN\""
+          },
+          {
+            "lang": "Python",
+            "label": "Python",
+            "source": "import requests\n\nresponse = requests.get(\n    \"http://localhost:8088/api/v1/dataset/{id_or_uuid}/related_objects\",\n    headers={\"Authorization\": \"Bearer \" + access_token}\n)\nprint(response.json())"
+          },
+          {
+            "lang": "JavaScript",
+            "label": "JavaScript",
+            "source": "const response = await fetch(\n  \"http://localhost:8088/api/v1/dataset/{id_or_uuid}/related_objects\",\n  {\n    headers: {\n      \"Authorization\": `Bearer ${accessToken}`\n    }\n  }\n);\nconst data = await response.json();\nconsole.log(data);"
+          }
+        ]
+      }
+    },
     "/api/v1/dataset/{pk}": {
       "delete": {
         "parameters": [
@@ -23550,138 +24488,6 @@
           }
         ]
       },
-      "get": {
-        "description": "Get a dataset by ID",
-        "parameters": [
-          {
-            "description": "The dataset ID",
-            "in": "path",
-            "name": "pk",
-            "required": true,
-            "schema": {
-              "type": "integer"
-            }
-          },
-          {
-            "content": {
-              "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/get_item_schema"
-                }
-              }
-            },
-            "in": "query",
-            "name": "q"
-          },
-          {
-            "description": "Should Jinja macros from sql, metrics and columns be rendered and included in the response",
-            "in": "query",
-            "name": "include_rendered_sql",
-            "schema": {
-              "type": "boolean"
-            }
-          }
-        ],
-        "responses": {
-          "200": {
-            "content": {
-              "application/json": {
-                "schema": {
-                  "properties": {
-                    "id": {
-                      "description": "The item id",
-                      "type": "string"
-                    },
-                    "result": {
-                      "$ref": "#/components/schemas/DatasetRestApi.get"
-                    }
-                  },
-                  "type": "object"
-                },
-                "example": {
-                  "id": "string",
-                  "result": {
-                    "always_filter_main_dttm": true,
-                    "cache_timeout": 1,
-                    "catalog": "string",
-                    "changed_on": "2024-01-15T10:30:00Z",
-                    "changed_on_humanized": {},
-                    "column_formats": {},
-                    "created_on": "2024-01-15T10:30:00Z",
-                    "created_on_humanized": {},
-                    "datasource_name": {},
-                    "datasource_type": {},
-                    "default_endpoint": "string",
-                    "description": "string",
-                    "extra": "string",
-                    "fetch_values_predicate": "string",
-                    "filter_select_enabled": true,
-                    "folders": {},
-                    "granularity_sqla": {},
-                    "id": 1,
-                    "is_managed_externally": true,
-                    "is_sqllab_view": true,
-                    "kind": {},
-                    "main_dttm_col": "string",
-                    "name": {},
-                    "normalize_columns": true,
-                    "offset": 1,
-                    "order_by_choices": {},
-                    "schema": "string",
-                    "select_star": {},
-                    "sql": "string",
-                    "table_name": "string",
-                    "template_params": "string",
-                    "time_grain_sqla": {},
-                    "uid": {},
-                    "url": {},
-                    "verbose_map": {}
-                  }
-                }
-              }
-            },
-            "description": "Dataset object has been returned."
-          },
-          "400": {
-            "$ref": "#/components/responses/400"
-          },
-          "401": {
-            "$ref": "#/components/responses/401"
-          },
-          "422": {
-            "$ref": "#/components/responses/422"
-          },
-          "500": {
-            "$ref": "#/components/responses/500"
-          }
-        },
-        "security": [
-          {
-            "jwt": []
-          }
-        ],
-        "summary": "Get a dataset",
-        "tags": [
-          "Datasets"
-        ],
-        "x-codeSamples": [
-          {
-            "lang": "cURL",
-            "label": "cURL",
-            "source": "curl -X GET \"http://localhost:8088/api/v1/dataset/1\" \\\n  -H \"Authorization: Bearer $ACCESS_TOKEN\""
-          },
-          {
-            "lang": "Python",
-            "label": "Python",
-            "source": "import requests\n\nresponse = requests.get(\n    \"http://localhost:8088/api/v1/dataset/1\",\n    headers={\"Authorization\": \"Bearer \" + access_token}\n)\nprint(response.json())"
-          },
-          {
-            "lang": "JavaScript",
-            "label": "JavaScript",
-            "source": "const response = await fetch(\n  \"http://localhost:8088/api/v1/dataset/1\",\n  {\n    headers: {\n      \"Authorization\": `Bearer ${accessToken}`\n    }\n  }\n);\nconst data = await response.json();\nconsole.log(data);"
-          }
-        ]
-      },
       "put": {
         "parameters": [
           {
@@ -23713,6 +24519,7 @@
                 "columns": [
                   {}
                 ],
+                "currency_code_column": "string",
                 "database_id": 1,
                 "default_endpoint": "string",
                 "description": "string",
@@ -23737,7 +24544,8 @@
                 "schema": "string",
                 "sql": "string",
                 "table_name": "string",
-                "template_params": "string"
+                "template_params": "string",
+                "uuid": "550e8400-e29b-41d4-a716-446655440000"
               }
             }
           },
@@ -23766,6 +24574,7 @@
                     "cache_timeout": 1,
                     "catalog": "string",
                     "columns": [],
+                    "currency_code_column": "string",
                     "database_id": 1,
                     "default_endpoint": "string",
                     "description": "string",
@@ -23784,7 +24593,8 @@
                     "schema": "string",
                     "sql": "string",
                     "table_name": "string",
-                    "template_params": "string"
+                    "template_params": "string",
+                    "uuid": "550e8400-e29b-41d4-a716-446655440000"
                   }
                 }
               }
@@ -23923,6 +24733,82 @@
         ]
       }
     },
+    "/api/v1/dataset/{pk}/drill_info/": {
+      "get": {
+        "parameters": [
+          {
+            "description": "The dataset ID",
+            "in": "path",
+            "name": "pk",
+            "required": true,
+            "schema": {
+              "type": "integer"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "content": {
+              "application/json": {
+                "schema": {
+                  "properties": {
+                    "result": {
+                      "type": "object"
+                    }
+                  },
+                  "type": "object"
+                },
+                "example": {
+                  "result": {}
+                }
+              }
+            },
+            "description": "Dataset drill info"
+          },
+          "401": {
+            "$ref": "#/components/responses/401"
+          },
+          "403": {
+            "$ref": "#/components/responses/403"
+          },
+          "404": {
+            "$ref": "#/components/responses/404"
+          },
+          "422": {
+            "$ref": "#/components/responses/422"
+          },
+          "500": {
+            "$ref": "#/components/responses/500"
+          }
+        },
+        "security": [
+          {
+            "jwt": []
+          }
+        ],
+        "summary": "Get dataset drill info",
+        "tags": [
+          "Datasets"
+        ],
+        "x-codeSamples": [
+          {
+            "lang": "cURL",
+            "label": "cURL",
+            "source": "curl -X GET \"http://localhost:8088/api/v1/dataset/1/drill_info/\" \\\n  -H \"Authorization: Bearer $ACCESS_TOKEN\""
+          },
+          {
+            "lang": "Python",
+            "label": "Python",
+            "source": "import requests\n\nresponse = requests.get(\n    \"http://localhost:8088/api/v1/dataset/1/drill_info/\",\n    headers={\"Authorization\": \"Bearer \" + access_token}\n)\nprint(response.json())"
+          },
+          {
+            "lang": "JavaScript",
+            "label": "JavaScript",
+            "source": "const response = await fetch(\n  \"http://localhost:8088/api/v1/dataset/1/drill_info/\",\n  {\n    headers: {\n      \"Authorization\": `Bearer ${accessToken}`\n    }\n  }\n);\nconst data = await response.json();\nconsole.log(data);"
+          }
+        ]
+      }
+    },
     "/api/v1/dataset/{pk}/metric/{metric_id}": {
       "delete": {
         "parameters": [
@@ -24083,71 +24969,6 @@
         ]
       }
     },
-    "/api/v1/dataset/{pk}/related_objects": {
-      "get": {
-        "parameters": [
-          {
-            "in": "path",
-            "name": "pk",
-            "required": true,
-            "schema": {
-              "type": "integer"
-            }
-          }
-        ],
-        "responses": {
-          "200": {
-            "content": {
-              "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/DatasetRelatedObjectsResponse"
-                },
-                "example": {
-                  "charts": {},
-                  "dashboards": {}
-                }
-              }
-            },
-            "description": "Query result"
-          },
-          "401": {
-            "$ref": "#/components/responses/401"
-          },
-          "404": {
-            "$ref": "#/components/responses/404"
-          },
-          "500": {
-            "$ref": "#/components/responses/500"
-          }
-        },
-        "security": [
-          {
-            "jwt": []
-          }
-        ],
-        "summary": "Get charts and dashboards count associated to a dataset",
-        "tags": [
-          "Datasets"
-        ],
-        "x-codeSamples": [
-          {
-            "lang": "cURL",
-            "label": "cURL",
-            "source": "curl -X GET \"http://localhost:8088/api/v1/dataset/1/related_objects\" \\\n  -H \"Authorization: Bearer $ACCESS_TOKEN\""
-          },
-          {
-            "lang": "Python",
-            "label": "Python",
-            "source": "import requests\n\nresponse = requests.get(\n    \"http://localhost:8088/api/v1/dataset/1/related_objects\",\n    headers={\"Authorization\": \"Bearer \" + access_token}\n)\nprint(response.json())"
-          },
-          {
-            "lang": "JavaScript",
-            "label": "JavaScript",
-            "source": "const response = await fetch(\n  \"http://localhost:8088/api/v1/dataset/1/related_objects\",\n  {\n    headers: {\n      \"Authorization\": `Bearer ${accessToken}`\n    }\n  }\n);\nconst data = await response.json();\nconsole.log(data);"
-          }
-        ]
-      }
-    },
     "/api/v1/datasource/{datasource_type}/{datasource_id}/column/{column_name}/values/": {
       "get": {
         "parameters": [
@@ -24263,6 +25084,159 @@
         ]
       }
     },
+    "/api/v1/datasource/{datasource_type}/{datasource_id}/validate_expression/": {
+      "post": {
+        "parameters": [
+          {
+            "description": "The type of datasource",
+            "in": "path",
+            "name": "datasource_type",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "description": "The id of the datasource",
+            "in": "path",
+            "name": "datasource_id",
+            "required": true,
+            "schema": {
+              "type": "integer"
+            }
+          }
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "properties": {
+                  "clause": {
+                    "description": "SQL clause type for filter expressions",
+                    "enum": [
+                      "WHERE",
+                      "HAVING"
+                    ],
+                    "type": "string"
+                  },
+                  "expression": {
+                    "description": "The SQL expression to validate",
+                    "type": "string"
+                  },
+                  "expression_type": {
+                    "default": "where",
+                    "description": "The type of SQL expression",
+                    "enum": [
+                      "column",
+                      "metric",
+                      "where",
+                      "having"
+                    ],
+                    "type": "string"
+                  }
+                },
+                "required": [
+                  "expression"
+                ],
+                "type": "object"
+              },
+              "example": {
+                "clause": "WHERE",
+                "expression": "string",
+                "expression_type": "column"
+              }
+            }
+          },
+          "required": true
+        },
+        "responses": {
+          "200": {
+            "content": {
+              "application/json": {
+                "schema": {
+                  "properties": {
+                    "result": {
+                      "description": "Empty array for success, errors for failure",
+                      "items": {
+                        "properties": {
+                          "end_column": {
+                            "type": "integer"
+                          },
+                          "line_number": {
+                            "type": "integer"
+                          },
+                          "message": {
+                            "type": "string"
+                          },
+                          "start_column": {
+                            "type": "integer"
+                          }
+                        },
+                        "type": "object"
+                      },
+                      "type": "array"
+                    }
+                  },
+                  "type": "object"
+                },
+                "example": {
+                  "result": [
+                    {
+                      "end_column": 1,
+                      "line_number": 1,
+                      "message": "string",
+                      "start_column": 1
+                    }
+                  ]
+                }
+              }
+            },
+            "description": "Validation result"
+          },
+          "400": {
+            "$ref": "#/components/responses/400"
+          },
+          "401": {
+            "$ref": "#/components/responses/401"
+          },
+          "403": {
+            "$ref": "#/components/responses/403"
+          },
+          "404": {
+            "$ref": "#/components/responses/404"
+          },
+          "500": {
+            "$ref": "#/components/responses/500"
+          }
+        },
+        "security": [
+          {
+            "jwt": []
+          }
+        ],
+        "summary": "Validate a SQL expression against a datasource",
+        "tags": [
+          "Datasources"
+        ],
+        "x-codeSamples": [
+          {
+            "lang": "cURL",
+            "label": "cURL",
+            "source": "curl -X POST \"http://localhost:8088/api/v1/datasource/{datasource_type}/{datasource_id}/validate_expression/\" \\\n  -H \"Authorization: Bearer $ACCESS_TOKEN\" \\\n  -H \"Content-Type: application/json\" \\\n  -d '{\"key\": \"value\"}'"
+          },
+          {
+            "lang": "Python",
+            "label": "Python",
+            "source": "import requests\n\nresponse = requests.post(\n    \"http://localhost:8088/api/v1/datasource/{datasource_type}/{datasource_id}/validate_expression/\",\n    headers={\"Authorization\": \"Bearer \" + access_token},\n    json={\"key\": \"value\"}\n)\nprint(response.json())"
+          },
+          {
+            "lang": "JavaScript",
+            "label": "JavaScript",
+            "source": "const response = await fetch(\n  \"http://localhost:8088/api/v1/datasource/{datasource_type}/{datasource_id}/validate_expression/\",\n  {\n    method: \"POST\",\n    headers: {\n      \"Authorization\": `Bearer ${accessToken}`,\n      \"Content-Type\": \"application/json\"\n    },\n    body: JSON.stringify({ key: \"value\" })\n  }\n);\nconst data = await response.json();\nconsole.log(data);"
+          }
+        ]
+      }
+    },
     "/api/v1/embedded_dashboard/{uuid}": {
       "get": {
         "parameters": [
@@ -25377,7 +26351,7 @@
                     "json": "string",
                     "referrer": "string",
                     "slice_id": 1,
-                    "user_id": 1
+                    "user_id": {}
                   },
                   "show_columns": [
                     "string"
@@ -25455,6 +26429,7 @@
                     "is_active": true,
                     "is_anonymous": true,
                     "last_name": "string",
+                    "login_count": 1,
                     "username": "string"
                   }
                 }
@@ -25466,6 +26441,11 @@
             "$ref": "#/components/responses/401"
           }
         },
+        "security": [
+          {
+            "jwt": []
+          }
+        ],
         "summary": "Get the user object",
         "tags": [
           "Current User"
@@ -25487,6 +26467,85 @@
             "source": "const response = await fetch(\n  \"http://localhost:8088/api/v1/me/\",\n  {\n    headers: {\n      \"Authorization\": `Bearer ${accessToken}`\n    }\n  }\n);\nconst data = await response.json();\nconsole.log(data);"
           }
         ]
+      },
+      "put": {
+        "description": "Updates the current user's first name, last name, or password.",
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/CurrentUserPutSchema"
+              },
+              "example": {
+                "first_name": "string",
+                "last_name": "string",
+                "password": "string"
+              }
+            }
+          },
+          "required": true
+        },
+        "responses": {
+          "200": {
+            "content": {
+              "application/json": {
+                "schema": {
+                  "properties": {
+                    "result": {
+                      "$ref": "#/components/schemas/UserResponseSchema"
+                    }
+                  },
+                  "type": "object"
+                },
+                "example": {
+                  "result": {
+                    "email": "string",
+                    "first_name": "string",
+                    "id": 1,
+                    "is_active": true,
+                    "is_anonymous": true,
+                    "last_name": "string",
+                    "login_count": 1,
+                    "username": "string"
+                  }
+                }
+              }
+            },
+            "description": "User updated successfully"
+          },
+          "400": {
+            "$ref": "#/components/responses/400"
+          },
+          "401": {
+            "$ref": "#/components/responses/401"
+          }
+        },
+        "security": [
+          {
+            "jwt": []
+          }
+        ],
+        "summary": "Update the current user",
+        "tags": [
+          "Current User"
+        ],
+        "x-codeSamples": [
+          {
+            "lang": "cURL",
+            "label": "cURL",
+            "source": "curl -X PUT \"http://localhost:8088/api/v1/me/\" \\\n  -H \"Authorization: Bearer $ACCESS_TOKEN\" \\\n  -H \"Content-Type: application/json\" \\\n  -d '{\"key\": \"value\"}'"
+          },
+          {
+            "lang": "Python",
+            "label": "Python",
+            "source": "import requests\n\nresponse = requests.put(\n    \"http://localhost:8088/api/v1/me/\",\n    headers={\"Authorization\": \"Bearer \" + access_token},\n    json={\"key\": \"value\"}\n)\nprint(response.json())"
+          },
+          {
+            "lang": "JavaScript",
+            "label": "JavaScript",
+            "source": "const response = await fetch(\n  \"http://localhost:8088/api/v1/me/\",\n  {\n    method: \"PUT\",\n    headers: {\n      \"Authorization\": `Bearer ${accessToken}`,\n      \"Content-Type\": \"application/json\"\n    },\n    body: JSON.stringify({ key: \"value\" })\n  }\n);\nconst data = await response.json();\nconsole.log(data);"
+          }
+        ]
       }
     },
     "/api/v1/me/roles/": {
@@ -25512,6 +26571,7 @@
                     "is_active": true,
                     "is_anonymous": true,
                     "last_name": "string",
+                    "login_count": 1,
                     "username": "string"
                   }
                 }
@@ -25523,6 +26583,11 @@
             "$ref": "#/components/responses/401"
           }
         },
+        "security": [
+          {
+            "jwt": []
+          }
+        ],
         "summary": "Get the user roles",
         "tags": [
           "Current User"
@@ -28582,7 +29647,7 @@
               },
               "example": {
                 "catalog": "string",
-                "db_id": 1,
+                "db_id": {},
                 "description": "string",
                 "extra_json": "string",
                 "label": "string",
@@ -28614,7 +29679,7 @@
                   "id": "string",
                   "result": {
                     "catalog": "string",
-                    "db_id": 1,
+                    "db_id": {},
                     "description": "string",
                     "extra_json": "string",
                     "label": "string",
@@ -29339,7 +30404,7 @@
               },
               "example": {
                 "catalog": "string",
-                "db_id": 1,
+                "db_id": {},
                 "description": "string",
                 "extra_json": "string",
                 "label": "string",
@@ -29367,7 +30432,7 @@
                 "example": {
                   "result": {
                     "catalog": "string",
-                    "db_id": 1,
+                    "db_id": {},
                     "description": "string",
                     "extra_json": "string",
                     "label": "string",
@@ -29480,6 +30545,672 @@
         ]
       }
     },
+    "/api/v1/security/groups/": {
+      "get": {
+        "description": "Get a list of models",
+        "parameters": [
+          {
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/get_list_schema"
+                }
+              }
+            },
+            "in": "query",
+            "name": "q"
+          }
+        ],
+        "responses": {
+          "200": {
+            "content": {
+              "application/json": {
+                "schema": {
+                  "properties": {
+                    "count": {
+                      "description": "The total record count on the backend",
+                      "type": "number"
+                    },
+                    "description_columns": {
+                      "properties": {
+                        "column_name": {
+                          "description": "The description for the column name. Will be translated by babel",
+                          "example": "A Nice description for the column",
+                          "type": "string"
+                        }
+                      },
+                      "type": "object"
+                    },
+                    "ids": {
+                      "description": "A list of item ids, useful when you don't know the column id",
+                      "items": {
+                        "type": "string"
+                      },
+                      "type": "array"
+                    },
+                    "label_columns": {
+                      "properties": {
+                        "column_name": {
+                          "description": "The label for the column name. Will be translated by babel",
+                          "example": "A Nice label for the column",
+                          "type": "string"
+                        }
+                      },
+                      "type": "object"
+                    },
+                    "list_columns": {
+                      "description": "A list of columns",
+                      "items": {
+                        "type": "string"
+                      },
+                      "type": "array"
+                    },
+                    "list_title": {
+                      "description": "A title to render. Will be translated by babel",
+                      "example": "List Items",
+                      "type": "string"
+                    },
+                    "order_columns": {
+                      "description": "A list of allowed columns to sort",
+                      "items": {
+                        "type": "string"
+                      },
+                      "type": "array"
+                    },
+                    "result": {
+                      "description": "The result from the get list query",
+                      "items": {
+                        "$ref": "#/components/schemas/GroupApi.get_list"
+                      },
+                      "type": "array"
+                    }
+                  },
+                  "type": "object"
+                },
+                "example": {
+                  "count": 1.0,
+                  "description_columns": {
+                    "column_name": "A Nice description for the column"
+                  },
+                  "ids": [
+                    "string"
+                  ],
+                  "label_columns": {
+                    "column_name": "A Nice label for the column"
+                  },
+                  "list_columns": [
+                    "string"
+                  ],
+                  "list_title": "List Items",
+                  "order_columns": [
+                    "string"
+                  ],
+                  "result": [
+                    {}
+                  ]
+                }
+              }
+            },
+            "description": "Items from Model"
+          },
+          "400": {
+            "$ref": "#/components/responses/400"
+          },
+          "401": {
+            "$ref": "#/components/responses/401"
+          },
+          "422": {
+            "$ref": "#/components/responses/422"
+          },
+          "500": {
+            "$ref": "#/components/responses/500"
+          }
+        },
+        "security": [
+          {
+            "jwt": []
+          }
+        ],
+        "tags": [
+          "Security Groups"
+        ],
+        "operationId": "get_security_groups",
+        "summary": "Get security groups",
+        "x-codeSamples": [
+          {
+            "lang": "cURL",
+            "label": "cURL",
+            "source": "curl -X GET \"http://localhost:8088/api/v1/security/groups/\" \\\n  -H \"Authorization: Bearer $ACCESS_TOKEN\""
+          },
+          {
+            "lang": "Python",
+            "label": "Python",
+            "source": "import requests\n\nresponse = requests.get(\n    \"http://localhost:8088/api/v1/security/groups/\",\n    headers={\"Authorization\": \"Bearer \" + access_token}\n)\nprint(response.json())"
+          },
+          {
+            "lang": "JavaScript",
+            "label": "JavaScript",
+            "source": "const response = await fetch(\n  \"http://localhost:8088/api/v1/security/groups/\",\n  {\n    headers: {\n      \"Authorization\": `Bearer ${accessToken}`\n    }\n  }\n);\nconst data = await response.json();\nconsole.log(data);"
+          }
+        ]
+      },
+      "post": {
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/GroupPostSchema"
+              },
+              "example": {
+                "description": "string",
+                "label": "string",
+                "name": "string",
+                "roles": [
+                  1
+                ],
+                "users": [
+                  1
+                ]
+              }
+            }
+          },
+          "description": "Model schema",
+          "required": true
+        },
+        "responses": {
+          "201": {
+            "content": {
+              "application/json": {
+                "schema": {
+                  "properties": {
+                    "result": {
+                      "$ref": "#/components/schemas/GroupPostSchema"
+                    }
+                  },
+                  "type": "object"
+                },
+                "example": {
+                  "result": {
+                    "description": "string",
+                    "label": "string",
+                    "name": "string",
+                    "roles": [],
+                    "users": []
+                  }
+                }
+              }
+            },
+            "description": "Group created"
+          },
+          "400": {
+            "$ref": "#/components/responses/400"
+          },
+          "401": {
+            "$ref": "#/components/responses/401"
+          },
+          "422": {
+            "$ref": "#/components/responses/422"
+          },
+          "500": {
+            "$ref": "#/components/responses/500"
+          }
+        },
+        "security": [
+          {
+            "jwt": []
+          }
+        ],
+        "tags": [
+          "Security Groups"
+        ],
+        "operationId": "create_security_groups",
+        "summary": "Create security groups",
+        "x-codeSamples": [
+          {
+            "lang": "cURL",
+            "label": "cURL",
+            "source": "curl -X POST \"http://localhost:8088/api/v1/security/groups/\" \\\n  -H \"Authorization: Bearer $ACCESS_TOKEN\" \\\n  -H \"Content-Type: application/json\" \\\n  -d '{\"key\": \"value\"}'"
+          },
+          {
+            "lang": "Python",
+            "label": "Python",
+            "source": "import requests\n\nresponse = requests.post(\n    \"http://localhost:8088/api/v1/security/groups/\",\n    headers={\"Authorization\": \"Bearer \" + access_token},\n    json={\"key\": \"value\"}\n)\nprint(response.json())"
+          },
+          {
+            "lang": "JavaScript",
+            "label": "JavaScript",
+            "source": "const response = await fetch(\n  \"http://localhost:8088/api/v1/security/groups/\",\n  {\n    method: \"POST\",\n    headers: {\n      \"Authorization\": `Bearer ${accessToken}`,\n      \"Content-Type\": \"application/json\"\n    },\n    body: JSON.stringify({ key: \"value\" })\n  }\n);\nconst data = await response.json();\nconsole.log(data);"
+          }
+        ]
+      }
+    },
+    "/api/v1/security/groups/_info": {
+      "get": {
+        "description": "Get metadata information about this API resource",
+        "parameters": [
+          {
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/get_info_schema"
+                }
+              }
+            },
+            "in": "query",
+            "name": "q"
+          }
+        ],
+        "responses": {
+          "200": {
+            "content": {
+              "application/json": {
+                "schema": {
+                  "properties": {
+                    "add_columns": {
+                      "type": "object"
+                    },
+                    "edit_columns": {
+                      "type": "object"
+                    },
+                    "filters": {
+                      "properties": {
+                        "column_name": {
+                          "items": {
+                            "properties": {
+                              "name": {
+                                "description": "The filter name. Will be translated by babel",
+                                "type": "string"
+                              },
+                              "operator": {
+                                "description": "The filter operation key to use on list filters",
+                                "type": "string"
+                              }
+                            },
+                            "type": "object"
+                          },
+                          "type": "array"
+                        }
+                      },
+                      "type": "object"
+                    },
+                    "permissions": {
+                      "description": "The user permissions for this API resource",
+                      "items": {
+                        "type": "string"
+                      },
+                      "type": "array"
+                    }
+                  },
+                  "type": "object"
+                },
+                "example": {
+                  "add_columns": {},
+                  "edit_columns": {},
+                  "filters": {
+                    "column_name": [
+                      {}
+                    ]
+                  },
+                  "permissions": [
+                    "string"
+                  ]
+                }
+              }
+            },
+            "description": "Item from Model"
+          },
+          "400": {
+            "$ref": "#/components/responses/400"
+          },
+          "401": {
+            "$ref": "#/components/responses/401"
+          },
+          "422": {
+            "$ref": "#/components/responses/422"
+          },
+          "500": {
+            "$ref": "#/components/responses/500"
+          }
+        },
+        "security": [
+          {
+            "jwt": []
+          }
+        ],
+        "tags": [
+          "Security Groups"
+        ],
+        "operationId": "get_security_groups__info",
+        "summary": "Get security groups  info",
+        "x-codeSamples": [
+          {
+            "lang": "cURL",
+            "label": "cURL",
+            "source": "curl -X GET \"http://localhost:8088/api/v1/security/groups/_info\" \\\n  -H \"Authorization: Bearer $ACCESS_TOKEN\""
+          },
+          {
+            "lang": "Python",
+            "label": "Python",
+            "source": "import requests\n\nresponse = requests.get(\n    \"http://localhost:8088/api/v1/security/groups/_info\",\n    headers={\"Authorization\": \"Bearer \" + access_token}\n)\nprint(response.json())"
+          },
+          {
+            "lang": "JavaScript",
+            "label": "JavaScript",
+            "source": "const response = await fetch(\n  \"http://localhost:8088/api/v1/security/groups/_info\",\n  {\n    headers: {\n      \"Authorization\": `Bearer ${accessToken}`\n    }\n  }\n);\nconst data = await response.json();\nconsole.log(data);"
+          }
+        ]
+      }
+    },
+    "/api/v1/security/groups/{pk}": {
+      "delete": {
+        "parameters": [
+          {
+            "in": "path",
+            "name": "pk",
+            "required": true,
+            "schema": {
+              "type": "integer"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "content": {
+              "application/json": {
+                "schema": {
+                  "properties": {
+                    "message": {
+                      "type": "string"
+                    }
+                  },
+                  "type": "object"
+                },
+                "example": {
+                  "message": "string"
+                }
+              }
+            },
+            "description": "Item deleted"
+          },
+          "404": {
+            "$ref": "#/components/responses/404"
+          },
+          "422": {
+            "$ref": "#/components/responses/422"
+          },
+          "500": {
+            "$ref": "#/components/responses/500"
+          }
+        },
+        "security": [
+          {
+            "jwt": []
+          }
+        ],
+        "tags": [
+          "Security Groups"
+        ],
+        "operationId": "delete_security_groups_by_pk",
+        "summary": "Delete security groups by pk",
+        "x-codeSamples": [
+          {
+            "lang": "cURL",
+            "label": "cURL",
+            "source": "curl -X DELETE \"http://localhost:8088/api/v1/security/groups/1\" \\\n  -H \"Authorization: Bearer $ACCESS_TOKEN\""
+          },
+          {
+            "lang": "Python",
+            "label": "Python",
+            "source": "import requests\n\nresponse = requests.delete(\n    \"http://localhost:8088/api/v1/security/groups/1\",\n    headers={\"Authorization\": \"Bearer \" + access_token}\n)\nprint(response.status_code)"
+          },
+          {
+            "lang": "JavaScript",
+            "label": "JavaScript",
+            "source": "const response = await fetch(\n  \"http://localhost:8088/api/v1/security/groups/1\",\n  {\n    method: \"DELETE\",\n    headers: {\n      \"Authorization\": `Bearer ${accessToken}`\n    }\n  }\n);\nconsole.log(response.status);"
+          }
+        ]
+      },
+      "get": {
+        "description": "Get an item model",
+        "parameters": [
+          {
+            "in": "path",
+            "name": "pk",
+            "required": true,
+            "schema": {
+              "type": "integer"
+            }
+          },
+          {
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/get_item_schema"
+                }
+              }
+            },
+            "in": "query",
+            "name": "q"
+          }
+        ],
+        "responses": {
+          "200": {
+            "content": {
+              "application/json": {
+                "schema": {
+                  "properties": {
+                    "description_columns": {
+                      "properties": {
+                        "column_name": {
+                          "description": "The description for the column name. Will be translated by babel",
+                          "example": "A Nice description for the column",
+                          "type": "string"
+                        }
+                      },
+                      "type": "object"
+                    },
+                    "id": {
+                      "description": "The item id",
+                      "type": "string"
+                    },
+                    "label_columns": {
+                      "properties": {
+                        "column_name": {
+                          "description": "The label for the column name. Will be translated by babel",
+                          "example": "A Nice label for the column",
+                          "type": "string"
+                        }
+                      },
+                      "type": "object"
+                    },
+                    "result": {
+                      "$ref": "#/components/schemas/GroupApi.get"
+                    },
+                    "show_columns": {
+                      "description": "A list of columns",
+                      "items": {
+                        "type": "string"
+                      },
+                      "type": "array"
+                    },
+                    "show_title": {
+                      "description": "A title to render. Will be translated by babel",
+                      "example": "Show Item Details",
+                      "type": "string"
+                    }
+                  },
+                  "type": "object"
+                },
+                "example": {
+                  "description_columns": {
+                    "column_name": "A Nice description for the column"
+                  },
+                  "id": "string",
+                  "label_columns": {
+                    "column_name": "A Nice label for the column"
+                  },
+                  "result": {
+                    "description": "string",
+                    "id": 1,
+                    "label": "string",
+                    "name": "string"
+                  },
+                  "show_columns": [
+                    "string"
+                  ],
+                  "show_title": "Show Item Details"
+                }
+              }
+            },
+            "description": "Item from Model"
+          },
+          "400": {
+            "$ref": "#/components/responses/400"
+          },
+          "401": {
+            "$ref": "#/components/responses/401"
+          },
+          "404": {
+            "$ref": "#/components/responses/404"
+          },
+          "422": {
+            "$ref": "#/components/responses/422"
+          },
+          "500": {
+            "$ref": "#/components/responses/500"
+          }
+        },
+        "security": [
+          {
+            "jwt": []
+          }
+        ],
+        "tags": [
+          "Security Groups"
+        ],
+        "operationId": "get_security_groups_by_pk",
+        "summary": "Get security groups by pk",
+        "x-codeSamples": [
+          {
+            "lang": "cURL",
+            "label": "cURL",
+            "source": "curl -X GET \"http://localhost:8088/api/v1/security/groups/1\" \\\n  -H \"Authorization: Bearer $ACCESS_TOKEN\""
+          },
+          {
+            "lang": "Python",
+            "label": "Python",
+            "source": "import requests\n\nresponse = requests.get(\n    \"http://localhost:8088/api/v1/security/groups/1\",\n    headers={\"Authorization\": \"Bearer \" + access_token}\n)\nprint(response.json())"
+          },
+          {
+            "lang": "JavaScript",
+            "label": "JavaScript",
+            "source": "const response = await fetch(\n  \"http://localhost:8088/api/v1/security/groups/1\",\n  {\n    headers: {\n      \"Authorization\": `Bearer ${accessToken}`\n    }\n  }\n);\nconst data = await response.json();\nconsole.log(data);"
+          }
+        ]
+      },
+      "put": {
+        "parameters": [
+          {
+            "in": "path",
+            "name": "pk",
+            "required": true,
+            "schema": {
+              "type": "integer"
+            }
+          }
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/GroupPutSchema"
+              },
+              "example": {
+                "description": "string",
+                "label": "string",
+                "name": "string",
+                "roles": [
+                  1
+                ],
+                "users": [
+                  1
+                ]
+              }
+            }
+          },
+          "description": "Model schema",
+          "required": true
+        },
+        "responses": {
+          "200": {
+            "content": {
+              "application/json": {
+                "schema": {
+                  "properties": {
+                    "result": {
+                      "$ref": "#/components/schemas/GroupPutSchema"
+                    }
+                  },
+                  "type": "object"
+                },
+                "example": {
+                  "result": {
+                    "description": "string",
+                    "label": "string",
+                    "name": "string",
+                    "roles": [],
+                    "users": []
+                  }
+                }
+              }
+            },
+            "description": "Group updated"
+          },
+          "400": {
+            "$ref": "#/components/responses/400"
+          },
+          "401": {
+            "$ref": "#/components/responses/401"
+          },
+          "404": {
+            "$ref": "#/components/responses/404"
+          },
+          "422": {
+            "$ref": "#/components/responses/422"
+          },
+          "500": {
+            "$ref": "#/components/responses/500"
+          }
+        },
+        "security": [
+          {
+            "jwt": []
+          }
+        ],
+        "tags": [
+          "Security Groups"
+        ],
+        "operationId": "update_security_groups_by_pk",
+        "summary": "Update security groups by pk",
+        "x-codeSamples": [
+          {
+            "lang": "cURL",
+            "label": "cURL",
+            "source": "curl -X PUT \"http://localhost:8088/api/v1/security/groups/1\" \\\n  -H \"Authorization: Bearer $ACCESS_TOKEN\" \\\n  -H \"Content-Type: application/json\" \\\n  -d '{\"key\": \"value\"}'"
+          },
+          {
+            "lang": "Python",
+            "label": "Python",
+            "source": "import requests\n\nresponse = requests.put(\n    \"http://localhost:8088/api/v1/security/groups/1\",\n    headers={\"Authorization\": \"Bearer \" + access_token},\n    json={\"key\": \"value\"}\n)\nprint(response.json())"
+          },
+          {
+            "lang": "JavaScript",
+            "label": "JavaScript",
+            "source": "const response = await fetch(\n  \"http://localhost:8088/api/v1/security/groups/1\",\n  {\n    method: \"PUT\",\n    headers: {\n      \"Authorization\": `Bearer ${accessToken}`,\n      \"Content-Type\": \"application/json\"\n    },\n    body: JSON.stringify({ key: \"value\" })\n  }\n);\nconst data = await response.json();\nconsole.log(data);"
+          }
+        ]
+      }
+    },
     "/api/v1/security/guest_token/": {
       "post": {
         "requestBody": {
@@ -29822,8 +31553,8 @@
                 "$ref": "#/components/schemas/PermissionViewMenuApi.post"
               },
               "example": {
-                "permission_id": 1,
-                "view_menu_id": 1
+                "permission_id": {},
+                "view_menu_id": {}
               }
             }
           },
@@ -29848,8 +31579,8 @@
                 "example": {
                   "id": "string",
                   "result": {
-                    "permission_id": 1,
-                    "view_menu_id": 1
+                    "permission_id": {},
+                    "view_menu_id": {}
                   }
                 }
               }
@@ -30237,8 +31968,8 @@
                 "$ref": "#/components/schemas/PermissionViewMenuApi.put"
               },
               "example": {
-                "permission_id": 1,
-                "view_menu_id": 1
+                "permission_id": {},
+                "view_menu_id": {}
               }
             }
           },
@@ -30259,8 +31990,8 @@
                 },
                 "example": {
                   "result": {
-                    "permission_id": 1,
-                    "view_menu_id": 1
+                    "permission_id": {},
+                    "view_menu_id": {}
                   }
                 }
               }
@@ -32204,6 +33935,100 @@
         ]
       }
     },
+    "/api/v1/security/roles/{role_id}/groups": {
+      "put": {
+        "parameters": [
+          {
+            "in": "path",
+            "name": "role_id",
+            "required": true,
+            "schema": {
+              "type": "integer"
+            }
+          }
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/RoleGroupPutSchema"
+              },
+              "example": {
+                "group_ids": [
+                  1
+                ]
+              }
+            }
+          },
+          "description": "Update role groups schema",
+          "required": true
+        },
+        "responses": {
+          "200": {
+            "content": {
+              "application/json": {
+                "schema": {
+                  "properties": {
+                    "result": {
+                      "$ref": "#/components/schemas/RoleGroupPutSchema"
+                    }
+                  },
+                  "type": "object"
+                },
+                "example": {
+                  "result": {
+                    "group_ids": []
+                  }
+                }
+              }
+            },
+            "description": "Role groups updated"
+          },
+          "400": {
+            "$ref": "#/components/responses/400"
+          },
+          "401": {
+            "$ref": "#/components/responses/401"
+          },
+          "404": {
+            "$ref": "#/components/responses/404"
+          },
+          "422": {
+            "$ref": "#/components/responses/422"
+          },
+          "500": {
+            "$ref": "#/components/responses/500"
+          }
+        },
+        "security": [
+          {
+            "jwt": []
+          }
+        ],
+        "tags": [
+          "Security Roles"
+        ],
+        "operationId": "update_security_roles_by_role_id_groups",
+        "summary": "Update security roles by role_id groups",
+        "x-codeSamples": [
+          {
+            "lang": "cURL",
+            "label": "cURL",
+            "source": "curl -X PUT \"http://localhost:8088/api/v1/security/roles/{role_id}/groups\" \\\n  -H \"Authorization: Bearer $ACCESS_TOKEN\" \\\n  -H \"Content-Type: application/json\" \\\n  -d '{\"key\": \"value\"}'"
+          },
+          {
+            "lang": "Python",
+            "label": "Python",
+            "source": "import requests\n\nresponse = requests.put(\n    \"http://localhost:8088/api/v1/security/roles/{role_id}/groups\",\n    headers={\"Authorization\": \"Bearer \" + access_token},\n    json={\"key\": \"value\"}\n)\nprint(response.json())"
+          },
+          {
+            "lang": "JavaScript",
+            "label": "JavaScript",
+            "source": "const response = await fetch(\n  \"http://localhost:8088/api/v1/security/roles/{role_id}/groups\",\n  {\n    method: \"PUT\",\n    headers: {\n      \"Authorization\": `Bearer ${accessToken}`,\n      \"Content-Type\": \"application/json\"\n    },\n    body: JSON.stringify({ key: \"value\" })\n  }\n);\nconst data = await response.json();\nconsole.log(data);"
+          }
+        ]
+      }
+    },
     "/api/v1/security/roles/{role_id}/permissions": {
       "post": {
         "parameters": [
@@ -32317,17 +34142,18 @@
                 "schema": {
                   "properties": {
                     "result": {
-                      "$ref": "#/components/schemas/RolePermissionListSchema"
+                      "items": {
+                        "$ref": "#/components/schemas/RolePermissionListSchema"
+                      },
+                      "type": "array"
                     }
                   },
                   "type": "object"
                 },
                 "example": {
-                  "result": {
-                    "id": 1,
-                    "permission_name": "string",
-                    "view_menu_name": "string"
-                  }
+                  "result": [
+                    {}
+                  ]
                 }
               }
             },
@@ -32472,6 +34298,807 @@
         ]
       }
     },
+    "/api/v1/security/user_registrations/": {
+      "get": {
+        "description": "Get a list of models",
+        "parameters": [
+          {
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/get_list_schema"
+                }
+              }
+            },
+            "in": "query",
+            "name": "q"
+          }
+        ],
+        "responses": {
+          "200": {
+            "content": {
+              "application/json": {
+                "schema": {
+                  "properties": {
+                    "count": {
+                      "description": "The total record count on the backend",
+                      "type": "number"
+                    },
+                    "description_columns": {
+                      "properties": {
+                        "column_name": {
+                          "description": "The description for the column name. Will be translated by babel",
+                          "example": "A Nice description for the column",
+                          "type": "string"
+                        }
+                      },
+                      "type": "object"
+                    },
+                    "ids": {
+                      "description": "A list of item ids, useful when you don't know the column id",
+                      "items": {
+                        "type": "string"
+                      },
+                      "type": "array"
+                    },
+                    "label_columns": {
+                      "properties": {
+                        "column_name": {
+                          "description": "The label for the column name. Will be translated by babel",
+                          "example": "A Nice label for the column",
+                          "type": "string"
+                        }
+                      },
+                      "type": "object"
+                    },
+                    "list_columns": {
+                      "description": "A list of columns",
+                      "items": {
+                        "type": "string"
+                      },
+                      "type": "array"
+                    },
+                    "list_title": {
+                      "description": "A title to render. Will be translated by babel",
+                      "example": "List Items",
+                      "type": "string"
+                    },
+                    "order_columns": {
+                      "description": "A list of allowed columns to sort",
+                      "items": {
+                        "type": "string"
+                      },
+                      "type": "array"
+                    },
+                    "result": {
+                      "description": "The result from the get list query",
+                      "items": {
+                        "$ref": "#/components/schemas/UserRegistrationsRestAPI.get_list"
+                      },
+                      "type": "array"
+                    }
+                  },
+                  "type": "object"
+                },
+                "example": {
+                  "count": 1.0,
+                  "description_columns": {
+                    "column_name": "A Nice description for the column"
+                  },
+                  "ids": [
+                    "string"
+                  ],
+                  "label_columns": {
+                    "column_name": "A Nice label for the column"
+                  },
+                  "list_columns": [
+                    "string"
+                  ],
+                  "list_title": "List Items",
+                  "order_columns": [
+                    "string"
+                  ],
+                  "result": [
+                    {}
+                  ]
+                }
+              }
+            },
+            "description": "Items from Model"
+          },
+          "400": {
+            "$ref": "#/components/responses/400"
+          },
+          "401": {
+            "$ref": "#/components/responses/401"
+          },
+          "422": {
+            "$ref": "#/components/responses/422"
+          },
+          "500": {
+            "$ref": "#/components/responses/500"
+          }
+        },
+        "security": [
+          {
+            "jwt": []
+          }
+        ],
+        "tags": [
+          "UserRegistrationsRestAPI"
+        ],
+        "operationId": "get_security_user_registrations",
+        "summary": "Get security user registrations",
+        "x-codeSamples": [
+          {
+            "lang": "cURL",
+            "label": "cURL",
+            "source": "curl -X GET \"http://localhost:8088/api/v1/security/user_registrations/\" \\\n  -H \"Authorization: Bearer $ACCESS_TOKEN\""
+          },
+          {
+            "lang": "Python",
+            "label": "Python",
+            "source": "import requests\n\nresponse = requests.get(\n    \"http://localhost:8088/api/v1/security/user_registrations/\",\n    headers={\"Authorization\": \"Bearer \" + access_token}\n)\nprint(response.json())"
+          },
+          {
+            "lang": "JavaScript",
+            "label": "JavaScript",
+            "source": "const response = await fetch(\n  \"http://localhost:8088/api/v1/security/user_registrations/\",\n  {\n    headers: {\n      \"Authorization\": `Bearer ${accessToken}`\n    }\n  }\n);\nconst data = await response.json();\nconsole.log(data);"
+          }
+        ]
+      },
+      "post": {
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/UserRegistrationsRestAPI.post"
+              },
+              "example": {
+                "id": 1
+              }
+            }
+          },
+          "description": "Model schema",
+          "required": true
+        },
+        "responses": {
+          "201": {
+            "content": {
+              "application/json": {
+                "schema": {
+                  "properties": {
+                    "id": {
+                      "type": "string"
+                    },
+                    "result": {
+                      "$ref": "#/components/schemas/UserRegistrationsRestAPI.post"
+                    }
+                  },
+                  "type": "object"
+                },
+                "example": {
+                  "id": "string",
+                  "result": {
+                    "id": 1
+                  }
+                }
+              }
+            },
+            "description": "Item inserted"
+          },
+          "400": {
+            "$ref": "#/components/responses/400"
+          },
+          "401": {
+            "$ref": "#/components/responses/401"
+          },
+          "422": {
+            "$ref": "#/components/responses/422"
+          },
+          "500": {
+            "$ref": "#/components/responses/500"
+          }
+        },
+        "security": [
+          {
+            "jwt": []
+          }
+        ],
+        "tags": [
+          "UserRegistrationsRestAPI"
+        ],
+        "operationId": "create_security_user_registrations",
+        "summary": "Create security user registrations",
+        "x-codeSamples": [
+          {
+            "lang": "cURL",
+            "label": "cURL",
+            "source": "curl -X POST \"http://localhost:8088/api/v1/security/user_registrations/\" \\\n  -H \"Authorization: Bearer $ACCESS_TOKEN\" \\\n  -H \"Content-Type: application/json\" \\\n  -d '{\"key\": \"value\"}'"
+          },
+          {
+            "lang": "Python",
+            "label": "Python",
+            "source": "import requests\n\nresponse = requests.post(\n    \"http://localhost:8088/api/v1/security/user_registrations/\",\n    headers={\"Authorization\": \"Bearer \" + access_token},\n    json={\"key\": \"value\"}\n)\nprint(response.json())"
+          },
+          {
+            "lang": "JavaScript",
+            "label": "JavaScript",
+            "source": "const response = await fetch(\n  \"http://localhost:8088/api/v1/security/user_registrations/\",\n  {\n    method: \"POST\",\n    headers: {\n      \"Authorization\": `Bearer ${accessToken}`,\n      \"Content-Type\": \"application/json\"\n    },\n    body: JSON.stringify({ key: \"value\" })\n  }\n);\nconst data = await response.json();\nconsole.log(data);"
+          }
+        ]
+      }
+    },
+    "/api/v1/security/user_registrations/_info": {
+      "get": {
+        "description": "Get metadata information about this API resource",
+        "parameters": [
+          {
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/get_info_schema"
+                }
+              }
+            },
+            "in": "query",
+            "name": "q"
+          }
+        ],
+        "responses": {
+          "200": {
+            "content": {
+              "application/json": {
+                "schema": {
+                  "properties": {
+                    "add_columns": {
+                      "type": "object"
+                    },
+                    "edit_columns": {
+                      "type": "object"
+                    },
+                    "filters": {
+                      "properties": {
+                        "column_name": {
+                          "items": {
+                            "properties": {
+                              "name": {
+                                "description": "The filter name. Will be translated by babel",
+                                "type": "string"
+                              },
+                              "operator": {
+                                "description": "The filter operation key to use on list filters",
+                                "type": "string"
+                              }
+                            },
+                            "type": "object"
+                          },
+                          "type": "array"
+                        }
+                      },
+                      "type": "object"
+                    },
+                    "permissions": {
+                      "description": "The user permissions for this API resource",
+                      "items": {
+                        "type": "string"
+                      },
+                      "type": "array"
+                    }
+                  },
+                  "type": "object"
+                },
+                "example": {
+                  "add_columns": {},
+                  "edit_columns": {},
+                  "filters": {
+                    "column_name": [
+                      {}
+                    ]
+                  },
+                  "permissions": [
+                    "string"
+                  ]
+                }
+              }
+            },
+            "description": "Item from Model"
+          },
+          "400": {
+            "$ref": "#/components/responses/400"
+          },
+          "401": {
+            "$ref": "#/components/responses/401"
+          },
+          "422": {
+            "$ref": "#/components/responses/422"
+          },
+          "500": {
+            "$ref": "#/components/responses/500"
+          }
+        },
+        "security": [
+          {
+            "jwt": []
+          }
+        ],
+        "tags": [
+          "UserRegistrationsRestAPI"
+        ],
+        "operationId": "get_security_user_registrations__info",
+        "summary": "Get security user registrations  info",
+        "x-codeSamples": [
+          {
+            "lang": "cURL",
+            "label": "cURL",
+            "source": "curl -X GET \"http://localhost:8088/api/v1/security/user_registrations/_info\" \\\n  -H \"Authorization: Bearer $ACCESS_TOKEN\""
+          },
+          {
+            "lang": "Python",
+            "label": "Python",
+            "source": "import requests\n\nresponse = requests.get(\n    \"http://localhost:8088/api/v1/security/user_registrations/_info\",\n    headers={\"Authorization\": \"Bearer \" + access_token}\n)\nprint(response.json())"
+          },
+          {
+            "lang": "JavaScript",
+            "label": "JavaScript",
+            "source": "const response = await fetch(\n  \"http://localhost:8088/api/v1/security/user_registrations/_info\",\n  {\n    headers: {\n      \"Authorization\": `Bearer ${accessToken}`\n    }\n  }\n);\nconst data = await response.json();\nconsole.log(data);"
+          }
+        ]
+      }
+    },
+    "/api/v1/security/user_registrations/distinct/{column_name}": {
+      "get": {
+        "parameters": [
+          {
+            "in": "path",
+            "name": "column_name",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/get_related_schema"
+                }
+              }
+            },
+            "in": "query",
+            "name": "q"
+          }
+        ],
+        "responses": {
+          "200": {
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/DistincResponseSchema"
+                },
+                "example": {
+                  "count": 1,
+                  "result": []
+                }
+              }
+            },
+            "description": "Distinct field data"
+          },
+          "400": {
+            "$ref": "#/components/responses/400"
+          },
+          "401": {
+            "$ref": "#/components/responses/401"
+          },
+          "404": {
+            "$ref": "#/components/responses/404"
+          },
+          "500": {
+            "$ref": "#/components/responses/500"
+          }
+        },
+        "security": [
+          {
+            "jwt": []
+          }
+        ],
+        "summary": "Get distinct values from field data (security-user-registrations-distinct-column-name)",
+        "tags": [
+          "UserRegistrationsRestAPI"
+        ],
+        "x-codeSamples": [
+          {
+            "lang": "cURL",
+            "label": "cURL",
+            "source": "curl -X GET \"http://localhost:8088/api/v1/security/user_registrations/distinct/{column_name}\" \\\n  -H \"Authorization: Bearer $ACCESS_TOKEN\""
+          },
+          {
+            "lang": "Python",
+            "label": "Python",
+            "source": "import requests\n\nresponse = requests.get(\n    \"http://localhost:8088/api/v1/security/user_registrations/distinct/{column_name}\",\n    headers={\"Authorization\": \"Bearer \" + access_token}\n)\nprint(response.json())"
+          },
+          {
+            "lang": "JavaScript",
+            "label": "JavaScript",
+            "source": "const response = await fetch(\n  \"http://localhost:8088/api/v1/security/user_registrations/distinct/{column_name}\",\n  {\n    headers: {\n      \"Authorization\": `Bearer ${accessToken}`\n    }\n  }\n);\nconst data = await response.json();\nconsole.log(data);"
+          }
+        ]
+      }
+    },
+    "/api/v1/security/user_registrations/related/{column_name}": {
+      "get": {
+        "parameters": [
+          {
+            "in": "path",
+            "name": "column_name",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/get_related_schema"
+                }
+              }
+            },
+            "in": "query",
+            "name": "q"
+          }
+        ],
+        "responses": {
+          "200": {
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/RelatedResponseSchema"
+                },
+                "example": {
+                  "count": 1,
+                  "result": []
+                }
+              }
+            },
+            "description": "Related column data"
+          },
+          "400": {
+            "$ref": "#/components/responses/400"
+          },
+          "401": {
+            "$ref": "#/components/responses/401"
+          },
+          "404": {
+            "$ref": "#/components/responses/404"
+          },
+          "500": {
+            "$ref": "#/components/responses/500"
+          }
+        },
+        "security": [
+          {
+            "jwt": []
+          }
+        ],
+        "summary": "Get related fields data (security-user-registrations-related-column-name)",
+        "tags": [
+          "UserRegistrationsRestAPI"
+        ],
+        "x-codeSamples": [
+          {
+            "lang": "cURL",
+            "label": "cURL",
+            "source": "curl -X GET \"http://localhost:8088/api/v1/security/user_registrations/related/{column_name}\" \\\n  -H \"Authorization: Bearer $ACCESS_TOKEN\""
+          },
+          {
+            "lang": "Python",
+            "label": "Python",
+            "source": "import requests\n\nresponse = requests.get(\n    \"http://localhost:8088/api/v1/security/user_registrations/related/{column_name}\",\n    headers={\"Authorization\": \"Bearer \" + access_token}\n)\nprint(response.json())"
+          },
+          {
+            "lang": "JavaScript",
+            "label": "JavaScript",
+            "source": "const response = await fetch(\n  \"http://localhost:8088/api/v1/security/user_registrations/related/{column_name}\",\n  {\n    headers: {\n      \"Authorization\": `Bearer ${accessToken}`\n    }\n  }\n);\nconst data = await response.json();\nconsole.log(data);"
+          }
+        ]
+      }
+    },
+    "/api/v1/security/user_registrations/{pk}": {
+      "delete": {
+        "parameters": [
+          {
+            "in": "path",
+            "name": "pk",
+            "required": true,
+            "schema": {
+              "type": "integer"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "content": {
+              "application/json": {
+                "schema": {
+                  "properties": {
+                    "message": {
+                      "type": "string"
+                    }
+                  },
+                  "type": "object"
+                },
+                "example": {
+                  "message": "string"
+                }
+              }
+            },
+            "description": "Item deleted"
+          },
+          "404": {
+            "$ref": "#/components/responses/404"
+          },
+          "422": {
+            "$ref": "#/components/responses/422"
+          },
+          "500": {
+            "$ref": "#/components/responses/500"
+          }
+        },
+        "security": [
+          {
+            "jwt": []
+          }
+        ],
+        "tags": [
+          "UserRegistrationsRestAPI"
+        ],
+        "operationId": "delete_security_user_registrations_by_pk",
+        "summary": "Delete security user registrations by pk",
+        "x-codeSamples": [
+          {
+            "lang": "cURL",
+            "label": "cURL",
+            "source": "curl -X DELETE \"http://localhost:8088/api/v1/security/user_registrations/1\" \\\n  -H \"Authorization: Bearer $ACCESS_TOKEN\""
+          },
+          {
+            "lang": "Python",
+            "label": "Python",
+            "source": "import requests\n\nresponse = requests.delete(\n    \"http://localhost:8088/api/v1/security/user_registrations/1\",\n    headers={\"Authorization\": \"Bearer \" + access_token}\n)\nprint(response.status_code)"
+          },
+          {
+            "lang": "JavaScript",
+            "label": "JavaScript",
+            "source": "const response = await fetch(\n  \"http://localhost:8088/api/v1/security/user_registrations/1\",\n  {\n    method: \"DELETE\",\n    headers: {\n      \"Authorization\": `Bearer ${accessToken}`\n    }\n  }\n);\nconsole.log(response.status);"
+          }
+        ]
+      },
+      "get": {
+        "description": "Get an item model",
+        "parameters": [
+          {
+            "in": "path",
+            "name": "pk",
+            "required": true,
+            "schema": {
+              "type": "integer"
+            }
+          },
+          {
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/get_item_schema"
+                }
+              }
+            },
+            "in": "query",
+            "name": "q"
+          }
+        ],
+        "responses": {
+          "200": {
+            "content": {
+              "application/json": {
+                "schema": {
+                  "properties": {
+                    "description_columns": {
+                      "properties": {
+                        "column_name": {
+                          "description": "The description for the column name. Will be translated by babel",
+                          "example": "A Nice description for the column",
+                          "type": "string"
+                        }
+                      },
+                      "type": "object"
+                    },
+                    "id": {
+                      "description": "The item id",
+                      "type": "string"
+                    },
+                    "label_columns": {
+                      "properties": {
+                        "column_name": {
+                          "description": "The label for the column name. Will be translated by babel",
+                          "example": "A Nice label for the column",
+                          "type": "string"
+                        }
+                      },
+                      "type": "object"
+                    },
+                    "result": {
+                      "$ref": "#/components/schemas/UserRegistrationsRestAPI.get"
+                    },
+                    "show_columns": {
+                      "description": "A list of columns",
+                      "items": {
+                        "type": "string"
+                      },
+                      "type": "array"
+                    },
+                    "show_title": {
+                      "description": "A title to render. Will be translated by babel",
+                      "example": "Show Item Details",
+                      "type": "string"
+                    }
+                  },
+                  "type": "object"
+                },
+                "example": {
+                  "description_columns": {
+                    "column_name": "A Nice description for the column"
+                  },
+                  "id": "string",
+                  "label_columns": {
+                    "column_name": "A Nice label for the column"
+                  },
+                  "result": {
+                    "id": 1
+                  },
+                  "show_columns": [
+                    "string"
+                  ],
+                  "show_title": "Show Item Details"
+                }
+              }
+            },
+            "description": "Item from Model"
+          },
+          "400": {
+            "$ref": "#/components/responses/400"
+          },
+          "401": {
+            "$ref": "#/components/responses/401"
+          },
+          "404": {
+            "$ref": "#/components/responses/404"
+          },
+          "422": {
+            "$ref": "#/components/responses/422"
+          },
+          "500": {
+            "$ref": "#/components/responses/500"
+          }
+        },
+        "security": [
+          {
+            "jwt": []
+          }
+        ],
+        "tags": [
+          "UserRegistrationsRestAPI"
+        ],
+        "operationId": "get_security_user_registrations_by_pk",
+        "summary": "Get security user registrations by pk",
+        "x-codeSamples": [
+          {
+            "lang": "cURL",
+            "label": "cURL",
+            "source": "curl -X GET \"http://localhost:8088/api/v1/security/user_registrations/1\" \\\n  -H \"Authorization: Bearer $ACCESS_TOKEN\""
+          },
+          {
+            "lang": "Python",
+            "label": "Python",
+            "source": "import requests\n\nresponse = requests.get(\n    \"http://localhost:8088/api/v1/security/user_registrations/1\",\n    headers={\"Authorization\": \"Bearer \" + access_token}\n)\nprint(response.json())"
+          },
+          {
+            "lang": "JavaScript",
+            "label": "JavaScript",
+            "source": "const response = await fetch(\n  \"http://localhost:8088/api/v1/security/user_registrations/1\",\n  {\n    headers: {\n      \"Authorization\": `Bearer ${accessToken}`\n    }\n  }\n);\nconst data = await response.json();\nconsole.log(data);"
+          }
+        ]
+      },
+      "put": {
+        "parameters": [
+          {
+            "in": "path",
+            "name": "pk",
+            "required": true,
+            "schema": {
+              "type": "integer"
+            }
+          }
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/UserRegistrationsRestAPI.put"
+              },
+              "example": {
+                "id": 1
+              }
+            }
+          },
+          "description": "Model schema",
+          "required": true
+        },
+        "responses": {
+          "200": {
+            "content": {
+              "application/json": {
+                "schema": {
+                  "properties": {
+                    "result": {
+                      "$ref": "#/components/schemas/UserRegistrationsRestAPI.put"
+                    }
+                  },
+                  "type": "object"
+                },
+                "example": {
+                  "result": {
+                    "id": 1
+                  }
+                }
+              }
+            },
+            "description": "Item changed"
+          },
+          "400": {
+            "$ref": "#/components/responses/400"
+          },
+          "401": {
+            "$ref": "#/components/responses/401"
+          },
+          "404": {
+            "$ref": "#/components/responses/404"
+          },
+          "422": {
+            "$ref": "#/components/responses/422"
+          },
+          "500": {
+            "$ref": "#/components/responses/500"
+          }
+        },
+        "security": [
+          {
+            "jwt": []
+          }
+        ],
+        "tags": [
+          "UserRegistrationsRestAPI"
+        ],
+        "operationId": "update_security_user_registrations_by_pk",
+        "summary": "Update security user registrations by pk",
+        "x-codeSamples": [
+          {
+            "lang": "cURL",
+            "label": "cURL",
+            "source": "curl -X PUT \"http://localhost:8088/api/v1/security/user_registrations/1\" \\\n  -H \"Authorization: Bearer $ACCESS_TOKEN\" \\\n  -H \"Content-Type: application/json\" \\\n  -d '{\"key\": \"value\"}'"
+          },
+          {
+            "lang": "Python",
+            "label": "Python",
+            "source": "import requests\n\nresponse = requests.put(\n    \"http://localhost:8088/api/v1/security/user_registrations/1\",\n    headers={\"Authorization\": \"Bearer \" + access_token},\n    json={\"key\": \"value\"}\n)\nprint(response.json())"
+          },
+          {
+            "lang": "JavaScript",
+            "label": "JavaScript",
+            "source": "const response = await fetch(\n  \"http://localhost:8088/api/v1/security/user_registrations/1\",\n  {\n    method: \"PUT\",\n    headers: {\n      \"Authorization\": `Bearer ${accessToken}`,\n      \"Content-Type\": \"application/json\"\n    },\n    body: JSON.stringify({ key: \"value\" })\n  }\n);\nconst data = await response.json();\nconsole.log(data);"
+          }
+        ]
+      }
+    },
     "/api/v1/security/users/": {
       "get": {
         "description": "Get a list of models",
@@ -32632,6 +35259,9 @@
                 "active": true,
                 "email": "string",
                 "first_name": "string",
+                "groups": [
+                  1
+                ],
                 "last_name": "string",
                 "password": "string",
                 "roles": [
@@ -32661,6 +35291,7 @@
                     "active": true,
                     "email": "string",
                     "first_name": "string",
+                    "groups": [],
                     "last_name": "string",
                     "password": "string",
                     "roles": [],
@@ -33068,6 +35699,9 @@
                 "active": true,
                 "email": "string",
                 "first_name": "string",
+                "groups": [
+                  1
+                ],
                 "last_name": "string",
                 "password": "string",
                 "roles": [
@@ -33097,6 +35731,7 @@
                     "active": true,
                     "email": "string",
                     "first_name": "string",
+                    "groups": [],
                     "last_name": "string",
                     "password": "string",
                     "roles": [],
@@ -33313,7 +35948,6 @@
                 "ctas_method": "string",
                 "database_id": 1,
                 "expand_data": true,
-                "json": true,
                 "queryLimit": 1,
                 "runAsync": true,
                 "schema": "string",
@@ -33496,6 +36130,88 @@
         ]
       }
     },
+    "/api/v1/sqllab/export_streaming/": {
+      "post": {
+        "requestBody": {
+          "content": {
+            "application/x-www-form-urlencoded": {
+              "schema": {
+                "properties": {
+                  "client_id": {
+                    "description": "The SQL query result identifier",
+                    "type": "string"
+                  },
+                  "expected_rows": {
+                    "description": "Optional expected row count for progress tracking",
+                    "type": "integer"
+                  },
+                  "filename": {
+                    "description": "Optional filename for the export",
+                    "type": "string"
+                  }
+                },
+                "type": "object"
+              }
+            }
+          },
+          "description": "Export parameters",
+          "required": true
+        },
+        "responses": {
+          "200": {
+            "content": {
+              "text/csv": {
+                "schema": {
+                  "type": "string"
+                }
+              }
+            },
+            "description": "Streaming CSV export"
+          },
+          "400": {
+            "$ref": "#/components/responses/400"
+          },
+          "401": {
+            "$ref": "#/components/responses/401"
+          },
+          "403": {
+            "$ref": "#/components/responses/403"
+          },
+          "404": {
+            "$ref": "#/components/responses/404"
+          },
+          "500": {
+            "$ref": "#/components/responses/500"
+          }
+        },
+        "security": [
+          {
+            "jwt": []
+          }
+        ],
+        "summary": "Export SQL query results to CSV with streaming",
+        "tags": [
+          "SQL Lab"
+        ],
+        "x-codeSamples": [
+          {
+            "lang": "cURL",
+            "label": "cURL",
+            "source": "curl -X POST \"http://localhost:8088/api/v1/sqllab/export_streaming/\" \\\n  -H \"Authorization: Bearer $ACCESS_TOKEN\" \\\n  -H \"Content-Type: application/json\" \\\n  -d '{\"key\": \"value\"}'"
+          },
+          {
+            "lang": "Python",
+            "label": "Python",
+            "source": "import requests\n\nresponse = requests.post(\n    \"http://localhost:8088/api/v1/sqllab/export_streaming/\",\n    headers={\"Authorization\": \"Bearer \" + access_token},\n    json={\"key\": \"value\"}\n)\nprint(response.json())"
+          },
+          {
+            "lang": "JavaScript",
+            "label": "JavaScript",
+            "source": "const response = await fetch(\n  \"http://localhost:8088/api/v1/sqllab/export_streaming/\",\n  {\n    method: \"POST\",\n    headers: {\n      \"Authorization\": `Bearer ${accessToken}`,\n      \"Content-Type\": \"application/json\"\n    },\n    body: JSON.stringify({ key: \"value\" })\n  }\n);\nconst data = await response.json();\nconsole.log(data);"
+          }
+        ]
+      }
+    },
     "/api/v1/sqllab/format_sql/": {
       "post": {
         "requestBody": {
@@ -33505,9 +36221,9 @@
                 "$ref": "#/components/schemas/FormatQueryPayloadSchema"
               },
               "example": {
-                "sql": "string",
-                "engine": "string",
                 "database_id": 1,
+                "engine": "string",
+                "sql": "string",
                 "template_params": "string"
               }
             }
@@ -35199,6 +37915,1255 @@
         ]
       }
     },
+    "/api/v1/theme/": {
+      "delete": {
+        "parameters": [
+          {
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/get_delete_ids_schema"
+                }
+              }
+            },
+            "in": "query",
+            "name": "q"
+          }
+        ],
+        "responses": {
+          "200": {
+            "content": {
+              "application/json": {
+                "schema": {
+                  "properties": {
+                    "message": {
+                      "type": "string"
+                    }
+                  },
+                  "type": "object"
+                },
+                "example": {
+                  "message": "string"
+                }
+              }
+            },
+            "description": "Themes bulk delete"
+          },
+          "401": {
+            "$ref": "#/components/responses/401"
+          },
+          "404": {
+            "$ref": "#/components/responses/404"
+          },
+          "422": {
+            "$ref": "#/components/responses/422"
+          },
+          "500": {
+            "$ref": "#/components/responses/500"
+          }
+        },
+        "security": [
+          {
+            "jwt": []
+          }
+        ],
+        "summary": "Bulk delete themes",
+        "tags": [
+          "Themes"
+        ],
+        "x-codeSamples": [
+          {
+            "lang": "cURL",
+            "label": "cURL",
+            "source": "curl -X DELETE \"http://localhost:8088/api/v1/theme/\" \\\n  -H \"Authorization: Bearer $ACCESS_TOKEN\""
+          },
+          {
+            "lang": "Python",
+            "label": "Python",
+            "source": "import requests\n\nresponse = requests.delete(\n    \"http://localhost:8088/api/v1/theme/\",\n    headers={\"Authorization\": \"Bearer \" + access_token}\n)\nprint(response.status_code)"
+          },
+          {
+            "lang": "JavaScript",
+            "label": "JavaScript",
+            "source": "const response = await fetch(\n  \"http://localhost:8088/api/v1/theme/\",\n  {\n    method: \"DELETE\",\n    headers: {\n      \"Authorization\": `Bearer ${accessToken}`\n    }\n  }\n);\nconsole.log(response.status);"
+          }
+        ]
+      },
+      "get": {
+        "description": "Gets a list of themes, use Rison or JSON query parameters for filtering, sorting, pagination and for selecting specific columns and metadata.",
+        "parameters": [
+          {
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/get_list_schema"
+                }
+              }
+            },
+            "in": "query",
+            "name": "q"
+          }
+        ],
+        "responses": {
+          "200": {
+            "content": {
+              "application/json": {
+                "schema": {
+                  "properties": {
+                    "count": {
+                      "description": "The total record count on the backend",
+                      "type": "number"
+                    },
+                    "description_columns": {
+                      "properties": {
+                        "column_name": {
+                          "description": "The description for the column name. Will be translated by babel",
+                          "example": "A Nice description for the column",
+                          "type": "string"
+                        }
+                      },
+                      "type": "object"
+                    },
+                    "ids": {
+                      "description": "A list of item ids, useful when you don't know the column id",
+                      "items": {
+                        "type": "string"
+                      },
+                      "type": "array"
+                    },
+                    "label_columns": {
+                      "properties": {
+                        "column_name": {
+                          "description": "The label for the column name. Will be translated by babel",
+                          "example": "A Nice label for the column",
+                          "type": "string"
+                        }
+                      },
+                      "type": "object"
+                    },
+                    "list_columns": {
+                      "description": "A list of columns",
+                      "items": {
+                        "type": "string"
+                      },
+                      "type": "array"
+                    },
+                    "list_title": {
+                      "description": "A title to render. Will be translated by babel",
+                      "example": "List Items",
+                      "type": "string"
+                    },
+                    "order_columns": {
+                      "description": "A list of allowed columns to sort",
+                      "items": {
+                        "type": "string"
+                      },
+                      "type": "array"
+                    },
+                    "result": {
+                      "description": "The result from the get list query",
+                      "items": {
+                        "$ref": "#/components/schemas/ThemeRestApi.get_list"
+                      },
+                      "type": "array"
+                    }
+                  },
+                  "type": "object"
+                },
+                "example": {
+                  "count": 1.0,
+                  "description_columns": {
+                    "column_name": "A Nice description for the column"
+                  },
+                  "ids": [
+                    "string"
+                  ],
+                  "label_columns": {
+                    "column_name": "A Nice label for the column"
+                  },
+                  "list_columns": [
+                    "string"
+                  ],
+                  "list_title": "List Items",
+                  "order_columns": [
+                    "string"
+                  ],
+                  "result": [
+                    {}
+                  ]
+                }
+              }
+            },
+            "description": "Items from Model"
+          },
+          "400": {
+            "$ref": "#/components/responses/400"
+          },
+          "401": {
+            "$ref": "#/components/responses/401"
+          },
+          "422": {
+            "$ref": "#/components/responses/422"
+          },
+          "500": {
+            "$ref": "#/components/responses/500"
+          }
+        },
+        "security": [
+          {
+            "jwt": []
+          }
+        ],
+        "summary": "Get a list of themes",
+        "tags": [
+          "Themes"
+        ],
+        "x-codeSamples": [
+          {
+            "lang": "cURL",
+            "label": "cURL",
+            "source": "curl -X GET \"http://localhost:8088/api/v1/theme/\" \\\n  -H \"Authorization: Bearer $ACCESS_TOKEN\""
+          },
+          {
+            "lang": "Python",
+            "label": "Python",
+            "source": "import requests\n\nresponse = requests.get(\n    \"http://localhost:8088/api/v1/theme/\",\n    headers={\"Authorization\": \"Bearer \" + access_token}\n)\nprint(response.json())"
+          },
+          {
+            "lang": "JavaScript",
+            "label": "JavaScript",
+            "source": "const response = await fetch(\n  \"http://localhost:8088/api/v1/theme/\",\n  {\n    headers: {\n      \"Authorization\": `Bearer ${accessToken}`\n    }\n  }\n);\nconst data = await response.json();\nconsole.log(data);"
+          }
+        ]
+      },
+      "post": {
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/ThemeRestApi.post"
+              },
+              "example": {
+                "json_data": "string",
+                "theme_name": "string"
+              }
+            }
+          },
+          "description": "Theme schema",
+          "required": true
+        },
+        "responses": {
+          "201": {
+            "content": {
+              "application/json": {
+                "schema": {
+                  "properties": {
+                    "id": {
+                      "type": "number"
+                    },
+                    "result": {
+                      "$ref": "#/components/schemas/ThemeRestApi.post"
+                    }
+                  },
+                  "type": "object"
+                },
+                "example": {
+                  "id": 1.0,
+                  "result": {
+                    "json_data": "string",
+                    "theme_name": "string"
+                  }
+                }
+              }
+            },
+            "description": "Theme created"
+          },
+          "400": {
+            "$ref": "#/components/responses/400"
+          },
+          "401": {
+            "$ref": "#/components/responses/401"
+          },
+          "422": {
+            "$ref": "#/components/responses/422"
+          },
+          "500": {
+            "$ref": "#/components/responses/500"
+          }
+        },
+        "security": [
+          {
+            "jwt": []
+          }
+        ],
+        "summary": "Create a theme",
+        "tags": [
+          "Themes"
+        ],
+        "x-codeSamples": [
+          {
+            "lang": "cURL",
+            "label": "cURL",
+            "source": "curl -X POST \"http://localhost:8088/api/v1/theme/\" \\\n  -H \"Authorization: Bearer $ACCESS_TOKEN\" \\\n  -H \"Content-Type: application/json\" \\\n  -d '{\"key\": \"value\"}'"
+          },
+          {
+            "lang": "Python",
+            "label": "Python",
+            "source": "import requests\n\nresponse = requests.post(\n    \"http://localhost:8088/api/v1/theme/\",\n    headers={\"Authorization\": \"Bearer \" + access_token},\n    json={\"key\": \"value\"}\n)\nprint(response.json())"
+          },
+          {
+            "lang": "JavaScript",
+            "label": "JavaScript",
+            "source": "const response = await fetch(\n  \"http://localhost:8088/api/v1/theme/\",\n  {\n    method: \"POST\",\n    headers: {\n      \"Authorization\": `Bearer ${accessToken}`,\n      \"Content-Type\": \"application/json\"\n    },\n    body: JSON.stringify({ key: \"value\" })\n  }\n);\nconst data = await response.json();\nconsole.log(data);"
+          }
+        ]
+      }
+    },
+    "/api/v1/theme/_info": {
+      "get": {
+        "description": "Get metadata information about this API resource",
+        "parameters": [
+          {
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/get_info_schema"
+                }
+              }
+            },
+            "in": "query",
+            "name": "q"
+          }
+        ],
+        "responses": {
+          "200": {
+            "content": {
+              "application/json": {
+                "schema": {
+                  "properties": {
+                    "add_columns": {
+                      "type": "object"
+                    },
+                    "edit_columns": {
+                      "type": "object"
+                    },
+                    "filters": {
+                      "properties": {
+                        "column_name": {
+                          "items": {
+                            "properties": {
+                              "name": {
+                                "description": "The filter name. Will be translated by babel",
+                                "type": "string"
+                              },
+                              "operator": {
+                                "description": "The filter operation key to use on list filters",
+                                "type": "string"
+                              }
+                            },
+                            "type": "object"
+                          },
+                          "type": "array"
+                        }
+                      },
+                      "type": "object"
+                    },
+                    "permissions": {
+                      "description": "The user permissions for this API resource",
+                      "items": {
+                        "type": "string"
+                      },
+                      "type": "array"
+                    }
+                  },
+                  "type": "object"
+                },
+                "example": {
+                  "add_columns": {},
+                  "edit_columns": {},
+                  "filters": {
+                    "column_name": [
+                      {}
+                    ]
+                  },
+                  "permissions": [
+                    "string"
+                  ]
+                }
+              }
+            },
+            "description": "Item from Model"
+          },
+          "400": {
+            "$ref": "#/components/responses/400"
+          },
+          "401": {
+            "$ref": "#/components/responses/401"
+          },
+          "422": {
+            "$ref": "#/components/responses/422"
+          },
+          "500": {
+            "$ref": "#/components/responses/500"
+          }
+        },
+        "security": [
+          {
+            "jwt": []
+          }
+        ],
+        "summary": "Get metadata information about this API resource (theme--info)",
+        "tags": [
+          "Themes"
+        ],
+        "x-codeSamples": [
+          {
+            "lang": "cURL",
+            "label": "cURL",
+            "source": "curl -X GET \"http://localhost:8088/api/v1/theme/_info\" \\\n  -H \"Authorization: Bearer $ACCESS_TOKEN\""
+          },
+          {
+            "lang": "Python",
+            "label": "Python",
+            "source": "import requests\n\nresponse = requests.get(\n    \"http://localhost:8088/api/v1/theme/_info\",\n    headers={\"Authorization\": \"Bearer \" + access_token}\n)\nprint(response.json())"
+          },
+          {
+            "lang": "JavaScript",
+            "label": "JavaScript",
+            "source": "const response = await fetch(\n  \"http://localhost:8088/api/v1/theme/_info\",\n  {\n    headers: {\n      \"Authorization\": `Bearer ${accessToken}`\n    }\n  }\n);\nconst data = await response.json();\nconsole.log(data);"
+          }
+        ]
+      }
+    },
+    "/api/v1/theme/export/": {
+      "get": {
+        "parameters": [
+          {
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/get_export_ids_schema"
+                }
+              }
+            },
+            "in": "query",
+            "name": "q"
+          }
+        ],
+        "responses": {
+          "200": {
+            "content": {
+              "application/zip": {
+                "schema": {
+                  "format": "binary",
+                  "type": "string"
+                }
+              }
+            },
+            "description": "Theme export"
+          },
+          "400": {
+            "$ref": "#/components/responses/400"
+          },
+          "401": {
+            "$ref": "#/components/responses/401"
+          },
+          "404": {
+            "$ref": "#/components/responses/404"
+          },
+          "422": {
+            "$ref": "#/components/responses/422"
+          },
+          "500": {
+            "$ref": "#/components/responses/500"
+          }
+        },
+        "security": [
+          {
+            "jwt": []
+          }
+        ],
+        "summary": "Download multiple themes as YAML files",
+        "tags": [
+          "Themes"
+        ],
+        "x-codeSamples": [
+          {
+            "lang": "cURL",
+            "label": "cURL",
+            "source": "curl -X GET \"http://localhost:8088/api/v1/theme/export/\" \\\n  -H \"Authorization: Bearer $ACCESS_TOKEN\""
+          },
+          {
+            "lang": "Python",
+            "label": "Python",
+            "source": "import requests\n\nresponse = requests.get(\n    \"http://localhost:8088/api/v1/theme/export/\",\n    headers={\"Authorization\": \"Bearer \" + access_token}\n)\nprint(response.json())"
+          },
+          {
+            "lang": "JavaScript",
+            "label": "JavaScript",
+            "source": "const response = await fetch(\n  \"http://localhost:8088/api/v1/theme/export/\",\n  {\n    headers: {\n      \"Authorization\": `Bearer ${accessToken}`\n    }\n  }\n);\nconst data = await response.json();\nconsole.log(data);"
+          }
+        ]
+      }
+    },
+    "/api/v1/theme/import/": {
+      "post": {
+        "requestBody": {
+          "content": {
+            "multipart/form-data": {
+              "schema": {
+                "properties": {
+                  "formData": {
+                    "format": "binary",
+                    "type": "string"
+                  },
+                  "overwrite": {
+                    "type": "string"
+                  }
+                },
+                "type": "object"
+              }
+            }
+          },
+          "required": true
+        },
+        "responses": {
+          "200": {
+            "content": {
+              "application/json": {
+                "schema": {
+                  "properties": {
+                    "message": {
+                      "type": "string"
+                    }
+                  },
+                  "type": "object"
+                },
+                "example": {
+                  "message": "string"
+                }
+              }
+            },
+            "description": "Theme imported"
+          },
+          "400": {
+            "$ref": "#/components/responses/400"
+          },
+          "401": {
+            "$ref": "#/components/responses/401"
+          },
+          "422": {
+            "$ref": "#/components/responses/422"
+          },
+          "500": {
+            "$ref": "#/components/responses/500"
+          }
+        },
+        "security": [
+          {
+            "jwt": []
+          }
+        ],
+        "summary": "Import themes from a ZIP file",
+        "tags": [
+          "Themes"
+        ],
+        "x-codeSamples": [
+          {
+            "lang": "cURL",
+            "label": "cURL",
+            "source": "curl -X POST \"http://localhost:8088/api/v1/theme/import/\" \\\n  -H \"Authorization: Bearer $ACCESS_TOKEN\" \\\n  -H \"Content-Type: application/json\" \\\n  -d '{\"key\": \"value\"}'"
+          },
+          {
+            "lang": "Python",
+            "label": "Python",
+            "source": "import requests\n\nresponse = requests.post(\n    \"http://localhost:8088/api/v1/theme/import/\",\n    headers={\"Authorization\": \"Bearer \" + access_token},\n    json={\"key\": \"value\"}\n)\nprint(response.json())"
+          },
+          {
+            "lang": "JavaScript",
+            "label": "JavaScript",
+            "source": "const response = await fetch(\n  \"http://localhost:8088/api/v1/theme/import/\",\n  {\n    method: \"POST\",\n    headers: {\n      \"Authorization\": `Bearer ${accessToken}`,\n      \"Content-Type\": \"application/json\"\n    },\n    body: JSON.stringify({ key: \"value\" })\n  }\n);\nconst data = await response.json();\nconsole.log(data);"
+          }
+        ]
+      }
+    },
+    "/api/v1/theme/related/{column_name}": {
+      "get": {
+        "parameters": [
+          {
+            "in": "path",
+            "name": "column_name",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/get_related_schema"
+                }
+              }
+            },
+            "in": "query",
+            "name": "q"
+          }
+        ],
+        "responses": {
+          "200": {
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/RelatedResponseSchema"
+                },
+                "example": {
+                  "count": 1,
+                  "result": []
+                }
+              }
+            },
+            "description": "Related column data"
+          },
+          "400": {
+            "$ref": "#/components/responses/400"
+          },
+          "401": {
+            "$ref": "#/components/responses/401"
+          },
+          "404": {
+            "$ref": "#/components/responses/404"
+          },
+          "500": {
+            "$ref": "#/components/responses/500"
+          }
+        },
+        "security": [
+          {
+            "jwt": []
+          }
+        ],
+        "summary": "Get related fields data (theme-related-column-name)",
+        "tags": [
+          "Themes"
+        ],
+        "x-codeSamples": [
+          {
+            "lang": "cURL",
+            "label": "cURL",
+            "source": "curl -X GET \"http://localhost:8088/api/v1/theme/related/{column_name}\" \\\n  -H \"Authorization: Bearer $ACCESS_TOKEN\""
+          },
+          {
+            "lang": "Python",
+            "label": "Python",
+            "source": "import requests\n\nresponse = requests.get(\n    \"http://localhost:8088/api/v1/theme/related/{column_name}\",\n    headers={\"Authorization\": \"Bearer \" + access_token}\n)\nprint(response.json())"
+          },
+          {
+            "lang": "JavaScript",
+            "label": "JavaScript",
+            "source": "const response = await fetch(\n  \"http://localhost:8088/api/v1/theme/related/{column_name}\",\n  {\n    headers: {\n      \"Authorization\": `Bearer ${accessToken}`\n    }\n  }\n);\nconst data = await response.json();\nconsole.log(data);"
+          }
+        ]
+      }
+    },
+    "/api/v1/theme/unset_system_dark": {
+      "delete": {
+        "responses": {
+          "200": {
+            "content": {
+              "application/json": {
+                "schema": {
+                  "properties": {
+                    "result": {
+                      "type": "string"
+                    }
+                  },
+                  "type": "object"
+                },
+                "example": {
+                  "result": "string"
+                }
+              }
+            },
+            "description": "System dark theme cleared"
+          },
+          "401": {
+            "$ref": "#/components/responses/401"
+          },
+          "403": {
+            "$ref": "#/components/responses/403"
+          },
+          "500": {
+            "$ref": "#/components/responses/500"
+          }
+        },
+        "security": [
+          {
+            "jwt": []
+          }
+        ],
+        "summary": "Clear the system dark theme",
+        "tags": [
+          "Themes"
+        ],
+        "x-codeSamples": [
+          {
+            "lang": "cURL",
+            "label": "cURL",
+            "source": "curl -X DELETE \"http://localhost:8088/api/v1/theme/unset_system_dark\" \\\n  -H \"Authorization: Bearer $ACCESS_TOKEN\""
+          },
+          {
+            "lang": "Python",
+            "label": "Python",
+            "source": "import requests\n\nresponse = requests.delete(\n    \"http://localhost:8088/api/v1/theme/unset_system_dark\",\n    headers={\"Authorization\": \"Bearer \" + access_token}\n)\nprint(response.status_code)"
+          },
+          {
+            "lang": "JavaScript",
+            "label": "JavaScript",
+            "source": "const response = await fetch(\n  \"http://localhost:8088/api/v1/theme/unset_system_dark\",\n  {\n    method: \"DELETE\",\n    headers: {\n      \"Authorization\": `Bearer ${accessToken}`\n    }\n  }\n);\nconsole.log(response.status);"
+          }
+        ]
+      }
+    },
+    "/api/v1/theme/unset_system_default": {
+      "delete": {
+        "responses": {
+          "200": {
+            "content": {
+              "application/json": {
+                "schema": {
+                  "properties": {
+                    "result": {
+                      "type": "string"
+                    }
+                  },
+                  "type": "object"
+                },
+                "example": {
+                  "result": "string"
+                }
+              }
+            },
+            "description": "System default theme cleared"
+          },
+          "401": {
+            "$ref": "#/components/responses/401"
+          },
+          "403": {
+            "$ref": "#/components/responses/403"
+          },
+          "500": {
+            "$ref": "#/components/responses/500"
+          }
+        },
+        "security": [
+          {
+            "jwt": []
+          }
+        ],
+        "summary": "Clear the system default theme",
+        "tags": [
+          "Themes"
+        ],
+        "x-codeSamples": [
+          {
+            "lang": "cURL",
+            "label": "cURL",
+            "source": "curl -X DELETE \"http://localhost:8088/api/v1/theme/unset_system_default\" \\\n  -H \"Authorization: Bearer $ACCESS_TOKEN\""
+          },
+          {
+            "lang": "Python",
+            "label": "Python",
+            "source": "import requests\n\nresponse = requests.delete(\n    \"http://localhost:8088/api/v1/theme/unset_system_default\",\n    headers={\"Authorization\": \"Bearer \" + access_token}\n)\nprint(response.status_code)"
+          },
+          {
+            "lang": "JavaScript",
+            "label": "JavaScript",
+            "source": "const response = await fetch(\n  \"http://localhost:8088/api/v1/theme/unset_system_default\",\n  {\n    method: \"DELETE\",\n    headers: {\n      \"Authorization\": `Bearer ${accessToken}`\n    }\n  }\n);\nconsole.log(response.status);"
+          }
+        ]
+      }
+    },
+    "/api/v1/theme/{pk}": {
+      "delete": {
+        "parameters": [
+          {
+            "in": "path",
+            "name": "pk",
+            "required": true,
+            "schema": {
+              "type": "integer"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "content": {
+              "application/json": {
+                "schema": {
+                  "properties": {
+                    "message": {
+                      "type": "string"
+                    }
+                  },
+                  "type": "object"
+                },
+                "example": {
+                  "message": "string"
+                }
+              }
+            },
+            "description": "Theme deleted"
+          },
+          "401": {
+            "$ref": "#/components/responses/401"
+          },
+          "403": {
+            "$ref": "#/components/responses/403"
+          },
+          "404": {
+            "$ref": "#/components/responses/404"
+          },
+          "422": {
+            "$ref": "#/components/responses/422"
+          },
+          "500": {
+            "$ref": "#/components/responses/500"
+          }
+        },
+        "security": [
+          {
+            "jwt": []
+          }
+        ],
+        "summary": "Delete a theme",
+        "tags": [
+          "Themes"
+        ],
+        "x-codeSamples": [
+          {
+            "lang": "cURL",
+            "label": "cURL",
+            "source": "curl -X DELETE \"http://localhost:8088/api/v1/theme/1\" \\\n  -H \"Authorization: Bearer $ACCESS_TOKEN\""
+          },
+          {
+            "lang": "Python",
+            "label": "Python",
+            "source": "import requests\n\nresponse = requests.delete(\n    \"http://localhost:8088/api/v1/theme/1\",\n    headers={\"Authorization\": \"Bearer \" + access_token}\n)\nprint(response.status_code)"
+          },
+          {
+            "lang": "JavaScript",
+            "label": "JavaScript",
+            "source": "const response = await fetch(\n  \"http://localhost:8088/api/v1/theme/1\",\n  {\n    method: \"DELETE\",\n    headers: {\n      \"Authorization\": `Bearer ${accessToken}`\n    }\n  }\n);\nconsole.log(response.status);"
+          }
+        ]
+      },
+      "get": {
+        "description": "Get an item model",
+        "parameters": [
+          {
+            "in": "path",
+            "name": "pk",
+            "required": true,
+            "schema": {
+              "type": "integer"
+            }
+          },
+          {
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/get_item_schema"
+                }
+              }
+            },
+            "in": "query",
+            "name": "q"
+          }
+        ],
+        "responses": {
+          "200": {
+            "content": {
+              "application/json": {
+                "schema": {
+                  "properties": {
+                    "description_columns": {
+                      "properties": {
+                        "column_name": {
+                          "description": "The description for the column name. Will be translated by babel",
+                          "example": "A Nice description for the column",
+                          "type": "string"
+                        }
+                      },
+                      "type": "object"
+                    },
+                    "id": {
+                      "description": "The item id",
+                      "type": "string"
+                    },
+                    "label_columns": {
+                      "properties": {
+                        "column_name": {
+                          "description": "The label for the column name. Will be translated by babel",
+                          "example": "A Nice label for the column",
+                          "type": "string"
+                        }
+                      },
+                      "type": "object"
+                    },
+                    "result": {
+                      "$ref": "#/components/schemas/ThemeRestApi.get"
+                    },
+                    "show_columns": {
+                      "description": "A list of columns",
+                      "items": {
+                        "type": "string"
+                      },
+                      "type": "array"
+                    },
+                    "show_title": {
+                      "description": "A title to render. Will be translated by babel",
+                      "example": "Show Item Details",
+                      "type": "string"
+                    }
+                  },
+                  "type": "object"
+                },
+                "example": {
+                  "description_columns": {
+                    "column_name": "A Nice description for the column"
+                  },
+                  "id": "string",
+                  "label_columns": {
+                    "column_name": "A Nice label for the column"
+                  },
+                  "result": {
+                    "changed_on_delta_humanized": {},
+                    "id": 1,
+                    "is_system": true,
+                    "is_system_dark": true,
+                    "is_system_default": true,
+                    "json_data": "string",
+                    "theme_name": "string",
+                    "uuid": "550e8400-e29b-41d4-a716-446655440000"
+                  },
+                  "show_columns": [
+                    "string"
+                  ],
+                  "show_title": "Show Item Details"
+                }
+              }
+            },
+            "description": "Item from Model"
+          },
+          "400": {
+            "$ref": "#/components/responses/400"
+          },
+          "401": {
+            "$ref": "#/components/responses/401"
+          },
+          "404": {
+            "$ref": "#/components/responses/404"
+          },
+          "422": {
+            "$ref": "#/components/responses/422"
+          },
+          "500": {
+            "$ref": "#/components/responses/500"
+          }
+        },
+        "security": [
+          {
+            "jwt": []
+          }
+        ],
+        "summary": "Get a theme",
+        "tags": [
+          "Themes"
+        ],
+        "x-codeSamples": [
+          {
+            "lang": "cURL",
+            "label": "cURL",
+            "source": "curl -X GET \"http://localhost:8088/api/v1/theme/1\" \\\n  -H \"Authorization: Bearer $ACCESS_TOKEN\""
+          },
+          {
+            "lang": "Python",
+            "label": "Python",
+            "source": "import requests\n\nresponse = requests.get(\n    \"http://localhost:8088/api/v1/theme/1\",\n    headers={\"Authorization\": \"Bearer \" + access_token}\n)\nprint(response.json())"
+          },
+          {
+            "lang": "JavaScript",
+            "label": "JavaScript",
+            "source": "const response = await fetch(\n  \"http://localhost:8088/api/v1/theme/1\",\n  {\n    headers: {\n      \"Authorization\": `Bearer ${accessToken}`\n    }\n  }\n);\nconst data = await response.json();\nconsole.log(data);"
+          }
+        ]
+      },
+      "put": {
+        "parameters": [
+          {
+            "in": "path",
+            "name": "pk",
+            "required": true,
+            "schema": {
+              "type": "integer"
+            }
+          }
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/ThemeRestApi.put"
+              },
+              "example": {
+                "json_data": "string",
+                "theme_name": "string"
+              }
+            }
+          },
+          "description": "Theme schema",
+          "required": true
+        },
+        "responses": {
+          "200": {
+            "content": {
+              "application/json": {
+                "schema": {
+                  "properties": {
+                    "id": {
+                      "type": "number"
+                    },
+                    "result": {
+                      "$ref": "#/components/schemas/ThemeRestApi.put"
+                    }
+                  },
+                  "type": "object"
+                },
+                "example": {
+                  "id": 1.0,
+                  "result": {
+                    "json_data": "string",
+                    "theme_name": "string"
+                  }
+                }
+              }
+            },
+            "description": "Theme updated"
+          },
+          "400": {
+            "$ref": "#/components/responses/400"
+          },
+          "401": {
+            "$ref": "#/components/responses/401"
+          },
+          "403": {
+            "$ref": "#/components/responses/403"
+          },
+          "404": {
+            "$ref": "#/components/responses/404"
+          },
+          "422": {
+            "$ref": "#/components/responses/422"
+          },
+          "500": {
+            "$ref": "#/components/responses/500"
+          }
+        },
+        "security": [
+          {
+            "jwt": []
+          }
+        ],
+        "summary": "Update a theme",
+        "tags": [
+          "Themes"
+        ],
+        "x-codeSamples": [
+          {
+            "lang": "cURL",
+            "label": "cURL",
+            "source": "curl -X PUT \"http://localhost:8088/api/v1/theme/1\" \\\n  -H \"Authorization: Bearer $ACCESS_TOKEN\" \\\n  -H \"Content-Type: application/json\" \\\n  -d '{\"key\": \"value\"}'"
+          },
+          {
+            "lang": "Python",
+            "label": "Python",
+            "source": "import requests\n\nresponse = requests.put(\n    \"http://localhost:8088/api/v1/theme/1\",\n    headers={\"Authorization\": \"Bearer \" + access_token},\n    json={\"key\": \"value\"}\n)\nprint(response.json())"
+          },
+          {
+            "lang": "JavaScript",
+            "label": "JavaScript",
+            "source": "const response = await fetch(\n  \"http://localhost:8088/api/v1/theme/1\",\n  {\n    method: \"PUT\",\n    headers: {\n      \"Authorization\": `Bearer ${accessToken}`,\n      \"Content-Type\": \"application/json\"\n    },\n    body: JSON.stringify({ key: \"value\" })\n  }\n);\nconst data = await response.json();\nconsole.log(data);"
+          }
+        ]
+      }
+    },
+    "/api/v1/theme/{pk}/set_system_dark": {
+      "put": {
+        "parameters": [
+          {
+            "description": "The theme id",
+            "in": "path",
+            "name": "pk",
+            "required": true,
+            "schema": {
+              "type": "integer"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "content": {
+              "application/json": {
+                "schema": {
+                  "properties": {
+                    "id": {
+                      "type": "integer"
+                    },
+                    "result": {
+                      "type": "string"
+                    }
+                  },
+                  "type": "object"
+                },
+                "example": {
+                  "id": 1,
+                  "result": "string"
+                }
+              }
+            },
+            "description": "Theme successfully set as system dark"
+          },
+          "400": {
+            "$ref": "#/components/responses/400"
+          },
+          "401": {
+            "$ref": "#/components/responses/401"
+          },
+          "403": {
+            "$ref": "#/components/responses/403"
+          },
+          "404": {
+            "$ref": "#/components/responses/404"
+          },
+          "422": {
+            "$ref": "#/components/responses/422"
+          },
+          "500": {
+            "$ref": "#/components/responses/500"
+          }
+        },
+        "security": [
+          {
+            "jwt": []
+          }
+        ],
+        "summary": "Set a theme as the system dark theme",
+        "tags": [
+          "Themes"
+        ],
+        "x-codeSamples": [
+          {
+            "lang": "cURL",
+            "label": "cURL",
+            "source": "curl -X PUT \"http://localhost:8088/api/v1/theme/1/set_system_dark\" \\\n  -H \"Authorization: Bearer $ACCESS_TOKEN\""
+          },
+          {
+            "lang": "Python",
+            "label": "Python",
+            "source": "import requests\n\nresponse = requests.put(\n    \"http://localhost:8088/api/v1/theme/1/set_system_dark\",\n    headers={\"Authorization\": \"Bearer \" + access_token},\n    json={\"key\": \"value\"}\n)\nprint(response.json())"
+          },
+          {
+            "lang": "JavaScript",
+            "label": "JavaScript",
+            "source": "const response = await fetch(\n  \"http://localhost:8088/api/v1/theme/1/set_system_dark\",\n  {\n    method: \"PUT\",\n    headers: {\n      \"Authorization\": `Bearer ${accessToken}`,\n      \"Content-Type\": \"application/json\"\n    },\n    body: JSON.stringify({ key: \"value\" })\n  }\n);\nconst data = await response.json();\nconsole.log(data);"
+          }
+        ]
+      }
+    },
+    "/api/v1/theme/{pk}/set_system_default": {
+      "put": {
+        "parameters": [
+          {
+            "description": "The theme id",
+            "in": "path",
+            "name": "pk",
+            "required": true,
+            "schema": {
+              "type": "integer"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "content": {
+              "application/json": {
+                "schema": {
+                  "properties": {
+                    "id": {
+                      "type": "integer"
+                    },
+                    "result": {
+                      "type": "string"
+                    }
+                  },
+                  "type": "object"
+                },
+                "example": {
+                  "id": 1,
+                  "result": "string"
+                }
+              }
+            },
+            "description": "Theme successfully set as system default"
+          },
+          "400": {
+            "$ref": "#/components/responses/400"
+          },
+          "401": {
+            "$ref": "#/components/responses/401"
+          },
+          "403": {
+            "$ref": "#/components/responses/403"
+          },
+          "404": {
+            "$ref": "#/components/responses/404"
+          },
+          "422": {
+            "$ref": "#/components/responses/422"
+          },
+          "500": {
+            "$ref": "#/components/responses/500"
+          }
+        },
+        "security": [
+          {
+            "jwt": []
+          }
+        ],
+        "summary": "Set a theme as the system default theme",
+        "tags": [
+          "Themes"
+        ],
+        "x-codeSamples": [
+          {
+            "lang": "cURL",
+            "label": "cURL",
+            "source": "curl -X PUT \"http://localhost:8088/api/v1/theme/1/set_system_default\" \\\n  -H \"Authorization: Bearer $ACCESS_TOKEN\""
+          },
+          {
+            "lang": "Python",
+            "label": "Python",
+            "source": "import requests\n\nresponse = requests.put(\n    \"http://localhost:8088/api/v1/theme/1/set_system_default\",\n    headers={\"Authorization\": \"Bearer \" + access_token},\n    json={\"key\": \"value\"}\n)\nprint(response.json())"
+          },
+          {
+            "lang": "JavaScript",
+            "label": "JavaScript",
+            "source": "const response = await fetch(\n  \"http://localhost:8088/api/v1/theme/1/set_system_default\",\n  {\n    method: \"PUT\",\n    headers: {\n      \"Authorization\": `Bearer ${accessToken}`,\n      \"Content-Type\": \"application/json\"\n    },\n    body: JSON.stringify({ key: \"value\" })\n  }\n);\nconst data = await response.json();\nconsole.log(data);"
+          }
+        ]
+      }
+    },
     "/api/v1/user/{user_id}/avatar.png": {
       "get": {
         "description": "Gets the avatar URL for the user with the given ID, or returns a 401 error if the user is unauthenticated.",
@@ -35339,7 +39304,7 @@
   "tags": [
     {
       "name": "Advanced Data Type",
-      "description": "Endpoints for advanced data type operations and conversions."
+      "description": "Advanced data type operations and conversions."
     },
     {
       "name": "Annotation Layers",
@@ -35367,7 +39332,7 @@
     },
     {
       "name": "Current User",
-      "description": "Get information about the currently authenticated user."
+      "description": "Get information about the authenticated user."
     },
     {
       "name": "Dashboard Filter State",
@@ -35375,7 +39340,7 @@
     },
     {
       "name": "Dashboard Permanent Link",
-      "description": "Create and retrieve permanent links to dashboard states."
+      "description": "Permanent links to dashboard states."
     },
     {
       "name": "Dashboards",
@@ -35407,11 +39372,11 @@
     },
     {
       "name": "Explore Permanent Link",
-      "description": "Create and retrieve permanent links to chart explore states."
+      "description": "Permanent links to chart explore states."
     },
     {
       "name": "Import/export",
-      "description": "Import and export Superset assets (dashboards, charts, databases)."
+      "description": "Import and export Superset assets."
     },
     {
       "name": "LogRestApi",
@@ -35435,7 +39400,7 @@
     },
     {
       "name": "Row Level Security",
-      "description": "Manage row-level security rules for data access control."
+      "description": "Manage row-level security rules for data access."
     },
     {
       "name": "SQL Lab",
@@ -35443,19 +39408,23 @@
     },
     {
       "name": "SQL Lab Permanent Link",
-      "description": "Create and retrieve permanent links to SQL Lab states."
+      "description": "Permanent links to SQL Lab states."
     },
     {
       "name": "Security",
       "description": "Authentication and token management."
     },
+    {
+      "name": "Security Groups",
+      "description": "Endpoints related to Security Groups."
+    },
     {
       "name": "Security Permissions",
       "description": "View available permissions."
     },
     {
       "name": "Security Permissions on Resources (View Menus)",
-      "description": "Manage permission-resource mappings."
+      "description": "Permission-resource mappings."
     },
     {
       "name": "Security Resources (View Menus)",
@@ -35473,9 +39442,17 @@
       "name": "Tags",
       "description": "Organize assets with tags."
     },
+    {
+      "name": "Themes",
+      "description": "Manage UI themes for customizing Superset's appearance."
+    },
     {
       "name": "User",
       "description": "User profile and preferences."
+    },
+    {
+      "name": "UserRegistrationsRestAPI",
+      "description": "Endpoints related to UserRegistrationsRestAPI."
     }
   ]
 }
diff --git a/docs/tsconfig.json b/docs/tsconfig.json
index ff0f5ac238c..e505bfd86ae 100644
--- a/docs/tsconfig.json
+++ b/docs/tsconfig.json
@@ -3,6 +3,7 @@
   "extends": "@docusaurus/tsconfig",
   "compilerOptions": {
     "baseUrl": ".",
+    "ignoreDeprecations": "6.0",
     "skipLibCheck": true,
     "noImplicitAny": false,
     "strict": false,
diff --git a/docs/versioned_docs/version-6.0.0/configuration/configuring-superset.mdx b/docs/versioned_docs/version-6.0.0/configuration/configuring-superset.mdx
index d9fb2ca41a0..a61d05ecfe4 100644
--- a/docs/versioned_docs/version-6.0.0/configuration/configuring-superset.mdx
+++ b/docs/versioned_docs/version-6.0.0/configuration/configuring-superset.mdx
@@ -109,6 +109,14 @@ SECRET_KEY = 'YOUR_OWN_RANDOM_GENERATED_SECRET_KEY'
 
 You can generate a strong secure key with `openssl rand -base64 42`.
 
+Alternatively, you can set the secret key using `SUPERSET_SECRET_KEY` environment variable:
+
+On a Unix-based system, such as Linux or macOS, you can do so by running the following command in your terminal:
+
+```bash
+export SUPERSET_SECRET_KEY=$(openssl rand -base64 42)
+```
+
 :::caution Use a strong secret key
 This key will be used for securely signing session cookies and encrypting sensitive information stored in Superset's application metadata database.
 Your deployment must use a complex, unique key.
diff --git a/docs/versioned_docs/version-6.0.0/faq.mdx b/docs/versioned_docs/version-6.0.0/faq.mdx
index 10c6b267d1e..3a3b57f82b8 100644
--- a/docs/versioned_docs/version-6.0.0/faq.mdx
+++ b/docs/versioned_docs/version-6.0.0/faq.mdx
@@ -35,7 +35,7 @@ or a view.
 When working with tables, the solution would be to create a table that contains all the fields
 needed for your analysis, most likely through some scheduled batch process.
 
-A view is a simple logical layer that abstracts an arbitrary SQL queries as a virtual table. This can
+A view is a simple logical layer that abstracts an arbitrary SQL query as a virtual table. This can
 allow you to join and union multiple tables and to apply some transformation using arbitrary SQL
 expressions. The limitation there is your database performance, as Superset effectively will run a
 query on top of your query (view). A good practice may be to limit yourself to joining your main
diff --git a/docs/yarn.lock b/docs/yarn.lock
index 6f455ed271b..09f05421816 100644
--- a/docs/yarn.lock
+++ b/docs/yarn.lock
@@ -2,41 +2,6 @@
 # yarn lockfile v1
 
 
-"@ai-sdk/gateway@1.0.34":
-  version "1.0.34"
-  resolved "https://registry.npmjs.org/@ai-sdk/gateway/-/gateway-1.0.34.tgz"
-  integrity sha512-Vc/4fGlAW2uGmz6DnbRB9b7kdkbk4DQYNDYNdr/NHJxoaLsdNF3CE8i172rZ47+jEU2hGibcn5yivbgvjMi8Ig==
-  dependencies:
-    "@ai-sdk/provider" "2.0.0"
-    "@ai-sdk/provider-utils" "3.0.10"
-    "@vercel/oidc" "3.0.2"
-
-"@ai-sdk/provider-utils@3.0.10":
-  version "3.0.10"
-  resolved "https://registry.npmjs.org/@ai-sdk/provider-utils/-/provider-utils-3.0.10.tgz"
-  integrity sha512-T1gZ76gEIwffep6MWI0QNy9jgoybUHE7TRaHB5k54K8mF91ciGFlbtCGxDYhMH3nCRergKwYFIDeFF0hJSIQHQ==
-  dependencies:
-    "@ai-sdk/provider" "2.0.0"
-    "@standard-schema/spec" "^1.0.0"
-    eventsource-parser "^3.0.5"
-
-"@ai-sdk/provider@2.0.0":
-  version "2.0.0"
-  resolved "https://registry.npmjs.org/@ai-sdk/provider/-/provider-2.0.0.tgz"
-  integrity sha512-6o7Y2SeO9vFKB8lArHXehNuusnpddKPk7xqL7T2/b+OvXMRIXUO1rR4wcv1hAFUAT9avGZshty3Wlua/XA7TvA==
-  dependencies:
-    json-schema "^0.4.0"
-
-"@ai-sdk/react@^2.0.30":
-  version "2.0.61"
-  resolved "https://registry.npmjs.org/@ai-sdk/react/-/react-2.0.61.tgz"
-  integrity sha512-XYqIFnfW2C4LpT3ifFzLSshvqK6gX4sf1wpJTJ/ecLiwyZ83GIGIlqmDU4NopljqEU8eZjl2/QZQnM5qrG/PFA==
-  dependencies:
-    "@ai-sdk/provider-utils" "3.0.10"
-    ai "5.0.61"
-    swr "^2.2.5"
-    throttleit "2.1.0"
-
 "@algolia/abtesting@1.6.0":
   version "1.6.0"
   resolved "https://registry.npmjs.org/@algolia/abtesting/-/abtesting-1.6.0.tgz"
@@ -55,6 +20,14 @@
     "@algolia/autocomplete-plugin-algolia-insights" "1.19.2"
     "@algolia/autocomplete-shared" "1.19.2"
 
+"@algolia/autocomplete-core@^1.19.2":
+  version "1.19.8"
+  resolved "https://registry.yarnpkg.com/@algolia/autocomplete-core/-/autocomplete-core-1.19.8.tgz#7c84c771d28643fb00d09026c05013fb97aeea23"
+  integrity sha512-3YEorYg44niXcm7gkft3nXYItHd44e8tmh4D33CTszPgP0QWkaLEaFywiNyJBo7UL/mqObA/G9RYuU7R8tN1IA==
+  dependencies:
+    "@algolia/autocomplete-plugin-algolia-insights" "1.19.8"
+    "@algolia/autocomplete-shared" "1.19.8"
+
 "@algolia/autocomplete-plugin-algolia-insights@1.19.2":
   version "1.19.2"
   resolved "https://registry.npmjs.org/@algolia/autocomplete-plugin-algolia-insights/-/autocomplete-plugin-algolia-insights-1.19.2.tgz"
@@ -62,11 +35,23 @@
   dependencies:
     "@algolia/autocomplete-shared" "1.19.2"
 
+"@algolia/autocomplete-plugin-algolia-insights@1.19.8":
+  version "1.19.8"
+  resolved "https://registry.yarnpkg.com/@algolia/autocomplete-plugin-algolia-insights/-/autocomplete-plugin-algolia-insights-1.19.8.tgz#f60d21edbe2a42e6d4e2215430733e3f51641471"
+  integrity sha512-ZvJWO8ZZJDpc1LNM2TTBdmQsZBLMR4rU5iNR2OYvEeFBiaf/0ESnRSSLQbryarJY4SVxtoz6A2ZtDMNM+iQEAA==
+  dependencies:
+    "@algolia/autocomplete-shared" "1.19.8"
+
 "@algolia/autocomplete-shared@1.19.2":
   version "1.19.2"
   resolved "https://registry.npmjs.org/@algolia/autocomplete-shared/-/autocomplete-shared-1.19.2.tgz"
   integrity sha512-jEazxZTVD2nLrC+wYlVHQgpBoBB5KPStrJxLzsIFl6Kqd1AlG9sIAGl39V5tECLpIQzB3Qa2T6ZPJ1ChkwMK/w==
 
+"@algolia/autocomplete-shared@1.19.8":
+  version "1.19.8"
+  resolved "https://registry.yarnpkg.com/@algolia/autocomplete-shared/-/autocomplete-shared-1.19.8.tgz#5d723d8bdb448efbb1b0e1c7ff94cc18e5b1dc0e"
+  integrity sha512-h5hf2t8ejF6vlOgvLaZzQbWs5SyH2z4PAWygNAvvD/2RI29hdQ54ldUGwqVuj9Srs+n8XUKTPUqb7fvhBhQrnQ==
+
 "@algolia/client-abtesting@5.40.0":
   version "5.40.0"
   resolved "https://registry.npmjs.org/@algolia/client-abtesting/-/client-abtesting-5.40.0.tgz"
@@ -227,10 +212,10 @@
   resolved "https://registry.npmjs.org/@ant-design/icons-svg/-/icons-svg-4.4.2.tgz"
   integrity sha512-vHbT+zJEVzllwP+CM+ul7reTEfBR0vgxFe7+lREAsAA7YGsYpboiq2sQNeQeRvh09GfQgs/GyFEvZpJ9cLXpXA==
 
-"@ant-design/icons@^6.1.0":
-  version "6.1.0"
-  resolved "https://registry.npmjs.org/@ant-design/icons/-/icons-6.1.0.tgz"
-  integrity sha512-KrWMu1fIg3w/1F2zfn+JlfNDU8dDqILfA5Tg85iqs1lf8ooyGlbkA+TkwfOKKgqpUmAiRY1PTFpuOU2DAIgSUg==
+"@ant-design/icons@^6.1.1":
+  version "6.1.1"
+  resolved "https://registry.yarnpkg.com/@ant-design/icons/-/icons-6.1.1.tgz#068963d3de44ff7034dce32c9cec3ff7d343fe6b"
+  integrity sha512-AMT4N2y++TZETNHiM77fs4a0uPVCJGuL5MTonk13Pvv7UN7sID1cNEZOc1qNqx6zLKAOilTEFAdAoAFKa0U//Q==
   dependencies:
     "@ant-design/colors" "^8.0.0"
     "@ant-design/icons-svg" "^4.4.0"
@@ -260,14 +245,12 @@
   resolved "https://registry.npmjs.org/@antfu/utils/-/utils-8.1.1.tgz"
   integrity sha512-Mex9nXf9vR6AhcXmMrlz/HVgYYZpVGJ6YlPgwl7UnaFpnshXs6EK/oa5Gpf3CzENMjkvEx2tQtntGnb7UtSTOQ==
 
-"@apidevtools/json-schema-ref-parser@^11.5.4":
-  version "11.9.3"
-  resolved "https://registry.npmjs.org/@apidevtools/json-schema-ref-parser/-/json-schema-ref-parser-11.9.3.tgz"
-  integrity sha512-60vepv88RwcJtSHrD6MjIL6Ta3SOYbgfnkHb+ppAVK+o9mXprRtulx7VlRl3lN3bbvysAfCS7WMVfhUYemB0IQ==
+"@apidevtools/json-schema-ref-parser@^15.3.3":
+  version "15.3.5"
+  resolved "https://registry.yarnpkg.com/@apidevtools/json-schema-ref-parser/-/json-schema-ref-parser-15.3.5.tgz#503726178d8d792eea7b195566272aaee6837e2f"
+  integrity sha512-orNOYXw3hYXxxisXMldjzjBzqqTLBPbwOtHg7ovBPvfBHDue1qM9YJENZ3W2BQuS+7z4ThogMbEzEsov57Itkg==
   dependencies:
-    "@jsdevtools/ono" "^7.1.3"
-    "@types/json-schema" "^7.0.15"
-    js-yaml "^4.1.0"
+    js-yaml "^4.1.1"
 
 "@babel/code-frame@^7.0.0", "@babel/code-frame@^7.28.6":
   version "7.28.6"
@@ -1146,7 +1129,7 @@
     "@babel/plugin-transform-modules-commonjs" "^7.27.1"
     "@babel/plugin-transform-typescript" "^7.27.1"
 
-"@babel/runtime-corejs3@^7.20.7", "@babel/runtime-corejs3@^7.22.15", "@babel/runtime-corejs3@^7.25.9", "@babel/runtime-corejs3@^7.26.10", "@babel/runtime-corejs3@^7.27.1":
+"@babel/runtime-corejs3@^7.20.7", "@babel/runtime-corejs3@^7.22.15", "@babel/runtime-corejs3@^7.26.10", "@babel/runtime-corejs3@^7.27.1":
   version "7.28.3"
   resolved "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.28.3.tgz"
   integrity sha512-LKYxD2CIfocUFNREQ1yk+dW+8OH8CRqmgatBZYXb+XhuObO8wsDpEoCNri5bKld9cnj8xukqZjxSX8p1YiRF8Q==
@@ -1568,28 +1551,29 @@
   resolved "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz"
   integrity sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw==
 
-"@docsearch/css@4.2.0":
-  version "4.2.0"
-  resolved "https://registry.npmjs.org/@docsearch/css/-/css-4.2.0.tgz"
-  integrity sha512-65KU9Fw5fGsPPPlgIghonMcndyx1bszzrDQYLfierN+Ha29yotMHzVS94bPkZS6On9LS8dE4qmW4P/fGjtCf/g==
+"@docsearch/core@4.6.2":
+  version "4.6.2"
+  resolved "https://registry.yarnpkg.com/@docsearch/core/-/core-4.6.2.tgz#0a6fdc13b1eb12153cb19316f911479b67f7bd58"
+  integrity sha512-/S0e6Dj7Zcm8m9Rru49YEX49dhU11be68c+S/BCyN8zQsTTgkKzXlhRbVL5mV6lOLC2+ZRRryaTdcm070Ug2oA==
 
-"@docsearch/react@^3.9.0 || ^4.1.0":
-  version "4.2.0"
-  resolved "https://registry.npmjs.org/@docsearch/react/-/react-4.2.0.tgz"
-  integrity sha512-zSN/KblmtBcerf7Z87yuKIHZQmxuXvYc6/m0+qnjyNu+Ir67AVOagTa1zBqcxkVUVkmBqUExdcyrdo9hbGbqTw==
+"@docsearch/css@4.6.2":
+  version "4.6.2"
+  resolved "https://registry.yarnpkg.com/@docsearch/css/-/css-4.6.2.tgz#986776619dccbf798176c75e858cc22f5e710bb4"
+  integrity sha512-fH/cn8BjEEdM2nJdjNMHIvOVYupG6AIDtFVDgIZrNzdCSj4KXr9kd+hsehqsNGYjpUjObeKYKvgy/IwCb1jZYQ==
+
+"@docsearch/react@^3.9.0 || ^4.3.2":
+  version "4.6.2"
+  resolved "https://registry.yarnpkg.com/@docsearch/react/-/react-4.6.2.tgz#e6c65fb87fb943eefaa936debe6d31bb51b25056"
+  integrity sha512-/BbtGFtqVOGwZx0dw/UfhN/0/DmMQYnulY4iv0tPRhC2JCXv0ka/+izwt3Jzo1ZxXS/2eMvv9zHsBJOK1I9f/w==
   dependencies:
-    "@ai-sdk/react" "^2.0.30"
     "@algolia/autocomplete-core" "1.19.2"
-    "@docsearch/css" "4.2.0"
-    ai "^5.0.30"
-    algoliasearch "^5.28.0"
-    marked "^16.3.0"
-    zod "^4.1.8"
+    "@docsearch/core" "4.6.2"
+    "@docsearch/css" "4.6.2"
 
-"@docusaurus/babel@3.9.2":
-  version "3.9.2"
-  resolved "https://registry.npmjs.org/@docusaurus/babel/-/babel-3.9.2.tgz"
-  integrity sha512-GEANdi/SgER+L7Japs25YiGil/AUDnFFHaCGPBbundxoWtCkA2lmy7/tFmgED4y1htAy6Oi4wkJEQdGssnw9MA==
+"@docusaurus/babel@3.10.0":
+  version "3.10.0"
+  resolved "https://registry.yarnpkg.com/@docusaurus/babel/-/babel-3.10.0.tgz#819819f107233dfcf50b59cd51158f23fb04878a"
+  integrity sha512-mqCJhCZNZUDg0zgDEaPTM4DnRsisa24HdqTy/qn/MQlbwhTb4WVaZg6ZyX6yIVKqTz8fS1hBMgM+98z+BeJJDg==
   dependencies:
     "@babel/core" "^7.25.9"
     "@babel/generator" "^7.25.9"
@@ -1599,25 +1583,24 @@
     "@babel/preset-react" "^7.25.9"
     "@babel/preset-typescript" "^7.25.9"
     "@babel/runtime" "^7.25.9"
-    "@babel/runtime-corejs3" "^7.25.9"
     "@babel/traverse" "^7.25.9"
-    "@docusaurus/logger" "3.9.2"
-    "@docusaurus/utils" "3.9.2"
+    "@docusaurus/logger" "3.10.0"
+    "@docusaurus/utils" "3.10.0"
     babel-plugin-dynamic-import-node "^2.3.3"
     fs-extra "^11.1.1"
     tslib "^2.6.0"
 
-"@docusaurus/bundler@3.9.2":
-  version "3.9.2"
-  resolved "https://registry.npmjs.org/@docusaurus/bundler/-/bundler-3.9.2.tgz"
-  integrity sha512-ZOVi6GYgTcsZcUzjblpzk3wH1Fya2VNpd5jtHoCCFcJlMQ1EYXZetfAnRHLcyiFeBABaI1ltTYbOBtH/gahGVA==
+"@docusaurus/bundler@3.10.0":
+  version "3.10.0"
+  resolved "https://registry.yarnpkg.com/@docusaurus/bundler/-/bundler-3.10.0.tgz#878c4c46bfa3434671ea37a43da184238a6aae26"
+  integrity sha512-iONUGZGgp+lAkw/cJZH6irONcF4p8+278IsdRlq8lYhxGjkoNUs0w7F4gVXBYSNChq5KG5/JleTSsdJySShxow==
   dependencies:
     "@babel/core" "^7.25.9"
-    "@docusaurus/babel" "3.9.2"
-    "@docusaurus/cssnano-preset" "3.9.2"
-    "@docusaurus/logger" "3.9.2"
-    "@docusaurus/types" "3.9.2"
-    "@docusaurus/utils" "3.9.2"
+    "@docusaurus/babel" "3.10.0"
+    "@docusaurus/cssnano-preset" "3.10.0"
+    "@docusaurus/logger" "3.10.0"
+    "@docusaurus/types" "3.10.0"
+    "@docusaurus/utils" "3.10.0"
     babel-loader "^9.2.1"
     clean-css "^5.3.3"
     copy-webpack-plugin "^11.0.0"
@@ -1637,18 +1620,18 @@
     webpack "^5.95.0"
     webpackbar "^6.0.1"
 
-"@docusaurus/core@3.9.2":
-  version "3.9.2"
-  resolved "https://registry.npmjs.org/@docusaurus/core/-/core-3.9.2.tgz"
-  integrity sha512-HbjwKeC+pHUFBfLMNzuSjqFE/58+rLVKmOU3lxQrpsxLBOGosYco/Q0GduBb0/jEMRiyEqjNT/01rRdOMWq5pw==
+"@docusaurus/core@3.10.0", "@docusaurus/core@^3.10.0":
+  version "3.10.0"
+  resolved "https://registry.yarnpkg.com/@docusaurus/core/-/core-3.10.0.tgz#642e71a0209d62c3f5ef275ed9d74a881f40df39"
+  integrity sha512-mgLdQsO8xppnQZc3LPi+Mf+PkPeyxJeIx11AXAq/14fsaMefInQiMEZUUmrc7J+956G/f7MwE7tn8KZgi3iRcA==
   dependencies:
-    "@docusaurus/babel" "3.9.2"
-    "@docusaurus/bundler" "3.9.2"
-    "@docusaurus/logger" "3.9.2"
-    "@docusaurus/mdx-loader" "3.9.2"
-    "@docusaurus/utils" "3.9.2"
-    "@docusaurus/utils-common" "3.9.2"
-    "@docusaurus/utils-validation" "3.9.2"
+    "@docusaurus/babel" "3.10.0"
+    "@docusaurus/bundler" "3.10.0"
+    "@docusaurus/logger" "3.10.0"
+    "@docusaurus/mdx-loader" "3.10.0"
+    "@docusaurus/utils" "3.10.0"
+    "@docusaurus/utils-common" "3.10.0"
+    "@docusaurus/utils-validation" "3.10.0"
     boxen "^6.2.1"
     chalk "^4.1.2"
     chokidar "^3.5.3"
@@ -1660,7 +1643,7 @@
     escape-html "^1.0.3"
     eta "^2.2.0"
     eval "^0.1.8"
-    execa "5.1.1"
+    execa "^5.1.1"
     fs-extra "^11.1.1"
     html-tags "^3.3.1"
     html-webpack-plugin "^5.6.0"
@@ -1671,12 +1654,12 @@
     prompts "^2.4.2"
     react-helmet-async "npm:@slorber/react-helmet-async@1.3.0"
     react-loadable "npm:@docusaurus/react-loadable@6.0.0"
-    react-loadable-ssr-addon-v5-slorber "^1.0.1"
+    react-loadable-ssr-addon-v5-slorber "^1.0.3"
     react-router "^5.3.4"
     react-router-config "^5.1.1"
     react-router-dom "^5.3.4"
     semver "^7.5.4"
-    serve-handler "^6.1.6"
+    serve-handler "^6.1.7"
     tinypool "^1.0.2"
     tslib "^2.6.0"
     update-notifier "^6.0.2"
@@ -1685,47 +1668,48 @@
     webpack-dev-server "^5.2.2"
     webpack-merge "^6.0.1"
 
-"@docusaurus/cssnano-preset@3.9.2":
-  version "3.9.2"
-  resolved "https://registry.npmjs.org/@docusaurus/cssnano-preset/-/cssnano-preset-3.9.2.tgz"
-  integrity sha512-8gBKup94aGttRduABsj7bpPFTX7kbwu+xh3K9NMCF5K4bWBqTFYW+REKHF6iBVDHRJ4grZdIPbvkiHd/XNKRMQ==
+"@docusaurus/cssnano-preset@3.10.0":
+  version "3.10.0"
+  resolved "https://registry.yarnpkg.com/@docusaurus/cssnano-preset/-/cssnano-preset-3.10.0.tgz#be1b435c33df09d743473d3fadda67b4568dfae3"
+  integrity sha512-qzSshTO1DB3TYW+dPUal5KHM7XPc5YQfzF3Kdb2NDACJUyGbNcFtw3tGkCJlYwhNCRKbZcmwraKUS1i5dcHdGg==
   dependencies:
     cssnano-preset-advanced "^6.1.2"
     postcss "^8.5.4"
     postcss-sort-media-queries "^5.2.0"
     tslib "^2.6.0"
 
-"@docusaurus/faster@^3.9.2":
-  version "3.9.2"
-  resolved "https://registry.yarnpkg.com/@docusaurus/faster/-/faster-3.9.2.tgz#47b69f39ed935fdcc8dc03896274fca29056e962"
-  integrity sha512-DEVIwhbrZZ4ir31X+qQNEQqDWkgCJUV6kiPPAd2MGTY8n5/n0c4B8qA5k1ipF2izwH00JEf0h6Daaut71zzkyw==
+"@docusaurus/faster@^3.10.0":
+  version "3.10.0"
+  resolved "https://registry.yarnpkg.com/@docusaurus/faster/-/faster-3.10.0.tgz#0758a93196f685537aa7700bde62faf926e6c817"
+  integrity sha512-GNPtVH14ISjHfSwnHu3KiFGf86ICmJSQDeSv/QaanpBgiZGOtgZaslnC5q8WiguxM1EVkwcGxPuD8BXF4eggKw==
   dependencies:
-    "@docusaurus/types" "3.9.2"
-    "@rspack/core" "^1.5.0"
+    "@docusaurus/types" "3.10.0"
+    "@rspack/core" "^1.7.10"
     "@swc/core" "^1.7.39"
     "@swc/html" "^1.13.5"
     browserslist "^4.24.2"
     lightningcss "^1.27.0"
+    semver "^7.5.4"
     swc-loader "^0.2.6"
     tslib "^2.6.0"
     webpack "^5.95.0"
 
-"@docusaurus/logger@3.9.2":
-  version "3.9.2"
-  resolved "https://registry.npmjs.org/@docusaurus/logger/-/logger-3.9.2.tgz"
-  integrity sha512-/SVCc57ByARzGSU60c50rMyQlBuMIJCjcsJlkphxY6B0GV4UH3tcA1994N8fFfbJ9kX3jIBe/xg3XP5qBtGDbA==
+"@docusaurus/logger@3.10.0":
+  version "3.10.0"
+  resolved "https://registry.yarnpkg.com/@docusaurus/logger/-/logger-3.10.0.tgz#2bacbd004dd78e3da926dbe8f6fa9a930856575d"
+  integrity sha512-9jrZzFuBH1LDRlZ7cznAhCLmAZ3HSDqgwdrSSZdGHq9SPUOQgXXu8mnxe2ZRB9NS1PCpMTIOVUqDtZPIhMafZg==
   dependencies:
     chalk "^4.1.2"
     tslib "^2.6.0"
 
-"@docusaurus/mdx-loader@3.9.2":
-  version "3.9.2"
-  resolved "https://registry.npmjs.org/@docusaurus/mdx-loader/-/mdx-loader-3.9.2.tgz"
-  integrity sha512-wiYoGwF9gdd6rev62xDU8AAM8JuLI/hlwOtCzMmYcspEkzecKrP8J8X+KpYnTlACBUUtXNJpSoCwFWJhLRevzQ==
+"@docusaurus/mdx-loader@3.10.0":
+  version "3.10.0"
+  resolved "https://registry.yarnpkg.com/@docusaurus/mdx-loader/-/mdx-loader-3.10.0.tgz#1d4b050d751389ecf38dee48bcb61e53df8ffb82"
+  integrity sha512-mQQV97080AH4PYNs087l202NMDqRopZA4mg5W76ZZyTFrmWhJ3mHg+8A+drJVENxw5/Q+wHMHLgsx+9z1nEs0A==
   dependencies:
-    "@docusaurus/logger" "3.9.2"
-    "@docusaurus/utils" "3.9.2"
-    "@docusaurus/utils-validation" "3.9.2"
+    "@docusaurus/logger" "3.10.0"
+    "@docusaurus/utils" "3.10.0"
+    "@docusaurus/utils-validation" "3.10.0"
     "@mdx-js/mdx" "^3.0.0"
     "@slorber/remark-comment" "^1.0.0"
     escape-html "^1.0.3"
@@ -1748,12 +1732,12 @@
     vfile "^6.0.1"
     webpack "^5.88.1"
 
-"@docusaurus/module-type-aliases@3.9.2", "@docusaurus/module-type-aliases@^3.9.1":
-  version "3.9.2"
-  resolved "https://registry.npmjs.org/@docusaurus/module-type-aliases/-/module-type-aliases-3.9.2.tgz"
-  integrity sha512-8qVe2QA9hVLzvnxP46ysuofJUIc/yYQ82tvA/rBTrnpXtCjNSFLxEZfd5U8cYZuJIVlkPxamsIgwd5tGZXfvew==
+"@docusaurus/module-type-aliases@3.10.0", "@docusaurus/module-type-aliases@^3.10.0":
+  version "3.10.0"
+  resolved "https://registry.yarnpkg.com/@docusaurus/module-type-aliases/-/module-type-aliases-3.10.0.tgz#749928f104d563f11f046bf0c9ab6489a470c7c8"
+  integrity sha512-/1O0Zg8w3DFrYX/I6Fbss7OJrtZw1QoyjDhegiFNHVi9A9Y0gQ3jUAytVxF6ywpAWpLyLxch8nN8H/V3XfzdJQ==
   dependencies:
-    "@docusaurus/types" "3.9.2"
+    "@docusaurus/types" "3.10.0"
     "@types/history" "^4.7.11"
     "@types/react" "*"
     "@types/react-router-config" "*"
@@ -1761,35 +1745,36 @@
     react-helmet-async "npm:@slorber/react-helmet-async@1.3.0"
     react-loadable "npm:@docusaurus/react-loadable@6.0.0"
 
-"@docusaurus/plugin-client-redirects@3.9.2":
-  version "3.9.2"
-  resolved "https://registry.npmjs.org/@docusaurus/plugin-client-redirects/-/plugin-client-redirects-3.9.2.tgz"
-  integrity sha512-lUgMArI9vyOYMzLRBUILcg9vcPTCyyI2aiuXq/4npcMVqOr6GfmwtmBYWSbNMlIUM0147smm4WhpXD0KFboffw==
+"@docusaurus/plugin-client-redirects@^3.10.0":
+  version "3.10.0"
+  resolved "https://registry.yarnpkg.com/@docusaurus/plugin-client-redirects/-/plugin-client-redirects-3.10.0.tgz#4dd4619817fd69462d1e6d986580343aeb911111"
+  integrity sha512-P+VLoLoZTc74so8+IbsaPZ33/mkf2BWL1CYXQpPRkl0v1QVCN2CgfsZY/8QtbYjQnx2upXUnv45abDhNcSggNw==
   dependencies:
-    "@docusaurus/core" "3.9.2"
-    "@docusaurus/logger" "3.9.2"
-    "@docusaurus/utils" "3.9.2"
-    "@docusaurus/utils-common" "3.9.2"
-    "@docusaurus/utils-validation" "3.9.2"
+    "@docusaurus/core" "3.10.0"
+    "@docusaurus/logger" "3.10.0"
+    "@docusaurus/utils" "3.10.0"
+    "@docusaurus/utils-common" "3.10.0"
+    "@docusaurus/utils-validation" "3.10.0"
     eta "^2.2.0"
     fs-extra "^11.1.1"
     lodash "^4.17.21"
     tslib "^2.6.0"
 
-"@docusaurus/plugin-content-blog@3.9.2":
-  version "3.9.2"
-  resolved "https://registry.npmjs.org/@docusaurus/plugin-content-blog/-/plugin-content-blog-3.9.2.tgz"
-  integrity sha512-3I2HXy3L1QcjLJLGAoTvoBnpOwa6DPUa3Q0dMK19UTY9mhPkKQg/DYhAGTiBUKcTR0f08iw7kLPqOhIgdV3eVQ==
+"@docusaurus/plugin-content-blog@3.10.0":
+  version "3.10.0"
+  resolved "https://registry.yarnpkg.com/@docusaurus/plugin-content-blog/-/plugin-content-blog-3.10.0.tgz#10095291b637440847854ecb2c8afcd8746debd7"
+  integrity sha512-RuTz68DhB7CL96QO5UsFbciD7GPYq6QV+YMfF9V0+N4ZgLhJIBgpVAr8GobrKF6NRe5cyWWETU5z5T834piG9g==
   dependencies:
-    "@docusaurus/core" "3.9.2"
-    "@docusaurus/logger" "3.9.2"
-    "@docusaurus/mdx-loader" "3.9.2"
-    "@docusaurus/theme-common" "3.9.2"
-    "@docusaurus/types" "3.9.2"
-    "@docusaurus/utils" "3.9.2"
-    "@docusaurus/utils-common" "3.9.2"
-    "@docusaurus/utils-validation" "3.9.2"
+    "@docusaurus/core" "3.10.0"
+    "@docusaurus/logger" "3.10.0"
+    "@docusaurus/mdx-loader" "3.10.0"
+    "@docusaurus/theme-common" "3.10.0"
+    "@docusaurus/types" "3.10.0"
+    "@docusaurus/utils" "3.10.0"
+    "@docusaurus/utils-common" "3.10.0"
+    "@docusaurus/utils-validation" "3.10.0"
     cheerio "1.0.0-rc.12"
+    combine-promises "^1.1.0"
     feed "^4.2.2"
     fs-extra "^11.1.1"
     lodash "^4.17.21"
@@ -1800,20 +1785,20 @@
     utility-types "^3.10.0"
     webpack "^5.88.1"
 
-"@docusaurus/plugin-content-docs@3.9.2":
-  version "3.9.2"
-  resolved "https://registry.npmjs.org/@docusaurus/plugin-content-docs/-/plugin-content-docs-3.9.2.tgz"
-  integrity sha512-C5wZsGuKTY8jEYsqdxhhFOe1ZDjH0uIYJ9T/jebHwkyxqnr4wW0jTkB72OMqNjsoQRcb0JN3PcSeTwFlVgzCZg==
+"@docusaurus/plugin-content-docs@3.10.0":
+  version "3.10.0"
+  resolved "https://registry.yarnpkg.com/@docusaurus/plugin-content-docs/-/plugin-content-docs-3.10.0.tgz#9c4ea1d5a405340f28c281d2e4586c695a7c65a5"
+  integrity sha512-9BjHhf15ct8Z7TThTC0xRndKDVvMKmVsAGAN7W9FpNRzfMdScOGcXtLmcCWtJGvAezjOJIm6CxOYCy3Io5+RnQ==
   dependencies:
-    "@docusaurus/core" "3.9.2"
-    "@docusaurus/logger" "3.9.2"
-    "@docusaurus/mdx-loader" "3.9.2"
-    "@docusaurus/module-type-aliases" "3.9.2"
-    "@docusaurus/theme-common" "3.9.2"
-    "@docusaurus/types" "3.9.2"
-    "@docusaurus/utils" "3.9.2"
-    "@docusaurus/utils-common" "3.9.2"
-    "@docusaurus/utils-validation" "3.9.2"
+    "@docusaurus/core" "3.10.0"
+    "@docusaurus/logger" "3.10.0"
+    "@docusaurus/mdx-loader" "3.10.0"
+    "@docusaurus/module-type-aliases" "3.10.0"
+    "@docusaurus/theme-common" "3.10.0"
+    "@docusaurus/types" "3.10.0"
+    "@docusaurus/utils" "3.10.0"
+    "@docusaurus/utils-common" "3.10.0"
+    "@docusaurus/utils-validation" "3.10.0"
     "@types/react-router-config" "^5.0.7"
     combine-promises "^1.1.0"
     fs-extra "^11.1.1"
@@ -1824,144 +1809,145 @@
     utility-types "^3.10.0"
     webpack "^5.88.1"
 
-"@docusaurus/plugin-content-pages@3.9.2":
-  version "3.9.2"
-  resolved "https://registry.npmjs.org/@docusaurus/plugin-content-pages/-/plugin-content-pages-3.9.2.tgz"
-  integrity sha512-s4849w/p4noXUrGpPUF0BPqIAfdAe76BLaRGAGKZ1gTDNiGxGcpsLcwJ9OTi1/V8A+AzvsmI9pkjie2zjIQZKA==
+"@docusaurus/plugin-content-pages@3.10.0":
+  version "3.10.0"
+  resolved "https://registry.yarnpkg.com/@docusaurus/plugin-content-pages/-/plugin-content-pages-3.10.0.tgz#7670cbb3c849f434949f542bfdfded1580a13165"
+  integrity sha512-5amX8kEJI+nIGtuLVjYk59Y5utEJ3CHETFOPEE4cooIRLA4xM4iBsA6zFgu4ljcopeYwvBzFEWf5g2I6Yb9SkA==
   dependencies:
-    "@docusaurus/core" "3.9.2"
-    "@docusaurus/mdx-loader" "3.9.2"
-    "@docusaurus/types" "3.9.2"
-    "@docusaurus/utils" "3.9.2"
-    "@docusaurus/utils-validation" "3.9.2"
+    "@docusaurus/core" "3.10.0"
+    "@docusaurus/mdx-loader" "3.10.0"
+    "@docusaurus/types" "3.10.0"
+    "@docusaurus/utils" "3.10.0"
+    "@docusaurus/utils-validation" "3.10.0"
     fs-extra "^11.1.1"
     tslib "^2.6.0"
     webpack "^5.88.1"
 
-"@docusaurus/plugin-css-cascade-layers@3.9.2":
-  version "3.9.2"
-  resolved "https://registry.npmjs.org/@docusaurus/plugin-css-cascade-layers/-/plugin-css-cascade-layers-3.9.2.tgz"
-  integrity sha512-w1s3+Ss+eOQbscGM4cfIFBlVg/QKxyYgj26k5AnakuHkKxH6004ZtuLe5awMBotIYF2bbGDoDhpgQ4r/kcj4rQ==
+"@docusaurus/plugin-css-cascade-layers@3.10.0":
+  version "3.10.0"
+  resolved "https://registry.yarnpkg.com/@docusaurus/plugin-css-cascade-layers/-/plugin-css-cascade-layers-3.10.0.tgz#71e318d842be95f92be6c3dca00ceea4971d0edb"
+  integrity sha512-6q1vtt5FJcg5osgkHeM1euErECNqEZ5Z1j69yiNx2luEBIso+nxCkS9nqj8w+MK5X7rvKEToGhFfOFWncs51pQ==
   dependencies:
-    "@docusaurus/core" "3.9.2"
-    "@docusaurus/types" "3.9.2"
-    "@docusaurus/utils" "3.9.2"
-    "@docusaurus/utils-validation" "3.9.2"
+    "@docusaurus/core" "3.10.0"
+    "@docusaurus/types" "3.10.0"
+    "@docusaurus/utils" "3.10.0"
+    "@docusaurus/utils-validation" "3.10.0"
     tslib "^2.6.0"
 
-"@docusaurus/plugin-debug@3.9.2":
-  version "3.9.2"
-  resolved "https://registry.npmjs.org/@docusaurus/plugin-debug/-/plugin-debug-3.9.2.tgz"
-  integrity sha512-j7a5hWuAFxyQAkilZwhsQ/b3T7FfHZ+0dub6j/GxKNFJp2h9qk/P1Bp7vrGASnvA9KNQBBL1ZXTe7jlh4VdPdA==
+"@docusaurus/plugin-debug@3.10.0":
+  version "3.10.0"
+  resolved "https://registry.yarnpkg.com/@docusaurus/plugin-debug/-/plugin-debug-3.10.0.tgz#e77f924604e1e09d5d90fe0bdf23a3be8ea3307e"
+  integrity sha512-XcljKN+G+nmmK69uQA1d9BlYU3ZftG3T3zpK8/7Hf/wrOlV7TA4Ampdrdwkg0jElKdKAoSnPhCO0/U3bQGsVQQ==
   dependencies:
-    "@docusaurus/core" "3.9.2"
-    "@docusaurus/types" "3.9.2"
-    "@docusaurus/utils" "3.9.2"
+    "@docusaurus/core" "3.10.0"
+    "@docusaurus/types" "3.10.0"
+    "@docusaurus/utils" "3.10.0"
     fs-extra "^11.1.1"
     react-json-view-lite "^2.3.0"
     tslib "^2.6.0"
 
-"@docusaurus/plugin-google-analytics@3.9.2":
-  version "3.9.2"
-  resolved "https://registry.npmjs.org/@docusaurus/plugin-google-analytics/-/plugin-google-analytics-3.9.2.tgz"
-  integrity sha512-mAwwQJ1Us9jL/lVjXtErXto4p4/iaLlweC54yDUK1a97WfkC6Z2k5/769JsFgwOwOP+n5mUQGACXOEQ0XDuVUw==
+"@docusaurus/plugin-google-analytics@3.10.0":
+  version "3.10.0"
+  resolved "https://registry.yarnpkg.com/@docusaurus/plugin-google-analytics/-/plugin-google-analytics-3.10.0.tgz#22c7e976fe4d970c7cd1c73c9723d9a5786c6e37"
+  integrity sha512-hTEoodatpBZnUat5nFExbuTGA1lhWGy7vZGuTew5Q3QDtGKFpSJLYmZJhdTjvCFwv1+qQ67hgAVlKdJOB8TXow==
   dependencies:
-    "@docusaurus/core" "3.9.2"
-    "@docusaurus/types" "3.9.2"
-    "@docusaurus/utils-validation" "3.9.2"
+    "@docusaurus/core" "3.10.0"
+    "@docusaurus/types" "3.10.0"
+    "@docusaurus/utils-validation" "3.10.0"
     tslib "^2.6.0"
 
-"@docusaurus/plugin-google-gtag@3.9.2":
-  version "3.9.2"
-  resolved "https://registry.npmjs.org/@docusaurus/plugin-google-gtag/-/plugin-google-gtag-3.9.2.tgz"
-  integrity sha512-YJ4lDCphabBtw19ooSlc1MnxtYGpjFV9rEdzjLsUnBCeis2djUyCozZaFhCg6NGEwOn7HDDyMh0yzcdRpnuIvA==
+"@docusaurus/plugin-google-gtag@3.10.0":
+  version "3.10.0"
+  resolved "https://registry.yarnpkg.com/@docusaurus/plugin-google-gtag/-/plugin-google-gtag-3.10.0.tgz#c38a2ba638257851cc845b934506b80c08d47f96"
+  integrity sha512-iB/Zzjv/eelJRbdULZqzWCbgMgJ7ht4ONVjXtN3+BI/muil6S87gQ1OJyPwlXD+ELdKkitC7bWv5eJdYOZLhrQ==
   dependencies:
-    "@docusaurus/core" "3.9.2"
-    "@docusaurus/types" "3.9.2"
-    "@docusaurus/utils-validation" "3.9.2"
-    "@types/gtag.js" "^0.0.12"
+    "@docusaurus/core" "3.10.0"
+    "@docusaurus/types" "3.10.0"
+    "@docusaurus/utils-validation" "3.10.0"
+    "@types/gtag.js" "^0.0.20"
     tslib "^2.6.0"
 
-"@docusaurus/plugin-google-tag-manager@3.9.2":
-  version "3.9.2"
-  resolved "https://registry.npmjs.org/@docusaurus/plugin-google-tag-manager/-/plugin-google-tag-manager-3.9.2.tgz"
-  integrity sha512-LJtIrkZN/tuHD8NqDAW1Tnw0ekOwRTfobWPsdO15YxcicBo2ykKF0/D6n0vVBfd3srwr9Z6rzrIWYrMzBGrvNw==
+"@docusaurus/plugin-google-tag-manager@3.10.0":
+  version "3.10.0"
+  resolved "https://registry.yarnpkg.com/@docusaurus/plugin-google-tag-manager/-/plugin-google-tag-manager-3.10.0.tgz#5469c923cc1ad4608399d0b17e5fcacd8e030d56"
+  integrity sha512-FEjZxqKgLHa+Wez/EgKxRwvArNCWIScfyEQD95rot7jkxp6nonjI5XIbGfO/iYhM5Qinwe8aIEQHP2KZtpqVuA==
   dependencies:
-    "@docusaurus/core" "3.9.2"
-    "@docusaurus/types" "3.9.2"
-    "@docusaurus/utils-validation" "3.9.2"
+    "@docusaurus/core" "3.10.0"
+    "@docusaurus/types" "3.10.0"
+    "@docusaurus/utils-validation" "3.10.0"
     tslib "^2.6.0"
 
-"@docusaurus/plugin-sitemap@3.9.2":
-  version "3.9.2"
-  resolved "https://registry.npmjs.org/@docusaurus/plugin-sitemap/-/plugin-sitemap-3.9.2.tgz"
-  integrity sha512-WLh7ymgDXjG8oPoM/T4/zUP7KcSuFYRZAUTl8vR6VzYkfc18GBM4xLhcT+AKOwun6kBivYKUJf+vlqYJkm+RHw==
+"@docusaurus/plugin-sitemap@3.10.0":
+  version "3.10.0"
+  resolved "https://registry.yarnpkg.com/@docusaurus/plugin-sitemap/-/plugin-sitemap-3.10.0.tgz#35d59d46803f279f22aa64fc1bd18c048f12662b"
+  integrity sha512-DVTSLjB97hIjmayGnGcBfognCeI7ZuUKgEnU7Oz81JYqXtVg94mVTthDjq3QHTylYNeCUbkaW8VF0FDLcc8pPw==
   dependencies:
-    "@docusaurus/core" "3.9.2"
-    "@docusaurus/logger" "3.9.2"
-    "@docusaurus/types" "3.9.2"
-    "@docusaurus/utils" "3.9.2"
-    "@docusaurus/utils-common" "3.9.2"
-    "@docusaurus/utils-validation" "3.9.2"
+    "@docusaurus/core" "3.10.0"
+    "@docusaurus/logger" "3.10.0"
+    "@docusaurus/types" "3.10.0"
+    "@docusaurus/utils" "3.10.0"
+    "@docusaurus/utils-common" "3.10.0"
+    "@docusaurus/utils-validation" "3.10.0"
     fs-extra "^11.1.1"
     sitemap "^7.1.1"
     tslib "^2.6.0"
 
-"@docusaurus/plugin-svgr@3.9.2":
-  version "3.9.2"
-  resolved "https://registry.npmjs.org/@docusaurus/plugin-svgr/-/plugin-svgr-3.9.2.tgz"
-  integrity sha512-n+1DE+5b3Lnf27TgVU5jM1d4x5tUh2oW5LTsBxJX4PsAPV0JGcmI6p3yLYtEY0LRVEIJh+8RsdQmRE66wSV8mw==
+"@docusaurus/plugin-svgr@3.10.0":
+  version "3.10.0"
+  resolved "https://registry.yarnpkg.com/@docusaurus/plugin-svgr/-/plugin-svgr-3.10.0.tgz#8ada2e6dd8318d20206a9b044fc091a5794ba3f0"
+  integrity sha512-lNljBESaETZqVBMPqkrGchr+UPT1eZzEPLmJhz8I76BxbjqgsUnRvrq6lQJ9sYjgmgX52KB7kkgczqd2yzoswQ==
   dependencies:
-    "@docusaurus/core" "3.9.2"
-    "@docusaurus/types" "3.9.2"
-    "@docusaurus/utils" "3.9.2"
-    "@docusaurus/utils-validation" "3.9.2"
+    "@docusaurus/core" "3.10.0"
+    "@docusaurus/types" "3.10.0"
+    "@docusaurus/utils" "3.10.0"
+    "@docusaurus/utils-validation" "3.10.0"
     "@svgr/core" "8.1.0"
     "@svgr/webpack" "^8.1.0"
     tslib "^2.6.0"
     webpack "^5.88.1"
 
-"@docusaurus/preset-classic@3.9.2":
-  version "3.9.2"
-  resolved "https://registry.npmjs.org/@docusaurus/preset-classic/-/preset-classic-3.9.2.tgz"
-  integrity sha512-IgyYO2Gvaigi21LuDIe+nvmN/dfGXAiMcV/murFqcpjnZc7jxFAxW+9LEjdPt61uZLxG4ByW/oUmX/DDK9t/8w==
+"@docusaurus/preset-classic@3.10.0":
+  version "3.10.0"
+  resolved "https://registry.yarnpkg.com/@docusaurus/preset-classic/-/preset-classic-3.10.0.tgz#74b6facdaf568bcd41ec90cae9aebb7ca0ac8619"
+  integrity sha512-kw/Ye02Hc6xP1OdTswy8yxQEHg0fdPpyWAQRxr5b2x3h7LlG2Zgbb5BDFROnXDDMpUxB7YejlocJIE5HIEfpNA==
   dependencies:
-    "@docusaurus/core" "3.9.2"
-    "@docusaurus/plugin-content-blog" "3.9.2"
-    "@docusaurus/plugin-content-docs" "3.9.2"
-    "@docusaurus/plugin-content-pages" "3.9.2"
-    "@docusaurus/plugin-css-cascade-layers" "3.9.2"
-    "@docusaurus/plugin-debug" "3.9.2"
-    "@docusaurus/plugin-google-analytics" "3.9.2"
-    "@docusaurus/plugin-google-gtag" "3.9.2"
-    "@docusaurus/plugin-google-tag-manager" "3.9.2"
-    "@docusaurus/plugin-sitemap" "3.9.2"
-    "@docusaurus/plugin-svgr" "3.9.2"
-    "@docusaurus/theme-classic" "3.9.2"
-    "@docusaurus/theme-common" "3.9.2"
-    "@docusaurus/theme-search-algolia" "3.9.2"
-    "@docusaurus/types" "3.9.2"
+    "@docusaurus/core" "3.10.0"
+    "@docusaurus/plugin-content-blog" "3.10.0"
+    "@docusaurus/plugin-content-docs" "3.10.0"
+    "@docusaurus/plugin-content-pages" "3.10.0"
+    "@docusaurus/plugin-css-cascade-layers" "3.10.0"
+    "@docusaurus/plugin-debug" "3.10.0"
+    "@docusaurus/plugin-google-analytics" "3.10.0"
+    "@docusaurus/plugin-google-gtag" "3.10.0"
+    "@docusaurus/plugin-google-tag-manager" "3.10.0"
+    "@docusaurus/plugin-sitemap" "3.10.0"
+    "@docusaurus/plugin-svgr" "3.10.0"
+    "@docusaurus/theme-classic" "3.10.0"
+    "@docusaurus/theme-common" "3.10.0"
+    "@docusaurus/theme-search-algolia" "3.10.0"
+    "@docusaurus/types" "3.10.0"
 
-"@docusaurus/theme-classic@3.9.2":
-  version "3.9.2"
-  resolved "https://registry.npmjs.org/@docusaurus/theme-classic/-/theme-classic-3.9.2.tgz"
-  integrity sha512-IGUsArG5hhekXd7RDb11v94ycpJpFdJPkLnt10fFQWOVxAtq5/D7hT6lzc2fhyQKaaCE62qVajOMKL7OiAFAIA==
+"@docusaurus/theme-classic@3.10.0":
+  version "3.10.0"
+  resolved "https://registry.yarnpkg.com/@docusaurus/theme-classic/-/theme-classic-3.10.0.tgz#d937915c691189f27ced649c822994d839ea565b"
+  integrity sha512-9msCAsRdN+UG+RwPwCFb0uKy4tGoPh5YfBozXeGUtIeAgsMdn6f3G/oY861luZ3t8S2ET8S9Y/1GnpJAGWytww==
   dependencies:
-    "@docusaurus/core" "3.9.2"
-    "@docusaurus/logger" "3.9.2"
-    "@docusaurus/mdx-loader" "3.9.2"
-    "@docusaurus/module-type-aliases" "3.9.2"
-    "@docusaurus/plugin-content-blog" "3.9.2"
-    "@docusaurus/plugin-content-docs" "3.9.2"
-    "@docusaurus/plugin-content-pages" "3.9.2"
-    "@docusaurus/theme-common" "3.9.2"
-    "@docusaurus/theme-translations" "3.9.2"
-    "@docusaurus/types" "3.9.2"
-    "@docusaurus/utils" "3.9.2"
-    "@docusaurus/utils-common" "3.9.2"
-    "@docusaurus/utils-validation" "3.9.2"
+    "@docusaurus/core" "3.10.0"
+    "@docusaurus/logger" "3.10.0"
+    "@docusaurus/mdx-loader" "3.10.0"
+    "@docusaurus/module-type-aliases" "3.10.0"
+    "@docusaurus/plugin-content-blog" "3.10.0"
+    "@docusaurus/plugin-content-docs" "3.10.0"
+    "@docusaurus/plugin-content-pages" "3.10.0"
+    "@docusaurus/theme-common" "3.10.0"
+    "@docusaurus/theme-translations" "3.10.0"
+    "@docusaurus/types" "3.10.0"
+    "@docusaurus/utils" "3.10.0"
+    "@docusaurus/utils-common" "3.10.0"
+    "@docusaurus/utils-validation" "3.10.0"
     "@mdx-js/react" "^3.0.0"
     clsx "^2.0.0"
+    copy-text-to-clipboard "^3.2.0"
     infima "0.2.0-alpha.45"
     lodash "^4.17.21"
     nprogress "^0.2.0"
@@ -1973,15 +1959,15 @@
     tslib "^2.6.0"
     utility-types "^3.10.0"
 
-"@docusaurus/theme-common@3.9.2":
-  version "3.9.2"
-  resolved "https://registry.npmjs.org/@docusaurus/theme-common/-/theme-common-3.9.2.tgz"
-  integrity sha512-6c4DAbR6n6nPbnZhY2V3tzpnKnGL+6aOsLvFL26VRqhlczli9eWG0VDUNoCQEPnGwDMhPS42UhSAnz5pThm5Ag==
+"@docusaurus/theme-common@3.10.0":
+  version "3.10.0"
+  resolved "https://registry.yarnpkg.com/@docusaurus/theme-common/-/theme-common-3.10.0.tgz#70b419ccfdf62f092299354a72d1692e81be597d"
+  integrity sha512-Dkp1YXKn16ByCJAdIjbDIOpVb4Z66MsVD694/ilX1vAAHaVEMrVsf/NPd9VgreyFx08rJ9GqV1MtzsbTcU73Kg==
   dependencies:
-    "@docusaurus/mdx-loader" "3.9.2"
-    "@docusaurus/module-type-aliases" "3.9.2"
-    "@docusaurus/utils" "3.9.2"
-    "@docusaurus/utils-common" "3.9.2"
+    "@docusaurus/mdx-loader" "3.10.0"
+    "@docusaurus/module-type-aliases" "3.10.0"
+    "@docusaurus/utils" "3.10.0"
+    "@docusaurus/utils-common" "3.10.0"
     "@types/history" "^4.7.11"
     "@types/react" "*"
     "@types/react-router-config" "*"
@@ -1991,47 +1977,48 @@
     tslib "^2.6.0"
     utility-types "^3.10.0"
 
-"@docusaurus/theme-live-codeblock@^3.9.2":
-  version "3.9.2"
-  resolved "https://registry.npmjs.org/@docusaurus/theme-live-codeblock/-/theme-live-codeblock-3.9.2.tgz"
-  integrity sha512-cgxxZh18dI5Q4iV0GLmwqXtgZbTLOnb0TYgZRiUh0mnIGbuNWFUhUYXXl5owKbDfIXFdFAiI/owJKM83howEAw==
+"@docusaurus/theme-live-codeblock@^3.10.0":
+  version "3.10.0"
+  resolved "https://registry.yarnpkg.com/@docusaurus/theme-live-codeblock/-/theme-live-codeblock-3.10.0.tgz#05a38c6bfac479fd698f18f27ca06ebb126633d9"
+  integrity sha512-1Ycxu0dBAhEXzXPQ1dQW01aY1MNi7TCTUOBtIF0GcNrQBFj74XxhDqv/T6GxYBsaN+6QnIDs1T+D43iV2/r2hQ==
   dependencies:
-    "@docusaurus/core" "3.9.2"
-    "@docusaurus/theme-common" "3.9.2"
-    "@docusaurus/theme-translations" "3.9.2"
-    "@docusaurus/utils-validation" "3.9.2"
+    "@docusaurus/core" "3.10.0"
+    "@docusaurus/theme-common" "3.10.0"
+    "@docusaurus/theme-translations" "3.10.0"
+    "@docusaurus/utils-validation" "3.10.0"
     "@philpl/buble" "^0.19.7"
     clsx "^2.0.0"
     fs-extra "^11.1.1"
     react-live "^4.1.6"
     tslib "^2.6.0"
 
-"@docusaurus/theme-mermaid@^3.9.2":
-  version "3.9.2"
-  resolved "https://registry.npmjs.org/@docusaurus/theme-mermaid/-/theme-mermaid-3.9.2.tgz"
-  integrity sha512-5vhShRDq/ntLzdInsQkTdoKWSzw8d1jB17sNPYhA/KvYYFXfuVEGHLM6nrf8MFbV8TruAHDG21Fn3W4lO8GaDw==
+"@docusaurus/theme-mermaid@^3.10.0":
+  version "3.10.0"
+  resolved "https://registry.yarnpkg.com/@docusaurus/theme-mermaid/-/theme-mermaid-3.10.0.tgz#6581ccf16d27e4c02fe8c7cf15488862f27be9c8"
+  integrity sha512-Y2xrlwhIJ80oOZIO3PXL6A7J869splfcMI87E3NKpYsy3zJxOyV+BP1QMtGi59ajKgU868HPuyyn6J+6BZGOBg==
   dependencies:
-    "@docusaurus/core" "3.9.2"
-    "@docusaurus/module-type-aliases" "3.9.2"
-    "@docusaurus/theme-common" "3.9.2"
-    "@docusaurus/types" "3.9.2"
-    "@docusaurus/utils-validation" "3.9.2"
+    "@docusaurus/core" "3.10.0"
+    "@docusaurus/module-type-aliases" "3.10.0"
+    "@docusaurus/theme-common" "3.10.0"
+    "@docusaurus/types" "3.10.0"
+    "@docusaurus/utils-validation" "3.10.0"
     mermaid ">=11.6.0"
     tslib "^2.6.0"
 
-"@docusaurus/theme-search-algolia@3.9.2":
-  version "3.9.2"
-  resolved "https://registry.npmjs.org/@docusaurus/theme-search-algolia/-/theme-search-algolia-3.9.2.tgz"
-  integrity sha512-GBDSFNwjnh5/LdkxCKQHkgO2pIMX1447BxYUBG2wBiajS21uj64a+gH/qlbQjDLxmGrbrllBrtJkUHxIsiwRnw==
+"@docusaurus/theme-search-algolia@3.10.0":
+  version "3.10.0"
+  resolved "https://registry.yarnpkg.com/@docusaurus/theme-search-algolia/-/theme-search-algolia-3.10.0.tgz#0ff57fe58db6abde8f5ad2877e459cd2fa6e7464"
+  integrity sha512-f5FPKI08e3JRG63vR/o4qeuUVHUHzFzM0nnF+AkB67soAZgNsKJRf2qmUZvlQkGwlV+QFkKe4D0ANMh1jToU3g==
   dependencies:
-    "@docsearch/react" "^3.9.0 || ^4.1.0"
-    "@docusaurus/core" "3.9.2"
-    "@docusaurus/logger" "3.9.2"
-    "@docusaurus/plugin-content-docs" "3.9.2"
-    "@docusaurus/theme-common" "3.9.2"
-    "@docusaurus/theme-translations" "3.9.2"
-    "@docusaurus/utils" "3.9.2"
-    "@docusaurus/utils-validation" "3.9.2"
+    "@algolia/autocomplete-core" "^1.19.2"
+    "@docsearch/react" "^3.9.0 || ^4.3.2"
+    "@docusaurus/core" "3.10.0"
+    "@docusaurus/logger" "3.10.0"
+    "@docusaurus/plugin-content-docs" "3.10.0"
+    "@docusaurus/theme-common" "3.10.0"
+    "@docusaurus/theme-translations" "3.10.0"
+    "@docusaurus/utils" "3.10.0"
+    "@docusaurus/utils-validation" "3.10.0"
     algoliasearch "^5.37.0"
     algoliasearch-helper "^3.26.0"
     clsx "^2.0.0"
@@ -2041,23 +2028,23 @@
     tslib "^2.6.0"
     utility-types "^3.10.0"
 
-"@docusaurus/theme-translations@3.9.2":
-  version "3.9.2"
-  resolved "https://registry.npmjs.org/@docusaurus/theme-translations/-/theme-translations-3.9.2.tgz"
-  integrity sha512-vIryvpP18ON9T9rjgMRFLr2xJVDpw1rtagEGf8Ccce4CkTrvM/fRB8N2nyWYOW5u3DdjkwKw5fBa+3tbn9P4PA==
+"@docusaurus/theme-translations@3.10.0":
+  version "3.10.0"
+  resolved "https://registry.yarnpkg.com/@docusaurus/theme-translations/-/theme-translations-3.10.0.tgz#8fdc23d29bd7f907db49c36cf65e2123d96be300"
+  integrity sha512-L9IbFLwTc5+XdgH45iQYufLn0SVZd6BUNelDbKIFlH+E4hhjuj/XHWAFMX/w2K59rfy8wak9McOaei7BSUfRPA==
   dependencies:
     fs-extra "^11.1.1"
     tslib "^2.6.0"
 
-"@docusaurus/tsconfig@^3.9.2":
-  version "3.9.2"
-  resolved "https://registry.npmjs.org/@docusaurus/tsconfig/-/tsconfig-3.9.2.tgz"
-  integrity sha512-j6/Fp4Rlpxsc632cnRnl5HpOWeb6ZKssDj6/XzzAzVGXXfm9Eptx3rxCC+fDzySn9fHTS+CWJjPineCR1bB5WQ==
+"@docusaurus/tsconfig@^3.10.0":
+  version "3.10.0"
+  resolved "https://registry.yarnpkg.com/@docusaurus/tsconfig/-/tsconfig-3.10.0.tgz#f40a57248828f0503a5f355cf30aa59941c9baaa"
+  integrity sha512-TXdC3WXuPrdQAexLvjUJfnYf3YKEgEqAs5nK0Q88pRBCW7t7oN4ILvWYb3A5Z1wlSXyXGWW/mCUmLEhdWsjnDQ==
 
-"@docusaurus/types@3.9.2":
-  version "3.9.2"
-  resolved "https://registry.npmjs.org/@docusaurus/types/-/types-3.9.2.tgz"
-  integrity sha512-Ux1JUNswg+EfUEmajJjyhIohKceitY/yzjRUpu04WXgvVz+fbhVC0p+R0JhvEu4ytw8zIAys2hrdpQPBHRIa8Q==
+"@docusaurus/types@3.10.0":
+  version "3.10.0"
+  resolved "https://registry.yarnpkg.com/@docusaurus/types/-/types-3.10.0.tgz#a69232bba74b738fcf4671fd5f0f079366dd3d13"
+  integrity sha512-F0dOt3FOoO20rRaFK7whGFQZ3ggyrWEdQc/c8/UiRuzhtg4y1w9FspXH5zpCT07uMnJKBPGh+qNazbNlCQqvSw==
   dependencies:
     "@mdx-js/mdx" "^3.0.0"
     "@types/history" "^4.7.11"
@@ -2070,38 +2057,38 @@
     webpack "^5.95.0"
     webpack-merge "^5.9.0"
 
-"@docusaurus/utils-common@3.9.2":
-  version "3.9.2"
-  resolved "https://registry.npmjs.org/@docusaurus/utils-common/-/utils-common-3.9.2.tgz"
-  integrity sha512-I53UC1QctruA6SWLvbjbhCpAw7+X7PePoe5pYcwTOEXD/PxeP8LnECAhTHHwWCblyUX5bMi4QLRkxvyZ+IT8Aw==
+"@docusaurus/utils-common@3.10.0":
+  version "3.10.0"
+  resolved "https://registry.yarnpkg.com/@docusaurus/utils-common/-/utils-common-3.10.0.tgz#2a6dc76b312664fca7234d33607c085318ff1ae3"
+  integrity sha512-JyL7sb9QVDgYvudIS81Dv0lsWm7le0vGZSDwsztxWam1SPBqrnkvBy9UYL/amh6pbybkyYTd3CMTkO24oMlCSw==
   dependencies:
-    "@docusaurus/types" "3.9.2"
+    "@docusaurus/types" "3.10.0"
     tslib "^2.6.0"
 
-"@docusaurus/utils-validation@3.9.2":
-  version "3.9.2"
-  resolved "https://registry.npmjs.org/@docusaurus/utils-validation/-/utils-validation-3.9.2.tgz"
-  integrity sha512-l7yk3X5VnNmATbwijJkexdhulNsQaNDwoagiwujXoxFbWLcxHQqNQ+c/IAlzrfMMOfa/8xSBZ7KEKDesE/2J7A==
+"@docusaurus/utils-validation@3.10.0":
+  version "3.10.0"
+  resolved "https://registry.yarnpkg.com/@docusaurus/utils-validation/-/utils-validation-3.10.0.tgz#a2418d7f31980d991fd3a1f39c8aad8820b36812"
+  integrity sha512-c+6n2+ZPOJtWWc8Bb/EYdpSDfjYEScdCu9fB/SNjOmSCf1IdVnGf2T53o0tsz0gDRtCL90tifTL0JE/oMuP1Mw==
   dependencies:
-    "@docusaurus/logger" "3.9.2"
-    "@docusaurus/utils" "3.9.2"
-    "@docusaurus/utils-common" "3.9.2"
+    "@docusaurus/logger" "3.10.0"
+    "@docusaurus/utils" "3.10.0"
+    "@docusaurus/utils-common" "3.10.0"
     fs-extra "^11.2.0"
     joi "^17.9.2"
     js-yaml "^4.1.0"
     lodash "^4.17.21"
     tslib "^2.6.0"
 
-"@docusaurus/utils@3.9.2":
-  version "3.9.2"
-  resolved "https://registry.npmjs.org/@docusaurus/utils/-/utils-3.9.2.tgz"
-  integrity sha512-lBSBiRruFurFKXr5Hbsl2thmGweAPmddhF3jb99U4EMDA5L+e5Y1rAkOS07Nvrup7HUMBDrCV45meaxZnt28nQ==
+"@docusaurus/utils@3.10.0":
+  version "3.10.0"
+  resolved "https://registry.yarnpkg.com/@docusaurus/utils/-/utils-3.10.0.tgz#ea7d7b0d325b60f728decc00bb3908d00ef86faf"
+  integrity sha512-T3B0WTigsIthe0D4LQa2k+7bJY+c3WS+Wq2JhcznOSpn1lSN64yNtHQXboCj3QnUs1EuAZszQG1SHKu5w5ZrlA==
   dependencies:
-    "@docusaurus/logger" "3.9.2"
-    "@docusaurus/types" "3.9.2"
-    "@docusaurus/utils-common" "3.9.2"
+    "@docusaurus/logger" "3.10.0"
+    "@docusaurus/types" "3.10.0"
+    "@docusaurus/utils-common" "3.10.0"
     escape-string-regexp "^4.0.0"
-    execa "5.1.1"
+    execa "^5.1.1"
     file-loader "^6.2.0"
     fs-extra "^11.1.1"
     github-slugger "^1.5.0"
@@ -2618,11 +2605,6 @@
     "@jridgewell/resolve-uri" "^3.1.0"
     "@jridgewell/sourcemap-codec" "^1.4.14"
 
-"@jsdevtools/ono@^7.1.3":
-  version "7.1.3"
-  resolved "https://registry.npmjs.org/@jsdevtools/ono/-/ono-7.1.3.tgz"
-  integrity sha512-4JQNk+3mVzK3xh2rqd6RB4J46qUR19azEHBneZyTZM+c456qOrbbM/5xcR8huNCCcbVt7+UmizG6GuUvPvKUYg==
-
 "@jsonjoy.com/base64@^1.1.2":
   version "1.1.2"
   resolved "https://registry.npmjs.org/@jsonjoy.com/base64/-/base64-1.1.2.tgz"
@@ -2789,11 +2771,6 @@
     "@nodelib/fs.scandir" "2.1.5"
     fastq "^1.6.0"
 
-"@opentelemetry/api@1.9.0":
-  version "1.9.0"
-  resolved "https://registry.npmjs.org/@opentelemetry/api/-/api-1.9.0.tgz"
-  integrity sha512-3giAOQvZiH5F9bMlMiv8+GSPMeqg0dbaeo58/0SlA9sxSqZhnUtxzX9/2FzyhS9sWQf5S0GJE0AKBrFqjpeYcg==
-
 "@parcel/watcher-android-arm64@2.5.6":
   version "2.5.6"
   resolved "https://registry.yarnpkg.com/@parcel/watcher-android-arm64/-/watcher-android-arm64-2.5.6.tgz#5f32e0dba356f4ac9a11068d2a5c134ca3ba6564"
@@ -3009,23 +2986,23 @@
     "@rc-component/util" "^1.2.1"
     clsx "^2.1.1"
 
-"@rc-component/form@~1.7.1":
-  version "1.7.1"
-  resolved "https://registry.yarnpkg.com/@rc-component/form/-/form-1.7.1.tgz#baf18de01e649415c39e895a2c2fc9c61e1f2e23"
-  integrity sha512-Uhw0FPvJ+Ko4xBxhvziqmqzIuO0YvVBzVyFGNAI9fMCz4r4DfrYK6PRIN6CkFqM0vdAX9sr4JGA1/h/VzpA1cA==
+"@rc-component/form@~1.8.0":
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/@rc-component/form/-/form-1.8.0.tgz#ed565337a69ebb6cfa20d1ad0dd58e443a71313a"
+  integrity sha512-eUD5KKYnIZWmJwRA0vnyO/ovYUfHGU1svydY1OrqU5fw8Oz9Tdqvxvrlh0wl6xI/EW69dT7II49xpgOWzK3T5A==
   dependencies:
     "@rc-component/async-validator" "^5.1.0"
     "@rc-component/util" "^1.6.2"
     clsx "^2.1.1"
 
-"@rc-component/image@~1.6.0":
-  version "1.6.0"
-  resolved "https://registry.npmjs.org/@rc-component/image/-/image-1.6.0.tgz"
-  integrity sha512-tSfn2ZE/oP082g4QIOxeehkmgnXB7R+5AFj/lIFr4k7pEuxHBdyGIq9axoCY9qea8NN0DY6p4IB/F07tLqaT5A==
+"@rc-component/image@~1.9.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@rc-component/image/-/image-1.9.0.tgz#110785d735d20336afcdbac84e8fbfd059a7a44e"
+  integrity sha512-khF7w7xkBH5B1bsBcI1FSUZdkyd1aqpl2eYyILCqCzzQH3XdfehGUaZTnptyaJJfs09/R5hv9jXWyazOMFIClQ==
   dependencies:
     "@rc-component/motion" "^1.0.0"
     "@rc-component/portal" "^2.1.2"
-    "@rc-component/util" "^1.3.0"
+    "@rc-component/util" "^1.10.1"
     clsx "^2.1.1"
 
 "@rc-component/input-number@~1.6.2":
@@ -3075,10 +3052,10 @@
   dependencies:
     "@babel/runtime" "^7.18.0"
 
-"@rc-component/motion@^1.0.0", "@rc-component/motion@^1.1.3", "@rc-component/motion@^1.1.4", "@rc-component/motion@^1.3.1":
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/@rc-component/motion/-/motion-1.3.1.tgz#1e56b06841ee677261251e6e69fedc8d73e65b22"
-  integrity sha512-Wo1mkd0tCcHtvYvpPOmlYJz546z16qlsiwaygmW7NPJpOZOF9GBjhGzdzZSsC2lEJ1IUkWLF4gMHlRA1aSA+Yw==
+"@rc-component/motion@^1.0.0", "@rc-component/motion@^1.1.3", "@rc-component/motion@^1.1.4", "@rc-component/motion@^1.3.2":
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/@rc-component/motion/-/motion-1.3.2.tgz#bd96e0fd16ee9d98c1d9be14198f003e367d8feb"
+  integrity sha512-itfd+GztzJYAb04Z4RkEub1TbJAfZc2Iuy8p44U44xD1F5+fNYFKI3897ijlbIyfvXkTmMm+KGcjkQQGMHywEQ==
   dependencies:
     "@rc-component/util" "^1.2.0"
     clsx "^2.1.1"
@@ -3117,10 +3094,10 @@
     "@rc-component/util" "^1.3.0"
     clsx "^2.1.1"
 
-"@rc-component/picker@~1.9.0":
-  version "1.9.0"
-  resolved "https://registry.npmjs.org/@rc-component/picker/-/picker-1.9.0.tgz"
-  integrity sha512-OLisdk8AWVCG9goBU1dWzuH5QlBQk8jktmQ6p0/IyBFwdKGwyIZOSjnBYo8hooHiTdl0lU+wGf/OfMtVBw02KQ==
+"@rc-component/picker@~1.9.1":
+  version "1.9.1"
+  resolved "https://registry.yarnpkg.com/@rc-component/picker/-/picker-1.9.1.tgz#7ffcb1e4d4655fe2f3d712773e1d3ab9cd5c2a5c"
+  integrity sha512-9FBYYsvH3HMLICaPDA/1Th5FLaDkFa7qAtangIdlhKb3ZALaR745e9PsOhheJb6asS4QXc12ffiAcjdkZ4C5/g==
   dependencies:
     "@rc-component/overflow" "^1.0.0"
     "@rc-component/resize-observer" "^1.0.0"
@@ -3159,10 +3136,10 @@
     "@rc-component/util" "^1.3.0"
     clsx "^2.1.1"
 
-"@rc-component/resize-observer@^1.0.0", "@rc-component/resize-observer@^1.0.1", "@rc-component/resize-observer@^1.1.1":
-  version "1.1.1"
-  resolved "https://registry.npmjs.org/@rc-component/resize-observer/-/resize-observer-1.1.1.tgz"
-  integrity sha512-NfXXMmiR+SmUuKE1NwJESzEUYUFWIDUn2uXpxCTOLwiRUUakd62DRNFjRJArgzyFW8S5rsL4aX5XlyIXyC/vRA==
+"@rc-component/resize-observer@^1.0.0", "@rc-component/resize-observer@^1.0.1", "@rc-component/resize-observer@^1.1.1", "@rc-component/resize-observer@^1.1.2":
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/@rc-component/resize-observer/-/resize-observer-1.1.2.tgz#5897e65d7fed5c6e768dcfd8bdec181a3309a98f"
+  integrity sha512-t/Bb0W8uvL4PYKAB3YcChC+DlHh0Wt5kM7q/J+0qpVEUMLe7Hk5zuvc9km0hMnTFPSx5Z7Wu/fzCLN6erVLE8Q==
   dependencies:
     "@rc-component/util" "^1.2.0"
 
@@ -3176,10 +3153,10 @@
     "@rc-component/util" "^1.3.0"
     clsx "^2.1.1"
 
-"@rc-component/select@~1.6.0", "@rc-component/select@~1.6.14":
-  version "1.6.14"
-  resolved "https://registry.yarnpkg.com/@rc-component/select/-/select-1.6.14.tgz#61028c0abe02d2a909935b5cb586374968196c96"
-  integrity sha512-T1IWeLlSas7Z/igZtPtJ/bweCxMMkXIGKQBtnigK+I/n1AVNjCs+ZdL3Fj42mq3uqm4sd1uzeQLZkdCqR26ADw==
+"@rc-component/select@~1.6.0", "@rc-component/select@~1.6.15":
+  version "1.6.15"
+  resolved "https://registry.yarnpkg.com/@rc-component/select/-/select-1.6.15.tgz#de2a3c8b020834cabd600b52de573a328c061eef"
+  integrity sha512-SyVCWnqxCQZZcQvQJ/CxSjx2bGma6ds/HtnpkIfZVnt6RoEgbqUmHgD6vrzNarNXwbLXerwVzWwq8F3d1sst7g==
   dependencies:
     "@rc-component/overflow" "^1.0.0"
     "@rc-component/trigger" "^3.0.0"
@@ -3273,10 +3250,10 @@
     "@rc-component/util" "^1.4.0"
     clsx "^2.1.1"
 
-"@rc-component/tree@~1.2.0", "@rc-component/tree@~1.2.3":
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/@rc-component/tree/-/tree-1.2.3.tgz#a70ae847a768763f4f461375620c1feccfcc933a"
-  integrity sha512-mG8hF2ogQcKaEpfyxzPvMWqqkptofd7Sf+YiXOpPzuXLTLwNKfLDJtysc1/oybopbnzxNqWh2Vgwi+GYwNIb7w==
+"@rc-component/tree@~1.2.0", "@rc-component/tree@~1.2.4":
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/@rc-component/tree/-/tree-1.2.4.tgz#cb4f7d818118b3447763e74d3a82fba6454c7317"
+  integrity sha512-5Gli43+m4R7NhpYYz3Z61I6LOw9yI6CNChxgVtvrO6xB1qML7iE6QMLVMB3+FTjo2yF6uFdAHtqWPECz/zbX5w==
   dependencies:
     "@rc-component/motion" "^1.0.0"
     "@rc-component/util" "^1.8.1"
@@ -3302,10 +3279,10 @@
     "@rc-component/util" "^1.3.0"
     clsx "^2.1.1"
 
-"@rc-component/util@^1.1.0", "@rc-component/util@^1.2.0", "@rc-component/util@^1.2.1", "@rc-component/util@^1.3.0", "@rc-component/util@^1.4.0", "@rc-component/util@^1.6.2", "@rc-component/util@^1.7.0", "@rc-component/util@^1.8.1", "@rc-component/util@^1.9.0":
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/@rc-component/util/-/util-1.9.0.tgz#ec5fe657a98554f26ef761345ca4b745be00af0e"
-  integrity sha512-5uW6AfhIigCWeEQDthTozlxiT4Prn6xYQWeO0xokjcaa186OtwPRHBZJ2o0T0FhbjGhZ3vXdbkv0sx3gAYW7Vg==
+"@rc-component/util@^1.1.0", "@rc-component/util@^1.10.1", "@rc-component/util@^1.2.0", "@rc-component/util@^1.2.1", "@rc-component/util@^1.3.0", "@rc-component/util@^1.4.0", "@rc-component/util@^1.6.2", "@rc-component/util@^1.7.0", "@rc-component/util@^1.8.1", "@rc-component/util@^1.9.0":
+  version "1.10.1"
+  resolved "https://registry.yarnpkg.com/@rc-component/util/-/util-1.10.1.tgz#213c84c77e8b2001095530d3b0dc47c49c34ffe3"
+  integrity sha512-q++9S6rUa5Idb/xIBNz6jtvumw5+O5YV5V0g4iK9mn9jWs4oGJheE3ZN1kAnE723AXyaD8v95yeOASmdk8Jnng==
   dependencies:
     is-mobile "^5.0.0"
     react-is "^18.2.0"
@@ -3320,33 +3297,36 @@
     "@rc-component/util" "^1.4.0"
     clsx "^2.1.1"
 
-"@redocly/ajv@^8.11.2":
-  version "8.17.2"
-  resolved "https://registry.npmjs.org/@redocly/ajv/-/ajv-8.17.2.tgz"
-  integrity sha512-rcbDZOfXAgGEJeJ30aWCVVJvxV9ooevb/m1/SFblO2qHs4cqTk178gx7T/vdslf57EA4lTofrwsq5K8rxK9g+g==
+"@redocly/ajv@^8.18.0":
+  version "8.18.3"
+  resolved "https://registry.yarnpkg.com/@redocly/ajv/-/ajv-8.18.3.tgz#a925753d9a33375219f1b2ba91aef320f9929577"
+  integrity sha512-l42u0of3hY98sN2A+M4qTX1O/KrpgGH32Hu9kP2GtHyD5Dfqq86PKFLe5dwaD8DEnNmlOlll2BAmeEtf0DaySg==
   dependencies:
     fast-deep-equal "^3.1.3"
     fast-uri "^3.0.1"
     json-schema-traverse "^1.0.0"
     require-from-string "^2.0.2"
 
-"@redocly/config@^0.22.0":
-  version "0.22.2"
-  resolved "https://registry.npmjs.org/@redocly/config/-/config-0.22.2.tgz"
-  integrity sha512-roRDai8/zr2S9YfmzUfNhKjOF0NdcOIqF7bhf4MVC5UxpjIysDjyudvlAiVbpPHp3eDRWbdzUgtkK1a7YiDNyQ==
-
-"@redocly/openapi-core@^1.34.3":
-  version "1.34.6"
-  resolved "https://registry.npmjs.org/@redocly/openapi-core/-/openapi-core-1.34.6.tgz"
-  integrity sha512-2+O+riuIUgVSuLl3Lyh5AplWZyVMNuG2F98/o6NrutKJfW4/GTZdPpZlIphS0HGgcOHgmWcCSHj+dWFlZaGSHw==
+"@redocly/config@^0.48.0":
+  version "0.48.0"
+  resolved "https://registry.yarnpkg.com/@redocly/config/-/config-0.48.0.tgz#d4ff534b0e4edfc6fc3d3fc93217f29471cfbc1e"
+  integrity sha512-8W3wz+Q7y4e9klJWlYOvQWK5r7P2Mo589vcjtlT5coOxsyAdt53k8Vb8iAqnRiGWExbjBQmSbL2XbuU747Nf6Q==
   dependencies:
-    "@redocly/ajv" "^8.11.2"
-    "@redocly/config" "^0.22.0"
+    json-schema-to-ts "2.7.2"
+
+"@redocly/openapi-core@^2.25.2":
+  version "2.28.1"
+  resolved "https://registry.yarnpkg.com/@redocly/openapi-core/-/openapi-core-2.28.1.tgz#a69fe41ef0bb4817296e96984bb191db8ab50440"
+  integrity sha512-PXulQY+lUJzeLWfhtJ8UPBFaMvlPDvW/dkozDhUAlYDotEYNMOaKFbJxKcrPCtRYtZ0TJsh5MohdcDLCBAJbFg==
+  dependencies:
+    "@redocly/ajv" "^8.18.0"
+    "@redocly/config" "^0.48.0"
+    ajv "npm:@redocly/ajv@8.18.0"
+    ajv-formats "^3.0.1"
     colorette "^1.2.0"
-    https-proxy-agent "^7.0.5"
     js-levenshtein "^1.1.6"
     js-yaml "^4.1.0"
-    minimatch "^5.0.1"
+    picomatch "^4.0.4"
     pluralize "^8.0.0"
     yaml-ast-parser "0.0.43"
 
@@ -3362,81 +3342,81 @@
     redux-thunk "^3.1.0"
     reselect "^5.1.0"
 
-"@rspack/binding-darwin-arm64@1.7.6":
-  version "1.7.6"
-  resolved "https://registry.yarnpkg.com/@rspack/binding-darwin-arm64/-/binding-darwin-arm64-1.7.6.tgz#10144f3841be88ea25c71a537df6b038ae84a87a"
-  integrity sha512-NZ9AWtB1COLUX1tA9HQQvWpTy07NSFfKBU8A6ylWd5KH8AePZztpNgLLAVPTuNO4CZXYpwcoclf8jG/luJcQdQ==
+"@rspack/binding-darwin-arm64@1.7.11":
+  version "1.7.11"
+  resolved "https://registry.yarnpkg.com/@rspack/binding-darwin-arm64/-/binding-darwin-arm64-1.7.11.tgz#ea43ac25a9ff99a9faf6c820f5d174a32974e95c"
+  integrity sha512-oduECiZVqbO5zlVw+q7Vy65sJFth99fWPTyucwvLJJtJkPL5n17Uiql2cYP6Ijn0pkqtf1SXgK8WjiKLG5bIig==
 
-"@rspack/binding-darwin-x64@1.7.6":
-  version "1.7.6"
-  resolved "https://registry.yarnpkg.com/@rspack/binding-darwin-x64/-/binding-darwin-x64-1.7.6.tgz#70588e30e1fdcd3149e09fe6798eb95609ad814b"
-  integrity sha512-J2g6xk8ZS7uc024dNTGTHxoFzFovAZIRixUG7PiciLKTMP78svbSSWrmW6N8oAsAkzYfJWwQpVgWfFNRHvYxSw==
+"@rspack/binding-darwin-x64@1.7.11":
+  version "1.7.11"
+  resolved "https://registry.yarnpkg.com/@rspack/binding-darwin-x64/-/binding-darwin-x64-1.7.11.tgz#5c724d91559d642d4a5e6aa4ed380c30bd0f64c0"
+  integrity sha512-a1+TtTE9ap6RalgFi7FGIgkJP6O4Vy6ctv+9WGJy53E4kuqHR0RygzaiVxCI/GMc/vBT9vY23hyrpWb3d1vtXA==
 
-"@rspack/binding-linux-arm64-gnu@1.7.6":
-  version "1.7.6"
-  resolved "https://registry.yarnpkg.com/@rspack/binding-linux-arm64-gnu/-/binding-linux-arm64-gnu-1.7.6.tgz#322e7fe54fccefd57603d4730130bef311b8dd60"
-  integrity sha512-eQfcsaxhFrv5FmtaA7+O1F9/2yFDNIoPZzV/ZvqvFz5bBXVc4FAm/1fVpBg8Po/kX1h0chBc7Xkpry3cabFW8w==
+"@rspack/binding-linux-arm64-gnu@1.7.11":
+  version "1.7.11"
+  resolved "https://registry.yarnpkg.com/@rspack/binding-linux-arm64-gnu/-/binding-linux-arm64-gnu-1.7.11.tgz#429119939bbe9d51a72caf99cffb8febe0f870fe"
+  integrity sha512-P0QrGRPbTWu6RKWfN0bDtbnEps3rXH0MWIMreZABoUrVmNQKtXR6e73J3ub6a+di5s2+K0M2LJ9Bh2/H4UsDUA==
 
-"@rspack/binding-linux-arm64-musl@1.7.6":
-  version "1.7.6"
-  resolved "https://registry.yarnpkg.com/@rspack/binding-linux-arm64-musl/-/binding-linux-arm64-musl-1.7.6.tgz#4444dfe045323f341c7c82fdb7dce5809fea51c1"
-  integrity sha512-DfQXKiyPIl7i1yECHy4eAkSmlUzzsSAbOjgMuKn7pudsWf483jg0UUYutNgXSlBjc/QSUp7906Cg8oty9OfwPA==
+"@rspack/binding-linux-arm64-musl@1.7.11":
+  version "1.7.11"
+  resolved "https://registry.yarnpkg.com/@rspack/binding-linux-arm64-musl/-/binding-linux-arm64-musl-1.7.11.tgz#d939b8c2c5bf35380d3c860402f7063031ef469a"
+  integrity sha512-6ky7R43VMjWwmx3Yx7Jl7faLBBMAgMDt+/bN35RgwjiPgsIByz65EwytUVuW9rikB43BGHvA/eqlnjLrUzNBqw==
 
-"@rspack/binding-linux-x64-gnu@1.7.6":
-  version "1.7.6"
-  resolved "https://registry.yarnpkg.com/@rspack/binding-linux-x64-gnu/-/binding-linux-x64-gnu-1.7.6.tgz#c31bf72789c71eeee75cd3cb06d6a6e5449e1bd1"
-  integrity sha512-NdA+2X3lk2GGrMMnTGyYTzM3pn+zNjaqXqlgKmFBXvjfZqzSsKq3pdD1KHZCd5QHN+Fwvoszj0JFsquEVhE1og==
+"@rspack/binding-linux-x64-gnu@1.7.11":
+  version "1.7.11"
+  resolved "https://registry.yarnpkg.com/@rspack/binding-linux-x64-gnu/-/binding-linux-x64-gnu-1.7.11.tgz#03567317a7e8cfc62d994dcf9683f932fd22054a"
+  integrity sha512-cuOJMfCOvb2Wgsry5enXJ3iT1FGUjdPqtGUBVupQlEG4ntSYsQ2PtF4wIDVasR3wdxC5nQbipOrDiN/u6fYsdQ==
 
-"@rspack/binding-linux-x64-musl@1.7.6":
-  version "1.7.6"
-  resolved "https://registry.yarnpkg.com/@rspack/binding-linux-x64-musl/-/binding-linux-x64-musl-1.7.6.tgz#20f8ad786d581af7a7c2802220b533ce531fb4c6"
-  integrity sha512-rEy6MHKob02t/77YNgr6dREyJ0e0tv1X6Xsg8Z5E7rPXead06zefUbfazj4RELYySWnM38ovZyJAkPx/gOn3VA==
+"@rspack/binding-linux-x64-musl@1.7.11":
+  version "1.7.11"
+  resolved "https://registry.yarnpkg.com/@rspack/binding-linux-x64-musl/-/binding-linux-x64-musl-1.7.11.tgz#d93c93ea796eae1572b2353a50d58cc6218c53b6"
+  integrity sha512-CoK37hva4AmHGh3VCsQXmGr40L36m1/AdnN5LEjUX6kx5rEH7/1nEBN6Ii72pejqDVvk9anEROmPDiPw10tpFg==
 
-"@rspack/binding-wasm32-wasi@1.7.6":
-  version "1.7.6"
-  resolved "https://registry.yarnpkg.com/@rspack/binding-wasm32-wasi/-/binding-wasm32-wasi-1.7.6.tgz#76ae0f9f584a054e109b83ec02516ce75dcff8e6"
-  integrity sha512-YupOrz0daSG+YBbCIgpDgzfMM38YpChv+afZpaxx5Ml7xPeAZIIdgWmLHnQ2rts73N2M1NspAiBwV00Xx0N4Vg==
+"@rspack/binding-wasm32-wasi@1.7.11":
+  version "1.7.11"
+  resolved "https://registry.yarnpkg.com/@rspack/binding-wasm32-wasi/-/binding-wasm32-wasi-1.7.11.tgz#c90235032fb14de50baf535592069923c1308f4e"
+  integrity sha512-OtrmnPUVJMxjNa3eDMfHyPdtlLRmmp/aIm0fQHlAOATbZvlGm12q7rhPW5BXTu1yh+1rQ1/uqvz+SzKEZXuJaQ==
   dependencies:
     "@napi-rs/wasm-runtime" "1.0.7"
 
-"@rspack/binding-win32-arm64-msvc@1.7.6":
-  version "1.7.6"
-  resolved "https://registry.yarnpkg.com/@rspack/binding-win32-arm64-msvc/-/binding-win32-arm64-msvc-1.7.6.tgz#4e7f70338dfcc8efa3a67d72064562eb9f0662cb"
-  integrity sha512-INj7aVXjBvlZ84kEhSK4kJ484ub0i+BzgnjDWOWM1K+eFYDZjLdAsQSS3fGGXwVc3qKbPIssFfnftATDMTEJHQ==
+"@rspack/binding-win32-arm64-msvc@1.7.11":
+  version "1.7.11"
+  resolved "https://registry.yarnpkg.com/@rspack/binding-win32-arm64-msvc/-/binding-win32-arm64-msvc-1.7.11.tgz#0afcfde6a77cdf6fa6a85de4f8a39b94a593aab2"
+  integrity sha512-lObFW6e5lCWNgTBNwT//yiEDbsxm9QG4BYUojqeXxothuzJ/L6ibXz6+gLMvbOvLGV3nKgkXmx8GvT9WDKR0mA==
 
-"@rspack/binding-win32-ia32-msvc@1.7.6":
-  version "1.7.6"
-  resolved "https://registry.yarnpkg.com/@rspack/binding-win32-ia32-msvc/-/binding-win32-ia32-msvc-1.7.6.tgz#efeb807c624536361467dfec0898705213fbd997"
-  integrity sha512-lXGvC+z67UMcw58In12h8zCa9IyYRmuptUBMItQJzu+M278aMuD1nETyGLL7e4+OZ2lvrnnBIcjXN1hfw2yRzw==
+"@rspack/binding-win32-ia32-msvc@1.7.11":
+  version "1.7.11"
+  resolved "https://registry.yarnpkg.com/@rspack/binding-win32-ia32-msvc/-/binding-win32-ia32-msvc-1.7.11.tgz#46606834538e84cd0f95f19089695ab122d69586"
+  integrity sha512-0pYGnZd8PPqNR68zQ8skamqNAXEA1sUfXuAdYcknIIRq2wsbiwFzIc0Pov1cIfHYab37G7sSIPBiOUdOWF5Ivw==
 
-"@rspack/binding-win32-x64-msvc@1.7.6":
-  version "1.7.6"
-  resolved "https://registry.yarnpkg.com/@rspack/binding-win32-x64-msvc/-/binding-win32-x64-msvc-1.7.6.tgz#48014313c224e9fce31d02134c81525a7cb7f891"
-  integrity sha512-zeUxEc0ZaPpmaYlCeWcjSJUPuRRySiSHN23oJ2Xyw0jsQ01Qm4OScPdr0RhEOFuK/UE+ANyRtDo4zJsY52Hadw==
+"@rspack/binding-win32-x64-msvc@1.7.11":
+  version "1.7.11"
+  resolved "https://registry.yarnpkg.com/@rspack/binding-win32-x64-msvc/-/binding-win32-x64-msvc-1.7.11.tgz#e486a33fc1227ec9cbd70439ef1b32ead1faec68"
+  integrity sha512-EeQXayoQk/uBkI3pdoXfQBXNIUrADq56L3s/DFyM2pJeUDrWmhfIw2UFIGkYPTMSCo8F2JcdcGM32FGJrSnU0Q==
 
-"@rspack/binding@1.7.6":
-  version "1.7.6"
-  resolved "https://registry.yarnpkg.com/@rspack/binding/-/binding-1.7.6.tgz#d61b241c0dbb4e395f7753de74a2fe760891d4f2"
-  integrity sha512-/NrEcfo8Gx22hLGysanrV6gHMuqZSxToSci/3M4kzEQtF5cPjfOv5pqeLK/+B6cr56ul/OmE96cCdWcXeVnFjQ==
+"@rspack/binding@1.7.11":
+  version "1.7.11"
+  resolved "https://registry.yarnpkg.com/@rspack/binding/-/binding-1.7.11.tgz#30f3e87242d9dcb3744edc22752cf24a9ceb4d61"
+  integrity sha512-2MGdy2s2HimsDT444Bp5XnALzNRxuBNc7y0JzyuqKbHBywd4x2NeXyhWXXoxufaCFu5PBc9Qq9jyfjW2Aeh06Q==
   optionalDependencies:
-    "@rspack/binding-darwin-arm64" "1.7.6"
-    "@rspack/binding-darwin-x64" "1.7.6"
-    "@rspack/binding-linux-arm64-gnu" "1.7.6"
-    "@rspack/binding-linux-arm64-musl" "1.7.6"
-    "@rspack/binding-linux-x64-gnu" "1.7.6"
-    "@rspack/binding-linux-x64-musl" "1.7.6"
-    "@rspack/binding-wasm32-wasi" "1.7.6"
-    "@rspack/binding-win32-arm64-msvc" "1.7.6"
-    "@rspack/binding-win32-ia32-msvc" "1.7.6"
-    "@rspack/binding-win32-x64-msvc" "1.7.6"
+    "@rspack/binding-darwin-arm64" "1.7.11"
+    "@rspack/binding-darwin-x64" "1.7.11"
+    "@rspack/binding-linux-arm64-gnu" "1.7.11"
+    "@rspack/binding-linux-arm64-musl" "1.7.11"
+    "@rspack/binding-linux-x64-gnu" "1.7.11"
+    "@rspack/binding-linux-x64-musl" "1.7.11"
+    "@rspack/binding-wasm32-wasi" "1.7.11"
+    "@rspack/binding-win32-arm64-msvc" "1.7.11"
+    "@rspack/binding-win32-ia32-msvc" "1.7.11"
+    "@rspack/binding-win32-x64-msvc" "1.7.11"
 
-"@rspack/core@^1.5.0":
-  version "1.7.6"
-  resolved "https://registry.yarnpkg.com/@rspack/core/-/core-1.7.6.tgz#d43a1c4103248cbe4011902906c6d7427b80f3a6"
-  integrity sha512-Iax6UhrfZqJajA778c1d5DBFbSIqPOSrI34kpNIiNpWd8Jq7mFIa+Z60SQb5ZQDZuUxcCZikjz5BxinFjTkg7Q==
+"@rspack/core@^1.7.10":
+  version "1.7.11"
+  resolved "https://registry.yarnpkg.com/@rspack/core/-/core-1.7.11.tgz#8d7d77db3b71332afd22a9c90904fe18a6832e2c"
+  integrity sha512-rsD9b+Khmot5DwCMiB3cqTQo53ioPG3M/A7BySu8+0+RS7GCxKm+Z+mtsjtG/vsu4Tn2tcqCdZtA3pgLoJB+ew==
   dependencies:
     "@module-federation/runtime-tools" "0.22.0"
-    "@rspack/binding" "1.7.6"
+    "@rspack/binding" "1.7.11"
     "@rspack/lite-tapable" "1.1.0"
 
 "@rspack/lite-tapable@1.1.0":
@@ -3738,26 +3718,26 @@
     "@svgr/plugin-jsx" "8.1.0"
     "@svgr/plugin-svgo" "8.1.0"
 
-"@swagger-api/apidom-ast@^1.6.0":
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/@swagger-api/apidom-ast/-/apidom-ast-1.6.0.tgz#c72f345023435e4033a5c67cdc064a51f75cd799"
-  integrity sha512-ez1KnBdAzoh5a6ijDXzu5nADkVZXlnL1RkLl8n2u2tjiNg9597xxmFdEHLVa31Vxr1yYj0WtYGLA5e2Kp0KNrQ==
+"@swagger-api/apidom-ast@^1.10.2":
+  version "1.10.2"
+  resolved "https://registry.yarnpkg.com/@swagger-api/apidom-ast/-/apidom-ast-1.10.2.tgz#fd7b49929bdd8ca07c247efeaae3c47c86d7da68"
+  integrity sha512-vTl8gWyeZaj887/NSWYs3as4K8wXHar5wY/606XRBjR2UgmJBokBgKjq7S23LW9tsYjsT4MjQKC8idjgw17xvg==
   dependencies:
     "@babel/runtime-corejs3" "^7.26.10"
-    "@swagger-api/apidom-error" "^1.6.0"
+    "@swagger-api/apidom-error" "^1.10.2"
     "@types/ramda" "~0.30.0"
     ramda "~0.30.0"
     ramda-adjunct "^5.0.0"
     unraw "^3.0.0"
 
-"@swagger-api/apidom-core@^1.6.0":
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/@swagger-api/apidom-core/-/apidom-core-1.6.0.tgz#4eb1ff8955ec623d6c1a9e5a5d3fb34714667cb9"
-  integrity sha512-gA1MVoXe19sjFLKGkWxp5VvSw3Tk0CSChfItJjFeFHpLSGrfm+LlXp37TmNSns53Ky0F7x7TB/5kAX5I/TO4xw==
+"@swagger-api/apidom-core@^1.10.2":
+  version "1.10.2"
+  resolved "https://registry.yarnpkg.com/@swagger-api/apidom-core/-/apidom-core-1.10.2.tgz#1ecf2808a1e3b1814e7f133e5c94cdd9fd5b9dcd"
+  integrity sha512-qryNBGHNWDvSRyK1w5rox0UOrHrVBjZOHgeXFpGHF+oBO7ntSc/H7BSiYMDR+KQESkzMcAxn4tZMLYItaBt06w==
   dependencies:
     "@babel/runtime-corejs3" "^7.26.10"
-    "@swagger-api/apidom-ast" "^1.6.0"
-    "@swagger-api/apidom-error" "^1.6.0"
+    "@swagger-api/apidom-ast" "^1.10.2"
+    "@swagger-api/apidom-error" "^1.10.2"
     "@types/ramda" "~0.30.0"
     minim "~0.23.8"
     ramda "~0.30.0"
@@ -3765,319 +3745,319 @@
     short-unique-id "^5.3.2"
     ts-mixer "^6.0.3"
 
-"@swagger-api/apidom-error@^1.6.0":
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/@swagger-api/apidom-error/-/apidom-error-1.6.0.tgz#e813c5491142bbb2518fed71133b28407e0c846a"
-  integrity sha512-xp/cQ1xQ/4Vd/hhQfONK7ea9oVc3JUXAYyfRzvDR0lxISly/SyD2jMcqXzHtrylBAnv7V2HSsbC1BWo7ZJDLSQ==
+"@swagger-api/apidom-error@^1.10.2":
+  version "1.10.2"
+  resolved "https://registry.yarnpkg.com/@swagger-api/apidom-error/-/apidom-error-1.10.2.tgz#a017b9653d22414908d664468f12634841f37696"
+  integrity sha512-SWyPyL5xwTUsDzPi0A5zwTFwqPezvlwj4opEqruqjESNTYupUA7+vt4Mdj7IlDaRYRG1qyCWQgKhIBXznVUD4w==
   dependencies:
     "@babel/runtime-corejs3" "^7.20.7"
 
-"@swagger-api/apidom-json-pointer@^1.6.0":
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/@swagger-api/apidom-json-pointer/-/apidom-json-pointer-1.6.0.tgz#21aad5634d997a7ad8976f1307393ec4d8c1fef0"
-  integrity sha512-RO6P5Gt64AnthGXKeqIFjQCLVFbAJvLYAb67TkvRQ9US4lNixFtFsYJnhLCC4ymz4dTT1hacG0cmTRGcEHF9ig==
+"@swagger-api/apidom-json-pointer@^1.10.2":
+  version "1.10.2"
+  resolved "https://registry.yarnpkg.com/@swagger-api/apidom-json-pointer/-/apidom-json-pointer-1.10.2.tgz#f454e11606759432ee87432216eb65703a76057f"
+  integrity sha512-zySHPqIXF4HZ3VWbHwTxO+H1e9dJw7mGHzoX+tZjx5wVyLQO3kZDCAAXzz3c3/TIY21Y2Zkpkez3q9hjFyuLvQ==
   dependencies:
     "@babel/runtime-corejs3" "^7.26.10"
-    "@swagger-api/apidom-core" "^1.6.0"
-    "@swagger-api/apidom-error" "^1.6.0"
+    "@swagger-api/apidom-core" "^1.10.2"
+    "@swagger-api/apidom-error" "^1.10.2"
     "@swaggerexpert/json-pointer" "^2.10.1"
 
-"@swagger-api/apidom-ns-api-design-systems@^1.6.0":
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/@swagger-api/apidom-ns-api-design-systems/-/apidom-ns-api-design-systems-1.6.0.tgz#9d1b17c3b660fa310f31e77da8b3fc53b430ad83"
-  integrity sha512-EYJfQ4JYuUo2J4QiiLnA/8LmM1k7AQcf1XVE+NrIpZ1160GIzqE+W5uOXkhAOImkP2Cb7EZZdE2cFE/tMYxNvw==
+"@swagger-api/apidom-ns-api-design-systems@^1.10.2":
+  version "1.10.2"
+  resolved "https://registry.yarnpkg.com/@swagger-api/apidom-ns-api-design-systems/-/apidom-ns-api-design-systems-1.10.2.tgz#0bea51cbfbb86ec272890c58cd771876329368e2"
+  integrity sha512-MsZ4GWmWN7wkWv7G9Pwk8sHU1j0bwk7xoGeaZmNCylbTfYvGkg6jJGMHdAdQNCQXbbpfLeKt1O+3YCN//JUQ7w==
   dependencies:
     "@babel/runtime-corejs3" "^7.26.10"
-    "@swagger-api/apidom-core" "^1.6.0"
-    "@swagger-api/apidom-error" "^1.6.0"
-    "@swagger-api/apidom-ns-openapi-3-1" "^1.6.0"
+    "@swagger-api/apidom-core" "^1.10.2"
+    "@swagger-api/apidom-error" "^1.10.2"
+    "@swagger-api/apidom-ns-openapi-3-1" "^1.10.2"
     "@types/ramda" "~0.30.0"
     ramda "~0.30.0"
     ramda-adjunct "^5.0.0"
     ts-mixer "^6.0.3"
 
-"@swagger-api/apidom-ns-arazzo-1@^1.6.0":
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/@swagger-api/apidom-ns-arazzo-1/-/apidom-ns-arazzo-1-1.6.0.tgz#0eb9ef09046e347df120c74f67462b623637c2a5"
-  integrity sha512-5rF8PyBiIHh6NfC5Y0WypW11X6hQIWr88EKNOQbBuT/nnzAsOznrUCfQ99FYGLucwdOHaMIBn/b/n4ejGBto/A==
+"@swagger-api/apidom-ns-arazzo-1@^1.10.2":
+  version "1.10.2"
+  resolved "https://registry.yarnpkg.com/@swagger-api/apidom-ns-arazzo-1/-/apidom-ns-arazzo-1-1.10.2.tgz#419ac738a943f4990a770dcfd521f0fa6122b08f"
+  integrity sha512-fQSwDlIR85tbnLXAjtV/ypSGUBfrzFcZ4NbH6BL1DSTR4uEunVxAULdD4wlhCt9gGNDl/zxZD3vQtlYDkXDFmw==
   dependencies:
     "@babel/runtime-corejs3" "^7.26.10"
-    "@swagger-api/apidom-core" "^1.6.0"
-    "@swagger-api/apidom-ns-json-schema-2020-12" "^1.6.0"
+    "@swagger-api/apidom-core" "^1.10.2"
+    "@swagger-api/apidom-ns-json-schema-2020-12" "^1.10.2"
     "@types/ramda" "~0.30.0"
     ramda "~0.30.0"
     ramda-adjunct "^5.0.0"
     ts-mixer "^6.0.3"
 
-"@swagger-api/apidom-ns-asyncapi-2@^1.6.0":
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/@swagger-api/apidom-ns-asyncapi-2/-/apidom-ns-asyncapi-2-1.6.0.tgz#c5a45530720429c1bc2513b1d9f7704454d4c176"
-  integrity sha512-tOodfX+o7lonEAnSAxet7nCayW+EqtKPegT06WXt7Llq1LS9eYZ9YzXdFgIwCm8UzfEpZdVLqtxbdLX9vuUtSg==
+"@swagger-api/apidom-ns-asyncapi-2@^1.10.2":
+  version "1.10.2"
+  resolved "https://registry.yarnpkg.com/@swagger-api/apidom-ns-asyncapi-2/-/apidom-ns-asyncapi-2-1.10.2.tgz#37c5e15a847a3dbefb5c002e3033a75476b3744f"
+  integrity sha512-obWHe3pyAj65Nf9ISwnbtJ4C5mZ15C6mtQXxzHVW5maVZqlqt3s/YbPY87EqK9ArdNOwOZHkQt2Uth02GMmjxA==
   dependencies:
     "@babel/runtime-corejs3" "^7.26.10"
-    "@swagger-api/apidom-core" "^1.6.0"
-    "@swagger-api/apidom-ns-json-schema-draft-7" "^1.6.0"
+    "@swagger-api/apidom-core" "^1.10.2"
+    "@swagger-api/apidom-ns-json-schema-draft-7" "^1.10.2"
     "@types/ramda" "~0.30.0"
     ramda "~0.30.0"
     ramda-adjunct "^5.0.0"
     ts-mixer "^6.0.3"
 
-"@swagger-api/apidom-ns-asyncapi-3@^1.6.0":
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/@swagger-api/apidom-ns-asyncapi-3/-/apidom-ns-asyncapi-3-1.6.0.tgz#af66f63137479ffa298f4f4b76a58db690894853"
-  integrity sha512-lRMvwTdtuPcwJEYLTX/UGtECpHi9UNYeT9rmWMw3LiKZrZzYc2L8q4ipPbpWwH8t7QfsF2u0iggCODU99lXCnw==
+"@swagger-api/apidom-ns-asyncapi-3@^1.10.2":
+  version "1.10.2"
+  resolved "https://registry.yarnpkg.com/@swagger-api/apidom-ns-asyncapi-3/-/apidom-ns-asyncapi-3-1.10.2.tgz#787851874b278dabe5b9583120f13ed06aafc21a"
+  integrity sha512-yqNmXeObF2OLAusgGEapXz2CrGjXwkcfG3DYcQDtOvgRytvGZxC2EkCUR+wEXCVNYhoJ7QpVzzTJOHs3jOvptg==
   dependencies:
     "@babel/runtime-corejs3" "^7.26.10"
-    "@swagger-api/apidom-core" "^1.6.0"
-    "@swagger-api/apidom-ns-asyncapi-2" "^1.6.0"
+    "@swagger-api/apidom-core" "^1.10.2"
+    "@swagger-api/apidom-ns-asyncapi-2" "^1.10.2"
     "@types/ramda" "~0.30.0"
     ramda "~0.30.0"
     ramda-adjunct "^5.0.0"
     ts-mixer "^6.0.3"
 
-"@swagger-api/apidom-ns-json-schema-2019-09@^1.6.0":
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/@swagger-api/apidom-ns-json-schema-2019-09/-/apidom-ns-json-schema-2019-09-1.6.0.tgz#439faf74e8ffa1006ae144b00a8dfb89b8cefba9"
-  integrity sha512-dee1i8wcAFgDEOzTsyoCzQhFLZ2JKzkK5KkRuryabvwS0hG2mKlogToFc8cO2MkkiLSpERm7DREALwSTFVHa0w==
+"@swagger-api/apidom-ns-json-schema-2019-09@^1.10.2":
+  version "1.10.2"
+  resolved "https://registry.yarnpkg.com/@swagger-api/apidom-ns-json-schema-2019-09/-/apidom-ns-json-schema-2019-09-1.10.2.tgz#358652692fb3dc89dbfc5f775ec79a27791b9620"
+  integrity sha512-I1FaBoDFMjybF4QVsesIYl8OilkwycZ0mQ0jf1P++zfTRG27uIePB8M+Iuj6iqMsE3qpkjjJJ6ZLnrLPdKvmRw==
   dependencies:
     "@babel/runtime-corejs3" "^7.26.10"
-    "@swagger-api/apidom-core" "^1.6.0"
-    "@swagger-api/apidom-error" "^1.6.0"
-    "@swagger-api/apidom-ns-json-schema-draft-7" "^1.6.0"
+    "@swagger-api/apidom-core" "^1.10.2"
+    "@swagger-api/apidom-error" "^1.10.2"
+    "@swagger-api/apidom-ns-json-schema-draft-7" "^1.10.2"
     "@types/ramda" "~0.30.0"
     ramda "~0.30.0"
     ramda-adjunct "^5.0.0"
     ts-mixer "^6.0.4"
 
-"@swagger-api/apidom-ns-json-schema-2020-12@^1.6.0":
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/@swagger-api/apidom-ns-json-schema-2020-12/-/apidom-ns-json-schema-2020-12-1.6.0.tgz#d2e0e1ef89141c0eea013687aebaf2580e8a6c7c"
-  integrity sha512-ldTxSnnIXskwpN6yCJkasqs32pJXwoXyad95crKT0xjZZr4fTrcAXXIyzdjBubiY9tK6elSrQGQxinJcV7ivWw==
+"@swagger-api/apidom-ns-json-schema-2020-12@^1.10.2":
+  version "1.10.2"
+  resolved "https://registry.yarnpkg.com/@swagger-api/apidom-ns-json-schema-2020-12/-/apidom-ns-json-schema-2020-12-1.10.2.tgz#f83dc1f6f403d1572acd2457557c37618379581d"
+  integrity sha512-lg9XfRlJRNoBa2EDGpEFc7HvFV39G6RG0/SbjQY0BE/WZer10wmfTCU7l3RUNJXRFGKH6/O/nsYgP7AFjTanXQ==
   dependencies:
     "@babel/runtime-corejs3" "^7.26.10"
-    "@swagger-api/apidom-core" "^1.6.0"
-    "@swagger-api/apidom-error" "^1.6.0"
-    "@swagger-api/apidom-ns-json-schema-2019-09" "^1.6.0"
+    "@swagger-api/apidom-core" "^1.10.2"
+    "@swagger-api/apidom-error" "^1.10.2"
+    "@swagger-api/apidom-ns-json-schema-2019-09" "^1.10.2"
     "@types/ramda" "~0.30.0"
     ramda "~0.30.0"
     ramda-adjunct "^5.0.0"
     ts-mixer "^6.0.4"
 
-"@swagger-api/apidom-ns-json-schema-draft-4@^1.6.0":
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/@swagger-api/apidom-ns-json-schema-draft-4/-/apidom-ns-json-schema-draft-4-1.6.0.tgz#57f2f0fb4c4a2b907cd096efc96e0bc9cd3594fc"
-  integrity sha512-t9HvHwrevEG7usosO6AdXmC8oYqje5nxHpUmODr72tUtCeAeGEGEb9lgqx7fBhjc3BYsRzOL1hX56m1gjEyCog==
+"@swagger-api/apidom-ns-json-schema-draft-4@^1.10.2":
+  version "1.10.2"
+  resolved "https://registry.yarnpkg.com/@swagger-api/apidom-ns-json-schema-draft-4/-/apidom-ns-json-schema-draft-4-1.10.2.tgz#79e984a17ce86a5a768cab521ea0bd79987d705f"
+  integrity sha512-C50KnSKynrmHky/oOB6+hHyZVpwng78Fz5aZjay3h8X5C/PJHmm3sDJFvF3/9wkYHO3N9sPp7cpu4Xm9VJ4/wQ==
   dependencies:
     "@babel/runtime-corejs3" "^7.26.10"
-    "@swagger-api/apidom-ast" "^1.6.0"
-    "@swagger-api/apidom-core" "^1.6.0"
+    "@swagger-api/apidom-ast" "^1.10.2"
+    "@swagger-api/apidom-core" "^1.10.2"
     "@types/ramda" "~0.30.0"
     ramda "~0.30.0"
     ramda-adjunct "^5.0.0"
     ts-mixer "^6.0.4"
 
-"@swagger-api/apidom-ns-json-schema-draft-6@^1.6.0":
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/@swagger-api/apidom-ns-json-schema-draft-6/-/apidom-ns-json-schema-draft-6-1.6.0.tgz#6d191a7ebf8c64cb6e29002a4f06ee454b960d64"
-  integrity sha512-aoyvQWgAOcZGTe5OfJ3r24DvXHHbrkKtAnxTOEdZzV/uOm6/cbuT8m02+aMOqWPxei1naC3ZHW9iHrETtfgV3w==
+"@swagger-api/apidom-ns-json-schema-draft-6@^1.10.2":
+  version "1.10.2"
+  resolved "https://registry.yarnpkg.com/@swagger-api/apidom-ns-json-schema-draft-6/-/apidom-ns-json-schema-draft-6-1.10.2.tgz#e55d05c44bb580e6690b1d8bdbafc29c9480c822"
+  integrity sha512-/wiP8+2lF8UJRrkoQ9HvKnMbnqijk2uY/hAg+/Bo73T9NGKkEa29jYVUKYNYj7gJBw4hhkUHfHFWuZUpxPC4ZA==
   dependencies:
     "@babel/runtime-corejs3" "^7.26.10"
-    "@swagger-api/apidom-core" "^1.6.0"
-    "@swagger-api/apidom-error" "^1.6.0"
-    "@swagger-api/apidom-ns-json-schema-draft-4" "^1.6.0"
+    "@swagger-api/apidom-core" "^1.10.2"
+    "@swagger-api/apidom-error" "^1.10.2"
+    "@swagger-api/apidom-ns-json-schema-draft-4" "^1.10.2"
     "@types/ramda" "~0.30.0"
     ramda "~0.30.0"
     ramda-adjunct "^5.0.0"
     ts-mixer "^6.0.4"
 
-"@swagger-api/apidom-ns-json-schema-draft-7@^1.6.0":
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/@swagger-api/apidom-ns-json-schema-draft-7/-/apidom-ns-json-schema-draft-7-1.6.0.tgz#5f95e9b055c9c9b1dc00c468a4f88449bdc89865"
-  integrity sha512-GjmC4+AHQh22fRZOmV+jSYMJTXh243XvdACfIQ//39kQu7gQsimF4PVSY2IgWSvS/I1ukWdPBYmDvOKryBPGrw==
+"@swagger-api/apidom-ns-json-schema-draft-7@^1.10.2":
+  version "1.10.2"
+  resolved "https://registry.yarnpkg.com/@swagger-api/apidom-ns-json-schema-draft-7/-/apidom-ns-json-schema-draft-7-1.10.2.tgz#357b62e4df4f07912c5283ac9a214e175aa27593"
+  integrity sha512-firN/uvnVxQgACqcyzV3NU9qjbMvNMJkpmm3wOat3URmaFMaFBT3qjbU1pFHBGbnXI3+I9pQJZHmJSwqNzfUbQ==
   dependencies:
     "@babel/runtime-corejs3" "^7.26.10"
-    "@swagger-api/apidom-core" "^1.6.0"
-    "@swagger-api/apidom-error" "^1.6.0"
-    "@swagger-api/apidom-ns-json-schema-draft-6" "^1.6.0"
+    "@swagger-api/apidom-core" "^1.10.2"
+    "@swagger-api/apidom-error" "^1.10.2"
+    "@swagger-api/apidom-ns-json-schema-draft-6" "^1.10.2"
     "@types/ramda" "~0.30.0"
     ramda "~0.30.0"
     ramda-adjunct "^5.0.0"
     ts-mixer "^6.0.4"
 
-"@swagger-api/apidom-ns-openapi-2@^1.6.0":
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/@swagger-api/apidom-ns-openapi-2/-/apidom-ns-openapi-2-1.6.0.tgz#2a8fe09b6e063ffe90ad75c31023ccbda558e097"
-  integrity sha512-xbmYzagnB8rO7sYwNGVyxYbNBkjCWnMhlnMrxkPtfQ/2u2ANAmTnCB/S/cMswX5XofiRJbznKAjLDSKBS+mLpQ==
+"@swagger-api/apidom-ns-openapi-2@^1.10.2":
+  version "1.10.2"
+  resolved "https://registry.yarnpkg.com/@swagger-api/apidom-ns-openapi-2/-/apidom-ns-openapi-2-1.10.2.tgz#9b2bec035501d40393291a70f9260e333c8d3ee5"
+  integrity sha512-FK5kYvo/1uwAByumRVRsynBlnKxUUImfsjPEFgRCW6yhbCGRqN47NaZ7GYFHpbhjC3OmMN5/etYj6B0jnZx7Gg==
   dependencies:
     "@babel/runtime-corejs3" "^7.26.10"
-    "@swagger-api/apidom-core" "^1.6.0"
-    "@swagger-api/apidom-error" "^1.6.0"
-    "@swagger-api/apidom-ns-json-schema-draft-4" "^1.6.0"
+    "@swagger-api/apidom-core" "^1.10.2"
+    "@swagger-api/apidom-error" "^1.10.2"
+    "@swagger-api/apidom-ns-json-schema-draft-4" "^1.10.2"
     "@types/ramda" "~0.30.0"
     ramda "~0.30.0"
     ramda-adjunct "^5.0.0"
     ts-mixer "^6.0.3"
 
-"@swagger-api/apidom-ns-openapi-3-0@^1.6.0":
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/@swagger-api/apidom-ns-openapi-3-0/-/apidom-ns-openapi-3-0-1.6.0.tgz#2f838c8ba216541d835793fd5947e1fed7b87445"
-  integrity sha512-AOvW7a2H27inepcTBAWaBMjJLrCh5IPWD4nTU+gysULC7IW6gphO8hj3iUuTmFBcGh9be89GBbvv2y/EGAfx9w==
+"@swagger-api/apidom-ns-openapi-3-0@^1.10.2":
+  version "1.10.2"
+  resolved "https://registry.yarnpkg.com/@swagger-api/apidom-ns-openapi-3-0/-/apidom-ns-openapi-3-0-1.10.2.tgz#8f86fd918cd1909444bb7b7c6b0ecc06bdaa76f2"
+  integrity sha512-ziyv85QbJYHRdc9oTEFBy3pxwxg7BW/a9GrwH01/SmuXVQPjLjwzRb+SjCxLogJppm0yjxOkDFI2VWPp2RADFg==
   dependencies:
     "@babel/runtime-corejs3" "^7.26.10"
-    "@swagger-api/apidom-core" "^1.6.0"
-    "@swagger-api/apidom-error" "^1.6.0"
-    "@swagger-api/apidom-ns-json-schema-draft-4" "^1.6.0"
+    "@swagger-api/apidom-core" "^1.10.2"
+    "@swagger-api/apidom-error" "^1.10.2"
+    "@swagger-api/apidom-ns-json-schema-draft-4" "^1.10.2"
     "@types/ramda" "~0.30.0"
     ramda "~0.30.0"
     ramda-adjunct "^5.0.0"
     ts-mixer "^6.0.3"
 
-"@swagger-api/apidom-ns-openapi-3-1@^1.6.0":
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/@swagger-api/apidom-ns-openapi-3-1/-/apidom-ns-openapi-3-1-1.6.0.tgz#786698fc0a1c9162782024a66d8be2b4e0e106db"
-  integrity sha512-jCVypc8503zDSxAQlyV8j1vzwc75VBdWHtE2O0F+q5j9qNtGxw/ekbDkgrydYRaGBl92mf16dtPjtp5LwJD0Hw==
+"@swagger-api/apidom-ns-openapi-3-1@^1.10.2":
+  version "1.10.2"
+  resolved "https://registry.yarnpkg.com/@swagger-api/apidom-ns-openapi-3-1/-/apidom-ns-openapi-3-1-1.10.2.tgz#968eaa27f98595a7bb0e820d5b805e770c886be0"
+  integrity sha512-ngcmO4dH77JT5hZB04OJdyTzgKnt2lNhAZQ+4wXjum/xhszjUmDhOeYfXdHw3Lm7MxsEsTesWzLYQ5LKADc41A==
   dependencies:
     "@babel/runtime-corejs3" "^7.26.10"
-    "@swagger-api/apidom-ast" "^1.6.0"
-    "@swagger-api/apidom-core" "^1.6.0"
-    "@swagger-api/apidom-json-pointer" "^1.6.0"
-    "@swagger-api/apidom-ns-json-schema-2020-12" "^1.6.0"
-    "@swagger-api/apidom-ns-openapi-3-0" "^1.6.0"
+    "@swagger-api/apidom-ast" "^1.10.2"
+    "@swagger-api/apidom-core" "^1.10.2"
+    "@swagger-api/apidom-json-pointer" "^1.10.2"
+    "@swagger-api/apidom-ns-json-schema-2020-12" "^1.10.2"
+    "@swagger-api/apidom-ns-openapi-3-0" "^1.10.2"
     "@types/ramda" "~0.30.0"
     ramda "~0.30.0"
     ramda-adjunct "^5.0.0"
     ts-mixer "^6.0.3"
 
-"@swagger-api/apidom-ns-openapi-3-2@^1.6.0":
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/@swagger-api/apidom-ns-openapi-3-2/-/apidom-ns-openapi-3-2-1.6.0.tgz#0ba997d1321a2af1af36ccd30f335b0c9da24753"
-  integrity sha512-QcFAUucaPaWiOKOEaaGqSfK3OtjeGJodWZLsuBQ0vrHaHkWyQ7jwsM1DJbc1Y8geOBeD2wIwdrdRjoulmqU1SA==
+"@swagger-api/apidom-ns-openapi-3-2@^1.10.2":
+  version "1.10.2"
+  resolved "https://registry.yarnpkg.com/@swagger-api/apidom-ns-openapi-3-2/-/apidom-ns-openapi-3-2-1.10.2.tgz#b2bb8f0d8ac71660255d6744aa71cb870c76fabf"
+  integrity sha512-3SWJ5ipWwn+w11HTUESWex/522jy2aGLzBqqMgH36sy+Wdwx+9Mw2bgSDqkxmNC5+jpzOGUOIWoQAMuCpS/Gzg==
   dependencies:
     "@babel/runtime-corejs3" "^7.26.10"
-    "@swagger-api/apidom-ast" "^1.6.0"
-    "@swagger-api/apidom-core" "^1.6.0"
-    "@swagger-api/apidom-json-pointer" "^1.6.0"
-    "@swagger-api/apidom-ns-json-schema-2020-12" "^1.6.0"
-    "@swagger-api/apidom-ns-openapi-3-0" "^1.6.0"
-    "@swagger-api/apidom-ns-openapi-3-1" "^1.6.0"
+    "@swagger-api/apidom-ast" "^1.10.2"
+    "@swagger-api/apidom-core" "^1.10.2"
+    "@swagger-api/apidom-json-pointer" "^1.10.2"
+    "@swagger-api/apidom-ns-json-schema-2020-12" "^1.10.2"
+    "@swagger-api/apidom-ns-openapi-3-0" "^1.10.2"
+    "@swagger-api/apidom-ns-openapi-3-1" "^1.10.2"
     "@types/ramda" "~0.30.0"
     ramda "~0.30.0"
     ramda-adjunct "^5.0.0"
     ts-mixer "^6.0.3"
 
-"@swagger-api/apidom-parser-adapter-api-design-systems-json@^1.6.0":
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/@swagger-api/apidom-parser-adapter-api-design-systems-json/-/apidom-parser-adapter-api-design-systems-json-1.6.0.tgz#8495b058dc7962ca2c17b0528aed78dac394f654"
-  integrity sha512-vz/9k0X/kh6mLm+Fi+LGNk/yyFq28wxI29ZVLW+b7ulcODikv+NaDnyN2n2kLKCvIchPATzAEvqMvVMuuQwWlg==
+"@swagger-api/apidom-parser-adapter-api-design-systems-json@^1.10.2":
+  version "1.10.2"
+  resolved "https://registry.yarnpkg.com/@swagger-api/apidom-parser-adapter-api-design-systems-json/-/apidom-parser-adapter-api-design-systems-json-1.10.2.tgz#8249b5abdd430624a7c7f9d1a007ecfc9e2bc3cc"
+  integrity sha512-kzhJUGzsJ38Uohj5xRQDkQC08rqNhatbqgD30LZ0/UWryJ9nAsjqK2ovuP9t+5WKcDE4iwcYeGSt1NA2XgEZwg==
   dependencies:
     "@babel/runtime-corejs3" "^7.26.10"
-    "@swagger-api/apidom-core" "^1.6.0"
-    "@swagger-api/apidom-ns-api-design-systems" "^1.6.0"
-    "@swagger-api/apidom-parser-adapter-json" "^1.6.0"
+    "@swagger-api/apidom-core" "^1.10.2"
+    "@swagger-api/apidom-ns-api-design-systems" "^1.10.2"
+    "@swagger-api/apidom-parser-adapter-json" "^1.10.2"
     "@types/ramda" "~0.30.0"
     ramda "~0.30.0"
     ramda-adjunct "^5.0.0"
 
-"@swagger-api/apidom-parser-adapter-api-design-systems-yaml@^1.6.0":
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/@swagger-api/apidom-parser-adapter-api-design-systems-yaml/-/apidom-parser-adapter-api-design-systems-yaml-1.6.0.tgz#a56b618504f0168b3687a42553b5d26860d85adc"
-  integrity sha512-QAq4H6YzRtysSpvLtlJ8WZ22/1Mht+/iarrUOijxDZQPAGfYeUoIicnCqxkVZYSea85sQl+3kiCCB3nhSH+L0g==
+"@swagger-api/apidom-parser-adapter-api-design-systems-yaml@^1.10.2":
+  version "1.10.2"
+  resolved "https://registry.yarnpkg.com/@swagger-api/apidom-parser-adapter-api-design-systems-yaml/-/apidom-parser-adapter-api-design-systems-yaml-1.10.2.tgz#053cc675e02bce40b16e2773fc57a11689cceb26"
+  integrity sha512-i3CmSxJ/iG67ybRDAJ9xpuMrOMFvC/obX2lI36E0VZzBTb+llw4Zd5qFmBqNnImLpwdmk11Z1V7i+5HM+J7ijQ==
   dependencies:
     "@babel/runtime-corejs3" "^7.26.10"
-    "@swagger-api/apidom-core" "^1.6.0"
-    "@swagger-api/apidom-ns-api-design-systems" "^1.6.0"
-    "@swagger-api/apidom-parser-adapter-yaml-1-2" "^1.6.0"
+    "@swagger-api/apidom-core" "^1.10.2"
+    "@swagger-api/apidom-ns-api-design-systems" "^1.10.2"
+    "@swagger-api/apidom-parser-adapter-yaml-1-2" "^1.10.2"
     "@types/ramda" "~0.30.0"
     ramda "~0.30.0"
     ramda-adjunct "^5.0.0"
 
-"@swagger-api/apidom-parser-adapter-arazzo-json-1@^1.6.0":
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/@swagger-api/apidom-parser-adapter-arazzo-json-1/-/apidom-parser-adapter-arazzo-json-1-1.6.0.tgz#63790158816fc50d81bcf59631b3536e3af8d5ca"
-  integrity sha512-syKPG3a9IGRvlGhXIEUzWhwbEuFbj+UwwtqaKu8zu771V+DRtH+wxyOkX54vKAIlApz/FgeUbmlWA1ZtYBlSIQ==
+"@swagger-api/apidom-parser-adapter-arazzo-json-1@^1.10.2":
+  version "1.10.2"
+  resolved "https://registry.yarnpkg.com/@swagger-api/apidom-parser-adapter-arazzo-json-1/-/apidom-parser-adapter-arazzo-json-1-1.10.2.tgz#988b6999d34df1b85bfbc3f5dc54f419b3b448f0"
+  integrity sha512-HwiUkwvo5i2hV2SS6KWrdj62BdceZGfhuXhr1il8akWekpU4jXPtr5pv4gOnKKJN7VgjAmwt/DlcCSRo1+9jVA==
   dependencies:
     "@babel/runtime-corejs3" "^7.26.10"
-    "@swagger-api/apidom-core" "^1.6.0"
-    "@swagger-api/apidom-ns-arazzo-1" "^1.6.0"
-    "@swagger-api/apidom-parser-adapter-json" "^1.6.0"
+    "@swagger-api/apidom-core" "^1.10.2"
+    "@swagger-api/apidom-ns-arazzo-1" "^1.10.2"
+    "@swagger-api/apidom-parser-adapter-json" "^1.10.2"
     "@types/ramda" "~0.30.0"
     ramda "~0.30.0"
     ramda-adjunct "^5.0.0"
 
-"@swagger-api/apidom-parser-adapter-arazzo-yaml-1@^1.6.0":
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/@swagger-api/apidom-parser-adapter-arazzo-yaml-1/-/apidom-parser-adapter-arazzo-yaml-1-1.6.0.tgz#390a74c9cabaf175f35086075e82579edcefeb40"
-  integrity sha512-IVVLn+a8Q1iQcQsm4tXiAPghHJuJSB1rhIlDyHe3tSQgt9HOSiVpbnJDpwE/JBxxDxSAkeT6Ovo+fi2T5AmHYg==
+"@swagger-api/apidom-parser-adapter-arazzo-yaml-1@^1.10.2":
+  version "1.10.2"
+  resolved "https://registry.yarnpkg.com/@swagger-api/apidom-parser-adapter-arazzo-yaml-1/-/apidom-parser-adapter-arazzo-yaml-1-1.10.2.tgz#fe2371ff7a9cf84094b1ec1554c404c804958c28"
+  integrity sha512-w8VTVuE7GPbRqWxvMgRoTb726JRsMhFPMfTBf8+MJ4pQThjk78dSXPV2Zlse71b2DWBuQy2sr6zGyLUNs/3ePQ==
   dependencies:
     "@babel/runtime-corejs3" "^7.26.10"
-    "@swagger-api/apidom-core" "^1.6.0"
-    "@swagger-api/apidom-ns-arazzo-1" "^1.6.0"
-    "@swagger-api/apidom-parser-adapter-yaml-1-2" "^1.6.0"
+    "@swagger-api/apidom-core" "^1.10.2"
+    "@swagger-api/apidom-ns-arazzo-1" "^1.10.2"
+    "@swagger-api/apidom-parser-adapter-yaml-1-2" "^1.10.2"
     "@types/ramda" "~0.30.0"
     ramda "~0.30.0"
     ramda-adjunct "^5.0.0"
 
-"@swagger-api/apidom-parser-adapter-asyncapi-json-2@^1.6.0":
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/@swagger-api/apidom-parser-adapter-asyncapi-json-2/-/apidom-parser-adapter-asyncapi-json-2-1.6.0.tgz#3573506e856350ef0a24c64b517c3461eaa64fa7"
-  integrity sha512-aSUi22ELTDvdCLA3nIUOehuNBcHSeCqU7S7YNiHP/mwE4Q07pwQrYXijH2PROfCdjlZNNN34m6Ptakd92jliJQ==
+"@swagger-api/apidom-parser-adapter-asyncapi-json-2@^1.10.2":
+  version "1.10.2"
+  resolved "https://registry.yarnpkg.com/@swagger-api/apidom-parser-adapter-asyncapi-json-2/-/apidom-parser-adapter-asyncapi-json-2-1.10.2.tgz#aca77a0e3abb7643aab18fa7dcb370334de6d264"
+  integrity sha512-FDNjqmn2vV1jFoVVwQDO0XPPm8R5xzmcyY/6yBLFmKZADin3smSKVZ+njYHmfRjpspXwN0AwI0drdvuH0FZLJg==
   dependencies:
     "@babel/runtime-corejs3" "^7.26.10"
-    "@swagger-api/apidom-core" "^1.6.0"
-    "@swagger-api/apidom-ns-asyncapi-2" "^1.6.0"
-    "@swagger-api/apidom-parser-adapter-json" "^1.6.0"
+    "@swagger-api/apidom-core" "^1.10.2"
+    "@swagger-api/apidom-ns-asyncapi-2" "^1.10.2"
+    "@swagger-api/apidom-parser-adapter-json" "^1.10.2"
     "@types/ramda" "~0.30.0"
     ramda "~0.30.0"
     ramda-adjunct "^5.0.0"
 
-"@swagger-api/apidom-parser-adapter-asyncapi-json-3@^1.6.0":
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/@swagger-api/apidom-parser-adapter-asyncapi-json-3/-/apidom-parser-adapter-asyncapi-json-3-1.6.0.tgz#c18fb9cb2ce69fbe82a4b4fee0bb88bd972956f2"
-  integrity sha512-Ic53vcFF9zniDyCXOGSwwuAdEBUn5lFEAa0m2i30R36cQFHBCCuvbzbMQjWdr+oML0Aw4XoqOwZCQgkJJICpPA==
+"@swagger-api/apidom-parser-adapter-asyncapi-json-3@^1.10.2":
+  version "1.10.2"
+  resolved "https://registry.yarnpkg.com/@swagger-api/apidom-parser-adapter-asyncapi-json-3/-/apidom-parser-adapter-asyncapi-json-3-1.10.2.tgz#01ff7e0b05336288776791c9d537d6abe98ddb57"
+  integrity sha512-x/0vM2nDDzYzFnXr69+so/KSH+2py2TiZd1K49pWcX8cHsPV1Y4Ppih7GVOMymd8m/IOCjLYlV7qt4eWDwdldg==
   dependencies:
     "@babel/runtime-corejs3" "^7.26.10"
-    "@swagger-api/apidom-core" "^1.6.0"
-    "@swagger-api/apidom-ns-asyncapi-3" "^1.6.0"
-    "@swagger-api/apidom-parser-adapter-json" "^1.6.0"
+    "@swagger-api/apidom-core" "^1.10.2"
+    "@swagger-api/apidom-ns-asyncapi-3" "^1.10.2"
+    "@swagger-api/apidom-parser-adapter-json" "^1.10.2"
     "@types/ramda" "~0.30.0"
     ramda "~0.30.0"
     ramda-adjunct "^5.0.0"
 
-"@swagger-api/apidom-parser-adapter-asyncapi-yaml-2@^1.6.0":
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/@swagger-api/apidom-parser-adapter-asyncapi-yaml-2/-/apidom-parser-adapter-asyncapi-yaml-2-1.6.0.tgz#209e4ceefa2c70ce0bfd957bf0e786474f763fb9"
-  integrity sha512-d/w7X+T4vT+KPqb+8xUm6n4pbHsGB28jdxE9rNVbxhu6D3owny2uxfglwaFh4fJG6FQMavCwl/QzfB4newdoKQ==
+"@swagger-api/apidom-parser-adapter-asyncapi-yaml-2@^1.10.2":
+  version "1.10.2"
+  resolved "https://registry.yarnpkg.com/@swagger-api/apidom-parser-adapter-asyncapi-yaml-2/-/apidom-parser-adapter-asyncapi-yaml-2-1.10.2.tgz#0912939a3d6f0845587bcd0ed6b67ae36c9989b0"
+  integrity sha512-2bVACmU9ZmAVVnqQWSc3Bs+xG0HHLU1tfZbYL8xNgSi8kw4HcnejF5mWtN+MLFzTaBmWCi2In7P7BYNR8+2Dyg==
   dependencies:
     "@babel/runtime-corejs3" "^7.26.10"
-    "@swagger-api/apidom-core" "^1.6.0"
-    "@swagger-api/apidom-ns-asyncapi-2" "^1.6.0"
-    "@swagger-api/apidom-parser-adapter-yaml-1-2" "^1.6.0"
+    "@swagger-api/apidom-core" "^1.10.2"
+    "@swagger-api/apidom-ns-asyncapi-2" "^1.10.2"
+    "@swagger-api/apidom-parser-adapter-yaml-1-2" "^1.10.2"
     "@types/ramda" "~0.30.0"
     ramda "~0.30.0"
     ramda-adjunct "^5.0.0"
 
-"@swagger-api/apidom-parser-adapter-asyncapi-yaml-3@^1.6.0":
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/@swagger-api/apidom-parser-adapter-asyncapi-yaml-3/-/apidom-parser-adapter-asyncapi-yaml-3-1.6.0.tgz#37f0c6d4562d93a910c883392f51ba3e2e004e17"
-  integrity sha512-Wmf0LY59TZxQhqrJU2pcnUikcChVB4IqGPgjtOFLUoqPpz8FSwYbJ/SPnSMSl+QuncxROheSFsgZ6Tupv0sPHw==
+"@swagger-api/apidom-parser-adapter-asyncapi-yaml-3@^1.10.2":
+  version "1.10.2"
+  resolved "https://registry.yarnpkg.com/@swagger-api/apidom-parser-adapter-asyncapi-yaml-3/-/apidom-parser-adapter-asyncapi-yaml-3-1.10.2.tgz#b8de51551d183f74e9c3eb3d0754200bc5751ff0"
+  integrity sha512-oHpbf+iqBcDS3qtsipMpgCwAeckKMxg0qFKYTCRZyJdctRgupJTxVeir6t/SGo0Ny0a1iknt2LN0u5frEen0kg==
   dependencies:
     "@babel/runtime-corejs3" "^7.26.10"
-    "@swagger-api/apidom-core" "^1.6.0"
-    "@swagger-api/apidom-ns-asyncapi-3" "^1.6.0"
-    "@swagger-api/apidom-parser-adapter-yaml-1-2" "^1.6.0"
+    "@swagger-api/apidom-core" "^1.10.2"
+    "@swagger-api/apidom-ns-asyncapi-3" "^1.10.2"
+    "@swagger-api/apidom-parser-adapter-yaml-1-2" "^1.10.2"
     "@types/ramda" "~0.30.0"
     ramda "~0.30.0"
     ramda-adjunct "^5.0.0"
 
-"@swagger-api/apidom-parser-adapter-json@^1.6.0":
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/@swagger-api/apidom-parser-adapter-json/-/apidom-parser-adapter-json-1.6.0.tgz#cb950140c66cb27cc7517f604e50e9c8bb6b2753"
-  integrity sha512-WdAS+dBAB2t18HuUgSZy5b8JM7uXfn1RlPymJNRMUsrKYCTtPrQ/0q3YfnBjPhtjSSNCp+p1wajxHAFS7cj2VA==
+"@swagger-api/apidom-parser-adapter-json@^1.10.2":
+  version "1.10.2"
+  resolved "https://registry.yarnpkg.com/@swagger-api/apidom-parser-adapter-json/-/apidom-parser-adapter-json-1.10.2.tgz#fd52f62064a2456a30f020b208d80715d4bb9ae2"
+  integrity sha512-VnwEkarKfsJYRF0zCI9AGiSIyBUXqS2d32KQuhVCt/HeuF1XO9sjeLjGiosA/24YVOnO0ul5TpiNFQn0pw89mA==
   dependencies:
     "@babel/runtime-corejs3" "^7.26.10"
-    "@swagger-api/apidom-ast" "^1.6.0"
-    "@swagger-api/apidom-core" "^1.6.0"
-    "@swagger-api/apidom-error" "^1.6.0"
+    "@swagger-api/apidom-ast" "^1.10.2"
+    "@swagger-api/apidom-core" "^1.10.2"
+    "@swagger-api/apidom-error" "^1.10.2"
     "@types/ramda" "~0.30.0"
     ramda "~0.30.0"
     ramda-adjunct "^5.0.0"
@@ -4085,119 +4065,119 @@
     tree-sitter-json "=0.24.8"
     web-tree-sitter "=0.24.5"
 
-"@swagger-api/apidom-parser-adapter-openapi-json-2@^1.6.0":
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/@swagger-api/apidom-parser-adapter-openapi-json-2/-/apidom-parser-adapter-openapi-json-2-1.6.0.tgz#278eac1ec8fec3b0c7e2cad6cc8f75f636ae8a3c"
-  integrity sha512-Q36W1FzdVaY7Oh98533dzCUghwb8k3ZMdlnV37V1H13FlUkj3tVZiWaeaCLwIakzQ7XXYaQTOP+VrRhDRjzhUA==
+"@swagger-api/apidom-parser-adapter-openapi-json-2@^1.10.2":
+  version "1.10.2"
+  resolved "https://registry.yarnpkg.com/@swagger-api/apidom-parser-adapter-openapi-json-2/-/apidom-parser-adapter-openapi-json-2-1.10.2.tgz#18a604e5197f095d7633ec47263ed31c856c2b87"
+  integrity sha512-+d/o/8TrNBjvFzgPb0RQhrCc8gOWnrHZF+xvCO5gwp+4MUr1XP1AJIox1e6t1SO+j7IQjiF2ocx2r7eFE5QC7w==
   dependencies:
     "@babel/runtime-corejs3" "^7.26.10"
-    "@swagger-api/apidom-core" "^1.6.0"
-    "@swagger-api/apidom-ns-openapi-2" "^1.6.0"
-    "@swagger-api/apidom-parser-adapter-json" "^1.6.0"
+    "@swagger-api/apidom-core" "^1.10.2"
+    "@swagger-api/apidom-ns-openapi-2" "^1.10.2"
+    "@swagger-api/apidom-parser-adapter-json" "^1.10.2"
     "@types/ramda" "~0.30.0"
     ramda "~0.30.0"
     ramda-adjunct "^5.0.0"
 
-"@swagger-api/apidom-parser-adapter-openapi-json-3-0@^1.6.0":
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/@swagger-api/apidom-parser-adapter-openapi-json-3-0/-/apidom-parser-adapter-openapi-json-3-0-1.6.0.tgz#9dfebd27032acef17d1c48820ab6d95db6561910"
-  integrity sha512-UY+obOLTPHJvnXscdMY9XwZyuqcnBe6cu9TURjJgkO/QpOpPDqqZoRyurKZgRrX0Pv9B1zR3EIzhl01u/jeUaw==
+"@swagger-api/apidom-parser-adapter-openapi-json-3-0@^1.10.2":
+  version "1.10.2"
+  resolved "https://registry.yarnpkg.com/@swagger-api/apidom-parser-adapter-openapi-json-3-0/-/apidom-parser-adapter-openapi-json-3-0-1.10.2.tgz#80c16b46d5ef355848d7cc5ab57aec589ada20e1"
+  integrity sha512-3ieUeX8/WywkUzdOO1U1QKQDNmpZFfOeTAeb4ISDd/PKOVwuEx/b0w5I8EuOu97tKAe3UUesEdii+pJlkcFlFw==
   dependencies:
     "@babel/runtime-corejs3" "^7.26.10"
-    "@swagger-api/apidom-core" "^1.6.0"
-    "@swagger-api/apidom-ns-openapi-3-0" "^1.6.0"
-    "@swagger-api/apidom-parser-adapter-json" "^1.6.0"
+    "@swagger-api/apidom-core" "^1.10.2"
+    "@swagger-api/apidom-ns-openapi-3-0" "^1.10.2"
+    "@swagger-api/apidom-parser-adapter-json" "^1.10.2"
     "@types/ramda" "~0.30.0"
     ramda "~0.30.0"
     ramda-adjunct "^5.0.0"
 
-"@swagger-api/apidom-parser-adapter-openapi-json-3-1@^1.6.0":
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/@swagger-api/apidom-parser-adapter-openapi-json-3-1/-/apidom-parser-adapter-openapi-json-3-1-1.6.0.tgz#2ede833b39831973525f8b45680010e957ead469"
-  integrity sha512-4ch04/96lYMXQu6odqa6H0aJmV8UefnBJKX1CPuL4qcPSPMFCurcXHGpPHrwMu1p/4Q9H+yRVlYeNQV10xvM0w==
+"@swagger-api/apidom-parser-adapter-openapi-json-3-1@^1.10.2":
+  version "1.10.2"
+  resolved "https://registry.yarnpkg.com/@swagger-api/apidom-parser-adapter-openapi-json-3-1/-/apidom-parser-adapter-openapi-json-3-1-1.10.2.tgz#58e2342896bc7a270d5b6cd5951b7b2536b7502e"
+  integrity sha512-z0c7IgMPLSDhE+ldTb54Xlhq+yPF0w/8LHXyeHX4V6BS1VG3Utb+mM/qTVfy1Eo+p1KGNlwNDEPsBp6jIaVb5Q==
   dependencies:
     "@babel/runtime-corejs3" "^7.26.10"
-    "@swagger-api/apidom-core" "^1.6.0"
-    "@swagger-api/apidom-ns-openapi-3-1" "^1.6.0"
-    "@swagger-api/apidom-parser-adapter-json" "^1.6.0"
+    "@swagger-api/apidom-core" "^1.10.2"
+    "@swagger-api/apidom-ns-openapi-3-1" "^1.10.2"
+    "@swagger-api/apidom-parser-adapter-json" "^1.10.2"
     "@types/ramda" "~0.30.0"
     ramda "~0.30.0"
     ramda-adjunct "^5.0.0"
 
-"@swagger-api/apidom-parser-adapter-openapi-json-3-2@^1.6.0":
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/@swagger-api/apidom-parser-adapter-openapi-json-3-2/-/apidom-parser-adapter-openapi-json-3-2-1.6.0.tgz#e019e0321928affbdb7e3b581da811b6da9b3665"
-  integrity sha512-fWR2gjMQg00QIimcXQMSVeLnCH/2iuDD/Dx8TzVHmKV/IKlu+TnmIVosdlDfRmOB+4duwU6/yfoA79IEhFeZdw==
+"@swagger-api/apidom-parser-adapter-openapi-json-3-2@^1.10.2":
+  version "1.10.2"
+  resolved "https://registry.yarnpkg.com/@swagger-api/apidom-parser-adapter-openapi-json-3-2/-/apidom-parser-adapter-openapi-json-3-2-1.10.2.tgz#ec4ed3b67067a1ba3f48432feb02316a25453dc5"
+  integrity sha512-bx/kEIXWtpHu+4LEiyNdt0v8ER5EVwPjhQdlpOaC5qghnRH9aUYOTawZtVHsNHAQWTIMNn9DdPKYQgttQKD0Pw==
   dependencies:
     "@babel/runtime-corejs3" "^7.26.10"
-    "@swagger-api/apidom-core" "^1.6.0"
-    "@swagger-api/apidom-ns-openapi-3-2" "^1.6.0"
-    "@swagger-api/apidom-parser-adapter-json" "^1.6.0"
+    "@swagger-api/apidom-core" "^1.10.2"
+    "@swagger-api/apidom-ns-openapi-3-2" "^1.10.2"
+    "@swagger-api/apidom-parser-adapter-json" "^1.10.2"
     "@types/ramda" "~0.30.0"
     ramda "~0.30.0"
     ramda-adjunct "^5.0.0"
 
-"@swagger-api/apidom-parser-adapter-openapi-yaml-2@^1.6.0":
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/@swagger-api/apidom-parser-adapter-openapi-yaml-2/-/apidom-parser-adapter-openapi-yaml-2-1.6.0.tgz#6ca83d9027e1adf9a2a8e7ef1f0b4599bcf6fbf0"
-  integrity sha512-dkEh1Rw9uvuIAOTfKjWRX2rLWP+xJ/Eqdkqeo0I0BWFKXX49YcDpHJV4XHpmd5FbsjJ9vBYr0hAmkbl32TtR4g==
+"@swagger-api/apidom-parser-adapter-openapi-yaml-2@^1.10.2":
+  version "1.10.2"
+  resolved "https://registry.yarnpkg.com/@swagger-api/apidom-parser-adapter-openapi-yaml-2/-/apidom-parser-adapter-openapi-yaml-2-1.10.2.tgz#9156fd645e4c262fb7d40a5a1893c933b9c4e2ff"
+  integrity sha512-e86JUXHGGEVsO4/xpy/GRSvYXGN30hLt1lMUhjzCFuE95N6/K3hmQHE3rA/H7ot1ajCWUhzukW5rGQac79NIjA==
   dependencies:
     "@babel/runtime-corejs3" "^7.26.10"
-    "@swagger-api/apidom-core" "^1.6.0"
-    "@swagger-api/apidom-ns-openapi-2" "^1.6.0"
-    "@swagger-api/apidom-parser-adapter-yaml-1-2" "^1.6.0"
+    "@swagger-api/apidom-core" "^1.10.2"
+    "@swagger-api/apidom-ns-openapi-2" "^1.10.2"
+    "@swagger-api/apidom-parser-adapter-yaml-1-2" "^1.10.2"
     "@types/ramda" "~0.30.0"
     ramda "~0.30.0"
     ramda-adjunct "^5.0.0"
 
-"@swagger-api/apidom-parser-adapter-openapi-yaml-3-0@^1.6.0":
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/@swagger-api/apidom-parser-adapter-openapi-yaml-3-0/-/apidom-parser-adapter-openapi-yaml-3-0-1.6.0.tgz#bd9ad26ed181153fb69eb73bda9fca9291b4eaed"
-  integrity sha512-6azq5YonWdzHcO9llK9zn1a+rGxlTz2Uf8p8NWDQnl2AZ56neDLYEL3mNDlrMXAy8dSJIHw+u9VF1OOzdslIHQ==
+"@swagger-api/apidom-parser-adapter-openapi-yaml-3-0@^1.10.2":
+  version "1.10.2"
+  resolved "https://registry.yarnpkg.com/@swagger-api/apidom-parser-adapter-openapi-yaml-3-0/-/apidom-parser-adapter-openapi-yaml-3-0-1.10.2.tgz#311050d1aaeae227773c8487f3210acd02b6f209"
+  integrity sha512-ucfc13Ai31tJ0ruAm1YiHhqENgcBuiOXL00OhoICWA56ggAcnA5WfWmvtsXVMlZsTHVbhZP3XpsH5rui2N8u5w==
   dependencies:
     "@babel/runtime-corejs3" "^7.26.10"
-    "@swagger-api/apidom-core" "^1.6.0"
-    "@swagger-api/apidom-ns-openapi-3-0" "^1.6.0"
-    "@swagger-api/apidom-parser-adapter-yaml-1-2" "^1.6.0"
+    "@swagger-api/apidom-core" "^1.10.2"
+    "@swagger-api/apidom-ns-openapi-3-0" "^1.10.2"
+    "@swagger-api/apidom-parser-adapter-yaml-1-2" "^1.10.2"
     "@types/ramda" "~0.30.0"
     ramda "~0.30.0"
     ramda-adjunct "^5.0.0"
 
-"@swagger-api/apidom-parser-adapter-openapi-yaml-3-1@^1.6.0":
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/@swagger-api/apidom-parser-adapter-openapi-yaml-3-1/-/apidom-parser-adapter-openapi-yaml-3-1-1.6.0.tgz#cb9e42504cd38564c7c444b958ccb8656314eac5"
-  integrity sha512-g2tGCXyIAC0IA6JjA0HVxHWyCovyfAxDQ+pMAJ6qm4PfrZHB+oXKWKZHNNmQaFiKdc/SVdMQq6Up0mXOQs7IOQ==
+"@swagger-api/apidom-parser-adapter-openapi-yaml-3-1@^1.10.2":
+  version "1.10.2"
+  resolved "https://registry.yarnpkg.com/@swagger-api/apidom-parser-adapter-openapi-yaml-3-1/-/apidom-parser-adapter-openapi-yaml-3-1-1.10.2.tgz#5d50ae20d9dbb4f23edfa2042deb3ec9ea3516e6"
+  integrity sha512-7o8j93qgf9yYAaaJ/GpH+5sB3fC9EmvmjTCqlw5YWXp+cRgCn9q7f80Sv4+NjbracUafB6qL4i9F/m+Xs0XZaQ==
   dependencies:
     "@babel/runtime-corejs3" "^7.26.10"
-    "@swagger-api/apidom-core" "^1.6.0"
-    "@swagger-api/apidom-ns-openapi-3-1" "^1.6.0"
-    "@swagger-api/apidom-parser-adapter-yaml-1-2" "^1.6.0"
+    "@swagger-api/apidom-core" "^1.10.2"
+    "@swagger-api/apidom-ns-openapi-3-1" "^1.10.2"
+    "@swagger-api/apidom-parser-adapter-yaml-1-2" "^1.10.2"
     "@types/ramda" "~0.30.0"
     ramda "~0.30.0"
     ramda-adjunct "^5.0.0"
 
-"@swagger-api/apidom-parser-adapter-openapi-yaml-3-2@^1.6.0":
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/@swagger-api/apidom-parser-adapter-openapi-yaml-3-2/-/apidom-parser-adapter-openapi-yaml-3-2-1.6.0.tgz#5851ff4cfeae7712ffab022b347e4877859ffc17"
-  integrity sha512-NGkdG9X5Svi89ZBluNseyUBNdgB9MkbTTNmerVKKOmCCHaVbzIb6UFPXf1MifSFyT+wTeGZk6WZLgRIDsTAZ5Q==
+"@swagger-api/apidom-parser-adapter-openapi-yaml-3-2@^1.10.2":
+  version "1.10.2"
+  resolved "https://registry.yarnpkg.com/@swagger-api/apidom-parser-adapter-openapi-yaml-3-2/-/apidom-parser-adapter-openapi-yaml-3-2-1.10.2.tgz#0b8e12e981cfb2361fb7317342897c7484fc706a"
+  integrity sha512-blDIeVmo8bpXYV/C+b6PYi54yS+5jPEZTFsK5jQ2NzpCPrkBPacp/KTuHBUBzJsYj4bj/ivRL3+JXGw4YovUHw==
   dependencies:
     "@babel/runtime-corejs3" "^7.26.10"
-    "@swagger-api/apidom-core" "^1.6.0"
-    "@swagger-api/apidom-ns-openapi-3-2" "^1.6.0"
-    "@swagger-api/apidom-parser-adapter-yaml-1-2" "^1.6.0"
+    "@swagger-api/apidom-core" "^1.10.2"
+    "@swagger-api/apidom-ns-openapi-3-2" "^1.10.2"
+    "@swagger-api/apidom-parser-adapter-yaml-1-2" "^1.10.2"
     "@types/ramda" "~0.30.0"
     ramda "~0.30.0"
     ramda-adjunct "^5.0.0"
 
-"@swagger-api/apidom-parser-adapter-yaml-1-2@^1.6.0":
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/@swagger-api/apidom-parser-adapter-yaml-1-2/-/apidom-parser-adapter-yaml-1-2-1.6.0.tgz#3bd4c52755f39c76a159645aadc9f96bec9156cd"
-  integrity sha512-UwSE5pPUJ+ag7ZCbesgx/SJ8zUD3Sx+2U4AD3/1G1EJ+0gb7FMYgihuOT8ujmBfZVGGm3HMIEIa1w3zha08v2g==
+"@swagger-api/apidom-parser-adapter-yaml-1-2@^1.10.2":
+  version "1.10.2"
+  resolved "https://registry.yarnpkg.com/@swagger-api/apidom-parser-adapter-yaml-1-2/-/apidom-parser-adapter-yaml-1-2-1.10.2.tgz#d723a5f2668e5eb4aa0428f4045c3bca157b90c6"
+  integrity sha512-I5eCls8XS3SVEwH/cuL6T3iar1TPaFYh3gXwS/2rzP1aZQNKSHDP3y3ney7nAomKG4dFvE8Q248FL36arG7T/w==
   dependencies:
     "@babel/runtime-corejs3" "^7.26.10"
-    "@swagger-api/apidom-ast" "^1.6.0"
-    "@swagger-api/apidom-core" "^1.6.0"
-    "@swagger-api/apidom-error" "^1.6.0"
+    "@swagger-api/apidom-ast" "^1.10.2"
+    "@swagger-api/apidom-core" "^1.10.2"
+    "@swagger-api/apidom-error" "^1.10.2"
     "@tree-sitter-grammars/tree-sitter-yaml" "=0.7.1"
     "@types/ramda" "~0.30.0"
     ramda "~0.30.0"
@@ -4205,45 +4185,45 @@
     tree-sitter "=0.22.4"
     web-tree-sitter "=0.24.5"
 
-"@swagger-api/apidom-reference@^1.6.0":
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/@swagger-api/apidom-reference/-/apidom-reference-1.6.0.tgz#1060b54d135b1888850678cd35d862ffb1ac6f77"
-  integrity sha512-gYTDfWQM1heqrCCrCsZH+EWDyAkIGqEJnSJcVWKngwOkXJKeUwat8p1TOW4q3rkaTT+fBaYbrjTr9SkFtVbdMg==
+"@swagger-api/apidom-reference@^1.10.2":
+  version "1.10.2"
+  resolved "https://registry.yarnpkg.com/@swagger-api/apidom-reference/-/apidom-reference-1.10.2.tgz#82069138540116c35ec782a5395c41ced7b20942"
+  integrity sha512-H5UqOmae9CXdiLJbbh1j+/hwvcECmr6ci2XtUKTQpFviemvsIDZmPV1DKUAxCfzGr2iOkDO6SZc+/OEWlETqiQ==
   dependencies:
     "@babel/runtime-corejs3" "^7.26.10"
-    "@swagger-api/apidom-core" "^1.6.0"
-    "@swagger-api/apidom-error" "^1.6.0"
+    "@swagger-api/apidom-core" "^1.10.2"
+    "@swagger-api/apidom-error" "^1.10.2"
     "@types/ramda" "~0.30.0"
-    axios "^1.12.2"
+    axios "^1.15.0"
     minimatch "^10.2.1"
     ramda "~0.30.0"
     ramda-adjunct "^5.0.0"
   optionalDependencies:
-    "@swagger-api/apidom-json-pointer" "^1.6.0"
-    "@swagger-api/apidom-ns-arazzo-1" "^1.6.0"
-    "@swagger-api/apidom-ns-asyncapi-2" "^1.6.0"
-    "@swagger-api/apidom-ns-openapi-2" "^1.6.0"
-    "@swagger-api/apidom-ns-openapi-3-0" "^1.6.0"
-    "@swagger-api/apidom-ns-openapi-3-1" "^1.6.0"
-    "@swagger-api/apidom-ns-openapi-3-2" "^1.6.0"
-    "@swagger-api/apidom-parser-adapter-api-design-systems-json" "^1.6.0"
-    "@swagger-api/apidom-parser-adapter-api-design-systems-yaml" "^1.6.0"
-    "@swagger-api/apidom-parser-adapter-arazzo-json-1" "^1.6.0"
-    "@swagger-api/apidom-parser-adapter-arazzo-yaml-1" "^1.6.0"
-    "@swagger-api/apidom-parser-adapter-asyncapi-json-2" "^1.6.0"
-    "@swagger-api/apidom-parser-adapter-asyncapi-json-3" "^1.6.0"
-    "@swagger-api/apidom-parser-adapter-asyncapi-yaml-2" "^1.6.0"
-    "@swagger-api/apidom-parser-adapter-asyncapi-yaml-3" "^1.6.0"
-    "@swagger-api/apidom-parser-adapter-json" "^1.6.0"
-    "@swagger-api/apidom-parser-adapter-openapi-json-2" "^1.6.0"
-    "@swagger-api/apidom-parser-adapter-openapi-json-3-0" "^1.6.0"
-    "@swagger-api/apidom-parser-adapter-openapi-json-3-1" "^1.6.0"
-    "@swagger-api/apidom-parser-adapter-openapi-json-3-2" "^1.6.0"
-    "@swagger-api/apidom-parser-adapter-openapi-yaml-2" "^1.6.0"
-    "@swagger-api/apidom-parser-adapter-openapi-yaml-3-0" "^1.6.0"
-    "@swagger-api/apidom-parser-adapter-openapi-yaml-3-1" "^1.6.0"
-    "@swagger-api/apidom-parser-adapter-openapi-yaml-3-2" "^1.6.0"
-    "@swagger-api/apidom-parser-adapter-yaml-1-2" "^1.6.0"
+    "@swagger-api/apidom-json-pointer" "^1.10.2"
+    "@swagger-api/apidom-ns-arazzo-1" "^1.10.2"
+    "@swagger-api/apidom-ns-asyncapi-2" "^1.10.2"
+    "@swagger-api/apidom-ns-openapi-2" "^1.10.2"
+    "@swagger-api/apidom-ns-openapi-3-0" "^1.10.2"
+    "@swagger-api/apidom-ns-openapi-3-1" "^1.10.2"
+    "@swagger-api/apidom-ns-openapi-3-2" "^1.10.2"
+    "@swagger-api/apidom-parser-adapter-api-design-systems-json" "^1.10.2"
+    "@swagger-api/apidom-parser-adapter-api-design-systems-yaml" "^1.10.2"
+    "@swagger-api/apidom-parser-adapter-arazzo-json-1" "^1.10.2"
+    "@swagger-api/apidom-parser-adapter-arazzo-yaml-1" "^1.10.2"
+    "@swagger-api/apidom-parser-adapter-asyncapi-json-2" "^1.10.2"
+    "@swagger-api/apidom-parser-adapter-asyncapi-json-3" "^1.10.2"
+    "@swagger-api/apidom-parser-adapter-asyncapi-yaml-2" "^1.10.2"
+    "@swagger-api/apidom-parser-adapter-asyncapi-yaml-3" "^1.10.2"
+    "@swagger-api/apidom-parser-adapter-json" "^1.10.2"
+    "@swagger-api/apidom-parser-adapter-openapi-json-2" "^1.10.2"
+    "@swagger-api/apidom-parser-adapter-openapi-json-3-0" "^1.10.2"
+    "@swagger-api/apidom-parser-adapter-openapi-json-3-1" "^1.10.2"
+    "@swagger-api/apidom-parser-adapter-openapi-json-3-2" "^1.10.2"
+    "@swagger-api/apidom-parser-adapter-openapi-yaml-2" "^1.10.2"
+    "@swagger-api/apidom-parser-adapter-openapi-yaml-3-0" "^1.10.2"
+    "@swagger-api/apidom-parser-adapter-openapi-yaml-3-1" "^1.10.2"
+    "@swagger-api/apidom-parser-adapter-openapi-yaml-3-2" "^1.10.2"
+    "@swagger-api/apidom-parser-adapter-yaml-1-2" "^1.10.2"
 
 "@swaggerexpert/cookie@^2.0.2":
   version "2.0.2"
@@ -4259,143 +4239,86 @@
   dependencies:
     apg-lite "^1.0.4"
 
-"@swc/core-darwin-arm64@1.15.13":
-  version "1.15.13"
-  resolved "https://registry.yarnpkg.com/@swc/core-darwin-arm64/-/core-darwin-arm64-1.15.13.tgz#f60ff48cb93066b83405074015eb6373ea0cdd77"
-  integrity sha512-ztXusRuC5NV2w+a6pDhX13CGioMLq8CjX5P4XgVJ21ocqz9t19288Do0y8LklplDtwcEhYGTNdMbkmUT7+lDTg==
+"@swc/core-darwin-arm64@1.15.30":
+  version "1.15.30"
+  resolved "https://registry.yarnpkg.com/@swc/core-darwin-arm64/-/core-darwin-arm64-1.15.30.tgz#23447f1c30c9155fe35602de4392b4ecfa0a54cc"
+  integrity sha512-VvpP+vq08HmGYewMWvrdsxh9s2lthz/808zXm8Yu5kaqeR8Yia2b0eYXleHQ3VAjoStUDk6LzTheBW9KXYQdMA==
 
-"@swc/core-darwin-arm64@1.15.18":
-  version "1.15.18"
-  resolved "https://registry.yarnpkg.com/@swc/core-darwin-arm64/-/core-darwin-arm64-1.15.18.tgz#fb487392f7bbe3179166b9b0d128916e39a627af"
-  integrity sha512-+mIv7uBuSaywN3C9LNuWaX1jJJ3SKfiJuE6Lr3bd+/1Iv8oMU7oLBjYMluX1UrEPzwN2qCdY6Io0yVicABoCwQ==
+"@swc/core-darwin-x64@1.15.30":
+  version "1.15.30"
+  resolved "https://registry.yarnpkg.com/@swc/core-darwin-x64/-/core-darwin-x64-1.15.30.tgz#16e6e35fff5b07c712d8af44783da59ac64ad5cf"
+  integrity sha512-WiJA0hiZI3nwQAO6mu5RqigtWGDtth4Hiq6rbZxAaQyhIcqKIg5IoMRc1Y071lrNJn29eEDMC86Rq58xgUxlDg==
 
-"@swc/core-darwin-x64@1.15.13":
-  version "1.15.13"
-  resolved "https://registry.yarnpkg.com/@swc/core-darwin-x64/-/core-darwin-x64-1.15.13.tgz#3838c08653ac53a6508cdc34bfa191281da4ed26"
-  integrity sha512-cVifxQUKhaE7qcO/y9Mq6PEhoyvN9tSLzCnnFZ4EIabFHBuLtDDO6a+vLveOy98hAs5Qu1+bb5Nv0oa1Pihe3Q==
+"@swc/core-linux-arm-gnueabihf@1.15.30":
+  version "1.15.30"
+  resolved "https://registry.yarnpkg.com/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.15.30.tgz#abce7de734301109a7df23c22f6b6d233e3b9de9"
+  integrity sha512-YANuFUo48kIT6plJgCD0keae9HFXfjxsbvsgevqc0hr/07X/p7sAWTFOGYEc2SXcASaK7UvuQqzlbW8pr7R79g==
 
-"@swc/core-darwin-x64@1.15.18":
-  version "1.15.18"
-  resolved "https://registry.yarnpkg.com/@swc/core-darwin-x64/-/core-darwin-x64-1.15.18.tgz#0e11fb0a80ebd56cb4417138a938ffc789ead492"
-  integrity sha512-wZle0eaQhnzxWX5V/2kEOI6Z9vl/lTFEC6V4EWcn+5pDjhemCpQv9e/TDJ0GIoiClX8EDWRvuZwh+Z3dhL1NAg==
+"@swc/core-linux-arm64-gnu@1.15.30":
+  version "1.15.30"
+  resolved "https://registry.yarnpkg.com/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.15.30.tgz#9a4e418cdbbfe64506dd12469a553c07e1924fef"
+  integrity sha512-VndG8jaR4ugY6u+iVOT0Q+d2fZd7sLgjPgN8W/Le+3EbZKl+cRfFxV7Eoz4gfLqhmneZPdcIzf9T3LkgkmqNLg==
 
-"@swc/core-linux-arm-gnueabihf@1.15.13":
-  version "1.15.13"
-  resolved "https://registry.yarnpkg.com/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.15.13.tgz#9308b156fae3fe5d12684b86af31ada4255066fc"
-  integrity sha512-t+xxEzZ48enl/wGGy7SRYd7kImWQ/+wvVFD7g5JZo234g6/QnIgZ+YdfIyjHB+ZJI3F7a2IQHS7RNjxF29UkWw==
+"@swc/core-linux-arm64-musl@1.15.30":
+  version "1.15.30"
+  resolved "https://registry.yarnpkg.com/@swc/core-linux-arm64-musl/-/core-linux-arm64-musl-1.15.30.tgz#4cd68ccb2af71c3ec539b15aa15c8fd304833d26"
+  integrity sha512-1SYGs2l0Yyyi0pR/P/NKz/x0kqxkoiw+BXeJjLUdecSk/KasncWlJrc6hOvFSgKHOBrzgM5jwuluKtlT8dnrcA==
 
-"@swc/core-linux-arm-gnueabihf@1.15.18":
-  version "1.15.18"
-  resolved "https://registry.yarnpkg.com/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.15.18.tgz#e7cac4b46d66dfd6b0fedea68877a5678fcf3579"
-  integrity sha512-ao61HGXVqrJFHAcPtF4/DegmwEkVCo4HApnotLU8ognfmU8x589z7+tcf3hU+qBiU1WOXV5fQX6W9Nzs6hjxDw==
+"@swc/core-linux-ppc64-gnu@1.15.30":
+  version "1.15.30"
+  resolved "https://registry.yarnpkg.com/@swc/core-linux-ppc64-gnu/-/core-linux-ppc64-gnu-1.15.30.tgz#561997d3c5f392db7e3473cb4bbc43e6d6b1160c"
+  integrity sha512-TXREtiXeRhbfDFbmhnkIsXpKfzbfT73YkV2ZF6w0sfxgjC5zI2ZAbaCOq25qxvegofj2K93DtOpm9RLaBgqR2g==
 
-"@swc/core-linux-arm64-gnu@1.15.13":
-  version "1.15.13"
-  resolved "https://registry.yarnpkg.com/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.15.13.tgz#b150d6091e2bb3cf97dc9712a711d3ba025811a9"
-  integrity sha512-VndeGvKmTXFn6AGwjy0Kg8i7HccOCE7Jt/vmZwRxGtOfNZM1RLYRQ7MfDLo6T0h1Bq6eYzps3L5Ma4zBmjOnOg==
+"@swc/core-linux-s390x-gnu@1.15.30":
+  version "1.15.30"
+  resolved "https://registry.yarnpkg.com/@swc/core-linux-s390x-gnu/-/core-linux-s390x-gnu-1.15.30.tgz#d6f1d5dceca794909305584cb69f80dd91820410"
+  integrity sha512-DCR2YYeyd6DQE4OuDhImouuNcjXEiEdnn1Y0DyGteugPEDvVuvYk8Xddi+4o2SgWH6jiW8/I+3emZvbep1NC+g==
 
-"@swc/core-linux-arm64-gnu@1.15.18":
-  version "1.15.18"
-  resolved "https://registry.yarnpkg.com/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.15.18.tgz#ca888f41be89887f9f6b4afd1cc38a1a596a655d"
-  integrity sha512-3xnctOBLIq3kj8PxOCgPrGjBLP/kNOddr6f5gukYt/1IZxsITQaU9TDyjeX6jG+FiCIHjCuWuffsyQDL5Ew1bg==
+"@swc/core-linux-x64-gnu@1.15.30":
+  version "1.15.30"
+  resolved "https://registry.yarnpkg.com/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.15.30.tgz#c3e91c60f265a62cec60145f0d2d931feb1cf41a"
+  integrity sha512-5Pizw3NgfOJ5BJOBK8TIRa59xFW2avESTOBDPTAYwZYa1JNDs+KMF9lUfjJiJLM5HiMs/wPheA9eiT0q9m2AoA==
 
-"@swc/core-linux-arm64-musl@1.15.13":
-  version "1.15.13"
-  resolved "https://registry.yarnpkg.com/@swc/core-linux-arm64-musl/-/core-linux-arm64-musl-1.15.13.tgz#35dd5382554096118ecd1db2928e1f71b56aa41a"
-  integrity sha512-SmZ9m+XqCB35NddHCctvHFLqPZDAs5j8IgD36GoutufDJmeq2VNfgk5rQoqNqKmAK3Y7iFdEmI76QoHIWiCLyw==
+"@swc/core-linux-x64-musl@1.15.30":
+  version "1.15.30"
+  resolved "https://registry.yarnpkg.com/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.15.30.tgz#3fd112e617a951438f73930b514adf19375067fb"
+  integrity sha512-qyqydP/wyH8alcIP4a2hnGSjHLJjm9H7yDFup+CPy9oTahFgLLwnNcv5UHXqO2Qs3AIND+cls5f/Bb6hqpxdgA==
 
-"@swc/core-linux-arm64-musl@1.15.18":
-  version "1.15.18"
-  resolved "https://registry.yarnpkg.com/@swc/core-linux-arm64-musl/-/core-linux-arm64-musl-1.15.18.tgz#292bb894cf08be522487897f6e2a616cbdd6198a"
-  integrity sha512-0a+Lix+FSSHBSBOA0XznCcHo5/1nA6oLLjcnocvzXeqtdjnPb+SvchItHI+lfeiuj1sClYPDvPMLSLyXFaiIKw==
+"@swc/core-win32-arm64-msvc@1.15.30":
+  version "1.15.30"
+  resolved "https://registry.yarnpkg.com/@swc/core-win32-arm64-msvc/-/core-win32-arm64-msvc-1.15.30.tgz#d005dce92e4ec1b0a7898667c9cf5e5215e4631c"
+  integrity sha512-CaQENgDHVGOg1mSF5sQVgvfFHG9kjMor2rkLMLeLOkfZYNj13ppnJ9+lfaBZLZUMMbnlGQnavCJb8PVBUOso7Q==
 
-"@swc/core-linux-x64-gnu@1.15.13":
-  version "1.15.13"
-  resolved "https://registry.yarnpkg.com/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.15.13.tgz#03f89bbdce8f07a1bc02a3ef1c93a5b4e81aef2e"
-  integrity sha512-5rij+vB9a29aNkHq72EXI2ihDZPszJb4zlApJY4aCC/q6utgqFA6CkrfTfIb+O8hxtG3zP5KERETz8mfFK6A0A==
+"@swc/core-win32-ia32-msvc@1.15.30":
+  version "1.15.30"
+  resolved "https://registry.yarnpkg.com/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.15.30.tgz#67ebfaa22266835a3d82776014c2f428346062bd"
+  integrity sha512-30VdLeGk6fugiUs/kUdJ/pAg7z/zpvVbR11RH60jZ0Z42WIeIniYx0rLEWN7h/pKJ3CopqsQ3RsogCAkRKiA2g==
 
-"@swc/core-linux-x64-gnu@1.15.18":
-  version "1.15.18"
-  resolved "https://registry.yarnpkg.com/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.15.18.tgz#2241fd6a01d88bac32334812660d80ebae88fd12"
-  integrity sha512-wG9J8vReUlpaHz4KOD/5UE1AUgirimU4UFT9oZmupUDEofxJKYb1mTA/DrMj0s78bkBiNI+7Fo2EgPuvOJfuAA==
+"@swc/core-win32-x64-msvc@1.15.30":
+  version "1.15.30"
+  resolved "https://registry.yarnpkg.com/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.15.30.tgz#cb602b53f9cdcdfb580cecdb02b536339d4b004b"
+  integrity sha512-4iObHPR+Q4oDY110EF5SF5eIaaVJNpMdG9C0q3Q92BsJ5y467uHz7sYQhP60WYlLFsLQ1el2YrIPUItUAQGOKg==
 
-"@swc/core-linux-x64-musl@1.15.13":
-  version "1.15.13"
-  resolved "https://registry.yarnpkg.com/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.15.13.tgz#27ae66914125bf35724e43bb06b856afed39770c"
-  integrity sha512-OlSlaOK9JplQ5qn07WiBLibkOw7iml2++ojEXhhR3rbWrNEKCD7sd8+6wSavsInyFdw4PhLA+Hy6YyDBIE23Yw==
-
-"@swc/core-linux-x64-musl@1.15.18":
-  version "1.15.18"
-  resolved "https://registry.yarnpkg.com/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.15.18.tgz#7d70f02a383d9dbae18b0d2906ee8b49dfb0b533"
-  integrity sha512-4nwbVvCphKzicwNWRmvD5iBaZj8JYsRGa4xOxJmOyHlMDpsvvJ2OR2cODlvWyGFH6BYL1MfIAK3qph3hp0Az6g==
-
-"@swc/core-win32-arm64-msvc@1.15.13":
-  version "1.15.13"
-  resolved "https://registry.yarnpkg.com/@swc/core-win32-arm64-msvc/-/core-win32-arm64-msvc-1.15.13.tgz#39776831949a53754d8f62e4730ac9430d1671f3"
-  integrity sha512-zwQii5YVdsfG8Ti9gIKgBKZg8qMkRZxl+OlYWUT5D93Jl4NuNBRausP20tfEkQdAPSRrMCSUZBM6FhW7izAZRg==
-
-"@swc/core-win32-arm64-msvc@1.15.18":
-  version "1.15.18"
-  resolved "https://registry.yarnpkg.com/@swc/core-win32-arm64-msvc/-/core-win32-arm64-msvc-1.15.18.tgz#6ea2b41d224a5ac84e1addf19fbc584e49698b08"
-  integrity sha512-zk0RYO+LjiBCat2RTMHzAWaMky0cra9loH4oRrLKLLNuL+jarxKLFDA8xTZWEkCPLjUTwlRN7d28eDLLMgtUcQ==
-
-"@swc/core-win32-ia32-msvc@1.15.13":
-  version "1.15.13"
-  resolved "https://registry.yarnpkg.com/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.15.13.tgz#995c45c9fd86d9959bc1a7275c4e60ac4efcc12f"
-  integrity sha512-hYXvyVVntqRlYoAIDwNzkS3tL2ijP3rxyWQMNKaxcCxxkCDto/w3meOK/OB6rbQSkNw0qTUcBfU9k+T0ptYdfQ==
-
-"@swc/core-win32-ia32-msvc@1.15.18":
-  version "1.15.18"
-  resolved "https://registry.yarnpkg.com/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.15.18.tgz#0c498802837ef53452c744964cac1391eb889e4d"
-  integrity sha512-yVuTrZ0RccD5+PEkpcLOBAuPbYBXS6rslENvIXfvJGXSdX5QGi1ehC4BjAMl5FkKLiam4kJECUI0l7Hq7T1vwg==
-
-"@swc/core-win32-x64-msvc@1.15.13":
-  version "1.15.13"
-  resolved "https://registry.yarnpkg.com/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.15.13.tgz#b329aec8bb5e84bab49c8f250ebb27f6c27dc213"
-  integrity sha512-XTzKs7c/vYCcjmcwawnQvlHHNS1naJEAzcBckMI5OJlnrcgW8UtcX9NHFYvNjGtXuKv0/9KvqL4fuahdvlNGKw==
-
-"@swc/core-win32-x64-msvc@1.15.18":
-  version "1.15.18"
-  resolved "https://registry.yarnpkg.com/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.15.18.tgz#878b48b38225680aad1e486880a6835461519e53"
-  integrity sha512-7NRmE4hmUQNCbYU3Hn9Tz57mK9Qq4c97ZS+YlamlK6qG9Fb5g/BB3gPDe0iLlJkns/sYv2VWSkm8c3NmbEGjbg==
-
-"@swc/core@^1.15.17":
-  version "1.15.18"
-  resolved "https://registry.yarnpkg.com/@swc/core/-/core-1.15.18.tgz#9eed29c0267d2c262391d4a2e75a3978e3f9dc74"
-  integrity sha512-z87aF9GphWp//fnkRsqvtY+inMVPgYW3zSlXH1kJFvRT5H/wiAn+G32qW5l3oEk63KSF1x3Ov0BfHCObAmT8RA==
+"@swc/core@^1.15.30", "@swc/core@^1.7.39":
+  version "1.15.30"
+  resolved "https://registry.yarnpkg.com/@swc/core/-/core-1.15.30.tgz#2f77d5ed3b0df964aac8aaa251dc43ed822100cc"
+  integrity sha512-R8VQbQY1BZcbIF2p3gjlTCwAQzx1A194ugWfwld5y+WgVVWqVKm7eURGGOVbQVubgKWzidP2agomBbg96rZilQ==
   dependencies:
     "@swc/counter" "^0.1.3"
-    "@swc/types" "^0.1.25"
+    "@swc/types" "^0.1.26"
   optionalDependencies:
-    "@swc/core-darwin-arm64" "1.15.18"
-    "@swc/core-darwin-x64" "1.15.18"
-    "@swc/core-linux-arm-gnueabihf" "1.15.18"
-    "@swc/core-linux-arm64-gnu" "1.15.18"
-    "@swc/core-linux-arm64-musl" "1.15.18"
-    "@swc/core-linux-x64-gnu" "1.15.18"
-    "@swc/core-linux-x64-musl" "1.15.18"
-    "@swc/core-win32-arm64-msvc" "1.15.18"
-    "@swc/core-win32-ia32-msvc" "1.15.18"
-    "@swc/core-win32-x64-msvc" "1.15.18"
-
-"@swc/core@^1.7.39":
-  version "1.15.13"
-  resolved "https://registry.yarnpkg.com/@swc/core/-/core-1.15.13.tgz#19b4117a76576f46b28199ac2f75cad5bc9cdde4"
-  integrity sha512-0l1gl/72PErwUZuavcRpRAQN9uSst+Nk++niC5IX6lmMWpXoScYx3oq/narT64/sKv/eRiPTaAjBFGDEQiWJIw==
-  dependencies:
-    "@swc/counter" "^0.1.3"
-    "@swc/types" "^0.1.25"
-  optionalDependencies:
-    "@swc/core-darwin-arm64" "1.15.13"
-    "@swc/core-darwin-x64" "1.15.13"
-    "@swc/core-linux-arm-gnueabihf" "1.15.13"
-    "@swc/core-linux-arm64-gnu" "1.15.13"
-    "@swc/core-linux-arm64-musl" "1.15.13"
-    "@swc/core-linux-x64-gnu" "1.15.13"
-    "@swc/core-linux-x64-musl" "1.15.13"
-    "@swc/core-win32-arm64-msvc" "1.15.13"
-    "@swc/core-win32-ia32-msvc" "1.15.13"
-    "@swc/core-win32-x64-msvc" "1.15.13"
+    "@swc/core-darwin-arm64" "1.15.30"
+    "@swc/core-darwin-x64" "1.15.30"
+    "@swc/core-linux-arm-gnueabihf" "1.15.30"
+    "@swc/core-linux-arm64-gnu" "1.15.30"
+    "@swc/core-linux-arm64-musl" "1.15.30"
+    "@swc/core-linux-ppc64-gnu" "1.15.30"
+    "@swc/core-linux-s390x-gnu" "1.15.30"
+    "@swc/core-linux-x64-gnu" "1.15.30"
+    "@swc/core-linux-x64-musl" "1.15.30"
+    "@swc/core-win32-arm64-msvc" "1.15.30"
+    "@swc/core-win32-ia32-msvc" "1.15.30"
+    "@swc/core-win32-x64-msvc" "1.15.30"
 
 "@swc/counter@^0.1.3":
   version "0.1.3"
@@ -4470,10 +4393,10 @@
     "@swc/html-win32-ia32-msvc" "1.15.13"
     "@swc/html-win32-x64-msvc" "1.15.13"
 
-"@swc/types@^0.1.25":
-  version "0.1.25"
-  resolved "https://registry.npmjs.org/@swc/types/-/types-0.1.25.tgz"
-  integrity sha512-iAoY/qRhNH8a/hBvm3zKj9qQ4oc2+3w1unPJa2XvTK3XjeLXtzcCingVPw/9e5mn1+0yPqxcBGp9Jf0pkfMb1g==
+"@swc/types@^0.1.26":
+  version "0.1.26"
+  resolved "https://registry.yarnpkg.com/@swc/types/-/types-0.1.26.tgz#2a976a1870caef1992316dda1464150ee36968b5"
+  integrity sha512-lyMwd7WGgG79RS7EERZV3T8wMdmPq3xwyg+1nmAM64kIhx5yl+juO2PYIHb7vTiPgPCj8LYjsNV2T5wiQHUEaw==
   dependencies:
     "@swc/counter" "^0.1.3"
 
@@ -4828,10 +4751,10 @@
   resolved "https://registry.npmjs.org/@types/geojson/-/geojson-7946.0.16.tgz"
   integrity sha512-6C8nqWur3j98U6+lXDfTUWIfgvZU+EumvpHKcYjujKH7woYyLj2sUmff0tRhrqM7BohUw7Pz3ZB1jj2gW9Fvmg==
 
-"@types/gtag.js@^0.0.12":
-  version "0.0.12"
-  resolved "https://registry.npmjs.org/@types/gtag.js/-/gtag.js-0.0.12.tgz"
-  integrity sha512-YQV9bUsemkzG81Ea295/nF/5GijnD2Af7QhEofh7xu+kvCN6RdodgNwwGWXB5GMI3NoyvQo0odNctoH/qLMIpg==
+"@types/gtag.js@^0.0.20":
+  version "0.0.20"
+  resolved "https://registry.yarnpkg.com/@types/gtag.js/-/gtag.js-0.0.20.tgz#e47edabb4ed5ecac90a079275958e6c929d7c08a"
+  integrity sha512-wwAbk3SA2QeU67unN7zPxjEHmPmlXwZXZvQEpbEUQuMCRGgKyE1m6XDuTUA9b6pCGb/GqJmdfMOY5LuDjJSbbg==
 
 "@types/hast@^2.0.0":
   version "2.3.10"
@@ -5117,100 +5040,100 @@
   dependencies:
     "@types/yargs-parser" "*"
 
-"@typescript-eslint/eslint-plugin@8.57.1", "@typescript-eslint/eslint-plugin@^8.52.0":
-  version "8.57.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.57.1.tgz#ddfdfb30f8b5ccee7f3c21798b377c51370edd55"
-  integrity sha512-Gn3aqnvNl4NGc6x3/Bqk1AOn0thyTU9bqDRhiRnUWezgvr2OnhYCWCgC8zXXRVqBsIL1pSDt7T9nJUe0oM0kDQ==
+"@typescript-eslint/eslint-plugin@8.59.0", "@typescript-eslint/eslint-plugin@^8.52.0":
+  version "8.59.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.59.0.tgz#fcbe76b693ce2412410cf4d48aefd617d345f2d9"
+  integrity sha512-HyAZtpdkgZwpq8Sz3FSUvCR4c+ScbuWa9AksK2Jweub7w4M3yTz4O11AqVJzLYjy/B9ZWPyc81I+mOdJU/bDQw==
   dependencies:
     "@eslint-community/regexpp" "^4.12.2"
-    "@typescript-eslint/scope-manager" "8.57.1"
-    "@typescript-eslint/type-utils" "8.57.1"
-    "@typescript-eslint/utils" "8.57.1"
-    "@typescript-eslint/visitor-keys" "8.57.1"
+    "@typescript-eslint/scope-manager" "8.59.0"
+    "@typescript-eslint/type-utils" "8.59.0"
+    "@typescript-eslint/utils" "8.59.0"
+    "@typescript-eslint/visitor-keys" "8.59.0"
     ignore "^7.0.5"
     natural-compare "^1.4.0"
-    ts-api-utils "^2.4.0"
+    ts-api-utils "^2.5.0"
 
-"@typescript-eslint/parser@8.57.1", "@typescript-eslint/parser@^8.56.1":
-  version "8.57.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-8.57.1.tgz#d523e559b148264055c0a49a29d5f50c7de659c2"
-  integrity sha512-k4eNDan0EIMTT/dUKc/g+rsJ6wcHYhNPdY19VoX/EOtaAG8DLtKCykhrUnuHPYvinn5jhAPgD2Qw9hXBwrahsw==
+"@typescript-eslint/parser@8.59.0", "@typescript-eslint/parser@^8.59.0":
+  version "8.59.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-8.59.0.tgz#57a138280b3ceaf07904fbd62c433d5cc1ee1573"
+  integrity sha512-TI1XGwKbDpo9tRW8UDIXCOeLk55qe9ZFGs8MTKU6/M08HWTw52DD/IYhfQtOEhEdPhLMT26Ka/x7p70nd3dzDg==
   dependencies:
-    "@typescript-eslint/scope-manager" "8.57.1"
-    "@typescript-eslint/types" "8.57.1"
-    "@typescript-eslint/typescript-estree" "8.57.1"
-    "@typescript-eslint/visitor-keys" "8.57.1"
+    "@typescript-eslint/scope-manager" "8.59.0"
+    "@typescript-eslint/types" "8.59.0"
+    "@typescript-eslint/typescript-estree" "8.59.0"
+    "@typescript-eslint/visitor-keys" "8.59.0"
     debug "^4.4.3"
 
-"@typescript-eslint/project-service@8.57.1":
-  version "8.57.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/project-service/-/project-service-8.57.1.tgz#16af9fe16eedbd7085e4fdc29baa73715c0c55c5"
-  integrity sha512-vx1F37BRO1OftsYlmG9xay1TqnjNVlqALymwWVuYTdo18XuKxtBpCj1QlzNIEHlvlB27osvXFWptYiEWsVdYsg==
+"@typescript-eslint/project-service@8.59.0":
+  version "8.59.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/project-service/-/project-service-8.59.0.tgz#914bf62069d870faa0389ffd725774a200f511bf"
+  integrity sha512-Lw5ITrR5s5TbC19YSvlr63ZfLaJoU6vtKTHyB0GQOpX0W7d5/Ir6vUahWi/8Sps/nOukZQ0IB3SmlxZnjaKVnw==
   dependencies:
-    "@typescript-eslint/tsconfig-utils" "^8.57.1"
-    "@typescript-eslint/types" "^8.57.1"
+    "@typescript-eslint/tsconfig-utils" "^8.59.0"
+    "@typescript-eslint/types" "^8.59.0"
     debug "^4.4.3"
 
-"@typescript-eslint/scope-manager@8.57.1":
-  version "8.57.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-8.57.1.tgz#4524d7e7b420cb501807499684d435ae129aaf35"
-  integrity sha512-hs/QcpCwlwT2L5S+3fT6gp0PabyGk4Q0Rv2doJXA0435/OpnSR3VRgvrp8Xdoc3UAYSg9cyUjTeFXZEPg/3OKg==
+"@typescript-eslint/scope-manager@8.59.0":
+  version "8.59.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-8.59.0.tgz#f71be268bd31da1c160815c689e4dde7c9bc9e8e"
+  integrity sha512-UzR16Ut8IpA3Mc4DbgAShlPPkVm8xXMWafXxB0BocaVRHs8ZGakAxGRskF7FId3sdk9lgGD73GSFaWmWFDE4dg==
   dependencies:
-    "@typescript-eslint/types" "8.57.1"
-    "@typescript-eslint/visitor-keys" "8.57.1"
+    "@typescript-eslint/types" "8.59.0"
+    "@typescript-eslint/visitor-keys" "8.59.0"
 
-"@typescript-eslint/tsconfig-utils@8.57.1", "@typescript-eslint/tsconfig-utils@^8.57.1":
-  version "8.57.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.57.1.tgz#9233443ec716882a6f9e240fd900a73f0235f3d7"
-  integrity sha512-0lgOZB8cl19fHO4eI46YUx2EceQqhgkPSuCGLlGi79L2jwYY1cxeYc1Nae8Aw1xjgW3PKVDLlr3YJ6Bxx8HkWg==
+"@typescript-eslint/tsconfig-utils@8.59.0", "@typescript-eslint/tsconfig-utils@^8.59.0":
+  version "8.59.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.59.0.tgz#1276077f5ad77e384446ea28a2474e8f8be1af41"
+  integrity sha512-91Sbl3s4Kb3SybliIY6muFBmHVv+pYXfybC4Oolp3dvk8BvIE3wOPc+403CWIT7mJNkfQRGtdqghzs2+Z91Tqg==
 
-"@typescript-eslint/type-utils@8.57.1":
-  version "8.57.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-8.57.1.tgz#c49af1347b5869ca85155547a8f34f84ab386fd9"
-  integrity sha512-+Bwwm0ScukFdyoJsh2u6pp4S9ktegF98pYUU0hkphOOqdMB+1sNQhIz8y5E9+4pOioZijrkfNO/HUJVAFFfPKA==
+"@typescript-eslint/type-utils@8.59.0":
+  version "8.59.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-8.59.0.tgz#2834ea3b179cedfc9244dcd4f74105a27751a439"
+  integrity sha512-3TRiZaQSltGqGeNrJzzr1+8YcEobKH9rHnqIp/1psfKFmhRQDNMGP5hBufanYTGznwShzVLs3Mz+gDN7HkWfXg==
   dependencies:
-    "@typescript-eslint/types" "8.57.1"
-    "@typescript-eslint/typescript-estree" "8.57.1"
-    "@typescript-eslint/utils" "8.57.1"
+    "@typescript-eslint/types" "8.59.0"
+    "@typescript-eslint/typescript-estree" "8.59.0"
+    "@typescript-eslint/utils" "8.59.0"
     debug "^4.4.3"
-    ts-api-utils "^2.4.0"
+    ts-api-utils "^2.5.0"
 
-"@typescript-eslint/types@8.57.1", "@typescript-eslint/types@^8.57.1":
-  version "8.57.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-8.57.1.tgz#54b27a8a25a7b45b4f978c3f8e00c4c78f11142c"
-  integrity sha512-S29BOBPJSFUiblEl6RzPPjJt6w25A6XsBqRVDt53tA/tlL8q7ceQNZHTjPeONt/3S7KRI4quk+yP9jK2WjBiPQ==
+"@typescript-eslint/types@8.59.0", "@typescript-eslint/types@^8.59.0":
+  version "8.59.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-8.59.0.tgz#cfcc643c6e879016479775850d86d84c14492738"
+  integrity sha512-nLzdsT1gdOgFxxxwrlNVUBzSNBEEHJ86bblmk4QAS6stfig7rcJzWKqCyxFy3YRRHXDWEkb2NralA1nOYkkm/A==
 
-"@typescript-eslint/typescript-estree@8.57.1":
-  version "8.57.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-8.57.1.tgz#a9fd28d4a0ec896aa9a9a7e0cead62ea24f99e76"
-  integrity sha512-ybe2hS9G6pXpqGtPli9Gx9quNV0TWLOmh58ADlmZe9DguLq0tiAKVjirSbtM1szG6+QH6rVXyU6GTLQbWnMY+g==
+"@typescript-eslint/typescript-estree@8.59.0":
+  version "8.59.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-8.59.0.tgz#feba58a70ab6ea7ac53a2f3ae900db28ce3454c2"
+  integrity sha512-O9Re9P1BmBLFJyikRbQpLku/QA3/AueZNO9WePLBwQrvkixTmDe8u76B6CYUAITRl/rHawggEqUGn5QIkVRLMw==
   dependencies:
-    "@typescript-eslint/project-service" "8.57.1"
-    "@typescript-eslint/tsconfig-utils" "8.57.1"
-    "@typescript-eslint/types" "8.57.1"
-    "@typescript-eslint/visitor-keys" "8.57.1"
+    "@typescript-eslint/project-service" "8.59.0"
+    "@typescript-eslint/tsconfig-utils" "8.59.0"
+    "@typescript-eslint/types" "8.59.0"
+    "@typescript-eslint/visitor-keys" "8.59.0"
     debug "^4.4.3"
     minimatch "^10.2.2"
     semver "^7.7.3"
     tinyglobby "^0.2.15"
-    ts-api-utils "^2.4.0"
+    ts-api-utils "^2.5.0"
 
-"@typescript-eslint/utils@8.57.1":
-  version "8.57.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-8.57.1.tgz#e40f5a7fcff02fd24092a7b52bd6ec029fb50465"
-  integrity sha512-XUNSJ/lEVFttPMMoDVA2r2bwrl8/oPx8cURtczkSEswY5T3AeLmCy+EKWQNdL4u0MmAHOjcWrqJp2cdvgjn8dQ==
+"@typescript-eslint/utils@8.59.0":
+  version "8.59.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-8.59.0.tgz#f50df9bd6967881ef64fba62230111153179ead5"
+  integrity sha512-I1R/K7V07XsMJ12Oaxg/O9GfrysGTmCRhvZJBv0RE0NcULMzjqVpR5kRRQjHsz3J/bElU7HwCO7zkqL+MSUz+g==
   dependencies:
     "@eslint-community/eslint-utils" "^4.9.1"
-    "@typescript-eslint/scope-manager" "8.57.1"
-    "@typescript-eslint/types" "8.57.1"
-    "@typescript-eslint/typescript-estree" "8.57.1"
+    "@typescript-eslint/scope-manager" "8.59.0"
+    "@typescript-eslint/types" "8.59.0"
+    "@typescript-eslint/typescript-estree" "8.59.0"
 
-"@typescript-eslint/visitor-keys@8.57.1":
-  version "8.57.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-8.57.1.tgz#3af4f88118924d3be983d4b8ae84803f11fe4563"
-  integrity sha512-YWnmJkXbofiz9KbnbbwuA2rpGkFPLbAIetcCNO6mJ8gdhdZ/v7WDXsoGFAJuM6ikUFKTlSQnjWnVO4ux+UzS6A==
+"@typescript-eslint/visitor-keys@8.59.0":
+  version "8.59.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-8.59.0.tgz#2e80de30e7e944ed4bd47d751e37dcb04db03795"
+  integrity sha512-/uejZt4dSere1bx12WLlPfv8GktzcaDtuJ7s42/HEZ5zGj9oxRaD4bj7qwSunXkf+pbAhFt2zjpHYUiT5lHf0Q==
   dependencies:
-    "@typescript-eslint/types" "8.57.1"
+    "@typescript-eslint/types" "8.59.0"
     eslint-visitor-keys "^5.0.0"
 
 "@ungap/structured-clone@^1.0.0":
@@ -5218,11 +5141,6 @@
   resolved "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.3.0.tgz"
   integrity sha512-WmoN8qaIAo7WTYWbAZuG8PYEhn5fkz7dZrqTBZ7dtt//lL2Gwms1IcnQ5yHqjDfX8Ft5j4YzDM23f87zBfDe9g==
 
-"@vercel/oidc@3.0.2":
-  version "3.0.2"
-  resolved "https://registry.npmjs.org/@vercel/oidc/-/oidc-3.0.2.tgz"
-  integrity sha512-JekxQ0RApo4gS4un/iMGsIL1/k4KUBe3HmnGcDvzHuFBdQdudEJgTqcsJC7y6Ul4Yw5CeykgvQbX2XeEJd0+DA==
-
 "@vx/responsive@^0.0.199":
   version "0.0.199"
   resolved "https://registry.npmjs.org/@vx/responsive/-/responsive-0.0.199.tgz"
@@ -5415,11 +5333,6 @@ address@^1.0.1:
   resolved "https://registry.npmjs.org/address/-/address-1.2.2.tgz"
   integrity sha512-4B/qKCfeE/ODUaAUpSwfzazo5x29WD4r3vXiWsB7I2mSDAihwEqKO+g8GELZUQSSAo5e1XTYh3ZVfLyxBc12nA==
 
-agent-base@^7.1.2:
-  version "7.1.4"
-  resolved "https://registry.npmjs.org/agent-base/-/agent-base-7.1.4.tgz"
-  integrity sha512-MnA+YT8fwfJPgBx3m60MNqakm30XOkyIoH1y6huTQvC0PwZG7ki8NacLBcrPbNoo8vEZy7Jpuk7+jMO+CUovTQ==
-
 aggregate-error@^3.0.0:
   version "3.1.0"
   resolved "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz"
@@ -5428,16 +5341,6 @@ aggregate-error@^3.0.0:
     clean-stack "^2.0.0"
     indent-string "^4.0.0"
 
-ai@5.0.61, ai@^5.0.30:
-  version "5.0.61"
-  resolved "https://registry.npmjs.org/ai/-/ai-5.0.61.tgz"
-  integrity sha512-a+NtNgxjMiGvL46/+v7iNbKHLAg8VDheNhYFe9lL3MPiL9W5DNH45wMaahteCYS4WgoFgdQa2zz4CM5lkiXuOA==
-  dependencies:
-    "@ai-sdk/gateway" "1.0.34"
-    "@ai-sdk/provider" "2.0.0"
-    "@ai-sdk/provider-utils" "3.0.10"
-    "@opentelemetry/api" "1.9.0"
-
 ajv-draft-04@1.0.0:
   version "1.0.0"
   resolved "https://registry.npmjs.org/ajv-draft-04/-/ajv-draft-04-1.0.0.tgz"
@@ -5450,6 +5353,13 @@ ajv-formats@2.1.1, ajv-formats@^2.1.1:
   dependencies:
     ajv "^8.0.0"
 
+ajv-formats@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/ajv-formats/-/ajv-formats-3.0.1.tgz#3d5dc762bca17679c3c2ea7e90ad6b7532309578"
+  integrity sha512-8iUql50EUR+uUcdRQ3HDqa6EVyo3docL8g5WJ3FNcWmu62IbkGUue/pEyLBW8VGKKucTPgqeks4fIU1DA4yowQ==
+  dependencies:
+    ajv "^8.0.0"
+
 ajv-keywords@^3.5.2:
   version "3.5.2"
   resolved "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz"
@@ -5463,9 +5373,9 @@ ajv-keywords@^5.1.0:
     fast-deep-equal "^3.1.3"
 
 ajv@^6.12.4, ajv@^6.12.5:
-  version "6.12.6"
-  resolved "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz"
-  integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==
+  version "6.14.0"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.14.0.tgz#fd067713e228210636ebb08c60bd3765d6dbe73a"
+  integrity sha512-IWrosm/yrn43eiKqkfkHis7QioDleaXQHdDVPKg0FSwwd/DuvyX79TZnFOnYpB7dcsFAMmtFztZuXPDvSePkFw==
   dependencies:
     fast-deep-equal "^3.1.1"
     fast-json-stable-stringify "^2.0.0"
@@ -5473,9 +5383,19 @@ ajv@^6.12.4, ajv@^6.12.5:
     uri-js "^4.2.2"
 
 ajv@^8.0.0, ajv@^8.11.0, ajv@^8.9.0:
-  version "8.17.1"
-  resolved "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz"
-  integrity sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==
+  version "8.18.0"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.18.0.tgz#8864186b6738d003eb3a933172bb3833e10cefbc"
+  integrity sha512-PlXPeEWMXMZ7sPYOHqmDyCJzcfNrUr3fGNKtezX14ykXOEIvyK81d+qydx89KY5O71FKMPaQ2vBfBFI5NHR63A==
+  dependencies:
+    fast-deep-equal "^3.1.3"
+    fast-uri "^3.0.1"
+    json-schema-traverse "^1.0.0"
+    require-from-string "^2.0.2"
+
+"ajv@npm:@redocly/ajv@8.18.0":
+  version "8.18.0"
+  resolved "https://registry.yarnpkg.com/@redocly/ajv/-/ajv-8.18.0.tgz#e6c7ba549111838baa950bc31acbc84b06f0239f"
+  integrity sha512-F+LMD2IDIXuHxgpLJh3nkLj9+tSaEzoUWd+7fONGq5pe2169FUDjpEkOfEpoGLz1sbZni/69p07OsecNfAOpqA==
   dependencies:
     fast-deep-equal "^3.1.3"
     fast-uri "^3.0.1"
@@ -5489,7 +5409,7 @@ algoliasearch-helper@^3.26.0:
   dependencies:
     "@algolia/events" "^4.0.1"
 
-algoliasearch@^5.28.0, algoliasearch@^5.37.0:
+algoliasearch@^5.37.0:
   version "5.40.0"
   resolved "https://registry.npmjs.org/algoliasearch/-/algoliasearch-5.40.0.tgz"
   integrity sha512-a9aIL2E3Z7uYUPMCmjMFFd5MWhn+ccTubEvnMy7rOTZCB62dXBJtz0R5BZ/TPuX3R9ocBsgWuAbGWQ+Ph4Fmlg==
@@ -5523,13 +5443,6 @@ ansi-align@^3.0.1:
   dependencies:
     string-width "^4.1.0"
 
-ansi-escapes@^4.3.2:
-  version "4.3.2"
-  resolved "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz"
-  integrity sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==
-  dependencies:
-    type-fest "^0.21.3"
-
 ansi-html-community@^0.0.8:
   version "0.0.8"
   resolved "https://registry.npmjs.org/ansi-html-community/-/ansi-html-community-0.0.8.tgz"
@@ -5564,16 +5477,21 @@ ansi-styles@^6.1.0:
   resolved "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz"
   integrity sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==
 
-antd@^6.3.2:
-  version "6.3.2"
-  resolved "https://registry.yarnpkg.com/antd/-/antd-6.3.2.tgz#ce1a33783d495fcfc77b58b73156ac6249e4fc0a"
-  integrity sha512-IlMoqaXlq5Bgxi0ANERhAzmDREYyGwr/U7MCVihaUQbE/ZOB3r4ArakUxjA1ULYNDA6K00dawSrB8aalGnZlLA==
+ansis@^3.2.0:
+  version "3.17.0"
+  resolved "https://registry.yarnpkg.com/ansis/-/ansis-3.17.0.tgz#fa8d9c2a93fe7d1177e0c17f9eeb562a58a832d7"
+  integrity sha512-0qWUglt9JEqLFr3w1I1pbrChn1grhaiAR2ocX1PP/flRmxgtwTzPFFFnfIlD6aMOLQZgSuCRlidD70lvx8yhzg==
+
+antd@^6.3.6:
+  version "6.3.6"
+  resolved "https://registry.yarnpkg.com/antd/-/antd-6.3.6.tgz#e892b851cf45d62201d889fe9cac36f4d2412e5f"
+  integrity sha512-zdCYjusrTUn4gNxEg4PH8MWlfuXYbKfuGOkjgZ0Rg6DpWbIVmG/MwvsZ5yvG6z3Y6UI/gzYpaQ82iTt4KdbeaA==
   dependencies:
     "@ant-design/colors" "^8.0.1"
     "@ant-design/cssinjs" "^2.1.2"
     "@ant-design/cssinjs-utils" "^2.1.2"
     "@ant-design/fast-color" "^3.0.1"
-    "@ant-design/icons" "^6.1.0"
+    "@ant-design/icons" "^6.1.1"
     "@ant-design/react-slick" "~2.0.0"
     "@babel/runtime" "^7.28.4"
     "@rc-component/cascader" "~1.14.0"
@@ -5583,23 +5501,23 @@ antd@^6.3.2:
     "@rc-component/dialog" "~1.8.4"
     "@rc-component/drawer" "~1.4.2"
     "@rc-component/dropdown" "~1.0.2"
-    "@rc-component/form" "~1.7.1"
-    "@rc-component/image" "~1.6.0"
+    "@rc-component/form" "~1.8.0"
+    "@rc-component/image" "~1.9.0"
     "@rc-component/input" "~1.1.2"
     "@rc-component/input-number" "~1.6.2"
     "@rc-component/mentions" "~1.6.0"
     "@rc-component/menu" "~1.2.0"
-    "@rc-component/motion" "^1.3.1"
+    "@rc-component/motion" "^1.3.2"
     "@rc-component/mutate-observer" "^2.0.1"
     "@rc-component/notification" "~1.2.0"
     "@rc-component/pagination" "~1.2.0"
-    "@rc-component/picker" "~1.9.0"
+    "@rc-component/picker" "~1.9.1"
     "@rc-component/progress" "~1.0.2"
     "@rc-component/qrcode" "~1.1.1"
     "@rc-component/rate" "~1.0.1"
-    "@rc-component/resize-observer" "^1.1.1"
+    "@rc-component/resize-observer" "^1.1.2"
     "@rc-component/segmented" "~1.3.0"
-    "@rc-component/select" "~1.6.14"
+    "@rc-component/select" "~1.6.15"
     "@rc-component/slider" "~1.0.1"
     "@rc-component/steps" "~1.2.2"
     "@rc-component/switch" "~1.0.3"
@@ -5608,11 +5526,11 @@ antd@^6.3.2:
     "@rc-component/textarea" "~1.1.2"
     "@rc-component/tooltip" "~1.4.0"
     "@rc-component/tour" "~2.3.0"
-    "@rc-component/tree" "~1.2.3"
+    "@rc-component/tree" "~1.2.4"
     "@rc-component/tree-select" "~1.8.0"
     "@rc-component/trigger" "^3.9.0"
     "@rc-component/upload" "~1.1.0"
-    "@rc-component/util" "^1.9.0"
+    "@rc-component/util" "^1.10.1"
     clsx "^2.1.1"
     dayjs "^1.11.11"
     scroll-into-view-if-needed "^3.1.0"
@@ -5799,14 +5717,14 @@ available-typed-arrays@^1.0.7:
   dependencies:
     possible-typed-array-names "^1.0.0"
 
-axios@^1.12.2:
-  version "1.13.5"
-  resolved "https://registry.yarnpkg.com/axios/-/axios-1.13.5.tgz#5e464688fa127e11a660a2c49441c009f6567a43"
-  integrity sha512-cz4ur7Vb0xS4/KUN0tPWe44eqxrIu31me+fbang3ijiNscE129POzipJJA6zniq2C/Z6sJCjMimjS8Lc/GAs8Q==
+axios@^1.15.0:
+  version "1.15.0"
+  resolved "https://registry.yarnpkg.com/axios/-/axios-1.15.0.tgz#0fcee91ef03d386514474904b27863b2c683bf4f"
+  integrity sha512-wWyJDlAatxk30ZJer+GeCWS209sA42X+N5jU2jy6oHTp7ufw8uzUTVFBX9+wTfAlhiJXGS0Bq7X6efruWjuK9Q==
   dependencies:
     follow-redirects "^1.15.11"
     form-data "^4.0.5"
-    proxy-from-env "^1.1.0"
+    proxy-from-env "^2.1.0"
 
 babel-loader@^9.2.1:
   version "9.2.1"
@@ -5876,10 +5794,10 @@ base64-js@^1.3.1, base64-js@^1.5.1:
   resolved "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz"
   integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==
 
-baseline-browser-mapping@^2.10.7, baseline-browser-mapping@^2.9.0, baseline-browser-mapping@^2.9.19:
-  version "2.10.7"
-  resolved "https://registry.yarnpkg.com/baseline-browser-mapping/-/baseline-browser-mapping-2.10.7.tgz#2c017adffe4f7bbe93c2e55526cc1869d36f588c"
-  integrity sha512-1ghYO3HnxGec0TCGBXiDLVns4eCSx4zJpxnHrlqFQajmhfKMQBzUGDdkMK7fUW7PTHTeLf+j87aTuKuuwWzMGw==
+baseline-browser-mapping@^2.10.20, baseline-browser-mapping@^2.9.0, baseline-browser-mapping@^2.9.19:
+  version "2.10.20"
+  resolved "https://registry.yarnpkg.com/baseline-browser-mapping/-/baseline-browser-mapping-2.10.20.tgz#7c99b86d43ae9be3810cac515f4675802e1f6b87"
+  integrity sha512-1AaXxEPfXT+GvTBJFuy4yXVHWJBXa4OdbIebGN/wX5DlsIkU0+wzGnd2lOzokSk51d5LUmqjgBLRLlypLUqInQ==
 
 batch@0.6.1:
   version "0.6.1"
@@ -5968,24 +5886,17 @@ boxen@^7.0.0:
     wrap-ansi "^8.1.0"
 
 brace-expansion@^1.1.7:
-  version "1.1.12"
-  resolved "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz"
-  integrity sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==
+  version "1.1.13"
+  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.13.tgz#d37875c01dc9eff988dd49d112a57cb67b54efe6"
+  integrity sha512-9ZLprWS6EENmhEOpjCYW2c8VkmOvckIJZfkr7rBW6dObmfgJ/L1GpSYW5Hpo9lDz4D1+n0Ckz8rU7FwHDQiG/w==
   dependencies:
     balanced-match "^1.0.0"
     concat-map "0.0.1"
 
-brace-expansion@^2.0.1:
-  version "2.0.2"
-  resolved "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz"
-  integrity sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==
-  dependencies:
-    balanced-match "^1.0.0"
-
-brace-expansion@^5.0.2:
-  version "5.0.2"
-  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-5.0.2.tgz#b6c16d0791087af6c2bc463f52a8142046c06b6f"
-  integrity sha512-Pdk8c9poy+YhOgVWw1JNN22/HcivgKWwpxKq04M/jTmHyCZn12WPJebZxdjSa5TmBqISrUSgNYU3eRORljfCCw==
+brace-expansion@^5.0.5:
+  version "5.0.5"
+  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-5.0.5.tgz#dcc3a37116b79f3e1b46db994ced5d570e930fdb"
+  integrity sha512-VZznLgtwhn+Mact9tfiwx64fA9erHH/MCXEUfB/0bX/6Fz6ny5EGTXYltMocqg4xFAQZtnO3DHWWXi8RiuN7cQ==
   dependencies:
     balanced-match "^4.0.2"
 
@@ -6124,10 +6035,10 @@ caniuse-api@^3.0.0:
     lodash.memoize "^4.1.2"
     lodash.uniq "^4.5.0"
 
-caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001702, caniuse-lite@^1.0.30001759, caniuse-lite@^1.0.30001780:
-  version "1.0.30001780"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001780.tgz#0e413de292808868a62ed9118822683fa120a110"
-  integrity sha512-llngX0E7nQci5BPJDqoZSbuZ5Bcs9F5db7EtgfwBerX9XGtkkiO4NwfDDIRzHTTwcYC8vC7bmeUEPGrKlR/TkQ==
+caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001702, caniuse-lite@^1.0.30001759, caniuse-lite@^1.0.30001790:
+  version "1.0.30001790"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001790.tgz#04660c7de15f445d86dd10ac88a8936ac0698e45"
+  integrity sha512-bOoxfJPyYo+ds6W0YfptaCWbFnJYjh2Y1Eow5lRv+vI2u8ganPZqNm1JwNh0t2ELQCqIWg4B3dWEusgAmsoyOw==
 
 ccount@^2.0.0:
   version "2.0.1"
@@ -6156,6 +6067,11 @@ chalk@^5.0.1, chalk@^5.2.0:
   resolved "https://registry.npmjs.org/chalk/-/chalk-5.6.0.tgz"
   integrity sha512-46QrSQFyVSEyYAgQ22hQ+zDa60YHA4fBstHmtSApj1Y5vKtG27fWowW03jCk5KcbXEWPZUIR894aARCA/G1kfQ==
 
+chalk@^5.6.2:
+  version "5.6.2"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-5.6.2.tgz#b1238b6e23ea337af71c7f8a295db5af0c158aea"
+  integrity sha512-7NzBL0rN6fMUW+f7A6Io4h40qQlG+xGmtMxfbnH/K7TAtt8JQWVQK+6g0UXKMeVJoyV5EkkNsErQ8pVD3bLHbA==
+
 char-regex@^1.0.2:
   version "1.0.2"
   resolved "https://registry.npmjs.org/char-regex/-/char-regex-1.0.2.tgz"
@@ -7321,7 +7237,7 @@ depd@~1.1.2:
   resolved "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz"
   integrity sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ==
 
-dequal@^2.0.0, dequal@^2.0.3:
+dequal@^2.0.0:
   version "2.0.3"
   resolved "https://registry.npmjs.org/dequal/-/dequal-2.0.3.tgz"
   integrity sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA==
@@ -7389,31 +7305,31 @@ doctrine@^2.1.0:
   dependencies:
     esutils "^2.0.2"
 
-docusaurus-plugin-openapi-docs@^4.6.0:
-  version "4.7.1"
-  resolved "https://registry.npmjs.org/docusaurus-plugin-openapi-docs/-/docusaurus-plugin-openapi-docs-4.7.1.tgz"
-  integrity sha512-RpqvTEnhIfdSuTn/Fa/8bmxeufijLL9HCRb//ELD33AKqEbCw147SKR/CqWu4H4gwi50FZLUbiHKZJbPtXLt9Q==
+docusaurus-plugin-openapi-docs@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/docusaurus-plugin-openapi-docs/-/docusaurus-plugin-openapi-docs-5.0.1.tgz#2fe62b58fc1af11e3d947edc2f0d60e04f1aa149"
+  integrity sha512-OVfoDovRdiS78DQYWmr2BjuOF2A6kVmJ43mgkQaAEZxASyHbUft4zUIhvfa7gqema6KNL9pVKejDievZdZ3wGQ==
   dependencies:
-    "@apidevtools/json-schema-ref-parser" "^11.5.4"
-    "@redocly/openapi-core" "^1.34.3"
+    "@apidevtools/json-schema-ref-parser" "^15.3.3"
+    "@redocly/openapi-core" "^2.25.2"
     allof-merge "^0.6.6"
-    chalk "^4.1.2"
+    chalk "^5.6.2"
     clsx "^2.1.1"
     fs-extra "^11.3.0"
     json-pointer "^0.6.2"
     json5 "^2.2.3"
     lodash "^4.17.21"
     mustache "^4.2.0"
-    openapi-to-postmanv2 "^5.0.0"
+    openapi-to-postmanv2 "^6.0.0"
     postman-collection "^5.0.2"
     slugify "^1.6.6"
     swagger2openapi "^7.0.8"
     xml-formatter "^3.6.6"
 
-docusaurus-theme-openapi-docs@^4.6.0:
-  version "4.7.1"
-  resolved "https://registry.npmjs.org/docusaurus-theme-openapi-docs/-/docusaurus-theme-openapi-docs-4.7.1.tgz"
-  integrity sha512-OPydf11LoEY3fdxaoqCVO+qCk7LBo6l6s28UvHJ5mIN/2xu+dOOio9+xnKZ5FIPOlD+dx0gVSKzaVCi/UFTxlg==
+docusaurus-theme-openapi-docs@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/docusaurus-theme-openapi-docs/-/docusaurus-theme-openapi-docs-5.0.1.tgz#a2c2c91346b6238f6d7862752cdb02611fb5396f"
+  integrity sha512-bVeb7hOqog9LKVrJzYXdNJ7/0N22lk0VE22QK+naAn5GuAvYo41JmpXW9hqLIPkEp2UbexTHoPW9SYVdUsyvvw==
   dependencies:
     "@hookform/error-message" "^2.0.1"
     "@reduxjs/toolkit" "^2.8.2"
@@ -7425,6 +7341,7 @@ docusaurus-theme-openapi-docs@^4.6.0:
     file-saver "^2.0.5"
     lodash "^4.17.21"
     pako "^2.1.0"
+    path-browserify "^1.0.1"
     postman-code-generators "^2.0.0"
     postman-collection "^5.0.2"
     prism-react-renderer "^2.4.1"
@@ -7487,10 +7404,10 @@ domhandler@^5.0.2, domhandler@^5.0.3:
   dependencies:
     domelementtype "^2.3.0"
 
-dompurify@=3.2.6, dompurify@^3.2.5:
-  version "3.2.6"
-  resolved "https://registry.npmjs.org/dompurify/-/dompurify-3.2.6.tgz"
-  integrity sha512-/2GogDQlohXPZe6D6NOgQvXLPSYBqIWMnZ8zzOhn09REE4eyAzb+Hed3jhoM9OkuaJ8P6ZGTTVWQKAi8ieIzfQ==
+dompurify@^3.2.5, dompurify@^3.3.2:
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-3.4.0.tgz#b1fc33ebdadb373241621e0a30e4ad81573dfd0b"
+  integrity sha512-nolgK9JcaUXMSmW+j1yaSvaEaoXYHwWyGJlkoCTghc97KgGDDSnpoU/PlEnw63Ah+TGKFOyY+X5LnxaWbCSfXg==
   optionalDependencies:
     "@types/trusted-types" "^2.0.7"
 
@@ -8090,12 +8007,7 @@ events@^3.2.0:
   resolved "https://registry.npmjs.org/events/-/events-3.3.0.tgz"
   integrity sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==
 
-eventsource-parser@^3.0.5:
-  version "3.0.6"
-  resolved "https://registry.npmjs.org/eventsource-parser/-/eventsource-parser-3.0.6.tgz"
-  integrity sha512-Vo1ab+QXPzZ4tCa8SwIHJFaSzy4R6SHf7BY79rFBDf0idraZWAkYrDjDj8uWaSm3S2TK+hJ7/t1CEmZ7jXw+pg==
-
-execa@5.1.1, execa@^5.1.1:
+execa@^5.1.1:
   version "5.1.1"
   resolved "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz"
   integrity sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==
@@ -8260,13 +8172,6 @@ fetch-retry@^6.0.0:
   resolved "https://registry.npmjs.org/fetch-retry/-/fetch-retry-6.0.0.tgz"
   integrity sha512-BUFj1aMubgib37I3v4q78fYo63Po7t4HUPTpQ6/QE6yK6cIQrP+W43FYToeTEyg5m2Y7eFUtijUuAv/PDlWuag==
 
-figures@^3.2.0:
-  version "3.2.0"
-  resolved "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz"
-  integrity sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==
-  dependencies:
-    escape-string-regexp "^1.0.5"
-
 file-entry-cache@^8.0.0:
   version "8.0.0"
   resolved "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-8.0.0.tgz"
@@ -8355,14 +8260,14 @@ flat@^5.0.2:
   integrity sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==
 
 flatted@^3.2.9:
-  version "3.3.3"
-  resolved "https://registry.npmjs.org/flatted/-/flatted-3.3.3.tgz"
-  integrity sha512-GX+ysw4PBCz0PzosHDepZGANEuFCMLrnRTiEy9McGjmkCQYwRq4A/X786G/fjM/+OjsWSU1ZrY5qyARZmO/uwg==
+  version "3.4.2"
+  resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.4.2.tgz#f5c23c107f0f37de8dbdf24f13722b3b98d52726"
+  integrity sha512-PjDse7RzhcPkIJwy5t7KPWQSZ9cAbzQXcafsetQoD7sOJRQlGikNbx7yZp2OotDnJyrDcbyRq3Ttb18iYOqkxA==
 
 follow-redirects@^1.0.0, follow-redirects@^1.15.11:
-  version "1.15.11"
-  resolved "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.11.tgz"
-  integrity sha512-deG2P0JfjrTxl50XGCDyfI97ZGVCxIpfKYmfyrQ54n5FO/0gfIES8C/Psl6kWVDolizcaaxZJnTS0QSMxvnsBQ==
+  version "1.16.0"
+  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.16.0.tgz#28474a159d3b9d11ef62050a14ed60e4df6d61bc"
+  integrity sha512-y5rN/uOsadFT/JfYwhxRS5R7Qce+g3zG97+JrtFZlC9klX/W5hD7iiLzScI4nZqUS7DNUdhPgw4xI8W2LuXlUw==
 
 for-each@^0.3.3, for-each@^0.3.5:
   version "0.3.5"
@@ -8412,16 +8317,7 @@ fresh@0.5.2, fresh@~0.5.2:
   resolved "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz"
   integrity sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==
 
-fs-extra@^11.1.1, fs-extra@^11.2.0:
-  version "11.3.1"
-  resolved "https://registry.npmjs.org/fs-extra/-/fs-extra-11.3.1.tgz"
-  integrity sha512-eXvGGwZ5CL17ZSwHWd3bbgk7UUpF6IFHtP57NYYakPvHOs8GDgDe5KJI36jIJzDkJ6eJjuzRA8eBQb6SkKue0g==
-  dependencies:
-    graceful-fs "^4.2.0"
-    jsonfile "^6.0.1"
-    universalify "^2.0.0"
-
-fs-extra@^11.3.0:
+fs-extra@^11.1.1, fs-extra@^11.2.0, fs-extra@^11.3.0:
   version "11.3.3"
   resolved "https://registry.npmjs.org/fs-extra/-/fs-extra-11.3.3.tgz"
   integrity sha512-VWSRii4t0AFm6ixFFmLLx1t7wS1gh+ckoa84aOeapGum0h+EZd1EhEumSB+ZdDLnEPuucsVB9oB7cxJHap6Afg==
@@ -8578,10 +8474,10 @@ globals@^15.14.0:
   resolved "https://registry.npmjs.org/globals/-/globals-15.15.0.tgz"
   integrity sha512-7ACyT3wmyp3I61S4fG682L0VA2RGD9otkqGJIwNUMF1SWUombIIk+af1unuDYgMm082aHYwD+mzJvv9Iu8dsgg==
 
-globals@^17.4.0:
-  version "17.4.0"
-  resolved "https://registry.yarnpkg.com/globals/-/globals-17.4.0.tgz#33d7d297ed1536b388a0e2f4bcd0ff19c8ff91b5"
-  integrity sha512-hjrNztw/VajQwOLsMNT1cbJiH2muO3OROCHnbehc8eY5JyD2gqz4AcMHPqgaOR59DjgUjYAYLeH699g/eWi2jw==
+globals@^17.5.0:
+  version "17.5.0"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-17.5.0.tgz#a82c641d898f8dfbe0e81f66fdff7d0de43f88c6"
+  integrity sha512-qoV+HK2yFl/366t2/Cb3+xxPUo5BuMynomoDmiaZBIdbs+0pYbjfZU+twLhGKp4uCZ/+NbtpVepH5bGCxRyy2g==
 
 globalthis@^1.0.4:
   version "1.0.4"
@@ -9067,14 +8963,6 @@ http2-wrapper@^2.1.10:
     quick-lru "^5.1.1"
     resolve-alpn "^1.2.0"
 
-https-proxy-agent@^7.0.5:
-  version "7.0.6"
-  resolved "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.6.tgz"
-  integrity sha512-vK9P5/iUfdl95AI+JVyUuIcVtd4ofvtrOr3HNtM2yxC9bnMbEdp3x01OhQNnjb8IJYi38VlTE3mBXwcfvywuSw==
-  dependencies:
-    agent-base "^7.1.2"
-    debug "4"
-
 human-signals@^2.1.0:
   version "2.1.0"
   resolved "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz"
@@ -9130,14 +9018,14 @@ immer@^11.0.0:
   integrity sha512-6jQTc5z0KJFtr1UgFpIL3N9XSC3saRaI9PwWtzM2pSqkNGtiNkYY2OSwkOGDK2XcTRcLb1pi/aNkKZz0nxVH4Q==
 
 immutable@^3.x.x:
-  version "3.8.2"
-  resolved "https://registry.npmjs.org/immutable/-/immutable-3.8.2.tgz"
-  integrity sha512-15gZoQ38eYjEjxkorfbcgBKBL6R7T459OuK+CpcWt7O3KF4uPCx2tD0uFETlUDIyo+1789crbMhTvQBSR5yBMg==
+  version "3.8.3"
+  resolved "https://registry.yarnpkg.com/immutable/-/immutable-3.8.3.tgz#0a8d2494a94d4b2d4f0e99986e74dd25d1e9a859"
+  integrity sha512-AUY/VyX0E5XlibOmWt10uabJzam1zlYjwiEgQSDc5+UIkFNaF9WM0JxXKaNMGf+F/ffUF+7kRKXM9A7C0xXqMg==
 
 immutable@^5.0.2:
-  version "5.1.4"
-  resolved "https://registry.npmjs.org/immutable/-/immutable-5.1.4.tgz"
-  integrity sha512-p6u1bG3YSnINT5RQmx/yRZBpenIl30kVxkTLDyHLIMk0gict704Q9n+thfDI7lTRm9vXdDYutVzXhzcThxTnXA==
+  version "5.1.5"
+  resolved "https://registry.yarnpkg.com/immutable/-/immutable-5.1.5.tgz#93ee4db5c2a9ab42a4a783069f3c5d8847d40165"
+  integrity sha512-t7xcm2siw+hlUM68I+UEOK+z84RzmN59as9DZ7P1l0994DKUWV7UXBMQZVxaoMSRQ+PBZbHCOoBt7a2wxOMt+A==
 
 import-fresh@^3.2.1, import-fresh@^3.3.0:
   version "3.3.1"
@@ -9714,21 +9602,21 @@ js-yaml-loader@^1.2.2:
 
 js-yaml@4.1.0:
   version "4.1.0"
-  resolved "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602"
   integrity sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==
   dependencies:
     argparse "^2.0.1"
 
 js-yaml@=4.1.1, js-yaml@^4.1.0, js-yaml@^4.1.1:
   version "4.1.1"
-  resolved "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.1.tgz"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.1.tgz#854c292467705b699476e1a2decc0c8a3458806b"
   integrity sha512-qQKT4zQxXl8lLwBtHMWwaTcGfFOZviOJet3Oy/xmGk2gZH677CJM9EvtfdSkgWcATZhj/55JZ0rmy3myCT5lsA==
   dependencies:
     argparse "^2.0.1"
 
 js-yaml@^3.13.1:
   version "3.14.2"
-  resolved "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.2.tgz"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.2.tgz#77485ce1dd7f33c061fd1b16ecea23b55fcb04b0"
   integrity sha512-PMSmkqxr106Xa156c2M265Z+FTrPl+oxd/rgOQy2tijQeK5TxQ43psO1ZCwhVOSdnn+RzkzlRz/eY4BgJBYVpg==
   dependencies:
     argparse "^1.0.7"
@@ -9771,7 +9659,7 @@ json-crawl@^0.5.3:
   resolved "https://registry.npmjs.org/json-crawl/-/json-crawl-0.5.3.tgz"
   integrity sha512-BEjjCw8c7SxzNK4orhlWD5cXQh8vCk2LqDr4WgQq4CV+5dvopeYwt1Tskg67SuSLKvoFH5g0yuYtg7rcfKV6YA==
 
-json-parse-even-better-errors@^2.3.0, json-parse-even-better-errors@^2.3.1:
+json-parse-even-better-errors@^2.3.0:
   version "2.3.1"
   resolved "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz"
   integrity sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==
@@ -9799,6 +9687,15 @@ json-schema-merge-allof@0.8.1:
     json-schema-compare "^0.2.2"
     lodash "^4.17.20"
 
+json-schema-to-ts@2.7.2:
+  version "2.7.2"
+  resolved "https://registry.yarnpkg.com/json-schema-to-ts/-/json-schema-to-ts-2.7.2.tgz#e8df41d7153e5517f0e68dbe57be12bb3609d6d5"
+  integrity sha512-R1JfqKqbBR4qE8UyBR56Ms30LL62/nlhoz+1UkfI/VE7p54Awu919FZ6ZUPG8zIa3XB65usPJgr1ONVncUGSaQ==
+  dependencies:
+    "@babel/runtime" "^7.18.3"
+    "@types/json-schema" "^7.0.9"
+    ts-algebra "^1.2.0"
+
 json-schema-traverse@^0.4.1:
   version "0.4.1"
   resolved "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz"
@@ -9809,11 +9706,6 @@ json-schema-traverse@^1.0.0:
   resolved "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz"
   integrity sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==
 
-json-schema@^0.4.0:
-  version "0.4.0"
-  resolved "https://registry.npmjs.org/json-schema/-/json-schema-0.4.0.tgz"
-  integrity sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA==
-
 json-stable-stringify-without-jsonify@^1.0.1:
   version "1.0.1"
   resolved "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz"
@@ -10107,13 +9999,13 @@ lodash.uniq@^4.5.0:
 
 lodash@4.17.21:
   version "4.17.21"
-  resolved "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
   integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
 
-lodash@^4.15.0, lodash@^4.17.10, lodash@^4.17.15, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.17.4:
-  version "4.17.23"
-  resolved "https://registry.npmjs.org/lodash/-/lodash-4.17.23.tgz"
-  integrity sha512-LgVTMpQtIopCi79SJeDiP0TfWi5CNEc/L/aRdTh3yIvmZXTnheWpKjSZhnvMl8iXbC1tFg9gdHHDMLoV7CnG+w==
+lodash@^4.15.0, lodash@^4.17.10, lodash@^4.17.15, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.17.4, lodash@^4.18.1:
+  version "4.18.1"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.18.1.tgz#ff2b66c1f6326d59513de2407bf881439812771c"
+  integrity sha512-dMInicTPVE8d1e5otfwmmjlxkZoUpiVLwyeTdUsi/Caj/gfzzblBcCE5sRHV/AsjuCmxWrte2TNGSYuCeCq+0Q==
 
 longest-streak@^3.0.0:
   version "3.1.0"
@@ -10166,13 +10058,6 @@ markdown-extensions@^2.0.0:
   resolved "https://registry.npmjs.org/markdown-extensions/-/markdown-extensions-2.0.0.tgz"
   integrity sha512-o5vL7aDWatOTX8LzaS1WMoaoxIiLRQJuIKKe2wAw6IeULDHaqbiqiggmx+pKvZDb1Sj+pE46Sn1T7lCqfFtg1Q==
 
-markdown-table@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.npmjs.org/markdown-table/-/markdown-table-2.0.0.tgz"
-  integrity sha512-Ezda85ToJUBhM6WGaG6veasyym+Tbs3cMAw/ZhOPqXiYsr0jgocBV3j3nx+4lk47plLlIqjwuTm/ywVI+zjJ/A==
-  dependencies:
-    repeat-string "^1.0.0"
-
 markdown-table@^3.0.0:
   version "3.0.4"
   resolved "https://registry.npmjs.org/markdown-table/-/markdown-table-3.0.4.tgz"
@@ -10183,11 +10068,6 @@ marked@^16.0.0:
   resolved "https://registry.npmjs.org/marked/-/marked-16.2.0.tgz"
   integrity sha512-LbbTuye+0dWRz2TS9KJ7wsnD4KAtpj0MVkWc90XvBa6AslXsT0hTBVH5k32pcSyHH1fst9XEFJunXHktVy0zlg==
 
-marked@^16.3.0:
-  version "16.4.0"
-  resolved "https://registry.npmjs.org/marked/-/marked-16.4.0.tgz"
-  integrity sha512-CTPAcRBq57cn3R8n3hwc2REddc28hjR7RzDXQ+lXLmMJYqn20BaI2cGw6QjgZGIgVfp2Wdfw4aMzgNteQ6qJgQ==
-
 math-expression-evaluator@^1.3.8:
   version "1.4.0"
   resolved "https://registry.npmjs.org/math-expression-evaluator/-/math-expression-evaluator-1.4.0.tgz"
@@ -11217,33 +11097,19 @@ minimalistic-assert@^1.0.0:
   resolved "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz"
   integrity sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==
 
-minimatch@3.1.2, minimatch@^3.1.1, minimatch@^3.1.2:
-  version "3.1.2"
-  resolved "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz"
-  integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==
+minimatch@3.1.5, minimatch@^3.1.1, minimatch@^3.1.2:
+  version "3.1.5"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.5.tgz#580c88f8d5445f2bd6aa8f3cadefa0de79fbd69e"
+  integrity sha512-VgjWUsnnT6n+NUk6eZq77zeFdpW2LWDzP6zFGrCbHXiYNul5Dzqk2HHQ5uFH2DNW5Xbp8+jVzaeNt94ssEEl4w==
   dependencies:
     brace-expansion "^1.1.7"
 
-minimatch@^10.2.1:
-  version "10.2.2"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-10.2.2.tgz#361603ee323cfb83496fea2ae17cc44ea4e1f99f"
-  integrity sha512-+G4CpNBxa5MprY+04MbgOw1v7So6n5JY166pFi9KfYwT78fxScCeSNQSNzp6dpPSW2rONOps6Ocam1wFhCgoVw==
+minimatch@^10.2.1, minimatch@^10.2.2:
+  version "10.2.5"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-10.2.5.tgz#bd48687a0be38ed2961399105600f832095861d1"
+  integrity sha512-MULkVLfKGYDFYejP07QOurDLLQpcjk7Fw+7jXS2R2czRQzR56yHRveU5NDJEOviH+hETZKSkIk5c+T23GjFUMg==
   dependencies:
-    brace-expansion "^5.0.2"
-
-minimatch@^10.2.2:
-  version "10.2.4"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-10.2.4.tgz#465b3accbd0218b8281f5301e27cedc697f96fde"
-  integrity sha512-oRjTw/97aTBN0RHbYCdtF1MQfvusSIBQM0IZEgzl6426+8jSC0nF1a/GmnVLpfB9yyr6g6FTqWqiZVbxrtaCIg==
-  dependencies:
-    brace-expansion "^5.0.2"
-
-minimatch@^5.0.1:
-  version "5.1.6"
-  resolved "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz"
-  integrity sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==
-  dependencies:
-    brace-expansion "^2.0.1"
+    brace-expansion "^5.0.5"
 
 minimist@^1.2.0:
   version "1.2.8"
@@ -11398,9 +11264,9 @@ node-fetch@^2.6.1:
     whatwg-url "^5.0.0"
 
 node-forge@^1:
-  version "1.3.2"
-  resolved "https://registry.npmjs.org/node-forge/-/node-forge-1.3.2.tgz"
-  integrity sha512-6xKiQ+cph9KImrRh0VsjH2d8/GXA4FIMlgU4B757iI1ApvcyA9VlouP0yZJha01V+huImO+kKMU7ih+2+E14fw==
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-1.4.0.tgz#1c7b7d8bdc2d078739f58287d589d903a11b2fc2"
+  integrity sha512-LarFH0+6VfriEhqMMcLX2F7SwSXeWwnEAJEsYm5QKWchiVYVvJyV9v7UDvUv+w5HO23ZpQTXDv/GxdDdMyOuoQ==
 
 node-gyp-build@^4.8.0, node-gyp-build@^4.8.2, node-gyp-build@^4.8.4:
   version "4.8.4"
@@ -11645,10 +11511,10 @@ openapi-server-url-templating@^1.3.0:
   dependencies:
     apg-lite "^1.0.4"
 
-openapi-to-postmanv2@^5.0.0:
-  version "5.8.0"
-  resolved "https://registry.npmjs.org/openapi-to-postmanv2/-/openapi-to-postmanv2-5.8.0.tgz"
-  integrity sha512-7f02ypBlAx4G9z3bP/uDk8pBwRbYt97Eoso8XJLyclfyRvCC+CvERLUl0MD0x+GoumpkJYnQ0VGdib/kwtUdUw==
+openapi-to-postmanv2@^6.0.0:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/openapi-to-postmanv2/-/openapi-to-postmanv2-6.0.1.tgz#ce14def40b16cd02f5656445cfe7d039f761a602"
+  integrity sha512-zAjaTwXo07az6jjvZTw4d26QMQsFxZBxTqjj3LQQMDCCuO6+peATQc9bSmAq3QbzvikP+h2WEjTphMcIrcSurg==
   dependencies:
     ajv "^8.11.0"
     ajv-draft-04 "1.0.0"
@@ -11663,11 +11529,17 @@ openapi-to-postmanv2@^5.0.0:
     neotraverse "0.6.15"
     oas-resolver-browser "2.5.6"
     object-hash "3.0.0"
+    openapi-types "^12.1.3"
     path-browserify "1.0.1"
     postman-collection "^5.0.0"
     swagger2openapi "7.0.8"
     yaml "1.10.2"
 
+openapi-types@^12.1.3:
+  version "12.1.3"
+  resolved "https://registry.yarnpkg.com/openapi-types/-/openapi-types-12.1.3.tgz#471995eb26c4b97b7bd356aacf7b91b73e777dd3"
+  integrity sha512-N4YtSYJqghVu4iek2ZUvcN/0aqH1kRDuNqzcycDxhOUpg7GdvLa2F3DgS6yBNhInhv2r/6I0Flkn7CqL8+nIcw==
+
 opener@^1.5.2:
   version "1.5.2"
   resolved "https://registry.npmjs.org/opener/-/opener-1.5.2.tgz"
@@ -11906,20 +11778,20 @@ path-parse@^1.0.7:
 
 path-to-regexp@3.3.0:
   version "3.3.0"
-  resolved "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-3.3.0.tgz"
+  resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-3.3.0.tgz#f7f31d32e8518c2660862b644414b6d5c63a611b"
   integrity sha512-qyCH421YQPS2WFDxDjftfc1ZR5WKQzVzqsp4n9M2kQhVOo/ByahFoUNJfl58kOcEGfQ//7weFTDhm+ss8Ecxgw==
 
 path-to-regexp@^1.7.0:
   version "1.9.0"
-  resolved "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.9.0.tgz"
+  resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-1.9.0.tgz#5dc0753acbf8521ca2e0f137b4578b917b10cf24"
   integrity sha512-xIp7/apCFJuUHdDLWe8O1HIkb0kQrOMb/0u6FXQjemHn/ii5LrIzU6bdECnsiTF/GjZkMEKg1xdiZwNqDYlZ6g==
   dependencies:
     isarray "0.0.1"
 
 path-to-regexp@~0.1.12:
-  version "0.1.12"
-  resolved "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.12.tgz"
-  integrity sha512-RA1GjUVMnvYFxuqovrEqZoxxW5NUZqbwKtYz/Tt7nXerk0LbLblQmrsgdeOxV5SFHf0UDggjS/bSeOZwt1pmEQ==
+  version "0.1.13"
+  resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.13.tgz#9b22ec16bc3ab88d05a0c7e369869421401ab17d"
+  integrity sha512-A/AGNMFN3c8bOlvV9RreMdrv7jsmF9XIfDeCd87+I8RNg6s78BhJxMu69NEMHBSJFxKidViTEdruRwEk/WIKqA==
 
 path-type@^4.0.0:
   version "4.0.0"
@@ -11945,14 +11817,14 @@ picocolors@^1.0.0, picocolors@^1.1.1:
   integrity sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==
 
 picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.3, picomatch@^2.3.1:
-  version "2.3.1"
-  resolved "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz"
-  integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.2.tgz#5a942915e26b372dc0f0e6753149a16e6b1c5601"
+  integrity sha512-V7+vQEJ06Z+c5tSye8S+nHUfI51xoXIXjHQ99cQtKUkQqqO1kO/KCJUfZXuB47h/YBlDhah2H3hdUGXn8ie0oA==
 
-picomatch@^4.0.3:
-  version "4.0.3"
-  resolved "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz"
-  integrity sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==
+picomatch@^4.0.3, picomatch@^4.0.4:
+  version "4.0.4"
+  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-4.0.4.tgz#fd6f5e00a143086e074dffe4c924b8fb293b0589"
+  integrity sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==
 
 pirates@^4.0.1:
   version "4.0.7"
@@ -12612,10 +12484,10 @@ prettier-linter-helpers@^1.0.1:
   dependencies:
     fast-diff "^1.1.2"
 
-prettier@^3.8.1:
-  version "3.8.1"
-  resolved "https://registry.npmjs.org/prettier/-/prettier-3.8.1.tgz"
-  integrity sha512-UOnG6LftzbdaHZcKoPFtOcCKztrQ57WkHDeRD9t/PTQtmT0NHSeWWepj6pS0z/N7+08BHFDQVUrfmfMRcZwbMg==
+prettier@^3.8.3:
+  version "3.8.3"
+  resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.8.3.tgz#560f2de55bf01b4c0503bc629d5df99b9a1d09b0"
+  integrity sha512-7igPTM53cGHMW8xWuVTydi2KO233VFiTNyF5hLJqpilHfmn8C8gPf+PS7dUT64YcXFbiMGZxS9pCSxL/Dxm/Jw==
 
 pretty-error@^4.0.0:
   version "4.0.0"
@@ -12700,10 +12572,10 @@ proxy-addr@~2.0.7:
     forwarded "0.2.0"
     ipaddr.js "1.9.1"
 
-proxy-from-env@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz"
-  integrity sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==
+proxy-from-env@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-2.1.0.tgz#a7487568adad577cfaaa7e88c49cab3ab3081aba"
+  integrity sha512-cJ+oHTW1VAEa8cJslgmUZrc+sjRKgAKl3Zyse6+PV38hZe/V6Z14TbCuXcan9F9ghlz4QrFr2c92TNF82UkYHA==
 
 punycode@^1.4.1:
   version "1.4.1"
@@ -12914,10 +12786,10 @@ react-live@^4.1.6, react-live@^4.1.8:
     sucrase "^3.35.0"
     use-editable "^2.3.3"
 
-react-loadable-ssr-addon-v5-slorber@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.npmjs.org/react-loadable-ssr-addon-v5-slorber/-/react-loadable-ssr-addon-v5-slorber-1.0.1.tgz"
-  integrity sha512-lq3Lyw1lGku8zUEJPDxsNm1AfYHBrO9Y1+olAYwpUJ2IGFBskM0DMKok97A6LWUpHm+o7IvQBOWu9MLenp9Z+A==
+react-loadable-ssr-addon-v5-slorber@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/react-loadable-ssr-addon-v5-slorber/-/react-loadable-ssr-addon-v5-slorber-1.0.3.tgz#bb3791bf481222c63a5bc6b96ee23f68cb5614b9"
+  integrity sha512-GXfh9VLwB5ERaCsU6RULh7tkemeX15aNh6wuMEBtfdyMa7fFG8TXrhXlx1SoEK2Ty/l6XIkzzYIQmyaWW3JgdQ==
   dependencies:
     "@babel/runtime" "^7.10.3"
 
@@ -13454,7 +13326,7 @@ renderkid@^3.0.0:
     lodash "^4.17.21"
     strip-ansi "^6.0.1"
 
-repeat-string@^1.0.0, repeat-string@^1.5.2:
+repeat-string@^1.5.2:
   version "1.6.1"
   resolved "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz"
   integrity sha512-PV0dzCYDNfRi1jCDbJzpW7jNNDRuCOG/jI5ctQcGKt/clZD+YcPS3yIlWuTJMmESC8aevCFmWJy5wjAFgNqN6w==
@@ -13821,20 +13693,20 @@ serialize-error@^8.1.0:
 
 serialize-javascript@^6.0.0, serialize-javascript@^6.0.1:
   version "6.0.2"
-  resolved "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.2.tgz"
+  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-6.0.2.tgz#defa1e055c83bf6d59ea805d8da862254eb6a6c2"
   integrity sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==
   dependencies:
     randombytes "^2.1.0"
 
-serve-handler@^6.1.6:
-  version "6.1.6"
-  resolved "https://registry.npmjs.org/serve-handler/-/serve-handler-6.1.6.tgz"
-  integrity sha512-x5RL9Y2p5+Sh3D38Fh9i/iQ5ZK+e4xuXRd/pGbM4D13tgo/MGwbttUk8emytcr1YYzBYs+apnUngBDFYfpjPuQ==
+serve-handler@^6.1.7:
+  version "6.1.7"
+  resolved "https://registry.yarnpkg.com/serve-handler/-/serve-handler-6.1.7.tgz#e9bb864e87ee71e8dab874cde44d146b77e3fb78"
+  integrity sha512-CinAq1xWb0vR3twAv9evEU8cNWkXCb9kd5ePAHUKJBkOsUpR1wt/CvGdeca7vqumL1U5cSaeVQ6zZMxiJ3yWsg==
   dependencies:
     bytes "3.0.0"
     content-disposition "0.5.2"
     mime-types "2.1.18"
-    minimatch "3.1.2"
+    minimatch "3.1.5"
     path-is-inside "1.0.2"
     path-to-regexp "3.3.0"
     range-parser "1.2.0"
@@ -14461,19 +14333,19 @@ svgo@^3.0.2, svgo@^3.2.0:
     picocolors "^1.0.0"
     sax "^1.5.0"
 
-swagger-client@^3.37.0:
-  version "3.37.0"
-  resolved "https://registry.yarnpkg.com/swagger-client/-/swagger-client-3.37.0.tgz#1ac57955d650cf92105e11900ca7b640f5604cc7"
-  integrity sha512-pzU+B+DkUbrSwlj4/E8sGeP1w84/CFgDJAt80fHu650TxnOHbqFLGQjiE6luvpRxTPdfK2zRHJP7I6CgUkI8yA==
+swagger-client@^3.37.2:
+  version "3.37.2"
+  resolved "https://registry.yarnpkg.com/swagger-client/-/swagger-client-3.37.2.tgz#19d15564b2c77c9200a3ee2b8a913e2bd2e4a596"
+  integrity sha512-KcB8psL1On4GWwv9Ribp1oteh50ygNnAyvQbd5MwiXMGkcB4f53rkZEdvZKPDdJO764mQjgErxQEGDVw6QBUMQ==
   dependencies:
     "@babel/runtime-corejs3" "^7.22.15"
     "@scarf/scarf" "=1.4.0"
-    "@swagger-api/apidom-core" "^1.6.0"
-    "@swagger-api/apidom-error" "^1.6.0"
-    "@swagger-api/apidom-json-pointer" "^1.6.0"
-    "@swagger-api/apidom-ns-openapi-3-1" "^1.6.0"
-    "@swagger-api/apidom-ns-openapi-3-2" "^1.6.0"
-    "@swagger-api/apidom-reference" "^1.6.0"
+    "@swagger-api/apidom-core" "^1.10.2"
+    "@swagger-api/apidom-error" "^1.10.2"
+    "@swagger-api/apidom-json-pointer" "^1.10.2"
+    "@swagger-api/apidom-ns-openapi-3-1" "^1.10.2"
+    "@swagger-api/apidom-ns-openapi-3-2" "^1.10.2"
+    "@swagger-api/apidom-reference" "^1.10.2"
     "@swaggerexpert/cookie" "^2.0.2"
     deepmerge "~4.3.0"
     fast-json-patch "^3.0.0-1"
@@ -14486,10 +14358,10 @@ swagger-client@^3.37.0:
     ramda "^0.30.1"
     ramda-adjunct "^5.1.0"
 
-swagger-ui-react@^5.32.0:
-  version "5.32.0"
-  resolved "https://registry.yarnpkg.com/swagger-ui-react/-/swagger-ui-react-5.32.0.tgz#fd764a7be746b5fdbff748fee6ef723eb05b4846"
-  integrity sha512-2mmrtvfp0EA90pdT8qXTMu26ex03TG2bsjvDAwXhdfCm+9foyadYJN+nEvDHM6/c6/xtXbdAsb6cVxBvbltnpw==
+swagger-ui-react@^5.32.4:
+  version "5.32.4"
+  resolved "https://registry.yarnpkg.com/swagger-ui-react/-/swagger-ui-react-5.32.4.tgz#783b22213c4e826618b1470fd8ae9e68a2587c7d"
+  integrity sha512-OsTqKCiDT/o8/oqZbt+p1djPkrOk3unKK/7+wGvP1+WY6pOzFoDLM4D39cNFtpIArtlg9uoK6MKIz3W00WX8qw==
   dependencies:
     "@babel/runtime-corejs3" "^7.27.1"
     "@scarf/scarf" "=1.4.0"
@@ -14498,12 +14370,12 @@ swagger-ui-react@^5.32.0:
     classnames "^2.5.1"
     css.escape "1.5.1"
     deep-extend "0.6.0"
-    dompurify "=3.2.6"
+    dompurify "^3.3.2"
     ieee754 "^1.2.1"
     immutable "^3.x.x"
     js-file-download "^0.4.12"
     js-yaml "=4.1.1"
-    lodash "^4.17.21"
+    lodash "^4.18.1"
     prop-types "^15.8.1"
     randexp "^0.5.3"
     randombytes "^2.1.0"
@@ -14520,7 +14392,7 @@ swagger-ui-react@^5.32.0:
     reselect "^5.1.1"
     serialize-error "^8.1.0"
     sha.js "^2.4.12"
-    swagger-client "^3.37.0"
+    swagger-client "^3.37.2"
     url-parse "^1.5.10"
     xml "=1.0.1"
     xml-but-prettier "^1.0.1"
@@ -14550,14 +14422,6 @@ swc-loader@^0.2.6, swc-loader@^0.2.7:
   dependencies:
     "@swc/counter" "^0.1.3"
 
-swr@^2.2.5:
-  version "2.3.6"
-  resolved "https://registry.npmjs.org/swr/-/swr-2.3.6.tgz"
-  integrity sha512-wfHRmHWk/isGNMwlLGlZX5Gzz/uTgo0o2IRuTMcf4CPuPFJZlq0rDaKUx+ozB5nBOReNV1kiOyzMfj+MBMikLw==
-  dependencies:
-    dequal "^2.0.3"
-    use-sync-external-store "^1.4.0"
-
 synckit@^0.11.12:
   version "0.11.12"
   resolved "https://registry.npmjs.org/synckit/-/synckit-0.11.12.tgz"
@@ -14614,11 +14478,6 @@ throttle-debounce@^5.0.0, throttle-debounce@^5.0.2:
   resolved "https://registry.npmjs.org/throttle-debounce/-/throttle-debounce-5.0.2.tgz"
   integrity sha512-B71/4oyj61iNH0KeCamLuE2rmKuTO5byTOSVwECM5FA7TiAiAW+UqTKZ9ERueC4qvgSttUhdmq1mXC3kJqGX7A==
 
-throttleit@2.1.0:
-  version "2.1.0"
-  resolved "https://registry.npmjs.org/throttleit/-/throttleit-2.1.0.tgz"
-  integrity sha512-nt6AMGKW1p/70DF/hGBdJB57B8Tspmbp5gfJ8ilhLnt7kkr2ye7hzD6NVG8GGErk2HWF34igrL2CXmNIkzKqKw==
-
 thunky@^1.0.2:
   version "1.1.0"
   resolved "https://registry.npmjs.org/thunky/-/thunky-1.1.0.tgz"
@@ -14737,10 +14596,15 @@ trough@^2.0.0:
   resolved "https://registry.npmjs.org/trough/-/trough-2.2.0.tgz"
   integrity sha512-tmMpK00BjZiUyVyvrBK7knerNgmgvcV/KLVyuma/SC+TQN167GrMRciANTz09+k3zW8L8t60jWO1GpfkZdjTaw==
 
-ts-api-utils@^2.4.0:
-  version "2.4.0"
-  resolved "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-2.4.0.tgz"
-  integrity sha512-3TaVTaAv2gTiMB35i3FiGJaRfwb3Pyn/j3m/bfAvGe8FB7CF6u+LMYqYlDh7reQf7UNvoTvdfAqHGmPGOSsPmA==
+ts-algebra@^1.2.0:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/ts-algebra/-/ts-algebra-1.2.2.tgz#b75d301c28cd4126cd344760a47b43e48e2872e0"
+  integrity sha512-kloPhf1hq3JbCPOTYoOWDKxebWjNb2o/LKnNfkWhxVVisFFmMJPPdJeGoGmM+iRLyoXAR61e08Pb+vUXINg8aA==
+
+ts-api-utils@^2.5.0:
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/ts-api-utils/-/ts-api-utils-2.5.0.tgz#4acd4a155e22734990a5ed1fe9e97f113bcb37c1"
+  integrity sha512-OJ/ibxhPlqrMM0UiNHJ/0CKQkoKF243/AEmplt3qpRgkW8VG7IfOS41h7V8TjITqdByHzrjcS/2si+y4lIh8NA==
 
 ts-dedent@^2.0.0, ts-dedent@^2.2.0:
   version "2.2.0"
@@ -14779,11 +14643,6 @@ type-fest@^0.20.2:
   resolved "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz"
   integrity sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==
 
-type-fest@^0.21.3:
-  version "0.21.3"
-  resolved "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz"
-  integrity sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==
-
 type-fest@^1.0.1:
   version "1.4.0"
   resolved "https://registry.npmjs.org/type-fest/-/type-fest-1.4.0.tgz"
@@ -14861,20 +14720,20 @@ types-ramda@^0.30.1:
   dependencies:
     ts-toolbelt "^9.6.0"
 
-typescript-eslint@^8.57.1:
-  version "8.57.1"
-  resolved "https://registry.yarnpkg.com/typescript-eslint/-/typescript-eslint-8.57.1.tgz#573f97d3e48bbb67290b47dde1b7cb3b5d01dc4f"
-  integrity sha512-fLvZWf+cAGw3tqMCYzGIU6yR8K+Y9NT2z23RwOjlNFF2HwSB3KhdEFI5lSBv8tNmFkkBShSjsCjzx1vahZfISA==
+typescript-eslint@^8.59.0:
+  version "8.59.0"
+  resolved "https://registry.yarnpkg.com/typescript-eslint/-/typescript-eslint-8.59.0.tgz#d1cc7c63559ce7116aeb66d35ec9dbe0063379fd"
+  integrity sha512-BU3ONW9X+v90EcCH9ZS6LMackcVtxRLlI3XrYyqZIwVSHIk7Qf7bFw1z0M9Q0IUxhTMZCf8piY9hTYaNEIASrw==
   dependencies:
-    "@typescript-eslint/eslint-plugin" "8.57.1"
-    "@typescript-eslint/parser" "8.57.1"
-    "@typescript-eslint/typescript-estree" "8.57.1"
-    "@typescript-eslint/utils" "8.57.1"
+    "@typescript-eslint/eslint-plugin" "8.59.0"
+    "@typescript-eslint/parser" "8.59.0"
+    "@typescript-eslint/typescript-estree" "8.59.0"
+    "@typescript-eslint/utils" "8.59.0"
 
-typescript@~5.9.3:
-  version "5.9.3"
-  resolved "https://registry.npmjs.org/typescript/-/typescript-5.9.3.tgz"
-  integrity sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==
+typescript@~6.0.3:
+  version "6.0.3"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-6.0.3.tgz#90251dc007916e972786cb94d74d15b185577d21"
+  integrity sha512-y2TvuxSZPDyQakkFRPZHKFm+KKVqIisdg9/CZwm9ftvKXLP8NRWj38/ODjNbr43SsoXqNuAisEf1GdCxqWcdBw==
 
 ufo@^1.5.4:
   version "1.6.1"
@@ -15479,10 +15338,10 @@ webpack-virtual-modules@^0.6.2:
   resolved "https://registry.npmjs.org/webpack-virtual-modules/-/webpack-virtual-modules-0.6.2.tgz"
   integrity sha512-66/V2i5hQanC51vBQKPH4aI8NMAcBW59FVBs+rC7eGHupMyfn34q7rZIE+ETlJ+XTevqfUhVVBgSUNSW2flEUQ==
 
-webpack@^5.105.4, webpack@^5.88.1, webpack@^5.95.0:
-  version "5.105.4"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.105.4.tgz#1b77fcd55a985ac7ca9de80a746caffa38220169"
-  integrity sha512-jTywjboN9aHxFlToqb0K0Zs9SbBoW4zRUlGzI2tYNxVYcEi/IPpn+Xi4ye5jTLvX2YeLuic/IvxNot+Q1jMoOw==
+webpack@^5.106.2, webpack@^5.88.1, webpack@^5.95.0:
+  version "5.106.2"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.106.2.tgz#ca8174b4fd80f055cc5a45fcc5577d6db76c8ac5"
+  integrity sha512-wGN3qcrBQIFmQ/c0AiOAQBvrZ5lmY8vbbMv4Mxfgzqd/B6+9pXtLo73WuS1dSGXM5QYY3hZnIbvx+K1xxe6FyA==
   dependencies:
     "@types/eslint-scope" "^3.7.7"
     "@types/estree" "^1.0.8"
@@ -15500,9 +15359,8 @@ webpack@^5.105.4, webpack@^5.88.1, webpack@^5.95.0:
     events "^3.2.0"
     glob-to-regexp "^0.4.1"
     graceful-fs "^4.2.11"
-    json-parse-even-better-errors "^2.3.1"
     loader-runner "^4.3.1"
-    mime-types "^2.1.27"
+    mime-db "^1.54.0"
     neo-async "^2.6.2"
     schema-utils "^4.3.3"
     tapable "^2.3.0"
@@ -15510,19 +15368,15 @@ webpack@^5.105.4, webpack@^5.88.1, webpack@^5.95.0:
     watchpack "^2.5.1"
     webpack-sources "^3.3.4"
 
-webpackbar@^6.0.1:
-  version "6.0.1"
-  resolved "https://registry.npmjs.org/webpackbar/-/webpackbar-6.0.1.tgz"
-  integrity sha512-TnErZpmuKdwWBdMoexjio3KKX6ZtoKHRVvLIU0A47R0VVBDtx3ZyOJDktgYixhoJokZTYTt1Z37OkO9pnGJa9Q==
+webpackbar@^6.0.1, webpackbar@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/webpackbar/-/webpackbar-7.0.0.tgz#7228d32881af2392381b6514499ddea73cdf218a"
+  integrity sha512-aS9soqSO2iCHgqHoCrj4LbfGQUboDCYJPSFOAchEK+9psIjNrfSWW4Y0YEz67MKURNvMmfo0ycOg9d/+OOf9/Q==
   dependencies:
-    ansi-escapes "^4.3.2"
-    chalk "^4.1.2"
+    ansis "^3.2.0"
     consola "^3.2.3"
-    figures "^3.2.0"
-    markdown-table "^2.0.0"
     pretty-time "^1.1.0"
     std-env "^3.7.0"
-    wrap-ansi "^7.0.0"
 
 websocket-driver@>=0.5.1, websocket-driver@^0.7.4:
   version "0.7.4"
@@ -15737,11 +15591,16 @@ yaml-ast-parser@0.0.43:
   resolved "https://registry.npmjs.org/yaml-ast-parser/-/yaml-ast-parser-0.0.43.tgz"
   integrity sha512-2PTINUwsRqSd+s8XxKaJWQlUuEMHJQyEuh2edBbW8KNJz0SJPwUSD2zRWqezFEdN7IzAgeuYHFUCF7o8zRdZ0A==
 
-yaml@1.10.2, yaml@^1.10.0:
+yaml@1.10.2:
   version "1.10.2"
-  resolved "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz"
+  resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b"
   integrity sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==
 
+yaml@^1.10.0:
+  version "1.10.3"
+  resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.3.tgz#76e407ed95c42684fb8e14641e5de62fe65bbcb3"
+  integrity sha512-vIYeF1u3CjlhAFekPPAk2h/Kv4T3mAkMox5OymRiJQB0spDP10LHvt+K7G9Ny6NuuMAb25/6n1qyUjAcGNf/AA==
+
 yargs-parser@^21.1.1:
   version "21.1.1"
   resolved "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz"
@@ -15775,11 +15634,6 @@ zenscroll@^4.0.2:
   resolved "https://registry.npmjs.org/zenscroll/-/zenscroll-4.0.2.tgz"
   integrity sha512-jEA1znR7b4C/NnaycInCU6h/d15ZzCd1jmsruqOKnZP6WXQSMH3W2GL+OXbkruslU4h+Tzuos0HdswzRUk/Vgg==
 
-zod@^4.1.8:
-  version "4.1.12"
-  resolved "https://registry.npmjs.org/zod/-/zod-4.1.12.tgz"
-  integrity sha512-JInaHOamG8pt5+Ey8kGmdcAcg3OL9reK8ltczgHTAwNhMys/6ThXHityHxVV2p3fkw/c+MAvBHFVYHFZDmjMCQ==
-
 zwitch@^2.0.0:
   version "2.0.4"
   resolved "https://registry.npmjs.org/zwitch/-/zwitch-2.0.4.tgz"
diff --git a/pyproject.toml b/pyproject.toml
index 12d5224cb38..5eca094b984 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -48,7 +48,7 @@ dependencies = [
     "cryptography>=42.0.4, <47.0.0",
     "deprecation>=2.1.0, <2.2.0",
     "flask>=2.2.5, <4.0.0",
-    "flask-appbuilder>=5.0.2,<6",
+    "flask-appbuilder>=5.2.1, <6.0.0",
     "flask-caching>=2.1.0, <3",
     "flask-compress>=1.13, <2.0",
     "flask-talisman>=1.0.0, <2.0",
@@ -89,7 +89,7 @@ dependencies = [
     "python-dateutil",
     "python-dotenv", # optional dependencies for Flask but required for Superset, see https://flask.palletsprojects.com/en/stable/installation/#optional-dependencies
     "pygeohash",
-    "pyarrow>=16.1.0, <19", # before upgrading pyarrow, check that all db dependencies support this, see e.g. https://github.com/apache/superset/pull/34693
+    "pyarrow>=16.1.0, <21", # before upgrading pyarrow, check that all db dependencies support this, see e.g. https://github.com/apache/superset/pull/34693
     "pyyaml>=6.0.0, <7.0.0",
     "PyJWT>=2.4.0, <3.0",
     "redis>=5.0.0, <6.0",
@@ -183,6 +183,7 @@ risingwave = ["sqlalchemy-risingwave"]
 shillelagh = ["shillelagh[all]>=1.4.3, <2"]
 singlestore = ["sqlalchemy-singlestoredb>=1.1.1, <2"]
 snowflake = ["snowflake-sqlalchemy>=1.2.4, <2"]
+sqlite = ["syntaqlite>=0.1.0"]
 spark = [
     "pyhive[hive]>=0.6.5;python_version<'3.11'",
     "pyhive[hive_pure_sasl]>=0.7",
@@ -226,6 +227,7 @@ development = [
     "ruff",
     "sqloxide",
     "statsd",
+    "syntaqlite>=0.1.0",
 ]
 
 [project.urls]
@@ -238,7 +240,7 @@ combine_as_imports = true
 include_trailing_comma = true
 line_length = 88
 known_first_party = "superset, apache-superset-core, apache-superset-extensions-cli"
-known_third_party = "alembic, apispec, backoff, celery, click, colorama, cron_descriptor, croniter, cryptography, dateutil, deprecation, flask, flask_appbuilder, flask_babel, flask_caching, flask_compress, flask_jwt_extended, flask_login, flask_migrate, flask_sqlalchemy, flask_talisman, flask_testing, flask_wtf, freezegun, geohash, geopy, holidays, humanize, isodate, jinja2, jwt, markdown, markupsafe, marshmallow, marshmallow-union, msgpack, nh3, numpy, pandas, parameterized, parsedatetime, pgsanity, polyline, prison, progress, pyarrow, sqlalchemy_bigquery, pyhive, pyparsing, pytest, pytest_mock, pytz, redis, requests, selenium, setuptools, shillelagh, simplejson, slack, sqlalchemy, sqlalchemy_utils, typing_extensions, urllib3, werkzeug, wtforms, wtforms_json, yaml"
+known_third_party = "alembic, apispec, backoff, celery, click, colorama, cron_descriptor, croniter, cryptography, dateutil, deprecation, flask, flask_appbuilder, flask_babel, flask_caching, flask_compress, flask_jwt_extended, flask_login, flask_migrate, flask_sqlalchemy, flask_talisman, flask_testing, flask_wtf, freezegun, geohash, geopy, holidays, humanize, isodate, jinja2, jwt, markdown, markupsafe, marshmallow, marshmallow-union, msgpack, nh3, numpy, pandas, parameterized, parsedatetime, pgsanity, polyline, prison, progress, pyarrow, sqlalchemy_bigquery, pyhive, pyparsing, pytest, pytest_mock, pytz, redis, requests, selenium, setuptools, shillelagh, simplejson, slack, sqlalchemy, sqlalchemy_utils, syntaqlite, typing_extensions, urllib3, werkzeug, wtforms, wtforms_json, yaml"
 multi_line_output = 3
 order_by_type = false
 
@@ -372,6 +374,7 @@ unfixable = []
 dummy-variable-rgx = "^(_+|(_+[a-zA-Z0-9_]*[a-zA-Z0-9]+?))$"
 
 [tool.ruff.lint.per-file-ignores]
+"superset/mcp_service/app.py" = ["S608", "E501"]  # LLM instruction text: SQL examples (S608) and long lines in multiline string (E501)
 "scripts/*" = ["TID251"]
 "setup.py" = ["TID251"]
 "superset/config.py" = ["TID251"]
diff --git a/requirements/base.in b/requirements/base.in
index 2d6100beab3..cad39dc543c 100644
--- a/requirements/base.in
+++ b/requirements/base.in
@@ -25,6 +25,16 @@ filelock>=3.20.3,<4.0.0
 # Security: decompression bomb fix (required by aiohttp 3.13.3)
 brotli>=1.2.0,<2.0.0
 numexpr>=2.9.0
+# Security: CVE-2026-34073 (MEDIUM) - Improper Certificate Validation
+cryptography>=46.0.7,<47.0.0
+# Security: Snyk - XSS vulnerability in Mako templates
+mako>=1.3.11,<2.0.0
+# Security: CVE-2024-52338 (CRITICAL) - Deserialization of untrusted data in IPC/Parquet readers
+pyarrow>=20.0.0,<21.0.0
+# Security: CVE-2026-27459 - pyopenssl certificate validation
+pyopenssl>=26.0.0,<27.0.0
+# Security: CVE-2026-25645 (MEDIUM) - Insecure Temporary File
+requests>=2.33.0,<3.0.0
 
 # 5.0.0 has a sensitive deprecation used in other libs
 # -> https://github.com/aio-libs/async-timeout/blob/master/CHANGES.rst#500-2024-10-31
diff --git a/requirements/base.txt b/requirements/base.txt
index 240cf7d4eb1..5dc0423c966 100644
--- a/requirements/base.txt
+++ b/requirements/base.txt
@@ -86,8 +86,9 @@ cron-descriptor==1.4.5
     # via apache-superset (pyproject.toml)
 croniter==6.0.0
     # via apache-superset (pyproject.toml)
-cryptography==46.0.5
+cryptography==46.0.7
     # via
+    #   -r requirements/base.in
     #   apache-superset (pyproject.toml)
     #   paramiko
     #   pyopenssl
@@ -120,7 +121,7 @@ flask==2.3.3
     #   flask-session
     #   flask-sqlalchemy
     #   flask-wtf
-flask-appbuilder==5.1.0
+flask-appbuilder==5.2.1
     # via
     #   apache-superset (pyproject.toml)
     #   apache-superset-core
@@ -205,11 +206,12 @@ kombu==5.5.3
     # via celery
 limits==5.1.0
     # via flask-limiter
-mako==1.3.10
+mako==1.3.11
     # via
+    #   -r requirements/base.in
     #   apache-superset (pyproject.toml)
     #   alembic
-markdown==3.8
+markdown==3.8.1
     # via apache-superset (pyproject.toml)
 markdown-it-py==3.0.0
     # via rich
@@ -279,7 +281,7 @@ parsedatetime==2.6
     # via apache-superset (pyproject.toml)
 pgsanity==0.2.9
     # via apache-superset (pyproject.toml)
-pillow==11.3.0
+pillow==12.1.1
     # via apache-superset (pyproject.toml)
 platformdirs==4.3.8
     # via requests-cache
@@ -291,9 +293,11 @@ prison==0.2.1
     # via flask-appbuilder
 prompt-toolkit==3.0.51
     # via click-repl
-pyarrow==16.1.0
-    # via apache-superset (pyproject.toml)
-pyasn1==0.6.2
+pyarrow==20.0.0
+    # via
+    #   -r requirements/base.in
+    #   apache-superset (pyproject.toml)
+pyasn1==0.6.3
     # via
     #   pyasn1-modules
     #   rsa
@@ -309,9 +313,9 @@ pydantic-core==2.33.2
     # via pydantic
 pygeohash==3.2.2
     # via apache-superset (pyproject.toml)
-pygments==2.19.1
+pygments==2.20.0
     # via rich
-pyjwt==2.10.1
+pyjwt==2.12.0
     # via
     #   apache-superset (pyproject.toml)
     #   flask-appbuilder
@@ -319,8 +323,10 @@ pyjwt==2.10.1
     #   redis
 pynacl==1.6.2
     # via paramiko
-pyopenssl==25.3.0
-    # via shillelagh
+pyopenssl==26.0.0
+    # via
+    #   -r requirements/base.in
+    #   shillelagh
 pyparsing==3.2.3
     # via apache-superset (pyproject.toml)
 pysocks==1.7.1
@@ -353,8 +359,9 @@ referencing==0.36.2
     # via
     #   jsonschema
     #   jsonschema-specifications
-requests==2.32.4
+requests==2.33.0
     # via
+    #   -r requirements/base.in
     #   requests-cache
     #   shillelagh
 requests-cache==1.2.1
diff --git a/requirements/development.txt b/requirements/development.txt
index 2b9fffd474b..0cd5411b357 100644
--- a/requirements/development.txt
+++ b/requirements/development.txt
@@ -178,7 +178,7 @@ croniter==6.0.0
     # via
     #   -c requirements/base-constraint.txt
     #   apache-superset
-cryptography==46.0.5
+cryptography==46.0.7
     # via
     #   -c requirements/base-constraint.txt
     #   apache-superset
@@ -259,7 +259,7 @@ flask==2.3.3
     #   flask-sqlalchemy
     #   flask-testing
     #   flask-wtf
-flask-appbuilder==5.1.0
+flask-appbuilder==5.2.1
     # via
     #   -c requirements/base-constraint.txt
     #   apache-superset
@@ -503,12 +503,12 @@ limits==5.1.0
     # via
     #   -c requirements/base-constraint.txt
     #   flask-limiter
-mako==1.3.10
+mako==1.3.11
     # via
     #   -c requirements/base-constraint.txt
     #   alembic
     #   apache-superset
-markdown==3.8
+markdown==3.8.1
     # via
     #   -c requirements/base-constraint.txt
     #   apache-superset
@@ -655,7 +655,7 @@ pgsanity==0.2.9
     # via
     #   -c requirements/base-constraint.txt
     #   apache-superset
-pillow==11.3.0
+pillow==12.1.1
     # via
     #   -c requirements/base-constraint.txt
     #   apache-superset
@@ -710,13 +710,13 @@ psycopg2-binary==2.9.9
     # via apache-superset
 py-key-value-aio==0.4.4
     # via fastmcp
-pyarrow==16.1.0
+pyarrow==20.0.0
     # via
     #   -c requirements/base-constraint.txt
     #   apache-superset
     #   db-dtypes
     #   pandas-gbq
-pyasn1==0.6.2
+pyasn1==0.6.3
     # via
     #   -c requirements/base-constraint.txt
     #   pyasn1-modules
@@ -756,7 +756,7 @@ pygeohash==3.2.2
     # via
     #   -c requirements/base-constraint.txt
     #   apache-superset
-pygments==2.19.1
+pygments==2.20.0
     # via
     #   -c requirements/base-constraint.txt
     #   rich
@@ -764,7 +764,7 @@ pyhive==0.7.0
     # via apache-superset
 pyinstrument==4.4.0
     # via apache-superset
-pyjwt==2.10.1
+pyjwt==2.12.0
     # via
     #   -c requirements/base-constraint.txt
     #   apache-superset
@@ -778,7 +778,7 @@ pynacl==1.6.2
     # via
     #   -c requirements/base-constraint.txt
     #   paramiko
-pyopenssl==25.3.0
+pyopenssl==26.0.0
     # via
     #   -c requirements/base-constraint.txt
     #   shillelagh
@@ -865,7 +865,7 @@ referencing==0.36.2
     #   jsonschema
     #   jsonschema-path
     #   jsonschema-specifications
-requests==2.32.4
+requests==2.33.0
     # via
     #   -c requirements/base-constraint.txt
     #   docker
@@ -992,6 +992,8 @@ starlette==0.49.1
     # via mcp
 statsd==4.0.1
     # via apache-superset
+syntaqlite==0.1.0
+    # via apache-superset
 tabulate==0.9.0
     # via
     #   -c requirements/base-constraint.txt
diff --git a/superset-core/pyproject.toml b/superset-core/pyproject.toml
index 57dfb231ade..1796b694153 100644
--- a/superset-core/pyproject.toml
+++ b/superset-core/pyproject.toml
@@ -18,20 +18,20 @@
 
 [project]
 name = "apache-superset-core"
-version = "0.1.0rc1"
+version = "0.1.0rc2"
 description = "Core Python package for building Apache Superset backend extensions and integrations"
 readme = "README.md"
 authors = [
     { name = "Apache Software Foundation", email = "dev@superset.apache.org" },
 ]
-license = { file="LICENSE.txt" }
+license = "Apache-2.0"
+license-files = ["LICENSE.txt"]
 requires-python = ">=3.10"
 keywords = ["superset", "apache", "analytics", "business-intelligence", "extensions", "visualization"]
 classifiers = [
     "Development Status :: 3 - Alpha",
     "Environment :: Web Environment",
     "Intended Audience :: Developers",
-    "License :: OSI Approved :: Apache Software License",
     "Operating System :: OS Independent",
     "Programming Language :: Python :: 3",
     "Programming Language :: Python :: 3.10",
diff --git a/superset-embedded-sdk/package-lock.json b/superset-embedded-sdk/package-lock.json
index ffdbbeea642..4b34612ff21 100644
--- a/superset-embedded-sdk/package-lock.json
+++ b/superset-embedded-sdk/package-lock.json
@@ -7025,9 +7025,9 @@
       "dev": true
     },
     "node_modules/picomatch": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
-      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.2.tgz",
+      "integrity": "sha512-V7+vQEJ06Z+c5tSye8S+nHUfI51xoXIXjHQ99cQtKUkQqqO1kO/KCJUfZXuB47h/YBlDhah2H3hdUGXn8ie0oA==",
       "dev": true,
       "engines": {
         "node": ">=8.6"
@@ -7121,15 +7121,6 @@
         }
       ]
     },
-    "node_modules/randombytes": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
-      "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
-      "dev": true,
-      "dependencies": {
-        "safe-buffer": "^5.1.0"
-      }
-    },
     "node_modules/react-is": {
       "version": "18.3.1",
       "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.3.1.tgz",
@@ -7306,26 +7297,6 @@
         "node": ">=10"
       }
     },
-    "node_modules/safe-buffer": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ]
-    },
     "node_modules/schema-utils": {
       "version": "4.3.3",
       "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.3.3.tgz",
@@ -7355,15 +7326,6 @@
         "semver": "bin/semver.js"
       }
     },
-    "node_modules/serialize-javascript": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.2.tgz",
-      "integrity": "sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==",
-      "dev": true,
-      "dependencies": {
-        "randombytes": "^2.1.0"
-      }
-    },
     "node_modules/shallow-clone": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz",
@@ -7590,15 +7552,14 @@
       }
     },
     "node_modules/terser-webpack-plugin": {
-      "version": "5.3.16",
-      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.16.tgz",
-      "integrity": "sha512-h9oBFCWrq78NyWWVcSwZarJkZ01c2AyGrzs1crmHZO3QUg9D61Wu4NPjBy69n7JqylFF5y+CsUZYmYEIZ3mR+Q==",
+      "version": "5.4.0",
+      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.4.0.tgz",
+      "integrity": "sha512-Bn5vxm48flOIfkdl5CaD2+1CiUVbonWQ3KQPyP7/EuIl9Gbzq/gQFOzaMFUEgVjB1396tcK0SG8XcNJ/2kDH8g==",
       "dev": true,
       "dependencies": {
         "@jridgewell/trace-mapping": "^0.3.25",
         "jest-worker": "^27.4.5",
         "schema-utils": "^4.3.0",
-        "serialize-javascript": "^6.0.2",
         "terser": "^5.31.1"
       },
       "engines": {
@@ -13159,9 +13120,9 @@
       "dev": true
     },
     "picomatch": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
-      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.2.tgz",
+      "integrity": "sha512-V7+vQEJ06Z+c5tSye8S+nHUfI51xoXIXjHQ99cQtKUkQqqO1kO/KCJUfZXuB47h/YBlDhah2H3hdUGXn8ie0oA==",
       "dev": true
     },
     "pify": {
@@ -13220,15 +13181,6 @@
       "integrity": "sha512-bVWawvoZoBYpp6yIoQtQXHZjmz35RSVHnUOTefl8Vcjr8snTPY1wnpSPMWekcFwbxI6gtmT7rSYPFvz71ldiOA==",
       "dev": true
     },
-    "randombytes": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
-      "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
-      "dev": true,
-      "requires": {
-        "safe-buffer": "^5.1.0"
-      }
-    },
     "react-is": {
       "version": "18.3.1",
       "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.3.1.tgz",
@@ -13359,12 +13311,6 @@
       "integrity": "sha512-X2UW6Nw3n/aMgDVy+0rSqgHlv39WZAlZrXCdnbyEiKm17DSqHX4MmQMaST3FbeWR5FTuRcUwYAziZajji0Y7mg==",
       "dev": true
     },
-    "safe-buffer": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
-      "dev": true
-    },
     "schema-utils": {
       "version": "4.3.3",
       "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.3.3.tgz",
@@ -13383,15 +13329,6 @@
       "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
       "dev": true
     },
-    "serialize-javascript": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.2.tgz",
-      "integrity": "sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==",
-      "dev": true,
-      "requires": {
-        "randombytes": "^2.1.0"
-      }
-    },
     "shallow-clone": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz",
@@ -13563,15 +13500,14 @@
       }
     },
     "terser-webpack-plugin": {
-      "version": "5.3.16",
-      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.16.tgz",
-      "integrity": "sha512-h9oBFCWrq78NyWWVcSwZarJkZ01c2AyGrzs1crmHZO3QUg9D61Wu4NPjBy69n7JqylFF5y+CsUZYmYEIZ3mR+Q==",
+      "version": "5.4.0",
+      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.4.0.tgz",
+      "integrity": "sha512-Bn5vxm48flOIfkdl5CaD2+1CiUVbonWQ3KQPyP7/EuIl9Gbzq/gQFOzaMFUEgVjB1396tcK0SG8XcNJ/2kDH8g==",
       "dev": true,
       "requires": {
         "@jridgewell/trace-mapping": "^0.3.25",
         "jest-worker": "^27.4.5",
         "schema-utils": "^4.3.0",
-        "serialize-javascript": "^6.0.2",
         "terser": "^5.31.1"
       }
     },
diff --git a/superset-extensions-cli/pyproject.toml b/superset-extensions-cli/pyproject.toml
index 8f853a86e36..55261c841ab 100644
--- a/superset-extensions-cli/pyproject.toml
+++ b/superset-extensions-cli/pyproject.toml
@@ -23,14 +23,14 @@ readme = "README.md"
 authors = [
     { name = "Apache Software Foundation", email = "dev@superset.apache.org" },
 ]
-license = { file="LICENSE.txt" }
+license = "Apache-2.0"
+license-files = ["LICENSE.txt"]
 requires-python = ">=3.10"
 keywords = ["superset", "apache", "cli", "extensions", "analytics", "business-intelligence", "development-tools"]
 classifiers = [
     "Development Status :: 3 - Alpha",
     "Environment :: Console",
     "Intended Audience :: Developers",
-    "License :: OSI Approved :: Apache Software License",
     "Operating System :: OS Independent",
     "Programming Language :: Python :: 3",
     "Programming Language :: Python :: 3.10",
diff --git a/superset-extensions-cli/src/superset_extensions_cli/cli.py b/superset-extensions-cli/src/superset_extensions_cli/cli.py
index feab2ab5d8a..730420f3535 100644
--- a/superset-extensions-cli/src/superset_extensions_cli/cli.py
+++ b/superset-extensions-cli/src/superset_extensions_cli/cli.py
@@ -585,9 +585,9 @@ def bundle(ctx: click.Context, output: Path | None) -> None:
         sys.exit(1)
 
     manifest = json.loads(manifest_path.read_text())
-    id_ = manifest["id"]
+    name = manifest["name"]
     version = manifest["version"]
-    default_filename = f"{id_}-{version}.supx"
+    default_filename = f"{name}-{version}.supx"
 
     if output is None:
         zip_path = Path(default_filename)
@@ -824,7 +824,7 @@ def init(
         else click.confirm("Include backend?", default=True)
     )
 
-    target_dir = Path.cwd() / names["id"]
+    target_dir = Path.cwd() / names["name"]
     if target_dir.exists():
         click.secho(f"❌ Directory {target_dir} already exists.", fg="red")
         sys.exit(1)
diff --git a/superset-extensions-cli/tests/test_cli_bundle.py b/superset-extensions-cli/tests/test_cli_bundle.py
index 29ec4355009..b4dbacd518c 100644
--- a/superset-extensions-cli/tests/test_cli_bundle.py
+++ b/superset-extensions-cli/tests/test_cli_bundle.py
@@ -43,10 +43,10 @@ def test_bundle_command_creates_zip_with_default_name(
     result = cli_runner.invoke(app, ["bundle"])
 
     assert result.exit_code == 0
-    assert "✅ Bundle created: test-org.test-extension-1.0.0.supx" in result.output
+    assert "✅ Bundle created: test-extension-1.0.0.supx" in result.output
 
     # Verify zip file was created
-    zip_path = isolated_filesystem / "test-org.test-extension-1.0.0.supx"
+    zip_path = isolated_filesystem / "test-extension-1.0.0.supx"
     assert_file_exists(zip_path)
 
     # Verify zip contents
@@ -100,7 +100,7 @@ def test_bundle_command_with_output_directory(
     assert result.exit_code == 0
 
     # Verify zip file was created in output directory
-    expected_path = output_dir / "test-org.test-extension-1.0.0.supx"
+    expected_path = output_dir / "test-extension-1.0.0.supx"
     assert_file_exists(expected_path)
     assert f"✅ Bundle created: {expected_path}" in result.output
 
@@ -193,7 +193,7 @@ def test_bundle_includes_all_files_recursively(
     assert result.exit_code == 0
 
     # Verify zip file and contents
-    zip_path = isolated_filesystem / "complex-org.complex-extension-2.1.0.supx"
+    zip_path = isolated_filesystem / "complex-extension-2.1.0.supx"
     assert_file_exists(zip_path)
 
     with zipfile.ZipFile(zip_path, "r") as zipf:
diff --git a/superset-extensions-cli/tests/test_cli_init.py b/superset-extensions-cli/tests/test_cli_init.py
index 5a03a48f917..4f2b585c67b 100644
--- a/superset-extensions-cli/tests/test_cli_init.py
+++ b/superset-extensions-cli/tests/test_cli_init.py
@@ -48,12 +48,12 @@ def test_init_creates_extension_with_both_frontend_and_backend(
     )
 
     # Verify directory structure
-    extension_path = isolated_filesystem / "test-org.test-extension"
+    extension_path = isolated_filesystem / "test-extension"
     assert_directory_exists(extension_path, "main extension directory")
 
     expected_structure = create_test_extension_structure(
         isolated_filesystem,
-        "test-org.test-extension",
+        "test-extension",
         include_frontend=True,
         include_backend=True,
     )
@@ -74,7 +74,7 @@ def test_init_creates_extension_with_frontend_only(
 
     assert result.exit_code == 0, f"Command failed with output: {result.output}"
 
-    extension_path = isolated_filesystem / "test-org.test-extension"
+    extension_path = isolated_filesystem / "test-extension"
     assert_directory_exists(extension_path)
 
     # Should have frontend directory and package.json
@@ -97,7 +97,7 @@ def test_init_creates_extension_with_backend_only(
 
     assert result.exit_code == 0, f"Command failed with output: {result.output}"
 
-    extension_path = isolated_filesystem / "test-org.test-extension"
+    extension_path = isolated_filesystem / "test-extension"
     assert_directory_exists(extension_path)
 
     # Should have backend directory and pyproject.toml
@@ -120,7 +120,7 @@ def test_init_creates_extension_with_neither_frontend_nor_backend(
 
     assert result.exit_code == 0, f"Command failed with output: {result.output}"
 
-    extension_path = isolated_filesystem / "test-org.test-extension"
+    extension_path = isolated_filesystem / "test-extension"
     assert_directory_exists(extension_path)
 
     # Should only have extension.json
@@ -138,8 +138,8 @@ def test_init_accepts_valid_display_name(cli_runner, isolated_filesystem):
     result = cli_runner.invoke(app, ["init"], input=cli_input)
 
     assert result.exit_code == 0, f"Should accept display name: {result.output}"
-    assert Path("test-org.my-awesome-extension").exists(), (
-        "Directory for generated composite ID should be created"
+    assert Path("my-awesome-extension").exists(), (
+        "Directory with extension name should be created"
     )
 
 
@@ -152,23 +152,21 @@ def test_init_accepts_mixed_alphanumeric_name(cli_runner, isolated_filesystem):
     assert result.exit_code == 0, (
         f"Mixed alphanumeric display name should be valid: {result.output}"
     )
-    assert Path("test-org.tool-123").exists(), (
-        "Directory for 'test-org.tool-123' should be created"
-    )
+    assert Path("tool-123").exists(), "Directory for 'tool-123' should be created"
 
 
 @pytest.mark.cli
 @pytest.mark.parametrize(
-    "display_name,expected_id",
+    "display_name,expected_dir",
     [
-        ("Test Extension", "test-org.test-extension"),
-        ("My Tool v2", "test-org.my-tool-v2"),
-        ("Dashboard Helper", "test-org.dashboard-helper"),
-        ("Chart Builder Pro", "test-org.chart-builder-pro"),
+        ("Test Extension", "test-extension"),
+        ("My Tool v2", "my-tool-v2"),
+        ("Dashboard Helper", "dashboard-helper"),
+        ("Chart Builder Pro", "chart-builder-pro"),
     ],
 )
-def test_init_with_various_display_names(cli_runner, display_name, expected_id):
-    """Test that init accepts various display names and generates proper IDs."""
+def test_init_with_various_display_names(cli_runner, display_name, expected_dir):
+    """Test that init accepts various display names and creates directory named after extension."""
     with cli_runner.isolated_filesystem():
         cli_input = f"{display_name}\n\ntest-org\n0.1.0\nApache-2.0\ny\ny\n"
         result = cli_runner.invoke(app, ["init"], input=cli_input)
@@ -176,8 +174,8 @@ def test_init_with_various_display_names(cli_runner, display_name, expected_id):
         assert result.exit_code == 0, (
             f"Valid display name '{display_name}' was rejected: {result.output}"
         )
-        assert Path(expected_id).exists(), (
-            f"Directory for '{expected_id}' was not created"
+        assert Path(expected_dir).exists(), (
+            f"Directory '{expected_dir}' was not created"
         )
 
 
@@ -187,7 +185,7 @@ def test_init_fails_when_directory_already_exists(
 ):
     """Test that init fails gracefully when target directory already exists."""
     # Create the directory first
-    existing_dir = isolated_filesystem / "test-org.test-extension"
+    existing_dir = isolated_filesystem / "test-extension"
     existing_dir.mkdir()
 
     result = cli_runner.invoke(app, ["init"], input=cli_input_both)
@@ -204,7 +202,7 @@ def test_extension_json_content_is_correct(
     result = cli_runner.invoke(app, ["init"], input=cli_input_both)
     assert result.exit_code == 0
 
-    extension_path = isolated_filesystem / "test-org.test-extension"
+    extension_path = isolated_filesystem / "test-extension"
     extension_json_path = extension_path / "extension.json"
 
     # Verify the JSON structure and values
@@ -238,7 +236,7 @@ def test_frontend_package_json_content_is_correct(
     result = cli_runner.invoke(app, ["init"], input=cli_input_both)
     assert result.exit_code == 0
 
-    extension_path = isolated_filesystem / "test-org.test-extension"
+    extension_path = isolated_filesystem / "test-extension"
     package_json_path = extension_path / "frontend" / "package.json"
 
     # Verify the package.json structure and values
@@ -267,7 +265,7 @@ def test_backend_pyproject_toml_is_created(
     result = cli_runner.invoke(app, ["init"], input=cli_input_both)
     assert result.exit_code == 0
 
-    extension_path = isolated_filesystem / "test-org.test-extension"
+    extension_path = isolated_filesystem / "test-extension"
     pyproject_path = extension_path / "backend" / "pyproject.toml"
 
     assert_file_exists(pyproject_path, "backend pyproject.toml")
@@ -305,7 +303,7 @@ def test_gitignore_content_is_correct(cli_runner, isolated_filesystem, cli_input
     result = cli_runner.invoke(app, ["init"], input=cli_input_both)
     assert result.exit_code == 0
 
-    extension_path = isolated_filesystem / "test-org.test-extension"
+    extension_path = isolated_filesystem / "test-extension"
     gitignore_path = extension_path / ".gitignore"
 
     assert_file_exists(gitignore_path, ".gitignore")
@@ -330,7 +328,7 @@ def test_init_with_custom_version_and_license(cli_runner, isolated_filesystem):
 
     assert result.exit_code == 0
 
-    extension_path = isolated_filesystem / "test-org.my-extension"
+    extension_path = isolated_filesystem / "my-extension"
     extension_json_path = extension_path / "extension.json"
 
     assert_json_content(
@@ -357,10 +355,10 @@ def test_full_init_workflow_integration(cli_runner, isolated_filesystem):
     assert result.exit_code == 0
 
     # Verify complete directory structure
-    extension_path = isolated_filesystem / "awesome-org.awesome-charts"
+    extension_path = isolated_filesystem / "awesome-charts"
     expected_structure = create_test_extension_structure(
         isolated_filesystem,
-        "awesome-org.awesome-charts",
+        "awesome-charts",
         include_frontend=True,
         include_backend=True,
     )
@@ -412,7 +410,7 @@ def test_init_non_interactive_with_all_options(cli_runner, isolated_filesystem):
     assert result.exit_code == 0, f"Command failed with output: {result.output}"
     assert "🎉 Extension My Extension (ID: my-org.my-ext) initialized" in result.output
 
-    extension_path = isolated_filesystem / "my-org.my-ext"
+    extension_path = isolated_filesystem / "my-ext"
     assert_directory_exists(extension_path)
     assert_directory_exists(extension_path / "frontend")
     assert_directory_exists(extension_path / "backend")
@@ -449,7 +447,7 @@ def test_init_frontend_only_with_cli_options(cli_runner, isolated_filesystem):
 
     assert result.exit_code == 0, f"Command failed with output: {result.output}"
 
-    extension_path = isolated_filesystem / "frontend-org.frontend-ext"
+    extension_path = isolated_filesystem / "frontend-ext"
     assert_directory_exists(extension_path / "frontend")
     assert not (extension_path / "backend").exists()
 
@@ -478,7 +476,7 @@ def test_init_backend_only_with_cli_options(cli_runner, isolated_filesystem):
 
     assert result.exit_code == 0, f"Command failed with output: {result.output}"
 
-    extension_path = isolated_filesystem / "backend-org.backend-ext"
+    extension_path = isolated_filesystem / "backend-ext"
     assert not (extension_path / "frontend").exists()
     assert_directory_exists(extension_path / "backend")
 
@@ -505,7 +503,7 @@ def test_init_prompts_for_missing_options(cli_runner, isolated_filesystem):
 
     assert result.exit_code == 0, f"Command failed with output: {result.output}"
 
-    extension_path = isolated_filesystem / "default-org.default-ext"
+    extension_path = isolated_filesystem / "default-ext"
     extension_json = load_json_file(extension_path / "extension.json")
     assert extension_json["version"] == "0.1.0"
     assert extension_json["license"] == "Apache-2.0"
diff --git a/superset-frontend/.eslintrc.js b/superset-frontend/.eslintrc.js
index db01c79e74e..fcca8cbf5ae 100644
--- a/superset-frontend/.eslintrc.js
+++ b/superset-frontend/.eslintrc.js
@@ -127,7 +127,6 @@ module.exports = {
   },
   plugins: [
     'import',
-    'file-progress',
     'lodash',
     'theme-colors',
     'icons',
diff --git a/superset-frontend/cypress-base/cypress/e2e/chart_list/list.test.ts b/superset-frontend/cypress-base/cypress/e2e/chart_list/list.test.ts
deleted file mode 100644
index 9f507bca4ab..00000000000
--- a/superset-frontend/cypress-base/cypress/e2e/chart_list/list.test.ts
+++ /dev/null
@@ -1,171 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-import { CHART_LIST } from 'cypress/utils/urls';
-import { setGridMode, toggleBulkSelect } from 'cypress/utils';
-import {
-  setFilter,
-  interceptBulkDelete,
-  interceptUpdate,
-  interceptDelete,
-  interceptFiltering,
-  interceptFavoriteStatus,
-} from '../explore/utils';
-
-function orderAlphabetical() {
-  setFilter('Sort', 'Alphabetical');
-}
-
-function openProperties() {
-  cy.get('[aria-label="more"]').eq(0).click();
-  cy.getBySel('chart-list-edit-option').click();
-}
-
-function openMenu() {
-  cy.get('[aria-label="more"]').eq(0).click();
-}
-
-function confirmDelete() {
-  cy.getBySel('delete-modal-input').type('DELETE');
-  cy.getBySel('modal-confirm-button').click();
-}
-
-function visitChartList() {
-  interceptFiltering();
-  interceptFavoriteStatus();
-  cy.visit(CHART_LIST);
-  cy.wait('@filtering');
-  cy.wait('@favoriteStatus');
-}
-
-describe('Charts list', () => {
-  describe('common actions', () => {
-    beforeEach(() => {
-      visitChartList();
-    });
-
-    it('should bulk delete correctly', () => {
-      cy.createSampleCharts([0, 1, 2, 3]);
-
-      interceptBulkDelete();
-      toggleBulkSelect();
-
-      // bulk deletes in card-view
-      setGridMode('card');
-      orderAlphabetical();
-
-      cy.getBySel('skeleton-card').should('not.exist');
-      cy.getBySel('styled-card').contains('1 - Sample chart').click();
-      cy.getBySel('styled-card').contains('2 - Sample chart').click();
-      cy.getBySel('bulk-select-action').contains('Delete').click();
-      confirmDelete();
-      cy.wait('@bulkDelete');
-      cy.getBySel('styled-card')
-        .eq(1)
-        .should('not.contain', '1 - Sample chart');
-      cy.getBySel('styled-card')
-        .eq(2)
-        .should('not.contain', '2 - Sample chart');
-
-      // bulk deletes in list-view
-      setGridMode('list');
-      cy.get('.loading').should('not.exist');
-      cy.getBySel('table-row').contains('3 - Sample chart').should('exist');
-      cy.getBySel('table-row').contains('4 - Sample chart').should('exist');
-      cy.get('[data-test="table-row"] input[type="checkbox"]').eq(0).click();
-      cy.get('[data-test="table-row"] input[type="checkbox"]').eq(1).click();
-      cy.getBySel('bulk-select-action').eq(0).contains('Delete').click();
-      confirmDelete();
-      cy.wait('@bulkDelete');
-      cy.get('.loading').should('exist');
-      cy.get('.loading').should('not.exist');
-      cy.getBySel('table-row').eq(0).should('not.contain', '3 - Sample chart');
-      cy.getBySel('table-row').eq(1).should('not.contain', '4 - Sample chart');
-    });
-
-    it('should delete correctly in card mode', () => {
-      cy.createSampleCharts([0, 1]);
-      interceptDelete();
-
-      // deletes in card-view
-      setGridMode('card');
-      orderAlphabetical();
-
-      cy.getBySel('styled-card').contains('1 - Sample chart');
-      openMenu();
-      cy.getBySel('chart-list-delete-option').click();
-      confirmDelete();
-      cy.wait('@delete');
-      cy.getBySel('styled-card')
-        .contains('1 - Sample chart')
-        .should('not.exist');
-    });
-
-    it('should delete correctly in list mode', () => {
-      cy.createSampleCharts([2, 3]);
-      interceptDelete();
-      cy.getBySel('sort-header').contains('Name').click();
-
-      // Modal closes immediately without this
-      cy.wait(2000);
-
-      cy.getBySel('table-row').eq(0).contains('3 - Sample chart');
-      cy.getBySel('delete').eq(0).click();
-      confirmDelete();
-      cy.wait('@delete');
-      cy.get('.loading').should('exist');
-      cy.get('.loading').should('not.exist');
-      cy.getBySel('table-row').eq(0).should('not.contain', '3 - Sample chart');
-    });
-
-    it('should edit correctly', () => {
-      cy.createSampleCharts([0]);
-      interceptUpdate();
-
-      // edits in card-view
-      setGridMode('card');
-      orderAlphabetical();
-      cy.getBySel('skeleton-card').should('not.exist');
-      cy.getBySel('styled-card').eq(0).contains('1 - Sample chart');
-
-      // change title
-      openProperties();
-      cy.getBySel('properties-modal-name-input').type(' | EDITED');
-      cy.get('button:contains("Save")').click();
-      cy.wait('@update');
-      cy.getBySel('styled-card').eq(0).contains('1 - Sample chart | EDITED');
-
-      // edits in list-view
-      setGridMode('list');
-      // Wait for list view to fully render after mode change
-      cy.get('.loading').should('not.exist');
-      cy.getBySel('table-row').should('be.visible');
-      // Target the specific row by chart title to avoid flakiness from row ordering
-      cy.getBySel('table-row')
-        .contains('1 - Sample chart | EDITED')
-        .parents('[data-test="table-row"]')
-        .find('[data-test="edit-alt"]')
-        .click();
-      cy.getBySel('properties-modal-name-input').clear();
-      cy.getBySel('properties-modal-name-input').type('1 - Sample chart');
-      cy.get('button:contains("Save")').click();
-      cy.wait('@update');
-      cy.getBySel('table-row').contains('1 - Sample chart').should('exist');
-    });
-  });
-});
diff --git a/superset-frontend/cypress-base/cypress/e2e/dataset/dataset_list.test.ts b/superset-frontend/cypress-base/cypress/e2e/dataset/dataset_list.test.ts
deleted file mode 100644
index 6bf0419cdda..00000000000
--- a/superset-frontend/cypress-base/cypress/e2e/dataset/dataset_list.test.ts
+++ /dev/null
@@ -1,42 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import { DATASET_LIST_PATH } from 'cypress/utils/urls';
-
-describe('Dataset list', () => {
-  before(() => {
-    cy.visit(DATASET_LIST_PATH);
-  });
-
-  xit('should open Explore on dataset name click', () => {
-    cy.intercept('**/api/v1/explore/**').as('explore');
-    cy.get('[data-test="listview-table"] [data-test="internal-link"]')
-      .contains('birth_names')
-      .click();
-    cy.wait('@explore');
-    cy.get('[data-test="datasource-control"] .title-select').contains(
-      'birth_names',
-    );
-    cy.get('.metric-option-label').first().contains('COUNT(*)');
-    cy.get('.column-option-label').first().contains('ds');
-    cy.get('[data-test="fast-viz-switcher"] > div:not([role="button"]')
-      .contains('Table')
-      .should('be.visible');
-  });
-});
diff --git a/superset-frontend/cypress-base/cypress/e2e/explore/utils.ts b/superset-frontend/cypress-base/cypress/e2e/explore/utils.ts
index 93dbe99baa2..5a4df482ec0 100644
--- a/superset-frontend/cypress-base/cypress/e2e/explore/utils.ts
+++ b/superset-frontend/cypress-base/cypress/e2e/explore/utils.ts
@@ -23,18 +23,6 @@ export function interceptFiltering() {
   cy.intercept('GET', `**/api/v1/chart/?q=*`).as('filtering');
 }
 
-export function interceptBulkDelete() {
-  cy.intercept('DELETE', `**/api/v1/chart/?q=*`).as('bulkDelete');
-}
-
-export function interceptDelete() {
-  cy.intercept('DELETE', `**/api/v1/chart/*`).as('delete');
-}
-
-export function interceptFavoriteStatus() {
-  cy.intercept('GET', '**/api/v1/chart/favorite_status/*').as('favoriteStatus');
-}
-
 export function interceptUpdate() {
   cy.intercept('PUT', `**/api/v1/chart/*`).as('update');
 }
@@ -43,32 +31,13 @@ export const interceptV1ChartData = (alias = 'v1Data') => {
   cy.intercept('**/api/v1/chart/data*').as(alias);
 };
 
-export function interceptExploreJson(alias = 'getJson') {
-  cy.intercept('POST', `**/superset/explore_json/**`).as(alias);
-}
-
-export const interceptFormDataKey = () => {
-  cy.intercept('POST', '**/api/v1/explore/form_data').as('formDataKey');
-};
-
-export function interceptExploreGet() {
+function interceptExploreGet() {
   cy.intercept({
     method: 'GET',
     url: /.*\/api\/v1\/explore\/\?(form_data_key|dashboard_page_id|slice_id)=.*/,
   }).as('getExplore');
 }
 
-export function setFilter(filter: string, option: string) {
-  interceptFiltering();
-
-  cy.get(`[aria-label^="${filter}"]`).first().click();
-  cy.get(`.ant-select-item-option[title="${option}"]`).first().click({
-    force: true,
-  });
-
-  cy.wait('@filtering');
-}
-
 export function saveChartToDashboard(chartName: string, dashboardName: string) {
   interceptDashboardGet();
   interceptUpdate();
diff --git a/superset-frontend/cypress-base/cypress/e2e/sqllab/_skip.sourcePanel.index.test.js b/superset-frontend/cypress-base/cypress/e2e/sqllab/_skip.sourcePanel.index.test.js
deleted file mode 100644
index 4b24c844364..00000000000
--- a/superset-frontend/cypress-base/cypress/e2e/sqllab/_skip.sourcePanel.index.test.js
+++ /dev/null
@@ -1,73 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-import { selectResultsTab } from './sqllab.helper';
-
-describe.skip('SqlLab datasource panel', () => {
-  beforeEach(() => {
-    cy.visit('/sqllab');
-  });
-
-  // TODO the test below is flaky, and has been disabled for the time being
-  // (notice the `it.skip`)
-  it('creates a table preview when a database, schema, and table are selected', () => {
-    cy.intercept('**/superset/table/**').as('tableMetadata');
-
-    // it should have dropdowns to select database, schema, and table
-    cy.get('.sql-toolbar .Select').should('have.length', 3);
-
-    cy.get('.sql-toolbar .table-schema').should('not.exist');
-    cy.get('[data-test="filterable-table-container"]').should('not.exist');
-
-    cy.get('.sql-toolbar .Select')
-      .eq(0) // database select
-      .within(() => {
-        // note: we have to set force: true because the input is invisible / cypress throws
-        cy.get('input').type('main{enter}', { force: true });
-      });
-
-    cy.get('.sql-toolbar .Select')
-      .eq(1) // schema select
-      .within(() => {
-        cy.get('input').type('main{enter}', { force: true });
-      });
-
-    cy.get('.sql-toolbar .Select')
-      .eq(2) // table select
-      .within(() => {
-        cy.get('input').type('birth_names{enter}', { force: true });
-      });
-
-    cy.wait('@tableMetadata');
-
-    cy.get('.sql-toolbar .table-schema').should('have.length', 1);
-    selectResultsTab().should('have.length', 1);
-
-    // add another table and check for added schema + preview
-    cy.get('.sql-toolbar .Select')
-      .eq(2)
-      .within(() => {
-        cy.get('input').type('logs{enter}', { force: true });
-      });
-
-    cy.wait('@tableMetadata');
-
-    cy.get('.sql-toolbar .table-schema').should('have.length', 2);
-    selectResultsTab().should('have.length', 2);
-  });
-});
diff --git a/superset-frontend/cypress-base/cypress/e2e/sqllab/query.test.ts b/superset-frontend/cypress-base/cypress/e2e/sqllab/query.test.ts
deleted file mode 100644
index 389698dcb8d..00000000000
--- a/superset-frontend/cypress-base/cypress/e2e/sqllab/query.test.ts
+++ /dev/null
@@ -1,192 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-import { nanoid } from 'nanoid';
-import { selectResultsTab, assertSQLLabResultsAreEqual } from './sqllab.helper';
-
-function parseClockStr(node: JQuery) {
-  return Number.parseFloat(node.text().replace(/:/g, ''));
-}
-
-describe('SqlLab query panel', () => {
-  beforeEach(() => {
-    cy.visit('/sqllab');
-  });
-
-  it.skip('supports entering and running a query', () => {
-    // row limit has to be < ~10 for us to be able to determine how many rows
-    // are fetched below (because React _Virtualized_ does not render all rows)
-    let clockTime = 0;
-
-    cy.intercept({
-      method: 'POST',
-      url: '**/api/v1/sqllab/execute/',
-    }).as('mockSQLResponse');
-
-    cy.get('.TableSelector .Select:eq(0)').click();
-    cy.get('.TableSelector .Select:eq(0) input[type=text]').focus();
-    cy.focused().type('{enter}');
-
-    cy.get('#brace-editor textarea').focus();
-    cy.focused().clear();
-    cy.focused().type(`{selectall}{backspace}SELECT 1`);
-
-    cy.get('#js-sql-toolbar button:eq(0)').eq(0).click();
-
-    // wait for 300 milliseconds
-    cy.wait(300);
-
-    // started timer
-    cy.get('.sql-toolbar .label-success').then(node => {
-      clockTime = parseClockStr(node);
-      // should be longer than 0.2s
-      expect(clockTime).greaterThan(0.2);
-    });
-
-    cy.wait('@mockSQLResponse');
-
-    // timer is increasing
-    cy.get('.sql-toolbar .label-success').then(node => {
-      const newClockTime = parseClockStr(node);
-      expect(newClockTime).greaterThan(0.9);
-      clockTime = newClockTime;
-    });
-
-    // rerun the query
-    cy.get('#js-sql-toolbar button:eq(0)').eq(0).click();
-
-    // should restart the timer
-    cy.get('.sql-toolbar .label-success').contains('00:00:00');
-    cy.wait('@mockSQLResponse');
-    cy.get('.sql-toolbar .label-success').then(node => {
-      expect(parseClockStr(node)).greaterThan(0.9);
-    });
-  });
-
-  it.skip('successfully saves a query', () => {
-    cy.intercept('**/api/v1/database/**/tables/**').as('getTables');
-
-    const query =
-      'SELECT ds, gender, name, num FROM main.birth_names ORDER BY name LIMIT 3';
-    const savedQueryTitle = `CYPRESS TEST QUERY ${nanoid()}`;
-
-    // we will assert that the results of the query we save, and the saved query are the same
-    let initialResultsTable: HTMLElement | null = null;
-    let savedQueryResultsTable = null;
-
-    cy.get('#brace-editor textarea').clear({ force: true });
-    cy.get('#brace-editor textarea').type(`{selectall}{backspace}${query}`, {
-      force: true,
-    });
-    cy.get('#brace-editor textarea').focus(); // focus => blur is required for updating the query that is to be saved
-    cy.focused().blur();
-
-    // ctrl + r also runs query
-    cy.get('#brace-editor textarea').type('{ctrl}r', { force: true });
-
-    cy.wait('@sqlLabQuery');
-
-    // Save results to check against below
-    selectResultsTab().then(resultsA => {
-      initialResultsTable = resultsA[0];
-    });
-
-    cy.get('#js-sql-toolbar button')
-      .eq(1) // save query
-      .click();
-
-    // Enter name + save into modal
-    cy.get('.modal-sm input').clear({ force: true });
-    cy.get('.modal-sm input').type(`{selectall}{backspace}${savedQueryTitle}`, {
-      force: true,
-    });
-
-    cy.get('.modal-sm .modal-body button')
-      .eq(0) // save
-      .click();
-
-    // first row contains most recent link, follow back to SqlLab
-    cy.get('table tr:first-child a[href*="savedQueryId"').click();
-
-    // will timeout without explicitly waiting here
-    cy.wait(['@getSavedQuery', '@getTables']);
-
-    // run the saved query
-    cy.get('#js-sql-toolbar button')
-      .eq(0) // run query
-      .click();
-
-    cy.wait('@sqlLabQuery');
-
-    // assert the results of the saved query match the initial results
-    selectResultsTab().then(resultsB => {
-      savedQueryResultsTable = resultsB[0];
-
-      assertSQLLabResultsAreEqual(initialResultsTable, savedQueryResultsTable);
-    });
-  });
-
-  it.skip('Create a chart from a query', () => {
-    cy.intercept('**/api/v1/sqllab/execute/').as('queryFinished');
-    cy.intercept('**/api/v1/explore/**').as('explore');
-    cy.intercept('**/api/v1/chart/**').as('chart');
-    cy.intercept('**/tabstateview/**').as('tabstateview');
-
-    // cypress doesn't handle opening a new tab, override window.open to open in the same tab
-    cy.window().then(win => {
-      cy.stub(win, 'open', url => {
-        // eslint-disable-next-line no-param-reassign
-        win.location.href = url;
-      });
-    });
-    cy.wait('@tabstateview');
-
-    const query = 'SELECT gender, name FROM birth_names';
-
-    cy.get('.ace_text-input').focus();
-    cy.focused().clear({ force: true });
-    cy.focused().type(`{selectall}{backspace}${query}`, { force: true });
-    cy.get('.sql-toolbar button').contains('Run').click();
-    cy.wait('@queryFinished');
-
-    cy.get(
-      '.SouthPane .ant-tabs-content > .ant-tabs-tabpane-active > div button:first',
-      { timeout: 10000 },
-    ).click();
-
-    cy.wait('@explore');
-    cy.get('[data-test="datasource-control"] .title-select').contains(query);
-    cy.get('.column-option-label').first().contains('gender');
-    cy.get('.column-option-label').last().contains('name');
-
-    cy.get(
-      '[data-test="all_columns"] [data-test="dnd-labels-container"] > div:first-child',
-    ).contains('gender');
-    cy.get(
-      '[data-test="all_columns"] [data-test="dnd-labels-container"] > div:nth-child(2)',
-    ).contains('name');
-
-    cy.wait('@chart');
-    cy.get('[data-test="slice-container"] table > thead th')
-      .first()
-      .contains('gender');
-    cy.get('[data-test="slice-container"] table > thead th')
-      .last()
-      .contains('name');
-  });
-});
diff --git a/superset-frontend/cypress-base/cypress/e2e/sqllab/sqllab.helper.js b/superset-frontend/cypress-base/cypress/e2e/sqllab/sqllab.helper.js
deleted file mode 100644
index 45f298205d3..00000000000
--- a/superset-frontend/cypress-base/cypress/e2e/sqllab/sqllab.helper.js
+++ /dev/null
@@ -1,41 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-export const selectResultsTab = () =>
-  cy.get('.SouthPane .ReactVirtualized__Table', { timeout: 10000 });
-
-// this function asserts that the result set for two SQL lab table results are equal
-export const assertSQLLabResultsAreEqual = (resultsA, resultsB) => {
-  const [headerA, bodyWrapperA] = resultsA.childNodes;
-  const bodyA = bodyWrapperA.childNodes[0];
-
-  const [headerB, bodyWrapperB] = resultsB.childNodes;
-  const bodyB = bodyWrapperB.childNodes[0];
-
-  expect(headerA.childNodes.length).to.equal(headerB.childNodes.length);
-  expect(bodyA.childNodes.length).to.equal(bodyB.childNodes.length);
-
-  bodyA.childNodes.forEach((rowA, rowIndex) => {
-    const rowB = bodyB.childNodes[rowIndex];
-
-    rowA.childNodes.forEach((cellA, columnIndex) => {
-      const cellB = rowB.childNodes[columnIndex];
-      expect(cellA.innerText).to.equal(cellB.innerText);
-    });
-  });
-};
diff --git a/superset-frontend/cypress-base/cypress/e2e/sqllab/tabs.test.ts b/superset-frontend/cypress-base/cypress/e2e/sqllab/tabs.test.ts
deleted file mode 100644
index 8ca480aab6d..00000000000
--- a/superset-frontend/cypress-base/cypress/e2e/sqllab/tabs.test.ts
+++ /dev/null
@@ -1,113 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-describe('SqlLab query tabs', () => {
-  beforeEach(() => {
-    cy.visit('/sqllab');
-  });
-
-  const tablistSelector = '[data-test="sql-editor-tabs"] > [role="tablist"]';
-  const tabSelector = `${tablistSelector} [role="tab"]:not([type="button"])`;
-
-  it('allows you to create and close a tab', () => {
-    cy.get(tabSelector).then(tabs => {
-      const initialTabCount = tabs.length;
-      const initialUntitledCount = Math.max(
-        0,
-        ...tabs
-          .map(
-            (i, tabItem) =>
-              Number(tabItem.textContent?.match(/Untitled Query (\d+)/)?.[1]) ||
-              0,
-          )
-          .toArray(),
-      );
-
-      // add two new tabs
-      cy.get('[data-test="add-tab-icon"]:visible:last').click({ force: true });
-      cy.contains('[role="tab"]', `Untitled Query ${initialUntitledCount + 1}`);
-      cy.get(tabSelector).should('have.length', initialTabCount + 1);
-
-      cy.get('[data-test="add-tab-icon"]:visible:last').click({ force: true });
-      cy.contains('[role="tab"]', `Untitled Query ${initialUntitledCount + 2}`);
-      cy.get(tabSelector).should('have.length', initialTabCount + 2);
-
-      // close the tabs
-      cy.get(`${tabSelector}:last [data-test="dropdown-trigger"]`).click({
-        force: true,
-      });
-      cy.get('[data-test="close-tab-menu-option"]').click();
-      cy.get(tabSelector).should('have.length', initialTabCount + 1);
-      cy.contains('[role="tab"]', `Untitled Query ${initialUntitledCount + 1}`);
-
-      cy.get(`${tablistSelector} [aria-label="remove"]:last`).click();
-      cy.get(tabSelector).should('have.length', initialTabCount);
-    });
-  });
-
-  it('opens a new tab by a button and a shortcut', () => {
-    const editorContent = '.ace_editor .ace_content';
-    const editorInput = '.ace_editor textarea';
-    const queryLimitSelector = '#js-sql-toolbar .limitDropdown';
-    cy.get(tabSelector).then(tabs => {
-      const initialTabCount = tabs.length;
-      const initialUntitledCount = Math.max(
-        0,
-        ...tabs
-          .map(
-            (i, tabItem) =>
-              Number(tabItem.textContent?.match(/Untitled Query (\d+)/)?.[1]) ||
-              0,
-          )
-          .toArray(),
-      );
-
-      // configure some editor settings
-      cy.get(editorInput).type('some random query string', { force: true });
-      cy.get(queryLimitSelector).parent().click({ force: true });
-      cy.get('.ant-dropdown-menu')
-        .last()
-        .find('.ant-dropdown-menu-item')
-        .first()
-        .click({ force: true });
-
-      // open a new tab by a button
-      cy.get('[data-test="add-tab-icon"]:visible:last').click({ force: true });
-      cy.contains('[role="tab"]', `Untitled Query ${initialUntitledCount + 1}`);
-      cy.get(tabSelector).should('have.length', initialTabCount + 1);
-      cy.get(editorContent).contains('SELECT ...');
-      cy.get(queryLimitSelector).contains('10');
-
-      // close the tab
-      cy.get(`${tabSelector}:last [data-test="dropdown-trigger"]`).click({
-        force: true,
-      });
-      cy.get(`${tablistSelector} [aria-label="remove"]:last`).click({
-        force: true,
-      });
-      cy.get(tabSelector).should('have.length', initialTabCount);
-
-      // open a new tab by a shortcut
-      cy.get('body').type('{ctrl}t');
-      cy.get(tabSelector).should('have.length', initialTabCount + 1);
-      cy.contains('[role="tab"]', `Untitled Query ${initialUntitledCount + 1}`);
-      cy.get(editorContent).contains('SELECT ...');
-      cy.get(queryLimitSelector).contains('10');
-    });
-  });
-});
diff --git a/superset-frontend/cypress-base/cypress/utils/index.ts b/superset-frontend/cypress-base/cypress/utils/index.ts
index 00ff58ab9aa..0c12c23aba7 100644
--- a/superset-frontend/cypress-base/cypress/utils/index.ts
+++ b/superset-frontend/cypress-base/cypress/utils/index.ts
@@ -25,28 +25,6 @@ export interface ChartSpec {
   viz: string;
 }
 
-const viewTypeIcons = {
-  card: 'appstore',
-  list: 'unordered-list',
-};
-
-export function setGridMode(type: 'card' | 'list') {
-  const icon = viewTypeIcons[type];
-  cy.get(`[aria-label="${icon}"]`).click();
-}
-
-export function toggleBulkSelect() {
-  cy.getBySel('bulk-select').click();
-}
-
-export function clearAllInputs() {
-  cy.get('body').then($body => {
-    if ($body.find('.ant-select-clear').length) {
-      cy.get('.ant-select-clear').click({ multiple: true, force: true });
-    }
-  });
-}
-
 const toSlicelike = ($chart: JQuery<HTMLElement>): Slice => {
   const chartId = $chart.attr('data-test-chart-id');
   const vizType = $chart.attr('data-test-viz-type');
diff --git a/superset-frontend/cypress-base/cypress/utils/urls.ts b/superset-frontend/cypress-base/cypress/utils/urls.ts
index 1a585f40479..66110bcc64b 100644
--- a/superset-frontend/cypress-base/cypress/utils/urls.ts
+++ b/superset-frontend/cypress-base/cypress/utils/urls.ts
@@ -25,8 +25,3 @@ export const SUPPORTED_CHARTS_DASHBOARD =
   '/superset/dashboard/supported_charts_dash/';
 export const TABBED_DASHBOARD = '/superset/dashboard/tabbed_dash/';
 export const DATABASE_LIST = '/databaseview/list';
-export const DATASET_LIST_PATH = 'tablemodelview/list';
-export const ALERT_LIST = '/alert/list/';
-export const REPORT_LIST = '/report/list/';
-export const LOGIN = '/login/';
-export const REGISTER = '/register/';
diff --git a/superset-frontend/cypress-base/package-lock.json b/superset-frontend/cypress-base/package-lock.json
index b976340ae43..e6346c4d33f 100644
--- a/superset-frontend/cypress-base/package-lock.json
+++ b/superset-frontend/cypress-base/package-lock.json
@@ -3167,9 +3167,9 @@
       "integrity": "sha512-Fc8Ne62jJlKHiG/ajlonC4Sd66Pq68fFwK4ihJGNZpGqboc324SQk+lRvMzpPRuJOmfrJefdG8/7JdWX4bzJ2Q=="
     },
     "node_modules/brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "version": "1.1.13",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.13.tgz",
+      "integrity": "sha512-9ZLprWS6EENmhEOpjCYW2c8VkmOvckIJZfkr7rBW6dObmfgJ/L1GpSYW5Hpo9lDz4D1+n0Ckz8rU7FwHDQiG/w==",
       "dependencies": {
         "balanced-match": "^1.0.0",
         "concat-map": "0.0.1"
@@ -4673,9 +4673,9 @@
       }
     },
     "node_modules/flatted": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.2.tgz",
-      "integrity": "sha512-JaTY/wtrcSyvXJl4IMFHPKyFur1sE9AUqc0QnhOaJ0CxHtAoIV8pYDzeEfAaNEtGkOfq4gr3LBFmdXW5mOQFnA==",
+      "version": "3.4.2",
+      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.4.2.tgz",
+      "integrity": "sha512-PjDse7RzhcPkIJwy5t7KPWQSZ9cAbzQXcafsetQoD7sOJRQlGikNbx7yZp2OotDnJyrDcbyRq3Ttb18iYOqkxA==",
       "dev": true,
       "peer": true
     },
@@ -5809,9 +5809,9 @@
       }
     },
     "node_modules/lodash": {
-      "version": "4.17.23",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.23.tgz",
-      "integrity": "sha512-LgVTMpQtIopCi79SJeDiP0TfWi5CNEc/L/aRdTh3yIvmZXTnheWpKjSZhnvMl8iXbC1tFg9gdHHDMLoV7CnG+w=="
+      "version": "4.18.1",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.18.1.tgz",
+      "integrity": "sha512-dMInicTPVE8d1e5otfwmmjlxkZoUpiVLwyeTdUsi/Caj/gfzzblBcCE5sRHV/AsjuCmxWrte2TNGSYuCeCq+0Q=="
     },
     "node_modules/lodash.clonedeep": {
       "version": "4.5.0",
@@ -6930,9 +6930,9 @@
       "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA=="
     },
     "node_modules/picomatch": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
-      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.2.tgz",
+      "integrity": "sha512-V7+vQEJ06Z+c5tSye8S+nHUfI51xoXIXjHQ99cQtKUkQqqO1kO/KCJUfZXuB47h/YBlDhah2H3hdUGXn8ie0oA==",
       "engines": {
         "node": ">=8.6"
       },
@@ -8642,9 +8642,9 @@
       "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
     },
     "node_modules/yaml": {
-      "version": "1.10.2",
-      "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz",
-      "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==",
+      "version": "1.10.3",
+      "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.3.tgz",
+      "integrity": "sha512-vIYeF1u3CjlhAFekPPAk2h/Kv4T3mAkMox5OymRiJQB0spDP10LHvt+K7G9Ny6NuuMAb25/6n1qyUjAcGNf/AA==",
       "peer": true,
       "engines": {
         "node": ">= 6"
@@ -11132,9 +11132,9 @@
       "integrity": "sha512-Fc8Ne62jJlKHiG/ajlonC4Sd66Pq68fFwK4ihJGNZpGqboc324SQk+lRvMzpPRuJOmfrJefdG8/7JdWX4bzJ2Q=="
     },
     "brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "version": "1.1.13",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.13.tgz",
+      "integrity": "sha512-9ZLprWS6EENmhEOpjCYW2c8VkmOvckIJZfkr7rBW6dObmfgJ/L1GpSYW5Hpo9lDz4D1+n0Ckz8rU7FwHDQiG/w==",
       "requires": {
         "balanced-match": "^1.0.0",
         "concat-map": "0.0.1"
@@ -12253,9 +12253,9 @@
       }
     },
     "flatted": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.2.tgz",
-      "integrity": "sha512-JaTY/wtrcSyvXJl4IMFHPKyFur1sE9AUqc0QnhOaJ0CxHtAoIV8pYDzeEfAaNEtGkOfq4gr3LBFmdXW5mOQFnA==",
+      "version": "3.4.2",
+      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.4.2.tgz",
+      "integrity": "sha512-PjDse7RzhcPkIJwy5t7KPWQSZ9cAbzQXcafsetQoD7sOJRQlGikNbx7yZp2OotDnJyrDcbyRq3Ttb18iYOqkxA==",
       "dev": true,
       "peer": true
     },
@@ -13072,9 +13072,9 @@
       }
     },
     "lodash": {
-      "version": "4.17.23",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.23.tgz",
-      "integrity": "sha512-LgVTMpQtIopCi79SJeDiP0TfWi5CNEc/L/aRdTh3yIvmZXTnheWpKjSZhnvMl8iXbC1tFg9gdHHDMLoV7CnG+w=="
+      "version": "4.18.1",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.18.1.tgz",
+      "integrity": "sha512-dMInicTPVE8d1e5otfwmmjlxkZoUpiVLwyeTdUsi/Caj/gfzzblBcCE5sRHV/AsjuCmxWrte2TNGSYuCeCq+0Q=="
     },
     "lodash.clonedeep": {
       "version": "4.5.0",
@@ -13825,9 +13825,9 @@
       "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA=="
     },
     "picomatch": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
-      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA=="
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.2.tgz",
+      "integrity": "sha512-V7+vQEJ06Z+c5tSye8S+nHUfI51xoXIXjHQ99cQtKUkQqqO1kO/KCJUfZXuB47h/YBlDhah2H3hdUGXn8ie0oA=="
     },
     "pify": {
       "version": "2.3.0",
@@ -15063,9 +15063,9 @@
       "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
     },
     "yaml": {
-      "version": "1.10.2",
-      "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz",
-      "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==",
+      "version": "1.10.3",
+      "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.3.tgz",
+      "integrity": "sha512-vIYeF1u3CjlhAFekPPAk2h/Kv4T3mAkMox5OymRiJQB0spDP10LHvt+K7G9Ny6NuuMAb25/6n1qyUjAcGNf/AA==",
       "peer": true
     },
     "yargs": {
diff --git a/superset-frontend/oxlint.json b/superset-frontend/oxlint.json
index fb4401c4bab..d2fe2bfb5ac 100644
--- a/superset-frontend/oxlint.json
+++ b/superset-frontend/oxlint.json
@@ -33,6 +33,33 @@
     // - No FontAwesome icons (use Icons component)
     // - No template variables in i18n (use parameterized messages)
 
+    // === Rules carried over from ESLint that oxlint does NOT implement ===
+    // oxlint 1.58+ errors on unknown builtin rules, so these can no longer
+    // be listed in this config. They were silently dropped in earlier
+    // oxlint versions (not actually enforced). Documented here for future
+    // maintainers — if/when oxlint adds them, re-enable in the relevant
+    // plugin section above.
+    //   import: newline-after-import, no-extraneous-dependencies,
+    //           no-import-module-exports, no-relative-packages,
+    //           no-unresolved, no-useless-path-segments
+    //   react:  default-props-match-prop-types, destructuring-assignment,
+    //           forbid-component-props, forbid-foreign-prop-types,
+    //           forbid-prop-types, function-component-definition,
+    //           jsx-no-bind, jsx-uses-vars, no-access-state-in-setstate,
+    //           no-deprecated, no-did-update-set-state, no-typos,
+    //           no-unstable-nested-components,
+    //           no-unused-class-component-methods, no-unused-prop-types,
+    //           no-unused-state, prefer-stateless-function, prop-types,
+    //           require-default-props, sort-comp, static-property-placement
+    //           (prefer-stateless-function / function-component-definition
+    //            are represented by react/prefer-function-component below)
+    //   jsx-a11y: interactive-supports-focus,
+    //             no-interactive-element-to-noninteractive-role,
+    //             no-noninteractive-element-interactions,
+    //             no-noninteractive-element-to-interactive-role
+    //   typescript: naming-convention
+    //   unicorn: prevent-abbreviations
+
     // === Core ESLint rules ===
     // Error prevention
     "no-console": "warn",
@@ -89,7 +116,6 @@
     "no-object-constructor": "error",
 
     // === Import plugin rules ===
-    "import/no-unresolved": "error",
     // TODO: Fix incorrect named imports in Storybook and other files
     "import/named": "warn",
     // TODO: Fix duplicate exports in shared-controls and other modules
@@ -105,56 +131,24 @@
     "import/first": "error",
     // TODO: Consolidate duplicate imports in DatasetList and other files
     "import/no-duplicates": "warn",
-    "import/newline-after-import": "error",
     "import/no-absolute-path": "error",
     "import/no-dynamic-require": "error",
     "import/no-webpack-loader-syntax": "error",
     "import/no-self-import": "error",
     "import/no-cycle": "off",
-    "import/no-useless-path-segments": ["error", { "commonjs": true }],
     "import/prefer-default-export": "off",
-    "import/no-relative-packages": "off",
-    "import/no-import-module-exports": "off",
-    "import/no-extraneous-dependencies": [
-      "error",
-      {
-        "devDependencies": [
-          "test/**",
-          "tests/**",
-          "spec/**",
-          "**/__tests__/**",
-          "**/__mocks__/**",
-          "*.test.{js,jsx,ts,tsx}",
-          "*.spec.{js,jsx,ts,tsx}",
-          "**/*.test.{js,jsx,ts,tsx}",
-          "**/*.spec.{js,jsx,ts,tsx}",
-          "**/jest.config.js",
-          "**/jest.setup.js",
-          "**/webpack.config.js",
-          "**/webpack.config.*.js",
-          "**/.eslintrc.js"
-        ],
-        "optionalDependencies": false
-      }
-    ],
 
     // === React plugin rules ===
-    "react/prop-types": "off",
-    "react/require-default-props": "off",
-    "react/forbid-prop-types": "off",
-    "react/forbid-component-props": "warn",
     "react/jsx-filename-extension": [
       "warn",
       { "extensions": [".jsx", ".tsx"] }
     ],
     "react/jsx-fragments": "error",
-    "react/jsx-no-bind": "off",
     "react/jsx-props-no-spreading": "off",
     "react/jsx-boolean-value": ["error", "never", { "always": [] }],
     "react/jsx-no-duplicate-props": "error",
     "react/jsx-no-undef": "error",
     "react/jsx-pascal-case": ["error", { "allowAllCaps": true, "ignore": [] }],
-    "react/jsx-uses-vars": "error",
     "react/jsx-no-target-blank": ["error", { "enforceDynamicLinks": "always" }],
     "react/jsx-no-comment-textnodes": "error",
     "react/jsx-no-useless-fragment": "off",
@@ -165,40 +159,27 @@
     "react/no-array-index-key": "off",
     "react/no-children-prop": "error",
     "react/no-danger": "error",
-    "react/forbid-foreign-prop-types": "error",
     "react/no-danger-with-children": "error",
-    "react/no-deprecated": "error",
-    "react/no-did-update-set-state": "error",
     "react/no-find-dom-node": "error",
     "react/no-is-mounted": "error",
     "react/no-render-return-value": "error",
     "react/no-string-refs": "off",
     "react/no-unescaped-entities": "off",
     "react/no-unknown-property": "off",
-    "react/no-unused-prop-types": "off",
-    "react/no-unused-state": "error",
     "react/no-will-update-set-state": "error",
     "react/prefer-es6-class": ["error", "always"],
-    "react/prefer-stateless-function": [
-      "error",
-      { "ignorePureComponents": true }
-    ],
     "react/require-render-return": "error",
     "react/self-closing-comp": "error",
     "react/void-dom-elements-no-children": "error",
-    "react/no-access-state-in-setstate": "error",
     "react/no-redundant-should-component-update": "error",
     "react/no-this-in-sfc": "error",
-    "react/no-typos": "error",
-    "react/no-unstable-nested-components": "off",
-    "react/no-unused-class-component-methods": "off",
-    "react/destructuring-assignment": "off",
-    "react/sort-comp": "off",
     "react/state-in-constructor": "off",
-    "react/static-property-placement": "off",
     "react/react-in-jsx-scope": "off",
-    "react/function-component-definition": "off",
-    "react/default-props-match-prop-types": "off",
+    // Successor to the ESLint-era `react/prefer-stateless-function` and
+    // `react/function-component-definition` rules. Disabled because the
+    // codebase still contains legacy class components; flip to "error"
+    // once the class-to-function migration completes.
+    "react/prefer-function-component": "off",
     "react/button-has-type": [
       "error",
       { "button": true, "submit": true, "reset": false }
@@ -223,7 +204,6 @@
     "jsx-a11y/html-has-lang": "error",
     "jsx-a11y/iframe-has-title": "error",
     "jsx-a11y/img-redundant-alt": "error",
-    "jsx-a11y/interactive-supports-focus": "error",
     "jsx-a11y/label-has-associated-control": "error",
     "jsx-a11y/lang": "error",
     "jsx-a11y/media-has-caption": "error",
@@ -231,9 +211,6 @@
     "jsx-a11y/no-access-key": "error",
     "jsx-a11y/no-autofocus": ["error", { "ignoreNonDOM": true }],
     "jsx-a11y/no-distracting-elements": "error",
-    "jsx-a11y/no-interactive-element-to-noninteractive-role": "error",
-    "jsx-a11y/no-noninteractive-element-interactions": "error",
-    "jsx-a11y/no-noninteractive-element-to-interactive-role": "error",
     "jsx-a11y/no-noninteractive-tabindex": "error",
     "jsx-a11y/no-redundant-roles": "error",
     "jsx-a11y/no-static-element-interactions": "off",
@@ -253,17 +230,6 @@
     "@typescript-eslint/explicit-module-boundary-types": "off",
     "@typescript-eslint/no-unused-vars": "warn",
     "@typescript-eslint/prefer-optional-chain": "error",
-    "@typescript-eslint/naming-convention": [
-      "error",
-      {
-        "selector": "enum",
-        "format": ["PascalCase"]
-      },
-      {
-        "selector": "enumMember",
-        "format": ["PascalCase"]
-      }
-    ],
 
     // === Unicorn rules (bonus coverage) ===
     "unicorn/no-new-array": "error",
@@ -279,7 +245,6 @@
     "unicorn/prefer-negative-index": "error",
     "unicorn/prefer-math-trunc": "error",
     "unicorn/filename-case": "off",
-    "unicorn/prevent-abbreviations": "off",
     "unicorn/no-null": "off",
     "unicorn/no-array-reduce": "off",
     "unicorn/no-array-for-each": "off",
diff --git a/superset-frontend/package-lock.json b/superset-frontend/package-lock.json
index e3a986c973f..e615ac4323e 100644
--- a/superset-frontend/package-lock.json
+++ b/superset-frontend/package-lock.json
@@ -47,21 +47,21 @@
         "@superset-ui/legacy-plugin-chart-chord": "file:./plugins/legacy-plugin-chart-chord",
         "@superset-ui/legacy-plugin-chart-country-map": "file:./plugins/legacy-plugin-chart-country-map",
         "@superset-ui/legacy-plugin-chart-horizon": "file:./plugins/legacy-plugin-chart-horizon",
-        "@superset-ui/legacy-plugin-chart-map-box": "file:./plugins/legacy-plugin-chart-map-box",
         "@superset-ui/legacy-plugin-chart-paired-t-test": "file:./plugins/legacy-plugin-chart-paired-t-test",
         "@superset-ui/legacy-plugin-chart-parallel-coordinates": "file:./plugins/legacy-plugin-chart-parallel-coordinates",
         "@superset-ui/legacy-plugin-chart-partition": "file:./plugins/legacy-plugin-chart-partition",
         "@superset-ui/legacy-plugin-chart-rose": "file:./plugins/legacy-plugin-chart-rose",
         "@superset-ui/legacy-plugin-chart-world-map": "file:./plugins/legacy-plugin-chart-world-map",
-        "@superset-ui/legacy-preset-chart-deckgl": "file:./plugins/legacy-preset-chart-deckgl",
         "@superset-ui/legacy-preset-chart-nvd3": "file:./plugins/legacy-preset-chart-nvd3",
         "@superset-ui/plugin-chart-ag-grid-table": "file:./plugins/plugin-chart-ag-grid-table",
         "@superset-ui/plugin-chart-cartodiagram": "file:./plugins/plugin-chart-cartodiagram",
         "@superset-ui/plugin-chart-echarts": "file:./plugins/plugin-chart-echarts",
         "@superset-ui/plugin-chart-handlebars": "file:./plugins/plugin-chart-handlebars",
         "@superset-ui/plugin-chart-pivot-table": "file:./plugins/plugin-chart-pivot-table",
+        "@superset-ui/plugin-chart-point-cluster-map": "file:./plugins/plugin-chart-point-cluster-map",
         "@superset-ui/plugin-chart-table": "file:./plugins/plugin-chart-table",
         "@superset-ui/plugin-chart-word-cloud": "file:./plugins/plugin-chart-word-cloud",
+        "@superset-ui/preset-chart-deckgl": "file:./plugins/preset-chart-deckgl",
         "@superset-ui/switchboard": "file:./packages/superset-ui-switchboard",
         "@types/d3-format": "^3.0.1",
         "@types/d3-selection": "^3.0.11",
@@ -73,49 +73,49 @@
         "@visx/scale": "^3.5.0",
         "@visx/tooltip": "^3.0.0",
         "@visx/xychart": "^3.5.1",
-        "ag-grid-community": "35.0.1",
-        "ag-grid-react": "35.0.1",
+        "ag-grid-community": "35.2.1",
+        "ag-grid-react": "35.2.1",
         "antd": "^5.26.0",
         "chrono-node": "^2.9.0",
         "classnames": "^2.2.5",
         "content-disposition": "^1.0.1",
         "d3-color": "^3.1.0",
         "d3-scale": "^4.0.2",
-        "dayjs": "^1.11.19",
+        "dayjs": "^1.11.20",
         "dom-to-image-more": "^3.7.2",
         "dom-to-pdf": "^0.3.2",
         "echarts": "^5.6.0",
         "fast-glob": "^3.3.2",
-        "fs-extra": "^11.3.3",
-        "fuse.js": "^7.1.0",
-        "geolib": "^3.3.4",
-        "geostyler": "^18.3.1",
+        "fs-extra": "^11.3.4",
+        "fuse.js": "^7.3.0",
+        "geolib": "^3.3.14",
+        "geostyler": "^18.5.0",
         "geostyler-data": "^1.1.0",
-        "geostyler-openlayers-parser": "^5.4.0",
+        "geostyler-openlayers-parser": "^5.7.0",
         "geostyler-style": "11.0.2",
         "geostyler-wfs-parser": "^3.0.1",
-        "google-auth-library": "^10.6.1",
+        "google-auth-library": "^10.6.2",
         "immer": "^11.1.4",
         "interweave": "^13.1.1",
         "jquery": "^4.0.0",
         "js-levenshtein": "^1.1.6",
         "json-bigint": "^1.0.0",
         "json-stringify-pretty-compact": "^2.0.0",
-        "lodash": "^4.17.23",
-        "mapbox-gl": "^3.19.0",
-        "markdown-to-jsx": "^9.7.6",
-        "match-sorter": "^6.3.4",
+        "lodash": "^4.18.1",
+        "mapbox-gl": "^3.22.0",
+        "markdown-to-jsx": "^9.7.16",
+        "match-sorter": "^8.2.0",
         "memoize-one": "^5.2.1",
         "mousetrap": "^1.6.5",
         "mustache": "^4.2.0",
-        "nanoid": "^5.1.6",
+        "nanoid": "^5.1.9",
         "ol": "^10.8.0",
         "pretty-ms": "^9.3.0",
         "query-string": "9.3.1",
         "re-resizable": "^6.11.2",
         "react": "^17.0.2",
-        "react-arborist": "^3.4.3",
-        "react-checkbox-tree": "^1.8.0",
+        "react-arborist": "^3.5.0",
+        "react-checkbox-tree": "^2.0.1",
         "react-diff-viewer-continued": "^4.2.0",
         "react-dnd": "^11.1.3",
         "react-dnd-html5-backend": "^11.1.3",
@@ -149,7 +149,7 @@
         "use-event-callback": "^0.1.0",
         "use-immer": "^0.11.0",
         "use-query-params": "^2.2.2",
-        "uuid": "^13.0.0",
+        "uuid": "^14.0.0",
         "xlsx": "https://cdn.sheetjs.com/xlsx-0.20.3/xlsx-0.20.3.tgz",
         "yargs": "^17.7.2"
       },
@@ -163,34 +163,34 @@
         "@babel/plugin-transform-export-namespace-from": "^7.27.1",
         "@babel/plugin-transform-modules-commonjs": "^7.28.6",
         "@babel/plugin-transform-runtime": "^7.29.0",
-        "@babel/preset-env": "^7.29.0",
+        "@babel/preset-env": "^7.29.2",
         "@babel/preset-react": "^7.28.5",
         "@babel/preset-typescript": "^7.28.5",
         "@babel/register": "^7.23.7",
-        "@babel/runtime": "^7.28.6",
-        "@babel/runtime-corejs3": "^7.29.0",
+        "@babel/runtime": "^7.29.2",
+        "@babel/runtime-corejs3": "^7.29.2",
         "@babel/types": "^7.28.6",
         "@cypress/react": "^8.0.2",
         "@emotion/babel-plugin": "^11.13.5",
         "@emotion/jest": "^11.14.2",
         "@istanbuljs/nyc-config-typescript": "^1.0.1",
         "@mihkeleidast/storybook-addon-source": "^1.0.1",
-        "@playwright/test": "^1.58.2",
+        "@playwright/test": "^1.59.1",
         "@pmmmwh/react-refresh-webpack-plugin": "^0.6.2",
-        "@storybook/addon-actions": "^8.6.17",
-        "@storybook/addon-controls": "^8.6.17",
-        "@storybook/addon-essentials": "^8.6.17",
-        "@storybook/addon-links": "^8.6.17",
-        "@storybook/addon-mdx-gfm": "^8.6.17",
-        "@storybook/components": "^8.6.17",
-        "@storybook/preview-api": "^8.6.17",
-        "@storybook/react": "^8.6.17",
-        "@storybook/react-webpack5": "^8.6.17",
-        "@storybook/test": "^8.6.15",
+        "@storybook/addon-actions": "^8.6.18",
+        "@storybook/addon-controls": "^8.6.18",
+        "@storybook/addon-essentials": "^8.6.18",
+        "@storybook/addon-links": "^8.6.18",
+        "@storybook/addon-mdx-gfm": "^8.6.18",
+        "@storybook/components": "^8.6.18",
+        "@storybook/preview-api": "^8.6.18",
+        "@storybook/react": "^8.6.18",
+        "@storybook/react-webpack5": "^8.6.18",
+        "@storybook/test": "^8.6.18",
         "@storybook/test-runner": "^0.17.0",
         "@svgr/webpack": "^8.1.0",
-        "@swc/core": "^1.15.18",
-        "@swc/plugin-emotion": "^14.6.0",
+        "@swc/core": "^1.15.30",
+        "@swc/plugin-emotion": "^14.8.0",
         "@swc/plugin-transform-imports": "^12.5.0",
         "@testing-library/dom": "^8.20.1",
         "@testing-library/jest-dom": "^6.9.1",
@@ -200,10 +200,11 @@
         "@types/content-disposition": "^0.5.9",
         "@types/dom-to-image": "^2.6.7",
         "@types/jest": "^30.0.0",
+        "@types/jquery": "^4.0.0",
         "@types/js-levenshtein": "^1.1.3",
         "@types/json-bigint": "^1.0.4",
         "@types/mousetrap": "^1.6.15",
-        "@types/node": "^25.3.3",
+        "@types/node": "^25.6.0",
         "@types/react": "^17.0.83",
         "@types/react-dom": "^17.0.26",
         "@types/react-loadable": "^5.5.11",
@@ -220,14 +221,14 @@
         "@typescript-eslint/eslint-plugin": "^7.18.0",
         "@typescript-eslint/parser": "^7.18.0",
         "babel-jest": "^30.0.2",
-        "babel-loader": "^10.0.0",
+        "babel-loader": "^10.1.1",
         "babel-plugin-dynamic-import-node": "^2.3.3",
         "babel-plugin-jsx-remove-data-test-id": "^3.0.0",
         "babel-plugin-lodash": "^3.3.4",
-        "baseline-browser-mapping": "^2.10.7",
+        "baseline-browser-mapping": "^2.10.16",
         "cheerio": "1.2.0",
         "concurrently": "^9.2.1",
-        "copy-webpack-plugin": "^13.0.1",
+        "copy-webpack-plugin": "^14.0.0",
         "cross-env": "^10.1.0",
         "css-loader": "^7.1.4",
         "css-minimizer-webpack-plugin": "^8.0.0",
@@ -236,17 +237,17 @@
         "eslint-import-resolver-alias": "^1.1.2",
         "eslint-import-resolver-typescript": "^4.4.4",
         "eslint-plugin-cypress": "^3.6.0",
-        "eslint-plugin-file-progress": "^1.5.0",
         "eslint-plugin-i18n-strings": "file:eslint-rules/eslint-plugin-i18n-strings",
         "eslint-plugin-icons": "file:eslint-rules/eslint-plugin-icons",
         "eslint-plugin-import": "^2.32.0",
         "eslint-plugin-jest-dom": "^5.5.0",
         "eslint-plugin-lodash": "^7.4.0",
+        "eslint-plugin-no-only-tests": "^3.3.0",
         "eslint-plugin-prettier": "^5.5.5",
         "eslint-plugin-react-prefer-function-component": "^5.0.0",
-        "eslint-plugin-react-you-might-not-need-an-effect": "^0.9.2",
+        "eslint-plugin-react-you-might-not-need-an-effect": "^0.9.3",
         "eslint-plugin-storybook": "^0.8.0",
-        "eslint-plugin-testing-library": "^7.16.0",
+        "eslint-plugin-testing-library": "^7.16.2",
         "eslint-plugin-theme-colors": "file:eslint-rules/eslint-plugin-theme-colors",
         "fetch-mock": "^12.6.0",
         "fork-ts-checker-webpack-plugin": "^9.1.0",
@@ -256,17 +257,17 @@
         "imports-loader": "^5.0.0",
         "jest": "^30.3.0",
         "jest-environment-jsdom": "^29.7.0",
-        "jest-html-reporter": "^4.3.0",
+        "jest-html-reporter": "^4.4.0",
         "jest-websocket-mock": "^2.5.0",
         "js-yaml-loader": "^1.2.2",
-        "jsdom": "^28.1.0",
-        "lerna": "^8.2.3",
+        "jsdom": "^29.0.2",
+        "lerna": "^9.0.4",
         "lightningcss": "^1.32.0",
-        "mini-css-extract-plugin": "^2.10.1",
-        "open-cli": "^8.0.0",
-        "oxlint": "^1.53.0",
+        "mini-css-extract-plugin": "^2.10.2",
+        "open-cli": "^9.0.0",
+        "oxlint": "^1.61.0",
         "po2json": "^0.4.5",
-        "prettier": "3.8.1",
+        "prettier": "3.8.3",
         "prettier-plugin-packagejson": "^3.0.2",
         "process": "^0.11.10",
         "react-refresh": "^0.18.0",
@@ -274,21 +275,21 @@
         "redux-mock-store": "^1.5.4",
         "source-map": "^0.7.6",
         "source-map-support": "^0.5.21",
-        "speed-measure-webpack-plugin": "^1.5.0",
-        "storybook": "8.6.17",
+        "speed-measure-webpack-plugin": "^1.6.0",
+        "storybook": "8.6.18",
         "style-loader": "^4.0.0",
         "swc-loader": "^0.2.7",
-        "terser-webpack-plugin": "^5.3.17",
+        "terser-webpack-plugin": "^5.4.0",
         "thread-loader": "^4.0.4",
-        "ts-jest": "^29.4.6",
+        "ts-jest": "^29.4.9",
         "tscw-config": "^1.1.2",
         "tsx": "^4.21.0",
         "typescript": "5.4.5",
         "unzipper": "^0.12.3",
         "vm-browserify": "^1.1.2",
-        "wait-on": "^9.0.4",
-        "webpack": "^5.105.4",
-        "webpack-bundle-analyzer": "^5.2.0",
+        "wait-on": "^9.0.5",
+        "webpack": "^5.106.0",
+        "webpack-bundle-analyzer": "^5.3.0",
         "webpack-cli": "^6.0.1",
         "webpack-dev-server": "^5.2.3",
         "webpack-manifest-plugin": "^5.0.1",
@@ -336,13 +337,6 @@
       "dev": true,
       "license": "Apache-2.0"
     },
-    "node_modules/@acemir/cssom": {
-      "version": "0.9.31",
-      "resolved": "https://registry.npmjs.org/@acemir/cssom/-/cssom-0.9.31.tgz",
-      "integrity": "sha512-ZnR3GSaH+/vJ0YlHau21FjfLYjMpYVIzTD8M8vIEQvIGxeOXyXdzCI140rrCY862p/C/BbzWsjc1dgnM9mkoTA==",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/@adobe/css-tools": {
       "version": "4.4.1",
       "resolved": "https://registry.npmjs.org/@adobe/css-tools/-/css-tools-4.4.1.tgz",
@@ -469,66 +463,57 @@
       "link": true
     },
     "node_modules/@asamuzakjp/css-color": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/@asamuzakjp/css-color/-/css-color-4.1.2.tgz",
-      "integrity": "sha512-NfBUvBaYgKIuq6E/RBLY1m0IohzNHAYyaJGuTK79Z23uNwmz2jl1mPsC5ZxCCxylinKhT1Amn5oNTlx1wN8cQg==",
+      "version": "5.1.6",
+      "resolved": "https://registry.npmjs.org/@asamuzakjp/css-color/-/css-color-5.1.6.tgz",
+      "integrity": "sha512-BXWCh8dHs9GOfpo/fWGDJtDmleta2VePN9rn6WQt3GjEbxzutVF4t0x2pmH+7dbMCLtuv3MlwqRsAuxlzFXqFg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@csstools/css-calc": "^3.0.0",
-        "@csstools/css-color-parser": "^4.0.1",
+        "@csstools/css-calc": "^3.1.1",
+        "@csstools/css-color-parser": "^4.0.2",
         "@csstools/css-parser-algorithms": "^4.0.0",
-        "@csstools/css-tokenizer": "^4.0.0",
-        "lru-cache": "^11.2.5"
-      }
-    },
-    "node_modules/@asamuzakjp/css-color/node_modules/lru-cache": {
-      "version": "11.2.6",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.2.6.tgz",
-      "integrity": "sha512-ESL2CrkS/2wTPfuend7Zhkzo2u0daGJ/A2VucJOgQ/C48S/zB8MMeMHSGKYpXhIjbPxfuezITkaBH1wqv00DDQ==",
-      "dev": true,
-      "license": "BlueOak-1.0.0",
+        "@csstools/css-tokenizer": "^4.0.0"
+      },
       "engines": {
-        "node": "20 || >=22"
+        "node": "^20.19.0 || ^22.12.0 || >=24.0.0"
       }
     },
     "node_modules/@asamuzakjp/dom-selector": {
-      "version": "6.8.1",
-      "resolved": "https://registry.npmjs.org/@asamuzakjp/dom-selector/-/dom-selector-6.8.1.tgz",
-      "integrity": "sha512-MvRz1nCqW0fsy8Qz4dnLIvhOlMzqDVBabZx6lH+YywFDdjXhMY37SmpV1XFX3JzG5GWHn63j6HX6QPr3lZXHvQ==",
+      "version": "7.0.7",
+      "resolved": "https://registry.npmjs.org/@asamuzakjp/dom-selector/-/dom-selector-7.0.7.tgz",
+      "integrity": "sha512-d2BgqDUOS1Hfp4IzKUZqCNz+Kg3Y88AkaBvJK/ZVSQPU1f7OpPNi7nQTH6/oI47Dkdg+Z3e8Yp6ynOu4UMINAQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@asamuzakjp/nwsapi": "^2.3.9",
         "bidi-js": "^1.0.3",
-        "css-tree": "^3.1.0",
-        "is-potential-custom-element-name": "^1.0.1",
-        "lru-cache": "^11.2.6"
+        "css-tree": "^3.2.1",
+        "is-potential-custom-element-name": "^1.0.1"
+      },
+      "engines": {
+        "node": "^20.19.0 || ^22.12.0 || >=24.0.0"
       }
     },
     "node_modules/@asamuzakjp/dom-selector/node_modules/css-tree": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-3.1.0.tgz",
-      "integrity": "sha512-0eW44TGN5SQXU1mWSkKwFstI/22X2bG1nYzZTYMAWjylYURhse752YgbE4Cx46AC+bAvI+/dYTPRk1LqSUnu6w==",
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-3.2.1.tgz",
+      "integrity": "sha512-X7sjQzceUhu1u7Y/ylrRZFU2FS6LRiFVp6rKLPg23y3x3c3DOKAwuXGDp+PAGjh6CSnCjYeAul8pcT8bAl+lSA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "mdn-data": "2.12.2",
-        "source-map-js": "^1.0.1"
+        "mdn-data": "2.27.1",
+        "source-map-js": "^1.2.1"
       },
       "engines": {
         "node": "^10 || ^12.20.0 || ^14.13.0 || >=15.0.0"
       }
     },
-    "node_modules/@asamuzakjp/dom-selector/node_modules/lru-cache": {
-      "version": "11.2.6",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.2.6.tgz",
-      "integrity": "sha512-ESL2CrkS/2wTPfuend7Zhkzo2u0daGJ/A2VucJOgQ/C48S/zB8MMeMHSGKYpXhIjbPxfuezITkaBH1wqv00DDQ==",
+    "node_modules/@asamuzakjp/dom-selector/node_modules/mdn-data": {
+      "version": "2.27.1",
+      "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.27.1.tgz",
+      "integrity": "sha512-9Yubnt3e8A0OKwxYSXyhLymGW4sCufcLG6VdiDdUGVkPhpqLxlvP5vl1983gQjJl3tqbrM731mjaZaP68AgosQ==",
       "dev": true,
-      "license": "BlueOak-1.0.0",
-      "engines": {
-        "node": "20 || >=22"
-      }
+      "license": "CC0-1.0"
     },
     "node_modules/@asamuzakjp/nwsapi": {
       "version": "2.3.9",
@@ -2392,9 +2377,9 @@
       }
     },
     "node_modules/@babel/preset-env": {
-      "version": "7.29.0",
-      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.29.0.tgz",
-      "integrity": "sha512-fNEdfc0yi16lt6IZo2Qxk3knHVdfMYX33czNb4v8yWhemoBhibCpQK/uYHtSKIiO+p/zd3+8fYVXhQdOVV608w==",
+      "version": "7.29.2",
+      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.29.2.tgz",
+      "integrity": "sha512-DYD23veRYGvBFhcTY1iUvJnDNpuqNd/BzBwCvzOTKUnJjKg5kpUBh3/u9585Agdkgj+QuygG7jLfOPWMa2KVNw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -2577,18 +2562,18 @@
       }
     },
     "node_modules/@babel/runtime": {
-      "version": "7.28.6",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.28.6.tgz",
-      "integrity": "sha512-05WQkdpL9COIMz4LjTxGpPNCdlpyimKppYNoJ5Di5EUObifl8t4tuLuUBBZEpoLYOmfvIWrsp9fCl0HoPRVTdA==",
+      "version": "7.29.2",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.29.2.tgz",
+      "integrity": "sha512-JiDShH45zKHWyGe4ZNVRrCjBz8Nh9TMmZG1kh4QTK8hCBTWBi8Da+i7s1fJw7/lYpM4ccepSNfqzZ/QvABBi5g==",
       "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/runtime-corejs3": {
-      "version": "7.29.0",
-      "resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.29.0.tgz",
-      "integrity": "sha512-TgUkdp71C9pIbBcHudc+gXZnihEDOjUAmXO1VO4HHGES7QLZcShR0stfKIxLSNIYx2fqhmJChOjm/wkF8wv4gA==",
+      "version": "7.29.2",
+      "resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.29.2.tgz",
+      "integrity": "sha512-Lc94FOD5+0aXhdb0Tdg3RUtqT6yWbI/BbFWvlaSJ3gAb9Ks+99nHRDKADVqC37er4eCB0fHyWT+y+K3QOvJKbw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -2650,6 +2635,17 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/@borewit/text-codec": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/@borewit/text-codec/-/text-codec-0.2.2.tgz",
+      "integrity": "sha512-DDaRehssg1aNrH4+2hnj1B7vnUGEjU6OIlyRdkMd0aUdIUvKXrJfXsy8LVtXAy7DRvYVluWbMspsRhz2lcW0mQ==",
+      "dev": true,
+      "license": "MIT",
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/Borewit"
+      }
+    },
     "node_modules/@bramus/specificity": {
       "version": "2.4.2",
       "resolved": "https://registry.npmjs.org/@bramus/specificity/-/specificity-2.4.2.tgz",
@@ -2712,9 +2708,9 @@
       }
     },
     "node_modules/@csstools/color-helpers": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/@csstools/color-helpers/-/color-helpers-6.0.1.tgz",
-      "integrity": "sha512-NmXRccUJMk2AWA5A7e5a//3bCIMyOu2hAtdRYrhPPHjDxINuCwX1w6rnIZ4xjLcp0ayv6h8Pc3X0eJUGiAAXHQ==",
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/@csstools/color-helpers/-/color-helpers-6.0.2.tgz",
+      "integrity": "sha512-LMGQLS9EuADloEFkcTBR3BwV/CGHV7zyDxVRtVDTwdI2Ca4it0CCVTT9wCkxSgokjE5Ho41hEPgb8OEUwoXr6Q==",
       "dev": true,
       "funding": [
         {
@@ -2756,9 +2752,9 @@
       }
     },
     "node_modules/@csstools/css-color-parser": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/@csstools/css-color-parser/-/css-color-parser-4.0.1.tgz",
-      "integrity": "sha512-vYwO15eRBEkeF6xjAno/KQ61HacNhfQuuU/eGwH67DplL0zD5ZixUa563phQvUelA07yDczIXdtmYojCphKJcw==",
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/@csstools/css-color-parser/-/css-color-parser-4.0.2.tgz",
+      "integrity": "sha512-0GEfbBLmTFf0dJlpsNU7zwxRIH0/BGEMuXLTCvFYxuL1tNhqzTbtnFICyJLTNK4a+RechKP75e7w42ClXSnJQw==",
       "dev": true,
       "funding": [
         {
@@ -2772,8 +2768,8 @@
       ],
       "license": "MIT",
       "dependencies": {
-        "@csstools/color-helpers": "^6.0.1",
-        "@csstools/css-calc": "^3.0.0"
+        "@csstools/color-helpers": "^6.0.2",
+        "@csstools/css-calc": "^3.1.1"
       },
       "engines": {
         "node": ">=20.19.0"
@@ -2806,23 +2802,6 @@
         "@csstools/css-tokenizer": "^4.0.0"
       }
     },
-    "node_modules/@csstools/css-syntax-patches-for-csstree": {
-      "version": "1.0.27",
-      "resolved": "https://registry.npmjs.org/@csstools/css-syntax-patches-for-csstree/-/css-syntax-patches-for-csstree-1.0.27.tgz",
-      "integrity": "sha512-sxP33Jwg1bviSUXAV43cVYdmjt2TLnLXNqCWl9xmxHawWVjGz/kEbdkr7F9pxJNBN2Mh+dq0crgItbW6tQvyow==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/csstools"
-        },
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/csstools"
-        }
-      ],
-      "license": "MIT-0"
-    },
     "node_modules/@csstools/css-tokenizer": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/@csstools/css-tokenizer/-/css-tokenizer-4.0.0.tgz",
@@ -3088,13 +3067,13 @@
       }
     },
     "node_modules/@discoveryjs/json-ext": {
-      "version": "0.5.7",
-      "resolved": "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz",
-      "integrity": "sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw==",
+      "version": "0.6.3",
+      "resolved": "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.6.3.tgz",
+      "integrity": "sha512-4B4OijXeVNOPZlYA2oEwWOTkzyltLao+xbotHQeqN++Rv27Y6s818+n2Qkp8q+Fxhn0t/5lA5X1Mxktud8eayQ==",
       "dev": true,
       "license": "MIT",
       "engines": {
-        "node": ">=10.0.0"
+        "node": ">=14.17.0"
       }
     },
     "node_modules/@dnd-kit/accessibility": {
@@ -4044,6 +4023,16 @@
         "url": "https://github.com/sponsors/ayuhito"
       }
     },
+    "node_modules/@gar/promise-retry": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/@gar/promise-retry/-/promise-retry-1.0.3.tgz",
+      "integrity": "sha512-GmzA9ckNokPypTg10pgpeHNQe7ph+iIKKmhKu3Ob9ANkswreCx7R3cKmY781K8QK3AqVL3xVh9A42JvIAbkkSA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "^20.17.0 || >=22.9.0"
+      }
+    },
     "node_modules/@googleapis/sheets": {
       "version": "13.0.1",
       "resolved": "https://registry.npmjs.org/@googleapis/sheets/-/sheets-13.0.1.tgz",
@@ -4091,9 +4080,9 @@
       "license": "BSD-3-Clause"
     },
     "node_modules/@hapi/tlds": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/@hapi/tlds/-/tlds-1.1.4.tgz",
-      "integrity": "sha512-Fq+20dxsxLaUn5jSSWrdtSRcIUba2JquuorF9UW1wIJS5cSUwxIsO2GIhaWynPRflvxSzFN+gxKte2HEW1OuoA==",
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/@hapi/tlds/-/tlds-1.1.6.tgz",
+      "integrity": "sha512-xdi7A/4NZokvV0ewovme3aUO5kQhW9pQ2YD1hRqZGhhSi5rBv4usHYidVocXSi9eihYsznZxLtAiEYYUL6VBGw==",
       "dev": true,
       "license": "BSD-3-Clause",
       "engines": {
@@ -4158,14 +4147,28 @@
         "node": ">=6.9.0"
       }
     },
-    "node_modules/@inquirer/external-editor": {
+    "node_modules/@inquirer/ansi": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/@inquirer/external-editor/-/external-editor-1.0.2.tgz",
-      "integrity": "sha512-yy9cOoBnx58TlsPrIxauKIFQTiyH+0MK4e97y4sV9ERbI+zDxw7i2hxHLCIEGIE/8PPvDxGhgzIOTSOWcs6/MQ==",
+      "resolved": "https://registry.npmjs.org/@inquirer/ansi/-/ansi-1.0.2.tgz",
+      "integrity": "sha512-S8qNSZiYzFd0wAcyG5AXCvUHC5Sr7xpZ9wZ2py9XR88jUz8wooStVx5M6dRzczbBWjic9NP7+rY0Xi7qqK/aMQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@inquirer/checkbox": {
+      "version": "4.3.2",
+      "resolved": "https://registry.npmjs.org/@inquirer/checkbox/-/checkbox-4.3.2.tgz",
+      "integrity": "sha512-VXukHf0RR1doGe6Sm4F0Em7SWYLTHSsbGfJdS9Ja2bX5/D5uwVOEjr07cncLROdBvmnvCATYEWlHqYmXv2IlQA==",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "chardet": "^2.1.0",
-        "iconv-lite": "^0.7.0"
+        "@inquirer/ansi": "^1.0.2",
+        "@inquirer/core": "^10.3.2",
+        "@inquirer/figures": "^1.0.15",
+        "@inquirer/type": "^3.0.10",
+        "yoctocolors-cjs": "^2.1.3"
       },
       "engines": {
         "node": ">=18"
@@ -4179,11 +4182,145 @@
         }
       }
     },
-    "node_modules/@inquirer/external-editor/node_modules/chardet": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/chardet/-/chardet-2.1.0.tgz",
-      "integrity": "sha512-bNFETTG/pM5ryzQ9Ad0lJOTa6HWD/YsScAR3EnCPZRPlQh77JocYktSHOUHelyhm8IARL+o4c4F1bP5KVOjiRA==",
-      "license": "MIT"
+    "node_modules/@inquirer/confirm": {
+      "version": "5.1.21",
+      "resolved": "https://registry.npmjs.org/@inquirer/confirm/-/confirm-5.1.21.tgz",
+      "integrity": "sha512-KR8edRkIsUayMXV+o3Gv+q4jlhENF9nMYUZs9PA2HzrXeHI8M5uDag70U7RJn9yyiMZSbtF5/UexBtAVtZGSbQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@inquirer/core": "^10.3.2",
+        "@inquirer/type": "^3.0.10"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "@types/node": ">=18"
+      },
+      "peerDependenciesMeta": {
+        "@types/node": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@inquirer/core": {
+      "version": "10.3.2",
+      "resolved": "https://registry.npmjs.org/@inquirer/core/-/core-10.3.2.tgz",
+      "integrity": "sha512-43RTuEbfP8MbKzedNqBrlhhNKVwoK//vUFNW3Q3vZ88BLcrs4kYpGg+B2mm5p2K/HfygoCxuKwJJiv8PbGmE0A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@inquirer/ansi": "^1.0.2",
+        "@inquirer/figures": "^1.0.15",
+        "@inquirer/type": "^3.0.10",
+        "cli-width": "^4.1.0",
+        "mute-stream": "^2.0.0",
+        "signal-exit": "^4.1.0",
+        "wrap-ansi": "^6.2.0",
+        "yoctocolors-cjs": "^2.1.3"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "@types/node": ">=18"
+      },
+      "peerDependenciesMeta": {
+        "@types/node": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@inquirer/core/node_modules/mute-stream": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-2.0.0.tgz",
+      "integrity": "sha512-WWdIxpyjEn+FhQJQQv9aQAYlHoNVdzIzUySNV1gHUPDSdZJ3yZn7pAAbQcV7B56Mvu881q9FZV+0Vx2xC44VWA==",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": "^18.17.0 || >=20.5.0"
+      }
+    },
+    "node_modules/@inquirer/core/node_modules/signal-exit": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
+      "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/@inquirer/editor": {
+      "version": "4.2.23",
+      "resolved": "https://registry.npmjs.org/@inquirer/editor/-/editor-4.2.23.tgz",
+      "integrity": "sha512-aLSROkEwirotxZ1pBaP8tugXRFCxW94gwrQLxXfrZsKkfjOYC1aRvAZuhpJOb5cu4IBTJdsCigUlf2iCOu4ZDQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@inquirer/core": "^10.3.2",
+        "@inquirer/external-editor": "^1.0.3",
+        "@inquirer/type": "^3.0.10"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "@types/node": ">=18"
+      },
+      "peerDependenciesMeta": {
+        "@types/node": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@inquirer/expand": {
+      "version": "4.0.23",
+      "resolved": "https://registry.npmjs.org/@inquirer/expand/-/expand-4.0.23.tgz",
+      "integrity": "sha512-nRzdOyFYnpeYTTR2qFwEVmIWypzdAx/sIkCMeTNTcflFOovfqUk+HcFhQQVBftAh9gmGrpFj6QcGEqrDMDOiew==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@inquirer/core": "^10.3.2",
+        "@inquirer/type": "^3.0.10",
+        "yoctocolors-cjs": "^2.1.3"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "@types/node": ">=18"
+      },
+      "peerDependenciesMeta": {
+        "@types/node": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@inquirer/external-editor": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/@inquirer/external-editor/-/external-editor-1.0.3.tgz",
+      "integrity": "sha512-RWbSrDiYmO4LbejWY7ttpxczuwQyZLBUyygsA9Nsv95hpzUWwnNTVQmAq3xuh7vNwCp07UTmE5i11XAEExx4RA==",
+      "license": "MIT",
+      "dependencies": {
+        "chardet": "^2.1.1",
+        "iconv-lite": "^0.7.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "@types/node": ">=18"
+      },
+      "peerDependenciesMeta": {
+        "@types/node": {
+          "optional": true
+        }
+      }
     },
     "node_modules/@inquirer/external-editor/node_modules/iconv-lite": {
       "version": "0.7.0",
@@ -4202,19 +4339,206 @@
       }
     },
     "node_modules/@inquirer/figures": {
-      "version": "1.0.13",
-      "resolved": "https://registry.npmjs.org/@inquirer/figures/-/figures-1.0.13.tgz",
-      "integrity": "sha512-lGPVU3yO9ZNqA7vTYz26jny41lE7yoQansmqdMLBEfqaGsmdg7V3W9mK9Pvb5IL4EVZ9GnSDGMO/cJXud5dMaw==",
+      "version": "1.0.15",
+      "resolved": "https://registry.npmjs.org/@inquirer/figures/-/figures-1.0.15.tgz",
+      "integrity": "sha512-t2IEY+unGHOzAaVM5Xx6DEWKeXlDDcNPeDyUpsRc6CUhBfU3VQOEl+Vssh7VNp1dR8MdUJBWhuObjXCsVpjN5g==",
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=18"
       }
     },
+    "node_modules/@inquirer/input": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/@inquirer/input/-/input-4.3.1.tgz",
+      "integrity": "sha512-kN0pAM4yPrLjJ1XJBjDxyfDduXOuQHrBB8aLDMueuwUGn+vNpF7Gq7TvyVxx8u4SHlFFj4trmj+a2cbpG4Jn1g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@inquirer/core": "^10.3.2",
+        "@inquirer/type": "^3.0.10"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "@types/node": ">=18"
+      },
+      "peerDependenciesMeta": {
+        "@types/node": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@inquirer/number": {
+      "version": "3.0.23",
+      "resolved": "https://registry.npmjs.org/@inquirer/number/-/number-3.0.23.tgz",
+      "integrity": "sha512-5Smv0OK7K0KUzUfYUXDXQc9jrf8OHo4ktlEayFlelCjwMXz0299Y8OrI+lj7i4gCBY15UObk76q0QtxjzFcFcg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@inquirer/core": "^10.3.2",
+        "@inquirer/type": "^3.0.10"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "@types/node": ">=18"
+      },
+      "peerDependenciesMeta": {
+        "@types/node": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@inquirer/password": {
+      "version": "4.0.23",
+      "resolved": "https://registry.npmjs.org/@inquirer/password/-/password-4.0.23.tgz",
+      "integrity": "sha512-zREJHjhT5vJBMZX/IUbyI9zVtVfOLiTO66MrF/3GFZYZ7T4YILW5MSkEYHceSii/KtRk+4i3RE7E1CUXA2jHcA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@inquirer/ansi": "^1.0.2",
+        "@inquirer/core": "^10.3.2",
+        "@inquirer/type": "^3.0.10"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "@types/node": ">=18"
+      },
+      "peerDependenciesMeta": {
+        "@types/node": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@inquirer/prompts": {
+      "version": "7.10.1",
+      "resolved": "https://registry.npmjs.org/@inquirer/prompts/-/prompts-7.10.1.tgz",
+      "integrity": "sha512-Dx/y9bCQcXLI5ooQ5KyvA4FTgeo2jYj/7plWfV5Ak5wDPKQZgudKez2ixyfz7tKXzcJciTxqLeK7R9HItwiByg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@inquirer/checkbox": "^4.3.2",
+        "@inquirer/confirm": "^5.1.21",
+        "@inquirer/editor": "^4.2.23",
+        "@inquirer/expand": "^4.0.23",
+        "@inquirer/input": "^4.3.1",
+        "@inquirer/number": "^3.0.23",
+        "@inquirer/password": "^4.0.23",
+        "@inquirer/rawlist": "^4.1.11",
+        "@inquirer/search": "^3.2.2",
+        "@inquirer/select": "^4.4.2"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "@types/node": ">=18"
+      },
+      "peerDependenciesMeta": {
+        "@types/node": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@inquirer/rawlist": {
+      "version": "4.1.11",
+      "resolved": "https://registry.npmjs.org/@inquirer/rawlist/-/rawlist-4.1.11.tgz",
+      "integrity": "sha512-+LLQB8XGr3I5LZN/GuAHo+GpDJegQwuPARLChlMICNdwW7OwV2izlCSCxN6cqpL0sMXmbKbFcItJgdQq5EBXTw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@inquirer/core": "^10.3.2",
+        "@inquirer/type": "^3.0.10",
+        "yoctocolors-cjs": "^2.1.3"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "@types/node": ">=18"
+      },
+      "peerDependenciesMeta": {
+        "@types/node": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@inquirer/search": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/@inquirer/search/-/search-3.2.2.tgz",
+      "integrity": "sha512-p2bvRfENXCZdWF/U2BXvnSI9h+tuA8iNqtUKb9UWbmLYCRQxd8WkvwWvYn+3NgYaNwdUkHytJMGG4MMLucI1kA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@inquirer/core": "^10.3.2",
+        "@inquirer/figures": "^1.0.15",
+        "@inquirer/type": "^3.0.10",
+        "yoctocolors-cjs": "^2.1.3"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "@types/node": ">=18"
+      },
+      "peerDependenciesMeta": {
+        "@types/node": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@inquirer/select": {
+      "version": "4.4.2",
+      "resolved": "https://registry.npmjs.org/@inquirer/select/-/select-4.4.2.tgz",
+      "integrity": "sha512-l4xMuJo55MAe+N7Qr4rX90vypFwCajSakx59qe/tMaC1aEHWLyw68wF4o0A4SLAY4E0nd+Vt+EyskeDIqu1M6w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@inquirer/ansi": "^1.0.2",
+        "@inquirer/core": "^10.3.2",
+        "@inquirer/figures": "^1.0.15",
+        "@inquirer/type": "^3.0.10",
+        "yoctocolors-cjs": "^2.1.3"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "@types/node": ">=18"
+      },
+      "peerDependenciesMeta": {
+        "@types/node": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@inquirer/type": {
+      "version": "3.0.10",
+      "resolved": "https://registry.npmjs.org/@inquirer/type/-/type-3.0.10.tgz",
+      "integrity": "sha512-BvziSRxfz5Ov8ch0z/n3oijRSEcEsHnhggm4xFZe93DHcUCTlutlq9Ox4SVENAfcRD22UQq7T/atg9Wr3k09eA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "@types/node": ">=18"
+      },
+      "peerDependenciesMeta": {
+        "@types/node": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/@isaacs/cliui": {
       "version": "8.0.2",
       "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz",
       "integrity": "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==",
+      "dev": true,
       "license": "ISC",
       "dependencies": {
         "string-width": "^5.1.2",
@@ -4232,6 +4556,7 @@
       "version": "6.1.0",
       "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz",
       "integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==",
+      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=12"
@@ -4244,6 +4569,7 @@
       "version": "6.2.1",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz",
       "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==",
+      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=12"
@@ -4256,6 +4582,7 @@
       "version": "5.1.2",
       "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz",
       "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "eastasianwidth": "^0.2.0",
@@ -4273,6 +4600,7 @@
       "version": "7.1.0",
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
       "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "ansi-regex": "^6.0.1"
@@ -4288,6 +4616,7 @@
       "version": "8.1.0",
       "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz",
       "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "ansi-styles": "^6.1.0",
@@ -4301,6 +4630,19 @@
         "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
       }
     },
+    "node_modules/@isaacs/fs-minipass": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/@isaacs/fs-minipass/-/fs-minipass-4.0.1.tgz",
+      "integrity": "sha512-wgm9Ehl2jpeqP3zw/7mo3kRHFp5MEDhqAdwy1fTGkHAwnkGOVsgpvQhL8B5n1qlb01jV3n/bI0ZfZp5lWA1k4w==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "minipass": "^7.0.4"
+      },
+      "engines": {
+        "node": ">=18.0.0"
+      }
+    },
     "node_modules/@isaacs/string-locale-compare": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/@isaacs/string-locale-compare/-/string-locale-compare-1.1.0.tgz",
@@ -4531,9 +4873,9 @@
       }
     },
     "node_modules/@jest/console/node_modules/picomatch": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz",
-      "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.4.tgz",
+      "integrity": "sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -4724,9 +5066,9 @@
       }
     },
     "node_modules/@jest/core/node_modules/picomatch": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz",
-      "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.4.tgz",
+      "integrity": "sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -5080,9 +5422,9 @@
       }
     },
     "node_modules/@jest/expect/node_modules/picomatch": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz",
-      "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.4.tgz",
+      "integrity": "sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -5329,9 +5671,9 @@
       }
     },
     "node_modules/@jest/globals/node_modules/picomatch": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz",
-      "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.4.tgz",
+      "integrity": "sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -5486,9 +5828,9 @@
       }
     },
     "node_modules/@jest/reporters/node_modules/brace-expansion": {
-      "version": "5.0.3",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.3.tgz",
-      "integrity": "sha512-fy6KJm2RawA5RcHkLa1z/ScpBeA762UF9KmZQxwIbDtRJrgLzM10depAiEQ+CXYcoiqW1/m96OAAoke2nE9EeA==",
+      "version": "5.0.5",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.5.tgz",
+      "integrity": "sha512-VZznLgtwhn+Mact9tfiwx64fA9erHH/MCXEUfB/0bX/6Fz6ny5EGTXYltMocqg4xFAQZtnO3DHWWXi8RiuN7cQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -5640,9 +5982,9 @@
       }
     },
     "node_modules/@jest/reporters/node_modules/picomatch": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz",
-      "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.4.tgz",
+      "integrity": "sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -5989,9 +6331,9 @@
       }
     },
     "node_modules/@jest/transform/node_modules/picomatch": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz",
-      "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.4.tgz",
+      "integrity": "sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -6182,690 +6524,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/@lerna/create": {
-      "version": "8.2.4",
-      "resolved": "https://registry.npmjs.org/@lerna/create/-/create-8.2.4.tgz",
-      "integrity": "sha512-A8AlzetnS2WIuhijdAzKUyFpR5YbLLfV3luQ4lzBgIBgRfuoBDZeF+RSZPhra+7A6/zTUlrbhKZIOi/MNhqgvQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@npmcli/arborist": "7.5.4",
-        "@npmcli/package-json": "5.2.0",
-        "@npmcli/run-script": "8.1.0",
-        "@nx/devkit": ">=17.1.2 < 21",
-        "@octokit/plugin-enterprise-rest": "6.0.1",
-        "@octokit/rest": "20.1.2",
-        "aproba": "2.0.0",
-        "byte-size": "8.1.1",
-        "chalk": "4.1.0",
-        "clone-deep": "4.0.1",
-        "cmd-shim": "6.0.3",
-        "color-support": "1.1.3",
-        "columnify": "1.6.0",
-        "console-control-strings": "^1.1.0",
-        "conventional-changelog-core": "5.0.1",
-        "conventional-recommended-bump": "7.0.1",
-        "cosmiconfig": "9.0.0",
-        "dedent": "1.5.3",
-        "execa": "5.0.0",
-        "fs-extra": "^11.2.0",
-        "get-stream": "6.0.0",
-        "git-url-parse": "14.0.0",
-        "glob-parent": "6.0.2",
-        "graceful-fs": "4.2.11",
-        "has-unicode": "2.0.1",
-        "ini": "^1.3.8",
-        "init-package-json": "6.0.3",
-        "inquirer": "^8.2.4",
-        "is-ci": "3.0.1",
-        "is-stream": "2.0.0",
-        "js-yaml": "4.1.0",
-        "libnpmpublish": "9.0.9",
-        "load-json-file": "6.2.0",
-        "make-dir": "4.0.0",
-        "minimatch": "3.0.5",
-        "multimatch": "5.0.0",
-        "node-fetch": "2.6.7",
-        "npm-package-arg": "11.0.2",
-        "npm-packlist": "8.0.2",
-        "npm-registry-fetch": "^17.1.0",
-        "nx": ">=17.1.2 < 21",
-        "p-map": "4.0.0",
-        "p-map-series": "2.1.0",
-        "p-queue": "6.6.2",
-        "p-reduce": "^2.1.0",
-        "pacote": "^18.0.6",
-        "pify": "5.0.0",
-        "read-cmd-shim": "4.0.0",
-        "resolve-from": "5.0.0",
-        "rimraf": "^4.4.1",
-        "semver": "^7.3.4",
-        "set-blocking": "^2.0.0",
-        "signal-exit": "3.0.7",
-        "slash": "^3.0.0",
-        "ssri": "^10.0.6",
-        "string-width": "^4.2.3",
-        "tar": "6.2.1",
-        "temp-dir": "1.0.0",
-        "through": "2.3.8",
-        "tinyglobby": "0.2.12",
-        "upath": "2.0.1",
-        "uuid": "^10.0.0",
-        "validate-npm-package-license": "^3.0.4",
-        "validate-npm-package-name": "5.0.1",
-        "wide-align": "1.1.5",
-        "write-file-atomic": "5.0.1",
-        "write-pkg": "4.0.0",
-        "yargs": "17.7.2",
-        "yargs-parser": "21.1.1"
-      },
-      "engines": {
-        "node": ">=18.0.0"
-      }
-    },
-    "node_modules/@lerna/create/node_modules/@octokit/auth-token": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/@octokit/auth-token/-/auth-token-4.0.0.tgz",
-      "integrity": "sha512-tY/msAuJo6ARbK6SPIxZrPBms3xPbfwBrulZe0Wtr/DIY9lje2HeV1uoebShn6mx7SjCHif6EjMvoREj+gZ+SA==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 18"
-      }
-    },
-    "node_modules/@lerna/create/node_modules/@octokit/core": {
-      "version": "5.2.2",
-      "resolved": "https://registry.npmjs.org/@octokit/core/-/core-5.2.2.tgz",
-      "integrity": "sha512-/g2d4sW9nUDJOMz3mabVQvOGhVa4e/BN/Um7yca9Bb2XTzPPnfTWHWQg+IsEYO7M3Vx+EXvaM/I2pJWIMun1bg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@octokit/auth-token": "^4.0.0",
-        "@octokit/graphql": "^7.1.0",
-        "@octokit/request": "^8.4.1",
-        "@octokit/request-error": "^5.1.1",
-        "@octokit/types": "^13.0.0",
-        "before-after-hook": "^2.2.0",
-        "universal-user-agent": "^6.0.0"
-      },
-      "engines": {
-        "node": ">= 18"
-      }
-    },
-    "node_modules/@lerna/create/node_modules/@octokit/endpoint": {
-      "version": "9.0.6",
-      "resolved": "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-9.0.6.tgz",
-      "integrity": "sha512-H1fNTMA57HbkFESSt3Y9+FBICv+0jFceJFPWDePYlR/iMGrwM5ph+Dd4XRQs+8X+PUFURLQgX9ChPfhJ/1uNQw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@octokit/types": "^13.1.0",
-        "universal-user-agent": "^6.0.0"
-      },
-      "engines": {
-        "node": ">= 18"
-      }
-    },
-    "node_modules/@lerna/create/node_modules/@octokit/graphql": {
-      "version": "7.1.1",
-      "resolved": "https://registry.npmjs.org/@octokit/graphql/-/graphql-7.1.1.tgz",
-      "integrity": "sha512-3mkDltSfcDUoa176nlGoA32RGjeWjl3K7F/BwHwRMJUW/IteSa4bnSV8p2ThNkcIcZU2umkZWxwETSSCJf2Q7g==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@octokit/request": "^8.4.1",
-        "@octokit/types": "^13.0.0",
-        "universal-user-agent": "^6.0.0"
-      },
-      "engines": {
-        "node": ">= 18"
-      }
-    },
-    "node_modules/@lerna/create/node_modules/@octokit/openapi-types": {
-      "version": "24.2.0",
-      "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-24.2.0.tgz",
-      "integrity": "sha512-9sIH3nSUttelJSXUrmGzl7QUBFul0/mB8HRYl3fOlgHbIWG+WnYDXU3v/2zMtAvuzZ/ed00Ei6on975FhBfzrg==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/@lerna/create/node_modules/@octokit/plugin-paginate-rest": {
-      "version": "11.4.4-cjs.2",
-      "resolved": "https://registry.npmjs.org/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-11.4.4-cjs.2.tgz",
-      "integrity": "sha512-2dK6z8fhs8lla5PaOTgqfCGBxgAv/le+EhPs27KklPhm1bKObpu6lXzwfUEQ16ajXzqNrKMujsFyo9K2eaoISw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@octokit/types": "^13.7.0"
-      },
-      "engines": {
-        "node": ">= 18"
-      },
-      "peerDependencies": {
-        "@octokit/core": "5"
-      }
-    },
-    "node_modules/@lerna/create/node_modules/@octokit/plugin-request-log": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/@octokit/plugin-request-log/-/plugin-request-log-4.0.1.tgz",
-      "integrity": "sha512-GihNqNpGHorUrO7Qa9JbAl0dbLnqJVrV8OXe2Zm5/Y4wFkZQDfTreBzVmiRfJVfE4mClXdihHnbpyyO9FSX4HA==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 18"
-      },
-      "peerDependencies": {
-        "@octokit/core": "5"
-      }
-    },
-    "node_modules/@lerna/create/node_modules/@octokit/plugin-rest-endpoint-methods": {
-      "version": "13.3.2-cjs.1",
-      "resolved": "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-13.3.2-cjs.1.tgz",
-      "integrity": "sha512-VUjIjOOvF2oELQmiFpWA1aOPdawpyaCUqcEBc/UOUnj3Xp6DJGrJ1+bjUIIDzdHjnFNO6q57ODMfdEZnoBkCwQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@octokit/types": "^13.8.0"
-      },
-      "engines": {
-        "node": ">= 18"
-      },
-      "peerDependencies": {
-        "@octokit/core": "^5"
-      }
-    },
-    "node_modules/@lerna/create/node_modules/@octokit/request": {
-      "version": "8.4.1",
-      "resolved": "https://registry.npmjs.org/@octokit/request/-/request-8.4.1.tgz",
-      "integrity": "sha512-qnB2+SY3hkCmBxZsR/MPCybNmbJe4KAlfWErXq+rBKkQJlbjdJeS85VI9r8UqeLYLvnAenU8Q1okM/0MBsAGXw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@octokit/endpoint": "^9.0.6",
-        "@octokit/request-error": "^5.1.1",
-        "@octokit/types": "^13.1.0",
-        "universal-user-agent": "^6.0.0"
-      },
-      "engines": {
-        "node": ">= 18"
-      }
-    },
-    "node_modules/@lerna/create/node_modules/@octokit/request-error": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/@octokit/request-error/-/request-error-5.1.1.tgz",
-      "integrity": "sha512-v9iyEQJH6ZntoENr9/yXxjuezh4My67CBSu9r6Ve/05Iu5gNgnisNWOsoJHTP6k0Rr0+HQIpnH+kyammu90q/g==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@octokit/types": "^13.1.0",
-        "deprecation": "^2.0.0",
-        "once": "^1.4.0"
-      },
-      "engines": {
-        "node": ">= 18"
-      }
-    },
-    "node_modules/@lerna/create/node_modules/@octokit/rest": {
-      "version": "20.1.2",
-      "resolved": "https://registry.npmjs.org/@octokit/rest/-/rest-20.1.2.tgz",
-      "integrity": "sha512-GmYiltypkHHtihFwPRxlaorG5R9VAHuk/vbszVoRTGXnAsY60wYLkh/E2XiFmdZmqrisw+9FaazS1i5SbdWYgA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@octokit/core": "^5.0.2",
-        "@octokit/plugin-paginate-rest": "11.4.4-cjs.2",
-        "@octokit/plugin-request-log": "^4.0.0",
-        "@octokit/plugin-rest-endpoint-methods": "13.3.2-cjs.1"
-      },
-      "engines": {
-        "node": ">= 18"
-      }
-    },
-    "node_modules/@lerna/create/node_modules/@octokit/types": {
-      "version": "13.10.0",
-      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-13.10.0.tgz",
-      "integrity": "sha512-ifLaO34EbbPj0Xgro4G5lP5asESjwHracYJvVaPIyXMuiuXLlhic3S47cBdTb+jfODkTE5YtGCLt3Ay3+J97sA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@octokit/openapi-types": "^24.2.0"
-      }
-    },
-    "node_modules/@lerna/create/node_modules/argparse": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
-      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
-      "dev": true,
-      "license": "Python-2.0"
-    },
-    "node_modules/@lerna/create/node_modules/before-after-hook": {
-      "version": "2.2.3",
-      "resolved": "https://registry.npmjs.org/before-after-hook/-/before-after-hook-2.2.3.tgz",
-      "integrity": "sha512-NzUnlZexiaH/46WDhANlyR2bXRopNg4F/zuSA3OpZnllCUgRaOF2znDioDWrmbNVsuZk6l9pMquQB38cfBZwkQ==",
-      "dev": true,
-      "license": "Apache-2.0"
-    },
-    "node_modules/@lerna/create/node_modules/chalk": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-      "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/@lerna/create/node_modules/cli-width": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-3.0.0.tgz",
-      "integrity": "sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw==",
-      "dev": true,
-      "license": "ISC",
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/@lerna/create/node_modules/cosmiconfig": {
-      "version": "9.0.0",
-      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-9.0.0.tgz",
-      "integrity": "sha512-itvL5h8RETACmOTFc4UfIyB2RfEHi71Ax6E/PivVxq9NseKbOWpeyHEOIbmAw1rs8Ak0VursQNww7lf7YtUwzg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "env-paths": "^2.2.1",
-        "import-fresh": "^3.3.0",
-        "js-yaml": "^4.1.0",
-        "parse-json": "^5.2.0"
-      },
-      "engines": {
-        "node": ">=14"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/d-fischer"
-      },
-      "peerDependencies": {
-        "typescript": ">=4.9.5"
-      },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@lerna/create/node_modules/dedent": {
-      "version": "1.5.3",
-      "resolved": "https://registry.npmjs.org/dedent/-/dedent-1.5.3.tgz",
-      "integrity": "sha512-NHQtfOOW68WD8lgypbLA5oT+Bt0xXJhiYvoR6SmmNXZfpzOGXwdKWmcwG8N7PwVVWV3eF/68nmD9BaJSsTBhyQ==",
-      "dev": true,
-      "license": "MIT",
-      "peerDependencies": {
-        "babel-plugin-macros": "^3.1.0"
-      },
-      "peerDependenciesMeta": {
-        "babel-plugin-macros": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@lerna/create/node_modules/eventemitter3": {
-      "version": "4.0.7",
-      "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz",
-      "integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/@lerna/create/node_modules/execa": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/execa/-/execa-5.0.0.tgz",
-      "integrity": "sha512-ov6w/2LCiuyO4RLYGdpFGjkcs0wMTgGE8PrkTHikeUy5iJekXyPIKUjifk5CsE0pt7sMCrMZ3YNqoCj6idQOnQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "cross-spawn": "^7.0.3",
-        "get-stream": "^6.0.0",
-        "human-signals": "^2.1.0",
-        "is-stream": "^2.0.0",
-        "merge-stream": "^2.0.0",
-        "npm-run-path": "^4.0.1",
-        "onetime": "^5.1.2",
-        "signal-exit": "^3.0.3",
-        "strip-final-newline": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sindresorhus/execa?sponsor=1"
-      }
-    },
-    "node_modules/@lerna/create/node_modules/fdir": {
-      "version": "6.5.0",
-      "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.5.0.tgz",
-      "integrity": "sha512-tIbYtZbucOs0BRGqPJkshJUYdL+SDH7dVM8gjy+ERp3WAUjLEFJE+02kanyHtwjWOnwrKYBiwAmM0p4kLJAnXg==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=12.0.0"
-      },
-      "peerDependencies": {
-        "picomatch": "^3 || ^4"
-      },
-      "peerDependenciesMeta": {
-        "picomatch": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@lerna/create/node_modules/get-stream": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.0.tgz",
-      "integrity": "sha512-A1B3Bh1UmL0bidM/YX2NsCOTnGJePL9rO/M+Mw3m9f2gUpfokS0hi5Eah0WSUEWZdZhIZtMjkIYS7mDfOqNHbg==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/@lerna/create/node_modules/glob-parent": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
-      "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "is-glob": "^4.0.3"
-      },
-      "engines": {
-        "node": ">=10.13.0"
-      }
-    },
-    "node_modules/@lerna/create/node_modules/ini": {
-      "version": "1.3.8",
-      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
-      "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==",
-      "dev": true,
-      "license": "ISC"
-    },
-    "node_modules/@lerna/create/node_modules/inquirer": {
-      "version": "8.2.7",
-      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-8.2.7.tgz",
-      "integrity": "sha512-UjOaSel/iddGZJ5xP/Eixh6dY1XghiBw4XK13rCCIJcJfyhhoul/7KhLLUGtebEj6GDYM6Vnx/mVsjx2L/mFIA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@inquirer/external-editor": "^1.0.0",
-        "ansi-escapes": "^4.2.1",
-        "chalk": "^4.1.1",
-        "cli-cursor": "^3.1.0",
-        "cli-width": "^3.0.0",
-        "figures": "^3.0.0",
-        "lodash": "^4.17.21",
-        "mute-stream": "0.0.8",
-        "ora": "^5.4.1",
-        "run-async": "^2.4.0",
-        "rxjs": "^7.5.5",
-        "string-width": "^4.1.0",
-        "strip-ansi": "^6.0.0",
-        "through": "^2.3.6",
-        "wrap-ansi": "^6.0.1"
-      },
-      "engines": {
-        "node": ">=12.0.0"
-      }
-    },
-    "node_modules/@lerna/create/node_modules/inquirer/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/@lerna/create/node_modules/is-stream": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz",
-      "integrity": "sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@lerna/create/node_modules/is-unicode-supported": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz",
-      "integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/@lerna/create/node_modules/js-yaml": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
-      "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "argparse": "^2.0.1"
-      },
-      "bin": {
-        "js-yaml": "bin/js-yaml.js"
-      }
-    },
-    "node_modules/@lerna/create/node_modules/log-symbols": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz",
-      "integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "chalk": "^4.1.0",
-        "is-unicode-supported": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/@lerna/create/node_modules/make-dir": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-4.0.0.tgz",
-      "integrity": "sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "semver": "^7.5.3"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/@lerna/create/node_modules/minimatch": {
-      "version": "3.0.5",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.5.tgz",
-      "integrity": "sha512-tUpxzX0VAzJHjLu0xUfFv1gwVp9ba3IOuRAVH2EGuRW8a5emA2FlACLqiT/lDVtS1W+TGNwqz3sWaNyLgDJWuw==",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "brace-expansion": "^1.1.7"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/@lerna/create/node_modules/mute-stream": {
-      "version": "0.0.8",
-      "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz",
-      "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==",
-      "dev": true,
-      "license": "ISC"
-    },
-    "node_modules/@lerna/create/node_modules/ora": {
-      "version": "5.4.1",
-      "resolved": "https://registry.npmjs.org/ora/-/ora-5.4.1.tgz",
-      "integrity": "sha512-5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "bl": "^4.1.0",
-        "chalk": "^4.1.0",
-        "cli-cursor": "^3.1.0",
-        "cli-spinners": "^2.5.0",
-        "is-interactive": "^1.0.0",
-        "is-unicode-supported": "^0.1.0",
-        "log-symbols": "^4.1.0",
-        "strip-ansi": "^6.0.0",
-        "wcwidth": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/@lerna/create/node_modules/p-queue": {
-      "version": "6.6.2",
-      "resolved": "https://registry.npmjs.org/p-queue/-/p-queue-6.6.2.tgz",
-      "integrity": "sha512-RwFpb72c/BhQLEXIZ5K2e+AhgNVmIejGlTgiB9MzZ0e93GRvqZ7uSi0dvRF7/XIXDeNkra2fNHBxTyPDGySpjQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "eventemitter3": "^4.0.4",
-        "p-timeout": "^3.2.0"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/@lerna/create/node_modules/p-timeout": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/p-timeout/-/p-timeout-3.2.0.tgz",
-      "integrity": "sha512-rhIwUycgwwKcP9yTOOFK/AKsAopjjCakVqLHePO3CC6Mir1Z99xT+R63jZxAT5lFZLa2inS5h+ZS2GvR99/FBg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "p-finally": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@lerna/create/node_modules/picomatch": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz",
-      "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/jonschlinkert"
-      }
-    },
-    "node_modules/@lerna/create/node_modules/pify": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/pify/-/pify-5.0.0.tgz",
-      "integrity": "sha512-eW/gHNMlxdSP6dmG6uJip6FXN0EQBwm2clYYd8Wul42Cwu/DK8HEftzsapcNdYe2MfLiIwZqsDk2RDEsTE79hA==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/@lerna/create/node_modules/run-async": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.4.1.tgz",
-      "integrity": "sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.12.0"
-      }
-    },
-    "node_modules/@lerna/create/node_modules/slash": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
-      "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@lerna/create/node_modules/tinyglobby": {
-      "version": "0.2.12",
-      "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.12.tgz",
-      "integrity": "sha512-qkf4trmKSIiMTs/E63cxH+ojC2unam7rJ0WrauAzpT3ECNTxGRMlaXxVbfxMUC/w0LaYk6jQ4y/nGR9uBO3tww==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "fdir": "^6.4.3",
-        "picomatch": "^4.0.2"
-      },
-      "engines": {
-        "node": ">=12.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/SuperchupuDev"
-      }
-    },
-    "node_modules/@lerna/create/node_modules/universal-user-agent": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-6.0.1.tgz",
-      "integrity": "sha512-yCzhz6FN2wU1NiiQRogkTQszlQSlpWaw8SvVegAc+bDxbzHgh1vX8uIe8OYyMH6DwH+sdTJsgMl36+mSMdRJIQ==",
-      "dev": true,
-      "license": "ISC"
-    },
-    "node_modules/@lerna/create/node_modules/uuid": {
-      "version": "10.0.0",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-10.0.0.tgz",
-      "integrity": "sha512-8XkAphELsDnEGrDxUOHB3RGvXz6TeuYSGEZBOjtTtPm2lwhGBjLgOzLHB63IUWfBpNucQjND6d3AOudO+H3RWQ==",
-      "dev": true,
-      "funding": [
-        "https://github.com/sponsors/broofa",
-        "https://github.com/sponsors/ctavan"
-      ],
-      "license": "MIT",
-      "bin": {
-        "uuid": "dist/bin/uuid"
-      }
-    },
     "node_modules/@loaders.gl/3d-tiles": {
       "version": "4.3.4",
       "resolved": "https://registry.npmjs.org/@loaders.gl/3d-tiles/-/3d-tiles-4.3.4.tgz",
@@ -7179,6 +6837,13 @@
         "@loaders.gl/core": "^4.3.0"
       }
     },
+    "node_modules/@ltd/j-toml": {
+      "version": "1.38.0",
+      "resolved": "https://registry.npmjs.org/@ltd/j-toml/-/j-toml-1.38.0.tgz",
+      "integrity": "sha512-lYtBcmvHustHQtg4X7TXUu1Xa/tbLC3p2wLvgQI+fWVySguVZJF60Snxijw5EiohumxZbR10kWYFFebh1zotiw==",
+      "dev": true,
+      "license": "LGPL-3.0"
+    },
     "node_modules/@luma.gl/constants": {
       "version": "9.2.6",
       "resolved": "https://registry.npmjs.org/@luma.gl/constants/-/constants-9.2.6.tgz",
@@ -7300,19 +6965,6 @@
         "geojson-normalize": "geojson-normalize"
       }
     },
-    "node_modules/@mapbox/geojson-rewind": {
-      "version": "0.5.2",
-      "resolved": "https://registry.npmjs.org/@mapbox/geojson-rewind/-/geojson-rewind-0.5.2.tgz",
-      "integrity": "sha512-tJaT+RbYGJYStt7wI3cq4Nl4SXxG8W7JDG5DMJu97V25RnbNg3QtQtf+KD+VLjNpWKYsRvXDNmNrBgEETr1ifA==",
-      "license": "ISC",
-      "dependencies": {
-        "get-stream": "^6.0.1",
-        "minimist": "^1.2.6"
-      },
-      "bin": {
-        "geojson-rewind": "geojson-rewind"
-      }
-    },
     "node_modules/@mapbox/jsonlint-lines-primitives": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/@mapbox/jsonlint-lines-primitives/-/jsonlint-lines-primitives-2.0.2.tgz",
@@ -7340,9 +6992,9 @@
       "license": "ISC"
     },
     "node_modules/@mapbox/tiny-sdf": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/@mapbox/tiny-sdf/-/tiny-sdf-2.0.6.tgz",
-      "integrity": "sha512-qMqa27TLw+ZQz5Jk+RcwZGH7BQf5G/TrutJhspsca/3SHwmgKQ1iq+d3Jxz5oysPVYTGP6aXxCo5Lk9Er6YBAA==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/@mapbox/tiny-sdf/-/tiny-sdf-2.1.0.tgz",
+      "integrity": "sha512-uFJhNh36BR4OCuWIEiWaEix9CA2WzT6CAIcqVjWYpnx8+QDtS+oC4QehRrx5cX4mgWs37MmKnwUejeHxVymzNg==",
       "license": "BSD-2-Clause"
     },
     "node_modules/@mapbox/unitbezier": {
@@ -7369,6 +7021,114 @@
         "node": ">=6.0.0"
       }
     },
+    "node_modules/@maplibre/geojson-vt": {
+      "version": "6.0.4",
+      "resolved": "https://registry.npmjs.org/@maplibre/geojson-vt/-/geojson-vt-6.0.4.tgz",
+      "integrity": "sha512-HYv3POhMRCdhP3UPPATM/hfcy6/WuVIf5FKboH8u/ZuFMTnAIcSVlq5nfOqroLokd925w2QtE7YwquFOIacwVQ==",
+      "license": "ISC",
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "kdbush": "^4.0.2"
+      }
+    },
+    "node_modules/@maplibre/maplibre-gl-style-spec": {
+      "version": "24.8.1",
+      "resolved": "https://registry.npmjs.org/@maplibre/maplibre-gl-style-spec/-/maplibre-gl-style-spec-24.8.1.tgz",
+      "integrity": "sha512-zxa92qF96ZNojLxeAjnaRpjVCy+swoUNJvDhtpC90k7u5F0TMr4GmvNqMKvYrMoPB8d7gRSXbMG1hBbmgESIsw==",
+      "license": "ISC",
+      "dependencies": {
+        "@mapbox/jsonlint-lines-primitives": "~2.0.2",
+        "@mapbox/unitbezier": "^0.0.1",
+        "json-stringify-pretty-compact": "^4.0.0",
+        "minimist": "^1.2.8",
+        "quickselect": "^3.0.0",
+        "rw": "^1.3.3",
+        "tinyqueue": "^3.0.0"
+      },
+      "bin": {
+        "gl-style-format": "dist/gl-style-format.mjs",
+        "gl-style-migrate": "dist/gl-style-migrate.mjs",
+        "gl-style-validate": "dist/gl-style-validate.mjs"
+      }
+    },
+    "node_modules/@maplibre/maplibre-gl-style-spec/node_modules/json-stringify-pretty-compact": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/json-stringify-pretty-compact/-/json-stringify-pretty-compact-4.0.0.tgz",
+      "integrity": "sha512-3CNZ2DnrpByG9Nqj6Xo8vqbjT4F6N+tb4Gb28ESAZjYZ5yqvmc56J+/kuIwkaAMOyblTQhUW7PxMkUb8Q36N3Q==",
+      "license": "MIT"
+    },
+    "node_modules/@maplibre/maplibre-gl-style-spec/node_modules/rw": {
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/rw/-/rw-1.3.3.tgz",
+      "integrity": "sha512-PdhdWy89SiZogBLaw42zdeqtRJ//zFd2PgQavcICDUgJT5oW10QCRKbJ6bg4r0/UY2M6BWd5tkxuGFRvCkgfHQ==",
+      "license": "BSD-3-Clause"
+    },
+    "node_modules/@maplibre/mlt": {
+      "version": "1.1.8",
+      "resolved": "https://registry.npmjs.org/@maplibre/mlt/-/mlt-1.1.8.tgz",
+      "integrity": "sha512-8vtfYGidr1rNkv5IwIoU2lfe3Oy+Wa8HluzQYcQi9cveU9K3pweAal/poQj4GJ0K/EW4bTQp2wVAs09g2yDRZg==",
+      "license": "(MIT OR Apache-2.0)",
+      "dependencies": {
+        "@mapbox/point-geometry": "^1.1.0"
+      }
+    },
+    "node_modules/@maplibre/mlt/node_modules/@mapbox/point-geometry": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@mapbox/point-geometry/-/point-geometry-1.1.0.tgz",
+      "integrity": "sha512-YGcBz1cg4ATXDCM/71L9xveh4dynfGmcLDqufR+nQQy3fKwsAZsWd/x4621/6uJaeB9mwOHE6hPeDgXz9uViUQ==",
+      "license": "ISC"
+    },
+    "node_modules/@maplibre/vt-pbf": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/@maplibre/vt-pbf/-/vt-pbf-4.3.0.tgz",
+      "integrity": "sha512-jIvp8F5hQCcreqOOpEt42TJMUlsrEcpf/kI1T2v85YrQRV6PPXUcEXUg5karKtH6oh47XJZ4kHu56pUkOuqA7w==",
+      "license": "MIT",
+      "dependencies": {
+        "@mapbox/point-geometry": "^1.1.0",
+        "@mapbox/vector-tile": "^2.0.4",
+        "@maplibre/geojson-vt": "^5.0.4",
+        "@types/geojson": "^7946.0.16",
+        "@types/supercluster": "^7.1.3",
+        "pbf": "^4.0.1",
+        "supercluster": "^8.0.1"
+      }
+    },
+    "node_modules/@maplibre/vt-pbf/node_modules/@mapbox/point-geometry": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@mapbox/point-geometry/-/point-geometry-1.1.0.tgz",
+      "integrity": "sha512-YGcBz1cg4ATXDCM/71L9xveh4dynfGmcLDqufR+nQQy3fKwsAZsWd/x4621/6uJaeB9mwOHE6hPeDgXz9uViUQ==",
+      "license": "ISC"
+    },
+    "node_modules/@maplibre/vt-pbf/node_modules/@mapbox/vector-tile": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/@mapbox/vector-tile/-/vector-tile-2.0.4.tgz",
+      "integrity": "sha512-AkOLcbgGTdXScosBWwmmD7cDlvOjkg/DetGva26pIRiZPdeJYjYKarIlb4uxVzi6bwHO6EWH82eZ5Nuv4T5DUg==",
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "@mapbox/point-geometry": "~1.1.0",
+        "@types/geojson": "^7946.0.16",
+        "pbf": "^4.0.1"
+      }
+    },
+    "node_modules/@maplibre/vt-pbf/node_modules/@maplibre/geojson-vt": {
+      "version": "5.0.4",
+      "resolved": "https://registry.npmjs.org/@maplibre/geojson-vt/-/geojson-vt-5.0.4.tgz",
+      "integrity": "sha512-KGg9sma45S+stfH9vPCJk1J0lSDLWZgCT9Y8u8qWZJyjFlP8MNP1WGTxIMYJZjDvVT3PDn05kN1C95Sut1HpgQ==",
+      "license": "ISC"
+    },
+    "node_modules/@maplibre/vt-pbf/node_modules/pbf": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/pbf/-/pbf-4.0.1.tgz",
+      "integrity": "sha512-SuLdBvS42z33m8ejRbInMapQe8n0D3vN/Xd5fmWM3tufNgRQFBpaW2YVJxQZV4iPNqb0vEFvssMEo5w9c6BTIA==",
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "resolve-protobuf-schema": "^2.1.0"
+      },
+      "bin": {
+        "pbf": "bin/pbf"
+      }
+    },
     "node_modules/@math.gl/core": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/@math.gl/core/-/core-4.1.0.tgz",
@@ -7519,6 +7279,18 @@
         "url": "https://paulmillr.com/funding/"
       }
     },
+    "node_modules/@nodable/entities": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/@nodable/entities/-/entities-2.1.0.tgz",
+      "integrity": "sha512-nyT7T3nbMyBI/lvr6L5TyWbFJAI9FTgVRakNoBqCD+PmID8DzFrrNdLLtHMwMszOtqZa8PAOV24ZqDnQrhQINA==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/nodable"
+        }
+      ],
+      "license": "MIT"
+    },
     "node_modules/@nodelib/fs.scandir": {
       "version": "2.1.5",
       "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
@@ -7555,26 +7327,26 @@
       }
     },
     "node_modules/@npmcli/agent": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/@npmcli/agent/-/agent-2.2.2.tgz",
-      "integrity": "sha512-OrcNPXdpSl9UX7qPVRWbmWMCSXrcDa2M9DvrbOTj7ao1S4PlqVFYv9/yLKMkrJKZ/V5A/kDBC690or307i26Og==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/@npmcli/agent/-/agent-4.0.0.tgz",
+      "integrity": "sha512-kAQTcEN9E8ERLVg5AsGwLNoFb+oEG6engbqAU2P43gD4JEIkNGMHdVQ096FsOAAYpZPB0RSt0zgInKIAS1l5QA==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
         "agent-base": "^7.1.0",
         "http-proxy-agent": "^7.0.0",
         "https-proxy-agent": "^7.0.1",
-        "lru-cache": "^10.0.1",
+        "lru-cache": "^11.2.1",
         "socks-proxy-agent": "^8.0.3"
       },
       "engines": {
-        "node": "^16.14.0 || >=18.0.0"
+        "node": "^20.17.0 || >=22.9.0"
       }
     },
     "node_modules/@npmcli/agent/node_modules/agent-base": {
-      "version": "7.1.3",
-      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.3.tgz",
-      "integrity": "sha512-jRR5wdylq8CkOe6hei19GGZnxM6rBGwFl3Bg0YItGDimvjGtAvdZk4Pu6Cl4u4Igsws4a1fd1Vq3ezrhn4KmFw==",
+      "version": "7.1.4",
+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.4.tgz",
+      "integrity": "sha512-MnA+YT8fwfJPgBx3m60MNqakm30XOkyIoH1y6huTQvC0PwZG7ki8NacLBcrPbNoo8vEZy7Jpuk7+jMO+CUovTQ==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -7610,60 +7382,61 @@
       }
     },
     "node_modules/@npmcli/agent/node_modules/lru-cache": {
-      "version": "10.4.3",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz",
-      "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==",
+      "version": "11.2.7",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.2.7.tgz",
+      "integrity": "sha512-aY/R+aEsRelme17KGQa/1ZSIpLpNYYrhcrepKTZgE+W3WM16YMCaPwOHLHsmopZHELU0Ojin1lPVxKR0MihncA==",
       "dev": true,
-      "license": "ISC"
+      "license": "BlueOak-1.0.0",
+      "engines": {
+        "node": "20 || >=22"
+      }
     },
     "node_modules/@npmcli/arborist": {
-      "version": "7.5.4",
-      "resolved": "https://registry.npmjs.org/@npmcli/arborist/-/arborist-7.5.4.tgz",
-      "integrity": "sha512-nWtIc6QwwoUORCRNzKx4ypHqCk3drI+5aeYdMTQQiRCcn4lOOgfQh7WyZobGYTxXPSq1VwV53lkpN/BRlRk08g==",
+      "version": "9.1.6",
+      "resolved": "https://registry.npmjs.org/@npmcli/arborist/-/arborist-9.1.6.tgz",
+      "integrity": "sha512-c5Pr3EG8UP5ollkJy2x+UdEQC5sEHe3H9whYn6hb2HJimAKS4zmoJkx5acCiR/g4P38RnCSMlsYQyyHnKYeLvQ==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
         "@isaacs/string-locale-compare": "^1.1.0",
-        "@npmcli/fs": "^3.1.1",
-        "@npmcli/installed-package-contents": "^2.1.0",
-        "@npmcli/map-workspaces": "^3.0.2",
-        "@npmcli/metavuln-calculator": "^7.1.1",
-        "@npmcli/name-from-folder": "^2.0.0",
-        "@npmcli/node-gyp": "^3.0.0",
-        "@npmcli/package-json": "^5.1.0",
-        "@npmcli/query": "^3.1.0",
-        "@npmcli/redact": "^2.0.0",
-        "@npmcli/run-script": "^8.1.0",
-        "bin-links": "^4.0.4",
-        "cacache": "^18.0.3",
+        "@npmcli/fs": "^4.0.0",
+        "@npmcli/installed-package-contents": "^3.0.0",
+        "@npmcli/map-workspaces": "^5.0.0",
+        "@npmcli/metavuln-calculator": "^9.0.2",
+        "@npmcli/name-from-folder": "^3.0.0",
+        "@npmcli/node-gyp": "^4.0.0",
+        "@npmcli/package-json": "^7.0.0",
+        "@npmcli/query": "^4.0.0",
+        "@npmcli/redact": "^3.0.0",
+        "@npmcli/run-script": "^10.0.0",
+        "bin-links": "^5.0.0",
+        "cacache": "^20.0.1",
         "common-ancestor-path": "^1.0.1",
-        "hosted-git-info": "^7.0.2",
-        "json-parse-even-better-errors": "^3.0.2",
+        "hosted-git-info": "^9.0.0",
         "json-stringify-nice": "^1.1.4",
-        "lru-cache": "^10.2.2",
-        "minimatch": "^9.0.4",
-        "nopt": "^7.2.1",
-        "npm-install-checks": "^6.2.0",
-        "npm-package-arg": "^11.0.2",
-        "npm-pick-manifest": "^9.0.1",
-        "npm-registry-fetch": "^17.0.1",
-        "pacote": "^18.0.6",
-        "parse-conflict-json": "^3.0.0",
-        "proc-log": "^4.2.0",
-        "proggy": "^2.0.0",
+        "lru-cache": "^11.2.1",
+        "minimatch": "^10.0.3",
+        "nopt": "^8.0.0",
+        "npm-install-checks": "^7.1.0",
+        "npm-package-arg": "^13.0.0",
+        "npm-pick-manifest": "^11.0.1",
+        "npm-registry-fetch": "^19.0.0",
+        "pacote": "^21.0.2",
+        "parse-conflict-json": "^4.0.0",
+        "proc-log": "^5.0.0",
+        "proggy": "^3.0.0",
         "promise-all-reject-late": "^1.0.0",
         "promise-call-limit": "^3.0.1",
-        "read-package-json-fast": "^3.0.2",
         "semver": "^7.3.7",
-        "ssri": "^10.0.6",
+        "ssri": "^12.0.0",
         "treeverse": "^3.0.0",
-        "walk-up-path": "^3.0.1"
+        "walk-up-path": "^4.0.0"
       },
       "bin": {
         "arborist": "bin/index.js"
       },
       "engines": {
-        "node": "^16.14.0 || >=18.0.0"
+        "node": "^20.17.0 || >=22.9.0"
       }
     },
     "node_modules/@npmcli/arborist/node_modules/balanced-match": {
@@ -7677,9 +7450,9 @@
       }
     },
     "node_modules/@npmcli/arborist/node_modules/brace-expansion": {
-      "version": "5.0.3",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.3.tgz",
-      "integrity": "sha512-fy6KJm2RawA5RcHkLa1z/ScpBeA762UF9KmZQxwIbDtRJrgLzM10depAiEQ+CXYcoiqW1/m96OAAoke2nE9EeA==",
+      "version": "5.0.5",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.5.tgz",
+      "integrity": "sha512-VZznLgtwhn+Mact9tfiwx64fA9erHH/MCXEUfB/0bX/6Fz6ny5EGTXYltMocqg4xFAQZtnO3DHWWXi8RiuN7cQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -7689,77 +7462,177 @@
         "node": "18 || 20 || >=22"
       }
     },
-    "node_modules/@npmcli/arborist/node_modules/lru-cache": {
-      "version": "10.4.3",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz",
-      "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==",
-      "dev": true,
-      "license": "ISC"
-    },
-    "node_modules/@npmcli/arborist/node_modules/minimatch": {
-      "version": "9.0.7",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.7.tgz",
-      "integrity": "sha512-MOwgjc8tfrpn5QQEvjijjmDVtMw2oL88ugTevzxQnzRLm6l3fVEF2gzU0kYeYYKD8C66+IdGX6peJ4MyUlUnPg==",
+    "node_modules/@npmcli/arborist/node_modules/hosted-git-info": {
+      "version": "9.0.2",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-9.0.2.tgz",
+      "integrity": "sha512-M422h7o/BR3rmCQ8UHi7cyyMqKltdP9Uo+J2fXK+RSAY+wTcKOIRyhTuKv4qn+DJf3g+PL890AzId5KZpX+CBg==",
       "dev": true,
       "license": "ISC",
+      "dependencies": {
+        "lru-cache": "^11.1.0"
+      },
+      "engines": {
+        "node": "^20.17.0 || >=22.9.0"
+      }
+    },
+    "node_modules/@npmcli/arborist/node_modules/lru-cache": {
+      "version": "11.2.7",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.2.7.tgz",
+      "integrity": "sha512-aY/R+aEsRelme17KGQa/1ZSIpLpNYYrhcrepKTZgE+W3WM16YMCaPwOHLHsmopZHELU0Ojin1lPVxKR0MihncA==",
+      "dev": true,
+      "license": "BlueOak-1.0.0",
+      "engines": {
+        "node": "20 || >=22"
+      }
+    },
+    "node_modules/@npmcli/arborist/node_modules/minimatch": {
+      "version": "10.2.4",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.2.4.tgz",
+      "integrity": "sha512-oRjTw/97aTBN0RHbYCdtF1MQfvusSIBQM0IZEgzl6426+8jSC0nF1a/GmnVLpfB9yyr6g6FTqWqiZVbxrtaCIg==",
+      "dev": true,
+      "license": "BlueOak-1.0.0",
       "dependencies": {
         "brace-expansion": "^5.0.2"
       },
       "engines": {
-        "node": ">=16 || 14 >=14.17"
+        "node": "18 || 20 || >=22"
       },
       "funding": {
         "url": "https://github.com/sponsors/isaacs"
       }
     },
+    "node_modules/@npmcli/arborist/node_modules/npm-bundled": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-5.0.0.tgz",
+      "integrity": "sha512-JLSpbzh6UUXIEoqPsYBvVNVmyrjVZ1fzEFbqxKkTJQkWBO3xFzFT+KDnSKQWwOQNbuWRwt5LSD6HOTLGIWzfrw==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "npm-normalize-package-bin": "^5.0.0"
+      },
+      "engines": {
+        "node": "^20.17.0 || >=22.9.0"
+      }
+    },
+    "node_modules/@npmcli/arborist/node_modules/npm-normalize-package-bin": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-5.0.0.tgz",
+      "integrity": "sha512-CJi3OS4JLsNMmr2u07OJlhcrPxCeOeP/4xq67aWNai6TNWWbTrlNDgl8NcFKVlcBKp18GPj+EzbNIgrBfZhsag==",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": "^20.17.0 || >=22.9.0"
+      }
+    },
+    "node_modules/@npmcli/arborist/node_modules/pacote": {
+      "version": "21.5.0",
+      "resolved": "https://registry.npmjs.org/pacote/-/pacote-21.5.0.tgz",
+      "integrity": "sha512-VtZ0SB8mb5Tzw3dXDfVAIjhyVKUHZkS/ZH9/5mpKenwC9sFOXNI0JI7kEF7IMkwOnsWMFrvAZHzx1T5fmrp9FQ==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "@gar/promise-retry": "^1.0.0",
+        "@npmcli/git": "^7.0.0",
+        "@npmcli/installed-package-contents": "^4.0.0",
+        "@npmcli/package-json": "^7.0.0",
+        "@npmcli/promise-spawn": "^9.0.0",
+        "@npmcli/run-script": "^10.0.0",
+        "cacache": "^20.0.0",
+        "fs-minipass": "^3.0.0",
+        "minipass": "^7.0.2",
+        "npm-package-arg": "^13.0.0",
+        "npm-packlist": "^10.0.1",
+        "npm-pick-manifest": "^11.0.1",
+        "npm-registry-fetch": "^19.0.0",
+        "proc-log": "^6.0.0",
+        "sigstore": "^4.0.0",
+        "ssri": "^13.0.0",
+        "tar": "^7.4.3"
+      },
+      "bin": {
+        "pacote": "bin/index.js"
+      },
+      "engines": {
+        "node": "^20.17.0 || >=22.9.0"
+      }
+    },
+    "node_modules/@npmcli/arborist/node_modules/pacote/node_modules/@npmcli/installed-package-contents": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/@npmcli/installed-package-contents/-/installed-package-contents-4.0.0.tgz",
+      "integrity": "sha512-yNyAdkBxB72gtZ4GrwXCM0ZUedo9nIbOMKfGjt6Cu6DXf0p8y1PViZAKDC8q8kv/fufx0WTjRBdSlyrvnP7hmA==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "npm-bundled": "^5.0.0",
+        "npm-normalize-package-bin": "^5.0.0"
+      },
+      "bin": {
+        "installed-package-contents": "bin/index.js"
+      },
+      "engines": {
+        "node": "^20.17.0 || >=22.9.0"
+      }
+    },
+    "node_modules/@npmcli/arborist/node_modules/pacote/node_modules/proc-log": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/proc-log/-/proc-log-6.1.0.tgz",
+      "integrity": "sha512-iG+GYldRf2BQ0UDUAd6JQ/RwzaQy6mXmsk/IzlYyal4A4SNFw54MeH4/tLkF4I5WoWG9SQwuqWzS99jaFQHBuQ==",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": "^20.17.0 || >=22.9.0"
+      }
+    },
+    "node_modules/@npmcli/arborist/node_modules/pacote/node_modules/ssri": {
+      "version": "13.0.1",
+      "resolved": "https://registry.npmjs.org/ssri/-/ssri-13.0.1.tgz",
+      "integrity": "sha512-QUiRf1+u9wPTL/76GTYlKttDEBWV1ga9ZXW8BG6kfdeyyM8LGPix9gROyg9V2+P0xNyF3X2Go526xKFdMZrHSQ==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "minipass": "^7.0.3"
+      },
+      "engines": {
+        "node": "^20.17.0 || >=22.9.0"
+      }
+    },
     "node_modules/@npmcli/fs": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-3.1.1.tgz",
-      "integrity": "sha512-q9CRWjpHCMIh5sVyefoD1cA7PkvILqCZsnSOEUUivORLjxCO/Irmue2DprETiNgEqktDBZaM1Bi+jrarx1XdCg==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-4.0.0.tgz",
+      "integrity": "sha512-/xGlezI6xfGO9NwuJlnwz/K14qD1kCSAGtacBHnGzeAIuJGazcp45KP5NuyARXoKb7cwulAGWVsbeSxdG/cb0Q==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
         "semver": "^7.3.5"
       },
       "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+        "node": "^18.17.0 || >=20.5.0"
       }
     },
     "node_modules/@npmcli/git": {
-      "version": "5.0.8",
-      "resolved": "https://registry.npmjs.org/@npmcli/git/-/git-5.0.8.tgz",
-      "integrity": "sha512-liASfw5cqhjNW9UFd+ruwwdEf/lbOAQjLL2XY2dFW/bkJheXDYZgOyul/4gVvEV4BWkTXjYGmDqMw9uegdbJNQ==",
+      "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/@npmcli/git/-/git-7.0.2.tgz",
+      "integrity": "sha512-oeolHDjExNAJAnlYP2qzNjMX/Xi9bmu78C9dIGr4xjobrSKbuMYCph8lTzn4vnW3NjIqVmw/f8BCfouqyJXlRg==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
-        "@npmcli/promise-spawn": "^7.0.0",
-        "ini": "^4.1.3",
-        "lru-cache": "^10.0.1",
-        "npm-pick-manifest": "^9.0.0",
-        "proc-log": "^4.0.0",
-        "promise-inflight": "^1.0.1",
-        "promise-retry": "^2.0.1",
+        "@gar/promise-retry": "^1.0.0",
+        "@npmcli/promise-spawn": "^9.0.0",
+        "ini": "^6.0.0",
+        "lru-cache": "^11.2.1",
+        "npm-pick-manifest": "^11.0.1",
+        "proc-log": "^6.0.0",
         "semver": "^7.3.5",
-        "which": "^4.0.0"
+        "which": "^6.0.0"
       },
       "engines": {
-        "node": "^16.14.0 || >=18.0.0"
-      }
-    },
-    "node_modules/@npmcli/git/node_modules/ini": {
-      "version": "4.1.3",
-      "resolved": "https://registry.npmjs.org/ini/-/ini-4.1.3.tgz",
-      "integrity": "sha512-X7rqawQBvfdjS10YU1y1YVreA3SsLrW9dX2CewP2EbBJM4ypVNLDkO5y04gejPwKIY9lR+7r9gn3rFPt/kmWFg==",
-      "dev": true,
-      "license": "ISC",
-      "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+        "node": "^20.17.0 || >=22.9.0"
       }
     },
     "node_modules/@npmcli/git/node_modules/isexe": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/isexe/-/isexe-3.1.2.tgz",
-      "integrity": "sha512-mIcis6w+JiQf3P7t7mg/35GKB4T1FQsBOtMIvuKw4YErj5RjtbhcTd5/I30fmkmGMwvI0WlzSNN+27K0QCMkAw==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-4.0.0.tgz",
+      "integrity": "sha512-FFUtZMpoZ8RqHS3XeXEmHWLA4thH+ZxCv2lOiPIn1Xc7CxrqhWzNSDzD+/chS/zbYezmiwWLdQC09JdQKmthOw==",
       "dev": true,
       "license": "BlueOak-1.0.0",
       "engines": {
@@ -7767,59 +7640,82 @@
       }
     },
     "node_modules/@npmcli/git/node_modules/lru-cache": {
-      "version": "10.4.3",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz",
-      "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==",
+      "version": "11.2.7",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.2.7.tgz",
+      "integrity": "sha512-aY/R+aEsRelme17KGQa/1ZSIpLpNYYrhcrepKTZgE+W3WM16YMCaPwOHLHsmopZHELU0Ojin1lPVxKR0MihncA==",
       "dev": true,
-      "license": "ISC"
+      "license": "BlueOak-1.0.0",
+      "engines": {
+        "node": "20 || >=22"
+      }
+    },
+    "node_modules/@npmcli/git/node_modules/proc-log": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/proc-log/-/proc-log-6.1.0.tgz",
+      "integrity": "sha512-iG+GYldRf2BQ0UDUAd6JQ/RwzaQy6mXmsk/IzlYyal4A4SNFw54MeH4/tLkF4I5WoWG9SQwuqWzS99jaFQHBuQ==",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": "^20.17.0 || >=22.9.0"
+      }
     },
     "node_modules/@npmcli/git/node_modules/which": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/which/-/which-4.0.0.tgz",
-      "integrity": "sha512-GlaYyEb07DPxYCKhKzplCWBJtvxZcZMrL+4UkrTSJHHPyZU4mYYTv3qaOe77H7EODLSSopAUFAc6W8U4yqvscg==",
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/which/-/which-6.0.1.tgz",
+      "integrity": "sha512-oGLe46MIrCRqX7ytPUf66EAYvdeMIZYn3WaocqqKZAxrBpkqHfL/qvTyJ/bTk5+AqHCjXmrv3CEWgy368zhRUg==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
-        "isexe": "^3.1.1"
+        "isexe": "^4.0.0"
       },
       "bin": {
         "node-which": "bin/which.js"
       },
       "engines": {
-        "node": "^16.13.0 || >=18.0.0"
+        "node": "^20.17.0 || >=22.9.0"
       }
     },
     "node_modules/@npmcli/installed-package-contents": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/@npmcli/installed-package-contents/-/installed-package-contents-2.1.0.tgz",
-      "integrity": "sha512-c8UuGLeZpm69BryRykLuKRyKFZYJsZSCT4aVY5ds4omyZqJ172ApzgfKJ5eV/r3HgLdUYgFVe54KSFVjKoe27w==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@npmcli/installed-package-contents/-/installed-package-contents-3.0.0.tgz",
+      "integrity": "sha512-fkxoPuFGvxyrH+OQzyTkX2LUEamrF4jZSmxjAtPPHHGO0dqsQ8tTKjnIS8SAnPHdk2I03BDtSMR5K/4loKg79Q==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
-        "npm-bundled": "^3.0.0",
-        "npm-normalize-package-bin": "^3.0.0"
+        "npm-bundled": "^4.0.0",
+        "npm-normalize-package-bin": "^4.0.0"
       },
       "bin": {
         "installed-package-contents": "bin/index.js"
       },
       "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+        "node": "^18.17.0 || >=20.5.0"
       }
     },
     "node_modules/@npmcli/map-workspaces": {
-      "version": "3.0.6",
-      "resolved": "https://registry.npmjs.org/@npmcli/map-workspaces/-/map-workspaces-3.0.6.tgz",
-      "integrity": "sha512-tkYs0OYnzQm6iIRdfy+LcLBjcKuQCeE5YLb8KnrIlutJfheNaPvPpgoFEyEFgbjzl5PLZ3IA/BWAwRU0eHuQDA==",
+      "version": "5.0.3",
+      "resolved": "https://registry.npmjs.org/@npmcli/map-workspaces/-/map-workspaces-5.0.3.tgz",
+      "integrity": "sha512-o2grssXo1e774E5OtEwwrgoszYRh0lqkJH+Pb9r78UcqdGJRDRfhpM8DvZPjzNLLNYeD/rNbjOKM3Ss5UABROw==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
-        "@npmcli/name-from-folder": "^2.0.0",
-        "glob": "^10.2.2",
-        "minimatch": "^9.0.0",
-        "read-package-json-fast": "^3.0.0"
+        "@npmcli/name-from-folder": "^4.0.0",
+        "@npmcli/package-json": "^7.0.0",
+        "glob": "^13.0.0",
+        "minimatch": "^10.0.3"
       },
       "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+        "node": "^20.17.0 || >=22.9.0"
+      }
+    },
+    "node_modules/@npmcli/map-workspaces/node_modules/@npmcli/name-from-folder": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/@npmcli/name-from-folder/-/name-from-folder-4.0.0.tgz",
+      "integrity": "sha512-qfrhVlOSqmKM8i6rkNdZzABj8MKEITGFAY+4teqBziksCQAOLutiAxM1wY2BKEd8KjUSpWmWCYxvXr0y4VTlPg==",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": "^20.17.0 || >=22.9.0"
       }
     },
     "node_modules/@npmcli/map-workspaces/node_modules/balanced-match": {
@@ -7833,9 +7729,9 @@
       }
     },
     "node_modules/@npmcli/map-workspaces/node_modules/brace-expansion": {
-      "version": "5.0.3",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.3.tgz",
-      "integrity": "sha512-fy6KJm2RawA5RcHkLa1z/ScpBeA762UF9KmZQxwIbDtRJrgLzM10depAiEQ+CXYcoiqW1/m96OAAoke2nE9EeA==",
+      "version": "5.0.5",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.5.tgz",
+      "integrity": "sha512-VZznLgtwhn+Mact9tfiwx64fA9erHH/MCXEUfB/0bX/6Fz6ny5EGTXYltMocqg4xFAQZtnO3DHWWXi8RiuN7cQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -7846,97 +7742,140 @@
       }
     },
     "node_modules/@npmcli/map-workspaces/node_modules/glob": {
-      "version": "10.5.0",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-10.5.0.tgz",
-      "integrity": "sha512-DfXN8DfhJ7NH3Oe7cFmu3NCu1wKbkReJ8TorzSAFbSKrlNaQSKfIzqYqVY8zlbs2NLBbWpRiU52GX2PbaBVNkg==",
-      "deprecated": "Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me",
+      "version": "13.0.6",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-13.0.6.tgz",
+      "integrity": "sha512-Wjlyrolmm8uDpm/ogGyXZXb1Z+Ca2B8NbJwqBVg0axK9GbBeoS7yGV6vjXnYdGm6X53iehEuxxbyiKp8QmN4Vw==",
       "dev": true,
-      "license": "ISC",
+      "license": "BlueOak-1.0.0",
       "dependencies": {
-        "foreground-child": "^3.1.0",
-        "jackspeak": "^3.1.2",
-        "minimatch": "^9.0.4",
-        "minipass": "^7.1.2",
-        "package-json-from-dist": "^1.0.0",
-        "path-scurry": "^1.11.1"
+        "minimatch": "^10.2.2",
+        "minipass": "^7.1.3",
+        "path-scurry": "^2.0.2"
       },
-      "bin": {
-        "glob": "dist/esm/bin.mjs"
+      "engines": {
+        "node": "18 || 20 || >=22"
       },
       "funding": {
         "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "node_modules/@npmcli/map-workspaces/node_modules/minimatch": {
-      "version": "9.0.7",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.7.tgz",
-      "integrity": "sha512-MOwgjc8tfrpn5QQEvjijjmDVtMw2oL88ugTevzxQnzRLm6l3fVEF2gzU0kYeYYKD8C66+IdGX6peJ4MyUlUnPg==",
+    "node_modules/@npmcli/map-workspaces/node_modules/lru-cache": {
+      "version": "11.2.7",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.2.7.tgz",
+      "integrity": "sha512-aY/R+aEsRelme17KGQa/1ZSIpLpNYYrhcrepKTZgE+W3WM16YMCaPwOHLHsmopZHELU0Ojin1lPVxKR0MihncA==",
       "dev": true,
-      "license": "ISC",
+      "license": "BlueOak-1.0.0",
+      "engines": {
+        "node": "20 || >=22"
+      }
+    },
+    "node_modules/@npmcli/map-workspaces/node_modules/minimatch": {
+      "version": "10.2.4",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.2.4.tgz",
+      "integrity": "sha512-oRjTw/97aTBN0RHbYCdtF1MQfvusSIBQM0IZEgzl6426+8jSC0nF1a/GmnVLpfB9yyr6g6FTqWqiZVbxrtaCIg==",
+      "dev": true,
+      "license": "BlueOak-1.0.0",
       "dependencies": {
         "brace-expansion": "^5.0.2"
       },
       "engines": {
-        "node": ">=16 || 14 >=14.17"
+        "node": "18 || 20 || >=22"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/@npmcli/map-workspaces/node_modules/path-scurry": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-2.0.2.tgz",
+      "integrity": "sha512-3O/iVVsJAPsOnpwWIeD+d6z/7PmqApyQePUtCndjatj/9I5LylHvt5qluFaBT3I5h3r1ejfR056c+FCv+NnNXg==",
+      "dev": true,
+      "license": "BlueOak-1.0.0",
+      "dependencies": {
+        "lru-cache": "^11.0.0",
+        "minipass": "^7.1.2"
+      },
+      "engines": {
+        "node": "18 || 20 || >=22"
       },
       "funding": {
         "url": "https://github.com/sponsors/isaacs"
       }
     },
     "node_modules/@npmcli/metavuln-calculator": {
-      "version": "7.1.1",
-      "resolved": "https://registry.npmjs.org/@npmcli/metavuln-calculator/-/metavuln-calculator-7.1.1.tgz",
-      "integrity": "sha512-Nkxf96V0lAx3HCpVda7Vw4P23RILgdi/5K1fmj2tZkWIYLpXAN8k2UVVOsW16TsS5F8Ws2I7Cm+PU1/rsVF47g==",
+      "version": "9.0.3",
+      "resolved": "https://registry.npmjs.org/@npmcli/metavuln-calculator/-/metavuln-calculator-9.0.3.tgz",
+      "integrity": "sha512-94GLSYhLXF2t2LAC7pDwLaM4uCARzxShyAQKsirmlNcpidH89VA4/+K1LbJmRMgz5gy65E/QBBWQdUvGLe2Frg==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
-        "cacache": "^18.0.0",
-        "json-parse-even-better-errors": "^3.0.0",
-        "pacote": "^18.0.0",
-        "proc-log": "^4.1.0",
+        "cacache": "^20.0.0",
+        "json-parse-even-better-errors": "^5.0.0",
+        "pacote": "^21.0.0",
+        "proc-log": "^6.0.0",
         "semver": "^7.3.5"
       },
       "engines": {
-        "node": "^16.14.0 || >=18.0.0"
+        "node": "^20.17.0 || >=22.9.0"
+      }
+    },
+    "node_modules/@npmcli/metavuln-calculator/node_modules/proc-log": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/proc-log/-/proc-log-6.1.0.tgz",
+      "integrity": "sha512-iG+GYldRf2BQ0UDUAd6JQ/RwzaQy6mXmsk/IzlYyal4A4SNFw54MeH4/tLkF4I5WoWG9SQwuqWzS99jaFQHBuQ==",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": "^20.17.0 || >=22.9.0"
       }
     },
     "node_modules/@npmcli/name-from-folder": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/@npmcli/name-from-folder/-/name-from-folder-2.0.0.tgz",
-      "integrity": "sha512-pwK+BfEBZJbKdNYpHHRTNBwBoqrN/iIMO0AiGvYsp3Hoaq0WbgGSWQR6SCldZovoDpY3yje5lkFUe6gsDgJ2vg==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@npmcli/name-from-folder/-/name-from-folder-3.0.0.tgz",
+      "integrity": "sha512-61cDL8LUc9y80fXn+lir+iVt8IS0xHqEKwPu/5jCjxQTVoSCmkXvw4vbMrzAMtmghz3/AkiBjhHkDKUH+kf7kA==",
       "dev": true,
       "license": "ISC",
       "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+        "node": "^18.17.0 || >=20.5.0"
       }
     },
     "node_modules/@npmcli/node-gyp": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/@npmcli/node-gyp/-/node-gyp-3.0.0.tgz",
-      "integrity": "sha512-gp8pRXC2oOxu0DUE1/M3bYtb1b3/DbJ5aM113+XJBgfXdussRAsX0YOrOhdd8WvnAR6auDBvJomGAkLKA5ydxA==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/@npmcli/node-gyp/-/node-gyp-4.0.0.tgz",
+      "integrity": "sha512-+t5DZ6mO/QFh78PByMq1fGSAub/agLJZDRfJRMeOSNCt8s9YVlTjmGpIPwPhvXTGUIJk+WszlT0rQa1W33yzNA==",
       "dev": true,
       "license": "ISC",
       "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+        "node": "^18.17.0 || >=20.5.0"
       }
     },
     "node_modules/@npmcli/package-json": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/@npmcli/package-json/-/package-json-5.2.0.tgz",
-      "integrity": "sha512-qe/kiqqkW0AGtvBjL8TJKZk/eBBSpnJkUWvHdQ9jM2lKHXRYYJuyNpJPlJw3c8QjC2ow6NZYiLExhUaeJelbxQ==",
+      "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/@npmcli/package-json/-/package-json-7.0.2.tgz",
+      "integrity": "sha512-0ylN3U5htO1SJTmy2YI78PZZjLkKUGg7EKgukb2CRi0kzyoDr0cfjHAzi7kozVhj2V3SxN1oyKqZ2NSo40z00g==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
-        "@npmcli/git": "^5.0.0",
-        "glob": "^10.2.2",
-        "hosted-git-info": "^7.0.0",
-        "json-parse-even-better-errors": "^3.0.0",
-        "normalize-package-data": "^6.0.0",
-        "proc-log": "^4.0.0",
-        "semver": "^7.5.3"
+        "@npmcli/git": "^7.0.0",
+        "glob": "^11.0.3",
+        "hosted-git-info": "^9.0.0",
+        "json-parse-even-better-errors": "^5.0.0",
+        "proc-log": "^6.0.0",
+        "semver": "^7.5.3",
+        "validate-npm-package-license": "^3.0.4"
       },
       "engines": {
-        "node": "^16.14.0 || >=18.0.0"
+        "node": "^20.17.0 || >=22.9.0"
+      }
+    },
+    "node_modules/@npmcli/package-json/node_modules/@isaacs/cliui": {
+      "version": "9.0.0",
+      "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-9.0.0.tgz",
+      "integrity": "sha512-AokJm4tuBHillT+FpMtxQ60n8ObyXBatq7jD2/JA9dxbDDokKQm8KMht5ibGzLVU9IJDIKK4TPKgMHEYMn3lMg==",
+      "dev": true,
+      "license": "BlueOak-1.0.0",
+      "engines": {
+        "node": ">=18"
       }
     },
     "node_modules/@npmcli/package-json/node_modules/balanced-match": {
@@ -7950,9 +7889,9 @@
       }
     },
     "node_modules/@npmcli/package-json/node_modules/brace-expansion": {
-      "version": "5.0.3",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.3.tgz",
-      "integrity": "sha512-fy6KJm2RawA5RcHkLa1z/ScpBeA762UF9KmZQxwIbDtRJrgLzM10depAiEQ+CXYcoiqW1/m96OAAoke2nE9EeA==",
+      "version": "5.0.5",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.5.tgz",
+      "integrity": "sha512-VZznLgtwhn+Mact9tfiwx64fA9erHH/MCXEUfB/0bX/6Fz6ny5EGTXYltMocqg4xFAQZtnO3DHWWXi8RiuN7cQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -7963,60 +7902,129 @@
       }
     },
     "node_modules/@npmcli/package-json/node_modules/glob": {
-      "version": "10.5.0",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-10.5.0.tgz",
-      "integrity": "sha512-DfXN8DfhJ7NH3Oe7cFmu3NCu1wKbkReJ8TorzSAFbSKrlNaQSKfIzqYqVY8zlbs2NLBbWpRiU52GX2PbaBVNkg==",
+      "version": "11.1.0",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-11.1.0.tgz",
+      "integrity": "sha512-vuNwKSaKiqm7g0THUBu2x7ckSs3XJLXE+2ssL7/MfTGPLLcrJQ/4Uq1CjPTtO5cCIiRxqvN6Twy1qOwhL0Xjcw==",
       "deprecated": "Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me",
       "dev": true,
-      "license": "ISC",
+      "license": "BlueOak-1.0.0",
       "dependencies": {
-        "foreground-child": "^3.1.0",
-        "jackspeak": "^3.1.2",
-        "minimatch": "^9.0.4",
+        "foreground-child": "^3.3.1",
+        "jackspeak": "^4.1.1",
+        "minimatch": "^10.1.1",
         "minipass": "^7.1.2",
         "package-json-from-dist": "^1.0.0",
-        "path-scurry": "^1.11.1"
+        "path-scurry": "^2.0.0"
       },
       "bin": {
         "glob": "dist/esm/bin.mjs"
       },
+      "engines": {
+        "node": "20 || >=22"
+      },
       "funding": {
         "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "node_modules/@npmcli/package-json/node_modules/minimatch": {
-      "version": "9.0.7",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.7.tgz",
-      "integrity": "sha512-MOwgjc8tfrpn5QQEvjijjmDVtMw2oL88ugTevzxQnzRLm6l3fVEF2gzU0kYeYYKD8C66+IdGX6peJ4MyUlUnPg==",
+    "node_modules/@npmcli/package-json/node_modules/hosted-git-info": {
+      "version": "9.0.2",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-9.0.2.tgz",
+      "integrity": "sha512-M422h7o/BR3rmCQ8UHi7cyyMqKltdP9Uo+J2fXK+RSAY+wTcKOIRyhTuKv4qn+DJf3g+PL890AzId5KZpX+CBg==",
       "dev": true,
       "license": "ISC",
+      "dependencies": {
+        "lru-cache": "^11.1.0"
+      },
+      "engines": {
+        "node": "^20.17.0 || >=22.9.0"
+      }
+    },
+    "node_modules/@npmcli/package-json/node_modules/jackspeak": {
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-4.2.3.tgz",
+      "integrity": "sha512-ykkVRwrYvFm1nb2AJfKKYPr0emF6IiXDYUaFx4Zn9ZuIH7MrzEZ3sD5RlqGXNRpHtvUHJyOnCEFxOlNDtGo7wg==",
+      "dev": true,
+      "license": "BlueOak-1.0.0",
+      "dependencies": {
+        "@isaacs/cliui": "^9.0.0"
+      },
+      "engines": {
+        "node": "20 || >=22"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/@npmcli/package-json/node_modules/lru-cache": {
+      "version": "11.2.7",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.2.7.tgz",
+      "integrity": "sha512-aY/R+aEsRelme17KGQa/1ZSIpLpNYYrhcrepKTZgE+W3WM16YMCaPwOHLHsmopZHELU0Ojin1lPVxKR0MihncA==",
+      "dev": true,
+      "license": "BlueOak-1.0.0",
+      "engines": {
+        "node": "20 || >=22"
+      }
+    },
+    "node_modules/@npmcli/package-json/node_modules/minimatch": {
+      "version": "10.2.4",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.2.4.tgz",
+      "integrity": "sha512-oRjTw/97aTBN0RHbYCdtF1MQfvusSIBQM0IZEgzl6426+8jSC0nF1a/GmnVLpfB9yyr6g6FTqWqiZVbxrtaCIg==",
+      "dev": true,
+      "license": "BlueOak-1.0.0",
       "dependencies": {
         "brace-expansion": "^5.0.2"
       },
       "engines": {
-        "node": ">=16 || 14 >=14.17"
+        "node": "18 || 20 || >=22"
       },
       "funding": {
         "url": "https://github.com/sponsors/isaacs"
       }
     },
+    "node_modules/@npmcli/package-json/node_modules/path-scurry": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-2.0.2.tgz",
+      "integrity": "sha512-3O/iVVsJAPsOnpwWIeD+d6z/7PmqApyQePUtCndjatj/9I5LylHvt5qluFaBT3I5h3r1ejfR056c+FCv+NnNXg==",
+      "dev": true,
+      "license": "BlueOak-1.0.0",
+      "dependencies": {
+        "lru-cache": "^11.0.0",
+        "minipass": "^7.1.2"
+      },
+      "engines": {
+        "node": "18 || 20 || >=22"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/@npmcli/package-json/node_modules/proc-log": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/proc-log/-/proc-log-6.1.0.tgz",
+      "integrity": "sha512-iG+GYldRf2BQ0UDUAd6JQ/RwzaQy6mXmsk/IzlYyal4A4SNFw54MeH4/tLkF4I5WoWG9SQwuqWzS99jaFQHBuQ==",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": "^20.17.0 || >=22.9.0"
+      }
+    },
     "node_modules/@npmcli/promise-spawn": {
-      "version": "7.0.2",
-      "resolved": "https://registry.npmjs.org/@npmcli/promise-spawn/-/promise-spawn-7.0.2.tgz",
-      "integrity": "sha512-xhfYPXoV5Dy4UkY0D+v2KkwvnDfiA/8Mt3sWCGI/hM03NsYIH8ZaG6QzS9x7pje5vHZBZJ2v6VRFVTWACnqcmQ==",
+      "version": "9.0.1",
+      "resolved": "https://registry.npmjs.org/@npmcli/promise-spawn/-/promise-spawn-9.0.1.tgz",
+      "integrity": "sha512-OLUaoqBuyxeTqUvjA3FZFiXUfYC1alp3Sa99gW3EUDz3tZ3CbXDdcZ7qWKBzicrJleIgucoWamWH1saAmH/l2Q==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
-        "which": "^4.0.0"
+        "which": "^6.0.0"
       },
       "engines": {
-        "node": "^16.14.0 || >=18.0.0"
+        "node": "^20.17.0 || >=22.9.0"
       }
     },
     "node_modules/@npmcli/promise-spawn/node_modules/isexe": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/isexe/-/isexe-3.1.2.tgz",
-      "integrity": "sha512-mIcis6w+JiQf3P7t7mg/35GKB4T1FQsBOtMIvuKw4YErj5RjtbhcTd5/I30fmkmGMwvI0WlzSNN+27K0QCMkAw==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-4.0.0.tgz",
+      "integrity": "sha512-FFUtZMpoZ8RqHS3XeXEmHWLA4thH+ZxCv2lOiPIn1Xc7CxrqhWzNSDzD+/chS/zbYezmiwWLdQC09JdQKmthOw==",
       "dev": true,
       "license": "BlueOak-1.0.0",
       "engines": {
@@ -8024,116 +8032,162 @@
       }
     },
     "node_modules/@npmcli/promise-spawn/node_modules/which": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/which/-/which-4.0.0.tgz",
-      "integrity": "sha512-GlaYyEb07DPxYCKhKzplCWBJtvxZcZMrL+4UkrTSJHHPyZU4mYYTv3qaOe77H7EODLSSopAUFAc6W8U4yqvscg==",
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/which/-/which-6.0.1.tgz",
+      "integrity": "sha512-oGLe46MIrCRqX7ytPUf66EAYvdeMIZYn3WaocqqKZAxrBpkqHfL/qvTyJ/bTk5+AqHCjXmrv3CEWgy368zhRUg==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
-        "isexe": "^3.1.1"
+        "isexe": "^4.0.0"
       },
       "bin": {
         "node-which": "bin/which.js"
       },
       "engines": {
-        "node": "^16.13.0 || >=18.0.0"
+        "node": "^20.17.0 || >=22.9.0"
       }
     },
     "node_modules/@npmcli/query": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/@npmcli/query/-/query-3.1.0.tgz",
-      "integrity": "sha512-C/iR0tk7KSKGldibYIB9x8GtO/0Bd0I2mhOaDb8ucQL/bQVTmGoeREaFj64Z5+iCBRf3dQfed0CjJL7I8iTkiQ==",
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/@npmcli/query/-/query-4.0.1.tgz",
+      "integrity": "sha512-4OIPFb4weUUwkDXJf4Hh1inAn8neBGq3xsH4ZsAaN6FK3ldrFkH7jSpCc7N9xesi0Sp+EBXJ9eGMDrEww2Ztqw==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
-        "postcss-selector-parser": "^6.0.10"
+        "postcss-selector-parser": "^7.0.0"
       },
       "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+        "node": "^18.17.0 || >=20.5.0"
+      }
+    },
+    "node_modules/@npmcli/query/node_modules/postcss-selector-parser": {
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-7.1.1.tgz",
+      "integrity": "sha512-orRsuYpJVw8LdAwqqLykBj9ecS5/cRHlI5+nvTo8LcCKmzDmqVORXtOIYEEQuL9D4BxtA1lm5isAqzQZCoQ6Eg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "cssesc": "^3.0.0",
+        "util-deprecate": "^1.0.2"
+      },
+      "engines": {
+        "node": ">=4"
       }
     },
     "node_modules/@npmcli/redact": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/@npmcli/redact/-/redact-2.0.1.tgz",
-      "integrity": "sha512-YgsR5jCQZhVmTJvjduTOIHph0L73pK8xwMVaDY0PatySqVM9AZj93jpoXYSJqfHFxFkN9dmqTw6OiqExsS3LPw==",
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/@npmcli/redact/-/redact-3.2.2.tgz",
+      "integrity": "sha512-7VmYAmk4csGv08QzrDKScdzn11jHPFGyqJW39FyPgPuAp3zIaUmuCo1yxw9aGs+NEJuTGQ9Gwqpt93vtJubucg==",
       "dev": true,
       "license": "ISC",
       "engines": {
-        "node": "^16.14.0 || >=18.0.0"
+        "node": "^18.17.0 || >=20.5.0"
       }
     },
     "node_modules/@npmcli/run-script": {
-      "version": "8.1.0",
-      "resolved": "https://registry.npmjs.org/@npmcli/run-script/-/run-script-8.1.0.tgz",
-      "integrity": "sha512-y7efHHwghQfk28G2z3tlZ67pLG0XdfYbcVG26r7YIXALRsrVQcTq4/tdenSmdOrEsNahIYA/eh8aEVROWGFUDg==",
+      "version": "10.0.3",
+      "resolved": "https://registry.npmjs.org/@npmcli/run-script/-/run-script-10.0.3.tgz",
+      "integrity": "sha512-ER2N6itRkzWbbtVmZ9WKaWxVlKlOeBFF1/7xx+KA5J1xKa4JjUwBdb6tDpk0v1qA+d+VDwHI9qmLcXSWcmi+Rw==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
-        "@npmcli/node-gyp": "^3.0.0",
-        "@npmcli/package-json": "^5.0.0",
-        "@npmcli/promise-spawn": "^7.0.0",
-        "node-gyp": "^10.0.0",
-        "proc-log": "^4.0.0",
-        "which": "^4.0.0"
+        "@npmcli/node-gyp": "^5.0.0",
+        "@npmcli/package-json": "^7.0.0",
+        "@npmcli/promise-spawn": "^9.0.0",
+        "node-gyp": "^12.1.0",
+        "proc-log": "^6.0.0",
+        "which": "^6.0.0"
       },
       "engines": {
-        "node": "^16.14.0 || >=18.0.0"
+        "node": "^20.17.0 || >=22.9.0"
+      }
+    },
+    "node_modules/@npmcli/run-script/node_modules/@npmcli/node-gyp": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/@npmcli/node-gyp/-/node-gyp-5.0.0.tgz",
+      "integrity": "sha512-uuG5HZFXLfyFKqg8QypsmgLQW7smiRjVc45bqD/ofZZcR/uxEjgQU8qDPv0s9TEeMUiAAU/GC5bR6++UdTirIQ==",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": "^20.17.0 || >=22.9.0"
       }
     },
     "node_modules/@npmcli/run-script/node_modules/isexe": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/isexe/-/isexe-3.1.2.tgz",
-      "integrity": "sha512-mIcis6w+JiQf3P7t7mg/35GKB4T1FQsBOtMIvuKw4YErj5RjtbhcTd5/I30fmkmGMwvI0WlzSNN+27K0QCMkAw==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-4.0.0.tgz",
+      "integrity": "sha512-FFUtZMpoZ8RqHS3XeXEmHWLA4thH+ZxCv2lOiPIn1Xc7CxrqhWzNSDzD+/chS/zbYezmiwWLdQC09JdQKmthOw==",
       "dev": true,
       "license": "BlueOak-1.0.0",
       "engines": {
         "node": ">=20"
       }
     },
+    "node_modules/@npmcli/run-script/node_modules/proc-log": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/proc-log/-/proc-log-6.1.0.tgz",
+      "integrity": "sha512-iG+GYldRf2BQ0UDUAd6JQ/RwzaQy6mXmsk/IzlYyal4A4SNFw54MeH4/tLkF4I5WoWG9SQwuqWzS99jaFQHBuQ==",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": "^20.17.0 || >=22.9.0"
+      }
+    },
     "node_modules/@npmcli/run-script/node_modules/which": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/which/-/which-4.0.0.tgz",
-      "integrity": "sha512-GlaYyEb07DPxYCKhKzplCWBJtvxZcZMrL+4UkrTSJHHPyZU4mYYTv3qaOe77H7EODLSSopAUFAc6W8U4yqvscg==",
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/which/-/which-6.0.1.tgz",
+      "integrity": "sha512-oGLe46MIrCRqX7ytPUf66EAYvdeMIZYn3WaocqqKZAxrBpkqHfL/qvTyJ/bTk5+AqHCjXmrv3CEWgy368zhRUg==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
-        "isexe": "^3.1.1"
+        "isexe": "^4.0.0"
       },
       "bin": {
         "node-which": "bin/which.js"
       },
       "engines": {
-        "node": "^16.13.0 || >=18.0.0"
+        "node": "^20.17.0 || >=22.9.0"
       }
     },
     "node_modules/@nx/devkit": {
-      "version": "20.8.4",
-      "resolved": "https://registry.npmjs.org/@nx/devkit/-/devkit-20.8.4.tgz",
-      "integrity": "sha512-3r+6QmIXXAWL6K7m8vAbW31aniAZmZAZXeMhOhWcJoOAU7ggpCQaM8JP8/kO5ov/Bmhyf0i/SSVXI6kwiR5WNQ==",
+      "version": "22.6.1",
+      "resolved": "https://registry.npmjs.org/@nx/devkit/-/devkit-22.6.1.tgz",
+      "integrity": "sha512-/mwG9zWY1phsWvMKzP0yZ4pE6aH0kLH31DuCYj4eLbhuUu0STL3xSdjPPzhDHf71R4K3YnuvG97e2qiGDbG5Qw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
+        "@zkochan/js-yaml": "0.0.7",
         "ejs": "^3.1.7",
         "enquirer": "~2.3.6",
-        "ignore": "^5.0.4",
-        "minimatch": "9.0.3",
-        "semver": "^7.5.3",
-        "tmp": "~0.2.1",
+        "minimatch": "10.2.4",
+        "semver": "^7.6.3",
         "tslib": "^2.3.0",
         "yargs-parser": "21.1.1"
       },
       "peerDependencies": {
-        "nx": ">= 19 <= 21"
+        "nx": ">= 21 <= 23 || ^22.0.0-0"
+      }
+    },
+    "node_modules/@nx/devkit/node_modules/balanced-match": {
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-4.0.4.tgz",
+      "integrity": "sha512-BLrgEcRTwX2o6gGxGOCNyMvGSp35YofuYzw9h1IMTRmKqttAZZVU67bdb9Pr2vUHA8+j3i2tJfjO6C6+4myGTA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "18 || 20 || >=22"
       }
     },
     "node_modules/@nx/devkit/node_modules/brace-expansion": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
-      "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
+      "version": "5.0.5",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.5.tgz",
+      "integrity": "sha512-VZznLgtwhn+Mact9tfiwx64fA9erHH/MCXEUfB/0bX/6Fz6ny5EGTXYltMocqg4xFAQZtnO3DHWWXi8RiuN7cQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "balanced-match": "^1.0.0"
+        "balanced-match": "^4.0.2"
+      },
+      "engines": {
+        "node": "18 || 20 || >=22"
       }
     },
     "node_modules/@nx/devkit/node_modules/enquirer": {
@@ -8150,25 +8204,25 @@
       }
     },
     "node_modules/@nx/devkit/node_modules/minimatch": {
-      "version": "9.0.3",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz",
-      "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==",
+      "version": "10.2.4",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.2.4.tgz",
+      "integrity": "sha512-oRjTw/97aTBN0RHbYCdtF1MQfvusSIBQM0IZEgzl6426+8jSC0nF1a/GmnVLpfB9yyr6g6FTqWqiZVbxrtaCIg==",
       "dev": true,
-      "license": "ISC",
+      "license": "BlueOak-1.0.0",
       "dependencies": {
-        "brace-expansion": "^2.0.1"
+        "brace-expansion": "^5.0.2"
       },
       "engines": {
-        "node": ">=16 || 14 >=14.17"
+        "node": "18 || 20 || >=22"
       },
       "funding": {
         "url": "https://github.com/sponsors/isaacs"
       }
     },
     "node_modules/@nx/nx-darwin-arm64": {
-      "version": "20.8.4",
-      "resolved": "https://registry.npmjs.org/@nx/nx-darwin-arm64/-/nx-darwin-arm64-20.8.4.tgz",
-      "integrity": "sha512-8Y7+4wj1qoZsuDRpnuiHzSIsMt3VqtJ0su8dgd/MyGccvvi4pndan2R5yTiVw/wmbMxtBmZ6PO6Z8dgSIrMVog==",
+      "version": "22.6.1",
+      "resolved": "https://registry.npmjs.org/@nx/nx-darwin-arm64/-/nx-darwin-arm64-22.6.1.tgz",
+      "integrity": "sha512-lixkEBGFdEsUiqEZg9LIyjfiTv12Sg1Es/yUgrdOQUAZu+5oiUPMoybyBwrvINl+fZw+PLh66jOmB4GSP2aUMQ==",
       "cpu": [
         "arm64"
       ],
@@ -8177,15 +8231,12 @@
       "optional": true,
       "os": [
         "darwin"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
+      ]
     },
     "node_modules/@nx/nx-darwin-x64": {
-      "version": "20.8.4",
-      "resolved": "https://registry.npmjs.org/@nx/nx-darwin-x64/-/nx-darwin-x64-20.8.4.tgz",
-      "integrity": "sha512-2lfuxRc56QWnAysMhcD03tpCPiRzV1+foUq0MhV2sSBIybXmgV4wHLkPZNhlBCl4FNXrWiZiN1OJ2X9AGiOdug==",
+      "version": "22.6.1",
+      "resolved": "https://registry.npmjs.org/@nx/nx-darwin-x64/-/nx-darwin-x64-22.6.1.tgz",
+      "integrity": "sha512-HvgtOtuWnEf0dpfWb05N0ptdFg040YgzsKFhXg6+qaBJg5Hg0e0AXPKaSgh2PCqCIDlKu40YtwVgF7KXxXAGlA==",
       "cpu": [
         "x64"
       ],
@@ -8194,15 +8245,12 @@
       "optional": true,
       "os": [
         "darwin"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
+      ]
     },
     "node_modules/@nx/nx-freebsd-x64": {
-      "version": "20.8.4",
-      "resolved": "https://registry.npmjs.org/@nx/nx-freebsd-x64/-/nx-freebsd-x64-20.8.4.tgz",
-      "integrity": "sha512-99vnUXZy+OUBHU+8Yhabre2qafepKg9GKkQkhmXvJGqOmuIsepK7wirUFo2PiVM8YhS6UV2rv6hKAZcQ7skYyg==",
+      "version": "22.6.1",
+      "resolved": "https://registry.npmjs.org/@nx/nx-freebsd-x64/-/nx-freebsd-x64-22.6.1.tgz",
+      "integrity": "sha512-g2wUltGX+7/+mdTV5d6ODa0ylrNu/krgb9YdrsbhW6oZeXYm2LeLOAnYqIlL/Kx140NLrb5Kcz7bi7JrBAw4Ow==",
       "cpu": [
         "x64"
       ],
@@ -8211,15 +8259,12 @@
       "optional": true,
       "os": [
         "freebsd"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
+      ]
     },
     "node_modules/@nx/nx-linux-arm-gnueabihf": {
-      "version": "20.8.4",
-      "resolved": "https://registry.npmjs.org/@nx/nx-linux-arm-gnueabihf/-/nx-linux-arm-gnueabihf-20.8.4.tgz",
-      "integrity": "sha512-dht73zpnpzEUEzMHFQs4mfiwZH3WcJgQNWkD5p7WkeJewHq2Yyd0eG5Jg3kB7wnFtwPUV1eNJRM5rephgylkLA==",
+      "version": "22.6.1",
+      "resolved": "https://registry.npmjs.org/@nx/nx-linux-arm-gnueabihf/-/nx-linux-arm-gnueabihf-22.6.1.tgz",
+      "integrity": "sha512-TTqisFPAPrj35EihvzotBbajS+0bX++PQggmRVmDmGwSTrpySRJwZnKNHYDqP6s9tigDvkNJOJftK+GkBEFRRA==",
       "cpu": [
         "arm"
       ],
@@ -8228,15 +8273,12 @@
       "optional": true,
       "os": [
         "linux"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
+      ]
     },
     "node_modules/@nx/nx-linux-arm64-gnu": {
-      "version": "20.8.4",
-      "resolved": "https://registry.npmjs.org/@nx/nx-linux-arm64-gnu/-/nx-linux-arm64-gnu-20.8.4.tgz",
-      "integrity": "sha512-syXxbJZ0yPaqzVmB28QJgUtaarSiW/PQmv/5Z2Ps8rCi7kYylISPVNjP1NNiIOcGDRWbHqoBfM0bEGPfSp0rBQ==",
+      "version": "22.6.1",
+      "resolved": "https://registry.npmjs.org/@nx/nx-linux-arm64-gnu/-/nx-linux-arm64-gnu-22.6.1.tgz",
+      "integrity": "sha512-uIkPcanSTIcyh7/6LOoX0YpGO/7GkVhMRgyM9Mg/7ItFjCtRaeuPEPrJESsaNeB5zIVVhI4cXbGrM9NDnagiiw==",
       "cpu": [
         "arm64"
       ],
@@ -8245,15 +8287,12 @@
       "optional": true,
       "os": [
         "linux"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
+      ]
     },
     "node_modules/@nx/nx-linux-arm64-musl": {
-      "version": "20.8.4",
-      "resolved": "https://registry.npmjs.org/@nx/nx-linux-arm64-musl/-/nx-linux-arm64-musl-20.8.4.tgz",
-      "integrity": "sha512-AlZZFolS/S0FahRKG7rJ0Z9CgmIkyzHgGaoy3qNEMDEjFhR3jt2ZZSLp90W7zjgrxojOo90ajNMrg2UmtcQRDA==",
+      "version": "22.6.1",
+      "resolved": "https://registry.npmjs.org/@nx/nx-linux-arm64-musl/-/nx-linux-arm64-musl-22.6.1.tgz",
+      "integrity": "sha512-eqkG8s/7remiRZ1Lo2zIrFLSNsQ/0x9fAj++CV1nqFE+rfykPQhC48F8pqsq6tUQpI5HqRQEfQgv4CnFNpLR+w==",
       "cpu": [
         "arm64"
       ],
@@ -8262,15 +8301,12 @@
       "optional": true,
       "os": [
         "linux"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
+      ]
     },
     "node_modules/@nx/nx-linux-x64-gnu": {
-      "version": "20.8.4",
-      "resolved": "https://registry.npmjs.org/@nx/nx-linux-x64-gnu/-/nx-linux-x64-gnu-20.8.4.tgz",
-      "integrity": "sha512-MSu+xVNdR95tuuO+eL/a/ZeMlhfrZ627On5xaCZXnJ+lFxNg/S4nlKZQk0Eq5hYALCd/GKgFGasRdlRdOtvGPg==",
+      "version": "22.6.1",
+      "resolved": "https://registry.npmjs.org/@nx/nx-linux-x64-gnu/-/nx-linux-x64-gnu-22.6.1.tgz",
+      "integrity": "sha512-6DhSupCcDa6BYzQ48qsMK4LIdIO+y4E+4xuUBkX2YTGOZh58gctELCv7Gi6/FhiC8rzVzM7hDcygOvHCGc30zA==",
       "cpu": [
         "x64"
       ],
@@ -8279,15 +8315,12 @@
       "optional": true,
       "os": [
         "linux"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
+      ]
     },
     "node_modules/@nx/nx-linux-x64-musl": {
-      "version": "20.8.4",
-      "resolved": "https://registry.npmjs.org/@nx/nx-linux-x64-musl/-/nx-linux-x64-musl-20.8.4.tgz",
-      "integrity": "sha512-KxpQpyLCgIIHWZ4iRSUN9ohCwn1ZSDASbuFCdG3mohryzCy8WrPkuPcb+68J3wuQhmA5w//Xpp/dL0hHoit9zQ==",
+      "version": "22.6.1",
+      "resolved": "https://registry.npmjs.org/@nx/nx-linux-x64-musl/-/nx-linux-x64-musl-22.6.1.tgz",
+      "integrity": "sha512-QqtfaBhdfLRKGucpP8RSv7KJ51XRWpfUcXPhkb/1dKP/b9/Z0kpaCgczGHdrAtX9m6haWw+sQXYGxnStZIg/TQ==",
       "cpu": [
         "x64"
       ],
@@ -8296,15 +8329,12 @@
       "optional": true,
       "os": [
         "linux"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
+      ]
     },
     "node_modules/@nx/nx-win32-arm64-msvc": {
-      "version": "20.8.4",
-      "resolved": "https://registry.npmjs.org/@nx/nx-win32-arm64-msvc/-/nx-win32-arm64-msvc-20.8.4.tgz",
-      "integrity": "sha512-ffLBrxM9ibk+eWSY995kiFFRTSRb9HkD5T1s/uZyxV6jfxYPaZDBAWAETDneyBXps7WtaOMu+kVZlXQ3X+TfIA==",
+      "version": "22.6.1",
+      "resolved": "https://registry.npmjs.org/@nx/nx-win32-arm64-msvc/-/nx-win32-arm64-msvc-22.6.1.tgz",
+      "integrity": "sha512-8pTWXphY5IIgY3edZ5SfzP8yPjBqoAxRV5snAYDctF4e0OC1nDOUims70jLesMle8DTSWiHPSfbLVfp2HkU9WQ==",
       "cpu": [
         "arm64"
       ],
@@ -8313,15 +8343,12 @@
       "optional": true,
       "os": [
         "win32"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
+      ]
     },
     "node_modules/@nx/nx-win32-x64-msvc": {
-      "version": "20.8.4",
-      "resolved": "https://registry.npmjs.org/@nx/nx-win32-x64-msvc/-/nx-win32-x64-msvc-20.8.4.tgz",
-      "integrity": "sha512-JxuuZc4h8EBqoYAiRHwskimpTJx70yn4lhIRFBoW5ICkxXW1Rw0yip/1UVsWRHXg/x9BxmH7VVazdfaQWmGu6A==",
+      "version": "22.6.1",
+      "resolved": "https://registry.npmjs.org/@nx/nx-win32-x64-msvc/-/nx-win32-x64-msvc-22.6.1.tgz",
+      "integrity": "sha512-XMYrtsR5O39uNR4fVpFs65rVB09FyLXvUM735r2rO7IUWWHxHWTAgVcc+gqQaAchBPqR9f1q+3u2i1Inub3Cdw==",
       "cpu": [
         "x64"
       ],
@@ -8330,70 +8357,7 @@
       "optional": true,
       "os": [
         "win32"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/@octokit/auth-token": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/@octokit/auth-token/-/auth-token-5.1.2.tgz",
-      "integrity": "sha512-JcQDsBdg49Yky2w2ld20IHAlwr8d/d8N6NiOXbtuoPCqzbsiJgF633mVUw3x4mo0H5ypataQIX7SFu3yy44Mpw==",
-      "license": "MIT",
-      "engines": {
-        "node": ">= 18"
-      }
-    },
-    "node_modules/@octokit/core": {
-      "version": "6.1.6",
-      "resolved": "https://registry.npmjs.org/@octokit/core/-/core-6.1.6.tgz",
-      "integrity": "sha512-kIU8SLQkYWGp3pVKiYzA5OSaNF5EE03P/R8zEmmrG6XwOg5oBjXyQVVIauQ0dgau4zYhpZEhJrvIYt6oM+zZZA==",
-      "license": "MIT",
-      "dependencies": {
-        "@octokit/auth-token": "^5.0.0",
-        "@octokit/graphql": "^8.2.2",
-        "@octokit/request": "^9.2.3",
-        "@octokit/request-error": "^6.1.8",
-        "@octokit/types": "^14.0.0",
-        "before-after-hook": "^3.0.2",
-        "universal-user-agent": "^7.0.0"
-      },
-      "engines": {
-        "node": ">= 18"
-      }
-    },
-    "node_modules/@octokit/endpoint": {
-      "version": "10.1.4",
-      "resolved": "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-10.1.4.tgz",
-      "integrity": "sha512-OlYOlZIsfEVZm5HCSR8aSg02T2lbUWOsCQoPKfTXJwDzcHQBrVBGdGXb89dv2Kw2ToZaRtudp8O3ZIYoaOjKlA==",
-      "license": "MIT",
-      "dependencies": {
-        "@octokit/types": "^14.0.0",
-        "universal-user-agent": "^7.0.2"
-      },
-      "engines": {
-        "node": ">= 18"
-      }
-    },
-    "node_modules/@octokit/graphql": {
-      "version": "8.2.2",
-      "resolved": "https://registry.npmjs.org/@octokit/graphql/-/graphql-8.2.2.tgz",
-      "integrity": "sha512-Yi8hcoqsrXGdt0yObxbebHXFOiUA+2v3n53epuOg1QUgOB6c4XzvisBNVXJSl8RYA5KrDuSL2yq9Qmqe5N0ryA==",
-      "license": "MIT",
-      "dependencies": {
-        "@octokit/request": "^9.2.3",
-        "@octokit/types": "^14.0.0",
-        "universal-user-agent": "^7.0.0"
-      },
-      "engines": {
-        "node": ">= 18"
-      }
-    },
-    "node_modules/@octokit/openapi-types": {
-      "version": "25.1.0",
-      "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-25.1.0.tgz",
-      "integrity": "sha512-idsIggNXUKkk0+BExUn1dQ92sfysJrje03Q0bv0e+KPLrvyqZF8MnBpFz8UNfYDwB3Ie7Z0TByjWfzxt7vseaA==",
-      "license": "MIT"
+      ]
     },
     "node_modules/@octokit/plugin-enterprise-rest": {
       "version": "6.0.1",
@@ -8402,150 +8366,10 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/@octokit/plugin-paginate-rest": {
-      "version": "11.6.0",
-      "resolved": "https://registry.npmjs.org/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-11.6.0.tgz",
-      "integrity": "sha512-n5KPteiF7pWKgBIBJSk8qzoZWcUkza2O6A0za97pMGVrGfPdltxrfmfF5GucHYvHGZD8BdaZmmHGz5cX/3gdpw==",
-      "license": "MIT",
-      "dependencies": {
-        "@octokit/types": "^13.10.0"
-      },
-      "engines": {
-        "node": ">= 18"
-      },
-      "peerDependencies": {
-        "@octokit/core": ">=6"
-      }
-    },
-    "node_modules/@octokit/plugin-paginate-rest/node_modules/@octokit/openapi-types": {
-      "version": "24.2.0",
-      "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-24.2.0.tgz",
-      "integrity": "sha512-9sIH3nSUttelJSXUrmGzl7QUBFul0/mB8HRYl3fOlgHbIWG+WnYDXU3v/2zMtAvuzZ/ed00Ei6on975FhBfzrg==",
-      "license": "MIT"
-    },
-    "node_modules/@octokit/plugin-paginate-rest/node_modules/@octokit/types": {
-      "version": "13.10.0",
-      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-13.10.0.tgz",
-      "integrity": "sha512-ifLaO34EbbPj0Xgro4G5lP5asESjwHracYJvVaPIyXMuiuXLlhic3S47cBdTb+jfODkTE5YtGCLt3Ay3+J97sA==",
-      "license": "MIT",
-      "dependencies": {
-        "@octokit/openapi-types": "^24.2.0"
-      }
-    },
-    "node_modules/@octokit/plugin-request-log": {
-      "version": "5.3.1",
-      "resolved": "https://registry.npmjs.org/@octokit/plugin-request-log/-/plugin-request-log-5.3.1.tgz",
-      "integrity": "sha512-n/lNeCtq+9ofhC15xzmJCNKP2BWTv8Ih2TTy+jatNCCq/gQP/V7rK3fjIfuz0pDWDALO/o/4QY4hyOF6TQQFUw==",
-      "license": "MIT",
-      "engines": {
-        "node": ">= 18"
-      },
-      "peerDependencies": {
-        "@octokit/core": ">=6"
-      }
-    },
-    "node_modules/@octokit/plugin-rest-endpoint-methods": {
-      "version": "13.5.0",
-      "resolved": "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-13.5.0.tgz",
-      "integrity": "sha512-9Pas60Iv9ejO3WlAX3maE1+38c5nqbJXV5GrncEfkndIpZrJ/WPMRd2xYDcPPEt5yzpxcjw9fWNoPhsSGzqKqw==",
-      "license": "MIT",
-      "dependencies": {
-        "@octokit/types": "^13.10.0"
-      },
-      "engines": {
-        "node": ">= 18"
-      },
-      "peerDependencies": {
-        "@octokit/core": ">=6"
-      }
-    },
-    "node_modules/@octokit/plugin-rest-endpoint-methods/node_modules/@octokit/openapi-types": {
-      "version": "24.2.0",
-      "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-24.2.0.tgz",
-      "integrity": "sha512-9sIH3nSUttelJSXUrmGzl7QUBFul0/mB8HRYl3fOlgHbIWG+WnYDXU3v/2zMtAvuzZ/ed00Ei6on975FhBfzrg==",
-      "license": "MIT"
-    },
-    "node_modules/@octokit/plugin-rest-endpoint-methods/node_modules/@octokit/types": {
-      "version": "13.10.0",
-      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-13.10.0.tgz",
-      "integrity": "sha512-ifLaO34EbbPj0Xgro4G5lP5asESjwHracYJvVaPIyXMuiuXLlhic3S47cBdTb+jfODkTE5YtGCLt3Ay3+J97sA==",
-      "license": "MIT",
-      "dependencies": {
-        "@octokit/openapi-types": "^24.2.0"
-      }
-    },
-    "node_modules/@octokit/request": {
-      "version": "9.2.4",
-      "resolved": "https://registry.npmjs.org/@octokit/request/-/request-9.2.4.tgz",
-      "integrity": "sha512-q8ybdytBmxa6KogWlNa818r0k1wlqzNC+yNkcQDECHvQo8Vmstrg18JwqJHdJdUiHD2sjlwBgSm9kHkOKe2iyA==",
-      "license": "MIT",
-      "dependencies": {
-        "@octokit/endpoint": "^10.1.4",
-        "@octokit/request-error": "^6.1.8",
-        "@octokit/types": "^14.0.0",
-        "fast-content-type-parse": "^2.0.0",
-        "universal-user-agent": "^7.0.2"
-      },
-      "engines": {
-        "node": ">= 18"
-      }
-    },
-    "node_modules/@octokit/request-error": {
-      "version": "6.1.8",
-      "resolved": "https://registry.npmjs.org/@octokit/request-error/-/request-error-6.1.8.tgz",
-      "integrity": "sha512-WEi/R0Jmq+IJKydWlKDmryPcmdYSVjL3ekaiEL1L9eo1sUnqMJ+grqmC9cjk7CA7+b2/T397tO5d8YLOH3qYpQ==",
-      "license": "MIT",
-      "dependencies": {
-        "@octokit/types": "^14.0.0"
-      },
-      "engines": {
-        "node": ">= 18"
-      }
-    },
-    "node_modules/@octokit/request/node_modules/fast-content-type-parse": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/fast-content-type-parse/-/fast-content-type-parse-2.0.1.tgz",
-      "integrity": "sha512-nGqtvLrj5w0naR6tDPfB4cUmYCqouzyQiz6C5y/LtcDllJdrcc6WaWW6iXyIIOErTa/XRybj28aasdn4LkVk6Q==",
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/fastify"
-        },
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/fastify"
-        }
-      ],
-      "license": "MIT"
-    },
-    "node_modules/@octokit/rest": {
-      "version": "21.1.1",
-      "resolved": "https://registry.npmjs.org/@octokit/rest/-/rest-21.1.1.tgz",
-      "integrity": "sha512-sTQV7va0IUVZcntzy1q3QqPm/r8rWtDCqpRAmb8eXXnKkjoQEtFe3Nt5GTVsHft+R6jJoHeSiVLcgcvhtue/rg==",
-      "license": "MIT",
-      "dependencies": {
-        "@octokit/core": "^6.1.4",
-        "@octokit/plugin-paginate-rest": "^11.4.2",
-        "@octokit/plugin-request-log": "^5.3.1",
-        "@octokit/plugin-rest-endpoint-methods": "^13.3.0"
-      },
-      "engines": {
-        "node": ">= 18"
-      }
-    },
-    "node_modules/@octokit/types": {
-      "version": "14.1.0",
-      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-14.1.0.tgz",
-      "integrity": "sha512-1y6DgTy8Jomcpu33N+p5w58l6xyt55Ar2I91RPiIA0xCJBXyUAhXCcmZaDWSANiha7R9a6qJJ2CRomGPZ6f46g==",
-      "license": "MIT",
-      "dependencies": {
-        "@octokit/openapi-types": "^25.1.0"
-      }
-    },
     "node_modules/@oxlint/binding-android-arm-eabi": {
-      "version": "1.53.0",
-      "resolved": "https://registry.npmjs.org/@oxlint/binding-android-arm-eabi/-/binding-android-arm-eabi-1.53.0.tgz",
-      "integrity": "sha512-JC89/jAx4d2zhDIbK8MC4L659FN1WiMXMBkNg7b33KXSkYpUgcbf+0nz7+EPRg+VwWiZVfaoFkNHJ7RXYb5Neg==",
+      "version": "1.61.0",
+      "resolved": "https://registry.npmjs.org/@oxlint/binding-android-arm-eabi/-/binding-android-arm-eabi-1.61.0.tgz",
+      "integrity": "sha512-6eZBPgiigK5txqoVgRqxbaxiom4lM8AP8CyKPPvpzKnQ3iFRFOIDc+0AapF+qsUSwjOzr5SGk4SxQDpQhkSJMQ==",
       "cpu": [
         "arm"
       ],
@@ -8560,9 +8384,9 @@
       }
     },
     "node_modules/@oxlint/binding-android-arm64": {
-      "version": "1.53.0",
-      "resolved": "https://registry.npmjs.org/@oxlint/binding-android-arm64/-/binding-android-arm64-1.53.0.tgz",
-      "integrity": "sha512-CY+pZfi+uyeU7AwFrEnjsNT+VfxYmKLMuk7bVxArd8f+09hQbJb8f7C7EpvTfNqrCK1J8zZlaYI4LltmEctgbQ==",
+      "version": "1.61.0",
+      "resolved": "https://registry.npmjs.org/@oxlint/binding-android-arm64/-/binding-android-arm64-1.61.0.tgz",
+      "integrity": "sha512-CkwLR69MUnyv5wjzebvbbtTSUwqLxM35CXE79bHqDIK+NtKmPEUpStTcLQRZMCo4MP0qRT6TXIQVpK0ZVScnMA==",
       "cpu": [
         "arm64"
       ],
@@ -8577,9 +8401,9 @@
       }
     },
     "node_modules/@oxlint/binding-darwin-arm64": {
-      "version": "1.53.0",
-      "resolved": "https://registry.npmjs.org/@oxlint/binding-darwin-arm64/-/binding-darwin-arm64-1.53.0.tgz",
-      "integrity": "sha512-0aqsC4HDQ94oI6kMz64iaOJ1f3bCVArxvaHJGOScBvFz6CcQedXi5b70Xg09CYjKNaHA56dW0QJfoZ/111kz1A==",
+      "version": "1.61.0",
+      "resolved": "https://registry.npmjs.org/@oxlint/binding-darwin-arm64/-/binding-darwin-arm64-1.61.0.tgz",
+      "integrity": "sha512-8JbefTkbmvqkqWjmQrHke+MdpgT2UghhD/ktM4FOQSpGeCgbMToJEKdl9zwhr/YWTl92i4QI1KiTwVExpcUN8A==",
       "cpu": [
         "arm64"
       ],
@@ -8594,9 +8418,9 @@
       }
     },
     "node_modules/@oxlint/binding-darwin-x64": {
-      "version": "1.53.0",
-      "resolved": "https://registry.npmjs.org/@oxlint/binding-darwin-x64/-/binding-darwin-x64-1.53.0.tgz",
-      "integrity": "sha512-e+KvuaWtnisyWojO/t5qKDbp2dvVpg+1dl4MGnTb21QpY4+4+9Y1XmZPaztcA2XNvy4BIaXFW+9JH9tMpSBqUg==",
+      "version": "1.61.0",
+      "resolved": "https://registry.npmjs.org/@oxlint/binding-darwin-x64/-/binding-darwin-x64-1.61.0.tgz",
+      "integrity": "sha512-uWpoxDT47hTnDLcdEh5jVbso8rlTTu5o0zuqa9J8E0JAKmIWn7kGFEIB03Pycn2hd2vKxybPGLhjURy/9We5FQ==",
       "cpu": [
         "x64"
       ],
@@ -8611,9 +8435,9 @@
       }
     },
     "node_modules/@oxlint/binding-freebsd-x64": {
-      "version": "1.53.0",
-      "resolved": "https://registry.npmjs.org/@oxlint/binding-freebsd-x64/-/binding-freebsd-x64-1.53.0.tgz",
-      "integrity": "sha512-hpU0ZHVeblFjmZDfgi9BxhhCpURh0KjoFy5V+Tvp9sg/fRcnMUEfaJrgz+jQfOX4jctlVWrAs1ANs91+5iV+zA==",
+      "version": "1.61.0",
+      "resolved": "https://registry.npmjs.org/@oxlint/binding-freebsd-x64/-/binding-freebsd-x64-1.61.0.tgz",
+      "integrity": "sha512-K/o4hEyW7flfMel0iBVznmMBt7VIMHGdjADocHKpK1DUF9erpWnJ+BSSWd2W0c8K3mPtpph+CuHzRU6CI3l9jQ==",
       "cpu": [
         "x64"
       ],
@@ -8628,9 +8452,9 @@
       }
     },
     "node_modules/@oxlint/binding-linux-arm-gnueabihf": {
-      "version": "1.53.0",
-      "resolved": "https://registry.npmjs.org/@oxlint/binding-linux-arm-gnueabihf/-/binding-linux-arm-gnueabihf-1.53.0.tgz",
-      "integrity": "sha512-ccKxOpw+X4xa2pO+qbTOpxQ2x1+Ag3ViRQMnWt3gHp1LcpNgS1xd6GYc3OvehmHtrXqEV3YGczZ0I1qpBB4/2A==",
+      "version": "1.61.0",
+      "resolved": "https://registry.npmjs.org/@oxlint/binding-linux-arm-gnueabihf/-/binding-linux-arm-gnueabihf-1.61.0.tgz",
+      "integrity": "sha512-P6040ZkcyweJ0Po9yEFqJCdvZnf3VNCGs1SIHgXDf8AAQNC6ID/heXQs9iSgo2FH7gKaKq32VWc59XZwL34C5Q==",
       "cpu": [
         "arm"
       ],
@@ -8645,9 +8469,9 @@
       }
     },
     "node_modules/@oxlint/binding-linux-arm-musleabihf": {
-      "version": "1.53.0",
-      "resolved": "https://registry.npmjs.org/@oxlint/binding-linux-arm-musleabihf/-/binding-linux-arm-musleabihf-1.53.0.tgz",
-      "integrity": "sha512-UBkBvmzSmlyH2ZObQMDKW/TuyTmUtP/XClPUyU2YLwj0qLopZTZxnDz4VG5d3wz1HQuZXO0o1QqsnQUW1v4a6Q==",
+      "version": "1.61.0",
+      "resolved": "https://registry.npmjs.org/@oxlint/binding-linux-arm-musleabihf/-/binding-linux-arm-musleabihf-1.61.0.tgz",
+      "integrity": "sha512-bwxrGCzTZkuB+THv2TQ1aTkVEfv5oz8sl+0XZZCpoYzErJD8OhPQOTA0ENPd1zJz8QsVdSzSrS2umKtPq4/JXg==",
       "cpu": [
         "arm"
       ],
@@ -8662,9 +8486,9 @@
       }
     },
     "node_modules/@oxlint/binding-linux-arm64-gnu": {
-      "version": "1.53.0",
-      "resolved": "https://registry.npmjs.org/@oxlint/binding-linux-arm64-gnu/-/binding-linux-arm64-gnu-1.53.0.tgz",
-      "integrity": "sha512-PQJJ1izoH9p61las6rZ0BWOznAhTDMmdUPL2IEBLuXFwhy2mSloYHvRkk39PSYJ1DyG+trqU5Z9ZbtHSGH6plg==",
+      "version": "1.61.0",
+      "resolved": "https://registry.npmjs.org/@oxlint/binding-linux-arm64-gnu/-/binding-linux-arm64-gnu-1.61.0.tgz",
+      "integrity": "sha512-vkhb9/wKguMkLlrm3FoJW/Xmdv31GgYAE+x8lxxQ+7HeOxXUySI0q36a3NTVIuQUdLzxCI1zzMGsk1o37FOe3w==",
       "cpu": [
         "arm64"
       ],
@@ -8679,9 +8503,9 @@
       }
     },
     "node_modules/@oxlint/binding-linux-arm64-musl": {
-      "version": "1.53.0",
-      "resolved": "https://registry.npmjs.org/@oxlint/binding-linux-arm64-musl/-/binding-linux-arm64-musl-1.53.0.tgz",
-      "integrity": "sha512-GXI1o4Thn/rtnRIL38BwrDMwVcUbIHKCsOixIWf/CkU3fCG3MXFzFTtDMt+34ik0Qk452d8kcpksL0w/hUkMZA==",
+      "version": "1.61.0",
+      "resolved": "https://registry.npmjs.org/@oxlint/binding-linux-arm64-musl/-/binding-linux-arm64-musl-1.61.0.tgz",
+      "integrity": "sha512-bl1dQh8LnVqsj6oOQAcxwbuOmNJkwc4p6o//HTBZhNTzJy21TLDwAviMqUFNUxDHkPGpmdKTSN4tWTjLryP8xg==",
       "cpu": [
         "arm64"
       ],
@@ -8696,9 +8520,9 @@
       }
     },
     "node_modules/@oxlint/binding-linux-ppc64-gnu": {
-      "version": "1.53.0",
-      "resolved": "https://registry.npmjs.org/@oxlint/binding-linux-ppc64-gnu/-/binding-linux-ppc64-gnu-1.53.0.tgz",
-      "integrity": "sha512-Uahk7IVs2yBamCgeJ3XKpKT9Vh+de0pDKISFKnjEcI3c/w2CFHk1+W6Q6G3KI56HGwE9PWCp6ayhA9whXWkNIQ==",
+      "version": "1.61.0",
+      "resolved": "https://registry.npmjs.org/@oxlint/binding-linux-ppc64-gnu/-/binding-linux-ppc64-gnu-1.61.0.tgz",
+      "integrity": "sha512-QoOX6KB2IiEpyOj/HKqaxi+NQHPnOgNgnr22n9N4ANJCzXkUlj1UmeAbFb4PpqdlHIzvGDM5xZ0OKtcLq9RhiQ==",
       "cpu": [
         "ppc64"
       ],
@@ -8713,9 +8537,9 @@
       }
     },
     "node_modules/@oxlint/binding-linux-riscv64-gnu": {
-      "version": "1.53.0",
-      "resolved": "https://registry.npmjs.org/@oxlint/binding-linux-riscv64-gnu/-/binding-linux-riscv64-gnu-1.53.0.tgz",
-      "integrity": "sha512-sWtcU9UkrKMWsGKdFy8R6jkm9Q0VVG1VCpxVuh0HzRQQi3ENI1Nh5CkpsdfUs2MKRcOoHKbXqTscunuXjhxoxQ==",
+      "version": "1.61.0",
+      "resolved": "https://registry.npmjs.org/@oxlint/binding-linux-riscv64-gnu/-/binding-linux-riscv64-gnu-1.61.0.tgz",
+      "integrity": "sha512-1TGcTerjY6p152wCof3oKElccq3xHljS/Mucp04gV/4ATpP6nO7YNnp7opEg6SHkv2a57/b4b8Ndm9znJ1/qAw==",
       "cpu": [
         "riscv64"
       ],
@@ -8730,9 +8554,9 @@
       }
     },
     "node_modules/@oxlint/binding-linux-riscv64-musl": {
-      "version": "1.53.0",
-      "resolved": "https://registry.npmjs.org/@oxlint/binding-linux-riscv64-musl/-/binding-linux-riscv64-musl-1.53.0.tgz",
-      "integrity": "sha512-aXew1+HDvCdExijX/8NBVC854zJwxhKP3l9AHFSHQNo4EanlHtzDMIlIvP3raUkL0vXtFCkTFYezzU5HjstB8A==",
+      "version": "1.61.0",
+      "resolved": "https://registry.npmjs.org/@oxlint/binding-linux-riscv64-musl/-/binding-linux-riscv64-musl-1.61.0.tgz",
+      "integrity": "sha512-65wXEmZIrX2ADwC8i/qFL4EWLSbeuBpAm3suuX1vu4IQkKd+wLT/HU/BOl84kp91u2SxPkPDyQgu4yrqp8vwVA==",
       "cpu": [
         "riscv64"
       ],
@@ -8747,9 +8571,9 @@
       }
     },
     "node_modules/@oxlint/binding-linux-s390x-gnu": {
-      "version": "1.53.0",
-      "resolved": "https://registry.npmjs.org/@oxlint/binding-linux-s390x-gnu/-/binding-linux-s390x-gnu-1.53.0.tgz",
-      "integrity": "sha512-rVpyBSqPGou9sITcsoXqUoGBUH74bxYLYOAGUqN599Zu6BQBlBU9hh3bJQ/20D1xrhhrsbiCpVPvXpLPM5nL1w==",
+      "version": "1.61.0",
+      "resolved": "https://registry.npmjs.org/@oxlint/binding-linux-s390x-gnu/-/binding-linux-s390x-gnu-1.61.0.tgz",
+      "integrity": "sha512-TVvhgMvor7Qa6COeXxCJ7ENOM+lcAOGsQ0iUdPSCv2hxb9qSHLQ4XF1h50S6RE1gBOJ0WV3rNukg4JJJP1LWRA==",
       "cpu": [
         "s390x"
       ],
@@ -8764,9 +8588,9 @@
       }
     },
     "node_modules/@oxlint/binding-linux-x64-gnu": {
-      "version": "1.53.0",
-      "resolved": "https://registry.npmjs.org/@oxlint/binding-linux-x64-gnu/-/binding-linux-x64-gnu-1.53.0.tgz",
-      "integrity": "sha512-eOyeQ8qFQ2geXmlWJuXAOaek0hFhbMLlYsU457NMLKDRoC43Xf+eDPZ9Yk0n9jDaGJ5zBl/3Dy8wo41cnIXuLA==",
+      "version": "1.61.0",
+      "resolved": "https://registry.npmjs.org/@oxlint/binding-linux-x64-gnu/-/binding-linux-x64-gnu-1.61.0.tgz",
+      "integrity": "sha512-SjpS5uYuFoDnDdZPwZE59ndF95AsY47R5MliuneTWR1pDm2CxGJaYXbKULI71t5TVfLQUWmrHEGRL9xvuq6dnA==",
       "cpu": [
         "x64"
       ],
@@ -8781,9 +8605,9 @@
       }
     },
     "node_modules/@oxlint/binding-linux-x64-musl": {
-      "version": "1.53.0",
-      "resolved": "https://registry.npmjs.org/@oxlint/binding-linux-x64-musl/-/binding-linux-x64-musl-1.53.0.tgz",
-      "integrity": "sha512-S6rBArW/zD1tob8M9PwKYrRmz+j1ss1+wjbRAJCWKd7TC3JB6noDiA95pIj9zOZVVp04MIzy5qymnYusrEyXzg==",
+      "version": "1.61.0",
+      "resolved": "https://registry.npmjs.org/@oxlint/binding-linux-x64-musl/-/binding-linux-x64-musl-1.61.0.tgz",
+      "integrity": "sha512-gGfAeGD4sNJGILZbc/yKcIimO9wQnPMoYp9swAaKeEtwsSQAbU+rsdQze5SBtIP6j0QDzeYd4XSSUCRCF+LIeQ==",
       "cpu": [
         "x64"
       ],
@@ -8798,9 +8622,9 @@
       }
     },
     "node_modules/@oxlint/binding-openharmony-arm64": {
-      "version": "1.53.0",
-      "resolved": "https://registry.npmjs.org/@oxlint/binding-openharmony-arm64/-/binding-openharmony-arm64-1.53.0.tgz",
-      "integrity": "sha512-sd/A0Ny5sN0D/MJtlk7w2jGY4bJQou7gToa9WZF7Sj6HTyVzvlzKJWiOHfr4SulVk4ndiFQ8rKmF9rXP0EcF3A==",
+      "version": "1.61.0",
+      "resolved": "https://registry.npmjs.org/@oxlint/binding-openharmony-arm64/-/binding-openharmony-arm64-1.61.0.tgz",
+      "integrity": "sha512-OlVT0LrG/ct33EVtWRyR+B/othwmDWeRxfi13wUdPeb3lAT5TgTcFDcfLfarZtzB4W1nWF/zICMgYdkggX2WmQ==",
       "cpu": [
         "arm64"
       ],
@@ -8815,9 +8639,9 @@
       }
     },
     "node_modules/@oxlint/binding-win32-arm64-msvc": {
-      "version": "1.53.0",
-      "resolved": "https://registry.npmjs.org/@oxlint/binding-win32-arm64-msvc/-/binding-win32-arm64-msvc-1.53.0.tgz",
-      "integrity": "sha512-QC3q7b51Er/ZurEFcFzc7RpQ/YEoEBLJuCp3WoOzhSHHH/nkUKFy+igOxlj1z3LayhEZPDQQ7sXvv2PM2cdG3Q==",
+      "version": "1.61.0",
+      "resolved": "https://registry.npmjs.org/@oxlint/binding-win32-arm64-msvc/-/binding-win32-arm64-msvc-1.61.0.tgz",
+      "integrity": "sha512-vI//NZPJk6DToiovPtaiwD4iQ7kO1r5ReWQD0sOOyKRtP3E2f6jxin4uvwi3OvDzHA2EFfd7DcZl5dtkQh7g1w==",
       "cpu": [
         "arm64"
       ],
@@ -8832,9 +8656,9 @@
       }
     },
     "node_modules/@oxlint/binding-win32-ia32-msvc": {
-      "version": "1.53.0",
-      "resolved": "https://registry.npmjs.org/@oxlint/binding-win32-ia32-msvc/-/binding-win32-ia32-msvc-1.53.0.tgz",
-      "integrity": "sha512-3OvLgOqwd705hWHV2i8ni80pilvg6BUgpC2+xtVu++e/q28LKVohGh5J5QYJOrRMfWmxK0M/AUu43vUw62LAKQ==",
+      "version": "1.61.0",
+      "resolved": "https://registry.npmjs.org/@oxlint/binding-win32-ia32-msvc/-/binding-win32-ia32-msvc-1.61.0.tgz",
+      "integrity": "sha512-0ySj4/4zd2XjePs3XAQq7IigIstN4LPQZgCyigX5/ERMLjdWAJfnxcTsrtxZxuij8guJW8foXuHmhGxW0H4dDA==",
       "cpu": [
         "ia32"
       ],
@@ -8849,9 +8673,9 @@
       }
     },
     "node_modules/@oxlint/binding-win32-x64-msvc": {
-      "version": "1.53.0",
-      "resolved": "https://registry.npmjs.org/@oxlint/binding-win32-x64-msvc/-/binding-win32-x64-msvc-1.53.0.tgz",
-      "integrity": "sha512-xTiOkntexCdJytZ7ArIIgl3vGW5ujMM3sJNM7/+iqGAVJagCqjFFWn68HRWRLeyT66c95uR+CeFmQFI6mLQqDw==",
+      "version": "1.61.0",
+      "resolved": "https://registry.npmjs.org/@oxlint/binding-win32-x64-msvc/-/binding-win32-x64-msvc-1.61.0.tgz",
+      "integrity": "sha512-0xgSiyeqDLDZxXoe9CVJrOx3TUVsfyoOY7cNi03JbItNcC9WCZqrSNdrAbHONxhSPaVh/lzfnDcON1RqSUMhHw==",
       "cpu": [
         "x64"
       ],
@@ -9034,6 +8858,7 @@
       "version": "0.11.0",
       "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz",
       "integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==",
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "engines": {
@@ -9054,13 +8879,13 @@
       }
     },
     "node_modules/@playwright/test": {
-      "version": "1.58.2",
-      "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.58.2.tgz",
-      "integrity": "sha512-akea+6bHYBBfA9uQqSYmlJXn61cTa+jbO87xVLCWbTqbWadRVmhxlXATaOjOgcBaWU4ePo0wB41KMFv3o35IXA==",
+      "version": "1.59.1",
+      "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.59.1.tgz",
+      "integrity": "sha512-PG6q63nQg5c9rIi4/Z5lR5IVF7yU5MqmKaPOe0HSc0O2cX1fPi96sUQu5j7eo4gKCkB2AnNGoWt7y4/Xx3Kcqg==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
-        "playwright": "1.58.2"
+        "playwright": "1.59.1"
       },
       "bin": {
         "playwright": "cli.js"
@@ -9554,6 +9379,12 @@
       "hasInstallScript": true,
       "license": "Apache-2.0"
     },
+    "node_modules/@sec-ant/readable-stream": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/@sec-ant/readable-stream/-/readable-stream-0.4.1.tgz",
+      "integrity": "sha512-831qok9r2t8AlxLko40y2ebgSDhenenCatLVeW/uBtnHPyhHOvG0C7TvfgecV+wHzIm5KUICgzmVpWS+IMEAeg==",
+      "license": "MIT"
+    },
     "node_modules/@sideway/address": {
       "version": "4.1.5",
       "resolved": "https://registry.npmjs.org/@sideway/address/-/address-4.1.5.tgz",
@@ -9586,32 +9417,32 @@
       "license": "BSD-3-Clause"
     },
     "node_modules/@sigstore/bundle": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/@sigstore/bundle/-/bundle-2.3.2.tgz",
-      "integrity": "sha512-wueKWDk70QixNLB363yHc2D2ItTgYiMTdPwK8D9dKQMR3ZQ0c35IxP5xnwQ8cNLoCgCRcHf14kE+CLIvNX1zmA==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/@sigstore/bundle/-/bundle-4.0.0.tgz",
+      "integrity": "sha512-NwCl5Y0V6Di0NexvkTqdoVfmjTaQwoLM236r89KEojGmq/jMls8S+zb7yOwAPdXvbwfKDlP+lmXgAL4vKSQT+A==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
-        "@sigstore/protobuf-specs": "^0.3.2"
+        "@sigstore/protobuf-specs": "^0.5.0"
       },
       "engines": {
-        "node": "^16.14.0 || >=18.0.0"
+        "node": "^20.17.0 || >=22.9.0"
       }
     },
     "node_modules/@sigstore/core": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@sigstore/core/-/core-1.1.0.tgz",
-      "integrity": "sha512-JzBqdVIyqm2FRQCulY6nbQzMpJJpSiJ8XXWMhtOX9eKgaXXpfNOF53lzQEjIydlStnd/eFtuC1dW4VYdD93oRg==",
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/@sigstore/core/-/core-3.2.0.tgz",
+      "integrity": "sha512-kxHrDQ9YgfrWUSXU0cjsQGv8JykOFZQ9ErNKbFPWzk3Hgpwu8x2hHrQ9IdA8yl+j9RTLTC3sAF3Tdq1IQCP4oA==",
       "dev": true,
       "license": "Apache-2.0",
       "engines": {
-        "node": "^16.14.0 || >=18.0.0"
+        "node": "^20.17.0 || >=22.9.0"
       }
     },
     "node_modules/@sigstore/protobuf-specs": {
-      "version": "0.3.3",
-      "resolved": "https://registry.npmjs.org/@sigstore/protobuf-specs/-/protobuf-specs-0.3.3.tgz",
-      "integrity": "sha512-RpacQhBlwpBWd7KEJsRKcBQalbV28fvkxwTOJIqhIuDysMMaJW47V4OqW30iJB9uRpqOSxxEAQFdr8tTattReQ==",
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/@sigstore/protobuf-specs/-/protobuf-specs-0.5.0.tgz",
+      "integrity": "sha512-MM8XIwUjN2bwvCg1QvrMtbBmpcSHrkhFSCu1D11NyPvDQ25HEc4oG5/OcQfd/Tlf/OxmKWERDj0zGE23jQaMwA==",
       "dev": true,
       "license": "Apache-2.0",
       "engines": {
@@ -9619,50 +9450,166 @@
       }
     },
     "node_modules/@sigstore/sign": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/@sigstore/sign/-/sign-2.3.2.tgz",
-      "integrity": "sha512-5Vz5dPVuunIIvC5vBb0APwo7qKA4G9yM48kPWJT+OEERs40md5GoUR1yedwpekWZ4m0Hhw44m6zU+ObsON+iDA==",
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/@sigstore/sign/-/sign-4.1.1.tgz",
+      "integrity": "sha512-Hf4xglukg0XXQ2RiD5vSoLjdPe8OBUPA8XeVjUObheuDcWdYWrnH/BNmxZCzkAy68MzmNCxXLeurJvs6hcP2OQ==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
-        "@sigstore/bundle": "^2.3.2",
-        "@sigstore/core": "^1.0.0",
-        "@sigstore/protobuf-specs": "^0.3.2",
-        "make-fetch-happen": "^13.0.1",
-        "proc-log": "^4.2.0",
-        "promise-retry": "^2.0.1"
+        "@gar/promise-retry": "^1.0.2",
+        "@sigstore/bundle": "^4.0.0",
+        "@sigstore/core": "^3.2.0",
+        "@sigstore/protobuf-specs": "^0.5.0",
+        "make-fetch-happen": "^15.0.4",
+        "proc-log": "^6.1.0"
       },
       "engines": {
-        "node": "^16.14.0 || >=18.0.0"
+        "node": "^20.17.0 || >=22.9.0"
+      }
+    },
+    "node_modules/@sigstore/sign/node_modules/@npmcli/redact": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/@npmcli/redact/-/redact-4.0.0.tgz",
+      "integrity": "sha512-gOBg5YHMfZy+TfHArfVogwgfBeQnKbbGo3pSUyK/gSI0AVu+pEiDVcKlQb0D8Mg1LNRZILZ6XG8I5dJ4KuAd9Q==",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": "^20.17.0 || >=22.9.0"
+      }
+    },
+    "node_modules/@sigstore/sign/node_modules/iconv-lite": {
+      "version": "0.7.2",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.7.2.tgz",
+      "integrity": "sha512-im9DjEDQ55s9fL4EYzOAv0yMqmMBSZp6G0VvFyTMPKWxiSBHUj9NW/qqLmXUwXrrM7AvqSlTCfvqRb0cM8yYqw==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "safer-buffer": ">= 2.1.2 < 3.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/express"
+      }
+    },
+    "node_modules/@sigstore/sign/node_modules/make-fetch-happen": {
+      "version": "15.0.5",
+      "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-15.0.5.tgz",
+      "integrity": "sha512-uCbIa8jWWmQZt4dSnEStkVC6gdakiinAm4PiGsywIkguF0eWMdcjDz0ECYhUolFU3pFLOev9VNPCEygydXnddg==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "@gar/promise-retry": "^1.0.0",
+        "@npmcli/agent": "^4.0.0",
+        "@npmcli/redact": "^4.0.0",
+        "cacache": "^20.0.1",
+        "http-cache-semantics": "^4.1.1",
+        "minipass": "^7.0.2",
+        "minipass-fetch": "^5.0.0",
+        "minipass-flush": "^1.0.5",
+        "minipass-pipeline": "^1.2.4",
+        "negotiator": "^1.0.0",
+        "proc-log": "^6.0.0",
+        "ssri": "^13.0.0"
+      },
+      "engines": {
+        "node": "^20.17.0 || >=22.9.0"
+      }
+    },
+    "node_modules/@sigstore/sign/node_modules/minipass-fetch": {
+      "version": "5.0.2",
+      "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-5.0.2.tgz",
+      "integrity": "sha512-2d0q2a8eCi2IRg/IGubCNRJoYbA1+YPXAzQVRFmB45gdGZafyivnZ5YSEfo3JikbjGxOdntGFvBQGqaSMXlAFQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "minipass": "^7.0.3",
+        "minipass-sized": "^2.0.0",
+        "minizlib": "^3.0.1"
+      },
+      "engines": {
+        "node": "^20.17.0 || >=22.9.0"
+      },
+      "optionalDependencies": {
+        "iconv-lite": "^0.7.2"
+      }
+    },
+    "node_modules/@sigstore/sign/node_modules/minipass-sized": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/minipass-sized/-/minipass-sized-2.0.0.tgz",
+      "integrity": "sha512-zSsHhto5BcUVM2m1LurnXY6M//cGhVaegT71OfOXoprxT6o780GZd792ea6FfrQkuU4usHZIUczAQMRUE2plzA==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "minipass": "^7.1.2"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@sigstore/sign/node_modules/negotiator": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-1.0.0.tgz",
+      "integrity": "sha512-8Ofs/AUQh8MaEcrlq5xOX0CQ9ypTF5dl78mjlMNfOK08fzpgTHQRQPBxcPlEtIw0yRpws+Zo/3r+5WRby7u3Gg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/@sigstore/sign/node_modules/proc-log": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/proc-log/-/proc-log-6.1.0.tgz",
+      "integrity": "sha512-iG+GYldRf2BQ0UDUAd6JQ/RwzaQy6mXmsk/IzlYyal4A4SNFw54MeH4/tLkF4I5WoWG9SQwuqWzS99jaFQHBuQ==",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": "^20.17.0 || >=22.9.0"
+      }
+    },
+    "node_modules/@sigstore/sign/node_modules/ssri": {
+      "version": "13.0.1",
+      "resolved": "https://registry.npmjs.org/ssri/-/ssri-13.0.1.tgz",
+      "integrity": "sha512-QUiRf1+u9wPTL/76GTYlKttDEBWV1ga9ZXW8BG6kfdeyyM8LGPix9gROyg9V2+P0xNyF3X2Go526xKFdMZrHSQ==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "minipass": "^7.0.3"
+      },
+      "engines": {
+        "node": "^20.17.0 || >=22.9.0"
       }
     },
     "node_modules/@sigstore/tuf": {
-      "version": "2.3.4",
-      "resolved": "https://registry.npmjs.org/@sigstore/tuf/-/tuf-2.3.4.tgz",
-      "integrity": "sha512-44vtsveTPUpqhm9NCrbU8CWLe3Vck2HO1PNLw7RIajbB7xhtn5RBPm1VNSCMwqGYHhDsBJG8gDF0q4lgydsJvw==",
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/@sigstore/tuf/-/tuf-4.0.2.tgz",
+      "integrity": "sha512-TCAzTy0xzdP79EnxSjq9KQ3eaR7+FmudLC6eRKknVKZbV7ZNlGLClAAQb/HMNJ5n2OBNk2GT1tEmU0xuPr+SLQ==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
-        "@sigstore/protobuf-specs": "^0.3.2",
-        "tuf-js": "^2.2.1"
+        "@sigstore/protobuf-specs": "^0.5.0",
+        "tuf-js": "^4.1.0"
       },
       "engines": {
-        "node": "^16.14.0 || >=18.0.0"
+        "node": "^20.17.0 || >=22.9.0"
       }
     },
     "node_modules/@sigstore/verify": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/@sigstore/verify/-/verify-1.2.1.tgz",
-      "integrity": "sha512-8iKx79/F73DKbGfRf7+t4dqrc0bRr0thdPrxAtCKWRm/F0tG71i6O1rvlnScncJLLBZHn3h8M3c1BSUAb9yu8g==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/@sigstore/verify/-/verify-3.1.0.tgz",
+      "integrity": "sha512-mNe0Iigql08YupSOGv197YdHpPPr+EzDZmfCgMc7RPNaZTw5aLN01nBl6CHJOh3BGtnMIj83EeN4butBchc8Ag==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
-        "@sigstore/bundle": "^2.3.2",
-        "@sigstore/core": "^1.1.0",
-        "@sigstore/protobuf-specs": "^0.3.2"
+        "@sigstore/bundle": "^4.0.0",
+        "@sigstore/core": "^3.1.0",
+        "@sigstore/protobuf-specs": "^0.5.0"
       },
       "engines": {
-        "node": "^16.14.0 || >=18.0.0"
+        "node": "^20.17.0 || >=22.9.0"
       }
     },
     "node_modules/@sinclair/typebox": {
@@ -9677,6 +9624,8 @@
       "resolved": "https://registry.npmjs.org/@sindresorhus/merge-streams/-/merge-streams-2.3.0.tgz",
       "integrity": "sha512-LtoMMhxAlorcGhmFYI+LhPgbPZCkgP6ra1YL604EeF6U98pLlQ3iWIGMdWSC+vWmPBWBNgmDBAhnAobLROJmwg==",
       "license": "MIT",
+      "optional": true,
+      "peer": true,
       "engines": {
         "node": ">=18"
       },
@@ -9705,16 +9654,16 @@
       }
     },
     "node_modules/@standard-schema/spec": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/@standard-schema/spec/-/spec-1.0.0.tgz",
-      "integrity": "sha512-m2bOd0f2RT9k8QJx1JN85cZYyH1RqFBdlwtkSlf4tBDYLCiiZnv1fIIwacK6cqwXavOydf0NPToMQgpKq+dVlA==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@standard-schema/spec/-/spec-1.1.0.tgz",
+      "integrity": "sha512-l2aFy5jALhniG5HgqrD6jXLi/rUWrKvqN/qJx6yoJsgKhblVd+iqqU4RCXavm/jPityDo5TCvKMnpjKnOriy0w==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/@storybook/addon-actions": {
-      "version": "8.6.17",
-      "resolved": "https://registry.npmjs.org/@storybook/addon-actions/-/addon-actions-8.6.17.tgz",
-      "integrity": "sha512-/G3Y7WIzGHMtKT6r3KCqgY/pAzfMhNHvBoRWoPfxMa27GiwmUaJlbfRPSReK/jGz6ye0Uwqix+NFbRXKiTqOJQ==",
+      "version": "8.6.18",
+      "resolved": "https://registry.npmjs.org/@storybook/addon-actions/-/addon-actions-8.6.18.tgz",
+      "integrity": "sha512-GcYhtE91GjIQTuZlwpTJ8jfMp6NC79nkpe1DGe0eetTpyQqLq1WUt+ACkk0Z5lqq2u8HBc09zCCGw+D8iCLpYQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -9729,7 +9678,7 @@
         "url": "https://opencollective.com/storybook"
       },
       "peerDependencies": {
-        "storybook": "8.6.17"
+        "storybook": "8.6.18"
       }
     },
     "node_modules/@storybook/addon-actions/node_modules/uuid": {
@@ -9747,9 +9696,9 @@
       }
     },
     "node_modules/@storybook/addon-controls": {
-      "version": "8.6.17",
-      "resolved": "https://registry.npmjs.org/@storybook/addon-controls/-/addon-controls-8.6.17.tgz",
-      "integrity": "sha512-kquUfiJyJMh8IHviTIz1A4UKqqNfvqrYFku9D3UukqkTriM1ngDOb9nryaJcUNTkco5JmIuGjYEJisva+u13lw==",
+      "version": "8.6.18",
+      "resolved": "https://registry.npmjs.org/@storybook/addon-controls/-/addon-controls-8.6.18.tgz",
+      "integrity": "sha512-K09dHDCfGW3cudsfuyfu0Yi49aZ2h7VYK4IXDGo1sfmtzVh4xd3HrZQQMVUeKLcfDP/NnJowT+fLVwg04CLrxQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -9762,25 +9711,25 @@
         "url": "https://opencollective.com/storybook"
       },
       "peerDependencies": {
-        "storybook": "8.6.17"
+        "storybook": "8.6.18"
       }
     },
     "node_modules/@storybook/addon-essentials": {
-      "version": "8.6.17",
-      "resolved": "https://registry.npmjs.org/@storybook/addon-essentials/-/addon-essentials-8.6.17.tgz",
-      "integrity": "sha512-nyp2RUxWGpD+xhGWOo221kHOY6cZlgXsV1F11sn7WxkH+yA7YHhLLYlIPHmNKKH+hdxN0rnlcpwjbr21u0Katg==",
+      "version": "8.6.18",
+      "resolved": "https://registry.npmjs.org/@storybook/addon-essentials/-/addon-essentials-8.6.18.tgz",
+      "integrity": "sha512-MmH7gFb8pyfRoAth0w2RW8j7mBaEJbEWGP3juIoH03ZqTGmbMUbJXElCuRgxQhve7pyz39zLsgtE78D7G+76ew==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@storybook/addon-actions": "8.6.17",
-        "@storybook/addon-backgrounds": "8.6.17",
-        "@storybook/addon-controls": "8.6.17",
-        "@storybook/addon-docs": "8.6.17",
-        "@storybook/addon-highlight": "8.6.17",
-        "@storybook/addon-measure": "8.6.17",
-        "@storybook/addon-outline": "8.6.17",
-        "@storybook/addon-toolbars": "8.6.17",
-        "@storybook/addon-viewport": "8.6.17",
+        "@storybook/addon-actions": "8.6.18",
+        "@storybook/addon-backgrounds": "8.6.18",
+        "@storybook/addon-controls": "8.6.18",
+        "@storybook/addon-docs": "8.6.18",
+        "@storybook/addon-highlight": "8.6.18",
+        "@storybook/addon-measure": "8.6.18",
+        "@storybook/addon-outline": "8.6.18",
+        "@storybook/addon-toolbars": "8.6.18",
+        "@storybook/addon-viewport": "8.6.18",
         "ts-dedent": "^2.0.0"
       },
       "funding": {
@@ -9788,13 +9737,13 @@
         "url": "https://opencollective.com/storybook"
       },
       "peerDependencies": {
-        "storybook": "8.6.17"
+        "storybook": "8.6.18"
       }
     },
     "node_modules/@storybook/addon-essentials/node_modules/@storybook/addon-backgrounds": {
-      "version": "8.6.17",
-      "resolved": "https://registry.npmjs.org/@storybook/addon-backgrounds/-/addon-backgrounds-8.6.17.tgz",
-      "integrity": "sha512-oh7jEQUt8WhH7cBm0jsJ1dujyaujM5rVS5IXJmDgdFJ8l0pqGzOUDmgkBVX147Uo5W1U47Sx+hA69lg6TKPOMQ==",
+      "version": "8.6.18",
+      "resolved": "https://registry.npmjs.org/@storybook/addon-backgrounds/-/addon-backgrounds-8.6.18.tgz",
+      "integrity": "sha512-froND3WwvSCYzjEBO8QODStaWNL+aGXqxBEbrMnGYejDFST4qEFkvM2IYWMnLBkRgrgJ0yIqTeDQoyH9b9/8uQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -9807,20 +9756,20 @@
         "url": "https://opencollective.com/storybook"
       },
       "peerDependencies": {
-        "storybook": "8.6.17"
+        "storybook": "8.6.18"
       }
     },
     "node_modules/@storybook/addon-essentials/node_modules/@storybook/addon-docs": {
-      "version": "8.6.17",
-      "resolved": "https://registry.npmjs.org/@storybook/addon-docs/-/addon-docs-8.6.17.tgz",
-      "integrity": "sha512-zvcSzoYvaZO4l9NxsviDr5vmuq8GVnH4Ap0v+5sSTq192yevm/iQcRnkWYBD9E/Lg5GBeyE+Ml2vjEOK+EPBEg==",
+      "version": "8.6.18",
+      "resolved": "https://registry.npmjs.org/@storybook/addon-docs/-/addon-docs-8.6.18.tgz",
+      "integrity": "sha512-55ADer0yNmmeR928Y3UAv3r4i7bJSd9LwywsQ+lRol/FNe0ZcwLEz31xL+jVsqQFNnDh/imsDIp8aYapGMtfEQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@mdx-js/react": "^3.0.0",
-        "@storybook/blocks": "8.6.17",
-        "@storybook/csf-plugin": "8.6.17",
-        "@storybook/react-dom-shim": "8.6.17",
+        "@storybook/blocks": "8.6.18",
+        "@storybook/csf-plugin": "8.6.18",
+        "@storybook/react-dom-shim": "8.6.18",
         "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0",
         "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0",
         "ts-dedent": "^2.0.0"
@@ -9830,13 +9779,13 @@
         "url": "https://opencollective.com/storybook"
       },
       "peerDependencies": {
-        "storybook": "8.6.17"
+        "storybook": "8.6.18"
       }
     },
     "node_modules/@storybook/addon-essentials/node_modules/@storybook/addon-docs/node_modules/@storybook/blocks": {
-      "version": "8.6.17",
-      "resolved": "https://registry.npmjs.org/@storybook/blocks/-/blocks-8.6.17.tgz",
-      "integrity": "sha512-zuYHH+0egovMrjWRKwOtgVGbz6KALGowPSWBzQ8deTBu6IXfkz6Ce1hRLJPn5S6/jDqqr9xx8vuAiypnRQ98tA==",
+      "version": "8.6.18",
+      "resolved": "https://registry.npmjs.org/@storybook/blocks/-/blocks-8.6.18.tgz",
+      "integrity": "sha512-esZv4msPQ9LxgTb8YUIZhhxVMuI6BPi5bkXtk8c7w7sWuAsqsCe/RnVInn7ooUry2gjnD4hd9+8Eqj0b8oTVoA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -9850,7 +9799,7 @@
       "peerDependencies": {
         "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0",
         "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0",
-        "storybook": "8.6.17"
+        "storybook": "8.6.18"
       },
       "peerDependenciesMeta": {
         "react": {
@@ -9862,9 +9811,9 @@
       }
     },
     "node_modules/@storybook/addon-essentials/node_modules/@storybook/addon-docs/node_modules/@storybook/csf-plugin": {
-      "version": "8.6.17",
-      "resolved": "https://registry.npmjs.org/@storybook/csf-plugin/-/csf-plugin-8.6.17.tgz",
-      "integrity": "sha512-ouvF/izbKclZxpfnRUkyC5ZVDU7QA0cHhjQnXTDT4F8b0uciQUDw1LosDZy5MXf03BeIDdyBAtzd/ym3wzd+kw==",
+      "version": "8.6.18",
+      "resolved": "https://registry.npmjs.org/@storybook/csf-plugin/-/csf-plugin-8.6.18.tgz",
+      "integrity": "sha512-x1ioz/L0CwaelCkHci3P31YtvwayN3FBftvwQOPbvRh9qeb4Cpz5IdVDmyvSxxYwXN66uAORNoqgjTi7B4/y5Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -9875,13 +9824,13 @@
         "url": "https://opencollective.com/storybook"
       },
       "peerDependencies": {
-        "storybook": "8.6.17"
+        "storybook": "8.6.18"
       }
     },
     "node_modules/@storybook/addon-essentials/node_modules/@storybook/addon-docs/node_modules/@storybook/react-dom-shim": {
-      "version": "8.6.17",
-      "resolved": "https://registry.npmjs.org/@storybook/react-dom-shim/-/react-dom-shim-8.6.17.tgz",
-      "integrity": "sha512-bHLsR9b/tiwm9lXbN8kp9XlOgkRXeg84UFwXaWBPu3pOO7vRXukk23SQUpLW+HhjKtCJ3xClSi5uMpse5MpkVQ==",
+      "version": "8.6.18",
+      "resolved": "https://registry.npmjs.org/@storybook/react-dom-shim/-/react-dom-shim-8.6.18.tgz",
+      "integrity": "sha512-N4xULcAWZQTUv4jy1/d346Tyb4gufuC3UaLCuU/iVSZ1brYF4OW3ANr+096btbMxY8pR/65lmtoqr5CTGwnBvA==",
       "dev": true,
       "license": "MIT",
       "funding": {
@@ -9891,13 +9840,13 @@
       "peerDependencies": {
         "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0-beta",
         "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0-beta",
-        "storybook": "8.6.17"
+        "storybook": "8.6.18"
       }
     },
     "node_modules/@storybook/addon-essentials/node_modules/@storybook/addon-highlight": {
-      "version": "8.6.17",
-      "resolved": "https://registry.npmjs.org/@storybook/addon-highlight/-/addon-highlight-8.6.17.tgz",
-      "integrity": "sha512-Tf7DxksSg+DqH0a0rLIpB5g9bJBUHcqmEGeYGX7EPQrXBpQAtFXz/XdzuD8eYDlPC1r42iQQw4w+CQnXJCOHFw==",
+      "version": "8.6.18",
+      "resolved": "https://registry.npmjs.org/@storybook/addon-highlight/-/addon-highlight-8.6.18.tgz",
+      "integrity": "sha512-wTFJ1DPM0C8gK6nGTJxH75byayQj7BPAz02fME4AOmT6clrBpVl1zSTFTkXaSr+k4xOfeMR/xNUfVskaXz6T9w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -9908,13 +9857,13 @@
         "url": "https://opencollective.com/storybook"
       },
       "peerDependencies": {
-        "storybook": "8.6.17"
+        "storybook": "8.6.18"
       }
     },
     "node_modules/@storybook/addon-essentials/node_modules/@storybook/addon-measure": {
-      "version": "8.6.17",
-      "resolved": "https://registry.npmjs.org/@storybook/addon-measure/-/addon-measure-8.6.17.tgz",
-      "integrity": "sha512-OFGmCrz9MTWfxa0t2GP+633VXZS7W3ahIM5bRmCTeG+jF/gdiVw3S2Adq7YiIZw+nROW9VtHBjuWGvy2miZxcQ==",
+      "version": "8.6.18",
+      "resolved": "https://registry.npmjs.org/@storybook/addon-measure/-/addon-measure-8.6.18.tgz",
+      "integrity": "sha512-fMEOJXgPrTm6qHlWoRM+WTLE7Mr1QBIf2ei+pujBQFcWkD6Gjc2pV8zKzvh93d+EA13wD8AmwOq1DEw9J+XH+g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -9926,13 +9875,13 @@
         "url": "https://opencollective.com/storybook"
       },
       "peerDependencies": {
-        "storybook": "8.6.17"
+        "storybook": "8.6.18"
       }
     },
     "node_modules/@storybook/addon-essentials/node_modules/@storybook/addon-outline": {
-      "version": "8.6.17",
-      "resolved": "https://registry.npmjs.org/@storybook/addon-outline/-/addon-outline-8.6.17.tgz",
-      "integrity": "sha512-UfFThgImS8cuv9Mts5JozGO2/SgjU61uKZxn7w+YpJQu0r2UAF56ZBBMZF/Ur5IC4HaoqDWF5DksMlFqMHPBsw==",
+      "version": "8.6.18",
+      "resolved": "https://registry.npmjs.org/@storybook/addon-outline/-/addon-outline-8.6.18.tgz",
+      "integrity": "sha512-TErFqfCtlV2xt9B6/kskROt69TPjr6AXdHpMselaRrN1X4WEjcMk9GT9PcNP7FXqL88/VYqUb3uNMiAmpDmS/g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -9944,13 +9893,13 @@
         "url": "https://opencollective.com/storybook"
       },
       "peerDependencies": {
-        "storybook": "8.6.17"
+        "storybook": "8.6.18"
       }
     },
     "node_modules/@storybook/addon-essentials/node_modules/@storybook/addon-toolbars": {
-      "version": "8.6.17",
-      "resolved": "https://registry.npmjs.org/@storybook/addon-toolbars/-/addon-toolbars-8.6.17.tgz",
-      "integrity": "sha512-LoWtnMVQJWivAu+SZdgYIsaiEqIq0mZ8Ses2xSwLnQZxndCakyqPYv/7YcdLDJaX5f8DpjPvSzJ77oa75oKgFw==",
+      "version": "8.6.18",
+      "resolved": "https://registry.npmjs.org/@storybook/addon-toolbars/-/addon-toolbars-8.6.18.tgz",
+      "integrity": "sha512-x037KXCEcNfPISGX485DtiP+8Bw/cOT45plcQa8eiAQVrVcUwYaDoLubE9YV5b5CsSAjX8sDviGTme6ALfq7+w==",
       "dev": true,
       "license": "MIT",
       "funding": {
@@ -9958,13 +9907,13 @@
         "url": "https://opencollective.com/storybook"
       },
       "peerDependencies": {
-        "storybook": "8.6.17"
+        "storybook": "8.6.18"
       }
     },
     "node_modules/@storybook/addon-essentials/node_modules/@storybook/addon-viewport": {
-      "version": "8.6.17",
-      "resolved": "https://registry.npmjs.org/@storybook/addon-viewport/-/addon-viewport-8.6.17.tgz",
-      "integrity": "sha512-gVUtbFQq/mpD5CFOqXGAu5hUpGm/t5G/psg3YsTjnaRBd18dJZ/+//HzZVbX9aEW8t5qTJeJcEYaF5463BVfNA==",
+      "version": "8.6.18",
+      "resolved": "https://registry.npmjs.org/@storybook/addon-viewport/-/addon-viewport-8.6.18.tgz",
+      "integrity": "sha512-z9sDJSkuWQb4BP+Z1+H+y/Q0rFbPSDcw+OBBEhMfRcJPPXavdC2pNQ0GdQNVw+tDwhAXj+U7jehKnMDKaP7TyA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -9975,13 +9924,13 @@
         "url": "https://opencollective.com/storybook"
       },
       "peerDependencies": {
-        "storybook": "8.6.17"
+        "storybook": "8.6.18"
       }
     },
     "node_modules/@storybook/addon-links": {
-      "version": "8.6.17",
-      "resolved": "https://registry.npmjs.org/@storybook/addon-links/-/addon-links-8.6.17.tgz",
-      "integrity": "sha512-ch1GgXILEmekf81nUvmre3xyhlg5zDibRxm8+psPqj7GqzWBI5l4kAiha0XOBWGz6vQEL5xCvN/rr8rfA9kWdQ==",
+      "version": "8.6.18",
+      "resolved": "https://registry.npmjs.org/@storybook/addon-links/-/addon-links-8.6.18.tgz",
+      "integrity": "sha512-FFlQcPRTgXoFZr2uawtf7lNc/ceIVRhU13BkJbJZKlil3+C8ORFDO1vnREzHje9JzeOWm/rzI0ay0RVetCcXzg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -9994,7 +9943,7 @@
       },
       "peerDependencies": {
         "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0-beta",
-        "storybook": "8.6.17"
+        "storybook": "8.6.18"
       },
       "peerDependenciesMeta": {
         "react": {
@@ -10003,9 +9952,9 @@
       }
     },
     "node_modules/@storybook/addon-mdx-gfm": {
-      "version": "8.6.17",
-      "resolved": "https://registry.npmjs.org/@storybook/addon-mdx-gfm/-/addon-mdx-gfm-8.6.17.tgz",
-      "integrity": "sha512-6gfRnNmUVYJNHrnOjix2v2QmsiJQW1+yCWDneO0fc6FDxZKzASb/sENgOEe04AItrdzEjPeKEIdsa35vmPtqlA==",
+      "version": "8.6.18",
+      "resolved": "https://registry.npmjs.org/@storybook/addon-mdx-gfm/-/addon-mdx-gfm-8.6.18.tgz",
+      "integrity": "sha512-u4+6N7wAjtEfXKQrve9vUyhVsRwSTBJPQdsEScfwoVjg+amCQQDhjbwB78gsCjrxXcbHtpqNM6DXHy8yvhocOg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -10017,7 +9966,7 @@
         "url": "https://opencollective.com/storybook"
       },
       "peerDependencies": {
-        "storybook": "8.6.17"
+        "storybook": "8.6.18"
       }
     },
     "node_modules/@storybook/addon-mdx-gfm/node_modules/@types/mdast": {
@@ -10887,9 +10836,9 @@
       }
     },
     "node_modules/@storybook/components": {
-      "version": "8.6.17",
-      "resolved": "https://registry.npmjs.org/@storybook/components/-/components-8.6.17.tgz",
-      "integrity": "sha512-0b8xkkuPCNbM8LTOzyfxuo2KdJCHIfu3+QxWBFllXap0eYNHwVeSxE5KERQ/bk2GDCiRzaUbwH9PeLorxOzJJQ==",
+      "version": "8.6.18",
+      "resolved": "https://registry.npmjs.org/@storybook/components/-/components-8.6.18.tgz",
+      "integrity": "sha512-55yViiZzPS/cPBuOeW4QGxGqrusjXVyxuknmbYCIwDtFyyvI/CgbjXRHdxNBaIjz+IlftxvBmmSaOqFG5+/dkA==",
       "dev": true,
       "license": "MIT",
       "funding": {
@@ -10901,13 +10850,13 @@
       }
     },
     "node_modules/@storybook/core": {
-      "version": "8.6.17",
-      "resolved": "https://registry.npmjs.org/@storybook/core/-/core-8.6.17.tgz",
-      "integrity": "sha512-lndZDYIvUddWk54HmgYwE4h2B0JtWt8ztIRAzHRt6ReZZ9QQbmM5b85Qpa+ng4dyQEKc2JAtYD3Du7RRFcpHlw==",
+      "version": "8.6.18",
+      "resolved": "https://registry.npmjs.org/@storybook/core/-/core-8.6.18.tgz",
+      "integrity": "sha512-dRBP2TnX6fGdS0T2mXBHjkS/3Nlu1ra1huovZVFuM67CYMzrhM/3hX/zru1vWSC5rqY93ZaAhjMciPW4pK5mMQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@storybook/theming": "8.6.17",
+        "@storybook/theming": "8.6.18",
         "better-opn": "^3.0.2",
         "browser-assert": "^1.2.1",
         "esbuild": "^0.18.0 || ^0.19.0 || ^0.20.0 || ^0.21.0 || ^0.22.0 || ^0.23.0 || ^0.24.0 || ^0.25.0",
@@ -10992,9 +10941,9 @@
       }
     },
     "node_modules/@storybook/manager-api": {
-      "version": "8.6.17",
-      "resolved": "https://registry.npmjs.org/@storybook/manager-api/-/manager-api-8.6.17.tgz",
-      "integrity": "sha512-sPJytvClNrw5GgKcPletMTxDOAYcTRA8VRt9E+ncKvPSYHtPDqLfGTgWajXmt0hRsiBUN5bOgLS9bmNjNQWhrw==",
+      "version": "8.6.18",
+      "resolved": "https://registry.npmjs.org/@storybook/manager-api/-/manager-api-8.6.18.tgz",
+      "integrity": "sha512-BjIp12gEMgzFkEsgKpDIbZdnSWTZpm2dlws8WiPJCpgJtG+HWSxZ0/Ms30Au9yfwzQEKRSbV/5zpsKMGc2SIJw==",
       "dev": true,
       "license": "MIT",
       "funding": {
@@ -11006,9 +10955,9 @@
       }
     },
     "node_modules/@storybook/preview-api": {
-      "version": "8.6.17",
-      "resolved": "https://registry.npmjs.org/@storybook/preview-api/-/preview-api-8.6.17.tgz",
-      "integrity": "sha512-vpTCTkw11wXerYnlG5Q0y4SbFqG9O6GhR0hlYgCn3Z9kcHlNjK/xuwd3h4CvwNXxRNWZGT8qYYCLn5gSSrX6fA==",
+      "version": "8.6.18",
+      "resolved": "https://registry.npmjs.org/@storybook/preview-api/-/preview-api-8.6.18.tgz",
+      "integrity": "sha512-joXRXh3GdVvzhbfIgmix1xs90p8Q/nja7AhEAC2egn5Pl7SKsIYZUCYI6UdrQANb2myg9P552LKXfPect8llKg==",
       "dev": true,
       "license": "MIT",
       "funding": {
@@ -11020,18 +10969,18 @@
       }
     },
     "node_modules/@storybook/react": {
-      "version": "8.6.17",
-      "resolved": "https://registry.npmjs.org/@storybook/react/-/react-8.6.17.tgz",
-      "integrity": "sha512-yoOzgyZ2VXPJBmvcKS4EVoAf7SJxXbMBcLjWGvmWdDnS+hd7S9cHG/SbgQ+9/vgiLUc+uEuvQjiKrwY3iOA5rg==",
+      "version": "8.6.18",
+      "resolved": "https://registry.npmjs.org/@storybook/react/-/react-8.6.18.tgz",
+      "integrity": "sha512-BuLpzMkKtF+UCQCbi+lYVX9cdcAMG86Lu2dDn7UFkPi5HRNFq/zHPSvlz1XDgL0OYMtcqB1aoVzFzcyzUBhhjw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@storybook/components": "8.6.17",
+        "@storybook/components": "8.6.18",
         "@storybook/global": "^5.0.0",
-        "@storybook/manager-api": "8.6.17",
-        "@storybook/preview-api": "8.6.17",
-        "@storybook/react-dom-shim": "8.6.17",
-        "@storybook/theming": "8.6.17"
+        "@storybook/manager-api": "8.6.18",
+        "@storybook/preview-api": "8.6.18",
+        "@storybook/react-dom-shim": "8.6.18",
+        "@storybook/theming": "8.6.18"
       },
       "engines": {
         "node": ">=18.0.0"
@@ -11041,10 +10990,10 @@
         "url": "https://opencollective.com/storybook"
       },
       "peerDependencies": {
-        "@storybook/test": "8.6.17",
+        "@storybook/test": "8.6.18",
         "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0-beta",
         "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0-beta",
-        "storybook": "8.6.17",
+        "storybook": "8.6.18",
         "typescript": ">= 4.2.x"
       },
       "peerDependenciesMeta": {
@@ -11121,15 +11070,15 @@
       }
     },
     "node_modules/@storybook/react-webpack5": {
-      "version": "8.6.17",
-      "resolved": "https://registry.npmjs.org/@storybook/react-webpack5/-/react-webpack5-8.6.17.tgz",
-      "integrity": "sha512-61rMF7O+Un+XgfSODkkvpQv6QToMkYB1OJBqHMidW4/VROuA+G51a2+xTWD1JrwIU11uJQU2DeqHn6w2nc9blQ==",
+      "version": "8.6.18",
+      "resolved": "https://registry.npmjs.org/@storybook/react-webpack5/-/react-webpack5-8.6.18.tgz",
+      "integrity": "sha512-oh7V2//Nm6O+7J5b7v4l+BTxksMq7thCmy607diwSBZHYz6G2CxcW3GhxWwZzpHoUVX6vOR5Uc94u9+wBuPi7A==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@storybook/builder-webpack5": "8.6.17",
-        "@storybook/preset-react-webpack": "8.6.17",
-        "@storybook/react": "8.6.17"
+        "@storybook/builder-webpack5": "8.6.18",
+        "@storybook/preset-react-webpack": "8.6.18",
+        "@storybook/react": "8.6.18"
       },
       "engines": {
         "node": ">=18.0.0"
@@ -11141,7 +11090,7 @@
       "peerDependencies": {
         "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0-beta",
         "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0-beta",
-        "storybook": "8.6.17",
+        "storybook": "8.6.18",
         "typescript": ">= 4.2.x"
       },
       "peerDependenciesMeta": {
@@ -11151,13 +11100,13 @@
       }
     },
     "node_modules/@storybook/react-webpack5/node_modules/@storybook/builder-webpack5": {
-      "version": "8.6.17",
-      "resolved": "https://registry.npmjs.org/@storybook/builder-webpack5/-/builder-webpack5-8.6.17.tgz",
-      "integrity": "sha512-QK0HuTLn/doWQNu/tBC8tP0DrQLqyZk/IeYaxYh43G3igsYHI+yTIG//lHLSRFqkJM6tFT2SIJO8xExE/MCMGQ==",
+      "version": "8.6.18",
+      "resolved": "https://registry.npmjs.org/@storybook/builder-webpack5/-/builder-webpack5-8.6.18.tgz",
+      "integrity": "sha512-rg73TpqIUzXc66c/AaQ4kuc8yiZ+tStvy5fb1OnFYZ9rAeYQejDD0OIIaI2rqtX5XYuxC+yQEGitMntlIMV0og==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@storybook/core-webpack": "8.6.17",
+        "@storybook/core-webpack": "8.6.18",
         "@types/semver": "^7.3.4",
         "browser-assert": "^1.2.1",
         "case-sensitive-paths-webpack-plugin": "^2.4.0",
@@ -11187,7 +11136,7 @@
         "url": "https://opencollective.com/storybook"
       },
       "peerDependencies": {
-        "storybook": "8.6.17"
+        "storybook": "8.6.18"
       },
       "peerDependenciesMeta": {
         "typescript": {
@@ -11196,9 +11145,9 @@
       }
     },
     "node_modules/@storybook/react-webpack5/node_modules/@storybook/builder-webpack5/node_modules/@storybook/core-webpack": {
-      "version": "8.6.17",
-      "resolved": "https://registry.npmjs.org/@storybook/core-webpack/-/core-webpack-8.6.17.tgz",
-      "integrity": "sha512-q8acHGExmDdqUyzYoPrxp52bUQ3pEskXlcZIETReb3++pATv7zlSghPVA283O9jgj9jYfz9VYyRjW3vqzIzi0A==",
+      "version": "8.6.18",
+      "resolved": "https://registry.npmjs.org/@storybook/core-webpack/-/core-webpack-8.6.18.tgz",
+      "integrity": "sha512-M+y/DFbiT3CJYQ90wJdXT4WxYImphof1f11StZSxJGo0u5PnCCdCze1qchXubApXRDO2T8HGxurXfhTEMqaGsA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -11209,18 +11158,18 @@
         "url": "https://opencollective.com/storybook"
       },
       "peerDependencies": {
-        "storybook": "8.6.17"
+        "storybook": "8.6.18"
       }
     },
     "node_modules/@storybook/react-webpack5/node_modules/@storybook/preset-react-webpack": {
-      "version": "8.6.17",
-      "resolved": "https://registry.npmjs.org/@storybook/preset-react-webpack/-/preset-react-webpack-8.6.17.tgz",
-      "integrity": "sha512-gMEc6BL8hQIXwOK6yeDc9PMgHKJO6wNM2c8Cttmk9oZeq1YzwIdrQjcLVdKYINGVaQRqLFBvLTmCzz/qPtI5qg==",
+      "version": "8.6.18",
+      "resolved": "https://registry.npmjs.org/@storybook/preset-react-webpack/-/preset-react-webpack-8.6.18.tgz",
+      "integrity": "sha512-UkioZsLIyKGQTAdVB3EMx4NyqwIPDRyuDTIQyCwlMcLYCJCs9Ks2ILbM1x1554/iqRIxy8Yv2IBMapK+euCwgg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@storybook/core-webpack": "8.6.17",
-        "@storybook/react": "8.6.17",
+        "@storybook/core-webpack": "8.6.18",
+        "@storybook/react": "8.6.18",
         "@storybook/react-docgen-typescript-plugin": "1.0.6--canary.9.0c3f3b7.0",
         "@types/semver": "^7.3.4",
         "find-up": "^5.0.0",
@@ -11241,7 +11190,7 @@
       "peerDependencies": {
         "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0-beta",
         "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0-beta",
-        "storybook": "8.6.17"
+        "storybook": "8.6.18"
       },
       "peerDependenciesMeta": {
         "typescript": {
@@ -11250,9 +11199,9 @@
       }
     },
     "node_modules/@storybook/react-webpack5/node_modules/@storybook/preset-react-webpack/node_modules/@storybook/core-webpack": {
-      "version": "8.6.17",
-      "resolved": "https://registry.npmjs.org/@storybook/core-webpack/-/core-webpack-8.6.17.tgz",
-      "integrity": "sha512-q8acHGExmDdqUyzYoPrxp52bUQ3pEskXlcZIETReb3++pATv7zlSghPVA283O9jgj9jYfz9VYyRjW3vqzIzi0A==",
+      "version": "8.6.18",
+      "resolved": "https://registry.npmjs.org/@storybook/core-webpack/-/core-webpack-8.6.18.tgz",
+      "integrity": "sha512-M+y/DFbiT3CJYQ90wJdXT4WxYImphof1f11StZSxJGo0u5PnCCdCze1qchXubApXRDO2T8HGxurXfhTEMqaGsA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -11263,7 +11212,7 @@
         "url": "https://opencollective.com/storybook"
       },
       "peerDependencies": {
-        "storybook": "8.6.17"
+        "storybook": "8.6.18"
       }
     },
     "node_modules/@storybook/react-webpack5/node_modules/ajv": {
@@ -11451,9 +11400,9 @@
       }
     },
     "node_modules/@storybook/react-webpack5/node_modules/yaml": {
-      "version": "1.10.2",
-      "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz",
-      "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==",
+      "version": "1.10.3",
+      "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.3.tgz",
+      "integrity": "sha512-vIYeF1u3CjlhAFekPPAk2h/Kv4T3mAkMox5OymRiJQB0spDP10LHvt+K7G9Ny6NuuMAb25/6n1qyUjAcGNf/AA==",
       "dev": true,
       "license": "ISC",
       "engines": {
@@ -11461,9 +11410,9 @@
       }
     },
     "node_modules/@storybook/react/node_modules/@storybook/react-dom-shim": {
-      "version": "8.6.17",
-      "resolved": "https://registry.npmjs.org/@storybook/react-dom-shim/-/react-dom-shim-8.6.17.tgz",
-      "integrity": "sha512-bHLsR9b/tiwm9lXbN8kp9XlOgkRXeg84UFwXaWBPu3pOO7vRXukk23SQUpLW+HhjKtCJ3xClSi5uMpse5MpkVQ==",
+      "version": "8.6.18",
+      "resolved": "https://registry.npmjs.org/@storybook/react-dom-shim/-/react-dom-shim-8.6.18.tgz",
+      "integrity": "sha512-N4xULcAWZQTUv4jy1/d346Tyb4gufuC3UaLCuU/iVSZ1brYF4OW3ANr+096btbMxY8pR/65lmtoqr5CTGwnBvA==",
       "dev": true,
       "license": "MIT",
       "funding": {
@@ -11473,18 +11422,18 @@
       "peerDependencies": {
         "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0-beta",
         "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0-beta",
-        "storybook": "8.6.17"
+        "storybook": "8.6.18"
       }
     },
     "node_modules/@storybook/test": {
-      "version": "8.6.17",
-      "resolved": "https://registry.npmjs.org/@storybook/test/-/test-8.6.17.tgz",
-      "integrity": "sha512-VTuCylXGQrFDZXqZ29+yvJ+A4TZ69jG72rLjiic8hI0SOt87AC/8X1NaYvd2NS4TY0G0PwqtxmKeig8qRDrhNg==",
+      "version": "8.6.18",
+      "resolved": "https://registry.npmjs.org/@storybook/test/-/test-8.6.18.tgz",
+      "integrity": "sha512-u/RwfWMyHcH0N2hqfMTw2CoZ58IXdeED3b8NmcHc8bmERB3byI5vVAkwYbcD7+WeRHIiym38ZHi0SRn+IpkO3Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@storybook/global": "^5.0.0",
-        "@storybook/instrumenter": "8.6.17",
+        "@storybook/instrumenter": "8.6.18",
         "@testing-library/dom": "10.4.0",
         "@testing-library/jest-dom": "6.5.0",
         "@testing-library/user-event": "14.5.2",
@@ -11496,7 +11445,7 @@
         "url": "https://opencollective.com/storybook"
       },
       "peerDependencies": {
-        "storybook": "8.6.17"
+        "storybook": "8.6.18"
       }
     },
     "node_modules/@storybook/test-runner": {
@@ -12845,9 +12794,9 @@
       }
     },
     "node_modules/@storybook/test/node_modules/@storybook/instrumenter": {
-      "version": "8.6.17",
-      "resolved": "https://registry.npmjs.org/@storybook/instrumenter/-/instrumenter-8.6.17.tgz",
-      "integrity": "sha512-uPqC0sPY2tYGkEVi1x+L4hvhkTwxT16B/LB8xIXh68co3gR8vY6wVskoBp2tM7LSUGl08U2ksZWxyTo1DaQY5Q==",
+      "version": "8.6.18",
+      "resolved": "https://registry.npmjs.org/@storybook/instrumenter/-/instrumenter-8.6.18.tgz",
+      "integrity": "sha512-viEC1BGlYyjAzi1Tv3LZjByh7Y3Oh04u6QKsujxdeUbr5rUOH4pa/wCKmxXmY6yWrD4WjcNtojmUvQZN/66FXQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -12859,7 +12808,7 @@
         "url": "https://opencollective.com/storybook"
       },
       "peerDependencies": {
-        "storybook": "8.6.17"
+        "storybook": "8.6.18"
       }
     },
     "node_modules/@storybook/test/node_modules/@testing-library/dom": {
@@ -12952,9 +12901,9 @@
       }
     },
     "node_modules/@storybook/theming": {
-      "version": "8.6.17",
-      "resolved": "https://registry.npmjs.org/@storybook/theming/-/theming-8.6.17.tgz",
-      "integrity": "sha512-IttFvRqozpuzN5MlQEWGOzUA2rZg86688Dyv1d+bjpYcFHtY1X4XyTCGwv1BPTaTsB959oM8R2yoNYWQkABbBA==",
+      "version": "8.6.18",
+      "resolved": "https://registry.npmjs.org/@storybook/theming/-/theming-8.6.18.tgz",
+      "integrity": "sha512-n6OEjEtHupa2PdTwWzRepr7cO8NkDd4rgF6BKLitRbujOspLxzMBEqdphs+QLcuiCIgf33SqmEA64QWnbSMhPw==",
       "dev": true,
       "license": "MIT",
       "funding": {
@@ -12993,10 +12942,6 @@
       "resolved": "plugins/legacy-plugin-chart-horizon",
       "link": true
     },
-    "node_modules/@superset-ui/legacy-plugin-chart-map-box": {
-      "resolved": "plugins/legacy-plugin-chart-map-box",
-      "link": true
-    },
     "node_modules/@superset-ui/legacy-plugin-chart-paired-t-test": {
       "resolved": "plugins/legacy-plugin-chart-paired-t-test",
       "link": true
@@ -13017,10 +12962,6 @@
       "resolved": "plugins/legacy-plugin-chart-world-map",
       "link": true
     },
-    "node_modules/@superset-ui/legacy-preset-chart-deckgl": {
-      "resolved": "plugins/legacy-preset-chart-deckgl",
-      "link": true
-    },
     "node_modules/@superset-ui/legacy-preset-chart-nvd3": {
       "resolved": "plugins/legacy-preset-chart-nvd3",
       "link": true
@@ -13045,6 +12986,10 @@
       "resolved": "plugins/plugin-chart-pivot-table",
       "link": true
     },
+    "node_modules/@superset-ui/plugin-chart-point-cluster-map": {
+      "resolved": "plugins/plugin-chart-point-cluster-map",
+      "link": true
+    },
     "node_modules/@superset-ui/plugin-chart-table": {
       "resolved": "plugins/plugin-chart-table",
       "link": true
@@ -13053,6 +12998,10 @@
       "resolved": "plugins/plugin-chart-word-cloud",
       "link": true
     },
+    "node_modules/@superset-ui/preset-chart-deckgl": {
+      "resolved": "plugins/preset-chart-deckgl",
+      "link": true
+    },
     "node_modules/@superset-ui/switchboard": {
       "resolved": "packages/superset-ui-switchboard",
       "link": true
@@ -13329,15 +13278,15 @@
       }
     },
     "node_modules/@swc/core": {
-      "version": "1.15.18",
-      "resolved": "https://registry.npmjs.org/@swc/core/-/core-1.15.18.tgz",
-      "integrity": "sha512-z87aF9GphWp//fnkRsqvtY+inMVPgYW3zSlXH1kJFvRT5H/wiAn+G32qW5l3oEk63KSF1x3Ov0BfHCObAmT8RA==",
+      "version": "1.15.30",
+      "resolved": "https://registry.npmjs.org/@swc/core/-/core-1.15.30.tgz",
+      "integrity": "sha512-R8VQbQY1BZcbIF2p3gjlTCwAQzx1A194ugWfwld5y+WgVVWqVKm7eURGGOVbQVubgKWzidP2agomBbg96rZilQ==",
       "devOptional": true,
       "hasInstallScript": true,
       "license": "Apache-2.0",
       "dependencies": {
         "@swc/counter": "^0.1.3",
-        "@swc/types": "^0.1.25"
+        "@swc/types": "^0.1.26"
       },
       "engines": {
         "node": ">=10"
@@ -13347,16 +13296,18 @@
         "url": "https://opencollective.com/swc"
       },
       "optionalDependencies": {
-        "@swc/core-darwin-arm64": "1.15.18",
-        "@swc/core-darwin-x64": "1.15.18",
-        "@swc/core-linux-arm-gnueabihf": "1.15.18",
-        "@swc/core-linux-arm64-gnu": "1.15.18",
-        "@swc/core-linux-arm64-musl": "1.15.18",
-        "@swc/core-linux-x64-gnu": "1.15.18",
-        "@swc/core-linux-x64-musl": "1.15.18",
-        "@swc/core-win32-arm64-msvc": "1.15.18",
-        "@swc/core-win32-ia32-msvc": "1.15.18",
-        "@swc/core-win32-x64-msvc": "1.15.18"
+        "@swc/core-darwin-arm64": "1.15.30",
+        "@swc/core-darwin-x64": "1.15.30",
+        "@swc/core-linux-arm-gnueabihf": "1.15.30",
+        "@swc/core-linux-arm64-gnu": "1.15.30",
+        "@swc/core-linux-arm64-musl": "1.15.30",
+        "@swc/core-linux-ppc64-gnu": "1.15.30",
+        "@swc/core-linux-s390x-gnu": "1.15.30",
+        "@swc/core-linux-x64-gnu": "1.15.30",
+        "@swc/core-linux-x64-musl": "1.15.30",
+        "@swc/core-win32-arm64-msvc": "1.15.30",
+        "@swc/core-win32-ia32-msvc": "1.15.30",
+        "@swc/core-win32-x64-msvc": "1.15.30"
       },
       "peerDependencies": {
         "@swc/helpers": ">=0.5.17"
@@ -13368,9 +13319,9 @@
       }
     },
     "node_modules/@swc/core-darwin-arm64": {
-      "version": "1.15.18",
-      "resolved": "https://registry.npmjs.org/@swc/core-darwin-arm64/-/core-darwin-arm64-1.15.18.tgz",
-      "integrity": "sha512-+mIv7uBuSaywN3C9LNuWaX1jJJ3SKfiJuE6Lr3bd+/1Iv8oMU7oLBjYMluX1UrEPzwN2qCdY6Io0yVicABoCwQ==",
+      "version": "1.15.30",
+      "resolved": "https://registry.npmjs.org/@swc/core-darwin-arm64/-/core-darwin-arm64-1.15.30.tgz",
+      "integrity": "sha512-VvpP+vq08HmGYewMWvrdsxh9s2lthz/808zXm8Yu5kaqeR8Yia2b0eYXleHQ3VAjoStUDk6LzTheBW9KXYQdMA==",
       "cpu": [
         "arm64"
       ],
@@ -13384,9 +13335,9 @@
       }
     },
     "node_modules/@swc/core-darwin-x64": {
-      "version": "1.15.18",
-      "resolved": "https://registry.npmjs.org/@swc/core-darwin-x64/-/core-darwin-x64-1.15.18.tgz",
-      "integrity": "sha512-wZle0eaQhnzxWX5V/2kEOI6Z9vl/lTFEC6V4EWcn+5pDjhemCpQv9e/TDJ0GIoiClX8EDWRvuZwh+Z3dhL1NAg==",
+      "version": "1.15.30",
+      "resolved": "https://registry.npmjs.org/@swc/core-darwin-x64/-/core-darwin-x64-1.15.30.tgz",
+      "integrity": "sha512-WiJA0hiZI3nwQAO6mu5RqigtWGDtth4Hiq6rbZxAaQyhIcqKIg5IoMRc1Y071lrNJn29eEDMC86Rq58xgUxlDg==",
       "cpu": [
         "x64"
       ],
@@ -13400,9 +13351,9 @@
       }
     },
     "node_modules/@swc/core-linux-arm-gnueabihf": {
-      "version": "1.15.18",
-      "resolved": "https://registry.npmjs.org/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.15.18.tgz",
-      "integrity": "sha512-ao61HGXVqrJFHAcPtF4/DegmwEkVCo4HApnotLU8ognfmU8x589z7+tcf3hU+qBiU1WOXV5fQX6W9Nzs6hjxDw==",
+      "version": "1.15.30",
+      "resolved": "https://registry.npmjs.org/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.15.30.tgz",
+      "integrity": "sha512-YANuFUo48kIT6plJgCD0keae9HFXfjxsbvsgevqc0hr/07X/p7sAWTFOGYEc2SXcASaK7UvuQqzlbW8pr7R79g==",
       "cpu": [
         "arm"
       ],
@@ -13416,9 +13367,9 @@
       }
     },
     "node_modules/@swc/core-linux-arm64-gnu": {
-      "version": "1.15.18",
-      "resolved": "https://registry.npmjs.org/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.15.18.tgz",
-      "integrity": "sha512-3xnctOBLIq3kj8PxOCgPrGjBLP/kNOddr6f5gukYt/1IZxsITQaU9TDyjeX6jG+FiCIHjCuWuffsyQDL5Ew1bg==",
+      "version": "1.15.30",
+      "resolved": "https://registry.npmjs.org/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.15.30.tgz",
+      "integrity": "sha512-VndG8jaR4ugY6u+iVOT0Q+d2fZd7sLgjPgN8W/Le+3EbZKl+cRfFxV7Eoz4gfLqhmneZPdcIzf9T3LkgkmqNLg==",
       "cpu": [
         "arm64"
       ],
@@ -13432,9 +13383,9 @@
       }
     },
     "node_modules/@swc/core-linux-arm64-musl": {
-      "version": "1.15.18",
-      "resolved": "https://registry.npmjs.org/@swc/core-linux-arm64-musl/-/core-linux-arm64-musl-1.15.18.tgz",
-      "integrity": "sha512-0a+Lix+FSSHBSBOA0XznCcHo5/1nA6oLLjcnocvzXeqtdjnPb+SvchItHI+lfeiuj1sClYPDvPMLSLyXFaiIKw==",
+      "version": "1.15.30",
+      "resolved": "https://registry.npmjs.org/@swc/core-linux-arm64-musl/-/core-linux-arm64-musl-1.15.30.tgz",
+      "integrity": "sha512-1SYGs2l0Yyyi0pR/P/NKz/x0kqxkoiw+BXeJjLUdecSk/KasncWlJrc6hOvFSgKHOBrzgM5jwuluKtlT8dnrcA==",
       "cpu": [
         "arm64"
       ],
@@ -13447,10 +13398,42 @@
         "node": ">=10"
       }
     },
+    "node_modules/@swc/core-linux-ppc64-gnu": {
+      "version": "1.15.30",
+      "resolved": "https://registry.npmjs.org/@swc/core-linux-ppc64-gnu/-/core-linux-ppc64-gnu-1.15.30.tgz",
+      "integrity": "sha512-TXREtiXeRhbfDFbmhnkIsXpKfzbfT73YkV2ZF6w0sfxgjC5zI2ZAbaCOq25qxvegofj2K93DtOpm9RLaBgqR2g==",
+      "cpu": [
+        "ppc64"
+      ],
+      "license": "Apache-2.0 AND MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@swc/core-linux-s390x-gnu": {
+      "version": "1.15.30",
+      "resolved": "https://registry.npmjs.org/@swc/core-linux-s390x-gnu/-/core-linux-s390x-gnu-1.15.30.tgz",
+      "integrity": "sha512-DCR2YYeyd6DQE4OuDhImouuNcjXEiEdnn1Y0DyGteugPEDvVuvYk8Xddi+4o2SgWH6jiW8/I+3emZvbep1NC+g==",
+      "cpu": [
+        "s390x"
+      ],
+      "license": "Apache-2.0 AND MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=10"
+      }
+    },
     "node_modules/@swc/core-linux-x64-gnu": {
-      "version": "1.15.18",
-      "resolved": "https://registry.npmjs.org/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.15.18.tgz",
-      "integrity": "sha512-wG9J8vReUlpaHz4KOD/5UE1AUgirimU4UFT9oZmupUDEofxJKYb1mTA/DrMj0s78bkBiNI+7Fo2EgPuvOJfuAA==",
+      "version": "1.15.30",
+      "resolved": "https://registry.npmjs.org/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.15.30.tgz",
+      "integrity": "sha512-5Pizw3NgfOJ5BJOBK8TIRa59xFW2avESTOBDPTAYwZYa1JNDs+KMF9lUfjJiJLM5HiMs/wPheA9eiT0q9m2AoA==",
       "cpu": [
         "x64"
       ],
@@ -13464,9 +13447,9 @@
       }
     },
     "node_modules/@swc/core-linux-x64-musl": {
-      "version": "1.15.18",
-      "resolved": "https://registry.npmjs.org/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.15.18.tgz",
-      "integrity": "sha512-4nwbVvCphKzicwNWRmvD5iBaZj8JYsRGa4xOxJmOyHlMDpsvvJ2OR2cODlvWyGFH6BYL1MfIAK3qph3hp0Az6g==",
+      "version": "1.15.30",
+      "resolved": "https://registry.npmjs.org/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.15.30.tgz",
+      "integrity": "sha512-qyqydP/wyH8alcIP4a2hnGSjHLJjm9H7yDFup+CPy9oTahFgLLwnNcv5UHXqO2Qs3AIND+cls5f/Bb6hqpxdgA==",
       "cpu": [
         "x64"
       ],
@@ -13480,9 +13463,9 @@
       }
     },
     "node_modules/@swc/core-win32-arm64-msvc": {
-      "version": "1.15.18",
-      "resolved": "https://registry.npmjs.org/@swc/core-win32-arm64-msvc/-/core-win32-arm64-msvc-1.15.18.tgz",
-      "integrity": "sha512-zk0RYO+LjiBCat2RTMHzAWaMky0cra9loH4oRrLKLLNuL+jarxKLFDA8xTZWEkCPLjUTwlRN7d28eDLLMgtUcQ==",
+      "version": "1.15.30",
+      "resolved": "https://registry.npmjs.org/@swc/core-win32-arm64-msvc/-/core-win32-arm64-msvc-1.15.30.tgz",
+      "integrity": "sha512-CaQENgDHVGOg1mSF5sQVgvfFHG9kjMor2rkLMLeLOkfZYNj13ppnJ9+lfaBZLZUMMbnlGQnavCJb8PVBUOso7Q==",
       "cpu": [
         "arm64"
       ],
@@ -13496,9 +13479,9 @@
       }
     },
     "node_modules/@swc/core-win32-ia32-msvc": {
-      "version": "1.15.18",
-      "resolved": "https://registry.npmjs.org/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.15.18.tgz",
-      "integrity": "sha512-yVuTrZ0RccD5+PEkpcLOBAuPbYBXS6rslENvIXfvJGXSdX5QGi1ehC4BjAMl5FkKLiam4kJECUI0l7Hq7T1vwg==",
+      "version": "1.15.30",
+      "resolved": "https://registry.npmjs.org/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.15.30.tgz",
+      "integrity": "sha512-30VdLeGk6fugiUs/kUdJ/pAg7z/zpvVbR11RH60jZ0Z42WIeIniYx0rLEWN7h/pKJ3CopqsQ3RsogCAkRKiA2g==",
       "cpu": [
         "ia32"
       ],
@@ -13512,9 +13495,9 @@
       }
     },
     "node_modules/@swc/core-win32-x64-msvc": {
-      "version": "1.15.18",
-      "resolved": "https://registry.npmjs.org/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.15.18.tgz",
-      "integrity": "sha512-7NRmE4hmUQNCbYU3Hn9Tz57mK9Qq4c97ZS+YlamlK6qG9Fb5g/BB3gPDe0iLlJkns/sYv2VWSkm8c3NmbEGjbg==",
+      "version": "1.15.30",
+      "resolved": "https://registry.npmjs.org/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.15.30.tgz",
+      "integrity": "sha512-4iObHPR+Q4oDY110EF5SF5eIaaVJNpMdG9C0q3Q92BsJ5y467uHz7sYQhP60WYlLFsLQ1el2YrIPUItUAQGOKg==",
       "cpu": [
         "x64"
       ],
@@ -13553,9 +13536,9 @@
       }
     },
     "node_modules/@swc/plugin-emotion": {
-      "version": "14.6.0",
-      "resolved": "https://registry.npmjs.org/@swc/plugin-emotion/-/plugin-emotion-14.6.0.tgz",
-      "integrity": "sha512-YyUalzWUeKgnm5SFxR6ZmIY06J6ffok/XyZjlzrLi5GdiGfSJVtmVhJxqNYNnT4CFa6pbo6Pp8yXeLfjNnSJzQ==",
+      "version": "14.8.0",
+      "resolved": "https://registry.npmjs.org/@swc/plugin-emotion/-/plugin-emotion-14.8.0.tgz",
+      "integrity": "sha512-otFM4JfEE9uyH6HxhD5Dmw6WUY773d2Ln44kEobc89HoVbdGkO3DZv9r2h5znFy7wORyl894V3nYd/mhqc4dIQ==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
@@ -13573,9 +13556,9 @@
       }
     },
     "node_modules/@swc/types": {
-      "version": "0.1.25",
-      "resolved": "https://registry.npmjs.org/@swc/types/-/types-0.1.25.tgz",
-      "integrity": "sha512-iAoY/qRhNH8a/hBvm3zKj9qQ4oc2+3w1unPJa2XvTK3XjeLXtzcCingVPw/9e5mn1+0yPqxcBGp9Jf0pkfMb1g==",
+      "version": "0.1.26",
+      "resolved": "https://registry.npmjs.org/@swc/types/-/types-0.1.26.tgz",
+      "integrity": "sha512-lyMwd7WGgG79RS7EERZV3T8wMdmPq3xwyg+1nmAM64kIhx5yl+juO2PYIHb7vTiPgPCj8LYjsNV2T5wiQHUEaw==",
       "devOptional": true,
       "license": "Apache-2.0",
       "dependencies": {
@@ -13722,6 +13705,24 @@
         "@testing-library/dom": ">=7.21.4"
       }
     },
+    "node_modules/@tokenizer/inflate": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/@tokenizer/inflate/-/inflate-0.4.1.tgz",
+      "integrity": "sha512-2mAv+8pkG6GIZiF1kNg1jAjh27IDxEPKwdGul3snfztFerfPGI1LjDezZp3i7BElXompqEtPmoPx6c2wgtWsOA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "debug": "^4.4.3",
+        "token-types": "^6.1.1"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/Borewit"
+      }
+    },
     "node_modules/@tokenizer/token": {
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/@tokenizer/token/-/token-0.3.0.tgz",
@@ -13774,17 +13775,17 @@
       }
     },
     "node_modules/@tufjs/models": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/@tufjs/models/-/models-2.0.1.tgz",
-      "integrity": "sha512-92F7/SFyufn4DXsha9+QfKnN03JGqtMFMXgSHbZOo8JG59WkTni7UzAouNQDf7AuP9OAMxVOPQcqG3sB7w+kkg==",
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/@tufjs/models/-/models-4.1.0.tgz",
+      "integrity": "sha512-Y8cK9aggNRsqJVaKUlEYs4s7CvQ1b1ta2DVPyAimb0I2qhzjNk+A+mxvll/klL0RlfuIUei8BF7YWiua4kQqww==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@tufjs/canonical-json": "2.0.0",
-        "minimatch": "^9.0.4"
+        "minimatch": "^10.1.1"
       },
       "engines": {
-        "node": "^16.14.0 || >=18.0.0"
+        "node": "^20.17.0 || >=22.9.0"
       }
     },
     "node_modules/@tufjs/models/node_modules/balanced-match": {
@@ -13798,9 +13799,9 @@
       }
     },
     "node_modules/@tufjs/models/node_modules/brace-expansion": {
-      "version": "5.0.3",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.3.tgz",
-      "integrity": "sha512-fy6KJm2RawA5RcHkLa1z/ScpBeA762UF9KmZQxwIbDtRJrgLzM10depAiEQ+CXYcoiqW1/m96OAAoke2nE9EeA==",
+      "version": "5.0.5",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.5.tgz",
+      "integrity": "sha512-VZznLgtwhn+Mact9tfiwx64fA9erHH/MCXEUfB/0bX/6Fz6ny5EGTXYltMocqg4xFAQZtnO3DHWWXi8RiuN7cQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -13811,16 +13812,16 @@
       }
     },
     "node_modules/@tufjs/models/node_modules/minimatch": {
-      "version": "9.0.7",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.7.tgz",
-      "integrity": "sha512-MOwgjc8tfrpn5QQEvjijjmDVtMw2oL88ugTevzxQnzRLm6l3fVEF2gzU0kYeYYKD8C66+IdGX6peJ4MyUlUnPg==",
+      "version": "10.2.4",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.2.4.tgz",
+      "integrity": "sha512-oRjTw/97aTBN0RHbYCdtF1MQfvusSIBQM0IZEgzl6426+8jSC0nF1a/GmnVLpfB9yyr6g6FTqWqiZVbxrtaCIg==",
       "dev": true,
-      "license": "ISC",
+      "license": "BlueOak-1.0.0",
       "dependencies": {
         "brace-expansion": "^5.0.2"
       },
       "engines": {
-        "node": ">=16 || 14 >=14.17"
+        "node": "18 || 20 || >=22"
       },
       "funding": {
         "url": "https://github.com/sponsors/isaacs"
@@ -14304,12 +14305,6 @@
         "@types/node": "*"
       }
     },
-    "node_modules/@types/hammerjs": {
-      "version": "2.0.46",
-      "resolved": "https://registry.npmjs.org/@types/hammerjs/-/hammerjs-2.0.46.tgz",
-      "integrity": "sha512-ynRvcq6wvqexJ9brDMS4BnBLzmr0e14d6ZJTEShTBWKymQiHwlAyGu0ZPEFI2Fh1U53F7tN9ufClWM5KvqkKOw==",
-      "license": "MIT"
-    },
     "node_modules/@types/hast": {
       "version": "2.3.10",
       "resolved": "https://registry.npmjs.org/@types/hast/-/hast-2.3.10.tgz",
@@ -14583,9 +14578,9 @@
       }
     },
     "node_modules/@types/jest/node_modules/picomatch": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz",
-      "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.4.tgz",
+      "integrity": "sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -14634,14 +14629,11 @@
       }
     },
     "node_modules/@types/jquery": {
-      "version": "3.5.33",
-      "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-3.5.33.tgz",
-      "integrity": "sha512-SeyVJXlCZpEki5F0ghuYe+L+PprQta6nRZqhONt9F13dWBtR/ftoaIbdRQ7cis7womE+X2LKhsDdDtkkDhJS6g==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-4.0.0.tgz",
+      "integrity": "sha512-Z+to+A2VkaHq1DfI2oSwsoCdhCHMpTSgjWzNcbNlRGYzksDBpPUgEcAL+RQjOBJRaLoEAOHXxqDGBVP+BblBwg==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@types/sizzle": "*"
-      }
+      "license": "MIT"
     },
     "node_modules/@types/js-levenshtein": {
       "version": "1.1.3",
@@ -14706,25 +14698,6 @@
         "@types/geojson": "*"
       }
     },
-    "node_modules/@types/mapbox__point-geometry": {
-      "version": "1.0.87",
-      "resolved": "https://registry.npmjs.org/@types/mapbox__point-geometry/-/mapbox__point-geometry-1.0.87.tgz",
-      "integrity": "sha512-32whuSWD/aDBHpRrZmEMlRjxR0L3sSYUaRnVmw0XwyVMvuU5LsRqrFwYud7gXjqmUE0MSoJB91+IJMqCyYyxag==",
-      "deprecated": "This is a stub types definition. @mapbox/point-geometry provides its own type definitions, so you do not need this installed.",
-      "license": "MIT",
-      "dependencies": {
-        "@mapbox/point-geometry": "*"
-      }
-    },
-    "node_modules/@types/mapbox-gl": {
-      "version": "2.7.21",
-      "resolved": "https://registry.npmjs.org/@types/mapbox-gl/-/mapbox-gl-2.7.21.tgz",
-      "integrity": "sha512-Dx9MuF2kKgT/N22LsMUB4b3acFZh9clVqz9zv1fomoiPoBrJolwYxpWA/9LPO/2N0xWbKi4V+pkjTaFkkx/4wA==",
-      "license": "MIT",
-      "dependencies": {
-        "@types/geojson": "*"
-      }
-    },
     "node_modules/@types/mdast": {
       "version": "4.0.4",
       "resolved": "https://registry.npmjs.org/@types/mdast/-/mdast-4.0.4.tgz",
@@ -14748,13 +14721,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/@types/minimatch": {
-      "version": "3.0.5",
-      "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.5.tgz",
-      "integrity": "sha512-Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ==",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/@types/minimist": {
       "version": "1.2.5",
       "resolved": "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.5.tgz",
@@ -14783,12 +14749,12 @@
       "license": "MIT"
     },
     "node_modules/@types/node": {
-      "version": "25.3.3",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.3.3.tgz",
-      "integrity": "sha512-DpzbrH7wIcBaJibpKo9nnSQL0MTRdnWttGyE5haGwK86xgMOkFLp7vEyfQPGLOJh5wNYiJ3V9PmUMDhV9u8kkQ==",
+      "version": "25.6.0",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.6.0.tgz",
+      "integrity": "sha512-+qIYRKdNYJwY3vRCZMdJbPLJAtGjQBudzZzdzwQYkEPQd+PJGixUL5QfvCLDaULoLv+RhT3LDkwEfKaAkgSmNQ==",
       "license": "MIT",
       "dependencies": {
-        "undici-types": "~7.18.0"
+        "undici-types": "~7.19.0"
       }
     },
     "node_modules/@types/normalize-package-data": {
@@ -14825,7 +14791,6 @@
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/@types/picomatch/-/picomatch-4.0.2.tgz",
       "integrity": "sha512-qHHxQ+P9PysNEGbALT8f8YOSHW0KJu6l2xU8DYY0fu/EmGxXdVnuTLvFUvBgPJMSqXq29SYHveejeAha+4AYgA==",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/@types/prismjs": {
@@ -15115,7 +15080,8 @@
       "resolved": "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.9.tgz",
       "integrity": "sha512-xzLEyKB50yqCUPUJkIsrVvoWNfFUbIZI+RspLWt8u+tIW/BetMBZtgV2LY/2o+tYH8dRvQ+eoPf3NdhQCcLE2w==",
       "dev": true,
-      "license": "MIT"
+      "license": "MIT",
+      "peer": true
     },
     "node_modules/@types/sockjs": {
       "version": "0.3.36",
@@ -15448,9 +15414,9 @@
       }
     },
     "node_modules/@typescript-eslint/eslint-plugin/node_modules/brace-expansion": {
-      "version": "5.0.3",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.3.tgz",
-      "integrity": "sha512-fy6KJm2RawA5RcHkLa1z/ScpBeA762UF9KmZQxwIbDtRJrgLzM10depAiEQ+CXYcoiqW1/m96OAAoke2nE9EeA==",
+      "version": "5.0.5",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.5.tgz",
+      "integrity": "sha512-VZznLgtwhn+Mact9tfiwx64fA9erHH/MCXEUfB/0bX/6Fz6ny5EGTXYltMocqg4xFAQZtnO3DHWWXi8RiuN7cQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -15608,9 +15574,9 @@
       }
     },
     "node_modules/@typescript-eslint/parser/node_modules/brace-expansion": {
-      "version": "5.0.3",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.3.tgz",
-      "integrity": "sha512-fy6KJm2RawA5RcHkLa1z/ScpBeA762UF9KmZQxwIbDtRJrgLzM10depAiEQ+CXYcoiqW1/m96OAAoke2nE9EeA==",
+      "version": "5.0.5",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.5.tgz",
+      "integrity": "sha512-VZznLgtwhn+Mact9tfiwx64fA9erHH/MCXEUfB/0bX/6Fz6ny5EGTXYltMocqg4xFAQZtnO3DHWWXi8RiuN7cQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -15861,9 +15827,9 @@
       }
     },
     "node_modules/@typescript-eslint/type-utils/node_modules/brace-expansion": {
-      "version": "5.0.3",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.3.tgz",
-      "integrity": "sha512-fy6KJm2RawA5RcHkLa1z/ScpBeA762UF9KmZQxwIbDtRJrgLzM10depAiEQ+CXYcoiqW1/m96OAAoke2nE9EeA==",
+      "version": "5.0.5",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.5.tgz",
+      "integrity": "sha512-VZznLgtwhn+Mact9tfiwx64fA9erHH/MCXEUfB/0bX/6Fz6ny5EGTXYltMocqg4xFAQZtnO3DHWWXi8RiuN7cQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -16296,6 +16262,72 @@
         "win32"
       ]
     },
+    "node_modules/@vis.gl/react-mapbox": {
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/@vis.gl/react-mapbox/-/react-mapbox-8.1.0.tgz",
+      "integrity": "sha512-FwvH822oxEjWYOr+pP2L8hpv+7cZB2UsQbHHHT0ryrkvvqzmTgt7qHDhamv0EobKw86e1I+B4ojENdJ5G5BkyQ==",
+      "license": "MIT",
+      "peerDependencies": {
+        "mapbox-gl": ">=3.5.0",
+        "react": ">=16.3.0",
+        "react-dom": ">=16.3.0"
+      },
+      "peerDependenciesMeta": {
+        "mapbox-gl": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@vis.gl/react-maplibre": {
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/@vis.gl/react-maplibre/-/react-maplibre-8.1.0.tgz",
+      "integrity": "sha512-PkAK/gp3mUfhCLhUuc+4gc3PN9zCtVGxTF2hB6R5R5yYUw+hdg84OZ770U5MU4tPMTCG6fbduExuIW6RRKN6qQ==",
+      "license": "MIT",
+      "dependencies": {
+        "@maplibre/maplibre-gl-style-spec": "^19.2.1"
+      },
+      "peerDependencies": {
+        "maplibre-gl": ">=4.0.0",
+        "react": ">=16.3.0",
+        "react-dom": ">=16.3.0"
+      },
+      "peerDependenciesMeta": {
+        "maplibre-gl": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@vis.gl/react-maplibre/node_modules/@maplibre/maplibre-gl-style-spec": {
+      "version": "19.3.3",
+      "resolved": "https://registry.npmjs.org/@maplibre/maplibre-gl-style-spec/-/maplibre-gl-style-spec-19.3.3.tgz",
+      "integrity": "sha512-cOZZOVhDSulgK0meTsTkmNXb1ahVvmTmWmfx9gRBwc6hq98wS9JP35ESIoNq3xqEan+UN+gn8187Z6E4NKhLsw==",
+      "license": "ISC",
+      "dependencies": {
+        "@mapbox/jsonlint-lines-primitives": "~2.0.2",
+        "@mapbox/unitbezier": "^0.0.1",
+        "json-stringify-pretty-compact": "^3.0.0",
+        "minimist": "^1.2.8",
+        "rw": "^1.3.3",
+        "sort-object": "^3.0.3"
+      },
+      "bin": {
+        "gl-style-format": "dist/gl-style-format.mjs",
+        "gl-style-migrate": "dist/gl-style-migrate.mjs",
+        "gl-style-validate": "dist/gl-style-validate.mjs"
+      }
+    },
+    "node_modules/@vis.gl/react-maplibre/node_modules/json-stringify-pretty-compact": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/json-stringify-pretty-compact/-/json-stringify-pretty-compact-3.0.0.tgz",
+      "integrity": "sha512-Rc2suX5meI0S3bfdZuA7JMFBGkJ875ApfVyq2WHELjBiiG22My/l7/8zPpH/CfFVQHuVLd8NLR0nv6vi0BYYKA==",
+      "license": "MIT"
+    },
+    "node_modules/@vis.gl/react-maplibre/node_modules/rw": {
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/rw/-/rw-1.3.3.tgz",
+      "integrity": "sha512-PdhdWy89SiZogBLaw42zdeqtRJ//zFd2PgQavcICDUgJT5oW10QCRKbJ6bg4r0/UY2M6BWd5tkxuGFRvCkgfHQ==",
+      "license": "BSD-3-Clause"
+    },
     "node_modules/@visx/annotation": {
       "version": "3.12.0",
       "resolved": "https://registry.npmjs.org/@visx/annotation/-/annotation-3.12.0.tgz",
@@ -17339,13 +17371,13 @@
       "license": "BSD-3-Clause"
     },
     "node_modules/abbrev": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-2.0.0.tgz",
-      "integrity": "sha512-6/mh1E2u2YgEsCHdY0Yx5oW+61gZU+1vXaoiHHrpKeuRNNgFvS+/jrwHiQhB5apAf5oB7UB7E19ol2R2LKH8hQ==",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-3.0.1.tgz",
+      "integrity": "sha512-AO2ac6pjRB3SJmGJo+v5/aK6Omggp6fsLrs6wN9bd35ulu4cCwaAU9+7ZhXjeqHVkaHThLuzH0nZr0YpCDhygg==",
       "dev": true,
       "license": "ISC",
       "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+        "node": "^18.17.0 || >=20.5.0"
       }
     },
     "node_modules/accepts": {
@@ -17390,6 +17422,30 @@
         "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"
       }
     },
+    "node_modules/acorn-walk": {
+      "version": "8.3.5",
+      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.5.tgz",
+      "integrity": "sha512-HEHNfbars9v4pgpW6SO1KSPkfoS0xVOM/9UzkJltjlsHZmJasxg8aXkuZa7SMf8vKGIBhpUsPluQSqhJFCqebw==",
+      "license": "MIT",
+      "dependencies": {
+        "acorn": "^8.11.0"
+      },
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/acorn-walk/node_modules/acorn": {
+      "version": "8.16.0",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.16.0.tgz",
+      "integrity": "sha512-UVJyE9MttOsBQIDKw1skb9nAwQuR5wuGD3+82K6JgJlm/Y+KI92oNsMNGZCYdDsVtRHSak0pcV5Dno5+4jh9sw==",
+      "license": "MIT",
+      "bin": {
+        "acorn": "bin/acorn"
+      },
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
     "node_modules/add-stream": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/add-stream/-/add-stream-1.0.0.tgz",
@@ -17398,27 +17454,27 @@
       "license": "MIT"
     },
     "node_modules/ag-charts-types": {
-      "version": "13.0.1",
-      "resolved": "https://registry.npmjs.org/ag-charts-types/-/ag-charts-types-13.0.1.tgz",
-      "integrity": "sha512-qg9adyiAaeUaDtWZEEPF45dv55kdJTe6Ghi0EQXCS79h/7KvOd6dxhqGZjPL1zeFl/L9qEXuYgb+LkGStq4mgQ==",
+      "version": "13.2.1",
+      "resolved": "https://registry.npmjs.org/ag-charts-types/-/ag-charts-types-13.2.1.tgz",
+      "integrity": "sha512-r7veb3QqJtIKlXmeUsLR4/oDPwmHxFI2tmbZra/203mdaz3uwQUrrgYNg628nrK+7L2YxXnwGc6L05tWjLLjNQ==",
       "license": "MIT"
     },
     "node_modules/ag-grid-community": {
-      "version": "35.0.1",
-      "resolved": "https://registry.npmjs.org/ag-grid-community/-/ag-grid-community-35.0.1.tgz",
-      "integrity": "sha512-fYYZdymWKsN9/tZv+R6uZRnuiWYEQr+GHl85ZrB0ixbFcE8opYK4NJI29NnMc9ShYiCBnAO9hj54IFa+FI4aDA==",
+      "version": "35.2.1",
+      "resolved": "https://registry.npmjs.org/ag-grid-community/-/ag-grid-community-35.2.1.tgz",
+      "integrity": "sha512-ycmGI+1EbUT7i3eg/Kgi1owwnkdHXRufo10Xm6cfSsVPM3TMpvlbLgi28KIPt9DGHZWHq9fOBn7nxMNdv1Yaow==",
       "license": "MIT",
       "dependencies": {
-        "ag-charts-types": "13.0.1"
+        "ag-charts-types": "13.2.1"
       }
     },
     "node_modules/ag-grid-react": {
-      "version": "35.0.1",
-      "resolved": "https://registry.npmjs.org/ag-grid-react/-/ag-grid-react-35.0.1.tgz",
-      "integrity": "sha512-NvrrgWUm+DsnsZVFho16srlyBNKSl9nqeSadk63HpHYerq4S4vN/2JCxdNtfqns7SpbYx7GbasbMFCXKYj7Qaw==",
+      "version": "35.2.1",
+      "resolved": "https://registry.npmjs.org/ag-grid-react/-/ag-grid-react-35.2.1.tgz",
+      "integrity": "sha512-UzdU15R6fyGJB+lBKEC458xacGoZged3Ra6Plqa7LvrJ/Mg0tWn1NH01UnuKyGEKPWMEAGvdXruOtOUywsPElA==",
       "license": "MIT",
       "dependencies": {
-        "ag-grid-community": "35.0.1",
+        "ag-grid-community": "35.2.1",
         "prop-types": "^15.8.1"
       },
       "peerDependencies": {
@@ -17745,6 +17801,15 @@
         "deep-equal": "^2.0.5"
       }
     },
+    "node_modules/arr-union": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz",
+      "integrity": "sha512-sKpyeERZ02v1FeCZT8lrfJq5u6goHCtpTAzPwJYe7c8SPFOboNjNg1vz2L4VTn9T4PQxEx13TbXLmYUcS6Ug7Q==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/array-buffer-byte-length": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.2.tgz",
@@ -17761,16 +17826,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/array-differ": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/array-differ/-/array-differ-3.0.0.tgz",
-      "integrity": "sha512-THtfYS6KtME/yIAhKjZ2ul7XI96lQGHRputJQHO80LAWQnuGP4iCIN8vdMRboGbIEYBwU33q8Tch1os2+X0kMg==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/array-flatten": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
@@ -17978,6 +18033,15 @@
         "node": ">=12"
       }
     },
+    "node_modules/assign-symbols": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz",
+      "integrity": "sha512-Q+JC7Whu8HhmTdBph/Tq59IoRtoy6KAm5zzPv00WdujX82lbAL8K7WVjne7vdCsAmbF4AYaDOPyO3k0kl8qIrw==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/ast-types": {
       "version": "0.16.1",
       "resolved": "https://registry.npmjs.org/ast-types/-/ast-types-0.16.1.tgz",
@@ -18070,23 +18134,26 @@
       "peer": true
     },
     "node_modules/axios": {
-      "version": "1.13.5",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-1.13.5.tgz",
-      "integrity": "sha512-cz4ur7Vb0xS4/KUN0tPWe44eqxrIu31me+fbang3ijiNscE129POzipJJA6zniq2C/Z6sJCjMimjS8Lc/GAs8Q==",
+      "version": "1.15.0",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-1.15.0.tgz",
+      "integrity": "sha512-wWyJDlAatxk30ZJer+GeCWS209sA42X+N5jU2jy6oHTp7ufw8uzUTVFBX9+wTfAlhiJXGS0Bq7X6efruWjuK9Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "follow-redirects": "^1.15.11",
         "form-data": "^4.0.5",
-        "proxy-from-env": "^1.1.0"
+        "proxy-from-env": "^2.1.0"
       }
     },
     "node_modules/axios/node_modules/proxy-from-env": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
-      "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-2.1.0.tgz",
+      "integrity": "sha512-cJ+oHTW1VAEa8cJslgmUZrc+sjRKgAKl3Zyse6+PV38hZe/V6Z14TbCuXcan9F9ghlz4QrFr2c92TNF82UkYHA==",
       "dev": true,
-      "license": "MIT"
+      "license": "MIT",
+      "engines": {
+        "node": ">=10"
+      }
     },
     "node_modules/b4a": {
       "version": "1.6.7",
@@ -18144,9 +18211,9 @@
       }
     },
     "node_modules/babel-loader": {
-      "version": "10.0.0",
-      "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-10.0.0.tgz",
-      "integrity": "sha512-z8jt+EdS61AMw22nSfoNJAZ0vrtmhPRVi6ghL3rCeRZI8cdNYFiV5xeV3HbE7rlZZNmGH8BVccwWt8/ED0QOHA==",
+      "version": "10.1.1",
+      "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-10.1.1.tgz",
+      "integrity": "sha512-JwKSzk2kjIe7mgPK+/lyZ2QAaJcpahNAdM+hgR2HI8D0OJVkdj8Rl6J3kaLYki9pwF7P2iWnD8qVv80Lq1ABtg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -18156,8 +18223,17 @@
         "node": "^18.20.0 || ^20.10.0 || >=22.0.0"
       },
       "peerDependencies": {
-        "@babel/core": "^7.12.0",
+        "@babel/core": "^7.12.0 || ^8.0.0-beta.1",
+        "@rspack/core": "^1.0.0 || ^2.0.0-0",
         "webpack": ">=5.61.0"
+      },
+      "peerDependenciesMeta": {
+        "@rspack/core": {
+          "optional": true
+        },
+        "webpack": {
+          "optional": true
+        }
       }
     },
     "node_modules/babel-plugin-dynamic-import-node": {
@@ -18259,9 +18335,9 @@
       }
     },
     "node_modules/babel-plugin-macros/node_modules/yaml": {
-      "version": "1.10.2",
-      "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz",
-      "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==",
+      "version": "1.10.3",
+      "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.3.tgz",
+      "integrity": "sha512-vIYeF1u3CjlhAFekPPAk2h/Kv4T3mAkMox5OymRiJQB0spDP10LHvt+K7G9Ny6NuuMAb25/6n1qyUjAcGNf/AA==",
       "license": "ISC",
       "engines": {
         "node": ">= 6"
@@ -18417,9 +18493,9 @@
       "license": "MIT"
     },
     "node_modules/baseline-browser-mapping": {
-      "version": "2.10.7",
-      "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.10.7.tgz",
-      "integrity": "sha512-1ghYO3HnxGec0TCGBXiDLVns4eCSx4zJpxnHrlqFQajmhfKMQBzUGDdkMK7fUW7PTHTeLf+j87aTuKuuwWzMGw==",
+      "version": "2.10.16",
+      "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.10.16.tgz",
+      "integrity": "sha512-Lyf3aK28zpsD1yQMiiHD4RvVb6UdMoo8xzG2XzFIfR9luPzOpcBlAsT/qfB1XWS1bxWT+UtE4WmQgsp297FYOA==",
       "dev": true,
       "license": "Apache-2.0",
       "bin": {
@@ -18467,12 +18543,6 @@
         "tweetnacl": "^0.14.3"
       }
     },
-    "node_modules/before-after-hook": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/before-after-hook/-/before-after-hook-3.0.2.tgz",
-      "integrity": "sha512-Nik3Sc0ncrMK4UUdXQmAnRtzmNQTAAXmXIopizwZ1W1t8QmfJj+zL4OA2I7XPTPW5z5TDqv4hRo/JzouDJnX3A==",
-      "license": "Apache-2.0"
-    },
     "node_modules/better-opn": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/better-opn/-/better-opn-3.0.2.tgz",
@@ -18516,19 +18586,67 @@
       }
     },
     "node_modules/bin-links": {
-      "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/bin-links/-/bin-links-4.0.4.tgz",
-      "integrity": "sha512-cMtq4W5ZsEwcutJrVId+a/tjt8GSbS+h0oNkdl6+6rBuEv8Ot33Bevj5KPm40t309zuhVic8NjpuL42QCiJWWA==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/bin-links/-/bin-links-5.0.0.tgz",
+      "integrity": "sha512-sdleLVfCjBtgO5cNjA2HVRvWBJAHs4zwenaCPMNJAJU0yNxpzj80IpjOIimkpkr+mhlA+how5poQtt53PygbHA==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
-        "cmd-shim": "^6.0.0",
-        "npm-normalize-package-bin": "^3.0.0",
-        "read-cmd-shim": "^4.0.0",
-        "write-file-atomic": "^5.0.0"
+        "cmd-shim": "^7.0.0",
+        "npm-normalize-package-bin": "^4.0.0",
+        "proc-log": "^5.0.0",
+        "read-cmd-shim": "^5.0.0",
+        "write-file-atomic": "^6.0.0"
       },
       "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+        "node": "^18.17.0 || >=20.5.0"
+      }
+    },
+    "node_modules/bin-links/node_modules/cmd-shim": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/cmd-shim/-/cmd-shim-7.0.0.tgz",
+      "integrity": "sha512-rtpaCbr164TPPh+zFdkWpCyZuKkjpAzODfaZCf/SVJZzJN+4bHQb/LP3Jzq5/+84um3XXY8r548XiWKSborwVw==",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": "^18.17.0 || >=20.5.0"
+      }
+    },
+    "node_modules/bin-links/node_modules/read-cmd-shim": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/read-cmd-shim/-/read-cmd-shim-5.0.0.tgz",
+      "integrity": "sha512-SEbJV7tohp3DAAILbEMPXavBjAnMN0tVnh4+9G8ihV4Pq3HYF9h8QNez9zkJ1ILkv9G2BjdzwctznGZXgu/HGw==",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": "^18.17.0 || >=20.5.0"
+      }
+    },
+    "node_modules/bin-links/node_modules/signal-exit": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
+      "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/bin-links/node_modules/write-file-atomic": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-6.0.0.tgz",
+      "integrity": "sha512-GmqrO8WJ1NuzJ2DrziEI2o57jKAVIQNf8a18W3nCYU3H7PNWqCCVTeH6/NQE93CIllIgQS98rrmVkYgTX9fFJQ==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "imurmurhash": "^0.1.4",
+        "signal-exit": "^4.0.1"
+      },
+      "engines": {
+        "node": "^18.17.0 || >=20.5.0"
       }
     },
     "node_modules/binary-extensions": {
@@ -18702,9 +18820,9 @@
       "license": "MIT"
     },
     "node_modules/brace-expansion": {
-      "version": "1.1.12",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz",
-      "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==",
+      "version": "1.1.13",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.13.tgz",
+      "integrity": "sha512-9ZLprWS6EENmhEOpjCYW2c8VkmOvckIJZfkr7rBW6dObmfgJ/L1GpSYW5Hpo9lDz4D1+n0Ckz8rU7FwHDQiG/w==",
       "license": "MIT",
       "dependencies": {
         "balanced-match": "^1.0.0",
@@ -18922,28 +19040,58 @@
         "node": ">=6.0.0"
       }
     },
+    "node_modules/bytewise": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/bytewise/-/bytewise-1.1.0.tgz",
+      "integrity": "sha512-rHuuseJ9iQ0na6UDhnrRVDh8YnWVlU6xM3VH6q/+yHDeUH2zIhUzP+2/h3LIrhLDBtTqzWpE3p3tP/boefskKQ==",
+      "license": "MIT",
+      "dependencies": {
+        "bytewise-core": "^1.2.2",
+        "typewise": "^1.0.3"
+      }
+    },
+    "node_modules/bytewise-core": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/bytewise-core/-/bytewise-core-1.2.3.tgz",
+      "integrity": "sha512-nZD//kc78OOxeYtRlVk8/zXqTB4gf/nlguL1ggWA8FuchMyOxcyHR4QPQZMUmA7czC+YnaBrPUCubqAWe50DaA==",
+      "license": "MIT",
+      "dependencies": {
+        "typewise-core": "^1.2"
+      }
+    },
     "node_modules/cacache": {
-      "version": "18.0.4",
-      "resolved": "https://registry.npmjs.org/cacache/-/cacache-18.0.4.tgz",
-      "integrity": "sha512-B+L5iIa9mgcjLbliir2th36yEwPftrzteHYujzsx3dFP/31GCHcIeS8f5MGd80odLOjaOvSpU3EEAmRQptkxLQ==",
+      "version": "20.0.4",
+      "resolved": "https://registry.npmjs.org/cacache/-/cacache-20.0.4.tgz",
+      "integrity": "sha512-M3Lab8NPYlZU2exsL3bMVvMrMqgwCnMWfdZbK28bn3pK6APT/Te/I8hjRPNu1uwORY9a1eEQoifXbKPQMfMTOA==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
-        "@npmcli/fs": "^3.1.0",
+        "@npmcli/fs": "^5.0.0",
         "fs-minipass": "^3.0.0",
-        "glob": "^10.2.2",
-        "lru-cache": "^10.0.1",
+        "glob": "^13.0.0",
+        "lru-cache": "^11.1.0",
         "minipass": "^7.0.3",
         "minipass-collect": "^2.0.1",
         "minipass-flush": "^1.0.5",
         "minipass-pipeline": "^1.2.4",
-        "p-map": "^4.0.0",
-        "ssri": "^10.0.0",
-        "tar": "^6.1.11",
-        "unique-filename": "^3.0.0"
+        "p-map": "^7.0.2",
+        "ssri": "^13.0.0"
       },
       "engines": {
-        "node": "^16.14.0 || >=18.0.0"
+        "node": "^20.17.0 || >=22.9.0"
+      }
+    },
+    "node_modules/cacache/node_modules/@npmcli/fs": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-5.0.0.tgz",
+      "integrity": "sha512-7OsC1gNORBEawOa5+j2pXN9vsicaIOH5cPXxoR6fJOmH6/EXpJB2CajXOu1fPRFun2m1lktEFX11+P89hqO/og==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "semver": "^7.3.5"
+      },
+      "engines": {
+        "node": "^20.17.0 || >=22.9.0"
       }
     },
     "node_modules/cacache/node_modules/balanced-match": {
@@ -18957,9 +19105,9 @@
       }
     },
     "node_modules/cacache/node_modules/brace-expansion": {
-      "version": "5.0.3",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.3.tgz",
-      "integrity": "sha512-fy6KJm2RawA5RcHkLa1z/ScpBeA762UF9KmZQxwIbDtRJrgLzM10depAiEQ+CXYcoiqW1/m96OAAoke2nE9EeA==",
+      "version": "5.0.5",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.5.tgz",
+      "integrity": "sha512-VZznLgtwhn+Mact9tfiwx64fA9erHH/MCXEUfB/0bX/6Fz6ny5EGTXYltMocqg4xFAQZtnO3DHWWXi8RiuN7cQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -18970,49 +19118,92 @@
       }
     },
     "node_modules/cacache/node_modules/glob": {
-      "version": "10.5.0",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-10.5.0.tgz",
-      "integrity": "sha512-DfXN8DfhJ7NH3Oe7cFmu3NCu1wKbkReJ8TorzSAFbSKrlNaQSKfIzqYqVY8zlbs2NLBbWpRiU52GX2PbaBVNkg==",
+      "version": "13.0.6",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-13.0.6.tgz",
+      "integrity": "sha512-Wjlyrolmm8uDpm/ogGyXZXb1Z+Ca2B8NbJwqBVg0axK9GbBeoS7yGV6vjXnYdGm6X53iehEuxxbyiKp8QmN4Vw==",
       "dev": true,
-      "license": "ISC",
+      "license": "BlueOak-1.0.0",
       "dependencies": {
-        "foreground-child": "^3.1.0",
-        "jackspeak": "^3.1.2",
-        "minimatch": "^9.0.4",
-        "minipass": "^7.1.2",
-        "package-json-from-dist": "^1.0.0",
-        "path-scurry": "^1.11.1"
+        "minimatch": "^10.2.2",
+        "minipass": "^7.1.3",
+        "path-scurry": "^2.0.2"
       },
-      "bin": {
-        "glob": "dist/esm/bin.mjs"
+      "engines": {
+        "node": "18 || 20 || >=22"
       },
       "funding": {
         "url": "https://github.com/sponsors/isaacs"
       }
     },
     "node_modules/cacache/node_modules/lru-cache": {
-      "version": "10.4.3",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz",
-      "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==",
+      "version": "11.2.7",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.2.7.tgz",
+      "integrity": "sha512-aY/R+aEsRelme17KGQa/1ZSIpLpNYYrhcrepKTZgE+W3WM16YMCaPwOHLHsmopZHELU0Ojin1lPVxKR0MihncA==",
       "dev": true,
-      "license": "ISC"
+      "license": "BlueOak-1.0.0",
+      "engines": {
+        "node": "20 || >=22"
+      }
     },
     "node_modules/cacache/node_modules/minimatch": {
-      "version": "9.0.7",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.7.tgz",
-      "integrity": "sha512-MOwgjc8tfrpn5QQEvjijjmDVtMw2oL88ugTevzxQnzRLm6l3fVEF2gzU0kYeYYKD8C66+IdGX6peJ4MyUlUnPg==",
+      "version": "10.2.4",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.2.4.tgz",
+      "integrity": "sha512-oRjTw/97aTBN0RHbYCdtF1MQfvusSIBQM0IZEgzl6426+8jSC0nF1a/GmnVLpfB9yyr6g6FTqWqiZVbxrtaCIg==",
       "dev": true,
-      "license": "ISC",
+      "license": "BlueOak-1.0.0",
       "dependencies": {
         "brace-expansion": "^5.0.2"
       },
       "engines": {
-        "node": ">=16 || 14 >=14.17"
+        "node": "18 || 20 || >=22"
       },
       "funding": {
         "url": "https://github.com/sponsors/isaacs"
       }
     },
+    "node_modules/cacache/node_modules/p-map": {
+      "version": "7.0.4",
+      "resolved": "https://registry.npmjs.org/p-map/-/p-map-7.0.4.tgz",
+      "integrity": "sha512-tkAQEw8ysMzmkhgw8k+1U/iPhWNhykKnSk4Rd5zLoPJCuJaGRPo6YposrZgaxHKzDHdDWWZvE/Sk7hsL2X/CpQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/cacache/node_modules/path-scurry": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-2.0.2.tgz",
+      "integrity": "sha512-3O/iVVsJAPsOnpwWIeD+d6z/7PmqApyQePUtCndjatj/9I5LylHvt5qluFaBT3I5h3r1ejfR056c+FCv+NnNXg==",
+      "dev": true,
+      "license": "BlueOak-1.0.0",
+      "dependencies": {
+        "lru-cache": "^11.0.0",
+        "minipass": "^7.1.2"
+      },
+      "engines": {
+        "node": "18 || 20 || >=22"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/cacache/node_modules/ssri": {
+      "version": "13.0.1",
+      "resolved": "https://registry.npmjs.org/ssri/-/ssri-13.0.1.tgz",
+      "integrity": "sha512-QUiRf1+u9wPTL/76GTYlKttDEBWV1ga9ZXW8BG6kfdeyyM8LGPix9gROyg9V2+P0xNyF3X2Go526xKFdMZrHSQ==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "minipass": "^7.0.3"
+      },
+      "engines": {
+        "node": "^20.17.0 || >=22.9.0"
+      }
+    },
     "node_modules/cachedir": {
       "version": "2.4.0",
       "resolved": "https://registry.npmjs.org/cachedir/-/cachedir-2.4.0.tgz",
@@ -19343,6 +19534,12 @@
         "url": "https://github.com/sponsors/wooorm"
       }
     },
+    "node_modules/chardet": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/chardet/-/chardet-2.1.1.tgz",
+      "integrity": "sha512-PsezH1rqdV9VvyNhxxOW32/d75r01NY7TQCmOqomRo15ZSOKbpTFVsfjghxo6JloQUCGnH4k1LGu0R4yCLlWQQ==",
+      "license": "MIT"
+    },
     "node_modules/charenc": {
       "version": "0.0.2",
       "resolved": "https://registry.npmjs.org/charenc/-/charenc-0.0.2.tgz",
@@ -19496,13 +19693,13 @@
       }
     },
     "node_modules/chownr": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz",
-      "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/chownr/-/chownr-3.0.0.tgz",
+      "integrity": "sha512-+IxzY9BZOQd/XuYPRmrvEVjF/nqj5kgT4kEq7VofrDoM1MxoRjEWkrCC3EtLi59TVawxTAn+orJwFQcrqEN1+g==",
       "dev": true,
-      "license": "ISC",
+      "license": "BlueOak-1.0.0",
       "engines": {
-        "node": ">=10"
+        "node": ">=18"
       }
     },
     "node_modules/chroma-js": {
@@ -19531,9 +19728,9 @@
       }
     },
     "node_modules/ci-info": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-4.2.0.tgz",
-      "integrity": "sha512-cYY9mypksY8NRqgDB1XD1RiJL338v/551niynFTGkZOO2LHuB2OmOYxDIe/ttN9AHwrqdum1360G3ald0W9kCg==",
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-4.3.1.tgz",
+      "integrity": "sha512-Wdy2Igu8OcBpI2pZePZ5oWjPC38tmDVx5WKUXKwlLYkA0ozo85sLsLvkBbBn/sZaSCMFOGZJ14fvW9t5/d7kdA==",
       "dev": true,
       "funding": [
         {
@@ -19656,7 +19853,6 @@
       "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-4.1.0.tgz",
       "integrity": "sha512-ouuZd4/dm2Sw5Gmqy6bGyNNNe1qt9RpmxveLSO7KcgsTnU7RXfsw+/bukWGo1abgBiMAic068rclZsO4IWmmxQ==",
       "license": "ISC",
-      "peer": true,
       "engines": {
         "node": ">= 12"
       }
@@ -19675,18 +19871,6 @@
         "node": ">=12"
       }
     },
-    "node_modules/cliui/node_modules/strip-ansi": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-      "license": "MIT",
-      "dependencies": {
-        "ansi-regex": "^5.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/cliui/node_modules/wrap-ansi": {
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
@@ -19732,7 +19916,8 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-1.0.0.tgz",
       "integrity": "sha512-au6ydSpg6nsrigcZ4m8Bc9hxjeW+GJ8xh5G3BJCMt4WXe1H10UNaVOamqQTmrx1kjVuxAHIQSNU6hY4Nsn9/ag==",
-      "license": "MIT"
+      "license": "MIT",
+      "peer": true
     },
     "node_modules/clsx": {
       "version": "2.1.1",
@@ -19850,19 +20035,6 @@
         "node": ">=8.0.0"
       }
     },
-    "node_modules/columnify/node_modules/strip-ansi": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ansi-regex": "^5.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/combined-stream": {
       "version": "1.0.8",
       "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
@@ -20399,20 +20571,20 @@
       }
     },
     "node_modules/copy-webpack-plugin": {
-      "version": "13.0.1",
-      "resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-13.0.1.tgz",
-      "integrity": "sha512-J+YV3WfhY6W/Xf9h+J1znYuqTye2xkBUIGyTPWuBAT27qajBa5mR4f8WBmfDY3YjRftT2kqZZiLi1qf0H+UOFw==",
+      "version": "14.0.0",
+      "resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-14.0.0.tgz",
+      "integrity": "sha512-3JLW90aBGeaTLpM7mYQKpnVdgsUZRExY55giiZgLuX/xTQRUs1dOCwbBnWnvY6Q6rfZoXMNwzOQJCSZPppfqXA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "glob-parent": "^6.0.1",
         "normalize-path": "^3.0.0",
         "schema-utils": "^4.2.0",
-        "serialize-javascript": "^6.0.2",
+        "serialize-javascript": "^7.0.3",
         "tinyglobby": "^0.2.12"
       },
       "engines": {
-        "node": ">= 18.12.0"
+        "node": ">= 20.9.0"
       },
       "funding": {
         "type": "opencollective",
@@ -21567,9 +21739,9 @@
       }
     },
     "node_modules/css-minimizer-webpack-plugin/node_modules/picomatch": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz",
-      "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.4.tgz",
+      "integrity": "sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -21579,16 +21751,6 @@
         "url": "https://github.com/sponsors/jonschlinkert"
       }
     },
-    "node_modules/css-minimizer-webpack-plugin/node_modules/serialize-javascript": {
-      "version": "7.0.4",
-      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-7.0.4.tgz",
-      "integrity": "sha512-DuGdB+Po43Q5Jxwpzt1lhyFSYKryqoNjQSA9M92tyw0lyHIOur+XCalOUe0KTJpyqzT8+fQ5A0Jf7vCx/NKmIg==",
-      "dev": true,
-      "license": "BSD-3-Clause",
-      "engines": {
-        "node": ">=20.0.0"
-      }
-    },
     "node_modules/css-minimizer-webpack-plugin/node_modules/supports-color": {
       "version": "8.1.1",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
@@ -21802,46 +21964,6 @@
       "dev": true,
       "license": "CC0-1.0"
     },
-    "node_modules/cssstyle": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-6.0.1.tgz",
-      "integrity": "sha512-IoJs7La+oFp/AB033wBStxNOJt4+9hHMxsXUPANcoXL2b3W4DZKghlJ2cI/eyeRZIQ9ysvYEorVhjrcYctWbog==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@asamuzakjp/css-color": "^4.1.2",
-        "@csstools/css-syntax-patches-for-csstree": "^1.0.26",
-        "css-tree": "^3.1.0",
-        "lru-cache": "^11.2.5"
-      },
-      "engines": {
-        "node": ">=20"
-      }
-    },
-    "node_modules/cssstyle/node_modules/css-tree": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-3.1.0.tgz",
-      "integrity": "sha512-0eW44TGN5SQXU1mWSkKwFstI/22X2bG1nYzZTYMAWjylYURhse752YgbE4Cx46AC+bAvI+/dYTPRk1LqSUnu6w==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "mdn-data": "2.12.2",
-        "source-map-js": "^1.0.1"
-      },
-      "engines": {
-        "node": "^10 || ^12.20.0 || ^14.13.0 || >=15.0.0"
-      }
-    },
-    "node_modules/cssstyle/node_modules/lru-cache": {
-      "version": "11.2.6",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.2.6.tgz",
-      "integrity": "sha512-ESL2CrkS/2wTPfuend7Zhkzo2u0daGJ/A2VucJOgQ/C48S/zB8MMeMHSGKYpXhIjbPxfuezITkaBH1wqv00DDQ==",
-      "dev": true,
-      "license": "BlueOak-1.0.0",
-      "engines": {
-        "node": "20 || >=22"
-      }
-    },
     "node_modules/csstype": {
       "version": "3.2.3",
       "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.2.3.tgz",
@@ -22420,9 +22542,9 @@
       }
     },
     "node_modules/dayjs": {
-      "version": "1.11.19",
-      "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.19.tgz",
-      "integrity": "sha512-t5EcLVS6QPBNqM2z8fakk/NKel+Xzshgt8FFKAn+qwlD1pzZWxh0nVCrvFK7ZDb6XucZeF9z8C7CBWTRIVApAw==",
+      "version": "1.11.20",
+      "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.20.tgz",
+      "integrity": "sha512-YbwwqR/uYpeoP4pu043q+LTDLFBLApUP6VxRihdfNTqu4ubqMlGDLd6ErXhEgsyvY0K6nCs7nggYumAN+9uEuQ==",
       "license": "MIT"
     },
     "node_modules/debounce": {
@@ -22611,9 +22733,9 @@
       }
     },
     "node_modules/default-browser": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/default-browser/-/default-browser-5.2.1.tgz",
-      "integrity": "sha512-WY/3TUME0x3KPYdRRxEJJvXRHV4PyPoUsxtZa78lwItwRQRHhd2U9xOscaT/YTf8uCXIAjeJOFBVEh/7FtD8Xg==",
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/default-browser/-/default-browser-5.5.0.tgz",
+      "integrity": "sha512-H9LMLr5zwIbSxrmvikGuI/5KGhZ8E2zH3stkMgM5LpOWDutGM2JZaj460Udnf1a+946zc7YBgrqEWwbk7zHvGw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -23099,9 +23221,9 @@
       }
     },
     "node_modules/dompurify": {
-      "version": "3.3.3",
-      "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-3.3.3.tgz",
-      "integrity": "sha512-Oj6pzI2+RqBfFG+qOaOLbFXLQ90ARpcGG6UePL82bJLtdsa6CYJD7nmiU8MW9nQNOtCHV3lZ/Bzq1X0QYbBZCA==",
+      "version": "3.4.0",
+      "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-3.4.0.tgz",
+      "integrity": "sha512-nolgK9JcaUXMSmW+j1yaSvaEaoXYHwWyGJlkoCTghc97KgGDDSnpoU/PlEnw63Ah+TGKFOyY+X5LnxaWbCSfXg==",
       "license": "(MPL-2.0 OR Apache-2.0)",
       "optionalDependencies": {
         "@types/trusted-types": "^2.0.7"
@@ -23377,6 +23499,7 @@
       "version": "3.1.10",
       "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.10.tgz",
       "integrity": "sha512-UeJmFfOrAQS8OJWPZ4qtgHyWExa088/MtK5UEyoJGFH67cDEXkZSviOiKRCZ4Xij0zxI3JECgYs3oKx+AizQBA==",
+      "devOptional": true,
       "license": "Apache-2.0",
       "dependencies": {
         "jake": "^10.8.5"
@@ -23412,6 +23535,7 @@
       "version": "9.2.2",
       "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
       "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==",
+      "dev": true,
       "license": "MIT"
     },
     "node_modules/emojis-list": {
@@ -23508,20 +23632,6 @@
         "node": ">=8.6"
       }
     },
-    "node_modules/enquirer/node_modules/strip-ansi": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-      "dev": true,
-      "license": "MIT",
-      "peer": true,
-      "dependencies": {
-        "ansi-regex": "^5.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/entities": {
       "version": "4.5.0",
       "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz",
@@ -24167,20 +24277,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/eslint-plugin-file-progress": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-file-progress/-/eslint-plugin-file-progress-1.5.0.tgz",
-      "integrity": "sha512-get8oNfacIagP+igSzrEZhepPgodtdwACVeKQsE1fVvTL15tZvgCv8K4B2lKT4FZOZOyhxSkQGnWyjEOx1uoIw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "nanospinner": "^1.1.0",
-        "picocolors": "^1.0.1"
-      },
-      "peerDependencies": {
-        "eslint": "^7.0.0 || ^8.0.0 || ^9.0.0"
-      }
-    },
     "node_modules/eslint-plugin-i18n-strings": {
       "resolved": "eslint-rules/eslint-plugin-i18n-strings",
       "link": true
@@ -24333,6 +24429,16 @@
         "eslint": ">=2"
       }
     },
+    "node_modules/eslint-plugin-no-only-tests": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-no-only-tests/-/eslint-plugin-no-only-tests-3.3.0.tgz",
+      "integrity": "sha512-brcKcxGnISN2CcVhXJ/kEQlNa0MEfGRtwKtWA16SkqXHKitaKIMrfemJKLKX1YqDU5C/5JY3PvZXd5jEW04e0Q==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=5.0.0"
+      }
+    },
     "node_modules/eslint-plugin-prettier": {
       "version": "5.5.5",
       "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-5.5.5.tgz",
@@ -24372,9 +24478,9 @@
       "license": "MIT"
     },
     "node_modules/eslint-plugin-react-you-might-not-need-an-effect": {
-      "version": "0.9.2",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-react-you-might-not-need-an-effect/-/eslint-plugin-react-you-might-not-need-an-effect-0.9.2.tgz",
-      "integrity": "sha512-VplJMf2kAYI4bF1KSCOygQ9BHzOqM/0P3cqpnBTylnSVv9aNxVrz2RDMs8bKJtITcp2CV9kuAUkzjUP0zgxbSw==",
+      "version": "0.9.3",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-react-you-might-not-need-an-effect/-/eslint-plugin-react-you-might-not-need-an-effect-0.9.3.tgz",
+      "integrity": "sha512-44cce7LndBnpDRWBTQ8p7ircIdl2rJBP5+V9Ik64E935UB47uA9ZMU1Uv160lAMhtvoPYqXBjQ+tojr5JF3mFQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -24430,9 +24536,9 @@
       }
     },
     "node_modules/eslint-plugin-testing-library": {
-      "version": "7.16.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-testing-library/-/eslint-plugin-testing-library-7.16.0.tgz",
-      "integrity": "sha512-lHZI6/Olb2oZqxd1+s1nOLCtL2PXKrc1ERz6oDbUKS0xZAMFH3Fy6wJo75z3pXTop3BV6+loPi2MSjIYt3vpAg==",
+      "version": "7.16.2",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-testing-library/-/eslint-plugin-testing-library-7.16.2.tgz",
+      "integrity": "sha512-8gleGnQXK2ZA3hHwjCwpYTZvM+9VsrJ+/9kDI8CjqAQGAdMQOdn/rJNu7ZySENuiWlGKQWyZJ4ZjEg2zamaRHw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -24559,9 +24665,9 @@
       }
     },
     "node_modules/eslint-plugin-testing-library/node_modules/brace-expansion": {
-      "version": "5.0.3",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.3.tgz",
-      "integrity": "sha512-fy6KJm2RawA5RcHkLa1z/ScpBeA762UF9KmZQxwIbDtRJrgLzM10depAiEQ+CXYcoiqW1/m96OAAoke2nE9EeA==",
+      "version": "5.0.5",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.5.tgz",
+      "integrity": "sha512-VZznLgtwhn+Mact9tfiwx64fA9erHH/MCXEUfB/0bX/6Fz6ny5EGTXYltMocqg4xFAQZtnO3DHWWXi8RiuN7cQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -24771,19 +24877,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/eslint/node_modules/strip-ansi": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ansi-regex": "^5.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/eslint/node_modules/type-fest": {
       "version": "0.20.2",
       "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
@@ -25135,6 +25228,18 @@
       "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==",
       "license": "MIT"
     },
+    "node_modules/extend-shallow": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+      "license": "MIT",
+      "dependencies": {
+        "is-extendable": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/extract-zip": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-2.0.1.tgz",
@@ -25211,6 +25316,15 @@
       "dev": true,
       "license": "Apache-2.0"
     },
+    "node_modules/fast-equals": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/fast-equals/-/fast-equals-6.0.0.tgz",
+      "integrity": "sha512-PFhhIGgdM79r5Uztdj9Zb6Tt1zKafqVfdMGwVca1z5z6fbX7DmsySSuJd8HiP6I1j505DCS83cLxo5rmSNeVEA==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
     "node_modules/fast-fifo": {
       "version": "1.3.2",
       "resolved": "https://registry.npmjs.org/fast-fifo/-/fast-fifo-1.3.2.tgz",
@@ -25299,21 +25413,24 @@
       "license": "BSD-3-Clause"
     },
     "node_modules/fast-xml-builder": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fast-xml-builder/-/fast-xml-builder-1.0.0.tgz",
-      "integrity": "sha512-fpZuDogrAgnyt9oDDz+5DBz0zgPdPZz6D4IR7iESxRXElrlGTRkHJ9eEt+SACRJwT0FNFrt71DFQIUFBJfX/uQ==",
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/fast-xml-builder/-/fast-xml-builder-1.1.5.tgz",
+      "integrity": "sha512-4TJn/8FKLeslLAH3dnohXqE3QSoxkhvaMzepOIZytwJXZO69Bfz0HBdDHzOTOon6G59Zrk6VQ2bEiv1t61rfkA==",
       "funding": [
         {
           "type": "github",
           "url": "https://github.com/sponsors/NaturalIntelligence"
         }
       ],
-      "license": "MIT"
+      "license": "MIT",
+      "dependencies": {
+        "path-expression-matcher": "^1.1.3"
+      }
     },
     "node_modules/fast-xml-parser": {
-      "version": "4.5.4",
-      "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-4.5.4.tgz",
-      "integrity": "sha512-jE8ugADnYOBsu1uaoayVl1tVKAMNOXyjwvv2U6udEA2ORBhDooJDWoGxTkhd4Qn4yh59JVVt/pKXtjPwx9OguQ==",
+      "version": "4.5.5",
+      "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-4.5.5.tgz",
+      "integrity": "sha512-cK9c5I/DwIOI7/Q7AlGN3DuTdwN61gwSfL8rvuVPK+0mcCNHHGxRrpiFtaZZRfRMJL3Gl8B2AFlBG6qXf03w9A==",
       "funding": [
         {
           "type": "github",
@@ -25491,18 +25608,19 @@
       "license": "MIT"
     },
     "node_modules/file-type": {
-      "version": "18.7.0",
-      "resolved": "https://registry.npmjs.org/file-type/-/file-type-18.7.0.tgz",
-      "integrity": "sha512-ihHtXRzXEziMrQ56VSgU7wkxh55iNchFkosu7Y9/S+tXHdKyrGjVK0ujbqNnsxzea+78MaLhN6PGmfYSAv1ACw==",
+      "version": "21.3.4",
+      "resolved": "https://registry.npmjs.org/file-type/-/file-type-21.3.4.tgz",
+      "integrity": "sha512-Ievi/yy8DS3ygGvT47PjSfdFoX+2isQueoYP1cntFW1JLYAuS4GD7NUPGg4zv2iZfV52uDyk5w5Z0TdpRS6Q1g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "readable-web-to-node-stream": "^3.0.2",
-        "strtok3": "^7.0.0",
-        "token-types": "^5.0.1"
+        "@tokenizer/inflate": "^0.4.1",
+        "strtok3": "^10.3.4",
+        "token-types": "^6.1.1",
+        "uint8array-extras": "^1.4.0"
       },
       "engines": {
-        "node": ">=14.16"
+        "node": ">=20"
       },
       "funding": {
         "url": "https://github.com/sindresorhus/file-type?sponsor=1"
@@ -25518,9 +25636,9 @@
       }
     },
     "node_modules/filelist/node_modules/brace-expansion": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
-      "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.3.tgz",
+      "integrity": "sha512-MCV/fYJEbqx68aE58kv2cA/kiky1G8vux3OR6/jbS+jIMe/6fJWa0DTzJU7dqijOWYwHi1t29FlfYI9uytqlpA==",
       "license": "MIT",
       "dependencies": {
         "balanced-match": "^1.0.0"
@@ -25784,18 +25902,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/find-up-simple": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/find-up-simple/-/find-up-simple-1.0.0.tgz",
-      "integrity": "sha512-q7Us7kcjj2VMePAa02hDAF6d+MzsdsAWEwYyOpwUtlerRBkOEPBCRZrAV4XfcSN8fHAgaD0hP7miwoay6DCprw==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=18"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/first-chunk-stream": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/first-chunk-stream/-/first-chunk-stream-5.0.0.tgz",
@@ -25852,16 +25958,16 @@
       }
     },
     "node_modules/flatted": {
-      "version": "3.4.1",
-      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.4.1.tgz",
-      "integrity": "sha512-IxfVbRFVlV8V/yRaGzk0UVIcsKKHMSfYw66T/u4nTwlWteQePsxe//LjudR1AMX4tZW3WFCh3Zqa/sjlqpbURQ==",
+      "version": "3.4.2",
+      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.4.2.tgz",
+      "integrity": "sha512-PjDse7RzhcPkIJwy5t7KPWQSZ9cAbzQXcafsetQoD7sOJRQlGikNbx7yZp2OotDnJyrDcbyRq3Ttb18iYOqkxA==",
       "dev": true,
       "license": "ISC"
     },
     "node_modules/follow-redirects": {
-      "version": "1.15.11",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.11.tgz",
-      "integrity": "sha512-deG2P0JfjrTxl50XGCDyfI97ZGVCxIpfKYmfyrQ54n5FO/0gfIES8C/Psl6kWVDolizcaaxZJnTS0QSMxvnsBQ==",
+      "version": "1.16.0",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.16.0.tgz",
+      "integrity": "sha512-y5rN/uOsadFT/JfYwhxRS5R7Qce+g3zG97+JrtFZlC9klX/W5hD7iiLzScI4nZqUS7DNUdhPgw4xI8W2LuXlUw==",
       "dev": true,
       "funding": [
         {
@@ -25895,12 +26001,13 @@
       }
     },
     "node_modules/foreground-child": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.3.0.tgz",
-      "integrity": "sha512-Ld2g8rrAyMYFXBhEqMz8ZAHBi4J4uS1i/CxGMDnjyFWddMXLVcDp051DZfu+t7+ab7Wv6SMqpWmyFIj5UbfFvg==",
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.3.1.tgz",
+      "integrity": "sha512-gIXjKqtFuWEgzFRJA9WCQeSJLZDjgJUOMCMzxtvFq/37KojM1BFGufqsCy0r4qSQmYLsZYMeyRqzIWOMup03sw==",
+      "dev": true,
       "license": "ISC",
       "dependencies": {
-        "cross-spawn": "^7.0.0",
+        "cross-spawn": "^7.0.6",
         "signal-exit": "^4.0.1"
       },
       "engines": {
@@ -25914,6 +26021,7 @@
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
       "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
+      "dev": true,
       "license": "ISC",
       "engines": {
         "node": ">=14"
@@ -26182,9 +26290,9 @@
       }
     },
     "node_modules/fs-extra": {
-      "version": "11.3.3",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.3.3.tgz",
-      "integrity": "sha512-VWSRii4t0AFm6ixFFmLLx1t7wS1gh+ckoa84aOeapGum0h+EZd1EhEumSB+ZdDLnEPuucsVB9oB7cxJHap6Afg==",
+      "version": "11.3.4",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.3.4.tgz",
+      "integrity": "sha512-CTXd6rk/M3/ULNQj8FBqBWHYBVYybQ3VPBw0xGKFe3tuH7ytT6ACnvzpIQ3UZtB8yvUKC2cXn1a+x+5EVQLovA==",
       "license": "MIT",
       "dependencies": {
         "graceful-fs": "^4.2.0",
@@ -26282,24 +26390,27 @@
       }
     },
     "node_modules/fuse.js": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/fuse.js/-/fuse.js-7.1.0.tgz",
-      "integrity": "sha512-trLf4SzuuUxfusZADLINj+dE8clK1frKdmqiJNb1Es75fmI5oY6X2mxLVUciLLjxqw/xr72Dhy+lER6dGd02FQ==",
+      "version": "7.3.0",
+      "resolved": "https://registry.npmjs.org/fuse.js/-/fuse.js-7.3.0.tgz",
+      "integrity": "sha512-plz8RVjfcDedTGfVngWH1jmJvBvAwi1v2jecfDerbEnMcmOYUEEwKFTHbNoCiYyzaK2Ws8lABkTCcRSqCY1q4w==",
       "license": "Apache-2.0",
       "engines": {
         "node": ">=10"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/krisk"
       }
     },
     "node_modules/gaxios": {
-      "version": "7.1.3",
-      "resolved": "https://registry.npmjs.org/gaxios/-/gaxios-7.1.3.tgz",
-      "integrity": "sha512-YGGyuEdVIjqxkxVH1pUTMY/XtmmsApXrCVv5EU25iX6inEPbV+VakJfLealkBtJN69AQmh1eGOdCl9Sm1UP6XQ==",
+      "version": "7.1.4",
+      "resolved": "https://registry.npmjs.org/gaxios/-/gaxios-7.1.4.tgz",
+      "integrity": "sha512-bTIgTsM2bWn3XklZISBTQX7ZSddGW+IO3bMdGaemHZ3tbqExMENHLx6kKZ/KlejgrMtj8q7wBItt51yegqalrA==",
       "license": "Apache-2.0",
       "dependencies": {
         "extend": "^3.0.2",
         "https-proxy-agent": "^7.0.1",
-        "node-fetch": "^3.3.2",
-        "rimraf": "^5.0.1"
+        "node-fetch": "^3.3.2"
       },
       "engines": {
         "node": ">=18"
@@ -26314,15 +26425,6 @@
         "node": ">= 14"
       }
     },
-    "node_modules/gaxios/node_modules/brace-expansion": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
-      "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
-      "license": "MIT",
-      "dependencies": {
-        "balanced-match": "^1.0.0"
-      }
-    },
     "node_modules/gaxios/node_modules/data-uri-to-buffer": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-4.0.1.tgz",
@@ -26332,27 +26434,6 @@
         "node": ">= 12"
       }
     },
-    "node_modules/gaxios/node_modules/glob": {
-      "version": "10.5.0",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-10.5.0.tgz",
-      "integrity": "sha512-DfXN8DfhJ7NH3Oe7cFmu3NCu1wKbkReJ8TorzSAFbSKrlNaQSKfIzqYqVY8zlbs2NLBbWpRiU52GX2PbaBVNkg==",
-      "deprecated": "Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me",
-      "license": "ISC",
-      "dependencies": {
-        "foreground-child": "^3.1.0",
-        "jackspeak": "^3.1.2",
-        "minimatch": "^9.0.4",
-        "minipass": "^7.1.2",
-        "package-json-from-dist": "^1.0.0",
-        "path-scurry": "^1.11.1"
-      },
-      "bin": {
-        "glob": "dist/esm/bin.mjs"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
     "node_modules/gaxios/node_modules/https-proxy-agent": {
       "version": "7.0.6",
       "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.6.tgz",
@@ -26366,21 +26447,6 @@
         "node": ">= 14"
       }
     },
-    "node_modules/gaxios/node_modules/minimatch": {
-      "version": "9.0.9",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.9.tgz",
-      "integrity": "sha512-OBwBN9AL4dqmETlpS2zasx+vTeWclWzkblfZk7KTA5j3jeOONz/tRCnZomUyvNg83wL5Zv9Ss6HMJXAgL8R2Yg==",
-      "license": "ISC",
-      "dependencies": {
-        "brace-expansion": "^2.0.2"
-      },
-      "engines": {
-        "node": ">=16 || 14 >=14.17"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
     "node_modules/gaxios/node_modules/node-fetch": {
       "version": "3.3.2",
       "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-3.3.2.tgz",
@@ -26399,21 +26465,6 @@
         "url": "https://opencollective.com/node-fetch"
       }
     },
-    "node_modules/gaxios/node_modules/rimraf": {
-      "version": "5.0.10",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-5.0.10.tgz",
-      "integrity": "sha512-l0OE8wL34P4nJH/H2ffoaniAokM2qSmrtXHmlpvYr5AVVX8msAyW0l8NVJFDxlSK4u3Uh/f41cQheDVdnYijwQ==",
-      "license": "ISC",
-      "dependencies": {
-        "glob": "^10.3.7"
-      },
-      "bin": {
-        "rimraf": "dist/esm/bin.mjs"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
     "node_modules/gcp-metadata": {
       "version": "8.1.2",
       "resolved": "https://registry.npmjs.org/gcp-metadata/-/gcp-metadata-8.1.2.tgz",
@@ -26466,15 +26517,15 @@
       "license": "ISC"
     },
     "node_modules/geolib": {
-      "version": "3.3.4",
-      "resolved": "https://registry.npmjs.org/geolib/-/geolib-3.3.4.tgz",
-      "integrity": "sha512-EicrlLLL3S42gE9/wde+11uiaYAaeSVDwCUIv2uMIoRBfNJCn8EsSI+6nS3r4TCKDO6+RQNM9ayLq2at+oZQWQ==",
+      "version": "3.3.14",
+      "resolved": "https://registry.npmjs.org/geolib/-/geolib-3.3.14.tgz",
+      "integrity": "sha512-uQ1772h3OjhWvL/HhSRZTMjBKIKoc4wFksLDqzqOkuG/2TgBbTwFamU0Disx3sNFk/BOweHyhKoVaYDuLIpsxQ==",
       "license": "MIT"
     },
     "node_modules/geostyler": {
-      "version": "18.3.1",
-      "resolved": "https://registry.npmjs.org/geostyler/-/geostyler-18.3.1.tgz",
-      "integrity": "sha512-ZEZDwdAtP6Z4ANtlMfYtMwymdFMrr6n0kD4q8dMANA54taXgbeJKU2quC93MQlXlSo8Ka8Y1xI3qAliRasvWcw==",
+      "version": "18.5.0",
+      "resolved": "https://registry.npmjs.org/geostyler/-/geostyler-18.5.0.tgz",
+      "integrity": "sha512-azjLMEhrTQot+pU3phfSrUZI7CdetyAl7JNAnxrGaPA/E/5mmyoPQugZso3CfIuIBwOtFLmfB36SLE/FeGFakA==",
       "license": "BSD-2-Clause",
       "dependencies": {
         "@ant-design/icons": "^5.5.1",
@@ -26497,15 +26548,15 @@
         "geostyler-data": "^1.1.0",
         "geostyler-geojson-parser": "^2.0.0",
         "geostyler-mapbox-parser": "^6.1.1",
-        "geostyler-openlayers-parser": "^5.4.0",
+        "geostyler-openlayers-parser": "^5.7.0",
         "geostyler-qgis-parser": "^4.0.2",
-        "geostyler-sld-parser": "^8.3.0",
-        "geostyler-style": "^11.0.2",
+        "geostyler-sld-parser": "^8.4.2",
+        "geostyler-style": "^11.1.0",
         "geostyler-wfs-parser": "^3.0.1",
         "lodash-es": "^4.17.21",
         "monaco-editor": "^0.52.0",
         "proj4": "^2.11.0",
-        "typescript-json-schema": "^0.65.0"
+        "typescript-json-schema": "^0.67.0"
       },
       "engines": {
         "node": ">=20.6.0"
@@ -26618,14 +26669,13 @@
       }
     },
     "node_modules/geostyler-openlayers-parser": {
-      "version": "5.4.0",
-      "resolved": "https://registry.npmjs.org/geostyler-openlayers-parser/-/geostyler-openlayers-parser-5.4.0.tgz",
-      "integrity": "sha512-BdlG10/wvok7KCOdtzM/NKfiUfkx+uqLDgesC3lNZnviz02S+zIQRtbAkb/Abin6/2boMFRL3i7YIt4D98xMNw==",
+      "version": "5.7.0",
+      "resolved": "https://registry.npmjs.org/geostyler-openlayers-parser/-/geostyler-openlayers-parser-5.7.0.tgz",
+      "integrity": "sha512-FRNTNPLoKJzKYnWas+E4hb4h38SGaK3KeNPZmLUqO5EcTootJjAJyTbCy/Cuv9afk56HYIBpM2gHh6q/fLwqsg==",
       "license": "BSD-2-Clause",
       "dependencies": {
         "css-font-parser": "^2.0.0",
-        "geostyler-style": "^11.0.1",
-        "lodash": "^4.17.21"
+        "geostyler-style": "^11.1.0"
       },
       "engines": {
         "node": ">=20.6.0"
@@ -26637,6 +26687,19 @@
         "ol": ">=7.4"
       }
     },
+    "node_modules/geostyler-openlayers-parser/node_modules/geostyler-style": {
+      "version": "11.1.0",
+      "resolved": "https://registry.npmjs.org/geostyler-style/-/geostyler-style-11.1.0.tgz",
+      "integrity": "sha512-PixhZL0yR6XVSxCGdm3/ti4DjclXTGOSm4xc2TpuymfAxOhQZ3t8u392o9Ne4l4fM4nIzRRKACj7Kr0nO9H1Vg==",
+      "license": "BSD-2-Clause",
+      "engines": {
+        "node": ">=20.6.0",
+        "npm": ">=10.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/geostyler"
+      }
+    },
     "node_modules/geostyler-qgis-parser": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/geostyler-qgis-parser/-/geostyler-qgis-parser-4.1.0.tgz",
@@ -26694,14 +26757,13 @@
       }
     },
     "node_modules/geostyler-sld-parser": {
-      "version": "8.4.0",
-      "resolved": "https://registry.npmjs.org/geostyler-sld-parser/-/geostyler-sld-parser-8.4.0.tgz",
-      "integrity": "sha512-XR7o5L1n/+xBk/W1WVobX7ftoeoRy486o7qfI1D24PYcRFK3EBr5Dh1TZgGI2U7VXDWx2/S4ipl0hztqbjYnxw==",
+      "version": "8.4.2",
+      "resolved": "https://registry.npmjs.org/geostyler-sld-parser/-/geostyler-sld-parser-8.4.2.tgz",
+      "integrity": "sha512-NPlTC1VoxgsApUgs/KhEAkGuMhWrUr2slJj8gSyXhd+oJUaYaPOfeGEFiaV+MGk1va+g3XJ1e5gkRD6aHjx8Eg==",
       "license": "BSD-2-Clause",
       "dependencies": {
         "fast-xml-parser": "^5.2.3",
-        "geostyler-style": "^11.0.2",
-        "lodash": "^4.17.21"
+        "geostyler-style": "^11.0.2"
       },
       "engines": {
         "node": ">=20.6.0"
@@ -26711,9 +26773,9 @@
       }
     },
     "node_modules/geostyler-sld-parser/node_modules/fast-xml-parser": {
-      "version": "5.4.2",
-      "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-5.4.2.tgz",
-      "integrity": "sha512-pw/6pIl4k0CSpElPEJhDppLzaixDEuWui2CUQQBH/ECDf7+y6YwA4Gf7Tyb0Rfe4DIMuZipYj4AEL0nACKglvQ==",
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-5.7.1.tgz",
+      "integrity": "sha512-8Cc3f8GUGUULg34pBch/KGyPLglS+OFs05deyOlY7fL2MTagYPKrVQNmR1fLF/yJ9PH5ZSTd3YDF6pnmeZU+zA==",
       "funding": [
         {
           "type": "github",
@@ -26722,17 +26784,19 @@
       ],
       "license": "MIT",
       "dependencies": {
-        "fast-xml-builder": "^1.0.0",
-        "strnum": "^2.1.2"
+        "@nodable/entities": "^2.1.0",
+        "fast-xml-builder": "^1.1.5",
+        "path-expression-matcher": "^1.5.0",
+        "strnum": "^2.2.3"
       },
       "bin": {
         "fxparser": "src/cli/cli.js"
       }
     },
     "node_modules/geostyler-sld-parser/node_modules/strnum": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/strnum/-/strnum-2.2.0.tgz",
-      "integrity": "sha512-Y7Bj8XyJxnPAORMZj/xltsfo55uOiyHcU2tnAVzHUnSJR/KsEX+9RoDeXEnsXtl/CX4fAcrt64gZ13aGaWPeBg==",
+      "version": "2.2.3",
+      "resolved": "https://registry.npmjs.org/strnum/-/strnum-2.2.3.tgz",
+      "integrity": "sha512-oKx6RUCuHfT3oyVjtnrmn19H1SiCqgJSg+54XqURKp5aCMbrXrhLjRN9TjuwMjiYstZ0MzDrHqkGZ5dFTKd+zg==",
       "funding": [
         {
           "type": "github",
@@ -26781,6 +26845,19 @@
         "react": ">=16.8.0"
       }
     },
+    "node_modules/geostyler/node_modules/geostyler-style": {
+      "version": "11.1.0",
+      "resolved": "https://registry.npmjs.org/geostyler-style/-/geostyler-style-11.1.0.tgz",
+      "integrity": "sha512-PixhZL0yR6XVSxCGdm3/ti4DjclXTGOSm4xc2TpuymfAxOhQZ3t8u392o9Ne4l4fM4nIzRRKACj7Kr0nO9H1Vg==",
+      "license": "BSD-2-Clause",
+      "engines": {
+        "node": ">=20.6.0",
+        "npm": ">=10.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/geostyler"
+      }
+    },
     "node_modules/geotiff": {
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/geotiff/-/geotiff-3.0.3.tgz",
@@ -26985,19 +27062,6 @@
         "node": ">=10"
       }
     },
-    "node_modules/get-port": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/get-port/-/get-port-5.1.1.tgz",
-      "integrity": "sha512-g/Q1aTSDOxFpchXC4i8ZWvxA1lnPqx/JHqcpIw0/LX9T8x/GBbi6YnlN5nhaKIFkT8oFsscUKgDJYxfwfS6QsQ==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/get-proto": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/get-proto/-/get-proto-1.0.1.tgz",
@@ -27011,23 +27075,11 @@
         "node": ">= 0.4"
       }
     },
-    "node_modules/get-stdin": {
-      "version": "9.0.0",
-      "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-9.0.0.tgz",
-      "integrity": "sha512-dVKBjfWisLAicarI2Sf+JuBE/DghV4UzNAVe9yhEJuzeREd3JhOTE9cUaJTeSa77fsbQUK3pcOpJfM59+VKZaA==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/get-stream": {
       "version": "6.0.1",
       "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
       "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
+      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=10"
@@ -27066,6 +27118,15 @@
         "url": "https://github.com/privatenumber/get-tsconfig?sponsor=1"
       }
     },
+    "node_modules/get-value": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz",
+      "integrity": "sha512-Ln0UQDlxH1BapMu3GPtf7CuYNwRZf2gwCuPqbyG6pB8WfmFpzqcy4xtAaAMUhnNqjMKTiCPZG2oMT3YSx8U2NA==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/getos": {
       "version": "3.2.1",
       "resolved": "https://registry.npmjs.org/getos/-/getos-3.2.1.tgz",
@@ -27112,6 +27173,7 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/git-raw-commits/-/git-raw-commits-3.0.0.tgz",
       "integrity": "sha512-b5OHmZ3vAgGrDn/X0kS+9qCfNKWe4K/jFnhwzVWWg0/k5eLa3060tZShrRg8Dja5kPc+YjS0Gc6y7cRr44Lpjw==",
+      "deprecated": "This package is no longer maintained. For the JavaScript API, please use @conventional-changelog/git-client instead.",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -27144,6 +27206,7 @@
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/git-semver-tags/-/git-semver-tags-5.0.1.tgz",
       "integrity": "sha512-hIvOeZwRbQ+7YEUmCkHqo8FOLQZCEn18yevLHADlFPZY02KJGsu5FZt9YW/lybfK2uhWFI7Qg/07LekJiTv7iA==",
+      "deprecated": "This package is no longer maintained. For the JavaScript API, please use @conventional-changelog/git-client instead.",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -27195,21 +27258,6 @@
       "dev": true,
       "license": "ISC"
     },
-    "node_modules/github-username": {
-      "version": "9.0.0",
-      "resolved": "https://registry.npmjs.org/github-username/-/github-username-9.0.0.tgz",
-      "integrity": "sha512-lY7+mymwQUEhRwWTLxieKkxcZkVNnUh8iAGnl30DMB1ZtYODHkMAckZk8Jx5dLQs1YKPYM2ibnzQu02aCLFcYQ==",
-      "license": "MIT",
-      "dependencies": {
-        "@octokit/rest": "^21.1.1"
-      },
-      "engines": {
-        "node": ">=18"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/gl-matrix": {
       "version": "3.4.4",
       "resolved": "https://registry.npmjs.org/gl-matrix/-/gl-matrix-3.4.4.tgz",
@@ -27402,14 +27450,14 @@
       }
     },
     "node_modules/google-auth-library": {
-      "version": "10.6.1",
-      "resolved": "https://registry.npmjs.org/google-auth-library/-/google-auth-library-10.6.1.tgz",
-      "integrity": "sha512-5awwuLrzNol+pFDmKJd0dKtZ0fPLAtoA5p7YO4ODsDu6ONJUVqbYwvv8y2ZBO5MBNp9TJXigB19710kYpBPdtA==",
+      "version": "10.6.2",
+      "resolved": "https://registry.npmjs.org/google-auth-library/-/google-auth-library-10.6.2.tgz",
+      "integrity": "sha512-e27Z6EThmVNNvtYASwQxose/G57rkRuaRbQyxM2bvYLLX/GqWZ5chWq2EBoUchJbCc57eC9ArzO5wMsEmWftCw==",
       "license": "Apache-2.0",
       "dependencies": {
         "base64-js": "^1.3.0",
         "ecdsa-sig-formatter": "^1.0.11",
-        "gaxios": "7.1.3",
+        "gaxios": "^7.1.4",
         "gcp-metadata": "8.1.2",
         "google-logging-utils": "1.1.3",
         "jws": "^4.0.0"
@@ -27485,15 +27533,6 @@
         "yarn": ">=1.3.0"
       }
     },
-    "node_modules/hammerjs": {
-      "version": "2.0.8",
-      "resolved": "https://registry.npmjs.org/hammerjs/-/hammerjs-2.0.8.tgz",
-      "integrity": "sha512-tSQXBXS/MWQOn/RKckawJ61vvsDpCom87JgxiYdGwHdOa0ht0vzUWDlfioofFCRU0L+6NGDt6XzbgoJvZkMeRQ==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
     "node_modules/handle-thing": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/handle-thing/-/handle-thing-2.0.1.tgz",
@@ -27502,9 +27541,9 @@
       "license": "MIT"
     },
     "node_modules/handlebars": {
-      "version": "4.7.8",
-      "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.7.8.tgz",
-      "integrity": "sha512-vafaFqs8MZkRrSX7sFVUdo3ap/eNiLnb4IakshzvP56X5Nr1iGKAIqdX6tMlm6HcNRIkr6AxO5jFEoJzzpT8aQ==",
+      "version": "4.7.9",
+      "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.7.9.tgz",
+      "integrity": "sha512-4E71E0rpOaQuJR2A3xDZ+GM1HyWYv1clR58tC8emQNeQe3RH7MAzSbat+V0wG78LQBo6m6bzSG/L4pBuCsgnUQ==",
       "license": "MIT",
       "dependencies": {
         "minimist": "^1.2.5",
@@ -28019,24 +28058,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/hosted-git-info": {
-      "version": "7.0.2",
-      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-7.0.2.tgz",
-      "integrity": "sha512-puUZAUKT5m8Zzvs72XWy3HtvVbTWljRE66cP60bxJzAqf2DgICo7lYTY2IHUmLnNpjYvw5bvmoHvPc0QO2a62w==",
-      "license": "ISC",
-      "dependencies": {
-        "lru-cache": "^10.0.1"
-      },
-      "engines": {
-        "node": "^16.14.0 || >=18.0.0"
-      }
-    },
-    "node_modules/hosted-git-info/node_modules/lru-cache": {
-      "version": "10.4.3",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz",
-      "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==",
-      "license": "ISC"
-    },
     "node_modules/hpack.js": {
       "version": "2.1.6",
       "resolved": "https://registry.npmjs.org/hpack.js/-/hpack.js-2.1.6.tgz",
@@ -28293,9 +28314,9 @@
       }
     },
     "node_modules/http-cache-semantics": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz",
-      "integrity": "sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ==",
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.2.0.tgz",
+      "integrity": "sha512-dTxcvPXqPvXBQpq5dUr6mEMJX4oIEFv6bwom3FDwKRDsuIjjJGANqhBuoAn9c1RQJIdAKav33ED65E2ys+87QQ==",
       "dev": true,
       "license": "BSD-2-Clause"
     },
@@ -28583,22 +28604,23 @@
       "version": "5.3.2",
       "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz",
       "integrity": "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==",
+      "devOptional": true,
       "license": "MIT",
       "engines": {
         "node": ">= 4"
       }
     },
     "node_modules/ignore-walk": {
-      "version": "6.0.5",
-      "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-6.0.5.tgz",
-      "integrity": "sha512-VuuG0wCnjhnylG1ABXT3dAuIpTNDs/G8jlpmwXY03fXoXy/8ZK8/T+hMzt8L4WnrLCJgdybqgPagnF/f97cg3A==",
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-8.0.0.tgz",
+      "integrity": "sha512-FCeMZT4NiRQGh+YkeKMtWrOmBgWjHjMJ26WQWrRQyoyzqevdaGSakUaJW5xQYmjLlUVk2qUnCjYVBax9EKKg8A==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
-        "minimatch": "^9.0.0"
+        "minimatch": "^10.0.3"
       },
       "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+        "node": "^20.17.0 || >=22.9.0"
       }
     },
     "node_modules/ignore-walk/node_modules/balanced-match": {
@@ -28612,9 +28634,9 @@
       }
     },
     "node_modules/ignore-walk/node_modules/brace-expansion": {
-      "version": "5.0.3",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.3.tgz",
-      "integrity": "sha512-fy6KJm2RawA5RcHkLa1z/ScpBeA762UF9KmZQxwIbDtRJrgLzM10depAiEQ+CXYcoiqW1/m96OAAoke2nE9EeA==",
+      "version": "5.0.5",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.5.tgz",
+      "integrity": "sha512-VZznLgtwhn+Mact9tfiwx64fA9erHH/MCXEUfB/0bX/6Fz6ny5EGTXYltMocqg4xFAQZtnO3DHWWXi8RiuN7cQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -28625,16 +28647,16 @@
       }
     },
     "node_modules/ignore-walk/node_modules/minimatch": {
-      "version": "9.0.7",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.7.tgz",
-      "integrity": "sha512-MOwgjc8tfrpn5QQEvjijjmDVtMw2oL88ugTevzxQnzRLm6l3fVEF2gzU0kYeYYKD8C66+IdGX6peJ4MyUlUnPg==",
+      "version": "10.2.4",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.2.4.tgz",
+      "integrity": "sha512-oRjTw/97aTBN0RHbYCdtF1MQfvusSIBQM0IZEgzl6426+8jSC0nF1a/GmnVLpfB9yyr6g6FTqWqiZVbxrtaCIg==",
       "dev": true,
-      "license": "ISC",
+      "license": "BlueOak-1.0.0",
       "dependencies": {
         "brace-expansion": "^5.0.2"
       },
       "engines": {
-        "node": ">=16 || 14 >=14.17"
+        "node": "18 || 20 || >=22"
       },
       "funding": {
         "url": "https://github.com/sponsors/isaacs"
@@ -28734,16 +28756,6 @@
         "webpack": "^5.0.0"
       }
     },
-    "node_modules/imports-loader/node_modules/source-map-js": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz",
-      "integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==",
-      "dev": true,
-      "license": "BSD-3-Clause",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/imurmurhash": {
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
@@ -28763,18 +28775,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/index-to-position": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/index-to-position/-/index-to-position-0.1.2.tgz",
-      "integrity": "sha512-MWDKS3AS1bGCHLBA2VLImJz42f7bJh8wQsTGCzI3j519/CASStoDONUBVz2I/VID0MpiX3SGSnbOD2xUalbE5g==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=18"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/inflight": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
@@ -28792,23 +28792,33 @@
       "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
       "license": "ISC"
     },
+    "node_modules/ini": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/ini/-/ini-6.0.0.tgz",
+      "integrity": "sha512-IBTdIkzZNOpqm7q3dRqJvMaldXjDHWkEDfrwGEQTs5eaQMWV+djAhR+wahyNNMAa+qpbDUhBMVt4ZKNwpPm7xQ==",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": "^20.17.0 || >=22.9.0"
+      }
+    },
     "node_modules/init-package-json": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/init-package-json/-/init-package-json-6.0.3.tgz",
-      "integrity": "sha512-Zfeb5ol+H+eqJWHTaGca9BovufyGeIfr4zaaBorPmJBMrJ+KBnN+kQx2ZtXdsotUTgldHmHQV44xvUWOUA7E2w==",
+      "version": "8.2.2",
+      "resolved": "https://registry.npmjs.org/init-package-json/-/init-package-json-8.2.2.tgz",
+      "integrity": "sha512-pXVMn67Jdw2hPKLCuJZj62NC9B2OIDd1R3JwZXTHXuEnfN3Uq5kJbKOSld6YEU+KOGfMD82EzxFTYz5o0SSJoA==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
-        "@npmcli/package-json": "^5.0.0",
-        "npm-package-arg": "^11.0.0",
-        "promzard": "^1.0.0",
-        "read": "^3.0.1",
-        "semver": "^7.3.5",
+        "@npmcli/package-json": "^7.0.0",
+        "npm-package-arg": "^13.0.0",
+        "promzard": "^2.0.0",
+        "read": "^4.0.0",
+        "semver": "^7.7.2",
         "validate-npm-package-license": "^3.0.4",
-        "validate-npm-package-name": "^5.0.0"
+        "validate-npm-package-name": "^6.0.2"
       },
       "engines": {
-        "node": "^16.14.0 || >=18.0.0"
+        "node": "^20.17.0 || >=22.9.0"
       }
     },
     "node_modules/inline-style-parser": {
@@ -28912,19 +28922,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/inquirer/node_modules/strip-ansi": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-      "license": "MIT",
-      "peer": true,
-      "dependencies": {
-        "ansi-regex": "^5.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/internal-slot": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.1.0.tgz",
@@ -28990,26 +28987,15 @@
       "license": "MIT"
     },
     "node_modules/ip-address": {
-      "version": "9.0.5",
-      "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-9.0.5.tgz",
-      "integrity": "sha512-zHtQzGojZXTwZTHQqra+ETKd4Sn3vgi7uBmlPoXVWZqYvuKmtI0l/VZTjqGmJY9x88GGOaZ9+G9ES8hC4T4X8g==",
+      "version": "10.1.0",
+      "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-10.1.0.tgz",
+      "integrity": "sha512-XXADHxXmvT9+CRxhXg56LJovE+bmWnEWB78LB83VZTprKTmaC5QfruXocxzTZ2Kl0DNwKuBdlIhjL8LeY8Sf8Q==",
       "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "jsbn": "1.1.0",
-        "sprintf-js": "^1.1.3"
-      },
       "engines": {
         "node": ">= 12"
       }
     },
-    "node_modules/ip-address/node_modules/sprintf-js": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.3.tgz",
-      "integrity": "sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA==",
-      "dev": true,
-      "license": "BSD-3-Clause"
-    },
     "node_modules/ipaddr.js": {
       "version": "1.9.1",
       "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz",
@@ -29300,6 +29286,15 @@
       "integrity": "sha512-IOQqts/aHWbiisY5DuPJQ0gcbvaLFCa7fBa9xoLfxBZvQ+ZI/Zh9xoI7Gk+G64N0FdK4AbibytHht2tWgpJWLg==",
       "license": "MIT"
     },
+    "node_modules/is-extendable": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+      "integrity": "sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/is-extglob": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
@@ -29383,6 +29378,19 @@
         "url": "https://github.com/sponsors/wooorm"
       }
     },
+    "node_modules/is-in-ssh": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-in-ssh/-/is-in-ssh-1.0.0.tgz",
+      "integrity": "sha512-jYa6Q9rH90kR1vKB6NM7qqd1mge3Fx4Dhw5TVlK1MUBqhEOuCagrEHMevNuCcbECmXZ0ThXkRm+Ymr51HwEPAw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=20"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/is-inside-container": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-inside-container/-/is-inside-container-1.0.0.tgz",
@@ -29445,13 +29453,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/is-lambda": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-lambda/-/is-lambda-1.0.1.tgz",
-      "integrity": "sha512-z7CMFGNrENq5iFB9Bqo64Xk6Y9sg+epq1myIcdHaGnbMTYOxvzsEtdYqQUylB7LxfkvgrrjP32T6Ywciio9UIQ==",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/is-map": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/is-map/-/is-map-2.0.3.tgz",
@@ -29464,6 +29465,12 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/is-mobile": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/is-mobile/-/is-mobile-5.0.0.tgz",
+      "integrity": "sha512-Tz/yndySvLAEXh+Uk8liFCxOwVH6YutuR74utvOcu7I9Di+DwM0mtdPVZNaVvvBUM2OXxne/NhOs1zAO7riusQ==",
+      "license": "MIT"
+    },
     "node_modules/is-negative-zero": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.3.tgz",
@@ -29548,7 +29555,6 @@
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
       "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "isobject": "^3.0.1"
@@ -29705,7 +29711,6 @@
       "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-2.1.0.tgz",
       "integrity": "sha512-mE00Gnza5EEB3Ds0HfMyllZzbBrmLOX3vfWoj9A9PEnTfratQ/BcaJOuMhnkhjXvb2+FkY3VuHqtAGpTPmglFQ==",
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=18"
       },
@@ -29803,6 +29808,8 @@
       "resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-5.0.3.tgz",
       "integrity": "sha512-VR4gNjFaDP8csJQvzInG20JvBj8MaHYLxNOMXysxRbGM7tcsHZwCjhch3FubFtZBkuDbN55i4dUukGeIrzF+6g==",
       "license": "MIT",
+      "optional": true,
+      "peer": true,
       "engines": {
         "node": ">= 18.0.0"
       },
@@ -29820,7 +29827,6 @@
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
       "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
@@ -30006,6 +30012,7 @@
       "version": "3.4.3",
       "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-3.4.3.tgz",
       "integrity": "sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==",
+      "dev": true,
       "license": "BlueOak-1.0.0",
       "dependencies": {
         "@isaacs/cliui": "^8.0.2"
@@ -30174,9 +30181,9 @@
       }
     },
     "node_modules/jest-changed-files/node_modules/picomatch": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz",
-      "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.4.tgz",
+      "integrity": "sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -30430,9 +30437,9 @@
       }
     },
     "node_modules/jest-circus/node_modules/picomatch": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz",
-      "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.4.tgz",
+      "integrity": "sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -30588,9 +30595,9 @@
       }
     },
     "node_modules/jest-cli/node_modules/picomatch": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz",
-      "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.4.tgz",
+      "integrity": "sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -30691,9 +30698,9 @@
       "license": "MIT"
     },
     "node_modules/jest-config/node_modules/brace-expansion": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
-      "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.3.tgz",
+      "integrity": "sha512-MCV/fYJEbqx68aE58kv2cA/kiky1G8vux3OR6/jbS+jIMe/6fJWa0DTzJU7dqijOWYwHi1t29FlfYI9uytqlpA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -30774,9 +30781,9 @@
       }
     },
     "node_modules/jest-config/node_modules/picomatch": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz",
-      "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.4.tgz",
+      "integrity": "sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -30990,9 +30997,9 @@
       }
     },
     "node_modules/jest-each/node_modules/picomatch": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz",
-      "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.4.tgz",
+      "integrity": "sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -31082,19 +31089,6 @@
         "acorn-walk": "^8.0.2"
       }
     },
-    "node_modules/jest-environment-jsdom/node_modules/acorn-walk": {
-      "version": "8.3.4",
-      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.4.tgz",
-      "integrity": "sha512-ueEepnujpqee2o5aIYnvHU6C0A42MNdsIDeqy5BydrkuC5R1ZuUFnm27EeFJGoEHJQgn3uleRvmTXaJgfXbt4g==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "acorn": "^8.11.0"
-      },
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
     "node_modules/jest-environment-jsdom/node_modules/cssom": {
       "version": "0.5.0",
       "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.5.0.tgz",
@@ -31493,9 +31487,9 @@
       }
     },
     "node_modules/jest-environment-node/node_modules/picomatch": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz",
-      "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.4.tgz",
+      "integrity": "sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -31686,9 +31680,9 @@
       }
     },
     "node_modules/jest-haste-map/node_modules/picomatch": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz",
-      "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.4.tgz",
+      "integrity": "sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -31699,9 +31693,9 @@
       }
     },
     "node_modules/jest-html-reporter": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/jest-html-reporter/-/jest-html-reporter-4.3.0.tgz",
-      "integrity": "sha512-lq4Zx35yc6Ehw513CXJ1ok3wUmkSiOImWcyLAmylfzrz7DAqtrhDF9V73F4qfstmGxlr8X0QrEjWsl/oqhf4sQ==",
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/jest-html-reporter/-/jest-html-reporter-4.4.0.tgz",
+      "integrity": "sha512-8aC5pzPOgsbiPwlvE686Gt3ZkUGHpafHtS0ffhCmKqTYdNwnrNX1WpmF7lbb3+3/TvZ9+UlACM811abivu5SWw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -31717,8 +31711,7 @@
         "node": ">=14.0.0"
       },
       "peerDependencies": {
-        "jest": "19.x - 30.x",
-        "typescript": "^3.7.x || ^4.3.x || ^5.x"
+        "jest": "19.x - 30.x"
       }
     },
     "node_modules/jest-html-reporter/node_modules/@jest/schemas": {
@@ -31777,19 +31770,6 @@
         "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/jest-html-reporter/node_modules/strip-ansi": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ansi-regex": "^5.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/jest-junit": {
       "version": "16.0.0",
       "resolved": "https://registry.npmjs.org/jest-junit/-/jest-junit-16.0.0.tgz",
@@ -31806,19 +31786,6 @@
         "node": ">=10.12.0"
       }
     },
-    "node_modules/jest-junit/node_modules/strip-ansi": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ansi-regex": "^5.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/jest-junit/node_modules/uuid": {
       "version": "8.3.2",
       "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
@@ -32278,9 +32245,9 @@
       }
     },
     "node_modules/jest-resolve/node_modules/picomatch": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz",
-      "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.4.tgz",
+      "integrity": "sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -32522,9 +32489,9 @@
       }
     },
     "node_modules/jest-runner/node_modules/picomatch": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz",
-      "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.4.tgz",
+      "integrity": "sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -32711,9 +32678,9 @@
       }
     },
     "node_modules/jest-runtime/node_modules/brace-expansion": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
-      "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.3.tgz",
+      "integrity": "sha512-MCV/fYJEbqx68aE58kv2cA/kiky1G8vux3OR6/jbS+jIMe/6fJWa0DTzJU7dqijOWYwHi1t29FlfYI9uytqlpA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -32837,9 +32804,9 @@
       }
     },
     "node_modules/jest-runtime/node_modules/picomatch": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz",
-      "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.4.tgz",
+      "integrity": "sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -33114,9 +33081,9 @@
       }
     },
     "node_modules/jest-snapshot/node_modules/picomatch": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz",
-      "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.4.tgz",
+      "integrity": "sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -33412,9 +33379,9 @@
       }
     },
     "node_modules/jest-watcher/node_modules/picomatch": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz",
-      "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.4.tgz",
+      "integrity": "sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -33524,9 +33491,9 @@
       }
     },
     "node_modules/joi": {
-      "version": "18.0.2",
-      "resolved": "https://registry.npmjs.org/joi/-/joi-18.0.2.tgz",
-      "integrity": "sha512-RuCOQMIt78LWnktPoeBL0GErkNaJPTBGcYuyaBvUOQSpcpcLfWrHPPihYdOGbV5pam9VTWbeoF7TsGiHugcjGA==",
+      "version": "18.1.2",
+      "resolved": "https://registry.npmjs.org/joi/-/joi-18.1.2.tgz",
+      "integrity": "sha512-rF5MAmps5esSlhCA+N1b6IYHDw9j/btzGaqfgie522jS02Ju/HXBxamlXVlKEHAxoMKQL77HWI8jlqWsFuekZA==",
       "dev": true,
       "license": "BSD-3-Clause",
       "dependencies": {
@@ -33536,7 +33503,7 @@
         "@hapi/pinpoint": "^2.0.1",
         "@hapi/tlds": "^1.1.1",
         "@hapi/topo": "^6.0.2",
-        "@standard-schema/spec": "^1.0.0"
+        "@standard-schema/spec": "^1.1.0"
       },
       "engines": {
         "node": ">= 20"
@@ -33617,13 +33584,6 @@
         "node": ">=4.0.0"
       }
     },
-    "node_modules/jsbn": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-1.1.0.tgz",
-      "integrity": "sha512-4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A==",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/jsdoc-type-pratt-parser": {
       "version": "4.8.0",
       "resolved": "https://registry.npmjs.org/jsdoc-type-pratt-parser/-/jsdoc-type-pratt-parser-4.8.0.tgz",
@@ -33635,36 +33595,36 @@
       }
     },
     "node_modules/jsdom": {
-      "version": "28.1.0",
-      "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-28.1.0.tgz",
-      "integrity": "sha512-0+MoQNYyr2rBHqO1xilltfDjV9G7ymYGlAUazgcDLQaUf8JDHbuGwsxN6U9qWaElZ4w1B2r7yEGIL3GdeW3Rug==",
+      "version": "29.0.2",
+      "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-29.0.2.tgz",
+      "integrity": "sha512-9VnGEBosc/ZpwyOsJBCQ/3I5p7Q5ngOY14a9bf5btenAORmZfDse1ZEheMiWcJ3h81+Fv7HmJFdS0szo/waF2w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@acemir/cssom": "^0.9.31",
-        "@asamuzakjp/dom-selector": "^6.8.1",
+        "@asamuzakjp/css-color": "^5.1.5",
+        "@asamuzakjp/dom-selector": "^7.0.6",
         "@bramus/specificity": "^2.4.2",
-        "@exodus/bytes": "^1.11.0",
-        "cssstyle": "^6.0.1",
+        "@csstools/css-syntax-patches-for-csstree": "^1.1.1",
+        "@exodus/bytes": "^1.15.0",
+        "css-tree": "^3.2.1",
         "data-urls": "^7.0.0",
         "decimal.js": "^10.6.0",
         "html-encoding-sniffer": "^6.0.0",
-        "http-proxy-agent": "^7.0.2",
-        "https-proxy-agent": "^7.0.6",
         "is-potential-custom-element-name": "^1.0.1",
+        "lru-cache": "^11.2.7",
         "parse5": "^8.0.0",
         "saxes": "^6.0.0",
         "symbol-tree": "^3.2.4",
-        "tough-cookie": "^6.0.0",
-        "undici": "^7.21.0",
+        "tough-cookie": "^6.0.1",
+        "undici": "^7.24.5",
         "w3c-xmlserializer": "^5.0.0",
         "webidl-conversions": "^8.0.1",
         "whatwg-mimetype": "^5.0.0",
-        "whatwg-url": "^16.0.0",
+        "whatwg-url": "^16.0.1",
         "xml-name-validator": "^5.0.0"
       },
       "engines": {
-        "node": "^20.19.0 || ^22.12.0 || >=24.0.0"
+        "node": "^20.19.0 || ^22.13.0 || >=24.0.0"
       },
       "peerDependencies": {
         "canvas": "^3.0.0"
@@ -33675,10 +33635,35 @@
         }
       }
     },
+    "node_modules/jsdom/node_modules/@csstools/css-syntax-patches-for-csstree": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@csstools/css-syntax-patches-for-csstree/-/css-syntax-patches-for-csstree-1.1.2.tgz",
+      "integrity": "sha512-5GkLzz4prTIpoyeUiIu3iV6CSG3Plo7xRVOFPKI7FVEJ3mZ0A8SwK0XU3Gl7xAkiQ+mDyam+NNp875/C5y+jSA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/csstools"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/csstools"
+        }
+      ],
+      "license": "MIT-0",
+      "peerDependencies": {
+        "css-tree": "^3.2.1"
+      },
+      "peerDependenciesMeta": {
+        "css-tree": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/jsdom/node_modules/@exodus/bytes": {
-      "version": "1.11.0",
-      "resolved": "https://registry.npmjs.org/@exodus/bytes/-/bytes-1.11.0.tgz",
-      "integrity": "sha512-wO3vd8nsEHdumsXrjGO/v4p6irbg7hy9kvIeR6i2AwylZSk4HJdWgL0FNaVquW1+AweJcdvU1IEpuIWk/WaPnA==",
+      "version": "1.15.0",
+      "resolved": "https://registry.npmjs.org/@exodus/bytes/-/bytes-1.15.0.tgz",
+      "integrity": "sha512-UY0nlA+feH81UGSHv92sLEPLCeZFjXOuHhrIo0HQydScuQc8s0A7kL/UdgwgDq8g8ilksmuoF35YVTNphV2aBQ==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -33694,28 +33679,32 @@
       }
     },
     "node_modules/jsdom/node_modules/@noble/hashes": {
-      "version": "1.8.0",
-      "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.8.0.tgz",
-      "integrity": "sha512-jCs9ldd7NwzpgXDIf6P3+NrHh9/sD6CQdxHyjQI+h/6rDNo88ypBxxz45UDuZHz9r3tNz7N/VInSVoVdtXEI4A==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-2.0.1.tgz",
+      "integrity": "sha512-XlOlEbQcE9fmuXxrVTXCTlG2nlRXa9Rj3rr5Ue/+tX+nmkgbX720YHh0VR3hBF9xDvwnb8D2shVGOwNx+ulArw==",
       "dev": true,
       "license": "MIT",
       "optional": true,
       "peer": true,
       "engines": {
-        "node": "^14.21.3 || >=16"
+        "node": ">= 20.19.0"
       },
       "funding": {
         "url": "https://paulmillr.com/funding/"
       }
     },
-    "node_modules/jsdom/node_modules/agent-base": {
-      "version": "7.1.3",
-      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.3.tgz",
-      "integrity": "sha512-jRR5wdylq8CkOe6hei19GGZnxM6rBGwFl3Bg0YItGDimvjGtAvdZk4Pu6Cl4u4Igsws4a1fd1Vq3ezrhn4KmFw==",
+    "node_modules/jsdom/node_modules/css-tree": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-3.2.1.tgz",
+      "integrity": "sha512-X7sjQzceUhu1u7Y/ylrRZFU2FS6LRiFVp6rKLPg23y3x3c3DOKAwuXGDp+PAGjh6CSnCjYeAul8pcT8bAl+lSA==",
       "dev": true,
       "license": "MIT",
+      "dependencies": {
+        "mdn-data": "2.27.1",
+        "source-map-js": "^1.2.1"
+      },
       "engines": {
-        "node": ">= 14"
+        "node": "^10 || ^12.20.0 || ^14.13.0 || >=15.0.0"
       }
     },
     "node_modules/jsdom/node_modules/entities": {
@@ -33731,33 +33720,22 @@
         "url": "https://github.com/fb55/entities?sponsor=1"
       }
     },
-    "node_modules/jsdom/node_modules/http-proxy-agent": {
-      "version": "7.0.2",
-      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.2.tgz",
-      "integrity": "sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==",
+    "node_modules/jsdom/node_modules/lru-cache": {
+      "version": "11.2.7",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.2.7.tgz",
+      "integrity": "sha512-aY/R+aEsRelme17KGQa/1ZSIpLpNYYrhcrepKTZgE+W3WM16YMCaPwOHLHsmopZHELU0Ojin1lPVxKR0MihncA==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "agent-base": "^7.1.0",
-        "debug": "^4.3.4"
-      },
+      "license": "BlueOak-1.0.0",
       "engines": {
-        "node": ">= 14"
+        "node": "20 || >=22"
       }
     },
-    "node_modules/jsdom/node_modules/https-proxy-agent": {
-      "version": "7.0.6",
-      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.6.tgz",
-      "integrity": "sha512-vK9P5/iUfdl95AI+JVyUuIcVtd4ofvtrOr3HNtM2yxC9bnMbEdp3x01OhQNnjb8IJYi38VlTE3mBXwcfvywuSw==",
+    "node_modules/jsdom/node_modules/mdn-data": {
+      "version": "2.27.1",
+      "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.27.1.tgz",
+      "integrity": "sha512-9Yubnt3e8A0OKwxYSXyhLymGW4sCufcLG6VdiDdUGVkPhpqLxlvP5vl1983gQjJl3tqbrM731mjaZaP68AgosQ==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "agent-base": "^7.1.2",
-        "debug": "4"
-      },
-      "engines": {
-        "node": ">= 14"
-      }
+      "license": "CC0-1.0"
     },
     "node_modules/jsdom/node_modules/parse5": {
       "version": "8.0.0",
@@ -33773,29 +33751,29 @@
       }
     },
     "node_modules/jsdom/node_modules/tldts": {
-      "version": "7.0.16",
-      "resolved": "https://registry.npmjs.org/tldts/-/tldts-7.0.16.tgz",
-      "integrity": "sha512-5bdPHSwbKTeHmXrgecID4Ljff8rQjv7g8zKQPkCozRo2HWWni+p310FSn5ImI+9kWw9kK4lzOB5q/a6iv0IJsw==",
+      "version": "7.0.27",
+      "resolved": "https://registry.npmjs.org/tldts/-/tldts-7.0.27.tgz",
+      "integrity": "sha512-I4FZcVFcqCRuT0ph6dCDpPuO4Xgzvh+spkcTr1gK7peIvxWauoloVO0vuy1FQnijT63ss6AsHB6+OIM4aXHbPg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "tldts-core": "^7.0.16"
+        "tldts-core": "^7.0.27"
       },
       "bin": {
         "tldts": "bin/cli.js"
       }
     },
     "node_modules/jsdom/node_modules/tldts-core": {
-      "version": "7.0.16",
-      "resolved": "https://registry.npmjs.org/tldts-core/-/tldts-core-7.0.16.tgz",
-      "integrity": "sha512-XHhPmHxphLi+LGbH0G/O7dmUH9V65OY20R7vH8gETHsp5AZCjBk9l8sqmRKLaGOxnETU7XNSDUPtewAy/K6jbA==",
+      "version": "7.0.27",
+      "resolved": "https://registry.npmjs.org/tldts-core/-/tldts-core-7.0.27.tgz",
+      "integrity": "sha512-YQ7uPjgWUibIK6DW5lrKujGwUKhLevU4hcGbP5O6TcIUb+oTjJYJVWPS4nZsIHrEEEG6myk/oqAJUEQmpZrHsg==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/jsdom/node_modules/tough-cookie": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-6.0.0.tgz",
-      "integrity": "sha512-kXuRi1mtaKMrsLUxz3sQYvVl37B0Ns6MzfrtV5DvJceE9bPyspOqk9xxv7XbZWcfLWbFmm997vl83qUWVJA64w==",
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-6.0.1.tgz",
+      "integrity": "sha512-LktZQb3IeoUWB9lqR5EWTHgW/VTITCXg4D21M+lvybRVdylLrRMnqaIONLVb5mav8vM19m44HIcGq4qASeu2Qw==",
       "dev": true,
       "license": "BSD-3-Clause",
       "dependencies": {
@@ -33861,20 +33839,22 @@
       "license": "MIT"
     },
     "node_modules/json-parse-even-better-errors": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-3.0.2.tgz",
-      "integrity": "sha512-fi0NG4bPjCHunUJffmLd0gxssIgkNmArMvis4iNah6Owg1MCJjWhEcDLmsK6iGkJq3tHwbDkTlce70/tmXN4cQ==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-5.0.0.tgz",
+      "integrity": "sha512-ZF1nxZ28VhQouRWhUcVlUIN3qwSgPuswK05s/HIaoetAoE/9tngVmCHjSxmSQPav1nd+lPtTL0YZ/2AFdR/iYQ==",
       "dev": true,
       "license": "MIT",
       "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+        "node": "^20.17.0 || >=22.9.0"
       }
     },
     "node_modules/json-schema": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.4.0.tgz",
       "integrity": "sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA==",
-      "license": "(AFL-2.1 OR BSD-3-Clause)"
+      "dev": true,
+      "license": "(AFL-2.1 OR BSD-3-Clause)",
+      "peer": true
     },
     "node_modules/json-schema-compare": {
       "version": "0.2.2",
@@ -34013,9 +33993,9 @@
       }
     },
     "node_modules/jspdf": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/jspdf/-/jspdf-4.2.0.tgz",
-      "integrity": "sha512-hR/hnRevAXXlrjeqU5oahOE+Ln9ORJUB5brLHHqH67A+RBQZuFr5GkbI9XQI8OUFSEezKegsi45QRpc4bGj75Q==",
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/jspdf/-/jspdf-4.2.1.tgz",
+      "integrity": "sha512-YyAXyvnmjTbR4bHQRLzex3CuINCDlQnBqoSYyjJwTP2x9jDLuKDzy7aKUl0hgx3uhcl7xzg32agn5vlie6HIlQ==",
       "license": "MIT",
       "dependencies": {
         "@babel/runtime": "^7.28.6",
@@ -34215,23 +34195,22 @@
       "license": "Apache-2.0"
     },
     "node_modules/lerna": {
-      "version": "8.2.4",
-      "resolved": "https://registry.npmjs.org/lerna/-/lerna-8.2.4.tgz",
-      "integrity": "sha512-0gaVWDIVT7fLfprfwpYcQajb7dBJv3EGavjG7zvJ+TmGx3/wovl5GklnSwM2/WeE0Z2wrIz7ndWhBcDUHVjOcQ==",
+      "version": "9.0.7",
+      "resolved": "https://registry.npmjs.org/lerna/-/lerna-9.0.7.tgz",
+      "integrity": "sha512-PMjbSWYfwL1yZ5c1D2PZuFyzmtYhLdn0f76uG8L25g6eYy34j+2jPb4Q6USx1UJvxVtxkdVEeAAWS/WxgJ8VZA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@lerna/create": "8.2.4",
-        "@npmcli/arborist": "7.5.4",
-        "@npmcli/package-json": "5.2.0",
-        "@npmcli/run-script": "8.1.0",
-        "@nx/devkit": ">=17.1.2 < 21",
+        "@npmcli/arborist": "9.1.6",
+        "@npmcli/package-json": "7.0.2",
+        "@npmcli/run-script": "10.0.3",
+        "@nx/devkit": ">=21.5.2 < 23.0.0",
         "@octokit/plugin-enterprise-rest": "6.0.1",
         "@octokit/rest": "20.1.2",
         "aproba": "2.0.0",
         "byte-size": "8.1.1",
         "chalk": "4.1.0",
-        "clone-deep": "4.0.1",
+        "ci-info": "4.3.1",
         "cmd-shim": "6.0.3",
         "color-support": "1.1.3",
         "columnify": "1.6.0",
@@ -34244,60 +34223,48 @@
         "envinfo": "7.13.0",
         "execa": "5.0.0",
         "fs-extra": "^11.2.0",
-        "get-port": "5.1.1",
         "get-stream": "6.0.0",
         "git-url-parse": "14.0.0",
         "glob-parent": "6.0.2",
-        "graceful-fs": "4.2.11",
         "has-unicode": "2.0.1",
         "import-local": "3.1.0",
         "ini": "^1.3.8",
-        "init-package-json": "6.0.3",
-        "inquirer": "^8.2.4",
+        "init-package-json": "8.2.2",
+        "inquirer": "12.9.6",
         "is-ci": "3.0.1",
-        "is-stream": "2.0.0",
-        "jest-diff": ">=29.4.3 < 30",
-        "js-yaml": "4.1.0",
-        "libnpmaccess": "8.0.6",
-        "libnpmpublish": "9.0.9",
+        "jest-diff": ">=30.0.0 < 31",
+        "js-yaml": "4.1.1",
+        "libnpmaccess": "10.0.3",
+        "libnpmpublish": "11.1.2",
         "load-json-file": "6.2.0",
-        "make-dir": "4.0.0",
-        "minimatch": "3.0.5",
-        "multimatch": "5.0.0",
-        "node-fetch": "2.6.7",
-        "npm-package-arg": "11.0.2",
-        "npm-packlist": "8.0.2",
-        "npm-registry-fetch": "^17.1.0",
-        "nx": ">=17.1.2 < 21",
+        "make-fetch-happen": "15.0.2",
+        "minimatch": "3.1.4",
+        "npm-package-arg": "13.0.1",
+        "npm-packlist": "10.0.3",
+        "npm-registry-fetch": "19.1.0",
+        "nx": ">=21.5.3 < 23.0.0",
         "p-map": "4.0.0",
         "p-map-series": "2.1.0",
         "p-pipe": "3.1.0",
         "p-queue": "6.6.2",
         "p-reduce": "2.1.0",
         "p-waterfall": "2.1.1",
-        "pacote": "^18.0.6",
-        "pify": "5.0.0",
+        "pacote": "21.0.1",
         "read-cmd-shim": "4.0.0",
-        "resolve-from": "5.0.0",
-        "rimraf": "^4.4.1",
-        "semver": "^7.3.8",
-        "set-blocking": "^2.0.0",
+        "semver": "7.7.2",
         "signal-exit": "3.0.7",
         "slash": "3.0.0",
-        "ssri": "^10.0.6",
+        "ssri": "12.0.0",
         "string-width": "^4.2.3",
-        "tar": "6.2.1",
-        "temp-dir": "1.0.0",
+        "tar": "7.5.11",
         "through": "2.3.8",
         "tinyglobby": "0.2.12",
         "typescript": ">=3 < 6",
         "upath": "2.0.1",
-        "uuid": "^10.0.0",
         "validate-npm-package-license": "3.0.4",
-        "validate-npm-package-name": "5.0.1",
+        "validate-npm-package-name": "6.0.2",
         "wide-align": "1.1.5",
         "write-file-atomic": "5.0.1",
-        "write-pkg": "4.0.0",
         "yargs": "17.7.2",
         "yargs-parser": "21.1.1"
       },
@@ -34305,7 +34272,30 @@
         "lerna": "dist/cli.js"
       },
       "engines": {
-        "node": ">=18.0.0"
+        "node": "^20.19.0 || ^22.12.0 || >=24.0.0"
+      }
+    },
+    "node_modules/lerna/node_modules/@jest/diff-sequences": {
+      "version": "30.3.0",
+      "resolved": "https://registry.npmjs.org/@jest/diff-sequences/-/diff-sequences-30.3.0.tgz",
+      "integrity": "sha512-cG51MVnLq1ecVUaQ3fr6YuuAOitHK1S4WUJHnsPFE/quQr33ADUx1FfrTCpMCRxvy0Yr9BThKpDjSlcTi91tMA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "node_modules/lerna/node_modules/@jest/schemas": {
+      "version": "30.0.5",
+      "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-30.0.5.tgz",
+      "integrity": "sha512-DmdYgtezMkh3cpU8/1uyXakv3tJRcmcXxBOcO0tbaozPwpmh4YMsnWrQm9ZmZMfa5ocbxzbFk6O4bDPEc/iAnA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@sinclair/typebox": "^0.34.0"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       }
     },
     "node_modules/lerna/node_modules/@octokit/auth-token": {
@@ -34475,6 +34465,13 @@
         "@octokit/openapi-types": "^24.2.0"
       }
     },
+    "node_modules/lerna/node_modules/@sinclair/typebox": {
+      "version": "0.34.48",
+      "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.34.48.tgz",
+      "integrity": "sha512-kKJTNuK3AQOrgjjotVxMrCn1sUJwM76wMszfq1kdU4uYVJjvEWuFQ6HgvLt4Xz3fSmZlTOxJ/Ie13KnIcWQXFA==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/lerna/node_modules/argparse": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
@@ -34506,16 +34503,6 @@
         "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/lerna/node_modules/cli-width": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-3.0.0.tgz",
-      "integrity": "sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw==",
-      "dev": true,
-      "license": "ISC",
-      "engines": {
-        "node": ">= 10"
-      }
-    },
     "node_modules/lerna/node_modules/cosmiconfig": {
       "version": "9.0.0",
       "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-9.0.0.tgz",
@@ -34661,33 +34648,49 @@
       "license": "ISC"
     },
     "node_modules/lerna/node_modules/inquirer": {
-      "version": "8.2.7",
-      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-8.2.7.tgz",
-      "integrity": "sha512-UjOaSel/iddGZJ5xP/Eixh6dY1XghiBw4XK13rCCIJcJfyhhoul/7KhLLUGtebEj6GDYM6Vnx/mVsjx2L/mFIA==",
+      "version": "12.9.6",
+      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-12.9.6.tgz",
+      "integrity": "sha512-603xXOgyfxhuis4nfnWaZrMaotNT0Km9XwwBNWUKbIDqeCY89jGr2F9YPEMiNhU6XjIP4VoWISMBFfcc5NgrTw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@inquirer/external-editor": "^1.0.0",
-        "ansi-escapes": "^4.2.1",
-        "chalk": "^4.1.1",
-        "cli-cursor": "^3.1.0",
-        "cli-width": "^3.0.0",
-        "figures": "^3.0.0",
-        "lodash": "^4.17.21",
-        "mute-stream": "0.0.8",
-        "ora": "^5.4.1",
-        "run-async": "^2.4.0",
-        "rxjs": "^7.5.5",
-        "string-width": "^4.1.0",
-        "strip-ansi": "^6.0.0",
-        "through": "^2.3.6",
-        "wrap-ansi": "^6.0.1"
+        "@inquirer/ansi": "^1.0.0",
+        "@inquirer/core": "^10.2.2",
+        "@inquirer/prompts": "^7.8.6",
+        "@inquirer/type": "^3.0.8",
+        "mute-stream": "^2.0.0",
+        "run-async": "^4.0.5",
+        "rxjs": "^7.8.2"
       },
       "engines": {
-        "node": ">=12.0.0"
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "@types/node": ">=18"
+      },
+      "peerDependenciesMeta": {
+        "@types/node": {
+          "optional": true
+        }
       }
     },
-    "node_modules/lerna/node_modules/inquirer/node_modules/chalk": {
+    "node_modules/lerna/node_modules/jest-diff": {
+      "version": "30.3.0",
+      "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-30.3.0.tgz",
+      "integrity": "sha512-n3q4PDQjS4LrKxfWB3Z5KNk1XjXtZTBwQp71OP0Jo03Z6V60x++K5L8k6ZrW8MY8pOFylZvHM0zsjS1RqlHJZQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/diff-sequences": "30.3.0",
+        "@jest/get-type": "30.1.0",
+        "chalk": "^4.1.2",
+        "pretty-format": "30.3.0"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "node_modules/lerna/node_modules/jest-diff/node_modules/chalk": {
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
       "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
@@ -34704,33 +34707,10 @@
         "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/lerna/node_modules/is-stream": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz",
-      "integrity": "sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/lerna/node_modules/is-unicode-supported": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz",
-      "integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/lerna/node_modules/js-yaml": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
-      "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.1.tgz",
+      "integrity": "sha512-qQKT4zQxXl8lLwBtHMWwaTcGfFOZviOJet3Oy/xmGk2gZH677CJM9EvtfdSkgWcATZhj/55JZ0rmy3myCT5lsA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -34740,81 +34720,14 @@
         "js-yaml": "bin/js-yaml.js"
       }
     },
-    "node_modules/lerna/node_modules/log-symbols": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz",
-      "integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "chalk": "^4.1.0",
-        "is-unicode-supported": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/lerna/node_modules/make-dir": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-4.0.0.tgz",
-      "integrity": "sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "semver": "^7.5.3"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/lerna/node_modules/minimatch": {
-      "version": "3.0.5",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.5.tgz",
-      "integrity": "sha512-tUpxzX0VAzJHjLu0xUfFv1gwVp9ba3IOuRAVH2EGuRW8a5emA2FlACLqiT/lDVtS1W+TGNwqz3sWaNyLgDJWuw==",
+    "node_modules/lerna/node_modules/mute-stream": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-2.0.0.tgz",
+      "integrity": "sha512-WWdIxpyjEn+FhQJQQv9aQAYlHoNVdzIzUySNV1gHUPDSdZJ3yZn7pAAbQcV7B56Mvu881q9FZV+0Vx2xC44VWA==",
       "dev": true,
       "license": "ISC",
-      "dependencies": {
-        "brace-expansion": "^1.1.7"
-      },
       "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/lerna/node_modules/mute-stream": {
-      "version": "0.0.8",
-      "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz",
-      "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==",
-      "dev": true,
-      "license": "ISC"
-    },
-    "node_modules/lerna/node_modules/ora": {
-      "version": "5.4.1",
-      "resolved": "https://registry.npmjs.org/ora/-/ora-5.4.1.tgz",
-      "integrity": "sha512-5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "bl": "^4.1.0",
-        "chalk": "^4.1.0",
-        "cli-cursor": "^3.1.0",
-        "cli-spinners": "^2.5.0",
-        "is-interactive": "^1.0.0",
-        "is-unicode-supported": "^0.1.0",
-        "log-symbols": "^4.1.0",
-        "strip-ansi": "^6.0.0",
-        "wcwidth": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "node": "^18.17.0 || >=20.5.0"
       }
     },
     "node_modules/lerna/node_modules/p-queue": {
@@ -34848,9 +34761,9 @@
       }
     },
     "node_modules/lerna/node_modules/picomatch": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz",
-      "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.4.tgz",
+      "integrity": "sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -34860,29 +34773,57 @@
         "url": "https://github.com/sponsors/jonschlinkert"
       }
     },
-    "node_modules/lerna/node_modules/pify": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/pify/-/pify-5.0.0.tgz",
-      "integrity": "sha512-eW/gHNMlxdSP6dmG6uJip6FXN0EQBwm2clYYd8Wul42Cwu/DK8HEftzsapcNdYe2MfLiIwZqsDk2RDEsTE79hA==",
+    "node_modules/lerna/node_modules/pretty-format": {
+      "version": "30.3.0",
+      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-30.3.0.tgz",
+      "integrity": "sha512-oG4T3wCbfeuvljnyAzhBvpN45E8iOTXCU/TD3zXW80HA3dQ4ahdqMkWGiPWZvjpQwlbyHrPTWUAqUzGzv4l1JQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/schemas": "30.0.5",
+        "ansi-styles": "^5.2.0",
+        "react-is": "^18.3.1"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "node_modules/lerna/node_modules/pretty-format/node_modules/ansi-styles": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
+      "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
       "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=10"
       },
       "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
     "node_modules/lerna/node_modules/run-async": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.4.1.tgz",
-      "integrity": "sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==",
+      "version": "4.0.6",
+      "resolved": "https://registry.npmjs.org/run-async/-/run-async-4.0.6.tgz",
+      "integrity": "sha512-IoDlSLTs3Yq593mb3ZoKWKXMNu3UpObxhgA/Xuid5p4bbfi2jdY1Hj0m1K+0/tEuQTxIGMhQDqGjKb7RuxGpAQ==",
       "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=0.12.0"
       }
     },
+    "node_modules/lerna/node_modules/semver": {
+      "version": "7.7.2",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz",
+      "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==",
+      "dev": true,
+      "license": "ISC",
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
     "node_modules/lerna/node_modules/slash": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
@@ -34893,19 +34834,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/lerna/node_modules/strip-ansi": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ansi-regex": "^5.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/lerna/node_modules/tinyglobby": {
       "version": "0.2.12",
       "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.12.tgz",
@@ -34930,20 +34858,6 @@
       "dev": true,
       "license": "ISC"
     },
-    "node_modules/lerna/node_modules/uuid": {
-      "version": "10.0.0",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-10.0.0.tgz",
-      "integrity": "sha512-8XkAphELsDnEGrDxUOHB3RGvXz6TeuYSGEZBOjtTtPm2lwhGBjLgOzLHB63IUWfBpNucQjND6d3AOudO+H3RWQ==",
-      "dev": true,
-      "funding": [
-        "https://github.com/sponsors/broofa",
-        "https://github.com/sponsors/ctavan"
-      ],
-      "license": "MIT",
-      "bin": {
-        "uuid": "dist/bin/uuid"
-      }
-    },
     "node_modules/leven": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz",
@@ -34969,37 +34883,37 @@
       }
     },
     "node_modules/libnpmaccess": {
-      "version": "8.0.6",
-      "resolved": "https://registry.npmjs.org/libnpmaccess/-/libnpmaccess-8.0.6.tgz",
-      "integrity": "sha512-uM8DHDEfYG6G5gVivVl+yQd4pH3uRclHC59lzIbSvy7b5FEwR+mU49Zq1jEyRtRFv7+M99mUW9S0wL/4laT4lw==",
+      "version": "10.0.3",
+      "resolved": "https://registry.npmjs.org/libnpmaccess/-/libnpmaccess-10.0.3.tgz",
+      "integrity": "sha512-JPHTfWJxIK+NVPdNMNGnkz4XGX56iijPbe0qFWbdt68HL+kIvSzh+euBL8npLZvl2fpaxo+1eZSdoG15f5YdIQ==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
-        "npm-package-arg": "^11.0.2",
-        "npm-registry-fetch": "^17.0.1"
+        "npm-package-arg": "^13.0.0",
+        "npm-registry-fetch": "^19.0.0"
       },
       "engines": {
-        "node": "^16.14.0 || >=18.0.0"
+        "node": "^20.17.0 || >=22.9.0"
       }
     },
     "node_modules/libnpmpublish": {
-      "version": "9.0.9",
-      "resolved": "https://registry.npmjs.org/libnpmpublish/-/libnpmpublish-9.0.9.tgz",
-      "integrity": "sha512-26zzwoBNAvX9AWOPiqqF6FG4HrSCPsHFkQm7nT+xU1ggAujL/eae81RnCv4CJ2In9q9fh10B88sYSzKCUh/Ghg==",
+      "version": "11.1.2",
+      "resolved": "https://registry.npmjs.org/libnpmpublish/-/libnpmpublish-11.1.2.tgz",
+      "integrity": "sha512-tNcU3cLH7toloAzhOOrBDhjzgbxpyuYvkf+BPPnnJCdc5EIcdJ8JcT+SglvCQKKyZ6m9dVXtCVlJcA6csxKdEA==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
+        "@npmcli/package-json": "^7.0.0",
         "ci-info": "^4.0.0",
-        "normalize-package-data": "^6.0.1",
-        "npm-package-arg": "^11.0.2",
-        "npm-registry-fetch": "^17.0.1",
-        "proc-log": "^4.2.0",
+        "npm-package-arg": "^13.0.0",
+        "npm-registry-fetch": "^19.0.0",
+        "proc-log": "^5.0.0",
         "semver": "^7.3.7",
-        "sigstore": "^2.2.0",
-        "ssri": "^10.0.6"
+        "sigstore": "^4.0.0",
+        "ssri": "^12.0.0"
       },
       "engines": {
-        "node": "^16.14.0 || >=18.0.0"
+        "node": "^20.17.0 || >=22.9.0"
       }
     },
     "node_modules/lie": {
@@ -35400,15 +35314,15 @@
       }
     },
     "node_modules/lodash": {
-      "version": "4.17.23",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.23.tgz",
-      "integrity": "sha512-LgVTMpQtIopCi79SJeDiP0TfWi5CNEc/L/aRdTh3yIvmZXTnheWpKjSZhnvMl8iXbC1tFg9gdHHDMLoV7CnG+w==",
+      "version": "4.18.1",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.18.1.tgz",
+      "integrity": "sha512-dMInicTPVE8d1e5otfwmmjlxkZoUpiVLwyeTdUsi/Caj/gfzzblBcCE5sRHV/AsjuCmxWrte2TNGSYuCeCq+0Q==",
       "license": "MIT"
     },
     "node_modules/lodash-es": {
-      "version": "4.17.23",
-      "resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.23.tgz",
-      "integrity": "sha512-kVI48u3PZr38HdYz98UmfPnXl2DXrpdctLrFLCd3kOx1xUkOmpFPx7gCWWM5MPkL/fD8zb+Ph0QzjGFs4+hHWg==",
+      "version": "4.18.1",
+      "resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.18.1.tgz",
+      "integrity": "sha512-J8xewKD/Gk22OZbhpOVSwcs60zhd95ESDwezOFuA3/099925PdHJ7OFHNTGtajL3AlZkykD32HykiMo+BIBI8A==",
       "license": "MIT"
     },
     "node_modules/lodash.debounce": {
@@ -35455,7 +35369,6 @@
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz",
       "integrity": "sha512-t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag==",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/lodash.merge": {
@@ -35695,27 +35608,36 @@
       "license": "ISC"
     },
     "node_modules/make-fetch-happen": {
-      "version": "13.0.1",
-      "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-13.0.1.tgz",
-      "integrity": "sha512-cKTUFc/rbKUd/9meOvgrpJ2WrNzymt6jfRDdwg5UCnVzv9dTpEj9JS5m3wtziXVCjluIXyL8pcaukYqezIzZQA==",
+      "version": "15.0.2",
+      "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-15.0.2.tgz",
+      "integrity": "sha512-sI1NY4lWlXBAfjmCtVWIIpBypbBdhHtcjnwnv+gtCnsaOffyFil3aidszGC8hgzJe+fT1qix05sWxmD/Bmf/oQ==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
-        "@npmcli/agent": "^2.0.0",
-        "cacache": "^18.0.0",
+        "@npmcli/agent": "^4.0.0",
+        "cacache": "^20.0.1",
         "http-cache-semantics": "^4.1.1",
-        "is-lambda": "^1.0.1",
         "minipass": "^7.0.2",
-        "minipass-fetch": "^3.0.0",
+        "minipass-fetch": "^4.0.0",
         "minipass-flush": "^1.0.5",
         "minipass-pipeline": "^1.2.4",
-        "negotiator": "^0.6.3",
-        "proc-log": "^4.2.0",
+        "negotiator": "^1.0.0",
+        "proc-log": "^5.0.0",
         "promise-retry": "^2.0.1",
-        "ssri": "^10.0.0"
+        "ssri": "^12.0.0"
       },
       "engines": {
-        "node": "^16.14.0 || >=18.0.0"
+        "node": "^20.17.0 || >=22.9.0"
+      }
+    },
+    "node_modules/make-fetch-happen/node_modules/negotiator": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-1.0.0.tgz",
+      "integrity": "sha512-8Ofs/AUQh8MaEcrlq5xOX0CQ9ypTF5dl78mjlMNfOK08fzpgTHQRQPBxcPlEtIw0yRpws+Zo/3r+5WRby7u3Gg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.6"
       }
     },
     "node_modules/makeerror": {
@@ -35749,18 +35671,18 @@
       "license": "MIT"
     },
     "node_modules/mapbox-gl": {
-      "version": "3.19.0",
-      "resolved": "https://registry.npmjs.org/mapbox-gl/-/mapbox-gl-3.19.0.tgz",
-      "integrity": "sha512-SFObIgdxN0b6hZNsRxSUmQWdVW9q9GM2gw4McgFbycyhekew7BZIh8V57pEERDWlI9x/5SxxraTit5Cf0hm9OA==",
+      "version": "3.22.0",
+      "resolved": "https://registry.npmjs.org/mapbox-gl/-/mapbox-gl-3.22.0.tgz",
+      "integrity": "sha512-ZIpF+oAMcQoDlvABmiRkHoydyBR9zI6CyDeVRa2/iyua0/B2+rPuIzoCV/CgN14P5F0HVk53GIZw220WSqJPyA==",
       "license": "SEE LICENSE IN LICENSE.txt",
       "workspaces": [
         "src/style-spec",
+        "packages/pmtiles-provider",
         "test/build/vite",
         "test/build/webpack",
         "test/build/typings"
       ],
       "dependencies": {
-        "@mapbox/jsonlint-lines-primitives": "^2.0.2",
         "@mapbox/mapbox-gl-supported": "^3.0.0",
         "@mapbox/point-geometry": "^1.1.0",
         "@mapbox/tiny-sdf": "^2.0.6",
@@ -35768,7 +35690,6 @@
         "@mapbox/vector-tile": "^2.0.4",
         "@types/geojson": "^7946.0.16",
         "@types/geojson-vt": "^3.2.5",
-        "@types/mapbox__point-geometry": "^1.0.87",
         "@types/pbf": "^3.0.5",
         "@types/supercluster": "^7.1.3",
         "cheap-ruler": "^4.0.0",
@@ -35822,11 +35743,84 @@
         "pbf": "bin/pbf"
       }
     },
-    "node_modules/mapbox-gl/node_modules/quickselect": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/quickselect/-/quickselect-3.0.0.tgz",
-      "integrity": "sha512-XdjUArbK4Bm5fLLvlm5KpTFOiOThgfWWI4axAZDWg4E/0mKdZyI9tNEfds27qCi1ze/vwTR16kvmmGhRra3c2g==",
-      "license": "ISC"
+    "node_modules/maplibre-gl": {
+      "version": "5.22.0",
+      "resolved": "https://registry.npmjs.org/maplibre-gl/-/maplibre-gl-5.22.0.tgz",
+      "integrity": "sha512-nc8YA+YSEioMZg5W0cb6Cf3wQ8aJge66dsttyBgpOArOnlmFJO1Kc5G32kYVPeUYhLpBja83T99uanmJvYAIyQ==",
+      "license": "BSD-3-Clause",
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "@mapbox/jsonlint-lines-primitives": "^2.0.2",
+        "@mapbox/point-geometry": "^1.1.0",
+        "@mapbox/tiny-sdf": "^2.0.7",
+        "@mapbox/unitbezier": "^0.0.1",
+        "@mapbox/vector-tile": "^2.0.4",
+        "@mapbox/whoots-js": "^3.1.0",
+        "@maplibre/geojson-vt": "^6.0.4",
+        "@maplibre/maplibre-gl-style-spec": "^24.8.1",
+        "@maplibre/mlt": "^1.1.8",
+        "@maplibre/vt-pbf": "^4.3.0",
+        "@types/geojson": "^7946.0.16",
+        "earcut": "^3.0.2",
+        "gl-matrix": "^3.4.4",
+        "kdbush": "^4.0.2",
+        "murmurhash-js": "^1.0.0",
+        "pbf": "^4.0.1",
+        "potpack": "^2.1.0",
+        "quickselect": "^3.0.0",
+        "tinyqueue": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=16.14.0",
+        "npm": ">=8.1.0"
+      },
+      "funding": {
+        "url": "https://github.com/maplibre/maplibre-gl-js?sponsor=1"
+      }
+    },
+    "node_modules/maplibre-gl/node_modules/@mapbox/point-geometry": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@mapbox/point-geometry/-/point-geometry-1.1.0.tgz",
+      "integrity": "sha512-YGcBz1cg4ATXDCM/71L9xveh4dynfGmcLDqufR+nQQy3fKwsAZsWd/x4621/6uJaeB9mwOHE6hPeDgXz9uViUQ==",
+      "license": "ISC",
+      "optional": true,
+      "peer": true
+    },
+    "node_modules/maplibre-gl/node_modules/@mapbox/vector-tile": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/@mapbox/vector-tile/-/vector-tile-2.0.4.tgz",
+      "integrity": "sha512-AkOLcbgGTdXScosBWwmmD7cDlvOjkg/DetGva26pIRiZPdeJYjYKarIlb4uxVzi6bwHO6EWH82eZ5Nuv4T5DUg==",
+      "license": "BSD-3-Clause",
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "@mapbox/point-geometry": "~1.1.0",
+        "@types/geojson": "^7946.0.16",
+        "pbf": "^4.0.1"
+      }
+    },
+    "node_modules/maplibre-gl/node_modules/earcut": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/earcut/-/earcut-3.0.2.tgz",
+      "integrity": "sha512-X7hshQbLyMJ/3RPhyObLARM2sNxxmRALLKx1+NVFFnQ9gKzmCrxm9+uLIAdBcvc8FNLpctqlQ2V6AE92Ol9UDQ==",
+      "license": "ISC",
+      "optional": true,
+      "peer": true
+    },
+    "node_modules/maplibre-gl/node_modules/pbf": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/pbf/-/pbf-4.0.1.tgz",
+      "integrity": "sha512-SuLdBvS42z33m8ejRbInMapQe8n0D3vN/Xd5fmWM3tufNgRQFBpaW2YVJxQZV4iPNqb0vEFvssMEo5w9c6BTIA==",
+      "license": "BSD-3-Clause",
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "resolve-protobuf-schema": "^2.1.0"
+      },
+      "bin": {
+        "pbf": "bin/pbf"
+      }
     },
     "node_modules/markdown-table": {
       "version": "3.0.4",
@@ -35839,9 +35833,9 @@
       }
     },
     "node_modules/markdown-to-jsx": {
-      "version": "9.7.6",
-      "resolved": "https://registry.npmjs.org/markdown-to-jsx/-/markdown-to-jsx-9.7.6.tgz",
-      "integrity": "sha512-oPckbBhWv/d2HmYzSv68g2UBTONmrFYlqUd+juolxTplJImhDEKFgAEcnxSTeZ1HISKzKxm+mVeUYP7OUhglJQ==",
+      "version": "9.7.16",
+      "resolved": "https://registry.npmjs.org/markdown-to-jsx/-/markdown-to-jsx-9.7.16.tgz",
+      "integrity": "sha512-+LEgOlYfUEB9i2Oaxasec9H2HytB1+SQcgwFmQiNTKwe8cQ2E9bDNgePGq6ChIycMxtpcEY0g44aQ3uJoMw8eg==",
       "license": "MIT",
       "engines": {
         "node": ">= 18"
@@ -35884,9 +35878,9 @@
       "license": "Unlicense"
     },
     "node_modules/match-sorter": {
-      "version": "6.3.4",
-      "resolved": "https://registry.npmjs.org/match-sorter/-/match-sorter-6.3.4.tgz",
-      "integrity": "sha512-jfZW7cWS5y/1xswZo8VBOdudUiSd9nifYRWphc9M5D/ee4w4AoXLgBEdRbgVaxbMuagBPeUC5y2Hi8DO6o9aDg==",
+      "version": "8.2.0",
+      "resolved": "https://registry.npmjs.org/match-sorter/-/match-sorter-8.2.0.tgz",
+      "integrity": "sha512-qRVB7wYMJXizAWR4TKo5UYwgW7oAVzA8V9jve0wGzRvV91ou9dcqL+/2gJtD0PZ/Pm2Fq6cVT4VHXHmDFVMGRA==",
       "license": "MIT",
       "dependencies": {
         "@babel/runtime": "^7.23.8",
@@ -36066,6 +36060,8 @@
       "resolved": "https://registry.npmjs.org/mem-fs-editor/-/mem-fs-editor-11.1.4.tgz",
       "integrity": "sha512-Z4QX14Ev6eOVTuVSayS5rdiOua6C3gHcFw+n9Qc7WiaVTbC+H8b99c32MYGmbQN9UFHJeI/p3lf3LAxiIzwEmA==",
       "license": "MIT",
+      "optional": true,
+      "peer": true,
       "dependencies": {
         "@types/ejs": "^3.1.4",
         "@types/node": ">=18",
@@ -36096,6 +36092,8 @@
       "resolved": "https://registry.npmjs.org/array-differ/-/array-differ-4.0.0.tgz",
       "integrity": "sha512-Q6VPTLMsmXZ47ENG3V+wQyZS1ZxXMxFyYzA+Z/GMrJ6yIutAIEf9wTyroTzmGjNfox9/h3GdGBCVh43GVFx4Uw==",
       "license": "MIT",
+      "optional": true,
+      "peer": true,
       "engines": {
         "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
       },
@@ -36108,6 +36106,8 @@
       "resolved": "https://registry.npmjs.org/array-union/-/array-union-3.0.1.tgz",
       "integrity": "sha512-1OvF9IbWwaeiM9VhzYXVQacMibxpXOMYVNIvMtKRyX9SImBXpKcFr8XvFDeEslCyuH/t6KRt7HEO94AlP8Iatw==",
       "license": "MIT",
+      "optional": true,
+      "peer": true,
       "engines": {
         "node": ">=12"
       },
@@ -36120,15 +36120,19 @@
       "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-4.0.4.tgz",
       "integrity": "sha512-BLrgEcRTwX2o6gGxGOCNyMvGSp35YofuYzw9h1IMTRmKqttAZZVU67bdb9Pr2vUHA8+j3i2tJfjO6C6+4myGTA==",
       "license": "MIT",
+      "optional": true,
+      "peer": true,
       "engines": {
         "node": "18 || 20 || >=22"
       }
     },
     "node_modules/mem-fs-editor/node_modules/brace-expansion": {
-      "version": "5.0.3",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.3.tgz",
-      "integrity": "sha512-fy6KJm2RawA5RcHkLa1z/ScpBeA762UF9KmZQxwIbDtRJrgLzM10depAiEQ+CXYcoiqW1/m96OAAoke2nE9EeA==",
+      "version": "5.0.5",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.5.tgz",
+      "integrity": "sha512-VZznLgtwhn+Mact9tfiwx64fA9erHH/MCXEUfB/0bX/6Fz6ny5EGTXYltMocqg4xFAQZtnO3DHWWXi8RiuN7cQ==",
       "license": "MIT",
+      "optional": true,
+      "peer": true,
       "dependencies": {
         "balanced-match": "^4.0.2"
       },
@@ -36141,6 +36145,8 @@
       "resolved": "https://registry.npmjs.org/globby/-/globby-14.0.2.tgz",
       "integrity": "sha512-s3Fq41ZVh7vbbe2PN3nrW7yC7U7MFVc5c98/iTl9c2GawNMKx/J648KQRW6WKkuU8GIbbh2IXfIRQjOZnXcTnw==",
       "license": "MIT",
+      "optional": true,
+      "peer": true,
       "dependencies": {
         "@sindresorhus/merge-streams": "^2.1.0",
         "fast-glob": "^3.3.2",
@@ -36161,6 +36167,8 @@
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.7.tgz",
       "integrity": "sha512-MOwgjc8tfrpn5QQEvjijjmDVtMw2oL88ugTevzxQnzRLm6l3fVEF2gzU0kYeYYKD8C66+IdGX6peJ4MyUlUnPg==",
       "license": "ISC",
+      "optional": true,
+      "peer": true,
       "dependencies": {
         "brace-expansion": "^5.0.2"
       },
@@ -36176,6 +36184,8 @@
       "resolved": "https://registry.npmjs.org/multimatch/-/multimatch-7.0.0.tgz",
       "integrity": "sha512-SYU3HBAdF4psHEL/+jXDKHO95/m5P2RvboHT2Y0WtTttvJLP4H/2WS9WlQPFvF6C8d6SpLw8vjCnQOnVIVOSJQ==",
       "license": "MIT",
+      "optional": true,
+      "peer": true,
       "dependencies": {
         "array-differ": "^4.0.0",
         "array-union": "^3.0.1",
@@ -36193,6 +36203,8 @@
       "resolved": "https://registry.npmjs.org/path-type/-/path-type-5.0.0.tgz",
       "integrity": "sha512-5HviZNaZcfqP95rwpv+1HDgUamezbqdSYTyzjTvwtJSnIH+3vnbmWsItli8OFEndS984VT55M3jduxZbX351gg==",
       "license": "MIT",
+      "optional": true,
+      "peer": true,
       "engines": {
         "node": ">=12"
       },
@@ -36205,6 +36217,8 @@
       "resolved": "https://registry.npmjs.org/slash/-/slash-5.1.0.tgz",
       "integrity": "sha512-ZA6oR3T/pEyuqwMgAKT0/hAv8oAXckzbkmR0UkUosQ+Mc4RxGoJkRmwHgHufaenlyAgE1Mxgpdcrf75y6XcnDg==",
       "license": "MIT",
+      "optional": true,
+      "peer": true,
       "engines": {
         "node": ">=14.16"
       },
@@ -36511,6 +36525,7 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
       "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
+      "dev": true,
       "license": "MIT"
     },
     "node_modules/merge2": {
@@ -36708,9 +36723,9 @@
       }
     },
     "node_modules/mini-css-extract-plugin": {
-      "version": "2.10.1",
-      "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-2.10.1.tgz",
-      "integrity": "sha512-k7G3Y5QOegl380tXmZ68foBRRjE9Ljavx835ObdvmZjQ639izvZD8CS7BkWw1qKPPzHsGL/JDhl0uyU1zc2rJw==",
+      "version": "2.10.2",
+      "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-2.10.2.tgz",
+      "integrity": "sha512-AOSS0IdEB95ayVkxn5oGzNQwqAi2J0Jb/kKm43t7H73s8+f5873g0yuj0PNvK4dO75mu5DHg4nlgp4k6Kga8eg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -36772,10 +36787,11 @@
       }
     },
     "node_modules/minipass": {
-      "version": "7.1.2",
-      "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz",
-      "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==",
-      "license": "ISC",
+      "version": "7.1.3",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.3.tgz",
+      "integrity": "sha512-tEBHqDnIoM/1rXME1zgka9g6Q2lcoCkxHLuc7ODJ5BxbP5d4c2Z5cGgtXAku59200Cx7diuHTOYfSBD8n6mm8A==",
+      "dev": true,
+      "license": "BlueOak-1.0.0",
       "engines": {
         "node": ">=16 || 14 >=14.17"
       }
@@ -36794,56 +36810,36 @@
       }
     },
     "node_modules/minipass-fetch": {
-      "version": "3.0.5",
-      "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-3.0.5.tgz",
-      "integrity": "sha512-2N8elDQAtSnFV0Dk7gt15KHsS0Fyz6CbYZ360h0WTYV1Ty46li3rAXVOQj1THMNLdmrD9Vt5pBPtWtVkpwGBqg==",
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-4.0.1.tgz",
+      "integrity": "sha512-j7U11C5HXigVuutxebFadoYBbd7VSdZWggSe64NVdvWNBqGAiXPL2QVCehjmw7lY1oF9gOllYbORh+hiNgfPgQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "minipass": "^7.0.3",
         "minipass-sized": "^1.0.3",
-        "minizlib": "^2.1.2"
+        "minizlib": "^3.0.1"
       },
       "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+        "node": "^18.17.0 || >=20.5.0"
       },
       "optionalDependencies": {
         "encoding": "^0.1.13"
       }
     },
     "node_modules/minipass-flush": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/minipass-flush/-/minipass-flush-1.0.5.tgz",
-      "integrity": "sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw==",
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/minipass-flush/-/minipass-flush-1.0.6.tgz",
+      "integrity": "sha512-7Uf5gMJZ2kTkFisE3toGxT991s+cg+vMh42nbZGM2bNxfYVpkpqRudf1QrcOy72a3PwcL4JYqL+4NY7t0Hdd0A==",
       "dev": true,
-      "license": "ISC",
+      "license": "BlueOak-1.0.0",
       "dependencies": {
-        "minipass": "^3.0.0"
+        "minipass": "^7.1.3"
       },
       "engines": {
-        "node": ">= 8"
+        "node": ">=16 || 14 >=14.17"
       }
     },
-    "node_modules/minipass-flush/node_modules/minipass": {
-      "version": "3.3.6",
-      "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
-      "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/minipass-flush/node_modules/yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-      "dev": true,
-      "license": "ISC"
-    },
     "node_modules/minipass-pipeline": {
       "version": "1.2.4",
       "resolved": "https://registry.npmjs.org/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz",
@@ -36911,39 +36907,18 @@
       "license": "ISC"
     },
     "node_modules/minizlib": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz",
-      "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-3.1.0.tgz",
+      "integrity": "sha512-KZxYo1BUkWD2TVFLr0MQoM8vUUigWD3LlD83a/75BqC+4qE0Hb1Vo5v1FgcfaNXvfXzr+5EhQ6ing/CaBijTlw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "minipass": "^3.0.0",
-        "yallist": "^4.0.0"
+        "minipass": "^7.1.2"
       },
       "engines": {
-        "node": ">= 8"
+        "node": ">= 18"
       }
     },
-    "node_modules/minizlib/node_modules/minipass": {
-      "version": "3.3.6",
-      "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
-      "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/minizlib/node_modules/yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-      "dev": true,
-      "license": "ISC"
-    },
     "node_modules/mitt": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/mitt/-/mitt-2.1.0.tgz",
@@ -37050,36 +37025,6 @@
         "multicast-dns": "cli.js"
       }
     },
-    "node_modules/multimatch": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/multimatch/-/multimatch-5.0.0.tgz",
-      "integrity": "sha512-ypMKuglUrZUD99Tk2bUQ+xNQj43lPEfAeX2o9cTteAmShXy2VHDJpuwu1o0xqoKCt9jLVAvwyFKdLTPXKAfJyA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@types/minimatch": "^3.0.3",
-        "array-differ": "^3.0.0",
-        "array-union": "^2.1.0",
-        "arrify": "^2.0.1",
-        "minimatch": "^3.0.4"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/multimatch/node_modules/arrify": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/arrify/-/arrify-2.0.1.tgz",
-      "integrity": "sha512-3duEwti880xqi4eAMN8AyR4a0ByT90zoYdLlevfrvU43vb0YZwZVfxOgxWrLXXXpyugL0hNZc9G6BiB5B3nUug==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/murmurhash-js": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/murmurhash-js/-/murmurhash-js-1.0.0.tgz",
@@ -37100,14 +37045,15 @@
       "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-1.0.0.tgz",
       "integrity": "sha512-avsJQhyd+680gKXyG/sQc0nXaC6rBkPOfyHYcFb9+hdkqQkR9bdnkJ0AMZhke0oesPqIO+mFFJ+IdBc7mst4IA==",
       "license": "ISC",
+      "peer": true,
       "engines": {
         "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
       }
     },
     "node_modules/nanoid": {
-      "version": "5.1.6",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-5.1.6.tgz",
-      "integrity": "sha512-c7+7RQ+dMB5dPwwCp4ee1/iV/q2P6aK1mTZcfr1BTuVlyW9hJYiMPybJCcnBlQtuSmTIWNeazm/zqNoZSSElBg==",
+      "version": "5.1.9",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-5.1.9.tgz",
+      "integrity": "sha512-ZUvP7KeBLe3OZ1ypw6dI/TzYJuvHP77IM4Ry73waSQTLn8/g8rpdjfyVAh7t1/+FjBtG4lCP42MEbDxOsRpBMw==",
       "funding": [
         {
           "type": "github",
@@ -37122,16 +37068,6 @@
         "node": "^18 || >=20"
       }
     },
-    "node_modules/nanospinner": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/nanospinner/-/nanospinner-1.2.2.tgz",
-      "integrity": "sha512-Zt/AmG6qRU3e+WnzGGLuMCEAO/dAu45stNbHY223tUxldaDAeE+FxSPsd9Q+j+paejmm0ZbrNVs5Sraqy3dRxA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "picocolors": "^1.1.1"
-      }
-    },
     "node_modules/napi-postinstall": {
       "version": "0.2.5",
       "resolved": "https://registry.npmjs.org/napi-postinstall/-/napi-postinstall-0.2.5.tgz",
@@ -37239,162 +37175,91 @@
         "semver": "bin/semver"
       }
     },
-    "node_modules/node-fetch": {
-      "version": "2.6.7",
-      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz",
-      "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "whatwg-url": "^5.0.0"
-      },
-      "engines": {
-        "node": "4.x || >=6.0.0"
-      },
-      "peerDependencies": {
-        "encoding": "^0.1.0"
-      },
-      "peerDependenciesMeta": {
-        "encoding": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/node-fetch/node_modules/tr46": {
-      "version": "0.0.3",
-      "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
-      "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/node-fetch/node_modules/webidl-conversions": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
-      "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==",
-      "dev": true,
-      "license": "BSD-2-Clause"
-    },
-    "node_modules/node-fetch/node_modules/whatwg-url": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
-      "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "tr46": "~0.0.3",
-        "webidl-conversions": "^3.0.0"
-      }
-    },
     "node_modules/node-gyp": {
-      "version": "10.3.1",
-      "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-10.3.1.tgz",
-      "integrity": "sha512-Pp3nFHBThHzVtNY7U6JfPjvT/DTE8+o/4xKsLQtBoU+j2HLsGlhcfzflAoUreaJbNmYnX+LlLi0qjV8kpyO6xQ==",
+      "version": "12.2.0",
+      "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-12.2.0.tgz",
+      "integrity": "sha512-q23WdzrQv48KozXlr0U1v9dwO/k59NHeSzn6loGcasyf0UnSrtzs8kRxM+mfwJSf0DkX0s43hcqgnSO4/VNthQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "env-paths": "^2.2.0",
         "exponential-backoff": "^3.1.1",
-        "glob": "^10.3.10",
         "graceful-fs": "^4.2.6",
-        "make-fetch-happen": "^13.0.0",
-        "nopt": "^7.0.0",
-        "proc-log": "^4.1.0",
+        "make-fetch-happen": "^15.0.0",
+        "nopt": "^9.0.0",
+        "proc-log": "^6.0.0",
         "semver": "^7.3.5",
-        "tar": "^6.2.1",
-        "which": "^4.0.0"
+        "tar": "^7.5.4",
+        "tinyglobby": "^0.2.12",
+        "which": "^6.0.0"
       },
       "bin": {
         "node-gyp": "bin/node-gyp.js"
       },
       "engines": {
-        "node": "^16.14.0 || >=18.0.0"
+        "node": "^20.17.0 || >=22.9.0"
       }
     },
-    "node_modules/node-gyp/node_modules/balanced-match": {
-      "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-4.0.4.tgz",
-      "integrity": "sha512-BLrgEcRTwX2o6gGxGOCNyMvGSp35YofuYzw9h1IMTRmKqttAZZVU67bdb9Pr2vUHA8+j3i2tJfjO6C6+4myGTA==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": "18 || 20 || >=22"
-      }
-    },
-    "node_modules/node-gyp/node_modules/brace-expansion": {
-      "version": "5.0.3",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.3.tgz",
-      "integrity": "sha512-fy6KJm2RawA5RcHkLa1z/ScpBeA762UF9KmZQxwIbDtRJrgLzM10depAiEQ+CXYcoiqW1/m96OAAoke2nE9EeA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "balanced-match": "^4.0.2"
-      },
-      "engines": {
-        "node": "18 || 20 || >=22"
-      }
-    },
-    "node_modules/node-gyp/node_modules/glob": {
-      "version": "10.5.0",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-10.5.0.tgz",
-      "integrity": "sha512-DfXN8DfhJ7NH3Oe7cFmu3NCu1wKbkReJ8TorzSAFbSKrlNaQSKfIzqYqVY8zlbs2NLBbWpRiU52GX2PbaBVNkg==",
-      "deprecated": "Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me",
+    "node_modules/node-gyp/node_modules/abbrev": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-4.0.0.tgz",
+      "integrity": "sha512-a1wflyaL0tHtJSmLSOVybYhy22vRih4eduhhrkcjgrWGnRfrZtovJ2FRjxuTtkkj47O/baf0R86QU5OuYpz8fA==",
       "dev": true,
       "license": "ISC",
-      "dependencies": {
-        "foreground-child": "^3.1.0",
-        "jackspeak": "^3.1.2",
-        "minimatch": "^9.0.4",
-        "minipass": "^7.1.2",
-        "package-json-from-dist": "^1.0.0",
-        "path-scurry": "^1.11.1"
-      },
-      "bin": {
-        "glob": "dist/esm/bin.mjs"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
+      "engines": {
+        "node": "^20.17.0 || >=22.9.0"
       }
     },
     "node_modules/node-gyp/node_modules/isexe": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/isexe/-/isexe-3.1.2.tgz",
-      "integrity": "sha512-mIcis6w+JiQf3P7t7mg/35GKB4T1FQsBOtMIvuKw4YErj5RjtbhcTd5/I30fmkmGMwvI0WlzSNN+27K0QCMkAw==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-4.0.0.tgz",
+      "integrity": "sha512-FFUtZMpoZ8RqHS3XeXEmHWLA4thH+ZxCv2lOiPIn1Xc7CxrqhWzNSDzD+/chS/zbYezmiwWLdQC09JdQKmthOw==",
       "dev": true,
       "license": "BlueOak-1.0.0",
       "engines": {
         "node": ">=20"
       }
     },
-    "node_modules/node-gyp/node_modules/minimatch": {
-      "version": "9.0.7",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.7.tgz",
-      "integrity": "sha512-MOwgjc8tfrpn5QQEvjijjmDVtMw2oL88ugTevzxQnzRLm6l3fVEF2gzU0kYeYYKD8C66+IdGX6peJ4MyUlUnPg==",
+    "node_modules/node-gyp/node_modules/nopt": {
+      "version": "9.0.0",
+      "resolved": "https://registry.npmjs.org/nopt/-/nopt-9.0.0.tgz",
+      "integrity": "sha512-Zhq3a+yFKrYwSBluL4H9XP3m3y5uvQkB/09CwDruCiRmR/UJYnn9W4R48ry0uGC70aeTPKLynBtscP9efFFcPw==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
-        "brace-expansion": "^5.0.2"
+        "abbrev": "^4.0.0"
+      },
+      "bin": {
+        "nopt": "bin/nopt.js"
       },
       "engines": {
-        "node": ">=16 || 14 >=14.17"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
+        "node": "^20.17.0 || >=22.9.0"
+      }
+    },
+    "node_modules/node-gyp/node_modules/proc-log": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/proc-log/-/proc-log-6.1.0.tgz",
+      "integrity": "sha512-iG+GYldRf2BQ0UDUAd6JQ/RwzaQy6mXmsk/IzlYyal4A4SNFw54MeH4/tLkF4I5WoWG9SQwuqWzS99jaFQHBuQ==",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": "^20.17.0 || >=22.9.0"
       }
     },
     "node_modules/node-gyp/node_modules/which": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/which/-/which-4.0.0.tgz",
-      "integrity": "sha512-GlaYyEb07DPxYCKhKzplCWBJtvxZcZMrL+4UkrTSJHHPyZU4mYYTv3qaOe77H7EODLSSopAUFAc6W8U4yqvscg==",
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/which/-/which-6.0.1.tgz",
+      "integrity": "sha512-oGLe46MIrCRqX7ytPUf66EAYvdeMIZYn3WaocqqKZAxrBpkqHfL/qvTyJ/bTk5+AqHCjXmrv3CEWgy368zhRUg==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
-        "isexe": "^3.1.1"
+        "isexe": "^4.0.0"
       },
       "bin": {
         "node-which": "bin/which.js"
       },
       "engines": {
-        "node": "^16.13.0 || >=18.0.0"
+        "node": "^20.17.0 || >=22.9.0"
       }
     },
     "node_modules/node-int64": {
@@ -37404,13 +37269,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/node-machine-id": {
-      "version": "1.1.12",
-      "resolved": "https://registry.npmjs.org/node-machine-id/-/node-machine-id-1.1.12.tgz",
-      "integrity": "sha512-QNABxbrPa3qEIfrE6GOJ7BYIuignnJw7iQ2YPbc3Nla1HzRJjXzZOiikfF8m7eAMfichLt3M4VgLOetqgDmgGQ==",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/node-preload": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/node-preload/-/node-preload-0.2.1.tgz",
@@ -37481,33 +37339,19 @@
       }
     },
     "node_modules/nopt": {
-      "version": "7.2.1",
-      "resolved": "https://registry.npmjs.org/nopt/-/nopt-7.2.1.tgz",
-      "integrity": "sha512-taM24ViiimT/XntxbPyJQzCG+p4EKOpgD3mxFwW38mGjVUrfERQOeY4EDHjdnptttfHuHQXFx+lTP08Q+mLa/w==",
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/nopt/-/nopt-8.1.0.tgz",
+      "integrity": "sha512-ieGu42u/Qsa4TFktmaKEwM6MQH0pOWnaB3htzh0JRtx84+Mebc0cbZYN5bC+6WTZ4+77xrL9Pn5m7CV6VIkV7A==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
-        "abbrev": "^2.0.0"
+        "abbrev": "^3.0.0"
       },
       "bin": {
         "nopt": "bin/nopt.js"
       },
       "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
-      }
-    },
-    "node_modules/normalize-package-data": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-6.0.2.tgz",
-      "integrity": "sha512-V6gygoYb/5EmNI+MEGrWkC+e6+Rr7mTmfHrxDbLzxQogBkgzo76rkok0Am6thgSF7Mv2nLOajAJj5vDJZEFn7g==",
-      "license": "BSD-2-Clause",
-      "dependencies": {
-        "hosted-git-info": "^7.0.0",
-        "semver": "^7.3.5",
-        "validate-npm-package-license": "^3.0.4"
-      },
-      "engines": {
-        "node": "^16.14.0 || >=18.0.0"
+        "node": "^18.17.0 || >=20.5.0"
       }
     },
     "node_modules/normalize-path": {
@@ -37520,104 +37364,161 @@
       }
     },
     "node_modules/npm-bundled": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-3.0.1.tgz",
-      "integrity": "sha512-+AvaheE/ww1JEwRHOrn4WHNzOxGtVp+adrg2AeZS/7KuxGUYFuBta98wYpfHBbJp6Tg6j1NKSEVHNcfZzJHQwQ==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-4.0.0.tgz",
+      "integrity": "sha512-IxaQZDMsqfQ2Lz37VvyyEtKLe8FsRZuysmedy/N06TU1RyVppYKXrO4xIhR0F+7ubIBox6Q7nir6fQI3ej39iA==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
-        "npm-normalize-package-bin": "^3.0.0"
+        "npm-normalize-package-bin": "^4.0.0"
       },
       "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+        "node": "^18.17.0 || >=20.5.0"
       }
     },
     "node_modules/npm-install-checks": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/npm-install-checks/-/npm-install-checks-6.3.0.tgz",
-      "integrity": "sha512-W29RiK/xtpCGqn6f3ixfRYGk+zRyr+Ew9F2E20BfXxT5/euLdA/Nm7fO7OeTGuAmTs30cpgInyJ0cYe708YTZw==",
+      "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/npm-install-checks/-/npm-install-checks-7.1.2.tgz",
+      "integrity": "sha512-z9HJBCYw9Zr8BqXcllKIs5nI+QggAImbBdHphOzVYrz2CB4iQ6FzWyKmlqDZua+51nAu7FcemlbTc9VgQN5XDQ==",
       "dev": true,
       "license": "BSD-2-Clause",
       "dependencies": {
         "semver": "^7.1.1"
       },
       "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+        "node": "^18.17.0 || >=20.5.0"
       }
     },
     "node_modules/npm-normalize-package-bin": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-3.0.1.tgz",
-      "integrity": "sha512-dMxCf+zZ+3zeQZXKxmyuCKlIDPGuv8EF940xbkC4kQVDTtqoh6rJFO+JTKSA6/Rwi0getWmtuy4Itup0AMcaDQ==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-4.0.0.tgz",
+      "integrity": "sha512-TZKxPvItzai9kN9H/TkmCtx/ZN/hvr3vUycjlfmH0ootY9yFBzNOpiXAdIn1Iteqsvk4lQn6B5PTrt+n6h8k/w==",
       "dev": true,
       "license": "ISC",
       "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+        "node": "^18.17.0 || >=20.5.0"
       }
     },
     "node_modules/npm-package-arg": {
-      "version": "11.0.2",
-      "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-11.0.2.tgz",
-      "integrity": "sha512-IGN0IAwmhDJwy13Wc8k+4PEbTPhpJnMtfR53ZbOyjkvmEcLS4nCwp6mvMWjS5sUjeiW3mpx6cHmuhKEu9XmcQw==",
+      "version": "13.0.1",
+      "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-13.0.1.tgz",
+      "integrity": "sha512-6zqls5xFvJbgFjB1B2U6yITtyGBjDBORB7suI4zA4T/sZ1OmkMFlaQSNB/4K0LtXNA1t4OprAFxPisadK5O2ag==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
-        "hosted-git-info": "^7.0.0",
-        "proc-log": "^4.0.0",
+        "hosted-git-info": "^9.0.0",
+        "proc-log": "^5.0.0",
         "semver": "^7.3.5",
-        "validate-npm-package-name": "^5.0.0"
+        "validate-npm-package-name": "^6.0.0"
       },
       "engines": {
-        "node": "^16.14.0 || >=18.0.0"
+        "node": "^20.17.0 || >=22.9.0"
+      }
+    },
+    "node_modules/npm-package-arg/node_modules/hosted-git-info": {
+      "version": "9.0.2",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-9.0.2.tgz",
+      "integrity": "sha512-M422h7o/BR3rmCQ8UHi7cyyMqKltdP9Uo+J2fXK+RSAY+wTcKOIRyhTuKv4qn+DJf3g+PL890AzId5KZpX+CBg==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "lru-cache": "^11.1.0"
+      },
+      "engines": {
+        "node": "^20.17.0 || >=22.9.0"
+      }
+    },
+    "node_modules/npm-package-arg/node_modules/lru-cache": {
+      "version": "11.2.7",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.2.7.tgz",
+      "integrity": "sha512-aY/R+aEsRelme17KGQa/1ZSIpLpNYYrhcrepKTZgE+W3WM16YMCaPwOHLHsmopZHELU0Ojin1lPVxKR0MihncA==",
+      "dev": true,
+      "license": "BlueOak-1.0.0",
+      "engines": {
+        "node": "20 || >=22"
       }
     },
     "node_modules/npm-packlist": {
-      "version": "8.0.2",
-      "resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-8.0.2.tgz",
-      "integrity": "sha512-shYrPFIS/JLP4oQmAwDyk5HcyysKW8/JLTEA32S0Z5TzvpaeeX2yMFfoK1fjEBnCBvVyIB/Jj/GBFdm0wsgzbA==",
+      "version": "10.0.3",
+      "resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-10.0.3.tgz",
+      "integrity": "sha512-zPukTwJMOu5X5uvm0fztwS5Zxyvmk38H/LfidkOMt3gbZVCyro2cD/ETzwzVPcWZA3JOyPznfUN/nkyFiyUbxg==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
-        "ignore-walk": "^6.0.4"
+        "ignore-walk": "^8.0.0",
+        "proc-log": "^6.0.0"
       },
       "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+        "node": "^20.17.0 || >=22.9.0"
+      }
+    },
+    "node_modules/npm-packlist/node_modules/proc-log": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/proc-log/-/proc-log-6.1.0.tgz",
+      "integrity": "sha512-iG+GYldRf2BQ0UDUAd6JQ/RwzaQy6mXmsk/IzlYyal4A4SNFw54MeH4/tLkF4I5WoWG9SQwuqWzS99jaFQHBuQ==",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": "^20.17.0 || >=22.9.0"
       }
     },
     "node_modules/npm-pick-manifest": {
-      "version": "9.1.0",
-      "resolved": "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-9.1.0.tgz",
-      "integrity": "sha512-nkc+3pIIhqHVQr085X9d2JzPzLyjzQS96zbruppqC9aZRm/x8xx6xhI98gHtsfELP2bE+loHq8ZaHFHhe+NauA==",
+      "version": "11.0.3",
+      "resolved": "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-11.0.3.tgz",
+      "integrity": "sha512-buzyCfeoGY/PxKqmBqn1IUJrZnUi1VVJTdSSRPGI60tJdUhUoSQFhs0zycJokDdOznQentgrpf8LayEHyyYlqQ==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
-        "npm-install-checks": "^6.0.0",
-        "npm-normalize-package-bin": "^3.0.0",
-        "npm-package-arg": "^11.0.0",
+        "npm-install-checks": "^8.0.0",
+        "npm-normalize-package-bin": "^5.0.0",
+        "npm-package-arg": "^13.0.0",
         "semver": "^7.3.5"
       },
       "engines": {
-        "node": "^16.14.0 || >=18.0.0"
+        "node": "^20.17.0 || >=22.9.0"
+      }
+    },
+    "node_modules/npm-pick-manifest/node_modules/npm-install-checks": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/npm-install-checks/-/npm-install-checks-8.0.0.tgz",
+      "integrity": "sha512-ScAUdMpyzkbpxoNekQ3tNRdFI8SJ86wgKZSQZdUxT+bj0wVFpsEMWnkXP0twVe1gJyNF5apBWDJhhIbgrIViRA==",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "dependencies": {
+        "semver": "^7.1.1"
+      },
+      "engines": {
+        "node": "^20.17.0 || >=22.9.0"
+      }
+    },
+    "node_modules/npm-pick-manifest/node_modules/npm-normalize-package-bin": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-5.0.0.tgz",
+      "integrity": "sha512-CJi3OS4JLsNMmr2u07OJlhcrPxCeOeP/4xq67aWNai6TNWWbTrlNDgl8NcFKVlcBKp18GPj+EzbNIgrBfZhsag==",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": "^20.17.0 || >=22.9.0"
       }
     },
     "node_modules/npm-registry-fetch": {
-      "version": "17.1.0",
-      "resolved": "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-17.1.0.tgz",
-      "integrity": "sha512-5+bKQRH0J1xG1uZ1zMNvxW0VEyoNWgJpY9UDuluPFLKDfJ9u2JmmjmTJV1srBGQOROfdBMiVvnH2Zvpbm+xkVA==",
+      "version": "19.1.0",
+      "resolved": "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-19.1.0.tgz",
+      "integrity": "sha512-xyZLfs7TxPu/WKjHUs0jZOPinzBAI32kEUel6za0vH+JUTnFZ5zbHI1ZoGZRDm6oMjADtrli6FxtMlk/5ABPNw==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
-        "@npmcli/redact": "^2.0.0",
+        "@npmcli/redact": "^3.0.0",
         "jsonparse": "^1.3.1",
-        "make-fetch-happen": "^13.0.0",
+        "make-fetch-happen": "^15.0.0",
         "minipass": "^7.0.2",
-        "minipass-fetch": "^3.0.0",
-        "minizlib": "^2.1.2",
-        "npm-package-arg": "^11.0.0",
-        "proc-log": "^4.0.0"
+        "minipass-fetch": "^4.0.0",
+        "minizlib": "^3.0.1",
+        "npm-package-arg": "^13.0.0",
+        "proc-log": "^5.0.0"
       },
       "engines": {
-        "node": "^16.14.0 || >=18.0.0"
+        "node": "^20.17.0 || >=22.9.0"
       }
     },
     "node_modules/npm-run-path": {
@@ -37672,42 +37573,44 @@
       "license": "MIT"
     },
     "node_modules/nx": {
-      "version": "20.8.4",
-      "resolved": "https://registry.npmjs.org/nx/-/nx-20.8.4.tgz",
-      "integrity": "sha512-/++x0OM3/UTmDR+wmPeV13tSxeTr+QGzj3flgtH9DiOPmQnn2CjHWAMZiOhcSh/hHoE/V3ySL4757InQUsVtjQ==",
+      "version": "22.6.1",
+      "resolved": "https://registry.npmjs.org/nx/-/nx-22.6.1.tgz",
+      "integrity": "sha512-b4eo52o5aCVt3oG6LPYvD2Cul3JFBMgr2p9OjMBIo6oU6QfSR693H2/UuUMepLtO6jcIniPKOcIrf6Ue8aXAww==",
       "dev": true,
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
+        "@ltd/j-toml": "^1.38.0",
         "@napi-rs/wasm-runtime": "0.2.4",
         "@yarnpkg/lockfile": "^1.1.0",
         "@yarnpkg/parsers": "3.0.2",
         "@zkochan/js-yaml": "0.0.7",
-        "axios": "^1.8.3",
-        "chalk": "^4.1.0",
+        "axios": "^1.12.0",
         "cli-cursor": "3.1.0",
         "cli-spinners": "2.6.1",
         "cliui": "^8.0.1",
         "dotenv": "~16.4.5",
         "dotenv-expand": "~11.0.6",
+        "ejs": "^3.1.7",
         "enquirer": "~2.3.6",
         "figures": "3.2.0",
         "flat": "^5.0.2",
         "front-matter": "^4.0.2",
-        "ignore": "^5.0.4",
-        "jest-diff": "^29.4.1",
+        "ignore": "^7.0.5",
+        "jest-diff": "^30.0.2",
         "jsonc-parser": "3.2.0",
         "lines-and-columns": "2.0.3",
-        "minimatch": "9.0.3",
-        "node-machine-id": "1.1.12",
+        "minimatch": "10.2.4",
         "npm-run-path": "^4.0.1",
         "open": "^8.4.0",
         "ora": "5.3.0",
+        "picocolors": "^1.1.0",
         "resolve.exports": "2.0.3",
-        "semver": "^7.5.3",
+        "semver": "^7.6.3",
         "string-width": "^4.2.3",
         "tar-stream": "~2.2.0",
         "tmp": "~0.2.1",
+        "tree-kill": "^1.2.2",
         "tsconfig-paths": "^4.1.2",
         "tslib": "^2.3.0",
         "yaml": "^2.6.0",
@@ -37719,20 +37622,20 @@
         "nx-cloud": "bin/nx-cloud.js"
       },
       "optionalDependencies": {
-        "@nx/nx-darwin-arm64": "20.8.4",
-        "@nx/nx-darwin-x64": "20.8.4",
-        "@nx/nx-freebsd-x64": "20.8.4",
-        "@nx/nx-linux-arm-gnueabihf": "20.8.4",
-        "@nx/nx-linux-arm64-gnu": "20.8.4",
-        "@nx/nx-linux-arm64-musl": "20.8.4",
-        "@nx/nx-linux-x64-gnu": "20.8.4",
-        "@nx/nx-linux-x64-musl": "20.8.4",
-        "@nx/nx-win32-arm64-msvc": "20.8.4",
-        "@nx/nx-win32-x64-msvc": "20.8.4"
+        "@nx/nx-darwin-arm64": "22.6.1",
+        "@nx/nx-darwin-x64": "22.6.1",
+        "@nx/nx-freebsd-x64": "22.6.1",
+        "@nx/nx-linux-arm-gnueabihf": "22.6.1",
+        "@nx/nx-linux-arm64-gnu": "22.6.1",
+        "@nx/nx-linux-arm64-musl": "22.6.1",
+        "@nx/nx-linux-x64-gnu": "22.6.1",
+        "@nx/nx-linux-x64-musl": "22.6.1",
+        "@nx/nx-win32-arm64-msvc": "22.6.1",
+        "@nx/nx-win32-x64-msvc": "22.6.1"
       },
       "peerDependencies": {
-        "@swc-node/register": "^1.8.0",
-        "@swc/core": "^1.3.85"
+        "@swc-node/register": "^1.11.1",
+        "@swc/core": "^1.15.8"
       },
       "peerDependenciesMeta": {
         "@swc-node/register": {
@@ -37743,14 +37646,57 @@
         }
       }
     },
-    "node_modules/nx/node_modules/brace-expansion": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
-      "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
+    "node_modules/nx/node_modules/@jest/diff-sequences": {
+      "version": "30.3.0",
+      "resolved": "https://registry.npmjs.org/@jest/diff-sequences/-/diff-sequences-30.3.0.tgz",
+      "integrity": "sha512-cG51MVnLq1ecVUaQ3fr6YuuAOitHK1S4WUJHnsPFE/quQr33ADUx1FfrTCpMCRxvy0Yr9BThKpDjSlcTi91tMA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "node_modules/nx/node_modules/@jest/schemas": {
+      "version": "30.0.5",
+      "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-30.0.5.tgz",
+      "integrity": "sha512-DmdYgtezMkh3cpU8/1uyXakv3tJRcmcXxBOcO0tbaozPwpmh4YMsnWrQm9ZmZMfa5ocbxzbFk6O4bDPEc/iAnA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "balanced-match": "^1.0.0"
+        "@sinclair/typebox": "^0.34.0"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "node_modules/nx/node_modules/@sinclair/typebox": {
+      "version": "0.34.48",
+      "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.34.48.tgz",
+      "integrity": "sha512-kKJTNuK3AQOrgjjotVxMrCn1sUJwM76wMszfq1kdU4uYVJjvEWuFQ6HgvLt4Xz3fSmZlTOxJ/Ie13KnIcWQXFA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/nx/node_modules/balanced-match": {
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-4.0.4.tgz",
+      "integrity": "sha512-BLrgEcRTwX2o6gGxGOCNyMvGSp35YofuYzw9h1IMTRmKqttAZZVU67bdb9Pr2vUHA8+j3i2tJfjO6C6+4myGTA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "18 || 20 || >=22"
+      }
+    },
+    "node_modules/nx/node_modules/brace-expansion": {
+      "version": "5.0.5",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.5.tgz",
+      "integrity": "sha512-VZznLgtwhn+Mact9tfiwx64fA9erHH/MCXEUfB/0bX/6Fz6ny5EGTXYltMocqg4xFAQZtnO3DHWWXi8RiuN7cQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "balanced-match": "^4.0.2"
+      },
+      "engines": {
+        "node": "18 || 20 || >=22"
       }
     },
     "node_modules/nx/node_modules/chalk": {
@@ -37783,73 +37729,74 @@
         "node": ">=8.6"
       }
     },
-    "node_modules/nx/node_modules/is-unicode-supported": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz",
-      "integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==",
+    "node_modules/nx/node_modules/ignore": {
+      "version": "7.0.5",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-7.0.5.tgz",
+      "integrity": "sha512-Hs59xBNfUIunMFgWAbGX5cq6893IbWg4KnrjbYwX3tx0ztorVgTDA6B2sxf8ejHJ4wz8BqGUMYlnzNBer5NvGg==",
       "dev": true,
       "license": "MIT",
       "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "node": ">= 4"
       }
     },
-    "node_modules/nx/node_modules/log-symbols": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz",
-      "integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==",
+    "node_modules/nx/node_modules/jest-diff": {
+      "version": "30.3.0",
+      "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-30.3.0.tgz",
+      "integrity": "sha512-n3q4PDQjS4LrKxfWB3Z5KNk1XjXtZTBwQp71OP0Jo03Z6V60x++K5L8k6ZrW8MY8pOFylZvHM0zsjS1RqlHJZQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "chalk": "^4.1.0",
-        "is-unicode-supported": "^0.1.0"
+        "@jest/diff-sequences": "30.3.0",
+        "@jest/get-type": "30.1.0",
+        "chalk": "^4.1.2",
+        "pretty-format": "30.3.0"
       },
       "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       }
     },
     "node_modules/nx/node_modules/minimatch": {
-      "version": "9.0.3",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz",
-      "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==",
+      "version": "10.2.4",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.2.4.tgz",
+      "integrity": "sha512-oRjTw/97aTBN0RHbYCdtF1MQfvusSIBQM0IZEgzl6426+8jSC0nF1a/GmnVLpfB9yyr6g6FTqWqiZVbxrtaCIg==",
       "dev": true,
-      "license": "ISC",
+      "license": "BlueOak-1.0.0",
       "dependencies": {
-        "brace-expansion": "^2.0.1"
+        "brace-expansion": "^5.0.2"
       },
       "engines": {
-        "node": ">=16 || 14 >=14.17"
+        "node": "18 || 20 || >=22"
       },
       "funding": {
         "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "node_modules/nx/node_modules/ora": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/ora/-/ora-5.3.0.tgz",
-      "integrity": "sha512-zAKMgGXUim0Jyd6CXK9lraBnD3H5yPGBPPOkC23a2BG6hsm4Zu6OQSjQuEtV0BHDf4aKHcUFvJiGRrFuW3MG8g==",
+    "node_modules/nx/node_modules/pretty-format": {
+      "version": "30.3.0",
+      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-30.3.0.tgz",
+      "integrity": "sha512-oG4T3wCbfeuvljnyAzhBvpN45E8iOTXCU/TD3zXW80HA3dQ4ahdqMkWGiPWZvjpQwlbyHrPTWUAqUzGzv4l1JQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "bl": "^4.0.3",
-        "chalk": "^4.1.0",
-        "cli-cursor": "^3.1.0",
-        "cli-spinners": "^2.5.0",
-        "is-interactive": "^1.0.0",
-        "log-symbols": "^4.0.0",
-        "strip-ansi": "^6.0.0",
-        "wcwidth": "^1.0.1"
+        "@jest/schemas": "30.0.5",
+        "ansi-styles": "^5.2.0",
+        "react-is": "^18.3.1"
       },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "node_modules/nx/node_modules/pretty-format/node_modules/ansi-styles": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
+      "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
+      "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=10"
       },
       "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
     "node_modules/nyc": {
@@ -38370,23 +38317,22 @@
       }
     },
     "node_modules/open-cli": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/open-cli/-/open-cli-8.0.0.tgz",
-      "integrity": "sha512-3muD3BbfLyzl+aMVSEfn2FfOqGdPYR0O4KNnxXsLEPE2q9OSjBfJAaB6XKbrUzLgymoSMejvb5jpXJfru/Ko2A==",
+      "version": "9.0.0",
+      "resolved": "https://registry.npmjs.org/open-cli/-/open-cli-9.0.0.tgz",
+      "integrity": "sha512-4UHkLVm4tUM/ardg66uY3x1icgfCnunks5eFVFBzASO3b13Ow2Md3xs9YT7yXWFjXOBpauIeh/N9fvbziU1wkg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "file-type": "^18.7.0",
-        "get-stdin": "^9.0.0",
-        "meow": "^12.1.1",
-        "open": "^10.0.0",
-        "tempy": "^3.1.0"
+        "file-type": "^21.3.4",
+        "meow": "^14.1.0",
+        "open": "^11.0.0",
+        "tempy": "^3.2.0"
       },
       "bin": {
         "open-cli": "cli.js"
       },
       "engines": {
-        "node": ">=18"
+        "node": ">=22"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
@@ -38405,49 +38351,35 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/open-cli/node_modules/is-wsl": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-3.1.0.tgz",
-      "integrity": "sha512-UcVfVfaK4Sc4m7X3dUSoHoozQGBEFeDC+zVo06t98xe8CzHSZZBekNXH+tu0NalHolcJ/QAGqS46Hef7QXBIMw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "is-inside-container": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=16"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/open-cli/node_modules/meow": {
-      "version": "12.1.1",
-      "resolved": "https://registry.npmjs.org/meow/-/meow-12.1.1.tgz",
-      "integrity": "sha512-BhXM0Au22RwUneMPwSCnyhTOizdWoIEPU9sp0Aqa1PnDMR5Wv2FGXYDjuzJEIX+Eo2Rb8xuYe5jrnm5QowQFkw==",
+      "version": "14.1.0",
+      "resolved": "https://registry.npmjs.org/meow/-/meow-14.1.0.tgz",
+      "integrity": "sha512-EDYo6VlmtnumlcBCbh1gLJ//9jvM/ndXHfVXIFrZVr6fGcwTUyCTFNTLCKuY3ffbK8L/+3Mzqnd58RojiZqHVw==",
       "dev": true,
       "license": "MIT",
       "engines": {
-        "node": ">=16.10"
+        "node": ">=20"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/open-cli/node_modules/open": {
-      "version": "10.1.0",
-      "resolved": "https://registry.npmjs.org/open/-/open-10.1.0.tgz",
-      "integrity": "sha512-mnkeQ1qP5Ue2wd+aivTD3NHd/lZ96Lu0jgf0pwktLPtx6cTZiH7tyeGRRHs0zX0rbrahXPnXlUnbeXyaBBuIaw==",
+      "version": "11.0.0",
+      "resolved": "https://registry.npmjs.org/open/-/open-11.0.0.tgz",
+      "integrity": "sha512-smsWv2LzFjP03xmvFoJ331ss6h+jixfA4UUV/Bsiyuu4YJPfN+FIQGOIiv4w9/+MoHkfkJ22UIaQWRVFRfH6Vw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "default-browser": "^5.2.1",
+        "default-browser": "^5.4.0",
         "define-lazy-prop": "^3.0.0",
+        "is-in-ssh": "^1.0.0",
         "is-inside-container": "^1.0.0",
-        "is-wsl": "^3.1.0"
+        "powershell-utils": "^0.1.0",
+        "wsl-utils": "^0.3.0"
       },
       "engines": {
-        "node": ">=18"
+        "node": ">=20"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
@@ -38499,6 +38431,76 @@
         "node": ">= 0.8.0"
       }
     },
+    "node_modules/ora": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/ora/-/ora-5.3.0.tgz",
+      "integrity": "sha512-zAKMgGXUim0Jyd6CXK9lraBnD3H5yPGBPPOkC23a2BG6hsm4Zu6OQSjQuEtV0BHDf4aKHcUFvJiGRrFuW3MG8g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "bl": "^4.0.3",
+        "chalk": "^4.1.0",
+        "cli-cursor": "^3.1.0",
+        "cli-spinners": "^2.5.0",
+        "is-interactive": "^1.0.0",
+        "log-symbols": "^4.0.0",
+        "strip-ansi": "^6.0.0",
+        "wcwidth": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/ora/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/ora/node_modules/is-unicode-supported": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz",
+      "integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/ora/node_modules/log-symbols": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz",
+      "integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "chalk": "^4.1.0",
+        "is-unicode-supported": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/os-homedir": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
@@ -38535,9 +38537,9 @@
       }
     },
     "node_modules/oxlint": {
-      "version": "1.53.0",
-      "resolved": "https://registry.npmjs.org/oxlint/-/oxlint-1.53.0.tgz",
-      "integrity": "sha512-TLW0PzGbpO1JxUnuy1pIqVPjQUGh4fNfxu5XJbdFIRFVaJ0UFzTjjk/hSFTMRxN6lZub53xL/IwJNEkrh7VtDg==",
+      "version": "1.61.0",
+      "resolved": "https://registry.npmjs.org/oxlint/-/oxlint-1.61.0.tgz",
+      "integrity": "sha512-ZC0ALuhDZ6ivOFG+sy0D0pEDN49EvsId98zVlmYdkcXHsEM14m/qTNUEsUpiFiCVbpIxYtVBmmLE87nsbUHohQ==",
       "dev": true,
       "license": "MIT",
       "bin": {
@@ -38550,28 +38552,28 @@
         "url": "https://github.com/sponsors/Boshen"
       },
       "optionalDependencies": {
-        "@oxlint/binding-android-arm-eabi": "1.53.0",
-        "@oxlint/binding-android-arm64": "1.53.0",
-        "@oxlint/binding-darwin-arm64": "1.53.0",
-        "@oxlint/binding-darwin-x64": "1.53.0",
-        "@oxlint/binding-freebsd-x64": "1.53.0",
-        "@oxlint/binding-linux-arm-gnueabihf": "1.53.0",
-        "@oxlint/binding-linux-arm-musleabihf": "1.53.0",
-        "@oxlint/binding-linux-arm64-gnu": "1.53.0",
-        "@oxlint/binding-linux-arm64-musl": "1.53.0",
-        "@oxlint/binding-linux-ppc64-gnu": "1.53.0",
-        "@oxlint/binding-linux-riscv64-gnu": "1.53.0",
-        "@oxlint/binding-linux-riscv64-musl": "1.53.0",
-        "@oxlint/binding-linux-s390x-gnu": "1.53.0",
-        "@oxlint/binding-linux-x64-gnu": "1.53.0",
-        "@oxlint/binding-linux-x64-musl": "1.53.0",
-        "@oxlint/binding-openharmony-arm64": "1.53.0",
-        "@oxlint/binding-win32-arm64-msvc": "1.53.0",
-        "@oxlint/binding-win32-ia32-msvc": "1.53.0",
-        "@oxlint/binding-win32-x64-msvc": "1.53.0"
+        "@oxlint/binding-android-arm-eabi": "1.61.0",
+        "@oxlint/binding-android-arm64": "1.61.0",
+        "@oxlint/binding-darwin-arm64": "1.61.0",
+        "@oxlint/binding-darwin-x64": "1.61.0",
+        "@oxlint/binding-freebsd-x64": "1.61.0",
+        "@oxlint/binding-linux-arm-gnueabihf": "1.61.0",
+        "@oxlint/binding-linux-arm-musleabihf": "1.61.0",
+        "@oxlint/binding-linux-arm64-gnu": "1.61.0",
+        "@oxlint/binding-linux-arm64-musl": "1.61.0",
+        "@oxlint/binding-linux-ppc64-gnu": "1.61.0",
+        "@oxlint/binding-linux-riscv64-gnu": "1.61.0",
+        "@oxlint/binding-linux-riscv64-musl": "1.61.0",
+        "@oxlint/binding-linux-s390x-gnu": "1.61.0",
+        "@oxlint/binding-linux-x64-gnu": "1.61.0",
+        "@oxlint/binding-linux-x64-musl": "1.61.0",
+        "@oxlint/binding-openharmony-arm64": "1.61.0",
+        "@oxlint/binding-win32-arm64-msvc": "1.61.0",
+        "@oxlint/binding-win32-ia32-msvc": "1.61.0",
+        "@oxlint/binding-win32-x64-msvc": "1.61.0"
       },
       "peerDependencies": {
-        "oxlint-tsgolint": ">=0.15.0"
+        "oxlint-tsgolint": ">=0.18.0"
       },
       "peerDependenciesMeta": {
         "oxlint-tsgolint": {
@@ -38764,6 +38766,7 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.1.tgz",
       "integrity": "sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw==",
+      "dev": true,
       "license": "BlueOak-1.0.0"
     },
     "node_modules/package-json/node_modules/ky": {
@@ -38779,35 +38782,156 @@
       }
     },
     "node_modules/pacote": {
-      "version": "18.0.6",
-      "resolved": "https://registry.npmjs.org/pacote/-/pacote-18.0.6.tgz",
-      "integrity": "sha512-+eK3G27SMwsB8kLIuj4h1FUhHtwiEUo21Tw8wNjmvdlpOEr613edv+8FUsTj/4F/VN5ywGE19X18N7CC2EJk6A==",
+      "version": "21.0.1",
+      "resolved": "https://registry.npmjs.org/pacote/-/pacote-21.0.1.tgz",
+      "integrity": "sha512-LHGIUQUrcDIJUej53KJz1BPvUuHrItrR2yrnN0Kl9657cJ0ZT6QJHk9wWPBnQZhYT5KLyZWrk9jaYc2aKDu4yw==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
-        "@npmcli/git": "^5.0.0",
-        "@npmcli/installed-package-contents": "^2.0.1",
-        "@npmcli/package-json": "^5.1.0",
-        "@npmcli/promise-spawn": "^7.0.0",
-        "@npmcli/run-script": "^8.0.0",
-        "cacache": "^18.0.0",
+        "@npmcli/git": "^6.0.0",
+        "@npmcli/installed-package-contents": "^3.0.0",
+        "@npmcli/package-json": "^7.0.0",
+        "@npmcli/promise-spawn": "^8.0.0",
+        "@npmcli/run-script": "^10.0.0",
+        "cacache": "^20.0.0",
         "fs-minipass": "^3.0.0",
         "minipass": "^7.0.2",
-        "npm-package-arg": "^11.0.0",
-        "npm-packlist": "^8.0.0",
-        "npm-pick-manifest": "^9.0.0",
-        "npm-registry-fetch": "^17.0.0",
-        "proc-log": "^4.0.0",
+        "npm-package-arg": "^13.0.0",
+        "npm-packlist": "^10.0.1",
+        "npm-pick-manifest": "^10.0.0",
+        "npm-registry-fetch": "^19.0.0",
+        "proc-log": "^5.0.0",
         "promise-retry": "^2.0.1",
-        "sigstore": "^2.2.0",
-        "ssri": "^10.0.0",
-        "tar": "^6.1.11"
+        "sigstore": "^4.0.0",
+        "ssri": "^12.0.0",
+        "tar": "^7.4.3"
       },
       "bin": {
         "pacote": "bin/index.js"
       },
       "engines": {
-        "node": "^16.14.0 || >=18.0.0"
+        "node": "^20.17.0 || >=22.9.0"
+      }
+    },
+    "node_modules/pacote/node_modules/@npmcli/git": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/@npmcli/git/-/git-6.0.3.tgz",
+      "integrity": "sha512-GUYESQlxZRAdhs3UhbB6pVRNUELQOHXwK9ruDkwmCv2aZ5y0SApQzUJCg02p3A7Ue2J5hxvlk1YI53c00NmRyQ==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "@npmcli/promise-spawn": "^8.0.0",
+        "ini": "^5.0.0",
+        "lru-cache": "^10.0.1",
+        "npm-pick-manifest": "^10.0.0",
+        "proc-log": "^5.0.0",
+        "promise-retry": "^2.0.1",
+        "semver": "^7.3.5",
+        "which": "^5.0.0"
+      },
+      "engines": {
+        "node": "^18.17.0 || >=20.5.0"
+      }
+    },
+    "node_modules/pacote/node_modules/@npmcli/promise-spawn": {
+      "version": "8.0.3",
+      "resolved": "https://registry.npmjs.org/@npmcli/promise-spawn/-/promise-spawn-8.0.3.tgz",
+      "integrity": "sha512-Yb00SWaL4F8w+K8YGhQ55+xE4RUNdMHV43WZGsiTM92gS+lC0mGsn7I4hLug7pbao035S6bj3Y3w0cUNGLfmkg==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "which": "^5.0.0"
+      },
+      "engines": {
+        "node": "^18.17.0 || >=20.5.0"
+      }
+    },
+    "node_modules/pacote/node_modules/hosted-git-info": {
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-8.1.0.tgz",
+      "integrity": "sha512-Rw/B2DNQaPBICNXEm8balFz9a6WpZrkCGpcWFpy7nCj+NyhSdqXipmfvtmWt9xGfp0wZnBxB+iVpLmQMYt47Tw==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "lru-cache": "^10.0.1"
+      },
+      "engines": {
+        "node": "^18.17.0 || >=20.5.0"
+      }
+    },
+    "node_modules/pacote/node_modules/ini": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/ini/-/ini-5.0.0.tgz",
+      "integrity": "sha512-+N0ngpO3e7cRUWOJAS7qw0IZIVc6XPrW4MlFBdD066F2L4k1L6ker3hLqSq7iXxU5tgS4WGkIUElWn5vogAEnw==",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": "^18.17.0 || >=20.5.0"
+      }
+    },
+    "node_modules/pacote/node_modules/isexe": {
+      "version": "3.1.5",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-3.1.5.tgz",
+      "integrity": "sha512-6B3tLtFqtQS4ekarvLVMZ+X+VlvQekbe4taUkf/rhVO3d/h0M2rfARm/pXLcPEsjjMsFgrFgSrhQIxcSVrBz8w==",
+      "dev": true,
+      "license": "BlueOak-1.0.0",
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/pacote/node_modules/lru-cache": {
+      "version": "10.4.3",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz",
+      "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/pacote/node_modules/npm-pick-manifest": {
+      "version": "10.0.0",
+      "resolved": "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-10.0.0.tgz",
+      "integrity": "sha512-r4fFa4FqYY8xaM7fHecQ9Z2nE9hgNfJR+EmoKv0+chvzWkBcORX3r0FpTByP+CbOVJDladMXnPQGVN8PBLGuTQ==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "npm-install-checks": "^7.1.0",
+        "npm-normalize-package-bin": "^4.0.0",
+        "npm-package-arg": "^12.0.0",
+        "semver": "^7.3.5"
+      },
+      "engines": {
+        "node": "^18.17.0 || >=20.5.0"
+      }
+    },
+    "node_modules/pacote/node_modules/npm-pick-manifest/node_modules/npm-package-arg": {
+      "version": "12.0.2",
+      "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-12.0.2.tgz",
+      "integrity": "sha512-f1NpFjNI9O4VbKMOlA5QoBq/vSQPORHcTZ2feJpFkTHJ9eQkdlmZEKSjcAhxTGInC7RlEyScT9ui67NaOsjFWA==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "hosted-git-info": "^8.0.0",
+        "proc-log": "^5.0.0",
+        "semver": "^7.3.5",
+        "validate-npm-package-name": "^6.0.0"
+      },
+      "engines": {
+        "node": "^18.17.0 || >=20.5.0"
+      }
+    },
+    "node_modules/pacote/node_modules/which": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/which/-/which-5.0.0.tgz",
+      "integrity": "sha512-JEdGzHwwkrbWoGOlIHqQ5gtprKGOenpDHpxE9zVR1bWbOtYRyPPHMe9FaP6x61CmNaTThSkb0DAJte5jD+DmzQ==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "isexe": "^3.1.1"
+      },
+      "bin": {
+        "node-which": "bin/which.js"
+      },
+      "engines": {
+        "node": "^18.17.0 || >=20.5.0"
       }
     },
     "node_modules/pad-component": {
@@ -38845,18 +38969,28 @@
       }
     },
     "node_modules/parse-conflict-json": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/parse-conflict-json/-/parse-conflict-json-3.0.1.tgz",
-      "integrity": "sha512-01TvEktc68vwbJOtWZluyWeVGWjP+bZwXtPDMQVbBKzbJ/vZBif0L69KH1+cHv1SZ6e0FKLvjyHe8mqsIqYOmw==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/parse-conflict-json/-/parse-conflict-json-4.0.0.tgz",
+      "integrity": "sha512-37CN2VtcuvKgHUs8+0b1uJeEsbGn61GRHz469C94P5xiOoqpDYJYwjg4RY9Vmz39WyZAVkR5++nbJwLMIgOCnQ==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
-        "json-parse-even-better-errors": "^3.0.0",
+        "json-parse-even-better-errors": "^4.0.0",
         "just-diff": "^6.0.0",
         "just-diff-apply": "^5.2.0"
       },
       "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+        "node": "^18.17.0 || >=20.5.0"
+      }
+    },
+    "node_modules/parse-conflict-json/node_modules/json-parse-even-better-errors": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-4.0.0.tgz",
+      "integrity": "sha512-lR4MXjGNgkJc7tkQ97kb2nuEMnNCyU//XYVH0MKTGcXEiSudQ5MKGKen3C5QubYy0vmq+JGitUg92uuywGEwIA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "^18.17.0 || >=20.5.0"
       }
     },
     "node_modules/parse-entities": {
@@ -39037,6 +39171,21 @@
         "node": ">=8"
       }
     },
+    "node_modules/path-expression-matcher": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/path-expression-matcher/-/path-expression-matcher-1.5.0.tgz",
+      "integrity": "sha512-cbrerZV+6rvdQrrD+iGMcZFEiiSrbv9Tfdkvnusy6y0x0GKBXREFg/Y65GhIfm0tnLntThhzCnfKwp1WRjeCyQ==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/NaturalIntelligence"
+        }
+      ],
+      "license": "MIT",
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
     "node_modules/path-is-absolute": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
@@ -39065,6 +39214,7 @@
       "version": "1.11.1",
       "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.11.1.tgz",
       "integrity": "sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==",
+      "dev": true,
       "license": "BlueOak-1.0.0",
       "dependencies": {
         "lru-cache": "^10.2.0",
@@ -39081,12 +39231,13 @@
       "version": "10.4.3",
       "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz",
       "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==",
+      "dev": true,
       "license": "ISC"
     },
     "node_modules/path-to-regexp": {
-      "version": "0.1.12",
-      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.12.tgz",
-      "integrity": "sha512-RA1GjUVMnvYFxuqovrEqZoxxW5NUZqbwKtYz/Tt7nXerk0LbLblQmrsgdeOxV5SFHf0UDggjS/bSeOZwt1pmEQ==",
+      "version": "0.1.13",
+      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.13.tgz",
+      "integrity": "sha512-A/AGNMFN3c8bOlvV9RreMdrv7jsmF9XIfDeCd87+I8RNg6s78BhJxMu69NEMHBSJFxKidViTEdruRwEk/WIKqA==",
       "dev": true,
       "license": "MIT"
     },
@@ -39122,20 +39273,6 @@
         "pbf": "bin/pbf"
       }
     },
-    "node_modules/peek-readable": {
-      "version": "5.3.1",
-      "resolved": "https://registry.npmjs.org/peek-readable/-/peek-readable-5.3.1.tgz",
-      "integrity": "sha512-GVlENSDW6KHaXcd9zkZltB7tCLosKB/4Hg0fqBJkAoBgYG2Tn1xtMgXtSUuMU9AK/gCm/tTdT8mgAeF4YNeeqw==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=14.16"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/Borewit"
-      }
-    },
     "node_modules/peek-stream": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/peek-stream/-/peek-stream-1.1.3.tgz",
@@ -39169,9 +39306,9 @@
       "license": "ISC"
     },
     "node_modules/picomatch": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
-      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.2.tgz",
+      "integrity": "sha512-V7+vQEJ06Z+c5tSye8S+nHUfI51xoXIXjHQ99cQtKUkQqqO1kO/KCJUfZXuB47h/YBlDhah2H3hdUGXn8ie0oA==",
       "license": "MIT",
       "engines": {
         "node": ">=8.6"
@@ -39288,13 +39425,13 @@
       }
     },
     "node_modules/playwright": {
-      "version": "1.58.2",
-      "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.58.2.tgz",
-      "integrity": "sha512-vA30H8Nvkq/cPBnNw4Q8TWz1EJyqgpuinBcHET0YVJVFldr8JDNiU9LaWAE1KqSkRYazuaBhTpB5ZzShOezQ6A==",
+      "version": "1.59.1",
+      "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.59.1.tgz",
+      "integrity": "sha512-C8oWjPR3F81yljW9o5OxcWzfh6avkVwDD2VYdwIGqTkl+OGFISgypqzfu7dOe4QNLL2aqcWBmI3PMtLIK233lw==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
-        "playwright-core": "1.58.2"
+        "playwright-core": "1.59.1"
       },
       "bin": {
         "playwright": "cli.js"
@@ -39307,9 +39444,9 @@
       }
     },
     "node_modules/playwright-core": {
-      "version": "1.58.2",
-      "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.58.2.tgz",
-      "integrity": "sha512-yZkEtftgwS8CsfYo7nm0KE8jsvm6i/PTgVtB8DL726wNf6H2IMsDuxCpJj59KDaxCtSnrWan2AeDqM7JBaultg==",
+      "version": "1.59.1",
+      "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.59.1.tgz",
+      "integrity": "sha512-HBV/RJg81z5BiiZ9yPzIiClYV/QMsDCKUyogwH9p3MCP6IYjUFu/MActgYAvK0oWyV9NlwM3GLBjADyWgydVyg==",
       "dev": true,
       "license": "Apache-2.0",
       "bin": {
@@ -39997,22 +40134,25 @@
         "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
       }
     },
-    "node_modules/postcss/node_modules/source-map-js": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz",
-      "integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==",
-      "dev": true,
-      "license": "BSD-3-Clause",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/potpack": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/potpack/-/potpack-2.0.0.tgz",
-      "integrity": "sha512-Q+/tYsFU9r7xoOJ+y/ZTtdVQwTWfzjbiXBDMM/JKUux3+QPP02iUuIoeBQ+Ot6oEDlC+/PGjB/5A3K7KKb7hcw==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/potpack/-/potpack-2.1.0.tgz",
+      "integrity": "sha512-pcaShQc1Shq0y+E7GqJqvZj8DTthWV1KeHGdi0Z6IAin2Oi3JnLCOfwnCo84qc+HAp52wT9nK9H7FAJp5a44GQ==",
       "license": "ISC"
     },
+    "node_modules/powershell-utils": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/powershell-utils/-/powershell-utils-0.1.0.tgz",
+      "integrity": "sha512-dM0jVuXJPsDN6DvRpea484tCUaMiXWjuCn++HGTqUWzGDjv5tZkEZldAJ/UMlqRYGFrD/etByo4/xOuC/snX2A==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=20"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/preact": {
       "version": "10.28.3",
       "resolved": "https://registry.npmjs.org/preact/-/preact-10.28.3.tgz",
@@ -40035,9 +40175,9 @@
       }
     },
     "node_modules/prettier": {
-      "version": "3.8.1",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.8.1.tgz",
-      "integrity": "sha512-UOnG6LftzbdaHZcKoPFtOcCKztrQ57WkHDeRD9t/PTQtmT0NHSeWWepj6pS0z/N7+08BHFDQVUrfmfMRcZwbMg==",
+      "version": "3.8.3",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.8.3.tgz",
+      "integrity": "sha512-7igPTM53cGHMW8xWuVTydi2KO233VFiTNyF5hLJqpilHfmn8C8gPf+PS7dUT64YcXFbiMGZxS9pCSxL/Dxm/Jw==",
       "dev": true,
       "license": "MIT",
       "bin": {
@@ -40163,13 +40303,13 @@
       }
     },
     "node_modules/proc-log": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/proc-log/-/proc-log-4.2.0.tgz",
-      "integrity": "sha512-g8+OnU/L2v+wyiVK+D5fA34J7EH8jZ8DDlvwhRCMxmMj7UCBvxiO1mGeN+36JXIKF4zevU4kRBd8lVgG9vLelA==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/proc-log/-/proc-log-5.0.0.tgz",
+      "integrity": "sha512-Azwzvl90HaF0aCz1JrDdXQykFakSSNPaPoiZ9fm5qJIMHioDZEi7OAdRwSm6rSoPtY3Qutnm3L7ogmg3dc+wbQ==",
       "dev": true,
       "license": "ISC",
       "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+        "node": "^18.17.0 || >=20.5.0"
       }
     },
     "node_modules/process": {
@@ -40215,13 +40355,13 @@
       }
     },
     "node_modules/proggy": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/proggy/-/proggy-2.0.0.tgz",
-      "integrity": "sha512-69agxLtnI8xBs9gUGqEnK26UfiexpHy+KUpBQWabiytQjnn5wFY8rklAi7GRfABIuPNnQ/ik48+LGLkYYJcy4A==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/proggy/-/proggy-3.0.0.tgz",
+      "integrity": "sha512-QE8RApCM3IaRRxVzxrjbgNMpQEX6Wu0p0KBeoSiSEw5/bsGwZHsshF4LCxH2jp/r6BU+bqA3LrMDEYNfJnpD8Q==",
       "dev": true,
       "license": "ISC",
       "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+        "node": "^18.17.0 || >=20.5.0"
       }
     },
     "node_modules/proj4": {
@@ -40255,13 +40395,6 @@
         "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "node_modules/promise-inflight": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz",
-      "integrity": "sha512-6zWPyEOFaQBJYcGMHBKTKJ3u6TBsnMFOIZSa6ce1e/ZrrsOlnHRHbabMjLiBYKp+n44X9eUI6VUPaukCXHuG4g==",
-      "dev": true,
-      "license": "ISC"
-    },
     "node_modules/promise-retry": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/promise-retry/-/promise-retry-2.0.1.tgz",
@@ -40301,16 +40434,16 @@
       }
     },
     "node_modules/promzard": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/promzard/-/promzard-1.0.2.tgz",
-      "integrity": "sha512-2FPputGL+mP3jJ3UZg/Dl9YOkovB7DX0oOr+ck5QbZ5MtORtds8k/BZdn+02peDLI8/YWbmzx34k5fA+fHvCVQ==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/promzard/-/promzard-2.0.0.tgz",
+      "integrity": "sha512-Ncd0vyS2eXGOjchIRg6PVCYKetJYrW1BSbbIo+bKdig61TB6nH2RQNF2uP+qMpsI73L/jURLWojcw8JNIKZ3gg==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
-        "read": "^3.0.1"
+        "read": "^4.0.0"
       },
       "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+        "node": "^18.17.0 || >=20.5.0"
       }
     },
     "node_modules/prop-types": {
@@ -40347,9 +40480,9 @@
       "license": "ISC"
     },
     "node_modules/protocol-buffers-schema": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/protocol-buffers-schema/-/protocol-buffers-schema-3.6.0.tgz",
-      "integrity": "sha512-TdDRD+/QNdrCGCE7v8340QyuXd4kIWIgapsE2+n/SaGiSSbomYl4TjHlvIoCWRpE7wFt02EpB35VVA2ImcBVqw==",
+      "version": "3.6.1",
+      "resolved": "https://registry.npmjs.org/protocol-buffers-schema/-/protocol-buffers-schema-3.6.1.tgz",
+      "integrity": "sha512-VG2K63Igkiv9p76tk1lilczEK1cT+kCjKtkdhw1dQZV3k3IXJbd3o6Ho8b9zJZaHSnT2hKe4I+ObmX9w6m5SmQ==",
       "license": "MIT"
     },
     "node_modules/protocols": {
@@ -40536,9 +40669,9 @@
       }
     },
     "node_modules/quickselect": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/quickselect/-/quickselect-2.0.0.tgz",
-      "integrity": "sha512-RKJ22hX8mHe3Y6wH/N3wCM6BWtjaxIyyUIkpHOvfFnxdI4yD4tBXEBKSbriGujF6jnSVkJrffuo6vxACiSSxIw==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/quickselect/-/quickselect-3.0.0.tgz",
+      "integrity": "sha512-XdjUArbK4Bm5fLLvlm5KpTFOiOThgfWWI4axAZDWg4E/0mKdZyI9tNEfds27qCi1ze/vwTR16kvmmGhRra3c2g==",
       "license": "ISC"
     },
     "node_modules/quote-stream": {
@@ -40565,16 +40698,6 @@
         "performance-now": "^2.1.0"
       }
     },
-    "node_modules/randombytes": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
-      "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "safe-buffer": "^5.1.0"
-      }
-    },
     "node_modules/range-parser": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
@@ -40654,12 +40777,6 @@
         "quickselect": "^3.0.0"
       }
     },
-    "node_modules/rbush/node_modules/quickselect": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/quickselect/-/quickselect-3.0.0.tgz",
-      "integrity": "sha512-XdjUArbK4Bm5fLLvlm5KpTFOiOThgfWWI4axAZDWg4E/0mKdZyI9tNEfds27qCi1ze/vwTR16kvmmGhRra3c2g==",
-      "license": "ISC"
-    },
     "node_modules/rc": {
       "version": "1.2.8",
       "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz",
@@ -41363,9 +41480,9 @@
       }
     },
     "node_modules/react-arborist": {
-      "version": "3.4.3",
-      "resolved": "https://registry.npmjs.org/react-arborist/-/react-arborist-3.4.3.tgz",
-      "integrity": "sha512-yFnq1nIQhT2uJY4TZVz2tgAiBb9lxSyvF4vC3S8POCK8xLzjGIxVv3/4dmYquQJ7AHxaZZArRGHiHKsEewKdTQ==",
+      "version": "3.5.0",
+      "resolved": "https://registry.npmjs.org/react-arborist/-/react-arborist-3.5.0.tgz",
+      "integrity": "sha512-FdXOICSt7P2h+Pxin1ULN02b4qrXJznNcshgwwWVtuYMLWSJcD245PQ4HOSj/Lr2T1uEegmnEm5Lbns2hUUsqg==",
       "license": "MIT",
       "dependencies": {
         "react-dnd": "^14.0.3",
@@ -41470,36 +41587,18 @@
       }
     },
     "node_modules/react-checkbox-tree": {
-      "version": "1.8.0",
-      "resolved": "https://registry.npmjs.org/react-checkbox-tree/-/react-checkbox-tree-1.8.0.tgz",
-      "integrity": "sha512-ufC4aorihOvjLpvY1beab2hjVLGZbDTFRzw62foG0+th+KX7e/sdmWu/nD1ZS/U5Yr0rWGwedGH5GOtR0IkUXw==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/react-checkbox-tree/-/react-checkbox-tree-2.0.1.tgz",
+      "integrity": "sha512-ZUh9strXP3a+RpXEGPSq5qWC0HSo3pjjGQEwNWYdmo1OfSNq0L61boy4ANIN2O+ybo/n80hadQYNAeMgwdQqRQ==",
       "license": "MIT",
       "dependencies": {
         "classnames": "^2.2.5",
-        "lodash": "^4.17.10",
-        "nanoid": "^3.0.0",
+        "fast-equals": "^6.0.0",
+        "lodash.memoize": "^4.1.2",
         "prop-types": "^15.5.8"
       },
       "peerDependencies": {
-        "react": "^15.3.0 || ^16.0.0 || ^17.0.0 || ^18.0.0"
-      }
-    },
-    "node_modules/react-checkbox-tree/node_modules/nanoid": {
-      "version": "3.3.8",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.8.tgz",
-      "integrity": "sha512-WNLf5Sd8oZxOm+TzppcYk8gVOgP+l58xNy58D0nbUnOxOWRWvlcCV4kUF7ltmI6PsrLl/BgKEyS4mqsGChFN0w==",
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/ai"
-        }
-      ],
-      "license": "MIT",
-      "bin": {
-        "nanoid": "bin/nanoid.cjs"
-      },
-      "engines": {
-        "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
+        "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0"
       }
     },
     "node_modules/react-diff-viewer-continued": {
@@ -41654,15 +41753,6 @@
         "react": ">=16.4.1"
       }
     },
-    "node_modules/react-icons": {
-      "version": "5.4.0",
-      "resolved": "https://registry.npmjs.org/react-icons/-/react-icons-5.4.0.tgz",
-      "integrity": "sha512-7eltJxgVt7X64oHh6wSWNwwbKTCtMfK35hcjvJS0yxEAhPM8oUKdS3+kqaW1vicIltw+kR2unHaa12S9pPALoQ==",
-      "license": "MIT",
-      "peerDependencies": {
-        "react": "*"
-      }
-    },
     "node_modules/react-intersection-observer": {
       "version": "10.0.3",
       "resolved": "https://registry.npmjs.org/react-intersection-observer/-/react-intersection-observer-10.0.3.tgz",
@@ -41721,96 +41811,95 @@
       }
     },
     "node_modules/react-map-gl": {
-      "version": "6.1.21",
-      "resolved": "https://registry.npmjs.org/react-map-gl/-/react-map-gl-6.1.21.tgz",
-      "integrity": "sha512-7ENXxAeYaI4dhol5bir3iK6TeR9teA3MF0WH6VIhmkMRdYY3lgA4t1GzDh2BwpSO340Ngw+5mC0nTsc6gd1O4w==",
+      "version": "8.1.1",
+      "resolved": "https://registry.npmjs.org/react-map-gl/-/react-map-gl-8.1.1.tgz",
+      "integrity": "sha512-aSqFAFoxvY7wxbGI93Dz0E41171mkAb3GcNbnkFIotmu88OFw495os6mIDZSi7irYNT/PZEIOEHUxhun4ToGuQ==",
       "license": "MIT",
       "dependencies": {
-        "@babel/runtime": "^7.0.0",
-        "@types/geojson": "^7946.0.7",
-        "@types/mapbox-gl": "^2.0.3",
-        "mapbox-gl": "^2.3.0",
-        "mjolnir.js": "^2.5.0",
-        "prop-types": "^15.7.2",
-        "resize-observer-polyfill": "^1.5.1",
-        "viewport-mercator-project": "^7.0.4"
-      },
-      "engines": {
-        "node": ">= 4",
-        "npm": ">= 3"
+        "@vis.gl/react-mapbox": "8.1.1",
+        "@vis.gl/react-maplibre": "8.1.1"
       },
       "peerDependencies": {
-        "react": ">=16.3.0"
+        "mapbox-gl": ">=1.13.0",
+        "maplibre-gl": ">=1.13.0",
+        "react": ">=16.3.0",
+        "react-dom": ">=16.3.0"
+      },
+      "peerDependenciesMeta": {
+        "mapbox-gl": {
+          "optional": true
+        },
+        "maplibre-gl": {
+          "optional": true
+        }
       }
     },
-    "node_modules/react-map-gl/node_modules/@mapbox/mapbox-gl-supported": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/@mapbox/mapbox-gl-supported/-/mapbox-gl-supported-2.0.1.tgz",
-      "integrity": "sha512-HP6XvfNIzfoMVfyGjBckjiAOQK9WfX0ywdLubuPMPv+Vqf5fj0uCbgBQYpiqcWZT6cbyyRnTSXDheT1ugvF6UQ==",
-      "license": "BSD-3-Clause"
-    },
-    "node_modules/react-map-gl/node_modules/geojson-vt": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/geojson-vt/-/geojson-vt-3.2.1.tgz",
-      "integrity": "sha512-EvGQQi/zPrDA6zr6BnJD/YhwAkBP8nnJ9emh3EnHQKVMfg/MRVtPbMYdgVy/IaEmn4UfagD2a6fafPDL5hbtwg==",
-      "license": "ISC"
-    },
-    "node_modules/react-map-gl/node_modules/mapbox-gl": {
-      "version": "2.15.0",
-      "resolved": "https://registry.npmjs.org/mapbox-gl/-/mapbox-gl-2.15.0.tgz",
-      "integrity": "sha512-fjv+aYrd5TIHiL7wRa+W7KjtUqKWziJMZUkK5hm8TvJ3OLeNPx4NmW/DgfYhd/jHej8wWL+QJBDbdMMAKvNC0A==",
-      "license": "SEE LICENSE IN LICENSE.txt",
+    "node_modules/react-map-gl/node_modules/@maplibre/maplibre-gl-style-spec": {
+      "version": "19.3.3",
+      "resolved": "https://registry.npmjs.org/@maplibre/maplibre-gl-style-spec/-/maplibre-gl-style-spec-19.3.3.tgz",
+      "integrity": "sha512-cOZZOVhDSulgK0meTsTkmNXb1ahVvmTmWmfx9gRBwc6hq98wS9JP35ESIoNq3xqEan+UN+gn8187Z6E4NKhLsw==",
+      "license": "ISC",
       "dependencies": {
-        "@mapbox/geojson-rewind": "^0.5.2",
-        "@mapbox/jsonlint-lines-primitives": "^2.0.2",
-        "@mapbox/mapbox-gl-supported": "^2.0.1",
-        "@mapbox/point-geometry": "^0.1.0",
-        "@mapbox/tiny-sdf": "^2.0.6",
+        "@mapbox/jsonlint-lines-primitives": "~2.0.2",
         "@mapbox/unitbezier": "^0.0.1",
-        "@mapbox/vector-tile": "^1.3.1",
-        "@mapbox/whoots-js": "^3.1.0",
-        "csscolorparser": "~1.0.3",
-        "earcut": "^2.2.4",
-        "geojson-vt": "^3.2.1",
-        "gl-matrix": "^3.4.3",
-        "grid-index": "^1.1.0",
-        "kdbush": "^4.0.1",
-        "murmurhash-js": "^1.0.0",
-        "pbf": "^3.2.1",
-        "potpack": "^2.0.0",
-        "quickselect": "^2.0.0",
+        "json-stringify-pretty-compact": "^3.0.0",
+        "minimist": "^1.2.8",
         "rw": "^1.3.3",
-        "supercluster": "^8.0.0",
-        "tinyqueue": "^2.0.3",
-        "vt-pbf": "^3.1.3"
+        "sort-object": "^3.0.3"
+      },
+      "bin": {
+        "gl-style-format": "dist/gl-style-format.mjs",
+        "gl-style-migrate": "dist/gl-style-migrate.mjs",
+        "gl-style-validate": "dist/gl-style-validate.mjs"
       }
     },
-    "node_modules/react-map-gl/node_modules/mjolnir.js": {
-      "version": "2.7.3",
-      "resolved": "https://registry.npmjs.org/mjolnir.js/-/mjolnir.js-2.7.3.tgz",
-      "integrity": "sha512-Z5z/+FzZqOSO3juSVKV3zcm4R2eAlWwlKMcqHmyFEJAaLILNcDKnIbnb4/kbcGyIuhtdWrzu8WOIR7uM6I34aw==",
+    "node_modules/react-map-gl/node_modules/@vis.gl/react-mapbox": {
+      "version": "8.1.1",
+      "resolved": "https://registry.npmjs.org/@vis.gl/react-mapbox/-/react-mapbox-8.1.1.tgz",
+      "integrity": "sha512-KMDTjtWESXxHS4uqWxjsvgQUHvuL3Z6SdKe68o7Nxma2qUfuyH3x4TCkIqGn3FQTrFvZLWvTnSAbGvtm+Kd13A==",
+      "license": "MIT",
+      "peerDependencies": {
+        "mapbox-gl": ">=3.5.0",
+        "react": ">=16.3.0",
+        "react-dom": ">=16.3.0"
+      },
+      "peerDependenciesMeta": {
+        "mapbox-gl": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/react-map-gl/node_modules/@vis.gl/react-maplibre": {
+      "version": "8.1.1",
+      "resolved": "https://registry.npmjs.org/@vis.gl/react-maplibre/-/react-maplibre-8.1.1.tgz",
+      "integrity": "sha512-iUOfzJAhFAJwEZp1644tQb7LOTFgi5/GzdaztkhzNgFVuoF2Ez7guvwZjQAKB9CN2TlHTgNuYH8UW85kO7cVhw==",
       "license": "MIT",
       "dependencies": {
-        "@types/hammerjs": "^2.0.41",
-        "hammerjs": "^2.0.8"
+        "@maplibre/maplibre-gl-style-spec": "^19.2.1"
       },
-      "engines": {
-        "node": ">= 4",
-        "npm": ">= 3"
+      "peerDependencies": {
+        "maplibre-gl": ">=4.0.0",
+        "react": ">=16.3.0",
+        "react-dom": ">=16.3.0"
+      },
+      "peerDependenciesMeta": {
+        "maplibre-gl": {
+          "optional": true
+        }
       }
     },
+    "node_modules/react-map-gl/node_modules/json-stringify-pretty-compact": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/json-stringify-pretty-compact/-/json-stringify-pretty-compact-3.0.0.tgz",
+      "integrity": "sha512-Rc2suX5meI0S3bfdZuA7JMFBGkJ875ApfVyq2WHELjBiiG22My/l7/8zPpH/CfFVQHuVLd8NLR0nv6vi0BYYKA==",
+      "license": "MIT"
+    },
     "node_modules/react-map-gl/node_modules/rw": {
       "version": "1.3.3",
       "resolved": "https://registry.npmjs.org/rw/-/rw-1.3.3.tgz",
       "integrity": "sha512-PdhdWy89SiZogBLaw42zdeqtRJ//zFd2PgQavcICDUgJT5oW10QCRKbJ6bg4r0/UY2M6BWd5tkxuGFRvCkgfHQ==",
       "license": "BSD-3-Clause"
     },
-    "node_modules/react-map-gl/node_modules/tinyqueue": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/tinyqueue/-/tinyqueue-2.0.3.tgz",
-      "integrity": "sha512-ppJZNDuKGgxzkHihX8v9v9G5f+18gzaTfrukGrq6ueg0lmH4nqVnA2IPG0AEH3jKEk2GRJCUhDoqpoiw3PHLBA==",
-      "license": "ISC"
-    },
     "node_modules/react-markdown": {
       "version": "8.0.7",
       "resolved": "https://registry.npmjs.org/react-markdown/-/react-markdown-8.0.7.tgz",
@@ -42148,16 +42237,16 @@
       }
     },
     "node_modules/read": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/read/-/read-3.0.1.tgz",
-      "integrity": "sha512-SLBrDU/Srs/9EoWhU5GdbAoxG1GzpQHo/6qiGItaoLJ1thmYpcNIM1qISEUvyHBzfGlWIyd6p2DNi1oV1VmAuw==",
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/read/-/read-4.1.0.tgz",
+      "integrity": "sha512-uRfX6K+f+R8OOrYScaM3ixPY4erg69f8DN6pgTvMcA9iRc8iDhwrA4m3Yu8YYKsXJgVvum+m8PkRboZwwuLzYA==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
-        "mute-stream": "^1.0.0"
+        "mute-stream": "^2.0.0"
       },
       "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+        "node": "^18.17.0 || >=20.5.0"
       }
     },
     "node_modules/read-cmd-shim": {
@@ -42170,85 +42259,6 @@
         "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
       }
     },
-    "node_modules/read-package-json-fast": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/read-package-json-fast/-/read-package-json-fast-3.0.2.tgz",
-      "integrity": "sha512-0J+Msgym3vrLOUB3hzQCuZHII0xkNGCtz/HJH9xZshwv9DbDwkw1KaE3gx/e2J5rpEY5rtOy6cyhKOPrkP7FZw==",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "json-parse-even-better-errors": "^3.0.0",
-        "npm-normalize-package-bin": "^3.0.0"
-      },
-      "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
-      }
-    },
-    "node_modules/read-package-up": {
-      "version": "11.0.0",
-      "resolved": "https://registry.npmjs.org/read-package-up/-/read-package-up-11.0.0.tgz",
-      "integrity": "sha512-MbgfoNPANMdb4oRBNg5eqLbB2t2r+o5Ua1pNt8BqGp4I0FJZhuVSOj3PaBPni4azWuSzEdNn2evevzVmEk1ohQ==",
-      "license": "MIT",
-      "dependencies": {
-        "find-up-simple": "^1.0.0",
-        "read-pkg": "^9.0.0",
-        "type-fest": "^4.6.0"
-      },
-      "engines": {
-        "node": ">=18"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/read-package-up/node_modules/parse-json": {
-      "version": "8.1.0",
-      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-8.1.0.tgz",
-      "integrity": "sha512-rum1bPifK5SSar35Z6EKZuYPJx85pkNaFrxBK3mwdfSJ1/WKbYrjoW/zTPSjRRamfmVX1ACBIdFAO0VRErW/EA==",
-      "license": "MIT",
-      "dependencies": {
-        "@babel/code-frame": "^7.22.13",
-        "index-to-position": "^0.1.2",
-        "type-fest": "^4.7.1"
-      },
-      "engines": {
-        "node": ">=18"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/read-package-up/node_modules/read-pkg": {
-      "version": "9.0.1",
-      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-9.0.1.tgz",
-      "integrity": "sha512-9viLL4/n1BJUCT1NXVTdS1jtm80yDEgR5T4yCelII49Mbj0v1rZdKqj7zCiYdbB0CuCgdrvHcNogAKTFPBocFA==",
-      "license": "MIT",
-      "dependencies": {
-        "@types/normalize-package-data": "^2.4.3",
-        "normalize-package-data": "^6.0.0",
-        "parse-json": "^8.0.0",
-        "type-fest": "^4.6.0",
-        "unicorn-magic": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=18"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/read-package-up/node_modules/type-fest": {
-      "version": "4.33.0",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.33.0.tgz",
-      "integrity": "sha512-s6zVrxuyKbbAsSAD5ZPTB77q4YIdRctkTbJ2/Dqlinwz+8ooH2gd+YA7VA6Pa93KML9GockVvoxjZ2vHP+mu8g==",
-      "license": "(MIT OR CC0-1.0)",
-      "engines": {
-        "node": ">=16"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/read-pkg": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-3.0.0.tgz",
@@ -42444,6 +42454,16 @@
         "node": ">=4"
       }
     },
+    "node_modules/read/node_modules/mute-stream": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-2.0.0.tgz",
+      "integrity": "sha512-WWdIxpyjEn+FhQJQQv9aQAYlHoNVdzIzUySNV1gHUPDSdZJ3yZn7pAAbQcV7B56Mvu881q9FZV+0Vx2xC44VWA==",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": "^18.17.0 || >=20.5.0"
+      }
+    },
     "node_modules/readable-stream": {
       "version": "3.6.2",
       "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
@@ -42458,23 +42478,6 @@
         "node": ">= 6"
       }
     },
-    "node_modules/readable-web-to-node-stream": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/readable-web-to-node-stream/-/readable-web-to-node-stream-3.0.2.tgz",
-      "integrity": "sha512-ePeK6cc1EcKLEhJFt/AebMCLL+GgSKhuygrZ/GLaKZYEecIgIECf4UaUuaByiGtzckwR4ain9VzUh95T1exYGw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "readable-stream": "^3.6.0"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/Borewit"
-      }
-    },
     "node_modules/readdirp": {
       "version": "3.6.0",
       "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
@@ -43675,19 +43678,6 @@
         "url": "https://github.com/fb55/entities?sponsor=1"
       }
     },
-    "node_modules/renderkid/node_modules/strip-ansi": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ansi-regex": "^5.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/replace-ext": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-2.0.0.tgz",
@@ -43912,81 +43902,6 @@
         "node": ">= 0.8.15"
       }
     },
-    "node_modules/rimraf": {
-      "version": "4.4.1",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-4.4.1.tgz",
-      "integrity": "sha512-Gk8NlF062+T9CqNGn6h4tls3k6T1+/nXdOcSZVikNVtlRdYpA7wRJJMoXmuvOnLW844rPjdQ7JgXCYM6PPC/og==",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "glob": "^9.2.0"
-      },
-      "bin": {
-        "rimraf": "dist/cjs/src/bin.js"
-      },
-      "engines": {
-        "node": ">=14"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/rimraf/node_modules/brace-expansion": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
-      "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "balanced-match": "^1.0.0"
-      }
-    },
-    "node_modules/rimraf/node_modules/glob": {
-      "version": "9.3.5",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-9.3.5.tgz",
-      "integrity": "sha512-e1LleDykUz2Iu+MTYdkSsuWX8lvAjAcs0Xef0lNIu0S2wOAzuTxCJtcd9S3cijlwYF18EsU3rzb8jPVobxDh9Q==",
-      "deprecated": "Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "fs.realpath": "^1.0.0",
-        "minimatch": "^8.0.2",
-        "minipass": "^4.2.4",
-        "path-scurry": "^1.6.1"
-      },
-      "engines": {
-        "node": ">=16 || 14 >=14.17"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/rimraf/node_modules/minimatch": {
-      "version": "8.0.6",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-8.0.6.tgz",
-      "integrity": "sha512-JVNTX5Qc03lB0PuFDuUcVTbi8u5kKchLXDYEnLJrOosZW8cqamFiyItG/7cn0QEt7XmeFHSLJRYg4KujJKuqlw==",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "brace-expansion": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=16 || 14 >=14.17"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/rimraf/node_modules/minipass": {
-      "version": "4.2.8",
-      "resolved": "https://registry.npmjs.org/minipass/-/minipass-4.2.8.tgz",
-      "integrity": "sha512-fNzuVyifolSLFL4NzpF+wEF4qrgqaaKX0haXPQEdQ7NKAN+WecoKMHV09YcuL/DHxrUsYQOK3MiuDf7Ip2OXfQ==",
-      "dev": true,
-      "license": "ISC",
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/rison": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/rison/-/rison-0.1.1.tgz",
@@ -44318,13 +44233,13 @@
       }
     },
     "node_modules/serialize-javascript": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.2.tgz",
-      "integrity": "sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==",
+      "version": "7.0.5",
+      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-7.0.5.tgz",
+      "integrity": "sha512-F4LcB0UqUl1zErq+1nYEEzSHJnIwb3AF2XWB94b+afhrekOUijwooAYqFyRbjYkm2PAKBabx6oYv/xDxNi8IBw==",
       "dev": true,
       "license": "BSD-3-Clause",
-      "dependencies": {
-        "randombytes": "^2.1.0"
+      "engines": {
+        "node": ">=20.0.0"
       }
     },
     "node_modules/serialize-query-params": {
@@ -44488,6 +44403,21 @@
         "node": ">= 0.4"
       }
     },
+    "node_modules/set-value": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz",
+      "integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==",
+      "license": "MIT",
+      "dependencies": {
+        "extend-shallow": "^2.0.1",
+        "is-extendable": "^0.1.1",
+        "is-plain-object": "^2.0.3",
+        "split-string": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/setimmediate": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz",
@@ -44664,21 +44594,21 @@
       "license": "ISC"
     },
     "node_modules/sigstore": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/sigstore/-/sigstore-2.3.1.tgz",
-      "integrity": "sha512-8G+/XDU8wNsJOQS5ysDVO0Etg9/2uA5gR9l4ZwijjlwxBcrU6RPfwi2+jJmbP+Ap1Hlp/nVAaEO4Fj22/SL2gQ==",
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/sigstore/-/sigstore-4.1.0.tgz",
+      "integrity": "sha512-/fUgUhYghuLzVT/gaJoeVehLCgZiUxPCPMcyVNY0lIf/cTCz58K/WTI7PefDarXxp9nUKpEwg1yyz3eSBMTtgA==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
-        "@sigstore/bundle": "^2.3.2",
-        "@sigstore/core": "^1.0.0",
-        "@sigstore/protobuf-specs": "^0.3.2",
-        "@sigstore/sign": "^2.3.2",
-        "@sigstore/tuf": "^2.3.4",
-        "@sigstore/verify": "^1.2.1"
+        "@sigstore/bundle": "^4.0.0",
+        "@sigstore/core": "^3.1.0",
+        "@sigstore/protobuf-specs": "^0.5.0",
+        "@sigstore/sign": "^4.1.0",
+        "@sigstore/tuf": "^4.0.1",
+        "@sigstore/verify": "^3.1.0"
       },
       "engines": {
-        "node": "^16.14.0 || >=18.0.0"
+        "node": "^20.17.0 || >=22.9.0"
       }
     },
     "node_modules/simple-git": {
@@ -44831,13 +44761,13 @@
       }
     },
     "node_modules/socks": {
-      "version": "2.8.3",
-      "resolved": "https://registry.npmjs.org/socks/-/socks-2.8.3.tgz",
-      "integrity": "sha512-l5x7VUUWbjVFbafGLxPWkYsHIhEvmF85tbIeFZWc8ZPtoMyybuEhL7Jye/ooC4/d48FgOjSJXgsF/AJPYCW8Zw==",
+      "version": "2.8.7",
+      "resolved": "https://registry.npmjs.org/socks/-/socks-2.8.7.tgz",
+      "integrity": "sha512-HLpt+uLy/pxB+bum/9DzAgiKS8CX1EvbWxI4zlmgGCExImLdiad2iCwXT5Z4c9c3Eq8rP2318mPW2c+QbtjK8A==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "ip-address": "^9.0.5",
+        "ip-address": "^10.0.1",
         "smart-buffer": "^4.2.0"
       },
       "engines": {
@@ -44861,26 +44791,75 @@
       }
     },
     "node_modules/socks-proxy-agent/node_modules/agent-base": {
-      "version": "7.1.3",
-      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.3.tgz",
-      "integrity": "sha512-jRR5wdylq8CkOe6hei19GGZnxM6rBGwFl3Bg0YItGDimvjGtAvdZk4Pu6Cl4u4Igsws4a1fd1Vq3ezrhn4KmFw==",
+      "version": "7.1.4",
+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.4.tgz",
+      "integrity": "sha512-MnA+YT8fwfJPgBx3m60MNqakm30XOkyIoH1y6huTQvC0PwZG7ki8NacLBcrPbNoo8vEZy7Jpuk7+jMO+CUovTQ==",
       "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">= 14"
       }
     },
+    "node_modules/sort-asc": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/sort-asc/-/sort-asc-0.2.0.tgz",
+      "integrity": "sha512-umMGhjPeHAI6YjABoSTrFp2zaBtXBej1a0yKkuMUyjjqu6FJsTF+JYwCswWDg+zJfk/5npWUUbd33HH/WLzpaA==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/sort-desc": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/sort-desc/-/sort-desc-0.2.0.tgz",
+      "integrity": "sha512-NqZqyvL4VPW+RAxxXnB8gvE1kyikh8+pR+T+CXLksVRN9eiQqkQlPwqWYU0mF9Jm7UnctShlxLyAt1CaBOTL1w==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/sort-keys": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/sort-keys/-/sort-keys-2.0.0.tgz",
-      "integrity": "sha512-/dPCrG1s3ePpWm6yBbxZq5Be1dXGLyLn9Z791chDC3NFrpkVbWGzkBwPN1knaciexFXgRJ7hzdnwZ4stHSDmjg==",
-      "dev": true,
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/sort-keys/-/sort-keys-6.0.0.tgz",
+      "integrity": "sha512-ueSlHJMwpIw42CJ4B11Uxzh/S0p0AlOyiNktlv2KOu5e1JpUE6DlC4AAUjXqesHdBRv/g0wC9Q4vwq0NP2pA9w==",
       "license": "MIT",
       "dependencies": {
-        "is-plain-obj": "^1.0.0"
+        "is-plain-obj": "^4.1.0"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">=20"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/sort-keys/node_modules/is-plain-obj": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-4.1.0.tgz",
+      "integrity": "sha512-+Pgi+vMuUNkJyExiMBt5IlFoMyKnr5zhJ4Uspz58WOhBF5QoIZkFyNHIbBAtHwzVAgk5RtndVNsDRN61/mmDqg==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/sort-object": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/sort-object/-/sort-object-3.0.3.tgz",
+      "integrity": "sha512-nK7WOY8jik6zaG9CRwZTaD5O7ETWDLZYMM12pqY8htll+7dYeqGfEUPcUBHOpSJg2vJOrvFIY2Dl5cX2ih1hAQ==",
+      "license": "MIT",
+      "dependencies": {
+        "bytewise": "^1.1.0",
+        "get-value": "^2.0.2",
+        "is-extendable": "^0.1.1",
+        "sort-asc": "^0.2.0",
+        "sort-desc": "^0.2.0",
+        "union-value": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
     "node_modules/sort-object-keys": {
@@ -44955,9 +44934,9 @@
       }
     },
     "node_modules/source-map-js": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.1.tgz",
-      "integrity": "sha512-4+TN2b3tqOCd/kaGRJ/sTYA0tR0mdXx26ipdolxcwtJVqEnqNYvlCAt1q3ypy4QMlYus+Zh34RNtYLoq2oQ4IA==",
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz",
+      "integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==",
       "dev": true,
       "license": "BSD-3-Clause",
       "engines": {
@@ -45158,9 +45137,9 @@
       }
     },
     "node_modules/speed-measure-webpack-plugin": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/speed-measure-webpack-plugin/-/speed-measure-webpack-plugin-1.5.0.tgz",
-      "integrity": "sha512-Re0wX5CtM6gW7bZA64ONOfEPEhwbiSF/vz6e2GvadjuaPrQcHTQdRGsD8+BE7iUOysXH8tIenkPCQBEcspXsNg==",
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/speed-measure-webpack-plugin/-/speed-measure-webpack-plugin-1.6.0.tgz",
+      "integrity": "sha512-hz09hUQeP74zHZOLtSJwpVsuLy8EWxuyGiMVZ2tuvIQcMlL5mGrmbe8RKvrVV5geRkxms9JusQuIBt0UnB0XFw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -45221,6 +45200,43 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/split-string": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz",
+      "integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==",
+      "license": "MIT",
+      "dependencies": {
+        "extend-shallow": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/split-string/node_modules/extend-shallow": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
+      "integrity": "sha512-BwY5b5Ql4+qZoefgMj2NUmx+tehVTH/Kf4k1ZEtOHNFcm2wSxMRo992l6X3TIgni2eZVTZ85xMOjF31fwZAj6Q==",
+      "license": "MIT",
+      "dependencies": {
+        "assign-symbols": "^1.0.0",
+        "is-extendable": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/split-string/node_modules/is-extendable": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
+      "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+      "license": "MIT",
+      "dependencies": {
+        "is-plain-object": "^2.0.4"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/split.js": {
       "version": "1.6.5",
       "resolved": "https://registry.npmjs.org/split.js/-/split.js-1.6.5.tgz",
@@ -45279,16 +45295,16 @@
       "peer": true
     },
     "node_modules/ssri": {
-      "version": "10.0.6",
-      "resolved": "https://registry.npmjs.org/ssri/-/ssri-10.0.6.tgz",
-      "integrity": "sha512-MGrFH9Z4NP9Iyhqn16sDtBpRRNJ0Y2hNa6D65h736fVSaPCHr4DM4sWUNvVaSuC+0OBGhwsrydQwmgfg5LncqQ==",
+      "version": "12.0.0",
+      "resolved": "https://registry.npmjs.org/ssri/-/ssri-12.0.0.tgz",
+      "integrity": "sha512-S7iGNosepx9RadX82oimUkvr0Ct7IjJbEbs4mJcTxst8um95J3sDYU1RBEOvdu6oL1Wek2ODI5i4MAw+dZ6cAQ==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
         "minipass": "^7.0.3"
       },
       "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+        "node": "^18.17.0 || >=20.5.0"
       }
     },
     "node_modules/stable-hash-x": {
@@ -45591,13 +45607,13 @@
       }
     },
     "node_modules/storybook": {
-      "version": "8.6.17",
-      "resolved": "https://registry.npmjs.org/storybook/-/storybook-8.6.17.tgz",
-      "integrity": "sha512-krR/l680A6qVnkGiK9p8jY0ucX3+kFCs2f4zw+S3w2Cdq8EiM/tFebPcX2V4S3z2UsO0v0dwAJOJNpzbFPdmVg==",
+      "version": "8.6.18",
+      "resolved": "https://registry.npmjs.org/storybook/-/storybook-8.6.18.tgz",
+      "integrity": "sha512-p8seiSI6FiVY6P3V0pG+5v7c8pDMehMAFRWEhG5XqIBSQszzOjDnW2rNvm3odoLKfo3V3P6Cs6Hv9ILzymULyQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@storybook/core": "8.6.17"
+        "@storybook/core": "8.6.18"
       },
       "bin": {
         "getstorybook": "bin/index.cjs",
@@ -45695,6 +45711,7 @@
       "version": "4.2.3",
       "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
       "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "emoji-regex": "^8.0.0",
@@ -45709,38 +45726,15 @@
       "version": "8.0.0",
       "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
       "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+      "dev": true,
       "license": "MIT"
     },
-    "node_modules/string-width-cjs/node_modules/strip-ansi": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-      "license": "MIT",
-      "dependencies": {
-        "ansi-regex": "^5.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/string-width/node_modules/emoji-regex": {
       "version": "8.0.0",
       "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
       "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
       "license": "MIT"
     },
-    "node_modules/string-width/node_modules/strip-ansi": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-      "license": "MIT",
-      "dependencies": {
-        "ansi-regex": "^5.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/string.prototype.trim": {
       "version": "1.2.10",
       "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.10.tgz",
@@ -45798,12 +45792,12 @@
       }
     },
     "node_modules/strip-ansi": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
-      "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
       "license": "MIT",
       "dependencies": {
-        "ansi-regex": "^5.0.0"
+        "ansi-regex": "^5.0.1"
       },
       "engines": {
         "node": ">=8"
@@ -45814,6 +45808,7 @@
       "version": "6.0.1",
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
       "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "ansi-regex": "^5.0.1"
@@ -45924,17 +45919,16 @@
       "license": "MIT"
     },
     "node_modules/strtok3": {
-      "version": "7.1.1",
-      "resolved": "https://registry.npmjs.org/strtok3/-/strtok3-7.1.1.tgz",
-      "integrity": "sha512-mKX8HA/cdBqMKUr0MMZAFssCkIGoZeSCMXgnt79yKxNFguMLVFgRe6wB+fsL0NmoHDbeyZXczy7vEPSoo3rkzg==",
+      "version": "10.3.5",
+      "resolved": "https://registry.npmjs.org/strtok3/-/strtok3-10.3.5.tgz",
+      "integrity": "sha512-ki4hZQfh5rX0QDLLkOCj+h+CVNkqmp/CMf8v8kZpkNVK6jGQooMytqzLZYUVYIZcFZ6yDB70EfD8POcFXiF5oA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@tokenizer/token": "^0.3.0",
-        "peek-readable": "^5.1.3"
+        "@tokenizer/token": "^0.3.0"
       },
       "engines": {
-        "node": ">=16"
+        "node": ">=18"
       },
       "funding": {
         "type": "github",
@@ -46127,7 +46121,6 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/tagged-tag/-/tagged-tag-1.0.0.tgz",
       "integrity": "sha512-yEFYrVhod+hdNyx7g5Bnkkb0G6si8HJurOoOEgC8B/O0uXLHlaey/65KRv6cuWBNhBgHKAROVpc7QyYqE5gFng==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=20"
@@ -46151,21 +46144,20 @@
       }
     },
     "node_modules/tar": {
-      "version": "6.2.1",
-      "resolved": "https://registry.npmjs.org/tar/-/tar-6.2.1.tgz",
-      "integrity": "sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A==",
+      "version": "7.5.11",
+      "resolved": "https://registry.npmjs.org/tar/-/tar-7.5.11.tgz",
+      "integrity": "sha512-ChjMH33/KetonMTAtpYdgUFr0tbz69Fp2v7zWxQfYZX4g5ZN2nOBXm1R2xyA+lMIKrLKIoKAwFj93jE/avX9cQ==",
       "dev": true,
-      "license": "ISC",
+      "license": "BlueOak-1.0.0",
       "dependencies": {
-        "chownr": "^2.0.0",
-        "fs-minipass": "^2.0.0",
-        "minipass": "^5.0.0",
-        "minizlib": "^2.1.1",
-        "mkdirp": "^1.0.3",
-        "yallist": "^4.0.0"
+        "@isaacs/fs-minipass": "^4.0.0",
+        "chownr": "^3.0.0",
+        "minipass": "^7.1.2",
+        "minizlib": "^3.1.0",
+        "yallist": "^5.0.0"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">=18"
       }
     },
     "node_modules/tar-stream": {
@@ -46185,48 +46177,15 @@
         "node": ">=6"
       }
     },
-    "node_modules/tar/node_modules/fs-minipass": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz",
-      "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "minipass": "^3.0.0"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/tar/node_modules/fs-minipass/node_modules/minipass": {
-      "version": "3.3.6",
-      "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
-      "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/tar/node_modules/minipass": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz",
-      "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==",
-      "dev": true,
-      "license": "ISC",
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/tar/node_modules/yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-5.0.0.tgz",
+      "integrity": "sha512-YgvUTfwqyc7UXVMrB+SImsVYSmTS8X/tSrtdNZMImM+n7+QTriRXyXim0mBrTXNeqzVF0KWGgHPeiyViFFrNDw==",
       "dev": true,
-      "license": "ISC"
+      "license": "BlueOak-1.0.0",
+      "engines": {
+        "node": ">=18"
+      }
     },
     "node_modules/teex": {
       "version": "1.0.1",
@@ -46238,19 +46197,19 @@
       }
     },
     "node_modules/temp-dir": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/temp-dir/-/temp-dir-1.0.0.tgz",
-      "integrity": "sha512-xZFXEGbG7SNC3itwBzI3RYjq/cEhBkx2hJuKGIUOcEULmkQExXiHat2z/qkISYsuR+IKumhEfKKbV5qXmhICFQ==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/temp-dir/-/temp-dir-3.0.0.tgz",
+      "integrity": "sha512-nHc6S/bwIilKHNRgK/3jlhDoIHcp45YgyiwcAk46Tr0LfEqGBVpmiAyuiuxeVE44m3mXnEeVhaipLOEWmH+Njw==",
       "dev": true,
       "license": "MIT",
       "engines": {
-        "node": ">=4"
+        "node": ">=14.16"
       }
     },
     "node_modules/tempy": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/tempy/-/tempy-3.1.0.tgz",
-      "integrity": "sha512-7jDLIdD2Zp0bDe5r3D2qtkd1QOCacylBuL7oa4udvN6v2pqr4+LcCr67C8DR1zkpaZ8XosF5m1yQSabKAW6f2g==",
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/tempy/-/tempy-3.2.0.tgz",
+      "integrity": "sha512-d79HhZya5Djd7am0q+W4RTsSU+D/aJzM+4Y4AGJGuGlgM2L6sx5ZvOYTmZjqPhrDrV6xJTtRSm1JCLj6V6LHLQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -46279,16 +46238,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/tempy/node_modules/temp-dir": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/temp-dir/-/temp-dir-3.0.0.tgz",
-      "integrity": "sha512-nHc6S/bwIilKHNRgK/3jlhDoIHcp45YgyiwcAk46Tr0LfEqGBVpmiAyuiuxeVE44m3mXnEeVhaipLOEWmH+Njw==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=14.16"
-      }
-    },
     "node_modules/terser": {
       "version": "5.37.0",
       "resolved": "https://registry.npmjs.org/terser/-/terser-5.37.0.tgz",
@@ -46309,9 +46258,9 @@
       }
     },
     "node_modules/terser-webpack-plugin": {
-      "version": "5.3.17",
-      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.17.tgz",
-      "integrity": "sha512-YR7PtUp6GMU91BgSJmlaX/rS2lGDbAF7D+Wtq7hRO+MiljNmodYvqslzCFiYVAgW+Qoaaia/QUIP4lGXufjdZw==",
+      "version": "5.4.0",
+      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.4.0.tgz",
+      "integrity": "sha512-Bn5vxm48flOIfkdl5CaD2+1CiUVbonWQ3KQPyP7/EuIl9Gbzq/gQFOzaMFUEgVjB1396tcK0SG8XcNJ/2kDH8g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -46593,13 +46542,6 @@
       "integrity": "sha512-pkJC8uIP/gxDHxNQUBUbjHyl6oZfT+ofn7tbaHW+CFIUjI+Q2MBbHcx1JSBQfhDaTcO9bNg328q0i7Vk5PismQ==",
       "license": "MIT"
     },
-    "node_modules/timezone-mock": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/timezone-mock/-/timezone-mock-1.4.0.tgz",
-      "integrity": "sha512-LMnGHctfNWTfGyNghWMGjaIzBQqtnHzOUzi9cL0nDS4dx5yuCwbD7dn9qZbU4jT1HMqQW1khEOloXUTTuxiSaQ==",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/tiny-invariant": {
       "version": "1.3.3",
       "resolved": "https://registry.npmjs.org/tiny-invariant/-/tiny-invariant-1.3.3.tgz",
@@ -46622,7 +46564,6 @@
       "version": "0.2.15",
       "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.15.tgz",
       "integrity": "sha512-j2Zq4NyQYG5XMST4cbs02Ak8iJUdxRM0XI5QyxXuZOzKOINmWurp3smXu3y5wDcJrptwpSjgXHzIQxR0omXljQ==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "fdir": "^6.5.0",
@@ -46639,7 +46580,6 @@
       "version": "6.5.0",
       "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.5.0.tgz",
       "integrity": "sha512-tIbYtZbucOs0BRGqPJkshJUYdL+SDH7dVM8gjy+ERp3WAUjLEFJE+02kanyHtwjWOnwrKYBiwAmM0p4kLJAnXg==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=12.0.0"
@@ -46654,10 +46594,9 @@
       }
     },
     "node_modules/tinyglobby/node_modules/picomatch": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz",
-      "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
-      "dev": true,
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.4.tgz",
+      "integrity": "sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==",
       "license": "MIT",
       "engines": {
         "node": ">=12"
@@ -46760,12 +46699,13 @@
       }
     },
     "node_modules/token-types": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/token-types/-/token-types-5.0.1.tgz",
-      "integrity": "sha512-Y2fmSnZjQdDb9W4w4r1tswlMHylzWIeOKpx0aZH9BgGtACHhrk3OkT52AzwcuqTRBZtvvnTjDBh8eynMulu8Vg==",
+      "version": "6.1.2",
+      "resolved": "https://registry.npmjs.org/token-types/-/token-types-6.1.2.tgz",
+      "integrity": "sha512-dRXchy+C0IgK8WPC6xvCHFRIWYUbqqdEIKPaKo/AcTUNzwLTK6AH7RjdLWsEZcAN/TBdtfUw3PYEgPr5VPr6ww==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
+        "@borewit/text-codec": "^0.2.1",
         "@tokenizer/token": "^0.3.0",
         "ieee754": "^1.2.1"
       },
@@ -46960,19 +46900,19 @@
       }
     },
     "node_modules/ts-jest": {
-      "version": "29.4.6",
-      "resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-29.4.6.tgz",
-      "integrity": "sha512-fSpWtOO/1AjSNQguk43hb/JCo16oJDnMJf3CdEGNkqsEX3t0KX96xvyX1D7PfLCpVoKu4MfVrqUkFyblYoY4lA==",
+      "version": "29.4.9",
+      "resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-29.4.9.tgz",
+      "integrity": "sha512-LTb9496gYPMCqjeDLdPrKuXtncudeV1yRZnF4Wo5l3SFi0RYEnYRNgMrFIdg+FHvfzjCyQk1cLncWVqiSX+EvQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "bs-logger": "^0.2.6",
         "fast-json-stable-stringify": "^2.1.0",
-        "handlebars": "^4.7.8",
+        "handlebars": "^4.7.9",
         "json5": "^2.2.3",
         "lodash.memoize": "^4.1.2",
         "make-error": "^1.3.6",
-        "semver": "^7.7.3",
+        "semver": "^7.7.4",
         "type-fest": "^4.41.0",
         "yargs-parser": "^21.1.1"
       },
@@ -46989,7 +46929,7 @@
         "babel-jest": "^29.0.0 || ^30.0.0",
         "jest": "^29.0.0 || ^30.0.0",
         "jest-util": "^29.0.0 || ^30.0.0",
-        "typescript": ">=4.3 <6"
+        "typescript": ">=4.3 <7"
       },
       "peerDependenciesMeta": {
         "@babel/core": {
@@ -47080,18 +47020,6 @@
         "node": ">=0.4.0"
       }
     },
-    "node_modules/ts-node/node_modules/acorn-walk": {
-      "version": "8.3.4",
-      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.4.tgz",
-      "integrity": "sha512-ueEepnujpqee2o5aIYnvHU6C0A42MNdsIDeqy5BydrkuC5R1ZuUFnm27EeFJGoEHJQgn3uleRvmTXaJgfXbt4g==",
-      "license": "MIT",
-      "dependencies": {
-        "acorn": "^8.11.0"
-      },
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
     "node_modules/ts-node/node_modules/diff": {
       "version": "4.0.4",
       "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.4.tgz",
@@ -47658,18 +47586,18 @@
       "license": "0BSD"
     },
     "node_modules/tuf-js": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/tuf-js/-/tuf-js-2.2.1.tgz",
-      "integrity": "sha512-GwIJau9XaA8nLVbUXsN3IlFi7WmQ48gBUrl3FTkkL/XLu/POhBzfmX9hd33FNMX1qAsfl6ozO1iMmW9NC8YniA==",
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/tuf-js/-/tuf-js-4.1.0.tgz",
+      "integrity": "sha512-50QV99kCKH5P/Vs4E2Gzp7BopNV+KzTXqWeaxrfu5IQJBOULRsTIS9seSsOVT8ZnGXzCyx55nYWAi4qJzpZKEQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@tufjs/models": "2.0.1",
-        "debug": "^4.3.4",
-        "make-fetch-happen": "^13.0.1"
+        "@tufjs/models": "4.1.0",
+        "debug": "^4.4.3",
+        "make-fetch-happen": "^15.0.1"
       },
       "engines": {
-        "node": "^16.14.0 || >=18.0.0"
+        "node": "^20.17.0 || >=22.9.0"
       }
     },
     "node_modules/tunnel-agent": {
@@ -47870,9 +47798,9 @@
       }
     },
     "node_modules/typescript-json-schema": {
-      "version": "0.65.1",
-      "resolved": "https://registry.npmjs.org/typescript-json-schema/-/typescript-json-schema-0.65.1.tgz",
-      "integrity": "sha512-tuGH7ff2jPaUYi6as3lHyHcKpSmXIqN7/mu50x3HlYn0EHzLpmt3nplZ7EuhUkO0eqDRc9GqWNkfjgBPIS9kxg==",
+      "version": "0.67.1",
+      "resolved": "https://registry.npmjs.org/typescript-json-schema/-/typescript-json-schema-0.67.1.tgz",
+      "integrity": "sha512-vKTZB/RoYTIBdVP7E7vrgHMCssBuhja91wQy498QIVhvfRimaOgjc98uwAXmZ7mbLUytJmOSbF11wPz+ByQeXg==",
       "license": "BSD-3-Clause",
       "dependencies": {
         "@types/json-schema": "^7.0.9",
@@ -47882,6 +47810,7 @@
         "safe-stable-stringify": "^2.2.0",
         "ts-node": "^10.9.1",
         "typescript": "~5.5.0",
+        "vm2": "^3.10.0",
         "yargs": "^17.1.1"
       },
       "bin": {
@@ -47916,6 +47845,21 @@
       "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==",
       "license": "MIT"
     },
+    "node_modules/typewise": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/typewise/-/typewise-1.0.3.tgz",
+      "integrity": "sha512-aXofE06xGhaQSPzt8hlTY+/YWQhm9P0jYUp1f2XtmW/3Bk0qzXcyFWAtPoo2uTGQj1ZwbDuSyuxicq+aDo8lCQ==",
+      "license": "MIT",
+      "dependencies": {
+        "typewise-core": "^1.2.0"
+      }
+    },
+    "node_modules/typewise-core": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/typewise-core/-/typewise-core-1.2.0.tgz",
+      "integrity": "sha512-2SCC/WLzj2SbUwzFOzqMCkz5amXLlxtJqDKTICqg30x+2DZxcfZN2MvQZmGfXWKNWaKK9pBPsvkcwv8bF/gxKg==",
+      "license": "MIT"
+    },
     "node_modules/uglify-js": {
       "version": "3.19.3",
       "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.19.3.tgz",
@@ -47929,6 +47873,19 @@
         "node": ">=0.8.0"
       }
     },
+    "node_modules/uint8array-extras": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/uint8array-extras/-/uint8array-extras-1.5.0.tgz",
+      "integrity": "sha512-rvKSBiC5zqCCiDZ9kAOszZcDvdAHwwIKJG33Ykj43OKcWsnmcBRL09YTU4nOeHZ8Y2a7l1MgTd08SBe9A8Qj6A==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/ultimate-pagination": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/ultimate-pagination/-/ultimate-pagination-1.0.0.tgz",
@@ -47967,9 +47924,9 @@
       "license": "MIT"
     },
     "node_modules/undici": {
-      "version": "7.24.1",
-      "resolved": "https://registry.npmjs.org/undici/-/undici-7.24.1.tgz",
-      "integrity": "sha512-5xoBibbmnjlcR3jdqtY2Lnx7WbrD/tHlT01TmvqZUFVc9Q1w4+j5hbnapTqbcXITMH1ovjq/W7BkqBilHiVAaA==",
+      "version": "7.24.6",
+      "resolved": "https://registry.npmjs.org/undici/-/undici-7.24.6.tgz",
+      "integrity": "sha512-Xi4agocCbRzt0yYMZGMA6ApD7gvtUFaxm4ZmeacWI4cZxaF6C+8I8QfofC20NAePiB/IcvZmzkJ7XPa471AEtA==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -47977,9 +47934,9 @@
       }
     },
     "node_modules/undici-types": {
-      "version": "7.18.2",
-      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.18.2.tgz",
-      "integrity": "sha512-AsuCzffGHJybSaRrmr5eHr81mwJU3kjw6M+uprWvCXiNeN9SOGwQ3Jn8jb8m3Z6izVgknn1R0FTCEAP2QrLY/w==",
+      "version": "7.19.2",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.19.2.tgz",
+      "integrity": "sha512-qYVnV5OEm2AW8cJMCpdV20CDyaN3g0AjDlOGf1OW4iaDEx8MwdtChUp4zu4H0VP3nDRF/8RKWH+IPp9uW0YGZg==",
       "license": "MIT"
     },
     "node_modules/unicode-canonical-property-names-ecmascript": {
@@ -48031,6 +47988,8 @@
       "resolved": "https://registry.npmjs.org/unicorn-magic/-/unicorn-magic-0.1.0.tgz",
       "integrity": "sha512-lRfVq8fE8gz6QMBuDM6a+LO3IAzTi05H6gCVaUpir2E1Rwpo4ZUog45KpNXKC/Mn3Yb9UDuHumeFTo9iV/D9FQ==",
       "license": "MIT",
+      "optional": true,
+      "peer": true,
       "engines": {
         "node": ">=18"
       },
@@ -48081,30 +48040,19 @@
         "node": ">= 0.8.0"
       }
     },
-    "node_modules/unique-filename": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-3.0.0.tgz",
-      "integrity": "sha512-afXhuC55wkAmZ0P18QsVE6kp8JaxrEokN2HGIoIVv2ijHQd419H0+6EigAFcIzXeMIkcIkNBpB3L/DXB3cTS/g==",
-      "dev": true,
-      "license": "ISC",
+    "node_modules/union-value": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz",
+      "integrity": "sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==",
+      "license": "MIT",
       "dependencies": {
-        "unique-slug": "^4.0.0"
+        "arr-union": "^3.1.0",
+        "get-value": "^2.0.6",
+        "is-extendable": "^0.1.1",
+        "set-value": "^2.0.1"
       },
       "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
-      }
-    },
-    "node_modules/unique-slug": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-4.0.0.tgz",
-      "integrity": "sha512-WrcA6AyEfqDX5bWige/4NQfPZMtASNVxdmWR76WESYQVAACSgWcR6e9i0mofqqBxYFtL4oAxPIptY73/0YE1DQ==",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "imurmurhash": "^0.1.4"
-      },
-      "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+        "node": ">=0.10.0"
       }
     },
     "node_modules/unique-string": {
@@ -48252,12 +48200,6 @@
         "url": "https://opencollective.com/unified"
       }
     },
-    "node_modules/universal-user-agent": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-7.0.3.tgz",
-      "integrity": "sha512-TmnEAEAsBJVZM/AADELsK76llnwcf9vMKuPz8JflO1frO8Lchitr0fNaN9d+Ap0BjKtqWqd/J17qeDnXh8CL2A==",
-      "license": "ISC"
-    },
     "node_modules/universalify": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz",
@@ -48292,9 +48234,9 @@
       }
     },
     "node_modules/unplugin/node_modules/acorn": {
-      "version": "8.15.0",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.15.0.tgz",
-      "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==",
+      "version": "8.16.0",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.16.0.tgz",
+      "integrity": "sha512-UVJyE9MttOsBQIDKw1skb9nAwQuR5wuGD3+82K6JgJlm/Y+KI92oNsMNGZCYdDsVtRHSak0pcV5Dno5+4jh9sw==",
       "dev": true,
       "license": "MIT",
       "bin": {
@@ -48574,9 +48516,9 @@
       }
     },
     "node_modules/uuid": {
-      "version": "13.0.0",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-13.0.0.tgz",
-      "integrity": "sha512-XQegIaBTVUjSHliKqcnFqYypAd4S+WCYt5NIeRs6w/UAry7z8Y9j5ZwRRL4kzq9U3sD6v+85er9FvkEaBpji2w==",
+      "version": "14.0.0",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-14.0.0.tgz",
+      "integrity": "sha512-Qo+uWgilfSmAhXCMav1uYFynlQO7fMFiMVZsQqZRMIXp0O7rR7qjkj+cPvBHLgBqi960QCoo/PH2/6ZtVqKvrg==",
       "funding": [
         "https://github.com/sponsors/broofa",
         "https://github.com/sponsors/ctavan"
@@ -48664,13 +48606,13 @@
       }
     },
     "node_modules/validate-npm-package-name": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-5.0.1.tgz",
-      "integrity": "sha512-OljLrQ9SQdOUqTaQxqL5dEfZWrXExyyWsozYlAWFawPVNuD83igl7uJD2RTkNMbniIYgt8l81eCJGIdQF7avLQ==",
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-6.0.2.tgz",
+      "integrity": "sha512-IUoow1YUtvoBBC06dXs8bR8B9vuA3aJfmQNKMoaPG/OFsPmoQvw8xh+6Ye25Gx9DQhoEom3Pcu9MKHerm/NpUQ==",
       "dev": true,
       "license": "ISC",
       "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+        "node": "^18.17.0 || >=20.5.0"
       }
     },
     "node_modules/validate.io-array": {
@@ -48854,31 +48796,12 @@
         "url": "https://opencollective.com/unified"
       }
     },
-    "node_modules/viewport-mercator-project": {
-      "version": "7.0.4",
-      "resolved": "https://registry.npmjs.org/viewport-mercator-project/-/viewport-mercator-project-7.0.4.tgz",
-      "integrity": "sha512-0jzpL6pIMocCKWg1C3mqi/N4UPgZC3FzwghEm1H+XsUo8hNZAyJc3QR7YqC816ibOR8aWT5pCsV+gCu8/BMJgg==",
-      "deprecated": "Package no longer supported. Contact Support at https://www.npmjs.com/support for more info.",
-      "license": "MIT",
-      "dependencies": {
-        "@math.gl/web-mercator": "^3.5.5"
-      }
-    },
-    "node_modules/viewport-mercator-project/node_modules/@math.gl/web-mercator": {
-      "version": "3.6.3",
-      "resolved": "https://registry.npmjs.org/@math.gl/web-mercator/-/web-mercator-3.6.3.tgz",
-      "integrity": "sha512-UVrkSOs02YLehKaehrxhAejYMurehIHPfFQvPFZmdJHglHOU4V2cCUApTVEwOksvCp161ypEqVp+9H6mGhTTcw==",
-      "license": "MIT",
-      "dependencies": {
-        "@babel/runtime": "^7.12.0",
-        "gl-matrix": "^3.4.0"
-      }
-    },
     "node_modules/vinyl": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-3.0.0.tgz",
       "integrity": "sha512-rC2VRfAVVCGEgjnxHUnpIVh3AGuk62rP3tqVrn+yab0YH7UULisC085+NYH+mnqf3Wx4SpSi1RQMwudL89N03g==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "clone": "^2.1.2",
         "clone-stats": "^1.0.0",
@@ -48922,15 +48845,32 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/vt-pbf": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/vt-pbf/-/vt-pbf-3.1.3.tgz",
-      "integrity": "sha512-2LzDFzt0mZKZ9IpVF2r69G9bXaP2Q2sArJCmcCgvfTdCCZzSyz4aCLoQyUilu37Ll56tCblIZrXFIjNUpGIlmA==",
+    "node_modules/vm2": {
+      "version": "3.10.5",
+      "resolved": "https://registry.npmjs.org/vm2/-/vm2-3.10.5.tgz",
+      "integrity": "sha512-3P/2QDccVFBcujfCOeP8vVNuGfuBJHEuvGR8eMmI10p/iwLL2UwF5PDaNaoOS2pRGQEDmJRyeEcc8kmm2Z59RA==",
       "license": "MIT",
       "dependencies": {
-        "@mapbox/point-geometry": "0.1.0",
-        "@mapbox/vector-tile": "^1.3.1",
-        "pbf": "^3.2.1"
+        "acorn": "^8.15.0",
+        "acorn-walk": "^8.3.4"
+      },
+      "bin": {
+        "vm2": "bin/vm2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      }
+    },
+    "node_modules/vm2/node_modules/acorn": {
+      "version": "8.16.0",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.16.0.tgz",
+      "integrity": "sha512-UVJyE9MttOsBQIDKw1skb9nAwQuR5wuGD3+82K6JgJlm/Y+KI92oNsMNGZCYdDsVtRHSak0pcV5Dno5+4jh9sw==",
+      "license": "MIT",
+      "bin": {
+        "acorn": "bin/acorn"
+      },
+      "engines": {
+        "node": ">=0.4.0"
       }
     },
     "node_modules/w3c-xmlserializer": {
@@ -48947,15 +48887,15 @@
       }
     },
     "node_modules/wait-on": {
-      "version": "9.0.4",
-      "resolved": "https://registry.npmjs.org/wait-on/-/wait-on-9.0.4.tgz",
-      "integrity": "sha512-k8qrgfwrPVJXTeFY8tl6BxVHiclK11u72DVKhpybHfUL/K6KM4bdyK9EhIVYGytB5MJe/3lq4Tf0hrjM+pvJZQ==",
+      "version": "9.0.5",
+      "resolved": "https://registry.npmjs.org/wait-on/-/wait-on-9.0.5.tgz",
+      "integrity": "sha512-qgnbHDfDTRIp73ANEJNRW/7kn8CrDUcvZz18xotJQku/P4saTGkbIzvnMZebPmVvVNUiRq1qWAPyqCH+W4H8KA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "axios": "^1.13.5",
-        "joi": "^18.0.2",
-        "lodash": "^4.17.23",
+        "axios": "^1.15.0",
+        "joi": "^18.1.2",
+        "lodash": "^4.18.1",
         "minimist": "^1.2.8",
         "rxjs": "^7.8.2"
       },
@@ -49070,11 +49010,14 @@
       }
     },
     "node_modules/walk-up-path": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/walk-up-path/-/walk-up-path-3.0.1.tgz",
-      "integrity": "sha512-9YlCL/ynK3CTlrSRrDxZvUauLzAswPCrsaCgilqFevUYpeEW0/3ScEjaa3kbW/T0ghhkEr7mv+fpjqn1Y1YuTA==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/walk-up-path/-/walk-up-path-4.0.0.tgz",
+      "integrity": "sha512-3hu+tD8YzSLGuFYtPRb48vdhKMi0KQV5sn+uWr8+7dMEq/2G/dtLrdDinkLjqq5TIbIBjYJ4Ax/n3YiaW7QM8A==",
       "dev": true,
-      "license": "ISC"
+      "license": "ISC",
+      "engines": {
+        "node": "20 || >=22"
+      }
     },
     "node_modules/walker": {
       "version": "1.0.8",
@@ -49155,9 +49098,9 @@
       }
     },
     "node_modules/webpack": {
-      "version": "5.105.4",
-      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.105.4.tgz",
-      "integrity": "sha512-jTywjboN9aHxFlToqb0K0Zs9SbBoW4zRUlGzI2tYNxVYcEi/IPpn+Xi4ye5jTLvX2YeLuic/IvxNot+Q1jMoOw==",
+      "version": "5.106.0",
+      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.106.0.tgz",
+      "integrity": "sha512-Pkx5joZ9RrdgO5LBkyX1L2ZAJeK/Taz3vqZ9CbcP0wS5LEMx5QkKsEwLl29QJfihZ+DKRBFldzy1O30pJ1MDpA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -49204,19 +49147,18 @@
       }
     },
     "node_modules/webpack-bundle-analyzer": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/webpack-bundle-analyzer/-/webpack-bundle-analyzer-5.2.0.tgz",
-      "integrity": "sha512-Etrauj1wYO/xjiz/Vfd6bW1lG9fEhrJpNmu10tv0X9kv+gyY3qiE09uYepqg1Xd0PxOvllRXwWYWjtQYoO/glQ==",
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/webpack-bundle-analyzer/-/webpack-bundle-analyzer-5.3.0.tgz",
+      "integrity": "sha512-PEhAoqiJ+47d0uLMx/+zo5XOvaU+Vk6N2ZLht7H3n09QLy/fhyvqGNwjdRUHJDgMN8crBR2ZwVHkIswT3Xuawg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@discoveryjs/json-ext": "0.5.7",
+        "@discoveryjs/json-ext": "^0.6.3",
         "acorn": "^8.0.4",
         "acorn-walk": "^8.0.0",
-        "commander": "^7.2.0",
-        "debounce": "^1.2.1",
-        "escape-string-regexp": "^4.0.0",
-        "html-escaper": "^2.0.2",
+        "commander": "^14.0.2",
+        "escape-string-regexp": "^5.0.0",
+        "html-escaper": "^3.0.3",
         "opener": "^1.5.2",
         "picocolors": "^1.0.0",
         "sirv": "^3.0.2",
@@ -49242,29 +49184,36 @@
         "node": ">=0.4.0"
       }
     },
-    "node_modules/webpack-bundle-analyzer/node_modules/acorn-walk": {
-      "version": "8.3.4",
-      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.4.tgz",
-      "integrity": "sha512-ueEepnujpqee2o5aIYnvHU6C0A42MNdsIDeqy5BydrkuC5R1ZuUFnm27EeFJGoEHJQgn3uleRvmTXaJgfXbt4g==",
+    "node_modules/webpack-bundle-analyzer/node_modules/commander": {
+      "version": "14.0.3",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-14.0.3.tgz",
+      "integrity": "sha512-H+y0Jo/T1RZ9qPP4Eh1pkcQcLRglraJaSLoyOtHxu6AapkjWVCy2Sit1QQ4x3Dng8qDlSsZEet7g5Pq06MvTgw==",
       "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "acorn": "^8.11.0"
-      },
       "engines": {
-        "node": ">=0.4.0"
+        "node": ">=20"
       }
     },
-    "node_modules/webpack-bundle-analyzer/node_modules/commander": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz",
-      "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==",
+    "node_modules/webpack-bundle-analyzer/node_modules/escape-string-regexp": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-5.0.0.tgz",
+      "integrity": "sha512-/veY75JbMK4j1yjvuUxuVsiS/hr/4iHs9FTT6cgTexxdE0Ly/glccBAkloH/DofkjRbZU3bnoj38mOmhkZ0lHw==",
       "dev": true,
       "license": "MIT",
       "engines": {
-        "node": ">= 10"
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/webpack-bundle-analyzer/node_modules/html-escaper": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-3.0.3.tgz",
+      "integrity": "sha512-RuMffC89BOWQoY0WKGpIhn5gX3iI54O6nRA0yC124NYVtzjmFWBIiFd8M0x+ZdX0P9R4lADg1mgP8C7PxGOWuQ==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/webpack-bundle-analyzer/node_modules/ws": {
       "version": "8.19.0",
       "resolved": "https://registry.npmjs.org/ws/-/ws-8.19.0.tgz",
@@ -49330,16 +49279,6 @@
         }
       }
     },
-    "node_modules/webpack-cli/node_modules/@discoveryjs/json-ext": {
-      "version": "0.6.3",
-      "resolved": "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.6.3.tgz",
-      "integrity": "sha512-4B4OijXeVNOPZlYA2oEwWOTkzyltLao+xbotHQeqN++Rv27Y6s818+n2Qkp8q+Fxhn0t/5lA5X1Mxktud8eayQ==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=14.17.0"
-      }
-    },
     "node_modules/webpack-cli/node_modules/commander": {
       "version": "12.1.0",
       "resolved": "https://registry.npmjs.org/commander/-/commander-12.1.0.tgz",
@@ -49869,9 +49808,9 @@
       }
     },
     "node_modules/whatwg-url": {
-      "version": "16.0.0",
-      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-16.0.0.tgz",
-      "integrity": "sha512-9CcxtEKsf53UFwkSUZjG+9vydAsFO4lFHBpJUtjBcoJOCJpKnSJNwCw813zrYJHpCJ7sgfbtOe0V5Ku7Pa1XMQ==",
+      "version": "16.0.1",
+      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-16.0.1.tgz",
+      "integrity": "sha512-1to4zXBxmXHV3IiSSEInrreIlu02vUOvrhxJJH5vcxYTBDAx51cqZiKdyTxlecdKNSjj8EcxGBxNf6Vg+945gw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -50090,6 +50029,7 @@
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
       "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "ansi-styles": "^4.0.0",
@@ -50136,81 +50076,6 @@
         "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "node_modules/write-json-file": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/write-json-file/-/write-json-file-3.2.0.tgz",
-      "integrity": "sha512-3xZqT7Byc2uORAatYiP3DHUUAVEkNOswEWNs9H5KXiicRTvzYzYqKjYc4G7p+8pltvAw641lVByKVtMpf+4sYQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "detect-indent": "^5.0.0",
-        "graceful-fs": "^4.1.15",
-        "make-dir": "^2.1.0",
-        "pify": "^4.0.1",
-        "sort-keys": "^2.0.0",
-        "write-file-atomic": "^2.4.2"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/write-json-file/node_modules/detect-indent": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-5.0.0.tgz",
-      "integrity": "sha512-rlpvsxUtM0PQvy9iZe640/IWwWYyBsTApREbA1pHOpmOUIl9MkP/U4z7vTtg4Oaojvqhxt7sdufnT0EzGaR31g==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/write-json-file/node_modules/pify": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
-      "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/write-json-file/node_modules/write-file-atomic": {
-      "version": "2.4.3",
-      "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.4.3.tgz",
-      "integrity": "sha512-GaETH5wwsX+GcnzhPgKcKjJ6M2Cq3/iZp1WyY/X1CSqrW+jVNM9Y7D8EC2sM4ZG/V8wZlSniJnCKWPmBYAucRQ==",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "graceful-fs": "^4.1.11",
-        "imurmurhash": "^0.1.4",
-        "signal-exit": "^3.0.2"
-      }
-    },
-    "node_modules/write-pkg": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/write-pkg/-/write-pkg-4.0.0.tgz",
-      "integrity": "sha512-v2UQ+50TNf2rNHJ8NyWttfm/EJUBWMJcx6ZTYZr6Qp52uuegWw/lBkCtCbnYZEmPRNL61m+u67dAmGxo+HTULA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "sort-keys": "^2.0.0",
-        "type-fest": "^0.4.1",
-        "write-json-file": "^3.2.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/write-pkg/node_modules/type-fest": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.4.1.tgz",
-      "integrity": "sha512-IwzA/LSfD2vC1/YDYMv/zHP4rDF1usCwllsDpbolT3D4fUepIO7f9K70jjmUewU/LmGUKJcwcVtDCpnKk4BPMw==",
-      "dev": true,
-      "license": "(MIT OR CC0-1.0)",
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/ws": {
       "version": "8.17.1",
       "resolved": "https://registry.npmjs.org/ws/-/ws-8.17.1.tgz",
@@ -50233,6 +50098,39 @@
         }
       }
     },
+    "node_modules/wsl-utils": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/wsl-utils/-/wsl-utils-0.3.1.tgz",
+      "integrity": "sha512-g/eziiSUNBSsdDJtCLB8bdYEUMj4jR7AGeUo96p/3dTafgjHhpF4RiCFPiRILwjQoDXx5MqkBr4fwWtR3Ky4Wg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-wsl": "^3.1.0",
+        "powershell-utils": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=20"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/wsl-utils/node_modules/is-wsl": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-3.1.1.tgz",
+      "integrity": "sha512-e6rvdUCiQCAuumZslxRJWR/Doq4VpPR82kqclvcS0efgt430SlGIk05vdCN58+VrzgtIcfNODjozVielycD4Sw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-inside-container": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=16"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/xlsx": {
       "version": "0.20.3",
       "resolved": "https://cdn.sheetjs.com/xlsx-0.20.3/xlsx-0.20.3.tgz",
@@ -50355,9 +50253,9 @@
       "license": "ISC"
     },
     "node_modules/yaml": {
-      "version": "2.8.2",
-      "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.8.2.tgz",
-      "integrity": "sha512-mplynKqc1C2hTVYxd0PU2xQAc22TI1vShAYGksCCfxbn/dFwnHTNi1bvYsBTkhdUNtGIf5xNOg938rrSSYvS9A==",
+      "version": "2.8.3",
+      "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.8.3.tgz",
+      "integrity": "sha512-AvbaCLOO2Otw/lW5bmh9d/WEdcDFdQp2Z2ZUH3pX9U2ihyUY0nvLv7J6TrWowklRGPYbB/IuIMfYgxaCPg5Bpg==",
       "dev": true,
       "license": "ISC",
       "bin": {
@@ -50409,216 +50307,6 @@
         "fd-slicer": "~1.1.0"
       }
     },
-    "node_modules/yeoman-generator": {
-      "version": "7.5.1",
-      "resolved": "https://registry.npmjs.org/yeoman-generator/-/yeoman-generator-7.5.1.tgz",
-      "integrity": "sha512-MYncRvzSTd71BMwiUMAVhfX00sDD8DZDrmPzRxQkWuWQ0V1Qt4Rd0gS/Nee2QDTWvRjvCa+KBfiAVrtOySq+JA==",
-      "license": "BSD-2-Clause",
-      "dependencies": {
-        "@types/lodash-es": "^4.17.9",
-        "@yeoman/namespace": "^1.0.0",
-        "chalk": "^5.3.0",
-        "debug": "^4.1.1",
-        "execa": "^8.0.1",
-        "github-username": "^9.0.0",
-        "json-schema": "^0.4.0",
-        "latest-version": "^9.0.0",
-        "lodash-es": "^4.17.21",
-        "mem-fs-editor": "^11.0.1",
-        "minimist": "^1.2.8",
-        "read-package-up": "^11.0.0",
-        "semver": "^7.5.4",
-        "simple-git": "^3.20.0",
-        "sort-keys": "^5.0.0",
-        "text-table": "^0.2.0"
-      },
-      "engines": {
-        "node": "^18.17.0 || >=20.5.0"
-      },
-      "peerDependencies": {
-        "@types/node": ">=18.18.5",
-        "@yeoman/types": "^1.1.1",
-        "mem-fs": "^4.0.0"
-      },
-      "peerDependenciesMeta": {
-        "@types/node": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/yeoman-generator/node_modules/chalk": {
-      "version": "5.4.1",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.4.1.tgz",
-      "integrity": "sha512-zgVZuo2WcZgfUEmsn6eO3kINexW8RAE4maiQ8QNs8CtpPCSyMiYsULR3HQYkm3w8FIA3SberyMJMSldGsW+U3w==",
-      "license": "MIT",
-      "engines": {
-        "node": "^12.17.0 || ^14.13 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/yeoman-generator/node_modules/execa": {
-      "version": "8.0.1",
-      "resolved": "https://registry.npmjs.org/execa/-/execa-8.0.1.tgz",
-      "integrity": "sha512-VyhnebXciFV2DESc+p6B+y0LjSm0krU4OgJN44qFAhBY0TJ+1V61tYD2+wHusZ6F9n5K+vl8k0sTy7PEfV4qpg==",
-      "license": "MIT",
-      "dependencies": {
-        "cross-spawn": "^7.0.3",
-        "get-stream": "^8.0.1",
-        "human-signals": "^5.0.0",
-        "is-stream": "^3.0.0",
-        "merge-stream": "^2.0.0",
-        "npm-run-path": "^5.1.0",
-        "onetime": "^6.0.0",
-        "signal-exit": "^4.1.0",
-        "strip-final-newline": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=16.17"
-      },
-      "funding": {
-        "url": "https://github.com/sindresorhus/execa?sponsor=1"
-      }
-    },
-    "node_modules/yeoman-generator/node_modules/get-stream": {
-      "version": "8.0.1",
-      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-8.0.1.tgz",
-      "integrity": "sha512-VaUJspBffn/LMCJVoMvSAdmscJyS1auj5Zulnn5UoYcY531UWmdwhRWkcGKnGU93m5HSXP9LP2usOryrBtQowA==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=16"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/yeoman-generator/node_modules/human-signals": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-5.0.0.tgz",
-      "integrity": "sha512-AXcZb6vzzrFAUE61HnN4mpLqd/cSIwNQjtNWR0euPm6y0iqx3G4gOXaIDdtdDwZmhwe82LA6+zinmW4UBWVePQ==",
-      "license": "Apache-2.0",
-      "engines": {
-        "node": ">=16.17.0"
-      }
-    },
-    "node_modules/yeoman-generator/node_modules/is-plain-obj": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-4.1.0.tgz",
-      "integrity": "sha512-+Pgi+vMuUNkJyExiMBt5IlFoMyKnr5zhJ4Uspz58WOhBF5QoIZkFyNHIbBAtHwzVAgk5RtndVNsDRN61/mmDqg==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/yeoman-generator/node_modules/is-stream": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-3.0.0.tgz",
-      "integrity": "sha512-LnQR4bZ9IADDRSkvpqMGvt/tEJWclzklNgSw48V5EAaAeDd6qGvN8ei6k5p0tvxSR171VmGyHuTiAOfxAbr8kA==",
-      "license": "MIT",
-      "engines": {
-        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/yeoman-generator/node_modules/mimic-fn": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-4.0.0.tgz",
-      "integrity": "sha512-vqiC06CuhBTUdZH+RYl8sFrL096vA45Ok5ISO6sE/Mr1jRbGH4Csnhi8f3wKVl7x8mO4Au7Ir9D3Oyv1VYMFJw==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/yeoman-generator/node_modules/npm-run-path": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-5.3.0.tgz",
-      "integrity": "sha512-ppwTtiJZq0O/ai0z7yfudtBpWIoxM8yE6nHi1X47eFR2EWORqfbu6CnPlNsjeN683eT0qG6H/Pyf9fCcvjnnnQ==",
-      "license": "MIT",
-      "dependencies": {
-        "path-key": "^4.0.0"
-      },
-      "engines": {
-        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/yeoman-generator/node_modules/onetime": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/onetime/-/onetime-6.0.0.tgz",
-      "integrity": "sha512-1FlR+gjXK7X+AsAHso35MnyN5KqGwJRi/31ft6x0M194ht7S+rWAvd7PHss9xSKMzE0asv1pyIHaJYq+BbacAQ==",
-      "license": "MIT",
-      "dependencies": {
-        "mimic-fn": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/yeoman-generator/node_modules/path-key": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/path-key/-/path-key-4.0.0.tgz",
-      "integrity": "sha512-haREypq7xkM7ErfgIyA0z+Bj4AGKlMSdlQE2jvJo6huWD1EdkKYV+G/T4nq0YEF2vgTT8kqMFKo1uHn950r4SQ==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/yeoman-generator/node_modules/signal-exit": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
-      "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
-      "license": "ISC",
-      "engines": {
-        "node": ">=14"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/yeoman-generator/node_modules/sort-keys": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/sort-keys/-/sort-keys-5.1.0.tgz",
-      "integrity": "sha512-aSbHV0DaBcr7u0PVHXzM6NbZNAtrr9sF6+Qfs9UUVG7Ll3jQ6hHi8F/xqIIcn2rvIVbr0v/2zyjSdwSV47AgLQ==",
-      "license": "MIT",
-      "dependencies": {
-        "is-plain-obj": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/yeoman-generator/node_modules/strip-final-newline": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-3.0.0.tgz",
-      "integrity": "sha512-dOESqjYr96iWYylGObzd39EuNTa5VJxyvVAEm5Jnh7KGo75V43Hk1odPQkNDyXNmUR6k+gEiDVXnjB8HJ3crXw==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/yn": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz",
@@ -50646,7 +50334,6 @@
       "resolved": "https://registry.npmjs.org/yoctocolors/-/yoctocolors-2.1.1.tgz",
       "integrity": "sha512-GQHQqAopRhwU8Kt1DDM8NjibDXHC8eoh1erhGAJPEyveY9qqVeXvVikNKrDz69sHowPMorbPUrH/mx8c50eiBQ==",
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=18"
       },
@@ -50655,11 +50342,10 @@
       }
     },
     "node_modules/yoctocolors-cjs": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/yoctocolors-cjs/-/yoctocolors-cjs-2.1.2.tgz",
-      "integrity": "sha512-cYVsTjKl8b+FrnidjibDWskAv7UKOfcwaVZdp/it9n1s9fU3IkgDbhdIRKCW4JDsAlECJY0ytoVPT3sK6kideA==",
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/yoctocolors-cjs/-/yoctocolors-cjs-2.1.3.tgz",
+      "integrity": "sha512-U/PBtDf35ff0D8X8D0jfdzHYEPFxAI7jJlxZXwCSez5M3190m+QobIfh+sWDWSHMCWWJN2AWamkegn6vr6YBTw==",
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=18"
       },
@@ -50891,13 +50577,13 @@
       "license": "Apache-2.0",
       "dependencies": {
         "chalk": "^5.6.2",
-        "lodash-es": "^4.17.23",
-        "yeoman-generator": "^7.5.1",
+        "lodash-es": "^4.18.1",
+        "yeoman-generator": "^8.1.2",
         "yosay": "^3.0.0"
       },
       "devDependencies": {
         "cross-env": "^10.1.0",
-        "fs-extra": "^11.3.3",
+        "fs-extra": "^11.3.4",
         "jest": "^30.3.0",
         "yeoman-test": "^11.3.1"
       },
@@ -50906,11 +50592,22 @@
         "npm": ">= 4.0.0"
       }
     },
+    "packages/generator-superset/node_modules/@sindresorhus/merge-streams": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/@sindresorhus/merge-streams/-/merge-streams-4.0.0.tgz",
+      "integrity": "sha512-tlqY9xq5ukxTUZBmoOp+m61cqwQD5pHJtFY3Mn8CA8ps6yghLH/Hw8UPdqg4OLmFW3IFlcXnQNmo/dh8HzXYIQ==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "packages/generator-superset/node_modules/array-differ": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/array-differ/-/array-differ-4.0.0.tgz",
       "integrity": "sha512-Q6VPTLMsmXZ47ENG3V+wQyZS1ZxXMxFyYzA+Z/GMrJ6yIutAIEf9wTyroTzmGjNfox9/h3GdGBCVh43GVFx4Uw==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
@@ -50923,7 +50620,6 @@
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/array-union/-/array-union-3.0.1.tgz",
       "integrity": "sha512-1OvF9IbWwaeiM9VhzYXVQacMibxpXOMYVNIvMtKRyX9SImBXpKcFr8XvFDeEslCyuH/t6KRt7HEO94AlP8Iatw==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=12"
@@ -50936,17 +50632,15 @@
       "version": "4.0.4",
       "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-4.0.4.tgz",
       "integrity": "sha512-BLrgEcRTwX2o6gGxGOCNyMvGSp35YofuYzw9h1IMTRmKqttAZZVU67bdb9Pr2vUHA8+j3i2tJfjO6C6+4myGTA==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": "18 || 20 || >=22"
       }
     },
     "packages/generator-superset/node_modules/brace-expansion": {
-      "version": "5.0.4",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.4.tgz",
-      "integrity": "sha512-h+DEnpVvxmfVefa4jFbCf5HdH5YMDXRsmKflpf1pILZWRFlTbJpxeU55nJl4Smt5HQaGzg1o6RHFPJaOqnmBDg==",
-      "dev": true,
+      "version": "5.0.5",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.5.tgz",
+      "integrity": "sha512-VZznLgtwhn+Mact9tfiwx64fA9erHH/MCXEUfB/0bX/6Fz6ny5EGTXYltMocqg4xFAQZtnO3DHWWXi8RiuN7cQ==",
       "license": "MIT",
       "dependencies": {
         "balanced-match": "^4.0.2"
@@ -50971,7 +50665,6 @@
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/ejs/-/ejs-4.0.1.tgz",
       "integrity": "sha512-krvQtxc0btwSm/nvnt1UpnaFDFVJpJ0fdckmALpCgShsr/iGYHTnJiUliZTgmzq/UxTX33TtOQVKaNigMQp/6Q==",
-      "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
         "jake": "^10.9.1"
@@ -50983,6 +50676,59 @@
         "node": ">=0.12.18"
       }
     },
+    "packages/generator-superset/node_modules/execa": {
+      "version": "9.6.1",
+      "resolved": "https://registry.npmjs.org/execa/-/execa-9.6.1.tgz",
+      "integrity": "sha512-9Be3ZoN4LmYR90tUoVu2te2BsbzHfhJyfEiAVfz7N5/zv+jduIfLrV2xdQXOHbaD6KgpGdO9PRPM1Y4Q9QkPkA==",
+      "license": "MIT",
+      "dependencies": {
+        "@sindresorhus/merge-streams": "^4.0.0",
+        "cross-spawn": "^7.0.6",
+        "figures": "^6.1.0",
+        "get-stream": "^9.0.0",
+        "human-signals": "^8.0.1",
+        "is-plain-obj": "^4.1.0",
+        "is-stream": "^4.0.1",
+        "npm-run-path": "^6.0.0",
+        "pretty-ms": "^9.2.0",
+        "signal-exit": "^4.1.0",
+        "strip-final-newline": "^4.0.0",
+        "yoctocolors": "^2.1.1"
+      },
+      "engines": {
+        "node": "^18.19.0 || >=20.5.0"
+      },
+      "funding": {
+        "url": "https://github.com/sindresorhus/execa?sponsor=1"
+      }
+    },
+    "packages/generator-superset/node_modules/figures": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/figures/-/figures-6.1.0.tgz",
+      "integrity": "sha512-d+l3qxjSesT4V7v2fh+QnmFnUWv9lSpjarhShNTgBOfA0ttejbQUAlHLitbjkoRiDulW0OPoQPYIGhIC8ohejg==",
+      "license": "MIT",
+      "dependencies": {
+        "is-unicode-supported": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "packages/generator-superset/node_modules/find-up-simple": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/find-up-simple/-/find-up-simple-1.0.1.tgz",
+      "integrity": "sha512-afd4O7zpqHeRyg4PfDQsXmlDe2PfdHtJt6Akt8jOWaApLOZk5JXs6VMR29lz03pRe9mpykrRCYIYxaJYcfpncQ==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "packages/generator-superset/node_modules/fs-extra": {
       "version": "11.3.2",
       "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.3.2.tgz",
@@ -50998,11 +50744,83 @@
         "node": ">=14.14"
       }
     },
+    "packages/generator-superset/node_modules/get-stream": {
+      "version": "9.0.1",
+      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-9.0.1.tgz",
+      "integrity": "sha512-kVCxPF3vQM/N0B1PmoqVUqgHP+EeVjmZSQn+1oCRPxd2P21P2F19lIgbR3HBosbB1PUhOAoctJnfEn2GbN2eZA==",
+      "license": "MIT",
+      "dependencies": {
+        "@sec-ant/readable-stream": "^0.4.1",
+        "is-stream": "^4.0.1"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "packages/generator-superset/node_modules/hosted-git-info": {
+      "version": "9.0.2",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-9.0.2.tgz",
+      "integrity": "sha512-M422h7o/BR3rmCQ8UHi7cyyMqKltdP9Uo+J2fXK+RSAY+wTcKOIRyhTuKv4qn+DJf3g+PL890AzId5KZpX+CBg==",
+      "license": "ISC",
+      "dependencies": {
+        "lru-cache": "^11.1.0"
+      },
+      "engines": {
+        "node": "^20.17.0 || >=22.9.0"
+      }
+    },
+    "packages/generator-superset/node_modules/human-signals": {
+      "version": "8.0.1",
+      "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-8.0.1.tgz",
+      "integrity": "sha512-eKCa6bwnJhvxj14kZk5NCPc6Hb6BdsU9DZcOnmQKSnO1VKrfV0zCvtttPZUsBvjmNDn8rpcJfpwSYnHBjc95MQ==",
+      "license": "Apache-2.0",
+      "engines": {
+        "node": ">=18.18.0"
+      }
+    },
+    "packages/generator-superset/node_modules/index-to-position": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/index-to-position/-/index-to-position-1.2.0.tgz",
+      "integrity": "sha512-Yg7+ztRkqslMAS2iFaU+Oa4KTSidr63OsFGlOrJoW981kIYO3CGCS3wA95P1mUi/IVSJkn0D479KTJpVpvFNuw==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "packages/generator-superset/node_modules/is-plain-obj": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-4.1.0.tgz",
+      "integrity": "sha512-+Pgi+vMuUNkJyExiMBt5IlFoMyKnr5zhJ4Uspz58WOhBF5QoIZkFyNHIbBAtHwzVAgk5RtndVNsDRN61/mmDqg==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "packages/generator-superset/node_modules/is-stream": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-4.0.1.tgz",
+      "integrity": "sha512-Dnz92NInDqYckGEUJv689RbRiTSEHCQ7wOVeALbkOz999YpqT46yMRIGtSNl2iCL1waAZSx40+h59NV/EwzV/A==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "packages/generator-superset/node_modules/isbinaryfile": {
       "version": "5.0.7",
       "resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-5.0.7.tgz",
       "integrity": "sha512-gnWD14Jh3FzS3CPhF0AxNOJ8CxqeblPTADzI38r0wt8ZyQl5edpy75myt08EG2oKvpyiqSqsx+Wkz9vtkbTqYQ==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">= 18.0.0"
@@ -51011,11 +50829,19 @@
         "url": "https://github.com/sponsors/gjtorikian/"
       }
     },
+    "packages/generator-superset/node_modules/lru-cache": {
+      "version": "11.2.7",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.2.7.tgz",
+      "integrity": "sha512-aY/R+aEsRelme17KGQa/1ZSIpLpNYYrhcrepKTZgE+W3WM16YMCaPwOHLHsmopZHELU0Ojin1lPVxKR0MihncA==",
+      "license": "BlueOak-1.0.0",
+      "engines": {
+        "node": "20 || >=22"
+      }
+    },
     "packages/generator-superset/node_modules/mem-fs-editor": {
       "version": "12.0.2",
       "resolved": "https://registry.npmjs.org/mem-fs-editor/-/mem-fs-editor-12.0.2.tgz",
       "integrity": "sha512-H31IlLheZAEViQpInX2Wv9YdH98hLMOeqiaSmuENIDoXriQBd7KUmqXOgby0Xgy/9MoZvvDly2k9Zm77EdngAA==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@types/ejs": "^3.1.5",
@@ -51053,7 +50879,6 @@
       "version": "10.2.4",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.2.4.tgz",
       "integrity": "sha512-oRjTw/97aTBN0RHbYCdtF1MQfvusSIBQM0IZEgzl6426+8jSC0nF1a/GmnVLpfB9yyr6g6FTqWqiZVbxrtaCIg==",
-      "dev": true,
       "license": "BlueOak-1.0.0",
       "dependencies": {
         "brace-expansion": "^5.0.2"
@@ -51069,7 +50894,6 @@
       "version": "8.0.0",
       "resolved": "https://registry.npmjs.org/multimatch/-/multimatch-8.0.0.tgz",
       "integrity": "sha512-0D10M2/MnEyvoog7tmozlpSqL3HEU1evxUFa3v1dsKYmBDFSP1dLSX4CH2rNjpQ+4Fps8GKmUkCwiKryaKqd9A==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "array-differ": "^4.0.0",
@@ -51083,11 +50907,129 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "packages/generator-superset/node_modules/normalize-package-data": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-8.0.0.tgz",
+      "integrity": "sha512-RWk+PI433eESQ7ounYxIp67CYuVsS1uYSonX3kA6ps/3LWfjVQa/ptEg6Y3T6uAMq1mWpX9PQ+qx+QaHpsc7gQ==",
+      "license": "BSD-2-Clause",
+      "dependencies": {
+        "hosted-git-info": "^9.0.0",
+        "semver": "^7.3.5",
+        "validate-npm-package-license": "^3.0.4"
+      },
+      "engines": {
+        "node": "^20.17.0 || >=22.9.0"
+      }
+    },
+    "packages/generator-superset/node_modules/npm-run-path": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-6.0.0.tgz",
+      "integrity": "sha512-9qny7Z9DsQU8Ou39ERsPU4OZQlSTP47ShQzuKZ6PRXpYLtIFgl/DEBYEXKlvcEa+9tHVcK8CF81Y2V72qaZhWA==",
+      "license": "MIT",
+      "dependencies": {
+        "path-key": "^4.0.0",
+        "unicorn-magic": "^0.3.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "packages/generator-superset/node_modules/parse-json": {
+      "version": "8.3.0",
+      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-8.3.0.tgz",
+      "integrity": "sha512-ybiGyvspI+fAoRQbIPRddCcSTV9/LsJbf0e/S85VLowVGzRmokfneg2kwVW/KU5rOXrPSbF1qAKPMgNTqqROQQ==",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/code-frame": "^7.26.2",
+        "index-to-position": "^1.1.0",
+        "type-fest": "^4.39.1"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "packages/generator-superset/node_modules/parse-json/node_modules/type-fest": {
+      "version": "4.41.0",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.41.0.tgz",
+      "integrity": "sha512-TeTSQ6H5YHvpqVwBRcnLDCBnDOHWYu7IvGbHT6N8AOymcr9PJGjc1GTtiWZTYg0NCgYwvnYWEkVChQAr9bjfwA==",
+      "license": "(MIT OR CC0-1.0)",
+      "engines": {
+        "node": ">=16"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "packages/generator-superset/node_modules/path-key": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-4.0.0.tgz",
+      "integrity": "sha512-haREypq7xkM7ErfgIyA0z+Bj4AGKlMSdlQE2jvJo6huWD1EdkKYV+G/T4nq0YEF2vgTT8kqMFKo1uHn950r4SQ==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "packages/generator-superset/node_modules/read-package-up": {
+      "version": "12.0.0",
+      "resolved": "https://registry.npmjs.org/read-package-up/-/read-package-up-12.0.0.tgz",
+      "integrity": "sha512-Q5hMVBYur/eQNWDdbF4/Wqqr9Bjvtrw2kjGxxBbKLbx8bVCL8gcArjTy8zDUuLGQicftpMuU0riQNcAsbtOVsw==",
+      "license": "MIT",
+      "dependencies": {
+        "find-up-simple": "^1.0.1",
+        "read-pkg": "^10.0.0",
+        "type-fest": "^5.2.0"
+      },
+      "engines": {
+        "node": ">=20"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "packages/generator-superset/node_modules/read-pkg": {
+      "version": "10.1.0",
+      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-10.1.0.tgz",
+      "integrity": "sha512-I8g2lArQiP78ll51UeMZojewtYgIRCKCWqZEgOO8c/uefTI+XDXvCSXu3+YNUaTNvZzobrL5+SqHjBrByRRTdg==",
+      "license": "MIT",
+      "dependencies": {
+        "@types/normalize-package-data": "^2.4.4",
+        "normalize-package-data": "^8.0.0",
+        "parse-json": "^8.3.0",
+        "type-fest": "^5.4.4",
+        "unicorn-magic": "^0.4.0"
+      },
+      "engines": {
+        "node": ">=20"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "packages/generator-superset/node_modules/read-pkg/node_modules/unicorn-magic": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/unicorn-magic/-/unicorn-magic-0.4.0.tgz",
+      "integrity": "sha512-wH590V9VNgYH9g3lH9wWjTrUoKsjLF6sGLjhR4sH1LWpLmCOH0Zf7PukhDA8BiS7KHe4oPNkcTHqYkj7SOGUOw==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=20"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "packages/generator-superset/node_modules/signal-exit": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
       "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
-      "dev": true,
       "license": "ISC",
       "engines": {
         "node": ">=14"
@@ -51096,11 +51038,22 @@
         "url": "https://github.com/sponsors/isaacs"
       }
     },
+    "packages/generator-superset/node_modules/strip-final-newline": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-4.0.0.tgz",
+      "integrity": "sha512-aulFJcD6YK8V1G7iRB5tigAP4TsHBZZrOV8pjV++zdUwmeV8uzbY7yn6h9MswN62adStNZFuCIx4haBnRuMDaw==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "packages/generator-superset/node_modules/type-fest": {
       "version": "5.4.4",
       "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-5.4.4.tgz",
       "integrity": "sha512-JnTrzGu+zPV3aXIUhnyWJj4z/wigMsdYajGLIYakqyOW1nPllzXEJee0QQbHj+CTIQtXGlAjuK0UY+2xTyjVAw==",
-      "dev": true,
       "license": "(MIT OR CC0-1.0)",
       "dependencies": {
         "tagged-tag": "^1.0.0"
@@ -51112,11 +51065,22 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "packages/generator-superset/node_modules/unicorn-magic": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/unicorn-magic/-/unicorn-magic-0.3.0.tgz",
+      "integrity": "sha512-+QBBXBCvifc56fsbuxZQ6Sic3wqqc3WWaqxs58gvJrcOuN83HGTCwz3oS5phzU9LthRNE9VrJCFCLUgHeeFnfA==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "packages/generator-superset/node_modules/vinyl": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-3.0.1.tgz",
       "integrity": "sha512-0QwqXteBNXgnLCdWdvPQBX6FXRHtIH3VhJPTd5Lwn28tJXc34YqSCWUmkOvtJHBmB3gGoPtrOKk3Ts8/kEZ9aA==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "clone": "^2.1.2",
@@ -51128,6 +51092,43 @@
         "node": ">=10.13.0"
       }
     },
+    "packages/generator-superset/node_modules/yeoman-generator": {
+      "version": "8.1.2",
+      "resolved": "https://registry.npmjs.org/yeoman-generator/-/yeoman-generator-8.1.2.tgz",
+      "integrity": "sha512-5e9jK2EPm6/c/zaYnuKnCLbRWfD9XwJYup1VzdJMgj010cgDn3YJWDfOIczabLfSoRSXRFxTDHfx1MEdIJEcGQ==",
+      "license": "BSD-2-Clause",
+      "dependencies": {
+        "@types/debug": "^4.1.12",
+        "@types/lodash-es": "^4.17.12",
+        "@yeoman/namespace": "^1.0.1",
+        "chalk": "^5.6.2",
+        "debug": "^4.4.3",
+        "execa": "^9.6.1",
+        "latest-version": "^9.0.0",
+        "lodash-es": "^4.17.23",
+        "mem-fs-editor": "^12.0.2",
+        "minimist": "^1.2.8",
+        "read-package-up": "^12.0.0",
+        "semver": "^7.7.4",
+        "simple-git": "^3.32.3",
+        "sort-keys": "^6.0.0",
+        "text-table": "^0.2.0",
+        "type-fest": "^5.4.4"
+      },
+      "engines": {
+        "node": "^20.17.0 || >=22.9.0"
+      },
+      "peerDependencies": {
+        "@types/node": ">=20.19.35",
+        "@yeoman/types": "^1.1.1",
+        "mem-fs": "^4.0.0"
+      },
+      "peerDependenciesMeta": {
+        "@types/node": {
+          "optional": true
+        }
+      }
+    },
     "packages/generator-superset/node_modules/yeoman-test": {
       "version": "11.3.1",
       "resolved": "https://registry.npmjs.org/yeoman-test/-/yeoman-test-11.3.1.tgz",
@@ -51167,12 +51168,12 @@
     },
     "packages/superset-core": {
       "name": "@apache-superset/core",
-      "version": "0.1.0-rc1",
-      "license": "ISC",
+      "version": "0.1.0-rc2",
+      "license": "Apache-2.0",
       "devDependencies": {
         "@babel/cli": "^7.28.6",
         "@babel/core": "^7.29.0",
-        "@babel/preset-env": "^7.29.0",
+        "@babel/preset-env": "^7.29.2",
         "@babel/preset-react": "^7.28.5",
         "@babel/preset-typescript": "^7.28.5",
         "@emotion/styled": "^11.14.1",
@@ -51196,7 +51197,7 @@
         "@fontsource/inter": "^5.2.6",
         "antd": "^5.26.0",
         "jed": "^1.1.1",
-        "lodash": "^4.17.21",
+        "lodash": "^4.18.1",
         "nanoid": "^5.0.9",
         "react": "^17.0.2",
         "react-dom": "^17.0.2",
@@ -51211,10 +51212,11 @@
       "dependencies": {
         "@apache-superset/core": "*",
         "@types/react": "*",
-        "lodash": "^4.17.23"
+        "lodash": "^4.18.1",
+        "tinycolor2": "*"
       },
       "peerDependencies": {
-        "@ant-design/icons": "^5.2.6",
+        "@ant-design/icons": "^5.6.1",
         "@emotion/react": "^11.4.1",
         "@superset-ui/core": "*",
         "@testing-library/dom": "^8.20.1",
@@ -51235,29 +51237,29 @@
       "version": "0.20.4",
       "license": "Apache-2.0",
       "dependencies": {
-        "@ant-design/icons": "^5.2.6",
+        "@ant-design/icons": "^6.1.1",
         "@apache-superset/core": "*",
-        "@babel/runtime": "^7.28.6",
+        "@babel/runtime": "^7.29.2",
         "@types/json-bigint": "^1.0.4",
         "@visx/responsive": "^3.12.0",
         "ace-builds": "^1.43.6",
-        "ag-grid-community": "35.0.1",
-        "ag-grid-react": "35.0.1",
+        "ag-grid-community": "35.2.1",
+        "ag-grid-react": "35.2.1",
         "brace": "^0.11.1",
         "classnames": "^2.5.1",
-        "core-js": "^3.48.0",
+        "core-js": "^3.49.0",
         "csstype": "^3.2.3",
         "d3-format": "^3.1.2",
         "d3-interpolate": "^3.0.1",
         "d3-scale": "^4.0.2",
         "d3-time": "^3.1.0",
         "d3-time-format": "^4.1.0",
-        "dayjs": "^1.11.19",
-        "dompurify": "^3.3.3",
+        "dayjs": "^1.11.20",
+        "dompurify": "^3.4.0",
         "fetch-retry": "^6.0.0",
-        "handlebars": "^4.7.8",
+        "handlebars": "^4.7.9",
         "jed": "^1.1.1",
-        "lodash": "^4.17.23",
+        "lodash": "^4.18.1",
         "math-expression-evaluator": "^2.0.7",
         "pretty-ms": "^9.3.0",
         "re-resizable": "^6.11.2",
@@ -51267,7 +51269,7 @@
         "react-js-cron": "^5.2.0",
         "react-markdown": "^8.0.7",
         "react-resize-detector": "^7.1.2",
-        "react-syntax-highlighter": "^16.1.1",
+        "react-syntax-highlighter": "^16.1.0",
         "react-ultimate-pagination": "^1.3.2",
         "regenerator-runtime": "^0.14.1",
         "rehype-raw": "^7.0.0",
@@ -51285,9 +51287,9 @@
         "@types/d3-scale": "^2.1.1",
         "@types/d3-time": "^3.0.4",
         "@types/d3-time-format": "^4.0.3",
-        "@types/jquery": "^3.5.33",
+        "@types/jquery": "^4.0.0",
         "@types/lodash": "^4.17.24",
-        "@types/node": "^25.3.3",
+        "@types/node": "^25.6.0",
         "@types/prop-types": "^15.7.15",
         "@types/react-syntax-highlighter": "^15.5.13",
         "@types/react-table": "^7.7.20",
@@ -51296,7 +51298,7 @@
         "fetch-mock": "^12.6.0",
         "jest-mock-console": "^2.0.0",
         "resize-observer-polyfill": "1.5.1",
-        "timezone-mock": "1.4.0"
+        "timezone-mock": "^1.4.2"
       },
       "peerDependencies": {
         "@emotion/cache": "^11.4.0",
@@ -51319,6 +51321,57 @@
         "tinycolor2": "*"
       }
     },
+    "packages/superset-ui-core/node_modules/@ant-design/colors": {
+      "version": "8.0.1",
+      "resolved": "https://registry.npmjs.org/@ant-design/colors/-/colors-8.0.1.tgz",
+      "integrity": "sha512-foPVl0+SWIslGUtD/xBr1p9U4AKzPhNYEseXYRRo5QSzGACYZrQbe11AYJbYfAWnWSpGBx6JjBmSeugUsD9vqQ==",
+      "license": "MIT",
+      "dependencies": {
+        "@ant-design/fast-color": "^3.0.0"
+      }
+    },
+    "packages/superset-ui-core/node_modules/@ant-design/fast-color": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/@ant-design/fast-color/-/fast-color-3.0.1.tgz",
+      "integrity": "sha512-esKJegpW4nckh0o6kV3Tkb7NPIZYbPnnFxmQDUmL08ukXZAvV85TZBr70eGuke/CIArLaP6aw8lt9KILjnWuOw==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=8.x"
+      }
+    },
+    "packages/superset-ui-core/node_modules/@ant-design/icons": {
+      "version": "6.1.1",
+      "resolved": "https://registry.npmjs.org/@ant-design/icons/-/icons-6.1.1.tgz",
+      "integrity": "sha512-AMT4N2y++TZETNHiM77fs4a0uPVCJGuL5MTonk13Pvv7UN7sID1cNEZOc1qNqx6zLKAOilTEFAdAoAFKa0U//Q==",
+      "license": "MIT",
+      "dependencies": {
+        "@ant-design/colors": "^8.0.0",
+        "@ant-design/icons-svg": "^4.4.0",
+        "@rc-component/util": "^1.3.0",
+        "clsx": "^2.1.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "peerDependencies": {
+        "react": ">=16.0.0",
+        "react-dom": ">=16.0.0"
+      }
+    },
+    "packages/superset-ui-core/node_modules/@ant-design/icons/node_modules/@rc-component/util": {
+      "version": "1.10.0",
+      "resolved": "https://registry.npmjs.org/@rc-component/util/-/util-1.10.0.tgz",
+      "integrity": "sha512-aY9GLBuiUdpyfIUpAWSYer4Tu3mVaZCo5A0q9NtXcazT3MRiI3/WNHCR+DUn5VAtR6iRRf0ynCqQUcHli5UdYw==",
+      "license": "MIT",
+      "dependencies": {
+        "is-mobile": "^5.0.0",
+        "react-is": "^18.2.0"
+      },
+      "peerDependencies": {
+        "react": ">=18.0.0",
+        "react-dom": ">=18.0.0"
+      }
+    },
     "packages/superset-ui-core/node_modules/@types/mdast": {
       "version": "3.0.15",
       "resolved": "https://registry.npmjs.org/@types/mdast/-/mdast-3.0.15.tgz",
@@ -51336,9 +51389,9 @@
       "license": "MIT"
     },
     "packages/superset-ui-core/node_modules/core-js": {
-      "version": "3.48.0",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.48.0.tgz",
-      "integrity": "sha512-zpEHTy1fjTMZCKLHUZoVeylt9XrzaIN2rbPXEt0k+q7JE5CkCZdo6bNq55bn24a69CH7ErAVLKijxJja4fw+UQ==",
+      "version": "3.49.0",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.49.0.tgz",
+      "integrity": "sha512-es1U2+YTtzpwkxVLwAFdSpaIMyQaq0PBgm3YD1W3Qpsn1NAmO3KSgZfu+oGSWVu6NvLHoHCV/aYcsE5wiB7ALg==",
       "hasInstallScript": true,
       "license": "MIT",
       "funding": {
@@ -52200,6 +52253,13 @@
         "url": "https://opencollective.com/unified"
       }
     },
+    "packages/superset-ui-core/node_modules/timezone-mock": {
+      "version": "1.4.2",
+      "resolved": "https://registry.npmjs.org/timezone-mock/-/timezone-mock-1.4.2.tgz",
+      "integrity": "sha512-RgPQkSrARNHBnchuFpjrYf97uWgEaseCXK2asSeGcgUzRUO3cBR9Zu0uO1z2Eyi/TQsQtHIvQLi0br30COHWUA==",
+      "dev": true,
+      "license": "MIT"
+    },
     "packages/superset-ui-core/node_modules/unist-util-is": {
       "version": "5.2.1",
       "resolved": "https://registry.npmjs.org/unist-util-is/-/unist-util-is-5.2.1.tgz",
@@ -52291,7 +52351,7 @@
       "dependencies": {
         "d3": "^3.5.17",
         "prop-types": "^15.8.1",
-        "react": "^19.2.1"
+        "react": "^19.2.5"
       },
       "peerDependencies": {
         "@apache-superset/core": "*",
@@ -52300,9 +52360,9 @@
       }
     },
     "plugins/legacy-plugin-chart-chord/node_modules/react": {
-      "version": "19.2.3",
-      "resolved": "https://registry.npmjs.org/react/-/react-19.2.3.tgz",
-      "integrity": "sha512-Ku/hhYbVjOQnXDZFv2+RibmLFGwFdeeKHFcOTlrt7xplBnya5OGn/hIRDsqDiSUcfORsDC7MPxwork8jBwsIWA==",
+      "version": "19.2.5",
+      "resolved": "https://registry.npmjs.org/react/-/react-19.2.5.tgz",
+      "integrity": "sha512-llUJLzz1zTUBrskt2pwZgLq59AemifIftw4aB7JxOqf1HY2FDaGDxgwpAPVzHU1kdWabH7FauP4i1oEeer2WCA==",
       "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
@@ -52373,6 +52433,7 @@
     "plugins/legacy-plugin-chart-map-box": {
       "name": "@superset-ui/legacy-plugin-chart-map-box",
       "version": "0.20.3",
+      "extraneous": true,
       "license": "Apache-2.0",
       "dependencies": {
         "@math.gl/web-mercator": "^4.1.0",
@@ -52488,15 +52549,16 @@
     "plugins/legacy-preset-chart-deckgl": {
       "name": "@superset-ui/legacy-preset-chart-deckgl",
       "version": "0.20.4",
+      "extraneous": true,
       "license": "Apache-2.0",
       "dependencies": {
-        "@deck.gl/aggregation-layers": "~9.2.5",
+        "@deck.gl/aggregation-layers": "~9.2.11",
         "@deck.gl/core": "~9.2.5",
-        "@deck.gl/extensions": "~9.2.5",
+        "@deck.gl/extensions": "~9.2.9",
         "@deck.gl/geo-layers": "~9.2.5",
         "@deck.gl/layers": "~9.2.5",
         "@deck.gl/mesh-layers": "~9.2.5",
-        "@deck.gl/react": "~9.2.5",
+        "@deck.gl/react": "~9.2.11",
         "@luma.gl/constants": "~9.2.5",
         "@luma.gl/core": "~9.2.5",
         "@luma.gl/engine": "~9.2.6",
@@ -52511,8 +52573,8 @@
         "d3-array": "^3.2.4",
         "d3-color": "^3.1.0",
         "d3-scale": "^4.0.2",
-        "handlebars": "^4.7.8",
-        "lodash": "^4.17.23",
+        "handlebars": "^4.7.9",
+        "lodash": "^4.18.1",
         "mousetrap": "^1.6.5",
         "ngeohash": "^0.6.3",
         "prop-types": "^15.8.1",
@@ -52537,67 +52599,6 @@
         "react-map-gl": "^6.1.19"
       }
     },
-    "plugins/legacy-preset-chart-deckgl/node_modules/@deck.gl/mesh-layers": {
-      "version": "9.2.5",
-      "resolved": "https://registry.npmjs.org/@deck.gl/mesh-layers/-/mesh-layers-9.2.5.tgz",
-      "integrity": "sha512-OJ7Nx6xhp7+bQ4S4asUUp7PdGwcfmQpQhe5SHDGy1UBZ0yZE+ojOo9uvVfXvGBnqq4Zpg9avV+WRN1/BffBsOw==",
-      "license": "MIT",
-      "dependencies": {
-        "@loaders.gl/gltf": "^4.2.0",
-        "@loaders.gl/schema": "^4.2.0",
-        "@luma.gl/gltf": "^9.2.4",
-        "@luma.gl/shadertools": "^9.2.4"
-      },
-      "peerDependencies": {
-        "@deck.gl/core": "~9.2.0",
-        "@luma.gl/core": "~9.2.4",
-        "@luma.gl/engine": "~9.2.4",
-        "@luma.gl/gltf": "~9.2.4",
-        "@luma.gl/shadertools": "~9.2.4"
-      }
-    },
-    "plugins/legacy-preset-chart-deckgl/node_modules/@luma.gl/gltf": {
-      "version": "9.2.4",
-      "resolved": "https://registry.npmjs.org/@luma.gl/gltf/-/gltf-9.2.4.tgz",
-      "integrity": "sha512-OhT9Aq8/MC9r/ii8hAW7sPlIbol1ZG74jsZXsFsoGzw9gfuxT5LX71rQ/oKnsDz7dGf2cM+bM3qe8C7QiIaUvw==",
-      "license": "MIT",
-      "dependencies": {
-        "@loaders.gl/core": "^4.2.0",
-        "@loaders.gl/gltf": "^4.2.0",
-        "@loaders.gl/textures": "^4.2.0",
-        "@math.gl/core": "^4.1.0"
-      },
-      "peerDependencies": {
-        "@luma.gl/constants": "~9.2.0",
-        "@luma.gl/core": "~9.2.0",
-        "@luma.gl/engine": "~9.2.0",
-        "@luma.gl/shadertools": "~9.2.0"
-      }
-    },
-    "plugins/legacy-preset-chart-deckgl/node_modules/@mapbox/tiny-sdf": {
-      "version": "2.0.7",
-      "resolved": "https://registry.npmjs.org/@mapbox/tiny-sdf/-/tiny-sdf-2.0.7.tgz",
-      "integrity": "sha512-25gQLQMcpivjOSA40g3gO6qgiFPDpWRoMfd+G/GoppPIeP6JDaMMkMrEJnMZhKyyS6iKwVt5YKu02vCUyJM3Ug==",
-      "license": "BSD-2-Clause"
-    },
-    "plugins/legacy-preset-chart-deckgl/node_modules/d3-array": {
-      "version": "3.2.4",
-      "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-3.2.4.tgz",
-      "integrity": "sha512-tdQAmyA18i4J7wprpYq8ClcxZy3SC31QMeByyCFyRt7BVHdREQZ5lpzoe5mFEYZUWe+oq8HBvk9JjpibyEV4Jg==",
-      "license": "ISC",
-      "dependencies": {
-        "internmap": "1 - 2"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "plugins/legacy-preset-chart-deckgl/node_modules/internmap": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/internmap/-/internmap-1.0.1.tgz",
-      "integrity": "sha512-lDB5YccMydFBtasVtxnZ3MRBHuaoE8GKsppq+EchKL2U4nK/DmEpPHNH8MZe5HkMtpSiTSOZwfN0tzYjO/lJEw==",
-      "license": "ISC"
-    },
     "plugins/legacy-preset-chart-nvd3": {
       "name": "@superset-ui/legacy-preset-chart-nvd3",
       "version": "0.20.3",
@@ -52605,9 +52606,9 @@
       "dependencies": {
         "d3": "^3.5.17",
         "d3-tip": "^0.9.1",
-        "dompurify": "^3.3.3",
+        "dompurify": "^3.4.0",
         "fast-safe-stringify": "^2.1.1",
-        "lodash": "^4.17.23",
+        "lodash": "^4.18.1",
         "nvd3-fork": "^2.0.5",
         "prop-types": "^15.8.1",
         "urijs": "^1.19.11"
@@ -52629,14 +52630,14 @@
         "@types/react-table": "^7.7.20",
         "classnames": "^2.5.1",
         "d3-array": "^3.2.4",
-        "lodash": "^4.17.23",
+        "lodash": "^4.18.1",
         "memoize-one": "^5.2.1",
         "react-table": "^7.8.0",
         "regenerator-runtime": "^0.14.1",
         "xss": "^1.0.15"
       },
       "peerDependencies": {
-        "@ant-design/icons": "^5.2.6",
+        "@ant-design/icons": "^5.6.1",
         "@apache-superset/core": "*",
         "@superset-ui/chart-controls": "*",
         "@superset-ui/core": "*",
@@ -52646,7 +52647,6 @@
         "@testing-library/react-hooks": "*",
         "@testing-library/user-event": "*",
         "@types/react": "*",
-        "match-sorter": "^6.3.3",
         "react": "^17.0.2",
         "react-dom": "^17.0.2"
       }
@@ -52670,10 +52670,10 @@
       "dependencies": {
         "@types/geojson": "^7946.0.16",
         "geojson": "^0.5.0",
-        "lodash": "^4.17.23"
+        "lodash": "^4.18.1"
       },
       "peerDependencies": {
-        "@ant-design/icons": "^5.2.6",
+        "@ant-design/icons": "^5.6.1",
         "@apache-superset/core": "*",
         "@reduxjs/toolkit": "*",
         "@superset-ui/chart-controls": "*",
@@ -52699,7 +52699,7 @@
         "@types/react-redux": "^7.1.34",
         "acorn": "^8.16.0",
         "d3-array": "^3.2.4",
-        "lodash": "^4.17.23",
+        "lodash": "^4.18.1",
         "zod": "^4.3.6"
       },
       "peerDependencies": {
@@ -52757,7 +52757,7 @@
         "ace-builds": "^1.4.14",
         "dayjs": "^1.11.19",
         "handlebars": "^4.7.8",
-        "lodash": "^4.17.11",
+        "lodash": "^4.18.1",
         "react": "^17.0.2",
         "react-ace": "^10.1.0",
         "react-dom": "^17.0.2"
@@ -52792,15 +52792,135 @@
         "jest": "^30.3.0"
       },
       "peerDependencies": {
-        "@ant-design/icons": "^5.2.6",
+        "@ant-design/icons": "^5.6.1",
         "@apache-superset/core": "*",
         "@superset-ui/chart-controls": "*",
         "@superset-ui/core": "*",
-        "lodash": "^4.17.11",
+        "lodash": "^4.18.1",
         "prop-types": "*",
         "react": "^17.0.2",
-        "react-dom": "^17.0.2",
-        "react-icons": "5.4.0"
+        "react-dom": "^17.0.2"
+      }
+    },
+    "plugins/plugin-chart-point-cluster-map": {
+      "name": "@superset-ui/plugin-chart-point-cluster-map",
+      "version": "1.0.0",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@math.gl/web-mercator": "^4.1.0",
+        "mapbox-gl": "^3.22.0",
+        "maplibre-gl": "^5.23.0",
+        "react-map-gl": "^8.1.0",
+        "supercluster": "^8.0.1"
+      },
+      "peerDependencies": {
+        "@apache-superset/core": "*",
+        "@superset-ui/chart-controls": "*",
+        "@superset-ui/core": "*",
+        "react": "^17.0.2 || ^19.0.0",
+        "react-dom": "^17.0.2 || ^19.0.0"
+      }
+    },
+    "plugins/plugin-chart-point-cluster-map/node_modules/@mapbox/point-geometry": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@mapbox/point-geometry/-/point-geometry-1.1.0.tgz",
+      "integrity": "sha512-YGcBz1cg4ATXDCM/71L9xveh4dynfGmcLDqufR+nQQy3fKwsAZsWd/x4621/6uJaeB9mwOHE6hPeDgXz9uViUQ==",
+      "license": "ISC"
+    },
+    "plugins/plugin-chart-point-cluster-map/node_modules/@mapbox/vector-tile": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/@mapbox/vector-tile/-/vector-tile-2.0.4.tgz",
+      "integrity": "sha512-AkOLcbgGTdXScosBWwmmD7cDlvOjkg/DetGva26pIRiZPdeJYjYKarIlb4uxVzi6bwHO6EWH82eZ5Nuv4T5DUg==",
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "@mapbox/point-geometry": "~1.1.0",
+        "@types/geojson": "^7946.0.16",
+        "pbf": "^4.0.1"
+      }
+    },
+    "plugins/plugin-chart-point-cluster-map/node_modules/@maplibre/geojson-vt": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/@maplibre/geojson-vt/-/geojson-vt-6.1.0.tgz",
+      "integrity": "sha512-2eIY4gZxeKIVOZVNkAMb+5NgXhgsMQpOveTQAvnp53LYqHGJZDidk7Ew0Tged9PThidpbS+NFTh0g4zivhPDzQ==",
+      "license": "ISC",
+      "dependencies": {
+        "kdbush": "^4.0.2"
+      }
+    },
+    "plugins/plugin-chart-point-cluster-map/node_modules/earcut": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/earcut/-/earcut-3.0.2.tgz",
+      "integrity": "sha512-X7hshQbLyMJ/3RPhyObLARM2sNxxmRALLKx1+NVFFnQ9gKzmCrxm9+uLIAdBcvc8FNLpctqlQ2V6AE92Ol9UDQ==",
+      "license": "ISC"
+    },
+    "plugins/plugin-chart-point-cluster-map/node_modules/maplibre-gl": {
+      "version": "5.23.0",
+      "resolved": "https://registry.npmjs.org/maplibre-gl/-/maplibre-gl-5.23.0.tgz",
+      "integrity": "sha512-aou8YBNFS8uVtDWFWt0W/6oorfl18wt+oIA8fnXk1kivjkbtXi9gGrQvflTpwrR3hG13aWdIdbYWeN0NFMV7ag==",
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "@mapbox/jsonlint-lines-primitives": "^2.0.2",
+        "@mapbox/point-geometry": "^1.1.0",
+        "@mapbox/tiny-sdf": "^2.0.7",
+        "@mapbox/unitbezier": "^0.0.1",
+        "@mapbox/vector-tile": "^2.0.4",
+        "@mapbox/whoots-js": "^3.1.0",
+        "@maplibre/geojson-vt": "^6.1.0",
+        "@maplibre/maplibre-gl-style-spec": "^24.8.1",
+        "@maplibre/mlt": "^1.1.8",
+        "@maplibre/vt-pbf": "^4.3.0",
+        "@types/geojson": "^7946.0.16",
+        "earcut": "^3.0.2",
+        "gl-matrix": "^3.4.4",
+        "kdbush": "^4.0.2",
+        "murmurhash-js": "^1.0.0",
+        "pbf": "^4.0.1",
+        "potpack": "^2.1.0",
+        "quickselect": "^3.0.0",
+        "tinyqueue": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=16.14.0",
+        "npm": ">=8.1.0"
+      },
+      "funding": {
+        "url": "https://github.com/maplibre/maplibre-gl-js?sponsor=1"
+      }
+    },
+    "plugins/plugin-chart-point-cluster-map/node_modules/pbf": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/pbf/-/pbf-4.0.1.tgz",
+      "integrity": "sha512-SuLdBvS42z33m8ejRbInMapQe8n0D3vN/Xd5fmWM3tufNgRQFBpaW2YVJxQZV4iPNqb0vEFvssMEo5w9c6BTIA==",
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "resolve-protobuf-schema": "^2.1.0"
+      },
+      "bin": {
+        "pbf": "bin/pbf"
+      }
+    },
+    "plugins/plugin-chart-point-cluster-map/node_modules/react-map-gl": {
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/react-map-gl/-/react-map-gl-8.1.0.tgz",
+      "integrity": "sha512-vDx/QXR3Tb+8/ap/z6gdMjJQ8ZEyaZf6+uMSPz7jhWF5VZeIsKsGfPvwHVPPwGF43Ryn+YR4bd09uEFNR5OPdg==",
+      "license": "MIT",
+      "dependencies": {
+        "@vis.gl/react-mapbox": "8.1.0",
+        "@vis.gl/react-maplibre": "8.1.0"
+      },
+      "peerDependencies": {
+        "mapbox-gl": ">=1.13.0",
+        "maplibre-gl": ">=1.13.0",
+        "react": ">=16.3.0",
+        "react-dom": ">=16.3.0"
+      },
+      "peerDependenciesMeta": {
+        "mapbox-gl": {
+          "optional": true
+        },
+        "maplibre-gl": {
+          "optional": true
+        }
       }
     },
     "plugins/plugin-chart-table": {
@@ -52812,15 +52932,14 @@
         "@types/react-table": "^7.7.20",
         "classnames": "^2.5.1",
         "d3-array": "^3.2.4",
-        "lodash": "^4.17.23",
+        "lodash": "^4.18.1",
         "memoize-one": "^5.2.1",
-        "react-icons": "5.4.0",
         "react-table": "^7.8.0",
         "regenerator-runtime": "^0.14.1",
         "xss": "^1.0.15"
       },
       "peerDependencies": {
-        "@ant-design/icons": "^5.2.6",
+        "@ant-design/icons": "^5.6.1",
         "@apache-superset/core": "*",
         "@superset-ui/chart-controls": "*",
         "@superset-ui/core": "*",
@@ -52830,7 +52949,7 @@
         "@testing-library/react-hooks": "*",
         "@testing-library/user-event": "*",
         "@types/react": "*",
-        "match-sorter": "^6.3.3",
+        "match-sorter": "^8.2.0",
         "react": "^17.0.2",
         "react-dom": "^17.0.2"
       }
@@ -52853,7 +52972,7 @@
       "license": "Apache-2.0",
       "dependencies": {
         "@types/d3-scale": "^4.0.9",
-        "d3-cloud": "^1.2.9",
+        "d3-cloud": "^1.2.8",
         "d3-scale": "^4.0.2"
       },
       "devDependencies": {
@@ -52886,6 +53005,202 @@
         "d3-dispatch": "^1.0.3"
       }
     },
+    "plugins/preset-chart-deckgl": {
+      "name": "@superset-ui/preset-chart-deckgl",
+      "version": "1.0.0",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@deck.gl/aggregation-layers": "~9.2.11",
+        "@deck.gl/core": "~9.2.5",
+        "@deck.gl/extensions": "~9.2.9",
+        "@deck.gl/geo-layers": "~9.2.5",
+        "@deck.gl/layers": "~9.2.5",
+        "@deck.gl/mapbox": "^9.3.1",
+        "@deck.gl/mesh-layers": "~9.2.5",
+        "@luma.gl/constants": "~9.2.5",
+        "@luma.gl/core": "~9.2.5",
+        "@luma.gl/engine": "~9.2.6",
+        "@luma.gl/shadertools": "~9.2.6",
+        "@luma.gl/webgl": "~9.2.6",
+        "@mapbox/geojson-extent": "^1.0.1",
+        "@math.gl/web-mercator": "^4.1.0",
+        "@types/d3-array": "^3.2.2",
+        "@types/geojson": "^7946.0.16",
+        "bootstrap-slider": "^11.0.2",
+        "d3-array": "^3.2.4",
+        "d3-color": "^3.1.0",
+        "d3-scale": "^4.0.2",
+        "handlebars": "^4.7.9",
+        "lodash": "^4.18.1",
+        "maplibre-gl": "^5.23.0",
+        "mousetrap": "^1.6.5",
+        "ngeohash": "^0.6.3",
+        "prop-types": "^15.8.1",
+        "react-map-gl": "^8.1.1",
+        "underscore": "^1.13.7",
+        "urijs": "^1.19.11",
+        "xss": "^1.0.15"
+      },
+      "devDependencies": {
+        "@types/mapbox__geojson-extent": "^1.0.3",
+        "@types/ngeohash": "^0.6.8",
+        "@types/underscore": "^1.13.0",
+        "@types/urijs": "^1.19.26"
+      },
+      "peerDependencies": {
+        "@apache-superset/core": "*",
+        "@superset-ui/chart-controls": "*",
+        "@superset-ui/core": "*",
+        "dayjs": "^1.11.19",
+        "mapbox-gl": ">=1.0.0",
+        "react": "^17.0.2 || ^19.0.0",
+        "react-dom": "^17.0.2 || ^19.0.0"
+      },
+      "peerDependenciesMeta": {
+        "mapbox-gl": {
+          "optional": true
+        }
+      }
+    },
+    "plugins/preset-chart-deckgl/node_modules/@deck.gl/aggregation-layers": {
+      "version": "9.2.11",
+      "resolved": "https://registry.npmjs.org/@deck.gl/aggregation-layers/-/aggregation-layers-9.2.11.tgz",
+      "integrity": "sha512-MRFbBHtMcDkOthxXnMPm6nF08DjFDACaIQsJSyHkdWtLUTSLHsWnOTn/8QbB4ka86WyNyfJy3dibLu/m3ei2ow==",
+      "license": "MIT",
+      "dependencies": {
+        "@luma.gl/constants": "~9.2.6",
+        "@luma.gl/shadertools": "~9.2.6",
+        "@math.gl/core": "^4.1.0",
+        "@math.gl/web-mercator": "^4.1.0",
+        "d3-hexbin": "^0.2.1"
+      },
+      "peerDependencies": {
+        "@deck.gl/core": "~9.2.0",
+        "@deck.gl/layers": "~9.2.0",
+        "@luma.gl/core": "~9.2.6",
+        "@luma.gl/engine": "~9.2.6"
+      }
+    },
+    "plugins/preset-chart-deckgl/node_modules/@deck.gl/extensions": {
+      "version": "9.2.11",
+      "resolved": "https://registry.npmjs.org/@deck.gl/extensions/-/extensions-9.2.11.tgz",
+      "integrity": "sha512-zlpM4Bg1ifBziW1Juiii9NY5gyW2rEhyVTWnhagH/bpTCZ2E73OhnToYt1ouqmoxL6lMtIjhRXz6LPb7tJbHHQ==",
+      "license": "MIT",
+      "dependencies": {
+        "@luma.gl/constants": "~9.2.6",
+        "@luma.gl/shadertools": "~9.2.6",
+        "@math.gl/core": "^4.1.0"
+      },
+      "peerDependencies": {
+        "@deck.gl/core": "~9.2.0",
+        "@luma.gl/core": "~9.2.6",
+        "@luma.gl/engine": "~9.2.6"
+      }
+    },
+    "plugins/preset-chart-deckgl/node_modules/@deck.gl/mapbox": {
+      "version": "9.3.1",
+      "resolved": "https://registry.npmjs.org/@deck.gl/mapbox/-/mapbox-9.3.1.tgz",
+      "integrity": "sha512-4SgpWMeZiqiZEiz9yPdr89cVRL8HFcvXLxXUA0ExhMreUdNuK/j2OIQHPhw6vp1xCFbJEEqRelQ0pJYkhGDkYw==",
+      "license": "MIT",
+      "dependencies": {
+        "@math.gl/web-mercator": "^4.1.0"
+      },
+      "peerDependencies": {
+        "@deck.gl/core": "~9.3.0",
+        "@luma.gl/core": "~9.3.2",
+        "@math.gl/web-mercator": "^4.1.0"
+      }
+    },
+    "plugins/preset-chart-deckgl/node_modules/@mapbox/point-geometry": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@mapbox/point-geometry/-/point-geometry-1.1.0.tgz",
+      "integrity": "sha512-YGcBz1cg4ATXDCM/71L9xveh4dynfGmcLDqufR+nQQy3fKwsAZsWd/x4621/6uJaeB9mwOHE6hPeDgXz9uViUQ==",
+      "license": "ISC"
+    },
+    "plugins/preset-chart-deckgl/node_modules/@mapbox/vector-tile": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/@mapbox/vector-tile/-/vector-tile-2.0.4.tgz",
+      "integrity": "sha512-AkOLcbgGTdXScosBWwmmD7cDlvOjkg/DetGva26pIRiZPdeJYjYKarIlb4uxVzi6bwHO6EWH82eZ5Nuv4T5DUg==",
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "@mapbox/point-geometry": "~1.1.0",
+        "@types/geojson": "^7946.0.16",
+        "pbf": "^4.0.1"
+      }
+    },
+    "plugins/preset-chart-deckgl/node_modules/@maplibre/geojson-vt": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/@maplibre/geojson-vt/-/geojson-vt-6.1.0.tgz",
+      "integrity": "sha512-2eIY4gZxeKIVOZVNkAMb+5NgXhgsMQpOveTQAvnp53LYqHGJZDidk7Ew0Tged9PThidpbS+NFTh0g4zivhPDzQ==",
+      "license": "ISC",
+      "dependencies": {
+        "kdbush": "^4.0.2"
+      }
+    },
+    "plugins/preset-chart-deckgl/node_modules/d3-array": {
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-3.2.4.tgz",
+      "integrity": "sha512-tdQAmyA18i4J7wprpYq8ClcxZy3SC31QMeByyCFyRt7BVHdREQZ5lpzoe5mFEYZUWe+oq8HBvk9JjpibyEV4Jg==",
+      "license": "ISC",
+      "dependencies": {
+        "internmap": "1 - 2"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "plugins/preset-chart-deckgl/node_modules/earcut": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/earcut/-/earcut-3.0.2.tgz",
+      "integrity": "sha512-X7hshQbLyMJ/3RPhyObLARM2sNxxmRALLKx1+NVFFnQ9gKzmCrxm9+uLIAdBcvc8FNLpctqlQ2V6AE92Ol9UDQ==",
+      "license": "ISC"
+    },
+    "plugins/preset-chart-deckgl/node_modules/maplibre-gl": {
+      "version": "5.23.0",
+      "resolved": "https://registry.npmjs.org/maplibre-gl/-/maplibre-gl-5.23.0.tgz",
+      "integrity": "sha512-aou8YBNFS8uVtDWFWt0W/6oorfl18wt+oIA8fnXk1kivjkbtXi9gGrQvflTpwrR3hG13aWdIdbYWeN0NFMV7ag==",
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "@mapbox/jsonlint-lines-primitives": "^2.0.2",
+        "@mapbox/point-geometry": "^1.1.0",
+        "@mapbox/tiny-sdf": "^2.0.7",
+        "@mapbox/unitbezier": "^0.0.1",
+        "@mapbox/vector-tile": "^2.0.4",
+        "@mapbox/whoots-js": "^3.1.0",
+        "@maplibre/geojson-vt": "^6.1.0",
+        "@maplibre/maplibre-gl-style-spec": "^24.8.1",
+        "@maplibre/mlt": "^1.1.8",
+        "@maplibre/vt-pbf": "^4.3.0",
+        "@types/geojson": "^7946.0.16",
+        "earcut": "^3.0.2",
+        "gl-matrix": "^3.4.4",
+        "kdbush": "^4.0.2",
+        "murmurhash-js": "^1.0.0",
+        "pbf": "^4.0.1",
+        "potpack": "^2.1.0",
+        "quickselect": "^3.0.0",
+        "tinyqueue": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=16.14.0",
+        "npm": ">=8.1.0"
+      },
+      "funding": {
+        "url": "https://github.com/maplibre/maplibre-gl-js?sponsor=1"
+      }
+    },
+    "plugins/preset-chart-deckgl/node_modules/pbf": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/pbf/-/pbf-4.0.1.tgz",
+      "integrity": "sha512-SuLdBvS42z33m8ejRbInMapQe8n0D3vN/Xd5fmWM3tufNgRQFBpaW2YVJxQZV4iPNqb0vEFvssMEo5w9c6BTIA==",
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "resolve-protobuf-schema": "^2.1.0"
+      },
+      "bin": {
+        "pbf": "bin/pbf"
+      }
+    },
     "tools/eslint-i18n-strings": {
       "version": "1.0.0",
       "extraneous": true,
diff --git a/superset-frontend/package.json b/superset-frontend/package.json
index b1a82dd245e..e13d08ca31c 100644
--- a/superset-frontend/package.json
+++ b/superset-frontend/package.json
@@ -128,17 +128,17 @@
     "@superset-ui/legacy-plugin-chart-chord": "file:./plugins/legacy-plugin-chart-chord",
     "@superset-ui/legacy-plugin-chart-country-map": "file:./plugins/legacy-plugin-chart-country-map",
     "@superset-ui/legacy-plugin-chart-horizon": "file:./plugins/legacy-plugin-chart-horizon",
-    "@superset-ui/legacy-plugin-chart-map-box": "file:./plugins/legacy-plugin-chart-map-box",
     "@superset-ui/legacy-plugin-chart-paired-t-test": "file:./plugins/legacy-plugin-chart-paired-t-test",
     "@superset-ui/legacy-plugin-chart-parallel-coordinates": "file:./plugins/legacy-plugin-chart-parallel-coordinates",
     "@superset-ui/legacy-plugin-chart-partition": "file:./plugins/legacy-plugin-chart-partition",
     "@superset-ui/legacy-plugin-chart-rose": "file:./plugins/legacy-plugin-chart-rose",
     "@superset-ui/legacy-plugin-chart-world-map": "file:./plugins/legacy-plugin-chart-world-map",
-    "@superset-ui/legacy-preset-chart-deckgl": "file:./plugins/legacy-preset-chart-deckgl",
+    "@superset-ui/preset-chart-deckgl": "file:./plugins/preset-chart-deckgl",
     "@superset-ui/legacy-preset-chart-nvd3": "file:./plugins/legacy-preset-chart-nvd3",
     "@superset-ui/plugin-chart-ag-grid-table": "file:./plugins/plugin-chart-ag-grid-table",
     "@superset-ui/plugin-chart-cartodiagram": "file:./plugins/plugin-chart-cartodiagram",
     "@superset-ui/plugin-chart-echarts": "file:./plugins/plugin-chart-echarts",
+    "@superset-ui/plugin-chart-point-cluster-map": "file:./plugins/plugin-chart-point-cluster-map",
     "@superset-ui/plugin-chart-handlebars": "file:./plugins/plugin-chart-handlebars",
     "@superset-ui/plugin-chart-pivot-table": "file:./plugins/plugin-chart-pivot-table",
     "@superset-ui/plugin-chart-table": "file:./plugins/plugin-chart-table",
@@ -154,49 +154,49 @@
     "@visx/scale": "^3.5.0",
     "@visx/tooltip": "^3.0.0",
     "@visx/xychart": "^3.5.1",
-    "ag-grid-community": "35.0.1",
-    "ag-grid-react": "35.0.1",
+    "ag-grid-community": "35.2.1",
+    "ag-grid-react": "35.2.1",
     "antd": "^5.26.0",
     "chrono-node": "^2.9.0",
     "classnames": "^2.2.5",
     "content-disposition": "^1.0.1",
     "d3-color": "^3.1.0",
     "d3-scale": "^4.0.2",
-    "dayjs": "^1.11.19",
+    "dayjs": "^1.11.20",
     "dom-to-image-more": "^3.7.2",
     "dom-to-pdf": "^0.3.2",
     "echarts": "^5.6.0",
     "fast-glob": "^3.3.2",
-    "fs-extra": "^11.3.3",
-    "fuse.js": "^7.1.0",
-    "geolib": "^3.3.4",
-    "geostyler": "^18.3.1",
+    "fs-extra": "^11.3.4",
+    "fuse.js": "^7.3.0",
+    "geolib": "^3.3.14",
+    "geostyler": "^18.5.0",
     "geostyler-data": "^1.1.0",
-    "geostyler-openlayers-parser": "^5.4.0",
+    "geostyler-openlayers-parser": "^5.7.0",
     "geostyler-style": "11.0.2",
     "geostyler-wfs-parser": "^3.0.1",
-    "google-auth-library": "^10.6.1",
+    "google-auth-library": "^10.6.2",
     "immer": "^11.1.4",
     "interweave": "^13.1.1",
     "jquery": "^4.0.0",
     "js-levenshtein": "^1.1.6",
     "json-bigint": "^1.0.0",
     "json-stringify-pretty-compact": "^2.0.0",
-    "lodash": "^4.17.23",
-    "mapbox-gl": "^3.19.0",
-    "markdown-to-jsx": "^9.7.6",
-    "match-sorter": "^6.3.4",
+    "lodash": "^4.18.1",
+    "mapbox-gl": "^3.22.0",
+    "markdown-to-jsx": "^9.7.16",
+    "match-sorter": "^8.2.0",
     "memoize-one": "^5.2.1",
     "mousetrap": "^1.6.5",
     "mustache": "^4.2.0",
-    "nanoid": "^5.1.6",
+    "nanoid": "^5.1.9",
     "ol": "^10.8.0",
     "pretty-ms": "^9.3.0",
     "query-string": "9.3.1",
     "re-resizable": "^6.11.2",
     "react": "^17.0.2",
-    "react-arborist": "^3.4.3",
-    "react-checkbox-tree": "^1.8.0",
+    "react-arborist": "^3.5.0",
+    "react-checkbox-tree": "^2.0.1",
     "react-diff-viewer-continued": "^4.2.0",
     "react-dnd": "^11.1.3",
     "react-dnd-html5-backend": "^11.1.3",
@@ -230,7 +230,7 @@
     "use-event-callback": "^0.1.0",
     "use-immer": "^0.11.0",
     "use-query-params": "^2.2.2",
-    "uuid": "^13.0.0",
+    "uuid": "^14.0.0",
     "xlsx": "https://cdn.sheetjs.com/xlsx-0.20.3/xlsx-0.20.3.tgz",
     "yargs": "^17.7.2"
   },
@@ -244,34 +244,34 @@
     "@babel/plugin-transform-export-namespace-from": "^7.27.1",
     "@babel/plugin-transform-modules-commonjs": "^7.28.6",
     "@babel/plugin-transform-runtime": "^7.29.0",
-    "@babel/preset-env": "^7.29.0",
+    "@babel/preset-env": "^7.29.2",
     "@babel/preset-react": "^7.28.5",
     "@babel/preset-typescript": "^7.28.5",
     "@babel/register": "^7.23.7",
-    "@babel/runtime": "^7.28.6",
-    "@babel/runtime-corejs3": "^7.29.0",
+    "@babel/runtime": "^7.29.2",
+    "@babel/runtime-corejs3": "^7.29.2",
     "@babel/types": "^7.28.6",
     "@cypress/react": "^8.0.2",
     "@emotion/babel-plugin": "^11.13.5",
     "@emotion/jest": "^11.14.2",
     "@istanbuljs/nyc-config-typescript": "^1.0.1",
     "@mihkeleidast/storybook-addon-source": "^1.0.1",
-    "@playwright/test": "^1.58.2",
+    "@playwright/test": "^1.59.1",
     "@pmmmwh/react-refresh-webpack-plugin": "^0.6.2",
-    "@storybook/addon-actions": "^8.6.17",
-    "@storybook/addon-controls": "^8.6.17",
-    "@storybook/addon-essentials": "^8.6.17",
-    "@storybook/addon-links": "^8.6.17",
-    "@storybook/addon-mdx-gfm": "^8.6.17",
-    "@storybook/components": "^8.6.17",
-    "@storybook/preview-api": "^8.6.17",
-    "@storybook/react": "^8.6.17",
-    "@storybook/react-webpack5": "^8.6.17",
-    "@storybook/test": "^8.6.15",
+    "@storybook/addon-actions": "^8.6.18",
+    "@storybook/addon-controls": "^8.6.18",
+    "@storybook/addon-essentials": "^8.6.18",
+    "@storybook/addon-links": "^8.6.18",
+    "@storybook/addon-mdx-gfm": "^8.6.18",
+    "@storybook/components": "^8.6.18",
+    "@storybook/preview-api": "^8.6.18",
+    "@storybook/react": "^8.6.18",
+    "@storybook/react-webpack5": "^8.6.18",
+    "@storybook/test": "^8.6.18",
     "@storybook/test-runner": "^0.17.0",
     "@svgr/webpack": "^8.1.0",
-    "@swc/core": "^1.15.18",
-    "@swc/plugin-emotion": "^14.6.0",
+    "@swc/core": "^1.15.30",
+    "@swc/plugin-emotion": "^14.8.0",
     "@swc/plugin-transform-imports": "^12.5.0",
     "@testing-library/dom": "^8.20.1",
     "@testing-library/jest-dom": "^6.9.1",
@@ -281,10 +281,11 @@
     "@types/content-disposition": "^0.5.9",
     "@types/dom-to-image": "^2.6.7",
     "@types/jest": "^30.0.0",
+    "@types/jquery": "^4.0.0",
     "@types/js-levenshtein": "^1.1.3",
     "@types/json-bigint": "^1.0.4",
     "@types/mousetrap": "^1.6.15",
-    "@types/node": "^25.3.3",
+    "@types/node": "^25.6.0",
     "@types/react": "^17.0.83",
     "@types/react-dom": "^17.0.26",
     "@types/react-loadable": "^5.5.11",
@@ -301,14 +302,14 @@
     "@typescript-eslint/eslint-plugin": "^7.18.0",
     "@typescript-eslint/parser": "^7.18.0",
     "babel-jest": "^30.0.2",
-    "babel-loader": "^10.0.0",
+    "babel-loader": "^10.1.1",
     "babel-plugin-dynamic-import-node": "^2.3.3",
     "babel-plugin-jsx-remove-data-test-id": "^3.0.0",
     "babel-plugin-lodash": "^3.3.4",
-    "baseline-browser-mapping": "^2.10.7",
+    "baseline-browser-mapping": "^2.10.16",
     "cheerio": "1.2.0",
     "concurrently": "^9.2.1",
-    "copy-webpack-plugin": "^13.0.1",
+    "copy-webpack-plugin": "^14.0.0",
     "cross-env": "^10.1.0",
     "css-loader": "^7.1.4",
     "css-minimizer-webpack-plugin": "^8.0.0",
@@ -317,17 +318,17 @@
     "eslint-import-resolver-alias": "^1.1.2",
     "eslint-import-resolver-typescript": "^4.4.4",
     "eslint-plugin-cypress": "^3.6.0",
-    "eslint-plugin-file-progress": "^1.5.0",
     "eslint-plugin-i18n-strings": "file:eslint-rules/eslint-plugin-i18n-strings",
     "eslint-plugin-icons": "file:eslint-rules/eslint-plugin-icons",
     "eslint-plugin-import": "^2.32.0",
     "eslint-plugin-jest-dom": "^5.5.0",
     "eslint-plugin-lodash": "^7.4.0",
+    "eslint-plugin-no-only-tests": "^3.3.0",
     "eslint-plugin-prettier": "^5.5.5",
     "eslint-plugin-react-prefer-function-component": "^5.0.0",
-    "eslint-plugin-react-you-might-not-need-an-effect": "^0.9.2",
+    "eslint-plugin-react-you-might-not-need-an-effect": "^0.9.3",
     "eslint-plugin-storybook": "^0.8.0",
-    "eslint-plugin-testing-library": "^7.16.0",
+    "eslint-plugin-testing-library": "^7.16.2",
     "eslint-plugin-theme-colors": "file:eslint-rules/eslint-plugin-theme-colors",
     "fetch-mock": "^12.6.0",
     "fork-ts-checker-webpack-plugin": "^9.1.0",
@@ -337,17 +338,17 @@
     "imports-loader": "^5.0.0",
     "jest": "^30.3.0",
     "jest-environment-jsdom": "^29.7.0",
-    "jest-html-reporter": "^4.3.0",
+    "jest-html-reporter": "^4.4.0",
     "jest-websocket-mock": "^2.5.0",
     "js-yaml-loader": "^1.2.2",
-    "jsdom": "^28.1.0",
-    "lerna": "^8.2.3",
+    "jsdom": "^29.0.2",
+    "lerna": "^9.0.4",
     "lightningcss": "^1.32.0",
-    "mini-css-extract-plugin": "^2.10.1",
-    "open-cli": "^8.0.0",
-    "oxlint": "^1.53.0",
+    "mini-css-extract-plugin": "^2.10.2",
+    "open-cli": "^9.0.0",
+    "oxlint": "^1.61.0",
     "po2json": "^0.4.5",
-    "prettier": "3.8.1",
+    "prettier": "3.8.3",
     "prettier-plugin-packagejson": "^3.0.2",
     "process": "^0.11.10",
     "react-refresh": "^0.18.0",
@@ -355,21 +356,21 @@
     "redux-mock-store": "^1.5.4",
     "source-map": "^0.7.6",
     "source-map-support": "^0.5.21",
-    "speed-measure-webpack-plugin": "^1.5.0",
-    "storybook": "8.6.17",
+    "speed-measure-webpack-plugin": "^1.6.0",
+    "storybook": "8.6.18",
     "style-loader": "^4.0.0",
     "swc-loader": "^0.2.7",
-    "terser-webpack-plugin": "^5.3.17",
+    "terser-webpack-plugin": "^5.4.0",
     "thread-loader": "^4.0.4",
-    "ts-jest": "^29.4.6",
+    "ts-jest": "^29.4.9",
     "tscw-config": "^1.1.2",
     "tsx": "^4.21.0",
     "typescript": "5.4.5",
     "unzipper": "^0.12.3",
     "vm-browserify": "^1.1.2",
-    "wait-on": "^9.0.4",
-    "webpack": "^5.105.4",
-    "webpack-bundle-analyzer": "^5.2.0",
+    "wait-on": "^9.0.5",
+    "webpack": "^5.106.0",
+    "webpack-bundle-analyzer": "^5.3.0",
     "webpack-cli": "^6.0.1",
     "webpack-dev-server": "^5.2.3",
     "webpack-manifest-plugin": "^5.0.1",
diff --git a/superset-frontend/packages/generator-superset/package.json b/superset-frontend/packages/generator-superset/package.json
index 78b199b90a5..662e437107f 100644
--- a/superset-frontend/packages/generator-superset/package.json
+++ b/superset-frontend/packages/generator-superset/package.json
@@ -29,13 +29,13 @@
   },
   "dependencies": {
     "chalk": "^5.6.2",
-    "lodash-es": "^4.17.23",
-    "yeoman-generator": "^7.5.1",
+    "lodash-es": "^4.18.1",
+    "yeoman-generator": "^8.1.2",
     "yosay": "^3.0.0"
   },
   "devDependencies": {
     "cross-env": "^10.1.0",
-    "fs-extra": "^11.3.3",
+    "fs-extra": "^11.3.4",
     "jest": "^30.3.0",
     "yeoman-test": "^11.3.1"
   },
diff --git a/superset-frontend/packages/superset-core/package.json b/superset-frontend/packages/superset-core/package.json
index d95b5bea6ec..1ccf3616b81 100644
--- a/superset-frontend/packages/superset-core/package.json
+++ b/superset-frontend/packages/superset-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@apache-superset/core",
-  "version": "0.1.0-rc1",
+  "version": "0.1.0-rc2",
   "description": "This package contains UI elements, APIs, and utility functions used by Superset.",
   "sideEffects": false,
   "main": "lib/index.js",
@@ -70,12 +70,12 @@
   "files": [
     "lib"
   ],
-  "author": "",
-  "license": "ISC",
+  "author": "Apache Software Foundation",
+  "license": "Apache-2.0",
   "devDependencies": {
     "@babel/cli": "^7.28.6",
     "@babel/core": "^7.29.0",
-    "@babel/preset-env": "^7.29.0",
+    "@babel/preset-env": "^7.29.2",
     "@babel/preset-react": "^7.28.5",
     "@babel/preset-typescript": "^7.28.5",
     "typescript": "^5.0.0",
@@ -102,7 +102,7 @@
     "react-dom": "^17.0.2",
     "react-loadable": "^5.5.0",
     "tinycolor2": "*",
-    "lodash": "^4.17.21",
+    "lodash": "^4.18.1",
     "antd": "^5.26.0",
     "jed": "^1.1.1"
   },
diff --git a/superset-frontend/packages/superset-core/src/theme/Theme.test.tsx b/superset-frontend/packages/superset-core/src/theme/Theme.test.tsx
index 873cf94ec5f..01d18e7483e 100644
--- a/superset-frontend/packages/superset-core/src/theme/Theme.test.tsx
+++ b/superset-frontend/packages/superset-core/src/theme/Theme.test.tsx
@@ -839,3 +839,73 @@ test('Theme includes both echartsOptionsOverrides and echartsOptionsOverridesByC
     },
   });
 });
+
+test('colorLink derives from colorPrimary when merging with base theme', () => {
+  const baseTheme: AnyThemeConfig = {
+    token: {
+      colorPrimary: '#2893B3',
+      colorLink: '#2893B3',
+      colorInfo: '#66bcfe',
+    },
+  };
+
+  const userTheme: AnyThemeConfig = {
+    token: {
+      colorPrimary: '#f759ab',
+    },
+  };
+
+  const theme = Theme.fromConfig(userTheme, baseTheme);
+
+  expect(theme.theme.colorPrimary).toBe('#f759ab');
+  expect(theme.theme.colorLink).toBe('#f759ab');
+  expect(theme.theme.colorInfo).toBe('#66bcfe');
+});
+
+test('colorLink is not overridden when user explicitly sets it', () => {
+  const baseTheme: AnyThemeConfig = {
+    token: {
+      colorPrimary: '#2893B3',
+      colorLink: '#2893B3',
+    },
+  };
+
+  const userTheme: AnyThemeConfig = {
+    token: {
+      colorPrimary: '#f759ab',
+      colorLink: '#ff0000',
+    },
+  };
+
+  const theme = Theme.fromConfig(userTheme, baseTheme);
+
+  expect(theme.theme.colorPrimary).toBe('#f759ab');
+  expect(theme.theme.colorLink).toBe('#ff0000');
+});
+
+test('colorLink derives from colorPrimary in setConfig when not explicitly set', () => {
+  const theme = Theme.fromConfig();
+
+  theme.setConfig({
+    token: {
+      colorPrimary: '#f759ab',
+    },
+  });
+
+  expect(theme.theme.colorPrimary).toBe('#f759ab');
+  expect(theme.theme.colorLink).toBe('#f759ab');
+});
+
+test('colorLink is preserved in setConfig when explicitly set', () => {
+  const theme = Theme.fromConfig();
+
+  theme.setConfig({
+    token: {
+      colorPrimary: '#f759ab',
+      colorLink: '#ff0000',
+    },
+  });
+
+  expect(theme.theme.colorPrimary).toBe('#f759ab');
+  expect(theme.theme.colorLink).toBe('#ff0000');
+});
diff --git a/superset-frontend/packages/superset-core/src/theme/Theme.tsx b/superset-frontend/packages/superset-core/src/theme/Theme.tsx
index 7a890982eaa..138a0ace9b6 100644
--- a/superset-frontend/packages/superset-core/src/theme/Theme.tsx
+++ b/superset-frontend/packages/superset-core/src/theme/Theme.tsx
@@ -66,6 +66,17 @@ export class Theme {
       mergedConfig = mergeWith({}, baseTheme, config, (objValue, srcValue) =>
         Array.isArray(srcValue) ? srcValue : undefined,
       );
+
+      // In Ant Design v5, colorLink derives from colorInfo, not colorPrimary.
+      // Currently we expectlinks to follow the brand/primary color. When the user
+      // overrides colorPrimary without explicitly setting colorLink, update the
+      // merged colorLink so links match the new primary palette.
+      if (config.token?.colorPrimary && !config.token?.colorLink) {
+        const mToken = mergedConfig?.token;
+        if (mToken) {
+          mToken.colorLink = mToken.colorPrimary;
+        }
+      }
     } else if (baseTheme && !config) {
       mergedConfig = baseTheme;
     }
@@ -98,6 +109,10 @@ export class Theme {
   setConfig(config: AnyThemeConfig): void {
     const antdConfig = normalizeThemeConfig(config);
 
+    if (antdConfig.token?.colorPrimary && !antdConfig.token?.colorLink) {
+      antdConfig.token.colorLink = antdConfig.token.colorPrimary;
+    }
+
     // First phase: Let Ant Design compute the tokens
     const tokens = Theme.getFilteredAntdTheme(antdConfig);
 
diff --git a/superset-frontend/packages/superset-core/src/theme/types.ts b/superset-frontend/packages/superset-core/src/theme/types.ts
index 87bd226f874..fccbfd41d36 100644
--- a/superset-frontend/packages/superset-core/src/theme/types.ts
+++ b/superset-frontend/packages/superset-core/src/theme/types.ts
@@ -110,6 +110,26 @@ export interface ColorVariants {
 }
 
 export interface SupersetSpecificTokens {
+  // Label variant tokens — Published/Draft (dashboard status)
+  labelPublishedColor?: string;
+  labelPublishedBg?: string;
+  labelPublishedBorderColor?: string;
+  labelPublishedIconColor?: string;
+  labelDraftColor?: string;
+  labelDraftBg?: string;
+  labelDraftBorderColor?: string;
+  labelDraftIconColor?: string;
+
+  // Label variant tokens — Dataset type (Physical/Virtual)
+  labelDatasetPhysicalColor?: string;
+  labelDatasetPhysicalBg?: string;
+  labelDatasetPhysicalBorderColor?: string;
+  labelDatasetPhysicalIconColor?: string;
+  labelDatasetVirtualColor?: string;
+  labelDatasetVirtualBg?: string;
+  labelDatasetVirtualBorderColor?: string;
+  labelDatasetVirtualIconColor?: string;
+
   // Font-related
   fontSizeXS: string;
   fontSizeXXL: string;
@@ -168,6 +188,55 @@ export interface SupersetSpecificTokens {
    * Defaults to colorPrimaryBgHover if not specified.
    */
   colorEditorSelection?: string;
+
+  // Secondary button tokens (Superset-specific)
+  // Ant Design's filled variant has no component tokens, so we provide our own.
+  // These fallback to colorPrimary* derived tokens when not set.
+  /**
+   * Text color for secondary buttons.
+   * Fallback: colorPrimary
+   */
+  buttonSecondaryColor?: string;
+  /**
+   * Background color for secondary buttons.
+   * Fallback: colorPrimaryBg
+   */
+  buttonSecondaryBg?: string;
+  /**
+   * Border color for secondary buttons.
+   * Fallback: transparent
+   */
+  buttonSecondaryBorderColor?: string;
+  /**
+   * Text color for secondary buttons on hover.
+   * Fallback: colorPrimary
+   */
+  buttonSecondaryHoverColor?: string;
+  /**
+   * Background color for secondary buttons on hover.
+   * Fallback: colorPrimaryBgHover
+   */
+  buttonSecondaryHoverBg?: string;
+  /**
+   * Border color for secondary buttons on hover.
+   * Fallback: transparent
+   */
+  buttonSecondaryHoverBorderColor?: string;
+  /**
+   * Text color for secondary buttons when active/pressed.
+   * Fallback: colorPrimary
+   */
+  buttonSecondaryActiveColor?: string;
+  /**
+   * Background color for secondary buttons when active/pressed.
+   * Fallback: colorPrimaryBorder
+   */
+  buttonSecondaryActiveBg?: string;
+  /**
+   * Border color for secondary buttons when active/pressed.
+   * Fallback: transparent
+   */
+  buttonSecondaryActiveBorderColor?: string;
 }
 
 /**
diff --git a/superset-frontend/packages/superset-ui-chart-controls/package.json b/superset-frontend/packages/superset-ui-chart-controls/package.json
index a9eb07107a1..6fe28fc9dbb 100644
--- a/superset-frontend/packages/superset-ui-chart-controls/package.json
+++ b/superset-frontend/packages/superset-ui-chart-controls/package.json
@@ -26,10 +26,11 @@
   "dependencies": {
     "@apache-superset/core": "*",
     "@types/react": "*",
-    "lodash": "^4.17.23"
+    "lodash": "^4.18.1",
+    "tinycolor2": "*"
   },
   "peerDependencies": {
-    "@ant-design/icons": "^5.2.6",
+    "@ant-design/icons": "^5.6.1",
     "@emotion/react": "^11.4.1",
     "@superset-ui/core": "*",
     "@testing-library/dom": "^8.20.1",
diff --git a/superset-frontend/packages/superset-ui-chart-controls/src/components/ColumnOption.tsx b/superset-frontend/packages/superset-ui-chart-controls/src/components/ColumnOption.tsx
index ca3c9edb164..17f02eecbd5 100644
--- a/superset-frontend/packages/superset-ui-chart-controls/src/components/ColumnOption.tsx
+++ b/superset-frontend/packages/superset-ui-chart-controls/src/components/ColumnOption.tsx
@@ -59,7 +59,7 @@ export function ColumnOption({
   const type = hasExpression ? 'expression' : type_generic;
   const [tooltipText, setTooltipText] = useState<ReactNode>(column.column_name);
   const [columnTypeTooltipText, setcolumnTypeTooltipText] = useState<ReactNode>(
-    column.type,
+    getColumnTypeTooltipNode(column),
   );
 
   useLayoutEffect(() => {
diff --git a/superset-frontend/packages/superset-ui-chart-controls/src/components/ControlSubSectionHeader.tsx b/superset-frontend/packages/superset-ui-chart-controls/src/components/ControlSubSectionHeader.tsx
index 79be75e55dd..0022dfde3a4 100644
--- a/superset-frontend/packages/superset-ui-chart-controls/src/components/ControlSubSectionHeader.tsx
+++ b/superset-frontend/packages/superset-ui-chart-controls/src/components/ControlSubSectionHeader.tsx
@@ -21,7 +21,11 @@ import { styled, css } from '@apache-superset/core/theme';
 export const ControlSubSectionHeader = styled.div`
   ${({ theme }) => css`
     font-weight: ${theme.fontWeightStrong};
+    margin-top: ${theme.sizeUnit * 3}px;
     margin-bottom: ${theme.sizeUnit}px;
     font-size: ${theme.fontSizeSM}px;
+    text-transform: uppercase;
+    letter-spacing: 0.05em;
+    color: ${theme.colorTextSecondary};
   `}
 `;
diff --git a/superset-frontend/packages/superset-ui-chart-controls/src/components/labelUtils.tsx b/superset-frontend/packages/superset-ui-chart-controls/src/components/labelUtils.tsx
index d4a1aec7fe7..ffee313a4df 100644
--- a/superset-frontend/packages/superset-ui-chart-controls/src/components/labelUtils.tsx
+++ b/superset-frontend/packages/superset-ui-chart-controls/src/components/labelUtils.tsx
@@ -20,6 +20,7 @@ import { ReactNode, RefObject } from 'react';
 
 import { t } from '@apache-superset/core/translation';
 import { css, styled } from '@apache-superset/core/theme';
+import { GenericDataType } from '@apache-superset/core/common';
 import { ColumnMeta, Metric } from '@superset-ui/chart-controls';
 
 const TooltipSectionWrapper = styled.div`
@@ -64,11 +65,29 @@ export const getColumnLabelText = (column: ColumnMeta): string =>
   column.verbose_name || column.column_name;
 
 export const getColumnTypeTooltipNode = (column: ColumnMeta): ReactNode => {
-  if (!column.type) {
+  const rawType = typeof column.type === 'string' ? column.type.trim() : '';
+
+  let typeLabel: ReactNode | null = null;
+
+  if (rawType && rawType.toLowerCase() !== 'column') {
+    typeLabel = rawType;
+  } else if (typeof column.type_generic === 'number') {
+    if (column.type_generic === GenericDataType.String) {
+      typeLabel = t('string');
+    } else if (column.type_generic === GenericDataType.Numeric) {
+      typeLabel = t('numeric');
+    } else if (column.type_generic === GenericDataType.Temporal) {
+      typeLabel = t('timestamp');
+    } else if (column.type_generic === GenericDataType.Boolean) {
+      typeLabel = t('boolean');
+    }
+  }
+
+  if (!typeLabel) {
     return null;
   }
 
-  return <TooltipSection label={t('Column type')} text={column.type} />;
+  return <TooltipSection label={t('Column type')} text={typeLabel} />;
 };
 
 export const getColumnTooltipNode = (
diff --git a/superset-frontend/packages/superset-ui-chart-controls/src/sections/chartTitle.tsx b/superset-frontend/packages/superset-ui-chart-controls/src/sections/chartTitle.tsx
index cc98584223d..3720f7437c4 100644
--- a/superset-frontend/packages/superset-ui-chart-controls/src/sections/chartTitle.tsx
+++ b/superset-frontend/packages/superset-ui-chart-controls/src/sections/chartTitle.tsx
@@ -23,7 +23,7 @@ import { ControlPanelSectionConfig } from '../types';
 import { formatSelectOptions } from '../utils';
 
 export const TITLE_MARGIN_OPTIONS: number[] = [
-  0, 15, 30, 50, 75, 100, 125, 150, 200,
+  0, 15, 30, 40, 50, 75, 100, 125, 150, 200,
 ];
 export const TITLE_POSITION_OPTIONS: [string, string][] = [
   ['Left', t('Left')],
@@ -56,7 +56,7 @@ export const titleControls: ControlPanelSectionConfig = {
           clearable: true,
           label: t('X Axis Title Margin'),
           renderTrigger: true,
-          default: TITLE_MARGIN_OPTIONS[0],
+          default: TITLE_MARGIN_OPTIONS[3],
           choices: formatSelectOptions(TITLE_MARGIN_OPTIONS),
         },
       },
@@ -82,7 +82,7 @@ export const titleControls: ControlPanelSectionConfig = {
           clearable: true,
           label: t('Y Axis Title Margin'),
           renderTrigger: true,
-          default: TITLE_MARGIN_OPTIONS[0],
+          default: TITLE_MARGIN_OPTIONS[4],
           choices: formatSelectOptions(TITLE_MARGIN_OPTIONS),
         },
       },
diff --git a/superset-frontend/packages/superset-ui-chart-controls/src/shared-controls/matrixifyControls.test.ts b/superset-frontend/packages/superset-ui-chart-controls/src/shared-controls/matrixifyControls.test.ts
new file mode 100644
index 00000000000..2b007fda917
--- /dev/null
+++ b/superset-frontend/packages/superset-ui-chart-controls/src/shared-controls/matrixifyControls.test.ts
@@ -0,0 +1,139 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { isMatrixifyVisible } from './matrixifyControls';
+
+/**
+ * Helper to build a controls object matching the shape used by
+ * control panel visibility callbacks.
+ */
+function makeControls(
+  overrides: Record<string, unknown> = {},
+): Record<string, { value: unknown }> {
+  const defaults: Record<string, unknown> = {
+    matrixify_enable: false,
+    matrixify_mode_rows: 'disabled',
+    matrixify_mode_columns: 'disabled',
+    matrixify_dimension_selection_mode_rows: 'members',
+    matrixify_dimension_selection_mode_columns: 'members',
+  };
+  const merged = { ...defaults, ...overrides };
+  return Object.fromEntries(
+    Object.entries(merged).map(([k, v]) => [k, { value: v }]),
+  );
+}
+
+// ── matrixify_enable guard ──────────────────────────────────────────
+
+test('returns false when matrixify_enable is false, even with active axis modes', () => {
+  const controls = makeControls({
+    matrixify_enable: false,
+    matrixify_mode_rows: 'metrics',
+    matrixify_mode_columns: 'dimensions',
+  });
+  expect(isMatrixifyVisible(controls, 'rows')).toBe(false);
+  expect(isMatrixifyVisible(controls, 'columns')).toBe(false);
+});
+
+test('returns false when matrixify_enable is undefined (old form_data without the field)', () => {
+  const controls = makeControls({
+    matrixify_mode_rows: 'metrics',
+  });
+  delete (controls as any).matrixify_enable;
+  expect(isMatrixifyVisible(controls, 'rows')).toBe(false);
+});
+
+test('returns false when controls object is undefined', () => {
+  expect(isMatrixifyVisible(undefined, 'rows')).toBe(false);
+});
+
+// ── axis mode checks ────────────────────────────────────────────────
+
+test('returns false when axis mode is disabled', () => {
+  const controls = makeControls({
+    matrixify_enable: true,
+    matrixify_mode_rows: 'disabled',
+  });
+  expect(isMatrixifyVisible(controls, 'rows')).toBe(false);
+});
+
+test('returns true when matrixify_enable is true and axis mode is metrics', () => {
+  const controls = makeControls({
+    matrixify_enable: true,
+    matrixify_mode_rows: 'metrics',
+  });
+  expect(isMatrixifyVisible(controls, 'rows')).toBe(true);
+});
+
+test('returns true when matrixify_enable is true and axis mode is dimensions', () => {
+  const controls = makeControls({
+    matrixify_enable: true,
+    matrixify_mode_columns: 'dimensions',
+  });
+  expect(isMatrixifyVisible(controls, 'columns')).toBe(true);
+});
+
+// ── mode filter ─────────────────────────────────────────────────────
+
+test('returns false when mode filter does not match axis value', () => {
+  const controls = makeControls({
+    matrixify_enable: true,
+    matrixify_mode_rows: 'metrics',
+  });
+  expect(isMatrixifyVisible(controls, 'rows', 'dimensions')).toBe(false);
+});
+
+test('returns true when mode filter matches axis value', () => {
+  const controls = makeControls({
+    matrixify_enable: true,
+    matrixify_mode_rows: 'dimensions',
+  });
+  expect(isMatrixifyVisible(controls, 'rows', 'dimensions')).toBe(true);
+});
+
+// ── selectionMode filter ────────────────────────────────────────────
+
+test('returns true when selectionMode matches', () => {
+  const controls = makeControls({
+    matrixify_enable: true,
+    matrixify_mode_rows: 'dimensions',
+    matrixify_dimension_selection_mode_rows: 'topn',
+  });
+  expect(isMatrixifyVisible(controls, 'rows', 'dimensions', 'topn')).toBe(true);
+});
+
+test('returns false when selectionMode does not match', () => {
+  const controls = makeControls({
+    matrixify_enable: true,
+    matrixify_mode_rows: 'dimensions',
+    matrixify_dimension_selection_mode_rows: 'members',
+  });
+  expect(isMatrixifyVisible(controls, 'rows', 'dimensions', 'topn')).toBe(
+    false,
+  );
+});
+
+test('ignores selectionMode filter when mode is metrics', () => {
+  const controls = makeControls({
+    matrixify_enable: true,
+    matrixify_mode_columns: 'metrics',
+  });
+  // selectionMode only applies to dimensions mode, should be ignored
+  expect(isMatrixifyVisible(controls, 'columns', 'metrics', 'topn')).toBe(true);
+});
diff --git a/superset-frontend/packages/superset-ui-chart-controls/src/shared-controls/matrixifyControls.tsx b/superset-frontend/packages/superset-ui-chart-controls/src/shared-controls/matrixifyControls.tsx
index 48dcaa3dafc..3e1b331d167 100644
--- a/superset-frontend/packages/superset-ui-chart-controls/src/shared-controls/matrixifyControls.tsx
+++ b/superset-frontend/packages/superset-ui-chart-controls/src/shared-controls/matrixifyControls.tsx
@@ -36,6 +36,8 @@ const isMatrixifyVisible = (
   mode?: 'metrics' | 'dimensions',
   selectionMode?: 'members' | 'topn' | 'all',
 ) => {
+  if (controls?.matrixify_enable?.value !== true) return false;
+
   const modeControl = `matrixify_mode_${axis}`;
   const selectionModeControl = `matrixify_dimension_selection_mode_${axis}`;
 
@@ -372,4 +374,4 @@ matrixifyControls.matrixify_show_column_headers = {
   visibility: ({ controls }) => isMatrixifyVisible(controls, 'columns'),
 };
 
-export { matrixifyControls };
+export { matrixifyControls, isMatrixifyVisible };
diff --git a/superset-frontend/packages/superset-ui-chart-controls/src/types.ts b/superset-frontend/packages/superset-ui-chart-controls/src/types.ts
index 1cc9743f4cf..6344222d594 100644
--- a/superset-frontend/packages/superset-ui-chart-controls/src/types.ts
+++ b/superset-frontend/packages/superset-ui-chart-controls/src/types.ts
@@ -507,6 +507,11 @@ export type ColorFormatters = {
   ) => string | undefined;
 }[];
 
+export type ResolvedColorFormatterResult = {
+  backgroundColor?: string;
+  color?: string;
+};
+
 export default {};
 
 export function isColumnMeta(column: AnyDict): column is ColumnMeta {
diff --git a/superset-frontend/packages/superset-ui-chart-controls/src/utils/getColorFormatters.ts b/superset-frontend/packages/superset-ui-chart-controls/src/utils/getColorFormatters.ts
index 5869472de9b..dbff332cdc0 100644
--- a/superset-frontend/packages/superset-ui-chart-controls/src/utils/getColorFormatters.ts
+++ b/superset-frontend/packages/superset-ui-chart-controls/src/utils/getColorFormatters.ts
@@ -20,11 +20,13 @@ import memoizeOne from 'memoize-one';
 import { isString, isBoolean } from 'lodash';
 import { isBlank } from '@apache-superset/core/utils';
 import { addAlpha, DataRecord } from '@superset-ui/core';
+import tinycolor from 'tinycolor2';
 import {
   ColorFormatters,
   Comparator,
   ConditionalFormattingConfig,
   MultipleValueComparators,
+  ResolvedColorFormatterResult,
 } from '../types';
 
 export const round = (num: number, precision = 0) =>
@@ -33,6 +35,11 @@ export const round = (num: number, precision = 0) =>
 const MIN_OPACITY_BOUNDED = 0.05;
 const MIN_OPACITY_UNBOUNDED = 0;
 const MAX_OPACITY = 1;
+const READABLE_TEXT_COLORS = [
+  { r: 0, g: 0, b: 0 },
+  { r: 255, g: 255, b: 255 },
+];
+
 export const getOpacity = (
   value: number | string | boolean | null,
   cutoffPoint: number | string,
@@ -325,3 +332,59 @@ export const getColorFormatters = memoizeOne(
       [],
     ) ?? [],
 );
+
+export const getReadableTextColor = (
+  backgroundColor: string | undefined,
+  surfaceColor: string,
+): string | undefined => {
+  if (!backgroundColor) {
+    return undefined;
+  }
+
+  const background = tinycolor(backgroundColor);
+  const surface = tinycolor(surfaceColor);
+
+  if (!background.isValid() || !surface.isValid()) {
+    return undefined;
+  }
+
+  const { r: bgR, g: bgG, b: bgB, a: bgAlpha } = background.toRgb();
+  const { r: surfaceR, g: surfaceG, b: surfaceB } = surface.toRgb();
+  const alpha = bgAlpha;
+
+  const compositeColor = tinycolor({
+    r: bgR * alpha + surfaceR * (1 - alpha),
+    g: bgG * alpha + surfaceG * (1 - alpha),
+    b: bgB * alpha + surfaceB * (1 - alpha),
+  });
+
+  return tinycolor
+    .mostReadable(compositeColor, READABLE_TEXT_COLORS, {
+      includeFallbackColors: true,
+      level: 'AA',
+      size: 'small',
+    })
+    .toRgbString();
+};
+
+export const getNormalizedTextColor = (
+  color: string | undefined,
+): string | undefined => {
+  if (!color) {
+    return undefined;
+  }
+
+  const parsedColor = tinycolor(color);
+  if (!parsedColor.isValid()) {
+    return color;
+  }
+
+  return parsedColor.setAlpha(1).toRgbString();
+};
+
+export const getTextColorForBackground = (
+  result: ResolvedColorFormatterResult,
+  surfaceColor: string,
+): string | undefined =>
+  getNormalizedTextColor(result.color) ??
+  getReadableTextColor(result.backgroundColor, surfaceColor);
diff --git a/superset-frontend/packages/superset-ui-chart-controls/test/components/labelUtils.test.tsx b/superset-frontend/packages/superset-ui-chart-controls/test/components/labelUtils.test.tsx
index 64e75887abd..ae050c820ed 100644
--- a/superset-frontend/packages/superset-ui-chart-controls/test/components/labelUtils.test.tsx
+++ b/superset-frontend/packages/superset-ui-chart-controls/test/components/labelUtils.test.tsx
@@ -24,6 +24,7 @@ import {
   getMetricTooltipNode,
   getColumnTypeTooltipNode,
 } from '../../src/components/labelUtils';
+import { GenericDataType } from '@apache-superset/core/common';
 
 test("should get column name when column doesn't have verbose_name", () => {
   expect(
@@ -89,6 +90,24 @@ test('should get column datatype rendered as tooltip when column has a type', ()
   expect(screen.getByText('text')).toBeVisible();
 });
 
+test('should fall back to generic data type label when type is "column"', () => {
+  render(
+    <>
+      {getColumnTypeTooltipNode({
+        id: 123,
+        column_name: 'column name',
+        verbose_name: '',
+        description: '',
+        type: 'column',
+        type_generic: GenericDataType.String,
+      })}
+    </>,
+  );
+
+  expect(screen.getByText('Column type')).toBeVisible();
+  expect(screen.getByText('string')).toBeVisible();
+});
+
 test('should get column name, verbose name and description when it has a verbose name', () => {
   const ref = { current: { scrollWidth: 100, clientWidth: 100 } };
   render(
diff --git a/superset-frontend/packages/superset-ui-chart-controls/test/utils/getColorFormatters.test.ts b/superset-frontend/packages/superset-ui-chart-controls/test/utils/getColorFormatters.test.ts
index 1ed3f031d70..821a864a546 100644
--- a/superset-frontend/packages/superset-ui-chart-controls/test/utils/getColorFormatters.test.ts
+++ b/superset-frontend/packages/superset-ui-chart-controls/test/utils/getColorFormatters.test.ts
@@ -24,6 +24,11 @@ import {
   getColorFormatters,
   getColorFunction,
 } from '../../src';
+import {
+  getReadableTextColor,
+  getNormalizedTextColor,
+  getTextColorForBackground,
+} from '../../src/utils/getColorFormatters';
 
 configure();
 const mockData = [
@@ -107,6 +112,64 @@ test('getColorFunction LESS_THAN', () => {
   expect(colorFunction(50)).toEqual('#FF0000FF');
 });
 
+test('getReadableTextColor returns white for dark backgrounds', () => {
+  expect(getReadableTextColor('#111111', '#ffffff')).toBe('rgb(255, 255, 255)');
+});
+
+test('getReadableTextColor returns black for light backgrounds', () => {
+  expect(getReadableTextColor('#f5f5f5', '#ffffff')).toBe('rgb(0, 0, 0)');
+});
+
+test('getReadableTextColor blends alpha over the provided surface', () => {
+  expect(getReadableTextColor('rgba(0, 0, 0, 0.6)', '#ffffff')).toBe(
+    'rgb(255, 255, 255)',
+  );
+  expect(getReadableTextColor('rgba(255, 255, 255, 0.6)', '#000000')).toBe(
+    'rgb(0, 0, 0)',
+  );
+});
+
+test('getReadableTextColor returns undefined for invalid colors', () => {
+  expect(getReadableTextColor('not-a-color', '#ffffff')).toBeUndefined();
+  expect(getReadableTextColor('#111111', 'not-a-color')).toBeUndefined();
+});
+
+test('getTextColorForBackground prefers explicit text color', () => {
+  expect(
+    getTextColorForBackground(
+      { backgroundColor: '#111111', color: '#ace1c4ff' },
+      '#ffffff',
+    ),
+  ).toBe('rgb(172, 225, 196)');
+});
+
+test('getNormalizedTextColor removes alpha from explicit text colors', () => {
+  expect(getNormalizedTextColor('#ace1c40d')).toBe('rgb(172, 225, 196)');
+  expect(getNormalizedTextColor('rgba(172, 225, 196, 0.2)')).toBe(
+    'rgb(172, 225, 196)',
+  );
+});
+
+test('getNormalizedTextColor preserves invalid explicit text colors', () => {
+  expect(getNormalizedTextColor('not-a-color')).toBe('not-a-color');
+});
+
+test('getTextColorForBackground normalizes explicit text color alpha', () => {
+  expect(
+    getTextColorForBackground(
+      { backgroundColor: '#111111', color: '#ace1c40d' },
+      '#ffffff',
+    ),
+  ).toBe('rgb(172, 225, 196)');
+});
+
+test('getTextColorForBackground falls back to adaptive contrast', () => {
+  expect(
+    getTextColorForBackground({ backgroundColor: '#111111' }, '#ffffff'),
+  ).toBe('rgb(255, 255, 255)');
+  expect(getTextColorForBackground({}, '#ffffff')).toBeUndefined();
+});
+
 test('getColorFunction GREATER_OR_EQUAL', () => {
   const colorFunction = getColorFunction(
     {
diff --git a/superset-frontend/packages/superset-ui-core/package.json b/superset-frontend/packages/superset-ui-core/package.json
index 3d4855ca3d0..217d9f088f8 100644
--- a/superset-frontend/packages/superset-ui-core/package.json
+++ b/superset-frontend/packages/superset-ui-core/package.json
@@ -24,39 +24,40 @@
     "lib"
   ],
   "dependencies": {
+    "@ant-design/icons": "^6.1.1",
     "@apache-superset/core": "*",
-    "@ant-design/icons": "^5.2.6",
-    "@babel/runtime": "^7.28.6",
+    "@babel/runtime": "^7.29.2",
     "@types/json-bigint": "^1.0.4",
+    "@visx/responsive": "^3.12.0",
     "ace-builds": "^1.43.6",
-    "ag-grid-community": "35.0.1",
-    "ag-grid-react": "35.0.1",
+    "ag-grid-community": "35.2.1",
+    "ag-grid-react": "35.2.1",
     "brace": "^0.11.1",
     "classnames": "^2.5.1",
+    "core-js": "^3.49.0",
     "csstype": "^3.2.3",
-    "core-js": "^3.48.0",
     "d3-format": "^3.1.2",
-    "dayjs": "^1.11.19",
     "d3-interpolate": "^3.0.1",
     "d3-scale": "^4.0.2",
     "d3-time": "^3.1.0",
     "d3-time-format": "^4.1.0",
-    "dompurify": "^3.3.3",
+    "dayjs": "^1.11.20",
+    "dompurify": "^3.4.0",
     "fetch-retry": "^6.0.0",
-    "handlebars": "^4.7.8",
+    "handlebars": "^4.7.9",
     "jed": "^1.1.1",
-    "lodash": "^4.17.23",
+    "lodash": "^4.18.1",
     "math-expression-evaluator": "^2.0.7",
     "pretty-ms": "^9.3.0",
     "re-resizable": "^6.11.2",
     "react-ace": "^14.0.1",
-    "react-js-cron": "^5.2.0",
     "react-draggable": "^4.5.0",
+    "react-error-boundary": "6.0.0",
+    "react-js-cron": "^5.2.0",
+    "react-markdown": "^8.0.7",
     "react-resize-detector": "^7.1.2",
     "react-syntax-highlighter": "^16.1.1",
     "react-ultimate-pagination": "^1.3.2",
-    "react-error-boundary": "6.0.0",
-    "react-markdown": "^8.0.7",
     "regenerator-runtime": "^0.14.1",
     "rehype-raw": "^7.0.0",
     "rehype-sanitize": "^6.0.0",
@@ -64,7 +65,6 @@
     "reselect": "^5.1.1",
     "rison": "^0.1.1",
     "seedrandom": "^3.0.5",
-    "@visx/responsive": "^3.12.0",
     "xss": "^1.0.15"
   },
   "devDependencies": {
@@ -74,21 +74,20 @@
     "@types/d3-scale": "^2.1.1",
     "@types/d3-time": "^3.0.4",
     "@types/d3-time-format": "^4.0.3",
-    "@types/react-table": "^7.7.20",
-    "@types/react-syntax-highlighter": "^15.5.13",
-    "@types/jquery": "^3.5.33",
+    "@types/jquery": "^4.0.0",
     "@types/lodash": "^4.17.24",
-    "@types/node": "^25.3.3",
+    "@types/node": "^25.6.0",
     "@types/prop-types": "^15.7.15",
+    "@types/react-syntax-highlighter": "^15.5.13",
+    "@types/react-table": "^7.7.20",
     "@types/rison": "0.1.0",
     "@types/seedrandom": "^3.0.8",
     "fetch-mock": "^12.6.0",
     "jest-mock-console": "^2.0.0",
     "resize-observer-polyfill": "1.5.1",
-    "timezone-mock": "1.4.0"
+    "timezone-mock": "^1.4.2"
   },
   "peerDependencies": {
-    "antd": "^5.26.0",
     "@emotion/cache": "^11.4.0",
     "@emotion/react": "^11.4.1",
     "@emotion/styled": "^11.14.1",
@@ -101,6 +100,7 @@
     "@types/react-loadable": "*",
     "@types/react-window": "^1.8.8",
     "@types/tinycolor2": "*",
+    "antd": "^5.26.0",
     "nanoid": "^5.0.9",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",
diff --git a/superset-frontend/packages/superset-ui-core/src/chart-composition/ChartFrame.tsx b/superset-frontend/packages/superset-ui-core/src/chart-composition/ChartFrame.tsx
index 88cf52ec72f..91836814e9f 100644
--- a/superset-frontend/packages/superset-ui-core/src/chart-composition/ChartFrame.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/chart-composition/ChartFrame.tsx
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { PureComponent, ReactNode } from 'react';
+import { memo, ReactNode } from 'react';
 
 import { isDefined } from '../utils';
 
@@ -29,7 +29,7 @@ type Props = {
   contentWidth?: number;
   contentHeight?: number;
   height: number;
-  renderContent: ({
+  renderContent?: ({
     height,
     width,
   }: {
@@ -39,36 +39,35 @@ type Props = {
   width: number;
 };
 
-export default class ChartFrame extends PureComponent<Props, {}> {
-  static defaultProps = {
-    renderContent() {},
-  };
+function ChartFrame({
+  contentWidth,
+  contentHeight,
+  width,
+  height,
+  renderContent = () => null,
+}: Props) {
+  const overflowX = checkNumber(contentWidth) && contentWidth > width;
+  const overflowY = checkNumber(contentHeight) && contentHeight > height;
 
-  render() {
-    const { contentWidth, contentHeight, width, height, renderContent } =
-      this.props;
-
-    const overflowX = checkNumber(contentWidth) && contentWidth > width;
-    const overflowY = checkNumber(contentHeight) && contentHeight > height;
-
-    if (overflowX || overflowY) {
-      return (
-        <div
-          style={{
-            height,
-            overflowX: overflowX ? 'auto' : 'hidden',
-            overflowY: overflowY ? 'auto' : 'hidden',
-            width,
-          }}
-        >
-          {renderContent({
-            height: Math.max(contentHeight ?? 0, height),
-            width: Math.max(contentWidth ?? 0, width),
-          })}
-        </div>
-      );
-    }
-
-    return renderContent({ height, width });
+  if (overflowX || overflowY) {
+    return (
+      <div
+        style={{
+          height,
+          overflowX: overflowX ? 'auto' : 'hidden',
+          overflowY: overflowY ? 'auto' : 'hidden',
+          width,
+        }}
+      >
+        {renderContent({
+          height: Math.max(contentHeight ?? 0, height),
+          width: Math.max(contentWidth ?? 0, width),
+        })}
+      </div>
+    );
   }
+
+  return <>{renderContent({ height, width })}</>;
 }
+
+export default memo(ChartFrame);
diff --git a/superset-frontend/packages/superset-ui-core/src/chart-composition/legend/WithLegend.tsx b/superset-frontend/packages/superset-ui-core/src/chart-composition/legend/WithLegend.tsx
index a2cac92ee33..48e7309cdab 100644
--- a/superset-frontend/packages/superset-ui-core/src/chart-composition/legend/WithLegend.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/chart-composition/legend/WithLegend.tsx
@@ -17,26 +17,19 @@
  * under the License.
  */
 
-import { CSSProperties, ReactNode, PureComponent } from 'react';
+import { CSSProperties, ReactNode, memo, useMemo } from 'react';
 import { ParentSize } from '@visx/responsive';
 
-const defaultProps = {
-  className: '',
-  height: 'auto' as number | string,
-  position: 'top',
-  width: 'auto' as number | string,
-};
-
 type Props = {
-  className: string;
+  className?: string;
   debounceTime?: number;
-  width: number | string;
-  height: number | string;
+  width?: number | string;
+  height?: number | string;
   legendJustifyContent?: 'center' | 'flex-start' | 'flex-end';
-  position: 'top' | 'left' | 'bottom' | 'right';
+  position?: 'top' | 'left' | 'bottom' | 'right';
   renderChart: (dim: { width: number; height: number }) => ReactNode;
   renderLegend?: (params: { direction: string }) => ReactNode;
-} & Readonly<typeof defaultProps>;
+};
 
 const LEGEND_STYLE_BASE: CSSProperties = {
   display: 'flex',
@@ -52,95 +45,101 @@ const CHART_STYLE_BASE: CSSProperties = {
   position: 'relative',
 };
 
-class WithLegend extends PureComponent<Props, {}> {
-  static defaultProps = defaultProps;
-
-  getContainerDirection(): CSSProperties['flexDirection'] {
-    const { position } = this.props;
-
-    if (position === 'left') {
-      return 'row';
-    }
-    if (position === 'right') {
-      return 'row-reverse';
-    }
-    if (position === 'bottom') {
-      return 'column-reverse';
-    }
-
-    return 'column';
+function getContainerDirection(
+  position: Props['position'],
+): CSSProperties['flexDirection'] {
+  if (position === 'left') {
+    return 'row';
+  }
+  if (position === 'right') {
+    return 'row-reverse';
+  }
+  if (position === 'bottom') {
+    return 'column-reverse';
   }
 
-  getLegendJustifyContent() {
-    const { legendJustifyContent, position } = this.props;
-    if (legendJustifyContent) {
-      return legendJustifyContent;
-    }
-
-    if (position === 'left' || position === 'right') {
-      return 'flex-start';
-    }
-
-    return 'flex-end';
-  }
-
-  render() {
-    const {
-      className,
-      debounceTime,
-      width,
-      height,
-      position,
-      renderChart,
-      renderLegend,
-    } = this.props;
-
-    const isHorizontal = position === 'left' || position === 'right';
-
-    const style: CSSProperties = {
-      display: 'flex',
-      flexDirection: this.getContainerDirection(),
-      height,
-      width,
-    };
-
-    const chartStyle: CSSProperties = { ...CHART_STYLE_BASE };
-    if (isHorizontal) {
-      chartStyle.width = 0;
-    } else {
-      chartStyle.height = 0;
-    }
-
-    const legendDirection = isHorizontal ? 'column' : 'row';
-    const legendStyle: CSSProperties = {
-      ...LEGEND_STYLE_BASE,
-      flexDirection: legendDirection,
-      justifyContent: this.getLegendJustifyContent(),
-    };
-
-    return (
-      <div className={`with-legend ${className}`} style={style}>
-        {renderLegend && (
-          <div className="legend-container" style={legendStyle}>
-            {renderLegend({
-              // Pass flexDirection for @vx/legend to arrange legend items
-              direction: legendDirection,
-            })}
-          </div>
-        )}
-        <div className="main-container" style={chartStyle}>
-          <ParentSize debounceTime={debounceTime}>
-            {(parent: { width: number; height: number }) =>
-              parent.width > 0 && parent.height > 0
-                ? // Only render when necessary
-                  renderChart(parent)
-                : null
-            }
-          </ParentSize>
-        </div>
-      </div>
-    );
-  }
+  return 'column';
 }
 
-export default WithLegend;
+function getLegendJustifyContent(
+  legendJustifyContent: Props['legendJustifyContent'],
+  position: Props['position'],
+) {
+  if (legendJustifyContent) {
+    return legendJustifyContent;
+  }
+
+  if (position === 'left' || position === 'right') {
+    return 'flex-start';
+  }
+
+  return 'flex-end';
+}
+
+function WithLegend({
+  className = '',
+  debounceTime,
+  width = 'auto',
+  height = 'auto',
+  legendJustifyContent,
+  position = 'top',
+  renderChart,
+  renderLegend,
+}: Props) {
+  const isHorizontal = position === 'left' || position === 'right';
+
+  const style: CSSProperties = useMemo(
+    () => ({
+      display: 'flex',
+      flexDirection: getContainerDirection(position),
+      height,
+      width,
+    }),
+    [position, height, width],
+  );
+
+  const chartStyle: CSSProperties = useMemo(() => {
+    const baseStyle = { ...CHART_STYLE_BASE };
+    if (isHorizontal) {
+      baseStyle.width = 0;
+    } else {
+      baseStyle.height = 0;
+    }
+    return baseStyle;
+  }, [isHorizontal]);
+
+  const legendDirection = isHorizontal ? 'column' : 'row';
+  const legendStyle: CSSProperties = useMemo(
+    () => ({
+      ...LEGEND_STYLE_BASE,
+      flexDirection: legendDirection,
+      justifyContent: getLegendJustifyContent(legendJustifyContent, position),
+    }),
+    [legendDirection, legendJustifyContent, position],
+  );
+
+  return (
+    <div className={`with-legend ${className}`} style={style}>
+      {renderLegend && (
+        <div className="legend-container" style={legendStyle}>
+          {renderLegend({
+            // Pass flexDirection for @vx/legend to arrange legend items
+            direction: legendDirection,
+          })}
+        </div>
+      )}
+      <div className="main-container" style={chartStyle}>
+        <ParentSize debounceTime={debounceTime}>
+          {(parent: { width: number; height: number }) =>
+            parent.width > 0 && parent.height > 0
+              ? // Only render when necessary
+                renderChart(parent)
+              : null
+          }
+        </ParentSize>
+      </div>
+    </div>
+  );
+}
+
+export default memo(WithLegend);
diff --git a/superset-frontend/packages/superset-ui-core/src/chart-composition/tooltip/TooltipFrame.tsx b/superset-frontend/packages/superset-ui-core/src/chart-composition/tooltip/TooltipFrame.tsx
index d470a229403..19008654316 100644
--- a/superset-frontend/packages/superset-ui-core/src/chart-composition/tooltip/TooltipFrame.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/chart-composition/tooltip/TooltipFrame.tsx
@@ -17,31 +17,21 @@
  * under the License.
  */
 
-import { PureComponent, ReactNode } from 'react';
-
-const defaultProps = {
-  className: '',
-};
+import { memo, ReactNode } from 'react';
 
 type Props = {
   className?: string;
   children: ReactNode;
-} & Readonly<typeof defaultProps>;
+};
 
 const CONTAINER_STYLE = { padding: 8 };
 
-class TooltipFrame extends PureComponent<Props, {}> {
-  static defaultProps = defaultProps;
-
-  render() {
-    const { className, children } = this.props;
-
-    return (
-      <div className={className} style={CONTAINER_STYLE}>
-        {children}
-      </div>
-    );
-  }
+function TooltipFrame({ className = '', children }: Props) {
+  return (
+    <div className={className} style={CONTAINER_STYLE}>
+      {children}
+    </div>
+  );
 }
 
-export default TooltipFrame;
+export default memo(TooltipFrame);
diff --git a/superset-frontend/packages/superset-ui-core/src/chart/components/Matrixify/MatrixifyGridGenerator.test.ts b/superset-frontend/packages/superset-ui-core/src/chart/components/Matrixify/MatrixifyGridGenerator.test.ts
index 8f660e1a776..047105ed56b 100644
--- a/superset-frontend/packages/superset-ui-core/src/chart/components/Matrixify/MatrixifyGridGenerator.test.ts
+++ b/superset-frontend/packages/superset-ui-core/src/chart/components/Matrixify/MatrixifyGridGenerator.test.ts
@@ -39,6 +39,7 @@ const createSqlMetric = (label: string, sql: string): AdhocMetric => ({
 const baseFormData: TestFormData = {
   viz_type: 'table',
   datasource: '1__table',
+  matrixify_enable: true,
   matrixify_mode_rows: 'metrics',
   matrixify_mode_columns: 'metrics',
   matrixify_rows: [createAdhocMetric('Revenue'), createAdhocMetric('Profit')],
@@ -77,6 +78,7 @@ test('should generate grid for dimensions mode', () => {
   const dimensionFormData: TestFormData = {
     viz_type: 'table',
     datasource: '1__table',
+    matrixify_enable: true,
     matrixify_mode_rows: 'dimensions',
     matrixify_mode_columns: 'dimensions',
     matrixify_dimension_rows: {
@@ -117,6 +119,7 @@ test('should generate grid for mixed mode (metrics rows, dimensions columns)', (
   const mixedFormData: TestFormData = {
     viz_type: 'table',
     datasource: '1__table',
+    matrixify_enable: true,
     matrixify_mode_rows: 'metrics',
     matrixify_mode_columns: 'dimensions',
     matrixify_rows: [createAdhocMetric('Total Sales')],
@@ -139,6 +142,7 @@ test('should handle empty configuration', () => {
   const emptyFormData: TestFormData = {
     viz_type: 'table',
     datasource: '1__table',
+    matrixify_enable: true,
     matrixify_mode_rows: 'metrics',
     matrixify_mode_columns: 'metrics',
     matrixify_rows: [],
@@ -157,6 +161,7 @@ test('should handle single row and column', () => {
   const singleCellFormData: TestFormData = {
     viz_type: 'table',
     datasource: '1__table',
+    matrixify_enable: true,
     matrixify_mode_rows: 'metrics',
     matrixify_mode_columns: 'metrics',
     matrixify_rows: [createAdhocMetric('Count')],
@@ -177,6 +182,7 @@ test('should handle string metrics', () => {
   const stringMetricFormData: TestFormData = {
     viz_type: 'table',
     datasource: '1__table',
+    matrixify_enable: true,
     matrixify_mode_rows: 'metrics',
     matrixify_mode_columns: 'metrics',
     matrixify_rows: ['count', 'sum'],
@@ -190,10 +196,30 @@ test('should handle string metrics', () => {
   expect(grid!.colHeaders).toEqual(['avg', 'max']);
 });
 
+test('should skip missing column metrics when generating cell form data', () => {
+  const missingColumnMetricFormData: TestFormData = {
+    viz_type: 'table',
+    datasource: '1__table',
+    matrixify_enable: true,
+    matrixify_mode_rows: 'metrics',
+    matrixify_mode_columns: 'metrics',
+    matrixify_rows: [createAdhocMetric('Revenue')],
+    matrixify_columns: [null],
+  };
+
+  const grid = generateMatrixifyGrid(missingColumnMetricFormData);
+
+  expect(grid).not.toBeNull();
+  expect(grid!.cells[0][0]!.formData.metrics).toEqual([
+    createAdhocMetric('Revenue'),
+  ]);
+});
+
 test('should not escape HTML entities in cell titles', () => {
   const formDataWithSpecialChars: TestFormData = {
     viz_type: 'table',
     datasource: '1__table',
+    matrixify_enable: true,
     matrixify_mode_rows: 'metrics',
     matrixify_mode_columns: 'metrics',
     matrixify_rows: [createAdhocMetric('Sales & Revenue')],
@@ -309,6 +335,7 @@ test('should generate single-column grid when only rows are configured', () => {
   const rowsOnlyFormData: TestFormData = {
     viz_type: 'table',
     datasource: '1__table',
+    matrixify_enable: true,
     matrixify_mode_rows: 'metrics',
     matrixify_rows: [createAdhocMetric('Revenue'), createAdhocMetric('Profit')],
     // No column config
@@ -326,6 +353,7 @@ test('should generate single-row grid when only columns are configured', () => {
   const colsOnlyFormData: TestFormData = {
     viz_type: 'table',
     datasource: '1__table',
+    matrixify_enable: true,
     matrixify_mode_columns: 'metrics',
     matrixify_columns: [
       createSqlMetric('Q1', 'SUM(q1)'),
@@ -359,6 +387,7 @@ test('should return empty string header for null metric in array (line 76)', ()
   const formData: TestFormData = {
     viz_type: 'table',
     datasource: '1__table',
+    matrixify_enable: true,
     matrixify_mode_rows: 'metrics',
     matrixify_mode_columns: 'metrics',
     matrixify_rows: [null],
@@ -373,6 +402,7 @@ test('should return empty string header for empty-string dimension value (line 8
   const formData: TestFormData = {
     viz_type: 'table',
     datasource: '1__table',
+    matrixify_enable: true,
     matrixify_mode_rows: 'dimensions',
     matrixify_mode_columns: 'dimensions',
     matrixify_dimension_rows: { dimension: 'country', values: [''] },
@@ -387,6 +417,7 @@ test('should skip dimension filter when value is undefined (lines 151, 165)', ()
   const formData: TestFormData = {
     viz_type: 'table',
     datasource: '1__table',
+    matrixify_enable: true,
     matrixify_mode_rows: 'dimensions',
     matrixify_mode_columns: 'dimensions',
     matrixify_dimension_rows: {
@@ -418,6 +449,7 @@ test('should handle metrics without labels', () => {
   const metricsWithoutLabels: TestFormData = {
     viz_type: 'table',
     datasource: '1__table',
+    matrixify_enable: true,
     matrixify_mode_rows: 'metrics',
     matrixify_mode_columns: 'metrics',
     matrixify_rows: [
diff --git a/superset-frontend/packages/superset-ui-core/src/chart/types/VizType.ts b/superset-frontend/packages/superset-ui-core/src/chart/types/VizType.ts
index 0052f160927..cadb4c187ca 100644
--- a/superset-frontend/packages/superset-ui-core/src/chart/types/VizType.ts
+++ b/superset-frontend/packages/superset-ui-core/src/chart/types/VizType.ts
@@ -41,6 +41,7 @@ export enum VizType {
   LegacyBubble = 'bubble',
   Line = 'echarts_timeseries_line',
   MapBox = 'mapbox',
+  PointClusterMap = 'point_cluster_map',
   MixedTimeseries = 'mixed_timeseries',
   PairedTTest = 'paired_ttest',
   ParallelCoordinates = 'para',
diff --git a/superset-frontend/packages/superset-ui-core/src/chart/types/matrixify.test.ts b/superset-frontend/packages/superset-ui-core/src/chart/types/matrixify.test.ts
index b0eaf837fcd..81c36a0cca2 100644
--- a/superset-frontend/packages/superset-ui-core/src/chart/types/matrixify.test.ts
+++ b/superset-frontend/packages/superset-ui-core/src/chart/types/matrixify.test.ts
@@ -137,9 +137,31 @@ test('getMatrixifyConfig should return null when no matrixify configuration exis
   expect(getMatrixifyConfig(formData)).toBeNull();
 });
 
+test('getMatrixifyConfig should return null when matrixify_enable is false', () => {
+  const formData = {
+    viz_type: 'table',
+    matrixify_enable: false,
+    matrixify_mode_rows: 'metrics',
+    matrixify_mode_columns: 'metrics',
+    matrixify_rows: [createMetric('Revenue')],
+    matrixify_columns: [createMetric('Q1')],
+  } as MatrixifyFormData;
+  expect(getMatrixifyConfig(formData)).toBeNull();
+});
+
+test('getMatrixifyConfig should return null when no axes are enabled', () => {
+  const formData = {
+    viz_type: 'table',
+    matrixify_enable: true,
+  } as MatrixifyFormData;
+
+  expect(getMatrixifyConfig(formData)).toBeNull();
+});
+
 test('getMatrixifyConfig should return valid config for metrics mode', () => {
   const formData = {
     viz_type: 'table',
+    matrixify_enable: true,
     matrixify_mode_rows: 'metrics',
     matrixify_mode_columns: 'metrics',
     matrixify_rows: [createMetric('Revenue')],
@@ -157,6 +179,7 @@ test('getMatrixifyConfig should return valid config for metrics mode', () => {
 test('getMatrixifyConfig should return valid config for dimensions mode', () => {
   const formData = {
     viz_type: 'table',
+    matrixify_enable: true,
     matrixify_mode_rows: 'dimensions',
     matrixify_mode_columns: 'dimensions',
     matrixify_dimension_rows: { dimension: 'country', values: ['USA'] },
@@ -180,6 +203,7 @@ test('getMatrixifyConfig should return valid config for dimensions mode', () =>
 test('getMatrixifyConfig should handle topn selection mode', () => {
   const formData = {
     viz_type: 'table',
+    matrixify_enable: true,
     matrixify_mode_rows: 'dimensions',
     matrixify_mode_columns: 'dimensions',
     matrixify_dimension_rows: {
@@ -197,6 +221,24 @@ test('getMatrixifyConfig should handle topn selection mode', () => {
   expect(config!.rows.dimension).toEqual(formData.matrixify_dimension_rows);
 });
 
+test('getMatrixifyConfig should preserve ascending topn order when explicitly disabled', () => {
+  const formData = {
+    viz_type: 'table',
+    matrixify_enable: true,
+    matrixify_mode_rows: 'dimensions',
+    matrixify_mode_columns: 'dimensions',
+    matrixify_dimension_rows: { dimension: 'country', values: ['USA'] },
+    matrixify_dimension_columns: { dimension: 'product', values: ['Widget'] },
+    matrixify_topn_order_rows: false,
+    matrixify_topn_order_columns: false,
+  } as MatrixifyFormData;
+
+  const config = getMatrixifyConfig(formData);
+  expect(config).not.toBeNull();
+  expect(config!.rows.topnOrder).toBe('asc');
+  expect(config!.columns.topnOrder).toBe('asc');
+});
+
 test('getMatrixifyValidationErrors should return empty array when matrixify is not enabled', () => {
   const formData = {
     viz_type: 'table',
@@ -207,9 +249,31 @@ test('getMatrixifyValidationErrors should return empty array when matrixify is n
   expect(getMatrixifyValidationErrors(formData)).toEqual([]);
 });
 
+test('getMatrixifyValidationErrors should return empty array when matrixify_enable is false even with stale mode values', () => {
+  const formData = {
+    viz_type: 'table',
+    matrixify_enable: false,
+    matrixify_mode_rows: 'metrics',
+    matrixify_mode_columns: 'dimensions',
+  } as MatrixifyFormData;
+
+  expect(getMatrixifyValidationErrors(formData)).toEqual([]);
+});
+
+test('getMatrixifyValidationErrors should return empty array when matrixify_enable is undefined with stale defaults', () => {
+  const formData = {
+    viz_type: 'bar',
+    matrixify_mode_rows: 'metrics',
+    matrixify_rows: [],
+  } as MatrixifyFormData;
+
+  expect(getMatrixifyValidationErrors(formData)).toEqual([]);
+});
+
 test('getMatrixifyValidationErrors should return empty array when properly configured', () => {
   const formData = {
     viz_type: 'table',
+    matrixify_enable: true,
     matrixify_mode_rows: 'metrics',
     matrixify_mode_columns: 'metrics',
     matrixify_rows: [createMetric('Revenue')],
@@ -219,9 +283,19 @@ test('getMatrixifyValidationErrors should return empty array when properly confi
   expect(getMatrixifyValidationErrors(formData)).toEqual([]);
 });
 
+test('getMatrixifyValidationErrors should return empty array when enabled with no active axes', () => {
+  const formData = {
+    viz_type: 'table',
+    matrixify_enable: true,
+  } as MatrixifyFormData;
+
+  expect(getMatrixifyValidationErrors(formData)).toEqual([]);
+});
+
 test('getMatrixifyValidationErrors should return error when enabled but no configuration exists', () => {
   const formData = {
     viz_type: 'table',
+    matrixify_enable: true,
     matrixify_mode_rows: 'metrics',
   } as MatrixifyFormData;
 
@@ -232,6 +306,7 @@ test('getMatrixifyValidationErrors should return error when enabled but no confi
 test('getMatrixifyValidationErrors should return error when metrics mode has no metrics', () => {
   const formData = {
     viz_type: 'table',
+    matrixify_enable: true,
     matrixify_mode_rows: 'metrics',
     matrixify_rows: [],
     matrixify_columns: [],
@@ -276,6 +351,7 @@ test('isMatrixifyEnabled should return false when switch is off even with valid
 test('getMatrixifyValidationErrors should return dimension error for rows when dimension has no data', () => {
   const formData = {
     viz_type: 'table',
+    matrixify_enable: true,
     matrixify_mode_rows: 'dimensions',
     // No matrixify_dimension_rows set
     matrixify_mode_columns: 'metrics',
@@ -289,6 +365,7 @@ test('getMatrixifyValidationErrors should return dimension error for rows when d
 test('getMatrixifyValidationErrors should return metric error for columns when metrics array is empty', () => {
   const formData = {
     viz_type: 'table',
+    matrixify_enable: true,
     matrixify_mode_rows: 'metrics',
     matrixify_rows: [createMetric('Revenue')],
     matrixify_mode_columns: 'metrics',
@@ -302,6 +379,7 @@ test('getMatrixifyValidationErrors should return metric error for columns when m
 test('getMatrixifyValidationErrors should return dimension error for columns when no dimension data', () => {
   const formData = {
     viz_type: 'table',
+    matrixify_enable: true,
     matrixify_mode_rows: 'metrics',
     matrixify_rows: [createMetric('Revenue')],
     matrixify_mode_columns: 'dimensions',
@@ -315,6 +393,7 @@ test('getMatrixifyValidationErrors should return dimension error for columns whe
 test('getMatrixifyValidationErrors skips row check when matrixify_mode_rows is not set', () => {
   const formData = {
     viz_type: 'table',
+    matrixify_enable: true,
     // No matrixify_mode_rows — hasRowMode = false
     matrixify_mode_columns: 'metrics',
     matrixify_columns: [createMetric('Q1')],
@@ -327,6 +406,7 @@ test('getMatrixifyValidationErrors skips row check when matrixify_mode_rows is n
 test('getMatrixifyValidationErrors evaluates full && expression when dimension is set but values are empty', () => {
   const formData = {
     viz_type: 'table',
+    matrixify_enable: true,
     matrixify_mode_rows: 'dimensions',
     matrixify_dimension_rows: { dimension: 'country', values: [] },
     matrixify_mode_columns: 'dimensions',
diff --git a/superset-frontend/packages/superset-ui-core/src/chart/types/matrixify.ts b/superset-frontend/packages/superset-ui-core/src/chart/types/matrixify.ts
index e43dbe31406..b179daf1fbf 100644
--- a/superset-frontend/packages/superset-ui-core/src/chart/types/matrixify.ts
+++ b/superset-frontend/packages/superset-ui-core/src/chart/types/matrixify.ts
@@ -154,6 +154,10 @@ function isAxisEnabled(mode?: MatrixifyMode): boolean {
 export function getMatrixifyConfig(
   formData: MatrixifyFormData & any,
 ): MatrixifyConfig | null {
+  if (formData.matrixify_enable !== true) {
+    return null;
+  }
+
   const rowEnabled = isAxisEnabled(formData.matrixify_mode_rows);
   const colEnabled = isAxisEnabled(formData.matrixify_mode_columns);
 
@@ -196,10 +200,7 @@ export function isMatrixifyEnabled(formData: MatrixifyFormData): boolean {
     return false;
   }
 
-  const config = getMatrixifyConfig(formData);
-  if (!config) {
-    return false;
-  }
+  const config = getMatrixifyConfig(formData)!;
 
   const hasRowData =
     rowEnabled &&
@@ -230,6 +231,10 @@ export function isMatrixifyEnabled(formData: MatrixifyFormData): boolean {
 export function getMatrixifyValidationErrors(
   formData: MatrixifyFormData,
 ): string[] {
+  if (formData.matrixify_enable !== true) {
+    return [];
+  }
+
   const errors: string[] = [];
 
   const rowEnabled = isAxisEnabled(formData.matrixify_mode_rows);
@@ -239,11 +244,7 @@ export function getMatrixifyValidationErrors(
     return errors;
   }
 
-  const config = getMatrixifyConfig(formData);
-  if (!config) {
-    errors.push('Please configure at least one row or column axis');
-    return errors;
-  }
+  const config = getMatrixifyConfig(formData)!;
 
   // Check row configuration (only if explicitly set in form data)
   const hasRowMode = Boolean(formData.matrixify_mode_rows);
diff --git a/superset-frontend/packages/superset-ui-core/src/components/AsyncAceEditor/index.tsx b/superset-frontend/packages/superset-ui-core/src/components/AsyncAceEditor/index.tsx
index 56230e130f0..19c7b46c675 100644
--- a/superset-frontend/packages/superset-ui-core/src/components/AsyncAceEditor/index.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/AsyncAceEditor/index.tsx
@@ -283,6 +283,16 @@ export function AsyncAceEditor(
                   color: ${token.colorText} !important;
                 }
 
+                /* Fix cursor misalignment by ensuring consistent font-family */
+                .ace_editor .ace_content {
+                  font-family: ${editorFontFamily} !important;
+                }
+
+                /* Ensure the text layer uses the same font-family */
+                .ace_editor .ace_text-layer {
+                  font-family: ${editorFontFamily} !important;
+                }
+
                 /* Adjust gutter colors */
                 .ace_editor .ace_gutter {
                   background-color: ${token.colorBgElevated} !important;
@@ -309,6 +319,11 @@ export function AsyncAceEditor(
                   opacity: 0.5;
                 }
 
+                /* Style bracket matching to blend with theme */
+                .ace_editor .ace_bracket {
+                  border-color: ${token.colorPrimaryBorderHover} !important;
+                }
+
                 /* Adjust cursor color */
                 .ace_editor .ace_cursor {
                   color: ${token.colorPrimaryText} !important;
diff --git a/superset-frontend/packages/superset-ui-core/src/components/AsyncEsmComponent/index.tsx b/superset-frontend/packages/superset-ui-core/src/components/AsyncEsmComponent/index.tsx
index 5f8562cd3eb..aeb8f8b7220 100644
--- a/superset-frontend/packages/superset-ui-core/src/components/AsyncEsmComponent/index.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/AsyncEsmComponent/index.tsx
@@ -33,20 +33,22 @@ import type { PlaceholderProps } from './types';
 function DefaultPlaceholder({
   width,
   height,
-  showLoadingForImport = false,
+  showLoadingForImport = true,
   placeholderStyle: style,
 }: PlaceholderProps) {
-  return (
-    // since `width` defaults to 100%, we can display the placeholder once
-    // height is specified.
-    (height && (
+  if (showLoadingForImport) {
+    return (
       <div key="async-asm-placeholder" style={{ width, height, ...style }}>
-        {showLoadingForImport && <Loading position="floating" />}
+        <Loading position="floating" size="s" />
       </div>
-    )) ||
-    // `|| null` is for in case of height=0.
-    null
-  );
+    );
+  }
+  if (height) {
+    return (
+      <div key="async-asm-placeholder" style={{ width, height, ...style }} />
+    );
+  }
+  return null;
 }
 
 /**
diff --git a/superset-frontend/packages/superset-ui-core/src/components/Button/Button.test.tsx b/superset-frontend/packages/superset-ui-core/src/components/Button/Button.test.tsx
index 2f2c16db27b..a01dee81a79 100644
--- a/superset-frontend/packages/superset-ui-core/src/components/Button/Button.test.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/Button/Button.test.tsx
@@ -23,6 +23,11 @@ import {
   SIZES as buttonSizes,
   STYLES as buttonStyles,
 } from './Button.stories';
+import {
+  getSecondaryButtonStyle,
+  getSecondaryButtonHoverStyles,
+} from './index';
+import type { SupersetTheme } from '@apache-superset/core/theme';
 
 test('works with an onClick handler', () => {
   const mockAction = jest.fn();
@@ -47,3 +52,165 @@ test('All the sorybook gallery variants mount', () => {
 
   expect(getAllByRole('button')).toHaveLength(permutationCount);
 });
+
+test('secondary button renders without errors', () => {
+  const { getByRole } = render(
+    <Button buttonStyle="secondary">Secondary</Button>,
+  );
+  expect(getByRole('button')).toBeInTheDocument();
+});
+
+test('getSecondaryButtonStyle uses fallback tokens when custom tokens not set', () => {
+  const mockTheme = {
+    colorPrimary: '#2893B3',
+    colorPrimaryBg: '#e6f4f7',
+    colorPrimaryBgHover: '#cce9ef',
+    colorPrimaryBorder: '#99d3df',
+  } as SupersetTheme;
+
+  const styles = getSecondaryButtonStyle(mockTheme);
+
+  // Default state uses inline styles (no !important needed)
+  expect(styles.color).toBe('#2893B3');
+  expect(styles.backgroundColor).toBe('#e6f4f7');
+  expect(styles.borderColor).toBe('transparent');
+});
+
+test('getSecondaryButtonHoverStyles uses fallback tokens when custom tokens not set', () => {
+  const mockTheme = {
+    colorPrimary: '#2893B3',
+    colorPrimaryBg: '#e6f4f7',
+    colorPrimaryBgHover: '#cce9ef',
+    colorPrimaryBorder: '#99d3df',
+  } as SupersetTheme;
+
+  const hoverStyles = getSecondaryButtonHoverStyles(mockTheme);
+
+  // Hover/active states use CSS with !important for specificity
+  expect(hoverStyles['&:hover'].backgroundColor).toBe('#cce9ef !important');
+  expect(hoverStyles['&:active'].backgroundColor).toBe('#99d3df !important');
+});
+
+test('getSecondaryButtonStyle uses custom tokens when provided', () => {
+  const mockTheme = {
+    colorPrimary: '#2893B3',
+    colorPrimaryBg: '#e6f4f7',
+    colorPrimaryBgHover: '#cce9ef',
+    colorPrimaryBorder: '#99d3df',
+    // Custom secondary button tokens
+    buttonSecondaryColor: '#custom-color',
+    buttonSecondaryBg: '#custom-bg',
+    buttonSecondaryBorderColor: '#custom-border',
+  } as SupersetTheme;
+
+  const styles = getSecondaryButtonStyle(mockTheme);
+
+  // Default state uses inline styles (no !important needed)
+  expect(styles.color).toBe('#custom-color');
+  expect(styles.backgroundColor).toBe('#custom-bg');
+  expect(styles.borderColor).toBe('#custom-border');
+});
+
+test('getSecondaryButtonHoverStyles uses custom tokens when provided', () => {
+  const mockTheme = {
+    colorPrimary: '#2893B3',
+    colorPrimaryBg: '#e6f4f7',
+    colorPrimaryBgHover: '#cce9ef',
+    colorPrimaryBorder: '#99d3df',
+    // Custom secondary button tokens
+    buttonSecondaryHoverColor: '#custom-hover-color',
+    buttonSecondaryHoverBg: '#custom-hover-bg',
+    buttonSecondaryHoverBorderColor: '#custom-hover-border',
+    buttonSecondaryActiveColor: '#custom-active-color',
+    buttonSecondaryActiveBg: '#custom-active-bg',
+    buttonSecondaryActiveBorderColor: '#custom-active-border',
+  } as SupersetTheme;
+
+  const hoverStyles = getSecondaryButtonHoverStyles(mockTheme);
+
+  // Hover/active states use CSS with !important for specificity
+  expect(hoverStyles['&:hover'].color).toBe('#custom-hover-color !important');
+  expect(hoverStyles['&:hover'].backgroundColor).toBe(
+    '#custom-hover-bg !important',
+  );
+  expect(hoverStyles['&:hover'].borderColor).toBe(
+    '#custom-hover-border !important',
+  );
+  expect(hoverStyles['&:active'].color).toBe('#custom-active-color !important');
+  expect(hoverStyles['&:active'].backgroundColor).toBe(
+    '#custom-active-bg !important',
+  );
+  expect(hoverStyles['&:active'].borderColor).toBe(
+    '#custom-active-border !important',
+  );
+});
+
+test('getSecondaryButtonStyle supports partial token overrides', () => {
+  const mockTheme = {
+    colorPrimary: '#2893B3',
+    colorPrimaryBg: '#e6f4f7',
+    colorPrimaryBgHover: '#cce9ef',
+    colorPrimaryBorder: '#99d3df',
+    // Only override some tokens
+    buttonSecondaryBg: '#custom-bg',
+    buttonSecondaryBorderColor: '#custom-border',
+  } as SupersetTheme;
+
+  const styles = getSecondaryButtonStyle(mockTheme);
+
+  // Should use custom values where provided (no !important for inline styles)
+  expect(styles.backgroundColor).toBe('#custom-bg');
+  expect(styles.borderColor).toBe('#custom-border');
+  // Should fallback to Ant Design tokens where not provided
+  expect(styles.color).toBe('#2893B3');
+});
+
+test('getSecondaryButtonHoverStyles supports partial token overrides', () => {
+  const mockTheme = {
+    colorPrimary: '#2893B3',
+    colorPrimaryBg: '#e6f4f7',
+    colorPrimaryBgHover: '#cce9ef',
+    colorPrimaryBorder: '#99d3df',
+    // Only override hover bg
+    buttonSecondaryHoverBg: '#custom-hover-bg',
+  } as SupersetTheme;
+
+  const hoverStyles = getSecondaryButtonHoverStyles(mockTheme);
+
+  // Should use custom value where provided
+  expect(hoverStyles['&:hover'].backgroundColor).toBe(
+    '#custom-hover-bg !important',
+  );
+  // Should fallback to Ant Design tokens where not provided
+  expect(hoverStyles['&:hover'].color).toBe('#2893B3 !important');
+  expect(hoverStyles['&:active'].backgroundColor).toBe('#99d3df !important');
+});
+
+test('getSecondaryButtonStyle falls back when tokens are empty strings', () => {
+  const mockTheme = {
+    colorPrimary: '#2893B3',
+    colorPrimaryBg: '#e6f4f7',
+    buttonSecondaryColor: '',
+    buttonSecondaryBg: '',
+    buttonSecondaryBorderColor: '',
+  } as SupersetTheme;
+
+  const styles = getSecondaryButtonStyle(mockTheme);
+
+  // Empty strings should trigger fallback to primary tokens
+  expect(styles.color).toBe('#2893B3');
+  expect(styles.backgroundColor).toBe('#e6f4f7');
+  expect(styles.borderColor).toBe('transparent');
+});
+
+test('secondary button merges consumer style with theme styles', () => {
+  const { getByRole } = render(
+    <Button buttonStyle="secondary" style={{ marginTop: 10, padding: 20 }}>
+      Styled Secondary
+    </Button>,
+  );
+  const button = getByRole('button');
+
+  // Consumer styles should be applied
+  expect(button).toHaveStyle({ marginTop: '10px', padding: '20px' });
+});
diff --git a/superset-frontend/packages/superset-ui-core/src/components/Button/index.tsx b/superset-frontend/packages/superset-ui-core/src/components/Button/index.tsx
index 626abfaa404..78f525e5a7c 100644
--- a/superset-frontend/packages/superset-ui-core/src/components/Button/index.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/Button/index.tsx
@@ -21,6 +21,7 @@ import cx from 'classnames';
 import { Button as AntdButton } from 'antd';
 import { useTheme } from '@apache-superset/core/theme';
 import { Tooltip } from '../Tooltip';
+import type { SupersetTheme } from '@apache-superset/core/theme';
 import type {
   ButtonColorType,
   ButtonProps,
@@ -30,6 +31,59 @@ import type {
   OnClickHandler,
 } from './types';
 
+/**
+ * Secondary Button Theming
+ *
+ * Ant Design's "filled" variant (used for secondary buttons) has no component-level
+ * tokens for customization. To enable full theming of secondary buttons, we use
+ * Superset-specific tokens (buttonSecondary*) with fallbacks to Ant Design's
+ * colorPrimary* derived tokens.
+ *
+ * Implementation approach (follows PR #38679 pattern for label tokens):
+ * - Default state: Applied via inline `style` prop (higher specificity than CSS classes)
+ * - Hover/Active states: Applied via `css` prop with !important (pseudo-selectors
+ *   cannot be applied via inline styles)
+ *
+ * Available tokens (all optional, with sensible fallbacks):
+ * - buttonSecondaryColor: Text color (fallback: colorPrimary)
+ * - buttonSecondaryBg: Background color (fallback: colorPrimaryBg)
+ * - buttonSecondaryBorderColor: Border color (fallback: transparent)
+ * - buttonSecondaryHoverColor: Hover text color (fallback: colorPrimary)
+ * - buttonSecondaryHoverBg: Hover background (fallback: colorPrimaryBgHover)
+ * - buttonSecondaryHoverBorderColor: Hover border (fallback: transparent)
+ * - buttonSecondaryActiveColor: Active/pressed text color (fallback: colorPrimary)
+ * - buttonSecondaryActiveBg: Active/pressed background (fallback: colorPrimaryBorder)
+ * - buttonSecondaryActiveBorderColor: Active/pressed border (fallback: transparent)
+ */
+
+/**
+ * Generates inline styles for secondary buttons (default state).
+ * Inline styles have higher specificity than CSS classes, so no !important needed.
+ */
+export const getSecondaryButtonStyle = (theme: SupersetTheme) => ({
+  color: theme.buttonSecondaryColor || theme.colorPrimary,
+  backgroundColor: theme.buttonSecondaryBg || theme.colorPrimaryBg,
+  borderColor: theme.buttonSecondaryBorderColor || 'transparent',
+});
+
+/**
+ * Generates CSS styles for secondary button hover/active states.
+ * Must use CSS (not inline styles) since pseudo-selectors cannot be applied via style prop.
+ * Uses !important to override Ant Design's default styles.
+ */
+export const getSecondaryButtonHoverStyles = (theme: SupersetTheme) => ({
+  '&:hover': {
+    color: `${theme.buttonSecondaryHoverColor || theme.colorPrimary} !important`,
+    backgroundColor: `${theme.buttonSecondaryHoverBg || theme.colorPrimaryBgHover} !important`,
+    borderColor: `${theme.buttonSecondaryHoverBorderColor || 'transparent'} !important`,
+  },
+  '&:active': {
+    color: `${theme.buttonSecondaryActiveColor || theme.colorPrimary} !important`,
+    backgroundColor: `${theme.buttonSecondaryActiveBg || theme.colorPrimaryBorder} !important`,
+    borderColor: `${theme.buttonSecondaryActiveBorderColor || 'transparent'} !important`,
+  },
+});
+
 const BUTTON_STYLE_MAP: Record<
   ButtonStyle,
   {
@@ -98,6 +152,12 @@ export function Button(props: ButtonProps) {
 
   const effectiveButtonStyle: ButtonStyle = buttonStyle ?? 'primary';
 
+  // Secondary button inline styles (default state) - inline styles override CSS classes
+  const secondaryStyle =
+    effectiveButtonStyle === 'secondary' && !disabled
+      ? getSecondaryButtonStyle(theme)
+      : undefined;
+
   const button = (
     <AntdButton
       href={disabled ? undefined : href}
@@ -132,15 +192,18 @@ export function Button(props: ButtonProps) {
         '& > span > :first-of-type': {
           marginRight: firstChildMargin,
         },
-        ':not(:hover)': effectiveButtonStyle === 'secondary' &&
-          !disabled && {
-            // NOTE: This is the best we can do contrast wise for the secondary button using antd tokens
-            // and abusing the semantics. Should be revisited when possible. https://github.com/apache/superset/pull/34253#issuecomment-3104834692
-            color: `${theme.colorPrimaryTextHover} !important`,
-          },
+        // Secondary button hover/active states via CSS
+        ...(effectiveButtonStyle === 'secondary' &&
+          !disabled &&
+          getSecondaryButtonHoverStyles(theme)),
       }}
       icon={icon}
       {...restProps}
+      style={
+        secondaryStyle
+          ? { ...secondaryStyle, ...restProps.style }
+          : restProps.style
+      }
     >
       {children}
     </AntdButton>
diff --git a/superset-frontend/packages/superset-ui-core/src/components/CodeSyntaxHighlighter/index.test.tsx b/superset-frontend/packages/superset-ui-core/src/components/CodeSyntaxHighlighter/index.test.tsx
index 8734447c302..c70da8df1c7 100644
--- a/superset-frontend/packages/superset-ui-core/src/components/CodeSyntaxHighlighter/index.test.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/CodeSyntaxHighlighter/index.test.tsx
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { render, screen } from '../../spec';
+import { render, screen, fireEvent } from '../../spec';
 import CodeSyntaxHighlighter from './index';
 
 // Simple mock that just returns the content
@@ -153,4 +153,44 @@ describe('CodeSyntaxHighlighter', () => {
 
     expect(screen.getByText('SELECT * FROM users;')).toBeInTheDocument();
   });
+
+  test('shows copy button by default', () => {
+    render(
+      <CodeSyntaxHighlighter language="sql">SELECT 1;</CodeSyntaxHighlighter>,
+    );
+
+    expect(screen.getByTitle('Copy to clipboard')).toBeInTheDocument();
+  });
+
+  test('hides copy button when showCopyButton is false', () => {
+    render(
+      <CodeSyntaxHighlighter language="sql" showCopyButton={false}>
+        SELECT 1;
+      </CodeSyntaxHighlighter>,
+    );
+
+    expect(screen.queryByTitle('Copy to clipboard')).not.toBeInTheDocument();
+  });
+
+  test('copy button does not throw when clipboard API is unavailable', () => {
+    const originalClipboard = navigator.clipboard;
+    Object.defineProperty(navigator, 'clipboard', {
+      value: undefined,
+      configurable: true,
+    });
+    document.execCommand = jest.fn().mockReturnValue(true);
+
+    render(
+      <CodeSyntaxHighlighter language="sql">SELECT 1;</CodeSyntaxHighlighter>,
+    );
+
+    expect(() =>
+      fireEvent.click(screen.getByTitle('Copy to clipboard')),
+    ).not.toThrow();
+
+    Object.defineProperty(navigator, 'clipboard', {
+      value: originalClipboard,
+      configurable: true,
+    });
+  });
 });
diff --git a/superset-frontend/packages/superset-ui-core/src/components/CodeSyntaxHighlighter/index.tsx b/superset-frontend/packages/superset-ui-core/src/components/CodeSyntaxHighlighter/index.tsx
index 131abad4304..29a035885f4 100644
--- a/superset-frontend/packages/superset-ui-core/src/components/CodeSyntaxHighlighter/index.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/CodeSyntaxHighlighter/index.tsx
@@ -16,11 +16,14 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { useEffect, useState } from 'react';
+import { useCallback, useEffect, useRef, useState } from 'react';
 import SyntaxHighlighterBase from 'react-syntax-highlighter/dist/cjs/light';
 import github from 'react-syntax-highlighter/dist/cjs/styles/hljs/github';
 import tomorrow from 'react-syntax-highlighter/dist/cjs/styles/hljs/tomorrow-night';
-import { isThemeDark, useTheme } from '@apache-superset/core/theme';
+import { css, isThemeDark, useTheme } from '@apache-superset/core/theme';
+import { t } from '@apache-superset/core/translation';
+import copyTextToClipboard from '../../utils/copy';
+import { Icons } from '../Icons';
 
 export type SupportedLanguage = 'sql' | 'htmlbars' | 'markdown' | 'json';
 
@@ -31,6 +34,7 @@ export interface CodeSyntaxHighlighterProps {
   showLineNumbers?: boolean;
   wrapLines?: boolean;
   style?: any; // Override theme style if needed
+  showCopyButton?: boolean;
 }
 
 // Track which languages have been registered to avoid duplicate registrations
@@ -76,11 +80,14 @@ export const CodeSyntaxHighlighter: React.FC<CodeSyntaxHighlighterProps> = ({
   showLineNumbers = false,
   wrapLines = true,
   style: overrideStyle,
+  showCopyButton = true,
 }) => {
   const theme = useTheme();
   const [isLanguageReady, setIsLanguageReady] = useState(
     registeredLanguages.has(language),
   );
+  const [copied, setCopied] = useState(false);
+  const copyTimeoutRef = useRef<ReturnType<typeof setTimeout> | null>(null);
 
   useEffect(() => {
     const loadLanguage = async () => {
@@ -93,6 +100,21 @@ export const CodeSyntaxHighlighter: React.FC<CodeSyntaxHighlighterProps> = ({
     loadLanguage();
   }, [language]);
 
+  useEffect(
+    () => () => {
+      if (copyTimeoutRef.current) clearTimeout(copyTimeoutRef.current);
+    },
+    [],
+  );
+
+  const handleCopy = useCallback(() => {
+    copyTextToClipboard(() => Promise.resolve(children)).then(() => {
+      if (copyTimeoutRef.current) clearTimeout(copyTimeoutRef.current);
+      setCopied(true);
+      copyTimeoutRef.current = setTimeout(() => setCopied(false), 1500);
+    });
+  }, [children]);
+
   const isDark = isThemeDark(theme);
   const themeStyle = overrideStyle || (isDark ? tomorrow : github);
 
@@ -104,32 +126,79 @@ export const CodeSyntaxHighlighter: React.FC<CodeSyntaxHighlighterProps> = ({
     ...customStyle,
   };
 
+  const copyButton = showCopyButton && (
+    <button
+      type="button"
+      onClick={(e: React.MouseEvent) => {
+        e.stopPropagation();
+        handleCopy();
+      }}
+      title={copied ? t('Copied!') : t('Copy to clipboard')}
+      css={css`
+        position: absolute;
+        top: ${theme.sizeUnit}px;
+        right: ${theme.sizeUnit}px;
+        background: none;
+        border: none;
+        cursor: pointer;
+        padding: ${theme.sizeUnit}px;
+        color: ${copied ? theme.colorSuccess : theme.colorTextSecondary};
+        line-height: 1;
+        border-radius: ${theme.borderRadius}px;
+        &:hover {
+          color: ${copied ? theme.colorSuccess : theme.colorText};
+          background: ${theme.colorBgTextHover};
+        }
+      `}
+    >
+      {copied ? (
+        <Icons.CheckOutlined style={{ fontSize: theme.fontSizeSM }} />
+      ) : (
+        <Icons.CopyOutlined style={{ fontSize: theme.fontSizeSM }} />
+      )}
+    </button>
+  );
+
   // Show a simple pre-formatted text while language is loading
   if (!isLanguageReady) {
     return (
-      <pre
-        style={{
-          ...defaultCustomStyle,
-          fontFamily: 'monospace',
-          whiteSpace: 'pre-wrap',
-          margin: 0,
-        }}
+      <div
+        css={css`
+          position: relative;
+        `}
       >
-        {children}
-      </pre>
+        {copyButton}
+        <pre
+          style={{
+            ...defaultCustomStyle,
+            fontFamily: 'monospace',
+            whiteSpace: 'pre-wrap',
+            margin: 0,
+          }}
+        >
+          {children}
+        </pre>
+      </div>
     );
   }
 
   return (
-    <SyntaxHighlighterBase
-      language={language}
-      style={themeStyle}
-      customStyle={defaultCustomStyle}
-      showLineNumbers={showLineNumbers}
-      wrapLines={wrapLines}
+    <div
+      css={css`
+        position: relative;
+      `}
     >
-      {children}
-    </SyntaxHighlighterBase>
+      {copyButton}
+      <SyntaxHighlighterBase
+        language={language}
+        style={themeStyle}
+        customStyle={defaultCustomStyle}
+        showLineNumbers={showLineNumbers}
+        wrapLines={wrapLines}
+      >
+        {children}
+      </SyntaxHighlighterBase>
+    </div>
   );
 };
 
diff --git a/superset-frontend/packages/superset-ui-core/src/components/DropdownContainer/DropdownContainer.tsx b/superset-frontend/packages/superset-ui-core/src/components/DropdownContainer/DropdownContainer.tsx
index 32a464f2ce8..e8deaf8e120 100644
--- a/superset-frontend/packages/superset-ui-core/src/components/DropdownContainer/DropdownContainer.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/DropdownContainer/DropdownContainer.tsx
@@ -352,6 +352,7 @@ export const DropdownContainer = forwardRef(
               onOpenChange={visible => setPopoverVisible(visible)}
               placement="bottom"
               forceRender={forceRender}
+              fresh // This prop prevents caching and stale data for filter scoping.
             >
               <Tooltip title={dropdownTriggerTooltip}>
                 <Button
diff --git a/superset-frontend/packages/superset-ui-core/src/components/EditableTitle/index.tsx b/superset-frontend/packages/superset-ui-core/src/components/EditableTitle/index.tsx
index e2c5d139e4b..17d8c51ef6d 100644
--- a/superset-frontend/packages/superset-ui-core/src/components/EditableTitle/index.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/EditableTitle/index.tsx
@@ -19,7 +19,7 @@
 
 import { t } from '@apache-superset/core/translation';
 import { css, styled } from '@apache-superset/core/theme';
-import { useEffect, useState, useRef } from 'react';
+import { useEffect, useLayoutEffect, useState, useRef } from 'react';
 import cx from 'classnames';
 import { Tooltip } from '../Tooltip';
 import { CertifiedBadge } from '../CertifiedBadge';
@@ -105,7 +105,7 @@ export function EditableTitle({
     return 0;
   }
 
-  useEffect(() => {
+  useLayoutEffect(() => {
     const { font } = window.getComputedStyle(
       contentRef.current?.resizableTextArea?.textArea || document.body,
     );
@@ -113,7 +113,7 @@ export function EditableTitle({
     const padding = 20;
     const maxAllowedWidth = typeof maxWidth === 'number' ? maxWidth : Infinity;
     setInputWidth(Math.min(textWidth + padding, maxAllowedWidth));
-  }, [currentTitle]);
+  }, [currentTitle, maxWidth]);
 
   useEffect(() => {
     if (title !== currentTitle) {
@@ -132,8 +132,7 @@ export function EditableTitle({
         textArea.scrollTop = textArea.scrollHeight;
       }
     }
-    onEditingChange?.(isEditing);
-  }, [isEditing, onEditingChange]);
+  }, [isEditing]);
 
   function handleClick() {
     if (!canEdit || isEditing) return;
@@ -144,6 +143,7 @@ export function EditableTitle({
       textArea.setSelectionRange(length, length);
     }
     setIsEditing(true);
+    onEditingChange?.(true);
   }
 
   function handleBlur() {
@@ -151,6 +151,7 @@ export function EditableTitle({
 
     if (!canEdit) return;
     setIsEditing(false);
+    onEditingChange?.(false);
 
     if (!formattedTitle.length) {
       setCurrentTitle(lastTitle);
diff --git a/superset-frontend/packages/superset-ui-core/src/components/EmptyState/svgs/empty-dashboard.svg b/superset-frontend/packages/superset-ui-core/src/components/EmptyState/svgs/empty-dashboard.svg
index 2acf05c8011..d7a6d8ef88f 100644
--- a/superset-frontend/packages/superset-ui-core/src/components/EmptyState/svgs/empty-dashboard.svg
+++ b/superset-frontend/packages/superset-ui-core/src/components/EmptyState/svgs/empty-dashboard.svg
@@ -17,10 +17,10 @@ specific language governing permissions and limitations
 under the License.
 -->
 <svg viewBox="0 0 119 78" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect x="17" y="1" width="86" height="62" rx="3" stroke="currentColor" stroke-width="2"/>
-<rect x="21" y="5" width="78" height="14" rx="3" stroke="currentColor" stroke-width="2"/>
-<rect x="21" y="23" width="38" height="36" rx="3" stroke="currentColor" stroke-width="2"/>
-<rect x="63" y="37" width="36" height="22" rx="3" stroke="currentColor" stroke-width="2"/>
-<rect x="63" y="23" width="36" height="10" rx="3" stroke="currentColor" stroke-width="2"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M16 55.2892C6.07439 57.7013 0 60.9397 0 64.5C0 71.9559 26.6391 78 59.5 78C92.3609 78 119 71.9559 119 64.5C119 61.0609 113.332 57.9221 104 55.5383V60C104 62.2092 102.209 64 100 64H20C17.7909 64 16 62.2092 16 60V55.2892Z" fill="currentColor" fill-opacity="0.25" stroke="currentColor"/>
+<path d="M99.3193 1H20.6639C19.0349 1 17.7143 2.32057 17.7143 3.94958V59.0084C17.7143 60.6374 19.0349 61.958 20.6639 61.958H99.3193C100.948 61.958 102.269 60.6374 102.269 59.0084V3.94958C102.269 2.32057 100.948 1 99.3193 1Z" stroke="currentColor" stroke-width="2"/>
+<path d="M95.3866 4.93277H24.5966C22.9676 4.93277 21.647 6.25335 21.647 7.88235V15.7479C21.647 17.3769 22.9676 18.6975 24.5966 18.6975H95.3866C97.0156 18.6975 98.3361 17.3769 98.3361 15.7479V7.88235C98.3361 6.25335 97.0156 4.93277 95.3866 4.93277Z" stroke="currentColor" stroke-width="2"/>
+<path d="M56.0588 22.6303H24.5966C22.9676 22.6303 21.647 23.9508 21.647 25.5798V55.0756C21.647 56.7046 22.9676 58.0252 24.5966 58.0252H56.0588C57.6878 58.0252 59.0084 56.7046 59.0084 55.0756V25.5798C59.0084 23.9508 57.6878 22.6303 56.0588 22.6303Z" stroke="currentColor" stroke-width="2"/>
+<path d="M95.3865 36.395H65.8907C64.2617 36.395 62.9412 37.7155 62.9412 39.3445V55.0756C62.9412 56.7046 64.2617 58.0252 65.8907 58.0252H95.3865C97.0155 58.0252 98.3361 56.7046 98.3361 55.0756V39.3445C98.3361 37.7155 97.0155 36.395 95.3865 36.395Z" stroke="currentColor" stroke-width="2"/>
+<path d="M95.3865 22.6303H65.8907C64.2617 22.6303 62.9412 23.9508 62.9412 25.5798V29.5126C62.9412 31.1416 64.2617 32.4622 65.8907 32.4622H95.3865C97.0155 32.4622 98.3361 31.1416 98.3361 29.5126V25.5798C98.3361 23.9508 97.0155 22.6303 95.3865 22.6303Z" stroke="currentColor" stroke-width="2"/>
+<path d="M17.2227 59.0086C17.2228 60.9091 18.7637 62.45 20.6641 62.45H99.3193C101.22 62.45 102.761 60.9091 102.761 59.0086V53.9891L103.374 54.1453C107.981 55.3221 111.718 56.6931 114.315 58.2137C116.877 59.7134 118.491 61.4572 118.491 63.4324C118.491 64.5056 118.01 65.513 117.177 66.4373C116.346 67.3587 115.143 68.2232 113.635 69.032C110.618 70.6501 106.286 72.0925 100.975 73.2977C90.343 75.7099 75.6797 77.1971 59.5 77.1971C43.3203 77.1971 28.657 75.7099 18.0254 73.2977C12.7137 72.0925 8.38162 70.6501 5.36523 69.032C3.85742 68.2232 2.65424 67.3587 1.82324 66.4373C0.989641 65.513 0.508789 64.5056 0.508789 63.4324C0.508977 61.389 2.23587 59.5926 4.96484 58.0535C7.73449 56.4916 11.717 55.0896 16.6152 53.8992L17.2227 53.7518V59.0086Z" fill="currentColor" fill-opacity="0.25" stroke="currentColor"/>
 </svg>
diff --git a/superset-frontend/packages/superset-ui-core/src/components/EmptyState/svgs/empty.svg b/superset-frontend/packages/superset-ui-core/src/components/EmptyState/svgs/empty.svg
index b503324f676..1eb7b801443 100644
--- a/superset-frontend/packages/superset-ui-core/src/components/EmptyState/svgs/empty.svg
+++ b/superset-frontend/packages/superset-ui-core/src/components/EmptyState/svgs/empty.svg
@@ -17,6 +17,6 @@ specific language governing permissions and limitations
 under the License.
 -->
 <svg viewBox="0 0 119 76" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M83.1952 1.36598L103 24V62C103 64.2091 101.209 66 99 66H20C17.7909 66 16 64.2091 16 62V24L35.8048 1.36598C36.5643 0.497921 37.6616 0 38.8151 0H80.1849C81.3384 0 82.4357 0.497922 83.1952 1.36598ZM101 26V62C101 63.1046 100.105 64 99 64H20C18.8954 64 18 63.1046 18 62V26H35.25C37.8734 26 40 28.1266 40 30.75C40 34.4779 43.0221 37.5 46.75 37.5H72.25C75.9779 37.5 79 34.4779 79 30.75C79 28.1266 81.1266 26 83.75 26H101ZM100.342 24L81.6901 2.68299C81.3103 2.24896 80.7617 2 80.1849 2H38.8151C38.2383 2 37.6897 2.24896 37.3099 2.68299L18.6575 24H35.25C38.9779 24 42 27.0221 42 30.75C42 33.3734 44.1266 35.5 46.75 35.5H72.25C74.8734 35.5 77 33.3734 77 30.75C77 27.0221 80.0221 24 83.75 24H100.342Z" fill="currentColor"/>
-<path d="M16 53.2891C6.07439 55.7012 0 58.9396 0 62.4999C0 69.9557 26.6391 75.9999 59.5 75.9999C92.3609 75.9999 119 69.9557 119 62.4999C119 58.9396 112.926 55.7012 103 53.2891V61.9999C103 64.209 101.209 65.9999 99 65.9999H20C17.7909 65.9999 16 64.209 16 61.9999V53.2891Z" fill="currentColor" stroke="currentColor" fill-opacity="0.25" />
+<path fill-rule="evenodd" clip-rule="evenodd" d="M82.7969 1.34302L102.269 23.5966V60.958C102.269 63.13 100.508 64.8908 98.3361 64.8908H20.6639C18.4919 64.8908 16.7311 63.13 16.7311 60.958V23.5966L36.203 1.34302C36.9498 0.489553 38.0286 0 39.1627 0H79.8372C80.9713 0 82.0502 0.489554 82.7969 1.34302ZM100.303 25.563V60.958C100.303 62.044 99.4225 62.9244 98.3361 62.9244H20.6639C19.5778 62.9244 18.6975 62.044 18.6975 60.958V25.563H35.6575C38.2369 25.563 40.3277 27.6539 40.3277 30.2332C40.3277 33.8984 43.299 36.8698 46.9643 36.8698H72.0357C75.7009 36.8698 78.6723 33.8984 78.6723 30.2332C78.6723 27.6539 80.7631 25.563 83.3424 25.563H100.303ZM99.6556 23.5966L81.3171 2.6379C80.9437 2.21116 80.4043 1.96639 79.8372 1.96639H39.1627C38.5956 1.96639 38.0562 2.21116 37.6828 2.6379L19.3439 23.5966H35.6575C39.3228 23.5966 42.2941 26.568 42.2941 30.2332C42.2941 32.8125 44.385 34.9034 46.9643 34.9034H72.0357C74.615 34.9034 76.7059 32.8125 76.7059 30.2332C76.7059 26.568 79.6772 23.5966 83.3424 23.5966H99.6556Z" fill="currentColor"/>
+<path d="M102.385 51.9159C107.283 53.1063 111.266 54.5083 114.035 56.0702C116.764 57.6093 118.491 59.4058 118.491 61.4492C118.491 62.5223 118.01 63.5298 117.177 64.454C116.346 65.3754 115.143 66.2399 113.635 67.0488C110.618 68.6668 106.286 70.1092 100.975 71.3144C90.343 73.7266 75.6797 75.2138 59.5 75.2138C43.3203 75.2138 28.657 73.7266 18.0254 71.3144C12.7137 70.1092 8.38162 68.6668 5.36523 67.0488C3.85743 66.2399 2.65424 65.3754 1.82324 64.454C0.989642 63.5298 0.508789 62.5223 0.508789 61.4492C0.508976 59.4057 2.23587 57.6093 4.96484 56.0702C7.73449 54.5083 11.717 53.1063 16.6152 51.9159L17.2227 51.7685V60.9579C17.2227 62.8584 18.7636 64.3993 20.6641 64.3993H98.3359C100.236 64.3993 101.777 62.8584 101.777 60.9579V51.7685L102.385 51.9159Z" fill="currentColor" stroke="currentColor" fill-opacity="0.25" />
 </svg>
diff --git a/superset-frontend/packages/superset-ui-core/src/components/EmptyState/svgs/star-circle.svg b/superset-frontend/packages/superset-ui-core/src/components/EmptyState/svgs/star-circle.svg
index d9e6c77e2c5..ae5a56883a8 100644
--- a/superset-frontend/packages/superset-ui-core/src/components/EmptyState/svgs/star-circle.svg
+++ b/superset-frontend/packages/superset-ui-core/src/components/EmptyState/svgs/star-circle.svg
@@ -17,6 +17,6 @@ specific language governing permissions and limitations
 under the License.
 -->
 <svg viewBox="0 0 119 78" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M59.2123 1.55857C59.4575 0.81382 60.5425 0.813801 60.7878 1.55857L67.5616 22.1322C67.9434 23.292 69.0328 24.0653 70.249 24.0653L92.1695 24.0653C92.9982 24.0653 93.2777 25.0719 92.6607 25.5143L74.9266 38.2295C73.9348 38.9406 73.5131 40.2085 73.8958 41.3707L80.6696 61.9444C80.8987 62.6402 80.076 63.3262 79.3906 62.8348L61.6566 50.1196C60.6679 49.4107 59.3321 49.4107 58.3434 50.1196L40.6094 62.8348C39.924 63.3262 39.1013 62.6402 39.3304 61.9444L46.1042 41.3707C46.4869 40.2085 46.0652 38.9406 45.0734 38.2295L27.3393 25.5143C26.7223 25.0719 27.0018 24.0653 27.8305 24.0653L49.751 24.0653C50.9672 24.0653 52.0566 23.292 52.4384 22.1322L59.2123 1.55857Z" stroke="currentColor" stroke-width="2"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M41.6782 51.616C17.5239 53.3343 0 58.4528 0 64.5C0 71.9558 26.6391 78 59.5 78C92.3609 78 119 71.9558 119 64.5C119 58.5387 101.97 53.4798 78.3466 51.6913L81.6194 61.6317C82.1664 63.2928 80.2398 64.6741 78.808 63.6475L61.1757 51.0053C60.619 51.0018 60.0604 51 59.5 51C59.2765 51 59.0534 51.0003 58.8305 51.0008L41.192 63.6475C39.7602 64.6741 37.8337 63.2928 38.3806 61.6317L41.6782 51.616Z" fill="currentColor" fill-opacity="0.25" stroke="currentColor"/>
+<path d="M59.2172 1.54918C59.4582 0.816949 60.525 0.81693 60.7662 1.54918L67.4261 21.777C67.8015 22.9173 68.8726 23.6776 70.0684 23.6776H91.6205C92.4352 23.6776 92.71 24.6673 92.1034 25.1023L74.6673 37.6038C73.6922 38.3029 73.2776 39.5495 73.6539 40.6922L80.3138 60.9201C80.5391 61.6042 79.7302 62.2787 79.0563 61.7956L61.6204 49.2941C60.6483 48.5971 59.3349 48.5971 58.3629 49.2941L40.9269 61.7956C40.253 62.2787 39.4441 61.6042 39.6694 60.9201L46.3294 40.6922C46.7056 39.5495 46.291 38.3029 45.3159 37.6038L27.8798 25.1023C27.2732 24.6673 27.548 23.6776 28.3628 23.6776H49.9149C51.1106 23.6776 52.1817 22.9173 52.5571 21.777L59.2172 1.54918Z" stroke="currentColor" stroke-width="2"/>
+<path d="M59.5 49.6685C60.052 49.6685 60.6021 49.6699 61.1504 49.6733L61.3066 49.6743L61.4336 49.7651L78.7695 62.1948C79.8103 62.9411 81.1618 61.9247 80.7803 60.7661L77.5625 50.9927L77.333 50.2935L78.0674 50.3491C89.7005 51.2299 99.7327 52.9176 106.87 55.1284C110.435 56.2328 113.307 57.4759 115.298 58.8335C117.27 60.1787 118.491 61.7173 118.491 63.4331C118.491 64.5061 118.01 65.5129 117.177 66.437C116.346 67.3584 115.143 68.2239 113.635 69.0327C110.618 70.6507 106.286 72.0922 100.975 73.2974C90.343 75.7096 75.6797 77.1978 59.5 77.1978C43.3203 77.1978 28.657 75.7096 18.0254 73.2974C12.7139 72.0922 8.3816 70.6507 5.36523 69.0327C3.85739 68.2239 2.65424 67.3584 1.82324 66.437C0.989783 65.5129 0.508887 64.5061 0.508789 63.4331C0.508789 61.6928 1.7644 60.135 3.78906 58.7749C5.83338 57.4017 8.78191 56.1452 12.4404 55.0327C19.7642 52.8057 30.0482 51.1211 41.9424 50.2749L42.6738 50.2231L42.4443 50.9194L39.2021 60.7661C38.8207 61.9247 40.1722 62.9409 41.2129 62.1948L58.5557 49.7612L58.6836 49.6694L58.8408 49.6685C59.0602 49.668 59.2799 49.6685 59.5 49.6685Z" fill="currentColor" fill-opacity="0.25" stroke="currentColor"/>
 </svg>
diff --git a/superset-frontend/packages/superset-ui-core/src/components/Icons/AntdEnhanced.tsx b/superset-frontend/packages/superset-ui-core/src/components/Icons/AntdEnhanced.tsx
index b1914d3e267..818a4ed5e23 100644
--- a/superset-frontend/packages/superset-ui-core/src/components/Icons/AntdEnhanced.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/Icons/AntdEnhanced.tsx
@@ -90,6 +90,7 @@ import {
   InfoCircleFilled,
   InsertRowAboveOutlined,
   InsertRowBelowOutlined,
+  LeftOutlined,
   LineChartOutlined,
   LineOutlined,
   LinkOutlined,
@@ -115,6 +116,7 @@ import {
   PlusSquareOutlined,
   PlusOutlined,
   ProfileOutlined,
+  PushpinFilled,
   PushpinOutlined,
   QuestionCircleOutlined,
   ReloadOutlined,
@@ -245,6 +247,7 @@ const AntdIcons = {
   InfoCircleFilled,
   InsertRowAboveOutlined,
   InsertRowBelowOutlined,
+  LeftOutlined,
   LineChartOutlined,
   LineOutlined,
   LinkOutlined,
@@ -270,6 +273,7 @@ const AntdIcons = {
   PlusSquareOutlined,
   PlusOutlined,
   ProfileOutlined,
+  PushpinFilled,
   PushpinOutlined,
   ReloadOutlined,
   QuestionCircleOutlined,
diff --git a/superset-frontend/packages/superset-ui-core/src/components/Label/reusable/DatasetTypeLabel.test.tsx b/superset-frontend/packages/superset-ui-core/src/components/Label/reusable/DatasetTypeLabel.test.tsx
new file mode 100644
index 00000000000..091d794dcba
--- /dev/null
+++ b/superset-frontend/packages/superset-ui-core/src/components/Label/reusable/DatasetTypeLabel.test.tsx
@@ -0,0 +1,128 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+import { screen } from '@testing-library/react';
+import '@testing-library/jest-dom';
+import { supersetTheme } from '@apache-superset/core/theme';
+import { DatasetTypeLabel } from './DatasetTypeLabel';
+import { renderWithTheme } from './testUtils';
+
+test('renders "Physical" text for physical dataset', () => {
+  renderWithTheme(<DatasetTypeLabel datasetType="physical" />);
+  expect(screen.getByText('Physical')).toBeInTheDocument();
+});
+
+test('renders "Virtual" text for virtual dataset', () => {
+  renderWithTheme(<DatasetTypeLabel datasetType="virtual" />);
+  expect(screen.getByText('Virtual')).toBeInTheDocument();
+});
+
+test('uses default primary color for physical label', () => {
+  renderWithTheme(<DatasetTypeLabel datasetType="physical" />);
+  const tag = screen
+    .getByText('Physical')
+    .closest('[data-test="dataset-type-label"]');
+  expect(tag).toHaveStyle({ color: supersetTheme.colorPrimaryText });
+});
+
+test('uses default color for virtual label', () => {
+  renderWithTheme(<DatasetTypeLabel datasetType="virtual" />);
+  const tag = screen
+    .getByText('Virtual')
+    .closest('[data-test="dataset-type-label"]');
+  expect(tag).toHaveStyle({ color: supersetTheme.colorPrimary });
+});
+
+test('applies custom labelDatasetPhysical tokens when set', () => {
+  renderWithTheme(<DatasetTypeLabel datasetType="physical" />, {
+    labelDatasetPhysicalColor: '#111111',
+    labelDatasetPhysicalBg: '#222222',
+    labelDatasetPhysicalBorderColor: '#333333',
+  });
+  const tag = screen
+    .getByText('Physical')
+    .closest('[data-test="dataset-type-label"]');
+  expect(tag).toHaveStyle({
+    color: '#111111',
+    backgroundColor: '#222222',
+    borderColor: '#333333',
+  });
+});
+
+test('applies custom labelDatasetVirtual tokens when set', () => {
+  renderWithTheme(<DatasetTypeLabel datasetType="virtual" />, {
+    labelDatasetVirtualColor: '#444444',
+    labelDatasetVirtualBg: '#555555',
+    labelDatasetVirtualBorderColor: '#666666',
+  });
+  const tag = screen
+    .getByText('Virtual')
+    .closest('[data-test="dataset-type-label"]');
+  expect(tag).toHaveStyle({
+    color: '#444444',
+    backgroundColor: '#555555',
+    borderColor: '#666666',
+  });
+});
+
+test('applies custom labelDatasetPhysicalIconColor to icon', () => {
+  const { container } = renderWithTheme(
+    <DatasetTypeLabel datasetType="physical" />,
+    { labelDatasetPhysicalIconColor: '#aabbcc' },
+  );
+  const svg = container.querySelector('[role="img"]');
+  expect(svg).toHaveStyle({ color: '#aabbcc' });
+});
+
+test('applies custom labelDatasetVirtualIconColor to icon', () => {
+  const { container } = renderWithTheme(
+    <DatasetTypeLabel datasetType="virtual" />,
+    { labelDatasetVirtualIconColor: '#ddeeff' },
+  );
+  const svg = container.querySelector('[role="img"]');
+  expect(svg).toHaveStyle({ color: '#ddeeff' });
+});
+
+test('uses default colorPrimary for physical dataset icon', () => {
+  const { container } = renderWithTheme(
+    <DatasetTypeLabel datasetType="physical" />,
+  );
+  const svg = container.querySelector('[role="img"]');
+  expect(svg).toHaveStyle({ color: supersetTheme.colorPrimary });
+});
+
+test('virtual dataset icon has no explicit icon color by default', () => {
+  const { container } = renderWithTheme(
+    <DatasetTypeLabel datasetType="virtual" />,
+  );
+  const svg = container.querySelector('[role="img"]') as HTMLElement;
+  expect(svg.style.color).toBe('');
+});
+
+test('partial token override uses custom bg with default color fallback', () => {
+  renderWithTheme(<DatasetTypeLabel datasetType="physical" />, {
+    labelDatasetPhysicalBg: '#ff0000',
+  });
+  const tag = screen
+    .getByText('Physical')
+    .closest('[data-test="dataset-type-label"]');
+  expect(tag).toHaveStyle({
+    backgroundColor: '#ff0000',
+    color: supersetTheme.colorPrimaryText,
+  });
+});
diff --git a/superset-frontend/packages/superset-ui-core/src/components/Label/reusable/DatasetTypeLabel.tsx b/superset-frontend/packages/superset-ui-core/src/components/Label/reusable/DatasetTypeLabel.tsx
index 48784d937a3..cab54c35e8a 100644
--- a/superset-frontend/packages/superset-ui-core/src/components/Label/reusable/DatasetTypeLabel.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/Label/reusable/DatasetTypeLabel.tsx
@@ -32,28 +32,41 @@ export const DatasetTypeLabel: React.FC<DatasetTypeLabelProps> = ({
   datasetType,
 }) => {
   const theme = useTheme();
-  const label: string =
-    datasetType === 'physical' ? t('Physical') : t('Virtual');
-  const icon =
-    datasetType === 'physical' ? (
-      <Icons.InsertRowAboveOutlined
-        iconSize={SIZE}
-        iconColor={theme.colorPrimary}
-      />
-    ) : (
-      <Icons.ConsoleSqlOutlined iconSize={SIZE} />
-    );
-  const labelType = datasetType === 'physical' ? 'primary' : 'default';
+  const isPhysical = datasetType === 'physical';
+  const label: string = isPhysical ? t('Physical') : t('Virtual');
+  const labelType = isPhysical ? 'primary' : 'default';
+
+  const color = isPhysical
+    ? (theme.labelDatasetPhysicalColor ?? theme.colorPrimaryText)
+    : (theme.labelDatasetVirtualColor ?? theme.colorPrimary);
+  const bg = isPhysical
+    ? theme.labelDatasetPhysicalBg
+    : theme.labelDatasetVirtualBg;
+  const borderColor = isPhysical
+    ? theme.labelDatasetPhysicalBorderColor
+    : theme.labelDatasetVirtualBorderColor;
+  const iconColor = isPhysical
+    ? (theme.labelDatasetPhysicalIconColor ?? theme.colorPrimary)
+    : theme.labelDatasetVirtualIconColor;
+
+  const icon = isPhysical ? (
+    <Icons.InsertRowAboveOutlined iconSize={SIZE} iconColor={iconColor} />
+  ) : (
+    <Icons.ConsoleSqlOutlined
+      iconSize={SIZE}
+      {...(iconColor && { iconColor })}
+    />
+  );
 
   return (
     <Label
       icon={icon}
       type={labelType}
+      data-test="dataset-type-label"
       style={{
-        color:
-          datasetType === 'physical'
-            ? theme.colorPrimaryText
-            : theme.colorPrimary,
+        color,
+        ...(bg && { backgroundColor: bg }),
+        ...(borderColor && { borderColor }),
       }}
     >
       {label}
diff --git a/superset-frontend/packages/superset-ui-core/src/components/Label/reusable/PublishedLabel.test.tsx b/superset-frontend/packages/superset-ui-core/src/components/Label/reusable/PublishedLabel.test.tsx
new file mode 100644
index 00000000000..d02cbbf7b35
--- /dev/null
+++ b/superset-frontend/packages/superset-ui-core/src/components/Label/reusable/PublishedLabel.test.tsx
@@ -0,0 +1,120 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+import { screen, fireEvent } from '@testing-library/react';
+import '@testing-library/jest-dom';
+import { supersetTheme } from '@apache-superset/core/theme';
+import { PublishedLabel } from './PublishedLabel';
+import { renderWithTheme } from './testUtils';
+
+test('renders "Published" text when isPublished is true', () => {
+  renderWithTheme(<PublishedLabel isPublished />);
+  expect(screen.getByText('Published')).toBeInTheDocument();
+});
+
+test('renders "Draft" text when isPublished is false', () => {
+  renderWithTheme(<PublishedLabel isPublished={false} />);
+  expect(screen.getByText('Draft')).toBeInTheDocument();
+});
+
+test('uses default success color for published label', () => {
+  renderWithTheme(<PublishedLabel isPublished />);
+  const tag = screen.getByText('Published').closest('.ant-tag');
+  expect(tag).toHaveStyle({ color: supersetTheme.colorSuccessText });
+});
+
+test('uses default primary color for draft label', () => {
+  renderWithTheme(<PublishedLabel isPublished={false} />);
+  const tag = screen.getByText('Draft').closest('.ant-tag');
+  expect(tag).toHaveStyle({ color: supersetTheme.colorPrimaryText });
+});
+
+test('applies custom labelPublished tokens when set', () => {
+  renderWithTheme(<PublishedLabel isPublished />, {
+    labelPublishedColor: '#111111',
+    labelPublishedBg: '#222222',
+    labelPublishedBorderColor: '#333333',
+  });
+  const tag = screen.getByText('Published').closest('.ant-tag');
+  expect(tag).toHaveStyle({
+    color: '#111111',
+    backgroundColor: '#222222',
+    borderColor: '#333333',
+  });
+});
+
+test('applies custom labelDraft tokens when set', () => {
+  renderWithTheme(<PublishedLabel isPublished={false} />, {
+    labelDraftColor: '#444444',
+    labelDraftBg: '#555555',
+    labelDraftBorderColor: '#666666',
+  });
+  const tag = screen.getByText('Draft').closest('.ant-tag');
+  expect(tag).toHaveStyle({
+    color: '#444444',
+    backgroundColor: '#555555',
+    borderColor: '#666666',
+  });
+});
+
+test('applies custom labelPublishedIconColor to icon', () => {
+  const { container } = renderWithTheme(<PublishedLabel isPublished />, {
+    labelPublishedIconColor: '#aabbcc',
+  });
+  const svg = container.querySelector('[role="img"]');
+  expect(svg).toHaveStyle({ color: '#aabbcc' });
+});
+
+test('applies custom labelDraftIconColor to icon', () => {
+  const { container } = renderWithTheme(
+    <PublishedLabel isPublished={false} />,
+    { labelDraftIconColor: '#ddeeff' },
+  );
+  const svg = container.querySelector('[role="img"]');
+  expect(svg).toHaveStyle({ color: '#ddeeff' });
+});
+
+test('uses default colorSuccess for published icon', () => {
+  const { container } = renderWithTheme(<PublishedLabel isPublished />);
+  const svg = container.querySelector('[role="img"]');
+  expect(svg).toHaveStyle({ color: supersetTheme.colorSuccess });
+});
+
+test('uses default colorPrimary for draft icon', () => {
+  const { container } = renderWithTheme(<PublishedLabel isPublished={false} />);
+  const svg = container.querySelector('[role="img"]');
+  expect(svg).toHaveStyle({ color: supersetTheme.colorPrimary });
+});
+
+test('calls onClick handler when clicked', () => {
+  const handleClick = jest.fn();
+  renderWithTheme(<PublishedLabel isPublished onClick={handleClick} />);
+  fireEvent.click(screen.getByText('Published'));
+  expect(handleClick).toHaveBeenCalledTimes(1);
+});
+
+test('partial token override uses custom bg with default color fallback', () => {
+  renderWithTheme(<PublishedLabel isPublished />, {
+    labelPublishedBg: '#ff0000',
+  });
+  const tag = screen.getByText('Published').closest('.ant-tag');
+  expect(tag).toHaveStyle({
+    backgroundColor: '#ff0000',
+    color: supersetTheme.colorSuccessText,
+  });
+});
diff --git a/superset-frontend/packages/superset-ui-core/src/components/Label/reusable/PublishedLabel.tsx b/superset-frontend/packages/superset-ui-core/src/components/Label/reusable/PublishedLabel.tsx
index 91fe9facde2..b6de7426730 100644
--- a/superset-frontend/packages/superset-ui-core/src/components/Label/reusable/PublishedLabel.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/Label/reusable/PublishedLabel.tsx
@@ -33,20 +33,34 @@ export const PublishedLabel: React.FC<PublishedLabelProps> = ({
 }) => {
   const theme = useTheme();
   const label = isPublished ? t('Published') : t('Draft');
-  const icon = isPublished ? (
-    <Icons.CheckCircleOutlined iconSize="s" iconColor={theme.colorSuccess} />
-  ) : (
-    <Icons.MinusCircleOutlined iconSize="s" iconColor={theme.colorPrimary} />
-  );
   const labelType = isPublished ? 'success' : 'primary';
 
+  const color = isPublished
+    ? (theme.labelPublishedColor ?? theme.colorSuccessText)
+    : (theme.labelDraftColor ?? theme.colorPrimaryText);
+  const bg = isPublished ? theme.labelPublishedBg : theme.labelDraftBg;
+  const borderColor = isPublished
+    ? theme.labelPublishedBorderColor
+    : theme.labelDraftBorderColor;
+  const iconColor = isPublished
+    ? (theme.labelPublishedIconColor ?? theme.colorSuccess)
+    : (theme.labelDraftIconColor ?? theme.colorPrimary);
+
+  const icon = isPublished ? (
+    <Icons.CheckCircleOutlined iconSize="s" iconColor={iconColor} />
+  ) : (
+    <Icons.MinusCircleOutlined iconSize="s" iconColor={iconColor} />
+  );
+
   return (
     <Label
       type={labelType}
       icon={icon}
       onClick={onClick}
       style={{
-        color: isPublished ? theme.colorSuccessText : theme.colorPrimaryText,
+        color,
+        ...(bg && { backgroundColor: bg }),
+        ...(borderColor && { borderColor }),
       }}
     >
       {label}
diff --git a/superset-frontend/packages/superset-ui-core/src/components/Label/reusable/testUtils.tsx b/superset-frontend/packages/superset-ui-core/src/components/Label/reusable/testUtils.tsx
new file mode 100644
index 00000000000..df815099561
--- /dev/null
+++ b/superset-frontend/packages/superset-ui-core/src/components/Label/reusable/testUtils.tsx
@@ -0,0 +1,32 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+import { type ReactElement } from 'react';
+import { render } from '@testing-library/react';
+import { ThemeProvider } from '@emotion/react';
+import { Theme, supersetTheme } from '@apache-superset/core/theme';
+
+export function renderWithTheme(
+  ui: ReactElement,
+  tokenOverrides?: Record<string, string>,
+) {
+  const theme = tokenOverrides
+    ? Theme.fromConfig({ token: tokenOverrides }).theme
+    : supersetTheme;
+  return render(<ThemeProvider theme={theme}>{ui}</ThemeProvider>);
+}
diff --git a/superset-frontend/packages/superset-ui-core/src/components/Menu/index.tsx b/superset-frontend/packages/superset-ui-core/src/components/Menu/index.tsx
index 6357471d19d..036dc4676ad 100644
--- a/superset-frontend/packages/superset-ui-core/src/components/Menu/index.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/Menu/index.tsx
@@ -84,35 +84,45 @@ const StyledMenu = styled(AntdMenu)`
 
 const StyledNav = styled(AntdMenu)`
   ${({ theme }) => css`
-    display: flex;
-    align-items: center;
-    height: 100%;
-    gap: 0;
     border-bottom: 0;
     line-height: ${theme.lineHeight};
-    &.ant-menu-horizontal > .ant-menu-item {
-      height: 100%;
+
+    &.ant-menu-horizontal {
       display: flex;
       align-items: center;
-      margin: 0;
-      padding: ${theme.sizeUnit * 2}px ${theme.sizeUnit * 4}px;
-      ::after {
-        content: '';
-        position: absolute;
-        width: 98%;
-        height: 2px;
-        background-color: ${theme.colorPrimaryBorderHover};
-        bottom: ${theme.sizeUnit / 4}px;
-        left: 0;
-        transform: scale(0);
-        transition: 0.2s all ease-out;
+      height: 100%;
+      gap: 0;
+
+      > .ant-menu-item {
+        height: 100%;
+        display: flex;
+        align-items: center;
+        margin: 0;
+        padding: ${theme.sizeUnit * 2}px ${theme.sizeUnit * 4}px;
+        ::after {
+          content: '';
+          position: absolute;
+          width: 98%;
+          height: 2px;
+          background-color: ${theme.colorPrimaryBorderHover};
+          bottom: ${theme.sizeUnit / 4}px;
+          left: 0;
+          transform: scale(0);
+          transition: 0.2s all ease-out;
+        }
+        :hover::after {
+          transform: scale(1);
+        }
       }
-      :hover::after {
+
+      > .ant-menu-item-selected::after {
         transform: scale(1);
       }
     }
-    &.ant-menu-horizontal > .ant-menu-item-selected::after {
-      transform: scale(1);
+
+    &.ant-menu-vertical {
+      border-inline-end: none;
+      width: 100%;
     }
   `}
 `;
diff --git a/superset-frontend/packages/superset-ui-core/src/components/Select/Select.test.tsx b/superset-frontend/packages/superset-ui-core/src/components/Select/Select.test.tsx
index 45656928757..2f8cb6860a2 100644
--- a/superset-frontend/packages/superset-ui-core/src/components/Select/Select.test.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/Select/Select.test.tsx
@@ -25,6 +25,7 @@ import {
   waitFor,
   within,
 } from '@superset-ui/core/spec';
+import { formatNumber } from '@superset-ui/core';
 import { Select } from '.';
 
 type Option = {
@@ -85,8 +86,10 @@ const getElementsByClassName = (className: string) =>
 const getSelect = () =>
   screen.getByRole('combobox', { name: new RegExp(ARIA_LABEL, 'i') });
 
-const selectAllButtonText = (length: number) => `Select all (${length})`;
-const deselectAllButtonText = (length: number) => `Clear (${length})`;
+const selectAllButtonText = (length: number) =>
+  `Select all (${formatNumber('SMART_NUMBER', length)})`;
+const deselectAllButtonText = (length: number) =>
+  `Clear (${formatNumber('SMART_NUMBER', length)})`;
 
 const findSelectOption = (text: string) =>
   waitFor(() =>
@@ -811,6 +814,62 @@ test('Maintains stable maxTagCount to prevent click target disappearing in oneLi
   expect(withinSelector.getByText('+ 2 ...')).toBeVisible();
 });
 
+test('dropdown width matches input width after tags collapse in oneLine mode', async () => {
+  render(
+    <div style={{ width: '300px' }}>
+      <Select
+        {...defaultProps}
+        value={[OPTIONS[0], OPTIONS[1], OPTIONS[2]]}
+        mode="multiple"
+        oneLine
+      />
+    </div>,
+  );
+
+  await open();
+
+  // Wait for RAF to complete and tags to collapse
+  await waitFor(() => {
+    const withinSelector = within(
+      getElementByClassName('.ant-select-selector'),
+    );
+    expect(
+      withinSelector.queryByText(OPTIONS[0].label),
+    ).not.toBeInTheDocument();
+    expect(withinSelector.getByText('+ 3 ...')).toBeVisible();
+  });
+
+  const selectElement = document.querySelector('.ant-select') as HTMLElement;
+  expect(selectElement).toBeInTheDocument();
+
+  // Mock the select element's width since JSDOM doesn't perform real layout
+  jest.spyOn(selectElement, 'getBoundingClientRect').mockReturnValue({
+    width: 300,
+    height: 32,
+    top: 0,
+    left: 0,
+    right: 300,
+    bottom: 32,
+    x: 0,
+    y: 0,
+    toJSON: () => ({}),
+  } as DOMRect);
+
+  // Close and reopen to trigger width measurement with mocked value
+  await type('{esc}');
+  await open();
+
+  const dropdown = document.querySelector(
+    '.ant-select-dropdown',
+  ) as HTMLElement;
+  expect(dropdown).toBeInTheDocument();
+
+  // Verify the dropdown has inline width matching the mocked select width
+  await waitFor(() => {
+    expect(parseInt(dropdown.style.width, 10)).toBe(300);
+  });
+});
+
 test('does not render "Select all" when there are 0 or 1 options', async () => {
   const { rerender } = render(
     <Select {...defaultProps} options={[]} mode="multiple" allowNewOptions />,
@@ -915,6 +974,49 @@ test('"Select all" does not affect disabled options', async () => {
   expect(await findSelectValue()).not.toHaveTextContent(options[1].label);
 });
 
+test('abbreviates large numbers in bulk action buttons', async () => {
+  const manyOptions = Array.from({ length: 1500 }, (_, i) => ({
+    label: `Option ${i}`,
+    value: i,
+  }));
+  render(<Select {...defaultProps} mode="multiple" options={manyOptions} />);
+  await open();
+  // SMART_NUMBER format uses lowercase 'k' for thousands (d3-format)
+  expect(await screen.findByText('Select all (1.5k)')).toBeInTheDocument();
+});
+
+test('dropdown takes full width of the select input for multi select', async () => {
+  render(
+    <div style={{ width: '400px' }}>
+      <Select {...defaultProps} mode="multiple" options={OPTIONS} />
+    </div>,
+  );
+  await open();
+  const dropdown = document.querySelector(
+    '.ant-select-dropdown',
+  ) as HTMLElement;
+  expect(dropdown).toBeInTheDocument();
+  // When popupMatchSelectWidth is true, antd dynamically matches the
+  // trigger width and does not set a fixed inline width on the dropdown.
+  const widthValue = parseInt(dropdown.style.width, 10);
+  expect(Number.isNaN(widthValue) || widthValue === 0).toBe(true);
+});
+
+test('dropdown takes full width of the select input for single select', async () => {
+  render(
+    <div style={{ width: '400px' }}>
+      <Select {...defaultProps} mode="single" options={OPTIONS} />
+    </div>,
+  );
+  await open();
+  const dropdown = document.querySelector(
+    '.ant-select-dropdown',
+  ) as HTMLElement;
+  expect(dropdown).toBeInTheDocument();
+  const widthValue = parseInt(dropdown.style.width, 10);
+  expect(Number.isNaN(widthValue) || widthValue === 0).toBe(true);
+});
+
 test('does not fire onChange when searching but no selection', async () => {
   const onChange = jest.fn();
   render(
diff --git a/superset-frontend/packages/superset-ui-core/src/components/Select/Select.tsx b/superset-frontend/packages/superset-ui-core/src/components/Select/Select.tsx
index a5863d1a6f4..ead92724684 100644
--- a/superset-frontend/packages/superset-ui-core/src/components/Select/Select.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/Select/Select.tsx
@@ -31,7 +31,7 @@ import {
 } from 'react';
 
 import { t } from '@apache-superset/core/translation';
-import { ensureIsArray, usePrevious } from '@superset-ui/core';
+import { ensureIsArray, formatNumber, usePrevious } from '@superset-ui/core';
 import { Constants } from '@superset-ui/core/components';
 import {
   LabeledValue as AntdLabeledValue,
@@ -149,6 +149,8 @@ const Select = forwardRef(
     // Prevent maxTagCount change during click events to avoid click target disappearing
     const [stableMaxTagCount, setStableMaxTagCount] = useState(maxTagCount);
     const isOpeningRef = useRef(false);
+    const selectContainerRef = useRef<HTMLDivElement>(null);
+    const [dropdownWidth, setDropdownWidth] = useState<number | true>(true);
 
     useEffect(() => {
       if (oneLine) {
@@ -159,12 +161,23 @@ const Select = forwardRef(
           requestAnimationFrame(() => {
             setStableMaxTagCount(0);
             isOpeningRef.current = false;
+
+            // Measure collapsed width and update dropdown width
+            const selectElement =
+              selectContainerRef.current?.querySelector('.ant-select');
+            if (selectElement) {
+              const { width } = selectElement.getBoundingClientRect();
+              if (width > 0) {
+                setDropdownWidth(width);
+              }
+            }
           });
           return;
         }
         if (!isDropdownVisible) {
           // When closing, immediately show the first tag
           setStableMaxTagCount(1);
+          setDropdownWidth(true); // Reset to default when closing
           isOpeningRef.current = false;
         }
         return;
@@ -494,7 +507,7 @@ const Select = forwardRef(
 
     const bulkSelectComponent = useMemo(
       () => (
-        <StyledBulkActionsContainer justify="center">
+        <StyledBulkActionsContainer justify="space-between">
           <Button
             type="link"
             buttonStyle="link"
@@ -506,7 +519,7 @@ const Select = forwardRef(
               handleSelectAll();
             }}
           >
-            {`${t('Select all')} (${bulkSelectCounts.selectable})`}
+            {`${t('Select all')} (${formatNumber('SMART_NUMBER', bulkSelectCounts.selectable)})`}
           </Button>
           <Button
             type="link"
@@ -523,7 +536,7 @@ const Select = forwardRef(
               handleDeselectAll();
             }}
           >
-            {`${t('Clear')} (${bulkSelectCounts.deselectable})`}
+            {`${t('Clear')} (${formatNumber('SMART_NUMBER', bulkSelectCounts.deselectable)})`}
           </Button>
         </StyledBulkActionsContainer>
       ),
@@ -717,7 +730,11 @@ const Select = forwardRef(
     };
 
     return (
-      <StyledContainer className={className} headerPosition={headerPosition}>
+      <StyledContainer
+        ref={selectContainerRef}
+        className={className}
+        headerPosition={headerPosition}
+      >
         {header && (
           <StyledHeader headerPosition={headerPosition}>{header}</StyledHeader>
         )}
@@ -777,7 +794,7 @@ const Select = forwardRef(
           options={visibleOptions}
           optionRender={option => <Space>{option.label || option.value}</Space>}
           oneLine={oneLine}
-          popupMatchSelectWidth={selectAllEnabled ? 168 : true}
+          popupMatchSelectWidth={oneLine ? dropdownWidth : true}
           css={props.css}
           dropdownAlign={DROPDOWN_ALIGN_BOTTOM}
           {...props}
diff --git a/superset-frontend/packages/superset-ui-core/src/components/Select/styles.tsx b/superset-frontend/packages/superset-ui-core/src/components/Select/styles.tsx
index b90d18fd904..59c6606f6fd 100644
--- a/superset-frontend/packages/superset-ui-core/src/components/Select/styles.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/Select/styles.tsx
@@ -140,11 +140,17 @@ export const StyledErrorMessage = styled.div`
 
 export const StyledBulkActionsContainer = styled(Flex)`
   ${({ theme }) => `
-    padding: ${theme.sizeUnit}px;
+    padding: ${theme.sizeUnit}px 0;
     border-top: 1px solid ${theme.colorSplit};
-    gap: ${theme.sizeUnit * 2}px;
     & .superset-button {
       font-family: inherit;
+      margin-left: 0 !important;
+    }
+    & .superset-button:first-of-type {
+      padding-right: 0 !important;
+    }
+    & .superset-button:last-of-type {
+      padding-left: 0 !important;
     }
   `}
 `;
diff --git a/superset-frontend/packages/superset-ui-core/src/components/Tabs/Tabs.tsx b/superset-frontend/packages/superset-ui-core/src/components/Tabs/Tabs.tsx
index bc12380b84b..3d479975e85 100644
--- a/superset-frontend/packages/superset-ui-core/src/components/Tabs/Tabs.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/Tabs/Tabs.tsx
@@ -155,6 +155,11 @@ export const StyledLineEditableTabs = styled(EditableTabs)`
 
   .ant-tabs-tab-btn {
     font-size: ${({ theme }) => theme.fontSize}px;
+
+    .editable-title textarea,
+    .editable-title input[type='text'] {
+      font-size: inherit;
+    }
   }
 
   .ant-tabs-tab-remove {
diff --git a/superset-frontend/packages/superset-ui-core/src/components/ThemedAgGridReact/ThemedAgGridReact.test.tsx b/superset-frontend/packages/superset-ui-core/src/components/ThemedAgGridReact/ThemedAgGridReact.test.tsx
index 4d34e022edf..42497b1a2bf 100644
--- a/superset-frontend/packages/superset-ui-core/src/components/ThemedAgGridReact/ThemedAgGridReact.test.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/ThemedAgGridReact/ThemedAgGridReact.test.tsx
@@ -158,11 +158,13 @@ test('passes all props through to AgGridReact', () => {
     />,
   );
 
+  // onGridReady and onFirstDataRendered are intercepted by the component to expose
+  // the grid API on the container element; the wrapped function is passed instead.
   expect(AgGridReact).toHaveBeenCalledWith(
     expect.objectContaining({
       rowData: mockRowData,
       columnDefs: mockColumnDefs,
-      onGridReady,
+      onGridReady: expect.any(Function),
       onCellClicked,
       pagination: true,
       paginationPageSize: 10,
@@ -171,6 +173,47 @@ test('passes all props through to AgGridReact', () => {
   );
 });
 
+test('onGridReady wrapper calls user callback and exposes api on container', () => {
+  const onGridReady = jest.fn();
+
+  render(
+    <ThemedAgGridReact
+      rowData={mockRowData}
+      columnDefs={mockColumnDefs}
+      onGridReady={onGridReady}
+    />,
+  );
+
+  // Retrieve the wrapped handler that was passed to AgGridReact
+  const lastCall = (AgGridReact as jest.Mock).mock.calls.at(-1)[0];
+  const wrappedOnGridReady = lastCall.onGridReady as Function;
+
+  const mockApi = { setGridOption: jest.fn() };
+  wrappedOnGridReady({ api: mockApi });
+
+  // The user-provided callback must be forwarded
+  expect(onGridReady).toHaveBeenCalledWith({ api: mockApi });
+});
+
+test('onFirstDataRendered wrapper calls user callback', () => {
+  const onFirstDataRendered = jest.fn();
+
+  render(
+    <ThemedAgGridReact
+      rowData={mockRowData}
+      columnDefs={mockColumnDefs}
+      onFirstDataRendered={onFirstDataRendered}
+    />,
+  );
+
+  const lastCall = (AgGridReact as jest.Mock).mock.calls.at(-1)[0];
+  const wrappedOnFirstDataRendered = lastCall.onFirstDataRendered as Function;
+
+  wrappedOnFirstDataRendered({ firstRow: 0 });
+
+  expect(onFirstDataRendered).toHaveBeenCalledWith({ firstRow: 0 });
+});
+
 test('applies custom theme colors from Superset theme', () => {
   const customTheme = {
     ...supersetTheme,
diff --git a/superset-frontend/packages/superset-ui-core/src/components/ThemedAgGridReact/index.tsx b/superset-frontend/packages/superset-ui-core/src/components/ThemedAgGridReact/index.tsx
index 507a6d73b2a..a44c7b26c71 100644
--- a/superset-frontend/packages/superset-ui-core/src/components/ThemedAgGridReact/index.tsx
+++ b/superset-frontend/packages/superset-ui-core/src/components/ThemedAgGridReact/index.tsx
@@ -16,19 +16,28 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { useMemo, forwardRef } from 'react';
+import { useMemo, useRef, useCallback, forwardRef } from 'react';
 import { css } from '@emotion/react';
 import { AgGridReact, type AgGridReactProps } from 'ag-grid-react';
 import {
   themeQuartz,
   colorSchemeDark,
   colorSchemeLight,
+  type GridApi,
+  type GridReadyEvent,
+  type FirstDataRenderedEvent,
 } from 'ag-grid-community';
 import { useTheme, useThemeMode } from '@apache-superset/core/theme';
 
 // Note: With ag-grid v34's new theming API, CSS files are injected automatically
 // Do NOT import 'ag-grid-community/styles/ag-grid.css' or theme CSS files
 
+// Extends HTMLDivElement with ag-grid state attached to the container for downloadAsImage.
+export interface AgGridContainerElement extends HTMLDivElement {
+  _agGridApi?: GridApi;
+  _agGridFirstDataRendered?: boolean;
+}
+
 export interface ThemedAgGridReactProps extends AgGridReactProps {
   /**
    * Optional theme parameter overrides to customize specific ag-grid theme values.
@@ -71,9 +80,13 @@ export interface ThemedAgGridReactProps extends AgGridReactProps {
 export const ThemedAgGridReact = forwardRef<
   AgGridReact,
   ThemedAgGridReactProps
->(function ThemedAgGridReact({ themeOverrides, ...props }, ref) {
+>(function ThemedAgGridReact(
+  { themeOverrides, onGridReady, onFirstDataRendered, ...props },
+  ref,
+) {
   const theme = useTheme();
   const isDarkMode = useThemeMode();
+  const containerRef = useRef<AgGridContainerElement>(null);
 
   // Get the appropriate ag-grid theme based on dark/light mode
   const agGridTheme = useMemo(() => {
@@ -140,8 +153,32 @@ export const ThemedAgGridReact = forwardRef<
     return baseTheme.withParams(finalParams);
   }, [theme, isDarkMode, themeOverrides]);
 
+  // Expose gridApi and first-data-rendered flag on the container for downloadAsImage.
+  const handleGridReady = useCallback(
+    (event: GridReadyEvent) => {
+      if (containerRef.current) {
+        containerRef.current._agGridFirstDataRendered = false;
+        containerRef.current._agGridApi = event.api;
+      }
+      onGridReady?.(event);
+    },
+    [onGridReady],
+  );
+
+  // Mark the container once rows are painted so downloadAsImage can gate on readiness.
+  const handleFirstDataRendered = useCallback(
+    (event: FirstDataRenderedEvent) => {
+      if (containerRef.current) {
+        containerRef.current._agGridFirstDataRendered = true;
+      }
+      onFirstDataRendered?.(event);
+    },
+    [onFirstDataRendered],
+  );
+
   return (
     <div
+      ref={containerRef}
       css={css`
         width: 100%;
         height: 100%;
@@ -151,7 +188,13 @@ export const ThemedAgGridReact = forwardRef<
       `}
       data-themed-ag-grid="true"
     >
-      <AgGridReact ref={ref} theme={agGridTheme} {...props} />
+      <AgGridReact
+        ref={ref}
+        theme={agGridTheme}
+        onGridReady={handleGridReady}
+        onFirstDataRendered={handleFirstDataRendered}
+        {...props}
+      />
     </div>
   );
 });
@@ -171,6 +214,7 @@ export type {
   CellClassParams,
   IMenuActionParams,
   IHeaderParams,
+  SelectionChangedEvent,
   SortModelItem,
   ValueFormatterParams,
   ValueGetterParams,
diff --git a/superset-frontend/packages/superset-ui-core/src/components/index.ts b/superset-frontend/packages/superset-ui-core/src/components/index.ts
index 048504ccfd6..223a49b03fd 100644
--- a/superset-frontend/packages/superset-ui-core/src/components/index.ts
+++ b/superset-frontend/packages/superset-ui-core/src/components/index.ts
@@ -201,6 +201,7 @@ export * from './Result';
 export {
   ThemedAgGridReact,
   type ThemedAgGridReactProps,
+  type AgGridContainerElement,
   setupAGGridModules,
   defaultModules,
 } from './ThemedAgGridReact';
diff --git a/superset-frontend/packages/superset-ui-core/src/query/types/Dashboard.ts b/superset-frontend/packages/superset-ui-core/src/query/types/Dashboard.ts
index bcf84355665..3fdf674f4f5 100644
--- a/superset-frontend/packages/superset-ui-core/src/query/types/Dashboard.ts
+++ b/superset-frontend/packages/superset-ui-core/src/query/types/Dashboard.ts
@@ -81,6 +81,7 @@ export type Filter = {
   granularity?: string;
   time_grain_sqla?: string;
   time_range?: string;
+  time_grains?: string[];
   requiredFirst?: boolean;
   tabsInScope?: string[];
   chartsInScope?: number[];
diff --git a/superset-frontend/packages/superset-ui-core/src/utils/copy.ts b/superset-frontend/packages/superset-ui-core/src/utils/copy.ts
new file mode 100644
index 00000000000..f39f5be0b47
--- /dev/null
+++ b/superset-frontend/packages/superset-ui-core/src/utils/copy.ts
@@ -0,0 +1,98 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+const isSafari = (): boolean => {
+  const { userAgent } = navigator;
+  return Boolean(userAgent && /^((?!chrome|android).)*safari/i.test(userAgent));
+};
+
+// Use the new Clipboard API if the browser supports it
+const copyTextWithClipboardApi = async (getText: () => Promise<string>) => {
+  // Safari (WebKit) does not support delayed generation of clipboard.
+  // This means that writing to the clipboard, from the moment the user
+  // interacts with the app, must be instantaneous.
+  // However, neither writeText nor write accepts a Promise, so
+  // we need to create a ClipboardItem that accepts said Promise to
+  // delay the text generation, as needed.
+  // Source: https://bugs.webkit.org/show_bug.cgi?id=222262P
+  if (isSafari()) {
+    try {
+      const clipboardItem = new ClipboardItem({
+        'text/plain': getText(),
+      });
+      await navigator.clipboard.write([clipboardItem]);
+    } catch {
+      // Fallback to default clipboard API implementation
+      const text = await getText();
+      await navigator.clipboard.writeText(text);
+    }
+  } else {
+    // For Blink, the above method won't work, but we can use the
+    // default (intended) API, since the delayed generation of the
+    // clipboard is now supported.
+    // Source: https://bugs.chromium.org/p/chromium/issues/detail?id=1014310
+    const text = await getText();
+    await navigator.clipboard.writeText(text);
+  }
+};
+
+const copyTextToClipboard = (getText: () => Promise<string>) =>
+  copyTextWithClipboardApi(getText)
+    // If the Clipboard API is not supported, fallback to the older method.
+    .catch(() =>
+      getText().then(
+        text =>
+          new Promise<void>((resolve, reject) => {
+            const selection: Selection | null = document.getSelection();
+            if (selection) {
+              selection.removeAllRanges();
+              const range = document.createRange();
+              const span = document.createElement('span');
+              span.textContent = text;
+              span.style.position = 'fixed';
+              span.style.top = '0';
+              span.style.clip = 'rect(0, 0, 0, 0)';
+              span.style.whiteSpace = 'pre';
+
+              document.body.appendChild(span);
+              range.selectNode(span);
+              selection.addRange(range);
+
+              try {
+                if (!document.execCommand('copy')) {
+                  reject();
+                }
+              } catch (err) {
+                reject();
+              }
+
+              document.body.removeChild(span);
+              if (selection.removeRange) {
+                selection.removeRange(range);
+              } else {
+                selection.removeAllRanges();
+              }
+            }
+
+            resolve();
+          }),
+      ),
+    );
+
+export default copyTextToClipboard;
diff --git a/superset-frontend/packages/superset-ui-core/src/utils/featureFlags.ts b/superset-frontend/packages/superset-ui-core/src/utils/featureFlags.ts
index 18bc85af00c..8f21d83738b 100644
--- a/superset-frontend/packages/superset-ui-core/src/utils/featureFlags.ts
+++ b/superset-frontend/packages/superset-ui-core/src/utils/featureFlags.ts
@@ -53,6 +53,7 @@ export enum FeatureFlag {
   EnableTemplateProcessing = 'ENABLE_TEMPLATE_PROCESSING',
   EscapeMarkdownHtml = 'ESCAPE_MARKDOWN_HTML',
   EstimateQueryCost = 'ESTIMATE_QUERY_COST',
+  FabApiKeyEnabled = 'FAB_API_KEY_ENABLED',
   FilterBarClosedByDefault = 'FILTERBAR_CLOSED_BY_DEFAULT',
   GlobalAsyncQueries = 'GLOBAL_ASYNC_QUERIES',
   GlobalTaskFramework = 'GLOBAL_TASK_FRAMEWORK',
diff --git a/superset-frontend/packages/superset-ui-core/src/utils/index.ts b/superset-frontend/packages/superset-ui-core/src/utils/index.ts
index 4d6e869cd0c..7f461f28fef 100644
--- a/superset-frontend/packages/superset-ui-core/src/utils/index.ts
+++ b/superset-frontend/packages/superset-ui-core/src/utils/index.ts
@@ -17,6 +17,7 @@
  * under the License.
  */
 export { default as convertKeysToCamelCase } from './convertKeysToCamelCase';
+export { default as copyTextToClipboard } from './copy';
 export { default as ensureIsArray } from './ensureIsArray';
 export { default as ensureIsInt } from './ensureIsInt';
 export { default as isDefined } from './isDefined';
diff --git a/superset-frontend/packages/superset-ui-core/test/time-comparison/getTimeOffset.test.ts b/superset-frontend/packages/superset-ui-core/test/time-comparison/getTimeOffset.test.ts
index 1f95559c20d..87ce93280a4 100644
--- a/superset-frontend/packages/superset-ui-core/test/time-comparison/getTimeOffset.test.ts
+++ b/superset-frontend/packages/superset-ui-core/test/time-comparison/getTimeOffset.test.ts
@@ -109,10 +109,10 @@ test('should handle custom range with relative dates (now)', () => {
     timeRangeFilter,
     shifts,
     startDate,
-    ['5 days ago'],
+    ['4 days ago'],
   );
   runTimezoneTest(NOW_IN_UTC, 'UTC', timeRangeFilter, shifts, startDate, [
-    '5 days ago',
+    '4 days ago',
   ]);
   runTimezoneTest(
     NOW_UTC_IN_PACIFIC,
@@ -218,10 +218,10 @@ test('should handle null timeRangeFilter', () => {
     timeRangeFilter,
     shifts,
     startDate,
-    ['3 days ago'],
+    ['2 days ago'],
   );
   runTimezoneTest(NOW_IN_UTC, 'UTC', timeRangeFilter, shifts, startDate, [
-    '3 days ago',
+    '2 days ago',
   ]);
   runTimezoneTest(
     NOW_UTC_IN_PACIFIC,
@@ -304,10 +304,10 @@ test('should handle custom range with DATEADD function and relative start date',
     timeRangeFilter,
     shifts,
     startDate,
-    ['3 days ago'],
+    ['2 days ago'],
   );
   runTimezoneTest(NOW_IN_UTC, 'UTC', timeRangeFilter, shifts, startDate, [
-    '3 days ago',
+    '2 days ago',
   ]);
   runTimezoneTest(
     NOW_UTC_IN_PACIFIC,
@@ -362,10 +362,10 @@ test('should handle custom range with specific date and relative end date', () =
     timeRangeFilter,
     shifts,
     startDate,
-    ['8 days ago'],
+    ['9 days ago'],
   );
   runTimezoneTest(NOW_IN_UTC, 'UTC', timeRangeFilter, shifts, startDate, [
-    '8 days ago',
+    '9 days ago',
   ]);
   runTimezoneTest(
     NOW_UTC_IN_PACIFIC,
@@ -390,10 +390,10 @@ test('should handle custom range with specific date and specific end date', () =
     timeRangeFilter,
     shifts,
     startDate,
-    ['1 days ago'],
+    ['2 days ago'],
   );
   runTimezoneTest(NOW_IN_UTC, 'UTC', timeRangeFilter, shifts, startDate, [
-    '1 days ago',
+    '2 days ago',
   ]);
   runTimezoneTest(
     NOW_UTC_IN_PACIFIC,
@@ -474,7 +474,7 @@ test('should handle custom range with previous calendar week', () => {
     timeRangeFilter,
     shifts,
     startDate,
-    ['3 days ago'],
+    ['1 days ago'],
   );
   runTimezoneTest(
     '2024-06-05T00:06:00Z',
@@ -482,7 +482,7 @@ test('should handle custom range with previous calendar week', () => {
     timeRangeFilter,
     shifts,
     startDate,
-    ['3 days ago'],
+    ['1 days ago'],
   );
   runTimezoneTest(
     '2024-06-04T16:06:00-08:00',
@@ -507,7 +507,7 @@ test('should handle custom range with previous calendar month', () => {
     timeRangeFilter,
     shifts,
     startDate,
-    ['7 days ago'],
+    ['5 days ago'],
   );
   runTimezoneTest(
     '2024-06-05T00:06:00Z',
@@ -515,7 +515,7 @@ test('should handle custom range with previous calendar month', () => {
     timeRangeFilter,
     shifts,
     startDate,
-    ['7 days ago'],
+    ['5 days ago'],
   );
   runTimezoneTest(
     '2024-06-04T16:06:00-08:00',
@@ -541,7 +541,7 @@ test('should handle custom range with previous calendar year', () => {
     timeRangeFilter,
     shifts,
     startDate,
-    ['8 days ago'],
+    ['6 days ago'],
   );
   runTimezoneTest(
     '2024-06-05T00:06:00Z',
@@ -549,7 +549,7 @@ test('should handle custom range with previous calendar year', () => {
     timeRangeFilter,
     shifts,
     startDate,
-    ['8 days ago'],
+    ['6 days ago'],
   );
   runTimezoneTest(
     '2024-06-04T16:06:00-08:00',
@@ -760,10 +760,10 @@ test('should handle future custom shift with different format', () => {
     timeRangeFilter,
     shifts,
     startDate,
-    ['3 days after'],
+    ['4 days after'],
   );
   runTimezoneTest(NOW_IN_UTC, 'UTC', timeRangeFilter, shifts, startDate, [
-    '3 days after',
+    '4 days after',
   ]);
   runTimezoneTest(
     NOW_UTC_IN_PACIFIC,
@@ -771,7 +771,7 @@ test('should handle future custom shift with different format', () => {
     timeRangeFilter,
     shifts,
     startDate,
-    ['4 days after'],
+    ['5 days after'],
   );
 });
 
@@ -850,10 +850,10 @@ test('should handle custom range with relative dates (hour)', () => {
     timeRangeFilter,
     shifts,
     startDate,
-    ['2 days ago'],
+    ['4 days ago'],
   );
   runTimezoneTest(NOW_IN_UTC, 'UTC', timeRangeFilter, shifts, startDate, [
-    '2 days ago',
+    '4 days ago',
   ]);
   runTimezoneTest(
     NOW_UTC_IN_PACIFIC,
diff --git a/superset-frontend/packages/superset-ui-core/test/time-comparison/parseDttmToDate.test.ts b/superset-frontend/packages/superset-ui-core/test/time-comparison/parseDttmToDate.test.ts
index e4f805e42c8..8936be7481b 100644
--- a/superset-frontend/packages/superset-ui-core/test/time-comparison/parseDttmToDate.test.ts
+++ b/superset-frontend/packages/superset-ui-core/test/time-comparison/parseDttmToDate.test.ts
@@ -20,7 +20,7 @@
 import { parseDttmToDate } from '@superset-ui/core';
 import timezoneMock from 'timezone-mock';
 
-// NOW will be set at midnight 2024-06-03 and transforme dfrom local timezone to UTC
+// NOW will be set at midnight 2024-06-03 and transformed from local timezone to UTC
 const NOW_IN_UTC = '2024-06-03T00:00:00Z';
 const NOW_UTC_IN_EUROPE = '2024-06-02T22:00:00Z'; // Same as 2024-06-03T00:00:00+02:00
 const NOW_UTC_IN_PACIFIC = '2024-06-03T08:00:00Z'; // Same as 2024-06-03T00:00:00-08:00
@@ -69,9 +69,9 @@ test('should return the current date for "today"', () => {
     'today',
     NOW_UTC_IN_EUROPE,
     'Etc/GMT-2',
-    new Date('2024-06-01T22:00:00Z'),
+    new Date('2024-06-02T22:00:00Z'),
   );
-  runTimezoneTest('today', NOW_IN_UTC, 'UTC', new Date('2024-06-02T00:00:00Z'));
+  runTimezoneTest('today', NOW_IN_UTC, 'UTC', new Date('2024-06-03T00:00:00Z'));
   runTimezoneTest(
     'today',
     NOW_UTC_IN_PACIFIC,
@@ -125,13 +125,13 @@ test('should return yesterday date for "Last day"', () => {
     'Last day',
     NOW_UTC_IN_EUROPE,
     'Etc/GMT-2',
-    new Date('2024-05-31T22:00:00Z'),
+    new Date('2024-06-01T22:00:00Z'),
   );
   runTimezoneTest(
     'Last day',
     NOW_IN_UTC,
     'UTC',
-    new Date('2024-06-01T00:00:00Z'),
+    new Date('2024-06-02T00:00:00Z'),
   );
   runTimezoneTest(
     'Last day',
@@ -147,13 +147,13 @@ test('should return the date one week ago for "Last week"', () => {
     'Last week',
     NOW_UTC_IN_EUROPE,
     'Etc/GMT-2',
-    new Date('2024-05-25T22:00:00Z'),
+    new Date('2024-05-26T22:00:00Z'),
   );
   runTimezoneTest(
     'Last week',
     NOW_IN_UTC,
     'UTC',
-    new Date('2024-05-26T00:00:00Z'),
+    new Date('2024-05-27T00:00:00Z'),
   );
   runTimezoneTest(
     'Last week',
@@ -169,13 +169,13 @@ test('should return the date one month ago for "Last month"', () => {
     'Last month',
     NOW_UTC_IN_EUROPE,
     'Etc/GMT-2',
-    new Date('2024-05-01T22:00:00Z'),
+    new Date('2024-05-02T22:00:00Z'),
   );
   runTimezoneTest(
     'Last month',
     NOW_IN_UTC,
     'UTC',
-    new Date('2024-05-02T00:00:00Z'),
+    new Date('2024-05-03T00:00:00Z'),
   );
   runTimezoneTest(
     'Last month',
@@ -191,13 +191,13 @@ test('should return the date three months ago for "Last quarter"', () => {
     'Last quarter',
     NOW_UTC_IN_EUROPE,
     'Etc/GMT-2',
-    new Date('2024-03-01T22:00:00Z'),
+    new Date('2024-03-02T22:00:00Z'),
   );
   runTimezoneTest(
     'Last quarter',
     NOW_IN_UTC,
     'UTC',
-    new Date('2024-03-02T00:00:00Z'),
+    new Date('2024-03-03T00:00:00Z'),
   );
   runTimezoneTest(
     'Last quarter',
@@ -213,13 +213,13 @@ test('should return the date one year ago for "Last year"', () => {
     'Last year',
     NOW_UTC_IN_EUROPE,
     'Etc/GMT-2',
-    new Date('2023-06-01T22:00:00Z'),
+    new Date('2023-06-02T22:00:00Z'),
   );
   runTimezoneTest(
     'Last year',
     NOW_IN_UTC,
     'UTC',
-    new Date('2023-06-02T00:00:00Z'),
+    new Date('2023-06-03T00:00:00Z'),
   );
   runTimezoneTest(
     'Last year',
@@ -235,19 +235,19 @@ test('should return the date for "previous calendar week"', () => {
     'previous calendar week',
     '2024-06-04T22:00:00Z',
     'Etc/GMT-2',
-    new Date('2024-05-27T16:00:00Z'),
+    new Date('2024-05-26T22:00:00Z'),
   );
   runTimezoneTest(
     'previous calendar week',
     '2024-06-05T00:00:00Z',
     'UTC',
-    new Date('2024-05-27T20:00:00Z'),
+    new Date('2024-05-27T00:00:00Z'),
   );
   runTimezoneTest(
     'previous calendar week',
     '2024-06-05T08:00:00Z',
     'Etc/GMT+8',
-    new Date('2024-05-27T12:00:00Z'),
+    new Date('2024-05-27T08:00:00Z'),
   );
 });
 
@@ -257,19 +257,19 @@ test('should return the date for "previous calendar month"', () => {
     'previous calendar month',
     NOW_UTC_IN_EUROPE,
     'Etc/GMT-2',
-    new Date('2024-05-01T10:00:00Z'),
+    new Date('2024-04-30T22:00:00Z'),
   );
   runTimezoneTest(
     'previous calendar month',
     NOW_IN_UTC,
     'UTC',
-    new Date('2024-05-01T16:00:00Z'),
+    new Date('2024-05-01T00:00:00Z'),
   );
   runTimezoneTest(
     'previous calendar month',
     NOW_UTC_IN_PACIFIC,
     'Etc/GMT+8',
-    new Date('2024-05-01T16:00:00Z'),
+    new Date('2024-05-01T08:00:00Z'),
   );
 });
 
@@ -279,19 +279,19 @@ test('should return the date for "previous calendar year"', () => {
     'previous calendar year',
     NOW_UTC_IN_EUROPE,
     'Etc/GMT-2',
-    new Date('2023-01-01T16:00:00Z'),
+    new Date('2022-12-31T22:00:00Z'),
   );
   runTimezoneTest(
     'previous calendar year',
     NOW_IN_UTC,
     'UTC',
-    new Date('2023-01-01T20:00:00Z'),
+    new Date('2023-01-01T00:00:00Z'),
   );
   runTimezoneTest(
     'previous calendar year',
     NOW_UTC_IN_PACIFIC,
     'Etc/GMT+8',
-    new Date('2023-01-01T12:00:00Z'),
+    new Date('2023-01-01T08:00:00Z'),
   );
 });
 
@@ -301,13 +301,13 @@ test('should return the date for "1 day ago"', () => {
     '1 day ago',
     NOW_UTC_IN_EUROPE,
     'Etc/GMT-2',
-    new Date('2024-05-31T22:00:00Z'),
+    new Date('2024-06-01T22:00:00Z'),
   );
   runTimezoneTest(
     '1 day ago',
     NOW_IN_UTC,
     'UTC',
-    new Date('2024-06-01T00:00:00Z'),
+    new Date('2024-06-02T00:00:00Z'),
   );
   runTimezoneTest(
     '1 day ago',
@@ -323,13 +323,13 @@ test('should return the date for "1 week ago"', () => {
     '1 week ago',
     NOW_UTC_IN_EUROPE,
     'Etc/GMT-2',
-    new Date('2024-05-25T22:00:00Z'),
+    new Date('2024-05-26T22:00:00Z'),
   );
   runTimezoneTest(
     '1 week ago',
     NOW_IN_UTC,
     'UTC',
-    new Date('2024-05-26T00:00:00Z'),
+    new Date('2024-05-27T00:00:00Z'),
   );
   runTimezoneTest(
     '1 week ago',
@@ -345,13 +345,13 @@ test('should return the date for "1 month ago"', () => {
     '1 month ago',
     NOW_UTC_IN_EUROPE,
     'Etc/GMT-2',
-    new Date('2024-05-01T22:00:00Z'),
+    new Date('2024-05-02T22:00:00Z'),
   );
   runTimezoneTest(
     '1 month ago',
     NOW_IN_UTC,
     'UTC',
-    new Date('2024-05-02T00:00:00Z'),
+    new Date('2024-05-03T00:00:00Z'),
   );
   runTimezoneTest(
     '1 month ago',
@@ -367,13 +367,13 @@ test('should return the date for "1 year ago"', () => {
     '1 year ago',
     NOW_UTC_IN_EUROPE,
     'Etc/GMT-2',
-    new Date('2023-06-01T22:00:00Z'),
+    new Date('2023-06-02T22:00:00Z'),
   );
   runTimezoneTest(
     '1 year ago',
     NOW_IN_UTC,
     'UTC',
-    new Date('2023-06-02T00:00:00Z'),
+    new Date('2023-06-03T00:00:00Z'),
   );
   runTimezoneTest(
     '1 year ago',
@@ -389,13 +389,13 @@ test('should return the date for "2024-03-09"', () => {
     '2024-03-09',
     NOW_UTC_IN_EUROPE,
     'Etc/GMT-2',
-    new Date('2024-03-07T22:00:00.000Z'),
+    new Date('2024-03-08T22:00:00.000Z'),
   );
   runTimezoneTest(
     '2024-03-09',
     NOW_IN_UTC,
     'UTC',
-    new Date('2024-03-08T00:00:00.000Z'),
+    new Date('2024-03-09T00:00:00.000Z'),
   );
   runTimezoneTest(
     '2024-03-09',
@@ -411,14 +411,14 @@ test('should return the current date for "Last day" with isEndDate true', () =>
     'Last day',
     NOW_UTC_IN_EUROPE,
     'Etc/GMT-2',
-    new Date('2024-06-01T22:00:00Z'),
+    new Date('2024-06-02T22:00:00Z'),
     true,
   );
   runTimezoneTest(
     'Last day',
     NOW_IN_UTC,
     'UTC',
-    new Date('2024-06-02T00:00:00Z'),
+    new Date('2024-06-03T00:00:00Z'),
     true,
   );
   runTimezoneTest(
@@ -436,14 +436,14 @@ test('should return the current date for "Last week" with isEndDate true', () =>
     'Last week',
     NOW_UTC_IN_EUROPE,
     'Etc/GMT-2',
-    new Date('2024-06-01T22:00:00Z'),
+    new Date('2024-06-02T22:00:00Z'),
     true,
   );
   runTimezoneTest(
     'Last week',
     NOW_IN_UTC,
     'UTC',
-    new Date('2024-06-02T00:00:00Z'),
+    new Date('2024-06-03T00:00:00Z'),
     true,
   );
   runTimezoneTest(
@@ -461,14 +461,14 @@ test('should return the current date for "Last quarter" with isEndDate true', ()
     'Last quarter',
     NOW_UTC_IN_EUROPE,
     'Etc/GMT-2',
-    new Date('2024-06-01T22:00:00Z'),
+    new Date('2024-06-02T22:00:00Z'),
     true,
   );
   runTimezoneTest(
     'Last quarter',
     NOW_IN_UTC,
     'UTC',
-    new Date('2024-06-02T00:00:00Z'),
+    new Date('2024-06-03T00:00:00Z'),
     true,
   );
   runTimezoneTest(
@@ -486,14 +486,14 @@ test('should return the current date for "Last year" with isEndDate true', () =>
     'Last year',
     NOW_UTC_IN_EUROPE,
     'Etc/GMT-2',
-    new Date('2024-06-01T22:00:00Z'),
+    new Date('2024-06-02T22:00:00Z'),
     true,
   );
   runTimezoneTest(
     'Last year',
     NOW_IN_UTC,
     'UTC',
-    new Date('2024-06-02T00:00:00Z'),
+    new Date('2024-06-03T00:00:00Z'),
     true,
   );
   runTimezoneTest(
@@ -511,21 +511,21 @@ test('should return the date for "previous calendar week" with isEndDate true',
     'previous calendar week',
     NOW_UTC_IN_EUROPE,
     'Etc/GMT-2',
-    new Date('2024-06-03T16:00:00Z'),
+    new Date('2024-06-02T22:00:00Z'),
     true,
   );
   runTimezoneTest(
     'previous calendar week',
     NOW_IN_UTC,
     'UTC',
-    new Date('2024-06-03T20:00:00Z'),
+    new Date('2024-06-03T00:00:00Z'),
     true,
   );
   runTimezoneTest(
     'previous calendar week',
     NOW_UTC_IN_PACIFIC,
     'Etc/GMT+8',
-    new Date('2024-06-03T12:00:00Z'),
+    new Date('2024-06-03T08:00:00Z'),
     true,
   );
 });
@@ -536,21 +536,21 @@ test('should return the date for "previous calendar month" with isEndDate true',
     'previous calendar month',
     NOW_UTC_IN_EUROPE,
     'Etc/GMT-2',
-    new Date('2024-06-01T16:00:00Z'),
+    new Date('2024-05-31T22:00:00Z'),
     true,
   );
   runTimezoneTest(
     'previous calendar month',
     NOW_IN_UTC,
     'UTC',
-    new Date('2024-06-01T20:00:00Z'),
+    new Date('2024-06-01T00:00:00Z'),
     true,
   );
   runTimezoneTest(
     'previous calendar month',
     NOW_UTC_IN_PACIFIC,
     'Etc/GMT+8',
-    new Date('2024-06-01T12:00:00Z'),
+    new Date('2024-06-01T08:00:00Z'),
     true,
   );
 });
@@ -561,21 +561,21 @@ test('should return the date for "previous calendar year" with isEndDate true',
     'previous calendar year',
     NOW_UTC_IN_EUROPE,
     'Etc/GMT-2',
-    new Date('2024-01-01T16:00:00Z'),
+    new Date('2023-12-31T22:00:00Z'),
     true,
   );
   runTimezoneTest(
     'previous calendar year',
     NOW_IN_UTC,
     'UTC',
-    new Date('2024-01-01T20:00:00Z'),
+    new Date('2024-01-01T00:00:00Z'),
     true,
   );
   runTimezoneTest(
     'previous calendar year',
     NOW_UTC_IN_PACIFIC,
     'Etc/GMT+8',
-    new Date('2024-01-01T12:00:00Z'),
+    new Date('2024-01-01T08:00:00Z'),
     true,
   );
 });
@@ -586,9 +586,9 @@ test('should return the date for "2024" with parts.length === 1', () => {
     '2024',
     NOW_UTC_IN_EUROPE,
     'Etc/GMT-2',
-    new Date('2023-12-30T22:00:00.000Z'),
+    new Date('2023-12-31T22:00:00.000Z'),
   );
-  runTimezoneTest('2024', NOW_IN_UTC, 'UTC', new Date('2023-12-31T00:00:00Z'));
+  runTimezoneTest('2024', NOW_IN_UTC, 'UTC', new Date('2024-01-01T00:00:00Z'));
   runTimezoneTest(
     '2024',
     NOW_UTC_IN_PACIFIC,
@@ -603,13 +603,13 @@ test('should return the date for "2024-03" with parts.length === 2', () => {
     '2024-03',
     NOW_UTC_IN_EUROPE,
     'Etc/GMT-2',
-    new Date('2024-02-28T22:00:00.000Z'),
+    new Date('2024-02-29T22:00:00.000Z'),
   );
   runTimezoneTest(
     '2024-03',
     NOW_IN_UTC,
     'UTC',
-    new Date('2024-02-29T00:00:00Z'),
+    new Date('2024-03-01T00:00:00Z'),
   );
   runTimezoneTest(
     '2024-03',
@@ -625,13 +625,13 @@ test('should return the date for "2024-03-06" with parts.length === 3', () => {
     '2024-03-06',
     NOW_UTC_IN_EUROPE,
     'Etc/GMT-2',
-    new Date('2024-03-04T22:00:00.000Z'),
+    new Date('2024-03-05T22:00:00.000Z'),
   );
   runTimezoneTest(
     '2024-03-06',
     NOW_IN_UTC,
     'UTC',
-    new Date('2024-03-05T00:00:00.000Z'),
+    new Date('2024-03-06T00:00:00.000Z'),
   );
   runTimezoneTest(
     '2024-03-06',
@@ -643,7 +643,7 @@ test('should return the date for "2024-03-06" with parts.length === 3', () => {
 
 test('should return the date for "2024-03-06" with computingShifts true', () => {
   jest.useFakeTimers();
-  const expectedDate = new Date('2024-03-05T22:00:00Z');
+  const expectedDate = new Date('2024-03-06T22:00:00Z');
   expectedDate.setHours(-expectedDate.getTimezoneOffset() / 60, 0, 0, 0);
   runTimezoneTest(
     '2024-03-06',
@@ -657,7 +657,7 @@ test('should return the date for "2024-03-06" with computingShifts true', () =>
 
 test('should return the date for "2024-03-06" with computingShifts true and isEndDate true', () => {
   jest.useFakeTimers();
-  const expectedDate = new Date('2024-03-05T22:00:00Z');
+  const expectedDate = new Date('2024-03-06T22:00:00Z');
   expectedDate.setHours(-expectedDate.getTimezoneOffset() / 60, 0, 0, 0);
   runTimezoneTest(
     '2024-03-06',
diff --git a/superset-frontend/packages/superset-ui-core/test/utils/copy.test.ts b/superset-frontend/packages/superset-ui-core/test/utils/copy.test.ts
new file mode 100644
index 00000000000..44c14958c76
--- /dev/null
+++ b/superset-frontend/packages/superset-ui-core/test/utils/copy.test.ts
@@ -0,0 +1,216 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+import { copyTextToClipboard } from '@superset-ui/core';
+
+const SAFARI_UA =
+  'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/17.0 Safari/605.1.15';
+const CHROME_UA =
+  'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36';
+
+const makeGetText = (text: string) => () => Promise.resolve(text);
+
+const globalWithClipboardItem = global as unknown as {
+  ClipboardItem?: unknown;
+};
+
+afterEach(() => {
+  jest.restoreAllMocks();
+  delete globalWithClipboardItem.ClipboardItem;
+});
+
+test('uses Clipboard API writeText on non-Safari browsers', async () => {
+  Object.defineProperty(navigator, 'userAgent', {
+    value: CHROME_UA,
+    configurable: true,
+  });
+  const writeText = jest.fn().mockResolvedValue(undefined);
+  Object.defineProperty(navigator, 'clipboard', {
+    value: { writeText },
+    configurable: true,
+  });
+
+  await copyTextToClipboard(makeGetText('hello'));
+
+  expect(writeText).toHaveBeenCalledWith('hello');
+});
+
+test('uses ClipboardItem API on Safari browsers', async () => {
+  Object.defineProperty(navigator, 'userAgent', {
+    value: SAFARI_UA,
+    configurable: true,
+  });
+  const write = jest.fn().mockResolvedValue(undefined);
+  Object.defineProperty(navigator, 'clipboard', {
+    value: { write },
+    configurable: true,
+  });
+  const MockClipboardItem = jest.fn().mockImplementation(data => ({ data }));
+  globalWithClipboardItem.ClipboardItem = MockClipboardItem;
+
+  await copyTextToClipboard(makeGetText('safari text'));
+
+  expect(MockClipboardItem).toHaveBeenCalled();
+  expect(write).toHaveBeenCalledWith([expect.anything()]);
+});
+
+test('falls back to writeText on Safari when ClipboardItem write fails', async () => {
+  Object.defineProperty(navigator, 'userAgent', {
+    value: SAFARI_UA,
+    configurable: true,
+  });
+  const writeText = jest.fn().mockResolvedValue(undefined);
+  const write = jest.fn().mockRejectedValue(new Error('not supported'));
+  Object.defineProperty(navigator, 'clipboard', {
+    value: { write, writeText },
+    configurable: true,
+  });
+  const MockClipboardItem = jest.fn().mockImplementation(data => ({ data }));
+  globalWithClipboardItem.ClipboardItem = MockClipboardItem;
+
+  await copyTextToClipboard(makeGetText('fallback text'));
+
+  expect(writeText).toHaveBeenCalledWith('fallback text');
+});
+
+function mockExecCommand(impl: (cmd: string) => boolean) {
+  Object.defineProperty(document, 'execCommand', {
+    value: jest.fn().mockImplementation(impl),
+    configurable: true,
+    writable: true,
+  });
+}
+
+function setupFallbackMocks(options: { selection: Partial<Selection> | null }) {
+  Object.defineProperty(navigator, 'userAgent', {
+    value: CHROME_UA,
+    configurable: true,
+  });
+  Object.defineProperty(navigator, 'clipboard', {
+    value: {
+      writeText: jest.fn().mockRejectedValue(new Error('not allowed')),
+    },
+    configurable: true,
+  });
+
+  const mockRange = { selectNode: jest.fn() };
+  const mockSpan = {
+    style: {} as CSSStyleDeclaration,
+    textContent: '',
+  } as unknown as HTMLSpanElement;
+
+  jest
+    .spyOn(document, 'getSelection')
+    .mockReturnValue(options.selection as Selection | null);
+  jest
+    .spyOn(document, 'createRange')
+    .mockReturnValue(mockRange as unknown as Range);
+  jest.spyOn(document, 'createElement').mockReturnValue(mockSpan);
+  jest.spyOn(document.body, 'appendChild').mockImplementation(() => mockSpan);
+  jest.spyOn(document.body, 'removeChild').mockImplementation(() => mockSpan);
+
+  return { mockRange, mockSpan };
+}
+
+test('falls back to execCommand copy when Clipboard API is unavailable', async () => {
+  const removeRange = jest.fn();
+  const { mockRange } = setupFallbackMocks({
+    selection: {
+      removeAllRanges: jest.fn(),
+      addRange: jest.fn(),
+      removeRange,
+    },
+  });
+  mockExecCommand(cmd => cmd === 'copy');
+
+  await copyTextToClipboard(makeGetText('exec text'));
+
+  expect(document.execCommand).toHaveBeenCalledWith('copy');
+  expect(removeRange).toHaveBeenCalledWith(mockRange);
+});
+
+test('falls back to removeAllRanges when removeRange is not available', async () => {
+  const removeAllRanges = jest.fn();
+  setupFallbackMocks({
+    selection: {
+      removeAllRanges,
+      addRange: jest.fn(),
+      removeRange: undefined,
+    },
+  });
+  mockExecCommand(cmd => cmd === 'copy');
+
+  await copyTextToClipboard(makeGetText('no removeRange'));
+
+  expect(removeAllRanges).toHaveBeenCalled();
+});
+
+test('rejects when execCommand returns false', async () => {
+  setupFallbackMocks({
+    selection: {
+      removeAllRanges: jest.fn(),
+      addRange: jest.fn(),
+      removeRange: jest.fn(),
+    },
+  });
+  mockExecCommand(() => false);
+
+  await expect(
+    copyTextToClipboard(makeGetText('fail')),
+  ).rejects.toBeUndefined();
+});
+
+test('rejects when execCommand throws', async () => {
+  setupFallbackMocks({
+    selection: {
+      removeAllRanges: jest.fn(),
+      addRange: jest.fn(),
+      removeRange: jest.fn(),
+    },
+  });
+  Object.defineProperty(document, 'execCommand', {
+    value: jest.fn().mockImplementation(() => {
+      throw new Error('execCommand error');
+    }),
+    configurable: true,
+    writable: true,
+  });
+
+  await expect(
+    copyTextToClipboard(makeGetText('throw')),
+  ).rejects.toBeUndefined();
+});
+
+test('resolves without copying when getSelection returns null', async () => {
+  Object.defineProperty(navigator, 'userAgent', {
+    value: CHROME_UA,
+    configurable: true,
+  });
+  Object.defineProperty(navigator, 'clipboard', {
+    value: {
+      writeText: jest.fn().mockRejectedValue(new Error('not allowed')),
+    },
+    configurable: true,
+  });
+
+  jest.spyOn(document, 'getSelection').mockReturnValue(null);
+
+  await expect(
+    copyTextToClipboard(makeGetText('no selection')),
+  ).resolves.toBeUndefined();
+});
diff --git a/superset-frontend/packages/superset-ui-core/test/utils/featureFlag.test.ts b/superset-frontend/packages/superset-ui-core/test/utils/featureFlag.test.ts
index 6ee4ccaf644..6a6646c6446 100644
--- a/superset-frontend/packages/superset-ui-core/test/utils/featureFlag.test.ts
+++ b/superset-frontend/packages/superset-ui-core/test/utils/featureFlag.test.ts
@@ -76,3 +76,16 @@ test('returns true for set feature flag', () => {
   });
   expect(isFeatureEnabled(FeatureFlag.DrillBy)).toEqual(true);
 });
+
+test('GranularExportControls feature flag has expected string value', () => {
+  expect(FeatureFlag.GranularExportControls).toBe('GRANULAR_EXPORT_CONTROLS');
+});
+
+test('returns true for set GranularExportControls feature flag', () => {
+  Object.defineProperty(window, 'featureFlags', {
+    value: {
+      GRANULAR_EXPORT_CONTROLS: true,
+    },
+  });
+  expect(isFeatureEnabled(FeatureFlag.GranularExportControls)).toEqual(true);
+});
diff --git a/superset-frontend/playwright.config.ts b/superset-frontend/playwright.config.ts
index 2c001297fe5..9edef2176c8 100644
--- a/superset-frontend/playwright.config.ts
+++ b/superset-frontend/playwright.config.ts
@@ -94,6 +94,7 @@ export default defineConfig({
       name: 'chromium',
       testIgnore: [
         '**/tests/auth/**/*.spec.ts',
+        '**/tests/sqllab/**/*.spec.ts',
         ...(process.env.INCLUDE_EXPERIMENTAL ? [] : ['**/experimental/**']),
       ],
       use: {
@@ -103,6 +104,22 @@ export default defineConfig({
         storageState: 'playwright/.auth/user.json',
       },
     },
+    {
+      // SQL Lab needs its own project because tab state is stored server-side
+      // per user (/tabstateview/*). All workers share the same auth user, so
+      // parallel workers mutating tabs would cause nondeterministic tab counts
+      // and cross-worker tab deletions. Other test suites (dataset, dashboard,
+      // chart) don't need this because they create/delete isolated resources
+      // via API with unique names — no shared mutable state between tests.
+      name: 'chromium-sqllab',
+      testMatch: '**/tests/sqllab/**/*.spec.ts',
+      fullyParallel: false,
+      use: {
+        browserName: 'chromium',
+        testIdAttribute: 'data-test',
+        storageState: 'playwright/.auth/user.json',
+      },
+    },
     {
       // Separate project for unauthenticated tests (login, signup, etc.)
       // These tests use beforeEach for per-test navigation - no global auth
diff --git a/superset-frontend/playwright/components/core/AgGrid.ts b/superset-frontend/playwright/components/core/AgGrid.ts
new file mode 100644
index 00000000000..0c073222dfb
--- /dev/null
+++ b/superset-frontend/playwright/components/core/AgGrid.ts
@@ -0,0 +1,85 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { Locator, Page } from '@playwright/test';
+
+const AG_GRID_SELECTORS = {
+  ROOT: '[role="grid"]',
+  HEADER_ROW: '.ag-header-row',
+  HEADER_CELL: '.ag-header-cell',
+  BODY_ROW: '.ag-row',
+  CELL: '.ag-cell',
+} as const;
+
+/**
+ * AG Grid component wrapper for Playwright.
+ * Used by FilterableTable/GridTable in SQL Lab results and elsewhere.
+ */
+export class AgGrid {
+  readonly page: Page;
+  private readonly locator: Locator;
+
+  constructor(page: Page, locator: Locator) {
+    this.page = page;
+    this.locator = locator;
+  }
+
+  get element(): Locator {
+    return this.locator;
+  }
+
+  /**
+   * Wait for the grid to render with data rows
+   */
+  async waitForRows(options?: { timeout?: number }): Promise<void> {
+    await this.locator
+      .locator(AG_GRID_SELECTORS.BODY_ROW)
+      .first()
+      .waitFor({ state: 'visible', ...options });
+  }
+
+  /**
+   * Get header cell texts
+   */
+  async getHeaderTexts(): Promise<string[]> {
+    return this.locator
+      .locator(AG_GRID_SELECTORS.HEADER_CELL)
+      .allTextContents();
+  }
+
+  /**
+   * Get the number of visible data rows
+   */
+  async getRowCount(): Promise<number> {
+    return this.locator.locator(AG_GRID_SELECTORS.BODY_ROW).count();
+  }
+
+  /**
+   * Get cell text at a specific row and column index (0-based)
+   */
+  async getCellText(row: number, col: number): Promise<string> {
+    const text = await this.locator
+      .locator(AG_GRID_SELECTORS.BODY_ROW)
+      .nth(row)
+      .locator(AG_GRID_SELECTORS.CELL)
+      .nth(col)
+      .textContent();
+    return text?.trim() ?? '';
+  }
+}
diff --git a/superset-frontend/playwright/components/core/EditableTabs.ts b/superset-frontend/playwright/components/core/EditableTabs.ts
new file mode 100644
index 00000000000..ca68181b498
--- /dev/null
+++ b/superset-frontend/playwright/components/core/EditableTabs.ts
@@ -0,0 +1,46 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { Tabs } from './Tabs';
+
+/**
+ * EditableTabs component for Ant Design editable-card tabs.
+ *
+ * Mirrors the Superset EditableTabs component (type="editable-card")
+ * which adds add/remove tab functionality to the base Tabs component.
+ *
+ * The add button (.ant-tabs-nav-add) is only rendered when
+ * type="editable-card". If the host component switches to type="card"
+ * (e.g., SQL Lab empty state), use the host page object for that case.
+ */
+export class EditableTabs extends Tabs {
+  /**
+   * Clicks the add-tab button rendered by antd in editable-card mode.
+   */
+  async addTab(): Promise<void> {
+    await this.element.getByRole('button', { name: 'Add tab' }).click();
+  }
+
+  /**
+   * Clicks the remove button on the last tab.
+   */
+  async removeLastTab(): Promise<void> {
+    await this.nav.locator('.ant-tabs-tab-remove').last().click();
+  }
+}
diff --git a/superset-frontend/playwright/components/core/Modal.ts b/superset-frontend/playwright/components/core/Modal.ts
index 2b91369113c..f90e37a238f 100644
--- a/superset-frontend/playwright/components/core/Modal.ts
+++ b/superset-frontend/playwright/components/core/Modal.ts
@@ -68,7 +68,7 @@ export class Modal {
   }
 
   /**
-   * Gets a footer button by text content (private helper)
+   * Gets a footer button by text content
    * @param buttonText - The text content of the button
    */
   private getFooterButton(buttonText: string): Locator {
@@ -80,7 +80,7 @@ export class Modal {
    * @param buttonText - The text content of the button to click
    * @param options - Optional click options
    */
-  protected async clickFooterButton(
+  async clickFooterButton(
     buttonText: string,
     options?: { timeout?: number; force?: boolean; delay?: number },
   ): Promise<void> {
diff --git a/superset-frontend/playwright/components/core/Popover.ts b/superset-frontend/playwright/components/core/Popover.ts
new file mode 100644
index 00000000000..3912286edb0
--- /dev/null
+++ b/superset-frontend/playwright/components/core/Popover.ts
@@ -0,0 +1,53 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { Locator, Page } from '@playwright/test';
+import { Button } from './Button';
+
+/**
+ * Ant Design Popover component.
+ */
+export class Popover {
+  readonly page: Page;
+  private readonly locator: Locator;
+
+  constructor(page: Page, locator?: Locator) {
+    this.page = page;
+    this.locator = locator ?? page.locator('.ant-popover-content');
+  }
+
+  get element(): Locator {
+    return this.locator;
+  }
+
+  async waitForVisible(options?: { timeout?: number }): Promise<void> {
+    await this.locator.waitFor({ state: 'visible', ...options });
+  }
+
+  async waitForHidden(options?: { timeout?: number }): Promise<void> {
+    await this.locator.waitFor({ state: 'hidden', ...options });
+  }
+
+  getButton(name: string): Button {
+    return new Button(
+      this.page,
+      this.locator.getByRole('button', { name, exact: true }),
+    );
+  }
+}
diff --git a/superset-frontend/playwright/components/core/Select.ts b/superset-frontend/playwright/components/core/Select.ts
index 1fb9191bcf5..5472b332636 100644
--- a/superset-frontend/playwright/components/core/Select.ts
+++ b/superset-frontend/playwright/components/core/Select.ts
@@ -18,6 +18,7 @@
  */
 
 import { Locator, Page } from '@playwright/test';
+import { TIMEOUT } from '../../utils/constants';
 
 /**
  * Ant Design Select component selectors
@@ -87,7 +88,7 @@ export class Select {
     await this.page
       .locator(`${SELECT_SELECTORS.DROPDOWN}:not(.ant-select-dropdown-hidden)`)
       .last()
-      .waitFor({ state: 'hidden', timeout: 5000 })
+      .waitFor({ state: 'hidden', timeout: TIMEOUT.UI_TRANSITION })
       .catch(error => {
         // Only ignore TimeoutError (dropdown may already be closed); re-throw others
         if (!(error instanceof Error) || error.name !== 'TimeoutError') {
diff --git a/superset-frontend/playwright/components/core/Tabs.ts b/superset-frontend/playwright/components/core/Tabs.ts
index cc4b7f50053..868bf728bdb 100644
--- a/superset-frontend/playwright/components/core/Tabs.ts
+++ b/superset-frontend/playwright/components/core/Tabs.ts
@@ -21,6 +21,10 @@ import { Locator, Page } from '@playwright/test';
 
 /**
  * Tabs component for Ant Design tab navigation.
+ *
+ * Expects the locator to point to the `.ant-tabs` wrapper element
+ * (not the inner tablist) so that `nav` can scope to the outer tab bar
+ * and exclude nested/inner tabs (e.g. Results / Query history in SQL Lab).
  */
 export class Tabs {
   readonly page: Page;
@@ -28,23 +32,54 @@ export class Tabs {
 
   constructor(page: Page, locator?: Locator) {
     this.page = page;
-    // Default to the tablist role if no specific locator provided
-    this.locator = locator ?? page.getByRole('tablist');
+    this.locator = locator ?? page.locator('.ant-tabs').first();
   }
 
   /**
-   * Gets the tablist element locator
+   * The root element locator for this tabs component.
    */
   get element(): Locator {
     return this.locator;
   }
 
   /**
-   * Gets a tab by name, scoped to this tablist's container
+   * The tab navigation bar for this component.
+   * Scoped to the first `.ant-tabs-nav` descendant so that queries
+   * only hit this component's tabs, never nested/inner tab bars.
+   */
+  protected get nav(): Locator {
+    return this.locator.locator('.ant-tabs-nav').first();
+  }
+
+  /**
+   * Returns the number of tabs.
+   * Counts `.ant-tabs-tab` wrappers in the nav bar — one per physical tab,
+   * regardless of inner role="tab" elements (btn, remove button, etc.).
+   */
+  async getTabCount(): Promise<number> {
+    return this.nav.locator('.ant-tabs-tab').count();
+  }
+
+  /**
+   * Returns the text content of all tabs.
+   */
+  async getTabNames(): Promise<string[]> {
+    return this.nav.locator('.ant-tabs-tab-btn').allTextContents();
+  }
+
+  /**
+   * Gets a tab button by name, scoped to this component's nav bar.
+   * Anchored at start (^) with negative lookahead (?!\d) to prevent
+   * partial matches: "Query" won't match "Query 1", and "Query 1"
+   * won't match "Query 10". Trailing icon text (e.g. " circle-solid")
+   * is allowed since (?!\d) permits non-digit suffixes.
    * @param tabName - The name/label of the tab
    */
   getTab(tabName: string): Locator {
-    return this.locator.getByRole('tab', { name: tabName });
+    const escaped = tabName.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+    return this.nav
+      .locator('.ant-tabs-tab-btn')
+      .filter({ hasText: new RegExp(`^${escaped}(?!\\d)`) });
   }
 
   /**
@@ -63,6 +98,16 @@ export class Tabs {
     return this.page.getByRole('tabpanel', { name: tabName });
   }
 
+  /**
+   * Returns the name of the currently active tab.
+   */
+  async getActiveTabName(): Promise<string> {
+    const text = await this.nav
+      .locator('.ant-tabs-tab-active .ant-tabs-tab-btn')
+      .textContent();
+    return text?.trim() ?? '';
+  }
+
   /**
    * Checks if a tab is selected
    * @param tabName - The name/label of the tab
diff --git a/superset-frontend/playwright/components/core/index.ts b/superset-frontend/playwright/components/core/index.ts
index 53a2ad71d6e..a16251c6fb6 100644
--- a/superset-frontend/playwright/components/core/index.ts
+++ b/superset-frontend/playwright/components/core/index.ts
@@ -19,12 +19,15 @@
 
 // Core Playwright Components for Superset
 export { AceEditor } from './AceEditor';
+export { AgGrid } from './AgGrid';
 export { Button } from './Button';
 export { Checkbox } from './Checkbox';
+export { EditableTabs } from './EditableTabs';
 export { Form } from './Form';
 export { Input } from './Input';
 export { Menu } from './Menu';
 export { Modal } from './Modal';
+export { Popover } from './Popover';
 export { Select } from './Select';
 export { Table } from './Table';
 export { Tabs } from './Tabs';
diff --git a/superset-frontend/playwright/components/modals/EditDatasetModal.ts b/superset-frontend/playwright/components/modals/EditDatasetModal.ts
index bce66be9625..06f29d600a8 100644
--- a/superset-frontend/playwright/components/modals/EditDatasetModal.ts
+++ b/superset-frontend/playwright/components/modals/EditDatasetModal.ts
@@ -40,8 +40,11 @@ export class EditDatasetModal extends Modal {
     // Use getByRole with specific name to target Edit Dataset dialog
     // The dialog has aria-labelledby that resolves to "edit Edit Dataset"
     this.specificLocator = page.getByRole('dialog', { name: /edit.*dataset/i });
-    // Scope tabs to modal's tablist to avoid matching tablists elsewhere on page
-    this.tabs = new Tabs(page, this.specificLocator.getByRole('tablist'));
+    // Scope tabs to modal dialog so nav getter finds .ant-tabs-nav as descendant
+    this.tabs = new Tabs(
+      page,
+      this.specificLocator.locator('.ant-tabs').first(),
+    );
   }
 
   /**
diff --git a/superset-frontend/playwright/components/modals/SaveDatasetModal.ts b/superset-frontend/playwright/components/modals/SaveDatasetModal.ts
new file mode 100644
index 00000000000..00cf4872166
--- /dev/null
+++ b/superset-frontend/playwright/components/modals/SaveDatasetModal.ts
@@ -0,0 +1,43 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { Page } from '@playwright/test';
+import { Input, Modal } from '../core';
+
+/**
+ * Save Dataset modal in SQL Lab.
+ * Appears when clicking "Save dataset" after running a query.
+ */
+export class SaveDatasetModal extends Modal {
+  constructor(page: Page) {
+    super(page, '[data-test="Save or Overwrite Dataset-modal"] .ant-modal');
+  }
+
+  private get nameInput(): Input {
+    return new Input(
+      this.page,
+      this.body.locator('input[placeholder="Dataset name"]'),
+    );
+  }
+
+  async fillName(name: string): Promise<void> {
+    await this.nameInput.clear();
+    await this.nameInput.fill(name);
+  }
+}
diff --git a/superset-frontend/playwright/components/modals/SaveQueryModal.ts b/superset-frontend/playwright/components/modals/SaveQueryModal.ts
new file mode 100644
index 00000000000..546c82b9fa2
--- /dev/null
+++ b/superset-frontend/playwright/components/modals/SaveQueryModal.ts
@@ -0,0 +1,43 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { Page } from '@playwright/test';
+import { Input, Modal } from '../core';
+
+/**
+ * Save Query modal in SQL Lab.
+ * Appears when clicking the Save button in the SQL editor toolbar.
+ */
+export class SaveQueryModal extends Modal {
+  constructor(page: Page) {
+    super(page, '.save-query-modal');
+  }
+
+  private get nameInput(): Input {
+    return new Input(
+      this.page,
+      this.body.locator('input[type="text"]').first(),
+    );
+  }
+
+  async fillName(name: string): Promise<void> {
+    await this.nameInput.clear();
+    await this.nameInput.fill(name);
+  }
+}
diff --git a/superset-frontend/playwright/components/modals/index.ts b/superset-frontend/playwright/components/modals/index.ts
index a8f8f1576f3..94bbe08def6 100644
--- a/superset-frontend/playwright/components/modals/index.ts
+++ b/superset-frontend/playwright/components/modals/index.ts
@@ -18,6 +18,11 @@
  */
 
 // Specific modal implementations
+export { ChartPropertiesModal } from './ChartPropertiesModal';
+export { ConfirmDialog } from './ConfirmDialog';
 export { DeleteConfirmationModal } from './DeleteConfirmationModal';
 export { DuplicateDatasetModal } from './DuplicateDatasetModal';
+export { EditDatasetModal } from './EditDatasetModal';
 export { ImportDatasetModal } from './ImportDatasetModal';
+export { SaveDatasetModal } from './SaveDatasetModal';
+export { SaveQueryModal } from './SaveQueryModal';
diff --git a/superset-frontend/playwright/helpers/api/assertions.ts b/superset-frontend/playwright/helpers/api/assertions.ts
index f07927bb9e7..a6fdb1937fe 100644
--- a/superset-frontend/playwright/helpers/api/assertions.ts
+++ b/superset-frontend/playwright/helpers/api/assertions.ts
@@ -61,6 +61,22 @@ export function expectStatusOneOf<T extends ResponseLike>(
   return response;
 }
 
+/**
+ * Extract the resource ID from a JSON response body.
+ * Handles both `{ result: { id } }` and `{ id }` shapes.
+ * @param response - Playwright Response or APIResponse object
+ * @returns The extracted numeric ID
+ */
+export async function extractIdFromResponse(
+  response: ResponseLike,
+): Promise<number> {
+  const body = await response.json();
+  const id: number = body.result?.id ?? body.id;
+  expect(typeof id, 'Response body must contain a numeric id').toBe('number');
+  expect(Number.isNaN(id), 'Response id must not be NaN').toBe(false);
+  return id;
+}
+
 interface ExportZipOptions {
   /** Directory name containing resource yaml files (e.g. 'charts', 'datasets') */
   resourceDir: string;
diff --git a/superset-frontend/playwright/helpers/api/dashboard.ts b/superset-frontend/playwright/helpers/api/dashboard.ts
index 52314a31c99..2eb8d092c0d 100644
--- a/superset-frontend/playwright/helpers/api/dashboard.ts
+++ b/superset-frontend/playwright/helpers/api/dashboard.ts
@@ -44,6 +44,7 @@ export interface DashboardCreatePayload {
   css?: string;
   json_metadata?: string;
   published?: boolean;
+  theme_id?: number;
 }
 
 /**
diff --git a/superset-frontend/playwright/helpers/api/savedQuery.ts b/superset-frontend/playwright/helpers/api/savedQuery.ts
new file mode 100644
index 00000000000..9c5a5a29d8b
--- /dev/null
+++ b/superset-frontend/playwright/helpers/api/savedQuery.ts
@@ -0,0 +1,47 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { Page, APIResponse } from '@playwright/test';
+import { apiGet, apiDelete, ApiRequestOptions } from './requests';
+
+const ENDPOINTS = {
+  SAVED_QUERY: 'api/v1/saved_query/',
+} as const;
+
+/**
+ * GET request to fetch a saved query's details
+ */
+export async function apiGetSavedQuery(
+  page: Page,
+  savedQueryId: number,
+  options?: ApiRequestOptions,
+): Promise<APIResponse> {
+  return apiGet(page, `${ENDPOINTS.SAVED_QUERY}${savedQueryId}`, options);
+}
+
+/**
+ * DELETE request to remove a saved query
+ */
+export async function apiDeleteSavedQuery(
+  page: Page,
+  savedQueryId: number,
+  options?: ApiRequestOptions,
+): Promise<APIResponse> {
+  return apiDelete(page, `${ENDPOINTS.SAVED_QUERY}${savedQueryId}`, options);
+}
diff --git a/superset-frontend/playwright/helpers/api/theme.ts b/superset-frontend/playwright/helpers/api/theme.ts
new file mode 100644
index 00000000000..1f0152fd15a
--- /dev/null
+++ b/superset-frontend/playwright/helpers/api/theme.ts
@@ -0,0 +1,62 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { Page, APIResponse } from '@playwright/test';
+import { apiPost, apiDelete, ApiRequestOptions } from './requests';
+
+export const ENDPOINTS = {
+  THEME: 'api/v1/theme/',
+} as const;
+
+/**
+ * TypeScript interface for theme creation API payload.
+ * Both fields are required (ThemePostSchema).
+ */
+export interface ThemeCreatePayload {
+  theme_name: string;
+  json_data: string;
+}
+
+/**
+ * POST request to create a theme
+ * @param page - Playwright page instance (provides authentication context)
+ * @param requestBody - Theme configuration object
+ * @returns API response from theme creation
+ */
+export async function apiPostTheme(
+  page: Page,
+  requestBody: ThemeCreatePayload,
+): Promise<APIResponse> {
+  return apiPost(page, ENDPOINTS.THEME, requestBody);
+}
+
+/**
+ * DELETE request to remove a theme
+ * @param page - Playwright page instance (provides authentication context)
+ * @param themeId - ID of the theme to delete
+ * @param options - Optional request options
+ * @returns API response from theme deletion
+ */
+export async function apiDeleteTheme(
+  page: Page,
+  themeId: number,
+  options?: ApiRequestOptions,
+): Promise<APIResponse> {
+  return apiDelete(page, `${ENDPOINTS.THEME}${themeId}`, options);
+}
diff --git a/superset-frontend/playwright/helpers/fixtures/testAssets.ts b/superset-frontend/playwright/helpers/fixtures/testAssets.ts
index ada44e5ae55..b630bbe60ad 100644
--- a/superset-frontend/playwright/helpers/fixtures/testAssets.ts
+++ b/superset-frontend/playwright/helpers/fixtures/testAssets.ts
@@ -21,7 +21,9 @@ import { test as base } from '@playwright/test';
 import { apiDeleteChart } from '../api/chart';
 import { apiDeleteDashboard } from '../api/dashboard';
 import { apiDeleteDataset } from '../api/dataset';
+import { apiDeleteTheme } from '../api/theme';
 import { apiDeleteDatabase } from '../api/database';
+import { apiDeleteSavedQuery } from '../api/savedQuery';
 
 /**
  * Test asset tracker for automatic cleanup after each test.
@@ -31,7 +33,9 @@ export interface TestAssets {
   trackDashboard(id: number): void;
   trackChart(id: number): void;
   trackDataset(id: number): void;
+  trackTheme(id: number): void;
   trackDatabase(id: number): void;
+  trackSavedQuery(id: number): void;
 }
 
 const EXPECTED_CLEANUP_STATUSES = new Set([200, 202, 204, 404]);
@@ -42,16 +46,39 @@ export const test = base.extend<{ testAssets: TestAssets }>({
     const dashboardIds = new Set<number>();
     const chartIds = new Set<number>();
     const datasetIds = new Set<number>();
+    const themeIds = new Set<number>();
     const databaseIds = new Set<number>();
+    const savedQueryIds = new Set<number>();
 
     await use({
       trackDashboard: id => dashboardIds.add(id),
       trackChart: id => chartIds.add(id),
       trackDataset: id => datasetIds.add(id),
+      trackTheme: id => themeIds.add(id),
       trackDatabase: id => databaseIds.add(id),
+      trackSavedQuery: id => savedQueryIds.add(id),
     });
 
-    // Cleanup order: dashboards → charts → datasets → databases (respects FK dependencies)
+    // Cleanup order: saved queries → dashboards → charts → datasets → themes → databases (respects FK dependencies)
+    // Saved queries have no FK dependents, so they can be cleaned up first
+    await Promise.all(
+      [...savedQueryIds].map(id =>
+        apiDeleteSavedQuery(page, id, { failOnStatusCode: false })
+          .then(response => {
+            if (!EXPECTED_CLEANUP_STATUSES.has(response.status())) {
+              console.warn(
+                `[testAssets] Unexpected status ${response.status()} cleaning up saved query ${id}`,
+              );
+            }
+          })
+          .catch(error => {
+            console.warn(
+              `[testAssets] Failed to cleanup saved query ${id}:`,
+              error,
+            );
+          }),
+      ),
+    );
     // Use failOnStatusCode: false to avoid throwing on 404 (resource already deleted by test)
     // Warn on unexpected status codes (401/403/500) that may indicate leaked state
     await Promise.all(
@@ -105,6 +132,21 @@ export const test = base.extend<{ testAssets: TestAssets }>({
           }),
       ),
     );
+    await Promise.all(
+      [...themeIds].map(id =>
+        apiDeleteTheme(page, id, { failOnStatusCode: false })
+          .then(response => {
+            if (!EXPECTED_CLEANUP_STATUSES.has(response.status())) {
+              console.warn(
+                `[testAssets] Unexpected status ${response.status()} cleaning up theme ${id}`,
+              );
+            }
+          })
+          .catch(error => {
+            console.warn(`[testAssets] Failed to cleanup theme ${id}:`, error);
+          }),
+      ),
+    );
     await Promise.all(
       [...databaseIds].map(id =>
         apiDeleteDatabase(page, id, { failOnStatusCode: false })
diff --git a/superset-frontend/playwright/pages/AuthPage.ts b/superset-frontend/playwright/pages/AuthPage.ts
index 2cb5157e144..397e2a82df1 100644
--- a/superset-frontend/playwright/pages/AuthPage.ts
+++ b/superset-frontend/playwright/pages/AuthPage.ts
@@ -50,7 +50,9 @@ export class AuthPage {
    * Navigate to the login page
    */
   async goto(): Promise<void> {
-    await this.page.goto(URL.LOGIN);
+    // Use domcontentloaded — the login form is server-rendered and ready before
+    // all assets load. The default 'load' event may never fire with HMR WebSocket.
+    await this.page.goto(URL.LOGIN, { waitUntil: 'domcontentloaded' });
   }
 
   /**
diff --git a/superset-frontend/playwright/pages/ChartListPage.ts b/superset-frontend/playwright/pages/ChartListPage.ts
index 74f75181d24..49c3578cfb1 100644
--- a/superset-frontend/playwright/pages/ChartListPage.ts
+++ b/superset-frontend/playwright/pages/ChartListPage.ts
@@ -47,7 +47,7 @@ export class ChartListPage {
   }
 
   /**
-   * Navigate to the chart list page.
+   * Navigate to the chart list page in table view.
    * Forces table view via URL parameter to avoid card view default
    * (ListviewsDefaultCardView feature flag may enable card view).
    */
@@ -55,6 +55,13 @@ export class ChartListPage {
     await this.page.goto(`${URL.CHART_LIST}?viewMode=table`);
   }
 
+  /**
+   * Navigate to the chart list page in card view.
+   */
+  async gotoCardView(): Promise<void> {
+    await this.page.goto(`${URL.CHART_LIST}?viewMode=card`);
+  }
+
   /**
    * Wait for the table to load
    * @param options - Optional wait options
@@ -63,6 +70,16 @@ export class ChartListPage {
     await this.table.waitForVisible(options);
   }
 
+  /**
+   * Wait for card view to finish loading.
+   */
+  async waitForCardLoad(options?: { timeout?: number }): Promise<void> {
+    await this.page
+      .locator('[data-test="styled-card"]')
+      .first()
+      .waitFor({ state: 'visible', ...options });
+  }
+
   /**
    * Gets a chart row locator by name.
    * Returns a Locator that tests can use with expect().toBeVisible(), etc.
@@ -129,4 +146,24 @@ export class ChartListPage {
   async clickBulkAction(actionName: string): Promise<void> {
     await this.bulkSelect.clickAction(actionName);
   }
+
+  // --- Card view methods ---
+
+  /**
+   * Gets a chart card locator by name (card view).
+   */
+  getChartCard(chartName: string): Locator {
+    return this.page
+      .locator('[data-test="styled-card"]')
+      .filter({ hasText: chartName });
+  }
+
+  /**
+   * Clicks the edit option in a chart card's dropdown menu (card view).
+   */
+  async clickCardEditAction(chartName: string): Promise<void> {
+    const card = this.getChartCard(chartName);
+    await card.locator('[aria-label="more"]').click();
+    await this.page.locator('[data-test="chart-list-edit-option"]').click();
+  }
 }
diff --git a/superset-frontend/playwright/pages/SqlLabPage.ts b/superset-frontend/playwright/pages/SqlLabPage.ts
new file mode 100644
index 00000000000..9c582fc73a7
--- /dev/null
+++ b/superset-frontend/playwright/pages/SqlLabPage.ts
@@ -0,0 +1,371 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { Page, Locator, Response } from '@playwright/test';
+import { AceEditor } from '../components/core/AceEditor';
+import { AgGrid } from '../components/core/AgGrid';
+import { Button } from '../components/core/Button';
+import { EditableTabs } from '../components/core/EditableTabs';
+import { Popover } from '../components/core/Popover';
+import { Select } from '../components/core/Select';
+import { waitForPost } from '../helpers/api/intercepts';
+import { URL } from '../utils/urls';
+import { TIMEOUT } from '../utils/constants';
+
+/**
+ * Page object for SQL Lab.
+ *
+ * Selectors verified against source code — see plan for line references.
+ */
+export class SqlLabPage {
+  private readonly page: Page;
+  private readonly editorTabs: EditableTabs;
+
+  private static readonly SELECTORS = {
+    SQL_EDITOR_TABS: '[data-test="sql-editor-tabs"]',
+    ADD_TAB_ICON: '[data-test="add-tab-icon"]',
+    RUN_QUERY_BUTTON: '[data-test="run-query-action"]',
+    SOUTH_PANE: '[data-test="south-pane"]',
+    EXPLORE_RESULTS_BUTTON: '[data-test="explore-results-button"]',
+    SAVE_BUTTON: 'button[aria-label="Save"]',
+    ACE_EDITOR: '.ace_editor',
+    LEFT_BAR: '[data-test="sql-editor-left-bar"]',
+    DATABASE_SELECTOR: '[data-test="DatabaseSelector"]',
+    LIMIT_DROPDOWN: '.limitDropdown',
+    SAVE_DATASET_BUTTON: 'button[aria-label="Save dataset"]',
+  } as const;
+
+  constructor(page: Page) {
+    this.page = page;
+    this.editorTabs = new EditableTabs(
+      page,
+      page.locator(SqlLabPage.SELECTORS.SQL_EDITOR_TABS),
+    );
+  }
+
+  // ── Navigation ──
+
+  async goto(): Promise<void> {
+    await this.page.goto(URL.SQLLAB, { waitUntil: 'domcontentloaded' });
+  }
+
+  async waitForPageLoad(options?: { timeout?: number }): Promise<void> {
+    // SQL Lab with dev server can be slow on first load (webpack HMR + React hydration)
+    const timeout = options?.timeout ?? TIMEOUT.QUERY_EXECUTION;
+    await this.editorTabs.element.waitFor({ state: 'visible', timeout });
+  }
+
+  /**
+   * Navigate to SQL Lab and wait until the editor is ready.
+   * Convenience method combining goto + waitForPageLoad + ensureEditorReady.
+   */
+  async gotoAndReady(): Promise<void> {
+    await this.goto();
+    await this.waitForPageLoad();
+    await this.ensureEditorReady();
+  }
+
+  /**
+   * Ensures at least one query editor tab exists. Creates one if SQL Lab
+   * is in the empty state ("Add a new tab to create SQL Query").
+   * Waits for the ace editor to be ready before returning.
+   *
+   * Uses a two-stage check to handle three states correctly:
+   * 1. Empty state (CI): type="card" with 0 queryEditors, no editor → create tab
+   * 2. Loading after reload: real tabs exist, editor hasn't mounted yet → just wait
+   * 3. Normal: tabs + editor present → ready immediately
+   *
+   * Stage 1 checks editor presence (catches empty + loading).
+   * Stage 2 checks the Ant Design tabs type to distinguish real tabs
+   * (type="editable-card") from the empty state (type="card"). The React
+   * source (TabbedSqlEditors) sets type based on queryEditors.length,
+   * so this directly reflects whether persisted tabs exist.
+   */
+  async ensureEditorReady(): Promise<void> {
+    // Page-global check: are there ANY editors in the DOM (any tab)?
+    const anyEditor = this.page.locator(SqlLabPage.SELECTORS.ACE_EDITOR);
+    let tabSyncPromise: Promise<Response> | null = null;
+
+    if ((await anyEditor.count()) === 0) {
+      // No editor visible. Check if real query editors exist (editable-card)
+      // or if this is the empty state (card type, 0 queryEditors).
+      // type="editable-card" → queryEditors.length > 0 (even 1 real tab).
+      // type="card" → queryEditors.length === 0 (true empty state).
+      const isEditableCard = await this.editorTabs.element.evaluate(el =>
+        el.classList.contains('ant-tabs-editable-card'),
+      );
+      if (!isEditableCard) {
+        // Register before clicking — EditorAutoSync POSTs the new tab
+        // within its 5 s interval, so capture it before any await.
+        tabSyncPromise = waitForPost(this.page, /tabstateview\/?$/, {
+          timeout: 10_000,
+        });
+        // True empty state — click add-tab icon (works in card mode)
+        await this.editorTabs.element
+          .locator(SqlLabPage.SELECTORS.ADD_TAB_ICON)
+          .first()
+          .click();
+      }
+      // If editable-card: real tabs exist, editor is still mounting — just wait
+    }
+
+    // Wait for the editor in the ACTIVE panel, not page-global .first().
+    // In persisted multi-tab sessions, .first() can resolve to a hidden
+    // inactive editor. activePanel scopes to the visible tab panel.
+    await this.activePanel
+      .locator(SqlLabPage.SELECTORS.ACE_EDITOR)
+      .waitFor({ state: 'visible' });
+    await this.editor.waitForReady();
+
+    // If we created the initial tab, wait for its backend sync to complete.
+    // This prevents later waitForPost calls from accidentally matching
+    // this tab's creation POST instead of a subsequent tab's.
+    if (tabSyncPromise) {
+      await tabSyncPromise;
+    }
+  }
+
+  // ── Active Tab Panel ──
+
+  /**
+   * Gets the active tab panel. Ant Design keeps inactive tab panels mounted
+   * but sets aria-hidden="true" on them. Using :not([aria-hidden="true"])
+   * is more reliable than :visible during tab-switch animations where both
+   * panels may briefly have non-zero dimensions.
+   */
+  private get activePanel(): Locator {
+    return this.page
+      .locator('[role="tabpanel"]:not([aria-hidden="true"])')
+      .filter({ has: this.page.locator(SqlLabPage.SELECTORS.ACE_EDITOR) });
+  }
+
+  // ── Elements ──
+
+  get editor(): AceEditor {
+    return new AceEditor(
+      this.page,
+      this.activePanel.locator(SqlLabPage.SELECTORS.ACE_EDITOR),
+    );
+  }
+
+  get resultsGrid(): AgGrid {
+    return new AgGrid(
+      this.page,
+      this.activePanel
+        .locator(SqlLabPage.SELECTORS.SOUTH_PANE)
+        .locator('[role="grid"]'),
+    );
+  }
+
+  get resultsPane(): Locator {
+    return this.activePanel.locator(SqlLabPage.SELECTORS.SOUTH_PANE);
+  }
+
+  get errorAlert(): Locator {
+    return this.resultsPane.locator('.ant-alert-error');
+  }
+
+  get databaseSelector(): Button {
+    return new Button(
+      this.page,
+      this.page.locator(
+        `${SqlLabPage.SELECTORS.LEFT_BAR} ${SqlLabPage.SELECTORS.DATABASE_SELECTOR}`,
+      ),
+    );
+  }
+
+  get runQueryButton(): Button {
+    return new Button(
+      this.page,
+      this.activePanel.locator(SqlLabPage.SELECTORS.RUN_QUERY_BUTTON),
+    );
+  }
+
+  get saveButton(): Button {
+    return new Button(
+      this.page,
+      this.activePanel.locator(SqlLabPage.SELECTORS.SAVE_BUTTON),
+    );
+  }
+
+  get saveDatasetButton(): Button {
+    return new Button(
+      this.page,
+      this.activePanel.locator(SqlLabPage.SELECTORS.SAVE_DATASET_BUTTON),
+    );
+  }
+
+  get createChartButton(): Button {
+    return new Button(
+      this.page,
+      this.activePanel.locator(SqlLabPage.SELECTORS.EXPLORE_RESULTS_BUTTON),
+    );
+  }
+
+  // ── Editor Convenience ──
+
+  async setQuery(sql: string): Promise<void> {
+    await this.editor.setText(sql);
+  }
+
+  async getQuery(): Promise<string> {
+    return this.editor.getText();
+  }
+
+  // ── Tab Management ──
+
+  async getTabCount(): Promise<number> {
+    return this.editorTabs.getTabCount();
+  }
+
+  async getTabNames(): Promise<string[]> {
+    return this.editorTabs.getTabNames();
+  }
+
+  async getActiveTabName(): Promise<string> {
+    return this.editorTabs.getActiveTabName();
+  }
+
+  async addTab(): Promise<void> {
+    await this.editorTabs.addTab();
+  }
+
+  async addTabByShortcut(): Promise<void> {
+    const modifier = process.platform === 'win32' ? 'Control+q' : 'Control+t';
+    await this.page.keyboard.press(modifier);
+  }
+
+  async closeLastTab(): Promise<void> {
+    const countBefore = await this.getTabCount();
+    await this.editorTabs.removeLastTab();
+    // Wait for tab count to decrease
+    await this.page.waitForFunction(
+      ([selector, expected]) => {
+        const container = document.querySelector(selector);
+        if (!container) return false;
+        const nav = container.querySelector(':scope > .ant-tabs-nav');
+        if (!nav) return false;
+        return nav.querySelectorAll('.ant-tabs-tab').length === expected;
+      },
+      [SqlLabPage.SELECTORS.SQL_EDITOR_TABS, countBefore - 1] as const,
+      { timeout: TIMEOUT.UI_TRANSITION },
+    );
+  }
+
+  getTab(name: string): Locator {
+    return this.editorTabs.getTab(name);
+  }
+
+  // ── Database Selection (Left Sidebar) ──
+
+  async selectDatabase(dbName: string): Promise<void> {
+    await this.databaseSelector.click();
+
+    const popover = new Popover(this.page);
+    await popover.waitForVisible();
+
+    // Target the .ant-select wrapper (not the combobox input) because the
+    // selection-item overlay intercepts pointer events on the input.
+    const dbSelect = popover.element
+      .locator(SqlLabPage.SELECTORS.DATABASE_SELECTOR)
+      .locator('.ant-select')
+      .first();
+    const select = new Select(this.page, dbSelect);
+    await select.selectOption(dbName);
+
+    await popover.getButton('Select').click();
+    await popover
+      .waitForHidden({ timeout: TIMEOUT.UI_TRANSITION })
+      .catch(error => {
+        if (!(error instanceof Error) || error.name !== 'TimeoutError') {
+          throw error;
+        }
+      });
+  }
+
+  // ── Query Execution ──
+
+  /**
+   * Sets SQL, runs the query, and waits for the API response.
+   * Also observes the QueryStatusBar (.ant-steps) loading indicator to
+   * confirm the UI entered the execution cycle — this unmounts the old
+   * results grid, so waitForQueryResults() can trust that any grid it
+   * finds afterward contains data from THIS execution.
+   */
+  async executeQuery(sql: string): Promise<Response> {
+    await this.setQuery(sql);
+    const responsePromise = waitForPost(this.page, 'api/v1/sqllab/execute/', {
+      timeout: TIMEOUT.QUERY_EXECUTION,
+    });
+    // Start observing the loading indicator BEFORE clicking Run so we
+    // catch it even for fast queries. QueryStatusBar (.ant-steps) appears
+    // when SQL Lab enters the running state and unmounts the results grid.
+    const loadingStarted = this.resultsPane
+      .locator('.ant-steps')
+      .waitFor({ state: 'visible', timeout: TIMEOUT.QUERY_EXECUTION });
+    await this.runQueryButton.click();
+    const [, response] = await Promise.all([loadingStarted, responsePromise]);
+    return response;
+  }
+
+  /**
+   * Wait for fresh query results to render in the AG Grid.
+   * Waits for the QueryStatusBar to disappear first, proving the execution
+   * cycle completed and React rendered the post-query grid.
+   * @param expectHeader - A column header that must be visible before returning.
+   * @param options.timeout - How long to wait (default: TIMEOUT.QUERY_EXECUTION)
+   */
+  async waitForQueryResults(
+    expectHeader: string,
+    options?: { timeout?: number },
+  ): Promise<void> {
+    const timeout = options?.timeout ?? TIMEOUT.QUERY_EXECUTION;
+    // Wait for QueryStatusBar to disappear — proves the loading → ready
+    // transition completed. If already hidden (fast query finished before
+    // this call), resolves immediately since executeQuery() already observed
+    // the loading state appear.
+    await this.resultsPane
+      .locator('.ant-steps')
+      .waitFor({ state: 'hidden', timeout });
+    const grid = this.resultsGrid.element;
+    await grid.waitFor({ state: 'visible', timeout });
+    await grid
+      .locator('.ag-header-cell', { hasText: expectHeader })
+      .first()
+      .waitFor({ state: 'visible', timeout });
+  }
+
+  // ── Row Limit ──
+
+  async getRowLimit(): Promise<string> {
+    const text = await this.activePanel
+      .locator(SqlLabPage.SELECTORS.LIMIT_DROPDOWN)
+      .textContent();
+    return text?.trim() ?? '';
+  }
+
+  /**
+   * Set the row limit via the Limit dropdown in the active panel.
+   * @param limit - The menu item label to select (e.g., "10", "100")
+   */
+  async setRowLimit(limit: string): Promise<void> {
+    await this.activePanel.locator(SqlLabPage.SELECTORS.LIMIT_DROPDOWN).click();
+    await this.page.getByRole('menuitem', { name: limit, exact: true }).click();
+  }
+}
diff --git a/superset-frontend/playwright/tests/auth/login.spec.ts b/superset-frontend/playwright/tests/auth/login.spec.ts
index 38fd48ee957..003e36f94a1 100644
--- a/superset-frontend/playwright/tests/auth/login.spec.ts
+++ b/superset-frontend/playwright/tests/auth/login.spec.ts
@@ -44,25 +44,18 @@ test.beforeEach(async ({ page }) => {
 test('should redirect to login with incorrect username and password', async ({
   page,
 }) => {
-  // Setup request interception before login attempt
-  const loginRequestPromise = authPage.waitForLoginRequest();
+  // The form submission is async (SupersetClient.postForm uses ensureAuth)
+  // so listen for the page reload before triggering the login
+  await Promise.all([
+    page.waitForEvent('load', { timeout: TIMEOUT.PAGE_LOAD }),
+    authPage.loginWithCredentials('wronguser', 'wrongpassword'),
+  ]);
 
-  // Attempt login with incorrect credentials (both username and password invalid)
-  await authPage.loginWithCredentials('wronguser', 'wrongpassword');
-
-  // Wait for login request and verify response
-  const loginResponse = await loginRequestPromise;
-  // Failed login returns 401 Unauthorized or 302 redirect to login
-  expect([401, 302]).toContain(loginResponse.status());
-
-  // Wait for redirect to complete before checking URL
-  await page.waitForURL(url => url.pathname.endsWith(URL.LOGIN), {
-    timeout: TIMEOUT.PAGE_LOAD,
-  });
+  // After the reload, wait for the React login form to render
+  await authPage.waitForLoginForm();
 
   // Verify we stay on login page
-  const currentUrl = await authPage.getCurrentUrl();
-  expect(currentUrl).toContain(URL.LOGIN);
+  expect(page.url()).toContain(URL.LOGIN);
 
   // Verify error message is shown
   const hasError = await authPage.hasLoginError();
@@ -70,16 +63,12 @@ test('should redirect to login with incorrect username and password', async ({
 });
 
 test('should login with correct username and password', async ({ page }) => {
-  // Setup request interception before login attempt
-  const loginRequestPromise = authPage.waitForLoginRequest();
-
   // Login with correct credentials
   await authPage.loginWithCredentials(adminUsername, adminPassword);
 
-  // Wait for login request and verify response
-  const loginResponse = await loginRequestPromise;
-  // Successful login returns 302 redirect
-  expect(loginResponse.status()).toBe(302);
+  // Use waitForLoginSuccess (proven in global-setup) — guards against race
+  // conditions with cookie check before falling back to response interception
+  await authPage.waitForLoginSuccess({ timeout: TIMEOUT.PAGE_LOAD });
 
   // Wait for successful redirect to welcome page
   await page.waitForURL(url => url.pathname.endsWith(URL.WELCOME), {
diff --git a/superset-frontend/playwright/tests/experimental/chart/chart-list.spec.ts b/superset-frontend/playwright/tests/chart/chart-list.spec.ts
similarity index 79%
rename from superset-frontend/playwright/tests/experimental/chart/chart-list.spec.ts
rename to superset-frontend/playwright/tests/chart/chart-list.spec.ts
index b1476db4f8f..57f7b2dd2ea 100644
--- a/superset-frontend/playwright/tests/experimental/chart/chart-list.spec.ts
+++ b/superset-frontend/playwright/tests/chart/chart-list.spec.ts
@@ -17,21 +17,20 @@
  * under the License.
  */
 
+import { testWithAssets, expect } from '../../helpers/fixtures';
+import { ChartListPage } from '../../pages/ChartListPage';
 import {
-  test as testWithAssets,
-  expect,
-} from '../../../helpers/fixtures/testAssets';
-import { ChartListPage } from '../../../pages/ChartListPage';
-import { ChartPropertiesModal } from '../../../components/modals/ChartPropertiesModal';
-import { DeleteConfirmationModal } from '../../../components/modals/DeleteConfirmationModal';
-import { Toast } from '../../../components/core/Toast';
-import { apiGetChart, ENDPOINTS } from '../../../helpers/api/chart';
+  ChartPropertiesModal,
+  DeleteConfirmationModal,
+} from '../../components/modals';
+import { Toast } from '../../components/core';
+import { apiGetChart, ENDPOINTS } from '../../helpers/api/chart';
 import { createTestChart } from './chart-test-helpers';
-import { waitForGet, waitForPut } from '../../../helpers/api/intercepts';
+import { waitForGet, waitForPut } from '../../helpers/api/intercepts';
 import {
   expectStatusOneOf,
   expectValidExportZip,
-} from '../../../helpers/api/assertions';
+} from '../../helpers/api/assertions';
 
 /**
  * Extend testWithAssets with chartListPage navigation (beforeEach equivalent).
@@ -261,6 +260,60 @@ test('should bulk delete multiple charts', async ({
   }
 });
 
+test('should edit chart name from card view', async ({ page, testAssets }) => {
+  // Create throwaway chart for editing
+  const { id: chartId, name: chartName } = await createTestChart(
+    page,
+    testAssets,
+    test.info(),
+    { prefix: 'test_card_edit' },
+  );
+
+  // Navigate to card view (not table view)
+  const cardListPage = new ChartListPage(page);
+  await cardListPage.gotoCardView();
+  await cardListPage.waitForCardLoad();
+
+  // Verify chart card is visible
+  await expect(cardListPage.getChartCard(chartName)).toBeVisible();
+
+  // Open card dropdown and click edit
+  await cardListPage.clickCardEditAction(chartName);
+
+  // Wait for properties modal to be ready
+  const propertiesModal = new ChartPropertiesModal(page);
+  await propertiesModal.waitForReady();
+
+  // Edit the chart name
+  const newName = `card_renamed_${Date.now()}_${test.info().parallelIndex}`;
+  await propertiesModal.fillName(newName);
+
+  // Set up response intercept for save
+  const saveResponsePromise = waitForPut(page, `${ENDPOINTS.CHART}${chartId}`);
+
+  // Click Save button
+  await propertiesModal.clickSave();
+
+  // Wait for save to complete and verify success
+  expectStatusOneOf(await saveResponsePromise, [200, 201]);
+
+  // Modal should close
+  await propertiesModal.waitForHidden();
+
+  // Verify success toast appears
+  const toast = new Toast(page);
+  await expect(toast.getSuccess()).toBeVisible();
+
+  // Verify the renamed card appears in card view and old name is gone
+  await expect(cardListPage.getChartCard(newName)).toBeVisible();
+  await expect(cardListPage.getChartCard(chartName)).not.toBeVisible();
+
+  // Backend verification: API returns updated name
+  const response = await apiGetChart(page, chartId);
+  const chart = (await response.json()).result;
+  expect(chart.slice_name).toBe(newName);
+});
+
 test('should bulk export multiple charts', async ({
   page,
   chartListPage,
diff --git a/superset-frontend/playwright/tests/experimental/chart/chart-test-helpers.ts b/superset-frontend/playwright/tests/chart/chart-test-helpers.ts
similarity index 92%
rename from superset-frontend/playwright/tests/experimental/chart/chart-test-helpers.ts
rename to superset-frontend/playwright/tests/chart/chart-test-helpers.ts
index fa0dc55e036..5cae0d5f58f 100644
--- a/superset-frontend/playwright/tests/experimental/chart/chart-test-helpers.ts
+++ b/superset-frontend/playwright/tests/chart/chart-test-helpers.ts
@@ -18,9 +18,9 @@
  */
 
 import type { Page, TestInfo } from '@playwright/test';
-import type { TestAssets } from '../../../helpers/fixtures/testAssets';
-import { apiPostChart } from '../../../helpers/api/chart';
-import { getDatasetByName } from '../../../helpers/api/dataset';
+import type { TestAssets } from '../../helpers/fixtures';
+import { apiPostChart } from '../../helpers/api/chart';
+import { getDatasetByName } from '../../helpers/api/dataset';
 
 interface TestChartResult {
   id: number;
diff --git a/superset-frontend/playwright/tests/experimental/dashboard/dashboard-list.spec.ts b/superset-frontend/playwright/tests/dashboard/dashboard-list.spec.ts
similarity index 95%
rename from superset-frontend/playwright/tests/experimental/dashboard/dashboard-list.spec.ts
rename to superset-frontend/playwright/tests/dashboard/dashboard-list.spec.ts
index 0ed0c49769d..a305b65ffa0 100644
--- a/superset-frontend/playwright/tests/experimental/dashboard/dashboard-list.spec.ts
+++ b/superset-frontend/playwright/tests/dashboard/dashboard-list.spec.ts
@@ -17,28 +17,27 @@
  * under the License.
  */
 
+import { testWithAssets, expect } from '../../helpers/fixtures';
+import { DashboardListPage } from '../../pages/DashboardListPage';
 import {
-  test as testWithAssets,
-  expect,
-} from '../../../helpers/fixtures/testAssets';
-import { DashboardListPage } from '../../../pages/DashboardListPage';
-import { DeleteConfirmationModal } from '../../../components/modals/DeleteConfirmationModal';
-import { ImportDatasetModal } from '../../../components/modals/ImportDatasetModal';
-import { Toast } from '../../../components/core/Toast';
+  DeleteConfirmationModal,
+  ImportDatasetModal,
+} from '../../components/modals';
+import { Toast } from '../../components/core';
 import {
   apiGetDashboard,
   apiDeleteDashboard,
   apiExportDashboards,
   getDashboardByName,
   ENDPOINTS,
-} from '../../../helpers/api/dashboard';
+} from '../../helpers/api/dashboard';
 import { createTestDashboard } from './dashboard-test-helpers';
-import { waitForGet, waitForPost } from '../../../helpers/api/intercepts';
+import { waitForGet, waitForPost } from '../../helpers/api/intercepts';
 import {
   expectStatusOneOf,
   expectValidExportZip,
-} from '../../../helpers/api/assertions';
-import { TIMEOUT } from '../../../utils/constants';
+} from '../../helpers/api/assertions';
+import { TIMEOUT } from '../../utils/constants';
 
 /**
  * Extend testWithAssets with dashboardListPage navigation (beforeEach equivalent).
diff --git a/superset-frontend/playwright/tests/experimental/dashboard/dashboard-test-helpers.ts b/superset-frontend/playwright/tests/dashboard/dashboard-test-helpers.ts
similarity index 93%
rename from superset-frontend/playwright/tests/experimental/dashboard/dashboard-test-helpers.ts
rename to superset-frontend/playwright/tests/dashboard/dashboard-test-helpers.ts
index fcbb07601eb..9f45661342e 100644
--- a/superset-frontend/playwright/tests/experimental/dashboard/dashboard-test-helpers.ts
+++ b/superset-frontend/playwright/tests/dashboard/dashboard-test-helpers.ts
@@ -18,8 +18,8 @@
  */
 
 import type { Page, TestInfo } from '@playwright/test';
-import type { TestAssets } from '../../../helpers/fixtures/testAssets';
-import { apiPostDashboard } from '../../../helpers/api/dashboard';
+import type { TestAssets } from '../../helpers/fixtures';
+import { apiPostDashboard } from '../../helpers/api/dashboard';
 
 interface TestDashboardResult {
   id: number;
diff --git a/superset-frontend/playwright/tests/experimental/dashboard/export.spec.ts b/superset-frontend/playwright/tests/dashboard/export.spec.ts
similarity index 94%
rename from superset-frontend/playwright/tests/experimental/dashboard/export.spec.ts
rename to superset-frontend/playwright/tests/dashboard/export.spec.ts
index 992aaca5097..1687bf2ecac 100644
--- a/superset-frontend/playwright/tests/experimental/dashboard/export.spec.ts
+++ b/superset-frontend/playwright/tests/dashboard/export.spec.ts
@@ -18,9 +18,9 @@
  */
 
 import { test, expect } from '@playwright/test';
-import { DashboardPage } from '../../../pages/DashboardPage';
-import { Toast } from '../../../components/core';
-import { TIMEOUT } from '../../../utils/constants';
+import { DashboardPage } from '../../pages/DashboardPage';
+import { Toast } from '../../components/core';
+import { TIMEOUT } from '../../utils/constants';
 
 /**
  * Dashboard Export E2E tests.
diff --git a/superset-frontend/playwright/tests/dashboard/theme.spec.ts b/superset-frontend/playwright/tests/dashboard/theme.spec.ts
new file mode 100644
index 00000000000..79d431cb85c
--- /dev/null
+++ b/superset-frontend/playwright/tests/dashboard/theme.spec.ts
@@ -0,0 +1,152 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { test, expect } from '@playwright/test';
+import { AuthPage } from '../../pages/AuthPage';
+import { DashboardPage } from '../../pages/DashboardPage';
+import { apiPostTheme, apiDeleteTheme } from '../../helpers/api/theme';
+import {
+  apiPostDashboard,
+  apiPutDashboard,
+  apiDeleteDashboard,
+} from '../../helpers/api/dashboard';
+import { apiGet } from '../../helpers/api/requests';
+import { TIMEOUT } from '../../utils/constants';
+
+/**
+ * Dashboard Theme E2E tests.
+ *
+ * Prerequisites:
+ * - Superset running with example data loaded
+ * - Admin user authenticated (via global-setup)
+ * - Non-admin test user created by `superset load-test-users`
+ *
+ * Credentials are configurable via environment variables:
+ * - PLAYWRIGHT_NONADMIN_USERNAME (default: 'gamma')
+ * - PLAYWRIGHT_NONADMIN_PASSWORD (default: 'general')
+ */
+
+const NONADMIN_USERNAME = process.env.PLAYWRIGHT_NONADMIN_USERNAME || 'gamma';
+const NONADMIN_PASSWORD = process.env.PLAYWRIGHT_NONADMIN_PASSWORD || 'general';
+
+// Clear storageState so the default page fixture starts unauthenticated.
+// Admin API calls use an explicit admin context with saved auth instead.
+test.use({ storageState: { cookies: [], origins: [] } });
+
+test('non-admin user can view a themed dashboard without 403 or infinite spinner', async ({
+  page,
+  browser,
+}) => {
+  test.setTimeout(60_000);
+
+  // --- ADMIN SETUP (explicit admin context with saved auth) ---
+  const adminContext = await browser.newContext({
+    baseURL: test.info().project.use.baseURL,
+    storageState: 'playwright/.auth/user.json',
+  });
+  const adminPage = await adminContext.newPage();
+
+  let themeId: number | undefined;
+  let dashboardId: number | undefined;
+
+  try {
+    // 1. Create a theme
+    const themeRes = await apiPostTheme(adminPage, {
+      theme_name: `e2e_theme_test_${Date.now()}`,
+      json_data: '{}',
+    });
+    expect(themeRes.ok()).toBe(true);
+    const themeBody = await themeRes.json();
+    themeId = themeBody.id;
+    expect(themeId).toBeTruthy();
+
+    // 2. Create a published dashboard with the theme assigned
+    const dashRes = await apiPostDashboard(adminPage, {
+      dashboard_title: `E2E Theme Test ${Date.now()}`,
+      published: true,
+      theme_id: themeId,
+    });
+    expect(dashRes.ok()).toBe(true);
+    const dashBody = await dashRes.json();
+    dashboardId = dashBody.id;
+    expect(dashboardId).toBeTruthy();
+
+    // 3. Grant non-admin user access by adding them as a dashboard owner
+    const usersRes = await apiGet(
+      adminPage,
+      `api/v1/dashboard/related/owners?q=(filter:'${NONADMIN_USERNAME}')`,
+    );
+    expect(usersRes.ok()).toBe(true);
+    const usersBody = await usersRes.json();
+    const gammaUserId = usersBody.result?.[0]?.value;
+    expect(gammaUserId).toBeTruthy();
+    const putRes = await apiPutDashboard(adminPage, dashboardId!, {
+      owners: [gammaUserId],
+    });
+    expect(putRes.ok()).toBe(true);
+
+    // --- NON-ADMIN USER PHASE (page has no cached auth via test.use) ---
+
+    // 4. Instrument network: track any /api/v1/theme/ requests and 403 responses
+    const themeApiRequests: string[] = [];
+    const forbiddenResponses: string[] = [];
+    page.on('response', response => {
+      const url = response.url();
+      if (url.includes('/api/v1/theme/')) {
+        themeApiRequests.push(url);
+      }
+      if (response.status() === 403 && url.includes('/api/v1/theme/')) {
+        forbiddenResponses.push(url);
+      }
+    });
+
+    // 5. Login as non-admin user
+    const authPage = new AuthPage(page);
+    await authPage.goto();
+    await authPage.waitForLoginForm();
+    await authPage.loginWithCredentials(NONADMIN_USERNAME, NONADMIN_PASSWORD);
+    await authPage.waitForLoginSuccess();
+
+    // 6. Navigate to the themed dashboard
+    const dashboardPage = new DashboardPage(page);
+    await dashboardPage.gotoById(dashboardId!);
+
+    // 7. Assert dashboard fully loads (not stuck on infinite spinner)
+    await dashboardPage.waitForLoad({ timeout: TIMEOUT.PAGE_LOAD });
+    await dashboardPage.waitForChartsToLoad();
+
+    // 8. Assert no /api/v1/theme/ requests were made (theme data comes from dashboard response)
+    expect(themeApiRequests).toHaveLength(0);
+    // Assert no 403 responses on /api/v1/theme/ (scoped to avoid login/unrelated 403 noise)
+    expect(forbiddenResponses).toHaveLength(0);
+  } finally {
+    // Cleanup: delete test resources using admin context
+    if (dashboardId) {
+      await apiDeleteDashboard(adminPage, dashboardId, {
+        failOnStatusCode: false,
+      }).catch(() => {});
+    }
+    if (themeId) {
+      await apiDeleteTheme(adminPage, themeId, {
+        failOnStatusCode: false,
+      }).catch(() => {});
+    }
+    await adminContext.close();
+  }
+});
diff --git a/superset-frontend/playwright/tests/experimental/dataset/create-dataset.spec.ts b/superset-frontend/playwright/tests/dataset/create-dataset.spec.ts
similarity index 91%
rename from superset-frontend/playwright/tests/experimental/dataset/create-dataset.spec.ts
rename to superset-frontend/playwright/tests/dataset/create-dataset.spec.ts
index 4250ddcb674..a1a69e54a93 100644
--- a/superset-frontend/playwright/tests/experimental/dataset/create-dataset.spec.ts
+++ b/superset-frontend/playwright/tests/dataset/create-dataset.spec.ts
@@ -17,17 +17,17 @@
  * under the License.
  */
 
-import { test, expect } from '../../../helpers/fixtures/testAssets';
-import type { TestAssets } from '../../../helpers/fixtures/testAssets';
+import { testWithAssets as test, expect } from '../../helpers/fixtures';
+import type { TestAssets } from '../../helpers/fixtures';
 import type { Page, TestInfo } from '@playwright/test';
-import { ExplorePage } from '../../../pages/ExplorePage';
-import { CreateDatasetPage } from '../../../pages/CreateDatasetPage';
-import { DatasetListPage } from '../../../pages/DatasetListPage';
-import { ChartCreationPage } from '../../../pages/ChartCreationPage';
-import { ENDPOINTS } from '../../../helpers/api/dataset';
-import { waitForPost } from '../../../helpers/api/intercepts';
-import { expectStatusOneOf } from '../../../helpers/api/assertions';
-import { apiPostDatabase } from '../../../helpers/api/database';
+import { ExplorePage } from '../../pages/ExplorePage';
+import { CreateDatasetPage } from '../../pages/CreateDatasetPage';
+import { DatasetListPage } from '../../pages/DatasetListPage';
+import { ChartCreationPage } from '../../pages/ChartCreationPage';
+import { ENDPOINTS } from '../../helpers/api/dataset';
+import { waitForPost } from '../../helpers/api/intercepts';
+import { expectStatusOneOf } from '../../helpers/api/assertions';
+import { apiPostDatabase } from '../../helpers/api/database';
 
 interface GsheetsSetupResult {
   sheetName: string;
diff --git a/superset-frontend/playwright/tests/experimental/dataset/dataset-list.spec.ts b/superset-frontend/playwright/tests/dataset/dataset-list.spec.ts
similarity index 92%
rename from superset-frontend/playwright/tests/experimental/dataset/dataset-list.spec.ts
rename to superset-frontend/playwright/tests/dataset/dataset-list.spec.ts
index a31e6db4e98..d9b781507ea 100644
--- a/superset-frontend/playwright/tests/experimental/dataset/dataset-list.spec.ts
+++ b/superset-frontend/playwright/tests/dataset/dataset-list.spec.ts
@@ -17,37 +17,36 @@
  * under the License.
  */
 
-import {
-  test as testWithAssets,
-  expect,
-} from '../../../helpers/fixtures/testAssets';
+import { testWithAssets, expect } from '../../helpers/fixtures';
 import path from 'path';
-import { DatasetListPage } from '../../../pages/DatasetListPage';
-import { ExplorePage } from '../../../pages/ExplorePage';
-import { ConfirmDialog } from '../../../components/modals/ConfirmDialog';
-import { DeleteConfirmationModal } from '../../../components/modals/DeleteConfirmationModal';
-import { ImportDatasetModal } from '../../../components/modals/ImportDatasetModal';
-import { DuplicateDatasetModal } from '../../../components/modals/DuplicateDatasetModal';
-import { EditDatasetModal } from '../../../components/modals/EditDatasetModal';
-import { Toast } from '../../../components/core/Toast';
+import { DatasetListPage } from '../../pages/DatasetListPage';
+import { ExplorePage } from '../../pages/ExplorePage';
+import {
+  ConfirmDialog,
+  DeleteConfirmationModal,
+  DuplicateDatasetModal,
+  EditDatasetModal,
+  ImportDatasetModal,
+} from '../../components/modals';
+import { Toast } from '../../components/core';
 import {
   apiDeleteDataset,
   apiGetDataset,
   apiPostVirtualDataset,
   getDatasetByName,
   ENDPOINTS,
-} from '../../../helpers/api/dataset';
+} from '../../helpers/api/dataset';
 import { createTestDataset } from './dataset-test-helpers';
 import {
   waitForGet,
   waitForPost,
   waitForPut,
-} from '../../../helpers/api/intercepts';
+} from '../../helpers/api/intercepts';
 import {
   expectStatusOneOf,
   expectValidExportZip,
-} from '../../../helpers/api/assertions';
-import { TIMEOUT } from '../../../utils/constants';
+} from '../../helpers/api/assertions';
+import { TIMEOUT } from '../../utils/constants';
 
 /**
  * Extend testWithAssets with datasetListPage navigation (beforeEach equivalent).
@@ -458,11 +457,12 @@ test.describe('import dataset', () => {
     testAssets,
   }) => {
     // Dataset name from fixture (test_netflix_1768502050965)
-    // Note: Fixture contains a Google Sheets dataset - test will skip if gsheets connector unavailable
+    // Note: Fixture contains a Google Sheets dataset backed by shillelagh[gsheetsapi],
+    // which is a base dependency — import failure fails the test hard (no skip).
     const importedDatasetName = 'test_netflix_1768502050965';
     const fixturePath = path.resolve(
       __dirname,
-      '../../../fixtures/dataset_export.zip',
+      '../../fixtures/dataset_export.zip',
     );
 
     // Cleanup: Delete any existing dataset with the same name from previous runs
@@ -518,25 +518,12 @@ test.describe('import dataset', () => {
       importResponse = await importResponsePromise;
     }
 
-    // Check final import response for gsheets connector errors
+    // Fail hard if dataset import fails.
+    // The fixture contains a gsheets dataset; shillelagh[gsheetsapi] is a base
+    // dependency (pyproject.toml), so the engine is always available in CI.
     if (!importResponse.ok()) {
       const errorBody = await importResponse.json().catch(() => ({}));
-      const errorText = JSON.stringify(errorBody);
-      // Skip test if gsheets connector not installed
-      if (
-        errorText.includes('gsheets') ||
-        errorText.includes('No such DB engine') ||
-        errorText.includes('Could not load database driver')
-      ) {
-        await test.info().attach('skip-reason', {
-          body: `Import failed due to missing gsheets connector: ${errorText}`,
-          contentType: 'text/plain',
-        });
-        test.skip();
-        return;
-      }
-      // Re-throw other errors
-      throw new Error(`Import failed: ${errorText}`);
+      throw new Error(`Import failed: ${JSON.stringify(errorBody)}`);
     }
 
     // Modal should close on success
diff --git a/superset-frontend/playwright/tests/experimental/dataset/dataset-test-helpers.ts b/superset-frontend/playwright/tests/dataset/dataset-test-helpers.ts
similarity index 93%
rename from superset-frontend/playwright/tests/experimental/dataset/dataset-test-helpers.ts
rename to superset-frontend/playwright/tests/dataset/dataset-test-helpers.ts
index 8f619580ae8..2bff43f8b28 100644
--- a/superset-frontend/playwright/tests/experimental/dataset/dataset-test-helpers.ts
+++ b/superset-frontend/playwright/tests/dataset/dataset-test-helpers.ts
@@ -18,8 +18,8 @@
  */
 
 import type { Page, TestInfo } from '@playwright/test';
-import type { TestAssets } from '../../../helpers/fixtures/testAssets';
-import { createTestVirtualDataset } from '../../../helpers/api/dataset';
+import type { TestAssets } from '../../helpers/fixtures';
+import { createTestVirtualDataset } from '../../helpers/api/dataset';
 
 interface TestDatasetResult {
   id: number;
diff --git a/superset-frontend/playwright/tests/sqllab/sqllab.spec.ts b/superset-frontend/playwright/tests/sqllab/sqllab.spec.ts
new file mode 100644
index 00000000000..7c6bf4896ee
--- /dev/null
+++ b/superset-frontend/playwright/tests/sqllab/sqllab.spec.ts
@@ -0,0 +1,315 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+/**
+ * SQL Lab E2E tests — sequential via chromium-sqllab project.
+ *
+ * Tab state is stored server-side per user (/tabstateview/*), and all workers
+ * share the same authenticated user. Parallel workers adding/removing tabs
+ * would cause nondeterministic tab counts and cross-worker deletions.
+ * See playwright.config.ts chromium-sqllab project for details.
+ */
+
+import { test, expect } from '../../helpers/fixtures/testAssets';
+import { SqlLabPage } from '../../pages/SqlLabPage';
+import { ExplorePage } from '../../pages/ExplorePage';
+import { Input } from '../../components/core';
+import { SaveQueryModal } from '../../components/modals/SaveQueryModal';
+import { SaveDatasetModal } from '../../components/modals/SaveDatasetModal';
+import { waitForPost } from '../../helpers/api/intercepts';
+import {
+  expectStatus,
+  extractIdFromResponse,
+} from '../../helpers/api/assertions';
+import { apiGetSavedQuery } from '../../helpers/api/savedQuery';
+import { TIMEOUT } from '../../utils/constants';
+import { URL } from '../../utils/urls';
+
+let sqlLabPage: SqlLabPage;
+
+test.beforeEach(async ({ page }) => {
+  test.setTimeout(TIMEOUT.SLOW_TEST);
+  sqlLabPage = new SqlLabPage(page);
+  await sqlLabPage.gotoAndReady();
+});
+
+// ── Query Execution ──
+
+test('executes a simple SELECT query and displays results', async () => {
+  await expect(sqlLabPage.databaseSelector.element).toBeVisible();
+
+  const response = await sqlLabPage.executeQuery('SELECT 1 AS test_col');
+  expectStatus(response, 200);
+
+  await sqlLabPage.waitForQueryResults('test_col');
+  const headers = await sqlLabPage.resultsGrid.getHeaderTexts();
+  expect(headers.some(h => h.includes('test_col'))).toBe(true);
+});
+
+test('shows error message for invalid SQL', async () => {
+  const invalidTable = 'a_table_that_does_not_exist_xyz_pw';
+  await sqlLabPage.executeQuery(`SELECT * FROM ${invalidTable}`);
+
+  const { errorAlert } = sqlLabPage;
+  await expect(errorAlert).toBeVisible({ timeout: TIMEOUT.QUERY_EXECUTION });
+  // Assert the error references the specific table name, proving this query
+  // triggered the failure — not a stale error from a prior test or session.
+  await expect(errorAlert).toContainText(invalidTable);
+});
+
+test('re-runs a query and refreshes results', async () => {
+  const firstResponse = await sqlLabPage.executeQuery('SELECT 1 AS first_col');
+  expectStatus(firstResponse, 200);
+  await sqlLabPage.waitForQueryResults('first_col');
+
+  const firstHeaders = await sqlLabPage.resultsGrid.getHeaderTexts();
+  expect(firstHeaders.some(h => h.includes('first_col'))).toBe(true);
+
+  const secondResponse = await sqlLabPage.executeQuery(
+    'SELECT 2 AS second_col',
+  );
+  expectStatus(secondResponse, 200);
+  await sqlLabPage.waitForQueryResults('second_col');
+
+  const secondHeaders = await sqlLabPage.resultsGrid.getHeaderTexts();
+  expect(secondHeaders.some(h => h.includes('second_col'))).toBe(true);
+  expect(secondHeaders.some(h => h.includes('first_col'))).toBe(false);
+});
+
+// ── Tabs ──
+
+test('creates a new tab via button', async () => {
+  const initialTabCount = await sqlLabPage.getTabCount();
+
+  await sqlLabPage.addTab();
+  await sqlLabPage.editor.waitForReady();
+
+  expect(await sqlLabPage.getTabCount()).toBe(initialTabCount + 1);
+
+  const defaultContent = await sqlLabPage.getQuery();
+  expect(defaultContent).toContain('SELECT');
+
+  await sqlLabPage.closeLastTab();
+  expect(await sqlLabPage.getTabCount()).toBe(initialTabCount);
+});
+
+test('closes a tab via close button', async () => {
+  const initialTabCount = await sqlLabPage.getTabCount();
+
+  await sqlLabPage.addTab();
+  await sqlLabPage.editor.waitForReady();
+  expect(await sqlLabPage.getTabCount()).toBe(initialTabCount + 1);
+
+  await sqlLabPage.closeLastTab();
+  expect(await sqlLabPage.getTabCount()).toBe(initialTabCount);
+});
+
+test('preserves query state when switching tabs', async () => {
+  const tabOneSql = `SELECT 'tab_one_${Date.now()}'`;
+  const tabTwoSql = `SELECT 'tab_two_${Date.now()}'`;
+
+  const firstTabName = await sqlLabPage.getActiveTabName();
+
+  await sqlLabPage.setQuery(tabOneSql);
+
+  await sqlLabPage.addTab();
+  await sqlLabPage.editor.waitForReady();
+  const secondTabName = await sqlLabPage.getActiveTabName();
+  await sqlLabPage.setQuery(tabTwoSql);
+
+  // Use positional selection — tab names can collide in CI (both tabs may be
+  // named "Untitled Query 1" depending on server-side tab state from prior tests).
+  // Content assertions use toPass() because the editor hydrates asynchronously
+  // after the tab switch — the Ace editor mounts first, then Redux populates it.
+  await sqlLabPage.getTab(firstTabName).first().click();
+  await sqlLabPage.editor.waitForReady();
+  await expect(async () => {
+    expect(await sqlLabPage.getQuery()).toContain('tab_one_');
+  }).toPass({ timeout: TIMEOUT.UI_TRANSITION });
+
+  await sqlLabPage.getTab(secondTabName).last().click();
+  await sqlLabPage.editor.waitForReady();
+  await expect(async () => {
+    expect(await sqlLabPage.getQuery()).toContain('tab_two_');
+  }).toPass({ timeout: TIMEOUT.UI_TRANSITION });
+
+  await sqlLabPage.closeLastTab();
+});
+
+test('should open new tab by keyboard shortcut with correct defaults', async ({
+  page,
+}) => {
+  const initialTabCount = await sqlLabPage.getTabCount();
+
+  await sqlLabPage.setQuery('some random query string');
+
+  // Register before addTabByShortcut — EditorAutoSync POSTs the new tab
+  // within its 5 s interval, so the POST can fire before any later line.
+  const tabStatePromise = waitForPost(page, /tabstateview\/?$/);
+
+  await sqlLabPage.addTabByShortcut();
+  await sqlLabPage.editor.waitForReady();
+  expect(await sqlLabPage.getTabCount()).toBe(initialTabCount + 1);
+
+  // Verify new tab has default SQL (not carried over from previous tab)
+  const defaultContent = await sqlLabPage.getQuery();
+  expect(defaultContent).toContain('SELECT');
+
+  // Wait for the auto-sync POST that persists the new tab to the backend
+  await tabStatePromise;
+
+  await page.reload();
+  await sqlLabPage.waitForPageLoad();
+  await sqlLabPage.ensureEditorReady();
+
+  expect(await sqlLabPage.getTabCount()).toBe(initialTabCount + 1);
+
+  await sqlLabPage.closeLastTab();
+  expect(await sqlLabPage.getTabCount()).toBe(initialTabCount);
+});
+
+// ── Save and Share ──
+
+test('saves a query and loads it from saved queries', async ({
+  page,
+  testAssets,
+}) => {
+  const queryText = 'SELECT 1 AS saved_test_col';
+  const savedQueryTitle = `pw_test_saved_query_${Date.now()}`;
+
+  await expect(sqlLabPage.databaseSelector.element).toBeVisible();
+
+  const executeResponse = await sqlLabPage.executeQuery(queryText);
+  expectStatus(executeResponse, 200);
+  await sqlLabPage.waitForQueryResults('saved_test_col');
+
+  await sqlLabPage.saveButton.click();
+  const saveModal = new SaveQueryModal(page);
+  await saveModal.waitForReady();
+
+  await saveModal.fillName(savedQueryTitle);
+
+  const savePromise = waitForPost(page, 'api/v1/saved_query/', {
+    timeout: TIMEOUT.API_RESPONSE,
+  });
+  await saveModal.clickFooterButton('Save');
+  const saveResponse = await savePromise;
+  expectStatus(saveResponse, 201);
+
+  const savedQueryId = await extractIdFromResponse(saveResponse);
+  testAssets.trackSavedQuery(savedQueryId);
+
+  await saveModal.waitForHidden();
+
+  const getResponse = await apiGetSavedQuery(page, savedQueryId);
+  const savedQuery = (await getResponse.json()).result;
+  expect(savedQuery.sql).toContain('saved_test_col');
+  expect(savedQuery.label).toBe(savedQueryTitle);
+
+  // Navigate through the Saved Queries list UI (not deep-link) to verify
+  // the query appears in the list and can be loaded from there.
+  await page.goto(URL.SAVED_QUERIES_LIST, { waitUntil: 'domcontentloaded' });
+  await page.locator('.ant-table').waitFor({
+    state: 'visible',
+    timeout: TIMEOUT.PAGE_LOAD,
+  });
+
+  // Search for the saved query by its unique name
+  const searchInput = new Input(page, 'input[data-test="filters-search"]');
+  await searchInput.fill(savedQueryTitle);
+
+  // Wait for the filtered row to appear in the table
+  const queryLink = page.getByRole('link', { name: savedQueryTitle });
+  await queryLink.waitFor({ state: 'visible', timeout: TIMEOUT.API_RESPONSE });
+
+  // Navigate to SQL Lab with the saved query ID. The list-view React Router
+  // <Link> uses makeUrl() which double-prefixes with basename in CI, causing
+  // the click to silently fail. Direct navigation tests the loading path
+  // reliably — the list search above already proves the query appears in the UI.
+  await page.goto(`${URL.SQLLAB}?savedQueryId=${savedQueryId}`);
+  await sqlLabPage.waitForPageLoad();
+  await sqlLabPage.ensureEditorReady();
+
+  const loadedSql = await sqlLabPage.getQuery();
+  expect(loadedSql).toContain('saved_test_col');
+});
+
+test('creates a dataset from query results', async ({ page, testAssets }) => {
+  await sqlLabPage.selectDatabase('examples');
+
+  const executeResponse = await sqlLabPage.executeQuery(
+    'SELECT 1 AS ds_test_col',
+  );
+  expectStatus(executeResponse, 200);
+  await sqlLabPage.waitForQueryResults('ds_test_col');
+
+  await sqlLabPage.saveDatasetButton.click();
+
+  const saveDatasetModal = new SaveDatasetModal(page);
+  await saveDatasetModal.waitForReady();
+
+  const datasetName = `pw_test_dataset_${Date.now()}`;
+  await saveDatasetModal.fillName(datasetName);
+
+  const datasetCreatePromise = waitForPost(page, 'api/v1/dataset/', {
+    timeout: TIMEOUT.API_RESPONSE,
+  });
+  const newPagePromise = page.context().waitForEvent('page', {
+    timeout: TIMEOUT.API_RESPONSE,
+  });
+
+  await saveDatasetModal.clickFooterButton('Save & Explore');
+
+  const createResponse = await datasetCreatePromise;
+  const datasetId = await extractIdFromResponse(createResponse);
+  testAssets.trackDataset(datasetId);
+
+  const newPage = await newPagePromise;
+
+  const explorePage = new ExplorePage(newPage);
+  await explorePage.waitForPageLoad({ timeout: TIMEOUT.PAGE_LOAD });
+
+  const loadedDatasetName = await explorePage.getDatasetName();
+  expect(loadedDatasetName).toContain(datasetName);
+
+  await newPage.close();
+});
+
+// ── Create Chart ──
+
+test('should navigate to Explore from SQL Lab query results', async ({
+  page,
+}) => {
+  await sqlLabPage.selectDatabase('examples');
+
+  const query = 'SELECT gender, name FROM birth_names';
+  const executeResponse = await sqlLabPage.executeQuery(query);
+  expectStatus(executeResponse, 200);
+
+  await sqlLabPage.waitForQueryResults('gender');
+
+  await expect(sqlLabPage.createChartButton.element).toBeEnabled();
+  await sqlLabPage.createChartButton.click();
+
+  const explorePage = new ExplorePage(page);
+  await explorePage.waitForPageLoad({ timeout: TIMEOUT.PAGE_LOAD });
+
+  const datasetName = await explorePage.getDatasetName();
+  expect(datasetName).toContain(query);
+});
diff --git a/superset-frontend/playwright/utils/constants.ts b/superset-frontend/playwright/utils/constants.ts
index 7f882d9630d..ab142b01208 100644
--- a/superset-frontend/playwright/utils/constants.ts
+++ b/superset-frontend/playwright/utils/constants.ts
@@ -58,4 +58,20 @@ export const TIMEOUT = {
    * File import/upload operations (upload + server processing)
    */
   FILE_IMPORT: 30000, // 30s for file import operations
+
+  /**
+   * UI transition timeout (tab close, popover dismiss, dropdown close)
+   */
+  UI_TRANSITION: 5000, // 5s ceiling for Ant Design animations (~300-500ms actual)
+
+  /**
+   * SQL query execution (query → backend processing → results)
+   */
+  QUERY_EXECUTION: 15000, // 15s for SQL queries that may take longer than default expect timeout
+
+  /**
+   * Extended test timeout for multi-step tests (page load + query execution + assertions).
+   * Use with test.setTimeout() when the default 30s test timeout is insufficient.
+   */
+  SLOW_TEST: 60000, // 60s for tests that chain multiple slow operations
 } as const;
diff --git a/superset-frontend/playwright/utils/urls.ts b/superset-frontend/playwright/utils/urls.ts
index fa5be71c8f1..ed78c0b1c53 100644
--- a/superset-frontend/playwright/utils/urls.ts
+++ b/superset-frontend/playwright/utils/urls.ts
@@ -33,6 +33,7 @@ export const URL = {
   DASHBOARD_LIST: 'dashboard/list/',
   DATASET_LIST: 'tablemodelview/list',
   LOGIN: 'login/',
+  SAVED_QUERIES_LIST: 'savedqueryview/list/',
   SQLLAB: 'sqllab',
   WELCOME: 'superset/welcome/',
 } as const;
diff --git a/superset-frontend/plugins/legacy-plugin-chart-chord/package.json b/superset-frontend/plugins/legacy-plugin-chart-chord/package.json
index 03ecfd5d7f8..c317b36644a 100644
--- a/superset-frontend/plugins/legacy-plugin-chart-chord/package.json
+++ b/superset-frontend/plugins/legacy-plugin-chart-chord/package.json
@@ -31,7 +31,7 @@
   "dependencies": {
     "d3": "^3.5.17",
     "prop-types": "^15.8.1",
-    "react": "^19.2.1"
+    "react": "^19.2.5"
   },
   "peerDependencies": {
     "@superset-ui/chart-controls": "*",
diff --git a/superset-frontend/plugins/legacy-plugin-chart-country-map/src/CountryMap.ts b/superset-frontend/plugins/legacy-plugin-chart-country-map/src/CountryMap.ts
index c4d94ff3a18..0ccfece3f1c 100644
--- a/superset-frontend/plugins/legacy-plugin-chart-country-map/src/CountryMap.ts
+++ b/superset-frontend/plugins/legacy-plugin-chart-country-map/src/CountryMap.ts
@@ -21,6 +21,7 @@
 import d3 from 'd3';
 import { extent as d3Extent } from 'd3-array';
 import {
+  ValueFormatter,
   getNumberFormatter,
   getSequentialSchemeRegistry,
   CategoricalColorNamespace,
@@ -60,7 +61,8 @@ interface CountryMapProps {
   height: number;
   country: string;
   linearColorScheme: string;
-  numberFormat: string;
+  numberFormat?: string; // left for backward compatibility
+  formatter: ValueFormatter;
   colorScheme: string;
   sliceId: number;
 }
@@ -74,13 +76,12 @@ function CountryMap(element: HTMLElement, props: CountryMapProps) {
     height,
     country,
     linearColorScheme,
-    numberFormat,
+    formatter,
     colorScheme,
     sliceId,
   } = props;
 
   const container = element;
-  const format = getNumberFormatter(numberFormat);
   const rawExtents = d3Extent(data, v => v.metric);
   const extents: [number, number] =
     rawExtents[0] != null && rawExtents[1] != null
@@ -182,7 +183,7 @@ function CountryMap(element: HTMLElement, props: CountryMapProps) {
       .style('top', `${position[1] + 30}px`)
       .style('left', `${position[0]}px`)
       .html(
-        `<div><strong>${getNameOfRegion(d)}</strong><br>${result.length > 0 ? format(result[0].metric) : ''}</div>`,
+        `<div><strong>${getNameOfRegion(d)}</strong><br>${result.length > 0 ? formatter(result[0].metric) : ''}</div>`,
       );
   };
 
diff --git a/superset-frontend/plugins/legacy-plugin-chart-country-map/src/controlPanel.ts b/superset-frontend/plugins/legacy-plugin-chart-country-map/src/controlPanel.ts
index ba163e2617f..16b923be539 100644
--- a/superset-frontend/plugins/legacy-plugin-chart-country-map/src/controlPanel.ts
+++ b/superset-frontend/plugins/legacy-plugin-chart-country-map/src/controlPanel.ts
@@ -69,6 +69,7 @@ const config: ControlPanelConfig = {
             },
           },
         ],
+        ['currency_format'],
         ['linear_color_scheme'],
       ],
     },
diff --git a/superset-frontend/plugins/legacy-plugin-chart-country-map/src/transformProps.ts b/superset-frontend/plugins/legacy-plugin-chart-country-map/src/transformProps.ts
index 946a5c9fd44..af32c4ef46d 100644
--- a/superset-frontend/plugins/legacy-plugin-chart-country-map/src/transformProps.ts
+++ b/superset-frontend/plugins/legacy-plugin-chart-country-map/src/transformProps.ts
@@ -16,26 +16,48 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { ChartProps } from '@superset-ui/core';
+import { ChartProps, getValueFormatter } from '@superset-ui/core';
 
 export default function transformProps(chartProps: ChartProps) {
-  const { width, height, formData, queriesData } = chartProps;
+  const { width, height, formData, queriesData, datasource } = chartProps;
   const {
     linearColorScheme,
     numberFormat,
+    currencyFormat,
     selectCountry,
     colorScheme,
     sliceId,
+    metric,
   } = formData;
 
+  const {
+    currencyFormats = {},
+    columnFormats = {},
+    currencyCodeColumn,
+  } = datasource;
+  const { data, detected_currency: detectedCurrency } = queriesData[0];
+
+  const formatter = getValueFormatter(
+    metric,
+    currencyFormats,
+    columnFormats,
+    numberFormat,
+    currencyFormat,
+    undefined, // key - not needed for single-metric charts
+    data,
+    currencyCodeColumn,
+    detectedCurrency,
+  );
+
   return {
     width,
     height,
     data: queriesData[0].data,
     country: selectCountry ? String(selectCountry).toLowerCase() : null,
     linearColorScheme,
-    numberFormat,
+    numberFormat, // left for backward compatibility
     colorScheme,
     sliceId,
+    formatter,
   };
 }
diff --git a/superset-frontend/plugins/legacy-plugin-chart-country-map/test/CountryMap.test.tsx b/superset-frontend/plugins/legacy-plugin-chart-country-map/test/CountryMap.test.tsx
index dbe912618cf..c12fe2b82a6 100644
--- a/superset-frontend/plugins/legacy-plugin-chart-country-map/test/CountryMap.test.tsx
+++ b/superset-frontend/plugins/legacy-plugin-chart-country-map/test/CountryMap.test.tsx
@@ -93,6 +93,7 @@ describe('CountryMap (legacy d3)', () => {
         linearColorScheme="bnbColors"
         colorScheme=""
         numberFormat=".2f"
+        formatter={jest.fn().mockReturnValue('100')}
       />,
     );
 
@@ -115,6 +116,7 @@ describe('CountryMap (legacy d3)', () => {
         country="canada"
         linearColorScheme="bnbColors"
         colorScheme=""
+        formatter={jest.fn().mockReturnValue('100')}
       />,
     );
 
@@ -144,6 +146,7 @@ describe('CountryMap (legacy d3)', () => {
         country="canada"
         linearColorScheme="bnbColors"
         colorScheme=""
+        formatter={jest.fn().mockReturnValue('100')}
       />,
     );
 
diff --git a/superset-frontend/plugins/legacy-plugin-chart-map-box/CHANGELOG.md b/superset-frontend/plugins/legacy-plugin-chart-map-box/CHANGELOG.md
deleted file mode 100644
index a6f72afc0bf..00000000000
--- a/superset-frontend/plugins/legacy-plugin-chart-map-box/CHANGELOG.md
+++ /dev/null
@@ -1,55 +0,0 @@
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied.  See the License for the
-  specific language governing permissions and limitations
-  under the License.
--->
-
-# Change Log
-
-All notable changes to this project will be documented in this file.
-See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
-
-# [0.20.0](https://github.com/apache/superset/compare/v2021.41.0...v0.20.0) (2024-09-09)
-
-### Bug Fixes
-
-- **deckgl:** deckgl unable to load map ([#17851](https://github.com/apache/superset/issues/17851)) ([52f5dcb](https://github.com/apache/superset/commit/52f5dcb58eec7b188f4387b8781dcda4252a5680))
-- **explore:** Prevent shared controls from checking feature flags outside React render ([#21315](https://github.com/apache/superset/issues/21315)) ([2285ebe](https://github.com/apache/superset/commit/2285ebe72ec4edded6d195052740b7f9f13d1f1b))
-
-### Features
-
-- apply standardized form data to tier 2 charts ([#20530](https://github.com/apache/superset/issues/20530)) ([de524bc](https://github.com/apache/superset/commit/de524bc59f011fd361dcdb7d35c2cb51f7eba442))
-- **deckgl-map:** use an arbitraty Mabpox style URL ([#26027](https://github.com/apache/superset/issues/26027)) ([#26031](https://github.com/apache/superset/issues/26031)) ([af58784](https://github.com/apache/superset/commit/af587840403d83a7da7fb0f57bc10ad2335d4eeb))
-
-# [0.19.0](https://github.com/apache/superset/compare/v2021.41.0...v0.19.0) (2024-09-07)
-
-### Bug Fixes
-
-- **deckgl:** deckgl unable to load map ([#17851](https://github.com/apache/superset/issues/17851)) ([52f5dcb](https://github.com/apache/superset/commit/52f5dcb58eec7b188f4387b8781dcda4252a5680))
-- **explore:** Prevent shared controls from checking feature flags outside React render ([#21315](https://github.com/apache/superset/issues/21315)) ([2285ebe](https://github.com/apache/superset/commit/2285ebe72ec4edded6d195052740b7f9f13d1f1b))
-
-### Features
-
-- apply standardized form data to tier 2 charts ([#20530](https://github.com/apache/superset/issues/20530)) ([de524bc](https://github.com/apache/superset/commit/de524bc59f011fd361dcdb7d35c2cb51f7eba442))
-- **deckgl-map:** use an arbitraty Mabpox style URL ([#26027](https://github.com/apache/superset/issues/26027)) ([#26031](https://github.com/apache/superset/issues/26031)) ([af58784](https://github.com/apache/superset/commit/af587840403d83a7da7fb0f57bc10ad2335d4eeb))
-
-# [0.18.0](https://github.com/apache-superset/superset-ui/compare/v0.17.87...v0.18.0) (2021-08-30)
-
-**Note:** Version bump only for package @superset-ui/legacy-plugin-chart-map-box
-
-## [0.17.61](https://github.com/apache-superset/superset-ui/compare/v0.17.60...v0.17.61) (2021-07-02)
-
-**Note:** Version bump only for package @superset-ui/legacy-plugin-chart-map-box
diff --git a/superset-frontend/plugins/legacy-plugin-chart-map-box/README.md b/superset-frontend/plugins/legacy-plugin-chart-map-box/README.md
deleted file mode 100644
index d3ecc6bed40..00000000000
--- a/superset-frontend/plugins/legacy-plugin-chart-map-box/README.md
+++ /dev/null
@@ -1,52 +0,0 @@
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-## @superset-ui/legacy-plugin-chart-map-box
-
-[![Version](https://img.shields.io/npm/v/@superset-ui/legacy-plugin-chart-map-box.svg?style=flat)](https://www.npmjs.com/package/@superset-ui/legacy-plugin-chart-map-box)
-[![Libraries.io](https://img.shields.io/librariesio/release/npm/%40superset-ui%2Flegacy-plugin-chart-map-box?style=flat)](https://libraries.io/npm/@superset-ui%2Flegacy-plugin-chart-map-box)
-
-This plugin provides MapBox for Superset.
-
-### Usage
-
-Configure `key`, which can be any `string`, and register the plugin. This `key` will be used to
-lookup this chart throughout the app.
-
-```js
-import MapBoxChartPlugin from '@superset-ui/legacy-plugin-chart-map-box';
-
-new MapBoxChartPlugin().configure({ key: 'map-box' }).register();
-```
-
-Then use it via `SuperChart`. See
-[storybook](https://apache-superset.github.io/superset-ui-plugins/?selectedKind=plugin-chart-map-box)
-for more details.
-
-```js
-<SuperChart
-  chartType="map-box"
-  width={600}
-  height={600}
-  formData={...}
-  queriesData={[{
-    data: {...},
-  }]}
-/>
-```
diff --git a/superset-frontend/plugins/legacy-plugin-chart-map-box/src/MapBox.tsx b/superset-frontend/plugins/legacy-plugin-chart-map-box/src/MapBox.tsx
deleted file mode 100644
index a69659de0b3..00000000000
--- a/superset-frontend/plugins/legacy-plugin-chart-map-box/src/MapBox.tsx
+++ /dev/null
@@ -1,243 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/* eslint-disable react/jsx-sort-default-props, react/sort-prop-types */
-/* eslint-disable react/forbid-prop-types, react/require-default-props */
-import { Component } from 'react';
-import MapGL from 'react-map-gl';
-import { WebMercatorViewport } from '@math.gl/web-mercator';
-import ScatterPlotGlowOverlay from './ScatterPlotGlowOverlay';
-import './MapBox.css';
-
-const NOOP = () => {};
-export const DEFAULT_MAX_ZOOM = 16;
-export const DEFAULT_POINT_RADIUS = 60;
-
-interface Viewport {
-  longitude: number;
-  latitude: number;
-  zoom: number;
-  isDragging?: boolean;
-}
-
-interface Clusterer {
-  getClusters(bbox: number[], zoom: number): GeoJSONLocation[];
-}
-
-interface GeoJSONLocation {
-  geometry: {
-    coordinates: [number, number];
-  };
-  properties: Record<string, number | string | boolean | null | undefined>;
-}
-
-interface MapBoxProps {
-  width?: number;
-  height?: number;
-  aggregatorName?: string;
-  clusterer: Clusterer; // Required - used for getClusters()
-  globalOpacity?: number;
-  hasCustomMetric?: boolean;
-  mapStyle?: string;
-  mapboxApiKey: string;
-  onViewportChange?: (viewport: Viewport) => void;
-  pointRadius?: number;
-  pointRadiusUnit?: string;
-  renderWhileDragging?: boolean;
-  rgb?: (string | number)[];
-  bounds?: [[number, number], [number, number]]; // May be undefined for empty datasets
-  viewportLongitude?: number;
-  viewportLatitude?: number;
-  viewportZoom?: number;
-}
-
-interface MapBoxState {
-  viewport: Viewport;
-}
-
-const defaultProps: Partial<MapBoxProps> = {
-  width: 400,
-  height: 400,
-  globalOpacity: 1,
-  onViewportChange: NOOP,
-  pointRadius: DEFAULT_POINT_RADIUS,
-  pointRadiusUnit: 'Pixels',
-};
-
-class MapBox extends Component<MapBoxProps, MapBoxState> {
-  static defaultProps = defaultProps;
-
-  constructor(props: MapBoxProps) {
-    super(props);
-
-    const fitBounds = this.computeFitBoundsViewport();
-
-    this.state = {
-      viewport: this.mergeViewportWithProps(fitBounds),
-    };
-    this.handleViewportChange = this.handleViewportChange.bind(this);
-  }
-
-  handleViewportChange(viewport: Viewport) {
-    this.setState({ viewport });
-    const { onViewportChange } = this.props;
-    onViewportChange!(viewport);
-  }
-
-  mergeViewportWithProps(
-    fitBounds: Viewport,
-    viewport: Viewport = fitBounds,
-    props: MapBoxProps = this.props,
-    useFitBoundsForUnset = true,
-  ): Viewport {
-    const { viewportLongitude, viewportLatitude, viewportZoom } = props;
-
-    return {
-      ...viewport,
-      longitude:
-        viewportLongitude ??
-        (useFitBoundsForUnset ? fitBounds.longitude : viewport.longitude),
-      latitude:
-        viewportLatitude ??
-        (useFitBoundsForUnset ? fitBounds.latitude : viewport.latitude),
-      zoom:
-        viewportZoom ?? (useFitBoundsForUnset ? fitBounds.zoom : viewport.zoom),
-    };
-  }
-
-  computeFitBoundsViewport(): Viewport {
-    const { width = 400, height = 400, bounds } = this.props;
-    if (bounds && bounds[0] && bounds[1]) {
-      const mercator = new WebMercatorViewport({ width, height }).fitBounds(
-        bounds,
-      );
-      return {
-        latitude: mercator.latitude,
-        longitude: mercator.longitude,
-        zoom: mercator.zoom,
-      };
-    }
-    return { latitude: 0, longitude: 0, zoom: 1 };
-  }
-
-  componentDidUpdate(prevProps: MapBoxProps) {
-    const { viewport } = this.state;
-    const fitBoundsInputsChanged =
-      prevProps.width !== this.props.width ||
-      prevProps.height !== this.props.height ||
-      prevProps.bounds !== this.props.bounds;
-    const viewportPropsChanged =
-      prevProps.viewportLongitude !== this.props.viewportLongitude ||
-      prevProps.viewportLatitude !== this.props.viewportLatitude ||
-      prevProps.viewportZoom !== this.props.viewportZoom;
-
-    if (!fitBoundsInputsChanged && !viewportPropsChanged) {
-      return;
-    }
-
-    const fitBounds = this.computeFitBoundsViewport();
-    const nextViewport = this.mergeViewportWithProps(
-      fitBounds,
-      viewport,
-      this.props,
-      fitBoundsInputsChanged || viewportPropsChanged,
-    );
-
-    const viewportChanged =
-      nextViewport.longitude !== viewport.longitude ||
-      nextViewport.latitude !== viewport.latitude ||
-      nextViewport.zoom !== viewport.zoom;
-
-    if (viewportChanged) {
-      this.setState({ viewport: nextViewport });
-    }
-  }
-
-  render() {
-    const {
-      width,
-      height,
-      aggregatorName,
-      clusterer,
-      globalOpacity,
-      mapStyle,
-      mapboxApiKey,
-      pointRadius,
-      pointRadiusUnit,
-      renderWhileDragging,
-      rgb,
-      hasCustomMetric,
-      bounds,
-    } = this.props;
-    const { viewport } = this.state;
-    const isDragging =
-      viewport.isDragging === undefined ? false : viewport.isDragging;
-
-    // Compute the clusters based on the original bounds and current zoom level. Note when zoom/pan
-    // to an area outside of the original bounds, no additional queries are made to the backend to
-    // retrieve additional data.
-    // add this variable to widen the visible area
-    const offsetHorizontal = ((width ?? 400) * 0.5) / 100;
-    const offsetVertical = ((height ?? 400) * 0.5) / 100;
-
-    // Guard against empty datasets where bounds may be undefined
-    const bbox =
-      bounds && bounds[0] && bounds[1]
-        ? [
-            bounds[0][0] - offsetHorizontal,
-            bounds[0][1] - offsetVertical,
-            bounds[1][0] + offsetHorizontal,
-            bounds[1][1] + offsetVertical,
-          ]
-        : [-180, -90, 180, 90]; // Default to world bounds
-
-    const clusters = clusterer.getClusters(bbox, Math.round(viewport.zoom));
-
-    return (
-      <MapGL
-        {...viewport}
-        mapStyle={mapStyle}
-        width={width}
-        height={height}
-        mapboxApiAccessToken={mapboxApiKey}
-        onViewportChange={this.handleViewportChange}
-        preserveDrawingBuffer
-      >
-        <ScatterPlotGlowOverlay
-          {...viewport}
-          isDragging={isDragging}
-          locations={clusters}
-          dotRadius={pointRadius}
-          pointRadiusUnit={pointRadiusUnit}
-          rgb={rgb}
-          globalOpacity={globalOpacity}
-          compositeOperation="screen"
-          renderWhileDragging={renderWhileDragging}
-          aggregation={hasCustomMetric ? aggregatorName : undefined}
-          lngLatAccessor={(location: GeoJSONLocation) => {
-            const { coordinates } = location.geometry;
-
-            return [coordinates[0], coordinates[1]];
-          }}
-        />
-      </MapGL>
-    );
-  }
-}
-
-export default MapBox;
diff --git a/superset-frontend/plugins/legacy-plugin-chart-map-box/src/ScatterPlotGlowOverlay.tsx b/superset-frontend/plugins/legacy-plugin-chart-map-box/src/ScatterPlotGlowOverlay.tsx
deleted file mode 100644
index e5220a0d538..00000000000
--- a/superset-frontend/plugins/legacy-plugin-chart-map-box/src/ScatterPlotGlowOverlay.tsx
+++ /dev/null
@@ -1,400 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/* eslint-disable react/require-default-props */
-import { PureComponent } from 'react';
-import { CanvasOverlay } from 'react-map-gl';
-import { kmToPixels, MILES_PER_KM } from './utils/geo';
-import roundDecimal from './utils/roundDecimal';
-import luminanceFromRGB from './utils/luminanceFromRGB';
-import 'mapbox-gl/dist/mapbox-gl.css';
-
-interface GeoJSONLocation {
-  geometry: {
-    coordinates: [number, number];
-  };
-  properties: Record<string, number | string | boolean | null | undefined>;
-}
-
-interface RedrawParams {
-  width: number;
-  height: number;
-  ctx: CanvasRenderingContext2D;
-  isDragging: boolean;
-  project: (lngLat: [number, number]) => [number, number];
-}
-
-interface DrawTextOptions {
-  fontHeight?: number;
-  label?: string | number;
-  radius?: number;
-  rgb?: (string | number)[];
-  shadow?: boolean;
-}
-
-interface ScatterPlotGlowOverlayProps {
-  aggregation?: string;
-  compositeOperation?: string;
-  dotRadius?: number;
-  globalOpacity?: number;
-  lngLatAccessor?: (location: GeoJSONLocation) => [number, number];
-  locations: GeoJSONLocation[];
-  pointRadiusUnit?: string;
-  renderWhileDragging?: boolean;
-  rgb?: (string | number)[];
-  zoom?: number;
-  isDragging?: boolean;
-}
-
-const defaultProps: Partial<ScatterPlotGlowOverlayProps> = {
-  // Same as browser default.
-  compositeOperation: 'source-over',
-  dotRadius: 4,
-  lngLatAccessor: (location: GeoJSONLocation) => [
-    location.geometry.coordinates[0],
-    location.geometry.coordinates[1],
-  ],
-  renderWhileDragging: true,
-};
-
-const computeClusterLabel = (
-  properties: Record<string, number | string | boolean | null | undefined>,
-  aggregation: string | undefined,
-): number | string => {
-  const count = properties.point_count as number;
-  if (!aggregation) {
-    return count;
-  }
-  if (aggregation === 'sum' || aggregation === 'min' || aggregation === 'max') {
-    return properties[aggregation] as number;
-  }
-  const { sum } = properties as { sum: number };
-  const mean = sum / count;
-  if (aggregation === 'mean') {
-    return Math.round(100 * mean) / 100;
-  }
-  const { squaredSum } = properties as { squaredSum: number };
-  const variance = squaredSum / count - (sum / count) ** 2;
-  if (aggregation === 'var') {
-    return Math.round(100 * variance) / 100;
-  }
-  if (aggregation === 'stdev') {
-    return Math.round(100 * Math.sqrt(variance)) / 100;
-  }
-
-  // fallback to point_count, this really shouldn't happen
-  return count;
-};
-
-class ScatterPlotGlowOverlay extends PureComponent<ScatterPlotGlowOverlayProps> {
-  static defaultProps = defaultProps;
-
-  constructor(props: ScatterPlotGlowOverlayProps) {
-    super(props);
-    this.redraw = this.redraw.bind(this);
-  }
-
-  drawText(
-    ctx: CanvasRenderingContext2D,
-    pixel: [number, number],
-    options: DrawTextOptions = {},
-  ) {
-    const IS_DARK_THRESHOLD = 110;
-    const {
-      fontHeight = 0,
-      label = '',
-      radius = 0,
-      rgb = [0, 0, 0],
-      shadow = false,
-    } = options;
-    const maxWidth = radius * 1.8;
-    const luminance = luminanceFromRGB(
-      rgb[1] as number,
-      rgb[2] as number,
-      rgb[3] as number,
-    );
-
-    ctx.globalCompositeOperation = 'source-over';
-    ctx.fillStyle = luminance <= IS_DARK_THRESHOLD ? 'white' : 'black';
-    ctx.font = `${fontHeight}px sans-serif`;
-    ctx.textAlign = 'center';
-    ctx.textBaseline = 'middle';
-    if (shadow) {
-      ctx.shadowBlur = 15;
-      ctx.shadowColor = luminance <= IS_DARK_THRESHOLD ? 'black' : '';
-    }
-
-    const textWidth = ctx.measureText(String(label)).width;
-    if (textWidth > maxWidth) {
-      const scale = fontHeight / textWidth;
-      ctx.font = `${scale * maxWidth}px sans-serif`;
-    }
-
-    const { compositeOperation } = this.props;
-
-    ctx.fillText(String(label), pixel[0], pixel[1]);
-    ctx.globalCompositeOperation = (compositeOperation ??
-      'source-over') as GlobalCompositeOperation;
-    ctx.shadowBlur = 0;
-    ctx.shadowColor = '';
-  }
-
-  // Modified: https://github.com/uber/react-map-gl/blob/master/overlays/scatterplot.react.js
-  redraw({ width, height, ctx, isDragging, project }: RedrawParams) {
-    const {
-      aggregation,
-      compositeOperation,
-      dotRadius,
-      globalOpacity,
-      lngLatAccessor,
-      locations,
-      pointRadiusUnit,
-      renderWhileDragging,
-      rgb,
-      zoom,
-    } = this.props;
-
-    const radius = dotRadius ?? 4;
-    const clusterLabelMap: (number | string)[] = [];
-
-    locations.forEach((location, i) => {
-      if (location.properties.cluster) {
-        clusterLabelMap[i] = computeClusterLabel(
-          location.properties,
-          aggregation,
-        );
-      }
-    });
-
-    const filteredLabels = clusterLabelMap.filter(
-      v => !Number.isNaN(v),
-    ) as number[];
-    // Guard against empty array or zero max to prevent NaN from division
-    const maxLabel =
-      filteredLabels.length > 0 ? Math.max(...filteredLabels) : 1;
-    const safeMaxLabel = maxLabel > 0 ? maxLabel : 1;
-
-    // Calculate min/max radius values for Pixels mode scaling
-    let minRadiusValue = Infinity;
-    let maxRadiusValue = -Infinity;
-    if (pointRadiusUnit === 'Pixels') {
-      locations.forEach(location => {
-        // Accept both null and undefined as "no value" and coerce potential numeric strings
-        if (
-          !location.properties.cluster &&
-          location.properties.radius != null
-        ) {
-          const radiusValueRaw = location.properties.radius;
-          const radiusValue = Number(radiusValueRaw);
-          if (Number.isFinite(radiusValue)) {
-            minRadiusValue = Math.min(minRadiusValue, radiusValue);
-            maxRadiusValue = Math.max(maxRadiusValue, radiusValue);
-          }
-        }
-      });
-    }
-
-    ctx.clearRect(0, 0, width, height);
-    ctx.globalCompositeOperation = (compositeOperation ??
-      'source-over') as GlobalCompositeOperation;
-
-    if ((renderWhileDragging || !isDragging) && locations) {
-      locations.forEach(function _forEach(
-        this: ScatterPlotGlowOverlay,
-        location: GeoJSONLocation,
-        i: number,
-      ) {
-        const pixel = project(lngLatAccessor!(location)) as [number, number];
-        const pixelRounded: [number, number] = [
-          roundDecimal(pixel[0], 1),
-          roundDecimal(pixel[1], 1),
-        ];
-
-        if (
-          pixelRounded[0] + radius >= 0 &&
-          pixelRounded[0] - radius < width &&
-          pixelRounded[1] + radius >= 0 &&
-          pixelRounded[1] - radius < height
-        ) {
-          ctx.beginPath();
-          if (location.properties.cluster) {
-            const clusterLabel = clusterLabelMap[i];
-            // Validate clusterLabel is a finite number before using it for radius calculation
-            const numericLabel = Number(clusterLabel);
-            const safeNumericLabel = Number.isFinite(numericLabel)
-              ? numericLabel
-              : 0;
-            const scaledRadius = roundDecimal(
-              (safeNumericLabel / safeMaxLabel) ** 0.5 * radius,
-              1,
-            );
-            const fontHeight = roundDecimal(scaledRadius * 0.5, 1);
-            const [x, y] = pixelRounded;
-            const gradient = ctx.createRadialGradient(
-              x,
-              y,
-              scaledRadius,
-              x,
-              y,
-              0,
-            );
-
-            gradient.addColorStop(
-              1,
-              `rgba(${rgb![1]}, ${rgb![2]}, ${rgb![3]}, ${0.8 * (globalOpacity ?? 1)})`,
-            );
-            gradient.addColorStop(
-              0,
-              `rgba(${rgb![1]}, ${rgb![2]}, ${rgb![3]}, 0)`,
-            );
-            ctx.arc(
-              pixelRounded[0],
-              pixelRounded[1],
-              scaledRadius,
-              0,
-              Math.PI * 2,
-            );
-            ctx.fillStyle = gradient;
-            ctx.fill();
-
-            if (Number.isFinite(safeNumericLabel)) {
-              let label: string | number = clusterLabel;
-              if (safeNumericLabel >= 10000) {
-                label = `${Math.round(safeNumericLabel / 1000)}k`;
-              } else if (safeNumericLabel >= 1000) {
-                label = `${Math.round(safeNumericLabel / 100) / 10}k`;
-              }
-              this.drawText(ctx, pixelRounded, {
-                fontHeight,
-                label,
-                radius: scaledRadius,
-                rgb,
-                shadow: true,
-              });
-            }
-          } else {
-            const defaultRadius = radius / 6;
-            const rawRadius = location.properties.radius;
-            const radiusProperty =
-              typeof rawRadius === 'number' ? rawRadius : null;
-            const pointMetric = location.properties.metric ?? null;
-            let pointRadius: number = radiusProperty ?? defaultRadius;
-            let pointLabel: string | number | undefined;
-
-            if (radiusProperty != null) {
-              const pointLatitude = lngLatAccessor!(location)[1];
-              if (pointRadiusUnit === 'Kilometers') {
-                pointLabel = `${roundDecimal(pointRadius, 2)}km`;
-                pointRadius = kmToPixels(pointRadius, pointLatitude, zoom ?? 0);
-              } else if (pointRadiusUnit === 'Miles') {
-                pointLabel = `${roundDecimal(pointRadius, 2)}mi`;
-                pointRadius = kmToPixels(
-                  pointRadius * MILES_PER_KM,
-                  pointLatitude,
-                  zoom ?? 0,
-                );
-              } else if (pointRadiusUnit === 'Pixels') {
-                // Scale pixel values to a reasonable range (radius/6 to radius/3)
-                // This ensures points are visible and proportional to their values
-                const MIN_POINT_RADIUS = radius / 6;
-                const MAX_POINT_RADIUS = radius / 3;
-
-                if (
-                  Number.isFinite(minRadiusValue) &&
-                  Number.isFinite(maxRadiusValue) &&
-                  maxRadiusValue > minRadiusValue
-                ) {
-                  // Normalize the value to 0-1 range, then scale to pixel range
-                  const numericPointRadius = Number(pointRadius);
-                  if (!Number.isFinite(numericPointRadius)) {
-                    // fallback to minimum visible size when the value is not a finite number
-                    pointRadius = MIN_POINT_RADIUS;
-                  } else {
-                    const normalizedValueRaw =
-                      (numericPointRadius - minRadiusValue) /
-                      (maxRadiusValue - minRadiusValue);
-                    const normalizedValue = Math.max(
-                      0,
-                      Math.min(1, normalizedValueRaw),
-                    );
-                    pointRadius =
-                      MIN_POINT_RADIUS +
-                      normalizedValue * (MAX_POINT_RADIUS - MIN_POINT_RADIUS);
-                  }
-                  pointLabel = `${roundDecimal(radiusProperty, 2)}`;
-                } else if (
-                  Number.isFinite(minRadiusValue) &&
-                  minRadiusValue === maxRadiusValue
-                ) {
-                  // All values are the same, use a fixed medium size
-                  pointRadius = (MIN_POINT_RADIUS + MAX_POINT_RADIUS) / 2;
-                  pointLabel = `${roundDecimal(radiusProperty, 2)}`;
-                } else {
-                  // Use raw pixel values if they're already in a reasonable range
-                  pointRadius = Math.max(
-                    MIN_POINT_RADIUS,
-                    Math.min(pointRadius, MAX_POINT_RADIUS),
-                  );
-                  pointLabel = `${roundDecimal(radiusProperty, 2)}`;
-                }
-              }
-            }
-
-            if (pointMetric !== null) {
-              const numericMetric = parseFloat(String(pointMetric));
-              pointLabel = Number.isFinite(numericMetric)
-                ? roundDecimal(numericMetric, 2)
-                : String(pointMetric);
-            }
-
-            // Fall back to default points if pointRadius wasn't a numerical column
-            if (!pointRadius) {
-              pointRadius = defaultRadius;
-            }
-
-            ctx.arc(
-              pixelRounded[0],
-              pixelRounded[1],
-              roundDecimal(pointRadius, 1),
-              0,
-              Math.PI * 2,
-            );
-            ctx.fillStyle = `rgba(${rgb![1]}, ${rgb![2]}, ${rgb![3]}, ${globalOpacity})`;
-            ctx.fill();
-
-            if (pointLabel !== undefined) {
-              this.drawText(ctx, pixelRounded, {
-                fontHeight: roundDecimal(pointRadius, 1),
-                label: pointLabel,
-                radius: pointRadius,
-                rgb,
-                shadow: false,
-              });
-            }
-          }
-        }
-      }, this);
-    }
-  }
-
-  render() {
-    return <CanvasOverlay redraw={this.redraw} />;
-  }
-}
-
-export default ScatterPlotGlowOverlay;
diff --git a/superset-frontend/plugins/legacy-plugin-chart-map-box/src/stories/MapBox.stories.tsx b/superset-frontend/plugins/legacy-plugin-chart-map-box/src/stories/MapBox.stories.tsx
deleted file mode 100644
index 8f68419e769..00000000000
--- a/superset-frontend/plugins/legacy-plugin-chart-map-box/src/stories/MapBox.stories.tsx
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-/* eslint-disable no-magic-numbers */
-import { SuperChart } from '@superset-ui/core';
-import { useTheme } from '@apache-superset/core/theme';
-import MapBoxChartPlugin from '@superset-ui/legacy-plugin-chart-map-box';
-import { withResizableChartDemo } from '@storybook-shared';
-import { generateData } from './data';
-
-new MapBoxChartPlugin().configure({ key: 'map-box' }).register();
-
-export default {
-  title: 'Legacy Chart Plugins/legacy-plugin-chart-map-box',
-  decorators: [withResizableChartDemo],
-  args: {
-    clusteringRadius: 60,
-    globalOpacity: 1,
-    pointRadius: 'Auto',
-    renderWhileDragging: true,
-  },
-  argTypes: {
-    clusteringRadius: {
-      control: { type: 'range', min: 0, max: 200, step: 10 },
-      description: 'Radius in pixels for clustering points',
-    },
-    globalOpacity: {
-      control: { type: 'range', min: 0, max: 1, step: 0.1 },
-      description: 'Opacity of map markers',
-    },
-    pointRadius: {
-      control: 'select',
-      options: ['Auto', 1, 2, 5, 10, 20, 50],
-      description: 'Size of point markers',
-    },
-    renderWhileDragging: {
-      control: 'boolean',
-      description: 'Render markers while dragging the map',
-    },
-  },
-  parameters: {
-    docs: {
-      description: {
-        component:
-          'Note: This chart requires a Mapbox API key to display. Without a valid key, the map background will not render.',
-      },
-    },
-  },
-};
-
-export const MapBoxViz = ({
-  clusteringRadius,
-  globalOpacity,
-  pointRadius,
-  renderWhileDragging,
-  width,
-  height,
-}: {
-  clusteringRadius: number;
-  globalOpacity: number;
-  pointRadius: string | number;
-  renderWhileDragging: boolean;
-  width: number;
-  height: number;
-}) => {
-  const theme = useTheme();
-  return (
-    <SuperChart
-      chartType="map-box"
-      width={width}
-      height={height}
-      queriesData={[{ data: generateData(theme) }]}
-      formData={{
-        all_columns_x: 'LON',
-        all_columns_y: 'LAT',
-        clustering_radius: String(clusteringRadius),
-        global_opacity: globalOpacity,
-        mapbox_color: 'rgb(244, 176, 42)',
-        mapbox_label: [],
-        mapbox_style: 'mapbox://styles/mapbox/light-v9',
-        pandas_aggfunc: 'sum',
-        point_radius: pointRadius,
-        point_radius_unit: 'Pixels',
-        render_while_dragging: renderWhileDragging,
-        viewport_latitude: 37.78711146014447,
-        viewport_longitude: -122.37633433151713,
-        viewport_zoom: 10.026425338292782,
-      }}
-    />
-  );
-};
diff --git a/superset-frontend/plugins/legacy-plugin-chart-map-box/src/transformProps.ts b/superset-frontend/plugins/legacy-plugin-chart-map-box/src/transformProps.ts
deleted file mode 100644
index 45eca8d4448..00000000000
--- a/superset-frontend/plugins/legacy-plugin-chart-map-box/src/transformProps.ts
+++ /dev/null
@@ -1,162 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-import Supercluster, {
-  type Options as SuperclusterOptions,
-} from 'supercluster';
-import { ChartProps } from '@superset-ui/core';
-import { DEFAULT_POINT_RADIUS, DEFAULT_MAX_ZOOM } from './MapBox';
-
-const NOOP = () => {};
-const MIN_LONGITUDE = -180;
-const MAX_LONGITUDE = 180;
-const MIN_LATITUDE = -90;
-const MAX_LATITUDE = 90;
-const MIN_ZOOM = 0;
-
-function toFiniteNumber(
-  value: string | number | null | undefined,
-): number | undefined {
-  if (value === null || value === undefined) return undefined;
-  const normalizedValue = typeof value === 'string' ? value.trim() : value;
-  if (normalizedValue === '') return undefined;
-  const num = Number(normalizedValue);
-  return Number.isFinite(num) ? num : undefined;
-}
-
-function clampNumber(
-  value: number | undefined,
-  min: number,
-  max: number,
-): number | undefined {
-  if (value === undefined) return undefined;
-  return Math.min(max, Math.max(min, value));
-}
-
-interface ClusterProperties {
-  metric: number;
-  sum: number;
-  squaredSum: number;
-  min: number;
-  max: number;
-}
-
-export default function transformProps(chartProps: ChartProps) {
-  const { width, height, formData, hooks, queriesData } = chartProps;
-  const { onError = NOOP, setControlValue = NOOP } = hooks;
-  const { bounds, geoJSON, hasCustomMetric, mapboxApiKey } =
-    queriesData[0].data;
-  const {
-    clusteringRadius,
-    globalOpacity,
-    mapboxColor,
-    mapboxStyle,
-    pandasAggfunc,
-    pointRadiusUnit,
-    renderWhileDragging,
-    viewportLongitude,
-    viewportLatitude,
-    viewportZoom,
-  } = formData;
-
-  // Validate mapbox color
-  const rgb = /^rgb\((\d{1,3}),\s*(\d{1,3}),\s*(\d{1,3})\)$/.exec(mapboxColor);
-  if (rgb === null) {
-    onError("Color field must be of form 'rgb(%d, %d, %d)'");
-
-    return {};
-  }
-
-  const opts: SuperclusterOptions<ClusterProperties, ClusterProperties> = {
-    maxZoom: DEFAULT_MAX_ZOOM,
-    radius: clusteringRadius,
-  };
-  if (hasCustomMetric) {
-    opts.initial = () => ({
-      metric: 0,
-      sum: 0,
-      squaredSum: 0,
-      min: Infinity,
-      max: -Infinity,
-    });
-    opts.map = (prop: ClusterProperties) => ({
-      metric: prop.metric,
-      sum: prop.metric,
-      squaredSum: prop.metric ** 2,
-      min: prop.metric,
-      max: prop.metric,
-    });
-    opts.reduce = (accu: ClusterProperties, prop: ClusterProperties) => {
-      // Temporarily disable param-reassignment linting to work with supercluster's api
-      /* eslint-disable no-param-reassign */
-      accu.sum += prop.sum;
-      accu.squaredSum += prop.squaredSum;
-      accu.min = Math.min(accu.min, prop.min);
-      accu.max = Math.max(accu.max, prop.max);
-      /* eslint-enable no-param-reassign */
-    };
-  }
-  const clusterer = new Supercluster(opts);
-  clusterer.load(geoJSON.features);
-
-  return {
-    width,
-    height,
-    aggregatorName: pandasAggfunc,
-    bounds,
-    clusterer,
-    hasCustomMetric,
-    mapboxApiKey,
-    mapStyle: mapboxStyle,
-    onViewportChange({
-      latitude,
-      longitude,
-      zoom,
-    }: {
-      latitude: number;
-      longitude: number;
-      zoom: number;
-    }) {
-      setControlValue('viewport_longitude', longitude);
-      setControlValue('viewport_latitude', latitude);
-      setControlValue('viewport_zoom', zoom);
-    },
-    // Always use DEFAULT_POINT_RADIUS as the base radius for cluster sizing
-    // Individual point radii come from geoJSON properties.radius
-    pointRadius: DEFAULT_POINT_RADIUS,
-    pointRadiusUnit,
-    renderWhileDragging,
-    rgb,
-    viewportLongitude: clampNumber(
-      toFiniteNumber(viewportLongitude),
-      MIN_LONGITUDE,
-      MAX_LONGITUDE,
-    ),
-    viewportLatitude: clampNumber(
-      toFiniteNumber(viewportLatitude),
-      MIN_LATITUDE,
-      MAX_LATITUDE,
-    ),
-    viewportZoom: clampNumber(
-      toFiniteNumber(viewportZoom),
-      MIN_ZOOM,
-      DEFAULT_MAX_ZOOM,
-    ),
-    globalOpacity: Math.min(1, Math.max(0, toFiniteNumber(globalOpacity) ?? 1)),
-  };
-}
diff --git a/superset-frontend/plugins/legacy-plugin-chart-map-box/test/MapBox.test.tsx b/superset-frontend/plugins/legacy-plugin-chart-map-box/test/MapBox.test.tsx
deleted file mode 100644
index f0782f5fc14..00000000000
--- a/superset-frontend/plugins/legacy-plugin-chart-map-box/test/MapBox.test.tsx
+++ /dev/null
@@ -1,381 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import { type ReactNode } from 'react';
-import { render } from '@testing-library/react';
-import MapBox from '../src/MapBox';
-
-// Capture the most recent viewport props passed to MapGL
-let lastMapGLProps: Record<string, unknown> = {};
-const mockFitBounds = jest.fn();
-
-jest.mock('react-map-gl', () => {
-  const MockMapGL = (props: Record<string, unknown>) => {
-    lastMapGLProps = props;
-    return <div data-test="map-gl">{props.children as ReactNode}</div>;
-  };
-  return { __esModule: true, default: MockMapGL };
-});
-
-jest.mock('@math.gl/web-mercator', () => ({
-  WebMercatorViewport: jest
-    .fn()
-    .mockImplementation(
-      ({ width, height }: { width: number; height: number }) => ({
-        fitBounds: (bounds: [[number, number], [number, number]]) =>
-          mockFitBounds(bounds, width, height),
-      }),
-    ),
-}));
-
-jest.mock('../src/ScatterPlotGlowOverlay', () => {
-  const MockOverlay = (props: Record<string, unknown>) => (
-    <div data-test="scatter-overlay" data-opacity={props.globalOpacity} />
-  );
-  return { __esModule: true, default: MockOverlay };
-});
-
-const defaultProps = {
-  width: 800,
-  height: 600,
-  clusterer: {
-    getClusters: jest.fn().mockReturnValue([]),
-  },
-  globalOpacity: 1,
-  mapboxApiKey: 'test-key',
-  mapStyle: 'mapbox://styles/mapbox/light-v9',
-  pointRadius: 60,
-  pointRadiusUnit: 'Pixels',
-  renderWhileDragging: true,
-  rgb: ['', 255, 0, 0] as (string | number)[],
-  hasCustomMetric: false,
-  bounds: [
-    [-74.0, 40.7],
-    [-73.9, 40.8],
-  ] as [[number, number], [number, number]],
-  onViewportChange: jest.fn(),
-};
-
-beforeEach(() => {
-  lastMapGLProps = {};
-  jest.clearAllMocks();
-  mockFitBounds.mockImplementation(
-    (
-      bounds: [[number, number], [number, number]],
-      width: number,
-      height: number,
-    ) => ({
-      latitude: Number(((bounds[0][1] + bounds[1][1]) / 2).toFixed(2)),
-      longitude: Number(((bounds[0][0] + bounds[1][0]) / 2).toFixed(2)),
-      zoom: Number((10 + width / 1000 + height / 10000).toFixed(2)),
-    }),
-  );
-});
-
-test('initializes viewport from bounds', () => {
-  render(<MapBox {...defaultProps} />);
-  expect(lastMapGLProps.latitude).toBe(40.75);
-  expect(lastMapGLProps.longitude).toBe(-73.95);
-  expect(lastMapGLProps.zoom).toBe(10.86);
-});
-
-test('updates viewport when viewport props change', () => {
-  const { rerender } = render(
-    <MapBox
-      {...defaultProps}
-      viewportLongitude={-73.95}
-      viewportLatitude={40.75}
-      viewportZoom={10}
-    />,
-  );
-
-  rerender(
-    <MapBox
-      {...defaultProps}
-      viewportLongitude={-122.4}
-      viewportLatitude={37.8}
-      viewportZoom={5}
-    />,
-  );
-
-  expect(lastMapGLProps.longitude).toBe(-122.4);
-  expect(lastMapGLProps.latitude).toBe(37.8);
-  expect(lastMapGLProps.zoom).toBe(5);
-});
-
-test('does not loop when viewport state matches new props', () => {
-  const { rerender } = render(
-    <MapBox
-      {...defaultProps}
-      viewportLongitude={-73.95}
-      viewportLatitude={40.75}
-      viewportZoom={10}
-    />,
-  );
-
-  // Re-render with same props that match the initial viewport state
-  rerender(
-    <MapBox
-      {...defaultProps}
-      viewportLongitude={-73.95}
-      viewportLatitude={40.75}
-      viewportZoom={10}
-    />,
-  );
-
-  // Viewport should still be the fitBounds-computed values since props didn't change
-  expect(lastMapGLProps.longitude).toBe(-73.95);
-  expect(lastMapGLProps.latitude).toBe(40.75);
-  expect(lastMapGLProps.zoom).toBe(10);
-});
-
-test('passes globalOpacity to ScatterPlotGlowOverlay', () => {
-  const { getByTestId } = render(
-    <MapBox {...defaultProps} globalOpacity={0.5} />,
-  );
-  const overlay = getByTestId('scatter-overlay');
-  expect(overlay.dataset.opacity).toBe('0.5');
-});
-
-test('initializes viewport from props when provided', () => {
-  render(
-    <MapBox
-      {...defaultProps}
-      viewportLongitude={-122.4}
-      viewportLatitude={37.8}
-      viewportZoom={5}
-    />,
-  );
-  expect(lastMapGLProps.longitude).toBe(-122.4);
-  expect(lastMapGLProps.latitude).toBe(37.8);
-  expect(lastMapGLProps.zoom).toBe(5);
-});
-
-test('handles undefined bounds gracefully', () => {
-  render(<MapBox {...defaultProps} bounds={undefined} />);
-  expect(lastMapGLProps.longitude).toBe(0);
-  expect(lastMapGLProps.latitude).toBe(0);
-  expect(lastMapGLProps.zoom).toBe(1);
-});
-
-test('applies partial viewport props on update', () => {
-  const { rerender } = render(<MapBox {...defaultProps} />);
-
-  rerender(<MapBox {...defaultProps} viewportLongitude={-122.4} />);
-
-  expect(lastMapGLProps.longitude).toBe(-122.4);
-  expect(lastMapGLProps.latitude).toBe(40.75);
-  expect(lastMapGLProps.zoom).toBe(10.86);
-});
-
-test('restores fitBounds when viewport props are cleared', () => {
-  const { rerender } = render(
-    <MapBox
-      {...defaultProps}
-      viewportLongitude={-122.4}
-      viewportLatitude={37.8}
-      viewportZoom={5}
-    />,
-  );
-
-  // Clear all viewport props (simulates user clearing the controls)
-  rerender(<MapBox {...defaultProps} />);
-
-  // Should revert to fitBounds values
-  expect(lastMapGLProps.longitude).toBe(-73.95);
-  expect(lastMapGLProps.latitude).toBe(40.75);
-  expect(lastMapGLProps.zoom).toBe(10.86);
-});
-
-test('restores only cleared viewport props, keeps the rest', () => {
-  const { rerender } = render(
-    <MapBox
-      {...defaultProps}
-      viewportLongitude={-122.4}
-      viewportLatitude={37.8}
-      viewportZoom={5}
-    />,
-  );
-
-  // Clear only longitude, keep lat/zoom
-  rerender(
-    <MapBox {...defaultProps} viewportLatitude={37.8} viewportZoom={5} />,
-  );
-
-  // Longitude reverts to fitBounds, lat/zoom stay
-  expect(lastMapGLProps.longitude).toBe(-73.95);
-  expect(lastMapGLProps.latitude).toBe(37.8);
-  expect(lastMapGLProps.zoom).toBe(5);
-});
-
-test('applies changed viewport props even when another is cleared simultaneously', () => {
-  const { rerender } = render(
-    <MapBox
-      {...defaultProps}
-      viewportLongitude={-122.4}
-      viewportLatitude={37.8}
-      viewportZoom={5}
-    />,
-  );
-
-  // Clear longitude, change latitude simultaneously
-  rerender(
-    <MapBox {...defaultProps} viewportLatitude={40.0} viewportZoom={5} />,
-  );
-
-  // Longitude reverts to fitBounds, latitude should be the NEW value
-  expect(lastMapGLProps.longitude).toBe(-73.95);
-  expect(lastMapGLProps.latitude).toBe(40.0);
-  expect(lastMapGLProps.zoom).toBe(5);
-});
-
-test('falls back to default viewport when cleared with undefined bounds', () => {
-  const { rerender } = render(
-    <MapBox
-      {...defaultProps}
-      bounds={undefined}
-      viewportLongitude={-122.4}
-      viewportLatitude={37.8}
-      viewportZoom={5}
-    />,
-  );
-
-  // Clear viewport props — no bounds to fitBounds to
-  rerender(<MapBox {...defaultProps} bounds={undefined} />);
-
-  // Should fall back to {0, 0, 1}
-  expect(lastMapGLProps.longitude).toBe(0);
-  expect(lastMapGLProps.latitude).toBe(0);
-  expect(lastMapGLProps.zoom).toBe(1);
-});
-
-test('recomputes fitBounds when bounds change and no explicit viewport is set', () => {
-  const { rerender } = render(<MapBox {...defaultProps} />);
-
-  rerender(
-    <MapBox
-      {...defaultProps}
-      bounds={[
-        [-123.2, 36.5],
-        [-121.8, 38.1],
-      ]}
-    />,
-  );
-
-  expect(lastMapGLProps.longitude).toBe(-122.5);
-  expect(lastMapGLProps.latitude).toBe(37.3);
-  expect(lastMapGLProps.zoom).toBe(10.86);
-});
-
-test('recomputes fitBounds when chart size changes and no explicit viewport is set', () => {
-  const { rerender } = render(<MapBox {...defaultProps} />);
-
-  rerender(<MapBox {...defaultProps} width={1200} height={900} />);
-
-  expect(lastMapGLProps.longitude).toBe(-73.95);
-  expect(lastMapGLProps.latitude).toBe(40.75);
-  expect(lastMapGLProps.zoom).toBe(11.29);
-});
-
-test('recomputes only implicit viewport fields when bounds change', () => {
-  const { rerender } = render(
-    <MapBox {...defaultProps} viewportLongitude={-122.4} />,
-  );
-
-  rerender(
-    <MapBox
-      {...defaultProps}
-      viewportLongitude={-122.4}
-      bounds={[
-        [-123.2, 36.5],
-        [-121.8, 38.1],
-      ]}
-    />,
-  );
-
-  expect(lastMapGLProps.longitude).toBe(-122.4);
-  expect(lastMapGLProps.latitude).toBe(37.3);
-  expect(lastMapGLProps.zoom).toBe(10.86);
-});
-
-test('recomputes only implicit viewport fields when chart size changes', () => {
-  const { rerender } = render(
-    <MapBox {...defaultProps} viewportLatitude={37.8} />,
-  );
-
-  rerender(
-    <MapBox
-      {...defaultProps}
-      viewportLatitude={37.8}
-      width={1200}
-      height={900}
-    />,
-  );
-
-  expect(lastMapGLProps.longitude).toBe(-73.95);
-  expect(lastMapGLProps.latitude).toBe(37.8);
-  expect(lastMapGLProps.zoom).toBe(11.29);
-});
-
-test('recomputes implicit position when zoom stays explicit across bounds changes', () => {
-  const { rerender } = render(<MapBox {...defaultProps} viewportZoom={5} />);
-
-  rerender(
-    <MapBox
-      {...defaultProps}
-      viewportZoom={5}
-      bounds={[
-        [-123.2, 36.5],
-        [-121.8, 38.1],
-      ]}
-    />,
-  );
-
-  expect(lastMapGLProps.longitude).toBe(-122.5);
-  expect(lastMapGLProps.latitude).toBe(37.3);
-  expect(lastMapGLProps.zoom).toBe(5);
-});
-
-test('does not recompute fitBounds on bounds change when an explicit viewport is set', () => {
-  const { rerender } = render(
-    <MapBox
-      {...defaultProps}
-      viewportLongitude={-122.4}
-      viewportLatitude={37.8}
-      viewportZoom={5}
-    />,
-  );
-
-  rerender(
-    <MapBox
-      {...defaultProps}
-      viewportLongitude={-122.4}
-      viewportLatitude={37.8}
-      viewportZoom={5}
-      bounds={[
-        [-123.2, 36.5],
-        [-121.8, 38.1],
-      ]}
-    />,
-  );
-
-  expect(lastMapGLProps.longitude).toBe(-122.4);
-  expect(lastMapGLProps.latitude).toBe(37.8);
-  expect(lastMapGLProps.zoom).toBe(5);
-});
diff --git a/superset-frontend/plugins/legacy-plugin-chart-map-box/test/ScatterPlotGlowOverlay.test.tsx b/superset-frontend/plugins/legacy-plugin-chart-map-box/test/ScatterPlotGlowOverlay.test.tsx
deleted file mode 100644
index 27dffc2ed2f..00000000000
--- a/superset-frontend/plugins/legacy-plugin-chart-map-box/test/ScatterPlotGlowOverlay.test.tsx
+++ /dev/null
@@ -1,346 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import { render } from '@testing-library/react';
-import ScatterPlotGlowOverlay from '../src/ScatterPlotGlowOverlay';
-
-// Mock react-map-gl's CanvasOverlay
-jest.mock('react-map-gl', () => ({
-  CanvasOverlay: ({ redraw }: { redraw: Function }) => {
-    // Store the redraw function so tests can call it
-    (global as any).mockRedraw = redraw;
-    return <div data-testid="canvas-overlay" />;
-  },
-}));
-
-// Mock utility functions
-jest.mock('../src/utils/luminanceFromRGB', () => ({
-  __esModule: true,
-  default: jest.fn(() => 150), // Return a value above the dark threshold
-}));
-
-// Test helpers
-const createMockCanvas = () => {
-  const ctx: any = {
-    clearRect: jest.fn(),
-    beginPath: jest.fn(),
-    arc: jest.fn(),
-    fill: jest.fn(),
-    fillText: jest.fn(),
-    measureText: jest.fn(() => ({ width: 10 })),
-    createRadialGradient: jest.fn(() => ({
-      addColorStop: jest.fn(),
-    })),
-    globalCompositeOperation: '',
-    fillStyle: '',
-    font: '',
-    textAlign: '',
-    textBaseline: '',
-    shadowBlur: 0,
-    shadowColor: '',
-  };
-
-  return ctx;
-};
-
-const createMockRedrawParams = (overrides = {}) => ({
-  width: 800,
-  height: 600,
-  ctx: createMockCanvas(),
-  isDragging: false,
-  project: (lngLat: [number, number]) => lngLat,
-  ...overrides,
-});
-
-const createLocation = (
-  coordinates: [number, number],
-  properties: Record<string, any>,
-) => ({
-  geometry: { coordinates },
-  properties,
-});
-
-const defaultProps = {
-  lngLatAccessor: (loc: any) => loc.geometry.coordinates,
-  dotRadius: 60,
-  rgb: ['', 255, 0, 0] as any,
-  globalOpacity: 1,
-};
-
-test('renders map with varying radius values in Pixels mode', () => {
-  const locations = [
-    createLocation([100, 100], { radius: 10, cluster: false }),
-    createLocation([200, 200], { radius: 50, cluster: false }),
-    createLocation([300, 300], { radius: 100, cluster: false }),
-  ];
-
-  expect(() => {
-    render(
-      <ScatterPlotGlowOverlay
-        {...defaultProps}
-        locations={locations}
-        pointRadiusUnit="Pixels"
-      />,
-    );
-    const redrawParams = createMockRedrawParams();
-    (global as any).mockRedraw(redrawParams);
-  }).not.toThrow();
-});
-
-test('handles dataset with uniform radius values', () => {
-  const locations = [
-    createLocation([100, 100], { radius: 50, cluster: false }),
-    createLocation([200, 200], { radius: 50, cluster: false }),
-    createLocation([300, 300], { radius: 50, cluster: false }),
-  ];
-
-  expect(() => {
-    render(
-      <ScatterPlotGlowOverlay
-        {...defaultProps}
-        locations={locations}
-        pointRadiusUnit="Pixels"
-      />,
-    );
-    const redrawParams = createMockRedrawParams();
-    (global as any).mockRedraw(redrawParams);
-  }).not.toThrow();
-});
-
-test('renders successfully when data contains non-finite values', () => {
-  const locations = [
-    createLocation([100, 100], { radius: 10, cluster: false }),
-    createLocation([200, 200], { radius: NaN, cluster: false }),
-    createLocation([300, 300], { radius: 100, cluster: false }),
-  ];
-
-  expect(() => {
-    render(
-      <ScatterPlotGlowOverlay
-        {...defaultProps}
-        locations={locations}
-        pointRadiusUnit="Pixels"
-      />,
-    );
-    const redrawParams = createMockRedrawParams();
-    (global as any).mockRedraw(redrawParams);
-  }).not.toThrow();
-});
-
-test('handles radius values provided as strings', () => {
-  const locations = [
-    createLocation([100, 100], { radius: '10', cluster: false }),
-    createLocation([200, 200], { radius: '50', cluster: false }),
-    createLocation([300, 300], { radius: '100', cluster: false }),
-  ];
-
-  expect(() => {
-    render(
-      <ScatterPlotGlowOverlay
-        {...defaultProps}
-        locations={locations}
-        pointRadiusUnit="Pixels"
-      />,
-    );
-    const redrawParams = createMockRedrawParams();
-    (global as any).mockRedraw(redrawParams);
-  }).not.toThrow();
-});
-
-test('renders points when radius values are missing', () => {
-  const locations = [
-    createLocation([100, 100], { radius: null, cluster: false }),
-    createLocation([200, 200], { radius: undefined, cluster: false }),
-    createLocation([300, 300], { cluster: false }),
-  ];
-
-  expect(() => {
-    render(
-      <ScatterPlotGlowOverlay
-        {...defaultProps}
-        locations={locations}
-        pointRadiusUnit="Pixels"
-      />,
-    );
-    const redrawParams = createMockRedrawParams();
-    (global as any).mockRedraw(redrawParams);
-  }).not.toThrow();
-});
-
-test('renders both cluster and non-cluster points correctly', () => {
-  const locations = [
-    createLocation([100, 100], { radius: 10, cluster: false }),
-    createLocation([200, 200], {
-      radius: 999,
-      cluster: true,
-      point_count: 5,
-      sum: 100,
-    }),
-    createLocation([300, 300], { radius: 100, cluster: false }),
-  ];
-
-  expect(() => {
-    render(
-      <ScatterPlotGlowOverlay
-        {...defaultProps}
-        locations={locations}
-        pointRadiusUnit="Pixels"
-      />,
-    );
-    const redrawParams = createMockRedrawParams();
-    (global as any).mockRedraw(redrawParams);
-  }).not.toThrow();
-});
-
-test('renders map with multiple points with different radius values', () => {
-  const locations = [
-    createLocation([100, 100], { radius: 10, cluster: false }),
-    createLocation([200, 200], { radius: 42.567, cluster: false }),
-    createLocation([300, 300], { radius: 100, cluster: false }),
-  ];
-
-  expect(() => {
-    render(
-      <ScatterPlotGlowOverlay
-        {...defaultProps}
-        locations={locations}
-        pointRadiusUnit="Pixels"
-      />,
-    );
-    const redrawParams = createMockRedrawParams();
-    (global as any).mockRedraw(redrawParams);
-  }).not.toThrow();
-});
-
-test('renders map with Kilometers mode', () => {
-  const locations = [
-    createLocation([100, 50], { radius: 10, cluster: false }),
-    createLocation([200, 50], { radius: 5, cluster: false }),
-  ];
-
-  expect(() => {
-    render(
-      <ScatterPlotGlowOverlay
-        {...defaultProps}
-        locations={locations}
-        pointRadiusUnit="Kilometers"
-        zoom={10}
-      />,
-    );
-    const redrawParams = createMockRedrawParams();
-    (global as any).mockRedraw(redrawParams);
-  }).not.toThrow();
-});
-
-test('renders map with Miles mode', () => {
-  const locations = [
-    createLocation([100, 50], { radius: 5, cluster: false }),
-    createLocation([200, 50], { radius: 10, cluster: false }),
-  ];
-
-  expect(() => {
-    render(
-      <ScatterPlotGlowOverlay
-        {...defaultProps}
-        locations={locations}
-        pointRadiusUnit="Miles"
-        zoom={10}
-      />,
-    );
-    const redrawParams = createMockRedrawParams();
-    (global as any).mockRedraw(redrawParams);
-  }).not.toThrow();
-});
-
-test('displays metric property labels on points', () => {
-  const locations = [
-    createLocation([100, 100], { radius: 50, metric: 123.456, cluster: false }),
-  ];
-
-  expect(() => {
-    render(
-      <ScatterPlotGlowOverlay
-        {...defaultProps}
-        locations={locations}
-        pointRadiusUnit="Pixels"
-      />,
-    );
-    const redrawParams = createMockRedrawParams();
-    (global as any).mockRedraw(redrawParams);
-  }).not.toThrow();
-});
-
-test('handles empty dataset without errors', () => {
-  expect(() => {
-    render(
-      <ScatterPlotGlowOverlay
-        {...defaultProps}
-        locations={[]}
-        pointRadiusUnit="Pixels"
-      />,
-    );
-    const redrawParams = createMockRedrawParams();
-    (global as any).mockRedraw(redrawParams);
-  }).not.toThrow();
-});
-
-test('handles extreme outlier radius values without breaking', () => {
-  const locations = [
-    createLocation([100, 100], { radius: 1, cluster: false }),
-    createLocation([200, 200], { radius: 50, cluster: false }),
-    createLocation([300, 300], { radius: 999999, cluster: false }),
-  ];
-
-  expect(() => {
-    render(
-      <ScatterPlotGlowOverlay
-        {...defaultProps}
-        locations={locations}
-        pointRadiusUnit="Pixels"
-      />,
-    );
-    const redrawParams = createMockRedrawParams();
-    (global as any).mockRedraw(redrawParams);
-  }).not.toThrow();
-});
-
-test('renders successfully with mixed extreme and negative radius values', () => {
-  const locations = [
-    createLocation([100, 100], { radius: 0.001, cluster: false }),
-    createLocation([150, 150], { radius: 5, cluster: false }),
-    createLocation([200, 200], { radius: 100, cluster: false }),
-    createLocation([250, 250], { radius: 50000, cluster: false }),
-    createLocation([300, 300], { radius: -10, cluster: false }),
-  ];
-
-  expect(() => {
-    render(
-      <ScatterPlotGlowOverlay
-        {...defaultProps}
-        locations={locations}
-        pointRadiusUnit="Pixels"
-      />,
-    );
-  }).not.toThrow();
-
-  expect(() => {
-    const redrawParams = createMockRedrawParams();
-    (global as any).mockRedraw(redrawParams);
-  }).not.toThrow();
-});
diff --git a/superset-frontend/plugins/legacy-plugin-chart-map-box/test/tsconfig.json b/superset-frontend/plugins/legacy-plugin-chart-map-box/test/tsconfig.json
deleted file mode 100644
index 42fa49ba514..00000000000
--- a/superset-frontend/plugins/legacy-plugin-chart-map-box/test/tsconfig.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "compilerOptions": {
-    "composite": false,
-    "emitDeclarationOnly": false,
-    "rootDir": "."
-  },
-  "extends": "../../../tsconfig.json",
-  "include": ["**/*", "../types/**/*", "../../../types/**/*"]
-}
diff --git a/superset-frontend/plugins/legacy-plugin-chart-map-box/tsconfig.json b/superset-frontend/plugins/legacy-plugin-chart-map-box/tsconfig.json
deleted file mode 100644
index 03190ec5bd4..00000000000
--- a/superset-frontend/plugins/legacy-plugin-chart-map-box/tsconfig.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "extends": "../../tsconfig.json",
-  "compilerOptions": {
-    // Path Resolution: Override baseUrl to maintain correct path mappings from parent config
-    // (e.g., "@apache-superset/core" -> "./packages/superset-core/src")
-    "baseUrl": "../..",
-
-    // Directory Overrides: Parent config paths are relative to frontend root,
-    // but packages need paths relative to their own directory
-    "outDir": "lib",
-    "rootDir": "src",
-    "declarationDir": "lib"
-  },
-  "include": ["src/**/*.ts", "src/**/*.tsx", "types/**/*"],
-  "exclude": [
-    "src/**/*.js",
-    "src/**/*.jsx",
-    "src/**/*.test.*",
-    "src/**/*.stories.*"],
-  "references": [
-    { "path": "../../packages/superset-core" },
-    { "path": "../../packages/superset-ui-core" },
-    { "path": "../../packages/superset-ui-chart-controls" }
-  ]
-}
diff --git a/superset-frontend/plugins/legacy-plugin-chart-map-box/types/external.d.ts b/superset-frontend/plugins/legacy-plugin-chart-map-box/types/external.d.ts
deleted file mode 100644
index 89134501f25..00000000000
--- a/superset-frontend/plugins/legacy-plugin-chart-map-box/types/external.d.ts
+++ /dev/null
@@ -1,101 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-declare module '*.png' {
-  const value: string;
-  export default value;
-}
-
-declare module '*.jpg' {
-  const value: string;
-  export default value;
-}
-
-declare module 'supercluster' {
-  interface Options<P = Record<string, unknown>, C = Record<string, unknown>> {
-    minZoom?: number;
-    maxZoom?: number;
-    minPoints?: number;
-    radius?: number;
-    extent?: number;
-    nodeSize?: number;
-    log?: boolean;
-    initial?: () => C;
-    map?: (props: P) => C;
-    reduce?: (accumulated: C, props: C) => void;
-  }
-
-  interface GeoJSONFeature {
-    type: string;
-    geometry: {
-      type: string;
-      coordinates: [number, number];
-    };
-    properties: Record<string, unknown>;
-  }
-
-  class Supercluster<P = Record<string, unknown>, C = Record<string, unknown>> {
-    constructor(options?: Options<P, C>);
-    load(points: GeoJSONFeature[]): Supercluster<P, C>;
-    getClusters(bbox: number[], zoom: number): GeoJSONFeature[];
-    getTile(z: number, x: number, y: number): GeoJSONFeature[] | null;
-    getChildren(clusterId: number): GeoJSONFeature[];
-    getLeaves(
-      clusterId: number,
-      limit?: number,
-      offset?: number,
-    ): GeoJSONFeature[];
-    getClusterExpansionZoom(clusterId: number): number;
-  }
-
-  export default Supercluster;
-  export { Options, GeoJSONFeature };
-}
-
-declare module 'react-map-gl' {
-  import { Component, ReactNode } from 'react';
-
-  interface MapGLProps {
-    width?: number;
-    height?: number;
-    latitude?: number;
-    longitude?: number;
-    zoom?: number;
-    mapStyle?: string;
-    mapboxApiAccessToken?: string;
-    onViewportChange?: Function;
-    preserveDrawingBuffer?: boolean;
-    children?: ReactNode;
-    [key: string]: unknown;
-  }
-
-  export default class MapGL extends Component<MapGLProps> {}
-
-  interface CanvasOverlayProps {
-    redraw: (params: {
-      width: number;
-      height: number;
-      ctx: CanvasRenderingContext2D;
-      isDragging: boolean;
-      project: (lngLat: [number, number]) => [number, number];
-    }) => void;
-  }
-
-  export class CanvasOverlay extends Component<CanvasOverlayProps> {}
-}
diff --git a/superset-frontend/plugins/legacy-plugin-chart-parallel-coordinates/src/ParallelCoordinates.ts b/superset-frontend/plugins/legacy-plugin-chart-parallel-coordinates/src/ParallelCoordinates.ts
index 67ae1c2686c..844cd05ac06 100644
--- a/superset-frontend/plugins/legacy-plugin-chart-parallel-coordinates/src/ParallelCoordinates.ts
+++ b/superset-frontend/plugins/legacy-plugin-chart-parallel-coordinates/src/ParallelCoordinates.ts
@@ -47,7 +47,9 @@ interface ParallelCoordinatesProps {
   width: number;
   height: number;
   colorMetric: string;
+  defaultLineColor: string;
   includeSeries: boolean;
+  isDarkMode: boolean;
   linearColorScheme: string;
   metrics: string[];
   series: string;
@@ -63,7 +65,9 @@ function ParallelCoordinates(
     width,
     height,
     colorMetric,
+    defaultLineColor,
     includeSeries,
+    isDarkMode,
     linearColorScheme,
     metrics,
     series,
@@ -87,9 +91,25 @@ function ParallelCoordinates(
             (d: Record<string, unknown>) => d[colorMetric] as number,
           ),
         )
-    : () => 'grey';
-  const color = (d: Record<string, unknown>) =>
-    (colorScale as Function)(d[colorMetric]);
+    : null;
+
+  const brightenForDarkMode = (colorStr: string): string => {
+    const hsl = d3.hsl(colorStr);
+    if (hsl.l < 0.5) {
+      hsl.l = Math.min(1, hsl.l + 0.4);
+      return hsl.toString();
+    }
+    return colorStr;
+  };
+
+  const color = (d: Record<string, unknown>): string => {
+    if (!colorScale) {
+      return defaultLineColor;
+    }
+    const baseColor = (colorScale as Function)(d[colorMetric]) as string;
+    return isDarkMode ? brightenForDarkMode(baseColor) : baseColor;
+  };
+
   const container = d3
     .select(element)
     .classed('superset-legacy-chart-parallel-coordinates', true);
@@ -105,7 +125,7 @@ function ParallelCoordinates(
     .width(width)
     .color(color)
     .alpha(0.5)
-    .composite('darken')
+    .composite(isDarkMode ? 'screen' : 'darken')
     .height(effHeight)
     .data(data)
     .dimensions(cols)
diff --git a/superset-frontend/plugins/legacy-plugin-chart-parallel-coordinates/src/ReactParallelCoordinates.tsx b/superset-frontend/plugins/legacy-plugin-chart-parallel-coordinates/src/ReactParallelCoordinates.tsx
index f5e8a5c8a9b..cf64d198650 100644
--- a/superset-frontend/plugins/legacy-plugin-chart-parallel-coordinates/src/ReactParallelCoordinates.tsx
+++ b/superset-frontend/plugins/legacy-plugin-chart-parallel-coordinates/src/ReactParallelCoordinates.tsx
@@ -64,6 +64,7 @@ export default styled(ParallelCoordinates)`
     .parcoords text.label {
       font: 100%;
       font-size: ${theme.fontSizeSM}px;
+      fill: ${theme.colorText};
       cursor: drag;
     }
     .parcoords rect.background {
@@ -85,6 +86,9 @@ export default styled(ParallelCoordinates)`
       stroke: ${theme.colorText};
       shape-rendering: crispEdges;
     }
+    .parcoords .axis text {
+      fill: ${theme.colorText};
+    }
     .parcoords canvas {
       opacity: 1;
       -moz-transition: opacity 0.3s;
diff --git a/superset-frontend/plugins/legacy-plugin-chart-parallel-coordinates/src/transformProps.ts b/superset-frontend/plugins/legacy-plugin-chart-parallel-coordinates/src/transformProps.ts
index afb4759bf88..94a065717ed 100644
--- a/superset-frontend/plugins/legacy-plugin-chart-parallel-coordinates/src/transformProps.ts
+++ b/superset-frontend/plugins/legacy-plugin-chart-parallel-coordinates/src/transformProps.ts
@@ -17,9 +17,10 @@
  * under the License.
  */
 import { ChartProps } from '@superset-ui/core';
+import { isThemeDark } from '@apache-superset/core/theme';
 
 export default function transformProps(chartProps: ChartProps) {
-  const { width, height, formData, queriesData } = chartProps;
+  const { width, height, formData, queriesData, theme } = chartProps;
   const {
     includeSeries,
     linearColorScheme,
@@ -33,15 +34,14 @@ export default function transformProps(chartProps: ChartProps) {
     width,
     height,
     data: queriesData[0].data,
+    defaultLineColor: theme.colorTextTertiary,
     includeSeries,
+    isDarkMode: isThemeDark(theme),
     linearColorScheme,
     metrics: metrics.map((m: { label?: string } | string) =>
       typeof m === 'string' ? m : m.label || m,
     ),
-    colorMetric:
-      secondaryMetric && secondaryMetric.label
-        ? secondaryMetric.label
-        : secondaryMetric,
+    colorMetric: secondaryMetric?.label || secondaryMetric,
     series,
     showDatatable,
   };
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/CHANGELOG.md b/superset-frontend/plugins/legacy-preset-chart-deckgl/CHANGELOG.md
deleted file mode 100644
index dbca781a9d7..00000000000
--- a/superset-frontend/plugins/legacy-preset-chart-deckgl/CHANGELOG.md
+++ /dev/null
@@ -1,89 +0,0 @@
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied.  See the License for the
-  specific language governing permissions and limitations
-  under the License.
--->
-
-# Change Log
-
-All notable changes to this project will be documented in this file.
-See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
-
-## [0.20.4](https://github.com/apache/superset/compare/v0.20.3...v0.20.4) (2024-12-10)
-
-**Note:** Version bump only for package @superset-ui/legacy-preset-chart-deckgl
-
-# [0.20.0](https://github.com/apache/superset/compare/v2021.41.0...v0.20.0) (2024-09-09)
-
-### Bug Fixes
-
-- **Dashboard:** Color inconsistency on refreshes and conflicts ([#27439](https://github.com/apache/superset/issues/27439)) ([313ee59](https://github.com/apache/superset/commit/313ee596f5435894f857d72be7269d5070c8c964))
-- deck.gl Geojson path not visible ([#24428](https://github.com/apache/superset/issues/24428)) ([6bb930e](https://github.com/apache/superset/commit/6bb930ef4ed26ea381e7f8e889851aa7867ba0eb))
-- deck.gl GeoJsonLayer Autozoom & fill/stroke options ([#19778](https://github.com/apache/superset/issues/19778)) ([d65b77e](https://github.com/apache/superset/commit/d65b77ec7dac4c2368fcaa1fe6e98db102966198))
-- **deck.gl Multiple Layer Chart:** Add Contour and Heatmap Layer as options ([#25923](https://github.com/apache/superset/issues/25923)) ([64ba579](https://github.com/apache/superset/commit/64ba5797df92d0f8067ccd2b30ba6ff58e0bd791))
-- deck.gl Scatterplot min/max radius ([#24363](https://github.com/apache/superset/issues/24363)) ([c728cdf](https://github.com/apache/superset/commit/c728cdf501ec292beb14a0982265052bf2274bec))
-- **deck.gl:** multiple layers map size is shrunk ([#18939](https://github.com/apache/superset/issues/18939)) ([2cb3635](https://github.com/apache/superset/commit/2cb3635256ee8e91f0bac2f3091684673c04ff2b))
-- **deck.gl:** update view state on property changes ([#17720](https://github.com/apache/superset/issues/17720)) ([#17826](https://github.com/apache/superset/issues/17826)) ([97d918b](https://github.com/apache/superset/commit/97d918b6927f572dca3b33c61b89c8b3ebdc4376))
-- DeckGL legend layout ([#30140](https://github.com/apache/superset/issues/30140)) ([af066a4](https://github.com/apache/superset/commit/af066a46306f2f476aa2944b14df3de1faf1e96d))
-- **deckgl:** deckgl unable to load map ([#17851](https://github.com/apache/superset/issues/17851)) ([52f5dcb](https://github.com/apache/superset/commit/52f5dcb58eec7b188f4387b8781dcda4252a5680))
-- **explore:** Fix chart standalone URL for report/thumbnail generation ([#20673](https://github.com/apache/superset/issues/20673)) ([84d4302](https://github.com/apache/superset/commit/84d4302628d18aa19c13cc5322e68abbc690ea4d))
-- **explore:** Prevent shared controls from checking feature flags outside React render ([#21315](https://github.com/apache/superset/issues/21315)) ([2285ebe](https://github.com/apache/superset/commit/2285ebe72ec4edded6d195052740b7f9f13d1f1b))
-- weight tooltip issue ([#19397](https://github.com/apache/superset/issues/19397)) ([f6d550b](https://github.com/apache/superset/commit/f6d550b7fc3643350483850064e65dbd3d026dc4))
-
-### Features
-
-- Add Deck.gl Contour Layer ([#24154](https://github.com/apache/superset/issues/24154)) ([512fb9a](https://github.com/apache/superset/commit/512fb9a0bdd428b94b0c121158b8b15b7631e0fb))
-- Add deck.gl Heatmap Visualization ([#23551](https://github.com/apache/superset/issues/23551)) ([fc8c537](https://github.com/apache/superset/commit/fc8c537118ce6c7b3a4624f88a31e2e7fb287327))
-- Add line width unit control in deckgl Polygon and Path ([#24755](https://github.com/apache/superset/issues/24755)) ([d26ea98](https://github.com/apache/superset/commit/d26ea980acc7d2a20757efc360d810afe83d5c65))
-- apply standardized form data to deckgl ([#20579](https://github.com/apache/superset/issues/20579)) ([290b89c](https://github.com/apache/superset/commit/290b89c7b4ae702c55f611bfac9cedb245ea8bd8))
-- **deck.gl:** add color range for deck.gl 3D ([#19520](https://github.com/apache/superset/issues/19520)) ([c0a00fd](https://github.com/apache/superset/commit/c0a00fd302ec66fbe0ca766cf73978c99ba00d82))
-- **deckgl-map:** use an arbitraty Mabpox style URL ([#26027](https://github.com/apache/superset/issues/26027)) ([#26031](https://github.com/apache/superset/issues/26031)) ([af58784](https://github.com/apache/superset/commit/af587840403d83a7da7fb0f57bc10ad2335d4eeb))
-- **explore:** Frontend implementation of dataset creation from infobox ([#19855](https://github.com/apache/superset/issues/19855)) ([ba0c37d](https://github.com/apache/superset/commit/ba0c37d3df85b1af39404af1d578daeb0ff2d278))
-- improve color consistency (save all labels) ([#19038](https://github.com/apache/superset/issues/19038)) ([dc57508](https://github.com/apache/superset/commit/dc575080d7e43d40b1734bb8f44fdc291cb95b11))
-- **legacy-preset-chart-deckgl:** Add ,.1f and ,.2f value formats to deckgl charts ([#18945](https://github.com/apache/superset/issues/18945)) ([c56dc8e](https://github.com/apache/superset/commit/c56dc8eace6a71b45240d1bb6768d75661052a2e))
-- make data tables support html ([#24368](https://github.com/apache/superset/issues/24368)) ([d2b0b8e](https://github.com/apache/superset/commit/d2b0b8eac52ad8b68639c6581a1ed174a593f564))
-- **viz picker:** Remove some tags, refactor Recommended section ([#27708](https://github.com/apache/superset/issues/27708)) ([c314999](https://github.com/apache/superset/commit/c3149994ac0d4392e0462421b62cd0c034142082))
-
-# [0.19.0](https://github.com/apache/superset/compare/v2021.41.0...v0.19.0) (2024-09-07)
-
-### Bug Fixes
-
-- **Dashboard:** Color inconsistency on refreshes and conflicts ([#27439](https://github.com/apache/superset/issues/27439)) ([313ee59](https://github.com/apache/superset/commit/313ee596f5435894f857d72be7269d5070c8c964))
-- deck.gl Geojson path not visible ([#24428](https://github.com/apache/superset/issues/24428)) ([6bb930e](https://github.com/apache/superset/commit/6bb930ef4ed26ea381e7f8e889851aa7867ba0eb))
-- deck.gl GeoJsonLayer Autozoom & fill/stroke options ([#19778](https://github.com/apache/superset/issues/19778)) ([d65b77e](https://github.com/apache/superset/commit/d65b77ec7dac4c2368fcaa1fe6e98db102966198))
-- **deck.gl Multiple Layer Chart:** Add Contour and Heatmap Layer as options ([#25923](https://github.com/apache/superset/issues/25923)) ([64ba579](https://github.com/apache/superset/commit/64ba5797df92d0f8067ccd2b30ba6ff58e0bd791))
-- deck.gl Scatterplot min/max radius ([#24363](https://github.com/apache/superset/issues/24363)) ([c728cdf](https://github.com/apache/superset/commit/c728cdf501ec292beb14a0982265052bf2274bec))
-- **deck.gl:** multiple layers map size is shrunk ([#18939](https://github.com/apache/superset/issues/18939)) ([2cb3635](https://github.com/apache/superset/commit/2cb3635256ee8e91f0bac2f3091684673c04ff2b))
-- **deck.gl:** update view state on property changes ([#17720](https://github.com/apache/superset/issues/17720)) ([#17826](https://github.com/apache/superset/issues/17826)) ([97d918b](https://github.com/apache/superset/commit/97d918b6927f572dca3b33c61b89c8b3ebdc4376))
-- DeckGL legend layout ([#30140](https://github.com/apache/superset/issues/30140)) ([af066a4](https://github.com/apache/superset/commit/af066a46306f2f476aa2944b14df3de1faf1e96d))
-- **deckgl:** deckgl unable to load map ([#17851](https://github.com/apache/superset/issues/17851)) ([52f5dcb](https://github.com/apache/superset/commit/52f5dcb58eec7b188f4387b8781dcda4252a5680))
-- **explore:** Fix chart standalone URL for report/thumbnail generation ([#20673](https://github.com/apache/superset/issues/20673)) ([84d4302](https://github.com/apache/superset/commit/84d4302628d18aa19c13cc5322e68abbc690ea4d))
-- **explore:** Prevent shared controls from checking feature flags outside React render ([#21315](https://github.com/apache/superset/issues/21315)) ([2285ebe](https://github.com/apache/superset/commit/2285ebe72ec4edded6d195052740b7f9f13d1f1b))
-- weight tooltip issue ([#19397](https://github.com/apache/superset/issues/19397)) ([f6d550b](https://github.com/apache/superset/commit/f6d550b7fc3643350483850064e65dbd3d026dc4))
-
-### Features
-
-- Add Deck.gl Contour Layer ([#24154](https://github.com/apache/superset/issues/24154)) ([512fb9a](https://github.com/apache/superset/commit/512fb9a0bdd428b94b0c121158b8b15b7631e0fb))
-- Add deck.gl Heatmap Visualization ([#23551](https://github.com/apache/superset/issues/23551)) ([fc8c537](https://github.com/apache/superset/commit/fc8c537118ce6c7b3a4624f88a31e2e7fb287327))
-- Add line width unit control in deckgl Polygon and Path ([#24755](https://github.com/apache/superset/issues/24755)) ([d26ea98](https://github.com/apache/superset/commit/d26ea980acc7d2a20757efc360d810afe83d5c65))
-- apply standardized form data to deckgl ([#20579](https://github.com/apache/superset/issues/20579)) ([290b89c](https://github.com/apache/superset/commit/290b89c7b4ae702c55f611bfac9cedb245ea8bd8))
-- **deck.gl:** add color range for deck.gl 3D ([#19520](https://github.com/apache/superset/issues/19520)) ([c0a00fd](https://github.com/apache/superset/commit/c0a00fd302ec66fbe0ca766cf73978c99ba00d82))
-- **deckgl-map:** use an arbitraty Mabpox style URL ([#26027](https://github.com/apache/superset/issues/26027)) ([#26031](https://github.com/apache/superset/issues/26031)) ([af58784](https://github.com/apache/superset/commit/af587840403d83a7da7fb0f57bc10ad2335d4eeb))
-- **explore:** Frontend implementation of dataset creation from infobox ([#19855](https://github.com/apache/superset/issues/19855)) ([ba0c37d](https://github.com/apache/superset/commit/ba0c37d3df85b1af39404af1d578daeb0ff2d278))
-- improve color consistency (save all labels) ([#19038](https://github.com/apache/superset/issues/19038)) ([dc57508](https://github.com/apache/superset/commit/dc575080d7e43d40b1734bb8f44fdc291cb95b11))
-- **legacy-preset-chart-deckgl:** Add ,.1f and ,.2f value formats to deckgl charts ([#18945](https://github.com/apache/superset/issues/18945)) ([c56dc8e](https://github.com/apache/superset/commit/c56dc8eace6a71b45240d1bb6768d75661052a2e))
-- make data tables support html ([#24368](https://github.com/apache/superset/issues/24368)) ([d2b0b8e](https://github.com/apache/superset/commit/d2b0b8eac52ad8b68639c6581a1ed174a593f564))
-- **viz picker:** Remove some tags, refactor Recommended section ([#27708](https://github.com/apache/superset/issues/27708)) ([c314999](https://github.com/apache/superset/commit/c3149994ac0d4392e0462421b62cd0c034142082))
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/README.md b/superset-frontend/plugins/legacy-preset-chart-deckgl/README.md
deleted file mode 100644
index f7455b355d3..00000000000
--- a/superset-frontend/plugins/legacy-preset-chart-deckgl/README.md
+++ /dev/null
@@ -1,57 +0,0 @@
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-## @superset-ui/legacy-preset-chart-deckgl
-
-[![Version](https://img.shields.io/npm/v/@superset-ui/legacy-preset-chart-deckgl.svg?style=flat)](https://img.shields.io/npm/v/@superset-ui/legacy-preset-chart-deckgl.svg?style=flat-square)
-[![Libraries.io](https://img.shields.io/librariesio/release/npm/%40superset-ui%2Flegacy-preset-chart-deckgl?style=flat)](https://libraries.io/npm/@superset-ui%2Flegacy-preset-chart-deckgl)
-
-This plugin provides `deck.gl` for Superset.
-
-### Usage
-
-Import the preset and register. This will register all the chart plugins under `deck.gl`.
-
-```js
-import { DeckGLChartPreset } from '@superset-ui/legacy-preset-chart-deckgl';
-
-new DeckGLChartPreset().register();
-```
-
-or register charts one by one. Configure `key`, which can be any `string`, and register the plugin. This `key` will be used to lookup this chart throughout the app.
-
-```js
-import { ArcChartPlugin } from '@superset-ui/legacy-preset-chart-deckgl';
-
-new ArcChartPlugin().configure({ key: 'deck_arc' }).register();
-```
-
-Then use it via `SuperChart`. See [storybook](https://apache-superset.github.io/superset-ui-plugins-deckgl) for more details.
-
-```js
-<SuperChart
-  chartType="deck_arc"
-  width={600}
-  height={600}
-  formData={...}
-  queriesData={[{
-    data: {...},
-  }]}
-/>
-```
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/types/external.d.ts b/superset-frontend/plugins/legacy-preset-chart-deckgl/types/external.d.ts
deleted file mode 100644
index 7093762a5c7..00000000000
--- a/superset-frontend/plugins/legacy-preset-chart-deckgl/types/external.d.ts
+++ /dev/null
@@ -1,71 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-declare module 'deck.gl' {
-  import { Layer, LayerProps } from '@deck.gl/core';
-
-  interface HeatmapLayerProps<T extends object = any> extends LayerProps<T> {
-    id?: string;
-    data?: T[];
-    getPosition?: (d: T) => number[] | null | undefined;
-    getWeight?: (d: T) => number | null | undefined;
-    radiusPixels?: number;
-    colorRange?: number[][];
-    threshold?: number;
-    intensity?: number;
-    aggregation?: string;
-  }
-
-  interface ContourLayerProps<T extends object = any> extends LayerProps<T> {
-    id?: string;
-    data?: T[];
-    getPosition?: (d: T) => number[] | null | undefined;
-    getWeight?: (d: T) => number | null | undefined;
-    contours: {
-      color?: ColorType | undefined;
-      lowerThreshold?: any | undefined;
-      upperThreshold?: any | undefined;
-      strokeWidth?: any | undefined;
-      zIndex?: any | undefined;
-    };
-    cellSize: number;
-    colorRange?: number[][];
-    intensity?: number;
-    aggregation?: string;
-  }
-
-  export class HeatmapLayer<T extends object = any> extends Layer<
-    T,
-    HeatmapLayerProps<T>
-  > {
-    constructor(props: HeatmapLayerProps<T>);
-  }
-
-  export class ContourLayer<T extends object = any> extends Layer<
-    T,
-    ContourLayerProps<T>
-  > {
-    constructor(props: ContourLayerProps<T>);
-  }
-}
-
-declare module '*.png' {
-  const value: any;
-  export default value;
-}
diff --git a/superset-frontend/plugins/legacy-preset-chart-nvd3/package.json b/superset-frontend/plugins/legacy-preset-chart-nvd3/package.json
index aa4526ebb7a..2c6962b2c86 100644
--- a/superset-frontend/plugins/legacy-preset-chart-nvd3/package.json
+++ b/superset-frontend/plugins/legacy-preset-chart-nvd3/package.json
@@ -32,9 +32,9 @@
     "d3": "^3.5.17",
     "d3-tip": "^0.9.1",
     "fast-safe-stringify": "^2.1.1",
-    "lodash": "^4.17.23",
+    "lodash": "^4.18.1",
     "nvd3-fork": "^2.0.5",
-    "dompurify": "^3.3.3",
+    "dompurify": "^3.4.0",
     "prop-types": "^15.8.1",
     "urijs": "^1.19.11"
   },
diff --git a/superset-frontend/plugins/plugin-chart-ag-grid-table/package.json b/superset-frontend/plugins/plugin-chart-ag-grid-table/package.json
index 0be899eeaba..982c9cf5707 100644
--- a/superset-frontend/plugins/plugin-chart-ag-grid-table/package.json
+++ b/superset-frontend/plugins/plugin-chart-ag-grid-table/package.json
@@ -28,15 +28,15 @@
     "@types/react-table": "^7.7.20",
     "classnames": "^2.5.1",
     "d3-array": "^3.2.4",
-    "lodash": "^4.17.23",
+    "lodash": "^4.18.1",
     "memoize-one": "^5.2.1",
     "react-table": "^7.8.0",
     "regenerator-runtime": "^0.14.1",
     "xss": "^1.0.15"
   },
   "peerDependencies": {
+    "@ant-design/icons": "^5.6.1",
     "@apache-superset/core": "*",
-    "@ant-design/icons": "^5.2.6",
     "@superset-ui/chart-controls": "*",
     "@superset-ui/core": "*",
     "@testing-library/dom": "^8.20.1",
@@ -45,7 +45,6 @@
     "@testing-library/react-hooks": "*",
     "@testing-library/user-event": "*",
     "@types/react": "*",
-    "match-sorter": "^6.3.3",
     "react": "^17.0.2",
     "react-dom": "^17.0.2"
   },
diff --git a/superset-frontend/plugins/plugin-chart-ag-grid-table/src/AgGridTable/index.tsx b/superset-frontend/plugins/plugin-chart-ag-grid-table/src/AgGridTable/index.tsx
index 011c2cf0ef9..5659077765d 100644
--- a/superset-frontend/plugins/plugin-chart-ag-grid-table/src/AgGridTable/index.tsx
+++ b/superset-frontend/plugins/plugin-chart-ag-grid-table/src/AgGridTable/index.tsx
@@ -40,7 +40,7 @@ import {
   GridReadyEvent,
   GridState,
   CellClickedEvent,
-  IMenuActionParams,
+  SelectionChangedEvent,
 } from '@superset-ui/core/components/ThemedAgGridReact';
 import { t } from '@apache-superset/core/translation';
 import {
@@ -56,6 +56,7 @@ import SearchSelectDropdown from './components/SearchSelectDropdown';
 import { SearchOption, SortByItem } from '../types';
 import getInitialSortState, { shouldSort } from '../utils/getInitialSortState';
 import getInitialFilterModel from '../utils/getInitialFilterModel';
+import reconcileColumnState from '../utils/reconcileColumnState';
 import { PAGE_SIZE_OPTIONS } from '../consts';
 import { getCompleteFilterState } from '../utils/filterStateManager';
 
@@ -95,8 +96,9 @@ export interface AgGridTableProps {
   percentMetrics: string[];
   serverPageLength: number;
   hasServerPageLengthChanged: boolean;
-  handleCrossFilter: (event: CellClickedEvent | IMenuActionParams) => void;
-  isActiveFilterValue: (key: string, val: DataRecordValue) => boolean;
+  handleCellClicked: (event: CellClickedEvent) => void;
+  handleSelectionChanged: (event: SelectionChangedEvent) => void;
+  filters?: Record<string, DataRecordValue[]> | null;
   renderTimeComparisonDropdown: () => JSX.Element | null;
   cleanedTotals: DataRecord;
   showTotals: boolean;
@@ -134,8 +136,9 @@ const AgGridDataTable: FunctionComponent<AgGridTableProps> = memo(
     percentMetrics,
     serverPageLength,
     hasServerPageLengthChanged,
-    handleCrossFilter,
-    isActiveFilterValue,
+    handleCellClicked,
+    handleSelectionChanged,
+    filters,
     renderTimeComparisonDropdown,
     cleanedTotals,
     showTotals,
@@ -421,6 +424,15 @@ const AgGridDataTable: FunctionComponent<AgGridTableProps> = memo(
       }
     }, [width]);
 
+    useEffect(() => {
+      if (
+        (!filters || Object.keys(filters).length === 0) &&
+        gridRef.current?.api?.getSelectedRows().length
+      ) {
+        gridRef.current.api.deselectAll();
+      }
+    }, [filters]);
+
     const onGridReady = (params: GridReadyEvent) => {
       // This will make columns fill the grid width
       params.api.sizeColumnsToFit();
@@ -429,10 +441,17 @@ const AgGridDataTable: FunctionComponent<AgGridTableProps> = memo(
       // Note: filterModel is now handled via gridInitialState for better performance
       if (chartState?.columnState && params.api) {
         try {
-          params.api.applyColumnState?.({
-            state: chartState.columnState as ColumnState[],
-            applyOrder: true,
-          });
+          const reconciledColumnState = reconcileColumnState(
+            chartState.columnState as ColumnState[],
+            colDefsFromProps as ColDef[],
+          );
+
+          if (reconciledColumnState) {
+            params.api.applyColumnState?.({
+              state: reconciledColumnState.columnState,
+              applyOrder: reconciledColumnState.applyOrder,
+            });
+          }
         } catch {
           // Silently fail if state restoration fails
         }
@@ -492,7 +511,8 @@ const AgGridDataTable: FunctionComponent<AgGridTableProps> = memo(
           onColumnGroupOpened={params => params.api.sizeColumnsToFit()}
           rowSelection="multiple"
           animateRows
-          onCellClicked={handleCrossFilter}
+          onCellClicked={handleCellClicked}
+          onSelectionChanged={handleSelectionChanged}
           onFilterChanged={handleFilterChanged}
           onStateUpdated={handleGridStateChange}
           initialState={gridInitialState}
@@ -584,7 +604,6 @@ const AgGridDataTable: FunctionComponent<AgGridTableProps> = memo(
             initialSortState: getInitialSortState(
               serverPaginationData?.sortBy || [],
             ),
-            isActiveFilterValue,
             lastFilteredColumn: serverPaginationData?.lastFilteredColumn,
             lastFilteredInputPosition:
               serverPaginationData?.lastFilteredInputPosition,
diff --git a/superset-frontend/plugins/plugin-chart-ag-grid-table/src/AgGridTableChart.tsx b/superset-frontend/plugins/plugin-chart-ag-grid-table/src/AgGridTableChart.tsx
index 0673bdd483a..2695b530dfe 100644
--- a/superset-frontend/plugins/plugin-chart-ag-grid-table/src/AgGridTableChart.tsx
+++ b/superset-frontend/plugins/plugin-chart-ag-grid-table/src/AgGridTableChart.tsx
@@ -23,12 +23,12 @@ import {
   getTimeFormatterForGranularity,
 } from '@superset-ui/core';
 import { GenericDataType } from '@apache-superset/core/common';
-import { useCallback, useEffect, useState, useMemo } from 'react';
+import { useCallback, useEffect, useRef, useState, useMemo } from 'react';
 import { isEqual } from 'lodash';
 
 import {
   CellClickedEvent,
-  IMenuActionParams,
+  SelectionChangedEvent,
 } from '@superset-ui/core/components/ThemedAgGridReact';
 import {
   AgGridTableChartTransformedProps,
@@ -40,7 +40,7 @@ import AgGridDataTable from './AgGridTable';
 import { updateTableOwnState } from './utils/externalAPIs';
 import TimeComparisonVisibility from './AgGridTable/components/TimeComparisonVisibility';
 import { useColDefs } from './utils/useColDefs';
-import { getCrossFilterDataMask } from './utils/getCrossFilterDataMask';
+import { buildSelectionCrossFilterDataMask } from './utils/getCrossFilterDataMask';
 import { StyledChartContainer } from './styles';
 import type { FilterState } from './utils/filterStateManager';
 
@@ -248,7 +248,14 @@ export default function TableChart<D extends DataRecord = DataRecord>(
 
   const isActiveFilterValue = useCallback(
     function isActiveFilterValue(key: string, val: DataRecordValue) {
-      return !!filters && filters[key]?.includes(val);
+      if (!filters || !filters[key]) return false;
+      return filters[key].some(filterVal => {
+        if (filterVal === val) return true;
+        if (filterVal instanceof Date && val instanceof Date) {
+          return filterVal.getTime() === val.getTime();
+        }
+        return false;
+      });
     },
     [filters],
   );
@@ -263,37 +270,68 @@ export default function TableChart<D extends DataRecord = DataRecord>(
     [timeGrain, isRawRecords],
   );
 
-  const toggleFilter = useCallback(
-    (event: CellClickedEvent | IMenuActionParams) => {
+  const activeColumnRef = useRef<string | null>(null);
+
+  const handleCellClicked = useCallback(
+    (event: CellClickedEvent) => {
+      if (!emitCrossFilters || !event.column) return;
+      const colDef = event.column.getColDef();
+      if (colDef.context?.isMetric || colDef.context?.isPercentMetric) return;
+
+      const key = event.column.getColId();
+      activeColumnRef.current = key;
+
+      // Re-click on already-filtered single selection → untoggle
+      // AG Grid doesn't change selection when re-clicking the same row,
+      // so onSelectionChanged won't fire — handle clear directly here
+      const selectedNodes = event.api.getSelectedNodes();
       if (
-        emitCrossFilters &&
-        event.column &&
-        !(
-          event.column.getColDef().context?.isMetric ||
-          event.column.getColDef().context?.isPercentMetric
-        )
+        selectedNodes.length === 1 &&
+        selectedNodes[0] === event.node &&
+        isActiveFilterValue(key, event.value)
       ) {
-        const crossFilterProps = {
-          key: event.column.getColId(),
-          value: event.value,
-          filters,
-          timeGrain,
-          isActiveFilterValue,
-          timestampFormatter,
-        };
-        setDataMask(getCrossFilterDataMask(crossFilterProps).dataMask);
+        event.node.setSelected(false);
+        setDataMask(
+          buildSelectionCrossFilterDataMask({
+            key,
+            values: [],
+            timeGrain,
+            timestampFormatter,
+          }).dataMask,
+        );
       }
     },
     [
       emitCrossFilters,
-      setDataMask,
-      filters,
-      timeGrain,
       isActiveFilterValue,
+      setDataMask,
+      timeGrain,
       timestampFormatter,
     ],
   );
 
+  const handleSelectionChanged = useCallback(
+    (event: SelectionChangedEvent) => {
+      if (!emitCrossFilters || !activeColumnRef.current) return;
+
+      const key = activeColumnRef.current;
+      const selectedRows = event.api.getSelectedRows();
+      const values = selectedRows
+        .map(row => row[key] as DataRecordValue)
+        .filter(v => v != null);
+
+      setDataMask(
+        buildSelectionCrossFilterDataMask({
+          key,
+          values,
+          timeGrain,
+          timestampFormatter,
+        }).dataMask,
+      );
+    },
+    [emitCrossFilters, setDataMask, timeGrain, timestampFormatter],
+  );
+
   const handleServerPaginationChange = useCallback(
     (pageNumber: number, pageSize: number) => {
       const modifiedOwnState = {
@@ -395,11 +433,12 @@ export default function TableChart<D extends DataRecord = DataRecord>(
         onFilterChanged={handleFilterChanged}
         metricColumns={metricColumns}
         id={slice_id}
-        handleCrossFilter={toggleFilter}
+        handleCellClicked={handleCellClicked}
+        handleSelectionChanged={handleSelectionChanged}
+        filters={filters}
         percentMetrics={percentMetrics}
         serverPageLength={serverPageLength}
         hasServerPageLengthChanged={hasServerPageLengthChanged}
-        isActiveFilterValue={isActiveFilterValue}
         renderTimeComparisonDropdown={
           isUsingTimeComparison ? renderTimeComparisonVisibility : () => null
         }
diff --git a/superset-frontend/plugins/plugin-chart-ag-grid-table/src/buildQuery.ts b/superset-frontend/plugins/plugin-chart-ag-grid-table/src/buildQuery.ts
index 3d04b6c1d1c..bbee0e3ab0b 100644
--- a/superset-frontend/plugins/plugin-chart-ag-grid-table/src/buildQuery.ts
+++ b/superset-frontend/plugins/plugin-chart-ag-grid-table/src/buildQuery.ts
@@ -238,12 +238,11 @@ const buildQuery: BuildQuery<TableChartFormData> = (
         });
 
         if (matchingColumn) {
-          if (
-            typeof matchingColumn === 'object' &&
-            'sqlExpression' in matchingColumn
-          ) {
-            return matchingColumn.sqlExpression;
-          }
+          // Return the label, not the raw sqlExpression. The backend
+          // (helpers.py get_sqla_query) resolves orderby strings by
+          // matching adhoc column labels, then uses adhoc_column_to_sqla
+          // to emit the actual SQL expression into ORDER BY — so this
+          // is dialect-safe across all database engines.
           return getColumnLabel(matchingColumn);
         }
 
diff --git a/superset-frontend/plugins/plugin-chart-ag-grid-table/src/styles/index.tsx b/superset-frontend/plugins/plugin-chart-ag-grid-table/src/styles/index.tsx
index 62e1fc35b79..7e5131bdf17 100644
--- a/superset-frontend/plugins/plugin-chart-ag-grid-table/src/styles/index.tsx
+++ b/superset-frontend/plugins/plugin-chart-ag-grid-table/src/styles/index.tsx
@@ -309,6 +309,17 @@ export const StyledChartContainer = styled.div<{
       height: auto;
     }
 
+    .ag-cell {
+      color: var(--ag-cell-value-color, inherit);
+    }
+
+    .ag-row-hover .ag-cell {
+      color: var(
+        --ag-cell-value-hover-color,
+        var(--ag-cell-value-color, inherit)
+      );
+    }
+
     .ag-container {
       border-radius: 0px;
       border: var(--ag-wrapper-border);
diff --git a/superset-frontend/plugins/plugin-chart-ag-grid-table/src/transformProps.ts b/superset-frontend/plugins/plugin-chart-ag-grid-table/src/transformProps.ts
index c27bd856d89..33ac8aa0183 100644
--- a/superset-frontend/plugins/plugin-chart-ag-grid-table/src/transformProps.ts
+++ b/superset-frontend/plugins/plugin-chart-ag-grid-table/src/transformProps.ts
@@ -431,6 +431,11 @@ const processColumns = memoizeOne(function processColumns(
         formatter,
         config,
       };
+    })
+    .sort((a, b) => {
+      const aIsMetric = a.isMetric || a.isPercentMetric ? 1 : 0;
+      const bIsMetric = b.isMetric || b.isPercentMetric ? 1 : 0;
+      return aIsMetric - bIsMetric;
     });
   return [metrics, percentMetrics, columns] as [
     typeof metrics,
diff --git a/superset-frontend/plugins/plugin-chart-ag-grid-table/src/utils/getCellClass.ts b/superset-frontend/plugins/plugin-chart-ag-grid-table/src/utils/getCellClass.ts
index fec452ef581..534357756b9 100644
--- a/superset-frontend/plugins/plugin-chart-ag-grid-table/src/utils/getCellClass.ts
+++ b/superset-frontend/plugins/plugin-chart-ag-grid-table/src/utils/getCellClass.ts
@@ -27,15 +27,11 @@ type GetCellClassParams = CellClassParams & {
 
 const getCellClass = (params: GetCellClassParams) => {
   const { col, emitCrossFilters } = params;
-  const isActiveFilterValue = params?.context?.isActiveFilterValue;
   let className = '';
   if (emitCrossFilters) {
     if (!col?.isMetric) {
       className += ' dt-is-filter';
     }
-    if (isActiveFilterValue?.(col?.key, params?.value)) {
-      className += ' dt-is-active-filter';
-    }
     if (col?.config?.truncateLongCells) {
       className += ' dt-truncate-cell';
     }
diff --git a/superset-frontend/plugins/plugin-chart-ag-grid-table/src/utils/getCellStyle.ts b/superset-frontend/plugins/plugin-chart-ag-grid-table/src/utils/getCellStyle.ts
index 1aab42b836f..ac5eb26b54a 100644
--- a/superset-frontend/plugins/plugin-chart-ag-grid-table/src/utils/getCellStyle.ts
+++ b/superset-frontend/plugins/plugin-chart-ag-grid-table/src/utils/getCellStyle.ts
@@ -17,7 +17,11 @@
  * under the License.
  */
 
-import { ColorFormatters } from '@superset-ui/chart-controls';
+import {
+  ColorFormatters,
+  getTextColorForBackground,
+  ObjectFormattingEnum,
+} from '@superset-ui/chart-controls';
 import { CellClassParams } from '@superset-ui/core/components/ThemedAgGridReact';
 import { BasicColorFormatterType, InputColumn } from '../types';
 
@@ -29,6 +33,8 @@ type CellStyleParams = CellClassParams & {
     [Key: string]: BasicColorFormatterType;
   }[];
   col: InputColumn;
+  cellSurfaceColor: string;
+  hoverCellSurfaceColor: string;
 };
 
 const getCellStyle = (params: CellStyleParams) => {
@@ -42,8 +48,11 @@ const getCellStyle = (params: CellStyleParams) => {
     columnColorFormatters,
     col,
     node,
+    cellSurfaceColor,
+    hoverCellSurfaceColor,
   } = params;
   let backgroundColor;
+  let color;
   if (hasColumnColorFormatters) {
     columnColorFormatters!
       .filter(formatter => {
@@ -56,7 +65,16 @@ const getCellStyle = (params: CellStyleParams) => {
         const formatterResult =
           value || value === 0 ? formatter.getColorFromValue(value) : false;
         if (formatterResult) {
-          backgroundColor = formatterResult;
+          if (
+            formatter.objectFormatting === ObjectFormattingEnum.TEXT_COLOR ||
+            formatter.toTextColor
+          ) {
+            color = formatterResult;
+          } else if (
+            formatter.objectFormatting !== ObjectFormattingEnum.CELL_BAR
+          ) {
+            backgroundColor = formatterResult;
+          }
         }
       });
   }
@@ -72,9 +90,20 @@ const getCellStyle = (params: CellStyleParams) => {
 
   const textAlign =
     col?.config?.horizontalAlign || (col?.isNumeric ? 'right' : 'left');
+  const resolvedTextColor = getTextColorForBackground(
+    { backgroundColor, color },
+    cellSurfaceColor,
+  );
+  const hoverResolvedTextColor = getTextColorForBackground(
+    { backgroundColor, color },
+    hoverCellSurfaceColor,
+  );
 
   return {
     backgroundColor: backgroundColor || '',
+    color: '',
+    '--ag-cell-value-color': resolvedTextColor || '',
+    '--ag-cell-value-hover-color': hoverResolvedTextColor || '',
     textAlign,
   };
 };
diff --git a/superset-frontend/plugins/plugin-chart-ag-grid-table/src/utils/getCrossFilterDataMask.ts b/superset-frontend/plugins/plugin-chart-ag-grid-table/src/utils/getCrossFilterDataMask.ts
index 6cf09e9be7e..ef404606931 100644
--- a/superset-frontend/plugins/plugin-chart-ag-grid-table/src/utils/getCrossFilterDataMask.ts
+++ b/superset-frontend/plugins/plugin-chart-ag-grid-table/src/utils/getCrossFilterDataMask.ts
@@ -34,6 +34,55 @@ type GetCrossFilterDataMaskProps = {
   timestampFormatter: (value: DataRecordValue) => string;
 };
 
+type BuildSelectionCrossFilterProps = {
+  key: string;
+  values: DataRecordValue[];
+  timeGrain?: TimeGranularity;
+  timestampFormatter: (value: DataRecordValue) => string;
+};
+
+export const buildSelectionCrossFilterDataMask = ({
+  key,
+  values,
+  timeGrain,
+  timestampFormatter,
+}: BuildSelectionCrossFilterProps) => {
+  if (values.length === 0) {
+    return {
+      dataMask: {
+        extraFormData: { filters: [] },
+        filterState: { label: null, value: null, filters: null },
+      },
+    };
+  }
+
+  const updatedFilters: DataRecordFilters = { [key]: values };
+  const isTimestamp = key === DTTM_ALIAS;
+  const label = values
+    .map(v => (isTimestamp ? timestampFormatter(v) : v))
+    .join(', ');
+
+  return {
+    dataMask: {
+      extraFormData: {
+        filters: [
+          {
+            col: key,
+            op: 'IN' as const,
+            val: values.map(el => (el instanceof Date ? el.getTime() : el!)),
+            grain: isTimestamp ? timeGrain : undefined,
+          },
+        ],
+      },
+      filterState: {
+        label,
+        value: [values],
+        filters: updatedFilters,
+      },
+    },
+  };
+};
+
 export const getCrossFilterDataMask = ({
   key,
   value,
diff --git a/superset-frontend/plugins/plugin-chart-ag-grid-table/src/utils/reconcileColumnState.test.ts b/superset-frontend/plugins/plugin-chart-ag-grid-table/src/utils/reconcileColumnState.test.ts
new file mode 100644
index 00000000000..78e0e79b2da
--- /dev/null
+++ b/superset-frontend/plugins/plugin-chart-ag-grid-table/src/utils/reconcileColumnState.test.ts
@@ -0,0 +1,86 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+import {
+  type ColDef,
+  type ColumnState,
+} from '@superset-ui/core/components/ThemedAgGridReact';
+import reconcileColumnState, { getLeafColumnIds } from './reconcileColumnState';
+
+test('getLeafColumnIds flattens grouped column defs in visual order', () => {
+  const colDefs: ColDef[] = [
+    { field: 'Manufacture_Date' },
+    {
+      headerName: 'Metrics',
+      children: [
+        { field: 'SUM(Sales_Amount)' },
+        { field: 'SUM(Discount_Applied)' },
+      ],
+    } as ColDef,
+    { field: 'SUM(Quantity_Sold)' },
+  ];
+
+  expect(getLeafColumnIds(colDefs)).toEqual([
+    'Manufacture_Date',
+    'SUM(Sales_Amount)',
+    'SUM(Discount_Applied)',
+    'SUM(Quantity_Sold)',
+  ]);
+});
+
+test('preserves saved order when the current column set is unchanged', () => {
+  const colDefs: ColDef[] = [
+    { field: 'Transaction_Timestamp' },
+    { field: 'SUM(Sales_Amount)' },
+    { field: 'SUM(Discount_Applied)' },
+  ];
+  const savedColumnState: ColumnState[] = [
+    { colId: 'SUM(Sales_Amount)' },
+    { colId: 'Transaction_Timestamp' },
+    { colId: 'SUM(Discount_Applied)' },
+  ];
+
+  expect(reconcileColumnState(savedColumnState, colDefs)).toEqual({
+    applyOrder: true,
+    columnState: savedColumnState,
+  });
+});
+
+test('drops stale order when a dynamic group by swaps the dimension column', () => {
+  const currentColDefs: ColDef[] = [
+    { field: 'Manufacture_Date' },
+    { field: 'SUM(Sales_Amount)' },
+    { field: 'SUM(Discount_Applied)' },
+    { field: 'SUM(Quantity_Sold)' },
+  ];
+  const savedColumnState: ColumnState[] = [
+    { colId: 'Transaction_Timestamp' },
+    { colId: 'SUM(Sales_Amount)' },
+    { colId: 'SUM(Discount_Applied)' },
+    { colId: 'SUM(Quantity_Sold)' },
+  ];
+
+  expect(reconcileColumnState(savedColumnState, currentColDefs)).toEqual({
+    applyOrder: false,
+    columnState: [
+      { colId: 'SUM(Sales_Amount)' },
+      { colId: 'SUM(Discount_Applied)' },
+      { colId: 'SUM(Quantity_Sold)' },
+    ],
+  });
+});
diff --git a/superset-frontend/plugins/plugin-chart-ag-grid-table/src/utils/reconcileColumnState.ts b/superset-frontend/plugins/plugin-chart-ag-grid-table/src/utils/reconcileColumnState.ts
new file mode 100644
index 00000000000..46577713a16
--- /dev/null
+++ b/superset-frontend/plugins/plugin-chart-ag-grid-table/src/utils/reconcileColumnState.ts
@@ -0,0 +1,83 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+import {
+  type ColDef,
+  type ColumnState,
+} from '@superset-ui/core/components/ThemedAgGridReact';
+
+type ColumnGroupDef = ColDef & {
+  children?: ColumnDefLike[];
+};
+
+type ColumnDefLike = ColDef | ColumnGroupDef;
+
+function hasChildren(colDef: ColumnDefLike): colDef is ColumnGroupDef {
+  return 'children' in colDef;
+}
+
+export interface ReconciledColumnState {
+  applyOrder: boolean;
+  columnState: ColumnState[];
+}
+
+export function getLeafColumnIds(colDefs: ColumnDefLike[]): string[] {
+  return colDefs.flatMap(colDef => {
+    if (
+      hasChildren(colDef) &&
+      Array.isArray(colDef.children) &&
+      colDef.children.length > 0
+    ) {
+      return getLeafColumnIds(colDef.children);
+    }
+
+    return typeof colDef.field === 'string' ? [colDef.field] : [];
+  });
+}
+
+export default function reconcileColumnState(
+  savedColumnState: ColumnState[] | undefined,
+  colDefs: ColumnDefLike[],
+): ReconciledColumnState | null {
+  if (!Array.isArray(savedColumnState) || savedColumnState.length === 0) {
+    return null;
+  }
+
+  const currentColumnIds = getLeafColumnIds(colDefs);
+  const currentColumnIdSet = new Set(currentColumnIds);
+  const filteredColumnState = savedColumnState.filter(
+    column =>
+      typeof column.colId === 'string' && currentColumnIdSet.has(column.colId),
+  );
+
+  if (filteredColumnState.length === 0) {
+    return null;
+  }
+
+  const savedColumnIdSet = new Set(
+    filteredColumnState.map(column => column.colId),
+  );
+  const hasSameColumnSet =
+    currentColumnIds.length === savedColumnIdSet.size &&
+    currentColumnIds.every(columnId => savedColumnIdSet.has(columnId));
+
+  return {
+    columnState: filteredColumnState,
+    applyOrder: hasSameColumnSet,
+  };
+}
diff --git a/superset-frontend/plugins/plugin-chart-ag-grid-table/src/utils/useColDefs.ts b/superset-frontend/plugins/plugin-chart-ag-grid-table/src/utils/useColDefs.ts
index 84606c5013f..48f713aabbe 100644
--- a/superset-frontend/plugins/plugin-chart-ag-grid-table/src/utils/useColDefs.ts
+++ b/superset-frontend/plugins/plugin-chart-ag-grid-table/src/utils/useColDefs.ts
@@ -21,6 +21,7 @@ import { ColDef } from '@superset-ui/core/components/ThemedAgGridReact';
 import { useCallback, useMemo } from 'react';
 import { DataRecord, DataRecordValue } from '@superset-ui/core';
 import { GenericDataType } from '@apache-superset/core/common';
+import { useTheme } from '@apache-superset/core/theme';
 import { ColorFormatters } from '@superset-ui/chart-controls';
 import { extent as d3Extent, max as d3Max } from 'd3-array';
 import {
@@ -225,6 +226,7 @@ export const useColDefs = ({
   alignPositiveNegative,
   slice_id,
 }: UseColDefsProps) => {
+  const theme = useTheme();
   const getCommonColProps = useCallback(
     (
       col: InputColumn,
@@ -280,15 +282,30 @@ export const useColDefs = ({
         headerName: getHeaderLabel(col),
         valueFormatter: p => valueFormatter(p, col),
         valueGetter: p => valueGetter(p, col),
-        cellStyle: p =>
-          getCellStyle({
+        cellStyle: p => {
+          const cellSurfaceColor =
+            p.node?.rowPinned != null
+              ? theme.colorBgBase
+              : p.rowIndex % 2 === 0
+                ? theme.colorBgBase
+                : theme.colorFillQuaternary;
+          const hoverCellSurfaceColor =
+            p.node?.rowPinned != null
+              ? cellSurfaceColor
+              : theme.colorFillSecondary;
+          const cellStyleParams = {
             ...p,
             hasColumnColorFormatters,
             columnColorFormatters,
             hasBasicColorFormatters,
             basicColorFormatters,
             col,
-          }),
+            cellSurfaceColor,
+            hoverCellSurfaceColor,
+          } as Parameters<typeof getCellStyle>[0];
+
+          return getCellStyle(cellStyleParams);
+        },
         cellClass: p =>
           getCellClass({
             ...p,
@@ -385,6 +402,9 @@ export const useColDefs = ({
       allowRearrangeColumns,
       serverPagination,
       alignPositiveNegative,
+      theme.colorBgBase,
+      theme.colorFillSecondary,
+      theme.colorFillQuaternary,
     ],
   );
 
diff --git a/superset-frontend/plugins/plugin-chart-ag-grid-table/test/buildQuery.test.ts b/superset-frontend/plugins/plugin-chart-ag-grid-table/test/buildQuery.test.ts
index acec22c6965..ecb00812330 100644
--- a/superset-frontend/plugins/plugin-chart-ag-grid-table/test/buildQuery.test.ts
+++ b/superset-frontend/plugins/plugin-chart-ag-grid-table/test/buildQuery.test.ts
@@ -90,7 +90,7 @@ describe('plugin-chart-ag-grid-table', () => {
         },
       ).queries[0];
 
-      expect(query.orderby).toEqual([['degree_type', true]]);
+      expect(query.orderby).toEqual([['Highest Degree', true]]);
     });
 
     test('should map string metric colId to backend identifier', () => {
@@ -267,6 +267,25 @@ describe('plugin-chart-ag-grid-table', () => {
       ]);
     });
 
+    test('should use label (not sqlExpression) for adhoc column in CSV export sortModel', () => {
+      const adhocColumn = createAdhocColumn('sales / 100', 'Margin');
+
+      const query = buildQuery(
+        {
+          ...basicFormData,
+          groupby: [adhocColumn],
+          result_format: 'csv',
+        },
+        {
+          ownState: {
+            sortModel: [{ colId: 'Margin', sort: 'desc' }],
+          },
+        },
+      ).queries[0];
+
+      expect(query.orderby?.[0]).toEqual(['Margin', false]);
+    });
+
     test('should not add tie-breaker for non-download queries with server pagination', () => {
       const query = buildQuery(
         {
diff --git a/superset-frontend/plugins/plugin-chart-ag-grid-table/test/utils/useColDefs.test.ts b/superset-frontend/plugins/plugin-chart-ag-grid-table/test/utils/useColDefs.test.ts
index 9f2a44a82d0..40b4863a3ae 100644
--- a/superset-frontend/plugins/plugin-chart-ag-grid-table/test/utils/useColDefs.test.ts
+++ b/superset-frontend/plugins/plugin-chart-ag-grid-table/test/utils/useColDefs.test.ts
@@ -18,9 +18,19 @@
  */
 import { renderHook } from '@testing-library/react-hooks';
 import { GenericDataType } from '@apache-superset/core/common';
+import {
+  supersetTheme,
+  ThemeProvider,
+  type SupersetTheme,
+} from '@apache-superset/core/theme';
+import { ObjectFormattingEnum } from '@superset-ui/chart-controls';
+import tinycolor from 'tinycolor2';
+import { createElement, type ComponentProps, ReactNode } from 'react';
 import { useColDefs } from '../../src/utils/useColDefs';
 import { InputColumn } from '../../src/types';
 
+type TestCellStyleFunc = (params: unknown) => unknown;
+
 function makeColumn(overrides: Partial<InputColumn> = {}): InputColumn {
   return {
     key: 'test_col',
@@ -34,6 +44,81 @@ function makeColumn(overrides: Partial<InputColumn> = {}): InputColumn {
   };
 }
 
+function getCellStyleFunction(cellStyle: unknown): TestCellStyleFunc {
+  expect(typeof cellStyle).toBe('function');
+  return cellStyle as TestCellStyleFunc;
+}
+
+function getCellStyleResult(
+  cellStyle: TestCellStyleFunc,
+  overrides: Record<string, unknown> = {},
+) {
+  return cellStyle({
+    value: 42,
+    colDef: { field: 'count' },
+    rowIndex: 0,
+    node: {},
+    ...overrides,
+  } as never);
+}
+
+function getExpectedTextColor(
+  result: { backgroundColor?: string; color?: string },
+  surfaceColor: string,
+) {
+  if (result.color) {
+    const parsedColor = tinycolor(result.color);
+    return parsedColor.isValid()
+      ? parsedColor.setAlpha(1).toRgbString()
+      : result.color;
+  }
+
+  if (!result.backgroundColor) {
+    return undefined;
+  }
+
+  const background = tinycolor(result.backgroundColor);
+  const surface = tinycolor(surfaceColor);
+  if (!background.isValid() || !surface.isValid()) {
+    return undefined;
+  }
+
+  const { r: bgR, g: bgG, b: bgB, a: bgAlpha } = background.toRgb();
+  const { r: surfaceR, g: surfaceG, b: surfaceB } = surface.toRgb();
+  const alpha = bgAlpha ?? 1;
+
+  return tinycolor
+    .mostReadable(
+      tinycolor({
+        r: bgR * alpha + surfaceR * (1 - alpha),
+        g: bgG * alpha + surfaceG * (1 - alpha),
+        b: bgB * alpha + surfaceB * (1 - alpha),
+      }),
+      [
+        { r: 0, g: 0, b: 0 },
+        { r: 255, g: 255, b: 255 },
+      ],
+      {
+        includeFallbackColors: true,
+        level: 'AA',
+        size: 'small',
+      },
+    )
+    .toRgbString();
+}
+
+function makeThemeWrapper(theme: SupersetTheme) {
+  return function ThemeWrapper({ children }: { children?: ReactNode }) {
+    return createElement(
+      ThemeProvider,
+      { theme } as ComponentProps<typeof ThemeProvider>,
+      children,
+    );
+  };
+}
+
+const defaultThemeWrapper = makeThemeWrapper(supersetTheme);
+
 const defaultProps = {
   data: [{ test_col: 'value' }],
   serverPagination: false,
@@ -58,12 +143,14 @@ test('boolean columns use agCheckboxCellRenderer', () => {
     dataType: GenericDataType.Boolean,
   });
 
-  const { result } = renderHook(() =>
-    useColDefs({
-      ...defaultProps,
-      columns: [booleanCol],
-      data: [{ is_active: true }, { is_active: false }],
-    }),
+  const { result } = renderHook(
+    () =>
+      useColDefs({
+        ...defaultProps,
+        columns: [booleanCol],
+        data: [{ is_active: true }, { is_active: false }],
+      }),
+    { wrapper: defaultThemeWrapper },
   );
 
   const colDef = result.current[0];
@@ -79,12 +166,14 @@ test('string columns use custom TextCellRenderer', () => {
     dataType: GenericDataType.String,
   });
 
-  const { result } = renderHook(() =>
-    useColDefs({
-      ...defaultProps,
-      columns: [stringCol],
-      data: [{ name: 'Alice' }],
-    }),
+  const { result } = renderHook(
+    () =>
+      useColDefs({
+        ...defaultProps,
+        columns: [stringCol],
+        data: [{ name: 'Alice' }],
+      }),
+    { wrapper: defaultThemeWrapper },
   );
 
   const colDef = result.current[0];
@@ -101,12 +190,14 @@ test('numeric columns use custom NumericCellRenderer', () => {
     isMetric: true,
   });
 
-  const { result } = renderHook(() =>
-    useColDefs({
-      ...defaultProps,
-      columns: [numericCol],
-      data: [{ count: 42 }],
-    }),
+  const { result } = renderHook(
+    () =>
+      useColDefs({
+        ...defaultProps,
+        columns: [numericCol],
+        data: [{ count: 42 }],
+      }),
+    { wrapper: defaultThemeWrapper },
   );
 
   const colDef = result.current[0];
@@ -121,15 +212,619 @@ test('temporal columns use custom TextCellRenderer', () => {
     dataType: GenericDataType.Temporal,
   });
 
-  const { result } = renderHook(() =>
-    useColDefs({
-      ...defaultProps,
-      columns: [temporalCol],
-      data: [{ created_at: '2024-01-01' }],
-    }),
+  const { result } = renderHook(
+    () =>
+      useColDefs({
+        ...defaultProps,
+        columns: [temporalCol],
+        data: [{ created_at: '2024-01-01' }],
+      }),
+    { wrapper: defaultThemeWrapper },
   );
 
   const colDef = result.current[0];
   expect(colDef.cellRenderer).toBeInstanceOf(Function);
   expect(colDef.cellDataType).toBe('date');
 });
+
+test('cellStyle derives readable text color from dark background formatting', () => {
+  const numericCol = makeColumn({
+    key: 'count',
+    label: 'Count',
+    dataType: GenericDataType.Numeric,
+    isNumeric: true,
+    isMetric: true,
+  });
+
+  const { result } = renderHook(
+    () =>
+      useColDefs({
+        ...defaultProps,
+        columns: [numericCol],
+        data: [{ count: 42 }],
+        columnColorFormatters: [
+          {
+            column: 'count',
+            objectFormatting: ObjectFormattingEnum.BACKGROUND_COLOR,
+            getColorFromValue: (value: unknown) =>
+              value === 42 ? '#111111' : undefined,
+          },
+        ],
+      }),
+    { wrapper: defaultThemeWrapper },
+  );
+
+  const colDef = result.current[0];
+  const cellStyle = getCellStyleFunction(colDef.cellStyle);
+  expect(
+    cellStyle({
+      value: 42,
+      colDef: { field: 'count' },
+      rowIndex: 0,
+      node: {},
+    } as never),
+  ).toMatchObject({
+    backgroundColor: '#111111',
+    color: '',
+    '--ag-cell-value-color': 'rgb(255, 255, 255)',
+    textAlign: 'right',
+  });
+});
+
+test('cellStyle keeps explicit text color over adaptive contrast', () => {
+  const numericCol = makeColumn({
+    key: 'count',
+    label: 'Count',
+    dataType: GenericDataType.Numeric,
+    isNumeric: true,
+    isMetric: true,
+  });
+
+  const { result } = renderHook(
+    () =>
+      useColDefs({
+        ...defaultProps,
+        columns: [numericCol],
+        data: [{ count: 42 }],
+        columnColorFormatters: [
+          {
+            column: 'count',
+            objectFormatting: ObjectFormattingEnum.BACKGROUND_COLOR,
+            getColorFromValue: (value: unknown) =>
+              value === 42 ? '#111111' : undefined,
+          },
+          {
+            column: 'count',
+            objectFormatting: ObjectFormattingEnum.TEXT_COLOR,
+            getColorFromValue: (value: unknown) =>
+              value === 42 ? '#ace1c40d' : undefined,
+          },
+        ],
+      }),
+    { wrapper: defaultThemeWrapper },
+  );
+
+  const colDef = result.current[0];
+  const cellStyle = getCellStyleFunction(colDef.cellStyle);
+  expect(
+    cellStyle({
+      value: 42,
+      colDef: { field: 'count' },
+      rowIndex: 0,
+      node: {},
+    } as never),
+  ).toMatchObject({
+    backgroundColor: '#111111',
+    color: '',
+    '--ag-cell-value-color': 'rgb(172, 225, 196)',
+    textAlign: 'right',
+  });
+});
+
+test('cellStyle treats legacy toTextColor formatters as text color', () => {
+  const numericCol = makeColumn({
+    key: 'count',
+    label: 'Count',
+    dataType: GenericDataType.Numeric,
+    isNumeric: true,
+    isMetric: true,
+  });
+
+  const { result } = renderHook(
+    () =>
+      useColDefs({
+        ...defaultProps,
+        columns: [numericCol],
+        data: [{ count: 42 }],
+        columnColorFormatters: [
+          {
+            column: 'count',
+            objectFormatting: ObjectFormattingEnum.BACKGROUND_COLOR,
+            getColorFromValue: (value: unknown) =>
+              value === 42 ? '#111111' : undefined,
+          },
+          {
+            column: 'count',
+            toTextColor: true,
+            getColorFromValue: (value: unknown) =>
+              value === 42 ? '#ace1c40d' : undefined,
+          },
+        ],
+      }),
+    { wrapper: defaultThemeWrapper },
+  );
+
+  const colDef = result.current[0];
+  const cellStyle = getCellStyleFunction(colDef.cellStyle);
+  expect(getCellStyleResult(cellStyle)).toMatchObject({
+    backgroundColor: '#111111',
+    color: '',
+    '--ag-cell-value-color': 'rgb(172, 225, 196)',
+    textAlign: 'right',
+  });
+});
+
+test('cellStyle uses caller-provided surface color for adaptive contrast', () => {
+  const numericCol = makeColumn({
+    key: 'count',
+    label: 'Count',
+    dataType: GenericDataType.Numeric,
+    isNumeric: true,
+    isMetric: true,
+  });
+  const backgroundColor = 'rgba(0, 0, 0, 0.4)';
+
+  const { result: lightResult } = renderHook(
+    () =>
+      useColDefs({
+        ...defaultProps,
+        columns: [numericCol],
+        data: [{ count: 42 }],
+        columnColorFormatters: [
+          {
+            column: 'count',
+            objectFormatting: ObjectFormattingEnum.BACKGROUND_COLOR,
+            getColorFromValue: (value: unknown) =>
+              value === 42 ? backgroundColor : undefined,
+          },
+        ],
+      }),
+    {
+      wrapper: makeThemeWrapper({
+        ...supersetTheme,
+        colorBgBase: '#ffffff',
+      }),
+    },
+  );
+
+  const { result: darkResult } = renderHook(
+    () =>
+      useColDefs({
+        ...defaultProps,
+        columns: [numericCol],
+        data: [{ count: 42 }],
+        columnColorFormatters: [
+          {
+            column: 'count',
+            objectFormatting: ObjectFormattingEnum.BACKGROUND_COLOR,
+            getColorFromValue: (value: unknown) =>
+              value === 42 ? backgroundColor : undefined,
+          },
+        ],
+      }),
+    {
+      wrapper: makeThemeWrapper({
+        ...supersetTheme,
+        colorBgBase: '#000000',
+      }),
+    },
+  );
+
+  const lightCellStyle = getCellStyleFunction(lightResult.current[0].cellStyle);
+  const darkCellStyle = getCellStyleFunction(darkResult.current[0].cellStyle);
+
+  expect(getCellStyleResult(lightCellStyle)).toMatchObject({
+    backgroundColor,
+    color: '',
+    '--ag-cell-value-color': getExpectedTextColor(
+      { backgroundColor },
+      '#ffffff',
+    ),
+  });
+  expect(getCellStyleResult(darkCellStyle)).toMatchObject({
+    backgroundColor,
+    color: '',
+    '--ag-cell-value-color': getExpectedTextColor(
+      { backgroundColor },
+      '#000000',
+    ),
+  });
+  expect(getCellStyleResult(lightCellStyle)).not.toEqual(
+    getCellStyleResult(darkCellStyle),
+  );
+});
+
+test('cellStyle uses striped odd-row surface for adaptive contrast', () => {
+  const numericCol = makeColumn({
+    key: 'count',
+    label: 'Count',
+    dataType: GenericDataType.Numeric,
+    isNumeric: true,
+    isMetric: true,
+  });
+  const backgroundColor = 'rgba(0, 0, 0, 0.4)';
+
+  const { result } = renderHook(
+    () =>
+      useColDefs({
+        ...defaultProps,
+        columns: [numericCol],
+        data: [{ count: 42 }, { count: 43 }],
+        columnColorFormatters: [
+          {
+            column: 'count',
+            objectFormatting: ObjectFormattingEnum.BACKGROUND_COLOR,
+            getColorFromValue: (value: unknown) =>
+              typeof value === 'number' ? backgroundColor : undefined,
+          },
+        ],
+      }),
+    {
+      wrapper: makeThemeWrapper({
+        ...supersetTheme,
+        colorBgBase: '#ffffff',
+        colorFillQuaternary: '#000000',
+      }),
+    },
+  );
+
+  const cellStyle = getCellStyleFunction(result.current[0].cellStyle);
+
+  expect(
+    getCellStyleResult(cellStyle, {
+      rowIndex: 0,
+    }),
+  ).toMatchObject({
+    backgroundColor,
+    color: '',
+    '--ag-cell-value-color': getExpectedTextColor(
+      { backgroundColor },
+      '#ffffff',
+    ),
+  });
+  expect(
+    getCellStyleResult(cellStyle, {
+      rowIndex: 1,
+    }),
+  ).toMatchObject({
+    backgroundColor,
+    color: '',
+    '--ag-cell-value-color': getExpectedTextColor(
+      { backgroundColor },
+      '#000000',
+    ),
+  });
+});
+
+test('cellStyle exposes hover-specific adaptive contrast for formatted cells', () => {
+  const numericCol = makeColumn({
+    key: 'count',
+    label: 'Count',
+    dataType: GenericDataType.Numeric,
+    isNumeric: true,
+    isMetric: true,
+  });
+  const backgroundColor = 'rgba(0, 0, 0, 0.4)';
+
+  const { result } = renderHook(
+    () =>
+      useColDefs({
+        ...defaultProps,
+        columns: [numericCol],
+        data: [{ count: 42 }],
+        columnColorFormatters: [
+          {
+            column: 'count',
+            objectFormatting: ObjectFormattingEnum.BACKGROUND_COLOR,
+            getColorFromValue: (value: unknown) =>
+              value === 42 ? backgroundColor : undefined,
+          },
+        ],
+      }),
+    {
+      wrapper: makeThemeWrapper({
+        ...supersetTheme,
+        colorBgBase: '#ffffff',
+        colorFillSecondary: '#000000',
+      }),
+    },
+  );
+
+  const cellStyle = getCellStyleFunction(result.current[0].cellStyle);
+  expect(getCellStyleResult(cellStyle)).toMatchObject({
+    backgroundColor,
+    color: '',
+    '--ag-cell-value-color': getExpectedTextColor(
+      { backgroundColor },
+      '#ffffff',
+    ),
+    '--ag-cell-value-hover-color': getExpectedTextColor(
+      { backgroundColor },
+      '#000000',
+    ),
+  });
+});
+
+test('cellStyle resets inline text color variables when no formatter matches', () => {
+  const numericCol = makeColumn({
+    key: 'count',
+    label: 'Count',
+    dataType: GenericDataType.Numeric,
+    isNumeric: true,
+    isMetric: true,
+  });
+
+  const { result } = renderHook(
+    () =>
+      useColDefs({
+        ...defaultProps,
+        columns: [numericCol],
+        data: [{ count: 42 }],
+        columnColorFormatters: [
+          {
+            column: 'count',
+            objectFormatting: ObjectFormattingEnum.BACKGROUND_COLOR,
+            getColorFromValue: () => undefined,
+          },
+        ],
+      }),
+    {
+      wrapper: makeThemeWrapper({
+        ...supersetTheme,
+        colorPrimaryText: '#123456',
+      }),
+    },
+  );
+
+  const cellStyle = getCellStyleFunction(result.current[0].cellStyle);
+  const cellStyleResult = getCellStyleResult(cellStyle) as {
+    backgroundColor: string;
+    color?: string;
+    textAlign: string;
+  };
+  expect(cellStyleResult).toMatchObject({
+    backgroundColor: '',
+    color: '',
+    '--ag-cell-value-color': '',
+    '--ag-cell-value-hover-color': '',
+    textAlign: 'right',
+  });
+});
+
+test('cellStyle preserves invalid explicit text color', () => {
+  const numericCol = makeColumn({
+    key: 'count',
+    label: 'Count',
+    dataType: GenericDataType.Numeric,
+    isNumeric: true,
+    isMetric: true,
+  });
+
+  const { result } = renderHook(
+    () =>
+      useColDefs({
+        ...defaultProps,
+        columns: [numericCol],
+        data: [{ count: 42 }],
+        columnColorFormatters: [
+          {
+            column: 'count',
+            objectFormatting: ObjectFormattingEnum.TEXT_COLOR,
+            getColorFromValue: (value: unknown) =>
+              value === 42 ? 'not-a-color' : undefined,
+          },
+        ],
+      }),
+    { wrapper: defaultThemeWrapper },
+  );
+
+  const cellStyle = getCellStyleFunction(result.current[0].cellStyle);
+  expect(getCellStyleResult(cellStyle)).toMatchObject({
+    backgroundColor: '',
+    color: '',
+    '--ag-cell-value-color': 'not-a-color',
+    '--ag-cell-value-hover-color': 'not-a-color',
+  });
+});
+
+test('cellStyle ignores cell-bar formatters for text and background resolution', () => {
+  const numericCol = makeColumn({
+    key: 'count',
+    label: 'Count',
+    dataType: GenericDataType.Numeric,
+    isNumeric: true,
+    isMetric: true,
+  });
+
+  const { result } = renderHook(
+    () =>
+      useColDefs({
+        ...defaultProps,
+        columns: [numericCol],
+        data: [{ count: 42 }],
+        columnColorFormatters: [
+          {
+            column: 'count',
+            objectFormatting: ObjectFormattingEnum.CELL_BAR,
+            getColorFromValue: (value: unknown) =>
+              value === 42 ? '#11111199' : undefined,
+          },
+        ],
+      }),
+    {
+      wrapper: makeThemeWrapper({
+        ...supersetTheme,
+        colorPrimaryText: '#654321',
+      }),
+    },
+  );
+
+  const cellStyle = getCellStyleFunction(result.current[0].cellStyle);
+  const cellStyleResult = getCellStyleResult(cellStyle) as {
+    backgroundColor: string;
+    color?: string;
+  };
+  expect(cellStyleResult).toMatchObject({
+    backgroundColor: '',
+    color: '',
+    '--ag-cell-value-color': '',
+    '--ag-cell-value-hover-color': '',
+  });
+});
+
+test('cellStyle lets basic color formatters override column formatter background', () => {
+  const numericCol = makeColumn({
+    key: 'count',
+    label: 'Count',
+    dataType: GenericDataType.Numeric,
+    isNumeric: true,
+    isMetric: true,
+    metricName: 'sum__count',
+  });
+
+  const { result } = renderHook(
+    () =>
+      useColDefs({
+        ...defaultProps,
+        columns: [numericCol],
+        data: [{ count: 42 }],
+        isUsingTimeComparison: true,
+        columnColorFormatters: [
+          {
+            column: 'count',
+            objectFormatting: ObjectFormattingEnum.BACKGROUND_COLOR,
+            getColorFromValue: (value: unknown) =>
+              value === 42 ? '#111111' : undefined,
+          },
+        ],
+        basicColorFormatters: [
+          {
+            sum__count: {
+              backgroundColor: '#abcdef',
+              arrowColor: 'Green',
+              mainArrow: 'up',
+            },
+          },
+        ],
+      }),
+    { wrapper: defaultThemeWrapper },
+  );
+
+  const cellStyle = getCellStyleFunction(result.current[0].cellStyle);
+  expect(getCellStyleResult(cellStyle)).toMatchObject({
+    backgroundColor: '#abcdef',
+    color: '',
+    '--ag-cell-value-color': getExpectedTextColor(
+      { backgroundColor: '#abcdef' },
+      '#ffffff',
+    ),
+  });
+});
+
+test('cellStyle ignores basic color formatters for pinned bottom rows', () => {
+  const numericCol = makeColumn({
+    key: 'count',
+    label: 'Count',
+    dataType: GenericDataType.Numeric,
+    isNumeric: true,
+    isMetric: true,
+    metricName: 'sum__count',
+  });
+
+  const { result } = renderHook(
+    () =>
+      useColDefs({
+        ...defaultProps,
+        columns: [numericCol],
+        data: [{ count: 42 }],
+        isUsingTimeComparison: true,
+        basicColorFormatters: [
+          {
+            sum__count: {
+              backgroundColor: '#abcdef',
+              arrowColor: 'Green',
+              mainArrow: 'up',
+            },
+          },
+        ],
+      }),
+    { wrapper: defaultThemeWrapper },
+  );
+
+  const cellStyle = getCellStyleFunction(result.current[0].cellStyle);
+  expect(
+    getCellStyleResult(cellStyle, {
+      node: { rowPinned: 'bottom' },
+    }),
+  ).toMatchObject({
+    backgroundColor: '',
+  });
+});
+
+test('cellStyle defaults non-numeric columns to left alignment', () => {
+  const stringCol = makeColumn({
+    key: 'name',
+    label: 'Name',
+    dataType: GenericDataType.String,
+  });
+
+  const { result } = renderHook(
+    () =>
+      useColDefs({
+        ...defaultProps,
+        columns: [stringCol],
+        data: [{ name: 'Alice' }],
+      }),
+    { wrapper: defaultThemeWrapper },
+  );
+
+  const cellStyle = getCellStyleFunction(result.current[0].cellStyle);
+  expect(
+    cellStyle({
+      value: 'Alice',
+      colDef: { field: 'name' },
+      rowIndex: 0,
+      node: {},
+    } as never),
+  ).toMatchObject({
+    textAlign: 'left',
+  });
+});
+
+test('cellStyle respects explicit horizontal alignment overrides', () => {
+  const numericCol = makeColumn({
+    key: 'count',
+    label: 'Count',
+    dataType: GenericDataType.Numeric,
+    isNumeric: true,
+    isMetric: true,
+    config: {
+      horizontalAlign: 'center',
+    },
+  });
+
+  const { result } = renderHook(
+    () =>
+      useColDefs({
+        ...defaultProps,
+        columns: [numericCol],
+        data: [{ count: 42 }],
+      }),
+    { wrapper: defaultThemeWrapper },
+  );
+
+  const cellStyle = getCellStyleFunction(result.current[0].cellStyle);
+  expect(getCellStyleResult(cellStyle)).toMatchObject({
+    textAlign: 'center',
+  });
+});
diff --git a/superset-frontend/plugins/plugin-chart-cartodiagram/package.json b/superset-frontend/plugins/plugin-chart-cartodiagram/package.json
index e467c2103db..4353f8d88af 100644
--- a/superset-frontend/plugins/plugin-chart-cartodiagram/package.json
+++ b/superset-frontend/plugins/plugin-chart-cartodiagram/package.json
@@ -31,14 +31,14 @@
   "dependencies": {
     "@types/geojson": "^7946.0.16",
     "geojson": "^0.5.0",
-    "lodash": "^4.17.23"
+    "lodash": "^4.18.1"
   },
   "peerDependencies": {
-    "@ant-design/icons": "^5.2.6",
+    "@ant-design/icons": "^5.6.1",
+    "@apache-superset/core": "*",
     "@reduxjs/toolkit": "*",
     "@superset-ui/chart-controls": "*",
     "@superset-ui/core": "*",
-    "@apache-superset/core": "*",
     "@types/react-redux": "*",
     "geostyler": "^18.3.1",
     "geostyler-data": "^1.0.0",
diff --git a/superset-frontend/plugins/plugin-chart-echarts/package.json b/superset-frontend/plugins/plugin-chart-echarts/package.json
index 459e3ee7a9e..d80dfc4c7f0 100644
--- a/superset-frontend/plugins/plugin-chart-echarts/package.json
+++ b/superset-frontend/plugins/plugin-chart-echarts/package.json
@@ -28,7 +28,7 @@
     "@types/react-redux": "^7.1.34",
     "acorn": "^8.16.0",
     "d3-array": "^3.2.4",
-    "lodash": "^4.17.23",
+    "lodash": "^4.18.1",
     "zod": "^4.3.6"
   },
   "peerDependencies": {
diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/BigNumber/BigNumberTotal/transformProps.ts b/superset-frontend/plugins/plugin-chart-echarts/src/BigNumber/BigNumberTotal/transformProps.ts
index c79e85784ba..7c250595962 100644
--- a/superset-frontend/plugins/plugin-chart-echarts/src/BigNumber/BigNumberTotal/transformProps.ts
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/BigNumber/BigNumberTotal/transformProps.ts
@@ -29,6 +29,7 @@ import {
 } from '@superset-ui/core';
 import { GenericDataType } from '@apache-superset/core/common';
 import { BigNumberTotalChartProps, BigNumberVizProps } from '../types';
+import { PROPORTION } from '../constants';
 import { getDateFormatter, getOriginalLabel, parseMetricValue } from '../utils';
 import { Refs } from '../../types';
 
@@ -76,8 +77,8 @@ export default function transformProps(
   const showMetricName = chartProps.rawFormData?.show_metric_name ?? false;
   const formattedSubtitle = subtitle?.trim() ? subtitle : subheader || '';
   const formattedSubtitleFontSize = subtitle?.trim()
-    ? (subtitleFontSize ?? 1)
-    : (subheaderFontSize ?? 1);
+    ? (subtitleFontSize ?? PROPORTION.SUBHEADER)
+    : (subheaderFontSize ?? subtitleFontSize ?? PROPORTION.SUBHEADER);
   const bigNumber =
     data.length === 0 ? null : parseMetricValue(data[0][metricName]);
 
diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/BigNumber/BigNumberViz.tsx b/superset-frontend/plugins/plugin-chart-echarts/src/BigNumber/BigNumberViz.tsx
index 3215eb3dd6c..38a08b65f5e 100644
--- a/superset-frontend/plugins/plugin-chart-echarts/src/BigNumber/BigNumberViz.tsx
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/BigNumber/BigNumberViz.tsx
@@ -30,20 +30,11 @@ import {
 import { styled, useTheme } from '@apache-superset/core/theme';
 import Echart from '../components/Echart';
 import { BigNumberVizProps } from './types';
+import { PROPORTION } from './constants';
 import { EventHandlers } from '../types';
 
 const defaultNumberFormatter = getNumberFormatter();
 
-const PROPORTION = {
-  // text size: proportion of the chart container sans trendline
-  METRIC_NAME: 0.125,
-  KICKER: 0.1,
-  HEADER: 0.3,
-  SUBHEADER: 0.125,
-  // trendline size: proportion of the whole chart container
-  TRENDLINE: 0.3,
-};
-
 function BigNumberVis({
   className = '',
   headerFormatter = defaultNumberFormatter,
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/test/utils/colors.test.ts b/superset-frontend/plugins/plugin-chart-echarts/src/BigNumber/constants.tsx
similarity index 81%
rename from superset-frontend/plugins/legacy-preset-chart-deckgl/test/utils/colors.test.ts
rename to superset-frontend/plugins/plugin-chart-echarts/src/BigNumber/constants.tsx
index 4691ba489f2..97d35562f14 100644
--- a/superset-frontend/plugins/legacy-preset-chart-deckgl/test/utils/colors.test.ts
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/BigNumber/constants.tsx
@@ -16,10 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { hexToRGB } from '../../src/utils/colors';
 
-describe('colors', () => {
-  test('hexToRGB()', () => {
-    expect(hexToRGB('#ffffff')).toEqual([255, 255, 255, 255]);
-  });
-});
+export const PROPORTION = {
+  METRIC_NAME: 0.125,
+  KICKER: 0.1,
+  HEADER: 0.3,
+  SUBHEADER: 0.125,
+  TRENDLINE: 0.3,
+};
diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/Bubble/constants.ts b/superset-frontend/plugins/plugin-chart-echarts/src/Bubble/constants.ts
index 12e928b1396..83d5449ea59 100644
--- a/superset-frontend/plugins/plugin-chart-echarts/src/Bubble/constants.ts
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/Bubble/constants.ts
@@ -25,8 +25,8 @@ export const DEFAULT_FORM_DATA: Partial<EchartsBubbleFormData> = {
   emitFilter: false,
   logXAis: false,
   logYAxis: false,
-  xAxisTitleMargin: 30,
-  yAxisTitleMargin: 30,
+  xAxisTitleMargin: 40,
+  yAxisTitleMargin: 50,
   truncateXAxis: false,
   truncateYAxis: false,
   xAxisBounds: [null, null],
diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/Bubble/controlPanel.tsx b/superset-frontend/plugins/plugin-chart-echarts/src/Bubble/controlPanel.tsx
index ccc176e039f..f0aa4a228fa 100644
--- a/superset-frontend/plugins/plugin-chart-echarts/src/Bubble/controlPanel.tsx
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/Bubble/controlPanel.tsx
@@ -144,7 +144,7 @@ const config: ControlPanelConfig = {
               clearable: true,
               label: t('X axis title margin'),
               renderTrigger: true,
-              default: sections.TITLE_MARGIN_OPTIONS[1],
+              default: sections.TITLE_MARGIN_OPTIONS[3],
               choices: formatSelectOptions(sections.TITLE_MARGIN_OPTIONS),
             },
           },
@@ -216,7 +216,7 @@ const config: ControlPanelConfig = {
               clearable: true,
               label: t('Y axis title margin'),
               renderTrigger: true,
-              default: sections.TITLE_MARGIN_OPTIONS[1],
+              default: sections.TITLE_MARGIN_OPTIONS[4],
               choices: formatSelectOptions(sections.TITLE_MARGIN_OPTIONS),
             },
           },
diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/Bubble/transformProps.ts b/superset-frontend/plugins/plugin-chart-echarts/src/Bubble/transformProps.ts
index ec671b94893..2ffeaebf2ab 100644
--- a/superset-frontend/plugins/plugin-chart-echarts/src/Bubble/transformProps.ts
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/Bubble/transformProps.ts
@@ -31,6 +31,7 @@ import { EchartsBubbleChartProps, EchartsBubbleFormData } from './types';
 import { DEFAULT_FORM_DATA, MINIMUM_BUBBLE_SIZE } from './constants';
 import { defaultGrid } from '../defaults';
 import { getLegendProps, getMinAndMaxFromBounds } from '../utils/series';
+import { resolveLegendLayout } from '../utils/legendLayout';
 import { Refs } from '../types';
 import { parseAxisBound } from '../utils/controls';
 import { getDefaultTooltip } from '../utils/tooltip';
@@ -172,6 +173,20 @@ export default function transformProps(chartProps: EchartsBubbleChartProps) {
   const xAxisFormatter = getNumberFormatter(xAxisFormat);
   const yAxisFormatter = getNumberFormatter(yAxisFormat);
   const tooltipSizeFormatter = getNumberFormatter(tooltipSizeFormat);
+  const legendData = Array.from(legends).sort((a: string, b: string) => {
+    if (!legendSort) return 0;
+    return legendSort === 'asc' ? a.localeCompare(b) : b.localeCompare(a);
+  });
+  const { effectiveLegendMargin, effectiveLegendType } = resolveLegendLayout({
+    chartHeight: height,
+    chartWidth: width,
+    legendItems: legendData,
+    legendMargin,
+    orientation: legendOrientation,
+    show: showLegend,
+    theme,
+    type: legendType,
+  });
 
   const [xAxisMin, xAxisMax] = (xAxisBounds || []).map(parseAxisBound);
   const [yAxisMin, yAxisMax] = (yAxisBounds || []).map(parseAxisBound);
@@ -181,7 +196,7 @@ export default function transformProps(chartProps: EchartsBubbleChartProps) {
     legendOrientation,
     true,
     false,
-    legendMargin,
+    effectiveLegendMargin,
     true,
     'Left',
     convertInteger(yAxisTitleMargin),
@@ -192,13 +207,12 @@ export default function transformProps(chartProps: EchartsBubbleChartProps) {
   const echartOptions: EChartsCoreOption = {
     series,
     xAxis: {
-      axisLabel: { formatter: xAxisFormatter },
+      axisLabel: { formatter: xAxisFormatter, rotate: xAxisLabelRotation },
       splitLine: {
         lineStyle: {
           type: 'dashed',
         },
       },
-      nameRotate: xAxisLabelRotation,
       interval: xAxisLabelInterval,
       scale: true,
       name: bubbleXAxisTitle,
@@ -211,13 +225,12 @@ export default function transformProps(chartProps: EchartsBubbleChartProps) {
       ...getMinAndMaxFromBounds(xAxisType, truncateXAxis, xAxisMin, xAxisMax),
     },
     yAxis: {
-      axisLabel: { formatter: yAxisFormatter },
+      axisLabel: { formatter: yAxisFormatter, rotate: yAxisLabelRotation },
       splitLine: {
         lineStyle: {
           type: 'dashed',
         },
       },
-      nameRotate: yAxisLabelRotation,
       scale: truncateYAxis,
       name: bubbleYAxisTitle,
       nameLocation: 'middle',
@@ -230,11 +243,13 @@ export default function transformProps(chartProps: EchartsBubbleChartProps) {
       type: logYAxis ? AxisType.Log : AxisType.Value,
     },
     legend: {
-      ...getLegendProps(legendType, legendOrientation, showLegend, theme),
-      data: Array.from(legends).sort((a: string, b: string) => {
-        if (!legendSort) return 0;
-        return legendSort === 'asc' ? a.localeCompare(b) : b.localeCompare(a);
-      }),
+      ...getLegendProps(
+        effectiveLegendType,
+        legendOrientation,
+        showLegend,
+        theme,
+      ),
+      data: legendData,
     },
     tooltip: {
       show: !inContextMenu,
diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/Funnel/transformProps.ts b/superset-frontend/plugins/plugin-chart-echarts/src/Funnel/transformProps.ts
index 58c0a697402..87189c355a3 100644
--- a/superset-frontend/plugins/plugin-chart-echarts/src/Funnel/transformProps.ts
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/Funnel/transformProps.ts
@@ -46,6 +46,7 @@ import {
   getLegendProps,
   sanitizeHtml,
 } from '../utils/series';
+import { resolveLegendLayout } from '../utils/legendLayout';
 import { defaultGrid } from '../defaults';
 import { DEFAULT_LEGEND_FORM_DATA, OpacityEnum } from '../constants';
 import { getDefaultTooltip } from '../utils/tooltip';
@@ -241,11 +242,25 @@ export default function transformProps(
     textBorderColor: theme.colorBgBase,
     textBorderWidth: 1,
   };
+  const legendData = keys.sort((a: string, b: string) => {
+    if (!legendSort) return 0;
+    return legendSort === 'asc' ? a.localeCompare(b) : b.localeCompare(a);
+  });
+  const { effectiveLegendMargin, effectiveLegendType } = resolveLegendLayout({
+    chartHeight: height,
+    chartWidth: width,
+    legendItems: legendData,
+    legendMargin,
+    orientation: legendOrientation,
+    show: showLegend,
+    theme,
+    type: legendType,
+  });
 
   const series: FunnelSeriesOption[] = [
     {
       type: VizType.Funnel,
-      ...getChartPadding(showLegend, legendOrientation, legendMargin),
+      ...getChartPadding(showLegend, legendOrientation, effectiveLegendMargin),
       animation: true,
       minSize: '0%',
       maxSize: '100%',
@@ -298,11 +313,13 @@ export default function transformProps(
       },
     },
     legend: {
-      ...getLegendProps(legendType, legendOrientation, showLegend, theme),
-      data: keys.sort((a: string, b: string) => {
-        if (!legendSort) return 0;
-        return legendSort === 'asc' ? a.localeCompare(b) : b.localeCompare(a);
-      }),
+      ...getLegendProps(
+        effectiveLegendType,
+        legendOrientation,
+        showLegend,
+        theme,
+      ),
+      data: legendData,
     },
     series,
   };
diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/Gantt/transformProps.ts b/superset-frontend/plugins/plugin-chart-echarts/src/Gantt/transformProps.ts
index 997cbab1397..1a9b4d565a1 100644
--- a/superset-frontend/plugins/plugin-chart-echarts/src/Gantt/transformProps.ts
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/Gantt/transformProps.ts
@@ -43,8 +43,13 @@ import {
   EchartsGanttFormData,
 } from './types';
 import { DEFAULT_FORM_DATA, TIMESERIES_CONSTANTS } from '../constants';
-import { Refs } from '../types';
-import { getLegendProps, groupData } from '../utils/series';
+import { LegendOrientation, Refs } from '../types';
+import {
+  getHorizontalLegendAvailableWidth,
+  getLegendProps,
+  groupData,
+} from '../utils/series';
+import { resolveLegendLayout } from '../utils/legendLayout';
 import {
   getTooltipTimeFormatter,
   getXAxisFormatter,
@@ -246,7 +251,7 @@ export default function transformProps(chartProps: EchartsGanttChartProps) {
   }
 
   const padding = getPadding(
-    showLegend && seriesMap.size > 1,
+    showLegend,
     legendOrientation,
     false,
     zoomable,
@@ -345,6 +350,40 @@ export default function transformProps(chartProps: EchartsGanttChartProps) {
       if (!legendSort) return 0;
       return legendSort === 'asc' ? a.localeCompare(b) : b.localeCompare(a);
     });
+  const { legendLayout, effectiveLegendType } = resolveLegendLayout({
+    availableWidth:
+      legendOrientation === LegendOrientation.Top ||
+      legendOrientation === LegendOrientation.Bottom
+        ? getHorizontalLegendAvailableWidth({
+            chartWidth: width,
+            orientation: legendOrientation,
+            padding,
+            zoomable,
+          })
+        : undefined,
+    chartHeight: height,
+    chartWidth: width,
+    legendItems: legendData,
+    legendMargin,
+    orientation: legendOrientation,
+    show: showLegend,
+    theme,
+    type: legendType,
+  });
+  if (legendLayout.effectiveMargin !== undefined) {
+    const adjustedPadding = getPadding(
+      showLegend,
+      legendOrientation,
+      false,
+      zoomable,
+      legendLayout.effectiveMargin,
+      !!xAxisTitle,
+      'Left',
+      convertInteger(yAxisTitleMargin),
+      convertInteger(xAxisTitleMargin),
+    );
+    Object.assign(padding, adjustedPadding);
+  }
 
   const tooltipFormatterMap = {
     [GenericDataType.Numeric]: tooltipValuesFormatter,
@@ -374,12 +413,13 @@ export default function transformProps(chartProps: EchartsGanttChartProps) {
     },
     legend: {
       ...getLegendProps(
-        legendType,
+        effectiveLegendType,
         legendOrientation,
         showLegend,
         theme,
         zoomable,
         legendState,
+        padding,
       ),
       data: legendData,
     },
diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/Graph/transformProps.ts b/superset-frontend/plugins/plugin-chart-echarts/src/Graph/transformProps.ts
index 8204351f30f..9fee03ae3d3 100644
--- a/superset-frontend/plugins/plugin-chart-echarts/src/Graph/transformProps.ts
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/Graph/transformProps.ts
@@ -42,6 +42,7 @@ import {
   getLegendProps,
   sanitizeHtml,
 } from '../utils/series';
+import { resolveLegendLayout } from '../utils/legendLayout';
 import { getDefaultTooltip } from '../utils/tooltip';
 import { Refs } from '../types';
 
@@ -298,6 +299,20 @@ export default function transformProps(
   });
 
   const categoryList = [...categories];
+  const legendData = categoryList.sort((a: string, b: string) => {
+    if (!legendSort) return 0;
+    return legendSort === 'asc' ? a.localeCompare(b) : b.localeCompare(a);
+  });
+  const { effectiveLegendMargin, effectiveLegendType } = resolveLegendLayout({
+    chartHeight: height,
+    chartWidth: width,
+    legendItems: legendData,
+    legendMargin,
+    orientation: legendOrientation,
+    show: showLegend,
+    theme,
+    type: legendType,
+  });
   const series: GraphSeriesOption[] = [
     {
       zoom: DEFAULT_GRAPH_SERIES_OPTION.zoom,
@@ -324,7 +339,7 @@ export default function transformProps(
       edgeSymbol: parseEdgeSymbol(edgeSymbol),
       edgeSymbolSize: baseEdgeWidth * 2,
       selectedMode,
-      ...getChartPadding(showLegend, legendOrientation, legendMargin),
+      ...getChartPadding(showLegend, legendOrientation, effectiveLegendMargin),
       animation: DEFAULT_GRAPH_SERIES_OPTION.animation,
       label: {
         ...DEFAULT_GRAPH_SERIES_OPTION.label,
@@ -353,11 +368,13 @@ export default function transformProps(
       },
     },
     legend: {
-      ...getLegendProps(legendType, legendOrientation, showLegend, theme),
-      data: categoryList.sort((a: string, b: string) => {
-        if (!legendSort) return 0;
-        return legendSort === 'asc' ? a.localeCompare(b) : b.localeCompare(a);
-      }),
+      ...getLegendProps(
+        effectiveLegendType,
+        legendOrientation,
+        showLegend,
+        theme,
+      ),
+      data: legendData,
     },
     series,
   };
diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/MixedTimeseries/transformProps.ts b/superset-frontend/plugins/plugin-chart-echarts/src/MixedTimeseries/transformProps.ts
index f4db0afc3d9..71dc91183a9 100644
--- a/superset-frontend/plugins/plugin-chart-echarts/src/MixedTimeseries/transformProps.ts
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/MixedTimeseries/transformProps.ts
@@ -55,6 +55,7 @@ import {
 import {
   EchartsTimeseriesSeriesType,
   ForecastSeriesEnum,
+  LegendOrientation,
   Refs,
 } from '../types';
 import { parseAxisBound } from '../utils/controls';
@@ -67,10 +68,12 @@ import {
   extractTooltipKeys,
   getAxisType,
   getColtypesMapping,
+  getHorizontalLegendAvailableWidth,
   getLegendProps,
   getMinAndMaxFromBounds,
   getOverMaxHiddenFormatter,
 } from '../utils/series';
+import { resolveLegendLayout } from '../utils/legendLayout';
 import {
   extractAnnotationLabels,
   getAnnotationData,
@@ -575,21 +578,87 @@ export default function transformProps(
       : String;
   const xAxisFormatter =
     xAxisDataType === GenericDataType.Temporal
-      ? getXAxisFormatter(xAxisTimeFormat)
+      ? getXAxisFormatter(xAxisTimeFormat, timeGrainSqla)
       : String;
 
+  const showMaxLabel = xAxisType === AxisType.Time && xAxisLabelRotation === 0;
+  const deduplicatedFormatter = showMaxLabel
+    ? (() => {
+        let lastLabel: string | undefined;
+        const wrapper = (value: number | string) => {
+          const label =
+            typeof xAxisFormatter === 'function'
+              ? (xAxisFormatter as Function)(value)
+              : String(value);
+          if (label === lastLabel) {
+            return '';
+          }
+          lastLabel = label;
+          return label;
+        };
+        if (typeof xAxisFormatter === 'function' && 'id' in xAxisFormatter) {
+          (wrapper as any).id = (xAxisFormatter as any).id;
+        }
+        return wrapper;
+      })()
+    : xAxisFormatter;
+
   const addYAxisTitleOffset =
     !!(yAxisTitle || yAxisTitleSecondary) &&
     convertInteger(yAxisTitleMargin) !== 0;
   const addXAxisTitleOffset =
     !!xAxisTitle && convertInteger(xAxisTitleMargin) !== 0;
+  const baseChartPadding = getPadding(
+    showLegend,
+    legendOrientation,
+    addYAxisTitleOffset,
+    zoomable,
+    legendMargin,
+    addXAxisTitleOffset,
+    yAxisTitlePosition,
+    convertInteger(yAxisTitleMargin),
+    convertInteger(xAxisTitleMargin),
+  );
+  const legendData = series
+    .filter(
+      entry =>
+        extractForecastSeriesContext((entry.name || '') as string).type ===
+        ForecastSeriesEnum.Observation,
+    )
+    .map(entry => entry.name)
+    .filter((name): name is string => Boolean(name))
+    .concat(extractAnnotationLabels(annotationLayers))
+    .sort((a: string, b: string) => {
+      if (!legendSort) return 0;
+      return legendSort === 'asc' ? a.localeCompare(b) : b.localeCompare(a);
+    });
+  const { effectiveLegendMargin, effectiveLegendType } = resolveLegendLayout({
+    availableWidth:
+      legendOrientation === LegendOrientation.Top ||
+      legendOrientation === LegendOrientation.Bottom
+        ? getHorizontalLegendAvailableWidth({
+            chartWidth: width,
+            orientation: legendOrientation,
+            padding: baseChartPadding,
+            zoomable,
+          })
+        : undefined,
+    chartHeight: height,
+    chartWidth: width,
+    legendItems: legendData,
+    legendMargin,
+    orientation: legendOrientation,
+    show: showLegend,
+    theme,
+    type: legendType,
+  });
 
   const chartPadding = getPadding(
     showLegend,
     legendOrientation,
     addYAxisTitleOffset,
     zoomable,
-    legendMargin,
+    effectiveLegendMargin,
     addXAxisTitleOffset,
     yAxisTitlePosition,
     convertInteger(yAxisTitleMargin),
@@ -611,9 +680,14 @@ export default function transformProps(
       nameGap: convertInteger(xAxisTitleMargin),
       nameLocation: 'middle',
       axisLabel: {
-        formatter: xAxisFormatter,
+        hideOverlap: !(xAxisType === AxisType.Time && xAxisLabelRotation !== 0),
+        formatter: deduplicatedFormatter,
         rotate: xAxisLabelRotation,
         interval: xAxisLabelInterval,
+        ...(showMaxLabel && {
+          showMaxLabel: true,
+          alignMaxLabel: 'right',
+        }),
       },
       minorTick: { show: minorTicks },
       minInterval:
@@ -753,7 +827,7 @@ export default function transformProps(
     },
     legend: {
       ...getLegendProps(
-        legendType,
+        effectiveLegendType,
         legendOrientation,
         showLegend,
         theme,
@@ -761,18 +835,7 @@ export default function transformProps(
         legendState,
         chartPadding,
       ),
-      data: series
-        .filter(
-          entry =>
-            extractForecastSeriesContext((entry.name || '') as string).type ===
-            ForecastSeriesEnum.Observation,
-        )
-        .map(entry => entry.id || entry.name || '')
-        .concat(extractAnnotationLabels(annotationLayers))
-        .sort((a: string, b: string) => {
-          if (!legendSort) return 0;
-          return legendSort === 'asc' ? a.localeCompare(b) : b.localeCompare(a);
-        }),
+      data: legendData,
     },
     series: dedupSeries(reorderForecastSeries(series) as SeriesOption[]),
     toolbox: {
diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/Pie/transformProps.ts b/superset-frontend/plugins/plugin-chart-echarts/src/Pie/transformProps.ts
index 3a66e61910e..6a355f6e753 100644
--- a/superset-frontend/plugins/plugin-chart-echarts/src/Pie/transformProps.ts
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/Pie/transformProps.ts
@@ -48,6 +48,7 @@ import {
   getLegendProps,
   sanitizeHtml,
 } from '../utils/series';
+import { resolveLegendLayout } from '../utils/legendLayout';
 import { defaultGrid } from '../defaults';
 import { convertInteger } from '../utils/convertInteger';
 import { getDefaultTooltip } from '../utils/tooltip';
@@ -380,11 +381,27 @@ export default function transformProps(
     show: showLabels,
     color: theme.colorText,
   };
+  const legendData = transformedData
+    .map(datum => datum.name)
+    .sort((a: string, b: string) => {
+      if (!legendSort) return 0;
+      return legendSort === 'asc' ? a.localeCompare(b) : b.localeCompare(a);
+    });
+  const { effectiveLegendMargin, effectiveLegendType } = resolveLegendLayout({
+    chartHeight: height,
+    chartWidth: width,
+    legendItems: legendData,
+    legendMargin,
+    orientation: legendOrientation,
+    show: showLegend,
+    theme,
+    type: legendType,
+  });
 
   const chartPadding = getChartPadding(
     showLegend,
     legendOrientation,
-    legendMargin,
+    effectiveLegendMargin,
   );
 
   const series: PieSeriesOption[] = [
@@ -444,13 +461,13 @@ export default function transformProps(
       },
     },
     legend: {
-      ...getLegendProps(legendType, legendOrientation, showLegend, theme),
-      data: transformedData
-        .map(datum => datum.name)
-        .sort((a: string, b: string) => {
-          if (!legendSort) return 0;
-          return legendSort === 'asc' ? a.localeCompare(b) : b.localeCompare(a);
-        }),
+      ...getLegendProps(
+        effectiveLegendType,
+        legendOrientation,
+        showLegend,
+        theme,
+      ),
+      data: legendData,
     },
     graphic: showTotal
       ? {
diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/Radar/transformProps.ts b/superset-frontend/plugins/plugin-chart-echarts/src/Radar/transformProps.ts
index 142bc51de45..a906ee9b177 100644
--- a/superset-frontend/plugins/plugin-chart-echarts/src/Radar/transformProps.ts
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/Radar/transformProps.ts
@@ -45,6 +45,7 @@ import {
   getColtypesMapping,
   getLegendProps,
 } from '../utils/series';
+import { resolveLegendLayout } from '../utils/legendLayout';
 import { defaultGrid } from '../defaults';
 import { Refs } from '../types';
 import { getDefaultTooltip } from '../utils/tooltip';
@@ -313,11 +314,27 @@ export default function transformProps(
       min,
     };
   });
+  const legendData = Array.from(columnsLabelMap.keys()).sort(
+    (a: string, b: string) => {
+      if (!legendSort) return 0;
+      return legendSort === 'asc' ? a.localeCompare(b) : b.localeCompare(a);
+    },
+  );
+  const { effectiveLegendMargin, effectiveLegendType } = resolveLegendLayout({
+    chartHeight: height,
+    chartWidth: width,
+    legendItems: legendData,
+    legendMargin,
+    orientation: legendOrientation,
+    show: showLegend,
+    theme,
+    type: legendType,
+  });
 
   const series: RadarSeriesOption[] = [
     {
       type: 'radar',
-      ...getChartPadding(showLegend, legendOrientation, legendMargin),
+      ...getChartPadding(showLegend, legendOrientation, effectiveLegendMargin),
       animation: false,
       emphasis: {
         label: {
@@ -354,11 +371,13 @@ export default function transformProps(
       formatter: NormalizedTooltipFormater,
     },
     legend: {
-      ...getLegendProps(legendType, legendOrientation, showLegend, theme),
-      data: Array.from(columnsLabelMap.keys()).sort((a: string, b: string) => {
-        if (!legendSort) return 0;
-        return legendSort === 'asc' ? a.localeCompare(b) : b.localeCompare(a);
-      }),
+      ...getLegendProps(
+        effectiveLegendType,
+        legendOrientation,
+        showLegend,
+        theme,
+      ),
+      data: legendData,
     },
     series,
     radar: {
diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Area/controlPanel.tsx b/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Area/controlPanel.tsx
index 4909ea38a81..5c12e526e9b 100644
--- a/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Area/controlPanel.tsx
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Area/controlPanel.tsx
@@ -17,7 +17,10 @@
  * under the License.
  */
 import { t } from '@apache-superset/core/translation';
+import { getColumnLabel, QueryFormColumn } from '@superset-ui/core';
+import { GenericDataType } from '@apache-superset/core/common';
 import {
+  checkColumnType,
   ControlPanelConfig,
   ControlPanelsContainerProps,
   ControlSubSectionHeader,
@@ -181,6 +184,30 @@ const config: ControlPanelConfig = {
               ...sharedControls.x_axis_time_format,
               default: 'smart_date',
               description: `${D3_TIME_FORMAT_DOCS}. ${TIME_SERIES_DESCRIPTION_TEXT}`,
+              visibility: ({ controls }: ControlPanelsContainerProps) =>
+                checkColumnType(
+                  getColumnLabel(controls?.x_axis?.value as QueryFormColumn),
+                  controls?.datasource?.datasource,
+                  [GenericDataType.Temporal],
+                ),
+              disableStash: true,
+              resetOnHide: false,
+            },
+          },
+        ],
+        [
+          {
+            name: 'x_axis_number_format',
+            config: {
+              ...sharedControls.x_axis_number_format,
+              default: '~g',
+              mapStateToProps: undefined,
+              visibility: ({ controls }: ControlPanelsContainerProps) =>
+                checkColumnType(
+                  getColumnLabel(controls?.x_axis?.value as QueryFormColumn),
+                  controls?.datasource?.datasource,
+                  [GenericDataType.Numeric],
+                ),
             },
           },
         ],
diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/EchartsTimeseries.test.tsx b/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/EchartsTimeseries.test.tsx
index 4c52463936b..6804f9c9784 100644
--- a/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/EchartsTimeseries.test.tsx
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/EchartsTimeseries.test.tsx
@@ -156,9 +156,9 @@ const defaultFormData: EchartsTimeseriesFormData & {
   showLegend: false,
   legendSort: null,
   xAxisTitle: '',
-  xAxisTitleMargin: 0,
+  xAxisTitleMargin: 40,
   yAxisTitle: '',
-  yAxisTitleMargin: 15,
+  yAxisTitleMargin: 50,
   yAxisTitlePosition: '',
   time_range: 'No filter',
   granularity: undefined,
diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Regular/Bar/controlPanel.tsx b/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Regular/Bar/controlPanel.tsx
index 8ab2b643809..da95df2d891 100644
--- a/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Regular/Bar/controlPanel.tsx
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Regular/Bar/controlPanel.tsx
@@ -17,8 +17,15 @@
  * under the License.
  */
 import { t } from '@apache-superset/core/translation';
-import { ensureIsArray, JsonArray } from '@superset-ui/core';
 import {
+  ensureIsArray,
+  getColumnLabel,
+  JsonArray,
+  QueryFormColumn,
+} from '@superset-ui/core';
+import { GenericDataType } from '@apache-superset/core/common';
+import {
+  checkColumnType,
   ControlPanelConfig,
   ControlPanelsContainerProps,
   ControlSetRow,
@@ -85,7 +92,7 @@ function createAxisTitleControl(axis: 'x' | 'y'): ControlSetRow[] {
           clearable: true,
           label: t('Axis title margin'),
           renderTrigger: true,
-          default: sections.TITLE_MARGIN_OPTIONS[0],
+          default: sections.TITLE_MARGIN_OPTIONS[3],
           choices: formatSelectOptions(sections.TITLE_MARGIN_OPTIONS),
           visibility: ({ controls }: ControlPanelsContainerProps) =>
             isXAxis ? isVertical(controls) : isHorizontal(controls),
@@ -118,7 +125,7 @@ function createAxisTitleControl(axis: 'x' | 'y'): ControlSetRow[] {
           clearable: true,
           label: t('Axis title margin'),
           renderTrigger: true,
-          default: sections.TITLE_MARGIN_OPTIONS[1],
+          default: sections.TITLE_MARGIN_OPTIONS[4],
           choices: formatSelectOptions(sections.TITLE_MARGIN_OPTIONS),
           visibility: ({ controls }: ControlPanelsContainerProps) =>
             isXAxis ? isHorizontal(controls) : isVertical(controls),
@@ -154,6 +161,13 @@ function createAxisControl(axis: 'x' | 'y'): ControlSetRow[] {
     Boolean(controls?.orientation.value === OrientationType.Vertical);
   const isHorizontal = (controls: ControlStateMapping) =>
     Boolean(controls?.orientation.value === OrientationType.Horizontal);
+  const isNumericXAxis = (controls: ControlStateMapping) =>
+    checkColumnType(
+      getColumnLabel(controls?.x_axis?.value as QueryFormColumn),
+      controls?.datasource?.datasource,
+      [GenericDataType.Numeric],
+    );
+
   return [
     [
       {
@@ -163,7 +177,23 @@ function createAxisControl(axis: 'x' | 'y'): ControlSetRow[] {
           default: 'smart_date',
           description: `${D3_TIME_FORMAT_DOCS}. ${TIME_SERIES_DESCRIPTION_TEXT}`,
           visibility: ({ controls }: ControlPanelsContainerProps) =>
-            isXAxis ? isVertical(controls) : isHorizontal(controls),
+            (isXAxis ? isVertical(controls) : isHorizontal(controls)) &&
+            !isNumericXAxis(controls),
+          disableStash: true,
+          resetOnHide: false,
+        },
+      },
+    ],
+    [
+      {
+        name: 'x_axis_number_format',
+        config: {
+          ...sharedControls.x_axis_number_format,
+          default: '~g',
+          mapStateToProps: undefined,
+          visibility: ({ controls }: ControlPanelsContainerProps) =>
+            (isXAxis ? isVertical(controls) : isHorizontal(controls)) &&
+            isNumericXAxis(controls),
           disableStash: true,
           resetOnHide: false,
         },
diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Regular/Line/controlPanel.tsx b/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Regular/Line/controlPanel.tsx
index 5d2ca46e3f3..ad1ad61e05f 100644
--- a/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Regular/Line/controlPanel.tsx
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Regular/Line/controlPanel.tsx
@@ -17,7 +17,10 @@
  * under the License.
  */
 import { t } from '@apache-superset/core/translation';
+import { getColumnLabel, QueryFormColumn } from '@superset-ui/core';
+import { GenericDataType } from '@apache-superset/core/common';
 import {
+  checkColumnType,
   ControlPanelConfig,
   ControlPanelsContainerProps,
   ControlSubSectionHeader,
@@ -146,6 +149,30 @@ const config: ControlPanelConfig = {
               ...sharedControls.x_axis_time_format,
               default: 'smart_date',
               description: `${D3_TIME_FORMAT_DOCS}. ${TIME_SERIES_DESCRIPTION_TEXT}`,
+              visibility: ({ controls }: ControlPanelsContainerProps) =>
+                checkColumnType(
+                  getColumnLabel(controls?.x_axis?.value as QueryFormColumn),
+                  controls?.datasource?.datasource,
+                  [GenericDataType.Temporal],
+                ),
+              disableStash: true,
+              resetOnHide: false,
+            },
+          },
+        ],
+        [
+          {
+            name: 'x_axis_number_format',
+            config: {
+              ...sharedControls.x_axis_number_format,
+              default: '~g',
+              mapStateToProps: undefined,
+              visibility: ({ controls }: ControlPanelsContainerProps) =>
+                checkColumnType(
+                  getColumnLabel(controls?.x_axis?.value as QueryFormColumn),
+                  controls?.datasource?.datasource,
+                  [GenericDataType.Numeric],
+                ),
             },
           },
         ],
diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Regular/Scatter/controlPanel.tsx b/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Regular/Scatter/controlPanel.tsx
index 97a6114b367..a955da37d52 100644
--- a/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Regular/Scatter/controlPanel.tsx
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Regular/Scatter/controlPanel.tsx
@@ -17,7 +17,10 @@
  * under the License.
  */
 import { t } from '@apache-superset/core/translation';
+import { getColumnLabel, QueryFormColumn } from '@superset-ui/core';
+import { GenericDataType } from '@apache-superset/core/common';
 import {
+  checkColumnType,
   ControlPanelConfig,
   ControlPanelsContainerProps,
   ControlSubSectionHeader,
@@ -112,53 +115,28 @@ const config: ControlPanelConfig = {
               ...sharedControls.x_axis_time_format,
               default: 'smart_date',
               description: `${D3_TIME_FORMAT_DOCS}. ${TIME_SERIES_DESCRIPTION_TEXT}`,
-              visibility: ({ controls }: ControlPanelsContainerProps) => {
-                // check if x axis is a time column
-                const xAxisColumn = controls?.x_axis?.value;
-                const xAxisOptions = controls?.x_axis?.options;
-
-                if (!xAxisColumn || !Array.isArray(xAxisOptions)) {
-                  return false;
-                }
-
-                const xAxisType = xAxisOptions.find(
-                  option => option.column_name === xAxisColumn,
-                )?.type;
-
-                return (
-                  typeof xAxisType === 'string' &&
-                  xAxisType.toUpperCase().includes('TIME')
-                );
-              },
+              visibility: ({ controls }: ControlPanelsContainerProps) =>
+                checkColumnType(
+                  getColumnLabel(controls?.x_axis?.value as QueryFormColumn),
+                  controls?.datasource?.datasource,
+                  [GenericDataType.Temporal],
+                ),
+              disableStash: true,
+              resetOnHide: false,
             },
           },
           {
             name: 'x_axis_number_format',
             config: {
               ...sharedControls.x_axis_number_format,
-              visibility: ({ controls }: ControlPanelsContainerProps) => {
-                // check if x axis is a floating-point column
-                const xAxisColumn = controls?.x_axis?.value;
-                const xAxisOptions = controls?.x_axis?.options;
-
-                if (!xAxisColumn || !Array.isArray(xAxisOptions)) {
-                  return false;
-                }
-
-                const xAxisType = xAxisOptions.find(
-                  option => option.column_name === xAxisColumn,
-                )?.type;
-
-                if (typeof xAxisType !== 'string') {
-                  return false;
-                }
-
-                const typeUpper = xAxisType.toUpperCase();
-
-                return ['FLOAT', 'DOUBLE', 'REAL', 'NUMERIC', 'DECIMAL'].some(
-                  t => typeUpper.includes(t),
-                );
-              },
+              default: '~g',
+              mapStateToProps: undefined,
+              visibility: ({ controls }: ControlPanelsContainerProps) =>
+                checkColumnType(
+                  getColumnLabel(controls?.x_axis?.value as QueryFormColumn),
+                  controls?.datasource?.datasource,
+                  [GenericDataType.Numeric],
+                ),
             },
           },
         ],
diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Regular/SmoothLine/controlPanel.tsx b/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Regular/SmoothLine/controlPanel.tsx
index c13d89787c3..45128037fca 100644
--- a/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Regular/SmoothLine/controlPanel.tsx
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Regular/SmoothLine/controlPanel.tsx
@@ -17,7 +17,10 @@
  * under the License.
  */
 import { t } from '@apache-superset/core/translation';
+import { getColumnLabel, QueryFormColumn } from '@superset-ui/core';
+import { GenericDataType } from '@apache-superset/core/common';
 import {
+  checkColumnType,
   ControlPanelConfig,
   ControlPanelsContainerProps,
   ControlSubSectionHeader,
@@ -111,6 +114,30 @@ const config: ControlPanelConfig = {
               ...sharedControls.x_axis_time_format,
               default: 'smart_date',
               description: `${D3_TIME_FORMAT_DOCS}. ${TIME_SERIES_DESCRIPTION_TEXT}`,
+              visibility: ({ controls }: ControlPanelsContainerProps) =>
+                checkColumnType(
+                  getColumnLabel(controls?.x_axis?.value as QueryFormColumn),
+                  controls?.datasource?.datasource,
+                  [GenericDataType.Temporal],
+                ),
+              disableStash: true,
+              resetOnHide: false,
+            },
+          },
+        ],
+        [
+          {
+            name: 'x_axis_number_format',
+            config: {
+              ...sharedControls.x_axis_number_format,
+              default: '~g',
+              mapStateToProps: undefined,
+              visibility: ({ controls }: ControlPanelsContainerProps) =>
+                checkColumnType(
+                  getColumnLabel(controls?.x_axis?.value as QueryFormColumn),
+                  controls?.datasource?.datasource,
+                  [GenericDataType.Numeric],
+                ),
             },
           },
         ],
diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Step/controlPanel.tsx b/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Step/controlPanel.tsx
index cbb17d7e0b4..87bcb0adc21 100644
--- a/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Step/controlPanel.tsx
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Step/controlPanel.tsx
@@ -17,7 +17,10 @@
  * under the License.
  */
 import { t } from '@apache-superset/core/translation';
+import { getColumnLabel, QueryFormColumn } from '@superset-ui/core';
+import { GenericDataType } from '@apache-superset/core/common';
 import {
+  checkColumnType,
   ControlPanelConfig,
   ControlPanelsContainerProps,
   ControlSubSectionHeader,
@@ -163,6 +166,30 @@ const config: ControlPanelConfig = {
               ...sharedControls.x_axis_time_format,
               default: 'smart_date',
               description: `${D3_TIME_FORMAT_DOCS}. ${TIME_SERIES_DESCRIPTION_TEXT}`,
+              visibility: ({ controls }: ControlPanelsContainerProps) =>
+                checkColumnType(
+                  getColumnLabel(controls?.x_axis?.value as QueryFormColumn),
+                  controls?.datasource?.datasource,
+                  [GenericDataType.Temporal],
+                ),
+              disableStash: true,
+              resetOnHide: false,
+            },
+          },
+        ],
+        [
+          {
+            name: 'x_axis_number_format',
+            config: {
+              ...sharedControls.x_axis_number_format,
+              default: '~g',
+              mapStateToProps: undefined,
+              visibility: ({ controls }: ControlPanelsContainerProps) =>
+                checkColumnType(
+                  getColumnLabel(controls?.x_axis?.value as QueryFormColumn),
+                  controls?.datasource?.datasource,
+                  [GenericDataType.Numeric],
+                ),
             },
           },
         ],
diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/constants.ts b/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/constants.ts
index 472d5fc6525..cdbab53d4f1 100644
--- a/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/constants.ts
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/constants.ts
@@ -44,9 +44,9 @@ export const DEFAULT_FORM_DATA: EchartsTimeseriesFormData = {
   // ...DEFAULT_TITLE_FORM_DATA, // TODO: figure out why these break things for stories (e.g. Bubble Chart)
   // here are the contents of DEFAULT_TITLE_FORM_DATA:
   xAxisTitle: '',
-  xAxisTitleMargin: 0,
+  xAxisTitleMargin: 40,
   yAxisTitle: '',
-  yAxisTitleMargin: 15,
+  yAxisTitleMargin: 50,
   yAxisTitlePosition: 'Top',
   // Now that the weird bug workaround is over, here's the rest...
   ...DEFAULT_SORT_SERIES_DATA,
diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/transformProps.ts b/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/transformProps.ts
index f7d90cc3f5a..114c374d659 100644
--- a/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/transformProps.ts
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/transformProps.ts
@@ -63,7 +63,13 @@ import {
   TimeseriesChartTransformedProps,
 } from './types';
 import { DEFAULT_FORM_DATA } from './constants';
-import { ForecastSeriesEnum, ForecastValue, Refs } from '../types';
+import {
+  ForecastSeriesEnum,
+  ForecastValue,
+  LegendOrientation,
+  LegendType,
+  Refs,
+} from '../types';
 import { parseAxisBound } from '../utils/controls';
 import {
   calculateLowerLogTick,
@@ -74,9 +80,11 @@ import {
   extractTooltipKeys,
   getAxisType,
   getColtypesMapping,
+  getHorizontalLegendAvailableWidth,
   getLegendProps,
   getMinAndMaxFromBounds,
 } from '../utils/series';
+import { resolveLegendLayout } from '../utils/legendLayout';
 import {
   extractAnnotationLabels,
   getAnnotationData,
@@ -116,6 +124,60 @@ import {
 import { safeParseEChartOptions } from '../utils/safeEChartOptionsParser';
 import { mergeCustomEChartOptions } from '../utils/mergeCustomEChartOptions';
 
+const visibleDashPatterns: ([number, number] | 'dashed' | 'dotted')[] = [
+  'dashed',
+  'dotted',
+  [6, 15], // narrow dashed
+  [2, 10], // wide dotted
+  [20, 3], // wide dashed
+];
+const visibleSymbols = [
+  'rect',
+  'triangle',
+  'diamond',
+  'roundRect',
+  'pin',
+] as const;
+
+function getSymbolMarker(symbol: string, color: string) {
+  const size = 10;
+  switch (symbol) {
+    case 'circle':
+      return `<span style="
+        display:inline-block;width:${size}px;height:${size}px;
+        border-radius:50%;background:${color};margin-right:5px"></span>`;
+    case 'rect':
+      return `<span style="
+        display:inline-block;width:${size}px;height:${size}px;
+        background:${color};margin-right:5px"></span>`;
+    case 'roundRect':
+      return `<span style="
+        display:inline-block;width:${size}px;height:${size}px;border-radius:2px;
+        background:${color};margin-right:5px"></span>`;
+    case 'triangle':
+      return `<span style="
+        display:inline-block;width:0;height:0;
+        border-left:${size / 2}px solid transparent;
+        border-right:${size / 2}px solid transparent;
+        border-bottom:${size}px solid ${color};
+        margin-right:5px"></span>`;
+    case 'diamond':
+      return `<span style="
+        display:inline-block;width:${size - 2}px;height:${size - 2}px;
+        background:${color};transform: rotate(45deg) translateX(1px) translateY(-1px);
+        margin-right:5px"></span>`;
+    case 'pin':
+      return `<span style="
+        display:inline-block;width:${size - 2}px;height:${size - 2}px;
+        background:${color};transform: rotate(45deg) translateX(1px) translateY(-1px);
+        border-radius:50%;border-bottom-right-radius:0;margin-right:5px"></span>`;
+    default:
+      return `<span style="
+        display:inline-block;width:${size}px;height:${size}px;
+        border-radius:50%;background:${color};margin-right:5px"></span>`;
+  }
+}
+
 export default function transformProps(
   chartProps: EchartsTimeseriesChartProps,
 ): TimeseriesChartTransformedProps {
@@ -338,7 +400,8 @@ export default function transformProps(
     );
 
     const lineStyle: LineStyleOption = {};
-    if (derivedSeries) {
+    let lineSymbol;
+    if (derivedSeries && timeShiftColor) {
       // Get the time offset for this series to assign different dash patterns
       const offset = getTimeOffset(entry, array) || seriesName;
       if (!offsetLineWidths[offset]) {
@@ -347,11 +410,11 @@ export default function transformProps(
       // Use visible dash patterns that vary by offset index
       // Pattern: [dash length, gap length] - scaled to be clearly visible
       const patternIndex = offsetLineWidths[offset];
-      lineStyle.type = [
-        (patternIndex % 5) + 4, // dash: 4-8px (visible)
-        (patternIndex % 3) + 3, // gap: 3-5px (visible)
-      ];
+      lineStyle.type =
+        visibleDashPatterns[patternIndex % visibleDashPatterns.length];
+
       lineStyle.opacity = OpacityEnum.DerivedSeries;
+      lineSymbol = visibleSymbols[patternIndex % visibleSymbols.length];
     }
 
     // Calculate min/max from data for horizontal bar charts
@@ -435,6 +498,7 @@ export default function transformProps(
         sliceId,
         isHorizontal,
         lineStyle,
+        lineSymbol,
         timeCompare: array,
         timeShiftColor,
         theme,
@@ -595,7 +659,10 @@ export default function transformProps(
     for (const s of series) {
       if (s.id) {
         const columnsArr = labelMap[s.id];
-        (s as any).stack = columnsArr[idxSelectedDimension];
+        const dimensionValue = columnsArr?.[idxSelectedDimension];
+        if (dimensionValue !== undefined) {
+          (s as any).stack = dimensionValue;
+        }
       }
     }
   }
@@ -618,9 +685,24 @@ export default function transformProps(
 
   // For horizontal bar charts, set max/min from calculated data bounds
   if (shouldCalculateDataBounds) {
-    // Set max to actual data max to avoid gaps and ensure labels are visible
-    if (dataMax !== undefined && yAxisMax === undefined) {
-      yAxisMax = dataMax;
+    // For stacked charts, clamp against the per-row stacked total to avoid
+    // clipping bars. Also keep dataMax so that mixed-sign stacks (where
+    // positive and negative values cancel in the algebraic row sum) cannot
+    // produce an axis max smaller than the largest individual positive segment.
+    const stackedTotalMax = Math.max(
+      ...sortedTotalValues.filter(
+        (v): v is number => typeof v === 'number' && !Number.isNaN(v),
+      ),
+    );
+    const effectiveDataMax = stack
+      ? Math.max(dataMax ?? Number.NEGATIVE_INFINITY, stackedTotalMax)
+      : dataMax;
+    if (
+      effectiveDataMax !== undefined &&
+      Number.isFinite(effectiveDataMax) &&
+      yAxisMax === undefined
+    ) {
+      yAxisMax = effectiveDataMax;
     }
     // Set min to actual data min for diverging bars
     if (dataMin !== undefined && yAxisMin === undefined && dataMin < 0) {
@@ -651,25 +733,10 @@ export default function transformProps(
     !!yAxisTitle && convertInteger(yAxisTitleMargin) !== 0;
   const addXAxisLabelOffset =
     !!xAxisTitle && convertInteger(xAxisTitleMargin) !== 0;
-  const padding = getPadding(
-    showLegend,
-    legendOrientation,
-    addYAxisLabelOffset,
-    zoomable,
-    legendMargin,
-    addXAxisLabelOffset,
-    yAxisTitlePosition,
-    convertInteger(yAxisTitleMargin),
-    convertInteger(xAxisTitleMargin),
-    isHorizontal,
-  );
-
   const legendData =
     colorByPrimaryAxis && groupBy.length === 0 && series.length > 0
-      ? // When colorByPrimaryAxis is enabled, show only primary axis values (deduped + filtered)
-        (() => {
+      ? (() => {
           const firstSeries = series[0];
-          // For horizontal charts the category is at index 1, for vertical at index 0
           const primaryAxisIndex = isHorizontal ? 1 : 0;
           if (firstSeries && Array.isArray(firstSeries.data)) {
             const names = (firstSeries.data as any[])
@@ -692,8 +759,7 @@ export default function transformProps(
           }
           return [];
         })()
-      : // Otherwise show original series names
-        rawSeries
+      : rawSeries
           .filter(
             entry =>
               extractForecastSeriesContext(entry.name || '').type ===
@@ -702,6 +768,116 @@ export default function transformProps(
           .map(entry => entry.name || '')
           .concat(extractAnnotationLabels(annotationLayers));
 
+  const sortedLegendData = [...legendData].sort((a: string, b: string) => {
+    if (!legendSort) return 0;
+    return legendSort === 'asc' ? a.localeCompare(b) : b.localeCompare(a);
+  });
+  const colorByPrimaryAxisLegendData = legendData.map(name => ({
+    name,
+    icon: 'roundRect',
+  }));
+  const getLegendLayout = (candidateLegendMargin?: string | number | null) => {
+    const padding = getPadding(
+      showLegend,
+      legendOrientation,
+      addYAxisLabelOffset,
+      zoomable,
+      candidateLegendMargin,
+      addXAxisLabelOffset,
+      yAxisTitlePosition,
+      convertInteger(yAxisTitleMargin),
+      convertInteger(xAxisTitleMargin),
+      isHorizontal,
+    );
+
+    return resolveLegendLayout({
+      availableWidth:
+        legendOrientation === LegendOrientation.Top ||
+        legendOrientation === LegendOrientation.Bottom
+          ? getHorizontalLegendAvailableWidth({
+              chartWidth: width,
+              orientation: legendOrientation,
+              padding,
+              zoomable,
+            })
+          : undefined,
+      chartHeight: height,
+      chartWidth: width,
+      legendItems:
+        colorByPrimaryAxis && groupBy.length === 0
+          ? colorByPrimaryAxisLegendData
+          : sortedLegendData,
+      legendMargin: candidateLegendMargin,
+      orientation: legendOrientation,
+      show: showLegend,
+      showSelectors: !(colorByPrimaryAxis && groupBy.length === 0),
+      theme,
+      type: legendType,
+    });
+  };
+  const initialLegendLayout = getLegendLayout(legendMargin);
+  const legendLayout =
+    isHorizontal &&
+    legendOrientation === LegendOrientation.Bottom &&
+    initialLegendLayout.effectiveLegendType === LegendType.Plain
+      ? getLegendLayout(initialLegendLayout.effectiveLegendMargin)
+      : initialLegendLayout;
+  const { effectiveLegendType } = legendLayout;
+  const effectiveLegendMargin =
+    isHorizontal &&
+    legendOrientation === LegendOrientation.Bottom &&
+    legendLayout.effectiveLegendType === LegendType.Scroll
+      ? legendMargin
+      : legendLayout.effectiveLegendMargin;
+  const padding = getPadding(
+    showLegend,
+    legendOrientation,
+    addYAxisLabelOffset,
+    zoomable,
+    effectiveLegendMargin,
+    addXAxisLabelOffset,
+    yAxisTitlePosition,
+    convertInteger(yAxisTitleMargin),
+    convertInteger(xAxisTitleMargin),
+    isHorizontal,
+  );
+
+  // Reduce grid padding for small charts to maximize the drawing area.
+  // Keep enough top padding so the max label doesn't clip against the cell border.
+  // Preserve bottom padding when zoomable, since getPadding() reserves space for the dataZoom slider.
+  if (height < TIMESERIES_CONSTANTS.compactChartHeight) {
+    padding.top = Math.min(padding.top, 12);
+    if (!zoomable) {
+      padding.bottom = Math.min(padding.bottom, 5);
+    }
+  }
+
+  // When showMaxLabel is true, ECharts may render a label at the axis
+  // boundary that formats identically to the last data-point tick (e.g.
+  // "2005" appears twice with Year grain). Wrap the formatter to suppress
+  // consecutive duplicate labels.
+  const showMaxLabel = xAxisType === AxisType.Time && xAxisLabelRotation === 0;
+  const deduplicatedFormatter = showMaxLabel
+    ? (() => {
+        let lastLabel: string | undefined;
+        const wrapper = (value: number | string) => {
+          const label =
+            typeof xAxisFormatter === 'function'
+              ? (xAxisFormatter as Function)(value)
+              : String(value);
+          if (label === lastLabel) {
+            return '';
+          }
+          lastLabel = label;
+          return label;
+        };
+        if (typeof xAxisFormatter === 'function' && 'id' in xAxisFormatter) {
+          (wrapper as any).id = (xAxisFormatter as any).id;
+        }
+        return wrapper;
+      })()
+    : xAxisFormatter;
+
   let xAxis: any = {
     type: xAxisType,
     name: xAxisTitle,
@@ -715,17 +891,16 @@ export default function transformProps(
       // from overlapping each other, with showMaxLabel to ensure
       // the last data point label stays visible (#37181).
       hideOverlap: !(xAxisType === AxisType.Time && xAxisLabelRotation !== 0),
-      formatter: xAxisFormatter,
+      formatter: deduplicatedFormatter,
       rotate: xAxisLabelRotation,
       interval: xAxisLabelInterval,
       // Force last label on non-rotated time axes to prevent
       // hideOverlap from hiding it. Skipped when rotated to
       // avoid phantom labels at the axis boundary.
-      ...(xAxisType === AxisType.Time &&
-        xAxisLabelRotation === 0 && {
-          showMaxLabel: true,
-          alignMaxLabel: 'right',
-        }),
+      ...(showMaxLabel && {
+        showMaxLabel: true,
+        alignMaxLabel: 'right',
+      }),
     },
     minorTick: { show: minorTicks },
     minInterval:
@@ -749,14 +924,35 @@ export default function transformProps(
     ),
   };
 
+  // Adapt y-axis to chart height: three tiers based on available space.
+  // >= 100px: full axis with proportional tick count
+  // 60-99px: show only min/max boundary labels (splitNumber=1), hide lines/ticks
+  // < 60px: hide all axis decorations, show line only
+  const isSmallChart = height < TIMESERIES_CONSTANTS.compactChartHeight;
+  const isMicroChart = height < TIMESERIES_CONSTANTS.microChartHeight;
+  const yAxisSplitNumber = isMicroChart
+    ? undefined
+    : isSmallChart
+      ? 1
+      : Math.max(
+          3,
+          Math.floor(height / TIMESERIES_CONSTANTS.yAxisPixelsPerTick),
+        );
+
   let yAxis: any = {
     ...defaultYAxis,
     type: logAxis ? AxisType.Log : AxisType.Value,
+    ...(yAxisSplitNumber !== undefined && { splitNumber: yAxisSplitNumber }),
     min: yAxisMin,
     max: yAxisMax,
-    minorTick: { show: minorTicks },
-    minorSplitLine: { show: minorSplitLine },
+    minorTick: { show: isSmallChart ? false : minorTicks },
+    minorSplitLine: { show: isSmallChart ? false : minorSplitLine },
+    splitLine: { show: !isSmallChart },
     axisLabel: {
+      show: !isMicroChart,
+      showMinLabel: !isMicroChart,
+      showMaxLabel: !isMicroChart,
+      hideOverlap: true,
       formatter: getYAxisFormatter(
         metrics,
         forcePercentFormatter,
@@ -765,8 +961,9 @@ export default function transformProps(
         yAxisFormat,
       ),
     },
+    axisTick: { show: !isSmallChart },
     scale: truncateYAxis,
-    name: yAxisTitle,
+    name: isSmallChart ? undefined : yAxisTitle,
     nameGap: convertInteger(yAxisTitleMargin),
     nameLocation: yAxisTitlePosition === 'Left' ? 'middle' : 'end',
   };
@@ -868,10 +1065,16 @@ export default function transformProps(
             if (value.observation === 0 && stack) {
               return;
             }
+            const seriesForKey = series.find(s => s.name === key);
+            const symbolForSeries = (seriesForKey as any)?.symbol || 'circle';
+            const marker = value.color
+              ? getSymbolMarker(symbolForSeries, value.color)
+              : value.marker;
             const row = formatForecastTooltipSeries({
               ...value,
               seriesName: key,
               formatter,
+              marker,
             });
 
             const annotationRow = annotationLayers.some(
@@ -910,9 +1113,10 @@ export default function transformProps(
     },
     legend: {
       ...getLegendProps(
-        legendType,
+        effectiveLegendType,
         legendOrientation,
-        showLegend,
+        // Hide legend on compact charts — not enough vertical space
+        isSmallChart ? false : showLegend,
         theme,
         zoomable,
         legendState,
@@ -921,18 +1125,8 @@ export default function transformProps(
       scrollDataIndex: legendIndex || 0,
       data:
         colorByPrimaryAxis && groupBy.length === 0
-          ? // When colorByPrimaryAxis, configure legend items with roundRect icons
-            legendData.map(name => ({
-              name,
-              icon: 'roundRect',
-            }))
-          : // Otherwise use normal legend data
-            legendData.sort((a: string, b: string) => {
-              if (!legendSort) return 0;
-              return legendSort === 'asc'
-                ? a.localeCompare(b)
-                : b.localeCompare(a);
-            }),
+          ? colorByPrimaryAxisLegendData
+          : sortedLegendData,
       // Disable legend selection and buttons when colorByPrimaryAxis is enabled
       ...(colorByPrimaryAxis && groupBy.length === 0
         ? {
diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/transformers.ts b/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/transformers.ts
index 799fce3003c..2a5f937075b 100644
--- a/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/transformers.ts
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/transformers.ts
@@ -221,6 +221,7 @@ export function transformSeries(
     seriesKey?: OptionName;
     sliceId?: number;
     isHorizontal?: boolean;
+    lineSymbol?: string;
     lineStyle?: LineStyleOption;
     queryIndex?: number;
     timeCompare?: string[];
@@ -359,8 +360,10 @@ export function transformSeries(
 
   // Use filled circles in dark mode to avoid the white fill issue with hollow circles
   // Use emptyCircle explicitly in light mode
-  const symbol =
-    plotType === 'line' ? (isDarkMode ? 'circle' : 'emptyCircle') : undefined;
+  let symbol;
+  if (plotType === 'line') {
+    symbol = opts.lineSymbol || (isDarkMode ? 'circle' : 'emptyCircle');
+  }
 
   return {
     ...series,
diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/components/Echart.tsx b/superset-frontend/plugins/plugin-chart-echarts/src/components/Echart.tsx
index 624316280ca..95e31481264 100644
--- a/superset-frontend/plugins/plugin-chart-echarts/src/components/Echart.tsx
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/components/Echart.tsx
@@ -273,18 +273,28 @@ function Echart(
       );
 
       const notMerge = !isDashboardRefreshing;
-      if (!notMerge) {
-        chartRef.current?.dispatchAction({ type: 'hideTip' });
-      }
+      chartRef.current?.dispatchAction({ type: 'hideTip' });
       chartRef.current?.setOption(themedEchartOptions, {
         notMerge,
         replaceMerge: notMerge ? undefined : ['series'],
-        lazyUpdate: isDashboardRefreshing,
+        // lazyUpdate defers render, causing tooltip crashes on stale shapes (#39247)
+        lazyUpdate: false,
       });
     }
     // eslint-disable-next-line react-hooks/exhaustive-deps -- isDashboardRefreshing intentionally excluded to prevent extra setOption calls
   }, [didMount, echartOptions, eventHandlers, zrEventHandlers, theme, vizType]);
 
+  // Clear tooltip on refresh start to avoid stale content (#39247)
+  useEffect(() => {
+    if (didMount && isDashboardRefreshing && chartRef.current) {
+      chartRef.current.dispatchAction({ type: 'hideTip' });
+      chartRef.current.dispatchAction({
+        type: 'updateAxisPointer',
+        currTrigger: 'leave',
+      });
+    }
+  }, [didMount, isDashboardRefreshing]);
+
   useEffect(() => () => chartRef.current?.dispose(), []);
 
   // highlighting
diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/constants.ts b/superset-frontend/plugins/plugin-chart-echarts/src/constants.ts
index 76de9217868..f496b7e2af8 100644
--- a/superset-frontend/plugins/plugin-chart-echarts/src/constants.ts
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/constants.ts
@@ -47,6 +47,11 @@ export const TIMESERIES_CONSTANTS = {
   extraControlsOffset: 22,
   // Min right padding (px) for horizontal bar charts to ensure value labels are fully visible
   horizontalBarLabelRightPadding: 70,
+  // Height thresholds (px) for responsive y-axis behavior
+  compactChartHeight: 100,
+  microChartHeight: 60,
+  // One y-axis tick per this many pixels of chart height
+  yAxisPixelsPerTick: 80,
 };
 
 export enum OpacityEnum {
@@ -102,9 +107,9 @@ export const DEFAULT_LEGEND_FORM_DATA: LegendFormData = {
 
 export const DEFAULT_TITLE_FORM_DATA: TitleFormData = {
   xAxisTitle: '',
-  xAxisTitleMargin: 0,
+  xAxisTitleMargin: 40,
   yAxisTitle: '',
-  yAxisTitleMargin: 15,
+  yAxisTitleMargin: 50,
   yAxisTitlePosition: 'Top',
 };
 
diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/types.ts b/superset-frontend/plugins/plugin-chart-echarts/src/types.ts
index 4dffdcf59ba..2656bf0a678 100644
--- a/superset-frontend/plugins/plugin-chart-echarts/src/types.ts
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/types.ts
@@ -92,6 +92,7 @@ export type ForecastValue = {
   forecastTrend?: number;
   forecastLower?: number;
   forecastUpper?: number;
+  color?: string;
 };
 
 export type LegendFormData = {
diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/utils/forecast.ts b/superset-frontend/plugins/plugin-chart-echarts/src/utils/forecast.ts
index 8364f4ed220..47cf7d63440 100644
--- a/superset-frontend/plugins/plugin-chart-echarts/src/utils/forecast.ts
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/utils/forecast.ts
@@ -60,7 +60,7 @@ export const extractForecastValuesFromTooltipParams = (
 ): Record<string, ForecastValue> => {
   const values: Record<string, ForecastValue> = {};
   params.forEach(param => {
-    const { marker, seriesId, value } = param;
+    const { marker, seriesId, value, color } = param;
     const context = extractForecastSeriesContext(seriesId);
     const numericValue = isHorizontal ? value[0] : value[1];
     if (typeof numericValue === 'number') {
@@ -69,6 +69,7 @@ export const extractForecastValuesFromTooltipParams = (
           marker: marker || '',
         };
       const forecastValues = values[context.name];
+      forecastValues.color = color;
       if (context.type === ForecastSeriesEnum.Observation)
         forecastValues.observation = numericValue;
       if (context.type === ForecastSeriesEnum.ForecastTrend)
diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/utils/legendLayout.ts b/superset-frontend/plugins/plugin-chart-echarts/src/utils/legendLayout.ts
new file mode 100644
index 00000000000..c4a8740e0c1
--- /dev/null
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/utils/legendLayout.ts
@@ -0,0 +1,56 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+import type { SupersetTheme } from '@apache-superset/core/theme';
+import { LegendOrientation, LegendType } from '../types';
+import { getLegendLayoutResult, LegendLayoutResult } from './series';
+
+type LegendDataItem =
+  | string
+  | number
+  | null
+  | undefined
+  | { name?: string | number | null };
+
+export type ResolvedLegendLayout = {
+  effectiveLegendMargin?: string | number | null;
+  effectiveLegendType: LegendType;
+  legendLayout: LegendLayoutResult;
+};
+
+export function resolveLegendLayout(args: {
+  availableHeight?: number;
+  availableWidth?: number;
+  chartHeight: number;
+  chartWidth: number;
+  legendItems?: LegendDataItem[];
+  legendMargin?: string | number | null;
+  orientation: LegendOrientation;
+  show: boolean;
+  showSelectors?: boolean;
+  theme: SupersetTheme;
+  type: LegendType;
+}): ResolvedLegendLayout {
+  const legendLayout = getLegendLayoutResult(args);
+
+  return {
+    effectiveLegendMargin: legendLayout.effectiveMargin ?? args.legendMargin,
+    effectiveLegendType: legendLayout.effectiveType,
+    legendLayout,
+  };
+}
diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/utils/series.ts b/superset-frontend/plugins/plugin-chart-echarts/src/utils/series.ts
index 882612ec33f..8e243167474 100644
--- a/superset-frontend/plugins/plugin-chart-echarts/src/utils/series.ts
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/utils/series.ts
@@ -55,6 +55,364 @@ function isDefined<T>(value: T | undefined | null): boolean {
   return value !== undefined && value !== null;
 }
 
+const DEFAULT_LEGEND_ITEM_GAP = 10;
+const DEFAULT_LEGEND_ICON_WIDTH = 25;
+const LEGEND_ICON_LABEL_GAP = 5;
+const LEGEND_HORIZONTAL_SIDE_GUTTER = 16;
+const LEGEND_HORIZONTAL_ROW_HEIGHT = 24;
+const LEGEND_HORIZONTAL_MAX_ROWS = 2;
+const LEGEND_HORIZONTAL_MAX_HEIGHT_RATIO = 0.25;
+const LEGEND_VERTICAL_SIDE_GUTTER = 16;
+const LEGEND_VERTICAL_ROW_HEIGHT = 24;
+const LEGEND_VERTICAL_MAX_WIDTH_RATIO = 0.4;
+const LEGEND_SELECTOR_GAP = 10;
+const LEGEND_MARGIN_GUTTER = 45;
+// ECharts does not expose pre-render measurements for plain legends, so these
+// values intentionally overestimate selector space to avoid clipping.
+const ESTIMATED_LEGEND_SELECTOR_WIDTH = 112;
+const LEGEND_TEXT_WIDTH_CACHE = new Map<string, number>();
+
+type LegendDataItem =
+  | string
+  | number
+  | null
+  | undefined
+  | { name?: string | number | null };
+
+export type LegendLayoutResult = {
+  effectiveMargin?: number;
+  effectiveType: LegendType;
+};
+
+const SCROLL_LEGEND_LAYOUT: LegendLayoutResult = {
+  effectiveType: LegendType.Scroll,
+};
+
+function getLegendLabel(item: LegendDataItem): string {
+  if (typeof item === 'string' || typeof item === 'number') {
+    return String(item);
+  }
+
+  if (item?.name === undefined || item.name === null) {
+    return '';
+  }
+
+  return String(item.name);
+}
+
+function measureLegendTextWidth(text: string, theme: SupersetTheme): number {
+  const cacheKey = `${theme.fontFamily}:${theme.fontSizeSM}:${text}`;
+  const cachedWidth = LEGEND_TEXT_WIDTH_CACHE.get(cacheKey);
+  if (cachedWidth !== undefined) {
+    return cachedWidth;
+  }
+
+  let width = text.length * theme.fontSizeSM * 0.62;
+
+  if (typeof document !== 'undefined') {
+    const canvas = document.createElement('canvas');
+    const context = canvas.getContext('2d');
+    if (context) {
+      context.font = `${theme.fontSizeSM}px ${theme.fontFamily}`;
+      ({ width } = context.measureText(text));
+    }
+  }
+
+  LEGEND_TEXT_WIDTH_CACHE.set(cacheKey, width);
+  return width;
+}
+
+function hasLegendLabel(item: LegendDataItem): boolean {
+  if (item === null || item === undefined) {
+    return false;
+  }
+
+  if (typeof item === 'object') {
+    return item.name !== null && item.name !== undefined;
+  }
+
+  return true;
+}
+
+function getLegendLabels(items: LegendDataItem[]): string[] {
+  return items.filter(hasLegendLabel).map(getLegendLabel);
+}
+
+function getLegendItemWidths(labels: string[], theme: SupersetTheme): number[] {
+  return labels.map(
+    label =>
+      DEFAULT_LEGEND_ICON_WIDTH +
+      LEGEND_ICON_LABEL_GAP +
+      measureLegendTextWidth(label, theme),
+  );
+}
+
+function estimateHorizontalLegendRows(
+  labels: string[],
+  chartWidth: number,
+  showSelectors: boolean,
+  theme: SupersetTheme,
+): number {
+  const availableWidth = Math.max(
+    chartWidth - LEGEND_HORIZONTAL_SIDE_GUTTER,
+    0,
+  );
+  if (availableWidth === 0) {
+    return Infinity;
+  }
+
+  const legendItemWidths = getLegendItemWidths(labels, theme);
+
+  if (legendItemWidths.length === 0) {
+    if (showSelectors && ESTIMATED_LEGEND_SELECTOR_WIDTH > availableWidth) {
+      return Infinity;
+    }
+    return 1;
+  }
+
+  let rows = 1;
+  let rowWidth = 0;
+
+  for (const itemWidth of legendItemWidths) {
+    if (itemWidth > availableWidth) {
+      return Infinity;
+    }
+
+    const nextWidth =
+      rowWidth === 0
+        ? itemWidth
+        : rowWidth + DEFAULT_LEGEND_ITEM_GAP + itemWidth;
+    if (rowWidth > 0 && nextWidth > availableWidth) {
+      rows += 1;
+      rowWidth = itemWidth;
+    } else {
+      rowWidth = nextWidth;
+    }
+  }
+
+  if (showSelectors) {
+    if (ESTIMATED_LEGEND_SELECTOR_WIDTH > availableWidth) {
+      return Infinity;
+    }
+    const selectorWidth =
+      rowWidth === 0
+        ? ESTIMATED_LEGEND_SELECTOR_WIDTH
+        : rowWidth + LEGEND_SELECTOR_GAP + ESTIMATED_LEGEND_SELECTOR_WIDTH;
+    if (selectorWidth > availableWidth) {
+      rows += 1;
+    }
+  }
+
+  return rows;
+}
+
+export function getHorizontalLegendAvailableWidth({
+  chartWidth,
+  orientation,
+  padding,
+  zoomable = false,
+}: {
+  chartWidth: number;
+  orientation: LegendOrientation.Top | LegendOrientation.Bottom;
+  padding?: LegendPaddingType;
+  zoomable?: boolean;
+}): number {
+  let availableWidth = chartWidth - (padding?.left ?? 0);
+
+  if (orientation === LegendOrientation.Top && zoomable) {
+    availableWidth -= TIMESERIES_CONSTANTS.legendTopRightOffset;
+  }
+
+  return Math.max(availableWidth, 0);
+}
+
+function getLongestLegendLabelWidth(
+  labels: string[],
+  theme: SupersetTheme,
+): number {
+  return labels.reduce(
+    (maxWidth, label) =>
+      Math.max(maxWidth, measureLegendTextWidth(label, theme)),
+    0,
+  );
+}
+
+function isHorizontalLegendOrientation(
+  orientation: LegendOrientation,
+): orientation is LegendOrientation.Top | LegendOrientation.Bottom {
+  return (
+    orientation === LegendOrientation.Top ||
+    orientation === LegendOrientation.Bottom
+  );
+}
+
+function getHorizontalPlainLegendLayout({
+  availableHeight,
+  availableWidth,
+  currentMargin,
+  legendLabels,
+  orientation,
+  showSelectors,
+  theme,
+}: {
+  availableHeight: number;
+  availableWidth: number;
+  currentMargin: number;
+  legendLabels: string[];
+  orientation: LegendOrientation.Top | LegendOrientation.Bottom;
+  showSelectors: boolean;
+  theme: SupersetTheme;
+}): LegendLayoutResult {
+  const rowCount = estimateHorizontalLegendRows(
+    legendLabels,
+    availableWidth,
+    showSelectors,
+    theme,
+  );
+  const requiredMargin =
+    defaultLegendPadding[orientation] +
+    Math.max(0, rowCount - 1) * LEGEND_HORIZONTAL_ROW_HEIGHT;
+  const maxLegendHeight =
+    availableHeight > 0
+      ? availableHeight * LEGEND_HORIZONTAL_MAX_HEIGHT_RATIO
+      : Infinity;
+
+  if (
+    !Number.isFinite(rowCount) ||
+    rowCount > LEGEND_HORIZONTAL_MAX_ROWS ||
+    requiredMargin > maxLegendHeight
+  ) {
+    return SCROLL_LEGEND_LAYOUT;
+  }
+
+  return {
+    effectiveMargin: Math.max(currentMargin, requiredMargin),
+    effectiveType: LegendType.Plain,
+  };
+}
+
+function getVerticalPlainLegendLayout({
+  availableHeight,
+  availableWidth,
+  currentMargin,
+  legendLabels,
+  showSelectors,
+  theme,
+}: {
+  availableHeight: number;
+  availableWidth: number;
+  currentMargin: number;
+  legendLabels: string[];
+  showSelectors: boolean;
+  theme: SupersetTheme;
+}): LegendLayoutResult {
+  if (legendLabels.length === 0) {
+    return {
+      effectiveMargin: currentMargin,
+      effectiveType: LegendType.Plain,
+    };
+  }
+
+  const selectorHeight = showSelectors
+    ? LEGEND_VERTICAL_ROW_HEIGHT + LEGEND_SELECTOR_GAP
+    : 0;
+  const effectiveAvailableHeight = Math.max(
+    availableHeight - LEGEND_VERTICAL_SIDE_GUTTER - selectorHeight,
+    0,
+  );
+  const rowsPerColumn = Math.floor(
+    (effectiveAvailableHeight + DEFAULT_LEGEND_ITEM_GAP) /
+      (LEGEND_VERTICAL_ROW_HEIGHT + DEFAULT_LEGEND_ITEM_GAP),
+  );
+  const requiredSelectorMargin = showSelectors
+    ? ESTIMATED_LEGEND_SELECTOR_WIDTH + LEGEND_VERTICAL_SIDE_GUTTER
+    : 0;
+  const requiredMargin = Math.ceil(
+    Math.max(
+      getLongestLegendLabelWidth(legendLabels, theme) + LEGEND_MARGIN_GUTTER,
+      requiredSelectorMargin,
+    ),
+  );
+  const maxLegendWidth =
+    availableWidth > 0
+      ? availableWidth * LEGEND_VERTICAL_MAX_WIDTH_RATIO
+      : Infinity;
+
+  if (
+    rowsPerColumn <= 0 ||
+    legendLabels.length > rowsPerColumn ||
+    requiredMargin > maxLegendWidth
+  ) {
+    return SCROLL_LEGEND_LAYOUT;
+  }
+
+  return {
+    effectiveMargin: Math.max(currentMargin, requiredMargin),
+    effectiveType: LegendType.Plain,
+  };
+}
+
+export function getLegendLayoutResult({
+  availableHeight,
+  availableWidth,
+  chartHeight,
+  chartWidth,
+  legendItems = [],
+  legendMargin,
+  orientation,
+  show,
+  showSelectors = true,
+  theme,
+  type,
+}: {
+  // Raw chart dimensions. Use availableWidth/availableHeight when other chart
+  // UI elements reserve legend space before ECharts lays out the legend.
+  availableHeight?: number;
+  availableWidth?: number;
+  chartHeight: number;
+  chartWidth: number;
+  legendItems?: LegendDataItem[];
+  legendMargin?: string | number | null;
+  orientation: LegendOrientation;
+  show: boolean;
+  showSelectors?: boolean;
+  theme: SupersetTheme;
+  type: LegendType;
+}): LegendLayoutResult {
+  if (!show || type !== LegendType.Plain) {
+    return { effectiveType: type };
+  }
+
+  const resolvedLegendMargin =
+    typeof legendMargin === 'number'
+      ? legendMargin
+      : defaultLegendPadding[orientation];
+  const legendLabels = getLegendLabels(legendItems);
+  const resolvedAvailableWidth = availableWidth ?? chartWidth;
+  const resolvedAvailableHeight = availableHeight ?? chartHeight;
+
+  if (isHorizontalLegendOrientation(orientation)) {
+    return getHorizontalPlainLegendLayout({
+      availableHeight: resolvedAvailableHeight,
+      availableWidth: resolvedAvailableWidth,
+      currentMargin: resolvedLegendMargin,
+      legendLabels,
+      orientation,
+      showSelectors,
+      theme,
+    });
+  }
+
+  return getVerticalPlainLegendLayout({
+    availableHeight: resolvedAvailableHeight,
+    availableWidth: resolvedAvailableWidth,
+    currentMargin: resolvedLegendMargin,
+    legendLabels,
+    showSelectors,
+    theme,
+  });
+}
+
 export function extractDataTotalValues(
   data: DataRecord[],
   opts: {
@@ -438,12 +796,6 @@ export function getLegendProps(
   legendState?: LegendState,
   padding?: LegendPaddingType,
 ): LegendComponentOption {
-  const isHorizontal =
-    orientation === LegendOrientation.Top ||
-    orientation === LegendOrientation.Bottom;
-
-  const effectiveType =
-    type === LegendType.Scroll || !isHorizontal ? type : LegendType.Scroll;
   const legend: LegendComponentOption = {
     orient: [LegendOrientation.Top, LegendOrientation.Bottom].includes(
       orientation,
@@ -451,7 +803,7 @@ export function getLegendProps(
       ? 'horizontal'
       : 'vertical',
     show,
-    type: effectiveType,
+    type,
     selected: legendState ?? {},
     selector: ['all', 'inverse'],
     selectorLabel: {
@@ -491,10 +843,16 @@ export function getLegendProps(
       if (padding?.left) {
         legend.left = padding.left;
       }
+      if (type === LegendType.Plain) {
+        legend.right = 0;
+      }
       break;
     case LegendOrientation.Top:
       legend.top = 0;
       legend.right = zoomable ? TIMESERIES_CONSTANTS.legendTopRightOffset : 0;
+      if (type === LegendType.Plain && padding?.left) {
+        legend.left = padding.left;
+      }
       break;
     default:
       legend.top = 0;
diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/utils/tooltip.ts b/superset-frontend/plugins/plugin-chart-echarts/src/utils/tooltip.ts
index f3de48b16e9..c940f5fea0c 100644
--- a/superset-frontend/plugins/plugin-chart-echarts/src/utils/tooltip.ts
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/utils/tooltip.ts
@@ -29,7 +29,8 @@ import { Refs } from '../types';
 
 export function getDefaultTooltip(refs: Refs) {
   return {
-    appendToBody: true,
+    appendToBody:
+      typeof document !== 'undefined' ? !document.fullscreenElement : true,
     borderColor: 'transparent',
     // CSS hack applied on this class to resolve https://github.com/apache/superset/issues/30058
     className: 'echarts-tooltip',
diff --git a/superset-frontend/plugins/plugin-chart-echarts/test/Gantt/transformProps.test.ts b/superset-frontend/plugins/plugin-chart-echarts/test/Gantt/transformProps.test.ts
index fd0545d5e99..f260959e4d2 100644
--- a/superset-frontend/plugins/plugin-chart-echarts/test/Gantt/transformProps.test.ts
+++ b/superset-frontend/plugins/plugin-chart-echarts/test/Gantt/transformProps.test.ts
@@ -303,4 +303,69 @@ describe('legend sorting', () => {
     const legendData = (result.echartOptions.legend as any).data;
     expect(legendData).toEqual(['series value 2', 'series value 1']);
   });
+
+  test('falls back to scroll for plain legends with an overlong legend item', () => {
+    const props = new ChartProps({
+      ...chartPropsConfig,
+      width: 320,
+      formData: {
+        ...formData,
+        legendType: LegendType.Plain,
+      },
+      queriesData: [
+        {
+          data: [
+            {
+              startTime: Date.UTC(2025, 1, 1, 13, 0, 0),
+              endTime: Date.UTC(2025, 1, 1, 14, 0, 0),
+              'Y Axis': 'first',
+              tooltip_column: 'tooltip value 1',
+              series:
+                'This is a ridiculously long legend label that should switch to scroll',
+            },
+            {
+              startTime: Date.UTC(2025, 1, 1, 18, 0, 0),
+              endTime: Date.UTC(2025, 1, 1, 20, 0, 0),
+              'Y Axis': 'second',
+              tooltip_column: 'tooltip value 2',
+              series: 'short label',
+            },
+          ],
+          colnames: [
+            'startTime',
+            'endTime',
+            'Y Axis',
+            'tooltip_column',
+            'series',
+          ],
+        },
+      ],
+    });
+
+    const result = transformProps(props as EchartsGanttChartProps);
+
+    expect((result.echartOptions.legend as any).type).toBe(LegendType.Scroll);
+  });
+
+  test('keeps legend visibility driven by showLegend for single-series charts', () => {
+    const props = new ChartProps({
+      ...chartPropsConfig,
+      queriesData: [
+        {
+          data: [queriesData[0].data[0]],
+          colnames: [
+            'startTime',
+            'endTime',
+            'Y Axis',
+            'tooltip_column',
+            'series',
+          ],
+        },
+      ],
+    });
+
+    const result = transformProps(props as EchartsGanttChartProps);
+
+    expect((result.echartOptions.legend as any).show).toBe(true);
+  });
 });
diff --git a/superset-frontend/plugins/plugin-chart-echarts/test/Heatmap/buildQuery.test.ts b/superset-frontend/plugins/plugin-chart-echarts/test/Heatmap/buildQuery.test.ts
index d4d64f37419..75786f761e5 100644
--- a/superset-frontend/plugins/plugin-chart-echarts/test/Heatmap/buildQuery.test.ts
+++ b/superset-frontend/plugins/plugin-chart-echarts/test/Heatmap/buildQuery.test.ts
@@ -16,67 +16,66 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { QueryFormData } from '@superset-ui/core';
+import { isPostProcessingRank, QueryFormData } from '@superset-ui/core';
 import buildQuery from '../../src/Heatmap/buildQuery';
 
-describe('Heatmap buildQuery - Rank Operation for Normalized Field', () => {
-  const baseFormData = {
-    datasource: '5__table',
-    granularity_sqla: 'ds',
-    metric: 'count',
-    x_axis: 'category',
-    groupby: ['region'],
-    viz_type: 'heatmap',
-  } as QueryFormData;
+const baseFormData = {
+  datasource: '5__table',
+  granularity_sqla: 'ds',
+  metric: 'count',
+  x_axis: 'category',
+  groupby: ['region'],
+  viz_type: 'heatmap',
+} as QueryFormData;
 
-  test('should ALWAYS include rank operation when normalized=true', () => {
-    const formData = {
-      ...baseFormData,
-      normalized: true,
-    };
+const getQuery = (formData: QueryFormData) => buildQuery(formData).queries[0];
+const getRankOperation = (formData: QueryFormData) =>
+  getQuery(formData).post_processing?.find(isPostProcessingRank);
 
-    const queryContext = buildQuery(formData);
-    const [query] = queryContext.queries;
-
-    const rankOperation = query.post_processing?.find(
-      op => op?.operation === 'rank',
-    );
-
-    expect(rankOperation).toBeDefined();
-    expect(rankOperation?.operation).toBe('rank');
+test('adds X axis orderby when sorting alphabetically ascending', () => {
+  const query = getQuery({
+    ...baseFormData,
+    sort_x_axis: 'alpha_asc',
   });
 
-  test('should ALWAYS include rank operation when normalized=false', () => {
-    const formData = {
-      ...baseFormData,
-      normalized: false,
-    };
-
-    const queryContext = buildQuery(formData);
-    const [query] = queryContext.queries;
-
-    const rankOperation = query.post_processing?.find(
-      op => op?.operation === 'rank',
-    );
-
-    expect(rankOperation).toBeDefined();
-    expect(rankOperation?.operation).toBe('rank');
-  });
-
-  test('should ALWAYS include rank operation when normalized is undefined', () => {
-    const formData = {
-      ...baseFormData,
-      // normalized not set
-    };
-
-    const queryContext = buildQuery(formData);
-    const [query] = queryContext.queries;
-
-    const rankOperation = query.post_processing?.find(
-      op => op?.operation === 'rank',
-    );
-
-    expect(rankOperation).toBeDefined();
-    expect(rankOperation?.operation).toBe('rank');
-  });
+  expect(query.orderby).toEqual([['category', true]]);
+});
+
+test('adds Y axis orderby when sorting alphabetically descending', () => {
+  const query = getQuery({
+    ...baseFormData,
+    sort_y_axis: 'alpha_desc',
+  });
+
+  expect(query.orderby).toEqual([['region', false]]);
+});
+
+test('should ALWAYS include rank operation when normalized=true', () => {
+  const rankOperation = getRankOperation({
+    ...baseFormData,
+    normalized: true,
+  });
+
+  expect(rankOperation).toBeDefined();
+  expect(rankOperation?.operation).toBe('rank');
+});
+
+test('should ALWAYS include rank operation when normalized=false', () => {
+  const rankOperation = getRankOperation({
+    ...baseFormData,
+    normalized: false,
+  });
+
+  expect(rankOperation).toBeDefined();
+  expect(rankOperation?.operation).toBe('rank');
+});
+
+test('should ALWAYS include rank operation when normalized is undefined', () => {
+  const rankOperation = getRankOperation({
+    ...baseFormData,
+    // normalized not set
+  });
+
+  expect(rankOperation).toBeDefined();
+  expect(rankOperation?.operation).toBe('rank');
 });
diff --git a/superset-frontend/plugins/plugin-chart-echarts/test/MixedTimeseries/transformProps.test.ts b/superset-frontend/plugins/plugin-chart-echarts/test/MixedTimeseries/transformProps.test.ts
index e8707d0c8c2..67ee4500bb8 100644
--- a/superset-frontend/plugins/plugin-chart-echarts/test/MixedTimeseries/transformProps.test.ts
+++ b/superset-frontend/plugins/plugin-chart-echarts/test/MixedTimeseries/transformProps.test.ts
@@ -19,8 +19,10 @@
 import {
   AnnotationStyle,
   AnnotationType,
+  AnnotationSourceType,
   DataRecord,
   FormulaAnnotationLayer,
+  IntervalAnnotationLayer,
   VizType,
   ChartDataResponseResult,
 } from '@superset-ui/core';
@@ -108,11 +110,11 @@ const formData: EchartsMixedTimeseriesFormData = {
   truncateYAxisSecondary: false,
   xAxisLabelRotation: 0,
   xAxisTitle: '',
-  xAxisTitleMargin: 0,
+  xAxisTitleMargin: 40,
   yAxisBounds: [undefined, undefined],
   yAxisBoundsSecondary: [undefined, undefined],
   yAxisTitle: '',
-  yAxisTitleMargin: 15,
+  yAxisTitleMargin: 50,
   yAxisTitlePosition: '',
   yAxisTitleSecondary: '',
   zoomable: false,
@@ -366,6 +368,67 @@ test('legend margin: right orientation sets grid.right correctly', () => {
   expect((transformed.echartOptions.grid as any).right).toEqual(270);
 });
 
+test('should exclude unnamed annotation helper series from legend data', () => {
+  const interval: IntervalAnnotationLayer = {
+    annotationType: AnnotationType.Interval,
+    name: 'My Interval',
+    show: true,
+    showLabel: true,
+    sourceType: AnnotationSourceType.Table,
+    titleColumn: '',
+    timeColumn: 'start',
+    intervalEndColumn: 'end',
+    descriptionColumns: [],
+    style: AnnotationStyle.Dashed,
+    value: 2,
+  };
+
+  const annotationData = {
+    'My Interval': {
+      columns: ['start', 'end', 'title'],
+      records: [
+        {
+          start: 2000,
+          end: 3000,
+          title: 'My Title',
+        },
+      ],
+    },
+  };
+
+  const chartProps = createEchartsTimeseriesTestChartProps<
+    EchartsMixedTimeseriesFormData,
+    EchartsMixedTimeseriesProps
+  >({
+    ...MIXED_TIMESERIES_CHART_PROPS_DEFAULTS,
+    defaultQueriesData: [],
+    formData: {
+      ...formData,
+      annotationLayers: [interval],
+      showLegend: true,
+      showQueryIdentifiers: true,
+    },
+    queriesData: [
+      createTestQueryData(defaultQueryRows, {
+        label_map: defaultLabelMap,
+        annotation_data: annotationData,
+      }),
+      createTestQueryData(defaultQueryRows, {
+        label_map: defaultLabelMap,
+        annotation_data: annotationData,
+      }),
+    ],
+  });
+  const transformed = transformProps(chartProps);
+
+  expect((transformed.echartOptions.legend as any).data).toEqual([
+    'sum__num (Query A), girl',
+    'sum__num (Query A), boy',
+    'sum__num (Query B), girl',
+    'sum__num (Query B), boy',
+  ]);
+});
+
 test('should add a formula annotation when X-axis column has dataset-level label', () => {
   const formula: FormulaAnnotationLayer = {
     name: 'My Formula',
diff --git a/superset-frontend/plugins/plugin-chart-echarts/test/Pie/transformProps.test.ts b/superset-frontend/plugins/plugin-chart-echarts/test/Pie/transformProps.test.ts
index 78b35ddbc65..5f2c508562c 100644
--- a/superset-frontend/plugins/plugin-chart-echarts/test/Pie/transformProps.test.ts
+++ b/superset-frontend/plugins/plugin-chart-echarts/test/Pie/transformProps.test.ts
@@ -29,6 +29,7 @@ import type {
 } from 'echarts/types/src/util/types';
 import transformProps, { parseParams } from '../../src/Pie/transformProps';
 import { EchartsPieChartProps, PieChartDataItem } from '../../src/Pie/types';
+import { LegendOrientation, LegendType } from '../../src/types';
 
 describe('Pie transformProps', () => {
   const formData: SqlaFormData = {
@@ -84,6 +85,51 @@ describe('Pie transformProps', () => {
       }),
     );
   });
+
+  test('falls back to scroll for plain legends with overlong labels', () => {
+    const longLegendChartProps = new ChartProps({
+      formData: {
+        colorScheme: 'bnbColors',
+        datasource: '3__table',
+        granularity_sqla: 'ds',
+        metric: 'sum__num',
+        groupby: ['category'],
+        viz_type: 'pie',
+        legendType: LegendType.Plain,
+        legendOrientation: LegendOrientation.Top,
+        showLegend: true,
+      } as SqlaFormData,
+      width: 320,
+      height: 600,
+      queriesData: [
+        {
+          data: [
+            {
+              category: 'This is a very long pie legend label one',
+              sum__num: 10,
+            },
+            {
+              category: 'This is a very long pie legend label two',
+              sum__num: 20,
+            },
+            {
+              category: 'This is a very long pie legend label three',
+              sum__num: 30,
+            },
+          ],
+        },
+      ],
+      theme: supersetTheme,
+    });
+
+    const transformed = transformProps(
+      longLegendChartProps as EchartsPieChartProps,
+    );
+
+    expect((transformed.echartOptions.legend as any).type).toBe(
+      LegendType.Scroll,
+    );
+  });
 });
 
 describe('formatPieLabel', () => {
diff --git a/superset-frontend/plugins/plugin-chart-echarts/test/Timeseries/Area/controlPanel.test.ts b/superset-frontend/plugins/plugin-chart-echarts/test/Timeseries/Area/controlPanel.test.ts
new file mode 100644
index 00000000000..20a36341694
--- /dev/null
+++ b/superset-frontend/plugins/plugin-chart-echarts/test/Timeseries/Area/controlPanel.test.ts
@@ -0,0 +1,115 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+import { ControlPanelsContainerProps } from '@superset-ui/chart-controls/types';
+import { GenericDataType } from '@apache-superset/core/common';
+import controlPanel from '../../../src/Timeseries/Area/controlPanel';
+
+const config = controlPanel;
+
+const getControl = (controlName: string) => {
+  for (const section of config.controlPanelSections) {
+    if (section && section.controlSetRows) {
+      for (const row of section.controlSetRows) {
+        for (const control of row) {
+          if (
+            typeof control === 'object' &&
+            control !== null &&
+            'name' in control &&
+            control.name === controlName
+          ) {
+            return control;
+          }
+        }
+      }
+    }
+  }
+
+  return null;
+};
+
+const mockControls = (
+  xAxisColumn: string | null,
+  typeGeneric: GenericDataType | null,
+): ControlPanelsContainerProps => {
+  const columns =
+    xAxisColumn && typeGeneric !== null
+      ? [{ column_name: xAxisColumn, type_generic: typeGeneric }]
+      : [];
+
+  return {
+    controls: {
+      // @ts-expect-error
+      x_axis: {
+        value: xAxisColumn,
+      },
+      // @ts-expect-error
+      datasource: {
+        datasource: { columns },
+      },
+    },
+  };
+};
+
+const timeFormatControl: any = getControl('x_axis_time_format');
+const numberFormatControl: any = getControl('x_axis_number_format');
+
+test('should include x_axis_time_format control', () => {
+  expect(timeFormatControl).toBeDefined();
+  expect(timeFormatControl.config.default).toBe('smart_date');
+});
+
+test('should include x_axis_number_format control', () => {
+  expect(numberFormatControl).toBeDefined();
+  expect(numberFormatControl.config.default).toBe('~g');
+});
+
+test('x_axis_time_format should be visible for temporal columns', () => {
+  const visibilityFn = timeFormatControl?.config?.visibility;
+  expect(visibilityFn(mockControls('date', GenericDataType.Temporal))).toBe(
+    true,
+  );
+});
+
+test('x_axis_time_format should be hidden for numeric columns', () => {
+  const visibilityFn = timeFormatControl?.config?.visibility;
+  expect(visibilityFn(mockControls('year', GenericDataType.Numeric))).toBe(
+    false,
+  );
+});
+
+test('x_axis_number_format should be visible for numeric columns', () => {
+  const visibilityFn = numberFormatControl?.config?.visibility;
+  expect(visibilityFn(mockControls('year', GenericDataType.Numeric))).toBe(
+    true,
+  );
+});
+
+test('x_axis_number_format should be hidden for temporal columns', () => {
+  const visibilityFn = numberFormatControl?.config?.visibility;
+  expect(visibilityFn(mockControls('date', GenericDataType.Temporal))).toBe(
+    false,
+  );
+});
+
+test('x_axis_number_format should be hidden for string columns', () => {
+  const visibilityFn = numberFormatControl?.config?.visibility;
+  expect(visibilityFn(mockControls('name', GenericDataType.String))).toBe(
+    false,
+  );
+});
diff --git a/superset-frontend/plugins/plugin-chart-echarts/test/Timeseries/Bar/controlPanel.test.ts b/superset-frontend/plugins/plugin-chart-echarts/test/Timeseries/Bar/controlPanel.test.ts
index 2b56d6ef0ad..01bb1db740c 100644
--- a/superset-frontend/plugins/plugin-chart-echarts/test/Timeseries/Bar/controlPanel.test.ts
+++ b/superset-frontend/plugins/plugin-chart-echarts/test/Timeseries/Bar/controlPanel.test.ts
@@ -16,11 +16,14 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+import { ControlPanelsContainerProps } from '@superset-ui/chart-controls/types';
+import { GenericDataType } from '@apache-superset/core/common';
 import controlPanel from '../../../src/Timeseries/Regular/Bar/controlPanel';
 import {
   StackControlOptionsWithoutStream,
   StackControlsValue,
 } from '../../../src/constants';
+import { OrientationType } from '../../../src/Timeseries/types';
 
 const config = controlPanel;
 
@@ -218,3 +221,74 @@ test('should preserve stack value when formData does not have stack property', (
 
   expect(result).not.toHaveProperty('stack');
 });
+
+// x_axis_number_format visibility tests
+
+const mockBarControls = (
+  xAxisColumn: string | null,
+  typeGeneric: GenericDataType | null,
+  orientation: string = OrientationType.Vertical,
+): ControlPanelsContainerProps => {
+  const columns =
+    xAxisColumn && typeGeneric !== null
+      ? [{ column_name: xAxisColumn, type_generic: typeGeneric }]
+      : [];
+
+  return {
+    controls: {
+      // @ts-expect-error
+      x_axis: {
+        value: xAxisColumn,
+      },
+      // @ts-expect-error
+      orientation: {
+        value: orientation,
+      },
+      // @ts-expect-error
+      datasource: {
+        datasource: { columns },
+      },
+    },
+  };
+};
+
+const numberFormatControl: any = getControl('x_axis_number_format');
+const timeFormatControl: any = getControl('x_axis_time_format');
+
+test('should include x_axis_number_format control in the panel', () => {
+  expect(numberFormatControl).toBeDefined();
+});
+
+test('x_axis_number_format should be visible for numeric columns in vertical orientation', () => {
+  const visibilityFn = numberFormatControl?.config?.visibility;
+  expect(visibilityFn(mockBarControls('year', GenericDataType.Numeric))).toBe(
+    true,
+  );
+  expect(visibilityFn(mockBarControls('price', GenericDataType.Numeric))).toBe(
+    true,
+  );
+});
+
+test('x_axis_number_format should be hidden for time columns', () => {
+  const visibilityFn = numberFormatControl?.config?.visibility;
+  expect(visibilityFn(mockBarControls('date', GenericDataType.Temporal))).toBe(
+    false,
+  );
+});
+
+test('x_axis_number_format should be hidden for non-numeric columns', () => {
+  const visibilityFn = numberFormatControl?.config?.visibility;
+  expect(visibilityFn(mockBarControls('name', GenericDataType.String))).toBe(
+    false,
+  );
+  expect(visibilityFn(mockBarControls('flag', GenericDataType.Boolean))).toBe(
+    false,
+  );
+});
+
+test('x_axis_time_format should be hidden for numeric columns', () => {
+  const visibilityFn = timeFormatControl?.config?.visibility;
+  expect(visibilityFn(mockBarControls('year', GenericDataType.Numeric))).toBe(
+    false,
+  );
+});
diff --git a/superset-frontend/plugins/plugin-chart-echarts/test/Timeseries/Bar/transformProps.test.ts b/superset-frontend/plugins/plugin-chart-echarts/test/Timeseries/Bar/transformProps.test.ts
index ec5bdac5a8c..80e434294c1 100644
--- a/superset-frontend/plugins/plugin-chart-echarts/test/Timeseries/Bar/transformProps.test.ts
+++ b/superset-frontend/plugins/plugin-chart-echarts/test/Timeseries/Bar/transformProps.test.ts
@@ -16,12 +16,63 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { ChartProps, SqlaFormData } from '@superset-ui/core';
+import {
+  ChartDataResponseResult,
+  ChartProps,
+  DataRecord,
+  SqlaFormData,
+} from '@superset-ui/core';
+import { GenericDataType } from '@apache-superset/core/common';
 import { supersetTheme } from '@apache-superset/core/theme';
-import { EchartsTimeseriesChartProps } from '../../../src/types';
+import { StackControlsValue } from '../../../src/constants';
+import type {
+  GridComponentOption,
+  LegendComponentOption,
+} from 'echarts/components';
+import {
+  EchartsTimeseriesChartProps,
+  LegendOrientation,
+  LegendType,
+} from '../../../src/types';
 import transformProps from '../../../src/Timeseries/transformProps';
 import { DEFAULT_FORM_DATA } from '../../../src/Timeseries/constants';
-import { EchartsTimeseriesSeriesType } from '../../../src/Timeseries/types';
+import {
+  EchartsTimeseriesFormData,
+  OrientationType,
+  EchartsTimeseriesSeriesType,
+} from '../../../src/Timeseries/types';
+import { getPadding } from '../../../src/Timeseries/transformers';
+import {
+  getHorizontalLegendAvailableWidth,
+  getLegendLayoutResult,
+} from '../../../src/utils/series';
+import { createEchartsTimeseriesTestChartProps } from '../../helpers';
+
+function createTestQueryData(
+  data: DataRecord[],
+  overrides?: Partial<ChartDataResponseResult>,
+): ChartDataResponseResult {
+  return {
+    annotation_data: null,
+    cache_key: null,
+    cache_timeout: null,
+    cached_dttm: null,
+    queried_dttm: null,
+    data,
+    colnames: [],
+    coltypes: [],
+    error: null,
+    is_cached: false,
+    query: '',
+    rowcount: data.length,
+    sql_rowcount: data.length,
+    stacktrace: null,
+    status: 'success',
+    from_dttm: null,
+    to_dttm: null,
+    ...overrides,
+  };
+}
 
 describe('Bar Chart X-axis Time Formatting', () => {
   const baseFormData: SqlaFormData = {
@@ -570,6 +621,48 @@ describe('Bar Chart X-axis Time Formatting', () => {
       expect(legendData).toContain('C');
     });
 
+    test('should preserve source order for color-by-primary-axis legends when label sorting is enabled', () => {
+      const unsortedCategoricalData = [
+        {
+          data: [
+            { category: 'Zulu', value: 100 },
+            { category: 'Alpha', value: 150 },
+            { category: 'Mike', value: 200 },
+          ],
+          colnames: ['category', 'value'],
+          coltypes: ['STRING', 'BIGINT'],
+        },
+      ];
+
+      const formData = {
+        ...baseFormData,
+        colorByPrimaryAxis: true,
+        groupby: [],
+        legendSort: 'asc',
+        x_axis: 'category',
+        metric: 'value',
+      };
+
+      const chartProps = new ChartProps({
+        ...baseChartPropsConfig,
+        queriesData: unsortedCategoricalData,
+        formData,
+      });
+
+      const transformedProps = transformProps(
+        chartProps as unknown as EchartsTimeseriesChartProps,
+      );
+
+      const legend = transformedProps.echartOptions.legend as {
+        data: { name: string }[];
+      };
+      expect(legend.data.map(item => item.name)).toEqual([
+        'Zulu',
+        'Alpha',
+        'Mike',
+      ]);
+    });
+
     test('should deduplicate legend entries when x-axis has repeated values', () => {
       const repeatedData = [
         {
@@ -634,4 +727,271 @@ describe('Bar Chart X-axis Time Formatting', () => {
       expect(hiddenSeries.length).toBe(3);
     });
   });
+
+  describe('Horizontal stacked bar chart axis bounds', () => {
+    // Dataset where each series max = 4 but stacked total max = 8
+    const stackedData: ChartDataResponseResult[] = [
+      createTestQueryData(
+        [
+          { team: 'Team A', High: 2, Low: 2, Medium: 4 },
+          { team: 'Team B', High: null, Low: null, Medium: 3 },
+          { team: 'Team C', High: null, Low: null, Medium: 1 },
+        ],
+        {
+          colnames: ['team', 'High', 'Low', 'Medium'],
+          coltypes: [
+            GenericDataType.String,
+            GenericDataType.Numeric,
+            GenericDataType.Numeric,
+            GenericDataType.Numeric,
+          ],
+        },
+      ),
+    ];
+
+    const horizontalStackedFormData: EchartsTimeseriesFormData = {
+      ...(baseFormData as EchartsTimeseriesFormData),
+      x_axis: 'team',
+      metric: ['High', 'Low', 'Medium'],
+      groupby: [],
+      orientation: OrientationType.Horizontal,
+      seriesType: EchartsTimeseriesSeriesType.Bar,
+      stack: StackControlsValue.Stack,
+      truncateYAxis: true,
+    };
+
+    test('xAxis.max uses stacked total, not individual series max', () => {
+      // Individual series max = 4 (Medium), stacked total for Team A = 8
+      // Without the fix, xAxis.max would be 4, clipping bars and duplicating labels
+      const chartProps = createEchartsTimeseriesTestChartProps<
+        EchartsTimeseriesFormData,
+        EchartsTimeseriesChartProps
+      >({
+        defaultFormData: horizontalStackedFormData,
+        defaultVizType: 'echarts_timeseries_bar',
+        defaultQueriesData: stackedData,
+      });
+
+      const { echartOptions } = transformProps(chartProps);
+      const xAxis = echartOptions.xAxis as any;
+
+      // xAxis.max must be >= stacked total (8), not capped at individual series max (4)
+      expect(xAxis.max).toBeGreaterThanOrEqual(8);
+    });
+
+    test('xAxis.max is not set to individual series max when stacking', () => {
+      const chartProps = createEchartsTimeseriesTestChartProps<
+        EchartsTimeseriesFormData,
+        EchartsTimeseriesChartProps
+      >({
+        defaultFormData: horizontalStackedFormData,
+        defaultVizType: 'echarts_timeseries_bar',
+        defaultQueriesData: stackedData,
+      });
+
+      const { echartOptions } = transformProps(chartProps);
+      const xAxis = echartOptions.xAxis as any;
+
+      // 4 is the individual series max — the axis should not be clipped there
+      expect(xAxis.max).not.toBe(4);
+    });
+
+    test('non-stacked horizontal bar chart still uses individual series max', () => {
+      const nonStackedFormData: EchartsTimeseriesFormData = {
+        ...horizontalStackedFormData,
+        stack: null,
+      };
+
+      const chartProps = createEchartsTimeseriesTestChartProps<
+        EchartsTimeseriesFormData,
+        EchartsTimeseriesChartProps
+      >({
+        defaultFormData: nonStackedFormData,
+        defaultVizType: 'echarts_timeseries_bar',
+        defaultQueriesData: stackedData,
+      });
+
+      const { echartOptions } = transformProps(chartProps);
+      const xAxis = echartOptions.xAxis as any;
+
+      // Without stacking, xAxis.max should be based on individual series values
+      expect(xAxis.max).toBe(4);
+    });
+  });
+
+  describe('Legend layout regressions', () => {
+    const getBottomLegendLayout = (
+      chartWidth: number,
+      legendItems: string[],
+      legendMargin?: string | number | null,
+    ) =>
+      getLegendLayoutResult({
+        availableWidth: getHorizontalLegendAvailableWidth({
+          chartWidth,
+          orientation: LegendOrientation.Bottom,
+          padding: getPadding(
+            true,
+            LegendOrientation.Bottom,
+            false,
+            false,
+            legendMargin,
+            false,
+            undefined,
+            undefined,
+            undefined,
+            true,
+          ),
+        }),
+        chartHeight: baseChartPropsConfig.height,
+        chartWidth,
+        legendItems,
+        legendMargin,
+        orientation: LegendOrientation.Bottom,
+        show: true,
+        theme: supersetTheme,
+        type: LegendType.Plain,
+      });
+
+    test('should fall back to scroll for horizontal bottom legends after margin expansion reduces available width', () => {
+      const legendLabels = [
+        'This is a long sales legend',
+        'This is a long marketing legend',
+        'This is a long operations legend',
+      ];
+      const longLegendData: ChartDataResponseResult[] = [
+        createTestQueryData(
+          [
+            {
+              [legendLabels[0]]: 100,
+              [legendLabels[1]]: null,
+              [legendLabels[2]]: null,
+              __timestamp: 1609459200000,
+            },
+            {
+              [legendLabels[0]]: null,
+              [legendLabels[1]]: 150,
+              [legendLabels[2]]: null,
+              __timestamp: 1612137600000,
+            },
+            {
+              [legendLabels[0]]: null,
+              [legendLabels[1]]: null,
+              [legendLabels[2]]: 200,
+              __timestamp: 1614556800000,
+            },
+          ],
+          {
+            colnames: [...legendLabels, '__timestamp'],
+            coltypes: [
+              GenericDataType.Numeric,
+              GenericDataType.Numeric,
+              GenericDataType.Numeric,
+              GenericDataType.Temporal,
+            ],
+          },
+        ),
+      ];
+      const regressionFormData: EchartsTimeseriesFormData = {
+        ...(baseFormData as EchartsTimeseriesFormData),
+        metric: legendLabels,
+        orientation: OrientationType.Horizontal,
+        legendOrientation: LegendOrientation.Bottom,
+        legendType: LegendType.Plain,
+        showLegend: true,
+      };
+      const baselineChartProps = createEchartsTimeseriesTestChartProps<
+        EchartsTimeseriesFormData,
+        EchartsTimeseriesChartProps
+      >({
+        defaultFormData: regressionFormData,
+        defaultVizType: 'echarts_timeseries_bar',
+        defaultQueriesData: longLegendData,
+        width: baseChartPropsConfig.width,
+        height: baseChartPropsConfig.height,
+      });
+      const baselineTransformed = transformProps(baselineChartProps);
+      const legendItems = (
+        (baselineTransformed.echartOptions.legend as LegendComponentOption)
+          .data as Array<string | { name: string }>
+      ).map(item => (typeof item === 'string' ? item : item.name));
+      let chartWidth: number | undefined;
+      let expandedLegendMargin: number | null = null;
+
+      for (let width = 300; width <= 700; width += 1) {
+        const initialLayout = getBottomLegendLayout(width, legendItems, null);
+
+        if (initialLayout.effectiveType !== LegendType.Plain) {
+          continue;
+        }
+
+        const refinedLayout = getBottomLegendLayout(
+          width,
+          legendItems,
+          initialLayout.effectiveMargin ?? null,
+        );
+
+        if (refinedLayout.effectiveType === LegendType.Scroll) {
+          chartWidth = width;
+          expandedLegendMargin = initialLayout.effectiveMargin ?? null;
+          break;
+        }
+      }
+
+      expect(chartWidth).toBeDefined();
+      expect(expandedLegendMargin).not.toBeNull();
+      const resolvedChartWidth = chartWidth ?? baseChartPropsConfig.width;
+
+      const chartProps = createEchartsTimeseriesTestChartProps<
+        EchartsTimeseriesFormData,
+        EchartsTimeseriesChartProps
+      >({
+        defaultFormData: regressionFormData,
+        defaultVizType: 'echarts_timeseries_bar',
+        defaultQueriesData: longLegendData,
+        width: resolvedChartWidth,
+        height: baseChartPropsConfig.height,
+      });
+
+      const transformedProps = transformProps(chartProps);
+      const legend = transformedProps.echartOptions
+        .legend as LegendComponentOption;
+      const grid = transformedProps.echartOptions.grid as GridComponentOption;
+      const expectedPadding = getPadding(
+        true,
+        LegendOrientation.Bottom,
+        false,
+        false,
+        null,
+        false,
+        undefined,
+        undefined,
+        undefined,
+        true,
+      );
+      [expectedPadding.bottom, expectedPadding.left] = [
+        expectedPadding.left,
+        expectedPadding.bottom,
+      ];
+      const expandedPadding = getPadding(
+        true,
+        LegendOrientation.Bottom,
+        false,
+        false,
+        expandedLegendMargin,
+        false,
+        undefined,
+        undefined,
+        undefined,
+        true,
+      );
+      [expandedPadding.bottom, expandedPadding.left] = [
+        expandedPadding.left,
+        expandedPadding.bottom,
+      ];
+
+      expect(legend.type).toBe(LegendType.Scroll);
+      expect(grid.bottom).toBe(expectedPadding.bottom);
+      expect(grid.bottom).not.toBe(expandedPadding.bottom);
+    });
+  });
 });
diff --git a/superset-frontend/plugins/plugin-chart-echarts/test/Timeseries/Line/controlPanel.test.ts b/superset-frontend/plugins/plugin-chart-echarts/test/Timeseries/Line/controlPanel.test.ts
new file mode 100644
index 00000000000..4183d1dba7e
--- /dev/null
+++ b/superset-frontend/plugins/plugin-chart-echarts/test/Timeseries/Line/controlPanel.test.ts
@@ -0,0 +1,115 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+import { ControlPanelsContainerProps } from '@superset-ui/chart-controls/types';
+import { GenericDataType } from '@apache-superset/core/common';
+import controlPanel from '../../../src/Timeseries/Regular/Line/controlPanel';
+
+const config = controlPanel;
+
+const getControl = (controlName: string) => {
+  for (const section of config.controlPanelSections) {
+    if (section && section.controlSetRows) {
+      for (const row of section.controlSetRows) {
+        for (const control of row) {
+          if (
+            typeof control === 'object' &&
+            control !== null &&
+            'name' in control &&
+            control.name === controlName
+          ) {
+            return control;
+          }
+        }
+      }
+    }
+  }
+
+  return null;
+};
+
+const mockControls = (
+  xAxisColumn: string | null,
+  typeGeneric: GenericDataType | null,
+): ControlPanelsContainerProps => {
+  const columns =
+    xAxisColumn && typeGeneric !== null
+      ? [{ column_name: xAxisColumn, type_generic: typeGeneric }]
+      : [];
+
+  return {
+    controls: {
+      // @ts-expect-error
+      x_axis: {
+        value: xAxisColumn,
+      },
+      // @ts-expect-error
+      datasource: {
+        datasource: { columns },
+      },
+    },
+  };
+};
+
+const timeFormatControl: any = getControl('x_axis_time_format');
+const numberFormatControl: any = getControl('x_axis_number_format');
+
+test('should include x_axis_time_format control', () => {
+  expect(timeFormatControl).toBeDefined();
+  expect(timeFormatControl.config.default).toBe('smart_date');
+});
+
+test('should include x_axis_number_format control', () => {
+  expect(numberFormatControl).toBeDefined();
+  expect(numberFormatControl.config.default).toBe('~g');
+});
+
+test('x_axis_time_format should be visible for temporal columns', () => {
+  const visibilityFn = timeFormatControl?.config?.visibility;
+  expect(visibilityFn(mockControls('date', GenericDataType.Temporal))).toBe(
+    true,
+  );
+});
+
+test('x_axis_time_format should be hidden for numeric columns', () => {
+  const visibilityFn = timeFormatControl?.config?.visibility;
+  expect(visibilityFn(mockControls('year', GenericDataType.Numeric))).toBe(
+    false,
+  );
+});
+
+test('x_axis_number_format should be visible for numeric columns', () => {
+  const visibilityFn = numberFormatControl?.config?.visibility;
+  expect(visibilityFn(mockControls('year', GenericDataType.Numeric))).toBe(
+    true,
+  );
+});
+
+test('x_axis_number_format should be hidden for temporal columns', () => {
+  const visibilityFn = numberFormatControl?.config?.visibility;
+  expect(visibilityFn(mockControls('date', GenericDataType.Temporal))).toBe(
+    false,
+  );
+});
+
+test('x_axis_number_format should be hidden for string columns', () => {
+  const visibilityFn = numberFormatControl?.config?.visibility;
+  expect(visibilityFn(mockControls('name', GenericDataType.String))).toBe(
+    false,
+  );
+});
diff --git a/superset-frontend/plugins/plugin-chart-echarts/test/Timeseries/Scatter/controlPanel.test.ts b/superset-frontend/plugins/plugin-chart-echarts/test/Timeseries/Scatter/controlPanel.test.ts
index 4c560ea9ff3..943badfe02f 100644
--- a/superset-frontend/plugins/plugin-chart-echarts/test/Timeseries/Scatter/controlPanel.test.ts
+++ b/superset-frontend/plugins/plugin-chart-echarts/test/Timeseries/Scatter/controlPanel.test.ts
@@ -17,6 +17,7 @@
  * under the License.
  */
 import { ControlPanelsContainerProps } from '@superset-ui/chart-controls/types';
+import { GenericDataType } from '@apache-superset/core/common';
 import controlPanel from '../../../src/Timeseries/Regular/Scatter/controlPanel';
 
 const config = controlPanel;
@@ -44,18 +45,22 @@ const getControl = (controlName: string) => {
 
 const mockControls = (
   xAxisColumn: string | null,
-  xAxisType: string | null,
+  typeGeneric: GenericDataType | null,
 ): ControlPanelsContainerProps => {
-  const options = xAxisType
-    ? [{ column_name: xAxisColumn, type: xAxisType }]
-    : [];
+  const columns =
+    xAxisColumn && typeGeneric !== null
+      ? [{ column_name: xAxisColumn, type_generic: typeGeneric }]
+      : [];
 
   return {
     controls: {
       // @ts-expect-error
       x_axis: {
         value: xAxisColumn,
-        options: options,
+      },
+      // @ts-expect-error
+      datasource: {
+        datasource: { columns },
       },
     },
   };
@@ -85,26 +90,21 @@ test('scatter chart control panel should have visibility function for x_axis_tim
 
 const isTimeVisible = (
   xAxisColumn: string | null,
-  xAxisType: string | null,
+  xAxisType: GenericDataType | null,
 ): boolean => {
   const props = mockControls(xAxisColumn, xAxisType);
   const visibilityFn = timeFormatControl?.config?.visibility;
   return visibilityFn ? visibilityFn(props) : false;
 };
 
-test('x_axis_time_format control should be visible for any data types include TIME', () => {
-  expect(isTimeVisible('time_column', 'TIME')).toBe(true);
-  expect(isTimeVisible('time_column', 'TIME WITH TIME ZONE')).toBe(true);
-  expect(isTimeVisible('time_column', 'TIMESTAMP WITH TIME ZONE')).toBe(true);
-  expect(isTimeVisible('time_column', 'TIMESTAMP WITHOUT TIME ZONE')).toBe(
-    true,
-  );
+test('x_axis_time_format control should be visible for temporal data types', () => {
+  expect(isTimeVisible('time_column', GenericDataType.Temporal)).toBe(true);
 });
 
-test('x_axis_time_format control should be hidden for data types that do NOT include TIME', () => {
-  expect(isTimeVisible('null', 'null')).toBe(false);
+test('x_axis_time_format control should be hidden for non-temporal data types', () => {
   expect(isTimeVisible(null, null)).toBe(false);
-  expect(isTimeVisible('float_column', 'FLOAT')).toBe(false);
+  expect(isTimeVisible('float_column', GenericDataType.Numeric)).toBe(false);
+  expect(isTimeVisible('name_column', GenericDataType.String)).toBe(false);
 });
 
 // tests for x_axis_number_format control
@@ -117,7 +117,7 @@ test('scatter chart control panel should include x_axis_number_format control in
 test('scatter chart control panel should have correct default value for x_axis_number_format', () => {
   expect(numberFormatControl).toBeDefined();
   expect(numberFormatControl.config).toBeDefined();
-  expect(numberFormatControl.config.default).toBe('SMART_NUMBER');
+  expect(numberFormatControl.config.default).toBe('~g');
 });
 
 test('scatter chart control panel should have visibility function for x_axis_number_format', () => {
@@ -131,26 +131,20 @@ test('scatter chart control panel should have visibility function for x_axis_num
 
 const isNumberVisible = (
   xAxisColumn: string | null,
-  xAxisType: string | null,
+  xAxisType: GenericDataType | null,
 ): boolean => {
   const props = mockControls(xAxisColumn, xAxisType);
   const visibilityFn = numberFormatControl?.config?.visibility;
   return visibilityFn ? visibilityFn(props) : false;
 };
 
-test('x_axis_number_format control should be visible for any floating-point data types', () => {
-  expect(isNumberVisible('float_column', 'FLOAT')).toBe(true);
-  expect(isNumberVisible('double_column', 'DOUBLE')).toBe(true);
-  expect(isNumberVisible('real_column', 'REAL')).toBe(true);
-  expect(isNumberVisible('numeric_column', 'NUMERIC')).toBe(true);
-  expect(isNumberVisible('decimal_column', 'DECIMAL')).toBe(true);
+test('x_axis_number_format control should be visible for numeric data types', () => {
+  expect(isNumberVisible('float_column', GenericDataType.Numeric)).toBe(true);
+  expect(isNumberVisible('int_column', GenericDataType.Numeric)).toBe(true);
 });
 
-test('x_axis_number_format control should be hidden for any non-floating-point data types', () => {
-  expect(isNumberVisible('string_column', 'VARCHAR')).toBe(false);
-  expect(isNumberVisible('null', 'null')).toBe(false);
+test('x_axis_number_format control should be hidden for non-numeric data types', () => {
+  expect(isNumberVisible('string_column', GenericDataType.String)).toBe(false);
   expect(isNumberVisible(null, null)).toBe(false);
-  expect(isNumberVisible('time_column', 'TIMESTAMP WITHOUT TIME ZONE')).toBe(
-    false,
-  );
+  expect(isNumberVisible('time_column', GenericDataType.Temporal)).toBe(false);
 });
diff --git a/superset-frontend/plugins/plugin-chart-echarts/test/Timeseries/SmoothLine/controlPanel.test.ts b/superset-frontend/plugins/plugin-chart-echarts/test/Timeseries/SmoothLine/controlPanel.test.ts
new file mode 100644
index 00000000000..1c1a634db3d
--- /dev/null
+++ b/superset-frontend/plugins/plugin-chart-echarts/test/Timeseries/SmoothLine/controlPanel.test.ts
@@ -0,0 +1,101 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+import { ControlPanelsContainerProps } from '@superset-ui/chart-controls/types';
+import { GenericDataType } from '@apache-superset/core/common';
+import controlPanel from '../../../src/Timeseries/Regular/SmoothLine/controlPanel';
+
+const config = controlPanel;
+
+const getControl = (controlName: string) => {
+  for (const section of config.controlPanelSections) {
+    if (section && section.controlSetRows) {
+      for (const row of section.controlSetRows) {
+        for (const control of row) {
+          if (
+            typeof control === 'object' &&
+            control !== null &&
+            'name' in control &&
+            control.name === controlName
+          ) {
+            return control;
+          }
+        }
+      }
+    }
+  }
+
+  return null;
+};
+
+const mockControls = (
+  xAxisColumn: string | null,
+  typeGeneric: GenericDataType | null,
+): ControlPanelsContainerProps => {
+  const columns =
+    xAxisColumn && typeGeneric !== null
+      ? [{ column_name: xAxisColumn, type_generic: typeGeneric }]
+      : [];
+
+  return {
+    controls: {
+      // @ts-expect-error
+      x_axis: {
+        value: xAxisColumn,
+      },
+      // @ts-expect-error
+      datasource: {
+        datasource: { columns },
+      },
+    },
+  };
+};
+
+const timeFormatControl: any = getControl('x_axis_time_format');
+const numberFormatControl: any = getControl('x_axis_number_format');
+
+test('should include x_axis_time_format control', () => {
+  expect(timeFormatControl).toBeDefined();
+  expect(timeFormatControl.config.default).toBe('smart_date');
+});
+
+test('should include x_axis_number_format control', () => {
+  expect(numberFormatControl).toBeDefined();
+  expect(numberFormatControl.config.default).toBe('~g');
+});
+
+test('x_axis_number_format should be visible for numeric columns', () => {
+  const visibilityFn = numberFormatControl?.config?.visibility;
+  expect(visibilityFn(mockControls('year', GenericDataType.Numeric))).toBe(
+    true,
+  );
+});
+
+test('x_axis_number_format should be hidden for temporal columns', () => {
+  const visibilityFn = numberFormatControl?.config?.visibility;
+  expect(visibilityFn(mockControls('date', GenericDataType.Temporal))).toBe(
+    false,
+  );
+});
+
+test('x_axis_number_format should be hidden for string columns', () => {
+  const visibilityFn = numberFormatControl?.config?.visibility;
+  expect(visibilityFn(mockControls('name', GenericDataType.String))).toBe(
+    false,
+  );
+});
diff --git a/superset-frontend/plugins/plugin-chart-echarts/test/Timeseries/Step/controlPanel.test.ts b/superset-frontend/plugins/plugin-chart-echarts/test/Timeseries/Step/controlPanel.test.ts
new file mode 100644
index 00000000000..dcd36ebacd2
--- /dev/null
+++ b/superset-frontend/plugins/plugin-chart-echarts/test/Timeseries/Step/controlPanel.test.ts
@@ -0,0 +1,115 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+import { ControlPanelsContainerProps } from '@superset-ui/chart-controls/types';
+import { GenericDataType } from '@apache-superset/core/common';
+import controlPanel from '../../../src/Timeseries/Step/controlPanel';
+
+const config = controlPanel;
+
+const getControl = (controlName: string) => {
+  for (const section of config.controlPanelSections) {
+    if (section && section.controlSetRows) {
+      for (const row of section.controlSetRows) {
+        for (const control of row) {
+          if (
+            typeof control === 'object' &&
+            control !== null &&
+            'name' in control &&
+            control.name === controlName
+          ) {
+            return control;
+          }
+        }
+      }
+    }
+  }
+
+  return null;
+};
+
+const mockControls = (
+  xAxisColumn: string | null,
+  typeGeneric: GenericDataType | null,
+): ControlPanelsContainerProps => {
+  const columns =
+    xAxisColumn && typeGeneric !== null
+      ? [{ column_name: xAxisColumn, type_generic: typeGeneric }]
+      : [];
+
+  return {
+    controls: {
+      // @ts-expect-error
+      x_axis: {
+        value: xAxisColumn,
+      },
+      // @ts-expect-error
+      datasource: {
+        datasource: { columns },
+      },
+    },
+  };
+};
+
+const timeFormatControl: any = getControl('x_axis_time_format');
+const numberFormatControl: any = getControl('x_axis_number_format');
+
+test('should include x_axis_time_format control', () => {
+  expect(timeFormatControl).toBeDefined();
+  expect(timeFormatControl.config.default).toBe('smart_date');
+});
+
+test('should include x_axis_number_format control', () => {
+  expect(numberFormatControl).toBeDefined();
+  expect(numberFormatControl.config.default).toBe('~g');
+});
+
+test('x_axis_time_format should be visible for temporal columns', () => {
+  const visibilityFn = timeFormatControl?.config?.visibility;
+  expect(visibilityFn(mockControls('date', GenericDataType.Temporal))).toBe(
+    true,
+  );
+});
+
+test('x_axis_time_format should be hidden for numeric columns', () => {
+  const visibilityFn = timeFormatControl?.config?.visibility;
+  expect(visibilityFn(mockControls('year', GenericDataType.Numeric))).toBe(
+    false,
+  );
+});
+
+test('x_axis_number_format should be visible for numeric columns', () => {
+  const visibilityFn = numberFormatControl?.config?.visibility;
+  expect(visibilityFn(mockControls('year', GenericDataType.Numeric))).toBe(
+    true,
+  );
+});
+
+test('x_axis_number_format should be hidden for temporal columns', () => {
+  const visibilityFn = numberFormatControl?.config?.visibility;
+  expect(visibilityFn(mockControls('date', GenericDataType.Temporal))).toBe(
+    false,
+  );
+});
+
+test('x_axis_number_format should be hidden for string columns', () => {
+  const visibilityFn = numberFormatControl?.config?.visibility;
+  expect(visibilityFn(mockControls('name', GenericDataType.String))).toBe(
+    false,
+  );
+});
diff --git a/superset-frontend/plugins/plugin-chart-echarts/test/Timeseries/transformProps.test.ts b/superset-frontend/plugins/plugin-chart-echarts/test/Timeseries/transformProps.test.ts
index 9020c811871..373cf6a0d54 100644
--- a/superset-frontend/plugins/plugin-chart-echarts/test/Timeseries/transformProps.test.ts
+++ b/superset-frontend/plugins/plugin-chart-echarts/test/Timeseries/transformProps.test.ts
@@ -28,7 +28,9 @@ import {
   SqlaFormData,
   TimeseriesAnnotationLayer,
   ChartDataResponseResult,
+  TimeGranularity,
 } from '@superset-ui/core';
+import { GenericDataType } from '@apache-superset/core/common';
 import { EchartsTimeseriesChartProps } from '../../src/types';
 import type { SeriesOption } from 'echarts';
 import transformProps from '../../src/Timeseries/transformProps';
@@ -37,7 +39,8 @@ import {
   OrientationType,
   EchartsTimeseriesFormData,
 } from '../../src/Timeseries/types';
-import { StackControlsValue } from '../../src/constants';
+import { StackControlsValue, TIMESERIES_CONSTANTS } from '../../src/constants';
+import { LegendOrientation, LegendType } from '../../src/types';
 import { DEFAULT_FORM_DATA } from '../../src/Timeseries/constants';
 import { createEchartsTimeseriesTestChartProps } from '../helpers';
 import { BASE_TIMESTAMP, createTestData } from './helpers';
@@ -898,6 +901,40 @@ describe('legend sorting', () => {
       'Boston',
     ]);
   });
+
+  test('falls back to scroll for zoomable top legends when toolbox space reduces available width', () => {
+    const narrowLegendData = [
+      createTestQueryData(
+        createTestData(
+          [
+            {
+              Alpha: 1,
+              Beta: 2,
+              Gamma: 3,
+            },
+          ],
+          { intervalMs: 300000000 },
+        ),
+      ),
+    ];
+    const chartProps = createTestChartProps({
+      width: 190 + TIMESERIES_CONSTANTS.legendTopRightOffset,
+      formData: {
+        ...formData,
+        legendType: LegendType.Plain,
+        legendOrientation: LegendOrientation.Top,
+        showLegend: true,
+        zoomable: true,
+      },
+      queriesData: narrowLegendData,
+    });
+
+    const transformed = transformProps(chartProps);
+
+    expect((transformed.echartOptions.legend as any).type).toBe(
+      LegendType.Scroll,
+    );
+  });
 });
 
 const timeCompareFormData: SqlaFormData = {
@@ -920,6 +957,7 @@ test('should apply dashed line style to time comparison series with single metri
     formData: {
       ...timeCompareFormData,
       time_compare: ['1 week ago'],
+      timeShiftColor: true,
       comparison_type: ComparisonType.Values,
     },
     queriesData: queriesDataWithTimeCompare,
@@ -939,18 +977,9 @@ test('should apply dashed line style to time comparison series with single metri
   expect(comparisonSeries).toBeDefined();
   // Main series should not have a dash pattern array
   expect(Array.isArray(mainSeries?.lineStyle?.type)).toBe(false);
-  // Comparison series should have a visible dash pattern array [dash, gap]
-  expect(Array.isArray(comparisonSeries?.lineStyle?.type)).toBe(true);
-  expect(
-    Array.isArray(comparisonSeries?.lineStyle?.type)
-      ? comparisonSeries.lineStyle.type[0]
-      : undefined,
-  ).toBeGreaterThanOrEqual(4);
-  expect(
-    Array.isArray(comparisonSeries?.lineStyle?.type)
-      ? comparisonSeries.lineStyle.type[1]
-      : undefined,
-  ).toBeGreaterThanOrEqual(3);
+  expect(mainSeries?.lineStyle?.type).not.toBe('dotted');
+  // Comparison series should have a visible dash pattern
+  expect(comparisonSeries?.lineStyle?.type).toBe('dotted');
 });
 
 test('should apply dashed line style to time comparison series with metric__offset pattern', () => {
@@ -973,6 +1002,7 @@ test('should apply dashed line style to time comparison series with metric__offs
     formData: {
       ...timeCompareFormData,
       time_compare: ['1 week ago'],
+      timeShiftColor: true,
       comparison_type: ComparisonType.Values,
     },
     queriesData: queriesDataWithTimeCompare,
@@ -994,18 +1024,8 @@ test('should apply dashed line style to time comparison series with metric__offs
   expect(comparisonSeries).toBeDefined();
   // Main series should not have a dash pattern array
   expect(Array.isArray(mainSeries?.lineStyle?.type)).toBe(false);
-  // Comparison series should have a visible dash pattern array [dash, gap]
-  expect(Array.isArray(comparisonSeries?.lineStyle?.type)).toBe(true);
-  expect(
-    Array.isArray(comparisonSeries?.lineStyle?.type)
-      ? comparisonSeries.lineStyle.type[0]
-      : undefined,
-  ).toBeGreaterThanOrEqual(4);
-  expect(
-    Array.isArray(comparisonSeries?.lineStyle?.type)
-      ? comparisonSeries.lineStyle.type[1]
-      : undefined,
-  ).toBeGreaterThanOrEqual(3);
+  // Comparison series should have a visible dash pattern
+  expect(comparisonSeries?.lineStyle?.type).toBe('dotted');
 });
 
 test('should apply connectNulls to time comparison series', () => {
@@ -1317,3 +1337,186 @@ test('should not apply axis bounds calculation when seriesType is not Bar for ho
   // Should not have explicit max set when seriesType is not Bar
   expect(xAxisRaw.max).toBeUndefined();
 });
+
+test('legend is visible on tall charts when enabled by the user', () => {
+  const chartProps = createTestChartProps({
+    height: 400,
+    formData: { showLegend: true },
+  });
+  const { legend } = transformProps(chartProps).echartOptions as any;
+
+  expect(legend.show).toBe(true);
+});
+
+test('legend is hidden on small charts even when enabled by the user', () => {
+  const chartProps = createTestChartProps({
+    height: 80,
+    formData: { showLegend: true },
+  });
+  const { legend } = transformProps(chartProps).echartOptions as any;
+
+  expect(legend.show).toBe(false);
+});
+
+test('y-axis labels remain visible on small charts for scale reference', () => {
+  const chartProps = createTestChartProps({ height: 80 });
+  const { yAxis } = transformProps(chartProps).echartOptions as any;
+
+  expect(yAxis.axisLabel.show).toBe(true);
+});
+
+test('y-axis labels are hidden on micro charts for a sparkline view', () => {
+  const chartProps = createTestChartProps({ height: 40 });
+  const { yAxis } = transformProps(chartProps).echartOptions as any;
+
+  expect(yAxis.axisLabel.show).toBe(false);
+});
+
+test('y-axis tick count scales with chart height', () => {
+  const short = transformProps(createTestChartProps({ height: 200 }));
+  const tall = transformProps(createTestChartProps({ height: 500 }));
+  const shortYAxis = short.echartOptions.yAxis as any;
+  const tallYAxis = tall.echartOptions.yAxis as any;
+
+  expect(tallYAxis.splitNumber).toBeGreaterThan(shortYAxis.splitNumber);
+});
+
+test('small chart y-axis uses splitNumber=1 to show only boundary labels', () => {
+  const chartProps = createTestChartProps({ height: 80 });
+  const { yAxis } = transformProps(chartProps).echartOptions as any;
+
+  expect(yAxis.splitNumber).toBe(1);
+});
+
+test('zoomable small chart preserves bottom padding for the dataZoom slider', () => {
+  const chartProps = createTestChartProps({
+    height: 80,
+    formData: { zoomable: true },
+  });
+  const result = transformProps(chartProps);
+  const grid = result.echartOptions.grid as any;
+
+  expect(grid.bottom).toBeGreaterThan(5);
+});
+
+test('boundary: height at exactly 100px uses full axis behavior', () => {
+  const chartProps = createTestChartProps({ height: 100 });
+  const { yAxis } = transformProps(chartProps).echartOptions as any;
+
+  expect(yAxis.axisLabel.show).toBe(true);
+  expect(yAxis.splitNumber).toBeGreaterThanOrEqual(3);
+});
+
+test('boundary: height at 99px triggers small chart behavior', () => {
+  const chartProps = createTestChartProps({
+    height: 99,
+    formData: { showLegend: true },
+  });
+  const { yAxis, legend } = transformProps(chartProps).echartOptions as any;
+
+  expect(yAxis.splitNumber).toBe(1);
+  expect(legend.show).toBe(false);
+});
+
+test('boundary: height at exactly 60px shows labels but uses compact axis', () => {
+  const chartProps = createTestChartProps({ height: 60 });
+  const { yAxis } = transformProps(chartProps).echartOptions as any;
+
+  expect(yAxis.axisLabel.show).toBe(true);
+  expect(yAxis.splitNumber).toBe(1);
+});
+
+test('boundary: height at 59px triggers micro chart behavior', () => {
+  const chartProps = createTestChartProps({ height: 59 });
+  const { yAxis } = transformProps(chartProps).echartOptions as any;
+
+  expect(yAxis.axisLabel.show).toBe(false);
+});
+
+test('x-axis formatter deduplicates consecutive identical labels for coarse time grains', () => {
+  const yearData = [
+    { __timestamp: Date.UTC(2003, 0, 1), sales: 100 },
+    { __timestamp: Date.UTC(2004, 0, 1), sales: 200 },
+    { __timestamp: Date.UTC(2005, 0, 1), sales: 300 },
+  ];
+
+  const chartProps = createTestChartProps({
+    formData: {
+      granularity_sqla: 'ds',
+      time_grain_sqla: TimeGranularity.YEAR,
+      xAxisTimeFormat: '%Y',
+    },
+    queriesData: [
+      createTestQueryData(yearData, {
+        colnames: ['__timestamp', 'sales'],
+        coltypes: [GenericDataType.Temporal, GenericDataType.Numeric],
+      }),
+    ],
+  });
+
+  const transformedProps = transformProps(chartProps);
+  const xAxisResult = transformedProps.echartOptions.xAxis as any;
+  const { formatter } = xAxisResult.axisLabel;
+
+  expect(typeof formatter).toBe('function');
+  expect(xAxisResult.axisLabel.showMaxLabel).toBe(true);
+
+  const label1 = formatter(Date.UTC(2003, 0, 1));
+  const label2 = formatter(Date.UTC(2004, 0, 1));
+  const label3 = formatter(Date.UTC(2005, 0, 1));
+  const label4 = formatter(Date.UTC(2005, 6, 1));
+
+  expect(label1).toBe('2003');
+  expect(label2).toBe('2004');
+  expect(label3).toBe('2005');
+  expect(label4).toBe('');
+});
+
+test('should assign distinct dash patterns for multiple time offsets consistently', () => {
+  const queriesDataWithMultipleOffsets = [
+    createTestQueryData([
+      {
+        sum__num: 100,
+        '1 year ago': 80,
+        '2 years ago': 60,
+        __timestamp: 599616000000,
+      },
+      {
+        sum__num: 150,
+        '1 year ago': 120,
+        '2 years ago': 90,
+        __timestamp: 599916000000,
+      },
+    ]),
+  ];
+
+  const chartProps = createTestChartProps({
+    formData: {
+      ...timeCompareFormData,
+      time_compare: ['1 year ago', '2 years ago'],
+      comparison_type: ComparisonType.Values,
+      timeShiftColor: true,
+    },
+    queriesData: queriesDataWithMultipleOffsets,
+  });
+
+  const transformed = transformProps(chartProps);
+  const series = (transformed.echartOptions.series as SeriesOption[]) || [];
+
+  const series1 = series.find(s => s.name === '1 year ago') as any;
+  const series2 = series.find(s => s.name === '2 years ago') as any;
+
+  expect(series1).toBeDefined();
+  expect(series2).toBeDefined();
+
+  const pattern1 = series1.lineStyle?.type;
+  const symbol1 = series1.symbol;
+  const pattern2 = series2.lineStyle?.type;
+  const symbol2 = series2.symbol;
+
+  // must be different patterns
+  expect(pattern1).not.toEqual(pattern2);
+
+  // must be different patterns
+  expect(symbol1).not.toEqual(symbol2);
+});
diff --git a/superset-frontend/plugins/plugin-chart-echarts/test/utils/series.test.ts b/superset-frontend/plugins/plugin-chart-echarts/test/utils/series.test.ts
index 88c58f34837..f50b1933d5d 100644
--- a/superset-frontend/plugins/plugin-chart-echarts/test/utils/series.test.ts
+++ b/superset-frontend/plugins/plugin-chart-echarts/test/utils/series.test.ts
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { SortSeriesType } from '@superset-ui/chart-controls';
+import { LegendPaddingType, SortSeriesType } from '@superset-ui/chart-controls';
 import {
   AxisType,
   DataRecord,
@@ -51,6 +51,71 @@ import {
 import { defaultLegendPadding } from '../../src/defaults';
 import { NULL_STRING } from '../../src/constants';
 
+const {
+  getHorizontalLegendAvailableWidth,
+  getLegendLayoutResult,
+}: {
+  getHorizontalLegendAvailableWidth: (args: {
+    chartWidth: number;
+    orientation: LegendOrientation.Top | LegendOrientation.Bottom;
+    padding?: LegendPaddingType;
+    zoomable?: boolean;
+  }) => number;
+  getLegendLayoutResult: (args: {
+    availableHeight?: number;
+    availableWidth?: number;
+    chartHeight: number;
+    chartWidth: number;
+    legendItems?: (
+      | string
+      | number
+      | null
+      | undefined
+      | { name?: string | number | null }
+    )[];
+    legendMargin?: string | number | null;
+    orientation: LegendOrientation;
+    show: boolean;
+    showSelectors?: boolean;
+    theme: typeof theme;
+    type: LegendType;
+  }) => {
+    effectiveMargin?: number;
+    effectiveType: LegendType;
+  };
+} = require('../../src/utils/series');
+
+const {
+  resolveLegendLayout,
+}: {
+  resolveLegendLayout: (args: {
+    availableHeight?: number;
+    availableWidth?: number;
+    chartHeight: number;
+    chartWidth: number;
+    legendItems?: (
+      | string
+      | number
+      | null
+      | undefined
+      | { name?: string | number | null }
+    )[];
+    legendMargin?: string | number | null;
+    orientation: LegendOrientation;
+    show: boolean;
+    showSelectors?: boolean;
+    theme: typeof theme;
+    type: LegendType;
+  }) => {
+    effectiveLegendMargin?: string | number | null;
+    effectiveLegendType: LegendType;
+    legendLayout: {
+      effectiveMargin?: number;
+      effectiveType: LegendType;
+    };
+  };
+} = require('../../src/utils/legendLayout');
+
 const expectedThemeProps = {
   selector: ['all', 'inverse'],
   selected: {},
@@ -891,19 +956,20 @@ describe('getLegendProps', () => {
     });
   });
 
-  test('should default plain legends to scroll for bottom orientation', () => {
+  test('should return the correct props for plain type with bottom orientation', () => {
     expect(
       getLegendProps(LegendType.Plain, LegendOrientation.Bottom, false, theme),
     ).toEqual({
       show: false,
       bottom: 0,
+      right: 0,
       orient: 'horizontal',
-      type: 'scroll',
+      type: 'plain',
       ...expectedThemeProps,
     });
   });
 
-  test('should default plain legends to scroll for top orientation', () => {
+  test('should return the correct props for plain type with top orientation', () => {
     expect(
       getLegendProps(LegendType.Plain, LegendOrientation.Top, false, theme),
     ).toEqual({
@@ -911,12 +977,248 @@ describe('getLegendProps', () => {
       top: 0,
       right: 0,
       orient: 'horizontal',
-      type: 'scroll',
+      type: 'plain',
       ...expectedThemeProps,
     });
   });
 });
 
+test('getLegendLayoutResult keeps plain horizontal legends when they fit within two rows', () => {
+  expect(
+    getLegendLayoutResult({
+      chartHeight: 400,
+      chartWidth: 800,
+      legendItems: ['Alpha', 'Beta', 'Gamma', 'Delta'],
+      legendMargin: null,
+      orientation: LegendOrientation.Top,
+      show: true,
+      theme,
+      type: LegendType.Plain,
+    }),
+  ).toEqual({
+    effectiveMargin: defaultLegendPadding[LegendOrientation.Top],
+    effectiveType: LegendType.Plain,
+  });
+});
+
+test('getLegendLayoutResult adds extra margin for wrapped plain horizontal legends', () => {
+  const layout = getLegendLayoutResult({
+    chartHeight: 400,
+    chartWidth: 640,
+    legendItems: [
+      'This is a long legend label',
+      'Another long legend label',
+      'Third long legend label',
+    ],
+    legendMargin: null,
+    orientation: LegendOrientation.Top,
+    show: true,
+    theme,
+    type: LegendType.Plain,
+  });
+
+  expect(layout).toMatchObject({
+    effectiveType: LegendType.Plain,
+  });
+  expect(layout.effectiveMargin).toBeGreaterThan(
+    defaultLegendPadding[LegendOrientation.Top],
+  );
+});
+
+test('getLegendLayoutResult falls back to scroll when horizontal plain legends exceed two rows', () => {
+  expect(
+    getLegendLayoutResult({
+      chartHeight: 400,
+      chartWidth: 240,
+      legendItems: [
+        'This is a long legend label',
+        'Another long legend label',
+        'Third long legend label',
+      ],
+      legendMargin: null,
+      orientation: LegendOrientation.Top,
+      show: true,
+      theme,
+      type: LegendType.Plain,
+    }),
+  ).toEqual({
+    effectiveType: LegendType.Scroll,
+  });
+});
+
+test('getLegendLayoutResult falls back to scroll when a single horizontal plain legend item exceeds available width', () => {
+  expect(
+    getLegendLayoutResult({
+      chartHeight: 400,
+      chartWidth: 260,
+      legendItems: [
+        'This is a ridiculously long legend label that should not fit on one line',
+      ],
+      legendMargin: null,
+      orientation: LegendOrientation.Top,
+      show: true,
+      theme,
+      type: LegendType.Plain,
+    }),
+  ).toEqual({
+    effectiveType: LegendType.Scroll,
+  });
+});
+
+test('getLegendLayoutResult falls back to scroll when reserved horizontal width reduces plain legend capacity', () => {
+  const availableWidth = getHorizontalLegendAvailableWidth({
+    chartWidth: 265,
+    orientation: LegendOrientation.Top,
+    padding: { left: 20 },
+    zoomable: true,
+  });
+
+  expect(
+    getLegendLayoutResult({
+      availableWidth,
+      chartHeight: 400,
+      chartWidth: 265,
+      legendItems: ['Alpha', 'Beta', 'Gamma'],
+      legendMargin: null,
+      orientation: LegendOrientation.Top,
+      show: true,
+      theme,
+      type: LegendType.Plain,
+    }),
+  ).toEqual({
+    effectiveType: LegendType.Scroll,
+  });
+});
+
+test('getLegendLayoutResult falls back to scroll when horizontal legend selectors alone exceed available width', () => {
+  expect(
+    getLegendLayoutResult({
+      chartHeight: 400,
+      chartWidth: 95,
+      legendItems: ['A'],
+      legendMargin: null,
+      orientation: LegendOrientation.Top,
+      show: true,
+      theme,
+      type: LegendType.Plain,
+    }),
+  ).toEqual({
+    effectiveType: LegendType.Scroll,
+  });
+});
+
+test('getLegendLayoutResult keeps plain vertical legends when they fit within a single column', () => {
+  expect(
+    getLegendLayoutResult({
+      chartHeight: 400,
+      chartWidth: 800,
+      legendItems: ['Alpha', 'Beta', 'Gamma'],
+      legendMargin: null,
+      orientation: LegendOrientation.Left,
+      show: true,
+      theme,
+      type: LegendType.Plain,
+    }),
+  ).toEqual({
+    effectiveMargin: defaultLegendPadding[LegendOrientation.Left],
+    effectiveType: LegendType.Plain,
+  });
+});
+
+test('getLegendLayoutResult adds extra margin for wide vertical plain legends', () => {
+  const layout = getLegendLayoutResult({
+    chartHeight: 400,
+    chartWidth: 800,
+    legendItems: ['This is a very long legend label'],
+    legendMargin: null,
+    orientation: LegendOrientation.Left,
+    show: true,
+    theme,
+    type: LegendType.Plain,
+  });
+
+  expect(layout).toMatchObject({
+    effectiveType: LegendType.Plain,
+  });
+  expect(layout.effectiveMargin).toBeGreaterThan(
+    defaultLegendPadding[LegendOrientation.Left],
+  );
+});
+
+test('getLegendLayoutResult falls back to scroll when vertical plain legends exceed one column', () => {
+  expect(
+    getLegendLayoutResult({
+      chartHeight: 160,
+      chartWidth: 800,
+      legendItems: ['Alpha', 'Beta', 'Gamma', 'Delta', 'Epsilon'],
+      legendMargin: null,
+      orientation: LegendOrientation.Left,
+      show: true,
+      theme,
+      type: LegendType.Plain,
+    }),
+  ).toEqual({
+    effectiveType: LegendType.Scroll,
+  });
+});
+
+test('getLegendLayoutResult falls back to scroll when vertical plain legend selectors exceed available width', () => {
+  expect(
+    getLegendLayoutResult({
+      chartHeight: 400,
+      chartWidth: 300,
+      legendItems: ['A', 'B', 'C'],
+      legendMargin: null,
+      orientation: LegendOrientation.Left,
+      show: true,
+      theme,
+      type: LegendType.Plain,
+    }),
+  ).toEqual({
+    effectiveType: LegendType.Scroll,
+  });
+});
+
+test('getLegendLayoutResult counts empty-string legend labels when estimating layout', () => {
+  expect(
+    getLegendLayoutResult({
+      chartHeight: 400,
+      chartWidth: 116,
+      legendItems: ['', 'A', 'B', 'C', 'D'],
+      legendMargin: null,
+      orientation: LegendOrientation.Top,
+      show: true,
+      showSelectors: false,
+      theme,
+      type: LegendType.Plain,
+    }),
+  ).toEqual({
+    effectiveType: LegendType.Scroll,
+  });
+});
+
+test('resolveLegendLayout returns both raw and effective legend layout values', () => {
+  expect(
+    resolveLegendLayout({
+      chartHeight: 400,
+      chartWidth: 800,
+      legendItems: ['Alpha', 'Beta'],
+      legendMargin: null,
+      orientation: LegendOrientation.Top,
+      show: true,
+      theme,
+      type: LegendType.Plain,
+    }),
+  ).toEqual({
+    effectiveLegendMargin: defaultLegendPadding[LegendOrientation.Top],
+    effectiveLegendType: LegendType.Plain,
+    legendLayout: {
+      effectiveMargin: defaultLegendPadding[LegendOrientation.Top],
+      effectiveType: LegendType.Plain,
+    },
+  });
+});
+
 describe('getChartPadding', () => {
   test('should handle top default', () => {
     expect(getChartPadding(true, LegendOrientation.Top)).toEqual({
diff --git a/superset-frontend/plugins/plugin-chart-handlebars/package.json b/superset-frontend/plugins/plugin-chart-handlebars/package.json
index b33296a086d..3e4deaa8ff4 100644
--- a/superset-frontend/plugins/plugin-chart-handlebars/package.json
+++ b/superset-frontend/plugins/plugin-chart-handlebars/package.json
@@ -37,7 +37,7 @@
     "@superset-ui/core": "*",
     "ace-builds": "^1.4.14",
     "handlebars": "^4.7.8",
-    "lodash": "^4.17.11",
+    "lodash": "^4.18.1",
     "dayjs": "^1.11.19",
     "react": "^17.0.2",
     "react-ace": "^10.1.0",
diff --git a/superset-frontend/plugins/plugin-chart-handlebars/src/plugin/controls/style.tsx b/superset-frontend/plugins/plugin-chart-handlebars/src/plugin/controls/style.tsx
index ce4b6cf48bf..b38635faa6d 100644
--- a/superset-frontend/plugins/plugin-chart-handlebars/src/plugin/controls/style.tsx
+++ b/superset-frontend/plugins/plugin-chart-handlebars/src/plugin/controls/style.tsx
@@ -30,10 +30,12 @@ import { debounceFunc } from '../../consts';
 
 interface StyleCustomControlProps {
   value: string;
+  htmlSanitization: boolean;
 }
 
 const StyleControl = (props: CustomControlConfig<StyleCustomControlProps>) => {
   const theme = useTheme();
+  const htmlSanitization = props.htmlSanitization ?? true;
 
   const defaultValue = props?.value
     ? undefined
@@ -48,10 +50,16 @@ const StyleControl = (props: CustomControlConfig<StyleCustomControlProps>) => {
       <ControlHeader>
         <div>
           {props.label}
-          <InfoTooltip
-            iconStyle={{ marginLeft: theme.sizeUnit }}
-            tooltip={t('You need to configure HTML sanitization to use CSS')}
-          />
+          {htmlSanitization && (
+            <InfoTooltip
+              iconStyle={{ marginLeft: theme.sizeUnit }}
+              tooltip={t(
+                'CSS styles may be removed by server-side HTML sanitization. ' +
+                  'If styles are not applying, ask your Superset administrator ' +
+                  'to adjust the HTML sanitization configuration.',
+              )}
+            />
+          )}
         </div>
       </ControlHeader>
       <CodeEditor
@@ -79,8 +87,9 @@ export const styleControlSetItem: ControlSetItem = {
     valueKey: null,
 
     validators: [],
-    mapStateToProps: ({ controls }) => ({
+    mapStateToProps: ({ controls, common }) => ({
       value: controls?.handlebars_template?.value,
+      htmlSanitization: common?.conf?.HTML_SANITIZATION ?? true,
     }),
   },
 };
diff --git a/superset-frontend/plugins/plugin-chart-pivot-table/package.json b/superset-frontend/plugins/plugin-chart-pivot-table/package.json
index 00cf4d89b9b..7d0d0b56e1d 100644
--- a/superset-frontend/plugins/plugin-chart-pivot-table/package.json
+++ b/superset-frontend/plugins/plugin-chart-pivot-table/package.json
@@ -27,12 +27,11 @@
     "access": "public"
   },
   "peerDependencies": {
-    "react-icons": "5.4.0",
+    "@ant-design/icons": "^5.6.1",
     "@apache-superset/core": "*",
-    "@ant-design/icons": "^5.2.6",
     "@superset-ui/chart-controls": "*",
     "@superset-ui/core": "*",
-    "lodash": "^4.17.11",
+    "lodash": "^4.18.1",
     "prop-types": "*",
     "react": "^17.0.2",
     "react-dom": "^17.0.2"
diff --git a/superset-frontend/plugins/plugin-chart-pivot-table/src/PivotTableChart.tsx b/superset-frontend/plugins/plugin-chart-pivot-table/src/PivotTableChart.tsx
index 425c3598117..56ed2cb5c90 100644
--- a/superset-frontend/plugins/plugin-chart-pivot-table/src/PivotTableChart.tsx
+++ b/superset-frontend/plugins/plugin-chart-pivot-table/src/PivotTableChart.tsx
@@ -439,11 +439,22 @@ export default function PivotTableChart(props: PivotTableProps) {
     [groupbyColumnsRaw, groupbyRowsRaw, setDataMask],
   );
 
+  const isActiveFilterValue = useCallback(
+    (key: string, val: DataRecordValue) => {
+      if (!selectedFilters || !selectedFilters[key]) return false;
+      return selectedFilters[key].some((filterVal: DataRecordValue) => {
+        if (filterVal === val) return true;
+        if (filterVal instanceof Date && val instanceof Date) {
+          return filterVal.getTime() === val.getTime();
+        }
+        return false;
+      });
+    },
+    [selectedFilters],
+  );
+
   const getCrossFilterDataMask = useCallback(
     (value: { [key: string]: string }) => {
-      const isActiveFilterValue = (key: string, val: DataRecordValue) =>
-        !!selectedFilters && selectedFilters[key]?.includes(val);
-
       if (!value) {
         return undefined;
       }
@@ -500,7 +511,7 @@ export default function PivotTableChart(props: PivotTableProps) {
         isCurrentValueSelected: isActiveFilterValue(key, val),
       };
     },
-    [groupbyColumnsRaw, groupbyRowsRaw, selectedFilters],
+    [groupbyColumnsRaw, groupbyRowsRaw, isActiveFilterValue, selectedFilters],
   );
 
   const toggleFilter = useCallback(
@@ -521,9 +532,6 @@ export default function PivotTableChart(props: PivotTableProps) {
         return;
       }
 
-      const isActiveFilterValue = (key: string, val: DataRecordValue) =>
-        !!selectedFilters && selectedFilters[key]?.includes(val);
-
       const filtersCopy = { ...filters };
       delete filtersCopy[METRIC_KEY];
 
@@ -533,16 +541,24 @@ export default function PivotTableChart(props: PivotTableProps) {
       }
 
       const [key, val] = filtersEntries[filtersEntries.length - 1];
+      const isMultiSelect = e.metaKey || e.ctrlKey;
 
       let updatedFilters = { ...selectedFilters };
-      // multi select
-      // if (selectedFilters && isActiveFilterValue(key, val)) {
-      //   updatedFilters[key] = selectedFilters[key].filter((x: DataRecordValue) => x !== val);
-      // } else {
-      //   updatedFilters[key] = [...(selectedFilters?.[key] || []), val];
-      // }
-      // single select
-      if (selectedFilters && isActiveFilterValue(key, val)) {
+      if (isMultiSelect) {
+        if (isActiveFilterValue(key, val)) {
+          updatedFilters[key] = (selectedFilters?.[key] || []).filter(
+            (x: DataRecordValue) => {
+              if (x === val) return false;
+              if (x instanceof Date && val instanceof Date) {
+                return x.getTime() !== val.getTime();
+              }
+              return true;
+            },
+          );
+        } else {
+          updatedFilters[key] = [...(selectedFilters?.[key] || []), val];
+        }
+      } else if (isActiveFilterValue(key, val)) {
         updatedFilters = {};
       } else {
         updatedFilters = {
@@ -557,7 +573,7 @@ export default function PivotTableChart(props: PivotTableProps) {
       }
       handleChange(updatedFilters);
     },
-    [emitCrossFilters, selectedFilters, handleChange],
+    [emitCrossFilters, isActiveFilterValue, selectedFilters, handleChange],
   );
 
   const tableOptions = useMemo(
@@ -576,6 +592,9 @@ export default function PivotTableChart(props: PivotTableProps) {
       omittedHighlightHeaderGroups: [METRIC_KEY],
       cellColorFormatters: { [METRIC_KEY]: metricColorFormatters },
       dateFormatters,
+      cellBackgroundColor: theme.colorBgBase,
+      cellTextColor: theme.colorPrimaryText,
+      activeHeaderBackgroundColor: theme.colorPrimaryBg,
     }),
     [
       colTotals,
@@ -586,6 +605,9 @@ export default function PivotTableChart(props: PivotTableProps) {
       rowTotals,
       rowSubTotals,
       selectedFilters,
+      theme.colorBgBase,
+      theme.colorPrimaryBg,
+      theme.colorPrimaryText,
       toggleFilter,
     ],
   );
diff --git a/superset-frontend/plugins/plugin-chart-pivot-table/src/react-pivottable/TableRenderers.tsx b/superset-frontend/plugins/plugin-chart-pivot-table/src/react-pivottable/TableRenderers.tsx
index cc1d8fbe2df..9961958b966 100644
--- a/superset-frontend/plugins/plugin-chart-pivot-table/src/react-pivottable/TableRenderers.tsx
+++ b/superset-frontend/plugins/plugin-chart-pivot-table/src/react-pivottable/TableRenderers.tsx
@@ -20,18 +20,22 @@
 import { Component, ReactNode, MouseEvent } from 'react';
 import { safeHtmlSpan } from '@superset-ui/core';
 import { t } from '@apache-superset/core/translation';
+import { supersetTheme } from '@apache-superset/core/theme';
 import PropTypes from 'prop-types';
-import { FaSort } from 'react-icons/fa';
-import { FaSortDown as FaSortDesc } from 'react-icons/fa';
-import { FaSortUp as FaSortAsc } from 'react-icons/fa';
+import {
+  CaretUpOutlined,
+  CaretDownOutlined,
+  ColumnHeightOutlined,
+} from '@ant-design/icons';
+import {
+  ColorFormatters,
+  getTextColorForBackground,
+  ObjectFormattingEnum,
+  ResolvedColorFormatterResult,
+} from '@superset-ui/chart-controls';
 import { PivotData, flatKey } from './utilities';
 import { Styles } from './Styles';
 
-interface CellColorFormatter {
-  column: string;
-  getColorFromValue(value: unknown): string | undefined;
-}
-
 type ClickCallback = (
   e: MouseEvent,
   value: unknown,
@@ -59,8 +63,11 @@ interface TableOptions {
   highlightHeaderCellsOnHover?: boolean;
   omittedHighlightHeaderGroups?: string[];
   highlightedHeaderCells?: Record<string, unknown[]>;
-  cellColorFormatters?: Record<string, CellColorFormatter[]>;
+  cellColorFormatters?: Record<string, ColorFormatters>;
   dateFormatters?: Record<string, ((val: unknown) => string) | undefined>;
+  cellBackgroundColor?: string;
+  cellTextColor?: string;
+  activeHeaderBackgroundColor?: string;
 }
 
 interface SubtotalDisplay {
@@ -174,14 +181,19 @@ function displayHeaderCell(
   );
 }
 
-function getCellColor(
+export function getCellColor(
   keys: string[],
   aggValue: string | number | null,
-  cellColorFormatters: Record<string, CellColorFormatter[]> | undefined,
-): { backgroundColor: string | undefined } {
+  cellColorFormatters: Record<string, ColorFormatters> | undefined,
+  cellBackgroundColor = supersetTheme.colorBgBase,
+): ResolvedColorFormatterResult {
   if (!cellColorFormatters) return { backgroundColor: undefined };
 
   let backgroundColor: string | undefined;
+  let color: string | undefined;
+  const isTextColorFormatter = (formatter: ColorFormatters[number]) =>
+    formatter.objectFormatting === ObjectFormattingEnum.TEXT_COLOR ||
+    formatter.toTextColor;
 
   for (const cellColorFormatter of Object.values(cellColorFormatters)) {
     if (!Array.isArray(cellColorFormatter)) continue;
@@ -191,14 +203,26 @@ function getCellColor(
         if (formatter.column === key) {
           const result = formatter.getColorFromValue(aggValue);
           if (result) {
-            backgroundColor = result;
+            if (isTextColorFormatter(formatter)) {
+              color = result;
+            } else if (
+              formatter.objectFormatting !== ObjectFormattingEnum.CELL_BAR
+            ) {
+              backgroundColor = result;
+            }
           }
         }
       }
     }
   }
 
-  return { backgroundColor };
+  return {
+    backgroundColor,
+    color: getTextColorForBackground(
+      { backgroundColor, color },
+      cellBackgroundColor,
+    ),
+  };
 }
 
 interface HierarchicalNode {
@@ -247,6 +271,11 @@ function sortHierarchicalObject(
   return result;
 }
 
+function convertToNumberIfNumeric(value: string): string | number {
+  const n = Number(value);
+  return value.trim() !== '' && !Number.isNaN(n) ? n : value;
+}
+
 function convertToArray(
   obj: Map<string, unknown>,
   rowEnabled: boolean | undefined,
@@ -746,6 +775,8 @@ export class TableRenderer extends Component<
       highlightedHeaderCells,
       cellColorFormatters,
       dateFormatters,
+      cellBackgroundColor = supersetTheme.colorBgBase,
+      activeHeaderBackgroundColor = supersetTheme.colorPrimaryBg,
     } = this.props.tableOptions;
 
     if (!visibleColKeys || !colAttrSpans) {
@@ -812,6 +843,7 @@ export class TableRenderer extends Component<
         ) {
           colLabelClass += ' active';
         }
+        const isActiveHeader = colLabelClass.includes('active');
         const maxRowIndex = pivotSettings.maxRowVisible!;
         const mColVisible = pivotSettings.maxColVisible!;
         const visibleSortIcon = mColVisible - 1 === attrIdx;
@@ -825,7 +857,7 @@ export class TableRenderer extends Component<
 
           if (activeSortColumn !== key) {
             return (
-              <FaSort
+              <ColumnHeightOutlined
                 onClick={() =>
                   this.sortData(key, visibleColKeys, pivotData, maxRowIndex)
                 }
@@ -833,7 +865,8 @@ export class TableRenderer extends Component<
             );
           }
 
-          const SortIcon = sortingOrder[key] === 'asc' ? FaSortAsc : FaSortDesc;
+          const SortIcon =
+            sortingOrder[key] === 'asc' ? CaretUpOutlined : CaretDownOutlined;
           return (
             <SortIcon
               onClick={() =>
@@ -843,13 +876,19 @@ export class TableRenderer extends Component<
           );
         };
         const headerCellFormattedValue =
-          dateFormatters?.[attrName]?.(colKey[attrIdx]) ?? colKey[attrIdx];
-        const { backgroundColor } = getCellColor(
+          dateFormatters?.[attrName]?.(
+            convertToNumberIfNumeric(colKey[attrIdx]),
+          ) ?? colKey[attrIdx];
+        const { backgroundColor, color } = getCellColor(
           [attrName],
           headerCellFormattedValue,
           cellColorFormatters,
+          isActiveHeader ? activeHeaderBackgroundColor : cellBackgroundColor,
         );
-        const style = { backgroundColor };
+        const style = {
+          backgroundColor,
+          ...(color ? { color } : {}),
+        };
         attrValueCells.push(
           <th
             className={colLabelClass}
@@ -878,7 +917,7 @@ export class TableRenderer extends Component<
               allowRenderHtml,
             )}
             <span
-              role="columnheader"
+              role="button"
               tabIndex={0}
               // Prevents event bubbling to avoid conflict with column header click handlers
               // Ensures sort operation executes without triggering cross-filtration
@@ -1044,6 +1083,9 @@ export class TableRenderer extends Component<
       highlightedHeaderCells,
       cellColorFormatters,
       dateFormatters,
+      cellBackgroundColor = supersetTheme.colorBgBase,
+      cellTextColor = supersetTheme.colorPrimaryText,
+      activeHeaderBackgroundColor = supersetTheme.colorPrimaryBg,
     } = this.props.tableOptions;
     const flatRowKey = flatKey(rowKey);
 
@@ -1067,6 +1109,7 @@ export class TableRenderer extends Component<
       ) {
         valueCellClassName += ' active';
       }
+      const isActiveHeader = valueCellClassName.includes('active');
       const rowSpan = rowAttrSpans![rowIdx][i];
       if (rowSpan > 0) {
         const flatRowKey = flatKey(rowKey.slice(0, i + 1));
@@ -1078,14 +1121,18 @@ export class TableRenderer extends Component<
           : null;
 
         const headerCellFormattedValue =
-          dateFormatters?.[rowAttrs[i]]?.(r) ?? r;
+          dateFormatters?.[rowAttrs[i]]?.(convertToNumberIfNumeric(r)) ?? r;
 
-        const { backgroundColor } = getCellColor(
+        const { backgroundColor, color } = getCellColor(
           [rowAttrs[i]],
           headerCellFormattedValue,
           cellColorFormatters,
+          isActiveHeader ? activeHeaderBackgroundColor : cellBackgroundColor,
         );
-        const style = { backgroundColor };
+        const style = {
+          backgroundColor,
+          ...(color ? { color } : {}),
+        };
         return (
           <th
             key={`rowKeyLabel-${i}`}
@@ -1152,15 +1199,20 @@ export class TableRenderer extends Component<
 
       const keys = [...rowKey, ...colKey];
 
-      const { backgroundColor } = getCellColor(
+      const { backgroundColor, color } = getCellColor(
         keys,
         aggValue,
         cellColorFormatters,
+        cellBackgroundColor,
       );
 
       const style = agg.isSubtotal
-        ? { fontWeight: 'bold' }
-        : { backgroundColor };
+        ? {
+            backgroundColor,
+            fontWeight: 'bold',
+            color: color ?? cellTextColor,
+          }
+        : { backgroundColor, color: color ?? cellTextColor };
 
       return (
         <td
diff --git a/superset-frontend/plugins/plugin-chart-pivot-table/test/react-pivottable/tableRenders.test.tsx b/superset-frontend/plugins/plugin-chart-pivot-table/test/react-pivottable/tableRenders.test.tsx
index 57bd4fcb7ca..6250ef66a44 100644
--- a/superset-frontend/plugins/plugin-chart-pivot-table/test/react-pivottable/tableRenders.test.tsx
+++ b/superset-frontend/plugins/plugin-chart-pivot-table/test/react-pivottable/tableRenders.test.tsx
@@ -16,21 +16,32 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { TableRenderer } from '../../src/react-pivottable/TableRenderers';
+import { Children, isValidElement, type ReactElement } from 'react';
+import {
+  getTextColorForBackground,
+  ObjectFormattingEnum,
+} from '@superset-ui/chart-controls';
+import {
+  getCellColor,
+  TableRenderer,
+} from '../../src/react-pivottable/TableRenderers';
 import type { PivotData } from '../../src/react-pivottable/utilities';
 
 let tableRenderer: TableRenderer;
 let mockGetAggregatedData: jest.Mock;
 let mockSortAndCacheData: jest.Mock;
 
+type RenderColHeaderRowSettings = Parameters<
+  TableRenderer['renderColHeaderRow']
+>[2];
+type RenderTableRowSettings = Parameters<TableRenderer['renderTableRow']>[2];
+type TableRendererStateStub = TableRenderer['state'];
+type CachedBasePivotSettings = NonNullable<
+  TableRenderer['cachedBasePivotSettings']
+>;
+
 const columnIndex = 0;
 const visibleColKeys = [['col1'], ['col2']];
-const pivotData = {
-  subtotals: {
-    rowEnabled: true,
-    rowPartialOnTop: false,
-  },
-} as any;
 const maxRowIndex = 2;
 
 const mockProps = {
@@ -56,6 +67,97 @@ const mockProps = {
   colPartialOnTop: false,
 };
 
+const toPivotData = (value: Partial<PivotData>): PivotData =>
+  value as unknown as PivotData;
+
+const toCachedBasePivotSettings = (
+  value: Partial<CachedBasePivotSettings>,
+): CachedBasePivotSettings => value as unknown as CachedBasePivotSettings;
+
+const createActiveHeaderTableOptions = (
+  activeHeaderBackgroundColor: string,
+  overrides: Record<string, unknown> = {},
+): TableRenderer['props']['tableOptions'] =>
+  ({
+    ...overrides,
+    activeHeaderBackgroundColor,
+  }) as unknown as TableRenderer['props']['tableOptions'];
+
+const createPivotDataStub = (
+  aggregatorValue = 200,
+  isSubtotal = false,
+): PivotData =>
+  toPivotData({
+    getAggregator: () => ({
+      push: jest.fn(),
+      value: () => aggregatorValue,
+      format: (value: number) => String(value),
+      isSubtotal,
+    }),
+  });
+
+const pivotData = toPivotData({
+  subtotals: {
+    rowEnabled: true,
+    rowPartialOnTop: false,
+  },
+});
+
+const createColHeaderRowSettings = (
+  overrides: Partial<RenderColHeaderRowSettings> = {},
+): RenderColHeaderRowSettings =>
+  ({
+    rowAttrs: [],
+    colAttrs: ['region'],
+    visibleColKeys: [['EMEA']],
+    colAttrSpans: [[1]],
+    colKeys: [['EMEA']],
+    colSubtotalDisplay: {
+      displayOnTop: false,
+      enabled: false,
+      hideOnExpand: false,
+    },
+    rowSubtotalDisplay: {
+      displayOnTop: false,
+      enabled: false,
+      hideOnExpand: false,
+    },
+    maxColVisible: 1,
+    maxRowVisible: 0,
+    pivotData: createPivotDataStub(),
+    namesMapping: {},
+    allowRenderHtml: false,
+    arrowExpanded: null,
+    arrowCollapsed: null,
+    rowTotals: false,
+    colTotals: false,
+    ...overrides,
+  }) as RenderColHeaderRowSettings;
+
+const createTableRowSettings = (
+  overrides: Partial<RenderTableRowSettings> = {},
+): RenderTableRowSettings =>
+  ({
+    rowAttrs: ['metric'],
+    colAttrs: [],
+    rowAttrSpans: [[1]],
+    visibleColKeys: [[]],
+    pivotData: createPivotDataStub(),
+    rowTotals: false,
+    rowSubtotalDisplay: {
+      displayOnTop: false,
+      enabled: false,
+      hideOnExpand: false,
+    },
+    arrowExpanded: null,
+    arrowCollapsed: null,
+    cellCallbacks: {},
+    rowTotalCallbacks: {},
+    namesMapping: {},
+    allowRenderHtml: false,
+    ...overrides,
+  }) as RenderTableRowSettings;
+
 beforeEach(() => {
   tableRenderer = new TableRenderer(mockProps);
 
@@ -65,24 +167,24 @@ beforeEach(() => {
   tableRenderer.getAggregatedData = mockGetAggregatedData;
   tableRenderer.sortAndCacheData = mockSortAndCacheData;
 
-  tableRenderer.cachedBasePivotSettings = {
-    pivotData: {
+  tableRenderer.cachedBasePivotSettings = toCachedBasePivotSettings({
+    pivotData: toPivotData({
       subtotals: {
         rowEnabled: true,
         rowPartialOnTop: false,
         colEnabled: false,
         colPartialOnTop: false,
       },
-    },
+    }),
     rowKeys: [['A'], ['B'], ['C']],
-  } as any;
+  });
 
   tableRenderer.state = {
     sortingOrder: [],
     activeSortColumn: null,
     collapsedRows: {},
     collapsedCols: {},
-  } as any;
+  } as TableRendererStateStub;
 });
 
 const mockGroups = {
@@ -103,13 +205,15 @@ const mockGroups = {
   },
 };
 
-const createMockPivotData = (rowData: Record<string, number>) =>
-  ({
+const createMockPivotData = (rowData: Record<string, number>): PivotData =>
+  toPivotData({
     rowKeys: Object.keys(rowData).map(key => key.split('.')),
-    getAggregator: (rowKey: string[], colName: string) => ({
+    getAggregator: (rowKey: string[]) => ({
+      push: jest.fn(),
       value: () => rowData[rowKey.join('.')],
+      format: (value: number) => String(value),
     }),
-  }) as unknown as PivotData;
+  });
 
 test('should set initial ascending sort when no active sort column', () => {
   mockGetAggregatedData.mockReturnValue({
@@ -211,15 +315,15 @@ test('should check second call in sequence', () => {
     activeSortColumn: 0,
     collapsedRows: {},
     collapsedCols: {},
-  } as any;
+  } as TableRendererStateStub;
   tableRenderer.sortData(columnIndex, visibleColKeys, pivotData, maxRowIndex);
 
   tableRenderer.state = {
     sortingOrder: ['asc' as never],
-    activeSortColumn: 0 as any,
+    activeSortColumn: 0,
     collapsedRows: {},
     collapsedCols: {},
-  } as any;
+  } as TableRendererStateStub;
   tableRenderer.sortData(columnIndex, visibleColKeys, pivotData, maxRowIndex);
 
   expect(mockSortAndCacheData).toHaveBeenCalledTimes(2);
@@ -324,22 +428,23 @@ test('should sort hierarchical data in ascending order', () => {
 test('should calculate groups from pivot data', () => {
   tableRenderer = new TableRenderer(mockProps);
   const mockAggregator = (value: number) => ({
+    push: jest.fn(),
     value: () => value,
     format: jest.fn(),
     isSubtotal: false,
   });
 
-  const mockPivotData = {
+  const mockPivotData = toPivotData({
     rowKeys: [['A'], ['B'], ['C']],
     getAggregator: jest
       .fn()
       .mockReturnValueOnce(mockAggregator(30))
       .mockReturnValueOnce(mockAggregator(10))
       .mockReturnValueOnce(mockAggregator(20)),
-  };
+  });
 
   const result = tableRenderer.getAggregatedData(
-    mockPivotData as any,
+    mockPivotData,
     ['col1'],
     false,
   );
@@ -589,3 +694,455 @@ test('values ​​from the 3rd level of the hierarchy with a subtotal at the to
     },
   });
 });
+
+test('getCellColor derives readable text from the winning background', () => {
+  expect(
+    getCellColor(
+      ['revenue'],
+      200,
+      {
+        metric: [
+          {
+            column: 'revenue',
+            objectFormatting: ObjectFormattingEnum.BACKGROUND_COLOR,
+            getColorFromValue: (value: unknown) =>
+              value === 200 ? '#111111' : undefined,
+          },
+        ],
+      },
+      '#ffffff',
+    ),
+  ).toEqual({
+    backgroundColor: '#111111',
+    color: 'rgb(255, 255, 255)',
+  });
+});
+
+test('getCellColor keeps explicit text color over adaptive contrast', () => {
+  expect(
+    getCellColor(
+      ['revenue'],
+      200,
+      {
+        metric: [
+          {
+            column: 'revenue',
+            objectFormatting: ObjectFormattingEnum.BACKGROUND_COLOR,
+            getColorFromValue: (value: unknown) =>
+              value === 200 ? '#111111' : undefined,
+          },
+          {
+            column: 'revenue',
+            objectFormatting: ObjectFormattingEnum.TEXT_COLOR,
+            getColorFromValue: (value: unknown) =>
+              value === 200 ? '#ace1c40d' : undefined,
+          },
+        ],
+      },
+      '#ffffff',
+    ),
+  ).toEqual({
+    backgroundColor: '#111111',
+    color: 'rgb(172, 225, 196)',
+  });
+});
+
+test('getCellColor treats legacy toTextColor formatters as text color', () => {
+  expect(
+    getCellColor(
+      ['revenue'],
+      200,
+      {
+        metric: [
+          {
+            column: 'revenue',
+            getColorFromValue: (value: unknown) =>
+              value === 200 ? '#111111' : undefined,
+          },
+          {
+            column: 'revenue',
+            toTextColor: true,
+            getColorFromValue: (value: unknown) =>
+              value === 200 ? '#ace1c40d' : undefined,
+          },
+        ],
+      },
+      '#ffffff',
+    ),
+  ).toEqual({
+    backgroundColor: '#111111',
+    color: 'rgb(172, 225, 196)',
+  });
+});
+
+test('getCellColor ignores cell-bar rules when resolving text color', () => {
+  expect(
+    getCellColor(
+      ['revenue'],
+      200,
+      {
+        metric: [
+          {
+            column: 'revenue',
+            objectFormatting: ObjectFormattingEnum.CELL_BAR,
+            getColorFromValue: (value: unknown) =>
+              value === 200 ? '#11111199' : undefined,
+          },
+        ],
+      },
+      '#ffffff',
+    ),
+  ).toEqual({
+    backgroundColor: undefined,
+    color: undefined,
+  });
+});
+
+test('renderTableRow keeps subtotal background and readable text in sync', () => {
+  tableRenderer = new TableRenderer({
+    ...mockProps,
+    tableOptions: {
+      cellColorFormatters: {
+        metric: [
+          {
+            column: 'revenue',
+            objectFormatting: ObjectFormattingEnum.BACKGROUND_COLOR,
+            getColorFromValue: (value: unknown) =>
+              value === 200 ? '#111111' : undefined,
+          },
+        ],
+      },
+      cellBackgroundColor: '#ffffff',
+      cellTextColor: '#000000',
+    },
+  });
+
+  const row = tableRenderer.renderTableRow(
+    ['revenue'],
+    0,
+    createTableRowSettings({
+      pivotData: createPivotDataStub(200, true),
+    }),
+  ) as ReactElement;
+
+  const cells = Children.toArray(row.props.children);
+  const valueCell = cells.find(
+    child => isValidElement(child) && child.props.className === 'pvtVal',
+  ) as ReactElement;
+
+  expect(valueCell.props.style).toEqual({
+    backgroundColor: '#111111',
+    color: 'rgb(255, 255, 255)',
+    fontWeight: 'bold',
+  });
+});
+
+test('renderColAttrsHeader applies readable text color to formatted headers', () => {
+  tableRenderer = new TableRenderer({
+    ...mockProps,
+    tableOptions: {
+      cellColorFormatters: {
+        metric: [
+          {
+            column: 'region',
+            objectFormatting: ObjectFormattingEnum.BACKGROUND_COLOR,
+            getColorFromValue: (value: unknown) =>
+              value === 'EMEA' ? '#111111' : undefined,
+          },
+        ],
+      },
+      cellBackgroundColor: '#ffffff',
+      cellTextColor: '#000000',
+    },
+  });
+
+  const row = tableRenderer.renderColHeaderRow(
+    'region',
+    0,
+    createColHeaderRowSettings(),
+  ) as ReactElement;
+
+  const cells = Children.toArray(row.props.children);
+  const headerCell = cells.find(
+    child => isValidElement(child) && child.props.className === 'pvtColLabel',
+  ) as ReactElement;
+
+  expect(headerCell.props.style).toEqual({
+    backgroundColor: '#111111',
+    color: 'rgb(255, 255, 255)',
+  });
+});
+
+test('renderColAttrsHeader uses active header surface for adaptive contrast', () => {
+  const activeHeaderBackgroundColor = '#102a43';
+  tableRenderer = new TableRenderer({
+    ...mockProps,
+    tableOptions: createActiveHeaderTableOptions(activeHeaderBackgroundColor, {
+      highlightedHeaderCells: {
+        region: ['EMEA'],
+      },
+      cellColorFormatters: {
+        metric: [
+          {
+            column: 'region',
+            objectFormatting: ObjectFormattingEnum.BACKGROUND_COLOR,
+            getColorFromValue: (value: unknown) =>
+              value === 'EMEA' ? 'rgba(0, 0, 0, 0.4)' : undefined,
+          },
+        ],
+      },
+      cellBackgroundColor: '#ffffff',
+      cellTextColor: '#000000',
+    }),
+  });
+
+  const row = tableRenderer.renderColHeaderRow(
+    'region',
+    0,
+    createColHeaderRowSettings(),
+  ) as ReactElement;
+
+  const cells = Children.toArray(row.props.children);
+  const headerCell = cells.find(
+    child =>
+      isValidElement(child) && child.props.className === 'pvtColLabel active',
+  ) as ReactElement;
+
+  expect(headerCell.props.style).toEqual({
+    backgroundColor: 'rgba(0, 0, 0, 0.4)',
+    color: getTextColorForBackground(
+      { backgroundColor: 'rgba(0, 0, 0, 0.4)' },
+      activeHeaderBackgroundColor,
+    ),
+  });
+});
+
+test('renderColHeaderRow preserves default header text color without formatting', () => {
+  tableRenderer = new TableRenderer({
+    ...mockProps,
+    tableOptions: {
+      cellColorFormatters: { metric: [] },
+      cellBackgroundColor: '#ffffff',
+      cellTextColor: '#ff00aa',
+    },
+  });
+
+  const row = tableRenderer.renderColHeaderRow(
+    'region',
+    0,
+    createColHeaderRowSettings(),
+  ) as ReactElement;
+
+  const cells = Children.toArray(row.props.children);
+  const headerCell = cells.find(
+    child => isValidElement(child) && child.props.className === 'pvtColLabel',
+  ) as ReactElement;
+
+  expect(headerCell.props.style).toEqual({
+    backgroundColor: undefined,
+    color: undefined,
+  });
+});
+
+test('renderTableRow preserves default row-header text color without formatting', () => {
+  tableRenderer = new TableRenderer({
+    ...mockProps,
+    tableOptions: {
+      cellColorFormatters: { metric: [] },
+      cellBackgroundColor: '#ffffff',
+      cellTextColor: '#ff00aa',
+    },
+  });
+
+  const row = tableRenderer.renderTableRow(
+    ['revenue'],
+    0,
+    createTableRowSettings(),
+  ) as ReactElement;
+
+  const cells = Children.toArray(row.props.children);
+  const headerCell = cells.find(
+    child => isValidElement(child) && child.props.className === 'pvtRowLabel',
+  ) as ReactElement;
+
+  expect(headerCell.props.style).toEqual({
+    backgroundColor: undefined,
+    color: undefined,
+  });
+});
+
+test('renderTableRow applies readable text color to formatted row headers', () => {
+  tableRenderer = new TableRenderer({
+    ...mockProps,
+    tableOptions: {
+      cellColorFormatters: {
+        metric: [
+          {
+            column: 'metric',
+            objectFormatting: ObjectFormattingEnum.BACKGROUND_COLOR,
+            getColorFromValue: (value: unknown) =>
+              value === 'revenue' ? '#111111' : undefined,
+          },
+        ],
+      },
+      cellBackgroundColor: '#ffffff',
+      cellTextColor: '#000000',
+    },
+  });
+
+  const row = tableRenderer.renderTableRow(
+    ['revenue'],
+    0,
+    createTableRowSettings(),
+  ) as ReactElement;
+
+  const cells = Children.toArray(row.props.children);
+  const headerCell = cells.find(
+    child => isValidElement(child) && child.props.className === 'pvtRowLabel',
+  ) as ReactElement;
+
+  expect(headerCell.props.style).toEqual({
+    backgroundColor: '#111111',
+    color: 'rgb(255, 255, 255)',
+  });
+});
+
+test('renderTableRow uses active header surface for adaptive contrast', () => {
+  const activeHeaderBackgroundColor = '#102a43';
+  tableRenderer = new TableRenderer({
+    ...mockProps,
+    tableOptions: createActiveHeaderTableOptions(activeHeaderBackgroundColor, {
+      highlightedHeaderCells: {
+        metric: ['revenue'],
+      },
+      cellColorFormatters: {
+        metric: [
+          {
+            column: 'metric',
+            objectFormatting: ObjectFormattingEnum.BACKGROUND_COLOR,
+            getColorFromValue: (value: unknown) =>
+              value === 'revenue' ? 'rgba(0, 0, 0, 0.4)' : undefined,
+          },
+        ],
+      },
+      cellBackgroundColor: '#ffffff',
+      cellTextColor: '#000000',
+    }),
+  });
+
+  const row = tableRenderer.renderTableRow(
+    ['revenue'],
+    0,
+    createTableRowSettings(),
+  ) as ReactElement;
+
+  const cells = Children.toArray(row.props.children);
+  const headerCell = cells.find(
+    child =>
+      isValidElement(child) && child.props.className === 'pvtRowLabel active',
+  ) as ReactElement;
+
+  expect(headerCell.props.style).toEqual({
+    backgroundColor: 'rgba(0, 0, 0, 0.4)',
+    color: getTextColorForBackground(
+      { backgroundColor: 'rgba(0, 0, 0, 0.4)' },
+      activeHeaderBackgroundColor,
+    ),
+  });
+});
+
+function makeColPivotSettings(
+  value: string,
+): Parameters<TableRenderer['renderColHeaderRow']>[2] {
+  return {
+    rowAttrs: [],
+    colAttrs: ['event_time'],
+    colKeys: [[value]],
+    visibleColKeys: [[value]],
+    colAttrSpans: [[1]],
+    rowTotals: false,
+    colSubtotalDisplay: {
+      enabled: false,
+      displayOnTop: false,
+      hideOnExpand: false,
+    },
+    maxColVisible: 1,
+    pivotData: {},
+    namesMapping: {},
+    allowRenderHtml: false,
+  } as unknown as Parameters<TableRenderer['renderColHeaderRow']>[2];
+}
+
+function makeRowPivotSettings(): Parameters<
+  TableRenderer['renderTableRow']
+>[2] {
+  const aggregator = {
+    value: jest.fn().mockReturnValue(1),
+    format: jest.fn().mockReturnValue('1'),
+    isSubtotal: false,
+  };
+  return {
+    rowAttrs: ['event_time'],
+    colAttrs: [],
+    rowAttrSpans: [[1]],
+    visibleColKeys: [[]],
+    pivotData: { getAggregator: jest.fn().mockReturnValue(aggregator) },
+    rowTotals: false,
+    rowSubtotalDisplay: {
+      enabled: false,
+      displayOnTop: false,
+      hideOnExpand: false,
+    },
+    arrowExpanded: null,
+    arrowCollapsed: null,
+    cellCallbacks: {},
+    rowTotalCallbacks: {},
+    namesMapping: {},
+    allowRenderHtml: false,
+  } as unknown as Parameters<TableRenderer['renderTableRow']>[2];
+}
+
+test.each([
+  ['numeric timestamp string', '1700000000000', 1700000000000],
+  ['non-numeric date string', 'Dec. 16 2020', 'Dec. 16 2020'],
+  ['ISO timestamp string', '2024-01-15T00:00:00Z', '2024-01-15T00:00:00Z'],
+])(
+  'col header date formatter receives correct value for %s',
+  (_, input, expected) => {
+    const formatter = jest.fn().mockReturnValue('formatted');
+    tableRenderer = new TableRenderer({
+      ...mockProps,
+      cols: ['event_time'],
+      tableOptions: {
+        ...mockProps.tableOptions,
+        dateFormatters: { event_time: formatter },
+      },
+    });
+    tableRenderer.renderColHeaderRow(
+      'event_time',
+      0,
+      makeColPivotSettings(input),
+    );
+    expect(formatter).toHaveBeenCalledWith(expected);
+  },
+);
+
+test.each([
+  ['numeric timestamp string', '1700000000000', 1700000000000],
+  ['non-numeric date string', 'Dec. 16 2020', 'Dec. 16 2020'],
+])(
+  'row header date formatter receives correct value for %s',
+  (_, input, expected) => {
+    const formatter = jest.fn().mockReturnValue('formatted');
+    tableRenderer = new TableRenderer({
+      ...mockProps,
+      rows: ['event_time'],
+      tableOptions: {
+        ...mockProps.tableOptions,
+        dateFormatters: { event_time: formatter },
+      },
+    });
+    tableRenderer.renderTableRow([input], 0, makeRowPivotSettings());
+    expect(formatter).toHaveBeenCalledWith(expected);
+  },
+);
diff --git a/superset-frontend/plugins/legacy-plugin-chart-map-box/package.json b/superset-frontend/plugins/plugin-chart-point-cluster-map/package.json
similarity index 65%
rename from superset-frontend/plugins/legacy-plugin-chart-map-box/package.json
rename to superset-frontend/plugins/plugin-chart-point-cluster-map/package.json
index 90b77fece55..d24744b5f9d 100644
--- a/superset-frontend/plugins/legacy-plugin-chart-map-box/package.json
+++ b/superset-frontend/plugins/plugin-chart-point-cluster-map/package.json
@@ -1,7 +1,7 @@
 {
-  "name": "@superset-ui/legacy-plugin-chart-map-box",
-  "version": "0.20.3",
-  "description": "Superset Legacy Chart - MapBox",
+  "name": "@superset-ui/plugin-chart-point-cluster-map",
+  "version": "1.0.0",
+  "description": "Superset Chart Plugin - Point Cluster Map",
   "keywords": [
     "superset"
   ],
@@ -12,7 +12,7 @@
   "repository": {
     "type": "git",
     "url": "https://github.com/apache/superset.git",
-    "directory": "superset-frontend/plugins/legacy-plugin-chart-map-box"
+    "directory": "superset-frontend/plugins/plugin-chart-point-cluster-map"
   },
   "license": "Apache-2.0",
   "author": "Superset",
@@ -27,16 +27,17 @@
   ],
   "dependencies": {
     "@math.gl/web-mercator": "^4.1.0",
-    "prop-types": "^15.8.1",
-    "react-map-gl": "^6.1.19",
+    "mapbox-gl": "^3.22.0",
+    "maplibre-gl": "^5.23.0",
+    "react-map-gl": "^8.1.0",
     "supercluster": "^8.0.1"
   },
   "peerDependencies": {
+    "@apache-superset/core": "*",
     "@superset-ui/chart-controls": "*",
     "@superset-ui/core": "*",
-    "@apache-superset/core": "*",
-    "mapbox-gl": "*",
-    "react": "^17.0.2"
+    "react": "^17.0.2 || ^19.0.0",
+    "react-dom": "^17.0.2 || ^19.0.0"
   },
   "publishConfig": {
     "access": "public"
diff --git a/superset-frontend/plugins/legacy-plugin-chart-map-box/src/MapBox.css b/superset-frontend/plugins/plugin-chart-point-cluster-map/src/MapLibre.css
similarity index 96%
rename from superset-frontend/plugins/legacy-plugin-chart-map-box/src/MapBox.css
rename to superset-frontend/plugins/plugin-chart-point-cluster-map/src/MapLibre.css
index adade29f589..8d51367ab74 100644
--- a/superset-frontend/plugins/legacy-plugin-chart-map-box/src/MapBox.css
+++ b/superset-frontend/plugins/plugin-chart-point-cluster-map/src/MapLibre.css
@@ -16,6 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-.mapbox .slice_container div {
+.maplibre .slice_container div {
   padding-top: 0px;
 }
diff --git a/superset-frontend/plugins/plugin-chart-point-cluster-map/src/MapLibre.tsx b/superset-frontend/plugins/plugin-chart-point-cluster-map/src/MapLibre.tsx
new file mode 100644
index 00000000000..c3c2b54db46
--- /dev/null
+++ b/superset-frontend/plugins/plugin-chart-point-cluster-map/src/MapLibre.tsx
@@ -0,0 +1,216 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+import { memo, useCallback, useEffect, useState } from 'react';
+import { Map as MapLibreMap } from 'react-map-gl/maplibre';
+import { Map as MapboxMap } from 'react-map-gl/mapbox';
+import { WebMercatorViewport } from '@math.gl/web-mercator';
+import { useTheme } from '@apache-superset/core/theme';
+import { t } from '@apache-superset/core/translation';
+import ScatterPlotOverlay from './components/ScatterPlotOverlay';
+import { getMapboxApiKey } from './utils/mapbox';
+import 'maplibre-gl/dist/maplibre-gl.css';
+import './MapLibre.css';
+
+const DEFAULT_MAP_STYLE = 'https://tiles.openfreemap.org/styles/liberty';
+
+export const DEFAULT_MAX_ZOOM = 16;
+export const DEFAULT_POINT_RADIUS = 60;
+
+interface Viewport {
+  longitude: number;
+  latitude: number;
+  zoom: number;
+}
+
+interface Clusterer {
+  getClusters(bbox: number[], zoom: number): GeoJSONLocation[];
+}
+
+interface GeoJSONLocation {
+  geometry: {
+    coordinates: [number, number];
+  };
+  properties: Record<string, number | string | boolean | null | undefined>;
+}
+
+interface MapLibreProps {
+  width?: number;
+  height?: number;
+  aggregatorName?: string;
+  clusterer: Clusterer; // Required - used for getClusters()
+  globalOpacity?: number;
+  hasCustomMetric?: boolean;
+  mapProvider?: string;
+  mapStyle?: string;
+  onViewportChange?: (viewport: Viewport) => void;
+  pointRadius?: number;
+  pointRadiusUnit?: string;
+  renderWhileDragging?: boolean;
+  rgb?: (string | number)[];
+  bounds?: [[number, number], [number, number]]; // May be undefined for empty datasets
+  viewportLongitude?: number;
+  viewportLatitude?: number;
+  viewportZoom?: number;
+}
+
+function MapLibre({
+  width = 400,
+  height = 400,
+  aggregatorName,
+  clusterer,
+  globalOpacity = 1,
+  hasCustomMetric,
+  mapProvider,
+  mapStyle,
+  onViewportChange,
+  pointRadius = DEFAULT_POINT_RADIUS,
+  pointRadiusUnit = 'Pixels',
+  renderWhileDragging = true,
+  rgb,
+  bounds,
+  viewportLongitude,
+  viewportLatitude,
+  viewportZoom,
+}: MapLibreProps) {
+  const computeFitBounds = useCallback((): Viewport => {
+    if (bounds && bounds[0] && bounds[1]) {
+      const mercator = new WebMercatorViewport({ width, height }).fitBounds(
+        bounds,
+      );
+      return {
+        latitude: mercator.latitude,
+        longitude: mercator.longitude,
+        zoom: mercator.zoom,
+      };
+    }
+    return { latitude: 0, longitude: 0, zoom: 1 };
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
+
+  const mergeViewportWithProps = useCallback(
+    (fitBounds: Viewport, base: Viewport = fitBounds): Viewport => ({
+      ...base,
+      longitude: viewportLongitude ?? fitBounds.longitude,
+      latitude: viewportLatitude ?? fitBounds.latitude,
+      zoom: viewportZoom ?? fitBounds.zoom,
+    }),
+    [viewportLongitude, viewportLatitude, viewportZoom],
+  );
+
+  const [viewport, setViewport] = useState<Viewport>(() =>
+    mergeViewportWithProps(computeFitBounds()),
+  );
+
+  useEffect(() => {
+    const fitBounds = computeFitBounds();
+    const next = mergeViewportWithProps(fitBounds, viewport);
+    if (
+      next.longitude !== viewport.longitude ||
+      next.latitude !== viewport.latitude ||
+      next.zoom !== viewport.zoom
+    ) {
+      setViewport(next);
+    }
+    // Only re-run when the viewport-override props change
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [viewportLongitude, viewportLatitude, viewportZoom]);
+
+  const handleMove = useCallback(
+    (evt: {
+      viewState: { longitude: number; latitude: number; zoom: number };
+    }) => {
+      const { longitude, latitude, zoom } = evt.viewState;
+      const newViewport = { longitude, latitude, zoom };
+      setViewport(newViewport);
+      onViewportChange?.(newViewport);
+    },
+    [onViewportChange],
+  );
+
+  // add this variable to widen the visible area
+  const offsetHorizontal = (width * 0.5) / 100;
+  const offsetVertical = (height * 0.5) / 100;
+
+  const bbox =
+    bounds && bounds[0] && bounds[1]
+      ? [
+          bounds[0][0] - offsetHorizontal,
+          bounds[0][1] - offsetVertical,
+          bounds[1][0] + offsetHorizontal,
+          bounds[1][1] + offsetVertical,
+        ]
+      : [-180, -90, 180, 90];
+
+  const clusters = clusterer.getClusters(bbox, Math.round(viewport.zoom));
+
+  const theme = useTheme();
+  const resolvedMapStyle = mapStyle || DEFAULT_MAP_STYLE;
+  const mapboxApiKey = mapProvider === 'mapbox' ? getMapboxApiKey() : '';
+
+  if (mapProvider === 'mapbox' && !mapboxApiKey) {
+    return (
+      <div
+        style={{
+          width,
+          height,
+          display: 'flex',
+          alignItems: 'center',
+          justifyContent: 'center',
+          padding: 16,
+          textAlign: 'center',
+          color: theme.colorTextSecondary,
+        }}
+      >
+        {t('Mapbox requires a MAPBOX_API_KEY to be configured on the server.')}
+      </div>
+    );
+  }
+
+  const MapComponent = mapProvider === 'mapbox' ? MapboxMap : MapLibreMap;
+  const mapboxProps =
+    mapProvider === 'mapbox' ? { mapboxAccessToken: mapboxApiKey } : {};
+
+  return (
+    <MapComponent
+      {...viewport}
+      {...mapboxProps}
+      style={{ width, height }}
+      mapStyle={resolvedMapStyle}
+      onMove={handleMove}
+    >
+      <ScatterPlotOverlay
+        locations={clusters}
+        dotRadius={pointRadius}
+        pointRadiusUnit={pointRadiusUnit}
+        rgb={rgb}
+        globalOpacity={globalOpacity}
+        compositeOperation="screen"
+        renderWhileDragging={renderWhileDragging}
+        aggregation={hasCustomMetric ? aggregatorName : undefined}
+        zoom={viewport.zoom}
+        lngLatAccessor={(location: GeoJSONLocation) => {
+          const { coordinates } = location.geometry;
+          return [coordinates[0], coordinates[1]];
+        }}
+      />
+    </MapComponent>
+  );
+}
+
+export default memo(MapLibre);
diff --git a/superset-frontend/plugins/plugin-chart-point-cluster-map/src/buildQuery.ts b/superset-frontend/plugins/plugin-chart-point-cluster-map/src/buildQuery.ts
new file mode 100644
index 00000000000..6bc9a72cc92
--- /dev/null
+++ b/superset-frontend/plugins/plugin-chart-point-cluster-map/src/buildQuery.ts
@@ -0,0 +1,90 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+import {
+  buildQueryContext,
+  ensureIsArray,
+  QueryFormColumn,
+  QueryObject,
+  QueryObjectFilterClause,
+  SqlaFormData,
+} from '@superset-ui/core';
+
+export interface MapLibreFormData extends SqlaFormData {
+  all_columns_x?: string;
+  all_columns_y?: string;
+  map_label?: string[];
+  point_radius?: string;
+  clustering_radius?: string;
+  pandas_aggfunc?: string;
+  global_opacity?: number;
+  maplibre_style?: string;
+  mapbox_style?: string;
+  map_color?: string;
+  render_while_dragging?: boolean;
+  point_radius_unit?: string;
+}
+
+export default function buildQuery(formData: MapLibreFormData) {
+  const { all_columns_x, all_columns_y, map_label, point_radius } = formData;
+
+  if (!all_columns_x || !all_columns_y) {
+    throw new Error('Longitude and latitude columns are required');
+  }
+
+  return buildQueryContext(formData, (baseQueryObject: QueryObject) => {
+    const columns: QueryFormColumn[] = [
+      ...ensureIsArray(baseQueryObject.columns || []),
+      all_columns_x,
+      all_columns_y,
+    ];
+
+    // Add label column if specified and not 'count'
+    const hasCustomMetric =
+      map_label && map_label.length > 0 && map_label[0] !== 'count';
+    if (hasCustomMetric) {
+      columns.push(map_label[0]);
+    }
+
+    // Add point radius column if not "Auto"
+    if (point_radius && point_radius !== 'Auto') {
+      columns.push(point_radius);
+    }
+
+    // Add null filters for lon/lat
+    const filters: QueryObjectFilterClause[] = ensureIsArray(
+      baseQueryObject.filters || [],
+    );
+    filters.push(
+      { col: all_columns_x, op: 'IS NOT NULL' },
+      { col: all_columns_y, op: 'IS NOT NULL' },
+    );
+
+    // Deduplicate columns
+    const uniqueColumns = [...new Set(columns)];
+
+    return [
+      {
+        ...baseQueryObject,
+        columns: uniqueColumns,
+        filters,
+        is_timeseries: false,
+      },
+    ];
+  });
+}
diff --git a/superset-frontend/plugins/plugin-chart-point-cluster-map/src/components/CanvasOverlay.tsx b/superset-frontend/plugins/plugin-chart-point-cluster-map/src/components/CanvasOverlay.tsx
new file mode 100644
index 00000000000..91b26922cf6
--- /dev/null
+++ b/superset-frontend/plugins/plugin-chart-point-cluster-map/src/components/CanvasOverlay.tsx
@@ -0,0 +1,121 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+import { useCallback, useEffect, useRef } from 'react';
+import { useMap as useMapLibre } from 'react-map-gl/maplibre';
+import { useMap as useMapbox } from 'react-map-gl/mapbox';
+
+export interface RedrawParams {
+  width: number;
+  height: number;
+  ctx: CanvasRenderingContext2D;
+  isDragging: boolean;
+  project: (lngLat: [number, number]) => [number, number];
+}
+
+interface CanvasOverlayProps {
+  redraw: (params: RedrawParams) => void;
+}
+
+export default function CanvasOverlay({ redraw }: CanvasOverlayProps) {
+  const mapLibreContext = useMapLibre();
+  const mapboxContext = useMapbox();
+  const mapRef = (mapLibreContext.current ?? mapboxContext.current) as any;
+  const canvasRef = useRef<HTMLCanvasElement>(null);
+  const isDraggingRef = useRef(false);
+
+  const project = useCallback(
+    (lngLat: [number, number]): [number, number] => {
+      if (!mapRef) return [0, 0];
+      const map = mapRef.getMap();
+      const point = map.project(lngLat);
+      return [point.x, point.y];
+    },
+    [mapRef],
+  );
+
+  const performRedraw = useCallback(() => {
+    const canvas = canvasRef.current;
+    const map = mapRef?.getMap();
+    if (!canvas || !map) return;
+
+    const container = map.getContainer();
+    const dpr = window.devicePixelRatio || 1;
+    const width = container.clientWidth;
+    const height = container.clientHeight;
+
+    canvas.width = width * dpr;
+    canvas.height = height * dpr;
+    canvas.style.width = `${width}px`;
+    canvas.style.height = `${height}px`;
+
+    const ctx = canvas.getContext('2d');
+    if (!ctx) return;
+
+    ctx.setTransform(dpr, 0, 0, dpr, 0, 0);
+
+    redraw({
+      width,
+      height,
+      ctx,
+      isDragging: isDraggingRef.current,
+      project,
+    });
+  }, [mapRef, redraw, project]);
+
+  useEffect(() => {
+    const map = mapRef?.getMap();
+    if (!map) return undefined;
+
+    const onMove = () => performRedraw();
+    const onDragStart = () => {
+      isDraggingRef.current = true;
+    };
+    const onDragEnd = () => {
+      isDraggingRef.current = false;
+      performRedraw();
+    };
+    const onResize = () => performRedraw();
+
+    map.on('move', onMove);
+    map.on('dragstart', onDragStart);
+    map.on('dragend', onDragEnd);
+    map.on('resize', onResize);
+
+    performRedraw();
+
+    return () => {
+      map.off('move', onMove);
+      map.off('dragstart', onDragStart);
+      map.off('dragend', onDragEnd);
+      map.off('resize', onResize);
+    };
+  }, [mapRef, performRedraw]);
+
+  return (
+    <canvas
+      ref={canvasRef}
+      style={{
+        position: 'absolute',
+        top: 0,
+        left: 0,
+        pointerEvents: 'none',
+      }}
+    />
+  );
+}
diff --git a/superset-frontend/plugins/plugin-chart-point-cluster-map/src/components/ScatterPlotOverlay.tsx b/superset-frontend/plugins/plugin-chart-point-cluster-map/src/components/ScatterPlotOverlay.tsx
new file mode 100644
index 00000000000..5c94a69b514
--- /dev/null
+++ b/superset-frontend/plugins/plugin-chart-point-cluster-map/src/components/ScatterPlotOverlay.tsx
@@ -0,0 +1,400 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+import { memo, useCallback } from 'react';
+import CanvasOverlay, { type RedrawParams } from './CanvasOverlay';
+import { kmToPixels, MILES_PER_KM } from '../utils/geo';
+import roundDecimal from '../utils/roundDecimal';
+import luminanceFromRGB from '../utils/luminanceFromRGB';
+
+// Shared radius bounds keep cluster and point sizing in sync.
+export const MIN_CLUSTER_RADIUS_RATIO = 1 / 6;
+export const MAX_POINT_RADIUS_RATIO = 1 / 3;
+
+interface GeoJSONLocation {
+  geometry: {
+    coordinates: [number, number];
+  };
+  properties: Record<string, number | string | boolean | null | undefined>;
+}
+
+interface DrawTextOptions {
+  fontHeight?: number;
+  label?: string | number;
+  radius?: number;
+  rgb?: (string | number)[];
+  shadow?: boolean;
+}
+
+interface ScatterPlotOverlayProps {
+  aggregation?: string;
+  compositeOperation?: string;
+  dotRadius?: number;
+  globalOpacity?: number;
+  lngLatAccessor?: (location: GeoJSONLocation) => [number, number];
+  locations: GeoJSONLocation[];
+  pointRadiusUnit?: string;
+  renderWhileDragging?: boolean;
+  rgb?: (string | number)[];
+  zoom?: number;
+}
+
+const IS_DARK_THRESHOLD = 110;
+
+const defaultLngLatAccessor = (location: GeoJSONLocation): [number, number] => [
+  location.geometry.coordinates[0],
+  location.geometry.coordinates[1],
+];
+
+const computeClusterLabel = (
+  properties: Record<string, number | string | boolean | null | undefined>,
+  aggregation: string | undefined,
+): number | string => {
+  const count = properties.point_count as number;
+  if (!aggregation) {
+    return count;
+  }
+  if (aggregation === 'sum' || aggregation === 'min' || aggregation === 'max') {
+    return properties[aggregation] as number;
+  }
+  const { sum } = properties as { sum: number };
+  const mean = sum / count;
+  if (aggregation === 'mean') {
+    return Math.round(100 * mean) / 100;
+  }
+  const { squaredSum } = properties as { squaredSum: number };
+  const variance = squaredSum / count - (sum / count) ** 2;
+  if (aggregation === 'var') {
+    return Math.round(100 * variance) / 100;
+  }
+  if (aggregation === 'std' || aggregation === 'stdev') {
+    return Math.round(100 * Math.sqrt(variance)) / 100;
+  }
+
+  // fallback to point_count
+  return count;
+};
+
+function drawText(
+  ctx: CanvasRenderingContext2D,
+  pixel: [number, number],
+  compositeOperation: string,
+  options: DrawTextOptions = {},
+) {
+  const {
+    fontHeight = 0,
+    label = '',
+    radius = 0,
+    rgb = [0, 0, 0],
+    shadow = false,
+  } = options;
+  const maxWidth = radius * 1.8;
+  const luminance = luminanceFromRGB(
+    rgb[1] as number,
+    rgb[2] as number,
+    rgb[3] as number,
+  );
+
+  ctx.globalCompositeOperation = 'source-over';
+  ctx.fillStyle = luminance <= IS_DARK_THRESHOLD ? 'white' : 'black';
+  ctx.font = `${fontHeight}px sans-serif`;
+  ctx.textAlign = 'center';
+  ctx.textBaseline = 'middle';
+  if (shadow) {
+    ctx.shadowBlur = 15;
+    ctx.shadowColor = luminance <= IS_DARK_THRESHOLD ? 'black' : '';
+  }
+
+  const textWidth = ctx.measureText(String(label)).width;
+  if (textWidth > maxWidth) {
+    const scale = fontHeight / textWidth;
+    ctx.font = `${scale * maxWidth}px sans-serif`;
+  }
+
+  ctx.fillText(String(label), pixel[0], pixel[1]);
+  ctx.globalCompositeOperation = compositeOperation as GlobalCompositeOperation;
+  ctx.shadowBlur = 0;
+  ctx.shadowColor = '';
+}
+
+function ScatterPlotOverlay({
+  aggregation,
+  compositeOperation = 'source-over',
+  dotRadius = 4,
+  globalOpacity = 1,
+  lngLatAccessor = defaultLngLatAccessor,
+  locations,
+  pointRadiusUnit,
+  renderWhileDragging = true,
+  rgb,
+  zoom,
+}: ScatterPlotOverlayProps) {
+  const redraw = useCallback(
+    ({ width, height, ctx, isDragging, project }: RedrawParams) => {
+      const radius = dotRadius;
+      const clusterLabelMap: (number | string)[] = [];
+
+      locations.forEach((location, i) => {
+        if (location.properties.cluster) {
+          clusterLabelMap[i] = computeClusterLabel(
+            location.properties,
+            aggregation,
+          );
+        }
+      });
+
+      const finiteClusterLabels = clusterLabelMap
+        .map(value => Number(value))
+        .filter(value => Number.isFinite(value));
+      const safeMaxAbsLabel =
+        finiteClusterLabels.length > 0
+          ? Math.max(
+              Math.max(...finiteClusterLabels.map(value => Math.abs(value))),
+              1,
+            )
+          : 1;
+
+      // Calculate min/max radius values for Pixels mode scaling
+      let minRadiusValue = Infinity;
+      let maxRadiusValue = -Infinity;
+      if (pointRadiusUnit === 'Pixels') {
+        locations.forEach(location => {
+          if (
+            !location.properties.cluster &&
+            location.properties.radius != null
+          ) {
+            const radiusValueRaw = location.properties.radius;
+            const radiusValue =
+              typeof radiusValueRaw === 'string' && radiusValueRaw.trim() === ''
+                ? null
+                : Number(radiusValueRaw);
+            if (radiusValue != null && Number.isFinite(radiusValue)) {
+              minRadiusValue = Math.min(minRadiusValue, radiusValue);
+              maxRadiusValue = Math.max(maxRadiusValue, radiusValue);
+            }
+          }
+        });
+      }
+
+      ctx.clearRect(0, 0, width, height);
+      ctx.globalCompositeOperation =
+        compositeOperation as GlobalCompositeOperation;
+
+      if ((renderWhileDragging || !isDragging) && locations) {
+        locations.forEach((location: GeoJSONLocation, i: number) => {
+          const pixel = project(lngLatAccessor(location));
+          const pixelRounded: [number, number] = [
+            roundDecimal(pixel[0], 1),
+            roundDecimal(pixel[1], 1),
+          ];
+
+          if (
+            pixelRounded[0] + radius >= 0 &&
+            pixelRounded[0] - radius < width &&
+            pixelRounded[1] + radius >= 0 &&
+            pixelRounded[1] - radius < height
+          ) {
+            ctx.beginPath();
+            if (location.properties.cluster) {
+              const clusterLabel = clusterLabelMap[i];
+              const numericLabel = Number(clusterLabel);
+              const safeNumericLabel = Number.isFinite(numericLabel)
+                ? numericLabel
+                : 0;
+              const minClusterRadius =
+                pointRadiusUnit === 'Pixels'
+                  ? radius * MAX_POINT_RADIUS_RATIO
+                  : radius * MIN_CLUSTER_RADIUS_RATIO;
+              const ratio = Math.abs(safeNumericLabel) / safeMaxAbsLabel;
+              const scaledRadius = roundDecimal(
+                minClusterRadius + ratio ** 0.5 * (radius - minClusterRadius),
+                1,
+              );
+              const fontHeight = roundDecimal(scaledRadius * 0.5, 1);
+              const [x, y] = pixelRounded;
+              const gradient = ctx.createRadialGradient(
+                x,
+                y,
+                scaledRadius,
+                x,
+                y,
+                0,
+              );
+
+              gradient.addColorStop(
+                1,
+                `rgba(${rgb![1]}, ${rgb![2]}, ${rgb![3]}, ${0.8 * globalOpacity})`,
+              );
+              gradient.addColorStop(
+                0,
+                `rgba(${rgb![1]}, ${rgb![2]}, ${rgb![3]}, 0)`,
+              );
+              ctx.arc(
+                pixelRounded[0],
+                pixelRounded[1],
+                scaledRadius,
+                0,
+                Math.PI * 2,
+              );
+              ctx.fillStyle = gradient;
+              ctx.fill();
+
+              if (Number.isFinite(safeNumericLabel)) {
+                let label: string | number = clusterLabel;
+                const absLabel = Math.abs(safeNumericLabel);
+                const sign = safeNumericLabel < 0 ? '-' : '';
+                if (absLabel >= 10000) {
+                  label = `${sign}${Math.round(absLabel / 1000)}k`;
+                } else if (absLabel >= 1000) {
+                  label = `${sign}${Math.round(absLabel / 100) / 10}k`;
+                }
+                drawText(ctx, pixelRounded, compositeOperation, {
+                  fontHeight,
+                  label,
+                  radius: scaledRadius,
+                  rgb,
+                  shadow: true,
+                });
+              }
+            } else {
+              const defaultRadius = radius * MIN_CLUSTER_RADIUS_RATIO;
+              const rawRadius = location.properties.radius;
+              const numericRadiusProperty =
+                rawRadius != null &&
+                !(typeof rawRadius === 'string' && rawRadius.trim() === '')
+                  ? Number(rawRadius)
+                  : null;
+              const radiusProperty =
+                numericRadiusProperty != null &&
+                Number.isFinite(numericRadiusProperty)
+                  ? numericRadiusProperty
+                  : null;
+              const pointMetric = location.properties.metric ?? null;
+              let pointRadius: number = radiusProperty ?? defaultRadius;
+              let pointLabel: string | number | undefined;
+
+              if (radiusProperty != null) {
+                const pointLatitude = lngLatAccessor(location)[1];
+                if (pointRadiusUnit === 'Kilometers') {
+                  pointLabel = `${roundDecimal(pointRadius, 2)}km`;
+                  pointRadius = kmToPixels(
+                    pointRadius,
+                    pointLatitude,
+                    zoom ?? 0,
+                  );
+                } else if (pointRadiusUnit === 'Miles') {
+                  pointLabel = `${roundDecimal(pointRadius, 2)}mi`;
+                  pointRadius = kmToPixels(
+                    pointRadius * MILES_PER_KM,
+                    pointLatitude,
+                    zoom ?? 0,
+                  );
+                } else if (pointRadiusUnit === 'Pixels') {
+                  const MIN_POINT_RADIUS = radius * MIN_CLUSTER_RADIUS_RATIO;
+                  const MAX_POINT_RADIUS = radius * MAX_POINT_RADIUS_RATIO;
+
+                  if (
+                    Number.isFinite(minRadiusValue) &&
+                    Number.isFinite(maxRadiusValue) &&
+                    maxRadiusValue > minRadiusValue
+                  ) {
+                    const numericPointRadius = Number(pointRadius);
+                    if (!Number.isFinite(numericPointRadius)) {
+                      pointRadius = MIN_POINT_RADIUS;
+                    } else {
+                      const normalizedValueRaw =
+                        (numericPointRadius - minRadiusValue) /
+                        (maxRadiusValue - minRadiusValue);
+                      const normalizedValue = Math.max(
+                        0,
+                        Math.min(1, normalizedValueRaw),
+                      );
+                      pointRadius =
+                        MIN_POINT_RADIUS +
+                        normalizedValue * (MAX_POINT_RADIUS - MIN_POINT_RADIUS);
+                    }
+                    pointLabel = `${roundDecimal(radiusProperty, 2)}`;
+                  } else if (
+                    Number.isFinite(minRadiusValue) &&
+                    minRadiusValue === maxRadiusValue
+                  ) {
+                    pointRadius = (MIN_POINT_RADIUS + MAX_POINT_RADIUS) / 2;
+                    pointLabel = `${roundDecimal(radiusProperty, 2)}`;
+                  } else {
+                    pointRadius = Math.max(
+                      MIN_POINT_RADIUS,
+                      Math.min(pointRadius, MAX_POINT_RADIUS),
+                    );
+                    pointLabel = `${roundDecimal(radiusProperty, 2)}`;
+                  }
+                }
+              }
+
+              if (pointMetric !== null) {
+                const numericMetric = parseFloat(String(pointMetric));
+                pointLabel = Number.isFinite(numericMetric)
+                  ? roundDecimal(numericMetric, 2)
+                  : String(pointMetric);
+              }
+
+              if (!pointRadius) {
+                pointRadius = defaultRadius;
+              }
+
+              ctx.arc(
+                pixelRounded[0],
+                pixelRounded[1],
+                roundDecimal(pointRadius, 1),
+                0,
+                Math.PI * 2,
+              );
+              ctx.fillStyle = `rgba(${rgb![1]}, ${rgb![2]}, ${rgb![3]}, ${globalOpacity})`;
+              ctx.fill();
+
+              if (pointLabel !== undefined) {
+                drawText(ctx, pixelRounded, compositeOperation, {
+                  fontHeight: roundDecimal(pointRadius, 1),
+                  label: pointLabel,
+                  radius: pointRadius,
+                  rgb,
+                  shadow: false,
+                });
+              }
+            }
+          }
+        });
+      }
+    },
+    [
+      aggregation,
+      compositeOperation,
+      dotRadius,
+      globalOpacity,
+      lngLatAccessor,
+      locations,
+      pointRadiusUnit,
+      renderWhileDragging,
+      rgb,
+      zoom,
+    ],
+  );
+
+  return <CanvasOverlay redraw={redraw} />;
+}
+
+export default memo(ScatterPlotOverlay);
diff --git a/superset-frontend/plugins/legacy-plugin-chart-map-box/src/controlPanel.ts b/superset-frontend/plugins/plugin-chart-point-cluster-map/src/controlPanel.ts
similarity index 73%
rename from superset-frontend/plugins/legacy-plugin-chart-map-box/src/controlPanel.ts
rename to superset-frontend/plugins/plugin-chart-point-cluster-map/src/controlPanel.ts
index 8b1c846e048..294e4f12087 100644
--- a/superset-frontend/plugins/legacy-plugin-chart-map-box/src/controlPanel.ts
+++ b/superset-frontend/plugins/plugin-chart-point-cluster-map/src/controlPanel.ts
@@ -17,7 +17,6 @@
  * under the License.
  */
 import { t } from '@apache-superset/core/translation';
-import { validateMapboxStylesUrl } from '@superset-ui/core';
 import {
   columnChoices,
   ControlPanelConfig,
@@ -29,12 +28,12 @@ import {
 const columnsConfig = sharedControls.entity;
 
 const colorChoices = [
-  ['rgb(0, 139, 139)', t('Dark Cyan')],
-  ['rgb(128, 0, 128)', t('Purple')],
-  ['rgb(255, 215, 0)', t('Gold')],
-  ['rgb(69, 69, 69)', t('Dim Gray')],
-  ['rgb(220, 20, 60)', t('Crimson')],
-  ['rgb(34, 139, 34)', t('Forest Green')],
+  ['#008b8b', t('Dark Cyan')],
+  ['#800080', t('Purple')],
+  ['#ffd700', t('Gold')],
+  ['#454545', t('Dim Gray')],
+  ['#dc143c', t('Crimson')],
+  ['#228b22', t('Forest Green')],
 ];
 
 const config: ControlPanelConfig = {
@@ -110,7 +109,7 @@ const config: ControlPanelConfig = {
                   'Either a numerical column or `Auto`, which scales the point based ' +
                   'on the largest cluster',
               ),
-              mapStateToProps: state => {
+              mapStateToProps: (state: any) => {
                 const datasourceChoices = columnChoices(state.datasource);
                 const choices: [string, string][] = [['Auto', t('Auto')]];
                 return {
@@ -145,7 +144,7 @@ const config: ControlPanelConfig = {
       controlSetRows: [
         [
           {
-            name: 'mapbox_label',
+            name: 'map_label',
             config: {
               type: 'SelectControl',
               multi: true,
@@ -157,7 +156,7 @@ const config: ControlPanelConfig = {
                   'Non-numerical columns will be used to label points. ' +
                   'Leave empty to get a count of points in each cluster.',
               ),
-              mapStateToProps: state => ({
+              mapStateToProps: (state: any) => ({
                 choices: columnChoices(state.datasource),
               }),
             },
@@ -189,21 +188,66 @@ const config: ControlPanelConfig = {
       ],
     },
     {
-      label: t('Visual Tweaks'),
+      label: t('Map'),
+      tabOverride: 'customize',
+      expanded: true,
       controlSetRows: [
         [
           {
-            name: 'render_while_dragging',
+            name: 'map_renderer',
             config: {
-              type: 'CheckboxControl',
-              label: t('Live render'),
-              default: true,
+              type: 'SelectControl',
+              label: t('Map Renderer'),
+              clearable: false,
+              renderTrigger: true,
+              choices: [
+                ['maplibre', t('MapLibre (open-source)')],
+                ['mapbox', t('Mapbox (API key required)')],
+              ],
+              default: 'maplibre',
               description: t(
-                'Points and clusters will update as the viewport is being changed',
+                'MapLibre is open-source and requires no API key. Mapbox requires MAPBOX_API_KEY to be configured on the server.',
               ),
             },
           },
         ],
+        [
+          {
+            name: 'maplibre_style',
+            config: {
+              type: 'SelectControl',
+              label: t('Map Style'),
+              clearable: false,
+              renderTrigger: true,
+              freeForm: true,
+              choices: [
+                [
+                  'https://tiles.openfreemap.org/styles/liberty',
+                  t('Liberty (OpenFreeMap)'),
+                ],
+                [
+                  'https://basemaps.cartocdn.com/gl/positron-gl-style/style.json',
+                  t('Light (Carto)'),
+                ],
+                [
+                  'https://basemaps.cartocdn.com/gl/dark-matter-gl-style/style.json',
+                  t('Dark (Carto)'),
+                ],
+                [
+                  'https://basemaps.cartocdn.com/gl/voyager-gl-style/style.json',
+                  t('Streets (Carto)'),
+                ],
+              ],
+              default: 'https://tiles.openfreemap.org/styles/liberty',
+              description: t(
+                'Base layer map style. See MapLibre documentation: %s',
+                'https://maplibre.org/maplibre-style-spec/',
+              ),
+              visibility: ({ controls }: any) =>
+                controls?.map_renderer?.value !== 'mapbox',
+            },
+          },
+        ],
         [
           {
             name: 'mapbox_style',
@@ -213,22 +257,42 @@ const config: ControlPanelConfig = {
               clearable: false,
               renderTrigger: true,
               freeForm: true,
-              validators: [validateMapboxStylesUrl],
               choices: [
-                ['mapbox://styles/mapbox/streets-v9', t('Streets')],
-                ['mapbox://styles/mapbox/dark-v9', t('Dark')],
-                ['mapbox://styles/mapbox/light-v9', t('Light')],
+                ['mapbox://styles/mapbox/streets-v12', t('Streets')],
+                ['mapbox://styles/mapbox/outdoors-v12', t('Outdoors')],
+                ['mapbox://styles/mapbox/light-v11', t('Light')],
+                ['mapbox://styles/mapbox/dark-v11', t('Dark')],
+                ['mapbox://styles/mapbox/satellite-v9', t('Satellite')],
                 [
-                  'mapbox://styles/mapbox/satellite-streets-v9',
+                  'mapbox://styles/mapbox/satellite-streets-v12',
                   t('Satellite Streets'),
                 ],
-                ['mapbox://styles/mapbox/satellite-v9', t('Satellite')],
-                ['mapbox://styles/mapbox/outdoors-v9', t('Outdoors')],
               ],
-              default: 'mapbox://styles/mapbox/light-v9',
+              default: 'mapbox://styles/mapbox/light-v11',
               description: t(
-                'Base layer map style. See Mapbox documentation: %s',
-                'https://docs.mapbox.com/help/glossary/style-url/',
+                'Base layer map style. Accepts a Mapbox style URL (mapbox://styles/...).',
+              ),
+              visibility: ({ controls }: any) =>
+                controls?.map_renderer?.value === 'mapbox',
+            },
+          },
+        ],
+      ],
+    },
+    {
+      label: t('Visual Tweaks'),
+      tabOverride: 'customize',
+      controlSetRows: [
+        [
+          {
+            name: 'render_while_dragging',
+            config: {
+              type: 'CheckboxControl',
+              label: t('Live render'),
+              renderTrigger: true,
+              default: true,
+              description: t(
+                'Points and clusters will update as the viewport is being changed',
               ),
             },
           },
@@ -239,9 +303,9 @@ const config: ControlPanelConfig = {
             config: {
               type: 'TextControl',
               label: t('Opacity'),
+              renderTrigger: true,
               default: 1,
               isFloat: true,
-              renderTrigger: true,
               description: t(
                 'Opacity of all clusters, points, and labels. Between 0 and 1.',
               ),
@@ -250,10 +314,11 @@ const config: ControlPanelConfig = {
         ],
         [
           {
-            name: 'mapbox_color',
+            name: 'map_color',
             config: {
               type: 'SelectControl',
               freeForm: true,
+              renderTrigger: true,
               label: t('RGB Color'),
               default: colorChoices[0][0],
               choices: colorChoices,
@@ -278,7 +343,6 @@ const config: ControlPanelConfig = {
               isFloat: true,
               description: t('Longitude of default viewport'),
               places: 8,
-              // Viewport longitude changes shouldn't prompt user to re-run query
               dontRefreshOnChange: true,
             },
           },
@@ -292,7 +356,6 @@ const config: ControlPanelConfig = {
               isFloat: true,
               description: t('Latitude of default viewport'),
               places: 8,
-              // Viewport latitude changes shouldn't prompt user to re-run query
               dontRefreshOnChange: true,
             },
           },
@@ -308,7 +371,6 @@ const config: ControlPanelConfig = {
               default: '',
               description: t('Zoom level of the map'),
               places: 8,
-              // Viewport zoom shouldn't prompt user to re-run query
               dontRefreshOnChange: true,
             },
           },
@@ -325,7 +387,7 @@ const config: ControlPanelConfig = {
       ),
     },
   },
-  formDataOverrides: formData => ({
+  formDataOverrides: (formData: any) => ({
     ...formData,
     groupby: getStandardizedControls().popAllColumns(),
   }),
diff --git a/superset-frontend/plugins/legacy-plugin-chart-map-box/src/images/MapBox-dark.jpg b/superset-frontend/plugins/plugin-chart-point-cluster-map/src/images/MapBox-dark.jpg
similarity index 100%
rename from superset-frontend/plugins/legacy-plugin-chart-map-box/src/images/MapBox-dark.jpg
rename to superset-frontend/plugins/plugin-chart-point-cluster-map/src/images/MapBox-dark.jpg
diff --git a/superset-frontend/plugins/legacy-plugin-chart-map-box/src/images/MapBox.jpg b/superset-frontend/plugins/plugin-chart-point-cluster-map/src/images/MapBox.jpg
similarity index 100%
rename from superset-frontend/plugins/legacy-plugin-chart-map-box/src/images/MapBox.jpg
rename to superset-frontend/plugins/plugin-chart-point-cluster-map/src/images/MapBox.jpg
diff --git a/superset-frontend/plugins/legacy-plugin-chart-map-box/src/images/MapBox2-dark.jpg b/superset-frontend/plugins/plugin-chart-point-cluster-map/src/images/MapBox2-dark.jpg
similarity index 100%
rename from superset-frontend/plugins/legacy-plugin-chart-map-box/src/images/MapBox2-dark.jpg
rename to superset-frontend/plugins/plugin-chart-point-cluster-map/src/images/MapBox2-dark.jpg
diff --git a/superset-frontend/plugins/legacy-plugin-chart-map-box/src/images/MapBox2.jpg b/superset-frontend/plugins/plugin-chart-point-cluster-map/src/images/MapBox2.jpg
similarity index 100%
rename from superset-frontend/plugins/legacy-plugin-chart-map-box/src/images/MapBox2.jpg
rename to superset-frontend/plugins/plugin-chart-point-cluster-map/src/images/MapBox2.jpg
diff --git a/superset-frontend/plugins/legacy-plugin-chart-map-box/src/images/thumbnail-dark.png b/superset-frontend/plugins/plugin-chart-point-cluster-map/src/images/thumbnail-dark.png
similarity index 100%
rename from superset-frontend/plugins/legacy-plugin-chart-map-box/src/images/thumbnail-dark.png
rename to superset-frontend/plugins/plugin-chart-point-cluster-map/src/images/thumbnail-dark.png
diff --git a/superset-frontend/plugins/legacy-plugin-chart-map-box/src/images/thumbnail.png b/superset-frontend/plugins/plugin-chart-point-cluster-map/src/images/thumbnail.png
similarity index 100%
rename from superset-frontend/plugins/legacy-plugin-chart-map-box/src/images/thumbnail.png
rename to superset-frontend/plugins/plugin-chart-point-cluster-map/src/images/thumbnail.png
diff --git a/superset-frontend/plugins/legacy-plugin-chart-map-box/src/images/thumbnailLarge.png b/superset-frontend/plugins/plugin-chart-point-cluster-map/src/images/thumbnailLarge.png
similarity index 100%
rename from superset-frontend/plugins/legacy-plugin-chart-map-box/src/images/thumbnailLarge.png
rename to superset-frontend/plugins/plugin-chart-point-cluster-map/src/images/thumbnailLarge.png
diff --git a/superset-frontend/plugins/legacy-plugin-chart-map-box/src/index.ts b/superset-frontend/plugins/plugin-chart-point-cluster-map/src/index.ts
similarity index 88%
rename from superset-frontend/plugins/legacy-plugin-chart-map-box/src/index.ts
rename to superset-frontend/plugins/plugin-chart-point-cluster-map/src/index.ts
index 666e8ea2303..1f95c36a98d 100644
--- a/superset-frontend/plugins/legacy-plugin-chart-map-box/src/index.ts
+++ b/superset-frontend/plugins/plugin-chart-point-cluster-map/src/index.ts
@@ -28,31 +28,30 @@ import controlPanel from './controlPanel';
 
 const metadata = new ChartMetadata({
   category: t('Map'),
-  credits: ['https://www.mapbox.com/mapbox-gl-js/api/'],
+  credits: ['https://maplibre.org/'],
   description: '',
   exampleGallery: [
     { url: example1, urlDark: example1Dark, caption: t('Light mode') },
     { url: example2, urlDark: example2Dark, caption: t('Dark mode') },
   ],
-  name: t('MapBox'),
+  name: t('Point Cluster Map'),
   tags: [
     t('Business'),
     t('Intensity'),
-    t('Legacy'),
     t('Density'),
     t('Scatter'),
     t('Transformable'),
   ],
   thumbnail,
   thumbnailDark,
-  useLegacyApi: true,
 });
 
-export default class MapBoxChartPlugin extends ChartPlugin {
+export default class ScatterMapChartPlugin extends ChartPlugin {
   constructor() {
     super({
-      loadChart: () => import('./MapBox'),
+      loadChart: () => import('./MapLibre'),
       loadTransformProps: () => import('./transformProps'),
+      loadBuildQuery: () => import('./buildQuery'),
       metadata,
       controlPanel,
     });
diff --git a/superset-frontend/plugins/plugin-chart-point-cluster-map/src/stories/PointClusterMap.stories.tsx b/superset-frontend/plugins/plugin-chart-point-cluster-map/src/stories/PointClusterMap.stories.tsx
new file mode 100644
index 00000000000..d6c5eeae3f3
--- /dev/null
+++ b/superset-frontend/plugins/plugin-chart-point-cluster-map/src/stories/PointClusterMap.stories.tsx
@@ -0,0 +1,176 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+/* eslint-disable sort-keys, no-magic-numbers */
+import { SuperChart } from '@superset-ui/core';
+import { useTheme } from '@apache-superset/core/theme';
+import ScatterMapChartPlugin from '@superset-ui/plugin-chart-point-cluster-map';
+import { withResizableChartDemo } from '@storybook-shared';
+import { generateData } from './data';
+
+new ScatterMapChartPlugin().configure({ key: 'point_cluster_map' }).register();
+
+export default {
+  title: 'Chart Plugins/plugin-chart-point-cluster-map',
+  decorators: [withResizableChartDemo],
+  args: {
+    clusteringRadius: 60,
+    globalOpacity: 1,
+    pointRadius: 'Auto',
+    renderWhileDragging: true,
+    mapRenderer: 'maplibre',
+  },
+  argTypes: {
+    clusteringRadius: {
+      control: { type: 'range', min: 0, max: 200, step: 10 },
+      description: 'Radius in pixels for clustering points',
+    },
+    globalOpacity: {
+      control: { type: 'range', min: 0, max: 1, step: 0.1 },
+      description: 'Opacity of map markers',
+    },
+    pointRadius: {
+      control: 'select',
+      options: ['Auto', 1, 2, 5, 10, 20, 50],
+      description: 'Size of point markers',
+    },
+    renderWhileDragging: {
+      control: 'boolean',
+      description: 'Render markers while dragging the map',
+    },
+    mapRenderer: {
+      control: 'select',
+      options: ['maplibre', 'mapbox'],
+      description:
+        'Map renderer. MapLibre is open-source. Mapbox requires MAPBOX_API_KEY.',
+    },
+  },
+};
+
+export const InteractiveSuperclusterMap = ({
+  clusteringRadius,
+  globalOpacity,
+  pointRadius,
+  renderWhileDragging,
+  mapRenderer,
+  width,
+  height,
+}: {
+  clusteringRadius: number;
+  globalOpacity: number;
+  pointRadius: string | number;
+  renderWhileDragging: boolean;
+  mapRenderer: string;
+  width: number;
+  height: number;
+}) => {
+  const theme = useTheme();
+  return (
+    <SuperChart
+      chartType="point_cluster_map"
+      width={width}
+      height={height}
+      queriesData={[{ data: generateData(theme) }]}
+      formData={{
+        clustering_radius: String(clusteringRadius),
+        global_opacity: globalOpacity,
+        map_color: '#008b8b',
+        map_label: [],
+        map_renderer: mapRenderer,
+        maplibre_style: 'https://tiles.openfreemap.org/styles/liberty',
+        mapbox_style: 'mapbox://styles/mapbox/light-v11',
+        pandas_aggfunc: 'sum',
+        point_radius: pointRadius,
+        point_radius_unit: 'Pixels',
+        render_while_dragging: renderWhileDragging,
+        viewport_latitude: 37.78,
+        viewport_longitude: -122.42,
+        viewport_zoom: 12,
+      }}
+    />
+  );
+};
+
+export const WithMetricLabels = ({
+  width,
+  height,
+}: {
+  width: number;
+  height: number;
+}) => {
+  const theme = useTheme();
+  return (
+    <SuperChart
+      chartType="point_cluster_map"
+      width={width}
+      height={height}
+      queriesData={[{ data: generateData(theme) }]}
+      formData={{
+        clustering_radius: '60',
+        global_opacity: 1,
+        map_color: '#dc143c',
+        map_label: ['metric'],
+        map_renderer: 'maplibre',
+        maplibre_style:
+          'https://basemaps.cartocdn.com/gl/dark-matter-gl-style/style.json',
+        pandas_aggfunc: 'sum',
+        point_radius: 'Auto',
+        point_radius_unit: 'Pixels',
+        render_while_dragging: true,
+        viewport_latitude: 37.78,
+        viewport_longitude: -122.42,
+        viewport_zoom: 12,
+      }}
+    />
+  );
+};
+
+export const NoClustering = ({
+  width,
+  height,
+}: {
+  width: number;
+  height: number;
+}) => {
+  const theme = useTheme();
+  return (
+    <SuperChart
+      chartType="point_cluster_map"
+      width={width}
+      height={height}
+      queriesData={[{ data: generateData(theme) }]}
+      formData={{
+        clustering_radius: '0',
+        global_opacity: 0.8,
+        map_color: '#228b22',
+        map_label: [],
+        map_renderer: 'maplibre',
+        maplibre_style:
+          'https://basemaps.cartocdn.com/gl/voyager-gl-style/style.json',
+        pandas_aggfunc: 'sum',
+        point_radius: 'Auto',
+        point_radius_unit: 'Pixels',
+        render_while_dragging: true,
+        viewport_latitude: 37.78,
+        viewport_longitude: -122.42,
+        viewport_zoom: 12,
+      }}
+    />
+  );
+};
diff --git a/superset-frontend/plugins/legacy-plugin-chart-map-box/src/stories/data.ts b/superset-frontend/plugins/plugin-chart-point-cluster-map/src/stories/data.ts
similarity index 100%
rename from superset-frontend/plugins/legacy-plugin-chart-map-box/src/stories/data.ts
rename to superset-frontend/plugins/plugin-chart-point-cluster-map/src/stories/data.ts
diff --git a/superset-frontend/plugins/plugin-chart-point-cluster-map/src/transformProps.ts b/superset-frontend/plugins/plugin-chart-point-cluster-map/src/transformProps.ts
new file mode 100644
index 00000000000..04d0cae20a8
--- /dev/null
+++ b/superset-frontend/plugins/plugin-chart-point-cluster-map/src/transformProps.ts
@@ -0,0 +1,292 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+import Supercluster, {
+  type Options as SuperclusterOptions,
+} from 'supercluster';
+import { ChartProps } from '@superset-ui/core';
+import { t } from '@apache-superset/core/translation';
+import { DEFAULT_POINT_RADIUS, DEFAULT_MAX_ZOOM } from './MapLibre';
+import roundDecimal from './utils/roundDecimal';
+
+const NOOP = () => {};
+
+// Geo precision to limit decimal places (matching legacy backend behavior)
+const GEO_PRECISION = 10;
+
+const MIN_LONGITUDE = -180;
+const MAX_LONGITUDE = 180;
+const MIN_LATITUDE = -90;
+const MAX_LATITUDE = 90;
+const MIN_ZOOM = 0;
+
+function toFiniteNumber(
+  value: string | number | null | undefined,
+): number | undefined {
+  if (value === null || value === undefined) return undefined;
+  const normalizedValue = typeof value === 'string' ? value.trim() : value;
+  if (normalizedValue === '') return undefined;
+  const num = Number(normalizedValue);
+  return Number.isFinite(num) ? num : undefined;
+}
+
+function clampNumber(
+  value: number | undefined,
+  min: number,
+  max: number,
+): number | undefined {
+  if (value === undefined) return undefined;
+  return Math.min(max, Math.max(min, value));
+}
+
+interface PointProperties {
+  metric: number | string | null;
+  radius: number | string | null;
+}
+
+interface ClusterProperties {
+  metric: number;
+  sum: number;
+  squaredSum: number;
+  min: number;
+  max: number;
+}
+
+interface DataRecord {
+  [key: string]: string | number | null | undefined;
+}
+
+function buildGeoJSONFromRecords(
+  records: DataRecord[],
+  lonCol: string,
+  latCol: string,
+  labelCol: string | null,
+  pointRadiusCol: string | null,
+) {
+  const features: GeoJSON.Feature<GeoJSON.Point, PointProperties>[] = [];
+  let minLon = Infinity;
+  let maxLon = -Infinity;
+  let minLat = Infinity;
+  let maxLat = -Infinity;
+
+  for (const record of records) {
+    const rawLon = record[lonCol];
+    const rawLat = record[latCol];
+    if (rawLon == null || rawLat == null) {
+      continue;
+    }
+    const lon = Number(rawLon);
+    const lat = Number(rawLat);
+    if (!Number.isFinite(lon) || !Number.isFinite(lat)) {
+      continue;
+    }
+
+    const roundedLon = roundDecimal(lon, GEO_PRECISION);
+    const roundedLat = roundDecimal(lat, GEO_PRECISION);
+
+    minLon = Math.min(minLon, roundedLon);
+    maxLon = Math.max(maxLon, roundedLon);
+    minLat = Math.min(minLat, roundedLat);
+    maxLat = Math.max(maxLat, roundedLat);
+
+    const metric = labelCol != null ? (record[labelCol] ?? null) : null;
+    const radius =
+      pointRadiusCol != null ? (record[pointRadiusCol] ?? null) : null;
+
+    features.push({
+      type: 'Feature',
+      properties: { metric, radius },
+      geometry: {
+        type: 'Point',
+        coordinates: [roundedLon, roundedLat],
+      },
+    });
+  }
+
+  const bounds: [[number, number], [number, number]] | undefined =
+    features.length > 0
+      ? [
+          [minLon, minLat],
+          [maxLon, maxLat],
+        ]
+      : undefined;
+
+  return {
+    geoJSON: { type: 'FeatureCollection' as const, features },
+    bounds,
+  };
+}
+
+export default function transformProps(chartProps: ChartProps) {
+  const {
+    width,
+    height,
+    rawFormData: formData,
+    hooks,
+    queriesData,
+  } = chartProps;
+  const { onError = NOOP, setControlValue = NOOP } = hooks;
+
+  const {
+    all_columns_x: allColumnsX,
+    all_columns_y: allColumnsY,
+    clustering_radius: clusteringRadius,
+    global_opacity: globalOpacity,
+    map_color: maplibreColor,
+    map_label: maplibreLabel,
+    map_renderer: mapProvider,
+    maplibre_style: maplibreStyle,
+    mapbox_style: mapboxStyle = '',
+    pandas_aggfunc: pandasAggfunc,
+    point_radius: pointRadius,
+    point_radius_unit: pointRadiusUnit,
+    render_while_dragging: renderWhileDragging,
+    viewport_longitude: viewportLongitude,
+    viewport_latitude: viewportLatitude,
+    viewport_zoom: viewportZoom,
+  } = formData;
+
+  // Support two data formats:
+  // 1. Legacy/GeoJSON: queriesData[0].data is an object with { geoJSON, bounds, hasCustomMetric }
+  // 2. Tabular records: queriesData[0].data is an array of flat records from a SQL query
+  const rawData = queriesData[0]?.data;
+  const isLegacyFormat = rawData && !Array.isArray(rawData) && rawData.geoJSON;
+
+  let geoJSON: { type: 'FeatureCollection'; features: any[] };
+  let bounds: [[number, number], [number, number]] | undefined;
+  let hasCustomMetric: boolean;
+
+  if (isLegacyFormat) {
+    const legacy = rawData as any;
+    ({ geoJSON } = legacy);
+    ({ bounds } = legacy);
+    hasCustomMetric = legacy.hasCustomMetric ?? false;
+  } else {
+    const records: DataRecord[] = (rawData as DataRecord[]) || [];
+    hasCustomMetric =
+      maplibreLabel != null &&
+      maplibreLabel.length > 0 &&
+      maplibreLabel[0] !== 'count';
+    const labelCol = hasCustomMetric ? maplibreLabel[0] : null;
+    const pointRadiusCol =
+      pointRadius && pointRadius !== 'Auto' ? pointRadius : null;
+
+    const built = buildGeoJSONFromRecords(
+      records,
+      allColumnsX,
+      allColumnsY,
+      labelCol,
+      pointRadiusCol,
+    );
+    ({ geoJSON } = built);
+    ({ bounds } = built);
+  }
+
+  // Validate color — supports hex (#rrggbb) and rgb(r, g, b) formats
+  let rgb: string[] | null = null;
+  const hexMatch = /^#([0-9a-f]{2})([0-9a-f]{2})([0-9a-f]{2})$/i.exec(
+    maplibreColor,
+  );
+  if (hexMatch) {
+    rgb = [
+      maplibreColor,
+      String(parseInt(hexMatch[1], 16)),
+      String(parseInt(hexMatch[2], 16)),
+      String(parseInt(hexMatch[3], 16)),
+    ];
+  } else {
+    rgb = /^rgb\((\d{1,3}),\s*(\d{1,3}),\s*(\d{1,3})\)$/.exec(maplibreColor);
+  }
+  if (rgb === null) {
+    onError(t("Color field must be a hex color (#rrggbb) or 'rgb(r, g, b)'"));
+    // Fall back to a safe default color so the chart can still render
+    rgb = ['', '0', '0', '0'];
+  }
+
+  const opts: SuperclusterOptions<PointProperties, ClusterProperties> = {
+    maxZoom: DEFAULT_MAX_ZOOM,
+    radius: clusteringRadius,
+  };
+  if (hasCustomMetric) {
+    opts.map = (prop: PointProperties) => ({
+      metric: Number(prop.metric) || 0,
+      sum: Number(prop.metric) || 0,
+      squaredSum: (Number(prop.metric) || 0) ** 2,
+      min: Number(prop.metric) || 0,
+      max: Number(prop.metric) || 0,
+    });
+    opts.reduce = (accu: ClusterProperties, prop: ClusterProperties) => {
+      /* eslint-disable no-param-reassign */
+      accu.sum += prop.sum;
+      accu.squaredSum += prop.squaredSum;
+      accu.min = Math.min(accu.min, prop.min);
+      accu.max = Math.max(accu.max, prop.max);
+      /* eslint-enable no-param-reassign */
+    };
+  }
+  const clusterer = new Supercluster<PointProperties, ClusterProperties>(opts);
+  // Disable strict typecheck on load since Supercluster typings have namespace issues with esModuleInterop
+  clusterer.load(geoJSON.features as any);
+
+  return {
+    width,
+    height,
+    aggregatorName: pandasAggfunc,
+    bounds,
+    clusterer,
+    globalOpacity: Math.min(1, Math.max(0, toFiniteNumber(globalOpacity) ?? 1)),
+    hasCustomMetric,
+    mapProvider,
+    mapStyle:
+      mapProvider === 'mapbox'
+        ? (mapboxStyle as string)
+        : (maplibreStyle as string),
+    onViewportChange({
+      latitude,
+      longitude,
+      zoom,
+    }: {
+      latitude: number;
+      longitude: number;
+      zoom: number;
+    }) {
+      setControlValue('viewport_longitude', longitude);
+      setControlValue('viewport_latitude', latitude);
+      setControlValue('viewport_zoom', zoom);
+    },
+    pointRadius: DEFAULT_POINT_RADIUS,
+    pointRadiusUnit,
+    renderWhileDragging,
+    rgb,
+    viewportLongitude: clampNumber(
+      toFiniteNumber(viewportLongitude),
+      MIN_LONGITUDE,
+      MAX_LONGITUDE,
+    ),
+    viewportLatitude: clampNumber(
+      toFiniteNumber(viewportLatitude),
+      MIN_LATITUDE,
+      MAX_LATITUDE,
+    ),
+    viewportZoom: clampNumber(
+      toFiniteNumber(viewportZoom),
+      MIN_ZOOM,
+      DEFAULT_MAX_ZOOM,
+    ),
+  };
+}
diff --git a/superset-frontend/plugins/legacy-plugin-chart-map-box/src/utils/geo.ts b/superset-frontend/plugins/plugin-chart-point-cluster-map/src/utils/geo.ts
similarity index 100%
rename from superset-frontend/plugins/legacy-plugin-chart-map-box/src/utils/geo.ts
rename to superset-frontend/plugins/plugin-chart-point-cluster-map/src/utils/geo.ts
diff --git a/superset-frontend/plugins/legacy-plugin-chart-map-box/src/utils/luminanceFromRGB.ts b/superset-frontend/plugins/plugin-chart-point-cluster-map/src/utils/luminanceFromRGB.ts
similarity index 100%
rename from superset-frontend/plugins/legacy-plugin-chart-map-box/src/utils/luminanceFromRGB.ts
rename to superset-frontend/plugins/plugin-chart-point-cluster-map/src/utils/luminanceFromRGB.ts
diff --git a/superset-frontend/plugins/plugin-chart-point-cluster-map/src/utils/mapbox.ts b/superset-frontend/plugins/plugin-chart-point-cluster-map/src/utils/mapbox.ts
new file mode 100644
index 00000000000..b617b4c37cc
--- /dev/null
+++ b/superset-frontend/plugins/plugin-chart-point-cluster-map/src/utils/mapbox.ts
@@ -0,0 +1,35 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+export function getMapboxApiKey(): string {
+  if (typeof document === 'undefined') {
+    return '';
+  }
+  try {
+    const appContainer = document.getElementById('app');
+    const dataBootstrap = appContainer?.getAttribute('data-bootstrap');
+    if (dataBootstrap) {
+      const bootstrapData = JSON.parse(dataBootstrap);
+      return bootstrapData?.common?.conf?.MAPBOX_API_KEY || '';
+    }
+  } catch {
+    // If bootstrap data is unavailable or malformed, return empty string
+  }
+  return '';
+}
diff --git a/superset-frontend/plugins/legacy-plugin-chart-map-box/src/utils/roundDecimal.ts b/superset-frontend/plugins/plugin-chart-point-cluster-map/src/utils/roundDecimal.ts
similarity index 100%
rename from superset-frontend/plugins/legacy-plugin-chart-map-box/src/utils/roundDecimal.ts
rename to superset-frontend/plugins/plugin-chart-point-cluster-map/src/utils/roundDecimal.ts
diff --git a/superset-frontend/plugins/plugin-chart-point-cluster-map/test/MapLibre.test.tsx b/superset-frontend/plugins/plugin-chart-point-cluster-map/test/MapLibre.test.tsx
new file mode 100644
index 00000000000..7c636e1bcd1
--- /dev/null
+++ b/superset-frontend/plugins/plugin-chart-point-cluster-map/test/MapLibre.test.tsx
@@ -0,0 +1,262 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { type ReactNode } from 'react';
+import { render } from '@testing-library/react';
+
+// Capture the most recent viewport props passed to the Map component
+let lastMapProps: Record<string, unknown> = {};
+const mockFitBounds = jest.fn();
+
+jest.mock('react-map-gl/maplibre', () => {
+  const MockMap = (props: Record<string, unknown>) => {
+    lastMapProps = props;
+    return <div data-testid="map-gl">{props.children as ReactNode}</div>;
+  };
+  return { __esModule: true, Map: MockMap };
+});
+
+jest.mock('react-map-gl/mapbox', () => {
+  const MockMap = (props: Record<string, unknown>) => {
+    lastMapProps = props;
+    return <div data-testid="map-gl">{props.children as ReactNode}</div>;
+  };
+  return { __esModule: true, Map: MockMap };
+});
+
+jest.mock('@math.gl/web-mercator', () => ({
+  WebMercatorViewport: jest
+    .fn()
+    .mockImplementation(
+      ({ width, height }: { width: number; height: number }) => ({
+        fitBounds: (bounds: [[number, number], [number, number]]) =>
+          mockFitBounds(bounds, width, height),
+      }),
+    ),
+}));
+
+jest.mock('../src/components/ScatterPlotOverlay', () => {
+  const MockOverlay = (props: Record<string, unknown>) => (
+    <div data-testid="scatter-overlay" data-opacity={props.globalOpacity} />
+  );
+  return { __esModule: true, default: MockOverlay };
+});
+
+jest.mock('@apache-superset/core/theme', () => ({
+  useTheme: () => ({ colorTextSecondary: '#666' }),
+}));
+
+jest.mock('maplibre-gl/dist/maplibre-gl.css', () => ({}));
+jest.mock('../src/MapLibre.css', () => ({}));
+
+// eslint-disable-next-line import/first
+import MapLibre from '../src/MapLibre';
+
+const defaultProps = {
+  width: 800,
+  height: 600,
+  clusterer: {
+    getClusters: jest.fn().mockReturnValue([]),
+  },
+  globalOpacity: 1,
+  mapProvider: 'maplibre',
+  mapStyle: 'https://tiles.openfreemap.org/styles/liberty',
+  pointRadius: 60,
+  pointRadiusUnit: 'Pixels',
+  renderWhileDragging: true,
+  rgb: ['', 255, 0, 0] as (string | number)[],
+  hasCustomMetric: false,
+  bounds: [
+    [-74.0, 40.7],
+    [-73.9, 40.8],
+  ] as [[number, number], [number, number]],
+  onViewportChange: jest.fn(),
+};
+
+beforeEach(() => {
+  lastMapProps = {};
+  jest.clearAllMocks();
+  mockFitBounds.mockImplementation(
+    (
+      bounds: [[number, number], [number, number]],
+      width: number,
+      height: number,
+    ) => ({
+      latitude: Number(((bounds[0][1] + bounds[1][1]) / 2).toFixed(2)),
+      longitude: Number(((bounds[0][0] + bounds[1][0]) / 2).toFixed(2)),
+      zoom: Number((10 + width / 1000 + height / 10000).toFixed(2)),
+    }),
+  );
+});
+
+test('initializes viewport from bounds', () => {
+  render(<MapLibre {...defaultProps} />);
+  expect(lastMapProps.longitude).toBe(-73.95);
+  expect(lastMapProps.latitude).toBe(40.75);
+  expect(lastMapProps.zoom).toBe(10.86);
+});
+
+test('initializes viewport from props when provided', () => {
+  render(
+    <MapLibre
+      {...defaultProps}
+      viewportLongitude={-122.4}
+      viewportLatitude={37.8}
+      viewportZoom={5}
+    />,
+  );
+  expect(lastMapProps.longitude).toBe(-122.4);
+  expect(lastMapProps.latitude).toBe(37.8);
+  expect(lastMapProps.zoom).toBe(5);
+});
+
+test('updates viewport when viewport props change', () => {
+  const { rerender } = render(
+    <MapLibre
+      {...defaultProps}
+      viewportLongitude={-73.95}
+      viewportLatitude={40.75}
+      viewportZoom={10}
+    />,
+  );
+
+  rerender(
+    <MapLibre
+      {...defaultProps}
+      viewportLongitude={-122.4}
+      viewportLatitude={37.8}
+      viewportZoom={5}
+    />,
+  );
+
+  expect(lastMapProps.longitude).toBe(-122.4);
+  expect(lastMapProps.latitude).toBe(37.8);
+  expect(lastMapProps.zoom).toBe(5);
+});
+
+test('does not loop when viewport state matches new props', () => {
+  const { rerender } = render(
+    <MapLibre
+      {...defaultProps}
+      viewportLongitude={-73.95}
+      viewportLatitude={40.75}
+      viewportZoom={10}
+    />,
+  );
+
+  rerender(
+    <MapLibre
+      {...defaultProps}
+      viewportLongitude={-73.95}
+      viewportLatitude={40.75}
+      viewportZoom={10}
+    />,
+  );
+
+  expect(lastMapProps.longitude).toBe(-73.95);
+  expect(lastMapProps.latitude).toBe(40.75);
+  expect(lastMapProps.zoom).toBe(10);
+});
+
+test('passes globalOpacity to ScatterPlotOverlay', () => {
+  const { container } = render(
+    <MapLibre {...defaultProps} globalOpacity={0.5} />,
+  );
+  const overlay = container.querySelector('[data-testid="scatter-overlay"]');
+  expect(overlay).not.toBeNull();
+  expect(overlay!.getAttribute('data-opacity')).toBe('0.5');
+});
+
+test('handles undefined bounds gracefully', () => {
+  render(<MapLibre {...defaultProps} bounds={undefined} />);
+  expect(lastMapProps.longitude).toBe(0);
+  expect(lastMapProps.latitude).toBe(0);
+  expect(lastMapProps.zoom).toBe(1);
+});
+
+test('applies partial viewport props on update', () => {
+  const { rerender } = render(<MapLibre {...defaultProps} />);
+
+  rerender(<MapLibre {...defaultProps} viewportLongitude={-122.4} />);
+
+  expect(lastMapProps.longitude).toBe(-122.4);
+  // lat and zoom come from fitBounds
+  expect(lastMapProps.latitude).toBe(40.75);
+  expect(lastMapProps.zoom).toBe(10.86);
+});
+
+test('restores fitBounds when viewport props are cleared', () => {
+  const { rerender } = render(
+    <MapLibre
+      {...defaultProps}
+      viewportLongitude={-122.4}
+      viewportLatitude={37.8}
+      viewportZoom={5}
+    />,
+  );
+
+  // Clear all viewport props
+  rerender(<MapLibre {...defaultProps} />);
+
+  // Should revert to fitBounds values
+  expect(lastMapProps.longitude).toBe(-73.95);
+  expect(lastMapProps.latitude).toBe(40.75);
+  expect(lastMapProps.zoom).toBe(10.86);
+});
+
+test('restores only cleared viewport props, keeps the rest', () => {
+  const { rerender } = render(
+    <MapLibre
+      {...defaultProps}
+      viewportLongitude={-122.4}
+      viewportLatitude={37.8}
+      viewportZoom={5}
+    />,
+  );
+
+  // Clear only longitude, keep lat/zoom
+  rerender(
+    <MapLibre {...defaultProps} viewportLatitude={37.8} viewportZoom={5} />,
+  );
+
+  // Longitude reverts to fitBounds, lat/zoom stay
+  expect(lastMapProps.longitude).toBe(-73.95);
+  expect(lastMapProps.latitude).toBe(37.8);
+  expect(lastMapProps.zoom).toBe(5);
+});
+
+test('falls back to default viewport when cleared with undefined bounds', () => {
+  const { rerender } = render(
+    <MapLibre
+      {...defaultProps}
+      bounds={undefined}
+      viewportLongitude={-122.4}
+      viewportLatitude={37.8}
+      viewportZoom={5}
+    />,
+  );
+
+  // Clear viewport props — no bounds to fitBounds to
+  rerender(<MapLibre {...defaultProps} bounds={undefined} />);
+
+  // Should fall back to {0, 0, 1}
+  expect(lastMapProps.longitude).toBe(0);
+  expect(lastMapProps.latitude).toBe(0);
+  expect(lastMapProps.zoom).toBe(1);
+});
diff --git a/superset-frontend/plugins/plugin-chart-point-cluster-map/test/ScatterPlotOverlay.test.tsx b/superset-frontend/plugins/plugin-chart-point-cluster-map/test/ScatterPlotOverlay.test.tsx
new file mode 100644
index 00000000000..cafa91aaeba
--- /dev/null
+++ b/superset-frontend/plugins/plugin-chart-point-cluster-map/test/ScatterPlotOverlay.test.tsx
@@ -0,0 +1,889 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { render } from '@testing-library/react';
+import ScatterPlotOverlay from '../src/components/ScatterPlotOverlay';
+import {
+  MIN_CLUSTER_RADIUS_RATIO,
+  MAX_POINT_RADIUS_RATIO,
+} from '../src/components/ScatterPlotOverlay';
+
+type MockGradient = {
+  addColorStop: jest.Mock<void, [number, string]>;
+};
+
+type MockCanvasContext = {
+  clearRect: jest.Mock<void, [number, number, number, number]>;
+  beginPath: jest.Mock<void, []>;
+  arc: jest.Mock<void, [number, number, number, number, number]>;
+  fill: jest.Mock<void, []>;
+  fillText: jest.Mock<void, [string, number, number]>;
+  measureText: jest.Mock<{ width: number }, [string]>;
+  createRadialGradient: jest.Mock<
+    MockGradient,
+    [number, number, number, number, number, number]
+  >;
+  globalCompositeOperation: string;
+  fillStyle: string | CanvasGradient;
+  font: string;
+  textAlign: CanvasTextAlign;
+  textBaseline: CanvasTextBaseline;
+  shadowBlur: number;
+  shadowColor: string;
+};
+
+type LocationProperties = Record<
+  string,
+  number | string | boolean | null | undefined
+>;
+
+type TestLocation = {
+  geometry: { coordinates: [number, number] };
+  properties: LocationProperties;
+};
+
+type MockRedrawParams = {
+  width: number;
+  height: number;
+  ctx: MockCanvasContext;
+  isDragging: boolean;
+  project: (lngLat: [number, number]) => [number, number];
+};
+
+declare global {
+  // eslint-disable-next-line no-var
+  var mockRedraw: unknown;
+}
+
+// Mock the CanvasOverlay component to capture the redraw function
+jest.mock('../src/components/CanvasOverlay', () => ({
+  __esModule: true,
+  default: ({ redraw }: { redraw: unknown }) => {
+    global.mockRedraw = redraw;
+    return <div data-testid="canvas-overlay" />;
+  },
+}));
+
+jest.mock('../src/utils/luminanceFromRGB', () => ({
+  __esModule: true,
+  default: jest.fn(() => 150),
+}));
+
+const createMockCanvas = () => {
+  const ctx: MockCanvasContext = {
+    clearRect: jest.fn(),
+    beginPath: jest.fn(),
+    arc: jest.fn(),
+    fill: jest.fn(),
+    fillText: jest.fn(),
+    measureText: jest.fn((_: string) => ({ width: 10 })),
+    createRadialGradient: jest.fn(
+      (
+        _x0: number,
+        _y0: number,
+        _r0: number,
+        _x1: number,
+        _y1: number,
+        _r1: number,
+      ) => ({
+        addColorStop: jest.fn<void, [number, string]>(),
+      }),
+    ),
+    globalCompositeOperation: '',
+    fillStyle: '',
+    font: '',
+    textAlign: 'center',
+    textBaseline: 'middle',
+    shadowBlur: 0,
+    shadowColor: '',
+  };
+
+  return ctx;
+};
+
+const createMockRedrawParams = (
+  overrides: Partial<MockRedrawParams> = {},
+): MockRedrawParams => ({
+  width: 800,
+  height: 600,
+  ctx: createMockCanvas(),
+  isDragging: false,
+  project: (lngLat: [number, number]) => lngLat,
+  ...overrides,
+});
+
+const createLocation = (
+  coordinates: [number, number],
+  properties: LocationProperties,
+): TestLocation => ({
+  geometry: { coordinates },
+  properties,
+});
+
+const triggerRedraw = (
+  overrides: Partial<MockRedrawParams> = {},
+): MockRedrawParams => {
+  const redrawParams = createMockRedrawParams(overrides);
+  if (typeof global.mockRedraw !== 'function') {
+    throw new Error('CanvasOverlay redraw callback was not registered');
+  }
+  (global.mockRedraw as (params: MockRedrawParams) => void)(redrawParams);
+  return redrawParams;
+};
+
+const defaultProps = {
+  lngLatAccessor: (loc: TestLocation) => loc.geometry.coordinates,
+  dotRadius: 60,
+  rgb: ['', 255, 0, 0] as [string, number, number, number],
+  globalOpacity: 1,
+};
+const MIN_VISIBLE_POINT_RADIUS =
+  defaultProps.dotRadius * MIN_CLUSTER_RADIUS_RATIO;
+const MAX_VISIBLE_POINT_RADIUS =
+  defaultProps.dotRadius * MAX_POINT_RADIUS_RATIO;
+
+test('renders map with varying radius values in Pixels mode', () => {
+  const locations = [
+    createLocation([100, 100], { radius: 10, cluster: false }),
+    createLocation([200, 200], { radius: 50, cluster: false }),
+    createLocation([300, 300], { radius: 100, cluster: false }),
+  ];
+
+  render(
+    <ScatterPlotOverlay
+      {...defaultProps}
+      locations={locations}
+      pointRadiusUnit="Pixels"
+    />,
+  );
+  const redrawParams = triggerRedraw();
+
+  const arcCalls = redrawParams.ctx.arc.mock.calls;
+
+  arcCalls.forEach(call => {
+    expect(call[2]).toBeGreaterThanOrEqual(MIN_VISIBLE_POINT_RADIUS);
+    expect(call[2]).toBeLessThanOrEqual(MAX_VISIBLE_POINT_RADIUS);
+  });
+
+  expect(arcCalls[0][2]).toBeLessThan(arcCalls[1][2]);
+  expect(arcCalls[1][2]).toBeLessThan(arcCalls[2][2]);
+});
+
+test('handles dataset with uniform radius values', () => {
+  const locations = [
+    createLocation([100, 100], { radius: 50, cluster: false }),
+    createLocation([200, 200], { radius: 50, cluster: false }),
+    createLocation([300, 300], { radius: 50, cluster: false }),
+  ];
+
+  expect(() => {
+    render(
+      <ScatterPlotOverlay
+        {...defaultProps}
+        locations={locations}
+        pointRadiusUnit="Pixels"
+      />,
+    );
+    triggerRedraw();
+  }).not.toThrow();
+});
+
+test('renders successfully when data contains non-finite values', () => {
+  const locations = [
+    createLocation([100, 100], { radius: 10, cluster: false }),
+    createLocation([200, 200], { radius: NaN, cluster: false }),
+    createLocation([300, 300], { radius: 100, cluster: false }),
+  ];
+
+  expect(() => {
+    render(
+      <ScatterPlotOverlay
+        {...defaultProps}
+        locations={locations}
+        pointRadiusUnit="Pixels"
+      />,
+    );
+    triggerRedraw();
+  }).not.toThrow();
+});
+
+test('handles radius values provided as strings', () => {
+  const locations = [
+    createLocation([100, 100], { radius: '10', cluster: false }),
+    createLocation([200, 200], { radius: '50', cluster: false }),
+    createLocation([300, 300], { radius: '100', cluster: false }),
+  ];
+
+  render(
+    <ScatterPlotOverlay
+      {...defaultProps}
+      locations={locations}
+      pointRadiusUnit="Pixels"
+    />,
+  );
+  const redrawParams = triggerRedraw();
+
+  const arcCalls = redrawParams.ctx.arc.mock.calls;
+
+  arcCalls.forEach(call => {
+    expect(call[2]).toBeGreaterThanOrEqual(MIN_VISIBLE_POINT_RADIUS);
+    expect(call[2]).toBeLessThanOrEqual(MAX_VISIBLE_POINT_RADIUS);
+  });
+
+  expect(arcCalls[0][2]).toBeLessThan(arcCalls[1][2]);
+  expect(arcCalls[1][2]).toBeLessThan(arcCalls[2][2]);
+});
+
+test('treats blank radius strings as missing values', () => {
+  const locations = [
+    createLocation([100, 100], { radius: '', cluster: false }),
+    createLocation([200, 200], { radius: '   ', cluster: false }),
+    createLocation([300, 300], { radius: '100', cluster: false }),
+  ];
+
+  render(
+    <ScatterPlotOverlay
+      {...defaultProps}
+      locations={locations}
+      pointRadiusUnit="Pixels"
+    />,
+  );
+  const redrawParams = triggerRedraw();
+
+  const arcCalls = redrawParams.ctx.arc.mock.calls;
+
+  expect(arcCalls[0][2]).toBe(MIN_VISIBLE_POINT_RADIUS);
+  expect(arcCalls[1][2]).toBe(MIN_VISIBLE_POINT_RADIUS);
+  expect(arcCalls[2][2]).toBe(15);
+});
+
+test('renders points when radius values are missing', () => {
+  const locations = [
+    createLocation([100, 100], { radius: null, cluster: false }),
+    createLocation([200, 200], { radius: undefined, cluster: false }),
+    createLocation([300, 300], { cluster: false }),
+  ];
+
+  expect(() => {
+    render(
+      <ScatterPlotOverlay
+        {...defaultProps}
+        locations={locations}
+        pointRadiusUnit="Pixels"
+      />,
+    );
+    triggerRedraw();
+  }).not.toThrow();
+});
+
+test('renders both cluster and non-cluster points correctly', () => {
+  const locations = [
+    createLocation([100, 100], { radius: 10, cluster: false }),
+    createLocation([200, 200], {
+      radius: 999,
+      cluster: true,
+      point_count: 5,
+      sum: 100,
+    }),
+    createLocation([300, 300], { radius: 100, cluster: false }),
+  ];
+
+  expect(() => {
+    render(
+      <ScatterPlotOverlay
+        {...defaultProps}
+        locations={locations}
+        pointRadiusUnit="Pixels"
+      />,
+    );
+    triggerRedraw();
+  }).not.toThrow();
+});
+
+test('renders map with multiple points with different radius values', () => {
+  const locations = [
+    createLocation([100, 100], { radius: 10, cluster: false }),
+    createLocation([200, 200], { radius: 42.567, cluster: false }),
+    createLocation([300, 300], { radius: 100, cluster: false }),
+  ];
+
+  expect(() => {
+    render(
+      <ScatterPlotOverlay
+        {...defaultProps}
+        locations={locations}
+        pointRadiusUnit="Pixels"
+      />,
+    );
+    triggerRedraw();
+  }).not.toThrow();
+});
+
+test('renders map with Kilometers mode', () => {
+  const locations = [
+    createLocation([100, 50], { radius: 10, cluster: false }),
+    createLocation([200, 50], { radius: 5, cluster: false }),
+  ];
+
+  expect(() => {
+    render(
+      <ScatterPlotOverlay
+        {...defaultProps}
+        locations={locations}
+        pointRadiusUnit="Kilometers"
+        zoom={10}
+      />,
+    );
+    triggerRedraw();
+  }).not.toThrow();
+});
+
+test('renders map with Miles mode', () => {
+  const locations = [
+    createLocation([100, 50], { radius: 5, cluster: false }),
+    createLocation([200, 50], { radius: 10, cluster: false }),
+  ];
+
+  expect(() => {
+    render(
+      <ScatterPlotOverlay
+        {...defaultProps}
+        locations={locations}
+        pointRadiusUnit="Miles"
+        zoom={10}
+      />,
+    );
+    triggerRedraw();
+  }).not.toThrow();
+});
+
+test('displays metric property labels on points', () => {
+  const locations = [
+    createLocation([100, 100], { radius: 50, metric: 123.456, cluster: false }),
+  ];
+
+  expect(() => {
+    render(
+      <ScatterPlotOverlay
+        {...defaultProps}
+        locations={locations}
+        pointRadiusUnit="Pixels"
+      />,
+    );
+    triggerRedraw();
+  }).not.toThrow();
+});
+
+test('handles empty dataset without errors', () => {
+  expect(() => {
+    render(
+      <ScatterPlotOverlay
+        {...defaultProps}
+        locations={[]}
+        pointRadiusUnit="Pixels"
+      />,
+    );
+    triggerRedraw();
+  }).not.toThrow();
+});
+
+test('handles extreme outlier radius values without breaking', () => {
+  const locations = [
+    createLocation([100, 100], { radius: 1, cluster: false }),
+    createLocation([200, 200], { radius: 50, cluster: false }),
+    createLocation([300, 300], { radius: 999999, cluster: false }),
+  ];
+
+  expect(() => {
+    render(
+      <ScatterPlotOverlay
+        {...defaultProps}
+        locations={locations}
+        pointRadiusUnit="Pixels"
+      />,
+    );
+    triggerRedraw();
+  }).not.toThrow();
+});
+
+test('renders successfully with mixed extreme and negative radius values', () => {
+  const locations = [
+    createLocation([100, 100], { radius: 0.001, cluster: false }),
+    createLocation([150, 150], { radius: 5, cluster: false }),
+    createLocation([200, 200], { radius: 100, cluster: false }),
+    createLocation([250, 250], { radius: 50000, cluster: false }),
+    createLocation([300, 300], { radius: -10, cluster: false }),
+  ];
+
+  expect(() => {
+    render(
+      <ScatterPlotOverlay
+        {...defaultProps}
+        locations={locations}
+        pointRadiusUnit="Pixels"
+      />,
+    );
+  }).not.toThrow();
+
+  expect(() => {
+    triggerRedraw();
+  }).not.toThrow();
+});
+
+test('cluster radius is always >= max individual point radius in Pixels mode', () => {
+  const locations = [
+    createLocation([100, 100], {
+      cluster: true,
+      point_count: 2,
+      sum: 1,
+    }),
+    createLocation([200, 200], { cluster: false, radius: 1 }),
+    createLocation([300, 300], { cluster: false, radius: 100 }),
+  ];
+
+  render(
+    <ScatterPlotOverlay
+      {...defaultProps}
+      locations={locations}
+      aggregation="sum"
+      pointRadiusUnit="Pixels"
+    />,
+  );
+  const redrawParams = triggerRedraw();
+
+  const arcCalls = redrawParams.ctx.arc.mock.calls;
+
+  expect(arcCalls[0][2]).toBeGreaterThanOrEqual(MAX_VISIBLE_POINT_RADIUS);
+  expect(arcCalls[1][2]).toBe(MIN_VISIBLE_POINT_RADIUS);
+  expect(arcCalls[2][2]).toBe(MAX_VISIBLE_POINT_RADIUS);
+  expect(arcCalls[0][2]).toBeGreaterThanOrEqual(arcCalls[2][2]);
+});
+
+test('largest cluster gets full dotRadius', () => {
+  const locations = [
+    createLocation([100, 100], {
+      cluster: true,
+      point_count: 10,
+      sum: 50,
+    }),
+    createLocation([200, 200], {
+      cluster: true,
+      point_count: 50,
+      sum: 100,
+    }),
+  ];
+
+  render(
+    <ScatterPlotOverlay
+      {...defaultProps}
+      locations={locations}
+      aggregation="sum"
+      pointRadiusUnit="Pixels"
+    />,
+  );
+  const redrawParams = triggerRedraw();
+
+  const arcCalls = redrawParams.ctx.arc.mock.calls;
+  expect(arcCalls[1][2]).toBe(defaultProps.dotRadius);
+});
+
+test('cluster radii preserve proportional ordering', () => {
+  const locations = [
+    createLocation([100, 100], {
+      cluster: true,
+      point_count: 5,
+      sum: 10,
+    }),
+    createLocation([200, 200], {
+      cluster: true,
+      point_count: 25,
+      sum: 50,
+    }),
+    createLocation([300, 300], {
+      cluster: true,
+      point_count: 50,
+      sum: 100,
+    }),
+  ];
+
+  render(
+    <ScatterPlotOverlay
+      {...defaultProps}
+      locations={locations}
+      aggregation="sum"
+      pointRadiusUnit="Pixels"
+    />,
+  );
+  const redrawParams = triggerRedraw();
+
+  const arcCalls = redrawParams.ctx.arc.mock.calls;
+  const r10 = arcCalls[0][2];
+  const r50 = arcCalls[1][2];
+  const r100 = arcCalls[2][2];
+
+  expect(r10).toBeLessThan(r50);
+  expect(r50).toBeLessThan(r100);
+});
+
+test('negative cluster label produces valid finite radius', () => {
+  const locations = [
+    createLocation([100, 100], {
+      cluster: true,
+      point_count: 3,
+      sum: -5,
+    }),
+  ];
+
+  render(
+    <ScatterPlotOverlay
+      {...defaultProps}
+      locations={locations}
+      aggregation="sum"
+    />,
+  );
+  const redrawParams = triggerRedraw();
+
+  const arcCalls = redrawParams.ctx.arc.mock.calls;
+  const radiusValue = arcCalls[0][2];
+  expect(Number.isFinite(radiusValue)).toBe(true);
+  expect(radiusValue).toBeGreaterThanOrEqual(MIN_VISIBLE_POINT_RADIUS);
+});
+
+test('ignores non-finite cluster labels when computing cluster scaling bounds', () => {
+  const locations = [
+    createLocation([100, 100], {
+      cluster: true,
+      point_count: 3,
+      sum: 'invalid',
+    }),
+    createLocation([200, 200], {
+      cluster: true,
+      point_count: 3,
+      sum: 100,
+    }),
+  ];
+
+  render(
+    <ScatterPlotOverlay
+      {...defaultProps}
+      locations={locations}
+      aggregation="sum"
+      pointRadiusUnit="Pixels"
+    />,
+  );
+  const redrawParams = triggerRedraw();
+
+  const arcCalls = redrawParams.ctx.arc.mock.calls;
+
+  expect(arcCalls[0][2]).toBeGreaterThanOrEqual(MAX_VISIBLE_POINT_RADIUS);
+  expect(arcCalls[1][2]).toBe(defaultProps.dotRadius);
+});
+
+test('single cluster with small maxLabel gets full dotRadius', () => {
+  const locations = [
+    createLocation([100, 100], {
+      cluster: true,
+      point_count: 1,
+      sum: 1,
+    }),
+  ];
+
+  render(
+    <ScatterPlotOverlay
+      {...defaultProps}
+      locations={locations}
+      aggregation="sum"
+    />,
+  );
+  const redrawParams = triggerRedraw();
+
+  const arcCalls = redrawParams.ctx.arc.mock.calls;
+  expect(arcCalls[0][2]).toBe(defaultProps.dotRadius);
+});
+
+test('all-negative cluster labels produce differentiated radii by magnitude', () => {
+  const locations = [
+    createLocation([100, 100], {
+      cluster: true,
+      point_count: 3,
+      sum: -100,
+    }),
+    createLocation([200, 200], {
+      cluster: true,
+      point_count: 3,
+      sum: -10,
+    }),
+    createLocation([300, 300], {
+      cluster: true,
+      point_count: 3,
+      sum: -1,
+    }),
+  ];
+
+  render(
+    <ScatterPlotOverlay
+      {...defaultProps}
+      locations={locations}
+      aggregation="sum"
+    />,
+  );
+  const redrawParams = triggerRedraw();
+
+  const arcCalls = redrawParams.ctx.arc.mock.calls;
+  const rNeg100 = arcCalls[0][2];
+  const rNeg10 = arcCalls[1][2];
+  const rNeg1 = arcCalls[2][2];
+
+  expect(rNeg1).toBeLessThan(rNeg10);
+  expect(rNeg10).toBeLessThan(rNeg100);
+  expect(Number.isFinite(rNeg100)).toBe(true);
+  expect(Number.isFinite(rNeg10)).toBe(true);
+  expect(Number.isFinite(rNeg1)).toBe(true);
+  expect(rNeg1).toBeGreaterThanOrEqual(MIN_VISIBLE_POINT_RADIUS);
+  expect(rNeg100).toBe(defaultProps.dotRadius);
+});
+
+test('mixed positive-and-negative cluster labels size by magnitude', () => {
+  const locations = [
+    createLocation([100, 100], {
+      cluster: true,
+      point_count: 3,
+      sum: -50,
+    }),
+    createLocation([200, 200], {
+      cluster: true,
+      point_count: 3,
+      sum: 0,
+    }),
+    createLocation([300, 300], {
+      cluster: true,
+      point_count: 3,
+      sum: 100,
+    }),
+  ];
+
+  render(
+    <ScatterPlotOverlay
+      {...defaultProps}
+      locations={locations}
+      aggregation="sum"
+    />,
+  );
+  const redrawParams = triggerRedraw();
+
+  const arcCalls = redrawParams.ctx.arc.mock.calls;
+  const rNeg50 = arcCalls[0][2];
+  const rZero = arcCalls[1][2];
+  const r100 = arcCalls[2][2];
+
+  expect(rZero).toBeLessThan(rNeg50);
+  expect(rNeg50).toBeLessThan(r100);
+  expect(rZero).toBeGreaterThanOrEqual(MIN_VISIBLE_POINT_RADIUS);
+  expect(r100).toBe(defaultProps.dotRadius);
+});
+
+test('all-identical negative labels get equal full radii', () => {
+  const locations = [
+    createLocation([100, 100], {
+      cluster: true,
+      point_count: 3,
+      sum: -5,
+    }),
+    createLocation([200, 200], {
+      cluster: true,
+      point_count: 3,
+      sum: -5,
+    }),
+    createLocation([300, 300], {
+      cluster: true,
+      point_count: 3,
+      sum: -5,
+    }),
+  ];
+
+  render(
+    <ScatterPlotOverlay
+      {...defaultProps}
+      locations={locations}
+      aggregation="sum"
+    />,
+  );
+  const redrawParams = triggerRedraw();
+
+  const arcCalls = redrawParams.ctx.arc.mock.calls;
+  const r1 = arcCalls[0][2];
+  const r2 = arcCalls[1][2];
+  const r3 = arcCalls[2][2];
+
+  expect(r1).toBe(r2);
+  expect(r2).toBe(r3);
+  expect(r1).toBe(defaultProps.dotRadius);
+});
+
+test('single negative cluster gets full radius', () => {
+  const locations = [
+    createLocation([100, 100], {
+      cluster: true,
+      point_count: 3,
+      sum: -5,
+    }),
+  ];
+
+  render(
+    <ScatterPlotOverlay
+      {...defaultProps}
+      locations={locations}
+      aggregation="sum"
+    />,
+  );
+  const redrawParams = triggerRedraw();
+
+  const arcCalls = redrawParams.ctx.arc.mock.calls;
+  expect(arcCalls[0][2]).toBe(defaultProps.dotRadius);
+});
+
+test('large negative cluster labels are abbreviated', () => {
+  const locations = [
+    createLocation([100, 100], {
+      cluster: true,
+      point_count: 3,
+      sum: -50000,
+    }),
+  ];
+
+  render(
+    <ScatterPlotOverlay
+      {...defaultProps}
+      locations={locations}
+      aggregation="sum"
+    />,
+  );
+  const redrawParams = triggerRedraw();
+
+  const fillTextCalls = redrawParams.ctx.fillText.mock.calls;
+  const labelArg = fillTextCalls[0][0];
+  expect(labelArg).toBe('-50k');
+});
+
+test.each([
+  ['sum', [{ sum: -100 }, { sum: -10 }, { sum: -1 }]],
+  ['min', [{ min: -100 }, { min: -10 }, { min: -1 }]],
+  ['max', [{ max: -100 }, { max: -10 }, { max: -1 }]],
+  ['mean', [{ sum: -300 }, { sum: -30 }, { sum: -3 }]],
+])(
+  'negative %s cluster labels preserve magnitude-based ordering',
+  (aggregation, labelProps) => {
+    const locations = [
+      createLocation([100, 100], {
+        cluster: true,
+        point_count: 3,
+        ...labelProps[0],
+      }),
+      createLocation([200, 200], {
+        cluster: true,
+        point_count: 3,
+        ...labelProps[1],
+      }),
+      createLocation([300, 300], {
+        cluster: true,
+        point_count: 3,
+        ...labelProps[2],
+      }),
+    ];
+
+    render(
+      <ScatterPlotOverlay
+        {...defaultProps}
+        locations={locations}
+        aggregation={aggregation}
+      />,
+    );
+    const redrawParams = triggerRedraw();
+
+    const arcCalls = redrawParams.ctx.arc.mock.calls;
+    const largestRadius = arcCalls[0][2];
+    const middleRadius = arcCalls[1][2];
+    const smallestRadius = arcCalls[2][2];
+
+    expect(smallestRadius).toBeLessThan(middleRadius);
+    expect(middleRadius).toBeLessThan(largestRadius);
+    expect(largestRadius).toBe(defaultProps.dotRadius);
+  },
+);
+
+test('zero-value cluster is visible with minimum radius', () => {
+  const locations = [
+    createLocation([100, 100], {
+      cluster: true,
+      point_count: 5,
+      sum: 0,
+    }),
+    createLocation([200, 200], {
+      cluster: true,
+      point_count: 10,
+      sum: 100,
+    }),
+  ];
+
+  render(
+    <ScatterPlotOverlay
+      {...defaultProps}
+      locations={locations}
+      aggregation="sum"
+      pointRadiusUnit="Pixels"
+    />,
+  );
+  const redrawParams = triggerRedraw();
+
+  const arcCalls = redrawParams.ctx.arc.mock.calls;
+  const zeroClusterRadius = arcCalls[0][2];
+
+  expect(Number.isFinite(zeroClusterRadius)).toBe(true);
+  expect(zeroClusterRadius).toBeGreaterThanOrEqual(MAX_VISIBLE_POINT_RADIUS);
+});
+
+test('all-zero clusters use a finite radius', () => {
+  const locations = [
+    createLocation([100, 100], {
+      cluster: true,
+      point_count: 5,
+      sum: 0,
+    }),
+    createLocation([200, 200], {
+      cluster: true,
+      point_count: 10,
+      sum: 0,
+    }),
+  ];
+
+  render(
+    <ScatterPlotOverlay
+      {...defaultProps}
+      locations={locations}
+      aggregation="sum"
+      pointRadiusUnit="Pixels"
+    />,
+  );
+  const redrawParams = triggerRedraw();
+
+  redrawParams.ctx.arc.mock.calls.forEach(call => {
+    expect(Number.isFinite(call[2])).toBe(true);
+    expect(call[2]).toBeGreaterThanOrEqual(MAX_VISIBLE_POINT_RADIUS);
+  });
+});
diff --git a/superset-frontend/plugins/legacy-plugin-chart-map-box/test/controlPanel.test.ts b/superset-frontend/plugins/plugin-chart-point-cluster-map/test/controlPanel.test.ts
similarity index 100%
rename from superset-frontend/plugins/legacy-plugin-chart-map-box/test/controlPanel.test.ts
rename to superset-frontend/plugins/plugin-chart-point-cluster-map/test/controlPanel.test.ts
diff --git a/superset-frontend/plugins/legacy-plugin-chart-map-box/test/transformProps.test.ts b/superset-frontend/plugins/plugin-chart-point-cluster-map/test/transformProps.test.ts
similarity index 75%
rename from superset-frontend/plugins/legacy-plugin-chart-map-box/test/transformProps.test.ts
rename to superset-frontend/plugins/plugin-chart-point-cluster-map/test/transformProps.test.ts
index 483f64963dc..dc5a460c5f9 100644
--- a/superset-frontend/plugins/legacy-plugin-chart-map-box/test/transformProps.test.ts
+++ b/superset-frontend/plugins/plugin-chart-point-cluster-map/test/transformProps.test.ts
@@ -42,19 +42,23 @@ type TransformPropsResult = {
   viewportLongitude?: number;
   viewportLatitude?: number;
   viewportZoom?: number;
+  rgb?: string[] | null;
 };
 
 const baseFormData = {
-  clusteringRadius: 60,
-  globalOpacity: 0.8,
-  mapboxColor: 'rgb(0, 139, 139)',
-  mapboxStyle: 'mapbox://styles/mapbox/light-v9',
-  pandasAggfunc: 'sum',
-  pointRadiusUnit: 'Pixels',
-  renderWhileDragging: true,
-  viewportLongitude: -73.935242,
-  viewportLatitude: 40.73061,
-  viewportZoom: 9,
+  all_columns_x: 'lon',
+  all_columns_y: 'lat',
+  clustering_radius: 60,
+  global_opacity: 0.8,
+  map_color: 'rgb(0, 139, 139)',
+  map_renderer: 'maplibre',
+  maplibre_style: 'https://tiles.openfreemap.org/styles/liberty',
+  pandas_aggfunc: 'sum',
+  point_radius_unit: 'Pixels',
+  render_while_dragging: true,
+  viewport_longitude: -73.935242,
+  viewport_latitude: 40.73061,
+  viewport_zoom: 9,
 };
 
 const baseQueriesData = [
@@ -66,7 +70,6 @@ const baseQueriesData = [
       ] as [[number, number], [number, number]],
       geoJSON: { features: [] },
       hasCustomMetric: false,
-      mapboxApiKey: 'test-api-key',
     },
   },
 ];
@@ -88,15 +91,15 @@ function getTransformPropsResult(
 }
 
 test('extracts globalOpacity from formData', () => {
-  const result = getTransformPropsResult({ globalOpacity: 0.5 });
+  const result = getTransformPropsResult({ global_opacity: 0.5 });
   expect(result.globalOpacity).toBe(0.5);
 });
 
 test('extracts viewport values from formData', () => {
   const result = getTransformPropsResult({
-    viewportLongitude: -122.4,
-    viewportLatitude: 37.8,
-    viewportZoom: 12,
+    viewport_longitude: -122.4,
+    viewport_latitude: 37.8,
+    viewport_zoom: 12,
   });
   expect(result).toEqual(
     expect.objectContaining({
@@ -109,9 +112,9 @@ test('extracts viewport values from formData', () => {
 
 test('clamps viewport values to safe map ranges', () => {
   const result = getTransformPropsResult({
-    viewportLongitude: 190,
-    viewportLatitude: -100,
-    viewportZoom: 99,
+    viewport_longitude: 190,
+    viewport_latitude: -100,
+    viewport_zoom: 99,
   });
   expect(result).toEqual(
     expect.objectContaining({
@@ -148,9 +151,9 @@ test('provides onViewportChange callback that updates control values', () => {
 
 test('normalizes string viewport values to numbers', () => {
   const result = getTransformPropsResult({
-    viewportLongitude: '-122.4',
-    viewportLatitude: '37.8',
-    viewportZoom: '12',
+    viewport_longitude: '-122.4',
+    viewport_latitude: '37.8',
+    viewport_zoom: '12',
   });
   expect(result.viewportLongitude).toBe(-122.4);
   expect(result.viewportLatitude).toBe(37.8);
@@ -159,9 +162,9 @@ test('normalizes string viewport values to numbers', () => {
 
 test('normalizes empty viewport values to undefined', () => {
   const result = getTransformPropsResult({
-    viewportLongitude: '',
-    viewportLatitude: '',
-    viewportZoom: '',
+    viewport_longitude: '',
+    viewport_latitude: '',
+    viewport_zoom: '',
   });
   expect(result.viewportLongitude).toBeUndefined();
   expect(result.viewportLatitude).toBeUndefined();
@@ -170,9 +173,9 @@ test('normalizes empty viewport values to undefined', () => {
 
 test('normalizes whitespace-only viewport values to undefined', () => {
   const result = getTransformPropsResult({
-    viewportLongitude: '   ',
-    viewportLatitude: '\t',
-    viewportZoom: ' \n ',
+    viewport_longitude: '   ',
+    viewport_latitude: '\t',
+    viewport_zoom: ' \n ',
   });
   expect(result.viewportLongitude).toBeUndefined();
   expect(result.viewportLatitude).toBeUndefined();
@@ -180,31 +183,31 @@ test('normalizes whitespace-only viewport values to undefined', () => {
 });
 
 test('normalizes string opacity to number', () => {
-  const result = getTransformPropsResult({ globalOpacity: '0.5' });
+  const result = getTransformPropsResult({ global_opacity: '0.5' });
   expect(result.globalOpacity).toBe(0.5);
 });
 
 test('defaults empty opacity to 1', () => {
-  const result = getTransformPropsResult({ globalOpacity: '' });
+  const result = getTransformPropsResult({ global_opacity: '' });
   expect(result.globalOpacity).toBe(1);
 });
 
 test('defaults whitespace-only opacity to 1', () => {
-  const result = getTransformPropsResult({ globalOpacity: '   ' });
+  const result = getTransformPropsResult({ global_opacity: '   ' });
   expect(result.globalOpacity).toBe(1);
 });
 
 test('clamps opacity to [0, 1] range', () => {
-  expect(getTransformPropsResult({ globalOpacity: 5 }).globalOpacity).toBe(1);
-  expect(getTransformPropsResult({ globalOpacity: -1 }).globalOpacity).toBe(0);
+  expect(getTransformPropsResult({ global_opacity: 5 }).globalOpacity).toBe(1);
+  expect(getTransformPropsResult({ global_opacity: -1 }).globalOpacity).toBe(0);
 });
 
 test('passes through numeric values unchanged', () => {
   const result = getTransformPropsResult({
-    viewportLongitude: -122.4,
-    viewportLatitude: 37.8,
-    viewportZoom: 12,
-    globalOpacity: 0.8,
+    viewport_longitude: -122.4,
+    viewport_latitude: 37.8,
+    viewport_zoom: 12,
+    global_opacity: 0.8,
   });
   expect(result.viewportLongitude).toBe(-122.4);
   expect(result.viewportLatitude).toBe(37.8);
@@ -212,19 +215,18 @@ test('passes through numeric values unchanged', () => {
   expect(result.globalOpacity).toBe(0.8);
 });
 
-test('calls onError and returns empty object for invalid color', () => {
+test('calls onError and falls back to black for invalid color', () => {
   const onError = jest.fn();
   const chartProps = new ChartProps({
-    formData: { ...baseFormData, mapboxColor: 'invalid-color' },
+    formData: { ...baseFormData, map_color: 'invalid-color' },
     width: 800,
     height: 600,
     queriesData: baseQueriesData,
     hooks: { onError },
     theme: supersetTheme,
   });
-  const result = transformProps(chartProps);
-  expect(onError).toHaveBeenCalledWith(
-    "Color field must be of form 'rgb(%d, %d, %d)'",
-  );
-  expect(result).toEqual({});
+  const result = transformProps(chartProps) as TransformPropsResult;
+  expect(onError).toHaveBeenCalled();
+  // Falls back to black instead of returning empty object
+  expect(result.rgb).toEqual(['', '0', '0', '0']);
 });
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/tsconfig.json b/superset-frontend/plugins/plugin-chart-point-cluster-map/tsconfig.json
similarity index 58%
rename from superset-frontend/plugins/legacy-preset-chart-deckgl/tsconfig.json
rename to superset-frontend/plugins/plugin-chart-point-cluster-map/tsconfig.json
index e73ca5d4f87..1abdcd42c58 100644
--- a/superset-frontend/plugins/legacy-preset-chart-deckgl/tsconfig.json
+++ b/superset-frontend/plugins/plugin-chart-point-cluster-map/tsconfig.json
@@ -1,12 +1,7 @@
 {
   "extends": "../../tsconfig.json",
   "compilerOptions": {
-    // Path Resolution: Override baseUrl to maintain correct path mappings from parent config
-    // (e.g., "@apache-superset/core" -> "./packages/superset-core/src")
     "baseUrl": "../..",
-
-    // Directory Overrides: Parent config paths are relative to frontend root,
-    // but packages need paths relative to their own directory
     "outDir": "lib",
     "rootDir": "src",
     "declarationDir": "lib"
diff --git a/superset-frontend/plugins/legacy-plugin-chart-map-box/test/utils/roundDecimal.test.ts b/superset-frontend/plugins/plugin-chart-point-cluster-map/types/external.d.ts
similarity index 72%
rename from superset-frontend/plugins/legacy-plugin-chart-map-box/test/utils/roundDecimal.test.ts
rename to superset-frontend/plugins/plugin-chart-point-cluster-map/types/external.d.ts
index a7fdda63a8a..b904c352de4 100644
--- a/superset-frontend/plugins/legacy-plugin-chart-map-box/test/utils/roundDecimal.test.ts
+++ b/superset-frontend/plugins/plugin-chart-point-cluster-map/types/external.d.ts
@@ -17,12 +17,12 @@
  * under the License.
  */
 
-import roundDecimal from '../../src/utils/roundDecimal';
+declare module '*.png' {
+  const value: string;
+  export default value;
+}
 
-describe('roundDecimal', () => {
-  test('rounding method to limit the number of decimal digits', () => {
-    expect(roundDecimal(1.139, 2)).toBe(1.14);
-    expect(roundDecimal(1.13929, 3)).toBe(1.139);
-    expect(roundDecimal(1.13929)).toBe(1);
-  });
-});
+declare module '*.jpg' {
+  const value: string;
+  export default value;
+}
diff --git a/superset-frontend/plugins/plugin-chart-table/package.json b/superset-frontend/plugins/plugin-chart-table/package.json
index 3d9798b6783..d4b9f099a69 100644
--- a/superset-frontend/plugins/plugin-chart-table/package.json
+++ b/superset-frontend/plugins/plugin-chart-table/package.json
@@ -24,20 +24,19 @@
     "lib"
   ],
   "dependencies": {
-    "react-icons": "5.4.0",
     "@types/d3-array": "^3.2.2",
     "@types/react-table": "^7.7.20",
     "classnames": "^2.5.1",
     "d3-array": "^3.2.4",
-    "lodash": "^4.17.23",
+    "lodash": "^4.18.1",
     "memoize-one": "^5.2.1",
     "react-table": "^7.8.0",
     "regenerator-runtime": "^0.14.1",
     "xss": "^1.0.15"
   },
   "peerDependencies": {
+    "@ant-design/icons": "^5.6.1",
     "@apache-superset/core": "*",
-    "@ant-design/icons": "^5.2.6",
     "@superset-ui/chart-controls": "*",
     "@superset-ui/core": "*",
     "@testing-library/dom": "^8.20.1",
@@ -46,7 +45,7 @@
     "@testing-library/react-hooks": "*",
     "@testing-library/user-event": "*",
     "@types/react": "*",
-    "match-sorter": "^6.3.3",
+    "match-sorter": "^8.2.0",
     "react": "^17.0.2",
     "react-dom": "^17.0.2"
   },
diff --git a/superset-frontend/plugins/plugin-chart-table/src/TableChart.tsx b/superset-frontend/plugins/plugin-chart-table/src/TableChart.tsx
index 02be074bf65..58f8a529a31 100644
--- a/superset-frontend/plugins/plugin-chart-table/src/TableChart.tsx
+++ b/superset-frontend/plugins/plugin-chart-table/src/TableChart.tsx
@@ -35,9 +35,11 @@ import {
   Row,
 } from 'react-table';
 import { extent as d3Extent, max as d3Max } from 'd3-array';
-import { FaSort } from 'react-icons/fa';
-import { FaSortDown as FaSortDesc } from 'react-icons/fa';
-import { FaSortUp as FaSortAsc } from 'react-icons/fa';
+import {
+  CaretUpOutlined,
+  CaretDownOutlined,
+  ColumnHeightOutlined,
+} from '@ant-design/icons';
 import cx from 'classnames';
 import {
   DataRecord,
@@ -75,6 +77,7 @@ import {
 import { isEmpty, debounce, isEqual } from 'lodash';
 import {
   ColorFormatters,
+  getTextColorForBackground,
   ObjectFormattingEnum,
   ColorSchemeEnum,
 } from '@superset-ui/chart-controls';
@@ -220,9 +223,9 @@ function cellBackground({
 
 function SortIcon<D extends object>({ column }: { column: ColumnInstance<D> }) {
   const { isSorted, isSortedDesc } = column;
-  let sortIcon = <FaSort />;
+  let sortIcon = <ColumnHeightOutlined />;
   if (isSorted) {
-    sortIcon = isSortedDesc ? <FaSortDesc /> : <FaSortAsc />;
+    sortIcon = isSortedDesc ? <CaretDownOutlined /> : <CaretUpOutlined />;
   }
   return sortIcon;
 }
@@ -342,6 +345,7 @@ export default function TableChart<D extends DataRecord = DataRecord>(
     hasServerPageLengthChanged,
     serverPageLength,
     slice_id,
+    columnLabelToNameMap = {},
   } = props;
 
   const comparisonColumns = useMemo(
@@ -411,7 +415,16 @@ export default function TableChart<D extends DataRecord = DataRecord>(
 
   const isActiveFilterValue = useCallback(
     function isActiveFilterValue(key: string, val: DataRecordValue) {
-      return !!filters && filters[key]?.includes(val);
+      if (!filters || !filters[key]) return false;
+      return filters[key].some(filterVal => {
+        if (filterVal === val) return true;
+        // DateWithFormatter extends Date — compare by time value
+        // since memoization cache misses can create new instances
+        if (filterVal instanceof Date && val instanceof Date) {
+          return filterVal.getTime() === val.getTime();
+        }
+        return false;
+      });
     },
     [filters],
   );
@@ -454,19 +467,22 @@ export default function TableChart<D extends DataRecord = DataRecord>(
               groupBy.length === 0
                 ? []
                 : groupBy.map(col => {
+                    // Resolve adhoc column labels back to original column names
+                    // so that cross-filters work on the receiving chart
+                    const resolvedCol = columnLabelToNameMap[col] ?? col;
                     const val = ensureIsArray(updatedFilters?.[col]);
                     if (!val.length)
                       return {
-                        col,
+                        col: resolvedCol,
                         op: 'IS NULL' as const,
                       };
                     return {
-                      col,
+                      col: resolvedCol,
                       op: 'IN' as const,
                       val: val.map(el =>
                         el instanceof Date ? el.getTime() : el!,
                       ),
-                      grain: col === DTTM_ALIAS ? timeGrain : undefined,
+                      grain: resolvedCol === DTTM_ALIAS ? timeGrain : undefined,
                     };
                   }),
           },
@@ -482,7 +498,13 @@ export default function TableChart<D extends DataRecord = DataRecord>(
         isCurrentValueSelected: isActiveFilterValue(key, value),
       };
     },
-    [filters, isActiveFilterValue, timestampFormatter, timeGrain],
+    [
+      filters,
+      isActiveFilterValue,
+      timestampFormatter,
+      timeGrain,
+      columnLabelToNameMap,
+    ],
   );
 
   const toggleFilter = useCallback(
@@ -944,9 +966,11 @@ export default function TableChart<D extends DataRecord = DataRecord>(
               if (!formatterResult) return;
 
               if (
-                formatter.objectFormatting === ObjectFormattingEnum.TEXT_COLOR
+                formatter.objectFormatting ===
+                  ObjectFormattingEnum.TEXT_COLOR ||
+                formatter.toTextColor
               ) {
-                color = formatterResult.slice(0, -2);
+                color = formatterResult;
               } else if (
                 formatter.objectFormatting === ObjectFormattingEnum.CELL_BAR
               ) {
@@ -997,8 +1021,13 @@ export default function TableChart<D extends DataRecord = DataRecord>(
                 ? basicColorColumnFormatters[row.index][column.key]?.mainArrow
                 : '';
           }
+          const rowSurfaceColor =
+            row.index % 2 === 0 ? theme.colorBgLayout : theme.colorBgBase;
+          const resolvedTextColor = getTextColorForBackground(
+            { backgroundColor, color },
+            rowSurfaceColor,
+          );
           const StyledCell = styled.td`
-            color: ${color ? `${color}FF` : theme.colorText};
             text-align: ${sharedStyle.textAlign};
             white-space: ${value instanceof Date ? 'nowrap' : undefined};
             position: relative;
@@ -1097,6 +1126,9 @@ export default function TableChart<D extends DataRecord = DataRecord>(
                 : '',
               isActiveFilterValue(key, value) ? ' dt-is-active-filter' : '',
             ].join(' '),
+            style: resolvedTextColor
+              ? ({ color: resolvedTextColor } as CSSProperties)
+              : undefined,
             tabIndex: 0,
           };
           if (html) {
diff --git a/superset-frontend/plugins/plugin-chart-table/src/transformProps.ts b/superset-frontend/plugins/plugin-chart-table/src/transformProps.ts
index 30ad5f9ed69..ad1977ba8de 100644
--- a/superset-frontend/plugins/plugin-chart-table/src/transformProps.ts
+++ b/superset-frontend/plugins/plugin-chart-table/src/transformProps.ts
@@ -29,6 +29,7 @@ import {
   getNumberFormatter,
   getTimeFormatter,
   getTimeFormatterForGranularity,
+  isAdhocColumn,
   normalizeCurrency,
   NumberFormats,
   QueryMode,
@@ -532,6 +533,20 @@ const transformProps = (
     comparison_type,
     slice_id,
   } = formData;
+  // Build a mapping from column labels to original column names.
+  // When a user creates an adhoc column with a custom label (e.g. sqlExpression: "state",
+  // label: "State_Renamed"), the query result uses the label as the column name.
+  // Cross-filtering needs the original column name to work on the receiving chart.
+  const columnLabelToNameMap: Record<string, string> = {};
+  const formColumns = ensureIsArray(
+    queryMode === QueryMode.Raw ? formData.all_columns : formData.groupby,
+  );
+  formColumns.forEach(col => {
+    if (isAdhocColumn(col) && col.label && col.label !== col.sqlExpression) {
+      columnLabelToNameMap[col.label] = col.sqlExpression;
+    }
+  });
+
   const isUsingTimeComparison =
     !isEmpty(time_compare) &&
     queryMode === QueryMode.Aggregate &&
@@ -791,6 +806,7 @@ const transformProps = (
     hasServerPageLengthChanged,
     serverPageLength,
     slice_id,
+    columnLabelToNameMap,
   };
 };
 
diff --git a/superset-frontend/plugins/plugin-chart-table/src/types.ts b/superset-frontend/plugins/plugin-chart-table/src/types.ts
index e7f02eaf6d7..fda8b78ab26 100644
--- a/superset-frontend/plugins/plugin-chart-table/src/types.ts
+++ b/superset-frontend/plugins/plugin-chart-table/src/types.ts
@@ -124,6 +124,10 @@ export interface TableChartTransformedProps<D extends DataRecord = DataRecord> {
   hasServerPageLengthChanged: boolean;
   serverPageLength: number;
   slice_id: number;
+  // Maps column labels (used as keys in query results) back to original
+  // column names for cross-filtering, so that adhoc columns with custom labels
+  // emit the correct column name in cross-filter data masks
+  columnLabelToNameMap?: Record<string, string>;
 }
 
 export default {};
diff --git a/superset-frontend/plugins/plugin-chart-table/test/TableChart.test.tsx b/superset-frontend/plugins/plugin-chart-table/test/TableChart.test.tsx
index f3963b0477d..6988f9afc18 100644
--- a/superset-frontend/plugins/plugin-chart-table/test/TableChart.test.tsx
+++ b/superset-frontend/plugins/plugin-chart-table/test/TableChart.test.tsx
@@ -17,7 +17,11 @@
  * under the License.
  */
 import '@testing-library/jest-dom';
-import { ObjectFormattingEnum } from '@superset-ui/chart-controls';
+import {
+  getTextColorForBackground,
+  ObjectFormattingEnum,
+} from '@superset-ui/chart-controls';
+import { supersetTheme } from '@apache-superset/core/theme';
 import {
   render,
   screen,
@@ -670,6 +674,52 @@ describe('plugin-chart-table', () => {
         );
         expect(getComputedStyle(screen.getByText('N/A')).background).toBe('');
       });
+
+      test('preserves muted null styling when no formatter resolves text color', () => {
+        const dataWithEmptyCell = cloneDeep(testData.advanced.queriesData[0]);
+        dataWithEmptyCell.data.push({
+          __timestamp: null,
+          name: 'Noah',
+          sum__num: null,
+          '%pct_nice': 0.643,
+          'abc.com': 'bazzinga',
+        });
+
+        render(
+          ProviderWrapper({
+            children: (
+              <TableChart
+                {...transformProps({
+                  ...testData.advanced,
+                  queriesData: [dataWithEmptyCell],
+                  rawFormData: {
+                    ...testData.advanced.rawFormData,
+                    conditional_formatting: [
+                      {
+                        colorScheme: '#ACE1C4',
+                        column: 'sum__num',
+                        operator: '<',
+                        targetValue: 12342,
+                      },
+                    ],
+                  },
+                })}
+              />
+            ),
+          }),
+        );
+
+        const noahRow = screen.getByText('Noah').closest('tr');
+        expect(noahRow).not.toBeNull();
+
+        const nullCell = noahRow?.querySelector('td.dt-is-null');
+        expect(nullCell).not.toBeNull();
+        expect((nullCell as HTMLElement).style.color).toBe('');
+        expect(getComputedStyle(nullCell as Element).color).toBe(
+          'rgba(0, 0, 0, 0.45)',
+        );
+      });
+
       test('should display original label in grouped headers', () => {
         const props = transformProps(testData.comparison);
 
@@ -1351,11 +1401,9 @@ describe('plugin-chart-table', () => {
         );
 
         expect(getComputedStyle(screen.getByTitle('2467063')).color).toBe(
-          'rgba(172, 225, 196, 1)',
-        );
-        expect(getComputedStyle(screen.getByTitle('2467')).color).toBe(
-          'rgba(0, 0, 0, 0.88)',
+          'rgb(172, 225, 196)',
         );
+        expect((screen.getByTitle('2467') as HTMLElement).style.color).toBe('');
       });
 
       test('display text color using column color formatter for entire row', () => {
@@ -1385,13 +1433,182 @@ describe('plugin-chart-table', () => {
         );
 
         expect(getComputedStyle(screen.getByText('Michael')).color).toBe(
-          'rgba(172, 225, 196, 1)',
+          'rgb(172, 225, 196)',
         );
         expect(getComputedStyle(screen.getByTitle('2467063')).color).toBe(
-          'rgba(172, 225, 196, 1)',
+          'rgb(172, 225, 196)',
         );
         expect(getComputedStyle(screen.getByTitle('0.123456')).color).toBe(
-          'rgba(172, 225, 196, 1)',
+          'rgb(172, 225, 196)',
+        );
+      });
+
+      test('derive readable text color from dark background formatting', () => {
+        render(
+          ProviderWrapper({
+            children: (
+              <TableChart
+                {...transformProps({
+                  ...testData.advanced,
+                  rawFormData: {
+                    ...testData.advanced.rawFormData,
+                    conditional_formatting: [
+                      {
+                        colorScheme: '#111111',
+                        column: 'sum__num',
+                        operator: '>',
+                        targetValue: 2467,
+                        useGradient: false,
+                      },
+                    ],
+                  },
+                })}
+              />
+            ),
+          }),
+        );
+
+        expect(getComputedStyle(screen.getByTitle('2467063')).background).toBe(
+          'rgb(17, 17, 17)',
+        );
+        expect(getComputedStyle(screen.getByTitle('2467063')).color).toBe(
+          'rgb(255, 255, 255)',
+        );
+      });
+
+      test('keep explicit text color over adaptive contrast', () => {
+        render(
+          ProviderWrapper({
+            children: (
+              <TableChart
+                {...transformProps({
+                  ...testData.advanced,
+                  rawFormData: {
+                    ...testData.advanced.rawFormData,
+                    conditional_formatting: [
+                      {
+                        colorScheme: '#111111',
+                        column: 'sum__num',
+                        operator: '>',
+                        targetValue: 2467,
+                        useGradient: false,
+                      },
+                      {
+                        colorScheme: '#ACE1C4',
+                        column: 'sum__num',
+                        operator: '>',
+                        targetValue: 2467,
+                        objectFormatting: ObjectFormattingEnum.TEXT_COLOR,
+                      },
+                    ],
+                  },
+                })}
+              />
+            ),
+          }),
+        );
+
+        expect(getComputedStyle(screen.getByTitle('2467063')).background).toBe(
+          'rgb(17, 17, 17)',
+        );
+        expect(getComputedStyle(screen.getByTitle('2467063')).color).toBe(
+          'rgb(172, 225, 196)',
+        );
+      });
+
+      test('support legacy toTextColor formatters', () => {
+        render(
+          ProviderWrapper({
+            children: (
+              <TableChart
+                {...transformProps({
+                  ...testData.advanced,
+                  rawFormData: {
+                    ...testData.advanced.rawFormData,
+                    conditional_formatting: [
+                      {
+                        colorScheme: '#111111',
+                        column: 'sum__num',
+                        operator: '>',
+                        targetValue: 2467,
+                        useGradient: false,
+                      },
+                      {
+                        colorScheme: '#ACE1C4',
+                        column: 'sum__num',
+                        operator: '>',
+                        targetValue: 2467,
+                        toTextColor: true,
+                      },
+                    ],
+                  },
+                })}
+              />
+            ),
+          }),
+        );
+
+        expect(getComputedStyle(screen.getByTitle('2467063')).background).toBe(
+          'rgb(17, 17, 17)',
+        );
+        expect(getComputedStyle(screen.getByTitle('2467063')).color).toBe(
+          'rgb(172, 225, 196)',
+        );
+      });
+
+      test('use striped row surface when deriving adaptive text color', () => {
+        const backgroundColor = Array.from(
+          { length: 0xff },
+          (_, index) => `#000000${(index + 1).toString(16).padStart(2, '0')}`,
+        ).find(candidate => {
+          const baseColor = getTextColorForBackground(
+            { backgroundColor: candidate },
+            supersetTheme.colorBgBase,
+          );
+          const layoutColor = getTextColorForBackground(
+            { backgroundColor: candidate },
+            supersetTheme.colorBgLayout,
+          );
+          return baseColor !== layoutColor;
+        });
+
+        expect(backgroundColor).toBeDefined();
+
+        render(
+          ProviderWrapper({
+            children: (
+              <TableChart
+                {...transformProps({
+                  ...testData.advanced,
+                  rawFormData: {
+                    ...testData.advanced.rawFormData,
+                    conditional_formatting: [
+                      {
+                        colorScheme: backgroundColor,
+                        column: 'sum__num',
+                        operator: '>',
+                        targetValue: 2000,
+                        useGradient: false,
+                      },
+                    ],
+                  },
+                })}
+              />
+            ),
+          }),
+        );
+
+        expect(getComputedStyle(screen.getByTitle('2467063')).color).toBe(
+          getTextColorForBackground(
+            { backgroundColor },
+            supersetTheme.colorBgLayout,
+          ),
+        );
+        expect(getComputedStyle(screen.getByTitle('2467')).color).toBe(
+          getTextColorForBackground(
+            { backgroundColor },
+            supersetTheme.colorBgBase,
+          ),
         );
       });
 
@@ -1524,6 +1741,200 @@ describe('plugin-chart-table', () => {
         );
       });
 
+      test('clicking a cell emits cross-filter, clicking again clears it', () => {
+        const setDataMask = jest.fn();
+        const props = transformProps({
+          ...testData.basic,
+          hooks: { setDataMask },
+          emitCrossFilters: true,
+        });
+        const { rerender } = render(
+          <ProviderWrapper>
+            <TableChart
+              {...props}
+              emitCrossFilters
+              setDataMask={setDataMask}
+              sticky={false}
+            />
+          </ProviderWrapper>,
+        );
+
+        // Click a string cell to apply cross-filter
+        const nameCell = screen.getByText('Michael');
+        fireEvent.click(nameCell);
+
+        // Find the cross-filter call (not the ownState call)
+        const crossFilterCall = setDataMask.mock.calls.find(
+          (call: any[]) => call[0]?.filterState?.filters,
+        );
+        expect(crossFilterCall).toBeDefined();
+        const firstCallArg = crossFilterCall![0];
+        // Should set the filter
+        expect(firstCallArg.filterState.filters).toEqual({
+          name: ['Michael'],
+        });
+        expect(firstCallArg.extraFormData.filters).toEqual(
+          expect.arrayContaining([
+            expect.objectContaining({
+              col: 'name',
+              op: 'IN',
+              val: ['Michael'],
+            }),
+          ]),
+        );
+
+        // Now simulate Redux updating the filters prop (as would happen in dashboard)
+        setDataMask.mockClear();
+        rerender(
+          <ProviderWrapper>
+            <TableChart
+              {...props}
+              emitCrossFilters
+              setDataMask={setDataMask}
+              filters={{ name: ['Michael'] }}
+              sticky={false}
+            />
+          </ProviderWrapper>,
+        );
+
+        // The cell should now have the active filter class
+        const activeCells = document.querySelectorAll('.dt-is-active-filter');
+        expect(activeCells.length).toBeGreaterThan(0);
+
+        // Click same cell again to clear cross-filter
+        setDataMask.mockClear();
+        const sameCellAgain = screen.getByText('Michael');
+        fireEvent.click(sameCellAgain);
+
+        // Find the cross-filter clearing call
+        const clearCall = setDataMask.mock.calls.find(
+          (call: any[]) => call[0]?.filterState !== undefined,
+        );
+        expect(clearCall).toBeDefined();
+        const secondCallArg = clearCall![0];
+        // Should clear the filter
+        expect(secondCallArg.filterState.filters).toBeNull();
+        expect(secondCallArg.extraFormData.filters).toEqual([]);
+      });
+
+      test('cross-filter toggle works with DateWithFormatter values', () => {
+        const setDataMask = jest.fn();
+        const props = transformProps({
+          ...testData.basic,
+          hooks: { setDataMask },
+          emitCrossFilters: true,
+        });
+
+        // The data has a __timestamp column with DateWithFormatter values
+        // after processDataRecords. Let's verify this.
+        const timestampVal = props.data[0].__timestamp;
+        expect(timestampVal).toBeInstanceOf(DateWithFormatter);
+
+        const { rerender } = render(
+          <ProviderWrapper>
+            <TableChart
+              {...props}
+              emitCrossFilters
+              setDataMask={setDataMask}
+              sticky={false}
+            />
+          </ProviderWrapper>,
+        );
+
+        // Click a timestamp cell - find it by text content
+        const timestampCell = screen.getByText('2020-01-01 12:34:56');
+        fireEvent.click(timestampCell);
+
+        const crossFilterCall = setDataMask.mock.calls.find(
+          (call: any[]) => call[0]?.filterState?.filters,
+        );
+        expect(crossFilterCall).toBeDefined();
+        const firstCallArg = crossFilterCall![0];
+
+        // Now re-render with the filters from the first click
+        // This simulates what happens via Redux in the real app
+        setDataMask.mockClear();
+        rerender(
+          <ProviderWrapper>
+            <TableChart
+              {...props}
+              emitCrossFilters
+              setDataMask={setDataMask}
+              filters={firstCallArg.filterState.filters}
+              sticky={false}
+            />
+          </ProviderWrapper>,
+        );
+
+        // The timestamp cell should be active
+        const activeCells = document.querySelectorAll('.dt-is-active-filter');
+        expect(activeCells.length).toBeGreaterThan(0);
+
+        // Click the same timestamp cell again to clear
+        setDataMask.mockClear();
+        const sameCell = screen.getByText('2020-01-01 12:34:56');
+        fireEvent.click(sameCell);
+
+        const clearCall = setDataMask.mock.calls.find(
+          (call: any[]) => call[0]?.filterState !== undefined,
+        );
+        expect(clearCall).toBeDefined();
+        // Should CLEAR the filter (not re-apply it)
+        expect(clearCall![0].filterState.filters).toBeNull();
+        expect(clearCall![0].extraFormData.filters).toEqual([]);
+      });
+
+      test('cross-filter toggle clears when DateWithFormatter references differ', () => {
+        // Regression test: when memoizeOne cache misses between renders,
+        // new DateWithFormatter instances are created with different references.
+        // isActiveFilterValue must compare by time value, not reference.
+        const setDataMask = jest.fn();
+        const props = transformProps({
+          ...testData.basic,
+          hooks: { setDataMask },
+          emitCrossFilters: true,
+        });
+
+        const timestampVal = props.data[0].__timestamp as DateWithFormatter;
+        expect(timestampVal).toBeInstanceOf(DateWithFormatter);
+
+        // Build filters with a DIFFERENT DateWithFormatter instance (same time value)
+        const filterKey = '__timestamp';
+        const differentRef = new DateWithFormatter(timestampVal.input, {
+          formatter: timestampVal.formatter,
+        });
+        expect(differentRef).not.toBe(timestampVal); // different reference
+        expect(differentRef.getTime()).toBe(timestampVal.getTime()); // same time
+
+        const { container } = render(
+          <ProviderWrapper>
+            <TableChart
+              {...props}
+              emitCrossFilters
+              setDataMask={setDataMask}
+              filters={{ [filterKey]: [differentRef] }}
+              sticky={false}
+            />
+          </ProviderWrapper>,
+        );
+
+        // The cell should show active filter despite different reference
+        const activeCells = container.querySelectorAll('.dt-is-active-filter');
+        expect(activeCells.length).toBeGreaterThan(0);
+
+        // Clicking should CLEAR the filter, not re-apply it
+        setDataMask.mockClear();
+        const timestampCell = screen.getByText('2020-01-01 12:34:56');
+        fireEvent.click(timestampCell);
+
+        const clearCall = setDataMask.mock.calls.find(
+          (call: any[]) => call[0]?.filterState !== undefined,
+        );
+        expect(clearCall).toBeDefined();
+        expect(clearCall![0].filterState.filters).toBeNull();
+        expect(clearCall![0].extraFormData.filters).toEqual([]);
+      });
+
       test('recalculates totals when user filters data', async () => {
         const formDataWithTotals = {
           ...testData.basic.formData,
@@ -1570,5 +1981,145 @@ describe('plugin-chart-table', () => {
         });
       });
     });
+
+    test('should build columnLabelToNameMap for adhoc columns with custom labels', () => {
+      const result = transformProps({
+        ...testData.basic,
+        rawFormData: {
+          ...testData.basic.rawFormData,
+          query_mode: QueryMode.Aggregate,
+          groupby: [
+            {
+              sqlExpression: 'name',
+              label: 'Name_Renamed',
+              expressionType: 'SQL',
+            },
+          ],
+          metrics: ['sum__num'],
+        },
+        emitCrossFilters: true,
+        queriesData: [
+          {
+            ...testData.basic.queriesData[0],
+            colnames: ['Name_Renamed', 'sum__num'],
+            coltypes: [GenericDataType.String, GenericDataType.Numeric],
+            data: [{ Name_Renamed: 'Michael', sum__num: 2467063 }],
+          },
+        ],
+      });
+      expect(result.columnLabelToNameMap).toEqual({
+        Name_Renamed: 'name',
+      });
+    });
+
+    test('should not populate columnLabelToNameMap for physical columns', () => {
+      const result = transformProps({
+        ...testData.basic,
+        rawFormData: {
+          ...testData.basic.rawFormData,
+          query_mode: QueryMode.Aggregate,
+          groupby: ['name'],
+          metrics: ['sum__num'],
+        },
+        emitCrossFilters: true,
+        queriesData: [
+          {
+            ...testData.basic.queriesData[0],
+            colnames: ['name', 'sum__num'],
+            coltypes: [GenericDataType.String, GenericDataType.Numeric],
+            data: [{ name: 'Michael', sum__num: 2467063 }],
+          },
+        ],
+      });
+      expect(result.columnLabelToNameMap).toEqual({});
+    });
+
+    test('should not populate columnLabelToNameMap when adhoc label matches sqlExpression', () => {
+      const result = transformProps({
+        ...testData.basic,
+        rawFormData: {
+          ...testData.basic.rawFormData,
+          query_mode: QueryMode.Aggregate,
+          groupby: [
+            {
+              sqlExpression: 'name',
+              label: 'name',
+              expressionType: 'SQL',
+            },
+          ],
+          metrics: ['sum__num'],
+        },
+        emitCrossFilters: true,
+        queriesData: [
+          {
+            ...testData.basic.queriesData[0],
+            colnames: ['name', 'sum__num'],
+            coltypes: [GenericDataType.String, GenericDataType.Numeric],
+            data: [{ name: 'Michael', sum__num: 2467063 }],
+          },
+        ],
+      });
+      expect(result.columnLabelToNameMap).toEqual({});
+    });
+
+    test('cross-filter on adhoc column with custom label emits original column name', () => {
+      const setDataMask = jest.fn();
+      const baseProps = transformProps({
+        ...testData.basic,
+        rawFormData: {
+          ...testData.basic.rawFormData,
+          query_mode: QueryMode.Aggregate,
+          groupby: [
+            {
+              sqlExpression: 'name',
+              label: 'Name_Renamed',
+              expressionType: 'SQL',
+            },
+          ],
+          metrics: ['sum__num'],
+        },
+        filterState: { filters: {} },
+        ownState: {},
+        hooks: {
+          onAddFilter: jest.fn(),
+          setDataMask,
+          onContextMenu: jest.fn(),
+        },
+        emitCrossFilters: true,
+        queriesData: [
+          {
+            ...testData.basic.queriesData[0],
+            colnames: ['Name_Renamed', 'sum__num'],
+            coltypes: [GenericDataType.String, GenericDataType.Numeric],
+            data: [
+              { Name_Renamed: 'Michael', sum__num: 2467063 },
+              { Name_Renamed: 'Joe', sum__num: 2467 },
+            ],
+          },
+        ],
+      });
+
+      render(
+        <ProviderWrapper>
+          <TableChart {...baseProps} emitCrossFilters sticky={false} />
+        </ProviderWrapper>,
+      );
+
+      // Verify the table rendered with data
+      expect(screen.getByText('Michael')).toBeInTheDocument();
+
+      // Find the td cell containing "Michael" and click it
+      const cell = screen.getByText('Michael').closest('td')!;
+      fireEvent.click(cell);
+
+      expect(setDataMask).toHaveBeenCalled();
+      const lastCall =
+        setDataMask.mock.calls[setDataMask.mock.calls.length - 1][0];
+      const { filters } = lastCall.extraFormData;
+      expect(filters).toHaveLength(1);
+      // Should emit the original column name, not the label
+      expect(filters[0].col).toBe('name');
+      expect(filters[0].val).toEqual(['Michael']);
+    });
   });
 });
diff --git a/superset-frontend/plugins/plugin-chart-word-cloud/package.json b/superset-frontend/plugins/plugin-chart-word-cloud/package.json
index a602fe6af73..c65767c6edc 100644
--- a/superset-frontend/plugins/plugin-chart-word-cloud/package.json
+++ b/superset-frontend/plugins/plugin-chart-word-cloud/package.json
@@ -30,13 +30,13 @@
   },
   "dependencies": {
     "@types/d3-scale": "^4.0.9",
-    "d3-cloud": "^1.2.9",
+    "d3-cloud": "^1.2.8",
     "d3-scale": "^4.0.2"
   },
   "peerDependencies": {
+    "@apache-superset/core": "*",
     "@superset-ui/chart-controls": "*",
     "@superset-ui/core": "*",
-    "@apache-superset/core": "*",
     "@types/lodash": "*",
     "@types/react": "*",
     "react": "^17.0.2"
diff --git a/superset-frontend/plugins/plugin-chart-word-cloud/src/plugin/buildQuery.ts b/superset-frontend/plugins/plugin-chart-word-cloud/src/plugin/buildQuery.ts
index faf816d5eca..e90aab66ed7 100644
--- a/superset-frontend/plugins/plugin-chart-word-cloud/src/plugin/buildQuery.ts
+++ b/superset-frontend/plugins/plugin-chart-word-cloud/src/plugin/buildQuery.ts
@@ -21,7 +21,8 @@ import { buildQueryContext, QueryFormOrderBy } from '@superset-ui/core';
 import { WordCloudFormData } from '../types';
 
 export default function buildQuery(formData: WordCloudFormData) {
-  const { metric, sort_by_metric, series, row_limit } = formData;
+  const { metric, sort_by_metric, sort_by_series, series, row_limit } =
+    formData;
   const orderby: QueryFormOrderBy[] = [];
   const shouldApplyOrderBy =
     row_limit !== undefined && row_limit !== null && row_limit !== 0;
@@ -29,7 +30,7 @@ export default function buildQuery(formData: WordCloudFormData) {
   if (sort_by_metric && metric) {
     orderby.push([metric, false]);
   }
-  if (series) {
+  if (sort_by_series && series) {
     orderby.push([series, true]);
   }
 
diff --git a/superset-frontend/plugins/plugin-chart-word-cloud/src/plugin/controlPanel.tsx b/superset-frontend/plugins/plugin-chart-word-cloud/src/plugin/controlPanel.tsx
index 9098a282c08..98e5e624b7f 100644
--- a/superset-frontend/plugins/plugin-chart-word-cloud/src/plugin/controlPanel.tsx
+++ b/superset-frontend/plugins/plugin-chart-word-cloud/src/plugin/controlPanel.tsx
@@ -35,6 +35,22 @@ const config: ControlPanelConfig = {
         ['adhoc_filters'],
         ['row_limit'],
         ['sort_by_metric'],
+        [
+          {
+            name: 'sort_by_series',
+            config: {
+              type: 'CheckboxControl',
+              label: t('Sort by series'),
+              default: false,
+              description: t(
+                'Sort results by series name in ascending order. ' +
+                  'When combined with "Sort by metric", this acts as a tiebreaker ' +
+                  'for equal metric values. Adding this sort may reduce query ' +
+                  'performance on some databases.',
+              ),
+            },
+          },
+        ],
       ],
     },
     {
diff --git a/superset-frontend/plugins/plugin-chart-word-cloud/test/buildQuery.test.ts b/superset-frontend/plugins/plugin-chart-word-cloud/test/buildQuery.test.ts
index c83f8993e81..7ce8cab7be1 100644
--- a/superset-frontend/plugins/plugin-chart-word-cloud/test/buildQuery.test.ts
+++ b/superset-frontend/plugins/plugin-chart-word-cloud/test/buildQuery.test.ts
@@ -21,17 +21,70 @@ import { VizType } from '@superset-ui/core';
 import { WordCloudFormData } from '../src';
 import buildQuery from '../src/plugin/buildQuery';
 
-describe('WordCloud buildQuery', () => {
-  const formData: WordCloudFormData = {
-    datasource: '5__table',
-    granularity_sqla: 'ds',
-    series: 'foo',
-    viz_type: VizType.WordCloud,
-  };
+const basicFormData: WordCloudFormData = {
+  datasource: '5__table',
+  granularity_sqla: 'ds',
+  series: 'foo',
+  viz_type: VizType.WordCloud,
+};
 
-  test('should build columns from series in form data', () => {
-    const queryContext = buildQuery(formData);
-    const [query] = queryContext.queries;
-    expect(query.columns).toEqual(['foo']);
+describe('plugin-chart-word-cloud', () => {
+  describe('buildQuery', () => {
+    test('should build columns from series in form data', () => {
+      const queryContext = buildQuery(basicFormData);
+      const [query] = queryContext.queries;
+      expect(query.columns).toEqual(['foo']);
+    });
+
+    test('should not include orderby when neither sort option is enabled', () => {
+      const queryContext = buildQuery({
+        ...basicFormData,
+        metric: 'count',
+        sort_by_metric: false,
+        sort_by_series: false,
+        row_limit: 100,
+      });
+      const [query] = queryContext.queries;
+      expect(query.orderby).toBeUndefined();
+    });
+
+    test('should order by metric DESC only when sort_by_metric is true', () => {
+      const queryContext = buildQuery({
+        ...basicFormData,
+        metric: 'count',
+        sort_by_metric: true,
+        sort_by_series: false,
+        row_limit: 100,
+      });
+      const [query] = queryContext.queries;
+      expect(query.orderby).toEqual([['count', false]]);
+    });
+
+    test('should order by series ASC only when sort_by_series is true', () => {
+      const queryContext = buildQuery({
+        ...basicFormData,
+        metric: 'count',
+        sort_by_metric: false,
+        sort_by_series: true,
+        row_limit: 100,
+      });
+      const [query] = queryContext.queries;
+      expect(query.orderby).toEqual([['foo', true]]);
+    });
+
+    test('should order by metric DESC then series ASC when both are true', () => {
+      const queryContext = buildQuery({
+        ...basicFormData,
+        metric: 'count',
+        sort_by_metric: true,
+        sort_by_series: true,
+        row_limit: 100,
+      });
+      const [query] = queryContext.queries;
+      expect(query.orderby).toEqual([
+        ['count', false],
+        ['foo', true],
+      ]);
+    });
   });
 });
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/package.json b/superset-frontend/plugins/preset-chart-deckgl/package.json
similarity index 70%
rename from superset-frontend/plugins/legacy-preset-chart-deckgl/package.json
rename to superset-frontend/plugins/preset-chart-deckgl/package.json
index 62eac12d75d..7f21f1784d0 100644
--- a/superset-frontend/plugins/legacy-preset-chart-deckgl/package.json
+++ b/superset-frontend/plugins/preset-chart-deckgl/package.json
@@ -1,7 +1,7 @@
 {
-  "name": "@superset-ui/legacy-preset-chart-deckgl",
-  "version": "0.20.4",
-  "description": "Superset Legacy Chart - deck.gl",
+  "name": "@superset-ui/preset-chart-deckgl",
+  "version": "1.0.0",
+  "description": "Superset Chart Plugin - deck.gl (MapLibre)",
   "keywords": [
     "superset"
   ],
@@ -12,7 +12,7 @@
   "repository": {
     "type": "git",
     "url": "https://github.com/apache/superset.git",
-    "directory": "superset-frontend/packages/legacy-preset-chart-deckgl"
+    "directory": "superset-frontend/plugins/preset-chart-deckgl"
   },
   "license": "Apache-2.0",
   "author": "Superset",
@@ -24,19 +24,18 @@
     "lib"
   ],
   "dependencies": {
-    "@deck.gl/aggregation-layers": "~9.2.5",
+    "@deck.gl/aggregation-layers": "~9.2.11",
     "@deck.gl/core": "~9.2.5",
-    "@deck.gl/extensions": "~9.2.5",
+    "@deck.gl/extensions": "~9.2.9",
     "@deck.gl/geo-layers": "~9.2.5",
     "@deck.gl/layers": "~9.2.5",
+    "@deck.gl/mapbox": "~9.3.1",
     "@deck.gl/mesh-layers": "~9.2.5",
-    "@deck.gl/react": "~9.2.5",
     "@luma.gl/constants": "~9.2.5",
     "@luma.gl/core": "~9.2.5",
     "@luma.gl/engine": "~9.2.6",
     "@luma.gl/shadertools": "~9.2.6",
     "@luma.gl/webgl": "~9.2.6",
-    "@mapbox/tiny-sdf": "^2.0.7",
     "@mapbox/geojson-extent": "^1.0.1",
     "@math.gl/web-mercator": "^4.1.0",
     "@types/d3-array": "^3.2.2",
@@ -45,12 +44,14 @@
     "d3-array": "^3.2.4",
     "d3-color": "^3.1.0",
     "d3-scale": "^4.0.2",
-    "handlebars": "^4.7.8",
-    "lodash": "^4.17.23",
+    "handlebars": "^4.7.9",
+    "lodash": "^4.18.1",
+    "maplibre-gl": "^5.23.0",
     "mousetrap": "^1.6.5",
     "ngeohash": "^0.6.3",
     "prop-types": "^15.8.1",
-    "underscore": "^1.13.8",
+    "react-map-gl": "^8.1.1",
+    "underscore": "^1.13.7",
     "urijs": "^1.19.11",
     "xss": "^1.0.15"
   },
@@ -65,10 +66,14 @@
     "@superset-ui/chart-controls": "*",
     "@superset-ui/core": "*",
     "dayjs": "^1.11.19",
-    "mapbox-gl": "*",
-    "react": "^17.0.2",
-    "react-dom": "^17.0.2",
-    "react-map-gl": "^6.1.19"
+    "mapbox-gl": ">=1.0.0",
+    "react": "^17.0.2 || ^19.0.0",
+    "react-dom": "^17.0.2 || ^19.0.0"
+  },
+  "peerDependenciesMeta": {
+    "mapbox-gl": {
+      "optional": true
+    }
   },
   "publishConfig": {
     "access": "public"
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/CategoricalDeckGLContainer.tsx b/superset-frontend/plugins/preset-chart-deckgl/src/CategoricalDeckGLContainer.tsx
similarity index 95%
rename from superset-frontend/plugins/legacy-preset-chart-deckgl/src/CategoricalDeckGLContainer.tsx
rename to superset-frontend/plugins/preset-chart-deckgl/src/CategoricalDeckGLContainer.tsx
index e032aefe282..afba0113056 100644
--- a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/CategoricalDeckGLContainer.tsx
+++ b/superset-frontend/plugins/preset-chart-deckgl/src/CategoricalDeckGLContainer.tsx
@@ -38,6 +38,7 @@ import {
 import type { Layer } from '@deck.gl/core';
 import Legend from './components/Legend';
 import { hexToRGB } from './utils/colors';
+import { getMapboxApiKey } from './utils/mapbox';
 import sandboxedEval from './utils/sandbox';
 import fitViewport, { Viewport } from './utils/fitViewport';
 import {
@@ -83,7 +84,6 @@ function getCategories(fd: QueryFormData, data: JsonObject[]) {
 export type CategoricalDeckGLContainerProps = {
   datasource: Datasource;
   formData: QueryFormData;
-  mapboxApiKey: string;
   getPoints: (data: JsonObject[]) => Point[];
   height: number;
   width: number;
@@ -155,7 +155,7 @@ const CategoricalDeckGLContainer = (props: CategoricalDeckGLContainerProps) => {
 
       switch (selectedColorScheme) {
         case COLOR_SCHEME_TYPES.fixed_color: {
-          color = fd.color_picker || { r: 0, g: 0, b: 0, a: 100 };
+          color = fd.color_picker || { r: 0, g: 0, b: 0, a: 1 };
           const colorArray = [color.r, color.g, color.b, color.a * 255];
 
           return data.map(d => ({ ...d, color: colorArray }));
@@ -166,7 +166,7 @@ const CategoricalDeckGLContainer = (props: CategoricalDeckGLContainerProps) => {
               r: 0,
               g: 0,
               b: 0,
-              a: 100,
+              a: 1,
             };
             const colorArray = [
               fallbackColor.r,
@@ -325,8 +325,15 @@ const CategoricalDeckGLContainer = (props: CategoricalDeckGLContainerProps) => {
         viewport={viewport}
         layers={getLayers()}
         setControlValue={props.setControlValue}
-        mapStyle={props.formData.mapbox_style}
-        mapboxApiAccessToken={props.mapboxApiKey}
+        mapStyle={
+          props.formData.map_renderer === 'mapbox'
+            ? props.formData.mapbox_style
+            : props.formData.maplibre_style
+        }
+        mapProvider={
+          props.formData.map_renderer === 'mapbox' ? 'mapbox' : 'maplibre'
+        }
+        mapboxApiKey={getMapboxApiKey()}
         width={props.width}
         height={props.height}
       />
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/DeckGLContainer.tsx b/superset-frontend/plugins/preset-chart-deckgl/src/DeckGLContainer.tsx
similarity index 64%
rename from superset-frontend/plugins/legacy-preset-chart-deckgl/src/DeckGLContainer.tsx
rename to superset-frontend/plugins/preset-chart-deckgl/src/DeckGLContainer.tsx
index d558532298d..c710d3a72d5 100644
--- a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/DeckGLContainer.tsx
+++ b/superset-frontend/plugins/preset-chart-deckgl/src/DeckGLContainer.tsx
@@ -1,7 +1,3 @@
-/* eslint-disable react/jsx-sort-default-props */
-/* eslint-disable react/sort-prop-types */
-/* eslint-disable react/jsx-handler-names */
-/* eslint-disable react/forbid-prop-types */
 /**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -30,32 +26,32 @@ import {
   useImperativeHandle,
   useState,
   isValidElement,
-  useRef,
 } from 'react';
 import { isEqual } from 'lodash';
-import { StaticMap } from 'react-map-gl';
-import DeckGL from '@deck.gl/react';
+import { Map as MapLibreMap } from 'react-map-gl/maplibre';
+import { Map as MapboxMap } from 'react-map-gl/mapbox';
+import mapboxgl from 'mapbox-gl';
 import type { Layer } from '@deck.gl/core';
 import { JsonObject, JsonValue, usePrevious } from '@superset-ui/core';
-import { styled } from '@apache-superset/core/theme';
-import { Device } from '@luma.gl/core';
+import { styled, useTheme } from '@apache-superset/core/theme';
+import { t } from '@apache-superset/core/translation';
+import DeckGLOverlayMapLibre from './components/DeckGLOverlayMapLibre';
+import DeckGLOverlayMapbox from './components/DeckGLOverlayMapbox';
 import Tooltip, { TooltipProps } from './components/Tooltip';
-import 'mapbox-gl/dist/mapbox-gl.css';
+import 'maplibre-gl/dist/maplibre-gl.css';
 import { Viewport } from './utils/fitViewport';
-import {
-  MAPBOX_LAYER_PREFIX,
-  OSM_LAYER_KEYWORDS,
-  TILE_LAYER_PREFIX,
-  buildTileLayer,
-} from './utils';
 
 const TICK = 250; // milliseconds
 
+const DEFAULT_MAP_STYLE =
+  'https://basemaps.cartocdn.com/gl/positron-gl-style/style.json';
+
 export type DeckGLContainerProps = {
   viewport: Viewport;
   setControlValue?: (control: string, value: JsonValue) => void;
   mapStyle?: string;
-  mapboxApiAccessToken: string;
+  mapProvider?: 'maplibre' | 'mapbox';
+  mapboxApiKey?: string;
   children?: ReactNode;
   width: number;
   height: number;
@@ -69,14 +65,6 @@ export const DeckGLContainer = memo(
     const [lastUpdate, setLastUpdate] = useState<number | null>(null);
     const [viewState, setViewState] = useState(props.viewport);
     const prevViewport = usePrevious(props.viewport);
-    const glContextRef = useRef<WebGL2RenderingContext | null>(null);
-
-    useEffect(
-      () => () => {
-        glContextRef.current?.getExtension('WEBGL_lose_context')?.loseContext();
-      },
-      [],
-    );
 
     useImperativeHandle(ref, () => ({ setTooltip }), []);
 
@@ -93,7 +81,7 @@ export const DeckGLContainer = memo(
 
     useEffect(() => {
       const timer = setInterval(tick, TICK);
-      return clearInterval(timer);
+      return () => clearInterval(timer);
     }, [tick]);
 
     useEffect(() => {
@@ -102,31 +90,12 @@ export const DeckGLContainer = memo(
       }
     }, [prevViewport, props.viewport]);
 
-    const onViewStateChange = useCallback(
-      ({ viewState }: { viewState: JsonObject }) => {
-        setViewState(viewState as Viewport);
-        setLastUpdate(Date.now());
-      },
-      [],
-    );
+    const onMove = useCallback((evt: { viewState: JsonObject }) => {
+      setViewState(evt.viewState as Viewport);
+      setLastUpdate(Date.now());
+    }, []);
 
     const layers = useCallback(() => {
-      if (
-        (props.mapStyle?.startsWith(TILE_LAYER_PREFIX) ||
-          OSM_LAYER_KEYWORDS.some((tilek: string) =>
-            props.mapStyle?.includes(tilek),
-          )) &&
-        props.layers.some(
-          l => typeof l !== 'function' && l?.id === 'tile-layer',
-        ) === false
-      ) {
-        props.layers.unshift(
-          buildTileLayer(
-            (props.mapStyle ?? '').replace(TILE_LAYER_PREFIX, ''),
-            'tile-layer',
-          ),
-        );
-      }
       // Support for layer factory
       if (props.layers.some(l => typeof l === 'function')) {
         return props.layers.map(l =>
@@ -135,7 +104,7 @@ export const DeckGLContainer = memo(
       }
 
       return props.layers as Layer[];
-    }, [props.layers, props.mapStyle]);
+    }, [props.layers]);
 
     const isCustomTooltip = (content: ReactNode): boolean =>
       isValidElement(content) &&
@@ -151,7 +120,35 @@ export const DeckGLContainer = memo(
       return <Tooltip tooltip={tooltipState} />;
     };
 
+    const theme = useTheme();
     const { children = null, height, width } = props;
+    const isMapbox = props.mapProvider === 'mapbox';
+    const mapStyle = props.mapStyle || DEFAULT_MAP_STYLE;
+
+    if (isMapbox && !props.mapboxApiKey) {
+      return (
+        <div
+          style={{
+            width,
+            height,
+            display: 'flex',
+            alignItems: 'center',
+            justifyContent: 'center',
+            padding: 16,
+            textAlign: 'center',
+            color: theme.colorTextSecondary,
+          }}
+        >
+          {t(
+            'Mapbox requires a MAPBOX_API_KEY to be configured on the server.',
+          )}
+        </div>
+      );
+    }
+
+    if (isMapbox && props.mapboxApiKey) {
+      mapboxgl.accessToken = props.mapboxApiKey;
+    }
 
     return (
       <>
@@ -162,28 +159,25 @@ export const DeckGLContainer = memo(
             e.stopPropagation();
           }}
         >
-          <DeckGL
-            controller
-            width={width}
-            height={height}
-            layers={layers()}
-            viewState={viewState}
-            onViewStateChange={onViewStateChange}
-            onAfterRender={(context: {
-              device: Device;
-              gl: WebGL2RenderingContext;
-            }) => {
-              glContextRef.current = context.gl;
-            }}
-          >
-            {props.mapStyle?.startsWith(MAPBOX_LAYER_PREFIX) && (
-              <StaticMap
-                preserveDrawingBuffer
-                mapStyle={props.mapStyle || 'light'}
-                mapboxApiAccessToken={props.mapboxApiAccessToken}
-              />
-            )}
-          </DeckGL>
+          {isMapbox ? (
+            <MapboxMap
+              {...viewState}
+              onMove={onMove}
+              mapStyle={mapStyle}
+              style={{ width, height }}
+            >
+              <DeckGLOverlayMapbox layers={layers()} />
+            </MapboxMap>
+          ) : (
+            <MapLibreMap
+              {...viewState}
+              onMove={onMove}
+              mapStyle={mapStyle}
+              style={{ width, height }}
+            >
+              <DeckGLOverlayMapLibre layers={layers()} />
+            </MapLibreMap>
+          )}
           {children}
         </div>
         {renderTooltip(tooltip)}
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/Multi/Multi.test.tsx b/superset-frontend/plugins/preset-chart-deckgl/src/Multi/Multi.test.tsx
similarity index 99%
rename from superset-frontend/plugins/legacy-preset-chart-deckgl/src/Multi/Multi.test.tsx
rename to superset-frontend/plugins/preset-chart-deckgl/src/Multi/Multi.test.tsx
index abce3761ad3..082c789c6a8 100644
--- a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/Multi/Multi.test.tsx
+++ b/superset-frontend/plugins/preset-chart-deckgl/src/Multi/Multi.test.tsx
@@ -58,7 +58,7 @@ const baseMockProps = {
     viz_type: 'deck_multi',
     deck_slices: [1, 2],
     autozoom: false,
-    mapbox_style: 'mapbox://styles/mapbox/light-v9',
+    map_style: 'mapbox://styles/mapbox/light-v9',
   },
   payload: {
     data: {
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/Multi/Multi.tsx b/superset-frontend/plugins/preset-chart-deckgl/src/Multi/Multi.tsx
similarity index 96%
rename from superset-frontend/plugins/legacy-preset-chart-deckgl/src/Multi/Multi.tsx
rename to superset-frontend/plugins/preset-chart-deckgl/src/Multi/Multi.tsx
index 3c52464a247..f88c9a7590f 100644
--- a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/Multi/Multi.tsx
+++ b/superset-frontend/plugins/preset-chart-deckgl/src/Multi/Multi.tsx
@@ -50,6 +50,7 @@ import {
 import { getExploreLongUrl } from '../utils/explore';
 import layerGenerators from '../layers';
 import fitViewport, { Viewport } from '../utils/fitViewport';
+import { getMapboxApiKey } from '../utils/mapbox';
 import { TooltipProps } from '../components/Tooltip';
 
 import { getPoints as getPointsArc } from '../layers/Arc/Arc';
@@ -377,7 +378,7 @@ const DeckMulti = (props: DeckMultiProps) => {
     );
 
     if (deckSlicesChanged || visibilityFilterChanged) {
-      loadLayers(formData, payload, undefined);
+      loadLayers(formData, payload, visibleDeckLayersFromRedux);
     }
   }, [
     loadLayers,
@@ -387,7 +388,7 @@ const DeckMulti = (props: DeckMultiProps) => {
     props,
   ]);
 
-  const { payload, formData, setControlValue, height, width } = props;
+  const { formData, setControlValue, height, width } = props;
 
   const layers = useMemo(
     () =>
@@ -401,10 +402,15 @@ const DeckMulti = (props: DeckMultiProps) => {
     <MultiWrapper height={height} width={width}>
       <DeckGLContainerStyledWrapper
         ref={containerRef}
-        mapboxApiAccessToken={payload.data.mapboxApiKey}
         viewport={viewport}
         layers={layers}
-        mapStyle={formData.mapbox_style}
+        mapStyle={
+          formData.map_renderer === 'mapbox'
+            ? formData.mapbox_style
+            : formData.maplibre_style
+        }
+        mapProvider={formData.map_renderer === 'mapbox' ? 'mapbox' : 'maplibre'}
+        mapboxApiKey={getMapboxApiKey()}
         setControlValue={setControlValue}
         onViewportChange={setViewport}
         height={height}
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/Multi/controlPanel.test.ts b/superset-frontend/plugins/preset-chart-deckgl/src/Multi/controlPanel.test.ts
similarity index 100%
rename from superset-frontend/plugins/legacy-preset-chart-deckgl/src/Multi/controlPanel.test.ts
rename to superset-frontend/plugins/preset-chart-deckgl/src/Multi/controlPanel.test.ts
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/Multi/controlPanel.ts b/superset-frontend/plugins/preset-chart-deckgl/src/Multi/controlPanel.ts
similarity index 94%
rename from superset-frontend/plugins/legacy-preset-chart-deckgl/src/Multi/controlPanel.ts
rename to superset-frontend/plugins/preset-chart-deckgl/src/Multi/controlPanel.ts
index da720d82868..8379345ad16 100644
--- a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/Multi/controlPanel.ts
+++ b/superset-frontend/plugins/preset-chart-deckgl/src/Multi/controlPanel.ts
@@ -18,7 +18,13 @@
  */
 import { t } from '@apache-superset/core/translation';
 import { validateNonEmpty } from '@superset-ui/core';
-import { viewport, mapboxStyle, autozoom } from '../utilities/Shared_DeckGL';
+import {
+  viewport,
+  mapboxStyle,
+  maplibreStyle,
+  mapProvider,
+  autozoom,
+} from '../utilities/Shared_DeckGL';
 
 export default {
   controlPanelSections: [
@@ -26,7 +32,9 @@ export default {
       label: t('Map'),
       expanded: true,
       controlSetRows: [
+        [mapProvider],
         [mapboxStyle],
+        [maplibreStyle],
         [viewport],
         [autozoom],
         [
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/Multi/images/example-dark.png b/superset-frontend/plugins/preset-chart-deckgl/src/Multi/images/example-dark.png
similarity index 100%
rename from superset-frontend/plugins/legacy-preset-chart-deckgl/src/Multi/images/example-dark.png
rename to superset-frontend/plugins/preset-chart-deckgl/src/Multi/images/example-dark.png
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/Multi/images/example.png b/superset-frontend/plugins/preset-chart-deckgl/src/Multi/images/example.png
similarity index 100%
rename from superset-frontend/plugins/legacy-preset-chart-deckgl/src/Multi/images/example.png
rename to superset-frontend/plugins/preset-chart-deckgl/src/Multi/images/example.png
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/Multi/images/thumbnail-dark.png b/superset-frontend/plugins/preset-chart-deckgl/src/Multi/images/thumbnail-dark.png
similarity index 100%
rename from superset-frontend/plugins/legacy-preset-chart-deckgl/src/Multi/images/thumbnail-dark.png
rename to superset-frontend/plugins/preset-chart-deckgl/src/Multi/images/thumbnail-dark.png
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/Multi/images/thumbnail.png b/superset-frontend/plugins/preset-chart-deckgl/src/Multi/images/thumbnail.png
similarity index 100%
rename from superset-frontend/plugins/legacy-preset-chart-deckgl/src/Multi/images/thumbnail.png
rename to superset-frontend/plugins/preset-chart-deckgl/src/Multi/images/thumbnail.png
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/Multi/images/thumbnailLarge.png b/superset-frontend/plugins/preset-chart-deckgl/src/Multi/images/thumbnailLarge.png
similarity index 100%
rename from superset-frontend/plugins/legacy-preset-chart-deckgl/src/Multi/images/thumbnailLarge.png
rename to superset-frontend/plugins/preset-chart-deckgl/src/Multi/images/thumbnailLarge.png
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/Multi/index.ts b/superset-frontend/plugins/preset-chart-deckgl/src/Multi/index.ts
similarity index 100%
rename from superset-frontend/plugins/legacy-preset-chart-deckgl/src/Multi/index.ts
rename to superset-frontend/plugins/preset-chart-deckgl/src/Multi/index.ts
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/TooltipRow.tsx b/superset-frontend/plugins/preset-chart-deckgl/src/TooltipRow.tsx
similarity index 100%
rename from superset-frontend/plugins/legacy-preset-chart-deckgl/src/TooltipRow.tsx
rename to superset-frontend/plugins/preset-chart-deckgl/src/TooltipRow.tsx
diff --git a/superset-frontend/plugins/preset-chart-deckgl/src/components/DeckGLOverlayMapLibre.tsx b/superset-frontend/plugins/preset-chart-deckgl/src/components/DeckGLOverlayMapLibre.tsx
new file mode 100644
index 00000000000..5e617464d89
--- /dev/null
+++ b/superset-frontend/plugins/preset-chart-deckgl/src/components/DeckGLOverlayMapLibre.tsx
@@ -0,0 +1,27 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+import { useControl } from 'react-map-gl/maplibre';
+import { MapboxOverlay } from '@deck.gl/mapbox';
+import type { MapboxOverlayProps } from '@deck.gl/mapbox';
+
+export default function DeckGLOverlayMapLibre(props: MapboxOverlayProps) {
+  const overlay = useControl<MapboxOverlay>(() => new MapboxOverlay(props));
+  overlay.setProps(props);
+  return null;
+}
diff --git a/superset-frontend/plugins/preset-chart-deckgl/src/components/DeckGLOverlayMapbox.tsx b/superset-frontend/plugins/preset-chart-deckgl/src/components/DeckGLOverlayMapbox.tsx
new file mode 100644
index 00000000000..57ce7d1461b
--- /dev/null
+++ b/superset-frontend/plugins/preset-chart-deckgl/src/components/DeckGLOverlayMapbox.tsx
@@ -0,0 +1,27 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+import { useControl } from 'react-map-gl/mapbox';
+import { MapboxOverlay } from '@deck.gl/mapbox';
+import type { MapboxOverlayProps } from '@deck.gl/mapbox';
+
+export default function DeckGLOverlayMapbox(props: MapboxOverlayProps) {
+  const overlay = useControl<MapboxOverlay>(() => new MapboxOverlay(props));
+  overlay.setProps(props);
+  return null;
+}
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/components/Legend.tsx b/superset-frontend/plugins/preset-chart-deckgl/src/components/Legend.tsx
similarity index 94%
rename from superset-frontend/plugins/legacy-preset-chart-deckgl/src/components/Legend.tsx
rename to superset-frontend/plugins/preset-chart-deckgl/src/components/Legend.tsx
index fe21ce2955d..32b995d08d8 100644
--- a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/components/Legend.tsx
+++ b/superset-frontend/plugins/preset-chart-deckgl/src/components/Legend.tsx
@@ -113,8 +113,14 @@ const Legend = ({
         <a
           href="#"
           role="button"
-          onClick={() => toggleCategory(k)}
-          onDoubleClick={() => showSingleCategory(k)}
+          onClick={e => {
+            e.preventDefault();
+            toggleCategory(k);
+          }}
+          onDoubleClick={e => {
+            e.preventDefault();
+            showSingleCategory(k);
+          }}
         >
           <span style={style}>{icon}</span> {formatCategoryLabel(k)}
         </a>
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/components/Tooltip.tsx b/superset-frontend/plugins/preset-chart-deckgl/src/components/Tooltip.tsx
similarity index 95%
rename from superset-frontend/plugins/legacy-preset-chart-deckgl/src/components/Tooltip.tsx
rename to superset-frontend/plugins/preset-chart-deckgl/src/components/Tooltip.tsx
index 11ed4219d7b..1eca2c1a77f 100644
--- a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/components/Tooltip.tsx
+++ b/superset-frontend/plugins/preset-chart-deckgl/src/components/Tooltip.tsx
@@ -42,8 +42,8 @@ const StyledDiv = styled.div<{
     position: absolute;
     top: ${top}px;
     left: ${left}px;
-    zIndex: 9;
-    pointerEvents: none;
+    z-index: 9;
+    pointer-events: none;
     ${
       variant === 'default'
         ? `
@@ -51,8 +51,8 @@ const StyledDiv = styled.div<{
       margin: ${theme.sizeUnit * 2}px;
       background: ${theme.colorBgElevated};
       color: ${theme.colorText};
-      maxWidth: 300px;
-      fontSize: ${theme.fontSizeSM}px;
+      max-width: 300px;
+      font-size: ${theme.fontSizeSM}px;
       border: 1px solid ${theme.colorBorder};
       border-radius: ${theme.borderRadius}px;
       box-shadow: ${theme.boxShadowSecondary};
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/factory.tsx b/superset-frontend/plugins/preset-chart-deckgl/src/factory.tsx
similarity index 94%
rename from superset-frontend/plugins/legacy-preset-chart-deckgl/src/factory.tsx
rename to superset-frontend/plugins/preset-chart-deckgl/src/factory.tsx
index bc48a52a377..dbe39936391 100644
--- a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/factory.tsx
+++ b/superset-frontend/plugins/preset-chart-deckgl/src/factory.tsx
@@ -19,6 +19,7 @@
 import { memo, useCallback, useEffect, useRef, useState } from 'react';
 import { isEqual } from 'lodash';
 import type { Layer } from '@deck.gl/core';
+import { getMapboxApiKey } from './utils/mapbox';
 import {
   Datasource,
   QueryFormData,
@@ -182,16 +183,23 @@ export function createDeckGLComponent(
       }
     }, [computeLayers, prevFormData, prevFilterState, prevPayload, props]);
 
-    const { formData, payload, setControlValue, height, width } = props;
+    const { formData, setControlValue, height, width } = props;
 
     return (
       <div style={{ position: 'relative' }}>
         <DeckGLContainerStyledWrapper
           ref={containerRef}
-          mapboxApiAccessToken={payload.data.mapboxApiKey}
           viewport={viewport}
           layers={layers}
-          mapStyle={formData.mapbox_style}
+          mapStyle={
+            formData.map_renderer === 'mapbox'
+              ? formData.mapbox_style
+              : formData.maplibre_style
+          }
+          mapProvider={
+            formData.map_renderer === 'mapbox' ? 'mapbox' : 'maplibre'
+          }
+          mapboxApiKey={getMapboxApiKey()}
           setControlValue={setControlValue}
           width={width}
           height={height}
@@ -232,7 +240,6 @@ export function createCategoricalDeckGLComponent(
       <CategoricalDeckGLContainer
         datasource={datasource}
         formData={formData}
-        mapboxApiKey={payload.data.mapboxApiKey}
         setControlValue={setControlValue}
         viewport={viewport}
         getLayer={getLayer}
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/index.ts b/superset-frontend/plugins/preset-chart-deckgl/src/index.ts
similarity index 100%
rename from superset-frontend/plugins/legacy-preset-chart-deckgl/src/index.ts
rename to superset-frontend/plugins/preset-chart-deckgl/src/index.ts
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Arc/Arc.tsx b/superset-frontend/plugins/preset-chart-deckgl/src/layers/Arc/Arc.tsx
similarity index 100%
rename from superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Arc/Arc.tsx
rename to superset-frontend/plugins/preset-chart-deckgl/src/layers/Arc/Arc.tsx
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Arc/buildQuery.ts b/superset-frontend/plugins/preset-chart-deckgl/src/layers/Arc/buildQuery.ts
similarity index 100%
rename from superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Arc/buildQuery.ts
rename to superset-frontend/plugins/preset-chart-deckgl/src/layers/Arc/buildQuery.ts
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Arc/controlPanel.ts b/superset-frontend/plugins/preset-chart-deckgl/src/layers/Arc/controlPanel.ts
similarity index 96%
rename from superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Arc/controlPanel.ts
rename to superset-frontend/plugins/preset-chart-deckgl/src/layers/Arc/controlPanel.ts
index 46c5e44bde3..fdfb38eae90 100644
--- a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Arc/controlPanel.ts
+++ b/superset-frontend/plugins/preset-chart-deckgl/src/layers/Arc/controlPanel.ts
@@ -39,6 +39,8 @@ import {
   legendPosition,
   viewport,
   mapboxStyle,
+  maplibreStyle,
+  mapProvider,
   tooltipContents,
   tooltipTemplate,
   deckGLCategoricalColor,
@@ -86,7 +88,12 @@ const config: ControlPanelConfig = {
     },
     {
       label: t('Map'),
-      controlSetRows: [[mapboxStyle], [autozoom, viewport]],
+      controlSetRows: [
+        [mapProvider],
+        [mapboxStyle],
+        [maplibreStyle],
+        [autozoom, viewport],
+      ],
     },
     {
       label: t('Arc'),
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Arc/images/example-dark.png b/superset-frontend/plugins/preset-chart-deckgl/src/layers/Arc/images/example-dark.png
similarity index 100%
rename from superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Arc/images/example-dark.png
rename to superset-frontend/plugins/preset-chart-deckgl/src/layers/Arc/images/example-dark.png
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Arc/images/example.png b/superset-frontend/plugins/preset-chart-deckgl/src/layers/Arc/images/example.png
similarity index 100%
rename from superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Arc/images/example.png
rename to superset-frontend/plugins/preset-chart-deckgl/src/layers/Arc/images/example.png
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Arc/images/thumbnail-dark.png b/superset-frontend/plugins/preset-chart-deckgl/src/layers/Arc/images/thumbnail-dark.png
similarity index 100%
rename from superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Arc/images/thumbnail-dark.png
rename to superset-frontend/plugins/preset-chart-deckgl/src/layers/Arc/images/thumbnail-dark.png
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Arc/images/thumbnail.png b/superset-frontend/plugins/preset-chart-deckgl/src/layers/Arc/images/thumbnail.png
similarity index 100%
rename from superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Arc/images/thumbnail.png
rename to superset-frontend/plugins/preset-chart-deckgl/src/layers/Arc/images/thumbnail.png
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Arc/images/thumbnailLarge.png b/superset-frontend/plugins/preset-chart-deckgl/src/layers/Arc/images/thumbnailLarge.png
similarity index 100%
rename from superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Arc/images/thumbnailLarge.png
rename to superset-frontend/plugins/preset-chart-deckgl/src/layers/Arc/images/thumbnailLarge.png
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Arc/index.ts b/superset-frontend/plugins/preset-chart-deckgl/src/layers/Arc/index.ts
similarity index 100%
rename from superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Arc/index.ts
rename to superset-frontend/plugins/preset-chart-deckgl/src/layers/Arc/index.ts
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Arc/stories/Arc.stories.tsx b/superset-frontend/plugins/preset-chart-deckgl/src/layers/Arc/stories/Arc.stories.tsx
similarity index 93%
rename from superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Arc/stories/Arc.stories.tsx
rename to superset-frontend/plugins/preset-chart-deckgl/src/layers/Arc/stories/Arc.stories.tsx
index 645fc9a0fd4..c57e8c21419 100644
--- a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Arc/stories/Arc.stories.tsx
+++ b/superset-frontend/plugins/preset-chart-deckgl/src/layers/Arc/stories/Arc.stories.tsx
@@ -20,7 +20,7 @@
 /* eslint-disable sort-keys */
 /* eslint-disable no-magic-numbers */
 import { SuperChart } from '@superset-ui/core';
-import { ArcChartPlugin } from '@superset-ui/legacy-preset-chart-deckgl';
+import { ArcChartPlugin } from '@superset-ui/preset-chart-deckgl';
 import { withResizableChartDemo } from '@storybook-shared';
 import payload from './payload';
 import { dummyDatasource } from '@storybook-shared';
@@ -28,7 +28,7 @@ import { dummyDatasource } from '@storybook-shared';
 new ArcChartPlugin().configure({ key: 'deck_arc' }).register();
 
 export default {
-  title: 'Legacy Chart Plugins/legacy-preset-chart-deckgl/ArcChartPlugin',
+  title: 'Chart Plugins/preset-chart-deckgl/ArcChartPlugin',
   decorators: [withResizableChartDemo],
   args: {
     strokeWidth: 1,
@@ -90,7 +90,8 @@ export const ArcChartViz = ({
       row_limit: 5000,
       filter_nulls: true,
       adhoc_filters: [],
-      mapbox_style: 'https://tile.openstreetmap.org/{z}/{x}/{y}.png',
+      map_style:
+        'https://basemaps.cartocdn.com/gl/positron-gl-style/style.json',
       viewport: {
         altitude: 1.5,
         bearing: 8.546256357301871,
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Arc/stories/payload.ts b/superset-frontend/plugins/preset-chart-deckgl/src/layers/Arc/stories/payload.ts
similarity index 100%
rename from superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Arc/stories/payload.ts
rename to superset-frontend/plugins/preset-chart-deckgl/src/layers/Arc/stories/payload.ts
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Arc/transformProps.ts b/superset-frontend/plugins/preset-chart-deckgl/src/layers/Arc/transformProps.ts
similarity index 100%
rename from superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Arc/transformProps.ts
rename to superset-frontend/plugins/preset-chart-deckgl/src/layers/Arc/transformProps.ts
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Contour/Contour.tsx b/superset-frontend/plugins/preset-chart-deckgl/src/layers/Contour/Contour.tsx
similarity index 100%
rename from superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Contour/Contour.tsx
rename to superset-frontend/plugins/preset-chart-deckgl/src/layers/Contour/Contour.tsx
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Contour/buildQuery.ts b/superset-frontend/plugins/preset-chart-deckgl/src/layers/Contour/buildQuery.ts
similarity index 100%
rename from superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Contour/buildQuery.ts
rename to superset-frontend/plugins/preset-chart-deckgl/src/layers/Contour/buildQuery.ts
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Contour/controlPanel.ts b/superset-frontend/plugins/preset-chart-deckgl/src/layers/Contour/controlPanel.ts
similarity index 97%
rename from superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Contour/controlPanel.ts
rename to superset-frontend/plugins/preset-chart-deckgl/src/layers/Contour/controlPanel.ts
index ee53209ec30..dc394a32e05 100644
--- a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Contour/controlPanel.ts
+++ b/superset-frontend/plugins/preset-chart-deckgl/src/layers/Contour/controlPanel.ts
@@ -30,6 +30,8 @@ import {
   jsOnclickHref,
   jsTooltip,
   mapboxStyle,
+  maplibreStyle,
+  mapProvider,
   spatial,
   viewport,
   tooltipContents,
@@ -55,7 +57,9 @@ const config: ControlPanelConfig = {
       label: t('Map'),
       expanded: true,
       controlSetRows: [
+        [mapProvider],
         [mapboxStyle],
+        [maplibreStyle],
         [autozoom, viewport],
         [
           {
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Contour/getSafeCellSize.test.ts b/superset-frontend/plugins/preset-chart-deckgl/src/layers/Contour/getSafeCellSize.test.ts
similarity index 100%
rename from superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Contour/getSafeCellSize.test.ts
rename to superset-frontend/plugins/preset-chart-deckgl/src/layers/Contour/getSafeCellSize.test.ts
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Contour/getSafeCellSize.ts b/superset-frontend/plugins/preset-chart-deckgl/src/layers/Contour/getSafeCellSize.ts
similarity index 100%
rename from superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Contour/getSafeCellSize.ts
rename to superset-frontend/plugins/preset-chart-deckgl/src/layers/Contour/getSafeCellSize.ts
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Contour/images/example-dark.png b/superset-frontend/plugins/preset-chart-deckgl/src/layers/Contour/images/example-dark.png
similarity index 100%
rename from superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Contour/images/example-dark.png
rename to superset-frontend/plugins/preset-chart-deckgl/src/layers/Contour/images/example-dark.png
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Contour/images/example.png b/superset-frontend/plugins/preset-chart-deckgl/src/layers/Contour/images/example.png
similarity index 100%
rename from superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Contour/images/example.png
rename to superset-frontend/plugins/preset-chart-deckgl/src/layers/Contour/images/example.png
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Contour/images/thumbnail-dark.png b/superset-frontend/plugins/preset-chart-deckgl/src/layers/Contour/images/thumbnail-dark.png
similarity index 100%
rename from superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Contour/images/thumbnail-dark.png
rename to superset-frontend/plugins/preset-chart-deckgl/src/layers/Contour/images/thumbnail-dark.png
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Contour/images/thumbnail.png b/superset-frontend/plugins/preset-chart-deckgl/src/layers/Contour/images/thumbnail.png
similarity index 100%
rename from superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Contour/images/thumbnail.png
rename to superset-frontend/plugins/preset-chart-deckgl/src/layers/Contour/images/thumbnail.png
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Contour/images/thumbnailLarge.png b/superset-frontend/plugins/preset-chart-deckgl/src/layers/Contour/images/thumbnailLarge.png
similarity index 100%
rename from superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Contour/images/thumbnailLarge.png
rename to superset-frontend/plugins/preset-chart-deckgl/src/layers/Contour/images/thumbnailLarge.png
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Contour/index.ts b/superset-frontend/plugins/preset-chart-deckgl/src/layers/Contour/index.ts
similarity index 100%
rename from superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Contour/index.ts
rename to superset-frontend/plugins/preset-chart-deckgl/src/layers/Contour/index.ts
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Contour/transformProps.ts b/superset-frontend/plugins/preset-chart-deckgl/src/layers/Contour/transformProps.ts
similarity index 100%
rename from superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Contour/transformProps.ts
rename to superset-frontend/plugins/preset-chart-deckgl/src/layers/Contour/transformProps.ts
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Geojson/Geojson.test.ts b/superset-frontend/plugins/preset-chart-deckgl/src/layers/Geojson/Geojson.test.ts
similarity index 97%
rename from superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Geojson/Geojson.test.ts
rename to superset-frontend/plugins/preset-chart-deckgl/src/layers/Geojson/Geojson.test.ts
index bf3b8527df8..6f189dc8c58 100644
--- a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Geojson/Geojson.test.ts
+++ b/superset-frontend/plugins/preset-chart-deckgl/src/layers/Geojson/Geojson.test.ts
@@ -24,9 +24,10 @@ import {
   computeGeoJsonIconOptionsFromFormData,
 } from './Geojson';
 
-jest.mock('@deck.gl/react', () => ({
+jest.mock('react-map-gl/maplibre', () => ({
   __esModule: true,
-  default: () => null,
+  Map: () => null,
+  useControl: () => null,
 }));
 
 test('computeGeoJsonTextOptionsFromJsOutput returns an empty object for non-object input', () => {
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Geojson/Geojson.tsx b/superset-frontend/plugins/preset-chart-deckgl/src/layers/Geojson/Geojson.tsx
similarity index 97%
rename from superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Geojson/Geojson.tsx
rename to superset-frontend/plugins/preset-chart-deckgl/src/layers/Geojson/Geojson.tsx
index 4ccaaaa8dd7..bebe118c5f8 100644
--- a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Geojson/Geojson.tsx
+++ b/superset-frontend/plugins/preset-chart-deckgl/src/layers/Geojson/Geojson.tsx
@@ -123,6 +123,8 @@ function setTooltipContent(o: JsonObject) {
 }
 
 const getFillColor = (feature: JsonObject, filterStateValue: unknown[]) => {
+  const baseColor = feature?.properties?.fillColor;
+
   if (filterStateValue) {
     if (
       JSON.stringify(feature.geometry.coordinates) ===
@@ -131,11 +133,14 @@ const getFillColor = (feature: JsonObject, filterStateValue: unknown[]) => {
       return HIGHLIGHT_COLOR_ARRAY;
     }
 
-    const fillColor = feature?.properties?.fillColor;
-    fillColor[3] = 125;
-    return fillColor;
+    if (Array.isArray(baseColor) && baseColor.length >= 4) {
+      return [baseColor[0], baseColor[1], baseColor[2], 125];
+    }
+
+    return baseColor ?? HIGHLIGHT_COLOR_ARRAY;
   }
-  return feature?.properties?.fillColor;
+
+  return baseColor;
 };
 const getLineColor = (feature: JsonObject) => feature?.properties?.strokeColor;
 
@@ -410,10 +415,9 @@ const DeckGLGeoJson = (props: DeckGLGeoJsonProps) => {
   return (
     <DeckGLContainerStyledWrapper
       ref={containerRef}
-      mapboxApiAccessToken={payload.data.mapboxApiKey}
       viewport={viewport}
       layers={[layer]}
-      mapStyle={formData.mapbox_style}
+      mapStyle={formData.map_style}
       setControlValue={setControlValue}
       height={height}
       width={width}
diff --git a/superset-frontend/plugins/preset-chart-deckgl/src/layers/Geojson/buildQuery.ts b/superset-frontend/plugins/preset-chart-deckgl/src/layers/Geojson/buildQuery.ts
new file mode 100644
index 00000000000..67b5ddd2327
--- /dev/null
+++ b/superset-frontend/plugins/preset-chart-deckgl/src/layers/Geojson/buildQuery.ts
@@ -0,0 +1,86 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+import {
+  buildQueryContext,
+  ensureIsArray,
+  QueryFormColumn,
+  QueryObject,
+  QueryObjectFilterClause,
+  SqlaFormData,
+} from '@superset-ui/core';
+import {
+  addJsColumnsToColumns,
+  addTooltipColumnsToQuery,
+} from '../buildQueryUtils';
+
+export interface DeckGeoJsonFormData extends SqlaFormData {
+  geojson?: string;
+  filter_nulls?: boolean;
+  js_columns?: string[];
+  tooltip_contents?: unknown[];
+}
+
+export default function buildQuery(formData: DeckGeoJsonFormData) {
+  const {
+    geojson,
+    filter_nulls = true,
+    js_columns,
+    tooltip_contents,
+  } = formData;
+
+  if (!geojson) {
+    throw new Error('GeoJSON column is required for GeoJSON charts');
+  }
+
+  return buildQueryContext(formData, (baseQueryObject: QueryObject) => {
+    let columns: QueryFormColumn[] = [
+      ...ensureIsArray(baseQueryObject.columns || []),
+      geojson,
+    ];
+
+    // Add js_columns
+    const columnStrings = columns.map(col =>
+      typeof col === 'string' ? col : col.label || col.sqlExpression || '',
+    );
+    const withJsColumns = addJsColumnsToColumns(columnStrings, js_columns);
+    columns = withJsColumns as QueryFormColumn[];
+
+    // Add tooltip columns
+    columns = addTooltipColumnsToQuery(columns, tooltip_contents);
+
+    // Add null filter for geojson column
+    const filters: QueryObjectFilterClause[] = ensureIsArray(
+      baseQueryObject.filters || [],
+    );
+    if (filter_nulls) {
+      filters.push({ col: geojson, op: 'IS NOT NULL' });
+    }
+
+    return [
+      {
+        ...baseQueryObject,
+        columns,
+        metrics: [],
+        groupby: [],
+        filters,
+        is_timeseries: false,
+      },
+    ];
+  });
+}
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Geojson/controlPanel.ts b/superset-frontend/plugins/preset-chart-deckgl/src/layers/Geojson/controlPanel.ts
similarity index 98%
rename from superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Geojson/controlPanel.ts
rename to superset-frontend/plugins/preset-chart-deckgl/src/layers/Geojson/controlPanel.ts
index cfb8c89cba6..6326968bad9 100644
--- a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Geojson/controlPanel.ts
+++ b/superset-frontend/plugins/preset-chart-deckgl/src/layers/Geojson/controlPanel.ts
@@ -37,6 +37,8 @@ import {
   extruded,
   viewport,
   mapboxStyle,
+  maplibreStyle,
+  mapProvider,
   autozoom,
   lineWidth,
   tooltipContents,
@@ -79,7 +81,12 @@ const config: ControlPanelConfig = {
     },
     {
       label: t('Map'),
-      controlSetRows: [[mapboxStyle, viewport], [autozoom]],
+      controlSetRows: [
+        [mapProvider],
+        [mapboxStyle],
+        [maplibreStyle],
+        [viewport, autozoom],
+      ],
     },
     {
       label: t('GeoJson Settings'),
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Geojson/images/example-dark.png b/superset-frontend/plugins/preset-chart-deckgl/src/layers/Geojson/images/example-dark.png
similarity index 100%
rename from superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Geojson/images/example-dark.png
rename to superset-frontend/plugins/preset-chart-deckgl/src/layers/Geojson/images/example-dark.png
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Geojson/images/example.png b/superset-frontend/plugins/preset-chart-deckgl/src/layers/Geojson/images/example.png
similarity index 100%
rename from superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Geojson/images/example.png
rename to superset-frontend/plugins/preset-chart-deckgl/src/layers/Geojson/images/example.png
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Geojson/images/thumbnail-dark.png b/superset-frontend/plugins/preset-chart-deckgl/src/layers/Geojson/images/thumbnail-dark.png
similarity index 100%
rename from superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Geojson/images/thumbnail-dark.png
rename to superset-frontend/plugins/preset-chart-deckgl/src/layers/Geojson/images/thumbnail-dark.png
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Geojson/images/thumbnail.png b/superset-frontend/plugins/preset-chart-deckgl/src/layers/Geojson/images/thumbnail.png
similarity index 100%
rename from superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Geojson/images/thumbnail.png
rename to superset-frontend/plugins/preset-chart-deckgl/src/layers/Geojson/images/thumbnail.png
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Geojson/images/thumbnailLarge.png b/superset-frontend/plugins/preset-chart-deckgl/src/layers/Geojson/images/thumbnailLarge.png
similarity index 100%
rename from superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Geojson/images/thumbnailLarge.png
rename to superset-frontend/plugins/preset-chart-deckgl/src/layers/Geojson/images/thumbnailLarge.png
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Geojson/index.ts b/superset-frontend/plugins/preset-chart-deckgl/src/layers/Geojson/index.ts
similarity index 94%
rename from superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Geojson/index.ts
rename to superset-frontend/plugins/preset-chart-deckgl/src/layers/Geojson/index.ts
index 9b2a8733b1e..618beff2b46 100644
--- a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Geojson/index.ts
+++ b/superset-frontend/plugins/preset-chart-deckgl/src/layers/Geojson/index.ts
@@ -22,7 +22,6 @@ import thumbnail from './images/thumbnail.png';
 import thumbnailDark from './images/thumbnail-dark.png';
 import example from './images/example.png';
 import exampleDark from './images/example-dark.png';
-import transformProps from '../../transformProps';
 import controlPanel from './controlPanel';
 
 const metadata = new ChartMetadata({
@@ -35,7 +34,6 @@ const metadata = new ChartMetadata({
   name: t('deck.gl Geojson'),
   thumbnail,
   thumbnailDark,
-  useLegacyApi: true,
   tags: [t('deckGL'), t('2D')],
   behaviors: [Behavior.InteractiveChart],
 });
@@ -44,9 +42,10 @@ export default class GeojsonChartPlugin extends ChartPlugin {
   constructor() {
     super({
       loadChart: () => import('./Geojson'),
+      loadTransformProps: () => import('./transformProps'),
+      loadBuildQuery: () => import('./buildQuery'),
       controlPanel,
       metadata,
-      transformProps,
     });
   }
 }
diff --git a/superset-frontend/plugins/preset-chart-deckgl/src/layers/Geojson/transformProps.ts b/superset-frontend/plugins/preset-chart-deckgl/src/layers/Geojson/transformProps.ts
new file mode 100644
index 00000000000..572df299ade
--- /dev/null
+++ b/superset-frontend/plugins/preset-chart-deckgl/src/layers/Geojson/transformProps.ts
@@ -0,0 +1,50 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+import { ChartProps, getColumnLabel } from '@superset-ui/core';
+import { getRecordsFromQuery } from '../transformUtils';
+import { DataRecord } from '../spatialUtils';
+import { createBaseTransformResult } from '../transformUtils';
+
+export default function transformProps(chartProps: ChartProps) {
+  const { rawFormData: formData } = chartProps;
+  const geojsonCol = formData.geojson
+    ? getColumnLabel(formData.geojson)
+    : undefined;
+
+  if (!geojsonCol) {
+    return createBaseTransformResult(chartProps, []);
+  }
+
+  const records = getRecordsFromQuery(chartProps.queriesData);
+
+  // Parse each record's geojson column value (replicates backend DeckGeoJson.get_properties)
+  const features = records
+    .map((record: DataRecord) => {
+      const geojsonStr = record[geojsonCol];
+      if (geojsonStr == null) return null;
+      try {
+        return JSON.parse(String(geojsonStr));
+      } catch {
+        return null;
+      }
+    })
+    .filter(Boolean);
+
+  return createBaseTransformResult(chartProps, features);
+}
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Grid/Grid.tsx b/superset-frontend/plugins/preset-chart-deckgl/src/layers/Grid/Grid.tsx
similarity index 100%
rename from superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Grid/Grid.tsx
rename to superset-frontend/plugins/preset-chart-deckgl/src/layers/Grid/Grid.tsx
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Grid/buildQuery.ts b/superset-frontend/plugins/preset-chart-deckgl/src/layers/Grid/buildQuery.ts
similarity index 100%
rename from superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Grid/buildQuery.ts
rename to superset-frontend/plugins/preset-chart-deckgl/src/layers/Grid/buildQuery.ts
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Grid/controlPanel.ts b/superset-frontend/plugins/preset-chart-deckgl/src/layers/Grid/controlPanel.ts
similarity index 96%
rename from superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Grid/controlPanel.ts
rename to superset-frontend/plugins/preset-chart-deckgl/src/layers/Grid/controlPanel.ts
index c0a280e4b75..a6363ff5ef2 100644
--- a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Grid/controlPanel.ts
+++ b/superset-frontend/plugins/preset-chart-deckgl/src/layers/Grid/controlPanel.ts
@@ -34,6 +34,8 @@ import {
   viewport,
   spatial,
   mapboxStyle,
+  maplibreStyle,
+  mapProvider,
   tooltipContents,
   tooltipTemplate,
   legendPosition,
@@ -59,7 +61,9 @@ const config: ControlPanelConfig = {
     {
       label: t('Map'),
       controlSetRows: [
+        [mapProvider],
         [mapboxStyle],
+        [maplibreStyle],
         [viewport],
         ...generateDeckGLColorSchemeControls({
           defaultSchemeType: COLOR_SCHEME_TYPES.categorical_palette,
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Grid/images/example-dark.png b/superset-frontend/plugins/preset-chart-deckgl/src/layers/Grid/images/example-dark.png
similarity index 100%
rename from superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Grid/images/example-dark.png
rename to superset-frontend/plugins/preset-chart-deckgl/src/layers/Grid/images/example-dark.png
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Grid/images/example.png b/superset-frontend/plugins/preset-chart-deckgl/src/layers/Grid/images/example.png
similarity index 100%
rename from superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Grid/images/example.png
rename to superset-frontend/plugins/preset-chart-deckgl/src/layers/Grid/images/example.png
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Grid/images/thumbnail-dark.png b/superset-frontend/plugins/preset-chart-deckgl/src/layers/Grid/images/thumbnail-dark.png
similarity index 100%
rename from superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Grid/images/thumbnail-dark.png
rename to superset-frontend/plugins/preset-chart-deckgl/src/layers/Grid/images/thumbnail-dark.png
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Grid/images/thumbnail.png b/superset-frontend/plugins/preset-chart-deckgl/src/layers/Grid/images/thumbnail.png
similarity index 100%
rename from superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Grid/images/thumbnail.png
rename to superset-frontend/plugins/preset-chart-deckgl/src/layers/Grid/images/thumbnail.png
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Grid/images/thumbnailLarge.png b/superset-frontend/plugins/preset-chart-deckgl/src/layers/Grid/images/thumbnailLarge.png
similarity index 100%
rename from superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Grid/images/thumbnailLarge.png
rename to superset-frontend/plugins/preset-chart-deckgl/src/layers/Grid/images/thumbnailLarge.png
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Grid/index.ts b/superset-frontend/plugins/preset-chart-deckgl/src/layers/Grid/index.ts
similarity index 100%
rename from superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Grid/index.ts
rename to superset-frontend/plugins/preset-chart-deckgl/src/layers/Grid/index.ts
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Grid/stories/Grid.stories.tsx b/superset-frontend/plugins/preset-chart-deckgl/src/layers/Grid/stories/Grid.stories.tsx
similarity index 92%
rename from superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Grid/stories/Grid.stories.tsx
rename to superset-frontend/plugins/preset-chart-deckgl/src/layers/Grid/stories/Grid.stories.tsx
index 52e08bdd29e..6ef79fc2213 100644
--- a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Grid/stories/Grid.stories.tsx
+++ b/superset-frontend/plugins/preset-chart-deckgl/src/layers/Grid/stories/Grid.stories.tsx
@@ -20,14 +20,14 @@
 /* eslint-disable sort-keys */
 /* eslint-disable no-magic-numbers */
 import { SuperChart } from '@superset-ui/core';
-import { GridChartPlugin } from '@superset-ui/legacy-preset-chart-deckgl';
+import { GridChartPlugin } from '@superset-ui/preset-chart-deckgl';
 import { withResizableChartDemo, dummyDatasource } from '@storybook-shared';
 import payload from './payload';
 
 new GridChartPlugin().configure({ key: 'deck_grid' }).register();
 
 export default {
-  title: 'Legacy Chart Plugins/legacy-preset-chart-deckgl/GridChartPlugin',
+  title: 'Chart Plugins/preset-chart-deckgl/GridChartPlugin',
   decorators: [withResizableChartDemo],
   args: {
     gridSize: 120,
@@ -79,7 +79,8 @@ export const GridChartViz = ({
       row_limit: 5000,
       filter_nulls: true,
       adhoc_filters: [],
-      mapbox_style: 'https://tile.openstreetmap.org/{z}/{x}/{y}.png',
+      map_style:
+        'https://basemaps.cartocdn.com/gl/positron-gl-style/style.json',
       viewport: {
         bearing: 155.80099696026355,
         latitude: 37.7942314882596,
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Grid/stories/payload.ts b/superset-frontend/plugins/preset-chart-deckgl/src/layers/Grid/stories/payload.ts
similarity index 100%
rename from superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Grid/stories/payload.ts
rename to superset-frontend/plugins/preset-chart-deckgl/src/layers/Grid/stories/payload.ts
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Grid/transformProps.ts b/superset-frontend/plugins/preset-chart-deckgl/src/layers/Grid/transformProps.ts
similarity index 100%
rename from superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Grid/transformProps.ts
rename to superset-frontend/plugins/preset-chart-deckgl/src/layers/Grid/transformProps.ts
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Heatmap/Heatmap.tsx b/superset-frontend/plugins/preset-chart-deckgl/src/layers/Heatmap/Heatmap.tsx
similarity index 95%
rename from superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Heatmap/Heatmap.tsx
rename to superset-frontend/plugins/preset-chart-deckgl/src/layers/Heatmap/Heatmap.tsx
index 4fffc554080..963ddcdbd62 100644
--- a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Heatmap/Heatmap.tsx
+++ b/superset-frontend/plugins/preset-chart-deckgl/src/layers/Heatmap/Heatmap.tsx
@@ -50,11 +50,11 @@ function setTooltipContent(formData: QueryFormData) {
           label={`${t('Longitude and Latitude')}: `}
           value={`${lon?.toFixed(6)}, ${lat?.toFixed(6)}`}
         />
-        <TooltipRow label="LON: " value={lon?.toFixed(6)} />
-        <TooltipRow label="LAT: " value={lat?.toFixed(6)} />
+        <TooltipRow label={`${t('LON')}: `} value={lon?.toFixed(6)} />
+        <TooltipRow label={`${t('LAT')}: `} value={lat?.toFixed(6)} />
         <TooltipRow
           label={`${metricLabel}: `}
-          value={`${o.object?.weight || o.object?.value || 'Aggregated Cell'}`}
+          value={`${o.object?.weight ?? o.object?.value ?? 'Aggregated Cell'}`}
         />
         {hasCustomTooltip && !hasObjectData && (
           <TooltipRow
@@ -188,7 +188,7 @@ export const getHighlightLayer: GetLayerType<HeatmapLayer> = ({
   );
 
   return new HeatmapLayer({
-    id: `heatmap-layer-${fd.slice_id}` as const,
+    id: `heatmap-highlight-layer-${fd.slice_id}` as const,
     data: dataInside,
     intensity,
     radiusPixels,
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Heatmap/buildQuery.ts b/superset-frontend/plugins/preset-chart-deckgl/src/layers/Heatmap/buildQuery.ts
similarity index 100%
rename from superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Heatmap/buildQuery.ts
rename to superset-frontend/plugins/preset-chart-deckgl/src/layers/Heatmap/buildQuery.ts
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Heatmap/controlPanel.ts b/superset-frontend/plugins/preset-chart-deckgl/src/layers/Heatmap/controlPanel.ts
similarity index 98%
rename from superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Heatmap/controlPanel.ts
rename to superset-frontend/plugins/preset-chart-deckgl/src/layers/Heatmap/controlPanel.ts
index efeda7d0b15..9501ade372f 100644
--- a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Heatmap/controlPanel.ts
+++ b/superset-frontend/plugins/preset-chart-deckgl/src/layers/Heatmap/controlPanel.ts
@@ -37,6 +37,8 @@ import {
   jsOnclickHref,
   jsTooltip,
   mapboxStyle,
+  maplibreStyle,
+  mapProvider,
   spatial,
   viewport,
   tooltipContents,
@@ -105,7 +107,9 @@ const config: ControlPanelConfig = {
     {
       label: t('Map'),
       controlSetRows: [
+        [mapProvider],
         [mapboxStyle],
+        [maplibreStyle],
         [viewport],
         [
           {
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Heatmap/images/example-dark.png b/superset-frontend/plugins/preset-chart-deckgl/src/layers/Heatmap/images/example-dark.png
similarity index 100%
rename from superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Heatmap/images/example-dark.png
rename to superset-frontend/plugins/preset-chart-deckgl/src/layers/Heatmap/images/example-dark.png
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Heatmap/images/example.png b/superset-frontend/plugins/preset-chart-deckgl/src/layers/Heatmap/images/example.png
similarity index 100%
rename from superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Heatmap/images/example.png
rename to superset-frontend/plugins/preset-chart-deckgl/src/layers/Heatmap/images/example.png
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Heatmap/images/thumbnail-dark.png b/superset-frontend/plugins/preset-chart-deckgl/src/layers/Heatmap/images/thumbnail-dark.png
similarity index 100%
rename from superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Heatmap/images/thumbnail-dark.png
rename to superset-frontend/plugins/preset-chart-deckgl/src/layers/Heatmap/images/thumbnail-dark.png
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Heatmap/images/thumbnail.png b/superset-frontend/plugins/preset-chart-deckgl/src/layers/Heatmap/images/thumbnail.png
similarity index 100%
rename from superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Heatmap/images/thumbnail.png
rename to superset-frontend/plugins/preset-chart-deckgl/src/layers/Heatmap/images/thumbnail.png
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Heatmap/images/thumbnailLarge.png b/superset-frontend/plugins/preset-chart-deckgl/src/layers/Heatmap/images/thumbnailLarge.png
similarity index 100%
rename from superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Heatmap/images/thumbnailLarge.png
rename to superset-frontend/plugins/preset-chart-deckgl/src/layers/Heatmap/images/thumbnailLarge.png
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Heatmap/index.ts b/superset-frontend/plugins/preset-chart-deckgl/src/layers/Heatmap/index.ts
similarity index 100%
rename from superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Heatmap/index.ts
rename to superset-frontend/plugins/preset-chart-deckgl/src/layers/Heatmap/index.ts
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Heatmap/transformProps.ts b/superset-frontend/plugins/preset-chart-deckgl/src/layers/Heatmap/transformProps.ts
similarity index 100%
rename from superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Heatmap/transformProps.ts
rename to superset-frontend/plugins/preset-chart-deckgl/src/layers/Heatmap/transformProps.ts
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Hex/Hex.tsx b/superset-frontend/plugins/preset-chart-deckgl/src/layers/Hex/Hex.tsx
similarity index 100%
rename from superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Hex/Hex.tsx
rename to superset-frontend/plugins/preset-chart-deckgl/src/layers/Hex/Hex.tsx
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Hex/buildQuery.ts b/superset-frontend/plugins/preset-chart-deckgl/src/layers/Hex/buildQuery.ts
similarity index 100%
rename from superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Hex/buildQuery.ts
rename to superset-frontend/plugins/preset-chart-deckgl/src/layers/Hex/buildQuery.ts
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Hex/controlPanel.ts b/superset-frontend/plugins/preset-chart-deckgl/src/layers/Hex/controlPanel.ts
similarity index 97%
rename from superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Hex/controlPanel.ts
rename to superset-frontend/plugins/preset-chart-deckgl/src/layers/Hex/controlPanel.ts
index df0cf267ed8..d1f53eae519 100644
--- a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Hex/controlPanel.ts
+++ b/superset-frontend/plugins/preset-chart-deckgl/src/layers/Hex/controlPanel.ts
@@ -32,6 +32,8 @@ import {
   jsOnclickHref,
   jsTooltip,
   mapboxStyle,
+  maplibreStyle,
+  mapProvider,
   spatial,
   viewport,
   tooltipContents,
@@ -57,7 +59,9 @@ const config: ControlPanelConfig = {
     {
       label: t('Map'),
       controlSetRows: [
+        [mapProvider],
         [mapboxStyle],
+        [maplibreStyle],
         ...generateDeckGLColorSchemeControls({
           defaultSchemeType: COLOR_SCHEME_TYPES.categorical_palette,
           disableCategoricalColumn: true,
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Hex/images/example-dark.png b/superset-frontend/plugins/preset-chart-deckgl/src/layers/Hex/images/example-dark.png
similarity index 100%
rename from superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Hex/images/example-dark.png
rename to superset-frontend/plugins/preset-chart-deckgl/src/layers/Hex/images/example-dark.png
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Hex/images/example.png b/superset-frontend/plugins/preset-chart-deckgl/src/layers/Hex/images/example.png
similarity index 100%
rename from superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Hex/images/example.png
rename to superset-frontend/plugins/preset-chart-deckgl/src/layers/Hex/images/example.png
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Hex/images/thumbnail-dark.png b/superset-frontend/plugins/preset-chart-deckgl/src/layers/Hex/images/thumbnail-dark.png
similarity index 100%
rename from superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Hex/images/thumbnail-dark.png
rename to superset-frontend/plugins/preset-chart-deckgl/src/layers/Hex/images/thumbnail-dark.png
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Hex/images/thumbnail.png b/superset-frontend/plugins/preset-chart-deckgl/src/layers/Hex/images/thumbnail.png
similarity index 100%
rename from superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Hex/images/thumbnail.png
rename to superset-frontend/plugins/preset-chart-deckgl/src/layers/Hex/images/thumbnail.png
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Hex/images/thumbnailLarge.png b/superset-frontend/plugins/preset-chart-deckgl/src/layers/Hex/images/thumbnailLarge.png
similarity index 100%
rename from superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Hex/images/thumbnailLarge.png
rename to superset-frontend/plugins/preset-chart-deckgl/src/layers/Hex/images/thumbnailLarge.png
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Hex/index.ts b/superset-frontend/plugins/preset-chart-deckgl/src/layers/Hex/index.ts
similarity index 100%
rename from superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Hex/index.ts
rename to superset-frontend/plugins/preset-chart-deckgl/src/layers/Hex/index.ts
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Hex/stories/Hex.stories.tsx b/superset-frontend/plugins/preset-chart-deckgl/src/layers/Hex/stories/Hex.stories.tsx
similarity index 92%
rename from superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Hex/stories/Hex.stories.tsx
rename to superset-frontend/plugins/preset-chart-deckgl/src/layers/Hex/stories/Hex.stories.tsx
index 9a308eea41d..756f1733a5d 100644
--- a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Hex/stories/Hex.stories.tsx
+++ b/superset-frontend/plugins/preset-chart-deckgl/src/layers/Hex/stories/Hex.stories.tsx
@@ -20,14 +20,14 @@
 /* eslint-disable sort-keys */
 /* eslint-disable no-magic-numbers */
 import { SuperChart } from '@superset-ui/core';
-import { HexChartPlugin } from '@superset-ui/legacy-preset-chart-deckgl';
+import { HexChartPlugin } from '@superset-ui/preset-chart-deckgl';
 import { withResizableChartDemo, dummyDatasource } from '@storybook-shared';
 import payload from './payload';
 
 new HexChartPlugin().configure({ key: 'deck_hex' }).register();
 
 export default {
-  title: 'Legacy Chart Plugins/legacy-preset-chart-deckgl/HexChartPlugin',
+  title: 'Chart Plugins/preset-chart-deckgl/HexChartPlugin',
   decorators: [withResizableChartDemo],
   args: {
     gridSize: 40,
@@ -79,7 +79,8 @@ export const HexChartViz = ({
       row_limit: 5000,
       filter_nulls: true,
       adhoc_filters: [],
-      mapbox_style: 'https://tile.openstreetmap.org/{z}/{x}/{y}.png',
+      map_style:
+        'https://basemaps.cartocdn.com/gl/positron-gl-style/style.json',
       viewport: {
         bearing: -2.3984797349335167,
         latitude: 37.789795085160335,
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Hex/stories/payload.ts b/superset-frontend/plugins/preset-chart-deckgl/src/layers/Hex/stories/payload.ts
similarity index 100%
rename from superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Hex/stories/payload.ts
rename to superset-frontend/plugins/preset-chart-deckgl/src/layers/Hex/stories/payload.ts
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Hex/transformProps.ts b/superset-frontend/plugins/preset-chart-deckgl/src/layers/Hex/transformProps.ts
similarity index 100%
rename from superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Hex/transformProps.ts
rename to superset-frontend/plugins/preset-chart-deckgl/src/layers/Hex/transformProps.ts
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Path/Path.test.tsx b/superset-frontend/plugins/preset-chart-deckgl/src/layers/Path/Path.test.tsx
similarity index 100%
rename from superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Path/Path.test.tsx
rename to superset-frontend/plugins/preset-chart-deckgl/src/layers/Path/Path.test.tsx
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Path/Path.tsx b/superset-frontend/plugins/preset-chart-deckgl/src/layers/Path/Path.tsx
similarity index 99%
rename from superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Path/Path.tsx
rename to superset-frontend/plugins/preset-chart-deckgl/src/layers/Path/Path.tsx
index 7408676df70..83fa5802750 100644
--- a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Path/Path.tsx
+++ b/superset-frontend/plugins/preset-chart-deckgl/src/layers/Path/Path.tsx
@@ -116,7 +116,7 @@ export const getHighlightLayer: GetLayerType<PathLayer> = function ({
 
   const filteredData = data.filter(
     (d: JsonObject) =>
-      JSON.stringify(d.path).replaceAll(' ', '') === filterState?.value[0],
+      JSON.stringify(d.path).replaceAll(' ', '') === filterState?.value?.[0],
   );
 
   return new PathLayer({
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Path/buildQuery.ts b/superset-frontend/plugins/preset-chart-deckgl/src/layers/Path/buildQuery.ts
similarity index 100%
rename from superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Path/buildQuery.ts
rename to superset-frontend/plugins/preset-chart-deckgl/src/layers/Path/buildQuery.ts
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Path/controlPanel.ts b/superset-frontend/plugins/preset-chart-deckgl/src/layers/Path/controlPanel.ts
similarity index 97%
rename from superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Path/controlPanel.ts
rename to superset-frontend/plugins/preset-chart-deckgl/src/layers/Path/controlPanel.ts
index 82248cc4923..14673499680 100644
--- a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Path/controlPanel.ts
+++ b/superset-frontend/plugins/preset-chart-deckgl/src/layers/Path/controlPanel.ts
@@ -30,6 +30,8 @@ import {
   lineType,
   reverseLongLat,
   mapboxStyle,
+  maplibreStyle,
+  mapProvider,
   tooltipContents,
   tooltipTemplate,
 } from '../../utilities/Shared_DeckGL';
@@ -65,7 +67,9 @@ const config: ControlPanelConfig = {
       label: t('Map'),
       expanded: true,
       controlSetRows: [
+        [mapProvider],
         [mapboxStyle],
+        [maplibreStyle],
         [viewport],
         ['color_picker'],
         [lineWidth],
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Path/images/example-dark.png b/superset-frontend/plugins/preset-chart-deckgl/src/layers/Path/images/example-dark.png
similarity index 100%
rename from superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Path/images/example-dark.png
rename to superset-frontend/plugins/preset-chart-deckgl/src/layers/Path/images/example-dark.png
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Path/images/example.png b/superset-frontend/plugins/preset-chart-deckgl/src/layers/Path/images/example.png
similarity index 100%
rename from superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Path/images/example.png
rename to superset-frontend/plugins/preset-chart-deckgl/src/layers/Path/images/example.png
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Path/images/thumbnail-dark.png b/superset-frontend/plugins/preset-chart-deckgl/src/layers/Path/images/thumbnail-dark.png
similarity index 100%
rename from superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Path/images/thumbnail-dark.png
rename to superset-frontend/plugins/preset-chart-deckgl/src/layers/Path/images/thumbnail-dark.png
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Path/images/thumbnail.png b/superset-frontend/plugins/preset-chart-deckgl/src/layers/Path/images/thumbnail.png
similarity index 100%
rename from superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Path/images/thumbnail.png
rename to superset-frontend/plugins/preset-chart-deckgl/src/layers/Path/images/thumbnail.png
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Path/images/thumbnailLarge.png b/superset-frontend/plugins/preset-chart-deckgl/src/layers/Path/images/thumbnailLarge.png
similarity index 100%
rename from superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Path/images/thumbnailLarge.png
rename to superset-frontend/plugins/preset-chart-deckgl/src/layers/Path/images/thumbnailLarge.png
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Path/index.ts b/superset-frontend/plugins/preset-chart-deckgl/src/layers/Path/index.ts
similarity index 100%
rename from superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Path/index.ts
rename to superset-frontend/plugins/preset-chart-deckgl/src/layers/Path/index.ts
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Path/stories/Path.stories.tsx b/superset-frontend/plugins/preset-chart-deckgl/src/layers/Path/stories/Path.stories.tsx
similarity index 92%
rename from superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Path/stories/Path.stories.tsx
rename to superset-frontend/plugins/preset-chart-deckgl/src/layers/Path/stories/Path.stories.tsx
index 0d5651ad946..0738a17868c 100644
--- a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Path/stories/Path.stories.tsx
+++ b/superset-frontend/plugins/preset-chart-deckgl/src/layers/Path/stories/Path.stories.tsx
@@ -21,14 +21,14 @@
 /* eslint-disable no-magic-numbers */
 import { SuperChart } from '@superset-ui/core';
 import { useTheme } from '@apache-superset/core/theme';
-import { PathChartPlugin } from '@superset-ui/legacy-preset-chart-deckgl';
+import { PathChartPlugin } from '@superset-ui/preset-chart-deckgl';
 import { withResizableChartDemo, dummyDatasource } from '@storybook-shared';
 import payload from './payload';
 
 new PathChartPlugin().configure({ key: 'deck_path' }).register();
 
 export default {
-  title: 'Legacy Chart Plugins/legacy-preset-chart-deckgl/PathChartPlugin',
+  title: 'Chart Plugins/preset-chart-deckgl/PathChartPlugin',
   decorators: [withResizableChartDemo],
   args: {
     lineWidth: 150,
@@ -75,7 +75,8 @@ export const PathChartViz = ({
         row_limit: 5000,
         filter_nulls: true,
         adhoc_filters: [],
-        mapbox_style: 'https://tile.openstreetmap.org/{z}/{x}/{y}.png',
+        map_style:
+          'https://basemaps.cartocdn.com/gl/positron-gl-style/style.json',
         viewport: {
           altitude: 1.5,
           bearing: 0,
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Path/stories/payload.ts b/superset-frontend/plugins/preset-chart-deckgl/src/layers/Path/stories/payload.ts
similarity index 100%
rename from superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Path/stories/payload.ts
rename to superset-frontend/plugins/preset-chart-deckgl/src/layers/Path/stories/payload.ts
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Path/transformProps.ts b/superset-frontend/plugins/preset-chart-deckgl/src/layers/Path/transformProps.ts
similarity index 100%
rename from superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Path/transformProps.ts
rename to superset-frontend/plugins/preset-chart-deckgl/src/layers/Path/transformProps.ts
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Polygon/Polygon.test.tsx b/superset-frontend/plugins/preset-chart-deckgl/src/layers/Polygon/Polygon.test.tsx
similarity index 99%
rename from superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Polygon/Polygon.test.tsx
rename to superset-frontend/plugins/preset-chart-deckgl/src/layers/Polygon/Polygon.test.tsx
index d6e1d640228..d107dc42771 100644
--- a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Polygon/Polygon.test.tsx
+++ b/superset-frontend/plugins/preset-chart-deckgl/src/layers/Polygon/Polygon.test.tsx
@@ -60,7 +60,7 @@ const mockProps = {
     legend_position: 'tr',
     legend_format: '.2f',
     autozoom: false,
-    mapbox_style: 'mapbox://styles/mapbox/light-v9',
+    map_style: 'mapbox://styles/mapbox/light-v9',
     opacity: 80,
     filled: true,
     stroked: true,
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Polygon/Polygon.tsx b/superset-frontend/plugins/preset-chart-deckgl/src/layers/Polygon/Polygon.tsx
similarity index 99%
rename from superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Polygon/Polygon.tsx
rename to superset-frontend/plugins/preset-chart-deckgl/src/layers/Polygon/Polygon.tsx
index 0a4d8088b28..08ece720b85 100644
--- a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Polygon/Polygon.tsx
+++ b/superset-frontend/plugins/preset-chart-deckgl/src/layers/Polygon/Polygon.tsx
@@ -347,8 +347,7 @@ const DeckGLPolygon = (props: DeckGLPolygonProps) => {
         viewport={viewport}
         layers={getLayers()}
         setControlValue={setControlValue}
-        mapStyle={formData.mapbox_style}
-        mapboxApiAccessToken={payload.data.mapboxApiKey}
+        mapStyle={formData.map_style}
         width={props.width}
         height={props.height}
       />
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Polygon/buildQuery.test.ts b/superset-frontend/plugins/preset-chart-deckgl/src/layers/Polygon/buildQuery.test.ts
similarity index 100%
rename from superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Polygon/buildQuery.test.ts
rename to superset-frontend/plugins/preset-chart-deckgl/src/layers/Polygon/buildQuery.test.ts
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Polygon/buildQuery.ts b/superset-frontend/plugins/preset-chart-deckgl/src/layers/Polygon/buildQuery.ts
similarity index 100%
rename from superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Polygon/buildQuery.ts
rename to superset-frontend/plugins/preset-chart-deckgl/src/layers/Polygon/buildQuery.ts
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Polygon/controlPanel.ts b/superset-frontend/plugins/preset-chart-deckgl/src/layers/Polygon/controlPanel.ts
similarity index 97%
rename from superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Polygon/controlPanel.ts
rename to superset-frontend/plugins/preset-chart-deckgl/src/layers/Polygon/controlPanel.ts
index 45198a9d291..010e079d00f 100644
--- a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Polygon/controlPanel.ts
+++ b/superset-frontend/plugins/preset-chart-deckgl/src/layers/Polygon/controlPanel.ts
@@ -44,6 +44,8 @@ import {
   lineType,
   reverseLongLat,
   mapboxStyle,
+  maplibreStyle,
+  mapProvider,
   deckGLCategoricalColorSchemeTypeSelect,
   deckGLLinearColorSchemeSelect,
   deckGLColorBreakpointsSelect,
@@ -98,7 +100,13 @@ const config: ControlPanelConfig = {
     {
       label: t('Map'),
       expanded: true,
-      controlSetRows: [[mapboxStyle], [viewport], [autozoom]],
+      controlSetRows: [
+        [mapProvider],
+        [mapboxStyle],
+        [maplibreStyle],
+        [viewport],
+        [autozoom],
+      ],
     },
     {
       label: t('Polygon Settings'),
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Polygon/images/example-dark.png b/superset-frontend/plugins/preset-chart-deckgl/src/layers/Polygon/images/example-dark.png
similarity index 100%
rename from superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Polygon/images/example-dark.png
rename to superset-frontend/plugins/preset-chart-deckgl/src/layers/Polygon/images/example-dark.png
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Polygon/images/example.png b/superset-frontend/plugins/preset-chart-deckgl/src/layers/Polygon/images/example.png
similarity index 100%
rename from superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Polygon/images/example.png
rename to superset-frontend/plugins/preset-chart-deckgl/src/layers/Polygon/images/example.png
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Polygon/images/thumbnail-dark.png b/superset-frontend/plugins/preset-chart-deckgl/src/layers/Polygon/images/thumbnail-dark.png
similarity index 100%
rename from superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Polygon/images/thumbnail-dark.png
rename to superset-frontend/plugins/preset-chart-deckgl/src/layers/Polygon/images/thumbnail-dark.png
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Polygon/images/thumbnail.png b/superset-frontend/plugins/preset-chart-deckgl/src/layers/Polygon/images/thumbnail.png
similarity index 100%
rename from superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Polygon/images/thumbnail.png
rename to superset-frontend/plugins/preset-chart-deckgl/src/layers/Polygon/images/thumbnail.png
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Polygon/images/thumbnailLarge.png b/superset-frontend/plugins/preset-chart-deckgl/src/layers/Polygon/images/thumbnailLarge.png
similarity index 100%
rename from superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Polygon/images/thumbnailLarge.png
rename to superset-frontend/plugins/preset-chart-deckgl/src/layers/Polygon/images/thumbnailLarge.png
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Polygon/index.ts b/superset-frontend/plugins/preset-chart-deckgl/src/layers/Polygon/index.ts
similarity index 100%
rename from superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Polygon/index.ts
rename to superset-frontend/plugins/preset-chart-deckgl/src/layers/Polygon/index.ts
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Polygon/stories/Polygon.stories.tsx b/superset-frontend/plugins/preset-chart-deckgl/src/layers/Polygon/stories/Polygon.stories.tsx
similarity index 94%
rename from superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Polygon/stories/Polygon.stories.tsx
rename to superset-frontend/plugins/preset-chart-deckgl/src/layers/Polygon/stories/Polygon.stories.tsx
index a212c734b93..40964ebd435 100644
--- a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Polygon/stories/Polygon.stories.tsx
+++ b/superset-frontend/plugins/preset-chart-deckgl/src/layers/Polygon/stories/Polygon.stories.tsx
@@ -20,7 +20,7 @@
 /* eslint-disable sort-keys */
 /* eslint-disable no-magic-numbers */
 import { SuperChart } from '@superset-ui/core';
-import { PolygonChartPlugin } from '@superset-ui/legacy-preset-chart-deckgl';
+import { PolygonChartPlugin } from '@superset-ui/preset-chart-deckgl';
 import { withResizableChartDemo, dummyDatasource } from '@storybook-shared';
 import payload from './payload';
 import geojsonPayload from './geojsonPayload';
@@ -28,7 +28,7 @@ import geojsonPayload from './geojsonPayload';
 new PolygonChartPlugin().configure({ key: 'deck_polygon' }).register();
 
 export default {
-  title: 'Legacy Chart Plugins/legacy-preset-chart-deckgl/PolygonChartPlugin',
+  title: 'Chart Plugins/preset-chart-deckgl/PolygonChartPlugin',
   decorators: [withResizableChartDemo],
   args: {
     filled: true,
@@ -104,7 +104,8 @@ export const PolygonChartViz = ({
       row_limit: 10000,
       reverse_long_lat: false,
       filter_nulls: true,
-      mapbox_style: 'https://tile.openstreetmap.org/{z}/{x}/{y}.png',
+      map_style:
+        'https://basemaps.cartocdn.com/gl/positron-gl-style/style.json',
       viewport: {
         altitude: 1.5,
         bearing: 37.89506450385642,
@@ -181,7 +182,8 @@ export const GeojsonPolygonViz = ({
       row_limit: 10000,
       reverse_long_lat: false,
       filter_nulls: true,
-      mapbox_style: 'https://tile.openstreetmap.org/{z}/{x}/{y}.png',
+      map_style:
+        'https://basemaps.cartocdn.com/gl/positron-gl-style/style.json',
       viewport: {
         longitude: 6.85236157047845,
         latitude: 31.222656842808707,
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Polygon/stories/geojsonPayload.ts b/superset-frontend/plugins/preset-chart-deckgl/src/layers/Polygon/stories/geojsonPayload.ts
similarity index 100%
rename from superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Polygon/stories/geojsonPayload.ts
rename to superset-frontend/plugins/preset-chart-deckgl/src/layers/Polygon/stories/geojsonPayload.ts
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Polygon/stories/payload.ts b/superset-frontend/plugins/preset-chart-deckgl/src/layers/Polygon/stories/payload.ts
similarity index 100%
rename from superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Polygon/stories/payload.ts
rename to superset-frontend/plugins/preset-chart-deckgl/src/layers/Polygon/stories/payload.ts
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Polygon/transformProps.test.ts b/superset-frontend/plugins/preset-chart-deckgl/src/layers/Polygon/transformProps.test.ts
similarity index 100%
rename from superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Polygon/transformProps.test.ts
rename to superset-frontend/plugins/preset-chart-deckgl/src/layers/Polygon/transformProps.test.ts
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Polygon/transformProps.ts b/superset-frontend/plugins/preset-chart-deckgl/src/layers/Polygon/transformProps.ts
similarity index 100%
rename from superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Polygon/transformProps.ts
rename to superset-frontend/plugins/preset-chart-deckgl/src/layers/Polygon/transformProps.ts
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Scatter/Scatter.tsx b/superset-frontend/plugins/preset-chart-deckgl/src/layers/Scatter/Scatter.tsx
similarity index 100%
rename from superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Scatter/Scatter.tsx
rename to superset-frontend/plugins/preset-chart-deckgl/src/layers/Scatter/Scatter.tsx
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Scatter/buildQuery.test.ts b/superset-frontend/plugins/preset-chart-deckgl/src/layers/Scatter/buildQuery.test.ts
similarity index 100%
rename from superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Scatter/buildQuery.test.ts
rename to superset-frontend/plugins/preset-chart-deckgl/src/layers/Scatter/buildQuery.test.ts
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Scatter/buildQuery.ts b/superset-frontend/plugins/preset-chart-deckgl/src/layers/Scatter/buildQuery.ts
similarity index 100%
rename from superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Scatter/buildQuery.ts
rename to superset-frontend/plugins/preset-chart-deckgl/src/layers/Scatter/buildQuery.ts
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Scatter/controlPanel.ts b/superset-frontend/plugins/preset-chart-deckgl/src/layers/Scatter/controlPanel.ts
similarity index 96%
rename from superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Scatter/controlPanel.ts
rename to superset-frontend/plugins/preset-chart-deckgl/src/layers/Scatter/controlPanel.ts
index e670bcde231..20a788c82a3 100644
--- a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Scatter/controlPanel.ts
+++ b/superset-frontend/plugins/preset-chart-deckgl/src/layers/Scatter/controlPanel.ts
@@ -34,6 +34,8 @@ import {
   pointRadiusFixed,
   multiplier,
   mapboxStyle,
+  maplibreStyle,
+  mapProvider,
   generateDeckGLColorSchemeControls,
   tooltipContents,
   tooltipTemplate,
@@ -66,7 +68,12 @@ const config: ControlPanelConfig = {
     {
       label: t('Map'),
       expanded: true,
-      controlSetRows: [[mapboxStyle], [autozoom, viewport]],
+      controlSetRows: [
+        [mapProvider],
+        [mapboxStyle],
+        [maplibreStyle],
+        [autozoom, viewport],
+      ],
     },
     {
       label: t('Point Size'),
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Scatter/images/example-dark.png b/superset-frontend/plugins/preset-chart-deckgl/src/layers/Scatter/images/example-dark.png
similarity index 100%
rename from superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Scatter/images/example-dark.png
rename to superset-frontend/plugins/preset-chart-deckgl/src/layers/Scatter/images/example-dark.png
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Scatter/images/example.png b/superset-frontend/plugins/preset-chart-deckgl/src/layers/Scatter/images/example.png
similarity index 100%
rename from superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Scatter/images/example.png
rename to superset-frontend/plugins/preset-chart-deckgl/src/layers/Scatter/images/example.png
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Scatter/images/thumbnail-dark.png b/superset-frontend/plugins/preset-chart-deckgl/src/layers/Scatter/images/thumbnail-dark.png
similarity index 100%
rename from superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Scatter/images/thumbnail-dark.png
rename to superset-frontend/plugins/preset-chart-deckgl/src/layers/Scatter/images/thumbnail-dark.png
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Scatter/images/thumbnail.png b/superset-frontend/plugins/preset-chart-deckgl/src/layers/Scatter/images/thumbnail.png
similarity index 100%
rename from superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Scatter/images/thumbnail.png
rename to superset-frontend/plugins/preset-chart-deckgl/src/layers/Scatter/images/thumbnail.png
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Scatter/images/thumbnailLarge.png b/superset-frontend/plugins/preset-chart-deckgl/src/layers/Scatter/images/thumbnailLarge.png
similarity index 100%
rename from superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Scatter/images/thumbnailLarge.png
rename to superset-frontend/plugins/preset-chart-deckgl/src/layers/Scatter/images/thumbnailLarge.png
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Scatter/index.ts b/superset-frontend/plugins/preset-chart-deckgl/src/layers/Scatter/index.ts
similarity index 100%
rename from superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Scatter/index.ts
rename to superset-frontend/plugins/preset-chart-deckgl/src/layers/Scatter/index.ts
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Scatter/stories/Scatter.stories.tsx b/superset-frontend/plugins/preset-chart-deckgl/src/layers/Scatter/stories/Scatter.stories.tsx
similarity index 93%
rename from superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Scatter/stories/Scatter.stories.tsx
rename to superset-frontend/plugins/preset-chart-deckgl/src/layers/Scatter/stories/Scatter.stories.tsx
index be9c9a949aa..9bae33a6083 100644
--- a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Scatter/stories/Scatter.stories.tsx
+++ b/superset-frontend/plugins/preset-chart-deckgl/src/layers/Scatter/stories/Scatter.stories.tsx
@@ -20,14 +20,14 @@
 /* eslint-disable sort-keys */
 /* eslint-disable no-magic-numbers */
 import { SuperChart } from '@superset-ui/core';
-import { ScatterChartPlugin } from '@superset-ui/legacy-preset-chart-deckgl';
+import { ScatterChartPlugin } from '@superset-ui/preset-chart-deckgl';
 import { withResizableChartDemo, dummyDatasource } from '@storybook-shared';
 import payload from './payload';
 
 new ScatterChartPlugin().configure({ key: 'deck_scatter' }).register();
 
 export default {
-  title: 'Legacy Chart Plugins/legacy-preset-chart-deckgl/ScatterChartPlugin',
+  title: 'Chart Plugins/preset-chart-deckgl/ScatterChartPlugin',
   decorators: [withResizableChartDemo],
   args: {
     minRadius: 2,
@@ -85,7 +85,8 @@ export const ScatterChartViz = ({
       row_limit: 5000,
       filter_nulls: true,
       adhoc_filters: [],
-      mapbox_style: 'https://tile.openstreetmap.org/{z}/{x}/{y}.png',
+      map_style:
+        'https://basemaps.cartocdn.com/gl/positron-gl-style/style.json',
       viewport: {
         bearing: -4.952916738791771,
         latitude: 37.78926922909199,
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Scatter/stories/payload.ts b/superset-frontend/plugins/preset-chart-deckgl/src/layers/Scatter/stories/payload.ts
similarity index 100%
rename from superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Scatter/stories/payload.ts
rename to superset-frontend/plugins/preset-chart-deckgl/src/layers/Scatter/stories/payload.ts
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Scatter/transformProps.test.ts b/superset-frontend/plugins/preset-chart-deckgl/src/layers/Scatter/transformProps.test.ts
similarity index 100%
rename from superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Scatter/transformProps.test.ts
rename to superset-frontend/plugins/preset-chart-deckgl/src/layers/Scatter/transformProps.test.ts
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Scatter/transformProps.ts b/superset-frontend/plugins/preset-chart-deckgl/src/layers/Scatter/transformProps.ts
similarity index 100%
rename from superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Scatter/transformProps.ts
rename to superset-frontend/plugins/preset-chart-deckgl/src/layers/Scatter/transformProps.ts
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Screengrid/Screengrid.tsx b/superset-frontend/plugins/preset-chart-deckgl/src/layers/Screengrid/Screengrid.tsx
similarity index 97%
rename from superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Screengrid/Screengrid.tsx
rename to superset-frontend/plugins/preset-chart-deckgl/src/layers/Screengrid/Screengrid.tsx
index ec39564387a..e72b523ceb3 100644
--- a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Screengrid/Screengrid.tsx
+++ b/superset-frontend/plugins/preset-chart-deckgl/src/layers/Screengrid/Screengrid.tsx
@@ -73,10 +73,13 @@ function defaultTooltipGenerator(o: JsonObject, formData: QueryFormData) {
         label={`${metricLabel}: `}
         value={`${o.object?.cellWeight}`}
       />
-      <TooltipRow label="Points: " value={`${pointCount} records`} />
+      <TooltipRow
+        label={`${t('Points')}: `}
+        value={`${pointCount} ${t('records')}`}
+      />
       {points.length > 0 && points.length <= 3 && (
         <div style={{ marginTop: 8, fontSize: '12px' }}>
-          <strong>Records:</strong>
+          <strong>{t('Records')}:</strong>
           {points.slice(0, 3).map((point: JsonObject, index: number) => (
             <div key={index} style={{ marginTop: 4, paddingLeft: '8px' }}>
               {Object.entries(point).map(([key, value]) =>
@@ -95,7 +98,7 @@ function defaultTooltipGenerator(o: JsonObject, formData: QueryFormData) {
       )}
       {points.length > 3 && (
         <MoreRecordsIndicator>
-          ... and {points.length - 3} more records
+          {t('... and %s more records', points.length - 3)}
         </MoreRecordsIndicator>
       )}
     </div>
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Screengrid/buildQuery.ts b/superset-frontend/plugins/preset-chart-deckgl/src/layers/Screengrid/buildQuery.ts
similarity index 100%
rename from superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Screengrid/buildQuery.ts
rename to superset-frontend/plugins/preset-chart-deckgl/src/layers/Screengrid/buildQuery.ts
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Screengrid/controlPanel.ts b/superset-frontend/plugins/preset-chart-deckgl/src/layers/Screengrid/controlPanel.ts
similarity index 94%
rename from superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Screengrid/controlPanel.ts
rename to superset-frontend/plugins/preset-chart-deckgl/src/layers/Screengrid/controlPanel.ts
index 22c31047204..feaa07d1c03 100644
--- a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Screengrid/controlPanel.ts
+++ b/superset-frontend/plugins/preset-chart-deckgl/src/layers/Screengrid/controlPanel.ts
@@ -34,6 +34,8 @@ import {
   viewport,
   spatial,
   mapboxStyle,
+  maplibreStyle,
+  mapProvider,
   deckGLFixedColor,
   deckGLCategoricalColorSchemeSelect,
   deckGLCategoricalColorSchemeTypeSelect,
@@ -59,7 +61,12 @@ const config: ControlPanelConfig = {
     },
     {
       label: t('Map'),
-      controlSetRows: [[mapboxStyle], [autozoom, viewport]],
+      controlSetRows: [
+        [mapProvider],
+        [mapboxStyle],
+        [maplibreStyle],
+        [autozoom, viewport],
+      ],
     },
     {
       label: t('Grid'),
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Screengrid/images/example-dark.png b/superset-frontend/plugins/preset-chart-deckgl/src/layers/Screengrid/images/example-dark.png
similarity index 100%
rename from superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Screengrid/images/example-dark.png
rename to superset-frontend/plugins/preset-chart-deckgl/src/layers/Screengrid/images/example-dark.png
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Screengrid/images/example.png b/superset-frontend/plugins/preset-chart-deckgl/src/layers/Screengrid/images/example.png
similarity index 100%
rename from superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Screengrid/images/example.png
rename to superset-frontend/plugins/preset-chart-deckgl/src/layers/Screengrid/images/example.png
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Screengrid/images/thumbnail-dark.png b/superset-frontend/plugins/preset-chart-deckgl/src/layers/Screengrid/images/thumbnail-dark.png
similarity index 100%
rename from superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Screengrid/images/thumbnail-dark.png
rename to superset-frontend/plugins/preset-chart-deckgl/src/layers/Screengrid/images/thumbnail-dark.png
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Screengrid/images/thumbnail.png b/superset-frontend/plugins/preset-chart-deckgl/src/layers/Screengrid/images/thumbnail.png
similarity index 100%
rename from superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Screengrid/images/thumbnail.png
rename to superset-frontend/plugins/preset-chart-deckgl/src/layers/Screengrid/images/thumbnail.png
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Screengrid/images/thumbnailLarge.png b/superset-frontend/plugins/preset-chart-deckgl/src/layers/Screengrid/images/thumbnailLarge.png
similarity index 100%
rename from superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Screengrid/images/thumbnailLarge.png
rename to superset-frontend/plugins/preset-chart-deckgl/src/layers/Screengrid/images/thumbnailLarge.png
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Screengrid/index.ts b/superset-frontend/plugins/preset-chart-deckgl/src/layers/Screengrid/index.ts
similarity index 100%
rename from superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Screengrid/index.ts
rename to superset-frontend/plugins/preset-chart-deckgl/src/layers/Screengrid/index.ts
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Screengrid/stories/Screengrid.stories.tsx b/superset-frontend/plugins/preset-chart-deckgl/src/layers/Screengrid/stories/Screengrid.stories.tsx
similarity index 91%
rename from superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Screengrid/stories/Screengrid.stories.tsx
rename to superset-frontend/plugins/preset-chart-deckgl/src/layers/Screengrid/stories/Screengrid.stories.tsx
index dc2c53ab597..c3e79295df1 100644
--- a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Screengrid/stories/Screengrid.stories.tsx
+++ b/superset-frontend/plugins/preset-chart-deckgl/src/layers/Screengrid/stories/Screengrid.stories.tsx
@@ -20,15 +20,14 @@
 /* eslint-disable sort-keys */
 /* eslint-disable no-magic-numbers */
 import { SuperChart } from '@superset-ui/core';
-import { ScreengridChartPlugin } from '@superset-ui/legacy-preset-chart-deckgl';
+import { ScreengridChartPlugin } from '@superset-ui/preset-chart-deckgl';
 import { withResizableChartDemo, dummyDatasource } from '@storybook-shared';
 import payload from './payload';
 
 new ScreengridChartPlugin().configure({ key: 'deck_screengrid' }).register();
 
 export default {
-  title:
-    'Legacy Chart Plugins/legacy-preset-chart-deckgl/ScreengridChartPlugin',
+  title: 'Chart Plugins/preset-chart-deckgl/ScreengridChartPlugin',
   decorators: [withResizableChartDemo],
   args: {
     gridSize: 20,
@@ -73,7 +72,8 @@ export const ScreengridChartViz = ({
       row_limit: 5000,
       filter_nulls: true,
       adhoc_filters: [],
-      mapbox_style: 'https://tile.openstreetmap.org/{z}/{x}/{y}.png',
+      map_style:
+        'https://basemaps.cartocdn.com/gl/positron-gl-style/style.json',
       viewport: {
         bearing: -4.952916738791771,
         latitude: 37.76024135844065,
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Screengrid/stories/payload.ts b/superset-frontend/plugins/preset-chart-deckgl/src/layers/Screengrid/stories/payload.ts
similarity index 100%
rename from superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Screengrid/stories/payload.ts
rename to superset-frontend/plugins/preset-chart-deckgl/src/layers/Screengrid/stories/payload.ts
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Screengrid/transformProps.ts b/superset-frontend/plugins/preset-chart-deckgl/src/layers/Screengrid/transformProps.ts
similarity index 100%
rename from superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Screengrid/transformProps.ts
rename to superset-frontend/plugins/preset-chart-deckgl/src/layers/Screengrid/transformProps.ts
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/buildQueryUtils.ts b/superset-frontend/plugins/preset-chart-deckgl/src/layers/buildQueryUtils.ts
similarity index 100%
rename from superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/buildQueryUtils.ts
rename to superset-frontend/plugins/preset-chart-deckgl/src/layers/buildQueryUtils.ts
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/common.test.ts b/superset-frontend/plugins/preset-chart-deckgl/src/layers/common.test.ts
similarity index 100%
rename from superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/common.test.ts
rename to superset-frontend/plugins/preset-chart-deckgl/src/layers/common.test.ts
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/common.tsx b/superset-frontend/plugins/preset-chart-deckgl/src/layers/common.tsx
similarity index 100%
rename from superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/common.tsx
rename to superset-frontend/plugins/preset-chart-deckgl/src/layers/common.tsx
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/index.ts b/superset-frontend/plugins/preset-chart-deckgl/src/layers/index.ts
similarity index 100%
rename from superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/index.ts
rename to superset-frontend/plugins/preset-chart-deckgl/src/layers/index.ts
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/spatialUtils.test.ts b/superset-frontend/plugins/preset-chart-deckgl/src/layers/spatialUtils.test.ts
similarity index 99%
rename from superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/spatialUtils.test.ts
rename to superset-frontend/plugins/preset-chart-deckgl/src/layers/spatialUtils.test.ts
index b33d2f3c86b..90c9206b637 100644
--- a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/spatialUtils.test.ts
+++ b/superset-frontend/plugins/preset-chart-deckgl/src/layers/spatialUtils.test.ts
@@ -506,7 +506,7 @@ describe('spatialUtils', () => {
     });
 
     expect(result.payload.data.features).toHaveLength(2);
-    expect(result.payload.data.mapboxApiKey).toBe('test_api_key');
+    expect(result.payload.data.mapboxApiKey).toBe('');
     expect(result.payload.data.metricLabels).toEqual(['count_label']);
   });
 
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/spatialUtils.ts b/superset-frontend/plugins/preset-chart-deckgl/src/layers/spatialUtils.ts
similarity index 93%
rename from superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/spatialUtils.ts
rename to superset-frontend/plugins/preset-chart-deckgl/src/layers/spatialUtils.ts
index 1572c0933b5..82034344e51 100644
--- a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/spatialUtils.ts
+++ b/superset-frontend/plugins/preset-chart-deckgl/src/layers/spatialUtils.ts
@@ -317,26 +317,12 @@ export function processSpatialData(
 
 const NOOP = () => {};
 
-export function getMapboxApiKey(mapboxApiKey?: string): string {
-  if (mapboxApiKey) {
-    return mapboxApiKey;
-  }
-
-  if (typeof document !== 'undefined') {
-    try {
-      const appContainer = document.getElementById('app');
-      const dataBootstrap = appContainer?.getAttribute('data-bootstrap');
-      if (dataBootstrap) {
-        const bootstrapData: BootstrapData = JSON.parse(dataBootstrap);
-        return bootstrapData?.common?.conf?.MAPBOX_API_KEY || '';
-      }
-    } catch (error) {
-      throw new Error(
-        `Failed to read MAPBOX_API_KEY from bootstrap data: ${error}`,
-      );
-    }
-  }
-
+/**
+ * @deprecated MapLibre does not require an API key. This function is kept for
+ * backward compatibility with any code that references `mapboxApiKey` in the
+ * payload data shape. It always returns an empty string.
+ */
+export function getMapboxApiKey(_mapboxApiKey?: string): string {
   return '';
 }
 
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/transformUtils.test.ts b/superset-frontend/plugins/preset-chart-deckgl/src/layers/transformUtils.test.ts
similarity index 100%
rename from superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/transformUtils.test.ts
rename to superset-frontend/plugins/preset-chart-deckgl/src/layers/transformUtils.test.ts
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/transformUtils.ts b/superset-frontend/plugins/preset-chart-deckgl/src/layers/transformUtils.ts
similarity index 100%
rename from superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/transformUtils.ts
rename to superset-frontend/plugins/preset-chart-deckgl/src/layers/transformUtils.ts
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/utils/metricUtils.test.ts b/superset-frontend/plugins/preset-chart-deckgl/src/layers/utils/metricUtils.test.ts
similarity index 100%
rename from superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/utils/metricUtils.test.ts
rename to superset-frontend/plugins/preset-chart-deckgl/src/layers/utils/metricUtils.test.ts
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/utils/metricUtils.ts b/superset-frontend/plugins/preset-chart-deckgl/src/layers/utils/metricUtils.ts
similarity index 100%
rename from superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/utils/metricUtils.ts
rename to superset-frontend/plugins/preset-chart-deckgl/src/layers/utils/metricUtils.ts
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/preset.ts b/superset-frontend/plugins/preset-chart-deckgl/src/preset.ts
similarity index 100%
rename from superset-frontend/plugins/legacy-preset-chart-deckgl/src/preset.ts
rename to superset-frontend/plugins/preset-chart-deckgl/src/preset.ts
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/transformProps.ts b/superset-frontend/plugins/preset-chart-deckgl/src/transformProps.ts
similarity index 100%
rename from superset-frontend/plugins/legacy-preset-chart-deckgl/src/transformProps.ts
rename to superset-frontend/plugins/preset-chart-deckgl/src/transformProps.ts
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/types.ts b/superset-frontend/plugins/preset-chart-deckgl/src/types.ts
similarity index 100%
rename from superset-frontend/plugins/legacy-preset-chart-deckgl/src/types.ts
rename to superset-frontend/plugins/preset-chart-deckgl/src/types.ts
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/utilities/HandlebarsRenderer.tsx b/superset-frontend/plugins/preset-chart-deckgl/src/utilities/HandlebarsRenderer.tsx
similarity index 100%
rename from superset-frontend/plugins/legacy-preset-chart-deckgl/src/utilities/HandlebarsRenderer.tsx
rename to superset-frontend/plugins/preset-chart-deckgl/src/utilities/HandlebarsRenderer.tsx
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/utilities/Shared_DeckGL.tsx b/superset-frontend/plugins/preset-chart-deckgl/src/utilities/Shared_DeckGL.tsx
similarity index 90%
rename from superset-frontend/plugins/legacy-preset-chart-deckgl/src/utilities/Shared_DeckGL.tsx
rename to superset-frontend/plugins/preset-chart-deckgl/src/utilities/Shared_DeckGL.tsx
index b2aabf4d931..490e1367be4 100644
--- a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/utilities/Shared_DeckGL.tsx
+++ b/superset-frontend/plugins/preset-chart-deckgl/src/utilities/Shared_DeckGL.tsx
@@ -22,7 +22,6 @@ import {
   FeatureFlag,
   isFeatureEnabled,
   validateNonEmpty,
-  validateMapboxStylesUrl,
   getCategoricalSchemeRegistry,
   getSequentialSchemeRegistry,
   SequentialScheme,
@@ -50,12 +49,22 @@ export const DEFAULT_DECKGL_COLOR = { r: 158, g: 158, b: 158, a: 1 };
 let deckglTiles: string[][];
 
 export const DEFAULT_DECKGL_TILES = [
-  ['https://tile.openstreetmap.org/{z}/{x}/{y}.png', 'Streets (OSM)'],
-  ['https://tile.osm.ch/osm-swiss-style/{z}/{x}/{y}.png', 'Topography (OSM)'],
   [
-    'tile://https://a.basemaps.cartocdn.com/dark_all/{z}/{x}/{y}.png',
-    'Dark (OSM)',
+    'https://basemaps.cartocdn.com/gl/positron-gl-style/style.json',
+    'Light (Carto)',
   ],
+  [
+    'https://basemaps.cartocdn.com/gl/dark-matter-gl-style/style.json',
+    'Dark (Carto)',
+  ],
+  [
+    'https://basemaps.cartocdn.com/gl/voyager-gl-style/style.json',
+    'Streets (Carto)',
+  ],
+  ['https://tiles.openfreemap.org/styles/liberty', 'Liberty (OpenFreeMap)'],
+];
+
+export const DEFAULT_MAPBOX_TILES = [
   ['mapbox://styles/mapbox/streets-v9', 'Streets (Mapbox)'],
   ['mapbox://styles/mapbox/dark-v9', 'Dark (Mapbox)'],
   ['mapbox://styles/mapbox/light-v9', 'Light (Mapbox)'],
@@ -85,7 +94,7 @@ const DEFAULT_VIEWPORT = {
 
 const sandboxUrl =
   'https://github.com/apache/superset/' +
-  'blob/master/superset-frontend/plugins/legacy-preset-chart-deckgl/src/utils/sandbox.ts';
+  'blob/master/superset-frontend/plugins/preset-chart-deckgl/src/utils/sandbox.ts';
 const jsFunctionInfo = (
   <div>
     {t(
@@ -409,6 +418,43 @@ export const reverseLongLat = {
   },
 };
 
+export const mapProvider = {
+  name: 'map_renderer',
+  config: {
+    type: 'SelectControl',
+    label: t('Map Renderer'),
+    clearable: false,
+    renderTrigger: true,
+    choices: [
+      ['maplibre', t('MapLibre (open-source)')],
+      ['mapbox', t('Mapbox (API key required)')],
+    ],
+    default: 'maplibre',
+    description: t(
+      'Select the map tile provider. MapLibre is open-source and requires no API key. ' +
+        'Mapbox requires MAPBOX_API_KEY to be configured in Superset.',
+    ),
+  },
+};
+
+export const maplibreStyle = {
+  name: 'maplibre_style',
+  config: {
+    type: 'SelectControl',
+    label: t('Map Style'),
+    clearable: false,
+    renderTrigger: true,
+    freeForm: true,
+    choices: getDeckGLTiles(),
+    default: getDeckGLTiles()[0][0],
+    description: t(
+      'Base layer map style. Accepts a MapLibre-compatible style URL.',
+    ),
+    visibility: ({ controls }: ControlPanelState) =>
+      controls?.map_renderer?.value !== 'mapbox',
+  },
+};
+
 export const mapboxStyle = {
   name: 'mapbox_style',
   config: {
@@ -417,14 +463,13 @@ export const mapboxStyle = {
     clearable: false,
     renderTrigger: true,
     freeForm: true,
-    validators: [validateMapboxStylesUrl],
-    choices: getDeckGLTiles(),
-    default: getDeckGLTiles()[0][0],
+    choices: DEFAULT_MAPBOX_TILES,
+    default: DEFAULT_MAPBOX_TILES[0][0],
     description: t(
-      'Base layer map style. See Mapbox documentation: %s',
-      'Mapbox base layer map style (see Mapbox documentation: %s) or tile server URL.',
-      'https://docs.mapbox.com/help/glossary/style-url/',
+      'Base layer map style. Accepts a Mapbox style URL (mapbox://styles/...).',
     ),
+    visibility: ({ controls }: ControlPanelState) =>
+      controls?.map_renderer?.value === 'mapbox',
   },
 };
 
@@ -508,7 +553,7 @@ export const tooltipTemplate = {
     default: '',
     description: '',
     placeholder: '',
-    mapStateToProps: (state: any, control: any) => ({
+    mapStateToProps: (_state: any, control: any) => ({
       value: control.value,
     }),
   },
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/utilities/TooltipTemplateControl.tsx b/superset-frontend/plugins/preset-chart-deckgl/src/utilities/TooltipTemplateControl.tsx
similarity index 100%
rename from superset-frontend/plugins/legacy-preset-chart-deckgl/src/utilities/TooltipTemplateControl.tsx
rename to superset-frontend/plugins/preset-chart-deckgl/src/utilities/TooltipTemplateControl.tsx
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/utilities/TooltipTemplateEditor.tsx b/superset-frontend/plugins/preset-chart-deckgl/src/utilities/TooltipTemplateEditor.tsx
similarity index 100%
rename from superset-frontend/plugins/legacy-preset-chart-deckgl/src/utilities/TooltipTemplateEditor.tsx
rename to superset-frontend/plugins/preset-chart-deckgl/src/utilities/TooltipTemplateEditor.tsx
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/utilities/controlRegistry.tsx b/superset-frontend/plugins/preset-chart-deckgl/src/utilities/controlRegistry.tsx
similarity index 100%
rename from superset-frontend/plugins/legacy-preset-chart-deckgl/src/utilities/controlRegistry.tsx
rename to superset-frontend/plugins/preset-chart-deckgl/src/utilities/controlRegistry.tsx
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/utilities/controls.ts b/superset-frontend/plugins/preset-chart-deckgl/src/utilities/controls.ts
similarity index 100%
rename from superset-frontend/plugins/legacy-preset-chart-deckgl/src/utilities/controls.ts
rename to superset-frontend/plugins/preset-chart-deckgl/src/utilities/controls.ts
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/utilities/multiValueUtils.ts b/superset-frontend/plugins/preset-chart-deckgl/src/utilities/multiValueUtils.ts
similarity index 100%
rename from superset-frontend/plugins/legacy-preset-chart-deckgl/src/utilities/multiValueUtils.ts
rename to superset-frontend/plugins/preset-chart-deckgl/src/utilities/multiValueUtils.ts
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/utilities/sharedDndControls.tsx b/superset-frontend/plugins/preset-chart-deckgl/src/utilities/sharedDndControls.tsx
similarity index 100%
rename from superset-frontend/plugins/legacy-preset-chart-deckgl/src/utilities/sharedDndControls.tsx
rename to superset-frontend/plugins/preset-chart-deckgl/src/utilities/sharedDndControls.tsx
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/utilities/tooltipUtils.tsx b/superset-frontend/plugins/preset-chart-deckgl/src/utilities/tooltipUtils.tsx
similarity index 100%
rename from superset-frontend/plugins/legacy-preset-chart-deckgl/src/utilities/tooltipUtils.tsx
rename to superset-frontend/plugins/preset-chart-deckgl/src/utilities/tooltipUtils.tsx
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/utilities/utils.ts b/superset-frontend/plugins/preset-chart-deckgl/src/utilities/utils.ts
similarity index 100%
rename from superset-frontend/plugins/legacy-preset-chart-deckgl/src/utilities/utils.ts
rename to superset-frontend/plugins/preset-chart-deckgl/src/utilities/utils.ts
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/utils.test.ts b/superset-frontend/plugins/preset-chart-deckgl/src/utils.test.ts
similarity index 100%
rename from superset-frontend/plugins/legacy-preset-chart-deckgl/src/utils.test.ts
rename to superset-frontend/plugins/preset-chart-deckgl/src/utils.test.ts
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/utils.ts b/superset-frontend/plugins/preset-chart-deckgl/src/utils.ts
similarity index 86%
rename from superset-frontend/plugins/legacy-preset-chart-deckgl/src/utils.ts
rename to superset-frontend/plugins/preset-chart-deckgl/src/utils.ts
index 6927e6306d7..2c42b918b7f 100644
--- a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/utils.ts
+++ b/superset-frontend/plugins/preset-chart-deckgl/src/utils.ts
@@ -26,8 +26,6 @@ import {
   SequentialScheme,
 } from '@superset-ui/core';
 import { Color } from '@deck.gl/core';
-import { GeoBoundingBox, TileLayer } from '@deck.gl/geo-layers';
-import { BitmapLayer, PathLayer } from '@deck.gl/layers';
 import { hexToRGB } from './utils/colors';
 import { ColorBreakpointType } from './types';
 
@@ -36,10 +34,6 @@ export const HIGHLIGHT_COLOR_ARRAY = [255, 0, 0, 255] as Color;
 
 const DEFAULT_NUM_BUCKETS = 10;
 
-export const MAPBOX_LAYER_PREFIX = 'mapbox://';
-export const TILE_LAYER_PREFIX = 'tile://';
-export const OSM_LAYER_KEYWORDS = ['openstreetmap', 'osm'];
-
 export type Buckets = {
   break_points: string[];
   num_buckets: string;
@@ -243,42 +237,3 @@ export function getColorBreakpointsBuckets(
 
   return buckets;
 }
-
-export function buildTileLayer(url: string, id: string) {
-  interface TileLayerProps {
-    id: string;
-    data: string;
-    minZoom: number;
-    maxZoom: number;
-    tileSize: number;
-    renderSubLayers: (props: any) => (BitmapLayer | PathLayer)[];
-  }
-
-  interface RenderSubLayerProps {
-    tile: {
-      bbox: GeoBoundingBox;
-    };
-    data: any;
-  }
-
-  return new TileLayer({
-    data: url,
-    id,
-    minZoom: 0,
-    maxZoom: 19,
-    tileSize: 256,
-
-    renderSubLayers: (props: RenderSubLayerProps): BitmapLayer[] => {
-      const { west, north, east, south } = props.tile.bbox as GeoBoundingBox;
-
-      // Ajouter une BitmapLayer
-      const bitmapLayer = new BitmapLayer(props, {
-        data: undefined,
-        image: props.data,
-        bounds: [west, south, east, north],
-      });
-
-      return [bitmapLayer];
-    },
-  } as TileLayerProps);
-}
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/utils/colors.ts b/superset-frontend/plugins/preset-chart-deckgl/src/utils/colors.ts
similarity index 100%
rename from superset-frontend/plugins/legacy-preset-chart-deckgl/src/utils/colors.ts
rename to superset-frontend/plugins/preset-chart-deckgl/src/utils/colors.ts
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/utils/computeBoundsFromPoints.ts b/superset-frontend/plugins/preset-chart-deckgl/src/utils/computeBoundsFromPoints.ts
similarity index 100%
rename from superset-frontend/plugins/legacy-preset-chart-deckgl/src/utils/computeBoundsFromPoints.ts
rename to superset-frontend/plugins/preset-chart-deckgl/src/utils/computeBoundsFromPoints.ts
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/utils/crossFiltersDataMask.test.ts b/superset-frontend/plugins/preset-chart-deckgl/src/utils/crossFiltersDataMask.test.ts
similarity index 100%
rename from superset-frontend/plugins/legacy-preset-chart-deckgl/src/utils/crossFiltersDataMask.test.ts
rename to superset-frontend/plugins/preset-chart-deckgl/src/utils/crossFiltersDataMask.test.ts
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/utils/crossFiltersDataMask.ts b/superset-frontend/plugins/preset-chart-deckgl/src/utils/crossFiltersDataMask.ts
similarity index 100%
rename from superset-frontend/plugins/legacy-preset-chart-deckgl/src/utils/crossFiltersDataMask.ts
rename to superset-frontend/plugins/preset-chart-deckgl/src/utils/crossFiltersDataMask.ts
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/utils/explore.ts b/superset-frontend/plugins/preset-chart-deckgl/src/utils/explore.ts
similarity index 100%
rename from superset-frontend/plugins/legacy-preset-chart-deckgl/src/utils/explore.ts
rename to superset-frontend/plugins/preset-chart-deckgl/src/utils/explore.ts
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/utils/fitViewport.ts b/superset-frontend/plugins/preset-chart-deckgl/src/utils/fitViewport.ts
similarity index 100%
rename from superset-frontend/plugins/legacy-preset-chart-deckgl/src/utils/fitViewport.ts
rename to superset-frontend/plugins/preset-chart-deckgl/src/utils/fitViewport.ts
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/utils/geo.ts b/superset-frontend/plugins/preset-chart-deckgl/src/utils/geo.ts
similarity index 100%
rename from superset-frontend/plugins/legacy-preset-chart-deckgl/src/utils/geo.ts
rename to superset-frontend/plugins/preset-chart-deckgl/src/utils/geo.ts
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/utils/getPointsFromPolygon.ts b/superset-frontend/plugins/preset-chart-deckgl/src/utils/getPointsFromPolygon.ts
similarity index 100%
rename from superset-frontend/plugins/legacy-preset-chart-deckgl/src/utils/getPointsFromPolygon.ts
rename to superset-frontend/plugins/preset-chart-deckgl/src/utils/getPointsFromPolygon.ts
diff --git a/superset-frontend/plugins/preset-chart-deckgl/src/utils/mapbox.ts b/superset-frontend/plugins/preset-chart-deckgl/src/utils/mapbox.ts
new file mode 100644
index 00000000000..b617b4c37cc
--- /dev/null
+++ b/superset-frontend/plugins/preset-chart-deckgl/src/utils/mapbox.ts
@@ -0,0 +1,35 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+export function getMapboxApiKey(): string {
+  if (typeof document === 'undefined') {
+    return '';
+  }
+  try {
+    const appContainer = document.getElementById('app');
+    const dataBootstrap = appContainer?.getAttribute('data-bootstrap');
+    if (dataBootstrap) {
+      const bootstrapData = JSON.parse(dataBootstrap);
+      return bootstrapData?.common?.conf?.MAPBOX_API_KEY || '';
+    }
+  } catch {
+    // If bootstrap data is unavailable or malformed, return empty string
+  }
+  return '';
+}
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/utils/safeStringify.ts b/superset-frontend/plugins/preset-chart-deckgl/src/utils/safeStringify.ts
similarity index 100%
rename from superset-frontend/plugins/legacy-preset-chart-deckgl/src/utils/safeStringify.ts
rename to superset-frontend/plugins/preset-chart-deckgl/src/utils/safeStringify.ts
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/utils/sandbox.ts b/superset-frontend/plugins/preset-chart-deckgl/src/utils/sandbox.ts
similarity index 100%
rename from superset-frontend/plugins/legacy-preset-chart-deckgl/src/utils/sandbox.ts
rename to superset-frontend/plugins/preset-chart-deckgl/src/utils/sandbox.ts
diff --git a/superset-frontend/plugins/preset-chart-deckgl/tsconfig.json b/superset-frontend/plugins/preset-chart-deckgl/tsconfig.json
new file mode 100644
index 00000000000..1abdcd42c58
--- /dev/null
+++ b/superset-frontend/plugins/preset-chart-deckgl/tsconfig.json
@@ -0,0 +1,16 @@
+{
+  "extends": "../../tsconfig.json",
+  "compilerOptions": {
+    "baseUrl": "../..",
+    "outDir": "lib",
+    "rootDir": "src",
+    "declarationDir": "lib"
+  },
+  "include": ["src/**/*", "types/**/*"],
+  "exclude": ["src/**/*.test.*", "src/**/*.stories.*"],
+  "references": [
+    { "path": "../../packages/superset-core" },
+    { "path": "../../packages/superset-ui-core" },
+    { "path": "../../packages/superset-ui-chart-controls" }
+  ]
+}
diff --git a/superset-frontend/plugins/preset-chart-deckgl/types/external.d.ts b/superset-frontend/plugins/preset-chart-deckgl/types/external.d.ts
new file mode 100644
index 00000000000..b904c352de4
--- /dev/null
+++ b/superset-frontend/plugins/preset-chart-deckgl/types/external.d.ts
@@ -0,0 +1,28 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+declare module '*.png' {
+  const value: string;
+  export default value;
+}
+
+declare module '*.jpg' {
+  const value: string;
+  export default value;
+}
diff --git a/superset-frontend/scripts/check-custom-rules.js b/superset-frontend/scripts/check-custom-rules.js
index a209d51e15c..e9c6eaca924 100755
--- a/superset-frontend/scripts/check-custom-rules.js
+++ b/superset-frontend/scripts/check-custom-rules.js
@@ -600,6 +600,7 @@ function main() {
     /\/lib\//,
     /\/dist\//,
     /plugins\/legacy-/, // Legacy plugins can have old color patterns
+    /plugin-chart-point-cluster-map\/src\/controlPanel/, // Data visualization color choices
     /\/vendor\//, // Third-party vendor code
     /spec\/fixtures\//, // Test fixtures
     /theme\/exampleThemes/, // Theme examples legitimately have colors
@@ -628,6 +629,7 @@ function main() {
         '**/lib/**', // Build artifacts
         '**/dist/**', // Build artifacts
         'plugins/legacy-*/**', // Legacy plugins
+        'plugins/plugin-chart-point-cluster-map/src/controlPanel.*', // Data visualization color choices
         '**/vendor/**',
         'spec/fixtures/**',
         '**/theme/exampleThemes/**',
@@ -651,7 +653,7 @@ function main() {
   }
 
   // eslint-disable-next-line no-console
-  console.log(`Checking ${files.length} files for Superset custom rules...\\n`);
+  console.log(`Checking ${files.length} files for Superset custom rules...\n`);
 
   files.forEach(file => {
     // Resolve the file path
@@ -664,7 +666,7 @@ function main() {
   });
 
   // eslint-disable-next-line no-console
-  console.log(`\\n${errorCount} errors, ${warningCount} warnings`);
+  console.log(`\n${errorCount} errors, ${warningCount} warnings`);
 
   if (errorCount > 0) {
     process.exit(1);
diff --git a/superset-frontend/spec/helpers/extensionTestHelpers.ts b/superset-frontend/spec/helpers/extensionTestHelpers.ts
new file mode 100644
index 00000000000..84f449b387a
--- /dev/null
+++ b/superset-frontend/spec/helpers/extensionTestHelpers.ts
@@ -0,0 +1,70 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+import type { ReactElement } from 'react';
+import { views, menus, commands } from 'src/core';
+import { resetContributions } from 'src/core/commands';
+
+const disposables: Array<{ dispose: () => void }> = [];
+
+/**
+ * Cleans up all tracked extension registrations (views, menus, commands).
+ * Call in afterEach to prevent state leaks between tests.
+ */
+export const cleanupExtensions = () => {
+  disposables.forEach(d => d.dispose());
+  disposables.length = 0;
+  resetContributions();
+};
+
+/**
+ * Registers a test view at a given location and tracks it for cleanup.
+ */
+export const registerTestView = (
+  location: string,
+  id: string,
+  name: string,
+  provider: () => ReactElement,
+) => {
+  const disposable = views.registerView({ id, name }, location, provider);
+  disposables.push(disposable);
+  return disposable;
+};
+
+/**
+ * Registers a toolbar action (command + menu item) and tracks both for cleanup.
+ * Primary actions require an icon to render in PanelToolbar.
+ */
+export const registerToolbarAction = (
+  viewId: string,
+  commandId: string,
+  title: string,
+  callback: () => void,
+  group: 'primary' | 'secondary' = 'primary',
+) => {
+  const cmdDisposable = commands.registerCommand(
+    { id: commandId, title, icon: 'FileOutlined' },
+    callback,
+  );
+  const menuDisposable = menus.registerMenuItem(
+    { command: commandId, view: `test-view-${commandId}` },
+    viewId,
+    group,
+  );
+  disposables.push(cmdDisposable, menuDisposable);
+};
diff --git a/superset-frontend/src/SqlLab/actions/sqlLab.test.ts b/superset-frontend/src/SqlLab/actions/sqlLab.test.ts
index 0de713eae3a..740d0a6e36e 100644
--- a/superset-frontend/src/SqlLab/actions/sqlLab.test.ts
+++ b/superset-frontend/src/SqlLab/actions/sqlLab.test.ts
@@ -33,6 +33,7 @@ import {
 } from 'src/SqlLab/fixtures';
 import { SupersetClient, isFeatureEnabled } from '@superset-ui/core';
 import { ADD_TOAST } from 'src/components/MessageToasts/actions';
+import { EMPTY_STATE_QE_ID } from 'src/SqlLab/hooks/useQueryEditor';
 import { ToastType } from '../../components/MessageToasts/types';
 
 const isFeatureEnabledMock = isFeatureEnabled as unknown as jest.Mock;
@@ -882,6 +883,44 @@ describe('async actions', () => {
         request(store.dispatch, store.getState, undefined);
         expect(store.getActions()).toEqual(expectedActions);
       });
+
+      test('creates a new query editor from the saved state in the empty tab', () => {
+        const unsavedEmptyTabState = {
+          id: EMPTY_STATE_QE_ID,
+          dbId: 2,
+          catalog: 'test_catalog',
+          schema: 'test_schema',
+        };
+        const store = mockStore({
+          ...initialState,
+          sqlLab: {
+            ...initialState.sqlLab,
+            tabHistory: [EMPTY_STATE_QE_ID],
+            unsavedQueryEditor: unsavedEmptyTabState,
+          },
+        });
+        const expectedActions = [
+          {
+            type: actions.ADD_QUERY_EDITOR,
+            queryEditor: {
+              id: 'abcd',
+              immutableId: 'abcd',
+              sql: expect.stringContaining('SELECT ...'),
+              name: 'Untitled Query 4',
+              dbId: unsavedEmptyTabState.dbId,
+              catalog: unsavedEmptyTabState.catalog,
+              schema: unsavedEmptyTabState.schema,
+              inLocalStorage: true,
+              autorun: false,
+              queryLimit: initialState.common.conf.DEFAULT_SQLLAB_LIMIT,
+              loaded: true,
+            },
+          },
+        ];
+        const request = actions.addNewQueryEditor();
+        request(store.dispatch, store.getState, undefined);
+        expect(store.getActions()).toEqual(expectedActions);
+      });
     });
   });
 
diff --git a/superset-frontend/src/SqlLab/actions/sqlLab.ts b/superset-frontend/src/SqlLab/actions/sqlLab.ts
index 093d1a497eb..dc5441ecfd0 100644
--- a/superset-frontend/src/SqlLab/actions/sqlLab.ts
+++ b/superset-frontend/src/SqlLab/actions/sqlLab.ts
@@ -47,6 +47,7 @@ import { newQueryTabName } from '../utils/newQueryTabName';
 import getInitialState from '../reducers/getInitialState';
 import { rehydratePersistedState } from '../utils/reduxStateToLocalStorageHelper';
 import { PREVIEW_QUERY_LIMIT } from '../constants';
+import { EMPTY_STATE_QE_ID } from '../hooks/useQueryEditor';
 
 // Type definitions for SqlLab actions
 export interface Query {
@@ -754,7 +755,7 @@ export function addNewQueryEditor(): SqlLabThunkAction<SqlLabAction> {
     const defaultDbId = common.conf.SQLLAB_DEFAULT_DBID as number | undefined;
     const activeQueryEditor = queryEditors.find(
       (qe: QueryEditor) => qe.id === tabHistory[tabHistory.length - 1],
-    );
+    ) ?? { id: EMPTY_STATE_QE_ID };
     const dbIds = Object.values(databases).map(
       (database: { id: number }) => database.id,
     );
diff --git a/superset-frontend/src/SqlLab/components/AppLayout/AppLayout.test.tsx b/superset-frontend/src/SqlLab/components/AppLayout/AppLayout.test.tsx
index 88ee6941765..a25738303a3 100644
--- a/superset-frontend/src/SqlLab/components/AppLayout/AppLayout.test.tsx
+++ b/superset-frontend/src/SqlLab/components/AppLayout/AppLayout.test.tsx
@@ -20,8 +20,11 @@ import React from 'react';
 import { render, userEvent, waitFor } from 'spec/helpers/testing-library';
 import { initialState } from 'src/SqlLab/fixtures';
 import useStoredSidebarWidth from 'src/components/ResizableSidebar/useStoredSidebarWidth';
-import { views } from 'src/core';
 import { ViewLocations } from 'src/SqlLab/contributions';
+import {
+  registerTestView,
+  cleanupExtensions,
+} from 'spec/helpers/extensionTestHelpers';
 import AppLayout from './index';
 
 jest.mock('src/components/ResizableSidebar/useStoredSidebarWidth');
@@ -63,6 +66,8 @@ beforeEach(() => {
   (useStoredSidebarWidth as jest.Mock).mockReturnValue([250, jest.fn()]);
 });
 
+afterEach(cleanupExtensions);
+
 test('renders two panels', () => {
   const { getAllByTestId } = render(<AppLayout {...defaultProps} />, {
     useRedux: true,
@@ -94,10 +99,20 @@ test('calls setWidth on sidebar resize when not hidden', async () => {
   await waitFor(() => expect(setWidth).toHaveBeenCalled());
 });
 
+test('right sidebar is hidden when no extensions registered', () => {
+  const { queryByText } = render(<AppLayout {...defaultProps} />, {
+    useRedux: true,
+    initialState,
+  });
+  // No right sidebar content — the third Splitter.Panel is conditionally omitted
+  expect(queryByText('Right Sidebar Content')).not.toBeInTheDocument();
+});
+
 test('renders right sidebar when view is contributed at rightSidebar location', () => {
-  views.registerView(
-    { id: 'test-right-sidebar-view', name: 'Test Right Sidebar View' },
+  registerTestView(
     ViewLocations.sqllab.rightSidebar,
+    'test-right-sidebar-view',
+    'Test Right Sidebar View',
     () => React.createElement('div', null, 'Right Sidebar Content'),
   );
 
@@ -110,5 +125,6 @@ test('renders right sidebar when view is contributed at rightSidebar location',
   );
 
   expect(getByText('Child')).toBeInTheDocument();
+  expect(getByText('Right Sidebar Content')).toBeInTheDocument();
   expect(getAllByTestId('mock-panel')).toHaveLength(3);
 });
diff --git a/superset-frontend/src/SqlLab/components/ColumnElement/index.tsx b/superset-frontend/src/SqlLab/components/ColumnElement/index.tsx
index 59a029904f0..7606149e71b 100644
--- a/superset-frontend/src/SqlLab/components/ColumnElement/index.tsx
+++ b/superset-frontend/src/SqlLab/components/ColumnElement/index.tsx
@@ -74,13 +74,16 @@ interface ColumnElementProps {
     keys?: { type: ColumnKeyTypeType }[];
     type: string;
   };
+  actions?: ReactNode;
 }
 
-const NowrapDiv = styled.div`
+const ColumnType = styled.div`
   white-space: nowrap;
+  color: ${({ theme }) => theme.colorTextDescription};
+  font-size: ${({ theme }) => theme.fontSizeSM}px;
 `;
 
-const ColumnElement = ({ column }: ColumnElementProps) => {
+const ColumnElement = ({ column, actions }: ColumnElementProps) => {
   let columnName: ReactNode = column.name;
   let icons;
   if (column.keys && column.keys.length > 0) {
@@ -110,10 +113,9 @@ const ColumnElement = ({ column }: ColumnElementProps) => {
       <div data-test="col-name">
         {columnName}
         {icons}
+        {actions}
       </div>
-      <NowrapDiv className="text-muted">
-        <small> {column.type}</small>
-      </NowrapDiv>
+      <ColumnType>{column.type}</ColumnType>
     </Flex>
   );
 };
diff --git a/superset-frontend/src/SqlLab/components/EditorWrapper/useKeywords.test.ts b/superset-frontend/src/SqlLab/components/EditorWrapper/useKeywords.test.ts
index 60c6d5095f5..be285fa4d3d 100644
--- a/superset-frontend/src/SqlLab/components/EditorWrapper/useKeywords.test.ts
+++ b/superset-frontend/src/SqlLab/components/EditorWrapper/useKeywords.test.ts
@@ -257,6 +257,8 @@ test('returns column keywords among selected tables', async () => {
     },
   );
 
+  // Both columns should be present since all cached table metadata
+  // for this database is included in autocomplete
   await waitFor(() =>
     expect(result.current).toContainEqual(
       expect.objectContaining({
@@ -268,31 +270,14 @@ test('returns column keywords among selected tables', async () => {
     ),
   );
 
-  expect(result.current).not.toContainEqual(
+  expect(result.current).toContainEqual(
     expect.objectContaining({
       name: unexpectedColumn,
+      value: unexpectedColumn,
+      score: COLUMN_AUTOCOMPLETE_SCORE,
+      meta: 'column',
     }),
   );
-
-  act(() => {
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    storeWithSqlLab.dispatch(
-      addTable(
-        { id: expectQueryEditorId } as any,
-        unexpectedTable,
-        expectCatalog,
-        expectSchema,
-      ) as any,
-    );
-  });
-
-  await waitFor(() =>
-    expect(result.current).toContainEqual(
-      expect.objectContaining({
-        name: unexpectedColumn,
-      }),
-    ),
-  );
 });
 
 test('returns long keywords with detail', async () => {
diff --git a/superset-frontend/src/SqlLab/components/EditorWrapper/useKeywords.ts b/superset-frontend/src/SqlLab/components/EditorWrapper/useKeywords.ts
index ce1896e0886..fa1a1974be9 100644
--- a/superset-frontend/src/SqlLab/components/EditorWrapper/useKeywords.ts
+++ b/superset-frontend/src/SqlLab/components/EditorWrapper/useKeywords.ts
@@ -17,7 +17,7 @@
  * under the License.
  */
 import { useEffect, useMemo, useRef } from 'react';
-import { useSelector, useDispatch, shallowEqual, useStore } from 'react-redux';
+import { useDispatch, useStore } from 'react-redux';
 import { t } from '@apache-superset/core/translation';
 import { getExtensionsRegistry } from '@superset-ui/core';
 
@@ -30,15 +30,10 @@ import {
   COLUMN_AUTOCOMPLETE_SCORE,
   SQL_FUNCTIONS_AUTOCOMPLETE_SCORE,
 } from 'src/SqlLab/constants';
-import {
-  schemaEndpoints,
-  tableEndpoints,
-  skipToken,
-} from 'src/hooks/apiResources';
+import { schemaEndpoints } from 'src/hooks/apiResources';
 import { api } from 'src/hooks/apiResources/queryApi';
 import { useDatabaseFunctionsQuery } from 'src/hooks/apiResources/databaseFunctions';
 import useEffectEvent from 'src/hooks/useEffectEvent';
-import { SqlLabRootState } from 'src/SqlLab/types';
 
 type Params = {
   queryEditorId: string | number;
@@ -51,7 +46,6 @@ type Params = {
 const EMPTY_LIST = [] as typeof sqlKeywords;
 
 const { useQueryState: useSchemasQueryState } = schemaEndpoints.schemas;
-const { useQueryState: useTablesQueryState } = tableEndpoints.tables;
 
 const getHelperText = (value: string) =>
   value.length > 30 && {
@@ -87,16 +81,6 @@ export function useKeywords(
     },
     { skip: skipFetch || !dbId },
   );
-  const { currentData: tableData } = useTablesQueryState(
-    {
-      dbId,
-      catalog,
-      schema,
-      forceRefresh: false,
-    },
-    { skip: skipFetch || !dbId || !schema },
-  );
-
   const { currentData: functionNames, isError } = useDatabaseFunctionsQuery(
     { dbId },
     { skip: skipFetch || !dbId },
@@ -110,41 +94,64 @@ export function useKeywords(
     }
   }, [dispatch, isError]);
 
-  const tablesForColumnMetadata = useSelector<SqlLabRootState, string[]>(
-    ({ sqlLab }) =>
-      skip
-        ? []
-        : (sqlLab?.tables ?? [])
-            .filter(table => table.queryEditorId === queryEditorId)
-            .map(table => table.name),
-    shallowEqual,
-  );
-
   const store = useStore();
   const apiState = store.getState()[api.reducerPath];
 
+  // Normalize catalog for comparison (null/undefined both mean "no catalog")
+  const normalizedCatalog = catalog ?? null;
+
+  // Collect all table names from all cached table-list queries for this database/catalog.
+  // This includes tables from any schema the user has expanded in the tree.
+  const allCachedTables = useMemo(() => {
+    if (skipFetch || !dbId || !apiState) return [];
+    const tables: { value: string; label: string; schema: string }[] = [];
+    const seen = new Set<string>();
+    const queries = apiState.queries ?? {};
+    for (const entry of Object.values(queries) as any[]) {
+      const arg = entry?.originalArgs;
+      if (
+        arg?.dbId === dbId &&
+        (arg?.catalog ?? null) === normalizedCatalog &&
+        entry?.status === 'fulfilled' &&
+        entry?.data?.options
+      ) {
+        for (const table of entry.data.options) {
+          const key = `${arg.schema}.${table.value}`;
+          if (!seen.has(key)) {
+            seen.add(key);
+            tables.push({
+              value: table.value,
+              label: table.label ?? table.value,
+              schema: arg.schema,
+            });
+          }
+        }
+      }
+    }
+    return tables;
+  }, [dbId, normalizedCatalog, apiState, skipFetch]);
+
+  // Collect column names from all cached table-metadata queries for this database/catalog.
+  // This includes columns from any table the user has expanded in the tree.
   const allColumns = useMemo(() => {
+    if (skipFetch || !dbId || !apiState) return [];
     const columns = new Set<string>();
-    tablesForColumnMetadata.forEach(table => {
-      tableEndpoints.tableMetadata
-        .select(
-          dbId && schema
-            ? {
-                dbId,
-                catalog,
-                schema,
-                table,
-              }
-            : skipToken,
-        )({
-          [api.reducerPath]: apiState,
-        })
-        .data?.columns?.forEach(({ name }) => {
-          columns.add(name);
-        });
-    });
+    const queries = apiState.queries ?? {};
+    for (const entry of Object.values(queries) as any[]) {
+      const arg = entry?.originalArgs;
+      if (
+        entry?.status === 'fulfilled' &&
+        entry?.data?.columns &&
+        arg?.dbId === dbId &&
+        (arg?.catalog ?? null) === normalizedCatalog
+      ) {
+        for (const col of entry.data.columns) {
+          columns.add(col.name);
+        }
+      }
+    }
     return [...columns];
-  }, [dbId, catalog, schema, apiState, tablesForColumnMetadata]);
+  }, [dbId, normalizedCatalog, apiState, skipFetch]);
 
   const insertMatch = useEffectEvent((editor: Editor, data: any) => {
     if (data.meta === 'table') {
@@ -153,7 +160,7 @@ export function useKeywords(
           { id: String(queryEditorId), dbId: dbId as number, tabViewId },
           data.value,
           catalog ?? null,
-          schema ?? '',
+          data.schema ?? schema ?? '',
           false, // Don't auto-expand/switch tabs when adding via autocomplete
         ),
       );
@@ -187,9 +194,10 @@ export function useKeywords(
 
   const tableKeywords = useMemo(
     () =>
-      (tableData?.options ?? []).map(({ value, label }) => ({
+      allCachedTables.map(({ value, label, schema: tableSchema }) => ({
         name: label,
         value,
+        schema: tableSchema,
         score: TABLE_AUTOCOMPLETE_SCORE,
         meta: 'table',
         completer: {
@@ -197,7 +205,7 @@ export function useKeywords(
         },
         ...getHelperText(value),
       })),
-    [tableData?.options, insertMatch],
+    [allCachedTables, insertMatch],
   );
 
   const columnKeywords = useMemo(
diff --git a/superset-frontend/src/SqlLab/components/HighlightedSql/HighlightedSql.test.tsx b/superset-frontend/src/SqlLab/components/HighlightedSql/HighlightedSql.test.tsx
index 70f63a2d0ff..2b4c841a040 100644
--- a/superset-frontend/src/SqlLab/components/HighlightedSql/HighlightedSql.test.tsx
+++ b/superset-frontend/src/SqlLab/components/HighlightedSql/HighlightedSql.test.tsx
@@ -36,13 +36,40 @@ test('renders a ModalTrigger component with shrink prop and maxWidth prop set to
   );
   expect(getByTestId('span-modal-trigger')).toBeInTheDocument();
 });
-test('renders two code elements in modal when rawSql prop is provided', () => {
-  const { getByRole, queryByRole, getByTestId } = render(
-    <HighlightedSql sql={sql} rawSql="SELECT * FORM foo" shrink maxWidth={5} />,
+test('renders single SQL block with no tabs when rawSql equals sql', () => {
+  const { queryByRole, getByTestId, queryByText } = render(
+    <HighlightedSql sql={sql} rawSql={sql} shrink maxWidth={5} />,
   );
   expect(queryByRole('dialog')).not.toBeInTheDocument();
   fireEvent.click(getByTestId('span-modal-trigger'));
   expect(queryByRole('dialog')).toBeInTheDocument();
-  const codeElements = getByRole('dialog').getElementsByTagName('code');
-  expect(codeElements.length).toEqual(2);
+  expect(queryByText('Executed SQL')).not.toBeInTheDocument();
+  expect(queryByText('Source SQL')).toBeInTheDocument();
+});
+
+test('renders tabs when rawSql differs from sql', () => {
+  const { queryByRole, getByTestId, getByText } = render(
+    <HighlightedSql sql={sql} rawSql="SELECT * FROM foo" shrink maxWidth={5} />,
+  );
+  expect(queryByRole('dialog')).not.toBeInTheDocument();
+  fireEvent.click(getByTestId('span-modal-trigger'));
+  expect(queryByRole('dialog')).toBeInTheDocument();
+  expect(getByText('Executed SQL')).toBeInTheDocument();
+  expect(getByText('Source SQL')).toBeInTheDocument();
+});
+
+test('renders tabs when rawSql has an added LIMIT', () => {
+  const { queryByRole, getByTestId, getByText } = render(
+    <HighlightedSql
+      sql={sql}
+      rawSql={`${sql} LIMIT 1000`}
+      shrink
+      maxWidth={5}
+    />,
+  );
+  expect(queryByRole('dialog')).not.toBeInTheDocument();
+  fireEvent.click(getByTestId('span-modal-trigger'));
+  expect(queryByRole('dialog')).toBeInTheDocument();
+  expect(getByText('Executed SQL')).toBeInTheDocument();
+  expect(getByText('Source SQL')).toBeInTheDocument();
 });
diff --git a/superset-frontend/src/SqlLab/components/HighlightedSql/index.tsx b/superset-frontend/src/SqlLab/components/HighlightedSql/index.tsx
index f958e05a32d..03adf270043 100644
--- a/superset-frontend/src/SqlLab/components/HighlightedSql/index.tsx
+++ b/superset-frontend/src/SqlLab/components/HighlightedSql/index.tsx
@@ -16,8 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+import { styled, useTheme } from '@apache-superset/core/theme';
 import { t } from '@apache-superset/core/translation';
-import { ModalTrigger } from '@superset-ui/core/components';
+import { ModalTrigger, Tabs } from '@superset-ui/core/components';
 import CodeSyntaxHighlighter from '@superset-ui/core/components/CodeSyntaxHighlighter';
 
 export interface HighlightedSqlProps {
@@ -40,6 +41,12 @@ interface TriggerNodeProps {
   maxWidth: number;
 }
 
+const Title = styled.h4`
+  font-size: ${({ theme }) => theme.fontSizeLG}px;
+  margin: ${({ theme }) => theme.sizeUnit * 2}px 0;
+  font-weight: ${({ theme }) => theme.fontWeightStrong};
+`;
+
 const shrinkSql = (sql: string, maxLines: number, maxWidth: number) => {
   const ssql = sql || '';
   let lines = ssql.split('\n');
@@ -56,24 +63,60 @@ const shrinkSql = (sql: string, maxLines: number, maxWidth: number) => {
 
 function TriggerNode({ shrink, sql, maxLines, maxWidth }: TriggerNodeProps) {
   return (
-    <CodeSyntaxHighlighter language="sql">
+    <CodeSyntaxHighlighter language="sql" showCopyButton={false}>
       {shrink ? shrinkSql(sql, maxLines, maxWidth) : sql}
     </CodeSyntaxHighlighter>
   );
 }
 
 function HighlightSqlModal({ rawSql, sql }: HighlightedSqlModalTypes) {
+  const theme = useTheme();
+  const codeBlockStyle = {
+    border: 1,
+    borderColor: theme.colorBorder,
+    borderStyle: 'solid',
+    backgroundColor: theme.colorBgLayout,
+    fontSize: theme.fontSize * 0.9,
+    padding: theme.sizeUnit * 2,
+  };
+
+  const isDifferent = !!rawSql && rawSql !== sql;
+
+  if (!isDifferent) {
+    return (
+      <div>
+        <Title>{t('Source SQL')}</Title>
+        <CodeSyntaxHighlighter language="sql" customStyle={codeBlockStyle}>
+          {sql}
+        </CodeSyntaxHighlighter>
+      </div>
+    );
+  }
+
   return (
-    <div>
-      <h4>{t('Source SQL')}</h4>
-      <CodeSyntaxHighlighter language="sql">{sql}</CodeSyntaxHighlighter>
-      {rawSql && rawSql !== sql && (
-        <div>
-          <h4>{t('Executed SQL')}</h4>
-          <CodeSyntaxHighlighter language="sql">{rawSql}</CodeSyntaxHighlighter>
-        </div>
-      )}
-    </div>
+    <Tabs
+      defaultActiveKey="executed"
+      items={[
+        {
+          key: 'executed',
+          label: t('Executed SQL'),
+          children: (
+            <CodeSyntaxHighlighter language="sql" customStyle={codeBlockStyle}>
+              {rawSql!}
+            </CodeSyntaxHighlighter>
+          ),
+        },
+        {
+          key: 'source',
+          label: t('Source SQL'),
+          children: (
+            <CodeSyntaxHighlighter language="sql" customStyle={codeBlockStyle}>
+              {sql}
+            </CodeSyntaxHighlighter>
+          ),
+        },
+      ]}
+    />
   );
 }
 
@@ -96,6 +139,7 @@ function HighlightedSql({
           maxWidth={maxWidth}
         />
       }
+      responsive
     />
   );
 }
diff --git a/superset-frontend/src/SqlLab/components/QueryHistory/QueryHistory.test.tsx b/superset-frontend/src/SqlLab/components/QueryHistory/QueryHistory.test.tsx
index a1d2185f3c5..cea251cb9cc 100644
--- a/superset-frontend/src/SqlLab/components/QueryHistory/QueryHistory.test.tsx
+++ b/superset-frontend/src/SqlLab/components/QueryHistory/QueryHistory.test.tsx
@@ -25,6 +25,11 @@ import {
   defaultQueryEditor,
   extraQueryEditor3,
 } from 'src/SqlLab/fixtures';
+import { ViewLocations } from 'src/SqlLab/contributions';
+import {
+  registerToolbarAction,
+  cleanupExtensions,
+} from 'spec/helpers/extensionTestHelpers';
 
 const mockedProps = {
   queryEditorId: defaultQueryEditor.id,
@@ -81,7 +86,11 @@ const setup = (overrides = {}) => (
   <QueryHistory {...mockedProps} {...overrides} />
 );
 
-afterEach(() => fetchMock.clearHistory().removeRoutes());
+afterEach(() => {
+  fetchMock.clearHistory().removeRoutes();
+  cleanupExtensions();
+  mockedIsFeatureEnabled.mockReset();
+});
 
 test('Renders an empty state for query history', () => {
   render(setup(), { useRedux: true, initialState });
@@ -242,3 +251,44 @@ test('displays multiple queries with newest query first', async () => {
 
   isFeatureEnabledMock.mockClear();
 });
+
+test('renders contributed toolbar action in queryHistory slot', () => {
+  registerToolbarAction(
+    ViewLocations.sqllab.queryHistory,
+    'test-history-action',
+    'History Action',
+    jest.fn(),
+  );
+
+  const stateWithQueries = {
+    ...initialState,
+    sqlLab: {
+      ...initialState.sqlLab,
+      queries: {
+        testQuery: {
+          id: 'testQuery',
+          sqlEditorId: defaultQueryEditor.id,
+          sql: 'SELECT 1',
+          state: QueryState.Success,
+          startDttm: Date.now(),
+          endDttm: Date.now() + 100,
+          progress: 100,
+          rows: 1,
+          cached: false,
+          changed_on: new Date().toISOString(),
+          db: 'main',
+          dbId: 1,
+        },
+      },
+    },
+  };
+
+  render(setup(), {
+    useRedux: true,
+    initialState: stateWithQueries,
+  });
+
+  expect(
+    screen.getByRole('button', { name: 'History Action' }),
+  ).toBeInTheDocument();
+});
diff --git a/superset-frontend/src/SqlLab/components/QueryLimitSelect/index.tsx b/superset-frontend/src/SqlLab/components/QueryLimitSelect/index.tsx
index 9dadb22b091..4c2803b7753 100644
--- a/superset-frontend/src/SqlLab/components/QueryLimitSelect/index.tsx
+++ b/superset-frontend/src/SqlLab/components/QueryLimitSelect/index.tsx
@@ -89,7 +89,7 @@ const QueryLimitSelect = ({
     >
       <Button
         size="small"
-        color="primary"
+        color="default"
         variant="text"
         showMarginRight={false}
       >
diff --git a/superset-frontend/src/SqlLab/components/ResultSet/ResultSet.test.tsx b/superset-frontend/src/SqlLab/components/ResultSet/ResultSet.test.tsx
index 20871fc029f..3885f195532 100644
--- a/superset-frontend/src/SqlLab/components/ResultSet/ResultSet.test.tsx
+++ b/superset-frontend/src/SqlLab/components/ResultSet/ResultSet.test.tsx
@@ -41,6 +41,19 @@ import {
   queryWithNoQueryLimit,
   failedQueryWithFrontendTimeoutErrors,
 } from 'src/SqlLab/fixtures';
+import { FeatureFlag, isFeatureEnabled } from '@superset-ui/core';
+import { ViewLocations } from 'src/SqlLab/contributions';
+import {
+  registerToolbarAction,
+  cleanupExtensions,
+} from 'spec/helpers/extensionTestHelpers';
+
+jest.mock('@superset-ui/core', () => ({
+  ...jest.requireActual('@superset-ui/core'),
+  isFeatureEnabled: jest.fn().mockReturnValue(false),
+}));
+
+const mockIsFeatureEnabled = isFeatureEnabled as jest.Mock;
 
 jest.mock('src/components/ErrorMessage', () => ({
   ErrorMessageWithStackTrace: () => <div data-test="error-message">Error</div>,
@@ -152,6 +165,7 @@ describe('ResultSet', () => {
   // Add cleanup after each test
   afterEach(async () => {
     fetchMock.clearHistory();
+    cleanupExtensions();
     // Wait for any pending effects to complete
     await new Promise(resolve => setTimeout(resolve, 0));
   });
@@ -545,7 +559,9 @@ describe('ResultSet', () => {
         },
       }),
     );
-    expect(queryByTestId('export-csv-button')).not.toBeInTheDocument();
+    const csvButton = queryByTestId('export-csv-button');
+    expect(csvButton).toBeInTheDocument();
+    expect(csvButton).toBeDisabled();
   });
 
   test('should allow copy to clipboard when user has permission to export data', async () => {
@@ -584,7 +600,9 @@ describe('ResultSet', () => {
         },
       }),
     );
-    expect(queryByTestId('copy-to-clipboard-button')).not.toBeInTheDocument();
+    const clipboardButton = queryByTestId('copy-to-clipboard-button');
+    expect(clipboardButton).toBeInTheDocument();
+    expect(clipboardButton).toBeDisabled();
   });
 
   test('should include sqlEditorImmutableId in query object when fetching results', async () => {
@@ -753,4 +771,242 @@ describe('ResultSet', () => {
       );
     },
   );
+
+  test('should show CSV button with granular can_export_data permission when flag is ON', async () => {
+    mockIsFeatureEnabled.mockImplementation(
+      (flag: FeatureFlag) => flag === FeatureFlag.GranularExportControls,
+    );
+    const { queryByTestId } = setup(
+      mockedProps,
+      mockStore({
+        ...initialState,
+        user: {
+          ...user,
+          roles: {
+            sql_lab: [['can_export_data', 'Superset']],
+          },
+        },
+        sqlLab: {
+          ...initialState.sqlLab,
+          queries: {
+            [queries[0].id]: queries[0],
+          },
+        },
+      }),
+    );
+    const csvButton = queryByTestId('export-csv-button');
+    expect(csvButton).toBeInTheDocument();
+    expect(csvButton).toBeEnabled();
+    mockIsFeatureEnabled.mockReset();
+  });
+
+  test('should disable CSV button when granular flag is ON and user lacks can_export_data', async () => {
+    mockIsFeatureEnabled.mockImplementation(
+      (flag: FeatureFlag) => flag === FeatureFlag.GranularExportControls,
+    );
+    const { queryByTestId } = setup(
+      mockedProps,
+      mockStore({
+        ...initialState,
+        user: {
+          ...user,
+          roles: {
+            sql_lab: [],
+          },
+        },
+        sqlLab: {
+          ...initialState.sqlLab,
+          queries: {
+            [queries[0].id]: queries[0],
+          },
+        },
+      }),
+    );
+    const csvButton = queryByTestId('export-csv-button');
+    expect(csvButton).toBeInTheDocument();
+    expect(csvButton).toBeDisabled();
+    mockIsFeatureEnabled.mockReset();
+  });
+
+  test('should show clipboard button with granular can_copy_clipboard permission when flag is ON', async () => {
+    mockIsFeatureEnabled.mockImplementation(
+      (flag: FeatureFlag) => flag === FeatureFlag.GranularExportControls,
+    );
+    const { queryByTestId } = setup(
+      mockedProps,
+      mockStore({
+        ...initialState,
+        user: {
+          ...user,
+          roles: {
+            sql_lab: [['can_copy_clipboard', 'Superset']],
+          },
+        },
+        sqlLab: {
+          ...initialState.sqlLab,
+          queries: {
+            [queries[0].id]: queries[0],
+          },
+        },
+      }),
+    );
+    const clipboardButton = queryByTestId('copy-to-clipboard-button');
+    expect(clipboardButton).toBeInTheDocument();
+    expect(clipboardButton).toBeEnabled();
+    mockIsFeatureEnabled.mockReset();
+  });
+
+  test('should disable clipboard button when granular flag is ON and user lacks can_copy_clipboard', async () => {
+    mockIsFeatureEnabled.mockImplementation(
+      (flag: FeatureFlag) => flag === FeatureFlag.GranularExportControls,
+    );
+    const { queryByTestId } = setup(
+      mockedProps,
+      mockStore({
+        ...initialState,
+        user: {
+          ...user,
+          roles: {
+            sql_lab: [['can_export_data', 'Superset']],
+          },
+        },
+        sqlLab: {
+          ...initialState.sqlLab,
+          queries: {
+            [queries[0].id]: queries[0],
+          },
+        },
+      }),
+    );
+    const clipboardButton = queryByTestId('copy-to-clipboard-button');
+    expect(clipboardButton).toBeInTheDocument();
+    expect(clipboardButton).toBeDisabled();
+    mockIsFeatureEnabled.mockReset();
+  });
+
+  test('should use legacy can_export_csv for both CSV and clipboard when granular flag is OFF', async () => {
+    mockIsFeatureEnabled.mockReturnValue(false);
+    const { queryByTestId } = setup(
+      mockedProps,
+      mockStore({
+        ...initialState,
+        user: {
+          ...user,
+          roles: {
+            sql_lab: [['can_export_csv', 'SQLLab']],
+          },
+        },
+        sqlLab: {
+          ...initialState.sqlLab,
+          queries: {
+            [queries[0].id]: queries[0],
+          },
+        },
+      }),
+    );
+    const csvButton = queryByTestId('export-csv-button');
+    const clipboardButton = queryByTestId('copy-to-clipboard-button');
+    expect(csvButton).toBeInTheDocument();
+    expect(csvButton).toBeEnabled();
+    expect(clipboardButton).toBeInTheDocument();
+    expect(clipboardButton).toBeEnabled();
+    mockIsFeatureEnabled.mockReset();
+  });
+
+  test('disabled CSV button should show permission tooltip when granular flag is ON', async () => {
+    mockIsFeatureEnabled.mockImplementation(
+      (flag: FeatureFlag) => flag === FeatureFlag.GranularExportControls,
+    );
+    const { getByTestId } = setup(
+      mockedProps,
+      mockStore({
+        ...initialState,
+        user: {
+          ...user,
+          roles: {
+            sql_lab: [['can_copy_clipboard', 'Superset']],
+          },
+        },
+        sqlLab: {
+          ...initialState.sqlLab,
+          queries: {
+            [queries[0].id]: queries[0],
+          },
+        },
+      }),
+    );
+    const csvButton = getByTestId('export-csv-button');
+    expect(csvButton).toBeDisabled();
+    fireEvent.mouseOver(csvButton.parentElement ?? csvButton);
+    await waitFor(() => {
+      expect(
+        screen.getByText("You don't have permission to export data"),
+      ).toBeInTheDocument();
+    });
+    mockIsFeatureEnabled.mockReset();
+  });
+
+  test('disabled clipboard button should show permission tooltip when granular flag is ON', async () => {
+    mockIsFeatureEnabled.mockImplementation(
+      (flag: FeatureFlag) => flag === FeatureFlag.GranularExportControls,
+    );
+    const { getByTestId } = setup(
+      mockedProps,
+      mockStore({
+        ...initialState,
+        user: {
+          ...user,
+          roles: {
+            sql_lab: [['can_export_data', 'Superset']],
+          },
+        },
+        sqlLab: {
+          ...initialState.sqlLab,
+          queries: {
+            [queries[0].id]: queries[0],
+          },
+        },
+      }),
+    );
+    const clipboardButton = getByTestId('copy-to-clipboard-button');
+    expect(clipboardButton).toBeDisabled();
+    fireEvent.mouseOver(clipboardButton.parentElement ?? clipboardButton);
+    await waitFor(() => {
+      expect(
+        screen.getByText("You don't have permission to copy to clipboard"),
+      ).toBeInTheDocument();
+    });
+    mockIsFeatureEnabled.mockReset();
+  });
+
+  test('renders contributed toolbar action in results slot', async () => {
+    registerToolbarAction(
+      ViewLocations.sqllab.results,
+      'test-results-action',
+      'Results Action',
+      jest.fn(),
+    );
+
+    const { getByTestId } = setup(
+      mockedProps,
+      mockStore({
+        ...initialState,
+        user,
+        sqlLab: {
+          ...initialState.sqlLab,
+          queries: {
+            [queries[0].id]: queries[0],
+          },
+        },
+      }),
+    );
+
+    await waitFor(() => {
+      expect(getByTestId('table-container')).toBeInTheDocument();
+    });
+
+    expect(
+      screen.getByRole('button', { name: 'Results Action' }),
+    ).toBeInTheDocument();
+  });
 });
diff --git a/superset-frontend/src/SqlLab/components/ResultSet/index.tsx b/superset-frontend/src/SqlLab/components/ResultSet/index.tsx
index 7c33304890a..d7c42fc2b2c 100644
--- a/superset-frontend/src/SqlLab/components/ResultSet/index.tsx
+++ b/superset-frontend/src/SqlLab/components/ResultSet/index.tsx
@@ -82,7 +82,7 @@ import {
   LOG_ACTIONS_SQLLAB_DOWNLOAD_CSV,
 } from 'src/logger/LogUtils';
 import { Icons } from '@superset-ui/core/components/Icons';
-import { findPermission } from 'src/utils/findPermission';
+import { usePermissions } from 'src/hooks/usePermissions';
 import { StreamingExportModal } from 'src/components/StreamingExportModal';
 import { useStreamingExport } from 'src/components/StreamingExportModal/useStreamingExport';
 import { useConfirmModal } from 'src/hooks/useConfirmModal';
@@ -172,7 +172,6 @@ const ResultSet = ({
   defaultQueryLimit,
   useFixedHeight = false,
 }: ResultSetProps) => {
-  const user = useSelector(({ user }: SqlLabRootState) => user, shallowEqual);
   const streamingThreshold = useSelector(
     (state: SqlLabRootState) =>
       state.common?.conf?.CSV_STREAMING_ROW_THRESHOLD || 1000,
@@ -227,6 +226,10 @@ const ResultSet = ({
     [query.results?.expanded_columns],
   );
 
+  const {
+    canExportDataSqlLab: canExportData,
+    canCopyClipboardSqlLab: canCopyClipboard,
+  } = usePermissions();
   const history = useHistory();
   const dispatch = useDispatch();
   const logAction = useLogAction({ queryId, sqlEditorId: query.sqlEditorId });
@@ -361,12 +364,6 @@ const ResultSet = ({
         schema: query?.schema,
       };
 
-      const canExportData = findPermission(
-        'can_export_csv',
-        'SQLLab',
-        user?.roles,
-      );
-
       const handleDownloadCsv = (event: React.MouseEvent<HTMLElement>) => {
         logAction(LOG_ACTIONS_SQLLAB_DOWNLOAD_CSV, {});
 
@@ -396,19 +393,26 @@ const ResultSet = ({
               onClick={createExploreResultsOnClick}
             />
           )}
-          {csv && canExportData && (
+          {csv && (
             <Button
               buttonSize="small"
               variant="text"
               color="primary"
               icon={<Icons.DownloadOutlined iconSize="m" />}
-              tooltip={t('Download to CSV')}
+              tooltip={
+                !canExportData
+                  ? t("You don't have permission to export data")
+                  : t('Download to CSV')
+              }
               aria-label={t('Download to CSV')}
-              {...(!shouldUseStreamingExport() && {
-                href: getExportCsvUrl(query.id),
-              })}
+              disabled={!canExportData}
+              {...(canExportData &&
+                !shouldUseStreamingExport() && {
+                  href: getExportCsvUrl(query.id),
+                })}
               data-test="export-csv-button"
               onClick={e => {
+                if (!canExportData) return;
                 const useStreaming = shouldUseStreamingExport();
 
                 if (useStreaming) {
@@ -427,30 +431,38 @@ const ResultSet = ({
               }}
             />
           )}
-          {canExportData && (
-            <CopyToClipboard
-              text={prepareCopyToClipboardTabularData(
-                data,
-                columns.map(c => c.column_name),
-              )}
-              wrapped={false}
-              copyNode={
-                <Button
-                  buttonSize="small"
-                  variant="text"
-                  color="primary"
-                  icon={<Icons.CopyOutlined iconSize="m" />}
-                  tooltip={t('Copy to Clipboard')}
-                  aria-label={t('Copy to Clipboard')}
-                  data-test="copy-to-clipboard-button"
-                />
-              }
-              hideTooltip
-              onCopyEnd={() =>
-                logAction(LOG_ACTIONS_SQLLAB_COPY_RESULT_TO_CLIPBOARD, {})
-              }
-            />
-          )}
+          <CopyToClipboard
+            text={
+              canCopyClipboard
+                ? prepareCopyToClipboardTabularData(
+                    data,
+                    columns.map(c => c.column_name),
+                  )
+                : ''
+            }
+            disabled={!canCopyClipboard}
+            wrapped={false}
+            copyNode={
+              <Button
+                buttonSize="small"
+                variant="text"
+                color="primary"
+                icon={<Icons.CopyOutlined iconSize="m" />}
+                tooltip={
+                  !canCopyClipboard
+                    ? t("You don't have permission to copy to clipboard")
+                    : t('Copy to Clipboard')
+                }
+                aria-label={t('Copy to Clipboard')}
+                disabled={!canCopyClipboard}
+                data-test="copy-to-clipboard-button"
+              />
+            }
+            hideTooltip
+            onCopyEnd={() =>
+              logAction(LOG_ACTIONS_SQLLAB_COPY_RESULT_TO_CLIPBOARD, {})
+            }
+          />
         </>
       );
 
@@ -749,6 +761,7 @@ const ResultSet = ({
               <div
                 css={css`
                   flex: 1 1 auto;
+                  padding-bottom: ${theme.sizeUnit * 3}px;
                 `}
               >
                 <AutoSizer disableWidth>
diff --git a/superset-frontend/src/SqlLab/components/SaveDatasetActionButton/index.tsx b/superset-frontend/src/SqlLab/components/SaveDatasetActionButton/index.tsx
index b82f788f420..a592c786b95 100644
--- a/superset-frontend/src/SqlLab/components/SaveDatasetActionButton/index.tsx
+++ b/superset-frontend/src/SqlLab/components/SaveDatasetActionButton/index.tsx
@@ -31,7 +31,7 @@ const SaveDatasetActionButton = ({
 }: SaveDatasetActionButtonProps) => (
   <>
     <Button
-      color="primary"
+      color="default"
       variant="text"
       onClick={() => setShowSave(true)}
       icon={<Icons.SaveOutlined />}
@@ -40,7 +40,7 @@ const SaveDatasetActionButton = ({
     />
     {onSaveAsExplore && (
       <Button
-        color="primary"
+        color="default"
         variant="text"
         onClick={() => onSaveAsExplore?.()}
         icon={<Icons.TableOutlined />}
diff --git a/superset-frontend/src/SqlLab/components/SaveQuery/index.tsx b/superset-frontend/src/SqlLab/components/SaveQuery/index.tsx
index 3d235cbd739..dc5e05b862c 100644
--- a/superset-frontend/src/SqlLab/components/SaveQuery/index.tsx
+++ b/superset-frontend/src/SqlLab/components/SaveQuery/index.tsx
@@ -233,7 +233,7 @@ const SaveQuery = ({
               {t('Cancel')}
             </Button>
             <Button
-              buttonStyle={isSaved ? undefined : 'primary'}
+              buttonStyle={isSaved ? 'secondary' : 'primary'}
               onClick={onSaveWrapper}
               cta
             >
diff --git a/superset-frontend/src/SqlLab/components/ShareSqlLabQuery/ShareSqlLabQuery.test.tsx b/superset-frontend/src/SqlLab/components/ShareSqlLabQuery/ShareSqlLabQuery.test.tsx
index 33b408eeedd..5d9f41da115 100644
--- a/superset-frontend/src/SqlLab/components/ShareSqlLabQuery/ShareSqlLabQuery.test.tsx
+++ b/superset-frontend/src/SqlLab/components/ShareSqlLabQuery/ShareSqlLabQuery.test.tsx
@@ -124,6 +124,25 @@ describe('ShareSqlLabQuery', () => {
       ).toEqual(expected);
     });
 
+    test('does not show duplicate "Copy to clipboard" tooltip on hover', async () => {
+      await act(async () => {
+        render(<ShareSqlLabQuery {...defaultProps} />, {
+          useRedux: true,
+          store,
+        });
+      });
+      const button = screen.getByRole('button');
+      userEvent.hover(button);
+      expect(
+         await screen.findByText('Copy query link to your clipboard'),
+       ).toBeInTheDocument();
+      await waitFor(() => {
+        // CopyToClipboard default tooltip must NOT appear —
+        // only the Button-level "Copy query link to your clipboard" should show.
+        expect(screen.queryByText('Copy to clipboard')).not.toBeInTheDocument();
+      });
+    });
+
     test('calls storeQuery() with unsaved changes', async () => {
       await act(async () => {
         render(<ShareSqlLabQuery {...defaultProps} />, {
diff --git a/superset-frontend/src/SqlLab/components/ShareSqlLabQuery/index.tsx b/superset-frontend/src/SqlLab/components/ShareSqlLabQuery/index.tsx
index 6be69ca8639..f3ce5b80ce2 100644
--- a/superset-frontend/src/SqlLab/components/ShareSqlLabQuery/index.tsx
+++ b/superset-frontend/src/SqlLab/components/ShareSqlLabQuery/index.tsx
@@ -71,7 +71,7 @@ const ShareSqlLabQuery = ({
     const tooltip = t('Copy query link to your clipboard');
     return (
       <Button
-        color="primary"
+        color="default"
         variant="text"
         tooltip={tooltip}
         css={css`
@@ -89,6 +89,7 @@ const ShareSqlLabQuery = ({
       getText={getCopyUrl}
       wrapped={false}
       copyNode={buildButton()}
+      hideTooltip
     />
   );
 };
diff --git a/superset-frontend/src/SqlLab/components/SouthPane/SouthPane.test.tsx b/superset-frontend/src/SqlLab/components/SouthPane/SouthPane.test.tsx
index 98b2ff45f54..42b15dfa8c0 100644
--- a/superset-frontend/src/SqlLab/components/SouthPane/SouthPane.test.tsx
+++ b/superset-frontend/src/SqlLab/components/SouthPane/SouthPane.test.tsx
@@ -16,12 +16,21 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+import React from 'react';
 import { render, waitFor, screen } from 'spec/helpers/testing-library';
+import userEvent from '@testing-library/user-event';
 import SouthPane from 'src/SqlLab/components/SouthPane';
 import { STATUS_OPTIONS } from 'src/SqlLab/constants';
 import { initialState, table, defaultQueryEditor } from 'src/SqlLab/fixtures';
 import { denormalizeTimestamp } from '@superset-ui/core';
-import userEvent from '@testing-library/user-event';
+import { ViewLocations } from 'src/SqlLab/contributions';
+import {
+  registerTestView,
+  registerToolbarAction,
+  cleanupExtensions,
+} from 'spec/helpers/extensionTestHelpers';
+
+afterEach(cleanupExtensions);
 
 const mockedProps = {
   queryEditorId: defaultQueryEditor.id,
@@ -163,8 +172,6 @@ test('should remove tab', async () => {
   const totalTabs = mockState.sqlLab.tables.length + 2;
   expect(tabs).toHaveLength(totalTabs);
 
-  console.log(tabs[2].parentElement?.innerHTML); // debug
-
   const removeButton = tabs[2].parentElement?.querySelector(
     'button[aria-label="remove"]',
   );
@@ -181,3 +188,64 @@ test('should remove tab', async () => {
     expect(tabs).toHaveLength(totalTabs - 1);
   });
 });
+
+test('renders contributed tab content via ViewListExtension', () => {
+  registerTestView(
+    ViewLocations.sqllab.panels,
+    'test-panel',
+    'Test Panel',
+    () => React.createElement('div', null, 'Contributed Panel Content'),
+  );
+
+  const { container } = render(<SouthPane {...mockedProps} />, {
+    useRedux: true,
+    initialState: mockState,
+  });
+
+  const tabs = Array.from(container.querySelectorAll('[role="tab"]')).filter(
+    tab => !tab.classList.contains('ant-tabs-tab-remove'),
+  );
+  // Base tabs (Results + Query history) + 2 table previews + 1 extension
+  expect(tabs).toHaveLength(mockState.sqlLab.tables.length + 3);
+  expect(tabs.find(tab => tab.textContent === 'Test Panel')).toBeTruthy();
+  expect(screen.getByText('Contributed Panel Content')).toBeInTheDocument();
+});
+
+test('renders slot-wide toolbar actions via PanelToolbar', () => {
+  registerToolbarAction(
+    ViewLocations.sqllab.panels,
+    'test-panels-action',
+    'Panels Action',
+    jest.fn(),
+  );
+
+  render(<SouthPane {...mockedProps} />, {
+    useRedux: true,
+    initialState: mockState,
+  });
+
+  expect(screen.getByLabelText('Panels Action')).toBeInTheDocument();
+});
+
+test('renders per-view toolbar actions for contributed tab', () => {
+  registerTestView(
+    ViewLocations.sqllab.panels,
+    'test-per-view-panel',
+    'Per-View Panel',
+    () => React.createElement('div', null, 'Per-View Content'),
+  );
+  registerToolbarAction(
+    'test-per-view-panel',
+    'test-per-view-action',
+    'Per-View Action',
+    jest.fn(),
+  );
+
+  render(<SouthPane {...mockedProps} />, {
+    useRedux: true,
+    initialState: mockState,
+  });
+
+  // Content is rendered via forceRender: true even when tab is not active.
+  expect(screen.getByLabelText('Per-View Action')).toBeInTheDocument();
+});
diff --git a/superset-frontend/src/SqlLab/components/SqlEditorLeftBar/SqlEditorLeftBar.test.tsx b/superset-frontend/src/SqlLab/components/SqlEditorLeftBar/SqlEditorLeftBar.test.tsx
index 673171787ae..3141e87d333 100644
--- a/superset-frontend/src/SqlLab/components/SqlEditorLeftBar/SqlEditorLeftBar.test.tsx
+++ b/superset-frontend/src/SqlLab/components/SqlEditorLeftBar/SqlEditorLeftBar.test.tsx
@@ -32,6 +32,8 @@ import {
   defaultQueryEditor,
   extraQueryEditor2,
 } from 'src/SqlLab/fixtures';
+import { EMPTY_STATE_QE_ID } from 'src/SqlLab/hooks/useQueryEditor';
+import * as useDatabaseSelectorModule from '../SqlEditorTopBar/useDatabaseSelector';
 import type { RootState } from 'src/views/store';
 import type { Store } from 'redux';
 
@@ -199,7 +201,7 @@ test('display no compatible schema found when schema api throws errors', async (
     ).toBeGreaterThanOrEqual(1),
   );
   const select = screen.getByRole('combobox', {
-    name: 'Select schema or type to search schemas',
+    name: 'Select schema',
   });
   userEvent.click(select);
   expect(
@@ -235,3 +237,16 @@ test('ignore schema api when current schema is deprecated', async () => {
     ]),
   );
 });
+
+test('uses EMPTY_STATE_QE_ID when queryEditorId is empty', async () => {
+  const useDatabaseSelectorSpy = jest.spyOn(
+    useDatabaseSelectorModule,
+    'default',
+  );
+
+  await renderAndWait({ queryEditorId: '' }, undefined, initialState);
+
+  expect(useDatabaseSelectorSpy).toHaveBeenCalledWith(EMPTY_STATE_QE_ID);
+
+  useDatabaseSelectorSpy.mockRestore();
+});
diff --git a/superset-frontend/src/SqlLab/components/SqlEditorLeftBar/index.tsx b/superset-frontend/src/SqlLab/components/SqlEditorLeftBar/index.tsx
index 9ff47fd6223..e4297629271 100644
--- a/superset-frontend/src/SqlLab/components/SqlEditorLeftBar/index.tsx
+++ b/superset-frontend/src/SqlLab/components/SqlEditorLeftBar/index.tsx
@@ -32,6 +32,7 @@ import { t } from '@apache-superset/core/translation';
 import { styled, css } from '@apache-superset/core/theme';
 import type { SchemaOption, CatalogOption } from 'src/hooks/apiResources';
 import { DatabaseSelector, type DatabaseObject } from 'src/components';
+import { EMPTY_STATE_QE_ID } from 'src/SqlLab/hooks/useQueryEditor';
 
 import useDatabaseSelector from '../SqlEditorTopBar/useDatabaseSelector';
 import TableExploreTree from '../TableExploreTree';
@@ -63,7 +64,8 @@ const StyledDivider = styled.div`
 `;
 
 const SqlEditorLeftBar = ({ queryEditorId }: SqlEditorLeftBarProps) => {
-  const dbSelectorProps = useDatabaseSelector(queryEditorId);
+  const activeQEId = queryEditorId || EMPTY_STATE_QE_ID;
+  const dbSelectorProps = useDatabaseSelector(activeQEId);
   const { db, catalog, schema, onDbChange, onCatalogChange, onSchemaChange } =
     dbSelectorProps;
 
@@ -198,7 +200,7 @@ const SqlEditorLeftBar = ({ queryEditorId }: SqlEditorLeftBarProps) => {
         />
       </Popover>
       <StyledDivider />
-      <TableExploreTree queryEditorId={queryEditorId} />
+      <TableExploreTree queryEditorId={activeQEId} />
       {shouldShowReset && (
         <Button
           buttonSize="small"
diff --git a/superset-frontend/src/SqlLab/components/SqlEditorTopBar/SqlEditorTopBar.test.tsx b/superset-frontend/src/SqlLab/components/SqlEditorTopBar/SqlEditorTopBar.test.tsx
index 224627b0701..515118c3900 100644
--- a/superset-frontend/src/SqlLab/components/SqlEditorTopBar/SqlEditorTopBar.test.tsx
+++ b/superset-frontend/src/SqlLab/components/SqlEditorTopBar/SqlEditorTopBar.test.tsx
@@ -17,31 +17,16 @@
  * under the License.
  */
 import { render, screen } from 'spec/helpers/testing-library';
-import { MenuItemType } from '@superset-ui/core/components/Menu';
 import SqlEditorTopBar, {
   SqlEditorTopBarProps,
 } from 'src/SqlLab/components/SqlEditorTopBar';
+import { ViewLocations } from 'src/SqlLab/contributions';
+import {
+  registerToolbarAction,
+  cleanupExtensions,
+} from 'spec/helpers/extensionTestHelpers';
 
-jest.mock('src/components/PanelToolbar', () => ({
-  __esModule: true,
-  default: ({
-    viewId,
-    defaultPrimaryActions,
-    defaultSecondaryActions,
-  }: {
-    viewId: string;
-    defaultPrimaryActions?: React.ReactNode;
-    defaultSecondaryActions?: MenuItemType[];
-  }) => (
-    <div
-      data-test="mock-panel-toolbar"
-      data-view-id={viewId}
-      data-default-secondary-count={defaultSecondaryActions?.length ?? 0}
-    >
-      {defaultPrimaryActions}
-    </div>
-  ),
-}));
+afterEach(cleanupExtensions);
 
 const defaultProps: SqlEditorTopBarProps = {
   queryEditorId: 'test-query-editor-id',
@@ -55,24 +40,6 @@ const defaultProps: SqlEditorTopBarProps = {
 const setup = (props?: Partial<SqlEditorTopBarProps>) =>
   render(<SqlEditorTopBar {...defaultProps} {...props} />);
 
-test('renders SqlEditorTopBar component', () => {
-  setup();
-  const panelToolbar = screen.getByTestId('mock-panel-toolbar');
-  expect(panelToolbar).toBeInTheDocument();
-});
-
-test('renders PanelToolbar with correct viewId', () => {
-  setup();
-  const panelToolbar = screen.getByTestId('mock-panel-toolbar');
-  expect(panelToolbar).toHaveAttribute('data-view-id', 'sqllab.editor');
-});
-
-test('renders PanelToolbar with correct secondary actions count', () => {
-  setup();
-  const panelToolbar = screen.getByTestId('mock-panel-toolbar');
-  expect(panelToolbar).toHaveAttribute('data-default-secondary-count', '2');
-});
-
 test('renders defaultPrimaryActions', () => {
   setup();
   expect(
@@ -98,9 +65,24 @@ test('renders with custom primary actions', () => {
   ).toBeInTheDocument();
 });
 
-test('renders with empty secondary actions', () => {
-  setup({ defaultSecondaryActions: [] });
-
-  const panelToolbar = screen.getByTestId('mock-panel-toolbar');
-  expect(panelToolbar).toHaveAttribute('data-default-secondary-count', '0');
+test('renders contributed toolbar action in editor slot', () => {
+  registerToolbarAction(
+    ViewLocations.sqllab.editor,
+    'test-editor-action',
+    'Test Editor Action',
+    jest.fn(),
+  );
+  setup();
+  expect(
+    screen.getByRole('button', { name: 'Test Editor Action' }),
+  ).toBeInTheDocument();
+});
+
+test('renders nothing when no toolbar actions registered and no default actions', () => {
+  setup({
+    defaultPrimaryActions: undefined,
+    defaultSecondaryActions: [],
+  });
+  // PanelToolbar returns null when there are no actions at all
+  expect(screen.queryByRole('button')).not.toBeInTheDocument();
 });
diff --git a/superset-frontend/src/SqlLab/components/StatusBar/StatusBar.test.tsx b/superset-frontend/src/SqlLab/components/StatusBar/StatusBar.test.tsx
index 60c0642e64a..54944b70ef7 100644
--- a/superset-frontend/src/SqlLab/components/StatusBar/StatusBar.test.tsx
+++ b/superset-frontend/src/SqlLab/components/StatusBar/StatusBar.test.tsx
@@ -16,26 +16,82 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+import React from 'react';
 import { render, screen } from 'spec/helpers/testing-library';
 import StatusBar from 'src/SqlLab/components/StatusBar';
+import { ViewLocations } from 'src/SqlLab/contributions';
+import {
+  registerTestView,
+  cleanupExtensions,
+} from 'spec/helpers/extensionTestHelpers';
 
-jest.mock('src/core/views', () => ({
-  views: {
-    getViews: jest.fn().mockReturnValue([{ id: 'test-status-bar' }]),
-    registerView: jest.fn(),
-  },
-}));
+let consoleErrorSpy: jest.SpyInstance;
 
-jest.mock('src/components/ViewListExtension', () => ({
-  __esModule: true,
-  default: ({ viewId }: { viewId: string }) => (
-    <div data-test="mock-view-extension" data-view-id={viewId}>
-      ViewListExtension
-    </div>
-  ),
-}));
-
-test('renders StatusBar component', () => {
-  render(<StatusBar />);
-  expect(screen.getByTestId('mock-view-extension')).toBeInTheDocument();
+afterEach(() => {
+  cleanupExtensions();
+  if (consoleErrorSpy) {
+    consoleErrorSpy.mockRestore();
+  }
+});
+
+test('renders extension content when registered at statusBar slot', () => {
+  registerTestView(
+    ViewLocations.sqllab.statusBar,
+    'test-status',
+    'Test Status',
+    () => React.createElement('div', null, 'Status Extension'),
+  );
+  render(<StatusBar />);
+  expect(screen.getByText('Status Extension')).toBeInTheDocument();
+});
+
+test('does not render container when no extensions registered', () => {
+  const { container } = render(<StatusBar />);
+  expect(container).toBeEmptyDOMElement();
+});
+
+test('extension throwing during render does not crash host', () => {
+  consoleErrorSpy = jest.spyOn(console, 'error').mockImplementation(() => {});
+
+  const ThrowingComponent = () => {
+    throw new Error('Extension error');
+  };
+
+  registerTestView(
+    ViewLocations.sqllab.statusBar,
+    'throwing-ext',
+    'Throwing',
+    () => React.createElement(ThrowingComponent),
+  );
+  registerTestView(
+    ViewLocations.sqllab.statusBar,
+    'healthy-ext',
+    'Healthy',
+    () => React.createElement('div', null, 'Healthy Content'),
+  );
+
+  render(<StatusBar />);
+
+  // Healthy extension still renders despite the throwing extension
+  expect(screen.getByText('Healthy Content')).toBeInTheDocument();
+  // Verify the error boundary caught the throwing extension
+  expect(consoleErrorSpy).toHaveBeenCalled();
+});
+
+test('renders multiple extensions in status bar', () => {
+  registerTestView(
+    ViewLocations.sqllab.statusBar,
+    'test-status-1',
+    'Status One',
+    () => React.createElement('div', null, 'Extension One'),
+  );
+  registerTestView(
+    ViewLocations.sqllab.statusBar,
+    'test-status-2',
+    'Status Two',
+    () => React.createElement('div', null, 'Extension Two'),
+  );
+  render(<StatusBar />);
+  expect(screen.getByText('Extension One')).toBeInTheDocument();
+  expect(screen.getByText('Extension Two')).toBeInTheDocument();
 });
diff --git a/superset-frontend/src/SqlLab/components/TableExploreTree/TableExploreTree.test.tsx b/superset-frontend/src/SqlLab/components/TableExploreTree/TableExploreTree.test.tsx
index 91334b6884e..585fa09128b 100644
--- a/superset-frontend/src/SqlLab/components/TableExploreTree/TableExploreTree.test.tsx
+++ b/superset-frontend/src/SqlLab/components/TableExploreTree/TableExploreTree.test.tsx
@@ -22,6 +22,11 @@ import { render, screen, waitFor } from 'spec/helpers/testing-library';
 import userEvent from '@testing-library/user-event';
 import { initialState, defaultQueryEditor } from 'src/SqlLab/fixtures';
 
+import { ViewLocations } from 'src/SqlLab/contributions';
+import {
+  registerToolbarAction,
+  cleanupExtensions,
+} from 'spec/helpers/extensionTestHelpers';
 import TableExploreTree from '.';
 
 jest.mock(
@@ -74,6 +79,7 @@ beforeEach(() => {
 afterEach(() => {
   jest.clearAllMocks();
   fetchMock.clearHistory();
+  cleanupExtensions();
 });
 
 const getInitialState = (overrides = {}) => ({
@@ -128,9 +134,9 @@ test('filters schemas when searching', async () => {
     expect(screen.getByText('public')).toBeInTheDocument();
   });
 
-  // Verify selected schemas are initially visible
-  expect(screen.queryByText('test_schema')).not.toBeInTheDocument();
-  expect(screen.queryByText('information_schema')).not.toBeInTheDocument();
+  // All schemas are visible (no longer filtered to selected schema)
+  expect(screen.getByText('test_schema')).toBeInTheDocument();
+  expect(screen.getByText('information_schema')).toBeInTheDocument();
 
   const searchInput = screen.getByPlaceholderText(
     'Enter a part of the object name',
@@ -239,3 +245,104 @@ test('renders refresh button for schema list', async () => {
   const refreshButton = screen.getByRole('button', { name: /reload/i });
   expect(refreshButton).toBeInTheDocument();
 });
+
+test('renders contributed toolbar action in leftSidebar slot', async () => {
+  registerToolbarAction(
+    ViewLocations.sqllab.leftSidebar,
+    'test-left-action',
+    'Left Sidebar Action',
+    jest.fn(),
+  );
+
+  renderComponent();
+
+  await waitFor(() => {
+    expect(screen.getByText('public')).toBeInTheDocument();
+  });
+
+  expect(
+    screen.getByRole('button', { name: 'Left Sidebar Action' }),
+  ).toBeInTheDocument();
+});
+
+test('shows columns immediately on first toggle when searchTerm is active', async () => {
+  // Regression: treeData change after async fetch was resetting react-arborist's
+  // internal open state, so children only appeared after toggling twice.
+  // The useEffect([treeData]) fix ensures manually-opened nodes stay open.
+  renderComponent();
+
+  await waitFor(() => {
+    expect(screen.getByText('public')).toBeInTheDocument();
+  });
+
+  // Expand schema to load tables
+  await userEvent.click(screen.getByText('public'));
+  await waitFor(() => {
+    expect(screen.getByText('users')).toBeInTheDocument();
+  });
+
+  // Activate search while schema is already expanded
+  const searchInput = screen.getByPlaceholderText(
+    'Enter a part of the object name',
+  );
+  await userEvent.type(searchInput, 'pub');
+
+  // Tables remain visible under the search-matched schema
+  expect(screen.getByText('users')).toBeInTheDocument();
+
+  // Toggle the table with searchTerm active — columns must appear on the FIRST click
+  await userEvent.click(screen.getByText('users'));
+
+  await waitFor(() => {
+    expect(screen.getByText('id')).toBeInTheDocument();
+  });
+  expect(screen.getByText('name')).toBeInTheDocument();
+  expect(screen.getByText('created_at')).toBeInTheDocument();
+});
+
+test('closes a schema while searchTerm is active and keeps it closed', async () => {
+  // Regression: manuallyOpenedNodes must record the schema as closed when the
+  // user collapses it with a searchTerm active. If it remains true, the treeData
+  // effect would immediately re-open the schema on the next data change.
+  //
+  // Note: searchTerm 'users' is intentional. A term that matches the schema name
+  // (e.g. 'pub') would cause highlightText to split 'public' across two DOM nodes,
+  // making screen.getByText('public') unreliable. 'users' matches a table name so
+  // the schema label is left as a plain text node and remains queryable.
+  renderComponent();
+
+  await waitFor(() => {
+    expect(screen.getByText('public')).toBeInTheDocument();
+  });
+
+  // Expand schema to load tables
+  await userEvent.click(screen.getByText('public'));
+  await waitFor(() => {
+    expect(screen.getByText('users')).toBeInTheDocument();
+  });
+
+  // Activate search with a term that matches a table name; 'public' schema is
+  // visible as an ancestor and its text is not highlighted (safe to query by text)
+  const searchInput = screen.getByPlaceholderText(
+    'Enter a part of the object name',
+  );
+  await userEvent.type(searchInput, 'users');
+  expect(screen.getByText('public')).toBeInTheDocument();
+
+  // Load columns to trigger a treeData change that could accidentally reopen the schema
+  await userEvent.click(screen.getByText('users'));
+  await waitFor(() => {
+    expect(screen.getByText('id')).toBeInTheDocument();
+  });
+
+  // Close the schema while searchTerm is active
+  await userEvent.click(screen.getByText('public'));
+
+  // Tables and columns must disappear and stay gone — the treeData effect must not
+  // reopen the schema because manuallyOpenedNodes was updated to false on close
+  await waitFor(() => {
+    expect(screen.queryByText('id')).not.toBeInTheDocument();
+  });
+  // The schema node itself remains visible as a matching ancestor (just collapsed)
+  expect(screen.getByText('public')).toBeInTheDocument();
+});
diff --git a/superset-frontend/src/SqlLab/components/TableExploreTree/TreeNodeRenderer.tsx b/superset-frontend/src/SqlLab/components/TableExploreTree/TreeNodeRenderer.tsx
index 5e845c45e6b..06605fdd601 100644
--- a/superset-frontend/src/SqlLab/components/TableExploreTree/TreeNodeRenderer.tsx
+++ b/superset-frontend/src/SqlLab/components/TableExploreTree/TreeNodeRenderer.tsx
@@ -16,21 +16,32 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { css, styled } from '@apache-superset/core/theme';
+import { css, styled, useTheme } from '@apache-superset/core/theme';
 import { t } from '@apache-superset/core/translation';
 import type { NodeRendererProps } from 'react-arborist';
-import { Icons, Tooltip, Typography } from '@superset-ui/core/components';
+import { Icons, Typography } from '@superset-ui/core/components';
 import RefreshLabel from '@superset-ui/core/components/RefreshLabel';
 import ColumnElement from 'src/SqlLab/components/ColumnElement';
-import IconButton from 'src/dashboard/components/IconButton';
-import type { TreeNodeData, FetchLazyTablesParams } from './types';
+import { ActionButton } from '@superset-ui/core/components/ActionButton';
+import copyTextToClipboard from 'src/utils/copy';
+import type { TreeNodeData } from './types';
 
 const StyledColumnNode = styled.div`
   & > .ant-flex {
     flex: 1;
-    margin-right: ${({ theme }) => theme.sizeUnit * 1.5}px;
+    margin-right: ${({ theme }) => theme.sizeUnit * 4}px;
     cursor: default;
   }
+
+  .col-copy-action {
+    opacity: 0;
+    flex-shrink: 0;
+    margin-left: ${({ theme }) => theme.sizeUnit}px;
+  }
+
+  &:hover .col-copy-action {
+    opacity: 1;
+  }
 `;
 
 const getOpacity = (disableCheckbox: boolean | undefined) =>
@@ -67,12 +78,25 @@ export interface TreeNodeRendererProps extends NodeRendererProps<TreeNodeData> {
   loadingNodes: Record<string, boolean>;
   searchTerm: string;
   catalog: string | null | undefined;
-  fetchLazyTables: (params: FetchLazyTablesParams) => void;
+  pinnedTableKeys: Set<string>;
+  pinnedSchemas: Set<string>;
+  selectStarMap: Record<string, string>;
+  handleRefreshTables: (params: {
+    dbId: number;
+    catalog: string | null | undefined;
+    schema: string;
+  }) => void;
   handlePinTable: (
     tableName: string,
     schemaName: string,
     catalogName: string | null,
   ) => void;
+  handleUnpinTable: (tableName: string, schemaName: string) => void;
+  handlePinSchema: (schemaName: string) => void;
+  handleUnpinSchema: (schemaName: string) => void;
+  refreshTableSchema: (id: string) => void;
+  sortedTables: Record<string, boolean>;
+  toggleSortColumns: (tableId: string) => void;
 }
 
 const TreeNodeRenderer: React.FC<TreeNodeRendererProps> = ({
@@ -82,16 +106,24 @@ const TreeNodeRenderer: React.FC<TreeNodeRendererProps> = ({
   loadingNodes,
   searchTerm,
   catalog,
-  fetchLazyTables,
+  pinnedTableKeys,
+  pinnedSchemas,
+  selectStarMap,
+  handleRefreshTables,
   handlePinTable,
+  handleUnpinTable,
+  handlePinSchema,
+  handleUnpinSchema,
+  refreshTableSchema,
+  sortedTables,
+  toggleSortColumns,
 }) => {
+  const theme = useTheme();
   const { data } = node;
   const parts = data.id.split(':');
   const [identifier, _dbId, schema, tableName] = parts;
 
-  // Use manually tracked open state for icon display
-  // This prevents search auto-expansion from affecting the icon
-  const isManuallyOpen = manuallyOpenedNodes[data.id] ?? false;
+  const isManuallyOpen = node.isOpen && !node.data.disableCheckbox;
   const isLoading = loadingNodes[data.id] ?? false;
 
   const renderIcon = () => {
@@ -109,25 +141,13 @@ const TreeNodeRenderer: React.FC<TreeNodeRendererProps> = ({
 
     if (identifier === 'table') {
       const TableTypeIcon =
-        data.tableType === 'view' ? Icons.EyeOutlined : Icons.TableOutlined;
-      // Show loading icon with table type icon when loading
+        data.tableType === 'view'
+          ? Icons.FunctionOutlined
+          : Icons.TableOutlined;
       if (isLoading) {
-        return (
-          <>
-            <Icons.LoadingOutlined iconSize="l" />
-            <TableTypeIcon iconSize="l" />
-          </>
-        );
+        return <Icons.LoadingOutlined iconSize="l" />;
       }
-      const ExpandIcon = isManuallyOpen
-        ? Icons.MinusSquareOutlined
-        : Icons.PlusSquareOutlined;
-      return (
-        <>
-          <ExpandIcon iconSize="l" />
-          <TableTypeIcon iconSize="l" />
-        </>
-      );
+      return <TableTypeIcon iconSize="l" />;
     }
 
     return null;
@@ -162,7 +182,24 @@ const TreeNodeRenderer: React.FC<TreeNodeRendererProps> = ({
         data-selected={node.isSelected}
         onClick={() => node.select()}
       >
-        <ColumnElement column={data.columnData} />
+        <ColumnElement
+          column={data.columnData}
+          actions={
+            <span
+              className="col-copy-action"
+              onClick={e => e.stopPropagation()}
+            >
+              <ActionButton
+                label={`copy-col-${data.name}`}
+                tooltip={t('Copy column name')}
+                icon={<Icons.CopyOutlined iconSize="m" />}
+                onClick={() =>
+                  copyTextToClipboard(() => Promise.resolve(data.name))
+                }
+              />
+            </span>
+          }
+        />
       </StyledColumnNode>
     );
   }
@@ -201,42 +238,169 @@ const TreeNodeRenderer: React.FC<TreeNodeRendererProps> = ({
         {highlightText(data.name, searchTerm)}
       </Typography.Text>
       {identifier === 'schema' && (
-        <div className="side-action-container" role="menu">
-          <RefreshLabel
-            onClick={e => {
-              e.stopPropagation();
-              fetchLazyTables({
-                dbId: _dbId,
-                catalog,
-                schema,
-                forceRefresh: true,
-              });
-            }}
-            tooltipContent={t('Force refresh table list')}
-          />
-        </div>
-      )}
-      {identifier === 'table' && (
         <div
           className="side-action-container"
           role="menu"
-          css={css`
-            position: inherit;
-          `}
+          onClick={e => e.stopPropagation()}
         >
-          <IconButton
-            icon={
-              <Tooltip title={t('Pin to the result panel')}>
-                <Icons.PushpinOutlined iconSize="xl" />
-              </Tooltip>
-            }
-            onClick={e => {
-              e.stopPropagation();
-              handlePinTable(tableName, schema, catalog ?? null);
-            }}
-          />
+          {pinnedSchemas.has(schema) && (
+            <div className="action-static">
+              <ActionButton
+                label={`pinned-schema-${schema}`}
+                icon={
+                  <Icons.PushpinFilled
+                    iconSize="m"
+                    css={css`
+                      color: ${theme.colorTextDescription};
+                    `}
+                  />
+                }
+                onClick={() => handleUnpinSchema(schema)}
+              />
+            </div>
+          )}
+          <div className="action-hover">
+            <RefreshLabel
+              onClick={e => {
+                e.stopPropagation();
+                handleRefreshTables({
+                  dbId: Number(_dbId),
+                  catalog,
+                  schema,
+                });
+              }}
+              tooltipContent={t('Force refresh table list')}
+            />
+            <ActionButton
+              label={
+                pinnedSchemas.has(schema)
+                  ? `unpin-schema-${schema}`
+                  : `pin-schema-${schema}`
+              }
+              tooltip={
+                pinnedSchemas.has(schema)
+                  ? t('Unpin from top')
+                  : t('Pin to top')
+              }
+              icon={
+                pinnedSchemas.has(schema) ? (
+                  <Icons.PushpinFilled iconSize="m" />
+                ) : (
+                  <Icons.PushpinOutlined iconSize="m" />
+                )
+              }
+              onClick={() =>
+                pinnedSchemas.has(schema)
+                  ? handleUnpinSchema(schema)
+                  : handlePinSchema(schema)
+              }
+            />
+          </div>
         </div>
       )}
+      {identifier === 'table' &&
+        (() => {
+          const nodeDbId = Number(_dbId);
+          const tableKey = `${nodeDbId}:${schema}:${tableName}`;
+          const isPinned = pinnedTableKeys.has(tableKey);
+          const selectStar = selectStarMap[tableKey];
+          return (
+            <div
+              className="side-action-container"
+              role="menu"
+              onClick={e => e.stopPropagation()}
+            >
+              {isPinned && (
+                <div className="action-static">
+                  <ActionButton
+                    label={`pinned-${schema}-${tableName}`}
+                    icon={
+                      <Icons.PushpinFilled
+                        iconSize="m"
+                        css={css`
+                          color: ${theme.colorTextDescription};
+                        `}
+                      />
+                    }
+                    onClick={() => handleUnpinTable(tableName, schema)}
+                  />
+                </div>
+              )}
+              <div className="action-hover">
+                {selectStar && (
+                  <ActionButton
+                    label={`copy-select-${schema}-${tableName}`}
+                    tooltip={t('Copy SELECT statement to the clipboard')}
+                    icon={<Icons.CopyOutlined iconSize="m" />}
+                    onClick={() =>
+                      copyTextToClipboard(() => Promise.resolve(selectStar))
+                    }
+                  />
+                )}
+                <ActionButton
+                  label={`sort-cols-${schema}-${tableName}`}
+                  tooltip={
+                    sortedTables[data.id]
+                      ? t('Sort by original table order')
+                      : t('Sort columns alphabetically')
+                  }
+                  icon={
+                    <Icons.SortAscendingOutlined
+                      iconSize="m"
+                      css={css`
+                        color: ${sortedTables[data.id]
+                          ? theme.colorPrimary
+                          : 'inherit'};
+                      `}
+                    />
+                  }
+                  onClick={() => toggleSortColumns(data.id)}
+                />
+                <ActionButton
+                  label={`refresh-schema-${schema}-${tableName}`}
+                  tooltip={t('Refresh table schema')}
+                  icon={<Icons.SyncOutlined iconSize="m" />}
+                  onClick={() => refreshTableSchema(data.id)}
+                />
+                <ActionButton
+                  label={
+                    isPinned
+                      ? `unpin-${schema}-${tableName}`
+                      : `pin-${schema}-${tableName}`
+                  }
+                  tooltip={
+                    isPinned
+                      ? t('Unpin from the result panel')
+                      : t('Pin to the result panel')
+                  }
+                  icon={
+                    isPinned ? (
+                      <Icons.PushpinFilled iconSize="m" />
+                    ) : (
+                      <Icons.PushpinOutlined iconSize="m" />
+                    )
+                  }
+                  onClick={() =>
+                    isPinned
+                      ? handleUnpinTable(tableName, schema)
+                      : handlePinTable(tableName, schema, catalog ?? null)
+                  }
+                />
+              </div>
+              <ActionButton
+                label={`toggle-${schema}-${tableName}`}
+                icon={
+                  isManuallyOpen ? (
+                    <Icons.UpOutlined iconSize="m" />
+                  ) : (
+                    <Icons.DownOutlined iconSize="m" />
+                  )
+                }
+                onClick={() => node.toggle()}
+              />
+            </div>
+          );
+        })()}
     </div>
   );
 };
diff --git a/superset-frontend/src/SqlLab/components/TableExploreTree/index.tsx b/superset-frontend/src/SqlLab/components/TableExploreTree/index.tsx
index 13b6e700ad5..af37bff0c2b 100644
--- a/superset-frontend/src/SqlLab/components/TableExploreTree/index.tsx
+++ b/superset-frontend/src/SqlLab/components/TableExploreTree/index.tsx
@@ -18,11 +18,13 @@
  */
 import {
   useCallback,
+  useEffect,
   useState,
   useRef,
   type ChangeEvent,
   useMemo,
 } from 'react';
+import { useDebounceValue } from 'src/hooks/useDebounceValue';
 import { useSelector, useDispatch, shallowEqual } from 'react-redux';
 import { styled, css, useTheme } from '@apache-superset/core/theme';
 import { t } from '@apache-superset/core/translation';
@@ -39,7 +41,12 @@ import {
 } from '@superset-ui/core/components';
 import type { SqlLabRootState } from 'src/SqlLab/types';
 import useQueryEditor from 'src/SqlLab/hooks/useQueryEditor';
-import { addTable } from 'src/SqlLab/actions/sqlLab';
+import { addTable, removeTables } from 'src/SqlLab/actions/sqlLab';
+import {
+  getItem,
+  setItem,
+  LocalStorageKeys,
+} from 'src/utils/localStorageHelpers';
 import PanelToolbar from 'src/components/PanelToolbar';
 import { ViewLocations } from 'src/SqlLab/contributions';
 import TreeNodeRenderer from './TreeNodeRenderer';
@@ -63,16 +70,24 @@ const StyledTreeContainer = styled.div`
     &:hover {
       background-color: ${({ theme }) => theme.colorBgTextHover};
 
-      .side-action-container {
-        opacity: 1;
+      .action-static {
+        display: none;
+      }
+
+      .action-hover {
+        display: flex;
       }
     }
 
     &[data-selected='true'] {
       background-color: ${({ theme }) => theme.colorBgTextActive};
 
-      .side-action-container {
-        opacity: 1;
+      .action-static {
+        display: none;
+      }
+
+      .action-hover {
+        display: flex;
       }
     }
   }
@@ -97,17 +112,56 @@ const StyledTreeContainer = styled.div`
   }
 
   .side-action-container {
-    opacity: 0;
-    position: absolute;
-    right: ${({ theme }) => theme.sizeUnit * 1.5}px;
-    top: 50%;
-    transform: translateY(-50%);
-    z-index: ${({ theme }) => theme.zIndexPopupBase};
+    display: flex;
+    align-items: center;
+    flex-shrink: 0;
+    margin-left: auto;
+  }
+
+  .action-static {
+    display: flex;
+    align-items: center;
+  }
+
+  .action-hover {
+    display: none;
+    align-items: center;
+    gap: ${({ theme }) => theme.sizeUnit * 0.5}px;
   }
 `;
 
 const ROW_HEIGHT = 28;
 
+const getPinnedSchemasStorageKey = (
+  dbId: number | undefined,
+  catalog: string | null | undefined,
+): string => `${dbId ?? ''}:${catalog ?? ''}`;
+
+const getPinnedSchemasFromStorage = (
+  dbId: number | undefined,
+  catalog: string | null | undefined,
+): Set<string> => {
+  if (!dbId) return new Set();
+  const stored = getItem(LocalStorageKeys.SqllabPinnedSchemas, {});
+  const key = getPinnedSchemasStorageKey(dbId, catalog);
+  const schemas = stored[key];
+  return Array.isArray(schemas) ? new Set<string>(schemas) : new Set();
+};
+
+const savePinnedSchemasToStorage = (
+  dbId: number | undefined,
+  catalog: string | null | undefined,
+  schemas: Set<string>,
+) => {
+  if (!dbId) return;
+  const stored = getItem(LocalStorageKeys.SqllabPinnedSchemas, {});
+  const key = getPinnedSchemasStorageKey(dbId, catalog);
+  setItem(LocalStorageKeys.SqllabPinnedSchemas, {
+    ...stored,
+    [key]: [...schemas],
+  });
+};
+
 const TableExploreTree: React.FC<Props> = ({ queryEditorId }) => {
   const dispatch = useDispatch();
   const theme = useTheme();
@@ -118,19 +172,20 @@ const TableExploreTree: React.FC<Props> = ({ queryEditorId }) => {
   );
   const queryEditor = useQueryEditor(queryEditorId, [
     'dbId',
-    'schema',
     'catalog',
+    'tabViewId',
   ]);
-  const { dbId, catalog, schema: selectedSchema } = queryEditor;
+  const { dbId, catalog } = queryEditor;
+  const editorId = queryEditor.tabViewId ?? queryEditor.id;
   const pinnedTables = useMemo(
     () =>
       Object.fromEntries(
         tables.map(({ queryEditorId, dbId, schema, name, persistData }) => [
-          queryEditor.id === queryEditorId ? `${dbId}:${schema}:${name}` : '',
+          editorId === queryEditorId ? `${dbId}:${schema}:${name}` : '',
           persistData,
         ]),
       ),
-    [tables, queryEditor.id],
+    [tables, editorId],
   );
 
   // Tree data hook - manages schema/table/column data fetching and tree structure
@@ -139,22 +194,127 @@ const TableExploreTree: React.FC<Props> = ({ queryEditorId }) => {
     isFetching,
     refetch,
     loadingNodes,
+    selectStarMap,
     handleToggle,
-    fetchLazyTables,
+    handleRefreshTables,
+    refreshTableSchema,
     errorPayload,
   } = useTreeData({
     dbId,
     catalog,
-    selectedSchema,
     pinnedTables,
   });
 
+  const pinnedTableKeys = useMemo(
+    () =>
+      new Set(
+        tables
+          .filter(({ queryEditorId: qeId }) => editorId === qeId)
+          .map(({ dbId, schema, name }) => `${dbId}:${schema}:${name}`),
+      ),
+    [tables, editorId],
+  );
+
   const handlePinTable = useCallback(
     (tableName: string, schemaName: string, catalogName: string | null) =>
       dispatch(addTable(queryEditor, tableName, catalogName, schemaName)),
     [dispatch, queryEditor],
   );
+
+  const handleUnpinTable = useCallback(
+    (tableName: string, schemaName: string) => {
+      const table = tables.find(
+        t =>
+          t.queryEditorId === editorId &&
+          t.dbId === dbId &&
+          t.schema === schemaName &&
+          t.name === tableName,
+      );
+      if (table) {
+        dispatch(removeTables([table]));
+      }
+    },
+    [dispatch, tables, editorId, dbId],
+  );
+  const [pinnedSchemas, setPinnedSchemas] = useState<Set<string>>(() =>
+    getPinnedSchemasFromStorage(dbId, catalog),
+  );
+
+  const previousDbIdRef = useRef<number | undefined>(dbId);
+  const previousCatalogRef = useRef<string | null | undefined>(catalog);
+
+  // Single effect handles both loading and persisting pinned schemas.
+  // Using refs to detect source changes avoids the race condition where the
+  // persist branch would run with stale pinnedSchemas right after a dbId/catalog
+  // change, corrupting the new source's stored pins.
+  useEffect(() => {
+    const dbChanged = previousDbIdRef.current !== dbId;
+    const catalogChanged = previousCatalogRef.current !== catalog;
+
+    if (dbChanged || catalogChanged) {
+      previousDbIdRef.current = dbId;
+      previousCatalogRef.current = catalog;
+      setPinnedSchemas(getPinnedSchemasFromStorage(dbId, catalog));
+      return;
+    }
+
+    savePinnedSchemasToStorage(dbId, catalog, pinnedSchemas);
+  }, [dbId, catalog, pinnedSchemas]);
+
+  const handlePinSchema = useCallback((schemaName: string) => {
+    setPinnedSchemas(prev => new Set([...prev, schemaName]));
+  }, []);
+
+  const handleUnpinSchema = useCallback((schemaName: string) => {
+    setPinnedSchemas(prev => {
+      const next = new Set(prev);
+      next.delete(schemaName);
+      return next;
+    });
+  }, []);
+
+  const sortedTreeData = useMemo(() => {
+    if (pinnedSchemas.size === 0) return treeData;
+    const pinned = treeData.filter(node => pinnedSchemas.has(node.name));
+    const rest = treeData.filter(node => !pinnedSchemas.has(node.name));
+    return [...pinned, ...rest];
+  }, [treeData, pinnedSchemas]);
+
+  const [sortedTables, setSortedTables] = useState<Record<string, boolean>>({});
+
+  useEffect(() => {
+    setSortedTables({});
+  }, [dbId, catalog]);
+
+  const toggleSortColumns = useCallback((tableId: string) => {
+    setSortedTables(prev => ({ ...prev, [tableId]: !prev[tableId] }));
+  }, []);
+
+  const displayTreeData = useMemo(() => {
+    const activeSorted = Object.keys(sortedTables).filter(
+      id => sortedTables[id],
+    );
+    if (activeSorted.length === 0) return sortedTreeData;
+
+    const sortedSet = new Set(activeSorted);
+    return sortedTreeData.map(schemaNode => ({
+      ...schemaNode,
+      children: schemaNode.children?.map(tableNode => {
+        if (tableNode.type !== 'table' || !sortedSet.has(tableNode.id)) {
+          return tableNode;
+        }
+        const { children } = tableNode;
+        if (!children || children.length <= 1) return tableNode;
+        return {
+          ...tableNode,
+          children: [...children].sort((a, b) => a.name.localeCompare(b.name)),
+        };
+      }),
+    }));
+  }, [sortedTreeData, sortedTables]);
+
   const [searchTerm, setSearchTerm] = useState('');
+  const debouncedSearchTerm = useDebounceValue(searchTerm);
   const handleSearchChange = useCallback(
     ({ target }: ChangeEvent<HTMLInputElement>) => setSearchTerm(target.value),
     [],
@@ -165,6 +325,21 @@ const TableExploreTree: React.FC<Props> = ({ queryEditorId }) => {
     Record<string, boolean>
   >({});
 
+  // Keep a ref so the treeData effect below always reads the latest value
+  // without needing it as a dependency (we only want to re-open on data change).
+  const manuallyOpenedNodesRef = useRef(manuallyOpenedNodes);
+  manuallyOpenedNodesRef.current = manuallyOpenedNodes;
+
+  // When treeData changes (e.g., children arrive after an async fetch),
+  // react-arborist may reset the open state of nodes that just received children.
+  // Explicitly re-open every node the user has manually opened so children
+  // become visible immediately without requiring a second toggle.
+  useEffect(() => {
+    Object.entries(manuallyOpenedNodesRef.current)
+      .filter(([, isOpen]) => isOpen)
+      .forEach(([id]) => treeRef.current?.open(id));
+  }, [treeData]);
+
   // Custom search match function for react-arborist
   const searchMatch = useCallback(
     (node: NodeApi<TreeNodeData>, term: string): boolean => {
@@ -197,9 +372,9 @@ const TableExploreTree: React.FC<Props> = ({ queryEditorId }) => {
 
   // Check if any nodes match the search term
   const hasMatchingNodes = useMemo(() => {
-    if (!searchTerm) return true;
+    if (!debouncedSearchTerm) return true;
 
-    const lowerTerm = searchTerm.toLowerCase();
+    const lowerTerm = debouncedSearchTerm.toLowerCase();
 
     const checkNode = (node: TreeNodeData): boolean => {
       if (node.type === 'empty') return false;
@@ -210,8 +385,8 @@ const TableExploreTree: React.FC<Props> = ({ queryEditorId }) => {
       return false;
     };
 
-    return treeData.some(node => checkNode(node));
-  }, [searchTerm, treeData]);
+    return displayTreeData.some(node => checkNode(node));
+  }, [debouncedSearchTerm, displayTreeData]);
 
   // Node renderer for react-arborist
   const renderNode = useCallback(
@@ -220,19 +395,37 @@ const TableExploreTree: React.FC<Props> = ({ queryEditorId }) => {
         {...props}
         manuallyOpenedNodes={manuallyOpenedNodes}
         loadingNodes={loadingNodes}
-        searchTerm={searchTerm}
+        searchTerm={debouncedSearchTerm}
         catalog={catalog}
-        fetchLazyTables={fetchLazyTables}
+        pinnedTableKeys={pinnedTableKeys}
+        pinnedSchemas={pinnedSchemas}
+        selectStarMap={selectStarMap}
+        handleRefreshTables={handleRefreshTables}
         handlePinTable={handlePinTable}
+        handleUnpinTable={handleUnpinTable}
+        handlePinSchema={handlePinSchema}
+        handleUnpinSchema={handleUnpinSchema}
+        refreshTableSchema={refreshTableSchema}
+        sortedTables={sortedTables}
+        toggleSortColumns={toggleSortColumns}
       />
     ),
     [
       catalog,
-      fetchLazyTables,
+      pinnedTableKeys,
+      pinnedSchemas,
+      selectStarMap,
+      handleRefreshTables,
       handlePinTable,
+      handleUnpinTable,
+      handlePinSchema,
+      handleUnpinSchema,
+      refreshTableSchema,
+      sortedTables,
+      toggleSortColumns,
       loadingNodes,
       manuallyOpenedNodes,
-      searchTerm,
+      debouncedSearchTerm,
     ],
   );
 
@@ -291,7 +484,7 @@ const TableExploreTree: React.FC<Props> = ({ queryEditorId }) => {
               return <Skeleton active />;
             }
 
-            if (searchTerm && !hasMatchingNodes) {
+            if (debouncedSearchTerm && !hasMatchingNodes) {
               return (
                 <Empty
                   description={t('No matching results found')}
@@ -303,12 +496,12 @@ const TableExploreTree: React.FC<Props> = ({ queryEditorId }) => {
             return (
               <Tree<TreeNodeData>
                 ref={treeRef}
-                data={treeData}
+                data={displayTreeData}
                 width="100%"
                 height={height || 500}
                 rowHeight={ROW_HEIGHT}
                 indent={16}
-                searchTerm={searchTerm}
+                searchTerm={debouncedSearchTerm}
                 searchMatch={searchMatch}
                 disableDrag
                 disableDrop
@@ -320,18 +513,37 @@ const TableExploreTree: React.FC<Props> = ({ queryEditorId }) => {
                     return;
                   }
 
+                  // Determine the previous open state to compute the new state.
+                  //
+                  // When searchTerm is active, react-arborist auto-expands nodes whose
+                  // descendants match the query. Those nodes have isOpen=true in the tree
+                  // but are absent from manuallyOpenedNodes, so the original check
+                  // (`manuallyOpenedNodes[id] ?? false`) misidentifies them as closed and
+                  // inverts the toggle direction. Reading from treeRef (which holds the
+                  // actual pre-toggle state because onToggle fires before the state change)
+                  // fixes this.
+                  //
+                  // When searchTerm is empty, searchMatch returns true for every node and
+                  // react-arborist marks all schemas as open (isOpen=true) even before any
+                  // user interaction. Using treeRef in that case would treat every first
+                  // click as a close action, so fall back to manuallyOpenedNodes instead.
+                  const wasOpen = debouncedSearchTerm
+                    ? (treeRef.current?.get(id)?.isOpen ??
+                      manuallyOpenedNodes[id] ??
+                      false)
+                    : (manuallyOpenedNodes[id] ?? false);
+                  const isNowOpen = !wasOpen;
+
+                  // Trigger data fetch when opening
+                  if (isNowOpen) {
+                    handleToggle(id, true);
+                  }
+
                   // Track manually opened/closed state
-                  setManuallyOpenedNodes(prev => {
-                    const wasOpen = prev[id] ?? false;
-                    const isNowOpen = !wasOpen;
-
-                    // Trigger data fetch when opening
-                    if (isNowOpen) {
-                      handleToggle(id, true);
-                    }
-
-                    return { ...prev, [id]: isNowOpen };
-                  });
+                  setManuallyOpenedNodes(prev => ({
+                    ...prev,
+                    [id]: isNowOpen,
+                  }));
                 }}
               >
                 {renderNode}
diff --git a/superset-frontend/src/SqlLab/components/TableExploreTree/useTreeData.ts b/superset-frontend/src/SqlLab/components/TableExploreTree/useTreeData.ts
index 0a85f5cbd7c..a61ea25c6ca 100644
--- a/superset-frontend/src/SqlLab/components/TableExploreTree/useTreeData.ts
+++ b/superset-frontend/src/SqlLab/components/TableExploreTree/useTreeData.ts
@@ -17,6 +17,7 @@
  * under the License.
  */
 import { useMemo, useReducer, useCallback } from 'react';
+import { useDispatch } from 'react-redux';
 import { t } from '@apache-superset/core/translation';
 import {
   Table,
@@ -26,6 +27,7 @@ import {
   useLazyTableMetadataQuery,
   useLazyTableExtendedMetadataQuery,
 } from 'src/hooks/apiResources';
+import { addDangerToast } from 'src/SqlLab/actions/sqlLab';
 import type { TreeNodeData } from './types';
 import { SupersetError } from '@superset-ui/core';
 
@@ -42,6 +44,7 @@ interface TreeDataState {
 type TreeDataAction =
   | { type: 'SET_TABLE_DATA'; key: string; data: { options: Table[] } }
   | { type: 'SET_TABLE_SCHEMA_DATA'; key: string; data: TableMetaData }
+  | { type: 'CLEAR_TABLE_SCHEMA_DATA'; key: string }
   | { type: 'SET_LOADING_NODE'; nodeId: string; loading: boolean }
   | { type: 'SET_ERROR'; errorPayload: SupersetError | null };
 
@@ -71,6 +74,10 @@ function treeDataReducer(
           [action.key]: action.data,
         },
       };
+    case 'CLEAR_TABLE_SCHEMA_DATA': {
+      const { [action.key]: _, ...rest } = state.tableSchemaData;
+      return { ...state, tableSchemaData: rest };
+    }
     case 'SET_LOADING_NODE':
       return {
         ...state,
@@ -93,7 +100,6 @@ function treeDataReducer(
 interface UseTreeDataParams {
   dbId: number | undefined;
   catalog: string | null | undefined;
-  selectedSchema: string | undefined;
   pinnedTables: Record<string, TableMetaData | undefined>;
 }
 
@@ -102,8 +108,14 @@ interface UseTreeDataResult {
   isFetching: boolean;
   refetch: () => void;
   loadingNodes: Record<string, boolean>;
+  selectStarMap: Record<string, string>;
   handleToggle: (id: string, isOpen: boolean) => Promise<void>;
-  fetchLazyTables: ReturnType<typeof useLazyTablesQuery>[0];
+  handleRefreshTables: (params: {
+    dbId: number;
+    catalog: string | null | undefined;
+    schema: string;
+  }) => void;
+  refreshTableSchema: (id: string) => void;
   errorPayload: SupersetError | null;
 }
 
@@ -116,9 +128,9 @@ const createEmptyNode = (parentId: string): TreeNodeData => ({
 const useTreeData = ({
   dbId,
   catalog,
-  selectedSchema,
   pinnedTables,
 }: UseTreeDataParams): UseTreeDataResult => {
+  const reduxDispatch = useDispatch();
   // Schema data from API
   const {
     currentData: schemaData,
@@ -134,6 +146,64 @@ const useTreeData = ({
   const [state, dispatch] = useReducer(treeDataReducer, initialState);
   const { tableData, tableSchemaData, loadingNodes, errorPayload } = state;
 
+  // Shared helper: fetch table metadata + extended metadata and store in state.
+  // preferCacheValue=true on initial open (use cached data if available),
+  // preferCacheValue=false on explicit refresh (bypass cache).
+  const fetchAndStoreTableSchema = useCallback(
+    (id: string, preferCacheValue: boolean) => {
+      if (loadingNodes[id]) return;
+
+      const parts = id.split(':');
+      const [, databaseId, schema, table] = parts;
+      const parsedDbId = Number(databaseId);
+      const tableKey = `${parsedDbId}:${schema}:${table}`;
+
+      dispatch({ type: 'SET_LOADING_NODE', nodeId: id, loading: true });
+
+      // .unwrap() causes RTK Query to reject on error so .catch() fires.
+      // Without it RTK Query resolves with { error } instead of rejecting.
+      Promise.all([
+        fetchTableMetadata(
+          { dbId: parsedDbId, catalog, schema, table },
+          preferCacheValue,
+        ).unwrap(),
+        fetchTableExtendedMetadata(
+          { dbId: parsedDbId, catalog, schema, table },
+          preferCacheValue,
+        ).unwrap(),
+      ])
+        .then(([tableMetadata, tableExtendedMetadata]) => {
+          if (tableMetadata) {
+            dispatch({
+              type: 'SET_TABLE_SCHEMA_DATA',
+              key: tableKey,
+              data: { ...tableMetadata, ...tableExtendedMetadata },
+            });
+          }
+        })
+        .catch(() => {
+          reduxDispatch(
+            addDangerToast(
+              t(
+                'An error occurred while fetching table metadata for %s',
+                table,
+              ),
+            ),
+          );
+        })
+        .finally(() => {
+          dispatch({ type: 'SET_LOADING_NODE', nodeId: id, loading: false });
+        });
+    },
+    [
+      catalog,
+      fetchTableExtendedMetadata,
+      fetchTableMetadata,
+      loadingNodes,
+      reduxDispatch,
+    ],
+  );
+
   // Handle async loading when node is toggled open
   const handleToggle = useCallback(
     async (id: string, isOpen: boolean) => {
@@ -147,20 +217,14 @@ const useTreeData = ({
       if (identifier === 'schema') {
         const schemaKey = `${parsedDbId}:${schema}`;
         if (!tableData?.[schemaKey]) {
-          // Set loading state
           dispatch({ type: 'SET_LOADING_NODE', nodeId: id, loading: true });
 
-          // Fetch tables asynchronously
           fetchLazyTables(
-            {
-              dbId: parsedDbId,
-              catalog,
-              schema,
-              forceRefresh: false,
-            },
+            { dbId: parsedDbId, catalog, schema, forceRefresh: false },
             true,
           )
-            .then(({ data }) => {
+            .unwrap()
+            .then(data => {
               if (data) {
                 dispatch({ type: 'SET_TABLE_DATA', key: schemaKey, data });
               }
@@ -188,73 +252,69 @@ const useTreeData = ({
         if (pinnedTables[tableKey]) return;
 
         if (!tableSchemaData[tableKey]) {
-          // Set loading state
-          dispatch({ type: 'SET_LOADING_NODE', nodeId: id, loading: true });
-
-          // Fetch metadata asynchronously
-          Promise.all([
-            fetchTableMetadata(
-              {
-                dbId: parsedDbId,
-                catalog,
-                schema,
-                table,
-              },
-              true,
-            ),
-            fetchTableExtendedMetadata(
-              {
-                dbId: parsedDbId,
-                catalog,
-                schema,
-                table,
-              },
-              true,
-            ),
-          ])
-            .then(
-              ([{ data: tableMetadata }, { data: tableExtendedMetadata }]) => {
-                if (tableMetadata) {
-                  dispatch({
-                    type: 'SET_TABLE_SCHEMA_DATA',
-                    key: tableKey,
-                    data: {
-                      ...tableMetadata,
-                      ...tableExtendedMetadata,
-                    },
-                  });
-                }
-              },
-            )
-            .finally(() => {
-              dispatch({
-                type: 'SET_LOADING_NODE',
-                nodeId: id,
-                loading: false,
-              });
-            });
+          fetchAndStoreTableSchema(id, true);
         }
       }
     },
     [
       catalog,
+      fetchAndStoreTableSchema,
       fetchLazyTables,
-      fetchTableExtendedMetadata,
-      fetchTableMetadata,
       pinnedTables,
       tableData,
       tableSchemaData,
     ],
   );
 
+  // Force-refresh the table list for a schema and update the tree
+  const handleRefreshTables = useCallback(
+    ({
+      dbId: refreshDbId,
+      catalog: refreshCatalog,
+      schema,
+    }: {
+      dbId: number;
+      catalog: string | null | undefined;
+      schema: string;
+    }) => {
+      const schemaKey = `${refreshDbId}:${schema}`;
+      const nodeId = `schema:${refreshDbId}:${schema}`;
+
+      dispatch({ type: 'SET_LOADING_NODE', nodeId, loading: true });
+
+      fetchLazyTables({
+        dbId: refreshDbId,
+        catalog: refreshCatalog,
+        schema,
+        forceRefresh: true,
+      })
+        .unwrap()
+        .then(data => {
+          dispatch({ type: 'SET_TABLE_DATA', key: schemaKey, data });
+        })
+        .catch(error => {
+          dispatch({
+            type: 'SET_ERROR',
+            errorPayload: error?.errors?.[0] ?? null,
+          });
+        })
+        .finally(() => {
+          dispatch({ type: 'SET_LOADING_NODE', nodeId, loading: false });
+        });
+    },
+    [fetchLazyTables],
+  );
+
+  const refreshTableSchema = useCallback(
+    (id: string) => {
+      fetchAndStoreTableSchema(id, false);
+    },
+    [fetchAndStoreTableSchema],
+  );
+
   // Build tree data
   const treeData = useMemo((): TreeNodeData[] => {
-    // Filter schemas if a schema is selected, otherwise show all
-    const filteredSchemaData = selectedSchema
-      ? schemaData?.filter(schema => schema.value === selectedSchema)
-      : schemaData;
-
-    const data = filteredSchemaData?.map(schema => {
+    const data = schemaData?.map(schema => {
       const schemaKey = `${dbId}:${schema.value}`;
       const schemaId = `schema:${dbId}:${schema.value}`;
       const tablesData = tableData?.[schemaKey];
@@ -316,22 +376,32 @@ const useTreeData = ({
     });
 
     return data ?? [];
-  }, [
-    dbId,
-    schemaData,
-    tableData,
-    tableSchemaData,
-    pinnedTables,
-    selectedSchema,
-  ]);
+  }, [dbId, schemaData, tableData, tableSchemaData, pinnedTables]);
+
+  // Map of tableKey -> selectStar SQL from table metadata
+  const selectStarMap = useMemo(() => {
+    const map: Record<string, string> = {};
+    const addEntry = (key: string, meta: TableMetaData | undefined) => {
+      if (meta?.selectStar) {
+        map[key] = meta.selectStar;
+      }
+    };
+    Object.entries(tableSchemaData).forEach(([key, meta]) =>
+      addEntry(key, meta),
+    );
+    Object.entries(pinnedTables).forEach(([key, meta]) => addEntry(key, meta));
+    return map;
+  }, [tableSchemaData, pinnedTables]);
 
   return {
     treeData,
     isFetching,
     refetch,
     loadingNodes,
+    selectStarMap,
     handleToggle,
-    fetchLazyTables,
+    handleRefreshTables,
+    refreshTableSchema,
     errorPayload,
   };
 };
diff --git a/superset-frontend/src/SqlLab/components/TablePreview/index.tsx b/superset-frontend/src/SqlLab/components/TablePreview/index.tsx
index 9e38b83ad7a..9fbcc3c1264 100644
--- a/superset-frontend/src/SqlLab/components/TablePreview/index.tsx
+++ b/superset-frontend/src/SqlLab/components/TablePreview/index.tsx
@@ -286,7 +286,6 @@ const TablePreview: FC<Props> = ({ dbId, catalog, schema, tableName }) => {
         <Breadcrumb.Item>{backend}</Breadcrumb.Item>
         <Breadcrumb.Item>{databaseName}</Breadcrumb.Item>
         {catalog && <Breadcrumb.Item>{catalog}</Breadcrumb.Item>}
-        {schema && <Breadcrumb.Item>{schema}</Breadcrumb.Item>}
         <Breadcrumb.Item> </Breadcrumb.Item>
       </Breadcrumb>
       <div style={{ display: 'none' }} aria-hidden="true">
@@ -314,6 +313,7 @@ const TablePreview: FC<Props> = ({ dbId, catalog, schema, tableName }) => {
       </div>
       <Title>
         <Icons.InsertRowAboveOutlined iconSize="l" />
+        {schema ? `${schema}.` : ''}
         {tableName}
         {titleActions()}
       </Title>
diff --git a/superset-frontend/src/SqlLab/fixtures.ts b/superset-frontend/src/SqlLab/fixtures.ts
index 179a2a60295..4e0f5c5b83e 100644
--- a/superset-frontend/src/SqlLab/fixtures.ts
+++ b/superset-frontend/src/SqlLab/fixtures.ts
@@ -362,7 +362,7 @@ export const queryWithNoQueryLimit = {
       },
       {
         is_dttm: false,
-        name: 'gender',
+        column_name: 'gender',
         type: 'STRING',
       },
     ],
diff --git a/superset-frontend/src/SqlLab/hooks/useQueryEditor/index.ts b/superset-frontend/src/SqlLab/hooks/useQueryEditor/index.ts
index 7a5f3c6874f..2845fe90349 100644
--- a/superset-frontend/src/SqlLab/hooks/useQueryEditor/index.ts
+++ b/superset-frontend/src/SqlLab/hooks/useQueryEditor/index.ts
@@ -21,6 +21,8 @@ import { useMemo } from 'react';
 import { shallowEqual, useSelector } from 'react-redux';
 import { SqlLabRootState, QueryEditor } from 'src/SqlLab/types';
 
+export const EMPTY_STATE_QE_ID = 'tmp_qe_id';
+
 export default function useQueryEditor<T extends keyof QueryEditor>(
   sqlEditorId: string,
   attributes: ReadonlyArray<T>,
@@ -43,6 +45,7 @@ export default function useQueryEditor<T extends keyof QueryEditor>(
         {
           ...queryEditors[queryEditorsById[sqlEditorId]],
           ...(sqlEditorId === unsavedQueryEditor?.id && unsavedQueryEditor),
+          ...(sqlEditorId === EMPTY_STATE_QE_ID && { id: sqlEditorId }),
         },
         ['id'].concat(attributes),
       ) as Pick<QueryEditor, T | 'id'>,
diff --git a/superset-frontend/src/SqlLab/reducers/getInitialState.test.ts b/superset-frontend/src/SqlLab/reducers/getInitialState.test.ts
index c0eda235d2d..8533f4ec795 100644
--- a/superset-frontend/src/SqlLab/reducers/getInitialState.test.ts
+++ b/superset-frontend/src/SqlLab/reducers/getInitialState.test.ts
@@ -34,6 +34,7 @@ const apiData = {
     lastName: 'last name',
     permissions: {},
     roles: {},
+    groups: [],
   },
 };
 const apiDataWithTabState = {
diff --git a/superset-frontend/src/SqlLab/reducers/sqlLab.ts b/superset-frontend/src/SqlLab/reducers/sqlLab.ts
index 46277bb86b6..34e3af847cc 100644
--- a/superset-frontend/src/SqlLab/reducers/sqlLab.ts
+++ b/superset-frontend/src/SqlLab/reducers/sqlLab.ts
@@ -42,7 +42,10 @@ function alterUnsavedQueryEditorState(
   id: string,
   silent = false,
 ): Partial<SqlLabState> {
-  if (state.tabHistory[state.tabHistory.length - 1] !== id) {
+  if (
+    state.tabHistory.length > 0 &&
+    state.tabHistory[state.tabHistory.length - 1] !== id
+  ) {
     const { queryEditors } = alterInArr(
       state,
       'queryEditors',
diff --git a/superset-frontend/src/chartCustomizations/components/DeckglLayerVisibility/DeckglLayerVisibilityCustomizationPlugin.test.tsx b/superset-frontend/src/chartCustomizations/components/DeckglLayerVisibility/DeckglLayerVisibilityCustomizationPlugin.test.tsx
index f3ef1d3389d..076623683ce 100644
--- a/superset-frontend/src/chartCustomizations/components/DeckglLayerVisibility/DeckglLayerVisibilityCustomizationPlugin.test.tsx
+++ b/superset-frontend/src/chartCustomizations/components/DeckglLayerVisibility/DeckglLayerVisibilityCustomizationPlugin.test.tsx
@@ -32,6 +32,7 @@ jest.mock('@superset-ui/core', () => ({
 const mockSupersetClientGet = SupersetClient.get as jest.Mock;
 
 const defaultProps: PluginDeckglLayerVisibilityProps = {
+  data: [],
   formData: {
     viz_type: 'deckgl_layer_visibility',
     defaultToAllLayersVisible: true,
@@ -40,7 +41,13 @@ const defaultProps: PluginDeckglLayerVisibilityProps = {
   height: 400,
   width: 600,
   filterState: {},
+  inputRef: { current: null },
   setDataMask: jest.fn(),
+  setFocusedFilter: jest.fn(),
+  unsetFocusedFilter: jest.fn(),
+  setHoveredFilter: jest.fn(),
+  unsetHoveredFilter: jest.fn(),
+  setFilterActive: jest.fn(),
 };
 
 const mockCharts = {
@@ -85,10 +92,13 @@ test('displays loading state initially', () => {
     },
   });
 
-  expect(screen.getByText('Loading deck.gl layers...')).toBeInTheDocument();
+  expect(
+    screen.getByTestId('deckgl-layer-visibility-select'),
+  ).toBeInTheDocument();
+  expect(screen.getByRole('combobox')).toBeDisabled();
 });
 
-test('displays message when no deck.gl multi layer charts are found', async () => {
+test('displays disabled select when no deck.gl multi layer charts are found', async () => {
   mockSupersetClientGet.mockResolvedValue({ json: { result: [] } });
 
   render(<DeckglLayerVisibilityCustomizationPlugin {...defaultProps} />, {
@@ -107,11 +117,7 @@ test('displays message when no deck.gl multi layer charts are found', async () =
   });
 
   await waitFor(() => {
-    expect(
-      screen.getByText(
-        'No deck.gl multi layer charts found in this dashboard.',
-      ),
-    ).toBeInTheDocument();
+    expect(screen.getByRole('combobox')).toBeDisabled();
   });
 });
 
@@ -126,10 +132,10 @@ test('renders layer selection control with layers from API', async () => {
   });
 
   await waitFor(() => {
-    expect(screen.getByText('Exclude layers (deck.gl)')).toBeInTheDocument();
+    expect(
+      screen.getByTestId('deckgl-layer-visibility-select'),
+    ).toBeInTheDocument();
   });
-
-  expect(screen.getByRole('combobox')).toBeInTheDocument();
 });
 
 test('collects unique layer IDs from multiple deck_multi charts', async () => {
@@ -168,7 +174,9 @@ test('handles layer selection and calls setDataMask', async () => {
   );
 
   await waitFor(() => {
-    expect(screen.getByText('Exclude layers (deck.gl)')).toBeInTheDocument();
+    expect(
+      screen.getByTestId('deckgl-layer-visibility-select'),
+    ).toBeInTheDocument();
   });
 
   const select = screen.getByRole('combobox');
@@ -211,7 +219,9 @@ test('initializes with filterState value when provided', async () => {
   );
 
   await waitFor(() => {
-    expect(screen.getByText('Exclude layers (deck.gl)')).toBeInTheDocument();
+    expect(
+      screen.getByTestId('deckgl-layer-visibility-select'),
+    ).toBeInTheDocument();
   });
 
   const select = screen.getByRole('combobox');
@@ -280,7 +290,9 @@ test('does not auto-initialize when defaultToAllLayersVisible is false', async (
   );
 
   await waitFor(() => {
-    expect(screen.getByText('Exclude layers (deck.gl)')).toBeInTheDocument();
+    expect(
+      screen.getByTestId('deckgl-layer-visibility-select'),
+    ).toBeInTheDocument();
   });
 
   expect(setDataMaskMock).not.toHaveBeenCalled();
@@ -304,7 +316,9 @@ test('handles multiple layer selection', async () => {
   );
 
   await waitFor(() => {
-    expect(screen.getByText('Exclude layers (deck.gl)')).toBeInTheDocument();
+    expect(
+      screen.getByTestId('deckgl-layer-visibility-select'),
+    ).toBeInTheDocument();
   });
 
   const select = screen.getByRole('combobox');
@@ -331,29 +345,36 @@ test('handles multiple layer selection', async () => {
   });
 });
 
-test('displays tooltip info icon', async () => {
-  mockSupersetClientGet.mockResolvedValue(mockApiResponse);
+test('displays tooltip on hover when select is disabled', async () => {
+  mockSupersetClientGet.mockResolvedValue({ json: { result: [] } });
 
   render(<DeckglLayerVisibilityCustomizationPlugin {...defaultProps} />, {
     useRedux: true,
     initialState: {
-      sliceEntities: { slices: mockCharts },
+      sliceEntities: {
+        slices: {
+          chart1: {
+            form_data: {
+              viz_type: 'line',
+            },
+          },
+        },
+      },
     },
   });
 
   await waitFor(() => {
-    expect(screen.getByText('Exclude layers (deck.gl)')).toBeInTheDocument();
+    expect(
+      screen.getByTestId('deckgl-layer-visibility-select'),
+    ).toBeInTheDocument();
   });
 
-  const tooltipIcon = screen.getByRole('img', { name: /info-circle/i });
-  expect(tooltipIcon).toBeInTheDocument();
-
-  await userEvent.hover(tooltipIcon);
+  await userEvent.hover(screen.getByTestId('deckgl-layer-visibility-select'));
 
   await waitFor(() => {
     expect(
       screen.getByText(
-        'Choose layers to hide from all deck.gl Multiple Layer charts in this dashboard.',
+        'No multilayer deck.gl charts are currently added to this dashboard.',
       ),
     ).toBeInTheDocument();
   });
@@ -378,11 +399,7 @@ test('handles charts with undefined deck_slices', async () => {
   });
 
   await waitFor(() => {
-    expect(
-      screen.getByText(
-        'No deck.gl multi layer charts found in this dashboard.',
-      ),
-    ).toBeInTheDocument();
+    expect(screen.getByRole('combobox')).toBeDisabled();
   });
 });
 
@@ -406,11 +423,7 @@ test('handles charts with non-array deck_slices', async () => {
   });
 
   await waitFor(() => {
-    expect(
-      screen.getByText(
-        'No deck.gl multi layer charts found in this dashboard.',
-      ),
-    ).toBeInTheDocument();
+    expect(screen.getByRole('combobox')).toBeDisabled();
   });
 });
 
@@ -447,6 +460,30 @@ test('deduplicates layer IDs from multiple charts', async () => {
   expect(callArgs.endpoint).toContain('/api/v1/chart/?q=');
 });
 
+test('renders validate message when filterState has validateMessage', async () => {
+  mockSupersetClientGet.mockResolvedValue(mockApiResponse);
+
+  render(
+    <DeckglLayerVisibilityCustomizationPlugin
+      {...defaultProps}
+      filterState={{
+        validateMessage: 'This field is required',
+        validateStatus: 'error',
+      }}
+    />,
+    {
+      useRedux: true,
+      initialState: {
+        sliceEntities: { slices: mockCharts },
+      },
+    },
+  );
+
+  await waitFor(() => {
+    expect(screen.getByText('This field is required')).toBeInTheDocument();
+  });
+});
+
 test('respects existing visible_deckgl_layers from Redux state', async () => {
   mockSupersetClientGet.mockResolvedValue(mockApiResponse);
   const setDataMaskMock = jest.fn();
@@ -477,7 +514,9 @@ test('respects existing visible_deckgl_layers from Redux state', async () => {
   );
 
   await waitFor(() => {
-    expect(screen.getByText('Exclude layers (deck.gl)')).toBeInTheDocument();
+    expect(
+      screen.getByTestId('deckgl-layer-visibility-select'),
+    ).toBeInTheDocument();
   });
 
   expect(setDataMaskMock).not.toHaveBeenCalled();
diff --git a/superset-frontend/src/chartCustomizations/components/DeckglLayerVisibility/DeckglLayerVisibilityCustomizationPlugin.tsx b/superset-frontend/src/chartCustomizations/components/DeckglLayerVisibility/DeckglLayerVisibilityCustomizationPlugin.tsx
index ff2461683f2..8b5619565d3 100644
--- a/superset-frontend/src/chartCustomizations/components/DeckglLayerVisibility/DeckglLayerVisibilityCustomizationPlugin.tsx
+++ b/superset-frontend/src/chartCustomizations/components/DeckglLayerVisibility/DeckglLayerVisibilityCustomizationPlugin.tsx
@@ -19,19 +19,17 @@
 import { useEffect, useState, useMemo, useRef, useCallback } from 'react';
 import { t } from '@apache-superset/core/translation';
 import { DataMask, ExtraFormData } from '@superset-ui/core';
-import { useTheme } from '@apache-superset/core/theme';
 import {
   Select,
   FormItem,
   Tooltip,
-  Icons,
-  Flex,
+  type FormItemProps,
 } from '@superset-ui/core/components';
 import { useSelector } from 'react-redux';
 import { createSelector } from '@reduxjs/toolkit';
 import { PluginDeckglLayerVisibilityProps } from './types';
 import { useDeckLayerMetadata } from './useDeckLayerMetadata';
-import { FilterPluginStyle } from '../common';
+import { FilterPluginStyle, StatusMessage } from '../common';
 import { Slice } from 'src/dashboard/types';
 
 type SliceEntitiesState = {
@@ -72,7 +70,6 @@ export default function DeckglLayerVisibilityCustomizationPlugin(
   props: PluginDeckglLayerVisibilityProps,
 ) {
   const { formData, filterState, setDataMask, width, height } = props;
-  const theme = useTheme();
   const [hiddenLayers, setHiddenLayers] = useState<number[]>(
     filterState?.value || [],
   );
@@ -128,6 +125,19 @@ export default function DeckglLayerVisibilityCustomizationPlugin(
     setDataMask,
   ]);
 
+  const formItemData: FormItemProps = useMemo(() => {
+    if (filterState.validateMessage) {
+      return {
+        extra: (
+          <StatusMessage status={filterState.validateStatus}>
+            {filterState.validateMessage}
+          </StatusMessage>
+        ),
+      };
+    }
+    return EMPTY_OBJECT as FormItemProps;
+  }, [filterState.validateMessage, filterState.validateStatus]);
+
   const handleLayerChange = useCallback(
     (selectedHiddenLayers: number[]) => {
       setHiddenLayers(selectedHiddenLayers);
@@ -157,48 +167,34 @@ export default function DeckglLayerVisibilityCustomizationPlugin(
     [apiLayers],
   );
 
-  if (isLoadingMetadata && apiLayers.length === 0) {
-    return (
-      <FilterPluginStyle height={height} width={width}>
-        <div>{t('Loading deck.gl layers...')}</div>
-      </FilterPluginStyle>
-    );
-  }
-
   return (
     <FilterPluginStyle height={height} width={width}>
-      {apiLayers.length === 0 ? (
-        <div>{t('No deck.gl multi layer charts found in this dashboard.')}</div>
-      ) : (
-        <FormItem
-          label={
-            <Flex gap={theme.sizeUnit}>
-              <span>{t('Exclude layers (deck.gl)')}</span>
-              <Tooltip
-                title={t(
-                  'Choose layers to hide from all deck.gl Multiple Layer charts in this dashboard.',
-                )}
-              >
-                <span className="tooltip-icon">
-                  <Icons.InfoCircleOutlined
-                    iconSize="m"
-                    iconColor={theme.colorIcon}
-                  />
-                </span>
-              </Tooltip>
-            </Flex>
+      <FormItem validateStatus={filterState.validateStatus} {...formItemData}>
+        <Tooltip
+          title={
+            !isLoadingMetadata && apiLayers.length === 0
+              ? t(
+                  'No multilayer deck.gl charts are currently added to this dashboard.',
+                )
+              : null
           }
         >
-          <Select
-            mode="multiple"
-            value={hiddenLayers}
-            onChange={handleLayerChange}
-            options={selectOptions}
-            placeholder={t('Select layers to hide')}
-            allowClear
-          />
-        </FormItem>
-      )}
+          <div>
+            <Select
+              data-test="deckgl-layer-visibility-select"
+              mode="multiple"
+              oneLine
+              value={hiddenLayers}
+              onChange={handleLayerChange}
+              options={selectOptions}
+              placeholder={t('Select layers to hide')}
+              allowClear
+              disabled={apiLayers.length === 0}
+              loading={isLoadingMetadata && apiLayers.length === 0}
+            />
+          </div>
+        </Tooltip>
+      </FormItem>
     </FilterPluginStyle>
   );
 }
diff --git a/superset-frontend/src/chartCustomizations/components/DeckglLayerVisibility/images/thumbnail.png b/superset-frontend/src/chartCustomizations/components/DeckglLayerVisibility/images/thumbnail.png
new file mode 100644
index 00000000000..7afef30bd4e
Binary files /dev/null and b/superset-frontend/src/chartCustomizations/components/DeckglLayerVisibility/images/thumbnail.png differ
diff --git a/superset-frontend/src/chartCustomizations/components/DeckglLayerVisibility/index.ts b/superset-frontend/src/chartCustomizations/components/DeckglLayerVisibility/index.ts
index 687ee7a082d..bddf87db57f 100644
--- a/superset-frontend/src/chartCustomizations/components/DeckglLayerVisibility/index.ts
+++ b/superset-frontend/src/chartCustomizations/components/DeckglLayerVisibility/index.ts
@@ -21,6 +21,7 @@ import { Behavior, ChartMetadata, ChartPlugin } from '@superset-ui/core';
 import buildQuery from './buildQuery';
 import controlPanel from './controlPanel';
 import transformProps from './transformProps';
+import thumbnail from './images/thumbnail.png';
 
 export default class DeckglLayerVisibilityCustomizationPlugin extends ChartPlugin {
   constructor() {
@@ -29,7 +30,7 @@ export default class DeckglLayerVisibilityCustomizationPlugin extends ChartPlugi
       description: t('Chart customization to control deck.gl layer visibility'),
       behaviors: [Behavior.InteractiveChart, Behavior.ChartCustomization],
       tags: [t('Deckgl'), t('Experimental')],
-      thumbnail: '',
+      thumbnail,
       enableNoResults: false,
       datasourceCount: 0,
     });
diff --git a/superset-frontend/src/chartCustomizations/components/DeckglLayerVisibility/types.ts b/superset-frontend/src/chartCustomizations/components/DeckglLayerVisibility/types.ts
index 35d7ba8648e..6c72cb6e46a 100644
--- a/superset-frontend/src/chartCustomizations/components/DeckglLayerVisibility/types.ts
+++ b/superset-frontend/src/chartCustomizations/components/DeckglLayerVisibility/types.ts
@@ -16,31 +16,25 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { QueryFormData, DataMask } from '@superset-ui/core';
+import { QueryFormData, FilterState } from '@superset-ui/core';
+import { PluginFilterHooks, PluginFilterStylesProps } from '../types';
+import { RefObject } from 'react';
+import type { RefSelectProps } from '@superset-ui/core/components';
+import { ColumnData, ColumnOption } from '../DynamicGroupBy/types';
 
 export interface DeckglLayerVisibilityFormData extends QueryFormData {
   defaultToAllLayersVisible?: boolean;
 }
 
-export const DEFAULT_FORM_DATA: Partial<DeckglLayerVisibilityFormData> = {
-  defaultToAllLayersVisible: true,
-};
-
 export interface LayerInfo {
   sliceId: number;
   name: string;
   type: string;
 }
 
-export interface PluginDeckglLayerVisibilityProps {
+export type PluginDeckglLayerVisibilityProps = PluginFilterStylesProps & {
+  data: (ColumnOption | ColumnData)[];
+  filterState: FilterState;
   formData: DeckglLayerVisibilityFormData;
-  height: number;
-  width: number;
-  filterState: {
-    value?: number[];
-  };
-  setDataMask: (dataMask: DataMask) => void;
-  ownState?: {
-    availableLayers?: LayerInfo[];
-  };
-}
+  inputRef: RefObject<RefSelectProps>;
+} & PluginFilterHooks;
diff --git a/superset-frontend/src/chartCustomizations/components/DeckglLayerVisibility/useDeckLayerMetadata.test.ts b/superset-frontend/src/chartCustomizations/components/DeckglLayerVisibility/useDeckLayerMetadata.test.ts
index 4b19a795f59..04e73ed5e81 100644
--- a/superset-frontend/src/chartCustomizations/components/DeckglLayerVisibility/useDeckLayerMetadata.test.ts
+++ b/superset-frontend/src/chartCustomizations/components/DeckglLayerVisibility/useDeckLayerMetadata.test.ts
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { renderHook } from '@testing-library/react-hooks';
+import { act, renderHook } from '@testing-library/react-hooks';
 import { SupersetClient } from '@superset-ui/core';
 import { useDeckLayerMetadata } from './useDeckLayerMetadata';
 
@@ -168,6 +168,34 @@ test('handles empty result from API', async () => {
   expect(result.current.error).toBe(null);
 });
 
+test('clears isLoading when sliceIds transitions from non-empty to empty', async () => {
+  const mockResponse = {
+    json: {
+      result: [{ id: 1, slice_name: 'Layer 1', viz_type: 'deck_scatter' }],
+    },
+  };
+  mockSupersetClientGet.mockResolvedValue(mockResponse);
+
+  const { result, rerender, waitForNextUpdate } = renderHook(
+    ({ ids }) => useDeckLayerMetadata(ids),
+    {
+      initialProps: { ids: [1] },
+    },
+  );
+
+  await waitForNextUpdate();
+
+  expect(result.current.isLoading).toBe(false);
+  expect(result.current.layers).toHaveLength(1);
+
+  act(() => {
+    rerender({ ids: [] });
+  });
+
+  expect(result.current.isLoading).toBe(false);
+  expect(result.current.layers).toEqual([]);
+});
+
 test('does not refetch when sliceIds array has same values', async () => {
   const mockResponse = {
     json: {
diff --git a/superset-frontend/src/chartCustomizations/components/DeckglLayerVisibility/useDeckLayerMetadata.ts b/superset-frontend/src/chartCustomizations/components/DeckglLayerVisibility/useDeckLayerMetadata.ts
index dfa7c65632c..cfb5fe789b0 100644
--- a/superset-frontend/src/chartCustomizations/components/DeckglLayerVisibility/useDeckLayerMetadata.ts
+++ b/superset-frontend/src/chartCustomizations/components/DeckglLayerVisibility/useDeckLayerMetadata.ts
@@ -35,12 +35,13 @@ export const useDeckLayerMetadata = (
   error: string | null;
 } => {
   const [layers, setLayers] = useState<LayerInfo[]>([]);
-  const [isLoading, setIsLoading] = useState(false);
+  const [isLoading, setIsLoading] = useState(sliceIds.length > 0);
   const [error, setError] = useState<string | null>(null);
 
   useEffect(() => {
     if (!sliceIds || sliceIds.length === 0) {
       setLayers([]);
+      setIsLoading(false);
       return;
     }
 
diff --git a/superset-frontend/src/components/AlteredSliceTag/utils/index.ts b/superset-frontend/src/components/AlteredSliceTag/utils/index.ts
index 482a4332621..3088d90aeb0 100644
--- a/superset-frontend/src/components/AlteredSliceTag/utils/index.ts
+++ b/superset-frontend/src/components/AlteredSliceTag/utils/index.ts
@@ -52,7 +52,9 @@ export const formatValueHandler = (
           v.comparator && v.comparator.constructor === Array
             ? `[${v.comparator.join(', ')}]`
             : v.comparator;
-        return `${v.subject} ${v.operator} ${filterVal}`;
+        return filterVal
+          ? `${v.subject} ${v.operator} ${filterVal}`
+          : `${v.subject} ${v.operator}`;
       })
       .join(', ');
   }
diff --git a/superset-frontend/src/components/AlteredSliceTag/utils/utils.test.ts b/superset-frontend/src/components/AlteredSliceTag/utils/utils.test.ts
index feddddeb0a1..1ceee92c589 100644
--- a/superset-frontend/src/components/AlteredSliceTag/utils/utils.test.ts
+++ b/superset-frontend/src/components/AlteredSliceTag/utils/utils.test.ts
@@ -258,6 +258,33 @@ describe('formatValueHandler', () => {
 
     expect(result).toEqual(expected);
   });
+
+  test('formats unary filter', () => {
+    const filters = [
+      {
+        expressionType: 'SIMPLE',
+        operator: 'IS NULL',
+        subject: 'a',
+      },
+      {
+        clause: 'WHERE',
+        comparator: ['hu', 'ho', 'ha'],
+        expressionType: 'SIMPLE',
+        operator: 'NOT IN',
+        subject: 'b',
+      },
+    ];
+    const key = 'adhoc_filters';
+
+    const expected = 'a IS NULL, b NOT IN [hu, ho, ha]';
+    const formattedValue: string | number = formatValueHandler(
+      filters,
+      key,
+      controlsMap,
+    );
+
+    expect(formattedValue).toEqual(expected);
+  });
 });
 
 // eslint-disable-next-line no-restricted-globals -- TODO: Migrate from describe blocks
diff --git a/superset-frontend/src/components/Chart/ChartContextMenu/ChartContextMenu.tsx b/superset-frontend/src/components/Chart/ChartContextMenu/ChartContextMenu.tsx
index cdab2f54af5..e2b919bee13 100644
--- a/superset-frontend/src/components/Chart/ChartContextMenu/ChartContextMenu.tsx
+++ b/superset-frontend/src/components/Chart/ChartContextMenu/ChartContextMenu.tsx
@@ -187,10 +187,11 @@ const ChartContextMenu = (
     canDrillBy &&
     isDisplayed(ContextMenuItem.DrillBy) &&
     !(
-      (formData.matrixify_mode_rows !== undefined &&
+      formData.matrixify_enable === true &&
+      ((formData.matrixify_mode_rows !== undefined &&
         formData.matrixify_mode_rows !== 'disabled') ||
-      (formData.matrixify_mode_columns !== undefined &&
-        formData.matrixify_mode_columns !== 'disabled')
+        (formData.matrixify_mode_columns !== undefined &&
+          formData.matrixify_mode_columns !== 'disabled'))
     ); // Disable drill by when matrixify is enabled
 
   const datasetResource = useDatasetDrillInfo(
diff --git a/superset-frontend/src/components/Chart/ChartRenderer.test.tsx b/superset-frontend/src/components/Chart/ChartRenderer.test.tsx
index 9fd400fd562..5d5022b09c3 100644
--- a/superset-frontend/src/components/Chart/ChartRenderer.test.tsx
+++ b/superset-frontend/src/components/Chart/ChartRenderer.test.tsx
@@ -212,6 +212,7 @@ test('should identify matrixify property changes correctly', () => {
     formData: {
       datasource: '',
       viz_type: VizType.Table,
+      matrixify_enable: true,
       matrixify_mode_rows: 'metrics',
       matrixify_dimension_x: { dimension: 'country', values: ['USA'] },
       matrixify_charts_per_row: 3,
@@ -234,6 +235,7 @@ test('should identify matrixify property changes correctly', () => {
     formData: {
       datasource: '',
       viz_type: VizType.Table,
+      matrixify_enable: true,
       matrixify_mode_rows: 'metrics',
       matrixify_dimension_x: {
         dimension: 'country',
@@ -277,6 +279,7 @@ test('should handle matrixify-related form data changes', () => {
     formData: {
       datasource: '',
       viz_type: VizType.Table,
+      matrixify_enable: true,
       matrixify_mode_rows: 'metrics', // This is a significant change
       regular_control: 'value1',
     },
@@ -296,6 +299,7 @@ test('should detect matrixify property addition', () => {
     formData: {
       datasource: '',
       viz_type: VizType.Table,
+      matrixify_enable: true,
       matrixify_mode_rows: 'metrics',
       // No matrixify_dimension_x initially
     },
@@ -317,6 +321,7 @@ test('should detect matrixify property addition', () => {
     formData: {
       datasource: '',
       viz_type: VizType.Table,
+      matrixify_enable: true,
       matrixify_mode_rows: 'metrics',
       matrixify_dimension_x: { dimension: 'country', values: ['USA'] }, // Added
     },
@@ -336,6 +341,7 @@ test('should detect nested matrixify property changes', () => {
     formData: {
       datasource: '',
       viz_type: VizType.Table,
+      matrixify_enable: true,
       matrixify_mode_rows: 'metrics',
       matrixify_dimension_x: {
         dimension: 'country',
@@ -361,6 +367,7 @@ test('should detect nested matrixify property changes', () => {
     formData: {
       datasource: '',
       viz_type: VizType.Table,
+      matrixify_enable: true,
       matrixify_mode_rows: 'metrics',
       matrixify_dimension_x: {
         dimension: 'country',
diff --git a/superset-frontend/src/components/Chart/ChartRenderer.tsx b/superset-frontend/src/components/Chart/ChartRenderer.tsx
index b58b3966b36..b5fa33c04c1 100644
--- a/superset-frontend/src/components/Chart/ChartRenderer.tsx
+++ b/superset-frontend/src/components/Chart/ChartRenderer.tsx
@@ -275,10 +275,11 @@ class ChartRenderer extends Component<ChartRendererProps, ChartRendererState> {
         const nextFormData = nextProps.formData as JsonObject;
         const currentFormData = this.props.formData as JsonObject;
         const isMatrixifyEnabled =
-          (nextFormData.matrixify_mode_rows !== undefined &&
+          nextFormData.matrixify_enable === true &&
+          ((nextFormData.matrixify_mode_rows !== undefined &&
             nextFormData.matrixify_mode_rows !== 'disabled') ||
-          (nextFormData.matrixify_mode_columns !== undefined &&
-            nextFormData.matrixify_mode_columns !== 'disabled');
+            (nextFormData.matrixify_mode_columns !== undefined &&
+              nextFormData.matrixify_mode_columns !== 'disabled'));
         if (!isMatrixifyEnabled) return false;
 
         // Check all matrixify-related properties
diff --git a/superset-frontend/src/components/Chart/DrillBy/DrillByModal.test.tsx b/superset-frontend/src/components/Chart/DrillBy/DrillByModal.test.tsx
index d49697af7e8..05b0194f5f8 100644
--- a/superset-frontend/src/components/Chart/DrillBy/DrillByModal.test.tsx
+++ b/superset-frontend/src/components/Chart/DrillBy/DrillByModal.test.tsx
@@ -29,14 +29,30 @@ import {
 } from 'spec/helpers/testing-library';
 import chartQueries, { sliceId } from 'spec/fixtures/mockChartQueries';
 import mockState from 'spec/fixtures/mockState';
+import { setupAGGridModules } from '@superset-ui/core/components/ThemedAgGridReact';
 import { DashboardPageIdContext } from 'src/dashboard/containers/DashboardPage';
 import DrillByModal, { DrillByModalProps } from './DrillByModal';
 
+setupAGGridModules();
+
 // Mock the isEmbedded function
 jest.mock('src/dashboard/util/isEmbedded', () => ({
   isEmbedded: jest.fn(() => false),
 }));
 
+jest.mock('src/explore/exploreUtils', () => {
+  const actual = jest.requireActual('src/explore/exploreUtils');
+  return {
+    ...actual,
+    exportChart: jest.fn(),
+  };
+});
+
+// eslint-disable-next-line @typescript-eslint/no-var-requires
+const { exportChart: exportChartMock } = jest.requireMock(
+  'src/explore/exploreUtils',
+) as { exportChart: jest.Mock };
+
 const CHART_DATA_ENDPOINT = 'glob:*/api/v1/chart/data*';
 const FORM_DATA_KEY_ENDPOINT = 'glob:*/api/v1/explore/form_data';
 
@@ -406,16 +422,9 @@ describe('Table view with pagination', () => {
     await waitFor(() => {
       expect(screen.getByTestId('drill-by-results-table')).toBeInTheDocument();
     });
-
-    // Check that pagination is rendered (there's also a breadcrumb list)
-    const lists = screen.getAllByRole('list');
-    const paginationList = lists.find(list =>
-      list.className?.includes('pagination'),
-    );
-    expect(paginationList).toBeInTheDocument();
   });
 
-  test('should handle pagination in table view', async () => {
+  test('should render data in table view', async () => {
     await renderModal({
       column: { column_name: 'state', verbose_name: null },
       drillByConfig: {
@@ -432,19 +441,9 @@ describe('Table view with pagination', () => {
       expect(screen.getByTestId('drill-by-results-table')).toBeInTheDocument();
     });
 
-    // Check that first page data is shown
-    expect(screen.getByText('State0')).toBeInTheDocument();
-
-    // Check pagination controls exist
-    const nextPageButton = screen.getByTitle('Next Page');
-    expect(nextPageButton).toBeInTheDocument();
-
-    // Click next page
-    userEvent.click(nextPageButton);
-
-    // Verify page changed (State0 should not be visible on page 2)
+    // Check that data is rendered in the grid
     await waitFor(() => {
-      expect(screen.queryByText('State0')).not.toBeInTheDocument();
+      expect(screen.getByText('State0')).toBeInTheDocument();
     });
   });
 
@@ -542,11 +541,12 @@ describe('Table view with pagination', () => {
       expect(screen.getByTestId('drill-by-results-table')).toBeInTheDocument();
     });
 
-    // Should show empty state
-    expect(screen.getByText('No data')).toBeInTheDocument();
+    // ag-grid shows its own empty overlay when there are no rows
+    const tableContainer = screen.getByTestId('drill-by-results-table');
+    expect(tableContainer).toBeInTheDocument();
   });
 
-  test('should handle sorting in table view', async () => {
+  test('should render grid in table view', async () => {
     await renderModal({
       column: { column_name: 'state', verbose_name: null },
       drillByConfig: {
@@ -563,16 +563,69 @@ describe('Table view with pagination', () => {
       expect(screen.getByTestId('drill-by-results-table')).toBeInTheDocument();
     });
 
-    // Find sortable column header
-    const sortableHeaders = screen.getAllByTestId('sort-header');
-    expect(sortableHeaders.length).toBeGreaterThan(0);
-
-    // Click to sort
-    userEvent.click(sortableHeaders[0]);
-
     // Table should still be rendered without crashes
-    await waitFor(() => {
-      expect(screen.getByTestId('drill-by-results-table')).toBeInTheDocument();
+    expect(screen.getByTestId('drill-by-results-table')).toBeInTheDocument();
+  });
+
+  test('CSV download calls exportChart with drilledFormData', async () => {
+    exportChartMock.mockClear();
+    await renderModal({
+      column: { column_name: 'state', verbose_name: null },
+      drillByConfig: {
+        filters: [{ col: 'gender', op: '==', val: 'boy' }],
+        groupbyFieldName: 'groupby',
+      },
     });
+
+    const tableRadio = await screen.findByRole('radio', { name: /table/i });
+    userEvent.click(tableRadio);
+    await waitFor(() =>
+      expect(screen.getByTestId('drill-by-results-table')).toBeInTheDocument(),
+    );
+
+    await userEvent.click(
+      await screen.findByRole('button', { name: 'Download' }),
+    );
+    await userEvent.click(await screen.findByText('Export to CSV'));
+
+    expect(exportChartMock).toHaveBeenCalledTimes(1);
+    expect(exportChartMock).toHaveBeenCalledWith(
+      expect.objectContaining({
+        resultFormat: 'csv',
+        resultType: 'full',
+        formData: expect.objectContaining({ slice_id: 0 }),
+      }),
+    );
+  });
+
+  test('XLSX download calls exportChart with xlsx format', async () => {
+    exportChartMock.mockClear();
+    await renderModal({
+      column: { column_name: 'state', verbose_name: null },
+      drillByConfig: {
+        filters: [{ col: 'gender', op: '==', val: 'boy' }],
+        groupbyFieldName: 'groupby',
+      },
+    });
+
+    const tableRadio = await screen.findByRole('radio', { name: /table/i });
+    userEvent.click(tableRadio);
+    await waitFor(() =>
+      expect(screen.getByTestId('drill-by-results-table')).toBeInTheDocument(),
+    );
+
+    await userEvent.click(
+      await screen.findByRole('button', { name: 'Download' }),
+    );
+    await userEvent.click(await screen.findByText('Export to Excel'));
+
+    expect(exportChartMock).toHaveBeenCalledTimes(1);
+    expect(exportChartMock).toHaveBeenCalledWith(
+      expect.objectContaining({
+        resultFormat: 'xlsx',
+        resultType: 'full',
+        formData: expect.objectContaining({ slice_id: 0 }),
+      }),
+    );
   });
 });
diff --git a/superset-frontend/src/components/Chart/DrillBy/DrillByModal.tsx b/superset-frontend/src/components/Chart/DrillBy/DrillByModal.tsx
index 1bb63d0d81e..57149ee55e0 100644
--- a/superset-frontend/src/components/Chart/DrillBy/DrillByModal.tsx
+++ b/superset-frontend/src/components/Chart/DrillBy/DrillByModal.tsx
@@ -54,7 +54,7 @@ import {
   LOG_ACTIONS_FURTHER_DRILL_BY,
 } from 'src/logger/LogUtils';
 import { findPermission } from 'src/utils/findPermission';
-import { getQuerySettings } from 'src/explore/exploreUtils';
+import { getQuerySettings, exportChart } from 'src/explore/exploreUtils';
 import { isEmbedded } from 'src/dashboard/util/isEmbedded';
 import { Dataset, DrillByType } from '../types';
 import DrillByChart from './DrillByChart';
@@ -209,12 +209,6 @@ export default function DrillByModal({
   const { displayModeToggle, drillByDisplayMode } = useDisplayModeToggle();
   const [chartDataResult, setChartDataResult] = useState<QueryData[]>();
 
-  const resultsTable = useResultsTableView(
-    chartDataResult,
-    formData.datasource,
-    canDownload,
-  );
-
   const [currentFormData, setCurrentFormData] = useState(formData);
   const [usedGroupbyColumns, setUsedGroupbyColumns] = useState<Column[]>(
     [...initialGroupbyColumns, column].filter(isDefined),
@@ -377,6 +371,63 @@ export default function DrillByModal({
     formData,
   ]);
 
+  const handleDownload = useCallback(
+    (exportType: 'csv' | 'xlsx') => {
+      Promise.resolve(
+        exportChart({
+          formData: drilledFormData,
+          resultFormat: exportType,
+          resultType: 'full',
+        }),
+      ).catch(error => {
+        addDangerToast(
+          t('Failed to generate download: %s', error?.message || error),
+        );
+      });
+    },
+    [drilledFormData, addDangerToast],
+  );
+
+  const handleDownloadCSV = useCallback(
+    () => handleDownload('csv'),
+    [handleDownload],
+  );
+
+  const handleDownloadXLSX = useCallback(
+    () => handleDownload('xlsx'),
+    [handleDownload],
+  );
+
+  const handleReload = useCallback(() => {
+    setChartDataResult(undefined);
+    setIsChartDataLoading(true);
+    const [useLegacyApi] = getQuerySettings(drilledFormData);
+    getChartDataRequest({
+      formData: drilledFormData,
+    })
+      .then(({ response, json }) =>
+        handleChartDataResponse(response, json, useLegacyApi),
+      )
+      .then(queriesResponse => {
+        setChartDataResult(queriesResponse);
+      })
+      .catch(() => {
+        addDangerToast(t('Failed to load chart data.'));
+      })
+      .finally(() => {
+        setIsChartDataLoading(false);
+      });
+  }, [addDangerToast, drilledFormData]);
+
+  const resultsTable = useResultsTableView(
+    chartDataResult,
+    formData.datasource,
+    canDownload,
+    handleDownloadCSV,
+    handleDownloadXLSX,
+    handleReload,
+  );
+
   useEffect(() => {
     setUsedGroupbyColumns(usedCols =>
       !currentColumn ||
diff --git a/superset-frontend/src/components/Chart/DrillBy/DrillBySubmenu.test.tsx b/superset-frontend/src/components/Chart/DrillBy/DrillBySubmenu.test.tsx
index 1a7f23a9e4a..02c2d11a22b 100644
--- a/superset-frontend/src/components/Chart/DrillBy/DrillBySubmenu.test.tsx
+++ b/superset-frontend/src/components/Chart/DrillBy/DrillBySubmenu.test.tsx
@@ -274,7 +274,11 @@ test('When menu item is clicked, call onSelection with clicked column and drill
 
 test('matrixify_mode_rows enabled should not render component', () => {
   const { container } = renderSubmenu({
-    formData: { ...defaultFormData, matrixify_mode_rows: 'metrics' },
+    formData: {
+      ...defaultFormData,
+      matrixify_enable: true,
+      matrixify_mode_rows: 'metrics',
+    },
   });
   expect(container).toBeEmptyDOMElement();
 });
diff --git a/superset-frontend/src/components/Chart/DrillBy/DrillBySubmenu.tsx b/superset-frontend/src/components/Chart/DrillBy/DrillBySubmenu.tsx
index 40e18a264be..ebad221fd80 100644
--- a/superset-frontend/src/components/Chart/DrillBy/DrillBySubmenu.tsx
+++ b/superset-frontend/src/components/Chart/DrillBy/DrillBySubmenu.tsx
@@ -179,10 +179,11 @@ export const DrillBySubmenu = ({
   }
 
   if (
-    (formData.matrixify_mode_rows !== undefined &&
+    formData.matrixify_enable === true &&
+    ((formData.matrixify_mode_rows !== undefined &&
       formData.matrixify_mode_rows !== 'disabled') ||
-    (formData.matrixify_mode_columns !== undefined &&
-      formData.matrixify_mode_columns !== 'disabled')
+      (formData.matrixify_mode_columns !== undefined &&
+        formData.matrixify_mode_columns !== 'disabled'))
   ) {
     return null;
   }
diff --git a/superset-frontend/src/components/Chart/DrillBy/useResultsTableView.test.ts b/superset-frontend/src/components/Chart/DrillBy/useResultsTableView.test.ts
index 59a5505a76e..92d5e48530c 100644
--- a/superset-frontend/src/components/Chart/DrillBy/useResultsTableView.test.ts
+++ b/superset-frontend/src/components/Chart/DrillBy/useResultsTableView.test.ts
@@ -25,25 +25,12 @@ import {
   within,
   waitFor,
 } from 'spec/helpers/testing-library';
+import { setupAGGridModules } from '@superset-ui/core/components/ThemedAgGridReact';
 import { useResultsTableView } from './useResultsTableView';
 
-const capturedProps: any[] = [];
-
-jest.mock(
-  'src/explore/components/DataTablesPane/components/SingleQueryResultPane',
-  () => {
-    const actual = jest.requireActual(
-      'src/explore/components/DataTablesPane/components/SingleQueryResultPane',
-    );
-    return {
-      ...actual,
-      SingleQueryResultPane: (props: any) => {
-        capturedProps.push(props);
-        return actual.SingleQueryResultPane(props);
-      },
-    };
-  },
-);
+beforeAll(() => {
+  setupAGGridModules();
+});
 
 const MOCK_CHART_DATA_RESULT = [
   {
@@ -92,9 +79,9 @@ test('Displays results table for 1 query', () => {
   );
   render(result.current, { useRedux: true });
   expect(screen.queryByRole('tablist')).not.toBeInTheDocument();
-  expect(screen.getByRole('table')).toBeInTheDocument();
-  expect(screen.getAllByTestId('sort-header')).toHaveLength(2);
-  expect(screen.getAllByTestId('table-row')).toHaveLength(4);
+  expect(screen.getByText('name')).toBeInTheDocument();
+  expect(screen.getByText('sum__num')).toBeInTheDocument();
+  expect(screen.getByText('Michael')).toBeInTheDocument();
 });
 
 test('Displays results for 2 queries', async () => {
@@ -102,60 +89,18 @@ test('Displays results for 2 queries', async () => {
     useResultsTableView(MOCK_CHART_DATA_RESULT, '1__table', true),
   );
   render(result.current, { useRedux: true });
-  const getActiveTabElement = () =>
-    document.querySelector('.ant-tabs-tabpane-active') as HTMLElement;
 
   const tablistElement = screen.getByRole('tablist');
   expect(tablistElement).toBeInTheDocument();
   expect(within(tablistElement).getByText('Results 1')).toBeInTheDocument();
   expect(within(tablistElement).getByText('Results 2')).toBeInTheDocument();
 
-  expect(within(getActiveTabElement()).getByRole('table')).toBeInTheDocument();
-  expect(
-    within(getActiveTabElement()).getAllByTestId('sort-header'),
-  ).toHaveLength(2);
-  expect(
-    within(getActiveTabElement()).getAllByTestId('table-row'),
-  ).toHaveLength(4);
+  expect(screen.getByText('Michael')).toBeInTheDocument();
 
   userEvent.click(screen.getByText('Results 2'));
 
   await waitFor(() => {
-    expect(
-      within(getActiveTabElement()).getAllByTestId('sort-header'),
-    ).toHaveLength(3);
-  });
-  expect(
-    within(getActiveTabElement()).getAllByTestId('table-row'),
-  ).toHaveLength(2);
-});
-
-test('passes isPaginationSticky={false} to SingleQueryResultPane for single query', () => {
-  capturedProps.length = 0;
-  const { result } = renderHook(() =>
-    useResultsTableView(MOCK_CHART_DATA_RESULT.slice(0, 1), '1__table', true),
-  );
-  render(result.current, { useRedux: true });
-
-  expect(capturedProps.length).toBeGreaterThan(0);
-  capturedProps.forEach(props => {
-    expect(props).toMatchObject({
-      isPaginationSticky: false,
-    });
-  });
-});
-
-test('passes isPaginationSticky={false} to SingleQueryResultPane for multiple queries', () => {
-  capturedProps.length = 0;
-  const { result } = renderHook(() =>
-    useResultsTableView(MOCK_CHART_DATA_RESULT, '1__table', true),
-  );
-  render(result.current, { useRedux: true });
-
-  expect(capturedProps.length).toBeGreaterThanOrEqual(2);
-  capturedProps.forEach(props => {
-    expect(props).toMatchObject({
-      isPaginationSticky: false,
-    });
+    expect(screen.getByText('gender')).toBeInTheDocument();
   });
+  expect(screen.getByText('boy')).toBeInTheDocument();
 });
diff --git a/superset-frontend/src/components/Chart/DrillBy/useResultsTableView.tsx b/superset-frontend/src/components/Chart/DrillBy/useResultsTableView.tsx
index f84a2f3be40..b36ef4a992c 100644
--- a/superset-frontend/src/components/Chart/DrillBy/useResultsTableView.tsx
+++ b/superset-frontend/src/components/Chart/DrillBy/useResultsTableView.tsx
@@ -22,13 +22,12 @@ import { t } from '@apache-superset/core/translation';
 import { SingleQueryResultPane } from 'src/explore/components/DataTablesPane/components/SingleQueryResultPane';
 import Tabs from '@superset-ui/core/components/Tabs';
 
-const DATA_SIZE = 15;
-
-const PaginationContainer = styled.div`
-  ${({ theme }) => css`
-    & .pagination-container {
-      bottom: ${-theme.sizeUnit * 4}px;
-    }
+const ResultContainer = styled.div`
+  ${() => css`
+    display: flex;
+    flex-direction: column;
+    flex: 1;
+    min-height: 0;
   `}
 `;
 
@@ -36,25 +35,29 @@ export const useResultsTableView = (
   chartDataResult: QueryData[] | undefined,
   datasourceId: string,
   canDownload: boolean,
+  onDownloadCSV?: () => void,
+  onDownloadXLSX?: () => void,
+  onReload?: () => void,
 ) => {
   if (!isDefined(chartDataResult)) {
     return <div />;
   }
   if (chartDataResult.length === 1) {
     return (
-      <PaginationContainer data-test="drill-by-results-table">
+      <ResultContainer data-test="drill-by-results-table">
         <SingleQueryResultPane
           colnames={chartDataResult[0].colnames}
           coltypes={chartDataResult[0].coltypes}
           rowcount={chartDataResult[0].sql_rowcount}
           data={chartDataResult[0].data}
-          dataSize={DATA_SIZE}
           datasourceId={datasourceId}
           isVisible
           canDownload={canDownload}
-          isPaginationSticky={false}
+          onDownloadCSV={onDownloadCSV}
+          onDownloadXLSX={onDownloadXLSX}
+          onReload={onReload}
         />
-      </PaginationContainer>
+      </ResultContainer>
     );
   }
   return (
@@ -64,19 +67,20 @@ export const useResultsTableView = (
         key: `result-tab-${index}`,
         label: t('Results %s', index + 1),
         children: (
-          <PaginationContainer>
+          <ResultContainer>
             <SingleQueryResultPane
               colnames={res.colnames}
               coltypes={res.coltypes}
               data={res.data}
               rowcount={res.sql_rowcount}
-              dataSize={DATA_SIZE}
               datasourceId={datasourceId}
               isVisible
               canDownload={canDownload}
-              isPaginationSticky={false}
+              onDownloadCSV={onDownloadCSV}
+              onDownloadXLSX={onDownloadXLSX}
+              onReload={onReload}
             />
-          </PaginationContainer>
+          </ResultContainer>
         ),
       }))}
     />
diff --git a/superset-frontend/src/components/Chart/DrillDetail/DownloadDropdown.test.tsx b/superset-frontend/src/components/Chart/DrillDetail/DownloadDropdown.test.tsx
new file mode 100644
index 00000000000..f09c364dcbc
--- /dev/null
+++ b/superset-frontend/src/components/Chart/DrillDetail/DownloadDropdown.test.tsx
@@ -0,0 +1,57 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+import { render, screen, userEvent } from 'spec/helpers/testing-library';
+import DownloadDropdown from './DownloadDropdown';
+
+const onDownloadCSV = jest.fn();
+const onDownloadXLSX = jest.fn();
+
+beforeEach(() => {
+  onDownloadCSV.mockClear();
+  onDownloadXLSX.mockClear();
+});
+
+const setup = () =>
+  render(
+    <DownloadDropdown
+      onDownloadCSV={onDownloadCSV}
+      onDownloadXLSX={onDownloadXLSX}
+    />,
+  );
+
+test('renders a download trigger with accessible label', () => {
+  setup();
+  expect(screen.getByRole('button', { name: 'Download' })).toBeInTheDocument();
+});
+
+test('fires onDownloadCSV when CSV menu item is selected', async () => {
+  setup();
+  await userEvent.click(screen.getByRole('button', { name: 'Download' }));
+  await userEvent.click(await screen.findByText('Export to CSV'));
+  expect(onDownloadCSV).toHaveBeenCalledTimes(1);
+  expect(onDownloadXLSX).not.toHaveBeenCalled();
+});
+
+test('fires onDownloadXLSX when Excel menu item is selected', async () => {
+  setup();
+  await userEvent.click(screen.getByRole('button', { name: 'Download' }));
+  await userEvent.click(await screen.findByText('Export to Excel'));
+  expect(onDownloadXLSX).toHaveBeenCalledTimes(1);
+  expect(onDownloadCSV).not.toHaveBeenCalled();
+});
diff --git a/superset-frontend/src/components/Chart/DrillDetail/DownloadDropdown.tsx b/superset-frontend/src/components/Chart/DrillDetail/DownloadDropdown.tsx
new file mode 100644
index 00000000000..4ebaa3be7e8
--- /dev/null
+++ b/superset-frontend/src/components/Chart/DrillDetail/DownloadDropdown.tsx
@@ -0,0 +1,82 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { t } from '@apache-superset/core/translation';
+import { css, useTheme } from '@apache-superset/core/theme';
+import { Dropdown, Tooltip } from '@superset-ui/core/components';
+import { Icons } from '@superset-ui/core/components/Icons';
+
+interface DownloadDropdownProps {
+  onDownloadCSV: () => void;
+  onDownloadXLSX: () => void;
+}
+
+const DownloadDropdown = ({
+  onDownloadCSV,
+  onDownloadXLSX,
+}: DownloadDropdownProps) => {
+  const theme = useTheme();
+  return (
+    <Dropdown
+      trigger={['click']}
+      menu={{
+        onClick: ({ key }) => {
+          if (key === 'csv') {
+            onDownloadCSV();
+          } else if (key === 'xlsx') {
+            onDownloadXLSX();
+          }
+        },
+        items: [
+          {
+            key: 'csv',
+            label: t('Export to CSV'),
+            icon: <Icons.FileOutlined />,
+          },
+          {
+            key: 'xlsx',
+            label: t('Export to Excel'),
+            icon: <Icons.FileOutlined />,
+          },
+        ],
+      }}
+    >
+      <Tooltip title={t('Download')}>
+        <span
+          tabIndex={0}
+          role="button"
+          aria-label={t('Download')}
+          data-test="drill-detail-download-btn"
+        >
+          <Icons.DownloadOutlined
+            iconColor={theme.colorIcon}
+            iconSize="l"
+            css={css`
+              &.anticon > * {
+                line-height: 0;
+              }
+            `}
+          />
+        </span>
+      </Tooltip>
+    </Dropdown>
+  );
+};
+
+export default DownloadDropdown;
diff --git a/superset-frontend/src/components/Chart/DrillDetail/DrillDetailPane.test.tsx b/superset-frontend/src/components/Chart/DrillDetail/DrillDetailPane.test.tsx
index 030552823ec..f9d9b924878 100644
--- a/superset-frontend/src/components/Chart/DrillDetail/DrillDetailPane.test.tsx
+++ b/superset-frontend/src/components/Chart/DrillDetail/DrillDetailPane.test.tsx
@@ -18,7 +18,12 @@
  */
 import fetchMock from 'fetch-mock';
 import { QueryFormData, SupersetClient } from '@superset-ui/core';
-import { render, screen, waitFor } from 'spec/helpers/testing-library';
+import {
+  render,
+  screen,
+  userEvent,
+  waitFor,
+} from 'spec/helpers/testing-library';
 import { getMockStoreWithNativeFilters } from 'spec/fixtures/mockStore';
 import chartQueries, { sliceId } from 'spec/fixtures/mockChartQueries';
 import { supersetGetCache } from 'src/utils/cachedSupersetGet';
@@ -189,6 +194,66 @@ test('should render the error', async () => {
   expect(screen.getByText('Error: Something went wrong')).toBeInTheDocument();
 });
 
+describe('download actions', () => {
+  const renderWithDownloadPermission = () =>
+    render(
+      <DrillDetailPane
+        initialFilters={[]}
+        formData={chart.form_data as unknown as QueryFormData}
+      />,
+      {
+        useRedux: true,
+        initialState: {
+          user: { roles: { Admin: [['can_csv', 'Superset']] } },
+          common: { conf: { SAMPLES_ROW_LIMIT: 10, ROW_LIMIT: 50000 } },
+          dashboardInfo: { id: 123 },
+        },
+      },
+    );
+
+  const clickDownloadItem = async (label: string) => {
+    await userEvent.click(
+      await screen.findByRole('button', { name: 'Download' }),
+    );
+    await userEvent.click(await screen.findByText(label));
+  };
+
+  test('CSV export posts drill_detail payload with ROW_LIMIT', async () => {
+    fetchWithData();
+    const postFormSpy = jest
+      .spyOn(SupersetClient, 'postForm')
+      .mockImplementation(() => Promise.resolve());
+    renderWithDownloadPermission();
+
+    await clickDownloadItem('Export to CSV');
+
+    expect(postFormSpy).toHaveBeenCalledTimes(1);
+    const body = postFormSpy.mock.calls[0][1] as { form_data: string };
+    const payload = JSON.parse(body.form_data);
+    expect(payload.result_type).toBe('drill_detail');
+    expect(payload.result_format).toBe('csv');
+    expect(payload.queries[0].row_limit).toBe(50000);
+    expect(payload.form_data.dashboardId).toBe(123);
+    postFormSpy.mockRestore();
+  });
+
+  test('XLSX export uses xlsx result_format', async () => {
+    fetchWithData();
+    const postFormSpy = jest
+      .spyOn(SupersetClient, 'postForm')
+      .mockImplementation(() => Promise.resolve());
+    renderWithDownloadPermission();
+
+    await clickDownloadItem('Export to Excel');
+
+    expect(postFormSpy).toHaveBeenCalledTimes(1);
+    const body = postFormSpy.mock.calls[0][1] as { form_data: string };
+    const payload = JSON.parse(body.form_data);
+    expect(payload.result_format).toBe('xlsx');
+    postFormSpy.mockRestore();
+  });
+});
+
 test('should use verbose_map for column headers when available', async () => {
   jest.restoreAllMocks();
 
diff --git a/superset-frontend/src/components/Chart/DrillDetail/DrillDetailPane.tsx b/superset-frontend/src/components/Chart/DrillDetail/DrillDetailPane.tsx
index 747c17d80bf..6922669e479 100644
--- a/superset-frontend/src/components/Chart/DrillDetail/DrillDetailPane.tsx
+++ b/superset-frontend/src/components/Chart/DrillDetail/DrillDetailPane.tsx
@@ -33,6 +33,7 @@ import {
   ensureIsArray,
   JsonObject,
   QueryFormData,
+  SupersetClient,
 } from '@superset-ui/core';
 import { css, useTheme } from '@apache-superset/core/theme';
 import { GenericDataType } from '@apache-superset/core/common';
@@ -47,6 +48,10 @@ import Table, {
   TableSize,
 } from '@superset-ui/core/components/Table';
 import { RootState } from 'src/dashboard/types';
+import { usePermissions } from 'src/hooks/usePermissions';
+import { useToasts } from 'src/components/MessageToasts/withToasts';
+import { ensureAppRoot } from 'src/utils/pathUtils';
+import { safeStringify } from 'src/utils/safeStringify';
 import HeaderWithRadioGroup from '@superset-ui/core/components/Table/header-renderers/HeaderWithRadioGroup';
 import { useDatasetMetadataBar } from 'src/features/datasets/metadataBar/useDatasetMetadataBar';
 import { Dataset } from '../types';
@@ -108,6 +113,13 @@ export default function DrillDetailPane({
       state.common.conf.SAMPLES_ROW_LIMIT,
   );
 
+  const ROW_LIMIT = useSelector(
+    (state: { common: { conf: JsonObject } }) => state.common.conf.ROW_LIMIT,
+  );
+
+  const { canDownload } = usePermissions();
+  const { addDangerToast } = useToasts();
+
   // Extract datasource ID/type from string ID
   const [datasourceId, datasourceType] = useMemo(
     () => formData.datasource.split('__'),
@@ -207,6 +219,64 @@ export default function DrillDetailPane({
     setPageIndex(0);
   }, []);
 
+  const handleDownload = useCallback(
+    (exportType: 'csv' | 'xlsx') => {
+      const drillPayload = getDrillPayload(formData, filters);
+      if (!drillPayload) {
+        addDangerToast(t('Unable to generate download payload'));
+        return;
+      }
+      const payload: JsonObject = {
+        datasource: {
+          id: parseInt(datasourceId, 10),
+          type: datasourceType,
+        },
+        queries: [
+          {
+            ...drillPayload,
+            columns: [],
+            metrics: [],
+            orderby: [],
+            row_limit: ROW_LIMIT,
+            row_offset: 0,
+          },
+        ],
+        result_type: 'drill_detail',
+        result_format: exportType,
+        force: false,
+      };
+      if (dashboardId) {
+        payload.form_data = { dashboardId };
+      }
+      SupersetClient.postForm(ensureAppRoot('/api/v1/chart/data'), {
+        form_data: safeStringify(payload),
+      }).catch(error => {
+        addDangerToast(
+          t('Failed to generate download: %s', error.message || error),
+        );
+      });
+    },
+    [
+      formData,
+      filters,
+      datasourceId,
+      datasourceType,
+      ROW_LIMIT,
+      dashboardId,
+      addDangerToast,
+    ],
+  );
+
+  const handleDownloadCSV = useCallback(
+    () => handleDownload('csv'),
+    [handleDownload],
+  );
+
+  const handleDownloadXLSX = useCallback(
+    () => handleDownload('xlsx'),
+    [handleDownload],
+  );
+
   // Clear cache and reset page index if filters change
   useEffect(() => {
     setResponseError('');
@@ -338,6 +408,11 @@ export default function DrillDetailPane({
           totalCount={resultsPage?.total}
           loading={isLoading}
           onReload={handleReload}
+          canDownload={canDownload}
+          onDownloadCSV={handleDownloadCSV}
+          onDownloadXLSX={handleDownloadXLSX}
+          data={data}
+          columnNames={resultsPage?.colNames}
         />
       )}
       {tableContent}
diff --git a/superset-frontend/src/components/Chart/DrillDetail/DrillDetailTableControls.stories.tsx b/superset-frontend/src/components/Chart/DrillDetail/DrillDetailTableControls.stories.tsx
index 2af6c354f4a..858d28cf14f 100644
--- a/superset-frontend/src/components/Chart/DrillDetail/DrillDetailTableControls.stories.tsx
+++ b/superset-frontend/src/components/Chart/DrillDetail/DrillDetailTableControls.stories.tsx
@@ -33,4 +33,9 @@ InteractiveTableControls.args = {
     { op: '>', col: 'tz_offset', val: 200 },
     { op: '==', col: 'platform', val: 'GB' },
   ],
+  canDownload: true,
+  onDownloadCSV: () => {},
+  onDownloadXLSX: () => {},
+  onReload: () => {},
+  loading: false,
 };
diff --git a/superset-frontend/src/components/Chart/DrillDetail/DrillDetailTableControls.test.tsx b/superset-frontend/src/components/Chart/DrillDetail/DrillDetailTableControls.test.tsx
index 91ac078ed8e..5f2fe88ccfb 100644
--- a/superset-frontend/src/components/Chart/DrillDetail/DrillDetailTableControls.test.tsx
+++ b/superset-frontend/src/components/Chart/DrillDetail/DrillDetailTableControls.test.tsx
@@ -17,20 +17,27 @@
  * under the License.
  */
 import { render, screen, userEvent } from 'spec/helpers/testing-library';
-import TableControls from './DrillDetailTableControls';
+import TableControls, { TableControlsProps } from './DrillDetailTableControls';
 
 const setFilters = jest.fn();
 const onReload = jest.fn();
-const setup = (overrides: Record<string, any> = {}) => {
+const onDownloadCSV = jest.fn();
+const onDownloadXLSX = jest.fn();
+const setup = (overrides: Partial<TableControlsProps> = {}) => {
   const props = {
     filters: [],
     setFilters,
     onReload,
     loading: false,
     totalCount: 0,
+    canDownload: true,
+    onDownloadCSV,
+    onDownloadXLSX,
+    data: [],
+    columnNames: [],
     ...overrides,
   };
-  return render(<TableControls {...props} />);
+  return render(<TableControls {...props} />, { useRedux: true });
 };
 test('should render', () => {
   const { container } = setup();
diff --git a/superset-frontend/src/components/Chart/DrillDetail/DrillDetailTableControls.tsx b/superset-frontend/src/components/Chart/DrillDetail/DrillDetailTableControls.tsx
index f1c7e23af39..b31879719d2 100644
--- a/superset-frontend/src/components/Chart/DrillDetail/DrillDetailTableControls.tsx
+++ b/superset-frontend/src/components/Chart/DrillDetail/DrillDetailTableControls.tsx
@@ -27,6 +27,11 @@ import {
 import { css, useTheme } from '@apache-superset/core/theme';
 import RowCountLabel from 'src/components/RowCountLabel';
 import { Icons } from '@superset-ui/core/components/Icons';
+import { Tooltip } from '@superset-ui/core/components';
+import { CopyToClipboardButton } from 'src/explore/components/DataTableControl';
+import { TabularDataRow } from 'src/utils/common';
+import { usePermissions } from 'src/hooks/usePermissions';
+import DownloadDropdown from './DownloadDropdown';
 
 export type TableControlsProps = {
   filters: BinaryQueryObjectFilterClause[];
@@ -34,6 +39,11 @@ export type TableControlsProps = {
   totalCount?: number;
   loading: boolean;
   onReload: () => void;
+  canDownload: boolean;
+  onDownloadCSV: () => void;
+  onDownloadXLSX: () => void;
+  data?: TabularDataRow[];
+  columnNames?: string[];
 };
 
 export default function TableControls({
@@ -42,8 +52,14 @@ export default function TableControls({
   totalCount,
   loading,
   onReload,
+  canDownload,
+  onDownloadCSV,
+  onDownloadXLSX,
+  data,
+  columnNames,
 }: TableControlsProps) {
   const theme = useTheme();
+  const { canCopyClipboard: copyEnabled } = usePermissions();
   const filterMap: Record<string, BinaryQueryObjectFilterClause> = useMemo(
     () =>
       Object.assign(
@@ -118,16 +134,38 @@ export default function TableControls({
           display: flex;
           align-items: center;
           height: min-content;
+          gap: ${theme.sizeUnit * 3}px;
         `}
       >
         <RowCountLabel loading={loading && !totalCount} rowcount={totalCount} />
-        <Icons.ReloadOutlined
-          iconColor={theme.colorIcon}
-          iconSize="l"
-          aria-label={t('Reload')}
-          role="button"
-          onClick={onReload}
-        />
+        {canDownload && (
+          <DownloadDropdown
+            onDownloadCSV={onDownloadCSV}
+            onDownloadXLSX={onDownloadXLSX}
+          />
+        )}
+        {copyEnabled ? (
+          <CopyToClipboardButton data={data} columns={columnNames} />
+        ) : (
+          <Tooltip title={t("You don't have permission to copy to clipboard")}>
+            <span>
+              <CopyToClipboardButton
+                data={data}
+                columns={columnNames}
+                disabled
+              />
+            </span>
+          </Tooltip>
+        )}
+        <Tooltip title={t('Reload')}>
+          <Icons.ReloadOutlined
+            iconColor={theme.colorIcon}
+            iconSize="l"
+            aria-label={t('Reload')}
+            role="button"
+            onClick={onReload}
+          />
+        </Tooltip>
       </div>
     </div>
   );
diff --git a/superset-frontend/src/components/CopyToClipboard/CopyToClipboard.test.tsx b/superset-frontend/src/components/CopyToClipboard/CopyToClipboard.test.tsx
index 4164cb45459..1ebb158dead 100644
--- a/superset-frontend/src/components/CopyToClipboard/CopyToClipboard.test.tsx
+++ b/superset-frontend/src/components/CopyToClipboard/CopyToClipboard.test.tsx
@@ -80,6 +80,30 @@ test('triggers onCopyEnd', async () => {
   await waitFor(() => expect(onCopyEnd).toHaveBeenCalled());
 });
 
+test('does not copy when disabled', async () => {
+  const callback = jest.fn();
+  document.execCommand = callback;
+
+  const originalClipboard = { ...global.navigator.clipboard };
+  // @ts-expect-error
+  global.navigator.clipboard = { write: callback, writeText: callback };
+
+  render(<CopyToClipboard disabled text="Text" />, { useRedux: true });
+
+  const copyButton = screen.getByText('Copy');
+  expect(copyButton).toHaveAttribute('aria-disabled', 'true');
+
+  userEvent.click(copyButton);
+
+  await waitFor(() => {
+    expect(callback).not.toHaveBeenCalled();
+  });
+
+  jest.resetAllMocks();
+  // @ts-expect-error
+  global.navigator.clipboard = originalClipboard;
+});
+
 test('renders unwrapped', () => {
   const text = 'Text';
   render(<CopyToClipboard text={text} wrapped={false} />, {
diff --git a/superset-frontend/src/components/CopyToClipboard/index.tsx b/superset-frontend/src/components/CopyToClipboard/index.tsx
index 3c3a51a845b..5df0f178f2a 100644
--- a/superset-frontend/src/components/CopyToClipboard/index.tsx
+++ b/superset-frontend/src/components/CopyToClipboard/index.tsx
@@ -43,6 +43,9 @@ class CopyToClip extends Component<CopyToClipboardProps> {
   }
 
   onClick() {
+    if (this.props.disabled) {
+      return;
+    }
     if (this.props.getText) {
       this.props.getText((d: string) => {
         this.copyToClipboard(Promise.resolve(d));
@@ -53,9 +56,16 @@ class CopyToClip extends Component<CopyToClipboardProps> {
   }
 
   getDecoratedCopyNode() {
-    return cloneElement(this.props.copyNode as ReactElement, {
-      style: { cursor: 'pointer' },
-      onClick: this.onClick,
+    const copyNode = this.props.copyNode as ReactElement;
+    const { disabled } = this.props;
+    return cloneElement(copyNode, {
+      style: {
+        ...copyNode.props.style,
+        cursor: disabled ? 'not-allowed' : 'pointer',
+      },
+      onClick: disabled ? undefined : this.onClick,
+      'aria-disabled': disabled || undefined,
+      tabIndex: disabled ? -1 : copyNode.props.tabIndex,
     });
   }
 
@@ -98,7 +108,7 @@ class CopyToClip extends Component<CopyToClipboardProps> {
   }
 
   renderNotWrapped() {
-    return this.renderTooltip('pointer');
+    return this.renderTooltip(this.props.disabled ? 'not-allowed' : 'pointer');
   }
 
   renderLink() {
@@ -114,7 +124,7 @@ class CopyToClip extends Component<CopyToClipboardProps> {
             {this.props.text}
           </span>
         )}
-        {this.renderTooltip('pointer')}
+        {this.renderTooltip(this.props.disabled ? 'not-allowed' : 'pointer')}
       </span>
     );
   }
diff --git a/superset-frontend/src/components/CopyToClipboard/types.ts b/superset-frontend/src/components/CopyToClipboard/types.ts
index 10d87e8decf..f475e7d9825 100644
--- a/superset-frontend/src/components/CopyToClipboard/types.ts
+++ b/superset-frontend/src/components/CopyToClipboard/types.ts
@@ -20,6 +20,7 @@ import type { ReactNode } from 'react';
 
 export interface CopyToClipboardProps {
   copyNode?: ReactNode;
+  disabled?: boolean;
   getText?: (callback: (data: string) => void) => void;
   onCopyEnd?: () => void;
   shouldShowText?: boolean;
diff --git a/superset-frontend/src/components/CrudThemeProvider.test.tsx b/superset-frontend/src/components/CrudThemeProvider.test.tsx
new file mode 100644
index 00000000000..cd61fbb2999
--- /dev/null
+++ b/superset-frontend/src/components/CrudThemeProvider.test.tsx
@@ -0,0 +1,326 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+import { type ReactNode } from 'react';
+import { render, screen } from 'spec/helpers/testing-library';
+import { logging } from '@apache-superset/core/utils';
+import {
+  Theme,
+  normalizeThemeConfig,
+  isThemeConfigDark,
+} from '@apache-superset/core/theme';
+import getBootstrapData from 'src/utils/getBootstrapData';
+import CrudThemeProvider from './CrudThemeProvider';
+
+jest.mock('@apache-superset/core/theme', () => ({
+  ...jest.requireActual('@apache-superset/core/theme'),
+  normalizeThemeConfig: jest.fn((config: unknown) => config),
+  isThemeConfigDark: jest.fn(() => false),
+}));
+
+jest.mock('src/utils/getBootstrapData', () => ({
+  __esModule: true,
+  default: jest.fn(() => ({
+    common: { theme: { default: {}, dark: {} } },
+  })),
+}));
+
+const mockGetBootstrapData = getBootstrapData as jest.MockedFunction<
+  typeof getBootstrapData
+>;
+const mockNormalizeThemeConfig = normalizeThemeConfig as jest.MockedFunction<
+  typeof normalizeThemeConfig
+>;
+const mockIsThemeConfigDark = isThemeConfigDark as jest.MockedFunction<
+  typeof isThemeConfigDark
+>;
+
+type BootstrapData = ReturnType<typeof getBootstrapData>;
+type BootstrapThemes = BootstrapData['common']['theme'];
+
+function mockBootstrap(themes: Partial<BootstrapThemes> = {}): BootstrapData {
+  return {
+    common: {
+      theme: { default: {}, dark: {}, ...themes },
+    },
+  } as unknown as BootstrapData;
+}
+
+const MockSupersetThemeProvider = ({ children }: { children: ReactNode }) => (
+  <div data-test="dashboard-theme-provider">{children}</div>
+);
+
+beforeEach(() => {
+  jest.restoreAllMocks();
+  jest.spyOn(Theme, 'fromConfig').mockReturnValue({
+    SupersetThemeProvider: MockSupersetThemeProvider,
+  } as unknown as Theme);
+  mockNormalizeThemeConfig.mockImplementation(
+    config => config as ReturnType<typeof normalizeThemeConfig>,
+  );
+  mockIsThemeConfigDark.mockReturnValue(false);
+  mockGetBootstrapData.mockReturnValue(mockBootstrap());
+  // Clean up font style elements from previous tests
+  document
+    .querySelectorAll('style[data-superset-fonts]')
+    .forEach(el => el.remove());
+});
+
+test('renders children directly when no theme is provided', () => {
+  render(
+    <CrudThemeProvider>
+      <div>Dashboard Content</div>
+    </CrudThemeProvider>,
+  );
+  expect(screen.getByText('Dashboard Content')).toBeInTheDocument();
+  expect(
+    screen.queryByTestId('dashboard-theme-provider'),
+  ).not.toBeInTheDocument();
+  expect(Theme.fromConfig).not.toHaveBeenCalled();
+});
+
+test('renders children directly when theme is null', () => {
+  render(
+    <CrudThemeProvider theme={null}>
+      <div>Dashboard Content</div>
+    </CrudThemeProvider>,
+  );
+  expect(screen.getByText('Dashboard Content')).toBeInTheDocument();
+  expect(
+    screen.queryByTestId('dashboard-theme-provider'),
+  ).not.toBeInTheDocument();
+  expect(Theme.fromConfig).not.toHaveBeenCalled();
+});
+
+test('wraps children with SupersetThemeProvider when valid theme data is provided', () => {
+  const themeConfig = { token: { colorPrimary: '#ff0000' } };
+  render(
+    <CrudThemeProvider
+      theme={{
+        id: 1,
+        theme_name: 'Custom Theme',
+        json_data: JSON.stringify(themeConfig),
+      }}
+    >
+      <div>Dashboard Content</div>
+    </CrudThemeProvider>,
+  );
+  expect(screen.getByText('Dashboard Content')).toBeInTheDocument();
+  expect(screen.getByTestId('dashboard-theme-provider')).toBeInTheDocument();
+  expect(Theme.fromConfig).toHaveBeenCalledWith(themeConfig, expect.anything());
+});
+
+test('creates theme from inline json_data via Theme.fromConfig', () => {
+  const themeConfig = { token: { colorPrimary: '#1677ff' } };
+  render(
+    <CrudThemeProvider
+      theme={{
+        id: 42,
+        theme_name: 'Branded',
+        json_data: JSON.stringify(themeConfig),
+      }}
+    >
+      <div>Dashboard Content</div>
+    </CrudThemeProvider>,
+  );
+  expect(screen.getByText('Dashboard Content')).toBeInTheDocument();
+  // No API call can happen — CrudThemeProvider has no fetch/SupersetClient imports.
+  // Theme is created synchronously from the inline json_data prop.
+  expect(Theme.fromConfig).toHaveBeenCalledWith(themeConfig, expect.anything());
+});
+
+test('falls back to rendering children without theme wrapper when json_data is invalid JSON', () => {
+  jest.spyOn(logging, 'warn').mockImplementation();
+  render(
+    <CrudThemeProvider
+      theme={{ id: 1, theme_name: 'Bad Theme', json_data: 'not-valid-json' }}
+    >
+      <div>Dashboard Content</div>
+    </CrudThemeProvider>,
+  );
+  expect(screen.getByText('Dashboard Content')).toBeInTheDocument();
+  expect(
+    screen.queryByTestId('dashboard-theme-provider'),
+  ).not.toBeInTheDocument();
+  expect(logging.warn).toHaveBeenCalled();
+});
+
+test('falls back to rendering children without theme wrapper when Theme.fromConfig throws', () => {
+  (Theme.fromConfig as jest.Mock).mockImplementation(() => {
+    throw new Error('Invalid theme config');
+  });
+  jest.spyOn(logging, 'warn').mockImplementation();
+  render(
+    <CrudThemeProvider
+      theme={{ id: 1, theme_name: 'Bad Theme', json_data: '{}' }}
+    >
+      <div>Dashboard Content</div>
+    </CrudThemeProvider>,
+  );
+  expect(screen.getByText('Dashboard Content')).toBeInTheDocument();
+  expect(
+    screen.queryByTestId('dashboard-theme-provider'),
+  ).not.toBeInTheDocument();
+  expect(logging.warn).toHaveBeenCalled();
+});
+
+test('merges dashboard theme with default base theme from bootstrap data', () => {
+  const bootstrapDefault = { token: { colorPrimary: '#base-default' } };
+  mockGetBootstrapData.mockReturnValue(
+    mockBootstrap({ default: bootstrapDefault }),
+  );
+  mockIsThemeConfigDark.mockReturnValue(false);
+
+  const themeConfig = { token: { colorPrimary: '#custom' } };
+  render(
+    <CrudThemeProvider
+      theme={{
+        id: 1,
+        theme_name: 'Custom Theme',
+        json_data: JSON.stringify(themeConfig),
+      }}
+    >
+      <div>Dashboard Content</div>
+    </CrudThemeProvider>,
+  );
+
+  // Theme.fromConfig should be called with TWO args: normalized config + base theme
+  expect(Theme.fromConfig).toHaveBeenCalledWith(
+    expect.objectContaining({
+      token: expect.objectContaining({ colorPrimary: '#custom' }),
+    }),
+    bootstrapDefault,
+  );
+});
+
+test('uses dark base theme when dashboard theme config is dark', () => {
+  const bootstrapDark = {
+    algorithm: 'dark',
+    token: { colorPrimary: '#base-dark' },
+  };
+  mockGetBootstrapData.mockReturnValue(mockBootstrap({ dark: bootstrapDark }));
+  mockIsThemeConfigDark.mockReturnValue(true);
+
+  const themeConfig = {
+    algorithm: 'dark',
+    token: { colorPrimary: '#custom-dark' },
+  };
+  render(
+    <CrudThemeProvider
+      theme={{
+        id: 1,
+        theme_name: 'Dark Theme',
+        json_data: JSON.stringify(themeConfig),
+      }}
+    >
+      <div>Dashboard Content</div>
+    </CrudThemeProvider>,
+  );
+
+  expect(Theme.fromConfig).toHaveBeenCalledWith(themeConfig, bootstrapDark);
+});
+
+test('injects font URLs as CSS @import rules', () => {
+  const fontUrl = 'https://fonts.example.com/custom.css';
+  const themeConfig = {
+    token: { colorPrimary: '#ff0000', fontUrls: [fontUrl] },
+  };
+  render(
+    <CrudThemeProvider
+      theme={{
+        id: 1,
+        theme_name: 'Font Theme',
+        json_data: JSON.stringify(themeConfig),
+      }}
+    >
+      <div>Dashboard Content</div>
+    </CrudThemeProvider>,
+  );
+
+  const fontStyle = document.querySelector('style[data-superset-fonts]');
+  expect(fontStyle).not.toBeNull();
+  expect(fontStyle?.textContent).toContain(`@import url("${fontUrl}")`);
+});
+
+test('does not inject fonts when Theme.fromConfig throws even if fontUrls are present', () => {
+  (Theme.fromConfig as jest.Mock).mockImplementation(() => {
+    throw new Error('Invalid theme config');
+  });
+  jest.spyOn(logging, 'warn').mockImplementation();
+  const themeConfig = {
+    token: {
+      colorPrimary: '#ff0000',
+      fontUrls: ['https://fonts.example.com/custom.css'],
+    },
+  };
+  render(
+    <CrudThemeProvider
+      theme={{
+        id: 1,
+        theme_name: 'Bad Theme With Fonts',
+        json_data: JSON.stringify(themeConfig),
+      }}
+    >
+      <div>Dashboard Content</div>
+    </CrudThemeProvider>,
+  );
+
+  const fontStyle = document.querySelector('style[data-superset-fonts]');
+  expect(fontStyle).toBeNull();
+  expect(logging.warn).toHaveBeenCalled();
+});
+
+test('ignores non-array fontUrls in theme config without throwing', () => {
+  const themeConfig = {
+    token: { colorPrimary: '#ff0000', fontUrls: 'not-an-array' },
+  };
+  render(
+    <CrudThemeProvider
+      theme={{
+        id: 1,
+        theme_name: 'Malformed Fonts',
+        json_data: JSON.stringify(themeConfig),
+      }}
+    >
+      <div>Dashboard Content</div>
+    </CrudThemeProvider>,
+  );
+
+  expect(screen.getByText('Dashboard Content')).toBeInTheDocument();
+  expect(screen.getByTestId('dashboard-theme-provider')).toBeInTheDocument();
+  const fontStyle = document.querySelector('style[data-superset-fonts]');
+  expect(fontStyle).toBeNull();
+});
+
+test('does not inject font style element when no fontUrls in config', () => {
+  const themeConfig = { token: { colorPrimary: '#ff0000' } };
+  render(
+    <CrudThemeProvider
+      theme={{
+        id: 1,
+        theme_name: 'No Fonts',
+        json_data: JSON.stringify(themeConfig),
+      }}
+    >
+      <div>Dashboard Content</div>
+    </CrudThemeProvider>,
+  );
+
+  const fontStyle = document.querySelector('style[data-superset-fonts]');
+  expect(fontStyle).toBeNull();
+});
diff --git a/superset-frontend/src/components/CrudThemeProvider.tsx b/superset-frontend/src/components/CrudThemeProvider.tsx
index 506d5a64688..d6ed28d0e89 100644
--- a/superset-frontend/src/components/CrudThemeProvider.tsx
+++ b/superset-frontend/src/components/CrudThemeProvider.tsx
@@ -16,68 +16,80 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { ReactNode, useEffect, useState } from 'react';
-import { useThemeContext } from 'src/theme/ThemeProvider';
-import { Theme } from '@apache-superset/core/theme';
-import { Loading } from '@superset-ui/core/components';
+import { ReactNode, useEffect, useMemo } from 'react';
+import { logging } from '@apache-superset/core/utils';
+import {
+  Theme,
+  normalizeThemeConfig,
+  isThemeConfigDark,
+} from '@apache-superset/core/theme';
+import getBootstrapData from 'src/utils/getBootstrapData';
+import type { Dashboard } from 'src/types/Dashboard';
 
 interface CrudThemeProviderProps {
   children: ReactNode;
-  themeId?: number | null;
+  theme?: Dashboard['theme'];
 }
 
 /**
- * CrudThemeProvider asks the ThemeController for a dashboard theme provider.
- * Flow: Dashboard loads → asks controller → controller fetches theme →
- * returns provider → dashboard uses it.
- *
- * CRITICAL: This does NOT modify the global controller - it creates an isolated dashboard theme.
+ * CrudThemeProvider applies a dashboard-specific theme using theme data
+ * from the dashboard API response. Merges with the system's base theme
+ * (light or dark) and loads custom fonts. Falls back to the global theme
+ * if the theme data is missing or invalid.
  */
 export default function CrudThemeProvider({
   children,
-  themeId,
+  theme,
 }: CrudThemeProviderProps) {
-  const globalThemeContext = useThemeContext();
-  const [dashboardTheme, setDashboardTheme] = useState<Theme | null>(null);
+  const { dashboardTheme, fontUrls } = useMemo(() => {
+    if (!theme?.json_data) {
+      return { dashboardTheme: null, fontUrls: undefined };
+    }
+    try {
+      const themeConfig = JSON.parse(theme.json_data);
+      const normalizedConfig = normalizeThemeConfig(themeConfig);
+      const isDark = isThemeConfigDark(normalizedConfig);
+      const {
+        common: { theme: bootstrapTheme },
+      } = getBootstrapData();
+      const baseTheme = isDark ? bootstrapTheme.dark : bootstrapTheme.default;
+      const createdTheme = Theme.fromConfig(
+        normalizedConfig,
+        baseTheme || undefined,
+      );
+      const rawUrls = themeConfig?.token?.fontUrls;
+      const urls = Array.isArray(rawUrls) ? (rawUrls as string[]) : undefined;
+      return { dashboardTheme: createdTheme, fontUrls: urls };
+    } catch (error) {
+      logging.warn('Failed to load dashboard theme:', error);
+      return { dashboardTheme: null, fontUrls: undefined };
+    }
+  }, [theme?.json_data]);
 
   useEffect(() => {
-    if (themeId) {
-      // Ask the controller to create a SEPARATE dashboard theme provider
-      // This should NOT affect the global controller or navbar
-      const loadDashboardTheme = async () => {
-        try {
-          const dashboardThemeProvider =
-            await globalThemeContext.createDashboardThemeProvider(
-              String(themeId),
-            );
-          setDashboardTheme(dashboardThemeProvider);
-        } catch (error) {
-          console.error('Failed to load dashboard theme:', error);
-          setDashboardTheme(null);
-        }
-      };
+    if (!dashboardTheme || !fontUrls?.length) return undefined;
 
-      loadDashboardTheme();
-    } else {
-      setDashboardTheme(null);
-    }
-  }, [themeId, globalThemeContext]);
+    // JSON.stringify provides safe escaping to prevent CSS injection
+    const css = fontUrls
+      .map((url: string) => `@import url(${JSON.stringify(url)});`)
+      .join('\n');
+    const style = document.createElement('style');
+    style.setAttribute('data-superset-fonts', 'true');
+    style.textContent = css;
+    document.head.appendChild(style);
 
-  // If no themeId, just render children (they use global theme)
-  if (!themeId) {
+    return () => {
+      style.remove();
+    };
+  }, [dashboardTheme, fontUrls]);
+
+  if (!dashboardTheme) {
     return <>{children}</>;
   }
 
-  // If themeId exists, but theme is not loaded yet, return null to prevent re-mounting children
-  if (!dashboardTheme) {
-    return <Loading />;
-  }
-
-  // Render children with the dashboard theme provider from controller
   return (
     <dashboardTheme.SupersetThemeProvider>
       {children}
     </dashboardTheme.SupersetThemeProvider>
   );
 }
-// test comment
diff --git a/superset-frontend/src/components/DatabaseSelector/DatabaseSelector.test.tsx b/superset-frontend/src/components/DatabaseSelector/DatabaseSelector.test.tsx
index e254b34f203..a1a4a56b35d 100644
--- a/superset-frontend/src/components/DatabaseSelector/DatabaseSelector.test.tsx
+++ b/superset-frontend/src/components/DatabaseSelector/DatabaseSelector.test.tsx
@@ -214,7 +214,7 @@ test('Refresh should work', async () => {
   expect(fetchMock.callHistory.calls(schemaApiRoute).length).toBe(0);
 
   const select = screen.getByRole('combobox', {
-    name: 'Select schema or type to search schemas: public',
+    name: 'Select schema: public',
   });
 
   await userEvent.click(select);
@@ -331,7 +331,7 @@ test('Should schema select display options', async () => {
   const props = createProps();
   render(<DatabaseSelector {...props} />, { useRedux: true, store });
   const select = screen.getByRole('combobox', {
-    name: 'Select schema or type to search schemas: public',
+    name: 'Select schema: public',
   });
   expect(select).toBeInTheDocument();
   await userEvent.click(select);
@@ -379,7 +379,7 @@ test('Sends the correct schema when changing the schema', async () => {
   rerender(<DatabaseSelector {...props} />);
   expect(props.onSchemaChange).toHaveBeenCalledTimes(0);
   const select = screen.getByRole('combobox', {
-    name: 'Select schema or type to search schemas: public',
+    name: 'Select schema: public',
   });
   expect(select).toBeInTheDocument();
   await userEvent.click(select);
diff --git a/superset-frontend/src/components/DatabaseSelector/index.tsx b/superset-frontend/src/components/DatabaseSelector/index.tsx
index ee5f39b9979..9ef37463b1e 100644
--- a/superset-frontend/src/components/DatabaseSelector/index.tsx
+++ b/superset-frontend/src/components/DatabaseSelector/index.tsx
@@ -515,17 +515,12 @@ export function DatabaseSelector({
 
   function renderSchemaSelect() {
     if (sqlLabMode) {
-      return renderSelectRow(
-        t('Select schema or type to search schemas'),
-        null,
-        null,
-        {
-          displayValue: currentSchema?.label,
-          disabled: !currentDb || readOnly,
-          loading: loadingSchemas,
-          icon: <Icons.RightOutlined />,
-        },
-      );
+      return renderSelectRow(t('Select schema'), null, null, {
+        displayValue: currentSchema?.label,
+        disabled: !currentDb || readOnly,
+        loading: loadingSchemas,
+        icon: <Icons.RightOutlined />,
+      });
     }
     const refreshIcon = !readOnly && (
       <RefreshLabel
@@ -539,13 +534,13 @@ export function DatabaseSelector({
         {renderSelectRow(
           t('Schema'),
           <Select
-            ariaLabel={t('Select schema or type to search schemas')}
+            ariaLabel={t('Select schema')}
             disabled={!currentDb || readOnly}
             labelInValue
             loading={loadingSchemas}
             name="select-schema"
             notFoundContent={t('No compatible schema found')}
-            placeholder={t('Select schema or type to search schemas')}
+            placeholder={t('Select schema')}
             onChange={item => changeSchema(item as SchemaOption)}
             options={schemaOptions}
             showSearch
diff --git a/superset-frontend/src/components/Datasource/DatasourceModal/index.tsx b/superset-frontend/src/components/Datasource/DatasourceModal/index.tsx
index d3e34b76484..65744e543eb 100644
--- a/superset-frontend/src/components/Datasource/DatasourceModal/index.tsx
+++ b/superset-frontend/src/components/Datasource/DatasourceModal/index.tsx
@@ -45,11 +45,19 @@ const DatasourceEditor = AsyncEsmComponent(
   () => import('../components/DatasourceEditor'),
 );
 
+const MODAL_HEIGHT_VH = 90;
+const TOP_MARGIN_VH = (100 - MODAL_HEIGHT_VH) / 2;
+
 const StyledDatasourceModal = styled(Modal)`
+  top: ${TOP_MARGIN_VH}vh;
+  padding-bottom: 0;
+
   && .ant-modal-content {
-    max-height: none;
+    max-height: ${MODAL_HEIGHT_VH}vh;
     margin-top: 0;
     margin-bottom: 0;
+    min-height: 500px;
+    min-width: 500px;
   }
 
   && .ant-modal-body {
@@ -367,7 +375,10 @@ const DatasourceModal: FunctionComponent<DatasourceModalProps> = ({
       }
       responsive
       resizable
-      resizableConfig={{ defaultSize: { width: 'auto', height: '900px' } }}
+      resizableConfig={{
+        defaultSize: { width: 'auto', height: `${MODAL_HEIGHT_VH}vh` },
+        maxHeight: `${MODAL_HEIGHT_VH}vh`,
+      }}
       draggable
     >
       <DatasourceEditor
diff --git a/superset-frontend/src/components/Datasource/FoldersEditor/styles.tsx b/superset-frontend/src/components/Datasource/FoldersEditor/styles.tsx
index b5ed9e615f6..a73dc24c905 100644
--- a/superset-frontend/src/components/Datasource/FoldersEditor/styles.tsx
+++ b/superset-frontend/src/components/Datasource/FoldersEditor/styles.tsx
@@ -33,7 +33,6 @@ export const FoldersToolbar = styled.div`
     top: -${theme.margin}px; // offsets tabs component bottom margin
     z-index: 10;
     background: ${theme.colorBgContainer};
-    padding-top: ${theme.paddingMD}px;
     display: flex;
     flex-direction: column;
     gap: ${theme.paddingLG}px;
diff --git a/superset-frontend/src/components/Datasource/components/DatasourceEditor/DatasourceEditor.tsx b/superset-frontend/src/components/Datasource/components/DatasourceEditor/DatasourceEditor.tsx
index 6150927ca6a..1745a584e90 100644
--- a/superset-frontend/src/components/Datasource/components/DatasourceEditor/DatasourceEditor.tsx
+++ b/superset-frontend/src/components/Datasource/components/DatasourceEditor/DatasourceEditor.tsx
@@ -66,6 +66,7 @@ import {
   Loading,
   Row,
   Select,
+  Tooltip,
   Typography,
   Label,
 } from '@superset-ui/core/components';
@@ -370,6 +371,7 @@ const StyledTableTabs = styled(Tabs)`
     flex: 1;
     min-height: 0;
     overflow: auto;
+    padding-top: ${({ theme }) => theme.paddingMD}px;
   }
 
   .ant-tabs-content {
@@ -393,6 +395,7 @@ const EditLockContainer = styled.div`
   font-size: ${({ theme }) => theme.fontSizeSM}px;
   display: flex;
   align-items: center;
+  padding: ${({ theme }) => theme.paddingSM}px 0;
   a {
     padding: 0 10px;
   }
@@ -577,7 +580,8 @@ function ColumnCollectionTable({
                   <TextAreaControl
                     language="sql"
                     offerEditInModal={false}
-                    resize="vertical"
+                    maxLines={25}
+                    debounceDelay={300}
                   />
                 }
               />
@@ -2179,6 +2183,19 @@ class DatasourceEditor extends PureComponent<
           expandFieldset={
             <FormContainer>
               <Fieldset compact>
+                <Field
+                  fieldKey="expression"
+                  label={t('SQL expression')}
+                  control={
+                    <TextAreaControl
+                      language="sql"
+                      offerEditInModal={false}
+                      minLines={3}
+                      maxLines={25}
+                      debounceDelay={300}
+                    />
+                  }
+                />
                 <Field
                   fieldKey="description"
                   label={t('Description')}
@@ -2261,7 +2278,10 @@ class DatasourceEditor extends PureComponent<
           })}
           itemCellProps={{
             expression: () => ({
-              width: '240px',
+              style: {
+                maxWidth: '240px',
+                overflow: 'hidden',
+              },
             }),
           }}
           itemRenderers={{
@@ -2289,18 +2309,18 @@ class DatasourceEditor extends PureComponent<
             verbose_name: (v, onChange) => (
               <TextControl value={v as string} onChange={onChange} />
             ),
-            expression: (v, onChange) => (
-              <TextAreaControl
-                canEdit
-                initialValue={v as string}
-                onChange={onChange}
-                extraClasses={['datasource-sql-expression']}
-                language="sql"
-                offerEditInModal={false}
-                minLines={5}
-                textAreaStyles={{ minWidth: '200px', maxWidth: '450px' }}
-                resize="both"
-              />
+            expression: (v: unknown) => (
+              <Tooltip title={t('Expand row to edit')}>
+                <Typography.Text
+                  code
+                  ellipsis
+                  css={css`
+                    cursor: default;
+                  `}
+                >
+                  {v as string}
+                </Typography.Text>
+              </Tooltip>
             ),
             description: (v, onChange, label) => (
               <StackedField
@@ -2525,18 +2545,20 @@ class DatasourceEditor extends PureComponent<
               key: TABS_KEYS.SETTINGS,
               label: t('Settings'),
               children: (
-                <Row gutter={16}>
-                  <Col xs={24} md={12}>
-                    <FormContainer>
-                      {this.renderSettingsFieldset()}
-                    </FormContainer>
-                  </Col>
-                  <Col xs={24} md={12}>
-                    <FormContainer>
-                      {this.renderAdvancedFieldset()}
-                    </FormContainer>
-                  </Col>
-                </Row>
+                <div style={{ overflowX: 'hidden' }}>
+                  <Row gutter={16}>
+                    <Col xs={24} md={12}>
+                      <FormContainer>
+                        {this.renderSettingsFieldset()}
+                      </FormContainer>
+                    </Col>
+                    <Col xs={24} md={12}>
+                      <FormContainer>
+                        {this.renderAdvancedFieldset()}
+                      </FormContainer>
+                    </Col>
+                  </Row>
+                </div>
               ),
             },
           ]}
diff --git a/superset-frontend/src/components/ErrorMessage/DatabaseErrorMessage.tsx b/superset-frontend/src/components/ErrorMessage/DatabaseErrorMessage.tsx
index 60f2de47824..40644c1cf5e 100644
--- a/superset-frontend/src/components/ErrorMessage/DatabaseErrorMessage.tsx
+++ b/superset-frontend/src/components/ErrorMessage/DatabaseErrorMessage.tsx
@@ -99,6 +99,7 @@ export function DatabaseErrorMessage({
     <ErrorAlert
       errorType={t('%s Error', extra?.engine_name || t('DB engine'))}
       message={alertMessage}
+      messagePre
       description={alertDescription}
       type={level}
       descriptionDetails={body}
diff --git a/superset-frontend/src/components/ErrorMessage/ErrorAlert.tsx b/superset-frontend/src/components/ErrorMessage/ErrorAlert.tsx
index 228668973ff..4eae54c6ad2 100644
--- a/superset-frontend/src/components/ErrorMessage/ErrorAlert.tsx
+++ b/superset-frontend/src/components/ErrorMessage/ErrorAlert.tsx
@@ -35,6 +35,7 @@ export const ErrorAlert: React.FC<ErrorAlertProps> = ({
   description,
   descriptionDetails,
   descriptionDetailsCollapsed = true,
+  messagePre = false,
   descriptionPre = true,
   compact = false,
   children,
@@ -69,13 +70,20 @@ export const ErrorAlert: React.FC<ErrorAlertProps> = ({
     );
   };
   const preStyle = {
-    whiteSpace: 'pre-wrap',
+    whiteSpace: 'pre-wrap' as const,
     fontFamily: theme.fontFamilyCode,
     margin: `${theme.sizeUnit}px 0`,
   };
   const renderDescription = () => (
     <div>
-      {message && <div>{message}</div>}
+      {message &&
+        (messagePre ? (
+          <Typography.Paragraph style={preStyle}>
+            {message}
+          </Typography.Paragraph>
+        ) : (
+          <div>{message}</div>
+        ))}
       {description && (
         <Typography.Paragraph
           style={descriptionPre ? preStyle : {}}
diff --git a/superset-frontend/src/components/ErrorMessage/types.ts b/superset-frontend/src/components/ErrorMessage/types.ts
index de597d19347..c48b3dfae4c 100644
--- a/superset-frontend/src/components/ErrorMessage/types.ts
+++ b/superset-frontend/src/components/ErrorMessage/types.ts
@@ -38,6 +38,7 @@ export interface ErrorAlertProps {
   description?: React.ReactNode; // Text shown under the first line, not collapsible
   descriptionDetails?: React.ReactNode | string; // Text shown under the first line, collapsible
   descriptionDetailsCollapsed?: boolean; // Hides the collapsible section unless "Show more" is clicked, default true
+  messagePre?: boolean; // Uses pre-style on the message, default false
   descriptionPre?: boolean; // Uses pre-style to break lines, default true
   compact?: boolean; // Shows the error icon with tooltip and modal, default false
   children?: React.ReactNode; // Additional content to show in the modal
diff --git a/superset-frontend/src/components/FilterableTable/FilterableTable.test.tsx b/superset-frontend/src/components/FilterableTable/FilterableTable.test.tsx
index 38fe13e7115..8c8c3bcbc01 100644
--- a/superset-frontend/src/components/FilterableTable/FilterableTable.test.tsx
+++ b/superset-frontend/src/components/FilterableTable/FilterableTable.test.tsx
@@ -73,6 +73,52 @@ describe('FilterableTable', () => {
     expect(queryByText('b1')).not.toBeInTheDocument();
     expect(queryByText('b3')).not.toBeInTheDocument();
   });
+
+  test('shows all rows when filterText is empty', () => {
+    const props = {
+      ...mockedProps,
+      filterText: '',
+    };
+    const { getByText } = render(<FilterableTable {...props} />);
+    expect(getByText('b1')).toBeInTheDocument();
+    expect(getByText('b2')).toBeInTheDocument();
+    expect(getByText('b3')).toBeInTheDocument();
+  });
+
+  test('updates filtered rows when filterText prop changes', () => {
+    const props = {
+      ...mockedProps,
+      filterText: 'b1',
+    };
+    const { getByText, queryByText, rerender } = render(
+      <FilterableTable {...props} />,
+    );
+    expect(getByText('b1')).toBeInTheDocument();
+    expect(queryByText('b2')).not.toBeInTheDocument();
+    expect(queryByText('b3')).not.toBeInTheDocument();
+
+    rerender(<FilterableTable {...mockedProps} filterText="b2" />);
+    expect(queryByText('b1')).not.toBeInTheDocument();
+    expect(getByText('b2')).toBeInTheDocument();
+    expect(queryByText('b3')).not.toBeInTheDocument();
+  });
+
+  test('shows all rows when filterText is cleared', () => {
+    const props = {
+      ...mockedProps,
+      filterText: 'b1',
+    };
+    const { getByText, queryByText, rerender } = render(
+      <FilterableTable {...props} />,
+    );
+    expect(getByText('b1')).toBeInTheDocument();
+    expect(queryByText('b2')).not.toBeInTheDocument();
+
+    rerender(<FilterableTable {...mockedProps} filterText="" />);
+    expect(getByText('b1')).toBeInTheDocument();
+    expect(getByText('b2')).toBeInTheDocument();
+    expect(getByText('b3')).toBeInTheDocument();
+  });
 });
 
 // eslint-disable-next-line no-restricted-globals -- TODO: Migrate from describe blocks
diff --git a/superset-frontend/src/components/FilterableTable/index.tsx b/superset-frontend/src/components/FilterableTable/index.tsx
index 1f37fff336a..fe9028a18a3 100644
--- a/superset-frontend/src/components/FilterableTable/index.tsx
+++ b/superset-frontend/src/components/FilterableTable/index.tsx
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { useMemo, useRef, useCallback, memo } from 'react';
+import { useMemo, useCallback, memo } from 'react';
 import { GridSize } from 'src/components/GridTable/constants';
 import { GridTable } from 'src/components/GridTable';
 import { type ColDef } from 'src/components/GridTable/types';
@@ -109,15 +109,15 @@ export const FilterableTable = ({
     [orderedColumnKeys, allowHTML, getCellContent],
   );
 
-  const keyword = useRef<string | undefined>(filterText);
-  keyword.current = filterText;
-
-  const keywordFilter = useCallback(node => {
-    if (keyword.current && node.data) {
-      return hasMatch(keyword.current, node.data);
-    }
-    return true;
-  }, []);
+  const keywordFilter = useCallback(
+    node => {
+      if (filterText && node.data) {
+        return hasMatch(filterText, node.data);
+      }
+      return true;
+    },
+    [filterText],
+  );
 
   return (
     <div className="filterable-table-container" data-test="table-container">
diff --git a/superset-frontend/src/components/FilterableTable/utils.tsx b/superset-frontend/src/components/FilterableTable/utils.tsx
index 336f64383b9..e388c373d6e 100644
--- a/superset-frontend/src/components/FilterableTable/utils.tsx
+++ b/superset-frontend/src/components/FilterableTable/utils.tsx
@@ -50,6 +50,7 @@ export const renderResultCell = ({
         modalTitle={t('Cell content')}
         jsonObject={jsonObject}
         jsonValue={cellData}
+        wrapContent={false}
       />
     );
   }
diff --git a/superset-frontend/src/components/JsonModal/index.tsx b/superset-frontend/src/components/JsonModal/index.tsx
index b365ea0705d..a28681ea3e4 100644
--- a/superset-frontend/src/components/JsonModal/index.tsx
+++ b/superset-frontend/src/components/JsonModal/index.tsx
@@ -42,6 +42,7 @@ export const JsonModal: FC<JsonModalProps> = ({
   modalTitle,
   jsonObject,
   jsonValue,
+  wrapContent = true,
 }) => {
   const jsonTreeTheme = useJsonTreeTheme();
 
@@ -66,7 +67,7 @@ export const JsonModal: FC<JsonModalProps> = ({
         </Button>
       }
       modalTitle={modalTitle}
-      triggerNode={<PreWrap>{content}</PreWrap>}
+      triggerNode={wrapContent ? <PreWrap>{content}</PreWrap> : content}
     />
   );
 };
diff --git a/superset-frontend/src/components/JsonModal/types.ts b/superset-frontend/src/components/JsonModal/types.ts
index b9d3c74cb3a..e88304f17ec 100644
--- a/superset-frontend/src/components/JsonModal/types.ts
+++ b/superset-frontend/src/components/JsonModal/types.ts
@@ -23,4 +23,5 @@ export interface JsonModalProps {
   modalTitle: string;
   jsonObject: Record<string, unknown> | unknown[];
   jsonValue: CellDataType;
+  wrapContent?: boolean;
 }
diff --git a/superset-frontend/src/components/ListView/ListView.tsx b/superset-frontend/src/components/ListView/ListView.tsx
index 87135397554..59a3309bbfa 100644
--- a/superset-frontend/src/components/ListView/ListView.tsx
+++ b/superset-frontend/src/components/ListView/ListView.tsx
@@ -188,6 +188,7 @@ const ViewModeContainer = styled.div`
 const EmptyWrapper = styled.div`
   ${({ theme }) => `
     padding: ${theme.sizeUnit * 40}px 0;
+    width: 100%;
 
     &.table {
       background: ${theme.colorBgContainer};
diff --git a/superset-frontend/src/components/Modal/StandardModal.tsx b/superset-frontend/src/components/Modal/StandardModal.tsx
index 0ab85a4e187..f19ea08def6 100644
--- a/superset-frontend/src/components/Modal/StandardModal.tsx
+++ b/superset-frontend/src/components/Modal/StandardModal.tsx
@@ -50,7 +50,7 @@ export const MODAL_LARGE_WIDTH = 900;
 
 const StyledModal = styled(Modal)`
   .ant-modal-body {
-    max-height: 60vh;
+    max-height: 80vh;
     height: auto;
     overflow-y: auto;
     padding: 0;
@@ -130,6 +130,7 @@ export function StandardModal({
       show={show}
       width={`${width}px`}
       wrapProps={wrapProps}
+      centered={centered}
       title={
         icon ? (
           <ModalTitleWithIcon
diff --git a/superset-frontend/src/components/PanelToolbar/PanelToolbar.test.tsx b/superset-frontend/src/components/PanelToolbar/PanelToolbar.test.tsx
new file mode 100644
index 00000000000..7b32a30f9d9
--- /dev/null
+++ b/superset-frontend/src/components/PanelToolbar/PanelToolbar.test.tsx
@@ -0,0 +1,47 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+import { render, screen } from 'spec/helpers/testing-library';
+import userEvent from '@testing-library/user-event';
+import PanelToolbar from 'src/components/PanelToolbar';
+import {
+  registerToolbarAction,
+  cleanupExtensions,
+} from 'spec/helpers/extensionTestHelpers';
+
+afterEach(cleanupExtensions);
+
+test('click executes registered command callback', async () => {
+  const callback = jest.fn();
+  registerToolbarAction(
+    'test.clickLocation',
+    'test-click-cmd',
+    'Click Me',
+    callback,
+  );
+
+  render(<PanelToolbar viewId="test.clickLocation" />);
+
+  await userEvent.click(screen.getByRole('button', { name: 'Click Me' }));
+  expect(callback).toHaveBeenCalledTimes(1);
+});
+
+test('renders nothing when no actions registered', () => {
+  const { container } = render(<PanelToolbar viewId="empty.location" />);
+  expect(container).toBeEmptyDOMElement();
+});
diff --git a/superset-frontend/src/components/PanelToolbar/index.tsx b/superset-frontend/src/components/PanelToolbar/index.tsx
index 8f1dcd93705..96b269aac82 100644
--- a/superset-frontend/src/components/PanelToolbar/index.tsx
+++ b/superset-frontend/src/components/PanelToolbar/index.tsx
@@ -62,7 +62,7 @@ const PanelToolbar = ({
               buttonSize="small"
               aria-label={command?.title}
               variant="text"
-              color="primary"
+              color="default"
             />
           );
         })
@@ -140,7 +140,7 @@ const PanelToolbar = ({
         >
           <Button
             showMarginRight={false}
-            color="primary"
+            color="default"
             variant="text"
             css={css`
               padding: 8px;
diff --git a/superset-frontend/src/components/TableSelector/TableSelector.test.tsx b/superset-frontend/src/components/TableSelector/TableSelector.test.tsx
index 5129d4e2e36..e92e48ac6a0 100644
--- a/superset-frontend/src/components/TableSelector/TableSelector.test.tsx
+++ b/superset-frontend/src/components/TableSelector/TableSelector.test.tsx
@@ -93,7 +93,7 @@ test('renders with default props', async () => {
     name: 'Select database or type to search databases',
   });
   const schemaSelect = screen.getByRole('combobox', {
-    name: 'Select schema or type to search schemas: test_schema',
+    name: 'Select schema: test_schema',
   });
   const tableSelect = screen.getByRole('combobox', {
     name: 'Select table or type to search tables',
diff --git a/superset-frontend/src/components/Tag/utils.tsx b/superset-frontend/src/components/Tag/utils.tsx
index 75cc840fa45..1ef7741b7c7 100644
--- a/superset-frontend/src/components/Tag/utils.tsx
+++ b/superset-frontend/src/components/Tag/utils.tsx
@@ -26,15 +26,6 @@ import {
 import type { TagType } from 'src/types/TagType';
 
 import rison from 'rison';
-import { cacheWrapper } from 'src/utils/cacheWrapper';
-
-const localCache = new Map<string, any>();
-
-const cachedSupersetGet = cacheWrapper(
-  SupersetClient.get,
-  localCache,
-  ({ endpoint }) => endpoint || '',
-);
 
 type SelectTagsValue = {
   value: number | undefined;
@@ -75,7 +66,7 @@ export const loadTags = async (
     return errorText;
   };
 
-  return cachedSupersetGet({
+  return SupersetClient.get({
     endpoint: `/api/v1/tag/?q=${query}`,
   })
     .then(response => {
diff --git a/superset-frontend/src/core/sqlLab/sqlLab.test.ts b/superset-frontend/src/core/sqlLab/sqlLab.test.ts
new file mode 100644
index 00000000000..5b7356c939b
--- /dev/null
+++ b/superset-frontend/src/core/sqlLab/sqlLab.test.ts
@@ -0,0 +1,585 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+import { configureStore, createListenerMiddleware } from '@reduxjs/toolkit';
+import type { QueryEditor } from 'src/SqlLab/types';
+import sqlLabReducer from 'src/SqlLab/reducers/sqlLab';
+import {
+  START_QUERY,
+  QUERY_SUCCESS,
+  STOP_QUERY,
+  QUERY_FAILED,
+  QUERY_EDITOR_SETDB,
+  QUERY_EDITOR_SET_SCHEMA,
+  QUERY_EDITOR_SET_TITLE,
+  SET_ACTIVE_SOUTHPANE_TAB,
+  REMOVE_QUERY_EDITOR,
+  SET_ACTIVE_QUERY_EDITOR,
+  ADD_QUERY_EDITOR,
+} from 'src/SqlLab/actions/sqlLab';
+
+// ---------------------------------------------------------------------------
+// Constants
+// ---------------------------------------------------------------------------
+
+const EDITOR_ID = 'editor-1';
+const IMMUTABLE_ID = 'immutable-1';
+
+// ---------------------------------------------------------------------------
+// Test infrastructure — real reducer + real listener middleware
+// ---------------------------------------------------------------------------
+
+const mockListenerMiddleware = createListenerMiddleware();
+
+function makeInitialSqlLabState() {
+  return {
+    queryEditors: [
+      {
+        id: EDITOR_ID,
+        immutableId: IMMUTABLE_ID,
+        name: 'Untitled Query 1',
+        dbId: 1,
+        catalog: null,
+        schema: 'public',
+        sql: 'SELECT 1',
+        autorun: false,
+        remoteId: null,
+        loaded: true,
+        inLocalStorage: true,
+      } as unknown as QueryEditor,
+    ],
+    tabHistory: [EDITOR_ID],
+    unsavedQueryEditor: {} as Record<string, unknown>,
+    queries: {} as Record<string, unknown>,
+    tables: [] as unknown[],
+    databases: {
+      1: { id: 1, database_name: 'test_db', allow_run_async: false },
+    } as Record<string, unknown>,
+    activeSouthPaneTab: 'Results' as string | number,
+    queriesLastUpdate: 0,
+    errorMessage: null as string | null,
+    alerts: [] as unknown[],
+    dbConnect: false,
+    offline: false,
+    editorTabLastUpdatedAt: 0,
+    lastUpdatedActiveTab: EDITOR_ID,
+    destroyedQueryEditors: {} as Record<string, number>,
+  };
+}
+
+function createMockStore() {
+  return configureStore({
+    reducer: { sqlLab: sqlLabReducer },
+    middleware: getDefault =>
+      getDefault({ serializableCheck: false, immutableCheck: false }).prepend(
+        mockListenerMiddleware.middleware,
+      ),
+    preloadedState: { sqlLab: makeInitialSqlLabState() as any },
+  });
+}
+
+let mockStore = createMockStore();
+
+// ---------------------------------------------------------------------------
+// Mocks — must use "mock" prefix for jest.mock() scoping rules
+// ---------------------------------------------------------------------------
+
+jest.mock('nanoid', () => {
+  let counter = 0;
+  return {
+    nanoid: jest.fn(() => {
+      counter += 1;
+      return `mock-nanoid-${counter}`;
+    }),
+  };
+});
+
+jest.mock('src/views/store', () => ({
+  get store() {
+    return mockStore;
+  },
+  get listenerMiddleware() {
+    return mockListenerMiddleware;
+  },
+  setupStore: jest.fn(),
+}));
+
+// Module under test — imported after mocks
+// eslint-disable-next-line import/first
+import { sqlLab } from '.';
+
+// ---------------------------------------------------------------------------
+// Helpers
+// ---------------------------------------------------------------------------
+
+function resetStore() {
+  mockStore = createMockStore();
+}
+
+function makeQueryPayload(overrides: Record<string, unknown> = {}) {
+  return {
+    id: 'q-1',
+    sql: 'SELECT 1',
+    sqlEditorId: EDITOR_ID,
+    sqlEditorImmutableId: IMMUTABLE_ID,
+    tab: 'Untitled Query 1',
+    dbId: 1,
+    catalog: null,
+    schema: 'public',
+    startDttm: 1000,
+    runAsync: false,
+    ...overrides,
+  };
+}
+
+function makeSecondEditor() {
+  return {
+    id: 'editor-2',
+    immutableId: 'immutable-2',
+    name: 'Query 2',
+    dbId: 2,
+    catalog: null,
+    schema: 'test_schema',
+    sql: 'SELECT 2',
+    autorun: false,
+    remoteId: null,
+    loaded: true,
+    inLocalStorage: true,
+  } as unknown as QueryEditor;
+}
+
+// ---------------------------------------------------------------------------
+// Lifecycle
+// ---------------------------------------------------------------------------
+
+afterEach(() => {
+  mockListenerMiddleware.clearListeners();
+  resetStore();
+});
+
+// ---------------------------------------------------------------------------
+// Event Listeners (11 tests) + Predicate scoping (2 tests)
+// ---------------------------------------------------------------------------
+
+test('onDidQueryRun fires with QueryContext on START_QUERY', () => {
+  const listener = jest.fn();
+  const disposable = sqlLab.onDidQueryRun(listener);
+
+  const query = makeQueryPayload();
+  mockStore.dispatch({ type: START_QUERY, query });
+
+  expect(listener).toHaveBeenCalledTimes(1);
+  const ctx = listener.mock.calls[0][0];
+  expect(ctx.clientId).toBe('q-1');
+  expect(ctx.tab.id).toBe(EDITOR_ID);
+  expect(ctx.tab.databaseId).toBe(1);
+  expect(ctx.runAsync).toBe(false);
+
+  disposable.dispose();
+});
+
+test('onDidQuerySuccess fires with QueryResultContext on QUERY_SUCCESS', () => {
+  const listener = jest.fn();
+  const disposable = sqlLab.onDidQuerySuccess(listener);
+
+  const query = makeQueryPayload({ state: 'running' });
+  // Add query to state first (reducer requires it for alterInObject)
+  mockStore.dispatch({ type: START_QUERY, query });
+  listener.mockClear();
+
+  const results = {
+    status: 'success',
+    columns: [{ name: 'id', type: 'INT', column_name: 'id' }],
+    data: [{ id: 1 }],
+    query_id: 42,
+    query: {
+      endDttm: 2000,
+      executedSql: 'SELECT 1',
+      tempTable: null,
+      limit: 100,
+      limitingFactor: 'QUERY',
+      rows: 1,
+    },
+  };
+
+  mockStore.dispatch({ type: QUERY_SUCCESS, query, results });
+
+  expect(listener).toHaveBeenCalledTimes(1);
+  const ctx = listener.mock.calls[0][0];
+  expect(ctx.remoteId).toBe(42);
+  expect(ctx.executedSql).toBe('SELECT 1');
+  expect(ctx.result.columns).toHaveLength(1);
+  expect(ctx.result.data).toEqual([{ id: 1 }]);
+  expect(ctx.endDttm).toBe(2000);
+
+  disposable.dispose();
+});
+
+test('onDidQueryStop fires with QueryContext on STOP_QUERY', () => {
+  const listener = jest.fn();
+  const disposable = sqlLab.onDidQueryStop(listener);
+
+  const query = makeQueryPayload();
+  mockStore.dispatch({ type: STOP_QUERY, query });
+
+  expect(listener).toHaveBeenCalledTimes(1);
+  const ctx = listener.mock.calls[0][0];
+  expect(ctx.clientId).toBe('q-1');
+  expect(ctx.tab.id).toBe(EDITOR_ID);
+
+  disposable.dispose();
+});
+
+test('onDidQueryFail fires with QueryErrorResultContext on QUERY_FAILED', () => {
+  const listener = jest.fn();
+  const disposable = sqlLab.onDidQueryFail(listener);
+
+  const query = makeQueryPayload({ state: 'running' });
+  // Add query to state first
+  mockStore.dispatch({ type: START_QUERY, query });
+  listener.mockClear();
+
+  const errors = [
+    {
+      message: 'table not found',
+      error_type: 'GENERIC_DB_ENGINE_ERROR',
+      level: 'error',
+      extra: { engine_name: 'PostgreSQL' },
+    },
+  ];
+
+  mockStore.dispatch({
+    type: QUERY_FAILED,
+    query,
+    msg: 'table not found',
+    errors,
+  });
+
+  expect(listener).toHaveBeenCalledTimes(1);
+  const ctx = listener.mock.calls[0][0];
+  expect(ctx.errorMessage).toBe('table not found');
+  expect(ctx.errors).toHaveLength(1);
+
+  disposable.dispose();
+});
+
+test('onDidChangeEditorDatabase fires with dbId on QUERY_EDITOR_SETDB', () => {
+  const listener = jest.fn();
+  const disposable = sqlLab.onDidChangeEditorDatabase(listener);
+
+  const queryEditor = { id: EDITOR_ID, immutableId: IMMUTABLE_ID };
+  mockStore.dispatch({ type: QUERY_EDITOR_SETDB, queryEditor, dbId: 5 });
+
+  expect(listener).toHaveBeenCalledTimes(1);
+  expect(listener).toHaveBeenCalledWith(5);
+
+  disposable.dispose();
+});
+
+test('onDidChangeEditorSchema fires with schema on QUERY_EDITOR_SET_SCHEMA', () => {
+  const listener = jest.fn();
+  const disposable = sqlLab.onDidChangeEditorSchema(listener);
+
+  const queryEditor = { id: EDITOR_ID, immutableId: IMMUTABLE_ID };
+  mockStore.dispatch({
+    type: QUERY_EDITOR_SET_SCHEMA,
+    queryEditor,
+    schema: 'information_schema',
+  });
+
+  expect(listener).toHaveBeenCalledTimes(1);
+  expect(listener).toHaveBeenCalledWith('information_schema');
+
+  disposable.dispose();
+});
+
+test('onDidChangeActivePanel fires with Panel on SET_ACTIVE_SOUTHPANE_TAB', () => {
+  const listener = jest.fn();
+  const disposable = sqlLab.onDidChangeActivePanel(listener);
+
+  mockStore.dispatch({ type: SET_ACTIVE_SOUTHPANE_TAB, tabId: 'History' });
+
+  expect(listener).toHaveBeenCalledTimes(1);
+  expect(listener.mock.calls[0][0].id).toBe('History');
+
+  disposable.dispose();
+});
+
+test('onDidChangeTabTitle fires with title on QUERY_EDITOR_SET_TITLE', () => {
+  const listener = jest.fn();
+  const disposable = sqlLab.onDidChangeTabTitle(listener);
+
+  const queryEditor = { id: EDITOR_ID, immutableId: IMMUTABLE_ID };
+  mockStore.dispatch({
+    type: QUERY_EDITOR_SET_TITLE,
+    queryEditor,
+    name: 'My Query',
+  });
+
+  expect(listener).toHaveBeenCalledTimes(1);
+  expect(listener).toHaveBeenCalledWith('My Query');
+
+  disposable.dispose();
+});
+
+test('onDidCloseTab fires with Tab on REMOVE_QUERY_EDITOR', async () => {
+  const listener = jest.fn();
+  const disposable = sqlLab.onDidCloseTab(listener);
+
+  const queryEditor = {
+    id: EDITOR_ID,
+    immutableId: IMMUTABLE_ID,
+    name: 'Untitled Query 1',
+    dbId: 1,
+    catalog: null,
+    schema: 'public',
+  } as QueryEditor;
+
+  mockStore.dispatch({ type: REMOVE_QUERY_EDITOR, queryEditor });
+
+  expect(listener).toHaveBeenCalledTimes(1);
+  const tab = listener.mock.calls[0][0];
+  expect(tab.id).toBe(EDITOR_ID);
+  expect(tab.title).toBe('Untitled Query 1');
+  expect(tab.databaseId).toBe(1);
+
+  // Closed-tab contract: getEditor() rejects immediately instead of waiting forever
+  await expect(tab.getEditor()).rejects.toThrow(/closed/i);
+
+  disposable.dispose();
+});
+
+test('onDidChangeActiveTab fires with Tab on SET_ACTIVE_QUERY_EDITOR', () => {
+  // Add a second editor so switching back is a real change
+  mockStore.dispatch({
+    type: ADD_QUERY_EDITOR,
+    queryEditor: makeSecondEditor(),
+  });
+
+  const listener = jest.fn();
+  const disposable = sqlLab.onDidChangeActiveTab(listener);
+
+  mockStore.dispatch({
+    type: SET_ACTIVE_QUERY_EDITOR,
+    queryEditor: { id: EDITOR_ID },
+  });
+
+  expect(listener).toHaveBeenCalledTimes(1);
+  const tab = listener.mock.calls[0][0];
+  expect(tab.id).toBe(EDITOR_ID);
+  expect(tab.title).toBe('Untitled Query 1');
+  expect(tab.databaseId).toBe(1);
+
+  disposable.dispose();
+});
+
+test('onDidCreateTab fires with Tab on ADD_QUERY_EDITOR', () => {
+  const listener = jest.fn();
+  const disposable = sqlLab.onDidCreateTab(listener);
+
+  const newEditor = {
+    id: 'new-tab',
+    immutableId: 'new-immutable',
+    name: 'New Query',
+    dbId: 1,
+    catalog: null,
+    schema: 'public',
+  } as QueryEditor;
+
+  mockStore.dispatch({ type: ADD_QUERY_EDITOR, queryEditor: newEditor });
+
+  expect(listener).toHaveBeenCalledTimes(1);
+  const tab = listener.mock.calls[0][0];
+  expect(tab.id).toBe('new-tab');
+  expect(tab.title).toBe('New Query');
+  expect(tab.databaseId).toBe(1);
+
+  disposable.dispose();
+});
+
+// ---------------------------------------------------------------------------
+// Predicate scoping — editor-scoped listeners ignore other editors' events
+// ---------------------------------------------------------------------------
+
+test('editor-scoped listener does not fire for a different editor', () => {
+  // Add a second editor (ADD_QUERY_EDITOR makes it active)
+  mockStore.dispatch({
+    type: ADD_QUERY_EDITOR,
+    queryEditor: makeSecondEditor(),
+  });
+
+  // Switch back to editor-1 so the predicate captures immutable-1
+  mockStore.dispatch({
+    type: SET_ACTIVE_QUERY_EDITOR,
+    queryEditor: { id: EDITOR_ID },
+  });
+
+  // Register listener while editor-1 is active (predicate captures immutable-1)
+  const listener = jest.fn();
+  const disposable = sqlLab.onDidQueryRun(listener);
+
+  // Dispatch START_QUERY for editor-2 — should be filtered out by predicate
+  const query = makeQueryPayload({
+    sqlEditorId: 'editor-2',
+    sqlEditorImmutableId: 'immutable-2',
+  });
+  mockStore.dispatch({ type: START_QUERY, query });
+
+  expect(listener).not.toHaveBeenCalled();
+
+  disposable.dispose();
+});
+
+test('editor-scoped predicate filters tab events via queryEditor lookup', () => {
+  // Add a second editor and switch back to editor-1
+  mockStore.dispatch({
+    type: ADD_QUERY_EDITOR,
+    queryEditor: makeSecondEditor(),
+  });
+  mockStore.dispatch({
+    type: SET_ACTIVE_QUERY_EDITOR,
+    queryEditor: { id: EDITOR_ID },
+  });
+
+  // Register listener while editor-1 is active (predicate captures immutable-1)
+  const listener = jest.fn();
+  const disposable = sqlLab.onDidChangeEditorDatabase(listener);
+
+  // Dispatch QUERY_EDITOR_SETDB for editor-2 — predicate uses findQueryEditor lookup (Path B)
+  mockStore.dispatch({
+    type: QUERY_EDITOR_SETDB,
+    queryEditor: { id: 'editor-2', immutableId: 'immutable-2' },
+    dbId: 99,
+  });
+
+  expect(listener).not.toHaveBeenCalled();
+
+  disposable.dispose();
+});
+
+test('globalPredicate listener fires for a non-active tab', () => {
+  // Add editor-2 and switch to it
+  mockStore.dispatch({
+    type: ADD_QUERY_EDITOR,
+    queryEditor: makeSecondEditor(),
+  });
+  mockStore.dispatch({
+    type: SET_ACTIVE_QUERY_EDITOR,
+    queryEditor: { id: 'editor-2' },
+  });
+
+  const listener = jest.fn();
+  const disposable = sqlLab.onDidCloseTab(listener);
+
+  // Close editor-1 while editor-2 is active — globalPredicate should still fire
+  const queryEditor = {
+    id: EDITOR_ID,
+    immutableId: IMMUTABLE_ID,
+    name: 'Untitled Query 1',
+    dbId: 1,
+    catalog: null,
+    schema: 'public',
+  } as QueryEditor;
+  mockStore.dispatch({ type: REMOVE_QUERY_EDITOR, queryEditor });
+
+  expect(listener).toHaveBeenCalledTimes(1);
+  expect(listener.mock.calls[0][0].id).toBe(EDITOR_ID);
+
+  disposable.dispose();
+});
+
+// ---------------------------------------------------------------------------
+// Disposable pattern
+// ---------------------------------------------------------------------------
+
+test('dispose() stops the listener from receiving events', () => {
+  const listener = jest.fn();
+  const disposable = sqlLab.onDidChangeActivePanel(listener);
+
+  // Dispatch a real change (initial state is 'Results', switch to 'History')
+  mockStore.dispatch({ type: SET_ACTIVE_SOUTHPANE_TAB, tabId: 'History' });
+  expect(listener).toHaveBeenCalledTimes(1);
+
+  disposable.dispose();
+
+  mockStore.dispatch({ type: SET_ACTIVE_SOUTHPANE_TAB, tabId: 'Query' });
+  expect(listener).toHaveBeenCalledTimes(1);
+});
+
+// ---------------------------------------------------------------------------
+// Imperative Functions (7 tests)
+// ---------------------------------------------------------------------------
+
+test('getCurrentTab returns the active tab with correct properties', () => {
+  const tab = sqlLab.getCurrentTab();
+
+  expect(tab).toBeDefined();
+  expect(tab!.id).toBe(EDITOR_ID);
+  expect(tab!.title).toBe('Untitled Query 1');
+  expect(tab!.databaseId).toBe(1);
+  expect(tab!.schema).toBe('public');
+});
+
+test('getActivePanel returns the active south pane tab', () => {
+  const panel = sqlLab.getActivePanel();
+  expect(panel.id).toBe('Results');
+});
+
+test('getTabs returns all open tabs', () => {
+  const tabs = sqlLab.getTabs();
+
+  expect(tabs).toHaveLength(1);
+  expect(tabs[0].id).toBe(EDITOR_ID);
+  expect(tabs[0].title).toBe('Untitled Query 1');
+});
+
+test('getDatabases returns all available databases', () => {
+  const databases = sqlLab.getDatabases();
+
+  expect(databases).toHaveLength(1);
+  expect(databases[0].id).toBe(1);
+  expect(databases[0].name).toBe('test_db');
+});
+
+test('createTab dispatches ADD_QUERY_EDITOR and returns the new tab', async () => {
+  const tab = await sqlLab.createTab({ title: 'Custom Tab', sql: 'SELECT 42' });
+
+  expect(tab).toBeDefined();
+  expect(tab.title).toBe('Custom Tab');
+  const tabs = sqlLab.getTabs();
+  expect(tabs.length).toBeGreaterThanOrEqual(2);
+});
+
+test('setActiveTab switches the active tab', async () => {
+  // Create a second tab first
+  await sqlLab.createTab({ title: 'Second Tab' });
+
+  // Switch back to the original tab
+  await sqlLab.setActiveTab(EDITOR_ID);
+
+  const currentTab = sqlLab.getCurrentTab();
+  expect(currentTab).toBeDefined();
+  expect(currentTab!.id).toBe(EDITOR_ID);
+});
+
+test('setActivePanel dispatches SET_ACTIVE_SOUTHPANE_TAB', async () => {
+  await sqlLab.setActivePanel('History');
+
+  const panel = sqlLab.getActivePanel();
+  expect(panel.id).toBe('History');
+});
diff --git a/superset-frontend/src/dashboard/actions/chartCustomizationActions.test.ts b/superset-frontend/src/dashboard/actions/chartCustomizationActions.test.ts
new file mode 100644
index 00000000000..09defc6c3c0
--- /dev/null
+++ b/superset-frontend/src/dashboard/actions/chartCustomizationActions.test.ts
@@ -0,0 +1,273 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+import fetchMock from 'fetch-mock';
+import { ChartCustomization, ChartCustomizationType } from '@superset-ui/core';
+import {
+  setInScopeStatusOfCustomizations,
+  saveChartCustomization,
+} from './chartCustomizationActions';
+import { SET_IN_SCOPE_STATUS_OF_FILTERS } from './nativeFilters';
+import { DASHBOARD_INFO_UPDATED } from './dashboardInfo';
+
+beforeAll(() => fetchMock.mockGlobal());
+afterAll(() => fetchMock.hardReset());
+afterEach(() => fetchMock.clearHistory().removeRoutes());
+
+function setup(stateOverrides: Record<string, unknown> = {}) {
+  const state = {
+    nativeFilters: {
+      filters: {},
+    },
+    dashboardInfo: {
+      metadata: {
+        chart_customization_config: [],
+      },
+    },
+    ...stateOverrides,
+  };
+  const getState = jest.fn(() => state) as unknown as () => any;
+  const dispatch = jest.fn();
+  return { getState, dispatch, state };
+}
+
+test('setInScopeStatusOfCustomizations filters null entries from chart_customization_config', () => {
+  const { getState, dispatch } = setup({
+    nativeFilters: {
+      filters: {
+        'CUSTOM-1': {
+          id: 'CUSTOM-1',
+          name: 'Group By',
+          chartsInScope: [],
+        },
+      },
+    },
+    dashboardInfo: {
+      metadata: {
+        chart_customization_config: [
+          null,
+          { id: 'CUSTOM-1', name: 'Group By', chartsInScope: [] },
+          null,
+        ],
+      },
+    },
+  });
+
+  const thunk = setInScopeStatusOfCustomizations([
+    {
+      customizationId: 'CUSTOM-1',
+      chartsInScope: [10, 20],
+      tabsInScope: ['TAB-A'],
+    },
+  ]);
+  thunk(dispatch, getState, null);
+
+  // Should dispatch SET_IN_SCOPE_STATUS_OF_FILTERS for the matching filter
+  expect(dispatch).toHaveBeenCalledWith(
+    expect.objectContaining({ type: SET_IN_SCOPE_STATUS_OF_FILTERS }),
+  );
+
+  // Should dispatch DASHBOARD_INFO_UPDATED with only the valid config item (nulls stripped)
+  const infoUpdateCall = dispatch.mock.calls.find(
+    ([action]: [{ type: string }]) => action.type === DASHBOARD_INFO_UPDATED,
+  );
+  expect(infoUpdateCall).toBeDefined();
+  const updatedConfig =
+    infoUpdateCall[0].newInfo.metadata.chart_customization_config;
+  expect(updatedConfig).toHaveLength(1);
+  expect(updatedConfig[0].id).toBe('CUSTOM-1');
+  expect(updatedConfig[0].chartsInScope).toEqual([10, 20]);
+  expect(updatedConfig[0].tabsInScope).toEqual(['TAB-A']);
+});
+
+test('setInScopeStatusOfCustomizations filters undefined entries from chart_customization_config', () => {
+  const { getState, dispatch } = setup({
+    nativeFilters: {
+      filters: {
+        'CUSTOM-1': {
+          id: 'CUSTOM-1',
+          name: 'Group By',
+          chartsInScope: [],
+        },
+      },
+    },
+    dashboardInfo: {
+      metadata: {
+        chart_customization_config: [
+          undefined,
+          { id: 'CUSTOM-1', name: 'Group By', chartsInScope: [] },
+          undefined,
+        ],
+      },
+    },
+  });
+
+  const thunk = setInScopeStatusOfCustomizations([
+    {
+      customizationId: 'CUSTOM-1',
+      chartsInScope: [10, 20],
+      tabsInScope: ['TAB-A'],
+    },
+  ]);
+  thunk(dispatch, getState, null);
+
+  const infoUpdateCall = dispatch.mock.calls.find(
+    ([action]: [{ type: string }]) => action.type === DASHBOARD_INFO_UPDATED,
+  );
+  expect(infoUpdateCall).toBeDefined();
+  const updatedConfig =
+    infoUpdateCall[0].newInfo.metadata.chart_customization_config;
+  expect(updatedConfig).toHaveLength(1);
+  expect(updatedConfig[0].id).toBe('CUSTOM-1');
+  expect(updatedConfig[0].chartsInScope).toEqual([10, 20]);
+});
+
+test('setInScopeStatusOfCustomizations handles config that is entirely null entries', () => {
+  const { getState, dispatch } = setup({
+    nativeFilters: { filters: {} },
+    dashboardInfo: {
+      metadata: {
+        chart_customization_config: [null, null],
+      },
+    },
+  });
+
+  const thunk = setInScopeStatusOfCustomizations([
+    {
+      customizationId: 'CUSTOM-MISSING',
+      chartsInScope: [10],
+      tabsInScope: [],
+    },
+  ]);
+  thunk(dispatch, getState, null);
+
+  // Should still dispatch the info update with an empty config
+  const infoUpdateCall = dispatch.mock.calls.find(
+    ([action]: [{ type: string }]) => action.type === DASHBOARD_INFO_UPDATED,
+  );
+  expect(infoUpdateCall).toBeDefined();
+  expect(
+    infoUpdateCall[0].newInfo.metadata.chart_customization_config,
+  ).toHaveLength(0);
+});
+
+test('setInScopeStatusOfCustomizations works with undefined metadata', () => {
+  const { getState, dispatch } = setup({
+    nativeFilters: { filters: {} },
+    dashboardInfo: { metadata: undefined },
+  });
+
+  const thunk = setInScopeStatusOfCustomizations([
+    {
+      customizationId: 'CUSTOM-1',
+      chartsInScope: [10],
+      tabsInScope: [],
+    },
+  ]);
+  thunk(dispatch, getState, null);
+
+  const infoUpdateCall = dispatch.mock.calls.find(
+    ([action]: [{ type: string }]) => action.type === DASHBOARD_INFO_UPDATED,
+  );
+  expect(infoUpdateCall).toBeDefined();
+  expect(
+    infoUpdateCall[0].newInfo.metadata.chart_customization_config,
+  ).toHaveLength(0);
+});
+
+test('saveChartCustomization filters null entries from currentConfig before merging', async () => {
+  const customization: ChartCustomization = {
+    id: 'CUSTOM-1',
+    type: ChartCustomizationType.ChartCustomization,
+    name: 'Group By',
+    filterType: 'chart_customization_dynamic_groupby',
+    targets: [{}],
+    scope: { rootPath: ['ROOT_ID'], excluded: [] },
+    chartsInScope: [10],
+    tabsInScope: ['TAB-A'],
+    defaultDataMask: {},
+    controlValues: {},
+  };
+
+  fetchMock.put('glob:*/api/v1/dashboard/1/chart_customizations', {
+    result: [customization],
+  });
+
+  const { getState, dispatch } = setup({
+    nativeFilters: { filters: {} },
+    dashboardInfo: {
+      id: 1,
+      metadata: {
+        chart_customization_config: [
+          null,
+          { id: 'CUSTOM-1', name: 'Group By', chartsInScope: [10] },
+          null,
+        ],
+      },
+    },
+  });
+
+  const thunk = saveChartCustomization([customization], [], [], false);
+  await thunk(dispatch, getState, null);
+
+  // DASHBOARD_INFO_UPDATED should have merged config without nulls
+  const infoUpdateCall = dispatch.mock.calls.find(
+    ([action]: [{ type: string }]) => action.type === DASHBOARD_INFO_UPDATED,
+  );
+  expect(infoUpdateCall).toBeDefined();
+  const config = infoUpdateCall[0].newInfo.metadata.chart_customization_config;
+  expect(config.every((item: unknown) => item !== null)).toBe(true);
+});
+
+test('saveChartCustomization filters null entries from oldConfig when resetDataMask is true', async () => {
+  const customization: ChartCustomization = {
+    id: 'CUSTOM-1',
+    type: ChartCustomizationType.ChartCustomization,
+    name: 'Group By',
+    filterType: 'chart_customization_dynamic_groupby',
+    targets: [{}],
+    scope: { rootPath: ['ROOT_ID'], excluded: [] },
+    chartsInScope: [10],
+    tabsInScope: ['TAB-A'],
+    defaultDataMask: {},
+    controlValues: {},
+  };
+
+  fetchMock.put('glob:*/api/v1/dashboard/1/chart_customizations', {
+    result: [customization],
+  });
+
+  const { getState, dispatch } = setup({
+    nativeFilters: { filters: {} },
+    dashboardInfo: {
+      id: 1,
+      metadata: {
+        chart_customization_config: [
+          null,
+          { id: 'CUSTOM-1', name: 'Group By', chartsInScope: [10] },
+          null,
+        ],
+      },
+    },
+  });
+
+  const thunk = saveChartCustomization([customization], [], [], true);
+
+  // Should not throw when building oldCustomizationsById from null-containing config
+  await expect(thunk(dispatch, getState, null)).resolves.toBeDefined();
+});
diff --git a/superset-frontend/src/dashboard/actions/chartCustomizationActions.ts b/superset-frontend/src/dashboard/actions/chartCustomizationActions.ts
index 348f65c9b86..6a282a03d71 100644
--- a/superset-frontend/src/dashboard/actions/chartCustomizationActions.ts
+++ b/superset-frontend/src/dashboard/actions/chartCustomizationActions.ts
@@ -107,7 +107,8 @@ export function saveChartCustomization(
       });
 
       const currentMetadata = getState().dashboardInfo.metadata;
-      const currentConfig = currentMetadata?.chart_customization_config || [];
+      const currentConfig =
+        currentMetadata?.chart_customization_config?.filter(Boolean) || [];
 
       const mergedResult = response.result.map(
         (item: ChartCustomization | ChartCustomizationDivider) => {
@@ -148,7 +149,8 @@ export function saveChartCustomization(
       );
 
       if (resetDataMask) {
-        const oldConfig = metadata?.chart_customization_config || [];
+        const oldConfig =
+          metadata?.chart_customization_config?.filter(Boolean) || [];
         const oldCustomizationsById = oldConfig.reduce<
           Record<string, ChartCustomization | ChartCustomizationDivider>
         >((acc, customization) => {
@@ -333,7 +335,8 @@ export function setInScopeStatusOfCustomizations(
     }
 
     const { metadata } = getState().dashboardInfo;
-    const customizationConfig = metadata?.chart_customization_config || [];
+    const customizationConfig =
+      metadata?.chart_customization_config?.filter(Boolean) || [];
 
     const scopeMap = new Map(
       customizationScopes.map(
diff --git a/superset-frontend/src/dashboard/actions/hydrate.ts b/superset-frontend/src/dashboard/actions/hydrate.ts
index 4639589ec24..f28803a0dec 100644
--- a/superset-frontend/src/dashboard/actions/hydrate.ts
+++ b/superset-frontend/src/dashboard/actions/hydrate.ts
@@ -293,15 +293,17 @@ export const hydrateDashboard =
       directPathToChild.push(directLinkComponentId);
     }
 
-    const rawChartCustomizations =
-      (metadata?.chart_customization_config as JsonObject[]) || [];
+    const rawChartCustomizations = (
+      (metadata?.chart_customization_config as JsonObject[]) || []
+    ).filter(Boolean);
 
     const chartCustomizations = migrateChartCustomizationArray(
       rawChartCustomizations,
     );
 
-    const filters =
-      (metadata?.native_filter_configuration as JsonObject[]) || [];
+    const filters = (
+      (metadata?.native_filter_configuration as JsonObject[]) || []
+    ).filter(Boolean);
     const combinedFilters = [...filters, ...chartCustomizations];
 
     const nativeFilters = getInitialNativeFilterState({
diff --git a/superset-frontend/src/dashboard/components/DashboardBuilder/DashboardBuilder.tsx b/superset-frontend/src/dashboard/components/DashboardBuilder/DashboardBuilder.tsx
index c2ea76ca2f8..a507c65318d 100644
--- a/superset-frontend/src/dashboard/components/DashboardBuilder/DashboardBuilder.tsx
+++ b/superset-frontend/src/dashboard/components/DashboardBuilder/DashboardBuilder.tsx
@@ -523,30 +523,33 @@ const DashboardBuilder = () => {
     ({ dropIndicatorProps }: { dropIndicatorProps: JsonObject }) => (
       <div>
         {dropIndicatorProps && <div {...dropIndicatorProps} />}
-        {!isReport && topLevelTabs && !uiConfig.hideNav && (
-          <WithPopoverMenu
-            shouldFocus={shouldFocusTabs}
-            menuItems={[
-              <IconButton
-                key="collapse-tabs"
-                icon={<Icons.FallOutlined iconSize="xl" />}
-                label={t('Collapse tab content')}
-                onClick={handleDeleteTopLevelTabs}
-              />,
-            ]}
-            editMode={editMode}
-          >
-            <DashboardComponent
-              id={topLevelTabs?.id}
-              parentId={DASHBOARD_ROOT_ID}
-              depth={DASHBOARD_ROOT_DEPTH + 1}
-              index={0}
-              renderTabContent={false}
-              renderHoverMenu={false}
-              onChangeTab={handleChangeTab}
-            />
-          </WithPopoverMenu>
-        )}
+        {!isReport &&
+          topLevelTabs &&
+          !uiConfig.hideTab &&
+          !uiConfig.hideNav && (
+            <WithPopoverMenu
+              shouldFocus={shouldFocusTabs}
+              menuItems={[
+                <IconButton
+                  key="collapse-tabs"
+                  icon={<Icons.FallOutlined iconSize="xl" />}
+                  label={t('Collapse tab content')}
+                  onClick={handleDeleteTopLevelTabs}
+                />,
+              ]}
+              editMode={editMode}
+            >
+              <DashboardComponent
+                id={topLevelTabs?.id}
+                parentId={DASHBOARD_ROOT_ID}
+                depth={DASHBOARD_ROOT_DEPTH + 1}
+                index={0}
+                renderTabContent={false}
+                renderHoverMenu={false}
+                onChangeTab={handleChangeTab}
+              />
+            </WithPopoverMenu>
+          )}
       </div>
     ),
     [
@@ -555,6 +558,7 @@ const DashboardBuilder = () => {
       handleDeleteTopLevelTabs,
       isReport,
       topLevelTabs,
+      uiConfig.hideTab,
       uiConfig.hideNav,
     ],
   );
diff --git a/superset-frontend/src/dashboard/components/DashboardBuilder/DashboardContainer.test.tsx b/superset-frontend/src/dashboard/components/DashboardBuilder/DashboardContainer.test.tsx
index 886563472ce..563cedf4198 100644
--- a/superset-frontend/src/dashboard/components/DashboardBuilder/DashboardContainer.test.tsx
+++ b/superset-frontend/src/dashboard/components/DashboardBuilder/DashboardContainer.test.tsx
@@ -16,15 +16,16 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { render, waitFor } from 'spec/helpers/testing-library';
+import { render, screen, waitFor } from 'spec/helpers/testing-library';
 import fetchMock from 'fetch-mock';
 import { storeWithState } from 'spec/fixtures/mockStore';
 import mockState from 'spec/fixtures/mockState';
 import { sliceId } from 'spec/fixtures/mockChartQueries';
-import { NativeFilterType } from '@superset-ui/core';
+import { ChartCustomizationType, NativeFilterType } from '@superset-ui/core';
 import { CHART_TYPE } from '../../util/componentTypes';
 import DashboardContainer from './DashboardContainer';
 import * as nativeFiltersActions from '../../actions/nativeFilters';
+import * as chartCustomizationActions from '../../actions/chartCustomizationActions';
 
 fetchMock.get('glob:*/csstemplateasyncmodelview/api/read', {});
 fetchMock.put('glob:*/api/v1/dashboard/*/colors*', {});
@@ -43,6 +44,16 @@ jest.mock('src/dashboard/containers/DashboardGrid', () => ({
   default: () => <div data-test="mock-dashboard-grid" />,
 }));
 
+// DashboardContainer dispatches these on mount, so unit tests stub them.
+jest.mock('src/dashboard/actions/dashboardState', () => ({
+  ...jest.requireActual('src/dashboard/actions/dashboardState'),
+  applyDashboardLabelsColorOnLoad: jest.fn(() => () => undefined),
+  updateDashboardLabelsColor: jest.fn(() => () => undefined),
+  persistDashboardLabelsColor: jest.fn(() => () => undefined),
+  ensureSyncedSharedLabelsColors: jest.fn(() => () => undefined),
+  ensureSyncedLabelsColorMap: jest.fn(() => () => undefined),
+}));
+
 const defaultTestFilter = {
   id: 'FILTER-1',
   name: 'Test Filter',
@@ -438,3 +449,411 @@ test('calculates tabsInScope for filters with tab-scoped charts', async () => {
     ]),
   );
 });
+
+// Chart customization scope tests.
+
+test('calculates chartsInScope correctly for new-format chart customizations', async () => {
+  const customizationId = 'CHART_CUSTOMIZATION-1';
+  const originalFn = chartCustomizationActions.setInScopeStatusOfCustomizations;
+  const spy = jest.spyOn(
+    chartCustomizationActions,
+    'setInScopeStatusOfCustomizations',
+  );
+  spy.mockImplementation(args => originalFn(args));
+
+  try {
+    const state = {
+      dashboardInfo: {
+        ...mockState.dashboardInfo,
+        metadata: {
+          ...mockState.dashboardInfo.metadata,
+          native_filter_configuration: [],
+          chart_customization_config: [
+            {
+              id: customizationId,
+              type: 'CHART_CUSTOMIZATION',
+              name: 'Dynamic Group By',
+              filterType: 'chart_customization_dynamic_groupby',
+              targets: [{ datasetId: 1, column: { name: 'status' } }],
+              scope: { rootPath: ['ROOT_ID'], excluded: [] },
+              chartsInScope: [],
+              defaultDataMask: {},
+              controlValues: {},
+            },
+          ],
+        },
+      },
+      nativeFilters: {
+        filters: {
+          [customizationId]: {
+            id: customizationId,
+            type: 'CHART_CUSTOMIZATION',
+            chartsInScope: [],
+          },
+        },
+      },
+    };
+    setup(state);
+
+    await waitFor(() => {
+      expect(spy).toHaveBeenCalledWith(
+        expect.arrayContaining([
+          expect.objectContaining({
+            customizationId,
+            chartsInScope: [sliceId],
+          }),
+        ]),
+      );
+    });
+  } finally {
+    spy.mockRestore();
+  }
+});
+
+test('migrates legacy-format customizations before scope calculation for scope-less items', async () => {
+  const legacyCustomizationId = 'CHART_CUSTOMIZATION-legacy-1';
+  const originalFn = chartCustomizationActions.setInScopeStatusOfCustomizations;
+  const spy = jest.spyOn(
+    chartCustomizationActions,
+    'setInScopeStatusOfCustomizations',
+  );
+  spy.mockImplementation(args => originalFn(args));
+
+  try {
+    const state = {
+      dashboardInfo: {
+        ...mockState.dashboardInfo,
+        metadata: {
+          ...mockState.dashboardInfo.metadata,
+          native_filter_configuration: [],
+          chart_customization_config: [
+            {
+              id: legacyCustomizationId,
+              customization: {
+                dataset: 1,
+                column: 'status',
+                filterType: 'chart_customization_dynamic_groupby',
+                name: 'Legacy Group By',
+              },
+            },
+          ],
+        },
+      },
+      nativeFilters: {
+        filters: {
+          [legacyCustomizationId]: {
+            id: legacyCustomizationId,
+            chartsInScope: [],
+          },
+        },
+      },
+    };
+    setup(state);
+
+    await waitFor(() => {
+      expect(spy).toHaveBeenCalledWith(
+        expect.arrayContaining([
+          expect.objectContaining({
+            customizationId: legacyCustomizationId,
+            chartsInScope: [sliceId],
+          }),
+        ]),
+      );
+    });
+  } finally {
+    spy.mockRestore();
+  }
+});
+
+test('preserves legacy chart-specific customizations during scope calculation', async () => {
+  const legacyCustomizationId = 'CHART_CUSTOMIZATION-legacy-chart-1';
+  const originalFn = chartCustomizationActions.setInScopeStatusOfCustomizations;
+  const spy = jest.spyOn(
+    chartCustomizationActions,
+    'setInScopeStatusOfCustomizations',
+  );
+  spy.mockImplementation(args => originalFn(args));
+
+  const baseDashboardLayout = mockState.dashboardLayout.present;
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  const { CHART_ID: _removed, ...cleanLayout } = baseDashboardLayout;
+
+  try {
+    const state = {
+      dashboardState: {
+        ...mockState.dashboardState,
+        sliceIds: [18, 19],
+      },
+      dashboardLayout: {
+        ...mockState.dashboardLayout,
+        present: {
+          ...cleanLayout,
+          CHART_ID_1: {
+            id: 'CHART_ID_1',
+            type: CHART_TYPE,
+            meta: { chartId: 18, width: 4, height: 10 },
+            parents: ['ROOT_ID', 'GRID_ID', 'ROW_ID'],
+          },
+          CHART_ID_2: {
+            id: 'CHART_ID_2',
+            type: CHART_TYPE,
+            meta: { chartId: 19, width: 4, height: 10 },
+            parents: ['ROOT_ID', 'GRID_ID', 'ROW_ID'],
+          },
+        },
+      },
+      dashboardInfo: {
+        ...mockState.dashboardInfo,
+        metadata: {
+          ...mockState.dashboardInfo.metadata,
+          native_filter_configuration: [],
+          chart_customization_config: [
+            {
+              id: legacyCustomizationId,
+              chartId: 18,
+              customization: {
+                dataset: 1,
+                column: 'status',
+                filterType: 'chart_customization_dynamic_groupby',
+                name: 'Legacy Chart Scoped Group By',
+              },
+            },
+          ],
+        },
+      },
+      nativeFilters: {
+        filters: {
+          [legacyCustomizationId]: {
+            id: legacyCustomizationId,
+            chartsInScope: [],
+          },
+        },
+      },
+    };
+    setup(state);
+
+    await waitFor(() => {
+      expect(spy).toHaveBeenCalledWith(
+        expect.arrayContaining([
+          expect.objectContaining({
+            customizationId: legacyCustomizationId,
+            chartsInScope: [18],
+          }),
+        ]),
+      );
+    });
+  } finally {
+    spy.mockRestore();
+  }
+});
+
+test('returns empty scope data for chart customization dividers', async () => {
+  const dividerId = 'CHART_CUSTOMIZATION_DIVIDER-1';
+  const originalFn = chartCustomizationActions.setInScopeStatusOfCustomizations;
+  const spy = jest.spyOn(
+    chartCustomizationActions,
+    'setInScopeStatusOfCustomizations',
+  );
+  spy.mockImplementation(args => originalFn(args));
+
+  try {
+    const state = {
+      dashboardInfo: {
+        ...mockState.dashboardInfo,
+        metadata: {
+          ...mockState.dashboardInfo.metadata,
+          native_filter_configuration: [],
+          chart_customization_config: [
+            {
+              id: dividerId,
+              type: ChartCustomizationType.Divider,
+              title: 'Divider',
+              description: 'Section divider',
+            },
+          ],
+        },
+      },
+      nativeFilters: {
+        filters: {
+          [dividerId]: {
+            id: dividerId,
+            type: ChartCustomizationType.Divider,
+          },
+        },
+      },
+    };
+    setup(state);
+
+    await waitFor(() => {
+      expect(spy).toHaveBeenCalledWith(
+        expect.arrayContaining([
+          expect.objectContaining({
+            customizationId: dividerId,
+            chartsInScope: [],
+            tabsInScope: [],
+          }),
+        ]),
+      );
+    });
+  } finally {
+    spy.mockRestore();
+  }
+});
+
+test('does not crash when chart_customization_config contains a legacy item with customization: null', async () => {
+  const nullCustomizationId = 'CHART_CUSTOMIZATION-null-1';
+  const originalFn = chartCustomizationActions.setInScopeStatusOfCustomizations;
+  const spy = jest.spyOn(
+    chartCustomizationActions,
+    'setInScopeStatusOfCustomizations',
+  );
+  spy.mockImplementation(args => originalFn(args));
+
+  try {
+    const state = {
+      dashboardInfo: {
+        ...mockState.dashboardInfo,
+        metadata: {
+          ...mockState.dashboardInfo.metadata,
+          native_filter_configuration: [],
+          chart_customization_config: [
+            {
+              id: nullCustomizationId,
+              customization: null,
+            },
+          ],
+        },
+      },
+      nativeFilters: {
+        filters: {
+          [nullCustomizationId]: {
+            id: nullCustomizationId,
+            chartsInScope: [],
+          },
+        },
+      },
+    };
+
+    setup(state);
+    expect(screen.getByTestId('mock-dashboard-grid')).toBeInTheDocument();
+  } finally {
+    spy.mockRestore();
+  }
+});
+
+test('does not crash when chart_customization_config contains a null entry', async () => {
+  setup({
+    dashboardInfo: {
+      ...mockState.dashboardInfo,
+      metadata: {
+        ...mockState.dashboardInfo.metadata,
+        native_filter_configuration: [],
+        chart_customization_config: [null],
+      },
+    },
+    nativeFilters: { filters: {} },
+  });
+  expect(screen.getByTestId('mock-dashboard-grid')).toBeInTheDocument();
+});
+
+test('does not crash when chart_customization_config contains an undefined entry', async () => {
+  setup({
+    dashboardInfo: {
+      ...mockState.dashboardInfo,
+      metadata: {
+        ...mockState.dashboardInfo.metadata,
+        native_filter_configuration: [],
+        chart_customization_config: [undefined],
+      },
+    },
+    nativeFilters: { filters: {} },
+  });
+  expect(screen.getByTestId('mock-dashboard-grid')).toBeInTheDocument();
+});
+
+test('does not crash when chart_customization_config mixes null and new-format items', async () => {
+  const customizationId = 'CHART_CUSTOMIZATION-new-format-1';
+  const originalFn = chartCustomizationActions.setInScopeStatusOfCustomizations;
+  const spy = jest.spyOn(
+    chartCustomizationActions,
+    'setInScopeStatusOfCustomizations',
+  );
+  spy.mockImplementation(args => originalFn(args));
+
+  try {
+    setup({
+      dashboardInfo: {
+        ...mockState.dashboardInfo,
+        metadata: {
+          ...mockState.dashboardInfo.metadata,
+          native_filter_configuration: [],
+          chart_customization_config: [
+            null,
+            {
+              id: customizationId,
+              type: 'CHART_CUSTOMIZATION',
+              name: 'Dynamic Group By',
+              filterType: 'chart_customization_dynamic_groupby',
+              targets: [{ datasetId: 1, column: { name: 'status' } }],
+              scope: { rootPath: ['ROOT_ID'], excluded: [] },
+              chartsInScope: [],
+              defaultDataMask: {},
+              controlValues: {},
+            },
+          ],
+        },
+      },
+      nativeFilters: {
+        filters: {
+          [customizationId]: {
+            id: customizationId,
+            type: 'CHART_CUSTOMIZATION',
+            chartsInScope: [],
+          },
+        },
+      },
+    });
+    expect(screen.getByTestId('mock-dashboard-grid')).toBeInTheDocument();
+
+    await waitFor(() => {
+      expect(spy).toHaveBeenCalledWith(
+        expect.arrayContaining([
+          expect.objectContaining({
+            customizationId,
+            chartsInScope: [sliceId],
+          }),
+        ]),
+      );
+    });
+  } finally {
+    spy.mockRestore();
+  }
+});
+
+test('does not dispatch setInScopeStatusOfCustomizations when chart_customization_config is empty', async () => {
+  const spy = jest.spyOn(
+    chartCustomizationActions,
+    'setInScopeStatusOfCustomizations',
+  );
+
+  try {
+    const state = {
+      dashboardInfo: {
+        ...mockState.dashboardInfo,
+        metadata: {
+          ...mockState.dashboardInfo.metadata,
+          native_filter_configuration: [],
+          chart_customization_config: [],
+        },
+      },
+      nativeFilters: { filters: {} },
+    };
+    setup(state);
+
+    await waitFor(() => {
+      expect(spy).not.toHaveBeenCalled();
+    });
+  } finally {
+    spy.mockRestore();
+  }
+});
diff --git a/superset-frontend/src/dashboard/components/DashboardBuilder/DashboardContainer.tsx b/superset-frontend/src/dashboard/components/DashboardBuilder/DashboardContainer.tsx
index d7f0be5274e..84ca3581bfa 100644
--- a/superset-frontend/src/dashboard/components/DashboardBuilder/DashboardContainer.tsx
+++ b/superset-frontend/src/dashboard/components/DashboardBuilder/DashboardContainer.tsx
@@ -63,6 +63,10 @@ import {
 } from 'src/dashboard/actions/dashboardState';
 import { getColorNamespace, resetColors } from 'src/utils/colorScheme';
 import { calculateScopes } from 'src/dashboard/util/calculateScopes';
+import {
+  isLegacyChartCustomizationFormat,
+  migrateChartCustomization,
+} from 'src/dashboard/util/migrateChartCustomization';
 import { CHART_TYPE } from 'src/dashboard/util/componentTypes';
 import { NATIVE_FILTER_DIVIDER_PREFIX } from '../nativeFilters/FiltersConfigModal/utils';
 import { selectFilterConfiguration } from '../nativeFilters/state';
@@ -85,6 +89,39 @@ interface CustomizationScopeData extends ScopeData {
   customizationId: string;
 }
 
+function normalizeChartCustomizationsForScopeCalculation(
+  chartCustomizations: ChartCustomizationConfiguration,
+  chartIds: number[],
+): ChartCustomizationConfiguration {
+  const truthyCustomizations = chartCustomizations.filter(Boolean);
+
+  if (!truthyCustomizations.some(isLegacyChartCustomizationFormat)) {
+    return truthyCustomizations;
+  }
+
+  return truthyCustomizations.map(item => {
+    if (!isLegacyChartCustomizationFormat(item)) {
+      return item;
+    }
+
+    const migratedCustomization = migrateChartCustomization(item);
+
+    if (!item.chartId) {
+      return migratedCustomization;
+    }
+
+    return {
+      ...migratedCustomization,
+      // Legacy items could target a single chart without an explicit scope.
+      // Preserve that targeting before calculateScopes recomputes chartsInScope.
+      scope: {
+        ...migratedCustomization.scope,
+        excluded: chartIds.filter(chartId => chartId !== item.chartId),
+      },
+    };
+  });
+}
+
 export const renderedChartIdsSelector: (state: RootState) => number[] =
   createSelector([(state: RootState) => state.charts], charts =>
     Object.values(charts)
@@ -192,8 +229,14 @@ const DashboardContainer: FC<DashboardContainerProps> = ({ topLevelTabs }) => {
       return;
     }
 
+    const normalizedCustomizations =
+      normalizeChartCustomizationsForScopeCalculation(
+        chartCustomizations,
+        chartIds,
+      );
+
     const scopes = calculateScopes(
-      chartCustomizations,
+      normalizedCustomizations,
       chartIds,
       chartLayoutItems,
       item => item.type === ChartCustomizationType.Divider,
diff --git a/superset-frontend/src/dashboard/components/FiltersBadge/DetailsPanel/index.tsx b/superset-frontend/src/dashboard/components/FiltersBadge/DetailsPanel/index.tsx
index 45766ad2086..80f70e3189c 100644
--- a/superset-frontend/src/dashboard/components/FiltersBadge/DetailsPanel/index.tsx
+++ b/superset-frontend/src/dashboard/components/FiltersBadge/DetailsPanel/index.tsx
@@ -181,7 +181,7 @@ const DetailsPanelPopover = ({
 
   return (
     <Popover
-      color={`${theme.colorBgElevated}cc`}
+      color={theme.colorBgElevated}
       content={content}
       open={popoverVisible}
       onOpenChange={handleVisibility}
diff --git a/superset-frontend/src/dashboard/components/Header/index.tsx b/superset-frontend/src/dashboard/components/Header/index.tsx
index 417c332fd2a..522a22f1eca 100644
--- a/superset-frontend/src/dashboard/components/Header/index.tsx
+++ b/superset-frontend/src/dashboard/components/Header/index.tsx
@@ -107,7 +107,7 @@ type DashboardPropertiesUpdate = {
   owners?: Owner[];
   roles?: Role[];
   tags?: TagType[];
-  themeId?: number | null;
+  theme?: { id: number; theme_name: string; json_data: string } | null;
   css?: string;
   title?: string;
 };
@@ -561,7 +561,10 @@ const Header = (): JSX.Element => {
         owners: updates.owners,
         roles: updates.roles,
         tags: updates.tags,
-        theme_id: updates.themeId,
+        // Conditional spread: omit `theme` key entirely when undefined
+        // to prevent the reducer from overwriting the existing theme.
+        // `undefined` means "not changed" (e.g., theme not in fetched list).
+        ...(updates.theme !== undefined && { theme: updates.theme }),
         css: updates.css,
       });
       boundActionCreators.setUnsavedChanges(true);
diff --git a/superset-frontend/src/dashboard/components/Header/useHeaderActionsDropdownMenu.tsx b/superset-frontend/src/dashboard/components/Header/useHeaderActionsDropdownMenu.tsx
index 7c648458024..121759846c8 100644
--- a/superset-frontend/src/dashboard/components/Header/useHeaderActionsDropdownMenu.tsx
+++ b/superset-frontend/src/dashboard/components/Header/useHeaderActionsDropdownMenu.tsx
@@ -36,6 +36,7 @@ import { getActiveFilters } from 'src/dashboard/util/activeDashboardFilters';
 import { getUrlParam } from 'src/utils/urlUtils';
 import { MenuKeys, RootState } from 'src/dashboard/types';
 import { HeaderDropdownProps } from 'src/dashboard/components/Header/types';
+import { usePermissions } from 'src/hooks/usePermissions';
 
 export const useHeaderActionsMenu = ({
   customCss,
@@ -72,6 +73,7 @@ export const useHeaderActionsMenu = ({
   Dispatch<SetStateAction<boolean>>,
 ] => {
   const [isDropdownVisible, setIsDropdownVisible] = useState(false);
+  const { canExportImage } = usePermissions();
   const history = useHistory();
   const directPathToChild = useSelector(
     (state: RootState) => state.dashboardState.directPathToChild,
@@ -169,6 +171,7 @@ export const useHeaderActionsMenu = ({
     disabled: isLoading,
     logEvent,
     userCanExport,
+    canExportImage,
   });
 
   const reportMenuItem = useHeaderReportMenuItems({
diff --git a/superset-frontend/src/dashboard/components/PropertiesModal/PropertiesModal.test.tsx b/superset-frontend/src/dashboard/components/PropertiesModal/PropertiesModal.test.tsx
index d7e4b8e1ec8..fbfd5da51c4 100644
--- a/superset-frontend/src/dashboard/components/PropertiesModal/PropertiesModal.test.tsx
+++ b/superset-frontend/src/dashboard/components/PropertiesModal/PropertiesModal.test.tsx
@@ -152,10 +152,12 @@ fetchMock.get('glob:*/api/v1/theme/*', {
       {
         id: 1,
         theme_name: 'Test Theme 1',
+        json_data: '{"token":{"colorPrimary":"#ff0000"}}',
       },
       {
         id: 2,
         theme_name: 'Test Theme 2',
+        json_data: '{"token":{"colorPrimary":"#0000ff"}}',
       },
     ],
   },
@@ -417,6 +419,74 @@ describe('PropertiesModal', () => {
     });
   });
 
+  test('passes full theme object with json_data to onSubmit when theme is selected', async () => {
+    mockedIsFeatureEnabled.mockReturnValue(false);
+    const props = createProps();
+    props.onlyApply = true;
+    // Dashboard has theme id=1, which exists in the fetched themes list
+    const propsWithTheme = {
+      ...props,
+      dashboardInfo: {
+        ...dashboardInfo,
+        json_metadata: mockedJsonMetadata,
+        theme: { id: 1, theme_name: 'Test Theme 1' },
+      },
+    };
+    render(<PropertiesModal {...propsWithTheme} />, {
+      useRedux: true,
+    });
+
+    expect(
+      await screen.findByTestId('dashboard-edit-properties-form'),
+    ).toBeInTheDocument();
+
+    userEvent.click(screen.getByRole('button', { name: 'Apply' }));
+    await waitFor(() => {
+      expect(props.onSubmit).toHaveBeenCalledTimes(1);
+      const submitCall = props.onSubmit.mock.calls[0][0];
+      // Full theme object (including json_data) should be passed, not just the ID
+      expect(submitCall.theme).toEqual({
+        id: 1,
+        theme_name: 'Test Theme 1',
+        json_data: '{"token":{"colorPrimary":"#ff0000"}}',
+      });
+      // themeId removed — derived from theme.id at the save callsite
+      expect(submitCall).not.toHaveProperty('themeId');
+    });
+  });
+
+  test('does not clear theme when selected theme is missing from fetched options', async () => {
+    mockedIsFeatureEnabled.mockReturnValue(false);
+    const props = createProps();
+    props.onlyApply = true;
+    // Dashboard has theme id=99, but the theme fetch returns ids 1 and 2
+    const propsWithDashboardInfo = {
+      ...props,
+      dashboardInfo: {
+        ...dashboardInfo,
+        json_metadata: mockedJsonMetadata,
+        theme: { id: 99, theme_name: 'Deleted Theme' },
+      },
+    };
+    render(<PropertiesModal {...propsWithDashboardInfo} />, {
+      useRedux: true,
+    });
+
+    expect(
+      await screen.findByTestId('dashboard-edit-properties-form'),
+    ).toBeInTheDocument();
+
+    userEvent.click(screen.getByRole('button', { name: 'Apply' }));
+    await waitFor(() => {
+      expect(props.onSubmit).toHaveBeenCalledTimes(1);
+      const submitCall = props.onSubmit.mock.calls[0][0];
+      // theme should be undefined (not null) so Redux is not overwritten
+      expect(submitCall.theme).toBeUndefined();
+      // themeId removed — derived from theme.id at the save callsite
+      expect(submitCall).not.toHaveProperty('themeId');
+    });
+  });
+
   test('Empty "Certified by" should clear "Certification details"', async () => {
     const props = createProps();
     const noCertifiedByProps = {
diff --git a/superset-frontend/src/dashboard/components/PropertiesModal/index.tsx b/superset-frontend/src/dashboard/components/PropertiesModal/index.tsx
index 8fbcbb690b8..d472923d143 100644
--- a/superset-frontend/src/dashboard/components/PropertiesModal/index.tsx
+++ b/superset-frontend/src/dashboard/components/PropertiesModal/index.tsx
@@ -53,6 +53,7 @@ import {
   setColorScheme,
   setDashboardMetadata,
 } from 'src/dashboard/actions/dashboardState';
+import { dashboardInfoChanged } from 'src/dashboard/actions/dashboardInfo';
 import { areObjectsEqual } from 'src/reduxUtils';
 import { StandardModal, useModalValidation } from 'src/components/Modal';
 import { validateRefreshFrequency } from '../RefreshFrequency';
@@ -138,10 +139,13 @@ const PropertiesModal = ({
     Array<{
       id: number;
       theme_name: string;
+      json_data?: string;
     }>
   >([]);
   const categoricalSchemeRegistry = getCategoricalSchemeRegistry();
   const originalDashboardMetadata = useRef<Record<string, any>>({});
+  const originalCss = useRef<string | null>(null);
+  const cssDebounceTimer = useRef<ReturnType<typeof setTimeout> | null>(null);
 
   const handleErrorResponse = async (response: Response) => {
     const { error, statusText, message } = await getClientErrorObject(response);
@@ -194,6 +198,9 @@ const PropertiesModal = ({
       setOwners(owners);
       setRoles(roles);
       setCustomCss(css || '');
+      if (originalCss.current === null) {
+        originalCss.current = css || '';
+      }
       setCurrentColorScheme(metadata?.color_scheme);
       setSelectedThemeId(theme?.id || null);
 
@@ -268,7 +275,19 @@ const PropertiesModal = ({
     setRoles(parsedRoles);
   };
 
-  const handleOnCancel = () => onHide();
+  const handleOnCancel = () => {
+    if (cssDebounceTimer.current) {
+      clearTimeout(cssDebounceTimer.current);
+      cssDebounceTimer.current = null;
+    }
+    if (originalCss.current !== null) {
+      dispatch(dashboardInfoChanged({ css: originalCss.current }));
+      dispatch(
+        setColorScheme(originalDashboardMetadata.current.color_scheme ?? ''),
+      );
+    }
+    onHide();
+  };
 
   const onColorSchemeChange = (
     colorScheme = '',
@@ -385,7 +404,9 @@ const PropertiesModal = ({
       colorNamespace,
       certifiedBy,
       certificationDetails,
-      themeId: selectedThemeId,
+      theme: selectedThemeId
+        ? themes.find(t => t.id === selectedThemeId)
+        : null,
       css: customCss,
       ...moreOnSubmitProps,
     };
@@ -426,6 +447,14 @@ const PropertiesModal = ({
     }
   };
 
+  // Must be defined before the data-loading effect so it runs first when show
+  // becomes true, ensuring handleDashboardData sees null and captures original CSS
+  useEffect(() => {
+    if (show) {
+      originalCss.current = null;
+    }
+  }, [show]);
+
   useEffect(() => {
     if (show) {
       // Reset loading state when modal opens
@@ -441,7 +470,7 @@ const PropertiesModal = ({
 
       // Fetch themes (excluding system themes)
       const themeQuery = rison.encode({
-        columns: ['id', 'theme_name', 'is_system'],
+        columns: ['id', 'theme_name', 'is_system', 'json_data'],
         filters: [
           {
             col: 'is_system',
@@ -593,6 +622,32 @@ const PropertiesModal = ({
 
   const isDataReady = !isLoading && dashboardInfo;
 
+  // Debounced live CSS preview so changes are reflected on the dashboard
+  // without clicking Apply. Called only on user edits, not on data load.
+  const handleCustomCssChange = useCallback(
+    (css: string) => {
+      setCustomCss(css);
+      if (cssDebounceTimer.current) {
+        clearTimeout(cssDebounceTimer.current);
+        cssDebounceTimer.current = null;
+      }
+      cssDebounceTimer.current = setTimeout(() => {
+        dispatch(dashboardInfoChanged({ css }));
+      }, 500);
+    },
+    [dispatch],
+  );
+
+  useEffect(
+    () => () => {
+      if (cssDebounceTimer.current) {
+        clearTimeout(cssDebounceTimer.current);
+        cssDebounceTimer.current = null;
+      }
+    },
+    [],
+  );
+
   // Validate basic section when title changes or data loads
   useEffect(() => {
     if (isDataReady) {
@@ -719,7 +774,7 @@ const PropertiesModal = ({
                   showChartTimestamps={showChartTimestamps}
                   onThemeChange={handleThemeChange}
                   onColorSchemeChange={onColorSchemeChange}
-                  onCustomCssChange={setCustomCss}
+                  onCustomCssChange={handleCustomCssChange}
                   onShowChartTimestampsChange={setShowChartTimestamps}
                   addDangerToast={addDangerToast}
                 />
diff --git a/superset-frontend/src/dashboard/components/PropertiesModal/sections/AdvancedSection.tsx b/superset-frontend/src/dashboard/components/PropertiesModal/sections/AdvancedSection.tsx
index e9fd5d869d7..510c50e9764 100644
--- a/superset-frontend/src/dashboard/components/PropertiesModal/sections/AdvancedSection.tsx
+++ b/superset-frontend/src/dashboard/components/PropertiesModal/sections/AdvancedSection.tsx
@@ -84,7 +84,7 @@ const AdvancedSection = ({
       tabSize={2}
       wordWrap
       width="100%"
-      height="200px"
+      height="60vh"
       annotations={toEditorAnnotations(jsonAnnotations)}
     />
   </ModalFormField>
diff --git a/superset-frontend/src/dashboard/components/PropertiesModal/sections/StylingSection.tsx b/superset-frontend/src/dashboard/components/PropertiesModal/sections/StylingSection.tsx
index 5194b910282..3c710861d3a 100644
--- a/superset-frontend/src/dashboard/components/PropertiesModal/sections/StylingSection.tsx
+++ b/superset-frontend/src/dashboard/components/PropertiesModal/sections/StylingSection.tsx
@@ -69,6 +69,7 @@ const StyledSwitchContainer = styled.div`
 interface Theme {
   id: number;
   theme_name: string;
+  json_data?: string;
 }
 
 interface CssTemplate {
diff --git a/superset-frontend/src/dashboard/components/SliceHeader/index.tsx b/superset-frontend/src/dashboard/components/SliceHeader/index.tsx
index be29e3c8e89..c3c1add10fd 100644
--- a/superset-frontend/src/dashboard/components/SliceHeader/index.tsx
+++ b/superset-frontend/src/dashboard/components/SliceHeader/index.tsx
@@ -19,6 +19,7 @@
 import {
   forwardRef,
   ReactNode,
+  RefObject,
   useContext,
   useEffect,
   useRef,
@@ -61,6 +62,7 @@ type SliceHeaderProps = SliceHeaderControlsProps & {
   height: number;
   queriedDttm?: string | null;
   exportPivotExcel?: (arg0: string) => void;
+  chartHolderRef?: RefObject<HTMLDivElement>;
 };
 
 const annotationsLoading = t('Annotation layers are still loading.');
@@ -171,6 +173,7 @@ const SliceHeader = forwardRef<HTMLDivElement, SliceHeaderProps>(
       width,
       height,
       exportPivotExcel = () => ({}),
+      chartHolderRef,
     },
     ref,
   ) => {
@@ -374,6 +377,7 @@ const SliceHeader = forwardRef<HTMLDivElement, SliceHeaderProps>(
                   exploreUrl={exploreUrl}
                   crossFiltersEnabled={isCrossFiltersEnabled}
                   exportPivotExcel={exportPivotExcel}
+                  chartHolderRef={chartHolderRef}
                 />
               )}
             </>
diff --git a/superset-frontend/src/dashboard/components/SliceHeaderControls/SliceHeaderControls.test.tsx b/superset-frontend/src/dashboard/components/SliceHeaderControls/SliceHeaderControls.test.tsx
index b80d59f3f58..bc3adeb1a33 100644
--- a/superset-frontend/src/dashboard/components/SliceHeaderControls/SliceHeaderControls.test.tsx
+++ b/superset-frontend/src/dashboard/components/SliceHeaderControls/SliceHeaderControls.test.tsx
@@ -17,7 +17,12 @@
  * under the License.
  */
 
-import { render, screen, userEvent } from 'spec/helpers/testing-library';
+import {
+  render,
+  screen,
+  userEvent,
+  waitFor,
+} from 'spec/helpers/testing-library';
 import { FeatureFlag, VizType } from '@superset-ui/core';
 import mockState from 'spec/fixtures/mockState';
 import { cachedSupersetGet } from 'src/utils/cachedSupersetGet';
@@ -122,6 +127,13 @@ const openMenu = () => {
   userEvent.click(screen.getByRole('button', { name: 'More Options' }));
 };
 
+const mockFullscreenElement = (getElement: () => Element | null) => {
+  Object.defineProperty(document, 'fullscreenElement', {
+    configurable: true,
+    get: getElement,
+  });
+};
+
 beforeEach(() => {
   mockCachedSupersetGet.mockClear();
   mockCachedSupersetGet.mockResolvedValue({
@@ -135,6 +147,10 @@ beforeEach(() => {
   });
 });
 
+afterEach(() => {
+  Reflect.deleteProperty(document, 'fullscreenElement');
+});
+
 test('Should render', () => {
   renderWrapper();
   openMenu();
@@ -304,14 +320,61 @@ test('Should "Force refresh"', () => {
   expect(props.addSuccessToast).toHaveBeenCalledTimes(1);
 });
 
-test('Should "Enter fullscreen"', () => {
-  const props = createProps();
+test('Should sync local state after entering fullscreen', async () => {
+  const mockDiv = document.createElement('div');
+  let fullscreenElement: Element | null = null;
+  mockFullscreenElement(() => fullscreenElement);
+  mockDiv.requestFullscreen = jest.fn().mockImplementation(async () => {
+    fullscreenElement = mockDiv;
+  });
+  const originalExitFullscreen = document.exitFullscreen;
+  (document as any).exitFullscreen = jest.fn().mockResolvedValue(undefined);
+  const props = {
+    ...createProps(),
+    chartHolderRef: { current: mockDiv },
+  };
   renderWrapper(props);
   openMenu();
-
   expect(props.handleToggleFullSize).toHaveBeenCalledTimes(0);
-  userEvent.click(screen.getByText('Enter fullscreen'));
-  expect(props.handleToggleFullSize).toHaveBeenCalledTimes(1);
+  const fullscreenItem = screen.getByRole('menuitem', {
+    name: /enter fullscreen/i,
+  });
+  await userEvent.click(fullscreenItem);
+  expect(props.handleToggleFullSize).toHaveBeenCalledTimes(0);
+  expect(mockDiv.requestFullscreen).toHaveBeenCalled();
+  document.dispatchEvent(new Event('fullscreenchange'));
+  await waitFor(() => {
+    expect(props.handleToggleFullSize).toHaveBeenCalledTimes(1);
+  });
+  (document as any).exitFullscreen = originalExitFullscreen;
+});
+
+test('Should sync local state after exiting fullscreen', async () => {
+  const mockDiv = document.createElement('div');
+  let fullscreenElement: Element | null = mockDiv;
+  mockFullscreenElement(() => fullscreenElement);
+  const originalExitFullscreen = document.exitFullscreen;
+  (document as any).exitFullscreen = jest.fn().mockImplementation(async () => {
+    fullscreenElement = null;
+  });
+  const props = {
+    ...createProps(),
+    isFullSize: true,
+    chartHolderRef: { current: mockDiv },
+  };
+  renderWrapper(props);
+  openMenu();
+  const fullscreenItem = screen.getByRole('menuitem', {
+    name: /exit fullscreen/i,
+  });
+  await userEvent.click(fullscreenItem);
+  expect(props.handleToggleFullSize).toHaveBeenCalledTimes(0);
+  expect(document.exitFullscreen).toHaveBeenCalledTimes(1);
+  document.dispatchEvent(new Event('fullscreenchange'));
+  await waitFor(() => {
+    expect(props.handleToggleFullSize).toHaveBeenCalledTimes(1);
+  });
+  (document as any).exitFullscreen = originalExitFullscreen;
 });
 
 test('Drill to detail modal is under featureflag', () => {
diff --git a/superset-frontend/src/dashboard/components/SliceHeaderControls/Styles.tsx b/superset-frontend/src/dashboard/components/SliceHeaderControls/Styles.tsx
new file mode 100644
index 00000000000..27d08fc86b6
--- /dev/null
+++ b/superset-frontend/src/dashboard/components/SliceHeaderControls/Styles.tsx
@@ -0,0 +1,71 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+import { css, SupersetTheme } from '@apache-superset/core/theme';
+
+export const fullscreenStyles = (theme: SupersetTheme) => css`
+  [data-test='dashboard-component-chart-holder']:fullscreen {
+    background-color: ${theme.colorBgBase};
+    width: 100vw;
+    height: 100vh;
+    box-sizing: border-box;
+    display: flex;
+    flex-direction: column;
+    padding: ${theme.sizeUnit * 4}px;
+    overflow: visible;
+    position: relative;
+    pointer-events: auto;
+    z-index: ${theme.zIndexPopupBase};
+    opacity: 1;
+    visibility: visible;
+
+    /* Ensure children take up available space */
+    .dashboard-chart,
+    .chart-container,
+    .slice_container,
+    .chart-slice {
+      flex: 1 1 auto;
+      height: 100%;
+      width: 100%;
+      display: flex;
+      flex-direction: column;
+      overflow: visible;
+    }
+
+    /* Portaled components inside the fullscreen layer */
+    .ant-dropdown,
+    .ant-tooltip,
+    .ant-modal-root,
+    .ant-select-dropdown,
+    .ant-popover {
+      z-index: ${theme.zIndexPopupBase + 1};
+      pointer-events: auto;
+    }
+  }
+
+  /* Interaction and Header fixes */
+  [data-test='dashboard-component-chart-holder']:fullscreen * {
+    pointer-events: auto;
+  }
+
+  [data-test='dashboard-component-chart-holder']:fullscreen
+    [data-test='slice-header'] {
+    z-index: ${theme.zIndexPopupBase};
+    position: relative;
+  }
+`;
diff --git a/superset-frontend/src/dashboard/components/SliceHeaderControls/index.tsx b/superset-frontend/src/dashboard/components/SliceHeaderControls/index.tsx
index 9fcf2ab0096..557e6e31b6f 100644
--- a/superset-frontend/src/dashboard/components/SliceHeaderControls/index.tsx
+++ b/superset-frontend/src/dashboard/components/SliceHeaderControls/index.tsx
@@ -22,6 +22,7 @@ import {
   KeyboardEvent,
   useState,
   useRef,
+  useEffect,
   RefObject,
 } from 'react';
 
@@ -61,6 +62,8 @@ import { useDatasetDrillInfo } from 'src/hooks/apiResources/datasets';
 import { ResourceStatus } from 'src/hooks/apiResources/apiResources';
 import { useCrossFiltersScopingModal } from '../nativeFilters/FilterBar/CrossFilters/ScopingModal/useCrossFiltersScopingModal';
 import { ViewResultsModalTrigger } from './ViewResultsModalTrigger';
+import { Global } from '@emotion/react';
+import { fullscreenStyles } from './Styles';
 
 const RefreshTooltip = styled.div`
   ${({ theme }) => css`
@@ -96,6 +99,7 @@ const VerticalDotsTrigger = () => {
 };
 
 export interface SliceHeaderControlsProps {
+  chartHolderRef?: RefObject<HTMLDivElement>;
   slice: {
     description: string;
     viz_type: string;
@@ -150,6 +154,12 @@ const dropdownIconsStyles = css`
   }
 `;
 
+const queueChartResize = () => {
+  window.setTimeout(() => {
+    window.dispatchEvent(new Event('resize'));
+  }, 300);
+};
+
 const SliceHeaderControls = (
   props: SliceHeaderControlsPropsWithRouter | SliceHeaderControlsProps,
 ) => {
@@ -197,6 +207,41 @@ const SliceHeaderControls = (
     }
   };
 
+  const requestChartFullscreen = () => {
+    const chartHolder = props.chartHolderRef?.current;
+
+    if (!chartHolder?.requestFullscreen) {
+      props.addDangerToast(t('Fullscreen is not supported in this browser.'));
+      return;
+    }
+
+    chartHolder.requestFullscreen().catch(error => {
+      props.addDangerToast(
+        t(
+          'Error enabling fullscreen: %s',
+          error instanceof Error ? error.message : t('Unknown error'),
+        ),
+      );
+    });
+  };
+
+  const exitChartFullscreen = () => {
+    if (!document.exitFullscreen) {
+      props.handleToggleFullSize();
+      queueChartResize();
+      return;
+    }
+
+    document.exitFullscreen().catch(error => {
+      props.addDangerToast(
+        t(
+          'Error disabling fullscreen: %s',
+          error instanceof Error ? error.message : t('Unknown error'),
+        ),
+      );
+    });
+  };
+
   const handleMenuClick = ({
     key,
     domEvent,
@@ -231,9 +276,19 @@ const SliceHeaderControls = (
         // eslint-disable-next-line no-unused-expressions
         props.exportPivotCSV?.(props.slice.slice_id);
         break;
-      case MenuKeys.Fullscreen:
-        props.handleToggleFullSize();
+      case MenuKeys.Fullscreen: {
+        if (props.isFullSize) {
+          if (document.fullscreenElement) {
+            exitChartFullscreen();
+          } else {
+            props.handleToggleFullSize();
+            queueChartResize();
+          }
+        } else {
+          requestChartFullscreen();
+        }
         break;
+      }
       case MenuKeys.ExportFullCsv:
         // eslint-disable-next-line no-unused-expressions
         props.exportFullCSV?.(props.slice.slice_id);
@@ -351,9 +406,9 @@ const SliceHeaderControls = (
     ? t('Exit fullscreen')
     : t('Enter fullscreen');
 
-  // @z-index-below-dashboard-header (100) - 1 = 99 for !isFullSize and 101 for isFullSize
+  // Use theme.zIndexPopupBase to keep dropdown above fullscreen (+1) or below dashboard header (-1)
   const dropdownOverlayStyle = {
-    zIndex: isFullSize ? 101 : 99,
+    zIndex: isFullSize ? theme.zIndexPopupBase + 1 : theme.zIndexPopupBase - 1,
     animationDuration: '0s',
   };
 
@@ -554,13 +609,35 @@ const SliceHeaderControls = (
     });
   }
 
+  useEffect(() => {
+    const handleFullscreenChange = () => {
+      const isChartFullscreen =
+        document.fullscreenElement === props.chartHolderRef?.current;
+
+      if (isChartFullscreen !== Boolean(isFullSize)) {
+        props.handleToggleFullSize();
+        queueChartResize();
+      }
+    };
+
+    document.addEventListener('fullscreenchange', handleFullscreenChange);
+    return () => {
+      document.removeEventListener('fullscreenchange', handleFullscreenChange);
+    };
+  }, [isFullSize, props.chartHolderRef, props.handleToggleFullSize]);
+
   return (
     <>
       {isFullSize && (
         <Icons.FullscreenExitOutlined
           style={{ fontSize: 22 }}
           onClick={() => {
-            props.handleToggleFullSize();
+            if (document.fullscreenElement) {
+              exitChartFullscreen();
+            } else {
+              props.handleToggleFullSize();
+              queueChartResize();
+            }
           }}
         />
       )}
@@ -603,8 +680,8 @@ const SliceHeaderControls = (
         showModal={drillModalIsOpen}
         dataset={datasetWithVerboseMap}
       />
-
       {canEditCrossFilters && scopingModal}
+      {isFullSize && <Global styles={fullscreenStyles(theme)} />}
     </>
   );
 };
diff --git a/superset-frontend/src/dashboard/components/filterscope/FilterScope.test.tsx b/superset-frontend/src/dashboard/components/filterscope/FilterScope.test.tsx
index 2c18ba4a208..4f4194904ac 100644
--- a/superset-frontend/src/dashboard/components/filterscope/FilterScope.test.tsx
+++ b/superset-frontend/src/dashboard/components/filterscope/FilterScope.test.tsx
@@ -171,7 +171,7 @@ function getCheckboxIcon(element: HTMLElement): Element {
  * checkbox state change is the fill color of the SVG icon.
  */
 function getCheckboxState(name: string): CheckboxState {
-  const element = screen.getByRole('link', { name });
+  const element = screen.getByRole('button', { name });
   const svgPath = getCheckboxIcon(element).children[1].children[0].children[0];
   const fill = svgPath.getAttribute('fill');
   return fill === supersetTheme.colorPrimary
@@ -183,7 +183,7 @@ function getCheckboxState(name: string): CheckboxState {
 
 // Replace the original clickCheckbox function with the async version
 async function clickCheckbox(name: string) {
-  const element = screen.getByRole('link', { name });
+  const element = screen.getByRole('button', { name });
   const checkboxLabel = getCheckboxIcon(element);
   await userEvent.click(checkboxLabel);
 }
@@ -204,11 +204,11 @@ test('renders with empty filters', () => {
 
 test('renders with filters values', () => {
   render(<FilterScopeSelector {...createProps()} />, { useRedux: true });
-  expect(screen.getByRole('link', { name: FILTER_A })).toBeInTheDocument();
-  expect(screen.getByRole('link', { name: FILTER_B })).toBeInTheDocument();
-  expect(screen.getByRole('link', { name: FILTER_C })).toBeInTheDocument();
-  expect(screen.getByRole('link', { name: TAB_A })).toBeInTheDocument();
-  expect(screen.getByRole('link', { name: TAB_B })).toBeInTheDocument();
+  expect(screen.getByRole('button', { name: FILTER_A })).toBeInTheDocument();
+  expect(screen.getByRole('button', { name: FILTER_B })).toBeInTheDocument();
+  expect(screen.getByRole('button', { name: FILTER_C })).toBeInTheDocument();
+  expect(screen.getByRole('button', { name: TAB_A })).toBeInTheDocument();
+  expect(screen.getByRole('button', { name: TAB_B })).toBeInTheDocument();
   expect(screen.queryByText(CHART_A)).not.toBeInTheDocument();
   expect(screen.queryByText(CHART_B)).not.toBeInTheDocument();
   expect(screen.queryByText(CHART_C)).not.toBeInTheDocument();
@@ -222,21 +222,21 @@ test('collapses/expands all filters', () => {
     useRedux: true,
   });
   userEvent.click(screen.getAllByRole('button', { name: COLLAPSE_ALL })[0]);
-  expect(screen.getByRole('link', { name: ALL_FILTERS })).toBeInTheDocument();
+  expect(screen.getByRole('button', { name: ALL_FILTERS })).toBeInTheDocument();
   expect(
-    screen.queryByRole('link', { name: FILTER_A }),
+    screen.queryByRole('button', { name: FILTER_A }),
   ).not.toBeInTheDocument();
   expect(
-    screen.queryByRole('link', { name: FILTER_B }),
+    screen.queryByRole('button', { name: FILTER_B }),
   ).not.toBeInTheDocument();
   expect(
-    screen.queryByRole('link', { name: FILTER_C }),
+    screen.queryByRole('button', { name: FILTER_C }),
   ).not.toBeInTheDocument();
   userEvent.click(screen.getAllByRole('button', { name: EXPAND_ALL })[0]);
-  expect(screen.getByRole('link', { name: ALL_FILTERS })).toBeInTheDocument();
-  expect(screen.getByRole('link', { name: FILTER_A })).toBeInTheDocument();
-  expect(screen.getByRole('link', { name: FILTER_B })).toBeInTheDocument();
-  expect(screen.getByRole('link', { name: FILTER_C })).toBeInTheDocument();
+  expect(screen.getByRole('button', { name: ALL_FILTERS })).toBeInTheDocument();
+  expect(screen.getByRole('button', { name: FILTER_A })).toBeInTheDocument();
+  expect(screen.getByRole('button', { name: FILTER_B })).toBeInTheDocument();
+  expect(screen.getByRole('button', { name: FILTER_C })).toBeInTheDocument();
 });
 
 test('collapses/expands all charts', () => {
@@ -251,10 +251,10 @@ test('collapses/expands all charts', () => {
   expect(screen.queryByText(CHART_D)).not.toBeInTheDocument();
   userEvent.click(screen.getAllByRole('button', { name: EXPAND_ALL })[1]);
   expect(screen.getByText(ALL_CHARTS)).toBeInTheDocument();
-  expect(screen.getByRole('link', { name: CHART_A })).toBeInTheDocument();
-  expect(screen.getByRole('link', { name: CHART_B })).toBeInTheDocument();
-  expect(screen.getByRole('link', { name: CHART_C })).toBeInTheDocument();
-  expect(screen.getByRole('link', { name: CHART_D })).toBeInTheDocument();
+  expect(screen.getByRole('button', { name: CHART_A })).toBeInTheDocument();
+  expect(screen.getByRole('button', { name: CHART_B })).toBeInTheDocument();
+  expect(screen.getByRole('button', { name: CHART_C })).toBeInTheDocument();
+  expect(screen.getByRole('button', { name: CHART_D })).toBeInTheDocument();
 });
 
 test('searches for a chart', () => {
@@ -262,9 +262,13 @@ test('searches for a chart', () => {
     useRedux: true,
   });
   userEvent.type(screen.getByPlaceholderText('Search...'), CHART_C);
-  expect(screen.queryByRole('link', { name: CHART_A })).not.toBeInTheDocument();
-  expect(screen.queryByRole('link', { name: CHART_B })).not.toBeInTheDocument();
-  expect(screen.getByRole('link', { name: CHART_C })).toBeInTheDocument();
+  expect(
+    screen.queryByRole('button', { name: CHART_A }),
+  ).not.toBeInTheDocument();
+  expect(
+    screen.queryByRole('button', { name: CHART_B }),
+  ).not.toBeInTheDocument();
+  expect(screen.getByRole('button', { name: CHART_C })).toBeInTheDocument();
 });
 
 // Update all tests that use clickCheckbox to be async and await the function call
diff --git a/superset-frontend/src/dashboard/components/gridComponents/Chart/Chart.tsx b/superset-frontend/src/dashboard/components/gridComponents/Chart/Chart.tsx
index 3c6c136159c..4a707a3522c 100644
--- a/superset-frontend/src/dashboard/components/gridComponents/Chart/Chart.tsx
+++ b/superset-frontend/src/dashboard/components/gridComponents/Chart/Chart.tsx
@@ -17,7 +17,15 @@
  * under the License.
  */
 import cx from 'classnames';
-import { useCallback, useEffect, useRef, useMemo, useState, memo } from 'react';
+import {
+  useCallback,
+  useEffect,
+  useRef,
+  useMemo,
+  useState,
+  memo,
+  RefObject,
+} from 'react';
 import type { ChartCustomization, JsonObject } from '@superset-ui/core';
 import { styled } from '@apache-superset/core/theme';
 import { t } from '@apache-superset/core/translation';
@@ -88,6 +96,7 @@ interface ChartProps {
   extraControls?: JsonObject;
   isInView?: boolean;
   cacheBusterProp?: string | number;
+  chartHolderRef?: RefObject<HTMLDivElement>;
 }
 
 const RESIZE_TIMEOUT = 500;
@@ -688,6 +697,7 @@ const Chart = (props: ChartProps) => {
         width={width}
         height={getHeaderHeight()}
         exportPivotExcel={exportPivotExcel as unknown as (arg0: string) => void}
+        chartHolderRef={props.chartHolderRef}
       />
 
       {/*
diff --git a/superset-frontend/src/dashboard/components/gridComponents/ChartHolder/ChartHolder.tsx b/superset-frontend/src/dashboard/components/gridComponents/ChartHolder/ChartHolder.tsx
index 597f8887796..7f2658a9667 100644
--- a/superset-frontend/src/dashboard/components/gridComponents/ChartHolder/ChartHolder.tsx
+++ b/superset-frontend/src/dashboard/components/gridComponents/ChartHolder/ChartHolder.tsx
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { useState, useMemo, useCallback, useEffect, memo } from 'react';
+import { useState, useMemo, useCallback, useEffect, useRef, memo } from 'react';
 
 import { ResizeCallback, ResizeStartCallback } from 're-resizable';
 import cx from 'classnames';
@@ -31,6 +31,7 @@ import HoverMenu from 'src/dashboard/components/menu/HoverMenu';
 import ResizableContainer from 'src/dashboard/components/resizable/ResizableContainer';
 import getChartAndLabelComponentIdFromPath from 'src/dashboard/util/getChartAndLabelComponentIdFromPath';
 import useFilterFocusHighlightStyles from 'src/dashboard/util/useFilterFocusHighlightStyles';
+import { AntdThemeProvider } from '@superset-ui/core/components';
 import { COLUMN_TYPE, ROW_TYPE } from 'src/dashboard/util/componentTypes';
 import {
   GRID_BASE_UNIT,
@@ -105,6 +106,7 @@ const ChartHolder = ({
   `;
   const { chartId } = component.meta;
   const isFullSize = fullSizeChartId === chartId;
+  const chartHolderRef = useRef<HTMLDivElement | null>(null);
 
   const focusHighlightStyles = useFilterFocusHighlightStyles(chartId ?? 0);
   const directPathToChild = useSelector(
@@ -257,7 +259,19 @@ const ChartHolder = ({
         editMode={editMode}
       >
         <div
-          ref={dragSourceRef}
+          ref={el => {
+            if (typeof dragSourceRef === 'function') {
+              dragSourceRef(el);
+            } else if (
+              dragSourceRef &&
+              Object.prototype.hasOwnProperty.call(dragSourceRef, 'current')
+            ) {
+              (
+                dragSourceRef as React.MutableRefObject<HTMLDivElement | null>
+              ).current = el;
+            }
+            chartHolderRef.current = el;
+          }}
           data-test="dashboard-component-chart-holder"
           style={focusHighlightStyles}
           css={isFullSize ? fullSizeStyle : undefined}
@@ -269,46 +283,59 @@ const ChartHolder = ({
             outlinedComponentId ? 'fade-in' : 'fade-out',
           )}
         >
-          {!editMode && (
-            <AnchorLink
-              id={component.id}
-              scrollIntoView={outlinedComponentId === component.id}
+          <AntdThemeProvider
+            getPopupContainer={(triggerNode: HTMLElement) =>
+              document.fullscreenElement
+                ? (triggerNode?.closest?.(
+                    '[data-test="dashboard-component-chart-holder"]',
+                  ) as HTMLElement) || document.body
+                : document.body
+            }
+          >
+            {!editMode && (
+              <AnchorLink
+                id={component.id}
+                scrollIntoView={outlinedComponentId === component.id}
+              />
+            )}
+            {!!outlinedComponentId && (
+              <style>
+                {`label[for=${outlinedColumnName}] + .Select .Select__control {
+                      border-color: ${theme.colorPrimary};
+                      transition: border-color 1s ease-in-out;
+                    }`}
+              </style>
+            )}
+            <Chart
+              componentId={component.id}
+              id={component.meta.chartId ?? 0}
+              dashboardId={dashboardId}
+              width={chartWidth}
+              height={chartHeight}
+              sliceName={
+                component.meta.sliceNameOverride ||
+                component.meta.sliceName ||
+                ''
+              }
+              updateSliceName={(_sliceId: number, name: string) =>
+                handleUpdateSliceName(name)
+              }
+              isComponentVisible={isComponentVisible}
+              handleToggleFullSize={handleToggleFullSize}
+              isFullSize={isFullSize}
+              setControlValue={handleExtraControl}
+              extraControls={extraControls}
+              isInView={isInView}
+              chartHolderRef={chartHolderRef}
             />
-          )}
-          {!!outlinedComponentId && (
-            <style>
-              {`label[for=${outlinedColumnName}] + .Select .Select__control {
-                    border-color: ${theme.colorPrimary};
-                    transition: border-color 1s ease-in-out;
-                  }`}
-            </style>
-          )}
-          <Chart
-            componentId={component.id}
-            id={component.meta.chartId ?? 0}
-            dashboardId={dashboardId}
-            width={chartWidth}
-            height={chartHeight}
-            sliceName={
-              component.meta.sliceNameOverride || component.meta.sliceName || ''
-            }
-            updateSliceName={(_sliceId: number, name: string) =>
-              handleUpdateSliceName(name)
-            }
-            isComponentVisible={isComponentVisible}
-            handleToggleFullSize={handleToggleFullSize}
-            isFullSize={isFullSize}
-            setControlValue={handleExtraControl}
-            extraControls={extraControls}
-            isInView={isInView}
-          />
-          {editMode && (
-            <HoverMenu position="top">
-              <div data-test="dashboard-delete-component-button">
-                <DeleteComponentButton onDelete={handleDeleteComponent} />
-              </div>
-            </HoverMenu>
-          )}
+            {editMode && (
+              <HoverMenu position="top">
+                <div data-test="dashboard-delete-component-button">
+                  <DeleteComponentButton onDelete={handleDeleteComponent} />
+                </div>
+              </HoverMenu>
+            )}
+          </AntdThemeProvider>
         </div>
       </ResizableContainer>
     ),
diff --git a/superset-frontend/src/dashboard/components/gridComponents/Tab/Tab.test.tsx b/superset-frontend/src/dashboard/components/gridComponents/Tab/Tab.test.tsx
index 43bf712bf2c..23e5a5deedd 100644
--- a/superset-frontend/src/dashboard/components/gridComponents/Tab/Tab.test.tsx
+++ b/superset-frontend/src/dashboard/components/gridComponents/Tab/Tab.test.tsx
@@ -160,6 +160,44 @@ test('Render tab (no content)', () => {
   expect(getByTestId('dragdroppable-object')).toBeInTheDocument();
 });
 
+test('passes correct canEdit and editing props to EditableTitle', () => {
+  const props = createProps();
+
+  props.editMode = true;
+  props.isFocused = false;
+  props.renderType = 'RENDER_TAB';
+  render(<Tab {...props} />, {
+    useRedux: true,
+    useDnd: true,
+  });
+
+  expect(EditableTitle).toHaveBeenCalledWith(
+    expect.objectContaining({
+      title: '🚀 Aspiring Developers',
+      canEdit: true,
+      editing: false,
+    }),
+    expect.anything(),
+  );
+
+  (EditableTitle as jest.Mock).mockClear();
+
+  const focusedProps = { ...props, isFocused: true };
+  render(<Tab {...focusedProps} />, {
+    useRedux: true,
+    useDnd: true,
+  });
+
+  expect(EditableTitle).toHaveBeenCalledWith(
+    expect.objectContaining({
+      title: '🚀 Aspiring Developers',
+      canEdit: true,
+      editing: true,
+    }),
+    expect.anything(),
+  );
+});
+
 test('Render tab (no content) editMode:true', () => {
   const props = createProps();
   props.editMode = true;
diff --git a/superset-frontend/src/dashboard/components/gridComponents/Tab/Tab.tsx b/superset-frontend/src/dashboard/components/gridComponents/Tab/Tab.tsx
index 60c0da870c1..86ef757b4a7 100644
--- a/superset-frontend/src/dashboard/components/gridComponents/Tab/Tab.tsx
+++ b/superset-frontend/src/dashboard/components/gridComponents/Tab/Tab.tsx
@@ -446,7 +446,7 @@ const Tab = (props: TabProps): ReactElement => {
             title={component.meta.text}
             defaultTitle={component.meta.defaultText}
             placeholder={component.meta.placeholder}
-            canEdit={editMode && isFocused}
+            canEdit={editMode}
             onSaveTitle={handleChangeText}
             showTooltip={false}
             editing={editMode && isFocused}
diff --git a/superset-frontend/src/dashboard/components/menu/DownloadMenuItems/DownloadMenuItems.test.tsx b/superset-frontend/src/dashboard/components/menu/DownloadMenuItems/DownloadMenuItems.test.tsx
index aa10717b64f..86efc2860e0 100644
--- a/superset-frontend/src/dashboard/components/menu/DownloadMenuItems/DownloadMenuItems.test.tsx
+++ b/superset-frontend/src/dashboard/components/menu/DownloadMenuItems/DownloadMenuItems.test.tsx
@@ -24,7 +24,11 @@ import {
   waitFor,
 } from 'spec/helpers/testing-library';
 import { Menu, MenuItem } from '@superset-ui/core/components/Menu';
-import { SupersetClient } from '@superset-ui/core';
+import {
+  FeatureFlag,
+  isFeatureEnabled,
+  SupersetClient,
+} from '@superset-ui/core';
 import { useDownloadMenuItems } from '.';
 
 const mockAddSuccessToast = jest.fn();
@@ -41,6 +45,7 @@ jest.mock('src/components/MessageToasts/withToasts', () => ({
 
 jest.mock('@superset-ui/core', () => ({
   ...jest.requireActual('@superset-ui/core'),
+  isFeatureEnabled: jest.fn().mockReturnValue(false),
   SupersetClient: {
     get: jest.fn(),
   },
@@ -136,3 +141,108 @@ test('Export as Example shows error toast on failure', async () => {
     );
   });
 });
+
+const mockIsFeatureEnabled = isFeatureEnabled as jest.Mock;
+
+const MenuWrapperWithProps = (
+  overrides: Partial<ReturnType<typeof createProps>> & {
+    canExportImage?: boolean;
+  },
+) => {
+  const downloadMenuItem = useDownloadMenuItems({
+    ...createProps(),
+    ...overrides,
+  });
+  const menuItems: MenuItem[] = [downloadMenuItem];
+  return <Menu forceSubMenuRender items={menuItems} />;
+};
+
+test('Screenshot menu items should be disabled when GranularExportControls is ON and canExportImage is false', () => {
+  mockIsFeatureEnabled.mockImplementation(
+    (flag: string) => flag === FeatureFlag.GranularExportControls,
+  );
+
+  render(<MenuWrapperWithProps canExportImage={false} />, {
+    useRedux: true,
+  });
+
+  const pdfItem = screen
+    .getByText('Export to PDF')
+    .closest('[role="menuitem"]');
+  const imageItem = screen
+    .getByText('Download as Image')
+    .closest('[role="menuitem"]');
+  expect(pdfItem).toHaveAttribute('aria-disabled', 'true');
+  expect(imageItem).toHaveAttribute('aria-disabled', 'true');
+
+  mockIsFeatureEnabled.mockReset();
+});
+
+test('Screenshot menu items should be enabled when GranularExportControls is ON and canExportImage is true', () => {
+  mockIsFeatureEnabled.mockImplementation(
+    (flag: string) => flag === FeatureFlag.GranularExportControls,
+  );
+
+  render(<MenuWrapperWithProps canExportImage />, {
+    useRedux: true,
+  });
+
+  const pdfItem = screen
+    .getByText('Export to PDF')
+    .closest('[role="menuitem"]');
+  const imageItem = screen
+    .getByText('Download as Image')
+    .closest('[role="menuitem"]');
+  expect(pdfItem).not.toHaveAttribute('aria-disabled', 'true');
+  expect(imageItem).not.toHaveAttribute('aria-disabled', 'true');
+
+  mockIsFeatureEnabled.mockReset();
+});
+
+test('Screenshot menu items should not be disabled when canExportImage is not provided', () => {
+  mockIsFeatureEnabled.mockReturnValue(false);
+
+  render(<MenuWrapperWithProps />, {
+    useRedux: true,
+  });
+
+  const pdfItem = screen
+    .getByText('Export to PDF')
+    .closest('[role="menuitem"]');
+  const imageItem = screen
+    .getByText('Download as Image')
+    .closest('[role="menuitem"]');
+  expect(pdfItem).not.toHaveAttribute('aria-disabled', 'true');
+  expect(imageItem).not.toHaveAttribute('aria-disabled', 'true');
+
+  mockIsFeatureEnabled.mockReset();
+});
+
+test('Disabled screenshot items should show tooltip icon when GranularExportControls is ON', () => {
+  mockIsFeatureEnabled.mockImplementation(
+    (flag: string) => flag === FeatureFlag.GranularExportControls,
+  );
+
+  render(<MenuWrapperWithProps canExportImage={false} />, {
+    useRedux: true,
+  });
+
+  const tooltipTriggers = screen.getAllByTestId('tooltip-trigger');
+  expect(tooltipTriggers.length).toBeGreaterThanOrEqual(2);
+
+  mockIsFeatureEnabled.mockReset();
+});
+
+test('Enabled screenshot items should not show tooltip icon', () => {
+  mockIsFeatureEnabled.mockImplementation(
+    (flag: string) => flag === FeatureFlag.GranularExportControls,
+  );
+
+  render(<MenuWrapperWithProps canExportImage />, {
+    useRedux: true,
+  });
+
+  expect(screen.queryByTestId('tooltip-trigger')).not.toBeInTheDocument();
+
+  mockIsFeatureEnabled.mockReset();
+});
diff --git a/superset-frontend/src/dashboard/components/menu/DownloadMenuItems/index.tsx b/superset-frontend/src/dashboard/components/menu/DownloadMenuItems/index.tsx
index d30d552974d..f46b0596702 100644
--- a/superset-frontend/src/dashboard/components/menu/DownloadMenuItems/index.tsx
+++ b/superset-frontend/src/dashboard/components/menu/DownloadMenuItems/index.tsx
@@ -37,6 +37,7 @@ import {
 } from 'src/logger/LogUtils';
 import { useToasts } from 'src/components/MessageToasts/withToasts';
 
+import { MenuItemTooltip } from 'src/components/Chart/DisabledMenuItemTooltip';
 import { DownloadScreenshotFormat } from './types';
 
 export interface UseDownloadMenuItemsProps {
@@ -48,6 +49,7 @@ export interface UseDownloadMenuItemsProps {
   title: string;
   disabled?: boolean;
   userCanExport?: boolean;
+  canExportImage?: boolean;
 }
 
 export const useDownloadMenuItems = (
@@ -62,6 +64,7 @@ export const useDownloadMenuItems = (
     disabled,
     title,
     userCanExport,
+    canExportImage,
   } = props;
 
   const { addDangerToast, addSuccessToast } = useToasts();
@@ -150,28 +153,46 @@ export const useDownloadMenuItems = (
     }
   };
 
+  const imageDisabled = canExportImage === false;
+
+  const imageExportLabel = (text: string) =>
+    imageDisabled ? (
+      <span>
+        {text}
+        <MenuItemTooltip
+          title={t("You don't have permission to export images")}
+        />
+      </span>
+    ) : (
+      text
+    );
+
   const screenshotMenuItems: MenuItem[] = isWebDriverScreenshotEnabled
     ? [
         {
           key: DownloadScreenshotFormat.PDF,
-          label: pdfMenuItemTitle,
+          label: imageExportLabel(pdfMenuItemTitle),
+          disabled: imageDisabled,
           onClick: () => downloadScreenshot(DownloadScreenshotFormat.PDF),
         },
         {
           key: DownloadScreenshotFormat.PNG,
-          label: imageMenuItemTitle,
+          label: imageExportLabel(imageMenuItemTitle),
+          disabled: imageDisabled,
           onClick: () => downloadScreenshot(DownloadScreenshotFormat.PNG),
         },
       ]
     : [
         {
           key: 'download-pdf',
-          label: pdfMenuItemTitle,
+          label: imageExportLabel(pdfMenuItemTitle),
+          disabled: imageDisabled,
           onClick: (e: any) => onDownloadPdf(e.domEvent),
         },
         {
           key: 'download-image',
-          label: imageMenuItemTitle,
+          label: imageExportLabel(imageMenuItemTitle),
+          disabled: imageDisabled,
           onClick: (e: any) => onDownloadImage(e.domEvent),
         },
       ];
diff --git a/superset-frontend/src/dashboard/components/menu/ShareMenuItems/ShareMenuItems.test.tsx b/superset-frontend/src/dashboard/components/menu/ShareMenuItems/ShareMenuItems.test.tsx
index 3e137d2c874..476487563a3 100644
--- a/superset-frontend/src/dashboard/components/menu/ShareMenuItems/ShareMenuItems.test.tsx
+++ b/superset-frontend/src/dashboard/components/menu/ShareMenuItems/ShareMenuItems.test.tsx
@@ -45,13 +45,16 @@ const createProps = () => ({
   submenuKey: 'share',
 });
 
-const { location } = window;
+const originalLocation = window.location;
 
 const postDashboardPermalinkMockUrl = `http://localhost/api/v1/dashboard/${DASHBOARD_ID}/permalink`;
 
-beforeAll((): void => {
+beforeEach(() => {
+  jest.clearAllMocks();
   // @ts-expect-error
   delete window.location;
+  window.location = { href: '' } as any;
+  fetchMock.clearHistory().removeRoutes();
   fetchMock.post(
     postDashboardPermalinkMockUrl,
     { key: '123', url: 'http://localhost/superset/dashboard/p/123/' },
@@ -59,15 +62,10 @@ beforeAll((): void => {
   );
 });
 
-beforeEach(() => {
-  jest.clearAllMocks();
-  window.location = {
-    href: '',
-  } as any;
-});
-
-afterAll((): void => {
-  window.location = location;
+afterEach(() => {
+  window.location = originalLocation;
+  window.featureFlags = {};
+  fetchMock.clearHistory().removeRoutes();
 });
 
 const MenuWrapper = (
@@ -113,7 +111,7 @@ test('Click on "Copy dashboard URL" and succeed', async () => {
     expect(props.addDangerToast).toHaveBeenCalledTimes(0);
   });
 
-  userEvent.click(screen.getByText('Copy dashboard URL'));
+  await userEvent.click(screen.getByText('Copy dashboard URL'));
 
   await waitFor(async () => {
     expect(spy).toHaveBeenCalledTimes(1);
@@ -145,7 +143,7 @@ test('Click on "Copy dashboard URL" and fail', async () => {
     expect(props.addDangerToast).toHaveBeenCalledTimes(0);
   });
 
-  userEvent.click(screen.getByText('Copy dashboard URL'));
+  await userEvent.click(screen.getByText('Copy dashboard URL'));
 
   await waitFor(async () => {
     expect(spy).toHaveBeenCalledTimes(1);
@@ -177,7 +175,7 @@ test('Click on "Share dashboard by email" and succeed', async () => {
     expect(window.location.href).toBe('');
   });
 
-  userEvent.click(screen.getByText('Share dashboard by email'));
+  await userEvent.click(screen.getByText('Share dashboard by email'));
 
   await waitFor(() => {
     expect(props.addDangerToast).toHaveBeenCalledTimes(0);
@@ -189,11 +187,7 @@ test('Click on "Share dashboard by email" and succeed', async () => {
 
 test('Click on "Share dashboard by email" and fail', async () => {
   fetchMock.removeRoute(postDashboardPermalinkMockUrl);
-  fetchMock.post(
-    `http://localhost/api/v1/dashboard/${DASHBOARD_ID}/permalink`,
-    { status: 404 },
-    { name: postDashboardPermalinkMockUrl },
-  );
+  fetchMock.post(postDashboardPermalinkMockUrl, { status: 404 });
   const props = createProps();
   render(
     <MenuWrapper
@@ -211,7 +205,7 @@ test('Click on "Share dashboard by email" and fail', async () => {
     expect(window.location.href).toBe('');
   });
 
-  userEvent.click(screen.getByText('Share dashboard by email'));
+  await userEvent.click(screen.getByText('Share dashboard by email'));
 
   await waitFor(() => {
     expect(window.location.href).toBe('');
diff --git a/superset-frontend/src/dashboard/components/nativeFilters/ConfigModal/SharedStyles.tsx b/superset-frontend/src/dashboard/components/nativeFilters/ConfigModal/SharedStyles.tsx
index b51ac560722..eccae1077d9 100644
--- a/superset-frontend/src/dashboard/components/nativeFilters/ConfigModal/SharedStyles.tsx
+++ b/superset-frontend/src/dashboard/components/nativeFilters/ConfigModal/SharedStyles.tsx
@@ -75,6 +75,7 @@ export const BaseModalWrapper = styled(StyledModal)<BaseModalWrapperProps>`
 export const BaseModalBody = styled.div<BaseModalBodyProps>`
   display: flex;
   height: 100%;
+  min-height: 500px;
   flex-direction: row;
   flex: 1;
 
diff --git a/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/ActionButtons/ActionButtons.test.tsx b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/ActionButtons/ActionButtons.test.tsx
index c6ce03e0398..2e4a0ad1dda 100644
--- a/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/ActionButtons/ActionButtons.test.tsx
+++ b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/ActionButtons/ActionButtons.test.tsx
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { OPEN_FILTER_BAR_WIDTH } from 'src/dashboard/constants';
 import { render, screen, userEvent } from 'spec/helpers/testing-library';
 import ActionButtons from './index';
 
@@ -76,30 +75,3 @@ test('should apply', () => {
   userEvent.click(applyBtn);
   expect(mockedProps.onApply).toHaveBeenCalled();
 });
-
-// eslint-disable-next-line no-restricted-globals -- TODO: Migrate from describe blocks
-describe('custom width', () => {
-  test('sets its default width with OPEN_FILTER_BAR_WIDTH', () => {
-    const mockedProps = createProps();
-    render(<ActionButtons {...mockedProps} />, { useRedux: true });
-    const container = screen.getByTestId('filterbar-action-buttons');
-    expect(container).toHaveStyle({
-      width: `${OPEN_FILTER_BAR_WIDTH - 1}px`,
-    });
-  });
-
-  test('sets custom width', () => {
-    const mockedProps = createProps();
-    const expectedWidth = 423;
-    const { getByTestId } = render(
-      <ActionButtons {...mockedProps} width={expectedWidth} />,
-      {
-        useRedux: true,
-      },
-    );
-    const container = getByTestId('filterbar-action-buttons');
-    expect(container).toHaveStyle({
-      width: `${expectedWidth - 1}px`,
-    });
-  });
-});
diff --git a/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/ActionButtons/index.tsx b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/ActionButtons/index.tsx
index 7c685842946..7b0c671000b 100644
--- a/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/ActionButtons/index.tsx
+++ b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/ActionButtons/index.tsx
@@ -27,13 +27,11 @@ import {
 } from '@superset-ui/core';
 import { css, SupersetTheme, styled } from '@apache-superset/core/theme';
 import { Button, Tooltip, Icons, Flex } from '@superset-ui/core/components';
-import { OPEN_FILTER_BAR_WIDTH } from 'src/dashboard/constants';
 import tinycolor from 'tinycolor2';
 import { FilterBarOrientation } from 'src/dashboard/types';
 import { getFilterBarTestId } from '../utils';
 
 interface ActionButtonsProps {
-  width?: number;
   onApply: () => void;
   onClearAll: () => void;
   dataMaskSelected: DataMaskState;
@@ -44,17 +42,16 @@ interface ActionButtonsProps {
   hasOutOfScopeRequiredFilters?: boolean;
 }
 
-const ButtonsContainer = styled.div<{ isVertical: boolean; width: number }>`
-  ${({ theme, isVertical, width }) => css`
+const ButtonsContainer = styled.div<{ isVertical: boolean }>`
+  ${({ theme, isVertical }) => css`
     display: flex;
 
     ${isVertical
       ? css`
           flex-direction: column;
           align-items: center;
-          position: fixed;
+          position: sticky;
           z-index: 100;
-          width: ${width - 1}px;
           bottom: 0;
           padding: ${theme.sizeUnit * 4}px;
           padding-top: ${theme.sizeUnit * 6}px;
@@ -100,7 +97,6 @@ const clearAllButtonStyle = (theme: SupersetTheme, isVertical: boolean) => css`
 `;
 
 const ActionButtons = ({
-  width = OPEN_FILTER_BAR_WIDTH,
   onApply,
   onClearAll,
   dataMaskApplied,
@@ -143,7 +139,6 @@ const ActionButtons = ({
   return (
     <ButtonsContainer
       isVertical={isVertical}
-      width={width}
       data-test="filterbar-action-buttons"
     >
       <Button
diff --git a/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterBar.test.tsx b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterBar.test.tsx
index 2ece961fd33..d00093f0c51 100644
--- a/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterBar.test.tsx
+++ b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterBar.test.tsx
@@ -17,7 +17,13 @@
  * under the License.
  */
 
-import { act, render, screen, userEvent } from 'spec/helpers/testing-library';
+import {
+  act,
+  fireEvent,
+  render,
+  screen,
+  userEvent,
+} from 'spec/helpers/testing-library';
 import { stateWithoutNativeFilters } from 'spec/fixtures/mockStore';
 import { testWithId } from 'src/utils/testUtils';
 import { Preset, makeApi } from '@superset-ui/core';
@@ -387,6 +393,15 @@ test('FilterBar apply button is disabled after creating a filter', async () => {
   userEvent.click(screen.getByTestId(getTestId('collapsable')));
   userEvent.click(screen.getByLabelText('setting'));
   userEvent.click(screen.getByText('Add or edit filters and controls'));
+
+  // First add a filter via the dropdown (modal now shows empty state by default)
+  const dropdownButton = screen.getByTestId('new-item-dropdown-button');
+  fireEvent.mouseEnter(dropdownButton);
+  const addFilterMenuItem = await screen.findByRole('menuitem', {
+    name: /add filter/i,
+  });
+  fireEvent.click(addFilterMenuItem);
+
   userEvent.click(screen.getByText('Value'));
   userEvent.click(screen.getByText('Time range'));
   userEvent.type(
diff --git a/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterBarSettings/index.tsx b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterBarSettings/index.tsx
index 199287e678d..018c8dd14b3 100644
--- a/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterBarSettings/index.tsx
+++ b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterBarSettings/index.tsx
@@ -84,7 +84,7 @@ const FilterBarSettings = () => {
 
   const { openFilterConfigModal, FilterConfigModalComponent } =
     useFilterConfigModal({
-      createNewOnOpen: filterValues.length === 0,
+      createNewOnOpen: false,
       dashboardId,
     });
 
diff --git a/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterControls/FilterControl.test.tsx b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterControls/FilterControl.test.tsx
new file mode 100644
index 00000000000..56a1571eb14
--- /dev/null
+++ b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterControls/FilterControl.test.tsx
@@ -0,0 +1,99 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+import { ReactNode } from 'react';
+import { render, screen } from 'spec/helpers/testing-library';
+import {
+  ChartCustomization,
+  ChartCustomizationType,
+  Filter,
+  NativeFilterType,
+} from '@superset-ui/core';
+import { ChartCustomizationPlugins } from 'src/constants';
+import FilterControl from './FilterControl';
+
+jest.mock('src/dashboard/components/nativeFilters/state', () => ({
+  useIsFilterInScope: () => () => false,
+}));
+
+jest.mock('../Vertical', () => {
+  const { createContext } = require('react');
+  return {
+    FilterBarScrollContext: createContext(false),
+  };
+});
+
+jest.mock('./FilterValue', () => () => null);
+
+jest.mock('../../FilterCard', () => ({
+  FilterCard: ({ children }: { children: ReactNode }) => <>{children}</>,
+}));
+
+jest.mock('./GroupByFilterCard', () => () => null);
+
+jest.mock('../utils', () => ({
+  checkIsMissingRequiredValue: () => false,
+}));
+
+jest.mock('react-reverse-portal', () => ({
+  createHtmlPortalNode: () => ({}),
+  InPortal: ({ children }: { children: ReactNode }) => <>{children}</>,
+  OutPortal: () => null,
+}));
+
+const deckglFilter: ChartCustomization = {
+  id: 'filter1',
+  name: 'Layer Visibility',
+  filterType: ChartCustomizationPlugins.DeckglLayerVisibility,
+  type: ChartCustomizationType.ChartCustomization,
+  targets: [],
+  scope: { rootPath: [], excluded: [] },
+  controlValues: {},
+  defaultDataMask: {},
+};
+
+const nativeFilter: Filter = {
+  id: 'filter2',
+  name: 'Select Filter',
+  filterType: 'filter_select',
+  type: NativeFilterType.NativeFilter,
+  targets: [],
+  scope: { rootPath: [], excluded: [] },
+  controlValues: {},
+  defaultDataMask: {},
+  cascadeParentIds: [],
+  description: '',
+};
+
+test('renders DeckglLayerVisibilityTooltip for deckgl layer visibility filter type', () => {
+  render(
+    <FilterControl filter={deckglFilter} onFilterSelectionChange={jest.fn()} />,
+  );
+  expect(
+    screen.getByTestId('deckgl-layer-visibility-tooltip-icon'),
+  ).toBeInTheDocument();
+});
+
+test('does not render DeckglLayerVisibilityTooltip for standard filter type', () => {
+  render(
+    <FilterControl filter={nativeFilter} onFilterSelectionChange={jest.fn()} />,
+  );
+  expect(
+    screen.queryByTestId('deckgl-layer-visibility-tooltip-icon'),
+  ).not.toBeInTheDocument();
+});
diff --git a/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterControls/FilterControl.tsx b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterControls/FilterControl.tsx
index 3d41fed342b..6c95cc4a28f 100644
--- a/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterControls/FilterControl.tsx
+++ b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterControls/FilterControl.tsx
@@ -24,6 +24,7 @@ import {
 } from 'react-reverse-portal';
 import { FilterBarOrientation } from 'src/dashboard/types';
 import { isChartCustomization } from '@superset-ui/core';
+import { ChartCustomizationPlugins } from 'src/constants';
 import { checkIsMissingRequiredValue } from '../utils';
 import FilterValue from './FilterValue';
 import { FilterCard } from '../../FilterCard';
@@ -35,6 +36,7 @@ import {
   FilterStyledIcon,
   RequiredFieldIndicator,
   DescriptionToolTip,
+  DeckglLayerVisibilityTooltip,
   useFilterControlDisplay,
 } from './FilterControlShared';
 import GroupByFilterCard from './GroupByFilterCard';
@@ -85,6 +87,10 @@ const FilterControl = ({
         {filter.description?.trim() && (
           <DescriptionToolTip description={filter.description} />
         )}
+        {filter.filterType ===
+          ChartCustomizationPlugins.DeckglLayerVisibility && (
+          <DeckglLayerVisibilityTooltip />
+        )}
         <FilterStyledIcon data-test="filter-icon">{icon}</FilterStyledIcon>
       </FilterControlTitleBox>
     ),
@@ -94,6 +100,7 @@ const FilterControl = ({
       name,
       isRequired,
       filter.description,
+      filter.filterType,
       icon,
     ],
   );
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/test/utils/getPointsFromPolygon.test.ts b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterControls/FilterControlShared.test.tsx
similarity index 52%
rename from superset-frontend/plugins/legacy-preset-chart-deckgl/test/utils/getPointsFromPolygon.test.ts
rename to superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterControls/FilterControlShared.test.tsx
index f722db31fe4..86574aff04c 100644
--- a/superset-frontend/plugins/legacy-preset-chart-deckgl/test/utils/getPointsFromPolygon.test.ts
+++ b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterControls/FilterControlShared.test.tsx
@@ -16,41 +16,19 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import getPointsFromPolygon from '../../src/utils/getPointsFromPolygon';
+import { render, screen, userEvent } from 'spec/helpers/testing-library';
+import { DeckglLayerVisibilityTooltip } from './FilterControlShared';
 
-describe('getPointsFromPolygon', () => {
-  test('handle original input', () => {
-    expect(
-      getPointsFromPolygon({
-        polygon: [
-          [1, 2],
-          [3, 4],
-        ],
-      }),
-    ).toEqual([
-      [1, 2],
-      [3, 4],
-    ]);
-  });
-  test('handle geojson features', () => {
-    expect(
-      getPointsFromPolygon({
-        polygon: {
-          type: 'Feature',
-          geometry: {
-            type: 'Polygon',
-            coordinates: [
-              [
-                [1, 2],
-                [3, 4],
-              ],
-            ],
-          },
-        },
-      }),
-    ).toEqual([
-      [1, 2],
-      [3, 4],
-    ]);
-  });
+test('renders DeckglLayerVisibilityTooltip with icon button', () => {
+  render(<DeckglLayerVisibilityTooltip />);
+  expect(screen.getByRole('button')).toBeInTheDocument();
+});
+
+test('shows tooltip content on hover for DeckglLayerVisibilityTooltip', async () => {
+  render(<DeckglLayerVisibilityTooltip />);
+  userEvent.hover(screen.getByRole('button'));
+  const tooltip = await screen.findByRole('tooltip');
+  expect(tooltip).toHaveTextContent(
+    'Choose layers to hide from all deck.gl Multiple Layer charts in this dashboard.',
+  );
 });
diff --git a/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterControls/FilterControlShared.tsx b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterControls/FilterControlShared.tsx
index e7e06439e87..68e407c4719 100644
--- a/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterControls/FilterControlShared.tsx
+++ b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterControls/FilterControlShared.tsx
@@ -19,6 +19,7 @@
 import { useMemo } from 'react';
 import { truncationCSS } from '@superset-ui/core';
 import { styled, SupersetTheme } from '@apache-superset/core/theme';
+import { t } from '@apache-superset/core/translation';
 import {
   FormItem as StyledFormItem,
   Form,
@@ -201,6 +202,10 @@ const ToolTipContainer = styled.div`
   display: flex;
 `;
 
+const StyledInfoCircleOutlined = styled(Icons.InfoCircleOutlined)`
+  padding-left: ${({ theme }) => theme.sizeUnit}px;
+`;
+
 export const RequiredFieldIndicator = () => (
   <span
     css={(theme: SupersetTheme) => ({
@@ -231,12 +236,23 @@ export const DescriptionToolTip = ({
         whiteSpace: 'normal',
       }}
     >
-      <Icons.InfoCircleOutlined
+      <StyledInfoCircleOutlined className="text-muted" role="button" />
+    </Tooltip>
+  </ToolTipContainer>
+);
+
+export const DeckglLayerVisibilityTooltip = () => (
+  <ToolTipContainer>
+    <Tooltip
+      title={t(
+        'Choose layers to hide from all deck.gl Multiple Layer charts in this dashboard.',
+      )}
+      placement="right"
+    >
+      <StyledInfoCircleOutlined
         className="text-muted"
         role="button"
-        css={(theme: SupersetTheme) => ({
-          paddingLeft: `${theme.sizeUnit}px`,
-        })}
+        data-test="deckgl-layer-visibility-tooltip-icon"
       />
     </Tooltip>
   </ToolTipContainer>
diff --git a/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterControls/FilterControls.test.tsx b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterControls/FilterControls.test.tsx
index 9f4c6e8ed2a..935928bada0 100644
--- a/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterControls/FilterControls.test.tsx
+++ b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterControls/FilterControls.test.tsx
@@ -384,6 +384,19 @@ test('FilterControls should handle empty filters list', () => {
   expect(container).toBeInTheDocument();
 });
 
+test('does not render "Filters out of scope" when all filters are in scope', () => {
+  const state = getDefaultState(FilterBarOrientation.Vertical);
+
+  const { useSelector } = jest.requireMock('react-redux');
+  useSelector.mockImplementation((selector: (s: typeof state) => unknown) =>
+    selector(state),
+  );
+
+  setupWithFilters(state);
+
+  expect(screen.queryByText(/Filters out of scope/)).not.toBeInTheDocument();
+});
+
 test('FilterControls overflowedByIndex updates when filters change scope', () => {
   const state = getDefaultState(FilterBarOrientation.Vertical);
 
diff --git a/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterControls/FilterControls.tsx b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterControls/FilterControls.tsx
index 35efda04623..ac235b15320 100644
--- a/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterControls/FilterControls.tsx
+++ b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterControls/FilterControls.tsx
@@ -222,6 +222,11 @@ const FilterControls: FC<FilterControlsProps> = ({
     chartCustomization: true,
   });
 
+  const showFiltersOutOfScope =
+    showCollapsePanel &&
+    (hideHeader || sectionsOpen.filters) &&
+    filtersOutOfScope.length > 0;
+
   const toggleSection = useCallback((section: keyof typeof sectionsOpen) => {
     setSectionsOpen(prev => ({
       ...prev,
@@ -343,7 +348,7 @@ const FilterControls: FC<FilterControlsProps> = ({
           </SectionContainer>
         )}
 
-        {showCollapsePanel && (hideHeader || sectionsOpen.filters) && (
+        {showFiltersOutOfScope && (
           <FiltersOutOfScopeCollapsible
             filtersOutOfScope={filtersOutOfScope}
             renderer={renderer}
diff --git a/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterControls/FilterValue.timeGrain.test.ts b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterControls/FilterValue.timeGrain.test.ts
new file mode 100644
index 00000000000..6680e8e70b8
--- /dev/null
+++ b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterControls/FilterValue.timeGrain.test.ts
@@ -0,0 +1,60 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { ChartDataResponseResult } from '@superset-ui/core';
+import { applyTimeGrainAllowlist } from './FilterValue';
+
+const baseResults = [
+  {
+    data: [
+      { duration: 'PT1H', name: 'Hour' },
+      { duration: 'P1D', name: 'Day' },
+      { duration: 'P1W', name: 'Week' },
+      { duration: 'P1M', name: 'Month' },
+    ],
+  },
+] as unknown as ChartDataResponseResult[];
+
+test('applyTimeGrainAllowlist should filter to configured durations', () => {
+  const filtered = applyTimeGrainAllowlist(
+    'filter_timegrain',
+    ['PT1H', 'P1D', 'P1W'],
+    baseResults,
+  );
+
+  expect(filtered[0].data).toEqual([
+    { duration: 'PT1H', name: 'Hour' },
+    { duration: 'P1D', name: 'Day' },
+    { duration: 'P1W', name: 'Week' },
+  ]);
+});
+
+test('applyTimeGrainAllowlist should return unfiltered results for non-timegrain filters', () => {
+  const filtered = applyTimeGrainAllowlist(
+    'filter_select',
+    ['PT1H'],
+    baseResults,
+  );
+  expect(filtered).toEqual(baseResults);
+});
+
+test('applyTimeGrainAllowlist should return unfiltered results when allowlist is empty', () => {
+  const filtered = applyTimeGrainAllowlist('filter_timegrain', [], baseResults);
+  expect(filtered).toEqual(baseResults);
+});
diff --git a/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterControls/FilterValue.tsx b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterControls/FilterValue.tsx
index 5a71656a958..c23f2578718 100644
--- a/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterControls/FilterValue.tsx
+++ b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterControls/FilterValue.tsx
@@ -46,7 +46,7 @@ import { useDispatch, useSelector } from 'react-redux';
 import { isEqual, isEqualWith } from 'lodash';
 import { getChartDataRequest } from 'src/components/Chart/chartAction';
 import { ErrorAlert, ErrorMessageWithStackTrace } from 'src/components';
-import { Loading, Constants } from '@superset-ui/core/components';
+import { Loading, Constants, Flex } from '@superset-ui/core/components';
 import { waitForAsyncData } from 'src/middleware/asyncEvent';
 import { FilterBarOrientation, RootState } from 'src/dashboard/types';
 import {
@@ -61,7 +61,7 @@ import { RESPONSIVE_WIDTH } from 'src/filters/components/common';
 import { dispatchHoverAction, dispatchFocusAction } from './utils';
 import { FilterControlProps } from './types';
 import { getFormData } from '../../utils';
-import { useFilterDependencies } from './state';
+import { useFilterDependencies, useTransitiveParentIds } from './state';
 import { useFilterOutlined } from '../useFilterOutlined';
 
 const HEIGHT = 32;
@@ -84,6 +84,35 @@ const StyledDiv = styled.div<{
 
 const queriesDataPlaceholder = [{ data: [{}] }];
 
+type TimeGrainFilterConfig = {
+  time_grains?: string[];
+};
+
+export const applyTimeGrainAllowlist = (
+  filterType: string,
+  allowedTimeGrains: string[] | undefined,
+  results: ChartDataResponseResult[],
+): ChartDataResponseResult[] => {
+  if (filterType !== 'filter_timegrain' || !allowedTimeGrains?.length) {
+    return results;
+  }
+
+  return results.map(result => {
+    if (!Array.isArray(result.data)) {
+      return result;
+    }
+
+    return {
+      ...result,
+      data: result.data.filter(row =>
+        allowedTimeGrains.includes(
+          (row as { duration?: string }).duration ?? '',
+        ),
+      ),
+    };
+  });
+};
+
 const useShouldFilterRefresh = () => {
   const isDashboardRefreshing = useSelector<RootState, boolean>(
     state => state.dashboardState.isRefreshing,
@@ -114,11 +143,15 @@ const FilterValue: FC<FilterValueProps> = ({
 }) => {
   const { id, targets, filterType } = filter;
   const isCustomization = isChartCustomization(filter);
+  const allowedTimeGrains = isCustomization
+    ? undefined
+    : (filter as TimeGrainFilterConfig).time_grains;
   const adhocFilters = isCustomization ? undefined : filter.adhoc_filters;
   const timeRange = isCustomization ? undefined : filter.time_range;
   const granularitySqla = isCustomization ? undefined : filter.granularity_sqla;
   const metadata = getChartMetadataRegistry().get(filterType);
   const dependencies = useFilterDependencies(id, dataMaskSelected);
+  const transitiveParentIds = useTransitiveParentIds(id);
   const shouldRefresh = useShouldFilterRefresh();
 
   const behaviors = useMemo(
@@ -128,6 +161,8 @@ const FilterValue: FC<FilterValueProps> = ({
     [isCustomization],
   );
   const [state, setState] = useState<ChartDataResponseResult[]>([]);
+  const hasDeps = Boolean(filter.cascadeParentIds?.length);
+  const [hasDepsFilterValue, setHasDepsFilterValue] = useState(hasDeps);
   const dashboardId = useSelector<RootState, number>(
     state => state.dashboardInfo.id,
   );
@@ -160,6 +195,10 @@ const FilterValue: FC<FilterValueProps> = ({
     }
   }, [dispatch, shouldRefresh]);
 
+  useEffect(() => {
+    setHasDepsFilterValue(hasDeps);
+  }, [hasDeps]);
+
   useEffect(() => {
     if (!inViewFirstTime && inView) {
       setInViewFirstTime(true);
@@ -181,32 +220,38 @@ const FilterValue: FC<FilterValueProps> = ({
       dashboardId,
     });
     const filterOwnState = filter.dataMask?.ownState || {};
-    if ((filter.cascadeParentIds ?? []).length) {
-      // Prevent unnecessary backend requests by validating parent filter selections first
+    if (transitiveParentIds.length) {
+      // Prevent unnecessary backend requests by validating ancestor filter
+      // selections first. We walk the full transitive ancestor chain (not just
+      // direct parents) so the counts line up with `dependencies`, which is
+      // itself built from the transitive chain by `useFilterDependencies`.
 
       let selectedParentFilterValueCounts = 0;
-
-      (filter.cascadeParentIds ?? []).forEach(pId => {
+      let isTimeRangeSelected = false;
+      transitiveParentIds.forEach(pId => {
         const extraFormData = dataMaskSelected?.[pId]?.extraFormData;
         if (extraFormData?.filters?.length) {
           selectedParentFilterValueCounts += extraFormData.filters.length;
-        } else if (extraFormData?.time_range) {
-          selectedParentFilterValueCounts += 1;
+        }
+        if (extraFormData?.time_range) {
+          isTimeRangeSelected = true;
         }
       });
 
-      // check if all parent filters with defaults have a value selected
+      // check if all ancestor filters with defaults have a value selected
 
-      let depsCount = dependencies.filters?.length ?? 0;
+      const depsCount = dependencies.filters?.length ?? 0;
+      const hasTimeRangeDeps = Boolean(dependencies?.time_range);
 
-      if (dependencies?.time_range) {
-        depsCount += 1;
-      }
-      if (selectedParentFilterValueCounts !== depsCount) {
+      if (
+        selectedParentFilterValueCounts !== depsCount ||
+        (hasTimeRangeDeps && !isTimeRangeSelected)
+      ) {
         // child filter should not request backend until it
-        // has all the required information from parent filters
+        // has all the required information from ancestor filters
         return;
       }
+      setHasDepsFilterValue(false);
     }
 
     // TODO: We should try to improve our useEffect hooks to depend more on
@@ -238,12 +283,24 @@ const FilterValue: FC<FilterValueProps> = ({
             // deal with getChartDataRequest transforming the response data
             const result = 'result' in json ? json.result[0] : json;
             if (response.status === 200) {
-              setState([result as ChartDataResponseResult]);
+              setState(
+                applyTimeGrainAllowlist(filterType, allowedTimeGrains, [
+                  result as ChartDataResponseResult,
+                ]),
+              );
+              setError(undefined);
               handleFilterLoadFinish();
             } else if (response.status === 202) {
               waitForAsyncData(result as Parameters<typeof waitForAsyncData>[0])
                 .then((asyncResult: ChartDataResponseResult[]) => {
-                  setState(asyncResult);
+                  setState(
+                    applyTimeGrainAllowlist(
+                      filterType,
+                      allowedTimeGrains,
+                      asyncResult,
+                    ),
+                  );
+                  setError(undefined);
                   handleFilterLoadFinish();
                 })
                 .catch((error: Response) => {
@@ -258,7 +315,13 @@ const FilterValue: FC<FilterValueProps> = ({
               );
             }
           } else {
-            setState(json.result as ChartDataResponseResult[]);
+            setState(
+              applyTimeGrainAllowlist(
+                filterType,
+                allowedTimeGrains,
+                json.result as ChartDataResponseResult[],
+              ),
+            );
             setError(undefined);
             handleFilterLoadFinish();
           }
@@ -277,10 +340,13 @@ const FilterValue: FC<FilterValueProps> = ({
     groupby,
     handleFilterLoadFinish,
     filter,
+    allowedTimeGrains,
     hasDataSource,
     isRefreshing,
     shouldRefresh,
     dataMaskSelected,
+    setHasDepsFilterValue,
+    transitiveParentIds,
   ]);
 
   useEffect(() => {
@@ -397,7 +463,12 @@ const FilterValue: FC<FilterValueProps> = ({
       overflow={overflow}
     >
       {isLoading ? (
-        <Loading position="inline-centered" size="s" muted />
+        <Flex align="center">
+          <Loading position="inline" size="s" muted />
+          {hasDepsFilterValue
+            ? t('Awaiting filter selection')
+            : t('Loading filter values')}
+        </Flex>
       ) : (
         <SuperChart
           height={HEIGHT}
diff --git a/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterControls/state.test.ts b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterControls/state.test.ts
new file mode 100644
index 00000000000..a83b50b1ca2
--- /dev/null
+++ b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterControls/state.test.ts
@@ -0,0 +1,177 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+import { renderHook } from '@testing-library/react-hooks';
+import { Provider } from 'react-redux';
+import configureStore from 'redux-mock-store';
+import { createElement } from 'react';
+import type { ReactNode } from 'react';
+import type { DataMaskStateWithId } from '@superset-ui/core';
+import {
+  FilterConfigMap,
+  resolveTransitiveParentIds,
+} from '../../dependencyGraph';
+import { useFilterDependencies, useTransitiveParentIds } from './state';
+
+const mockStore = configureStore([]);
+
+const buildWrapper = (filters: FilterConfigMap) => {
+  const store = mockStore({ nativeFilters: { filters } });
+  return ({ children }: { children: ReactNode }) =>
+    createElement(Provider, { store }, children);
+};
+
+test('resolveTransitiveParentIds returns empty for a filter with no parents', () => {
+  expect(
+    resolveTransitiveParentIds('A', {
+      A: { cascadeParentIds: [] },
+    }),
+  ).toEqual([]);
+});
+
+test('resolveTransitiveParentIds walks a linear chain A -> B -> C -> D', () => {
+  // D depends on C, C on B, B on A; each level only lists its direct parent.
+  const result = resolveTransitiveParentIds('D', {
+    A: { cascadeParentIds: [] },
+    B: { cascadeParentIds: ['A'] },
+    C: { cascadeParentIds: ['B'] },
+    D: { cascadeParentIds: ['C'] },
+  });
+  // Furthest ancestor first, closest parent last.
+  expect(result).toEqual(['A', 'B', 'C']);
+});
+
+test('resolveTransitiveParentIds deduplicates shared ancestors in a diamond', () => {
+  //      A
+  //    /  \
+  //   B    C
+  //    \  /
+  //     D
+  const result = resolveTransitiveParentIds('D', {
+    A: { cascadeParentIds: [] },
+    B: { cascadeParentIds: ['A'] },
+    C: { cascadeParentIds: ['A'] },
+    D: { cascadeParentIds: ['B', 'C'] },
+  });
+  expect(result).toContain('A');
+  expect(result).toContain('B');
+  expect(result).toContain('C');
+  // A should only appear once even though reachable via B and C.
+  expect(result.filter(id => id === 'A')).toHaveLength(1);
+});
+
+test('resolveTransitiveParentIds defends against cyclic configuration', () => {
+  // Filter config modal enforces acyclicity, but malformed saved state
+  // should not spin forever here.
+  const result = resolveTransitiveParentIds('A', {
+    A: { cascadeParentIds: ['B'] },
+    B: { cascadeParentIds: ['A'] },
+  });
+  expect(result).toEqual(['B']);
+});
+
+test('resolveTransitiveParentIds tolerates missing filter entries', () => {
+  // Unknown parent id referenced in cascadeParentIds should not crash.
+  expect(
+    resolveTransitiveParentIds('X', {
+      X: { cascadeParentIds: ['Y'] },
+    }),
+  ).toEqual(['Y']);
+});
+
+test('useTransitiveParentIds reads filter config from redux', () => {
+  const wrapper = buildWrapper({
+    A: { cascadeParentIds: [] },
+    B: { cascadeParentIds: ['A'] },
+    C: { cascadeParentIds: ['B'] },
+  });
+  const { result } = renderHook(() => useTransitiveParentIds('C'), { wrapper });
+  expect(result.current).toEqual(['A', 'B']);
+});
+
+test('useFilterDependencies merges extraFormData across the full chain', () => {
+  // Regression test for sc-102912: a chain A -> B -> C -> D where each level
+  // only lists its direct parent must still produce extra_form_data that
+  // includes clauses from every ancestor, not just the closest parent.
+  const wrapper = buildWrapper({
+    A: { cascadeParentIds: [] },
+    B: { cascadeParentIds: ['A'] },
+    C: { cascadeParentIds: ['B'] },
+    D: { cascadeParentIds: ['C'] },
+  });
+  const dataMaskSelected: DataMaskStateWithId = {
+    A: {
+      id: 'A',
+      extraFormData: { filters: [{ col: 'country', op: 'IN', val: ['US'] }] },
+    },
+    B: {
+      id: 'B',
+      extraFormData: { filters: [{ col: 'region', op: 'IN', val: ['West'] }] },
+    },
+    C: {
+      id: 'C',
+      extraFormData: { filters: [{ col: 'state', op: 'IN', val: ['CA'] }] },
+    },
+  };
+  const { result } = renderHook(
+    () => useFilterDependencies('D', dataMaskSelected),
+    { wrapper },
+  );
+  const cols = (result.current.filters ?? []).map(f => f.col);
+  // All three ancestor clauses must be present.
+  expect(cols).toEqual(expect.arrayContaining(['country', 'region', 'state']));
+  expect(result.current.filters ?? []).toHaveLength(3);
+});
+
+test('useFilterDependencies lets the closest ancestor override scalar fields', () => {
+  // `mergeExtraFormData` appends filter arrays but overrides scalar fields
+  // like `time_range`. Topological order must put the closest parent last so
+  // its scalar overrides win over further ancestors.
+  const wrapper = buildWrapper({
+    A: { cascadeParentIds: [] },
+    B: { cascadeParentIds: ['A'] },
+    C: { cascadeParentIds: ['B'] },
+  });
+  const dataMaskSelected: DataMaskStateWithId = {
+    A: {
+      id: 'A',
+      extraFormData: { time_range: 'Last year' },
+    },
+    B: {
+      id: 'B',
+      extraFormData: { time_range: 'Last month' },
+    },
+  };
+  const { result } = renderHook(
+    () => useFilterDependencies('C', dataMaskSelected),
+    { wrapper },
+  );
+  // B is C's closest ancestor with a time_range, so it should win over A.
+  expect(result.current.time_range).toBe('Last month');
+});
+
+test('useFilterDependencies returns empty object when parent state is missing', () => {
+  const wrapper = buildWrapper({
+    A: { cascadeParentIds: [] },
+    B: { cascadeParentIds: ['A'] },
+  });
+  const { result } = renderHook(() => useFilterDependencies('B', {}), {
+    wrapper,
+  });
+  expect(result.current).toEqual({});
+});
diff --git a/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterControls/state.ts b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterControls/state.ts
index bb5b5c2672e..37d5e809256 100644
--- a/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterControls/state.ts
+++ b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterControls/state.ts
@@ -18,25 +18,41 @@
  */
 import { useMemo } from 'react';
 import { shallowEqual, useSelector } from 'react-redux';
-import {
-  DataMaskStateWithId,
-  ensureIsArray,
-  ExtraFormData,
-} from '@superset-ui/core';
+import { DataMaskStateWithId, ExtraFormData } from '@superset-ui/core';
+import { RootState } from 'src/dashboard/types';
 import { mergeExtraFormData } from '../../utils';
+import {
+  FilterConfigMap,
+  resolveTransitiveParentIds,
+} from '../../dependencyGraph';
+
+/**
+ * Resolve the transitive ancestor ids for a given filter from the live
+ * native-filter configuration in Redux. Shared between
+ * `useFilterDependencies` and the readiness guard in `FilterValue` so they
+ * always agree on which parents count.
+ */
+export function useTransitiveParentIds(id: string): string[] {
+  const filterConfig = useSelector<RootState, FilterConfigMap | undefined>(
+    state => state.nativeFilters?.filters,
+    shallowEqual,
+  );
+
+  return useMemo(
+    () => resolveTransitiveParentIds(id, filterConfig ?? {}),
+    [id, filterConfig],
+  );
+}
 
-// eslint-disable-next-line import/prefer-default-export
 export function useFilterDependencies(
   id: string,
   dataMaskSelected?: DataMaskStateWithId,
 ): ExtraFormData {
-  const dependencyIds = useSelector<any, string[] | undefined>(
-    state => state.nativeFilters.filters[id]?.cascadeParentIds,
-    shallowEqual,
-  );
+  const dependencyIds = useTransitiveParentIds(id);
+
   return useMemo(() => {
-    let dependencies = {};
-    ensureIsArray(dependencyIds).forEach(parentId => {
+    let dependencies: ExtraFormData = {};
+    dependencyIds.forEach(parentId => {
       const parentState = dataMaskSelected?.[parentId];
       dependencies = mergeExtraFormData(
         dependencies,
diff --git a/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FiltersDropdownContent/FiltersDropdownContent.test.tsx b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FiltersDropdownContent/FiltersDropdownContent.test.tsx
new file mode 100644
index 00000000000..04cf8e192fc
--- /dev/null
+++ b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FiltersDropdownContent/FiltersDropdownContent.test.tsx
@@ -0,0 +1,71 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+import { render, screen } from 'spec/helpers/testing-library';
+import { Filter } from '@superset-ui/core';
+import { FiltersDropdownContent } from '.';
+
+const buildFilter = (id: string, name: string): Filter =>
+  ({
+    id,
+    name,
+    filterType: 'filter_select',
+    targets: [{ datasetId: 1, column: { name: 'country' } }],
+    defaultDataMask: {},
+    controlValues: {},
+    cascadeParentIds: [],
+    scope: { rootPath: ['ROOT_ID'], excluded: [] as string[] },
+  }) as unknown as Filter;
+
+const baseProps = {
+  overflowedCrossFilters: [],
+  filtersInScope: [buildFilter('filter-1', 'In Scope Filter')],
+  renderer: (filter: any) => <div key={filter.id}>{filter.name}</div>,
+  rendererCrossFilter: () => null,
+  showCollapsePanel: true,
+  forceRenderOutOfScope: false,
+};
+
+test('does not render "Filters out of scope" section when filtersOutOfScope is empty', () => {
+  render(<FiltersDropdownContent {...baseProps} filtersOutOfScope={[]} />);
+
+  expect(screen.queryByText(/Filters out of scope/)).not.toBeInTheDocument();
+});
+
+test('renders "Filters out of scope" section when one or more filters are out of scope', () => {
+  render(
+    <FiltersDropdownContent
+      {...baseProps}
+      filtersOutOfScope={[buildFilter('filter-2', 'Out of Scope Filter')]}
+    />,
+  );
+
+  expect(screen.getByText(/Filters out of scope/)).toBeInTheDocument();
+});
+
+test('does not render "Filters out of scope" section when showCollapsePanel is false', () => {
+  render(
+    <FiltersDropdownContent
+      {...baseProps}
+      showCollapsePanel={false}
+      filtersOutOfScope={[buildFilter('filter-2', 'Out of Scope Filter')]}
+    />,
+  );
+
+  expect(screen.queryByText(/Filters out of scope/)).not.toBeInTheDocument();
+});
diff --git a/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FiltersDropdownContent/index.tsx b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FiltersDropdownContent/index.tsx
index 07c3696eb8f..5900a9ec6e5 100644
--- a/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FiltersDropdownContent/index.tsx
+++ b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FiltersDropdownContent/index.tsx
@@ -61,7 +61,7 @@ export const FiltersDropdownContent = ({
       ),
     )}
     {filtersInScope.map(renderer)}
-    {showCollapsePanel && (
+    {showCollapsePanel && filtersOutOfScope.length > 0 && (
       <FiltersOutOfScopeCollapsible
         filtersOutOfScope={filtersOutOfScope}
         renderer={renderer}
diff --git a/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FiltersOutOfScopeCollapsible/index.tsx b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FiltersOutOfScopeCollapsible/index.tsx
index 7c9a2262907..43d4edec9b1 100644
--- a/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FiltersOutOfScopeCollapsible/index.tsx
+++ b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FiltersOutOfScopeCollapsible/index.tsx
@@ -37,7 +37,6 @@ export const FiltersOutOfScopeCollapsible = ({
     ghost
     bordered
     expandIconPosition="end"
-    collapsible={filtersOutOfScope.length === 0 ? 'disabled' : undefined}
     items={[
       {
         key: 'out-of-scope-filters',
diff --git a/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/Vertical.tsx b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/Vertical.tsx
index fa9ab3c4183..864db364a38 100644
--- a/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/Vertical.tsx
+++ b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/Vertical.tsx
@@ -288,8 +288,15 @@ const VerticalFilterBar: FC<VerticalBarProps> = ({
         <Bar className={cx({ open: filtersOpen })} width={width}>
           <Header toggleFiltersBar={toggleFiltersBar} />
           {!isInitialized ? (
-            <div css={{ height }}>
-              <Loading size="s" muted />
+            <div
+              css={{
+                height,
+                display: 'flex',
+                alignItems: 'center',
+                justifyContent: 'center',
+              }}
+            >
+              <Loading position="inline-centered" size="s" muted />
             </div>
           ) : (
             <div css={tabPaneStyle} onScroll={onScroll}>
diff --git a/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/index.tsx b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/index.tsx
index 25377ee36a2..702f4678add 100644
--- a/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/index.tsx
+++ b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/index.tsx
@@ -600,7 +600,6 @@ const FilterBar: FC<FiltersBarProps> = ({
     () => (
       <ActionButtons
         filterBarOrientation={orientation}
-        width={verticalConfig?.width}
         onApply={handleApply}
         onClearAll={handleClearAll}
         dataMaskSelected={dataMaskSelected}
@@ -612,7 +611,6 @@ const FilterBar: FC<FiltersBarProps> = ({
     ),
     [
       orientation,
-      verticalConfig?.width,
       handleApply,
       handleClearAll,
       dataMaskSelected,
diff --git a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/ConfigModalContent/ConfigModalContent.tsx b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/ConfigModalContent/ConfigModalContent.tsx
index 156a710e498..8bbd7fd8b96 100644
--- a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/ConfigModalContent/ConfigModalContent.tsx
+++ b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/ConfigModalContent/ConfigModalContent.tsx
@@ -25,7 +25,8 @@ import {
 } from '@superset-ui/core';
 import type { FormInstance } from '@superset-ui/core/components';
 import { styled } from '@apache-superset/core/theme';
-import { Flex } from '@superset-ui/core/components';
+import { EmptyState, Flex } from '@superset-ui/core/components';
+import { t } from '@apache-superset/core/translation';
 import FilterContentRenderer from './FilterContentRenderer';
 import CustomizationContentRenderer from './CustomizationContentRenderer';
 import { FiltersConfigFormHandle } from '../FiltersConfigForm/FiltersConfigForm';
@@ -105,6 +106,28 @@ function ConfigModalContent({
     isChartCustomizationId(currentItemId) &&
     chartCustomizationIds.includes(currentItemId);
 
+  const hasNoItems =
+    filterState.orderedIds.length === 0 &&
+    customizationState.orderedIds.length === 0;
+  const showEmptyState = hasNoItems || !currentItemId;
+
+  if (showEmptyState) {
+    return (
+      <StyledContentFlex vertical>
+        <Flex flex={1}>
+          <EmptyState
+            size="small"
+            title=""
+            image="empty.svg"
+            description={t(
+              'Manage filters and customizations to set scoping, descriptions, and limitations. Create new elements for better dashboard insights.',
+            )}
+          />
+        </Flex>
+      </StyledContentFlex>
+    );
+  }
+
   return (
     <StyledContentFlex vertical>
       <div
diff --git a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/ConfigModalSidebar/ConfigModalSidebar.tsx b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/ConfigModalSidebar/ConfigModalSidebar.tsx
index feb6ce87679..b46a59215ff 100644
--- a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/ConfigModalSidebar/ConfigModalSidebar.tsx
+++ b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/ConfigModalSidebar/ConfigModalSidebar.tsx
@@ -20,7 +20,7 @@ import { FC, ReactNode, useCallback, useState } from 'react';
 import { t } from '@apache-superset/core/translation';
 import { NativeFilterType, ChartCustomizationType } from '@superset-ui/core';
 import { styled } from '@apache-superset/core/theme';
-import { Collapse, Flex } from '@superset-ui/core/components';
+import { Collapse, EmptyState, Flex } from '@superset-ui/core/components';
 import type { DragEndEvent } from '@dnd-kit/core';
 import {
   DndContext,
@@ -36,18 +36,32 @@ import { FilterRemoval } from '../types';
 import { FILTER_TYPE, CUSTOMIZATION_TYPE } from '../DraggableFilter';
 import { isFilterId, isChartCustomizationId, isDivider } from '../utils';
 
+// max-height constrains the sidebar so its inner Collapse can scroll when
+// there are many filters (sc-101839). The parent height chain through the
+// antd Form is unreliable, so a viewport-relative max-height is used instead
+// of height: 100%.
 const StyledSidebarFlex = styled(Flex)`
   min-width: 290px;
   max-width: 290px;
+  max-height: 70vh;
   border-right: 1px solid ${({ theme }) => theme.colorBorderSecondary};
 `;
 
 const StyledHeaderFlex = styled(Flex)`
   padding: ${({ theme }) => theme.sizeUnit * 3}px;
+
+  & button {
+    width: 100%;
+  }
 `;
 
+// min-height: 0 lets the flex item shrink below its content size so that
+// overflow: auto produces a scrollbar when the filter list is taller than
+// the sidebar. Without it, flex items default to min-height: auto and
+// refuse to shrink.
 const BaseStyledCollapse = styled(Collapse)<{ isDragging: boolean }>`
   flex: 1;
+  min-height: 0; /* required for flex item to shrink */
   overflow: auto;
   .ant-collapse-content-box {
     padding: 0;
@@ -254,6 +268,9 @@ const ConfigModalSidebar: FC<ConfigModalSidebarProps> = ({
     </div>
   );
 
+  const hasNoItems =
+    filterOrderedIds.length === 0 && customizationOrderedIds.length === 0;
+
   return (
     <DndContext
       sensors={sensors}
@@ -269,54 +286,65 @@ const ConfigModalSidebar: FC<ConfigModalSidebarProps> = ({
             onAddCustomization={onAddCustomization}
           />
         </StyledHeaderFlex>
-        <StyledCollapse
-          key={formValuesVersion}
-          activeKey={activeCollapseKeys}
-          onChange={keys => onCollapseChange(keys as string[])}
-          ghost
-          isDragging={isDragging}
-        >
-          <StyledCollapse.Panel key="filters" header={filtersHeader}>
-            <ItemSectionContent
-              currentItemId={currentItemId}
-              items={filterOrderedIds}
-              removedItems={filterRemovedItems}
-              erroredItems={filterErroredItems}
-              getItemTitle={getTitle}
-              onChange={onChange}
-              onRearrange={onRearrange}
-              onRemove={onRemove}
-              restoreItem={restoreItem}
-              dataTestId="filter-title-container"
-              deleteAltText={t('Remove filter')}
-              dragType={FILTER_TYPE}
-              isCurrentSection={isFilterId(currentItemId)}
-              onCrossListDrop={handleFilterCrossListDrop}
+        {hasNoItems ? (
+          <Flex>
+            <EmptyState
+              size="small"
+              title=""
+              image="empty.svg"
+              description={t('No filters or customizations created yet')}
             />
-          </StyledCollapse.Panel>
-
-          <StyledCollapse.Panel
-            key="chartCustomizations"
-            header={customizationsHeader}
+          </Flex>
+        ) : (
+          <StyledCollapse
+            key={formValuesVersion}
+            activeKey={activeCollapseKeys}
+            onChange={keys => onCollapseChange(keys as string[])}
+            ghost
+            isDragging={isDragging}
           >
-            <ItemSectionContent
-              currentItemId={currentItemId}
-              items={customizationOrderedIds}
-              removedItems={customizationRemovedItems}
-              erroredItems={customizationErroredItems}
-              getItemTitle={getTitle}
-              onChange={onChange}
-              onRearrange={onRearrange}
-              onRemove={onRemove}
-              restoreItem={restoreItem}
-              dataTestId="customization-title-container"
-              deleteAltText={t('Remove customization')}
-              dragType={CUSTOMIZATION_TYPE}
-              isCurrentSection={isChartCustomizationId(currentItemId)}
-              onCrossListDrop={handleCustomizationCrossListDrop}
-            />
-          </StyledCollapse.Panel>
-        </StyledCollapse>
+            <StyledCollapse.Panel key="filters" header={filtersHeader}>
+              <ItemSectionContent
+                currentItemId={currentItemId}
+                items={filterOrderedIds}
+                removedItems={filterRemovedItems}
+                erroredItems={filterErroredItems}
+                getItemTitle={getTitle}
+                onChange={onChange}
+                onRearrange={onRearrange}
+                onRemove={onRemove}
+                restoreItem={restoreItem}
+                dataTestId="filter-title-container"
+                deleteAltText={t('Remove filter')}
+                dragType={FILTER_TYPE}
+                isCurrentSection={isFilterId(currentItemId)}
+                onCrossListDrop={handleFilterCrossListDrop}
+              />
+            </StyledCollapse.Panel>
+
+            <StyledCollapse.Panel
+              key="chartCustomizations"
+              header={customizationsHeader}
+            >
+              <ItemSectionContent
+                currentItemId={currentItemId}
+                items={customizationOrderedIds}
+                removedItems={customizationRemovedItems}
+                erroredItems={customizationErroredItems}
+                getItemTitle={getTitle}
+                onChange={onChange}
+                onRearrange={onRearrange}
+                onRemove={onRemove}
+                restoreItem={restoreItem}
+                dataTestId="customization-title-container"
+                deleteAltText={t('Remove customization')}
+                dragType={CUSTOMIZATION_TYPE}
+                isCurrentSection={isChartCustomizationId(currentItemId)}
+                onCrossListDrop={handleCustomizationCrossListDrop}
+              />
+            </StyledCollapse.Panel>
+          </StyledCollapse>
+        )}
       </StyledSidebarFlex>
     </DndContext>
   );
diff --git a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FilterTitleContainer.tsx b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FilterTitleContainer.tsx
index b04a63ecf6d..6e0bbddbb5f 100644
--- a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FilterTitleContainer.tsx
+++ b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FilterTitleContainer.tsx
@@ -212,6 +212,7 @@ const FilterTitleContainer = forwardRef<HTMLDivElement, Props>(
                   onRemove(id);
                 }}
                 alt={t('Remove filter')}
+                data-test="filter-remove-button"
               />
             )}
           </div>
diff --git a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FilterScope/utils.test.ts b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FilterScope/utils.test.ts
index 4ce48ed1cc7..94c1b3cdc85 100644
--- a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FilterScope/utils.test.ts
+++ b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FilterScope/utils.test.ts
@@ -18,7 +18,7 @@
  */
 import { Layout, LayoutItem, Charts } from 'src/dashboard/types';
 import { VizType } from '@superset-ui/core';
-import { buildTree } from './utils';
+import { buildTree, getTreeCheckedItems } from './utils';
 import type { TreeItem } from './types';
 
 // The types defined for Layout and sub elements is not compatible with the data we get back fro a real dashboard layout
@@ -18048,6 +18048,85 @@ describe('Ensure buildTree does not throw runtime errors when encountering an in
     }).not.toThrow();
   });
 
+  test('Does not infinitely recurse when layout contains a cycle (nested tabs circular reference)', () => {
+    // Simulate a corrupted layout where TAB-A → TAB-B → TAB-A (cycle)
+    const circularLayout = {
+      ROOT_ID: {
+        id: 'ROOT_ID',
+        type: 'ROOT',
+        children: ['TAB-A'],
+        parents: [],
+      },
+      'TAB-A': {
+        id: 'TAB-A',
+        type: 'TAB',
+        children: ['TAB-B'],
+        parents: ['ROOT_ID'],
+        meta: { text: 'Tab A' },
+      },
+      'TAB-B': {
+        id: 'TAB-B',
+        type: 'TAB',
+        // Points back to TAB-A, creating a cycle
+        children: ['TAB-A'],
+        parents: ['ROOT_ID', 'TAB-A'],
+        meta: { text: 'Tab B' },
+      },
+    };
+
+    const rootNode = circularLayout.ROOT_ID;
+    const rootTreeItem: TreeItem = {
+      key: 'ROOT_ID',
+      title: 'Root',
+      children: [],
+      nodeType: 'TAB',
+    };
+
+    expect(() => {
+      buildTree(
+        rootNode as unknown as LayoutItem,
+        rootTreeItem,
+        circularLayout as unknown as Layout,
+        {} as Charts,
+        ['ROOT_ID', 'TAB-A', 'TAB-B'],
+        [],
+        () => 'title',
+      );
+    }).not.toThrow();
+  });
+
+  test('getTreeCheckedItems does not infinitely recurse when scope rootPath creates a cycle', () => {
+    // Simulate a corrupted layout where ROW-A → ROW-B → ROW-A (cycle via children)
+    const circularLayout = {
+      ROOT_ID: {
+        id: 'ROOT_ID',
+        type: 'ROOT',
+        children: ['ROW-A'],
+        parents: [],
+      },
+      'ROW-A': {
+        id: 'ROW-A',
+        type: 'ROW',
+        children: ['ROW-B'],
+        parents: ['ROOT_ID'],
+      },
+      'ROW-B': {
+        id: 'ROW-B',
+        type: 'ROW',
+        // Points back to ROW-A, creating a cycle
+        children: ['ROW-A'],
+        parents: ['ROOT_ID', 'ROW-A'],
+      },
+    };
+
+    expect(() => {
+      getTreeCheckedItems(
+        { rootPath: ['ROOT_ID'], excluded: [] },
+        circularLayout as unknown as Layout,
+      );
+    }).not.toThrow();
+  });
+
   test('Avoids runtime error with invalid inputs', () => {
     expect(() => {
       buildTree(
diff --git a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FilterScope/utils.ts b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FilterScope/utils.ts
index af62f19034b..8d61b956929 100644
--- a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FilterScope/utils.ts
+++ b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FilterScope/utils.ts
@@ -100,6 +100,7 @@ export const buildTree = (
   initiallyExcludedCharts: number[],
   buildTreeLeafTitle: BuildTreeLeafTitle,
   sliceEntities?: Record<number, Slice>,
+  visited: Set<string> = new Set(),
 ) => {
   if (!node) {
     return;
@@ -154,6 +155,10 @@ export const buildTree = (
 
   if (node.type !== CHART_TYPE) {
     node?.children?.forEach?.(child => {
+      if (visited.has(child)) {
+        return;
+      }
+      visited.add(child);
       const childNode = layout?.[child];
       if (childNode) {
         buildTree(
@@ -165,6 +170,7 @@ export const buildTree = (
           initiallyExcludedCharts,
           buildTreeLeafTitle,
           sliceEntities,
+          visited,
         );
       } else {
         logging.warn(
@@ -192,13 +198,19 @@ const checkTreeItem = (
   layout: Layout,
   items: string[],
   excluded: number[],
+  visited: Set<string> = new Set(),
 ) => {
   items.forEach(item => {
+    if (visited.has(item)) {
+      return;
+    }
+    visited.add(item);
     checkTreeItem(
       checkedItems,
       layout,
       addInvisibleParents(layout, item),
       excluded,
+      visited,
     );
     if (
       layout[item]?.type === CHART_TYPE &&
diff --git a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FiltersConfigForm.tsx b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FiltersConfigForm.tsx
index cc53dcbcb61..575319f7516 100644
--- a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FiltersConfigForm.tsx
+++ b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FiltersConfigForm.tsx
@@ -107,6 +107,7 @@ import RemovedFilter from './RemovedFilter';
 import { useBackendFormUpdate, useDefaultValue } from './state';
 import {
   hasTemporalColumns,
+  getTimeGrainOptions,
   isValidFilterValue,
   mostUsedDataset,
   setNativeFilterFieldValues,
@@ -262,6 +263,12 @@ export interface FiltersConfigFormProps {
 
 const FILTERS_WITH_ADHOC_FILTERS = ['filter_select', 'filter_range'];
 
+const getOptionDataTest = (
+  prefix: string,
+  value: string | number | undefined,
+) =>
+  `${prefix}-${String(value ?? 'undefined').replace(/[^a-zA-Z0-9_-]/g, '-')}`;
+
 // TODO: Rename the filter plugins and remove this mapping
 const FILTER_TYPE_NAME_MAPPING = {
   [t('Select filter')]: t('Value'),
@@ -579,6 +586,10 @@ const FiltersConfigForm = (
     !!filterToEdit?.adhoc_filters?.length ||
     !!filterToEdit?.time_range;
 
+  const hasTimeGrainPreFilter = !!(
+    formFilter?.time_grains?.length || filterToEdit?.time_grains?.length
+  );
+
   const hasEnableSingleValue =
     formFilter?.controlValues?.enableSingleValue !== undefined ||
     filterToEdit?.controlValues?.enableSingleValue !== undefined;
@@ -746,6 +757,7 @@ const FiltersConfigForm = (
             'schema',
             'sql',
             'table_name',
+            'time_grain_sqla',
           ],
         })}`,
       })
@@ -936,6 +948,16 @@ const FiltersConfigForm = (
                             label: name || pluginKey,
                           };
                         })}
+                        optionRender={option => (
+                          <span
+                            data-test={getOptionDataTest(
+                              'customization-type-option',
+                              option.value,
+                            )}
+                          >
+                            {option.label || option.value}
+                          </span>
+                        )}
                         onChange={value => {
                           setNativeFilterFieldValues(form, filterId, {
                             filterType: value,
@@ -994,6 +1016,16 @@ const FiltersConfigForm = (
                             disabled: isDisabled,
                           };
                         })}
+                        optionRender={option => (
+                          <span
+                            data-test={getOptionDataTest(
+                              'filter-type-option',
+                              option.value,
+                            )}
+                          >
+                            {option.label || option.value}
+                          </span>
+                        )}
                         onChange={value => {
                           setNativeFilterFieldValues(form, filterId, {
                             filterType: value,
@@ -1254,6 +1286,78 @@ const FiltersConfigForm = (
                                     </CollapsibleControl>
                                   </FormItem>
                                 )}
+                                {itemTypeField === 'filter_timegrain' &&
+                                  hasDataset &&
+                                  datasetDetails?.time_grain_sqla &&
+                                  datasetDetails.time_grain_sqla.length > 0 && (
+                                    <FormItem
+                                      name={[
+                                        'filters',
+                                        filterId,
+                                        'preFilterTimegrain',
+                                      ]}
+                                    >
+                                      <CollapsibleControl
+                                        initialValue={hasTimeGrainPreFilter}
+                                        title={t('Pre-filter available values')}
+                                        tooltip={t(
+                                          'Select which time grains are available in the filter control. This is a UI allow list only and does not add extra conditions to the underlying queries.',
+                                        )}
+                                        onChange={checked => {
+                                          if (!checked) {
+                                            setNativeFilterFieldValues(
+                                              form,
+                                              filterId,
+                                              { time_grains: undefined },
+                                            );
+                                            forceUpdate();
+                                          }
+                                          formChanged();
+                                        }}
+                                      >
+                                        <FormItem
+                                          name={[
+                                            'filters',
+                                            filterId,
+                                            'time_grains',
+                                          ]}
+                                          initialValue={
+                                            filterToEdit?.time_grains
+                                          }
+                                          {...getFiltersConfigModalTestId(
+                                            'time-grain-allowlist',
+                                          )}
+                                        >
+                                          <Select
+                                            mode="multiple"
+                                            ariaLabel={t('Time grain options')}
+                                            options={getTimeGrainOptions(
+                                              datasetDetails.time_grain_sqla,
+                                            )}
+                                            sortComparator={() => 0}
+                                            onChange={(values: string[]) => {
+                                              setNativeFilterFieldValues(
+                                                form,
+                                                filterId,
+                                                {
+                                                  time_grains:
+                                                    values.length > 0 &&
+                                                    values.length <
+                                                      datasetDetails
+                                                        .time_grain_sqla.length
+                                                      ? values
+                                                      : undefined,
+                                                },
+                                              );
+                                              forceUpdate();
+                                              formChanged();
+                                            }}
+                                            css={{ width: INPUT_WIDTH }}
+                                          />
+                                        </FormItem>
+                                      </CollapsibleControl>
+                                    </FormItem>
+                                  )}
                                 {itemTypeField !== 'filter_range' ? (
                                   <FormItem
                                     name={['filters', filterId, 'sortFilter']}
@@ -1347,24 +1451,21 @@ const FiltersConfigForm = (
                                               }),
                                             )}
                                             onChange={value => {
-                                              if (value !== undefined) {
-                                                const previous =
-                                                  form.getFieldValue(
-                                                    'filters',
-                                                  )?.[filterId].controlValues ||
-                                                  {};
-                                                setNativeFilterFieldValues(
-                                                  form,
-                                                  filterId,
-                                                  {
-                                                    controlValues: {
-                                                      ...previous,
-                                                      sortMetric: value,
-                                                    },
+                                              const previous =
+                                                form.getFieldValue('filters')?.[
+                                                  filterId
+                                                ].controlValues || {};
+                                              setNativeFilterFieldValues(
+                                                form,
+                                                filterId,
+                                                {
+                                                  controlValues: {
+                                                    ...previous,
+                                                    sortMetric: value,
                                                   },
-                                                );
-                                                forceUpdate();
-                                              }
+                                                },
+                                              );
+                                              forceUpdate();
                                               formChanged();
                                             }}
                                           />
diff --git a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/TimeGrainPreFilter.test.tsx b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/TimeGrainPreFilter.test.tsx
new file mode 100644
index 00000000000..70890a62b91
--- /dev/null
+++ b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/TimeGrainPreFilter.test.tsx
@@ -0,0 +1,203 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+import {
+  cleanup,
+  render,
+  screen,
+  userEvent,
+  waitFor,
+} from 'spec/helpers/testing-library';
+import { Form, Select } from '@superset-ui/core/components';
+import { CollapsibleControl } from './CollapsibleControl';
+import { getTimeGrainOptions } from './utils';
+
+/**
+ * Tests for the Time Grain Pre-filter feature (CollapsibleControl + Select).
+ *
+ * These tests verify:
+ * - Options are rendered in database order (no client-side sorting)
+ * - A saved subset of time_grains is loaded and shown as selected values
+ * - The CollapsibleControl checkbox shows/hides the Select
+ * - Toggling the checkbox off clears the underlying selection
+ */
+
+const TIME_GRAIN_TUPLES: [string, string][] = [
+  ['PT1S', 'Second'],
+  ['PT1M', 'Minute'],
+  ['PT1H', 'Hour'],
+  ['P1D', 'Day'],
+  ['P1W', 'Week'],
+];
+
+// NOTE: This file uses the real AntD Select. In jsdom, rc-overflow schedules
+// deferred updates (raf/timers) that can fire after unmount and cause
+// "state update on unmounted component" warnings. Scoped fake timers let us
+// clear pending work deterministically during teardown for this test only.
+beforeEach(() => {
+  jest.useFakeTimers();
+});
+
+afterEach(() => {
+  cleanup();
+  jest.clearAllTimers();
+  jest.useRealTimers();
+});
+
+const renderPreFilter = (props: {
+  savedGrains?: string[];
+  initialChecked?: boolean;
+  onChangeMock?: jest.Mock;
+}) => {
+  const {
+    savedGrains,
+    initialChecked = false,
+    onChangeMock = jest.fn(),
+  } = props;
+  const options = getTimeGrainOptions(TIME_GRAIN_TUPLES);
+
+  const PreFilterHarness = () => {
+    const [form] = Form.useForm();
+
+    const handleToggle = (checked: boolean) => {
+      // Mirrors the real form behavior: clear persisted values when disabled.
+      if (!checked) {
+        form.setFieldValue('time_grains', undefined);
+      }
+      onChangeMock(checked);
+    };
+
+    return (
+      <Form form={form}>
+        <CollapsibleControl
+          title="Pre-filter available values"
+          initialValue={initialChecked}
+          onChange={handleToggle}
+        >
+          <Form.Item name="time_grains" initialValue={savedGrains}>
+            <Select
+              mode="multiple"
+              ariaLabel="Time grain options"
+              options={options}
+              sortComparator={() => 0}
+            />
+          </Form.Item>
+        </CollapsibleControl>
+        <Form.Item noStyle shouldUpdate>
+          {() => (
+            <div data-test="time-grains-value">
+              {JSON.stringify(form.getFieldValue('time_grains') ?? null)}
+            </div>
+          )}
+        </Form.Item>
+      </Form>
+    );
+  };
+
+  return render(<PreFilterHarness />);
+};
+
+test('time grain options preserve database order (no sorting)', async () => {
+  renderPreFilter({ initialChecked: true });
+
+  const combobox = screen.getByRole('combobox', {
+    name: /Time grain options/i,
+  });
+  await userEvent.click(combobox);
+
+  const labels = (await screen.findAllByRole('option')).map(
+    option => option.textContent,
+  );
+
+  // Options must follow database order: Second, Minute, Hour, Day, Week
+  expect(labels).toEqual(['Second', 'Minute', 'Hour', 'Day', 'Week']);
+});
+
+test('saved time grains are loaded as selected values', () => {
+  renderPreFilter({ savedGrains: ['P1D', 'P1W'], initialChecked: true });
+
+  expect(screen.getByTitle('Day')).toBeInTheDocument();
+  expect(screen.getByTitle('Week')).toBeInTheDocument();
+  expect(screen.queryByTitle('Second')).not.toBeInTheDocument();
+  expect(screen.getByTestId('time-grains-value')).toHaveTextContent(
+    '["P1D","P1W"]',
+  );
+});
+
+test('unchecking CollapsibleControl clears underlying time_grains selection', async () => {
+  renderPreFilter({ savedGrains: ['P1D', 'P1W'], initialChecked: true });
+
+  expect(screen.getByTestId('time-grains-value')).toHaveTextContent(
+    '["P1D","P1W"]',
+  );
+
+  const checkbox = screen.getByRole('checkbox', {
+    name: /Pre-filter available values/i,
+  });
+  await userEvent.click(checkbox);
+
+  await waitFor(() => {
+    expect(screen.queryByRole('combobox')).not.toBeInTheDocument();
+    expect(screen.getByTestId('time-grains-value')).toHaveTextContent('null');
+  });
+});
+
+test('CollapsibleControl checkbox shows and hides the grain Select', async () => {
+  renderPreFilter({});
+
+  // Initially unchecked — select should be hidden
+  expect(screen.queryByRole('combobox')).not.toBeInTheDocument();
+
+  const checkbox = screen.getByRole('checkbox', {
+    name: /Pre-filter available values/i,
+  });
+  await userEvent.click(checkbox);
+
+  // After checking — select should appear
+  expect(screen.getByRole('combobox')).toBeInTheDocument();
+
+  await userEvent.click(checkbox);
+
+  // After unchecking — select should disappear
+  expect(screen.queryByRole('combobox')).not.toBeInTheDocument();
+});
+
+test('CollapsibleControl starts expanded when initialValue is true', () => {
+  renderPreFilter({ initialChecked: true });
+
+  // When initialValue=true the checkbox is checked and children are visible
+  expect(screen.getByRole('combobox')).toBeInTheDocument();
+  const checkbox = screen.getByRole('checkbox', {
+    name: /Pre-filter available values/i,
+  });
+  expect(checkbox).toBeChecked();
+});
+
+test('onChange is called with correct value when checkbox is toggled', async () => {
+  const onChangeMock = jest.fn();
+  renderPreFilter({ onChangeMock });
+
+  const checkbox = screen.getByRole('checkbox', {
+    name: /Pre-filter available values/i,
+  });
+  await userEvent.click(checkbox);
+  expect(onChangeMock).toHaveBeenCalledWith(true);
+
+  await userEvent.click(checkbox);
+  expect(onChangeMock).toHaveBeenCalledWith(false);
+});
diff --git a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/utils.test.ts b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/utils.test.ts
index 65d5313d86e..6bfbb52a80d 100644
--- a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/utils.test.ts
+++ b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/utils.test.ts
@@ -30,6 +30,7 @@ import {
   shouldShowTimeRangePicker,
   mostUsedDataset,
   doesColumnMatchFilterType,
+  getTimeGrainOptions,
 } from './utils';
 
 // Test hasTemporalColumns - validates time range pre-filter visibility logic
@@ -276,3 +277,29 @@ test('isValidFilterValue returns false when range filter value is not an array',
   expect(isValidFilterValue(null, true)).toBe(false);
   expect(isValidFilterValue(undefined, true)).toBe(false);
 });
+
+test('getTimeGrainOptions normalizes tuple payloads into visible select options', () => {
+  expect(
+    getTimeGrainOptions([
+      ['P1D', 'Day'],
+      ['PT1H', 'Hour'],
+      ['P1W', 'Week'],
+    ]),
+  ).toEqual([
+    { value: 'P1D', label: 'Day' },
+    { value: 'PT1H', label: 'Hour' },
+    { value: 'P1W', label: 'Week' },
+  ]);
+});
+
+test('getTimeGrainOptions falls back to value when tuple label is empty', () => {
+  expect(
+    getTimeGrainOptions([
+      ['P1D', ''],
+      ['P1W', 'Week'],
+    ]),
+  ).toEqual([
+    { value: 'P1D', label: 'P1D' },
+    { value: 'P1W', label: 'Week' },
+  ]);
+});
diff --git a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/utils.ts b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/utils.ts
index 7c05f393cee..f586dcb5024 100644
--- a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/utils.ts
+++ b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/utils.ts
@@ -27,6 +27,16 @@ import { FILTER_SUPPORTED_TYPES } from './constants';
 
 const FILTERS_FIELD_NAME = 'filters';
 
+type TimeGrainTuple = [string, string];
+
+export const getTimeGrainOptions = (
+  timeGrains: TimeGrainTuple[] = [],
+): { value: string; label: string }[] =>
+  timeGrains.map(timeGrain => {
+    const [value, label] = timeGrain;
+    return { value, label: label || value };
+  });
+
 export const useForceUpdate = (isActive = true) => {
   const [, updateState] = useState({});
   return useCallback(() => {
diff --git a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigModal.test.tsx b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigModal.test.tsx
index fa92c5be4da..3583671ad59 100644
--- a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigModal.test.tsx
+++ b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigModal.test.tsx
@@ -654,7 +654,8 @@ test('reorders filters via keyboard (Space, ArrowDown, Space)', async () => {
   }
 }, 30000);
 
-test('updates sidebar title when filter name changes', async () => {
+// eslint-disable-next-line jest/no-disabled-tests -- flaky timeout, see https://github.com/apache/superset/pull/39181
+test.skip('updates sidebar title when filter name changes', async () => {
   const nativeFilterConfig = [
     buildNativeFilter('NATIVE_FILTER-1', 'state', []),
     buildNativeFilter('NATIVE_FILTER-2', 'country', []),
@@ -695,56 +696,59 @@ test('updates sidebar title when filter name changes', async () => {
 
 test('modifies the name of a filter', async () => {
   jest.useFakeTimers();
-  try {
-    const nativeFilterConfig = [
-      buildNativeFilter('NATIVE_FILTER-1', 'state', []),
-      buildNativeFilter('NATIVE_FILTER-2', 'country', []),
-    ];
 
-    const state = {
-      ...defaultState(),
-      dashboardInfo: {
-        metadata: {
-          native_filter_configuration: nativeFilterConfig,
-        },
+  const nativeFilterConfig = [
+    buildNativeFilter('NATIVE_FILTER-1', 'state', []),
+    buildNativeFilter('NATIVE_FILTER-2', 'country', []),
+  ];
+
+  const state = {
+    ...defaultState(),
+    dashboardInfo: {
+      metadata: {
+        native_filter_configuration: nativeFilterConfig,
       },
-      dashboardLayout,
-    };
+    },
+    dashboardLayout,
+  };
 
-    const onSave = jest.fn();
+  const onSave = jest.fn();
 
-    defaultRender(state, {
-      ...props,
-      createNewOnOpen: false,
-      onSave,
-    });
+  defaultRender(state, {
+    ...props,
+    createNewOnOpen: false,
+    onSave,
+  });
 
-    const filterNameInput = screen.getByRole('textbox', {
-      name: FILTER_NAME_REGEX,
-    });
+  const filterNameInput = screen.getByRole('textbox', {
+    name: FILTER_NAME_REGEX,
+  });
 
-    await userEvent.clear(filterNameInput);
-    await userEvent.type(filterNameInput, 'New Filter Name');
+  await userEvent.clear(filterNameInput);
+  await userEvent.type(filterNameInput, 'New Filter Name');
 
-    jest.runAllTimers();
+  // Flush the 500ms debounce on the filter name input.
+  // Using advanceTimersByTime instead of runAllTimers to avoid infinite
+  // loops caused by recursive antd animation timers.
+  jest.advanceTimersByTime(1000);
 
-    await userEvent.click(screen.getByRole('button', { name: SAVE_REGEX }));
+  // Switch back to real timers so waitFor polling works
+  jest.useRealTimers();
 
-    await waitFor(() =>
-      expect(onSave).toHaveBeenCalledWith(
-        expect.objectContaining({
-          filterChanges: expect.objectContaining({
-            modified: expect.arrayContaining([
-              expect.objectContaining({ name: 'New Filter Name' }),
-            ]),
-          }),
+  await userEvent.click(screen.getByRole('button', { name: SAVE_REGEX }));
+
+  await waitFor(() =>
+    expect(onSave).toHaveBeenCalledWith(
+      expect.objectContaining({
+        filterChanges: expect.objectContaining({
+          modified: expect.arrayContaining([
+            expect.objectContaining({ name: 'New Filter Name' }),
+          ]),
         }),
-      ),
-    );
-  } finally {
-    jest.useRealTimers();
-  }
-});
+      }),
+    ),
+  );
+}, 30000);
 
 test('renders a filter with a chart containing BigInt values', async () => {
   const nativeFilterConfig = [
@@ -768,3 +772,58 @@ test('renders a filter with a chart containing BigInt values', async () => {
 
   expect(screen.getByText(FILTER_TYPE_REGEX)).toBeInTheDocument();
 });
+
+test('displays empty state when modal opens with no filters and createNewOnOpen is false', () => {
+  defaultRender(defaultState(), { ...props, createNewOnOpen: false });
+
+  // Check left panel empty state
+  expect(
+    screen.getByText('No filters or customizations created yet'),
+  ).toBeInTheDocument();
+
+  // Check right panel empty state
+  expect(
+    screen.getByText(
+      /Manage filters and customizations to set scoping, descriptions, and limitations/,
+    ),
+  ).toBeInTheDocument();
+
+  // Verify no filter form is rendered (no "Untitled" filter created)
+  expect(screen.queryByText(FILTER_TYPE_REGEX)).not.toBeInTheDocument();
+});
+
+test('does not auto-create a filter when createNewOnOpen is false', () => {
+  defaultRender(defaultState(), { ...props, createNewOnOpen: false });
+
+  // The filter configuration form should not be visible
+  expect(screen.queryByText(FILTER_NAME_REGEX)).not.toBeInTheDocument();
+  expect(screen.queryByText(DATASET_REGEX)).not.toBeInTheDocument();
+});
+
+test('empty state disappears when a filter is added via dropdown', async () => {
+  defaultRender(defaultState(), {
+    ...props,
+    createNewOnOpen: false,
+  });
+
+  // Verify empty state is shown initially
+  expect(
+    screen.getByText('No filters or customizations created yet'),
+  ).toBeInTheDocument();
+
+  // Add a filter via the dropdown
+  const dropdownButton = screen.getByTestId('new-item-dropdown-button');
+  fireEvent.mouseEnter(dropdownButton);
+  const addFilterMenuItem = await screen.findByRole('menuitem', {
+    name: /add filter/i,
+  });
+  fireEvent.click(addFilterMenuItem);
+
+  // Verify empty state is gone and filter form is shown
+  await waitFor(() => {
+    expect(
+      screen.queryByText('No filters or customizations created yet'),
+    ).not.toBeInTheDocument();
+  });
+  expect(screen.getByText(FILTER_TYPE_REGEX)).toBeInTheDocument();
+});
diff --git a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/transformers/filterTransformer.ts b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/transformers/filterTransformer.ts
index 8a28084f355..b2d059cdcb3 100644
--- a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/transformers/filterTransformer.ts
+++ b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/transformers/filterTransformer.ts
@@ -127,6 +127,9 @@ function transformFormInput(
     adhoc_filters: formInputs.adhoc_filters,
     time_range: formInputs.time_range,
     granularity_sqla: formInputs.granularity_sqla,
+    time_grains: formInputs.time_grains?.length
+      ? formInputs.time_grains
+      : undefined,
     sortMetric: formInputs.sortMetric ?? null,
     requiredFirst: formInputs.requiredFirst
       ? Object.values(formInputs.requiredFirst).find(rf => rf)
diff --git a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/types.ts b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/types.ts
index 82d1c0aa387..78461fcbf20 100644
--- a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/types.ts
+++ b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/types.ts
@@ -51,6 +51,7 @@ export interface NativeFiltersFormItem {
   adhoc_filters?: AdhocFilter[];
   time_range?: string;
   granularity_sqla?: string;
+  time_grains?: string[];
   type: typeof NativeFilterType.NativeFilter;
   description: string;
 }
diff --git a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/utils.ts b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/utils.ts
index d412349adc3..9b3b87641cf 100644
--- a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/utils.ts
+++ b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/utils.ts
@@ -140,6 +140,9 @@ export const createHandleSave =
         time_range: formInputs.time_range,
         controlValues: formInputs.controlValues ?? {},
         granularity_sqla: formInputs.granularity_sqla,
+        ...(formInputs.time_grains?.length
+          ? { time_grains: formInputs.time_grains }
+          : {}),
         requiredFirst: Object.values(formInputs.requiredFirst ?? {}).find(
           rf => rf,
         ),
diff --git a/superset-frontend/src/dashboard/components/nativeFilters/dependencyGraph.ts b/superset-frontend/src/dashboard/components/nativeFilters/dependencyGraph.ts
new file mode 100644
index 00000000000..e4232524d77
--- /dev/null
+++ b/superset-frontend/src/dashboard/components/nativeFilters/dependencyGraph.ts
@@ -0,0 +1,75 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+import { ensureIsArray } from '@superset-ui/core';
+
+/**
+ * Shared graph primitives for the native-filter dependency graph.
+ *
+ * A dependent filter stores only its *direct* parents in `cascadeParentIds`,
+ * but most consumers (options queries, `extra_form_data` emitted to charts,
+ * readiness checks) need the full transitive ancestor set. Keeping the graph
+ * primitives here lets the hook layer and any non-React callers (e.g. form
+ * validation, batch checks) share one traversal implementation.
+ */
+
+/**
+ * Minimal shape we need from the native-filter config map. Kept intentionally
+ * narrow so dividers / chart customizations (which may omit `cascadeParentIds`)
+ * are also assignable.
+ */
+export type FilterConfigMap = Record<string, { cascadeParentIds?: string[] }>;
+
+/**
+ * Resolve the full set of transitive ancestor filter ids for the given filter,
+ * in topological order (furthest ancestor first, closest parent last).
+ *
+ * The ordering is significant: `mergeExtraFormData` appends filter arrays but
+ * *overrides* scalar fields like `time_range`, so iterating ancestors from
+ * furthest to closest makes the closest parent's scalar overrides win. A chain
+ * A -> B -> C -> D where each level lists only its direct parent therefore
+ * produces `[A, B, C]` for D, which matches the intended precedence.
+ *
+ * Cycles are silently skipped. The filter-config modal enforces acyclicity at
+ * save time (see `hasCircularDependency`), but defensive traversal here keeps
+ * a malformed saved config from spinning forever.
+ */
+export function resolveTransitiveParentIds(
+  id: string,
+  filterConfig: FilterConfigMap,
+): string[] {
+  const ordered: string[] = [];
+  const visited = new Set<string>([id]);
+
+  const visit = (currentId: string) => {
+    const parents = ensureIsArray(
+      filterConfig[currentId]?.cascadeParentIds,
+    ) as string[];
+    parents.forEach(parentId => {
+      if (visited.has(parentId)) return;
+      visited.add(parentId);
+      // Depth-first so the furthest ancestors are appended before the
+      // closer parents, giving a stable topological order.
+      visit(parentId);
+      ordered.push(parentId);
+    });
+  };
+
+  visit(id);
+  return ordered;
+}
diff --git a/superset-frontend/src/dashboard/components/nativeFilters/state.test.ts b/superset-frontend/src/dashboard/components/nativeFilters/state.test.ts
index 782e0fff6bf..a97360ea54e 100644
--- a/superset-frontend/src/dashboard/components/nativeFilters/state.test.ts
+++ b/superset-frontend/src/dashboard/components/nativeFilters/state.test.ts
@@ -19,8 +19,18 @@
 
 import { renderHook } from '@testing-library/react-hooks';
 import { useSelector } from 'react-redux';
-import { NativeFilterType, Filter, Divider } from '@superset-ui/core';
-import { useIsFilterInScope, useSelectFiltersInScope } from './state';
+import {
+  NativeFilterType,
+  Filter,
+  Divider,
+  ChartCustomizationType,
+  type ChartCustomization,
+} from '@superset-ui/core';
+import {
+  useChartCustomizationConfiguration,
+  useIsFilterInScope,
+  useSelectFiltersInScope,
+} from './state';
 
 jest.mock('react-redux', () => {
   const actual = jest.requireActual('react-redux');
@@ -507,3 +517,87 @@ test('filter with mix of existing and non-existent charts in chartsInScope', ()
   const { result } = renderHook(() => useIsFilterInScope());
   expect(result.current(filter)).toBe(true);
 });
+
+test('useChartCustomizationConfiguration ignores null items in metadata', () => {
+  (useSelector as jest.Mock).mockImplementation((selector: Function) =>
+    selector({
+      dashboardInfo: {
+        metadata: {
+          chart_customization_config: [
+            null,
+            {
+              id: 'CHART_CUSTOMIZATION-1',
+              name: 'Dynamic Group By',
+              type: ChartCustomizationType.ChartCustomization,
+              filterType: 'chart_customization_dynamic_groupby',
+              chartsInScope: [101],
+              scope: { rootPath: ['ROOT_ID'], excluded: [] },
+              controlValues: { canSelectMultiple: false },
+              defaultDataMask: {},
+              cascadeParentIds: [],
+              targets: [{ column: { name: 'status' }, datasetId: 1 }],
+              description: 'valid customization',
+            } satisfies ChartCustomization,
+          ],
+        },
+      },
+      dashboardLayout: {
+        present: {
+          'CHART-101': {
+            type: 'CHART',
+            meta: { chartId: 101 },
+          },
+        },
+      },
+    }),
+  );
+
+  const { result } = renderHook(() => useChartCustomizationConfiguration());
+
+  expect(result.current).toHaveLength(1);
+  expect(result.current[0]).toEqual(
+    expect.objectContaining({ id: 'CHART_CUSTOMIZATION-1' }),
+  );
+});
+
+test('useChartCustomizationConfiguration ignores undefined items in metadata', () => {
+  (useSelector as jest.Mock).mockImplementation((selector: Function) =>
+    selector({
+      dashboardInfo: {
+        metadata: {
+          chart_customization_config: [
+            undefined,
+            {
+              id: 'CHART_CUSTOMIZATION-1',
+              name: 'Dynamic Group By',
+              type: ChartCustomizationType.ChartCustomization,
+              filterType: 'chart_customization_dynamic_groupby',
+              chartsInScope: [101],
+              scope: { rootPath: ['ROOT_ID'], excluded: [] },
+              controlValues: { canSelectMultiple: false },
+              defaultDataMask: {},
+              cascadeParentIds: [],
+              targets: [{ column: { name: 'status' }, datasetId: 1 }],
+              description: 'valid customization',
+            } satisfies ChartCustomization,
+          ],
+        },
+      },
+      dashboardLayout: {
+        present: {
+          'CHART-101': {
+            type: 'CHART',
+            meta: { chartId: 101 },
+          },
+        },
+      },
+    }),
+  );
+
+  const { result } = renderHook(() => useChartCustomizationConfiguration());
+
+  expect(result.current).toHaveLength(1);
+  expect(result.current[0]).toEqual(
+    expect.objectContaining({ id: 'CHART_CUSTOMIZATION-1' }),
+  );
+});
diff --git a/superset-frontend/src/dashboard/components/nativeFilters/state.ts b/superset-frontend/src/dashboard/components/nativeFilters/state.ts
index 11034ab1da0..cfb58d0f442 100644
--- a/superset-frontend/src/dashboard/components/nativeFilters/state.ts
+++ b/superset-frontend/src/dashboard/components/nativeFilters/state.ts
@@ -101,13 +101,15 @@ const selectChartCustomizationConfiguration = createSelector(
     selectDashboardChartIds,
   ],
   (allCustomizations, dashboardChartIds): ChartCustomizationConfiguration => {
-    const hasLegacyFormat = allCustomizations.some(item =>
+    const truthyCustomizations = allCustomizations.filter(Boolean);
+
+    const hasLegacyFormat = truthyCustomizations.some(item =>
       isLegacyChartCustomizationFormat(item),
     );
 
     const migratedCustomizations = hasLegacyFormat
-      ? migrateChartCustomizationArray(allCustomizations)
-      : (allCustomizations as ChartCustomizationConfiguration);
+      ? migrateChartCustomizationArray(truthyCustomizations)
+      : (truthyCustomizations as ChartCustomizationConfiguration);
 
     return migratedCustomizations.filter(customization => {
       if (
diff --git a/superset-frontend/src/dashboard/components/nativeFilters/utils.test.ts b/superset-frontend/src/dashboard/components/nativeFilters/utils.test.ts
index 03fc3a0f4a9..2873e43300b 100644
--- a/superset-frontend/src/dashboard/components/nativeFilters/utils.test.ts
+++ b/superset-frontend/src/dashboard/components/nativeFilters/utils.test.ts
@@ -19,7 +19,11 @@
 import { Behavior } from '@superset-ui/core';
 import { DashboardLayout } from 'src/dashboard/types';
 import { CHART_TYPE } from 'src/dashboard/util/componentTypes';
-import { nativeFilterGate, findTabsWithChartsInScope } from './utils';
+import {
+  nativeFilterGate,
+  findTabsWithChartsInScope,
+  getFormData,
+} from './utils';
 
 // eslint-disable-next-line no-restricted-globals -- TODO: Migrate from describe blocks
 describe('nativeFilterGate', () => {
@@ -81,3 +85,18 @@ test('findTabsWithChartsInScope should handle a recursive layout structure', ()
     [],
   );
 });
+
+test('getFormData should include persisted time_grains for time grain filters', () => {
+  const formData = getFormData({
+    dashboardId: 10,
+    id: 'NATIVE_FILTER-1',
+    filterType: 'filter_timegrain',
+    type: 'NATIVE_FILTER' as any,
+    controlValues: {},
+    defaultDataMask: {},
+    datasetId: 11,
+    time_grains: ['PT1H', 'P1D', 'P1W'],
+  });
+
+  expect((formData as any).time_grains).toEqual(['PT1H', 'P1D', 'P1W']);
+});
diff --git a/superset-frontend/src/dashboard/components/nativeFilters/utils.ts b/superset-frontend/src/dashboard/components/nativeFilters/utils.ts
index 7fc18f0aeab..4401071eb8f 100644
--- a/superset-frontend/src/dashboard/components/nativeFilters/utils.ts
+++ b/superset-frontend/src/dashboard/components/nativeFilters/utils.ts
@@ -50,6 +50,7 @@ export const getFormData = ({
   groupby,
   defaultDataMask,
   controlValues,
+  time_grains,
   filterType,
   sortMetric,
   adhoc_filters,
@@ -67,6 +68,7 @@ export const getFormData = ({
   time_range?: string;
   sortMetric?: string | null;
   granularity_sqla?: string;
+  time_grains?: string[];
 }): Partial<QueryFormData> => {
   const otherProps: {
     datasource?: string;
@@ -84,9 +86,12 @@ export const getFormData = ({
   }
 
   const vizType = filterType;
+  const timeGrainsFormData =
+    time_grains && time_grains.length > 0 ? { time_grains } : {};
 
   return {
     ...controlValues,
+    ...timeGrainsFormData,
     ...otherProps,
     adhoc_filters: adhoc_filters ?? [],
     extra_filters: [],
diff --git a/superset-frontend/src/dashboard/containers/DashboardPage.test.tsx b/superset-frontend/src/dashboard/containers/DashboardPage.test.tsx
new file mode 100644
index 00000000000..2eb05eea842
--- /dev/null
+++ b/superset-frontend/src/dashboard/containers/DashboardPage.test.tsx
@@ -0,0 +1,256 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+import type { ReactNode } from 'react';
+import { Suspense } from 'react';
+import { render, screen, waitFor } from 'spec/helpers/testing-library';
+import {
+  useDashboard,
+  useDashboardCharts,
+  useDashboardDatasets,
+} from 'src/hooks/apiResources';
+import { SupersetClient } from '@superset-ui/core';
+import CrudThemeProvider from 'src/components/CrudThemeProvider';
+import DashboardPage from './DashboardPage';
+
+const mockTheme = {
+  id: 42,
+  theme_name: 'Branded',
+  json_data: '{"token":{"colorPrimary":"#1677ff"}}',
+};
+
+const mockDashboard = {
+  id: 1,
+  slug: null,
+  url: '/superset/dashboard/1/',
+  dashboard_title: 'Test Dashboard',
+  thumbnail_url: null,
+  published: true,
+  css: null,
+  json_metadata: '{}',
+  position_json: '{}',
+  changed_by_name: 'admin',
+  changed_by: { id: 1, first_name: 'Admin', last_name: 'User' },
+  changed_on: '2024-01-01T00:00:00',
+  charts: [],
+  owners: [],
+  roles: [],
+  theme: mockTheme,
+};
+
+jest.mock('src/hooks/apiResources', () => ({
+  useDashboard: jest.fn(),
+  useDashboardCharts: jest.fn(),
+  useDashboardDatasets: jest.fn(),
+}));
+
+jest.mock('src/dashboard/actions/hydrate', () => ({
+  ...jest.requireActual('src/dashboard/actions/hydrate'),
+  hydrateDashboard: jest.fn(() => ({ type: 'MOCK_HYDRATE' })),
+}));
+
+jest.mock('src/dashboard/actions/datasources', () => ({
+  ...jest.requireActual('src/dashboard/actions/datasources'),
+  setDatasources: jest.fn(() => ({ type: 'MOCK_SET_DATASOURCES' })),
+}));
+
+jest.mock('src/dashboard/actions/dashboardState', () => ({
+  ...jest.requireActual('src/dashboard/actions/dashboardState'),
+  setDatasetsStatus: jest.fn(() => ({ type: 'MOCK_SET_DATASETS_STATUS' })),
+}));
+
+jest.mock('src/components/CrudThemeProvider', () => ({
+  __esModule: true,
+  default: jest.fn(({ children }: { children: ReactNode }) => (
+    <div>{children}</div>
+  )),
+}));
+
+jest.mock('src/dashboard/components/DashboardBuilder/DashboardBuilder', () => ({
+  __esModule: true,
+  default: () => <div data-testid="dashboard-builder">DashboardBuilder</div>,
+}));
+
+jest.mock('src/dashboard/components/SyncDashboardState', () => ({
+  __esModule: true,
+  default: () => null,
+  getDashboardContextLocalStorage: () => ({}),
+}));
+
+jest.mock('src/dashboard/containers/Dashboard', () => ({
+  __esModule: true,
+  default: ({ children }: { children: ReactNode }) => <div>{children}</div>,
+}));
+
+jest.mock('src/components/MessageToasts/withToasts', () => ({
+  useToasts: () => ({ addDangerToast: jest.fn(), addSuccessToast: jest.fn() }),
+}));
+
+jest.mock('src/dashboard/util/injectCustomCss', () => ({
+  __esModule: true,
+  default: () => () => {},
+}));
+
+jest.mock('src/dashboard/util/activeAllDashboardFilters', () => ({
+  getAllActiveFilters: () => ({}),
+  getRelevantDataMask: () => ({}),
+}));
+
+jest.mock('src/dashboard/util/activeDashboardFilters', () => ({
+  getActiveFilters: () => ({}),
+}));
+
+jest.mock('src/utils/urlUtils', () => ({
+  getUrlParam: () => null,
+}));
+
+jest.mock('src/dashboard/components/nativeFilters/FilterBar/keyValue', () => ({
+  getFilterValue: jest.fn(),
+  getPermalinkValue: jest.fn(),
+}));
+
+jest.mock('src/dashboard/contexts/AutoRefreshContext', () => ({
+  AutoRefreshProvider: ({ children }: { children: ReactNode }) => (
+    <>{children}</>
+  ),
+}));
+
+const mockUseDashboard = useDashboard as jest.Mock;
+const mockUseDashboardCharts = useDashboardCharts as jest.Mock;
+const mockUseDashboardDatasets = useDashboardDatasets as jest.Mock;
+const MockCrudThemeProvider = CrudThemeProvider as unknown as jest.Mock;
+
+afterEach(() => {
+  jest.restoreAllMocks();
+});
+
+beforeEach(() => {
+  jest.clearAllMocks();
+  mockUseDashboard.mockReturnValue({
+    result: mockDashboard,
+    error: null,
+  });
+  mockUseDashboardCharts.mockReturnValue({
+    result: [],
+    error: null,
+  });
+  mockUseDashboardDatasets.mockReturnValue({
+    result: [],
+    error: null,
+    status: 'complete',
+  });
+});
+
+test('passes full theme object from dashboard API response to CrudThemeProvider', async () => {
+  const clientGetSpy = jest.spyOn(SupersetClient, 'get');
+
+  render(
+    <Suspense fallback="loading">
+      <DashboardPage idOrSlug="1" />
+    </Suspense>,
+    {
+      useRedux: true,
+      useRouter: true,
+      initialState: {
+        dashboardInfo: { id: 1, metadata: {} },
+        dashboardState: { sliceIds: [] },
+        nativeFilters: { filters: {} },
+        dataMask: {},
+      },
+    },
+  );
+
+  await waitFor(() => {
+    expect(screen.queryByText('loading')).not.toBeInTheDocument();
+  });
+
+  expect(MockCrudThemeProvider).toHaveBeenCalledWith(
+    expect.objectContaining({ theme: mockTheme }),
+    expect.anything(),
+  );
+
+  // Regression guard: theme data comes from the dashboard API response,
+  // not a separate /api/v1/theme/:id fetch (which would 403 for non-admin users)
+  const themeCalls = clientGetSpy.mock.calls.filter(([{ endpoint }]) =>
+    endpoint?.startsWith('/api/v1/theme/'),
+  );
+  expect(themeCalls).toHaveLength(0);
+});
+
+test('uses theme from Redux dashboardInfo when it differs from API response (Properties modal update)', async () => {
+  const reduxTheme = {
+    id: 99,
+    theme_name: 'Updated Theme',
+    json_data: '{"token":{"colorPrimary":"#ff0000"}}',
+  };
+
+  render(
+    <Suspense fallback="loading">
+      <DashboardPage idOrSlug="1" />
+    </Suspense>,
+    {
+      useRedux: true,
+      useRouter: true,
+      initialState: {
+        dashboardInfo: { id: 1, metadata: {}, theme: reduxTheme },
+        dashboardState: { sliceIds: [] },
+        nativeFilters: { filters: {} },
+        dataMask: {},
+      },
+    },
+  );
+
+  await waitFor(() => {
+    expect(screen.queryByText('loading')).not.toBeInTheDocument();
+  });
+
+  // Redux theme should take priority over API response theme
+  expect(MockCrudThemeProvider).toHaveBeenCalledWith(
+    expect.objectContaining({ theme: reduxTheme }),
+    expect.anything(),
+  );
+});
+
+test('passes null theme when Redux dashboardInfo.theme is explicitly null (theme removed)', async () => {
+  render(
+    <Suspense fallback="loading">
+      <DashboardPage idOrSlug="1" />
+    </Suspense>,
+    {
+      useRedux: true,
+      useRouter: true,
+      initialState: {
+        dashboardInfo: { id: 1, metadata: {}, theme: null },
+        dashboardState: { sliceIds: [] },
+        nativeFilters: { filters: {} },
+        dataMask: {},
+      },
+    },
+  );
+
+  await waitFor(() => {
+    expect(screen.queryByText('loading')).not.toBeInTheDocument();
+  });
+
+  // When theme is explicitly null in Redux (removed via Properties modal),
+  // CrudThemeProvider should receive null
+  expect(MockCrudThemeProvider).toHaveBeenCalledWith(
+    expect.objectContaining({ theme: null }),
+    expect.anything(),
+  );
+});
diff --git a/superset-frontend/src/dashboard/containers/DashboardPage.tsx b/superset-frontend/src/dashboard/containers/DashboardPage.tsx
index e345f5a469d..f6d755adf6d 100644
--- a/superset-frontend/src/dashboard/containers/DashboardPage.tsx
+++ b/superset-frontend/src/dashboard/containers/DashboardPage.tsx
@@ -120,7 +120,7 @@ export const DashboardPage: FC<PageProps> = ({ idOrSlug }: PageProps) => {
     ({ dashboardInfo }) =>
       dashboardInfo && Object.keys(dashboardInfo).length > 0,
   );
-  const dashboardTheme = useSelector(
+  const reduxTheme = useSelector(
     (state: RootState) => state.dashboardInfo.theme,
   );
   const { addDangerToast } = useToasts();
@@ -295,11 +295,7 @@ export const DashboardPage: FC<PageProps> = ({ idOrSlug }: PageProps) => {
           <SyncDashboardState dashboardPageId={dashboardPageId} />
           <DashboardPageIdContext.Provider value={dashboardPageId}>
             <CrudThemeProvider
-              themeId={
-                dashboardTheme !== undefined
-                  ? dashboardTheme?.id
-                  : dashboard?.theme?.id
-              }
+              theme={reduxTheme !== undefined ? reduxTheme : dashboard?.theme}
             >
               <AutoRefreshProvider>
                 <DashboardContainer
diff --git a/superset-frontend/src/dashboard/hooks/useDownloadScreenshot.test.ts b/superset-frontend/src/dashboard/hooks/useDownloadScreenshot.test.ts
new file mode 100644
index 00000000000..a53f299bfb7
--- /dev/null
+++ b/superset-frontend/src/dashboard/hooks/useDownloadScreenshot.test.ts
@@ -0,0 +1,73 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+import { renderHook, act } from '@testing-library/react-hooks';
+import { SupersetClient } from '@superset-ui/core';
+import { useDownloadScreenshot } from './useDownloadScreenshot';
+import { DownloadScreenshotFormat } from '../components/menu/DownloadMenuItems/types';
+
+jest.mock('@superset-ui/core', () => ({
+  SupersetClient: {
+    post: jest.fn(),
+    get: jest.fn(),
+  },
+  SupersetApiError: class SupersetApiError extends Error {
+    status: number;
+    constructor(message: string, status: number) {
+      super(message);
+      this.status = status;
+    }
+  },
+}));
+
+jest.mock('react-redux', () => ({
+  useSelector: jest.fn(() => undefined),
+}));
+
+jest.mock('src/components/MessageToasts/withToasts', () => ({
+  useToasts: () => ({
+    addDangerToast: jest.fn(),
+    addSuccessToast: jest.fn(),
+    addInfoToast: jest.fn(),
+  }),
+}));
+
+jest.mock('src/utils/urlUtils', () => ({
+  getDashboardUrlParams: jest.fn(() => []),
+}));
+
+test('downloadScreenshot calls API with force=true to ensure fresh screenshots', async () => {
+  const mockCacheKey = 'test-cache-key';
+  (SupersetClient.post as jest.Mock).mockResolvedValue({
+    json: { cache_key: mockCacheKey },
+  });
+
+  const { result } = renderHook(() => useDownloadScreenshot(123));
+
+  await act(async () => {
+    result.current(DownloadScreenshotFormat.PNG);
+  });
+
+  expect(SupersetClient.post).toHaveBeenCalledTimes(1);
+  const callArgs = (SupersetClient.post as jest.Mock).mock.calls[0][0];
+
+  // Verify that force=true is included in the endpoint URL
+  // This prevents regression where stale cached screenshots are returned
+  expect(callArgs.endpoint).toContain('force');
+  expect(callArgs.endpoint).toMatch(/force[:%]true|force[:%]!t/);
+});
diff --git a/superset-frontend/src/dashboard/hooks/useDownloadScreenshot.ts b/superset-frontend/src/dashboard/hooks/useDownloadScreenshot.ts
index df494bad20a..7610c18daa1 100644
--- a/superset-frontend/src/dashboard/hooks/useDownloadScreenshot.ts
+++ b/superset-frontend/src/dashboard/hooks/useDownloadScreenshot.ts
@@ -20,6 +20,7 @@ import { useCallback, useEffect, useRef } from 'react';
 import { useSelector } from 'react-redux';
 import { useToasts } from 'src/components/MessageToasts/withToasts';
 import { last } from 'lodash';
+import rison from 'rison';
 import contentDisposition from 'content-disposition';
 import { t } from '@apache-superset/core/translation';
 import { SupersetClient, SupersetApiError } from '@superset-ui/core';
@@ -145,7 +146,7 @@ export const useDownloadScreenshot = (
       };
 
       SupersetClient.post({
-        endpoint: `/api/v1/dashboard/${dashboardId}/cache_dashboard_screenshot/`,
+        endpoint: `/api/v1/dashboard/${dashboardId}/cache_dashboard_screenshot/?q=${rison.encode({ force: true })}`,
         jsonPayload: {
           anchor,
           activeTabs,
diff --git a/superset-frontend/src/dashboard/reducers/dashboardInfo.test.ts b/superset-frontend/src/dashboard/reducers/dashboardInfo.test.ts
new file mode 100644
index 00000000000..8bf3e5b774d
--- /dev/null
+++ b/superset-frontend/src/dashboard/reducers/dashboardInfo.test.ts
@@ -0,0 +1,301 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+import {
+  DASHBOARD_INFO_UPDATED,
+  dashboardInfoChanged,
+} from '../actions/dashboardInfo';
+import { CLEAR_ALL_CHART_CUSTOMIZATIONS } from '../actions/chartCustomizationActions';
+import type { DashboardInfo } from '../types';
+import dashboardInfoReducer from './dashboardInfo';
+
+const existingTheme = {
+  id: 99,
+  theme_name: 'Corporate Theme',
+  json_data: '{"token":{"colorPrimary":"#003366"}}',
+};
+
+const stateWithTheme = {
+  id: 1,
+  theme: existingTheme,
+  slug: 'test-dash',
+  metadata: {},
+} as Partial<DashboardInfo>;
+
+const stateWithScopes = {
+  id: 1,
+  metadata: {
+    native_filter_configuration: [
+      {
+        id: 'FILTER-1',
+        name: 'Region',
+        chartsInScope: [10, 20, 30],
+        tabsInScope: ['TAB-A'],
+        targets: [{ datasetId: 1 }],
+      },
+      {
+        id: 'FILTER-2',
+        name: 'Date Range',
+        chartsInScope: [40],
+        tabsInScope: [],
+        targets: [{ datasetId: 2 }],
+      },
+    ],
+    chart_customization_config: [
+      {
+        id: 'CUSTOM-1',
+        chartsInScope: [100],
+        tabsInScope: ['TAB-X'],
+      },
+    ],
+  },
+} as unknown as Partial<DashboardInfo>;
+
+test('preserves existing theme when DASHBOARD_INFO_UPDATED payload omits theme key', () => {
+  // Simulates the fixed Header behavior: conditional spread omits `theme`
+  // key when PropertiesModal returns theme: undefined (theme not in fetched list).
+  const action = dashboardInfoChanged({ slug: 'new-slug' });
+  const result = dashboardInfoReducer(stateWithTheme, action);
+
+  expect(result.theme).toBe(existingTheme);
+  expect(result.slug).toBe('new-slug');
+
+  // themeId derivation (Header line 299) should produce the original ID
+  const themeId = result.theme ? result.theme.id : null;
+  expect(themeId).toBe(99);
+});
+
+test('clears theme when DASHBOARD_INFO_UPDATED payload has theme: null', () => {
+  // Simulates intentional theme removal via Properties modal.
+  const action = dashboardInfoChanged({ theme: null });
+  const result = dashboardInfoReducer(stateWithTheme, action);
+
+  expect(result.theme).toBeNull();
+
+  const themeId = result.theme ? result.theme.id : null;
+  expect(themeId).toBeNull();
+});
+
+test('overwrites theme when DASHBOARD_INFO_UPDATED payload has theme: undefined', () => {
+  // Documents the dangerous behavior that the Header conditional spread prevents.
+  // If `theme: undefined` leaks into the action payload, the reducer WILL overwrite
+  // the existing theme — this is why Header must omit the key entirely.
+  const action = {
+    type: DASHBOARD_INFO_UPDATED,
+    newInfo: { theme: undefined },
+  };
+  const result = dashboardInfoReducer(stateWithTheme, action);
+
+  // theme is overwritten to undefined — save would compute themeId as null
+  expect(result.theme).toBeUndefined();
+  const themeId = result.theme ? result.theme.id : null;
+  expect(themeId).toBeNull();
+});
+
+test('preserves native_filter_configuration scopes during DASHBOARD_INFO_UPDATED metadata refresh', () => {
+  // Simulates the save flow: onUpdateSuccess → setDashboardMetadata(serverMetadata)
+  // → dashboardInfoChanged({ metadata: ... }) → DASHBOARD_INFO_UPDATED.
+  // The server response contains filters WITHOUT chartsInScope/tabsInScope (client-only).
+  const serverMetadata = {
+    native_filter_configuration: [
+      { id: 'FILTER-1', name: 'Region (updated)', targets: [{ datasetId: 1 }] },
+      { id: 'FILTER-2', name: 'Date Range', targets: [{ datasetId: 2 }] },
+    ],
+  } as unknown as DashboardInfo['metadata'];
+
+  const action = dashboardInfoChanged({ metadata: serverMetadata });
+  const result = dashboardInfoReducer(stateWithScopes, action);
+
+  const filters = result.metadata?.native_filter_configuration;
+  expect(filters).toHaveLength(2);
+
+  // FILTER-1: server updated the name, scopes preserved from existing state
+  expect(filters![0].name).toBe('Region (updated)');
+  expect(filters![0].chartsInScope).toEqual([10, 20, 30]);
+  expect(filters![0].tabsInScope).toEqual(['TAB-A']);
+
+  // FILTER-2: unchanged, scopes preserved
+  expect(filters![1].chartsInScope).toEqual([40]);
+  expect(filters![1].tabsInScope).toEqual([]);
+});
+
+test('preserves chart_customization_config scopes during DASHBOARD_INFO_UPDATED metadata refresh', () => {
+  const serverMetadata = {
+    chart_customization_config: [{ id: 'CUSTOM-1' }],
+  } as unknown as DashboardInfo['metadata'];
+
+  const action = dashboardInfoChanged({ metadata: serverMetadata });
+  const result = dashboardInfoReducer(stateWithScopes, action);
+
+  const customizations = result.metadata?.chart_customization_config;
+  expect(customizations).toHaveLength(1);
+  expect(customizations![0].chartsInScope).toEqual([100]);
+  expect(customizations![0].tabsInScope).toEqual(['TAB-X']);
+});
+
+test('does not affect metadata when DASHBOARD_INFO_UPDATED has no metadata key', () => {
+  const action = dashboardInfoChanged({ slug: 'new-slug' });
+  const result = dashboardInfoReducer(stateWithScopes, action);
+
+  // Metadata untouched — same reference
+  expect(result.metadata).toBe(stateWithScopes.metadata);
+});
+
+test('preserveScopes filters out null entries from both existing and incoming config', () => {
+  const stateWithNulls = {
+    id: 1,
+    metadata: {
+      native_filter_configuration: [
+        null,
+        {
+          id: 'FILTER-1',
+          name: 'Region',
+          chartsInScope: [10, 20],
+          tabsInScope: ['TAB-A'],
+          targets: [{ datasetId: 1 }],
+        },
+      ],
+      chart_customization_config: [
+        null,
+        {
+          id: 'CUSTOM-1',
+          chartsInScope: [100],
+          tabsInScope: ['TAB-X'],
+        },
+      ],
+    },
+  } as unknown as Partial<DashboardInfo>;
+
+  const serverMetadata = {
+    native_filter_configuration: [
+      null,
+      { id: 'FILTER-1', name: 'Region (updated)', targets: [{ datasetId: 1 }] },
+    ],
+    chart_customization_config: [null, { id: 'CUSTOM-1' }],
+  } as unknown as DashboardInfo['metadata'];
+
+  const action = dashboardInfoChanged({ metadata: serverMetadata });
+  const result = dashboardInfoReducer(stateWithNulls, action);
+
+  const filters = result.metadata?.native_filter_configuration;
+  expect(filters).toHaveLength(1);
+  expect(filters![0].id).toBe('FILTER-1');
+  expect(filters![0].chartsInScope).toEqual([10, 20]);
+
+  const customizations = result.metadata?.chart_customization_config;
+  expect(customizations).toHaveLength(1);
+  expect(customizations![0].id).toBe('CUSTOM-1');
+  expect(customizations![0].chartsInScope).toEqual([100]);
+});
+
+test('preserveScopes filters out undefined entries from both existing and incoming config', () => {
+  const stateWithUndefined = {
+    id: 1,
+    metadata: {
+      native_filter_configuration: [
+        undefined,
+        {
+          id: 'FILTER-1',
+          name: 'Region',
+          chartsInScope: [10, 20],
+          tabsInScope: ['TAB-A'],
+          targets: [{ datasetId: 1 }],
+        },
+      ],
+      chart_customization_config: [
+        undefined,
+        {
+          id: 'CUSTOM-1',
+          chartsInScope: [100],
+          tabsInScope: ['TAB-X'],
+        },
+      ],
+    },
+  } as unknown as Partial<DashboardInfo>;
+
+  const serverMetadata = {
+    native_filter_configuration: [
+      undefined,
+      { id: 'FILTER-1', name: 'Region (updated)', targets: [{ datasetId: 1 }] },
+    ],
+    chart_customization_config: [undefined, { id: 'CUSTOM-1' }],
+  } as unknown as DashboardInfo['metadata'];
+
+  const action = dashboardInfoChanged({ metadata: serverMetadata });
+  const result = dashboardInfoReducer(stateWithUndefined, action);
+
+  const filters = result.metadata?.native_filter_configuration;
+  expect(filters).toHaveLength(1);
+  expect(filters![0].id).toBe('FILTER-1');
+  expect(filters![0].chartsInScope).toEqual([10, 20]);
+
+  const customizations = result.metadata?.chart_customization_config;
+  expect(customizations).toHaveLength(1);
+  expect(customizations![0].id).toBe('CUSTOM-1');
+  expect(customizations![0].chartsInScope).toEqual([100]);
+});
+
+test('CLEAR_ALL_CHART_CUSTOMIZATIONS filters out null entries before mapping', () => {
+  const stateWithNullConfig = {
+    id: 1,
+    metadata: {
+      chart_customization_config: [
+        null,
+        {
+          id: 'CUSTOM-1',
+          targets: [{ datasetId: 1, column: { name: 'status' } }],
+          chartsInScope: [10],
+        },
+        null,
+      ],
+    },
+  } as unknown as Partial<DashboardInfo>;
+
+  const action = { type: CLEAR_ALL_CHART_CUSTOMIZATIONS };
+  const result = dashboardInfoReducer(stateWithNullConfig, action);
+
+  const config = result.metadata?.chart_customization_config;
+  expect(config).toHaveLength(1);
+  expect(config![0].id).toBe('CUSTOM-1');
+  expect(config![0].targets).toEqual([{ datasetId: 1 }]);
+});
+
+test('CLEAR_ALL_CHART_CUSTOMIZATIONS filters out undefined entries before mapping', () => {
+  const stateWithUndefinedConfig = {
+    id: 1,
+    metadata: {
+      chart_customization_config: [
+        undefined,
+        {
+          id: 'CUSTOM-1',
+          targets: [{ datasetId: 1, column: { name: 'status' } }],
+          chartsInScope: [10],
+        },
+        undefined,
+      ],
+    },
+  } as unknown as Partial<DashboardInfo>;
+
+  const action = { type: CLEAR_ALL_CHART_CUSTOMIZATIONS };
+  const result = dashboardInfoReducer(stateWithUndefinedConfig, action);
+
+  const config = result.metadata?.chart_customization_config;
+  expect(config).toHaveLength(1);
+  expect(config![0].id).toBe('CUSTOM-1');
+  expect(config![0].targets).toEqual([{ datasetId: 1 }]);
+});
diff --git a/superset-frontend/src/dashboard/reducers/dashboardInfo.ts b/superset-frontend/src/dashboard/reducers/dashboardInfo.ts
index 69c4551ce78..94a1f671058 100644
--- a/superset-frontend/src/dashboard/reducers/dashboardInfo.ts
+++ b/superset-frontend/src/dashboard/reducers/dashboardInfo.ts
@@ -46,9 +46,7 @@ import {
 
 interface DashboardInfoAction {
   type: string;
-  newInfo?: Partial<DashboardInfo> & {
-    theme_id?: number | null;
-  };
+  newInfo?: Partial<DashboardInfo>;
   filterBarOrientation?: FilterBarOrientation;
   crossFiltersEnabled?: boolean;
   chartCustomization?: (ChartCustomization | ChartCustomizationDivider)[];
@@ -91,7 +89,10 @@ function preserveScopes<T extends ScopedConfigItem>(
   existingConfig: T[] | undefined,
   incomingConfig: T[] | undefined,
 ): T[] {
-  const existingScopesMap = (existingConfig || []).reduce<
+  const truthyExistingConfig = (existingConfig || []).filter(Boolean);
+  const truthyIncomingConfig = (incomingConfig || []).filter(Boolean);
+
+  const existingScopesMap = truthyExistingConfig.reduce<
     Record<string, { chartsInScope?: number[]; tabsInScope?: string[] }>
   >((acc, item) => {
     if (item.chartsInScope != null || item.tabsInScope != null) {
@@ -103,7 +104,7 @@ function preserveScopes<T extends ScopedConfigItem>(
     return acc;
   }, {});
 
-  return (incomingConfig || []).map(item => {
+  return truthyIncomingConfig.map(item => {
     const existingScopes = existingScopesMap[item.id];
     if (item.chartsInScope == null && existingScopes) {
       return {
@@ -124,22 +125,31 @@ export default function dashboardInfoReducer(
     case DASHBOARD_INFO_UPDATED: {
       const dashAction = action as DashboardInfoAction;
       const newInfo = dashAction.newInfo || {};
-      const { theme_id: themeId, ...otherInfo } = newInfo;
-      const updatedState: DashboardInfoState = {
+      const incomingMeta = newInfo.metadata;
+      return {
         ...state,
-        ...otherInfo,
+        ...newInfo,
+        // Preserve client-only scope data (chartsInScope, tabsInScope) when
+        // metadata is refreshed from the server, matching HYDRATE_DASHBOARD.
+        ...(incomingMeta && {
+          metadata: {
+            ...incomingMeta,
+            ...(incomingMeta.native_filter_configuration && {
+              native_filter_configuration: preserveScopes(
+                state.metadata?.native_filter_configuration,
+                incomingMeta.native_filter_configuration,
+              ),
+            }),
+            ...(incomingMeta.chart_customization_config && {
+              chart_customization_config: preserveScopes(
+                state.metadata?.chart_customization_config,
+                incomingMeta.chart_customization_config,
+              ),
+            }),
+          },
+        }),
         last_modified_time: Math.round(new Date().getTime() / 1000),
       };
-
-      if (themeId !== undefined) {
-        if (themeId === null) {
-          updatedState.theme = null;
-        } else {
-          updatedState.theme = { id: themeId, name: `Theme ${themeId}` };
-        }
-      }
-
-      return updatedState;
     }
     case DASHBOARD_INFO_FILTERS_CHANGED: {
       const dashAction = action as DashboardInfoAction;
@@ -282,8 +292,9 @@ export default function dashboardInfoReducer(
         pendingChartCustomizations: {},
       };
     case CLEAR_ALL_CHART_CUSTOMIZATIONS: {
-      const customizationConfig =
-        state.metadata?.chart_customization_config || [];
+      const customizationConfig = (
+        state.metadata?.chart_customization_config || []
+      ).filter(Boolean);
       return {
         ...state,
         metadata: {
diff --git a/superset-frontend/src/dashboard/reducers/nativeFilters.test.ts b/superset-frontend/src/dashboard/reducers/nativeFilters.test.ts
index ceac844317b..31c2aee28ca 100644
--- a/superset-frontend/src/dashboard/reducers/nativeFilters.test.ts
+++ b/superset-frontend/src/dashboard/reducers/nativeFilters.test.ts
@@ -22,9 +22,10 @@ import {
   ChartCustomization,
   ChartCustomizationType,
 } from '@superset-ui/core';
-import nativeFilterReducer from './nativeFilters';
+import nativeFilterReducer, { getInitialState } from './nativeFilters';
 import { SET_NATIVE_FILTERS_CONFIG_COMPLETE } from '../actions/nativeFilters';
 import { HYDRATE_DASHBOARD } from '../actions/hydrate';
+import { migrateChartCustomizationArray } from '../util/migrateChartCustomization';
 
 const createMockFilter = (
   id: string,
@@ -415,3 +416,94 @@ test('SET_NATIVE_FILTERS_CONFIG_COMPLETE treats backend response as source of tr
   expect(result.filters.customization1.chartsInScope).toEqual([12, 13]);
   expect(result.filters.customization1.tabsInScope).toEqual(['tab6']);
 });
+
+test('getInitialState builds filters map from combined filter and customization config', () => {
+  const filter = createMockFilter('filter1', [1, 2], ['tab1']);
+  const customization = createMockChartCustomization(
+    'custom1',
+    [3, 4],
+    ['tab2'],
+  );
+
+  const result = getInitialState({
+    filterConfig: [filter, customization],
+  });
+
+  expect(Object.keys(result.filters)).toHaveLength(2);
+  expect(result.filters.filter1).toBeDefined();
+  expect(result.filters.custom1).toBeDefined();
+  expect(result.filters.filter1.chartsInScope).toEqual([1, 2]);
+  expect(result.filters.custom1.chartsInScope).toEqual([3, 4]);
+});
+
+test('getInitialState crashes on null entries in filterConfig (hydrate must pre-filter)', () => {
+  // This proves why hydrate.ts MUST call .filter(Boolean) before passing
+  // chart_customization_config to getInitialState — null entries cause a
+  // TypeError when accessing .id on null.
+  expect(() =>
+    getInitialState({
+      filterConfig: [
+        null as unknown as Filter,
+        createMockFilter('filter1', [1], []),
+      ],
+    }),
+  ).toThrow();
+});
+
+test('hydrate pipeline: filter(Boolean) + migrate + getInitialState succeeds with null entries', () => {
+  // Reproduces the exact pipeline in hydrate.ts (lines 296-312):
+  //   rawConfig.filter(Boolean) → migrateChartCustomizationArray → getInitialState
+  const rawConfig = [
+    null,
+    {
+      id: 'CHART_CUSTOMIZATION-1',
+      type: ChartCustomizationType.ChartCustomization,
+      name: 'Dynamic Group By',
+      filterType: 'chart_customization_dynamic_groupby',
+      targets: [{ datasetId: 1, column: { name: 'status' } }],
+      scope: { rootPath: ['ROOT_ID'], excluded: [] },
+      chartsInScope: [10],
+      defaultDataMask: { filterState: { value: null } },
+      controlValues: {},
+      cascadeParentIds: [],
+      description: '',
+    },
+    null,
+  ];
+
+  // Step 1: filter(Boolean) — as hydrate.ts does
+  const filtered = rawConfig.filter(Boolean);
+  // Step 2: migrate — as hydrate.ts does
+  const migrated = migrateChartCustomizationArray(filtered);
+  // Step 3: combine with native filters and pass to getInitialState
+  const nativeFilters = [createMockFilter('filter1', [1, 2], ['tab1'])];
+  const result = getInitialState({
+    filterConfig: [...nativeFilters, ...migrated] as Filter[],
+  });
+
+  expect(Object.keys(result.filters)).toHaveLength(2);
+  expect(result.filters.filter1).toBeDefined();
+  expect(result.filters['CHART_CUSTOMIZATION-1']).toBeDefined();
+  expect(result.filters['CHART_CUSTOMIZATION-1'].chartsInScope).toEqual([10]);
+});
+
+test('hydrate pipeline: native_filter_configuration with null entries does not crash getInitialState', () => {
+  // Reproduces the native_filter_configuration path in hydrate.ts (L305):
+  //   native_filter_configuration may contain null entries from corrupted metadata.
+  //   Without .filter(Boolean), these nulls reach getInitialState which reads .id → crash.
+  const nativeFilters = [
+    null,
+    createMockFilter('filter1', [1, 2], ['tab1']),
+    null,
+  ];
+
+  // After .filter(Boolean), only valid filters remain
+  const filtered = nativeFilters.filter(Boolean);
+  const result = getInitialState({
+    filterConfig: filtered as Filter[],
+  });
+
+  expect(Object.keys(result.filters)).toHaveLength(1);
+  expect(result.filters.filter1).toBeDefined();
+  expect(result.filters.filter1.chartsInScope).toEqual([1, 2]);
+});
diff --git a/superset-frontend/src/dashboard/types.ts b/superset-frontend/src/dashboard/types.ts
index 49b05812468..2a7056bebab 100644
--- a/superset-frontend/src/dashboard/types.ts
+++ b/superset-frontend/src/dashboard/types.ts
@@ -207,9 +207,9 @@ export type DashboardInfo = {
   pendingChartCustomizations?: Record<string, ChartCustomization>;
   theme?: {
     id: number;
-    name: string;
+    theme_name: string;
+    json_data: string;
   } | null;
-  theme_id?: number | null;
   css?: string;
   slug?: string;
   last_modified_time: number;
diff --git a/superset-frontend/src/dashboard/util/charts/getFormDataWithExtraFilters.ts b/superset-frontend/src/dashboard/util/charts/getFormDataWithExtraFilters.ts
index ee987bbeb23..161e0edddb3 100644
--- a/superset-frontend/src/dashboard/util/charts/getFormDataWithExtraFilters.ts
+++ b/superset-frontend/src/dashboard/util/charts/getFormDataWithExtraFilters.ts
@@ -22,10 +22,11 @@ import {
   DataRecordFilters,
   DataRecordValue,
   ensureIsArray,
+  getColumnLabel,
   JsonObject,
   PartialFilters,
-  QueryFormExtraFilter,
   ChartCustomization,
+  QueryFormColumn,
 } from '@superset-ui/core';
 import {
   ChartConfiguration,
@@ -123,8 +124,13 @@ function extractColumnNames(columns: unknown[]): string[] {
     columns.forEach((col: unknown) => {
       if (typeof col === 'string') {
         columnNames.push(col);
-      } else if (col && typeof col === 'object' && 'column_name' in col) {
-        columnNames.push((col as { column_name: string }).column_name);
+      } else if (col && typeof col === 'object') {
+        if ('column_name' in col) {
+          columnNames.push((col as { column_name: string }).column_name);
+        } else if ('sqlExpression' in col) {
+          const label = getColumnLabel(col as QueryFormColumn);
+          if (label) columnNames.push(label);
+        }
       }
     });
   }
@@ -136,7 +142,7 @@ function buildExistingColumnsSet(chart: ChartQueryPayload): Set<string> {
   const chartType = chart.form_data?.viz_type;
 
   const existingGroupBy = ensureIsArray(chart.form_data?.groupby);
-  existingGroupBy.forEach((col: string) => existingColumns.add(col));
+  extractColumnNames(existingGroupBy).forEach(col => existingColumns.add(col));
 
   const xAxisColumn = chart.form_data?.x_axis;
   if (xAxisColumn && chartType !== 'heatmap' && chartType !== 'heatmap_v2') {
@@ -251,7 +257,8 @@ function applyChartSpecificGroupBy(
       groupByFormData.target = limitedColumns[1];
     }
   } else if (['chord'].includes(chartType)) {
-    groupByFormData.groupby = [...existingGroupBy, ...groupByColumns];
+    groupByFormData.groupby =
+      groupByColumns.length > 0 ? [groupByColumns[0]] : existingGroupBy;
   } else if (chartType === 'bubble_v2') {
     const { limitedColumns } = limitColumnsForChartType(
       chartType,
@@ -283,7 +290,6 @@ function processGroupByCustomizations(
 ): {
   groupby?: string[];
   order_by_cols?: string[];
-  filters?: QueryFormExtraFilter[];
   x_axis?: string;
   series?: string;
   columns?: string[];
@@ -319,7 +325,7 @@ function processGroupByCustomizations(
   });
 
   const chartType = chart.form_data?.viz_type;
-  if (isChartWithoutGroupBy(chartType)) {
+  if (isChartWithoutGroupBy(chartType) || chartType === 'chord') {
     return {};
   }
 
@@ -328,7 +334,6 @@ function processGroupByCustomizations(
   const xAxisColumn = chart.form_data?.x_axis;
 
   const groupByColumns: string[] = [];
-  const allFilters: QueryFormExtraFilter[] = [];
   let orderByConfig: string[] | undefined;
   let heatmapColumnAdded = false;
 
@@ -342,7 +347,9 @@ function processGroupByCustomizations(
       return;
     }
 
-    const selectedValues = groupByInfo.selectedValues || [];
+    const selectedValues = (groupByInfo.selectedValues || []).filter(
+      (value): value is string => typeof value === 'string' && value.length > 0,
+    );
     const columnNames = selectedValues;
 
     if (columnNames.length === 0) {
@@ -376,16 +383,6 @@ function processGroupByCustomizations(
       });
     }
 
-    columnNames.forEach(columnName => {
-      if (selectedValues.length > 0) {
-        allFilters.push({
-          col: columnName,
-          op: 'IN',
-          val: selectedValues,
-        });
-      }
-    });
-
     const sortMetric = item.controlValues?.sortMetric;
     const sortAscending = item.controlValues?.sortAscending;
     if (sortMetric) {
@@ -400,10 +397,6 @@ function processGroupByCustomizations(
     xAxisColumn,
   );
 
-  if (allFilters.length > 0) {
-    groupByFormData.filters = allFilters;
-  }
-
   if (orderByConfig) {
     groupByFormData.order_by_cols = orderByConfig;
   }
@@ -548,7 +541,11 @@ export default function getFormDataWithExtraFilters({
 
       const selectedValues = mask.filterState?.value;
       groupByState[key] = {
-        selectedValues: Array.isArray(selectedValues) ? selectedValues : [],
+        selectedValues: Array.isArray(selectedValues)
+          ? selectedValues
+          : typeof selectedValues === 'string'
+            ? [selectedValues]
+            : [],
         hasInteracted: mask.filterState?.value !== undefined,
       };
     }
diff --git a/superset-frontend/src/dashboard/util/getFormDataWithExtraFilters.test.ts b/superset-frontend/src/dashboard/util/getFormDataWithExtraFilters.test.ts
index d871a877ccc..61adf3e3ad4 100644
--- a/superset-frontend/src/dashboard/util/getFormDataWithExtraFilters.test.ts
+++ b/superset-frontend/src/dashboard/util/getFormDataWithExtraFilters.test.ts
@@ -20,191 +20,590 @@ import getFormDataWithExtraFilters, {
   CachedFormDataWithExtraControls,
   GetFormDataWithExtraFiltersArguments,
 } from 'src/dashboard/util/charts/getFormDataWithExtraFilters';
+import { ChartCustomizationType } from '@superset-ui/core';
 import { sliceId as chartId } from 'spec/fixtures/mockChartQueries';
 
-// eslint-disable-next-line no-restricted-globals -- TODO: Migrate from describe blocks
-describe('getFormDataWithExtraFilters', () => {
-  const filterId = 'native-filter-1';
-  const mockChart = {
-    id: chartId,
-    chartAlert: null,
-    chartStatus: null,
-    chartUpdateEndTime: null,
-    chartUpdateStartTime: 1,
-    lastRendered: 1,
-    latestQueryFormData: {},
-    sliceFormData: null,
-    queryController: null,
-    queriesResponse: null,
-    triggerQuery: false,
-    form_data: {
-      viz_type: 'filter_select',
-      filters: [
-        {
-          col: 'country_name',
-          op: 'IN',
-          val: ['United States'],
-        },
-      ],
-      datasource: '123',
-      url_params: {},
-    },
+type ChartCustomizationItem = NonNullable<
+  GetFormDataWithExtraFiltersArguments['chartCustomizationItems']
+>[number];
+
+function createChartCustomization(
+  overrides: Partial<ChartCustomizationItem> = {},
+): ChartCustomizationItem {
+  return {
+    id: 'CHART_CUSTOMIZATION-1',
+    type: ChartCustomizationType.ChartCustomization,
+    name: 'Dynamic Group By',
+    filterType: 'chart_customization_dynamic_groupby',
+    targets: [{ datasetId: 3, column: { name: 'status' } }],
+    scope: { rootPath: [], excluded: [] },
+    chartsInScope: [chartId],
+    defaultDataMask: {},
+    controlValues: {},
+    ...overrides,
   };
-  const mockArgs: GetFormDataWithExtraFiltersArguments = {
-    chartConfiguration: {},
-    chart: mockChart,
-    filters: {
-      region: ['Spain'],
-      color: ['pink', 'purple'],
+}
+
+const expectGroupBy = (
+  result: CachedFormDataWithExtraControls,
+  expected: unknown,
+) => {
+  expect('groupby' in result).toBe(true);
+  if (!('groupby' in result)) {
+    throw new Error('Expected groupby to be present in form data');
+  }
+  expect(result.groupby).toEqual(expected);
+};
+
+const expectGroupByLength = (
+  result: CachedFormDataWithExtraControls,
+  length: number,
+) => {
+  expect('groupby' in result).toBe(true);
+  if (!('groupby' in result)) {
+    throw new Error('Expected groupby to be present in form data');
+  }
+  expect(result.groupby).toHaveLength(length);
+};
+
+const getResultFilters = (result: CachedFormDataWithExtraControls) => {
+  if (!('filters' in result) || !Array.isArray(result.filters)) {
+    return [];
+  }
+
+  return result.filters.filter(
+    (
+      filter,
+    ): filter is {
+      col: string;
+      val: unknown[];
+    } =>
+      typeof filter === 'object' &&
+      filter !== null &&
+      'col' in filter &&
+      'val' in filter &&
+      typeof filter.col === 'string' &&
+      Array.isArray(filter.val),
+  );
+};
+
+const filterId = 'native-filter-1';
+const mockChart = {
+  id: chartId,
+  chartAlert: null,
+  chartStatus: null,
+  chartUpdateEndTime: null,
+  chartUpdateStartTime: 1,
+  lastRendered: 1,
+  latestQueryFormData: {},
+  sliceFormData: null,
+  queryController: null,
+  queriesResponse: null,
+  triggerQuery: false,
+  form_data: {
+    viz_type: 'filter_select',
+    filters: [
+      {
+        col: 'country_name',
+        op: 'IN',
+        val: ['United States'],
+      },
+    ],
+    datasource: '123',
+    url_params: {},
+  },
+};
+const mockArgs: GetFormDataWithExtraFiltersArguments = {
+  chartConfiguration: {},
+  chart: mockChart,
+  filters: {
+    region: ['Spain'],
+    color: ['pink', 'purple'],
+  },
+  sliceId: chartId,
+  nativeFilters: {},
+  dataMask: {
+    [filterId]: {
+      id: filterId,
+      extraFormData: {},
+      filterState: {},
+      ownState: {},
     },
-    sliceId: chartId,
-    nativeFilters: {},
+  },
+  extraControls: {
+    stack: 'Stacked',
+  },
+  allSliceIds: [chartId],
+};
+
+test('should include filters from the passed filters', () => {
+  const result = getFormDataWithExtraFilters(mockArgs);
+  expect(result.extra_filters).toHaveLength(2);
+  expect(result.extra_filters[0]).toEqual({
+    col: 'region',
+    op: 'IN',
+    val: ['Spain'],
+  });
+  expect(result.extra_filters[1]).toEqual({
+    col: 'color',
+    op: 'IN',
+    val: ['pink', 'purple'],
+  });
+});
+
+test('should compose extra control', () => {
+  const result: CachedFormDataWithExtraControls =
+    getFormDataWithExtraFilters(mockArgs);
+  expect(result.stack).toEqual('Stacked');
+});
+
+test('should merge extraFormData from chart customizations', () => {
+  const customizationId = 'CHART_CUSTOMIZATION-1';
+  const argsWithCustomization: GetFormDataWithExtraFiltersArguments = {
+    ...mockArgs,
     dataMask: {
-      [filterId]: {
-        id: filterId,
-        extraFormData: {},
-        filterState: {},
+      [customizationId]: {
+        id: customizationId,
+        extraFormData: {
+          time_grain_sqla: 'PT1H',
+        },
+        filterState: {
+          value: ['category1', 'category2'],
+        },
         ownState: {},
       },
     },
-    extraControls: {
-      stack: 'Stacked',
-    },
-    allSliceIds: [chartId],
+    chartCustomizationItems: [
+      createChartCustomization({
+        id: customizationId,
+        name: 'Time Grain Customization',
+        filterType: 'chart_customization_time_grain',
+        targets: [
+          {
+            datasetId: 123,
+            column: { name: 'time_column' },
+          },
+        ],
+        scope: {
+          rootPath: [],
+          excluded: [],
+        },
+        chartsInScope: [chartId],
+        defaultDataMask: {},
+        controlValues: {},
+      }),
+    ],
   };
 
-  test('should include filters from the passed filters', () => {
-    const result = getFormDataWithExtraFilters(mockArgs);
-    expect(result.extra_filters).toHaveLength(2);
-    expect(result.extra_filters[0]).toEqual({
-      col: 'region',
-      op: 'IN',
-      val: ['Spain'],
-    });
-    expect(result.extra_filters[1]).toEqual({
-      col: 'color',
-      op: 'IN',
-      val: ['pink', 'purple'],
-    });
-  });
-
-  test('should compose extra control', () => {
-    const result: CachedFormDataWithExtraControls =
-      getFormDataWithExtraFilters(mockArgs);
-    expect(result.stack).toEqual('Stacked');
-  });
-
-  test('should merge extraFormData from chart customizations', () => {
-    const customizationId = 'CHART_CUSTOMIZATION-1';
-    const argsWithCustomization: GetFormDataWithExtraFiltersArguments = {
-      ...mockArgs,
-      dataMask: {
-        [customizationId]: {
-          id: customizationId,
-          extraFormData: {
-            time_grain_sqla: 'PT1H',
-          },
-          filterState: {
-            value: ['category1', 'category2'],
-          },
-          ownState: {},
-        },
-      },
-      chartCustomizationItems: [
-        {
-          id: customizationId,
-          type: 'CHART_CUSTOMIZATION' as any,
-          name: 'Time Grain Customization',
-          filterType: 'chart_customization_time_grain',
-          targets: [
-            {
-              datasetId: 123,
-              column: { name: 'time_column' },
-            },
-          ],
-          scope: {
-            rootPath: [],
-            excluded: [],
-          },
-          chartsInScope: [chartId],
-          defaultDataMask: {},
-          controlValues: {},
-        },
-      ],
-    };
-
-    const result = getFormDataWithExtraFilters(argsWithCustomization);
-    expect((result as any).time_grain_sqla).toEqual('PT1H');
-  });
-
-  test('should merge both filters and customization extraFormData', () => {
-    const customizationId = 'CHART_CUSTOMIZATION-1';
-    const argsWithBoth: GetFormDataWithExtraFiltersArguments = {
-      ...mockArgs,
-      chartConfiguration: {
-        [filterId]: {
-          id: filterId,
-          targets: [
-            {
-              datasetId: 123,
-              column: { name: 'country_name' },
-            },
-          ],
-          scope: { rootPath: ['ROOT_ID'], excluded: [] },
-          cascadeParentIds: [],
-        },
-      } as any,
-      dataMask: {
-        [filterId]: {
-          id: filterId,
-          extraFormData: {
-            filters: [
-              {
-                col: 'country_name',
-                op: 'IN',
-                val: ['United States'],
-              },
-            ],
-          },
-          filterState: {},
-          ownState: {},
-        },
-        [customizationId]: {
-          id: customizationId,
-          extraFormData: {
-            time_grain_sqla: 'PT1H',
-          },
-          filterState: {
-            value: ['category1'],
-          },
-          ownState: {},
-        },
-      },
-      chartCustomizationItems: [
-        {
-          id: customizationId,
-          type: 'CHART_CUSTOMIZATION' as any,
-          name: 'Time Grain Customization',
-          filterType: 'chart_customization_time_grain',
-          targets: [
-            {
-              datasetId: 123,
-              column: { name: 'time_column' },
-            },
-          ],
-          scope: {
-            rootPath: [],
-            excluded: [],
-          },
-          chartsInScope: [chartId],
-          defaultDataMask: {},
-          controlValues: {},
-        },
-      ],
-    };
-
-    const result = getFormDataWithExtraFilters(argsWithBoth);
-    expect((result as any).time_grain_sqla).toEqual('PT1H');
-    expect(result.extra_form_data).toBeDefined();
-  });
+  const result = getFormDataWithExtraFilters(argsWithCustomization);
+  expect(result).toEqual(expect.objectContaining({ time_grain_sqla: 'PT1H' }));
+});
+
+test('should merge both filters and customization extraFormData', () => {
+  const customizationId = 'CHART_CUSTOMIZATION-1';
+  const argsWithBoth: GetFormDataWithExtraFiltersArguments = {
+    ...mockArgs,
+    activeFilters: {
+      [filterId]: {
+        targets: [
+          {
+            datasetId: 123,
+            column: { name: 'country_name' },
+          },
+        ],
+        scope: [chartId],
+        values: {
+          filters: [
+            {
+              col: 'country_name',
+              op: 'IN',
+              val: ['United States'],
+            },
+          ],
+        },
+      },
+    },
+    dataMask: {
+      [filterId]: {
+        id: filterId,
+        extraFormData: {
+          filters: [
+            {
+              col: 'country_name',
+              op: 'IN',
+              val: ['United States'],
+            },
+          ],
+        },
+        filterState: {},
+        ownState: {},
+      },
+      [customizationId]: {
+        id: customizationId,
+        extraFormData: {
+          time_grain_sqla: 'PT1H',
+        },
+        filterState: {
+          value: ['category1'],
+        },
+        ownState: {},
+      },
+    },
+    chartCustomizationItems: [
+      createChartCustomization({
+        id: customizationId,
+        name: 'Time Grain Customization',
+        filterType: 'chart_customization_time_grain',
+        targets: [
+          {
+            datasetId: 123,
+            column: { name: 'time_column' },
+          },
+        ],
+        scope: {
+          rootPath: [],
+          excluded: [],
+        },
+        chartsInScope: [chartId],
+        defaultDataMask: {},
+        controlValues: {},
+      }),
+    ],
+  };
+
+  const result = getFormDataWithExtraFilters(argsWithBoth);
+  expect(result).toEqual(expect.objectContaining({ time_grain_sqla: 'PT1H' }));
+  expect(result.extra_form_data).toBeDefined();
+});
+
+const makeGroupByArgs = (
+  selectedValue: string | string[],
+  baseGroupby: string[] = [],
+): GetFormDataWithExtraFiltersArguments => {
+  const customizationId = 'CHART_CUSTOMIZATION-groupby-1';
+  return {
+    ...mockArgs,
+    chart: {
+      ...mockChart,
+      form_data: {
+        ...mockChart.form_data,
+        viz_type: 'table',
+        datasource: '3__table',
+        groupby: baseGroupby,
+      },
+    },
+    dataMask: {
+      [customizationId]: {
+        id: customizationId,
+        extraFormData: {},
+        filterState: { value: selectedValue },
+        ownState: {},
+      },
+    },
+    chartCustomizationItems: [
+      createChartCustomization({
+        id: customizationId,
+      }),
+    ],
+  };
+};
+
+test('dynamic group by does not inject a filter using the selected column name as a value', () => {
+  const result = getFormDataWithExtraFilters(makeGroupByArgs(['status']));
+  const spuriousFilter = getResultFilters(result).find(
+    filter => filter.col === 'status' && filter.val.includes('status'),
+  );
+  expect(spuriousFilter).toBeUndefined();
+  expectGroupBy(result, ['status']);
+});
+
+test('dynamic group by still applies when the selected column is already in the base groupby', () => {
+  const result = getFormDataWithExtraFilters(
+    makeGroupByArgs(['status'], ['status']),
+  );
+  expectGroupBy(result, ['status']);
+});
+
+test('dynamic group by with no selection leaves the base groupby unchanged', () => {
+  const result = getFormDataWithExtraFilters(makeGroupByArgs([], ['status']));
+  expectGroupBy(result, ['status']);
+});
+
+test('dynamic group by ignores empty-string selections and keeps the base groupby', () => {
+  const result = getFormDataWithExtraFilters(
+    makeGroupByArgs(['', 'status'], ['original_column']),
+  );
+  expectGroupBy(result, ['status']);
+});
+
+test('chord chart ignores dynamic group by selections and keeps the existing source unchanged', () => {
+  const result = getFormDataWithExtraFilters({
+    ...makeGroupByArgs(['payment_method'], ['status']),
+    chart: {
+      ...mockChart,
+      form_data: {
+        ...mockChart.form_data,
+        viz_type: 'chord',
+        datasource: '3__table',
+        groupby: ['status'],
+      },
+    },
+  });
+
+  expectGroupBy(result, ['status']);
+});
+
+test('dynamic group by normalizes a single-select string value into a one-item groupby array', () => {
+  const result = getFormDataWithExtraFilters(makeGroupByArgs('status'));
+  expectGroupBy(result, ['status']);
+});
+
+test('structural conflict: metric column blocks groupby override (nonConflictingColumns guard)', () => {
+  const customizationId = 'CHART_CUSTOMIZATION-groupby-conflict';
+  const argsWithMetricConflict: GetFormDataWithExtraFiltersArguments = {
+    ...mockArgs,
+    chart: {
+      ...mockChart,
+      form_data: {
+        ...mockChart.form_data,
+        viz_type: 'table',
+        datasource: '3__table',
+        groupby: ['original_column'],
+        metrics: ['revenue'],
+      },
+    },
+    dataMask: {
+      [customizationId]: {
+        id: customizationId,
+        extraFormData: {},
+        filterState: { value: ['revenue'] },
+        ownState: {},
+      },
+    },
+    chartCustomizationItems: [
+      createChartCustomization({
+        id: customizationId,
+        targets: [{ datasetId: 3, column: { name: 'revenue' } }],
+      }),
+    ],
+  };
+
+  const result = getFormDataWithExtraFilters(argsWithMetricConflict);
+  expectGroupBy(result, ['original_column']);
+});
+
+test('multi-column selection: all selected columns appear in result groupby', () => {
+  const result = getFormDataWithExtraFilters(
+    makeGroupByArgs(['status', 'product_line']),
+  );
+  expectGroupBy(result, expect.arrayContaining(['status', 'product_line']));
+  expectGroupByLength(result, 2);
+});
+
+test('dataset mismatch: display control for a different dataset does not affect the chart', () => {
+  const customizationId = 'CHART_CUSTOMIZATION-wrong-dataset';
+  const argsWrongDataset: GetFormDataWithExtraFiltersArguments = {
+    ...mockArgs,
+    chart: {
+      ...mockChart,
+      form_data: {
+        ...mockChart.form_data,
+        viz_type: 'table',
+        datasource: '3__table',
+        groupby: ['original_column'],
+      },
+    },
+    dataMask: {
+      [customizationId]: {
+        id: customizationId,
+        extraFormData: {},
+        filterState: { value: ['status'] },
+        ownState: {},
+      },
+    },
+    chartCustomizationItems: [
+      createChartCustomization({
+        id: customizationId,
+        targets: [{ datasetId: 999, column: { name: 'status' } }],
+      }),
+    ],
+  };
+
+  const result = getFormDataWithExtraFilters(argsWrongDataset);
+  expectGroupBy(result, ['original_column']);
+});
+
+test('dynamic group by with overlapping selection preserves multi-column base groupby', () => {
+  const result = getFormDataWithExtraFilters(
+    makeGroupByArgs(['status'], ['status', 'category']),
+  );
+  expectGroupBy(result, ['status', 'category']);
+});
+
+test('timeseries chart: overlapping selection preserves multi-column base groupby', () => {
+  const customizationId = 'CHART_CUSTOMIZATION-groupby-1';
+  const result = getFormDataWithExtraFilters({
+    ...mockArgs,
+    chart: {
+      ...mockChart,
+      form_data: {
+        ...mockChart.form_data,
+        viz_type: 'echarts_timeseries_line',
+        datasource: '3__table',
+        groupby: ['series_col', 'breakdown_col'],
+        x_axis: 'time_col',
+      },
+    },
+    dataMask: {
+      [customizationId]: {
+        id: customizationId,
+        extraFormData: {},
+        filterState: { value: ['series_col'] },
+        ownState: {},
+      },
+    },
+    chartCustomizationItems: [
+      createChartCustomization({ id: customizationId }),
+    ],
+  });
+  expectGroupBy(result, ['series_col', 'breakdown_col']);
+});
+
+test('partial overlap: only non-existing columns pass through as customization override', () => {
+  const result = getFormDataWithExtraFilters(
+    makeGroupByArgs(['status', 'new_col'], ['status', 'category']),
+  );
+  expectGroupBy(result, ['new_col']);
+});
+
+test('object-typed groupby entries (AdhocColumn) are recognized as existing columns', () => {
+  const customizationId = 'CHART_CUSTOMIZATION-groupby-1';
+  const result = getFormDataWithExtraFilters({
+    ...mockArgs,
+    chart: {
+      ...mockChart,
+      form_data: {
+        ...mockChart.form_data,
+        viz_type: 'table',
+        datasource: '3__table',
+        groupby: [{ column_name: 'status' }, 'category'],
+      },
+    },
+    dataMask: {
+      [customizationId]: {
+        id: customizationId,
+        extraFormData: {},
+        filterState: { value: ['status', 'new_col'] },
+        ownState: {},
+      },
+    },
+    chartCustomizationItems: [
+      createChartCustomization({ id: customizationId }),
+    ],
+  });
+  // 'status' is already in groupby (as an object with column_name), so only 'new_col' passes through
+  expectGroupBy(result, ['new_col']);
+});
+
+test('AdhocColumn with sqlExpression (no column_name) is recognized as existing column', () => {
+  const customizationId = 'CHART_CUSTOMIZATION-groupby-1';
+  const result = getFormDataWithExtraFilters({
+    ...mockArgs,
+    chart: {
+      ...mockChart,
+      form_data: {
+        ...mockChart.form_data,
+        viz_type: 'table',
+        datasource: '3__table',
+        groupby: [
+          {
+            sqlExpression: 'CASE WHEN status = 1 THEN "active" END',
+            label: 'status_label',
+            expressionType: 'SQL',
+          },
+          'category',
+        ],
+      },
+    },
+    dataMask: {
+      [customizationId]: {
+        id: customizationId,
+        extraFormData: {},
+        filterState: { value: ['status_label', 'new_col'] },
+        ownState: {},
+      },
+    },
+    chartCustomizationItems: [
+      createChartCustomization({ id: customizationId }),
+    ],
+  });
+  // 'status_label' matches the AdhocColumn's label, so only 'new_col' passes through
+  expectGroupBy(result, ['new_col']);
+});
+
+test('AdhocColumn with empty label falls back to sqlExpression for identity', () => {
+  const customizationId = 'CHART_CUSTOMIZATION-groupby-1';
+  const sqlExpr = 'CASE WHEN status = 1 THEN "active" END';
+  const result = getFormDataWithExtraFilters({
+    ...mockArgs,
+    chart: {
+      ...mockChart,
+      form_data: {
+        ...mockChart.form_data,
+        viz_type: 'table',
+        datasource: '3__table',
+        groupby: [
+          { sqlExpression: sqlExpr, label: '', expressionType: 'SQL' },
+          'category',
+        ],
+      },
+    },
+    dataMask: {
+      [customizationId]: {
+        id: customizationId,
+        extraFormData: {},
+        filterState: { value: [sqlExpr, 'new_col'] },
+        ownState: {},
+      },
+    },
+    chartCustomizationItems: [
+      createChartCustomization({ id: customizationId }),
+    ],
+  });
+  // Empty label → falls back to sqlExpression; sqlExpr is in existingColumns, only 'new_col' passes
+  expectGroupBy(result, ['new_col']);
+});
+
+test('Scope boundary: display control with chartsInScope:[] does not affect the chart', () => {
+  const customizationId = 'CHART_CUSTOMIZATION-groupby-out-of-scope';
+  const argsOutOfScope: GetFormDataWithExtraFiltersArguments = {
+    ...mockArgs,
+    chart: {
+      ...mockChart,
+      form_data: {
+        ...mockChart.form_data,
+        viz_type: 'table',
+        datasource: '3__table',
+        groupby: ['original_column'],
+      },
+    },
+    dataMask: {
+      [customizationId]: {
+        id: customizationId,
+        extraFormData: {},
+        filterState: { value: ['replacement_column'] },
+        ownState: {},
+      },
+    },
+    chartCustomizationItems: [
+      createChartCustomization({
+        id: customizationId,
+        name: 'Out Of Scope Group By',
+        chartsInScope: [],
+      }),
+    ],
+  };
+
+  const result = getFormDataWithExtraFilters(argsOutOfScope);
+  expectGroupBy(result, ['original_column']);
 });
diff --git a/superset-frontend/src/dashboard/util/migrateChartCustomization.test.ts b/superset-frontend/src/dashboard/util/migrateChartCustomization.test.ts
index 28784c7378a..3932a417544 100644
--- a/superset-frontend/src/dashboard/util/migrateChartCustomization.test.ts
+++ b/superset-frontend/src/dashboard/util/migrateChartCustomization.test.ts
@@ -418,6 +418,89 @@ test('migrateChartCustomizationArray migrates mixed array', () => {
   expect(result[1].name).toBe('Already Migrated');
 });
 
+test('isLegacyChartCustomizationFormat rejects item with customization: null', () => {
+  const item = { id: 'CUSTOMIZATION-NULL', customization: null };
+  expect(isLegacyChartCustomizationFormat(item)).toBe(false);
+});
+
+test('migrateChartCustomizationArray drops item with customization: null', () => {
+  const items = [
+    { id: 'CUSTOMIZATION-NULL', customization: null },
+    {
+      id: 'CUSTOMIZATION-VALID',
+      customization: {
+        name: 'Valid',
+        dataset: 1,
+        column: 'country',
+      },
+    },
+  ];
+  const result = migrateChartCustomizationArray(items);
+  // Malformed item is dropped; valid legacy item is migrated
+  expect(result).toHaveLength(1);
+  expect(result[0].name).toBe('Valid');
+  expect(result[0].type).toBe(ChartCustomizationType.ChartCustomization);
+});
+
+test('isLegacyChartCustomizationFormat rejects item with customization: undefined', () => {
+  const item = { id: 'CUSTOMIZATION-UNDEF', customization: undefined };
+  expect(isLegacyChartCustomizationFormat(item)).toBe(false);
+});
+
+test('migrateChartCustomizationArray drops null entries', () => {
+  const items = [
+    null,
+    {
+      id: 'CUSTOMIZATION-VALID',
+      customization: {
+        name: 'Valid',
+        dataset: 1,
+        column: 'country',
+      },
+    },
+  ];
+  const result = migrateChartCustomizationArray(items);
+  expect(result).toHaveLength(1);
+  expect(result[0].name).toBe('Valid');
+  expect(result[0].type).toBe(ChartCustomizationType.ChartCustomization);
+});
+
+test('migrateChartCustomizationArray drops undefined entries', () => {
+  const items = [
+    undefined,
+    {
+      id: 'CUSTOMIZATION-VALID',
+      customization: {
+        name: 'Valid',
+        dataset: 1,
+        column: 'country',
+      },
+    },
+  ];
+  const result = migrateChartCustomizationArray(items);
+  expect(result).toHaveLength(1);
+  expect(result[0].name).toBe('Valid');
+  expect(result[0].type).toBe(ChartCustomizationType.ChartCustomization);
+});
+
+test('migrateChartCustomizationArray drops item with customization: undefined', () => {
+  const items = [
+    { id: 'CUSTOMIZATION-UNDEF', customization: undefined },
+    {
+      id: 'CUSTOMIZATION-VALID',
+      customization: {
+        name: 'Valid',
+        dataset: 1,
+        column: 'country',
+      },
+    },
+  ];
+  const result = migrateChartCustomizationArray(items);
+  expect(result).toHaveLength(1);
+  expect(result[0].name).toBe('Valid');
+  expect(result[0].type).toBe(ChartCustomizationType.ChartCustomization);
+});
+
 test('migrateChartCustomizationArray handles empty array', () => {
   const result = migrateChartCustomizationArray([]);
   expect(result).toEqual([]);
diff --git a/superset-frontend/src/dashboard/util/migrateChartCustomization.ts b/superset-frontend/src/dashboard/util/migrateChartCustomization.ts
index e658c57c0f4..9e05495487a 100644
--- a/superset-frontend/src/dashboard/util/migrateChartCustomization.ts
+++ b/superset-frontend/src/dashboard/util/migrateChartCustomization.ts
@@ -32,6 +32,7 @@ export function isLegacyChartCustomizationFormat(
     typeof item === 'object' &&
     item !== null &&
     'customization' in item &&
+    (item as Record<string, unknown>).customization != null &&
     !('type' in item)
   );
 }
@@ -146,10 +147,17 @@ export function migrateChartCustomization(
 export function migrateChartCustomizationArray(
   items: unknown[],
 ): ChartCustomization[] {
-  return items.map(item => {
-    if (isLegacyChartCustomizationFormat(item)) {
-      return migrateChartCustomization(item);
-    }
-    return item as ChartCustomization;
-  });
+  return items
+    .filter(
+      item =>
+        item != null &&
+        (isLegacyChartCustomizationFormat(item) ||
+          (typeof item === 'object' && 'type' in item)),
+    )
+    .map(item => {
+      if (isLegacyChartCustomizationFormat(item)) {
+        return migrateChartCustomization(item);
+      }
+      return item as ChartCustomization;
+    });
 }
diff --git a/superset-frontend/src/dashboard/util/permissionUtils.test.ts b/superset-frontend/src/dashboard/util/permissionUtils.test.ts
index e7d9d133900..2bf2ea369f5 100644
--- a/superset-frontend/src/dashboard/util/permissionUtils.test.ts
+++ b/superset-frontend/src/dashboard/util/permissionUtils.test.ts
@@ -41,6 +41,7 @@ const ownerUser: UserWithPermissionsAndRoles = {
   username: 'owner',
   permissions: {},
   roles: { Alpha: [['can_write', 'Dashboard']] },
+  groups: [],
 };
 
 const adminUser: UserWithPermissionsAndRoles = {
diff --git a/superset-frontend/src/dataMask/reducer.test.ts b/superset-frontend/src/dataMask/reducer.test.ts
index 00f5e88d446..072fefe8948 100644
--- a/superset-frontend/src/dataMask/reducer.test.ts
+++ b/superset-frontend/src/dataMask/reducer.test.ts
@@ -23,11 +23,15 @@ import {
   type SetDataMaskForFilterChangesComplete,
 } from './actions';
 import {
+  type ChartCustomization,
   type DataMaskStateWithId,
   type Filter,
+  type FilterConfiguration,
   type NativeFilterTarget,
   NativeFilterType,
+  ChartCustomizationType,
 } from '@superset-ui/core';
+import { HYDRATE_DASHBOARD } from 'src/dashboard/actions/hydrate';
 
 // Helper to create minimal filter for testing
 const createFilter = (
@@ -116,3 +120,66 @@ test('when user edits a filter without changing targets, their selection is pres
     '1 year ago',
   );
 });
+
+// Runtime data from the server can contain null entries in
+// chart_customization_config even though the TS type does not include | null
+// yet. These helpers build HYDRATE_DASHBOARD actions that mirror that reality.
+function hydrateAction(
+  chartCustomizationConfig: unknown[],
+  nativeFilterConfig: FilterConfiguration = [],
+) {
+  return {
+    type: HYDRATE_DASHBOARD as typeof HYDRATE_DASHBOARD,
+    data: {
+      dashboardInfo: {
+        metadata: {
+          native_filter_configuration: nativeFilterConfig,
+          chart_customization_config:
+            chartCustomizationConfig as ChartCustomization[],
+        },
+      },
+      dataMask: {},
+    },
+  };
+}
+
+test('HYDRATE_DASHBOARD filters null entries from chart_customization_config', () => {
+  const customizationId = 'CHART_CUSTOMIZATION-group-1';
+  const action = hydrateAction([
+    null,
+    {
+      id: customizationId,
+      type: ChartCustomizationType.ChartCustomization,
+      name: 'Dynamic Group By',
+      filterType: 'chart_customization_dynamic_groupby',
+      targets: [{ datasetId: 1, column: { name: 'status' } }],
+      scope: { rootPath: ['ROOT_ID'], excluded: [] },
+      chartsInScope: [10],
+      defaultDataMask: {
+        extraFormData: {},
+        filterState: { value: ['status'] },
+      },
+      controlValues: {},
+      cascadeParentIds: [],
+      description: '',
+    },
+    null,
+  ]);
+
+  const result = reducer({}, action);
+
+  expect(result[customizationId]).toBeDefined();
+  expect(result[customizationId].filterState?.value).toEqual(['status']);
+});
+
+test('HYDRATE_DASHBOARD handles chart_customization_config that is entirely null', () => {
+  const action = hydrateAction([null, null]);
+
+  const result = reducer({}, action);
+
+  // Should not crash; no customization keys should appear
+  const customizationKeys = Object.keys(result).filter(k =>
+    k.startsWith('CHART_CUSTOMIZATION'),
+  );
+  expect(customizationKeys).toHaveLength(0);
+});
diff --git a/superset-frontend/src/dataMask/reducer.ts b/superset-frontend/src/dataMask/reducer.ts
index 90051cbe54a..5ae614eb048 100644
--- a/superset-frontend/src/dataMask/reducer.ts
+++ b/superset-frontend/src/dataMask/reducer.ts
@@ -230,8 +230,9 @@ const dataMaskReducer = produce(
           loadedDataMask,
         );
 
-        const rawChartCustomizationConfig =
-          metadata?.chart_customization_config || [];
+        const rawChartCustomizationConfig = (
+          metadata?.chart_customization_config || []
+        ).filter(Boolean);
 
         const hasLegacyFormat = rawChartCustomizationConfig.some(item =>
           isLegacyChartCustomizationFormat(item),
diff --git a/superset-frontend/src/explore/actions/hydrateExplore.ts b/superset-frontend/src/explore/actions/hydrateExplore.ts
index 0639ff9f949..d488dfb4d29 100644
--- a/superset-frontend/src/explore/actions/hydrateExplore.ts
+++ b/superset-frontend/src/explore/actions/hydrateExplore.ts
@@ -161,10 +161,10 @@ export const hydrateExplore =
         : findPermission('can_csv', 'Superset', user?.roles),
       can_export_image: granularExport
         ? findPermission('can_export_image', 'Superset', user?.roles)
-        : true,
+        : findPermission('can_csv', 'Superset', user?.roles),
       can_copy_clipboard: granularExport
         ? findPermission('can_copy_clipboard', 'Superset', user?.roles)
-        : true,
+        : findPermission('can_csv', 'Superset', user?.roles),
       can_overwrite: ensureIsArray(slice?.owners).includes(
         user?.userId as number,
       ),
@@ -211,7 +211,7 @@ export const hydrateExplore =
       sliceFormData,
       queryController: null,
       queriesResponse: null,
-      triggerQuery: false,
+      triggerQuery: !!saveAction,
       lastRendered: 0,
     };
 
diff --git a/superset-frontend/src/explore/components/ControlPanelsContainer.test.tsx b/superset-frontend/src/explore/components/ControlPanelsContainer.test.tsx
index 466c56ee1ac..4b797b36345 100644
--- a/superset-frontend/src/explore/components/ControlPanelsContainer.test.tsx
+++ b/superset-frontend/src/explore/components/ControlPanelsContainer.test.tsx
@@ -407,6 +407,119 @@ describe('ControlPanelsContainer', () => {
     getChartControlPanelRegistry().remove('line');
   });
 
+  test('should stash control value when visibility is false and disableStash is not set', async () => {
+    getChartControlPanelRegistry().remove('table');
+    getChartControlPanelRegistry().registerValue('table', {
+      controlPanelSections: [
+        {
+          label: t('Query'),
+          expanded: true,
+          controlSetRows: [
+            [
+              {
+                name: 'x_axis_time_format',
+                config: {
+                  type: 'SelectControl',
+                  label: t('Time Format'),
+                  default: 'smart_date',
+                  choices: [['smart_date', 'Adaptive Formatting']],
+                  visibility: () => false,
+                },
+              },
+            ],
+          ],
+        },
+      ],
+    });
+
+    const props = getDefaultProps();
+    props.form_data = {
+      ...props.form_data,
+      x_axis_time_format: 'smart_date',
+    };
+
+    const { getByTestId } = render(
+      <>
+        <ControlPanelsContainer {...props} />
+        <FormDataMock />
+      </>,
+      {
+        useRedux: true,
+        initialState: {
+          explore: {
+            form_data: {
+              ...defaultState.form_data,
+              x_axis_time_format: 'smart_date',
+            },
+          },
+        },
+      },
+    );
+
+    await waitFor(() => {
+      expect(getByTestId('mock-formdata')).not.toHaveTextContent(
+        'x_axis_time_format',
+      );
+    });
+  });
+
+  test('should preserve control value when visibility is false and disableStash is true', async () => {
+    getChartControlPanelRegistry().remove('table');
+    getChartControlPanelRegistry().registerValue('table', {
+      controlPanelSections: [
+        {
+          label: t('Query'),
+          expanded: true,
+          controlSetRows: [
+            [
+              {
+                name: 'x_axis_time_format',
+                config: {
+                  type: 'SelectControl',
+                  label: t('Time Format'),
+                  default: 'smart_date',
+                  choices: [['smart_date', 'Adaptive Formatting']],
+                  visibility: () => false,
+                  disableStash: true,
+                },
+              },
+            ],
+          ],
+        },
+      ],
+    });
+
+    const props = getDefaultProps();
+    props.form_data = {
+      ...props.form_data,
+      x_axis_time_format: 'smart_date',
+    };
+
+    const { getByTestId } = render(
+      <>
+        <ControlPanelsContainer {...props} />
+        <FormDataMock />
+      </>,
+      {
+        useRedux: true,
+        initialState: {
+          explore: {
+            form_data: {
+              ...defaultState.form_data,
+              x_axis_time_format: 'smart_date',
+            },
+          },
+        },
+      },
+    );
+
+    await waitFor(() => {
+      expect(getByTestId('mock-formdata')).toHaveTextContent(
+        'x_axis_time_format',
+      );
+    });
+  });
+
   test('should not show Matrixify tab for table chart types', async () => {
     // Enable Matrixify feature flag
     mockIsFeatureEnabled.mockImplementation(
diff --git a/superset-frontend/src/explore/components/ControlPanelsContainer.tsx b/superset-frontend/src/explore/components/ControlPanelsContainer.tsx
index 0a1c79ab9fe..fa7719bd521 100644
--- a/superset-frontend/src/explore/components/ControlPanelsContainer.tsx
+++ b/superset-frontend/src/explore/components/ControlPanelsContainer.tsx
@@ -648,6 +648,7 @@ export const ControlPanelsContainer = (props: ControlPanelsContainerProps) => {
       </span>
     );
 
+    let isInSubSection = false;
     const PanelChildren = (
       <>
         <StashFormDataContainer
@@ -665,8 +666,19 @@ export const ControlPanelsContainer = (props: ControlPanelsContainerProps) => {
             .filter(Boolean)}
         />
         {isVisible && (
-          <>
+          <div style={{ paddingLeft: theme.sizeUnit * 2 }}>
             {section.controlSetRows.map((controlSets, i) => {
+              // Detect sub-section header rows (React elements with no name prop)
+              const isSubSectionHeaderRow = controlSets.some(
+                item =>
+                  isValidElement(item) &&
+                  !(item as React.ReactElement<Record<string, unknown>>).props
+                    ?.name,
+              );
+              if (isSubSectionHeaderRow) {
+                isInSubSection = true;
+              }
+
               const renderedControls = controlSets
                 .map(controlItem => {
                   if (!controlItem) {
@@ -715,14 +727,23 @@ export const ControlPanelsContainer = (props: ControlPanelsContainerProps) => {
               if (renderedControls.length === 0) {
                 return null;
               }
-              return (
+              // Indent controls within sub-sections for visual hierarchy
+              const paddingLeft =
+                isInSubSection && !isSubSectionHeaderRow
+                  ? theme.sizeUnit * 3
+                  : 0;
+              return paddingLeft ? (
+                <div key={`controlsetrow-${i}`} style={{ paddingLeft }}>
+                  <ControlRow controls={renderedControls} />
+                </div>
+              ) : (
                 <ControlRow
                   key={`controlsetrow-${i}`}
                   controls={renderedControls}
                 />
               );
             })}
-          </>
+          </div>
         )}
       </>
     );
diff --git a/superset-frontend/src/explore/components/DataTableControl/CopyToClipboardButton.test.tsx b/superset-frontend/src/explore/components/DataTableControl/CopyToClipboardButton.test.tsx
index dafe14902e3..a66759833aa 100644
--- a/superset-frontend/src/explore/components/DataTableControl/CopyToClipboardButton.test.tsx
+++ b/superset-frontend/src/explore/components/DataTableControl/CopyToClipboardButton.test.tsx
@@ -54,3 +54,31 @@ test('Should copy to clipboard', async () => {
   // @ts-expect-error
   global.navigator.clipboard = originalClipboard;
 });
+
+test('Should not copy to clipboard when disabled', async () => {
+  const callback = jest.fn();
+  document.execCommand = callback;
+
+  const originalClipboard = { ...global.navigator.clipboard };
+  // @ts-expect-error
+  global.navigator.clipboard = { write: callback, writeText: callback };
+
+  render(
+    <CopyToClipboardButton data={[{ copy: 'data', data: 'copy' }]} disabled />,
+    {
+      useRedux: true,
+    },
+  );
+
+  const copyButton = screen.getByRole('button');
+  expect(copyButton).toHaveAttribute('aria-disabled', 'true');
+  userEvent.click(copyButton);
+
+  await waitFor(() => {
+    expect(callback).not.toHaveBeenCalled();
+  });
+
+  jest.resetAllMocks();
+  // @ts-expect-error
+  global.navigator.clipboard = originalClipboard;
+});
diff --git a/superset-frontend/src/explore/components/DataTableControl/index.tsx b/superset-frontend/src/explore/components/DataTableControl/index.tsx
index 823da872857..11599cf2c80 100644
--- a/superset-frontend/src/explore/components/DataTableControl/index.tsx
+++ b/superset-frontend/src/explore/components/DataTableControl/index.tsx
@@ -58,29 +58,45 @@ export const CopyButton = styled(Button)`
 export const CopyToClipboardButton = ({
   data,
   columns,
+  disabled = false,
 }: {
   data?: TabularDataRow[];
   columns?: string[];
-}) => (
-  <CopyToClipboard
-    text={
-      data && columns ? prepareCopyToClipboardTabularData(data, columns) : ''
-    }
-    wrapped={false}
-    copyNode={
-      <Icons.CopyOutlined
-        iconSize="l"
-        aria-label={t('Copy')}
-        role="button"
-        css={css`
-          &.anticon > * {
-            line-height: 0;
-          }
-        `}
-      />
-    }
-  />
-);
+  disabled?: boolean;
+}) => {
+  const theme = useTheme();
+  return (
+    <CopyToClipboard
+      text={
+        !disabled && data && columns
+          ? prepareCopyToClipboardTabularData(data, columns)
+          : ''
+      }
+      disabled={disabled}
+      wrapped={false}
+      copyNode={
+        <span
+          role="button"
+          aria-label={t('Copy')}
+          aria-disabled={disabled}
+          tabIndex={disabled ? -1 : 0}
+        >
+          <Icons.CopyOutlined
+            iconColor={theme.colorIcon}
+            iconSize="l"
+            css={css`
+              opacity: ${disabled ? 0.3 : 1};
+              cursor: ${disabled ? 'not-allowed' : 'pointer'};
+              &.anticon > * {
+                line-height: 0;
+              }
+            `}
+          />
+        </span>
+      }
+    />
+  );
+};
 
 export const FilterInput = ({
   onChangeHandler,
diff --git a/superset-frontend/src/explore/components/DataTablesPane/DataTablesPane.tsx b/superset-frontend/src/explore/components/DataTablesPane/DataTablesPane.tsx
index 22431227cb3..74302177542 100644
--- a/superset-frontend/src/explore/components/DataTablesPane/DataTablesPane.tsx
+++ b/superset-frontend/src/explore/components/DataTablesPane/DataTablesPane.tsx
@@ -206,6 +206,7 @@ export const DataTablesPane = ({
         <StyledDiv>
           <SamplesPane
             datasource={datasource}
+            queryFormData={queryFormData}
             queryForce={queryForce}
             isRequest={isRequest.samples}
             setForceQuery={setForceQuery}
diff --git a/superset-frontend/src/explore/components/DataTablesPane/components/DataTableControls.tsx b/superset-frontend/src/explore/components/DataTablesPane/components/DataTableControls.tsx
index 5206032b03b..72b8fab8941 100644
--- a/superset-frontend/src/explore/components/DataTablesPane/components/DataTableControls.tsx
+++ b/superset-frontend/src/explore/components/DataTablesPane/components/DataTableControls.tsx
@@ -16,10 +16,13 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { styled, css } from '@apache-superset/core/theme';
+import { styled, css, useTheme } from '@apache-superset/core/theme';
+import { t } from '@apache-superset/core/translation';
 import { GenericDataType } from '@apache-superset/core/common';
 import { useMemo } from 'react';
 import { zip } from 'lodash';
+import { Select, Tooltip } from '@superset-ui/core/components';
+import { Icons } from '@superset-ui/core/components/Icons';
 import {
   CopyToClipboardButton,
   FilterInput,
@@ -27,12 +30,23 @@ import {
 import { applyFormattingToTabularData } from 'src/utils/common';
 import { getTimeColumns } from 'src/explore/components/DataTableControl/utils';
 import RowCountLabel from 'src/components/RowCountLabel';
+import { usePermissions } from 'src/hooks/usePermissions';
+import DownloadDropdown from 'src/components/Chart/DrillDetail/DownloadDropdown';
 import { TableControlsProps } from '../types';
 
+export const ROW_LIMIT_OPTIONS = [
+  { value: 100, label: '100 rows' },
+  { value: 500, label: '500 rows' },
+  { value: 1000, label: '1k rows' },
+  { value: 5000, label: '5k rows' },
+  { value: 10000, label: '10k rows' },
+];
+
 export const TableControlsWrapper = styled.div`
   ${({ theme }) => `
     display: flex;
     align-items: center;
+    padding-top: ${theme.sizeUnit * 2}px;
     padding-bottom: ${theme.sizeUnit * 2}px;
     justify-content: space-between;
 
@@ -51,7 +65,14 @@ export const TableControls = ({
   rowcount,
   isLoading,
   canDownload,
+  rowLimit,
+  rowLimitOptions,
+  onRowLimitChange,
+  onDownloadCSV,
+  onDownloadXLSX,
+  onReload,
 }: TableControlsProps) => {
+  const theme = useTheme();
   const originalTimeColumns = getTimeColumns(datasourceId);
   const formattedTimeColumns = zip<string, GenericDataType>(
     columnNames,
@@ -69,6 +90,7 @@ export const TableControls = ({
     () => applyFormattingToTabularData(data, formattedTimeColumns),
     [data, formattedTimeColumns],
   );
+  const { canCopyClipboard: copyEnabled } = usePermissions();
   return (
     <TableControlsWrapper>
       <FilterInput onChangeHandler={onInputChange} shouldFocus />
@@ -76,11 +98,51 @@ export const TableControls = ({
         css={css`
           display: flex;
           align-items: center;
+          gap: 8px;
         `}
       >
-        <RowCountLabel rowcount={rowcount} loading={isLoading} />
-        {canDownload && (
+        {onRowLimitChange && (
+          <Select
+            value={rowLimit}
+            onChange={onRowLimitChange}
+            options={rowLimitOptions ?? []}
+            css={css`
+              min-width: 110px;
+            `}
+          />
+        )}
+        {(!onRowLimitChange || rowcount < (rowLimit ?? Infinity)) && (
+          <RowCountLabel rowcount={rowcount} loading={isLoading} />
+        )}
+        {canDownload && onDownloadCSV && onDownloadXLSX && (
+          <DownloadDropdown
+            onDownloadCSV={onDownloadCSV}
+            onDownloadXLSX={onDownloadXLSX}
+          />
+        )}
+        {copyEnabled ? (
           <CopyToClipboardButton data={formattedData} columns={columnNames} />
+        ) : (
+          <Tooltip title={t("You don't have permission to copy to clipboard")}>
+            <span>
+              <CopyToClipboardButton
+                data={formattedData}
+                columns={columnNames}
+                disabled
+              />
+            </span>
+          </Tooltip>
+        )}
+        {onReload && (
+          <Tooltip title={t('Reload')}>
+            <Icons.ReloadOutlined
+              iconColor={theme.colorIcon}
+              iconSize="l"
+              aria-label={t('Reload')}
+              role="button"
+              onClick={onReload}
+            />
+          </Tooltip>
         )}
       </div>
     </TableControlsWrapper>
diff --git a/superset-frontend/src/explore/components/DataTablesPane/components/SamplesPane.tsx b/superset-frontend/src/explore/components/DataTablesPane/components/SamplesPane.tsx
index 1c58bd9ae69..b7c4b4ae48b 100644
--- a/superset-frontend/src/explore/components/DataTablesPane/components/SamplesPane.tsx
+++ b/superset-frontend/src/explore/components/DataTablesPane/components/SamplesPane.tsx
@@ -20,64 +20,96 @@ import { useState, useEffect, useMemo, useCallback } from 'react';
 import { t } from '@apache-superset/core/translation';
 import { ensureIsArray } from '@superset-ui/core';
 import { styled } from '@apache-superset/core/theme';
-import {
-  TableView,
-  TableSize,
-  EmptyState,
-  Loading,
-  EmptyWrapperType,
-} from '@superset-ui/core/components';
+import { EmptyState, Loading } from '@superset-ui/core/components';
 import { GenericDataType } from '@apache-superset/core/common';
-import {
-  useFilteredTableData,
-  useTableColumns,
-} from 'src/explore/components/DataTableControl';
+import { GridTable } from 'src/components/GridTable';
+import { GridSize } from 'src/components/GridTable/constants';
 import { getDatasourceSamples } from 'src/components/Chart/chartAction';
-import { TableControls } from './DataTableControls';
+import { getDrillPayload } from 'src/components/Chart/DrillDetail/utils';
+import {
+  useGridColumns,
+  useKeywordFilter,
+  useGridHeight,
+} from './useGridResultTable';
+import { TableControls, ROW_LIMIT_OPTIONS } from './DataTableControls';
 import { SamplesPaneProps } from '../types';
 
 const Error = styled.pre`
   margin-top: ${({ theme }) => `${theme.sizeUnit * 4}px`};
 `;
 
-const cache = new WeakSet();
+const GridContainer = styled.div`
+  flex: 1;
+  min-height: 0;
+  position: relative;
+`;
+
+const GridSizer = styled.div`
+  position: absolute;
+  inset: 0;
+`;
+
+const cache = new WeakMap();
+
+const DEFAULT_ROW_LIMIT = 100;
 
 export const SamplesPane = ({
   isRequest,
   datasource,
+  queryFormData,
   queryForce,
   setForceQuery,
-  dataSize = 50,
   isVisible,
   canDownload,
 }: SamplesPaneProps) => {
   const [filterText, setFilterText] = useState('');
+  const [rowLimit, setRowLimit] = useState(DEFAULT_ROW_LIMIT);
   const [data, setData] = useState<Record<string, any>[][]>([]);
   const [colnames, setColnames] = useState<string[]>([]);
   const [coltypes, setColtypes] = useState<GenericDataType[]>([]);
   const [isLoading, setIsLoading] = useState<boolean>(false);
   const [rowcount, setRowCount] = useState<number>(0);
   const [responseError, setResponseError] = useState<string>('');
+  const { gridHeight, measuredRef } = useGridHeight();
   const datasourceId = useMemo(
     () => `${datasource.id}__${datasource.type}`,
     [datasource],
   );
 
+  const handleRowLimitChange = useCallback(
+    (limit: number) => {
+      setRowLimit(limit);
+      cache.delete(queryFormData);
+    },
+    [queryFormData],
+  );
+
   useEffect(() => {
     if (isRequest && queryForce) {
-      cache.delete(datasource);
+      cache.delete(queryFormData);
     }
 
-    if (isRequest && !cache.has(datasource)) {
+    if (isRequest && !cache.has(queryFormData)) {
       setIsLoading(true);
-      getDatasourceSamples(datasource.type, datasource.id, queryForce, {})
+      const payload =
+        getDrillPayload(
+          queryFormData as Parameters<typeof getDrillPayload>[0],
+        ) ?? {};
+      getDatasourceSamples(
+        datasource.type,
+        datasource.id,
+        queryForce,
+        payload,
+        rowLimit,
+        1,
+      )
         .then(response => {
           setData(ensureIsArray(response.data));
           setColnames(ensureIsArray(response.colnames));
           setColtypes(ensureIsArray(response.coltypes));
           setRowCount(response.rowcount);
           setResponseError('');
-          cache.add(datasource);
+          cache.set(queryFormData, true);
           if (queryForce) {
             setForceQuery?.(false);
           }
@@ -92,20 +124,10 @@ export const SamplesPane = ({
           setIsLoading(false);
         });
     }
-  }, [datasource, isRequest, queryForce]);
+  }, [datasource, queryFormData, isRequest, queryForce, rowLimit]);
 
-  // this is to preserve the order of the columns, even if there are integer values,
-  // while also only grabbing the first column's keys
-  const columns = useTableColumns(
-    colnames,
-    coltypes,
-    data,
-    datasourceId,
-    isVisible,
-    {}, // moreConfig
-    true, // allowHTML
-  );
-  const filteredData = useFilteredTableData(filterText, data);
+  const columns = useGridColumns(colnames, coltypes, data);
+  const keywordFilter = useKeywordFilter(filterText);
 
   const handleInputChange = useCallback(
     (input: string) => setFilterText(input),
@@ -120,7 +142,7 @@ export const SamplesPane = ({
     return (
       <>
         <TableControls
-          data={filteredData}
+          data={data}
           columnNames={colnames}
           columnTypes={coltypes}
           rowcount={rowcount}
@@ -128,6 +150,9 @@ export const SamplesPane = ({
           onInputChange={handleInputChange}
           isLoading={isLoading}
           canDownload={canDownload}
+          rowLimit={rowLimit}
+          rowLimitOptions={ROW_LIMIT_OPTIONS}
+          onRowLimitChange={handleRowLimitChange}
         />
         <Error>{responseError}</Error>
       </>
@@ -142,7 +167,7 @@ export const SamplesPane = ({
   return (
     <>
       <TableControls
-        data={filteredData}
+        data={data}
         columnNames={colnames}
         columnTypes={coltypes}
         rowcount={rowcount}
@@ -150,19 +175,22 @@ export const SamplesPane = ({
         onInputChange={handleInputChange}
         isLoading={isLoading}
         canDownload={canDownload}
+        rowLimit={rowLimit}
+        rowLimitOptions={ROW_LIMIT_OPTIONS}
+        onRowLimitChange={handleRowLimitChange}
       />
-      <TableView
-        columns={columns}
-        data={filteredData}
-        pageSize={dataSize}
-        noDataText={t('No results')}
-        emptyWrapperType={EmptyWrapperType.Small}
-        className="table-condensed"
-        isPaginationSticky
-        showRowCount={false}
-        size={TableSize.Small}
-        small
-      />
+      <GridContainer>
+        <GridSizer ref={measuredRef}>
+          <GridTable
+            data={data}
+            columns={columns}
+            height={gridHeight}
+            size={GridSize.Small}
+            externalFilter={keywordFilter}
+            showRowNumber
+          />
+        </GridSizer>
+      </GridContainer>
     </>
   );
 };
diff --git a/superset-frontend/src/explore/components/DataTablesPane/components/SingleQueryResultPane.tsx b/superset-frontend/src/explore/components/DataTablesPane/components/SingleQueryResultPane.tsx
index cf44d415538..8cd279f4164 100644
--- a/superset-frontend/src/explore/components/DataTablesPane/components/SingleQueryResultPane.tsx
+++ b/superset-frontend/src/explore/components/DataTablesPane/components/SingleQueryResultPane.tsx
@@ -17,46 +17,55 @@
  * under the License.
  */
 import { useState, useCallback } from 'react';
-import { t } from '@apache-superset/core/translation';
+import { styled } from '@apache-superset/core/theme';
+import { GridTable } from 'src/components/GridTable';
+import { GridSize } from 'src/components/GridTable/constants';
 import {
-  TableView,
-  TableSize,
-  EmptyWrapperType,
-} from '@superset-ui/core/components';
-import {
-  useFilteredTableData,
-  useTableColumns,
-} from 'src/explore/components/DataTableControl';
+  useGridColumns,
+  useKeywordFilter,
+  useGridHeight,
+} from './useGridResultTable';
 import { TableControls } from './DataTableControls';
 import { SingleQueryResultPaneProp } from '../types';
 
+const ResultPaneContainer = styled.div`
+  display: flex;
+  flex-direction: column;
+  flex: 1;
+  min-height: 0;
+`;
+
+const GridContainer = styled.div`
+  flex: 1;
+  min-height: 0;
+  position: relative;
+`;
+
+const GridSizer = styled.div`
+  position: absolute;
+  inset: 0;
+`;
+
 export const SingleQueryResultPane = ({
   data,
   colnames,
   coltypes,
   rowcount,
   datasourceId,
-  dataSize = 50,
-  isVisible,
   canDownload,
   columnDisplayNames,
-  isPaginationSticky = true,
+  rowLimit,
+  rowLimitOptions,
+  onRowLimitChange,
+  onDownloadCSV,
+  onDownloadXLSX,
+  onReload,
 }: SingleQueryResultPaneProp) => {
   const [filterText, setFilterText] = useState('');
+  const { gridHeight, measuredRef } = useGridHeight();
 
-  // this is to preserve the order of the columns, even if there are integer values,
-  // while also only grabbing the first column's keys
-  const columns = useTableColumns(
-    colnames,
-    coltypes,
-    data,
-    datasourceId,
-    isVisible,
-    {}, // moreConfig
-    true, // allowHTML
-    columnDisplayNames,
-  );
-  const filteredData = useFilteredTableData(filterText, data);
+  const columns = useGridColumns(colnames, coltypes, data, columnDisplayNames);
+  const keywordFilter = useKeywordFilter(filterText);
 
   const handleInputChange = useCallback(
     (input: string) => setFilterText(input),
@@ -64,9 +73,9 @@ export const SingleQueryResultPane = ({
   );
 
   return (
-    <>
+    <ResultPaneContainer>
       <TableControls
-        data={filteredData}
+        data={data}
         columnNames={colnames}
         columnTypes={coltypes}
         rowcount={rowcount}
@@ -74,19 +83,25 @@ export const SingleQueryResultPane = ({
         onInputChange={handleInputChange}
         isLoading={false}
         canDownload={canDownload}
+        rowLimit={rowLimit}
+        rowLimitOptions={rowLimitOptions}
+        onRowLimitChange={onRowLimitChange}
+        onDownloadCSV={onDownloadCSV}
+        onDownloadXLSX={onDownloadXLSX}
+        onReload={onReload}
       />
-      <TableView
-        columns={columns}
-        size={TableSize.Small}
-        data={filteredData}
-        pageSize={dataSize}
-        noDataText={t('No results')}
-        emptyWrapperType={EmptyWrapperType.Small}
-        className="table-condensed"
-        isPaginationSticky={isPaginationSticky}
-        showRowCount={false}
-        small
-      />
-    </>
+      <GridContainer>
+        <GridSizer ref={measuredRef}>
+          <GridTable
+            data={data}
+            columns={columns}
+            height={gridHeight}
+            size={GridSize.Small}
+            externalFilter={keywordFilter}
+            showRowNumber
+          />
+        </GridSizer>
+      </GridContainer>
+    </ResultPaneContainer>
   );
 };
diff --git a/superset-frontend/src/explore/components/DataTablesPane/components/useGridResultTable.tsx b/superset-frontend/src/explore/components/DataTablesPane/components/useGridResultTable.tsx
new file mode 100644
index 00000000000..a88a32eef05
--- /dev/null
+++ b/superset-frontend/src/explore/components/DataTablesPane/components/useGridResultTable.tsx
@@ -0,0 +1,123 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+import { useMemo, useCallback, useRef, useState } from 'react';
+import { getTimeFormatter, safeHtmlSpan, TimeFormats } from '@superset-ui/core';
+import { Constants } from '@superset-ui/core/components';
+import { GenericDataType } from '@apache-superset/core/common';
+import type { IRowNode } from 'ag-grid-community';
+
+const timeFormatter = getTimeFormatter(TimeFormats.DATABASE_DATETIME);
+
+export function useGridColumns(
+  colnames: string[] | undefined,
+  coltypes: GenericDataType[] | undefined,
+  data: Record<string, any>[] | undefined,
+  columnDisplayNames?: Record<string, string>,
+) {
+  return useMemo(
+    () =>
+      colnames && data?.length
+        ? colnames
+            .filter((column: string) => Object.keys(data[0]).includes(column))
+            .map((key, index) => {
+              const colType = coltypes?.[index];
+              const headerLabel = columnDisplayNames?.[key] ?? key;
+              return {
+                label: key,
+                headerName: headerLabel,
+                render: ({ value }: { value: unknown }) => {
+                  if (value === true) {
+                    return Constants.BOOL_TRUE_DISPLAY;
+                  }
+                  if (value === false) {
+                    return Constants.BOOL_FALSE_DISPLAY;
+                  }
+                  if (value === null) {
+                    return (
+                      <span style={{ color: 'var(--ant-color-text-tertiary)' }}>
+                        {Constants.NULL_DISPLAY}
+                      </span>
+                    );
+                  }
+                  if (
+                    colType === GenericDataType.Temporal &&
+                    typeof value === 'number'
+                  ) {
+                    return timeFormatter(value);
+                  }
+                  if (typeof value === 'string') {
+                    return safeHtmlSpan(value);
+                  }
+                  return String(value);
+                },
+              };
+            })
+        : [],
+    [colnames, data, coltypes, columnDisplayNames],
+  );
+}
+
+export function useKeywordFilter(filterText: string) {
+  return useCallback(
+    (node: IRowNode) => {
+      if (filterText && node.data) {
+        const lowerFilter = filterText.toLowerCase();
+        return Object.values(node.data).some(
+          (value: unknown) =>
+            value != null && String(value).toLowerCase().includes(lowerFilter),
+        );
+      }
+      return true;
+    },
+    [filterText],
+  );
+}
+
+/**
+ * Measures the height of an absolutely-positioned inner element that fills
+ * its relative-positioned parent. Uses a callback ref so the ResizeObserver
+ * is created when the element mounts (which may be after initial render if
+ * the component conditionally renders a loading state first).
+ */
+export function useGridHeight(fallbackHeight = 400) {
+  const [gridHeight, setGridHeight] = useState(fallbackHeight);
+  const observerRef = useRef<ResizeObserver | null>(null);
+
+  const measuredRef = useCallback((el: HTMLDivElement | null) => {
+    if (observerRef.current) {
+      observerRef.current.disconnect();
+      observerRef.current = null;
+    }
+    if (!el) return;
+
+    const observer = new ResizeObserver(entries => {
+      const entry = entries[0];
+      if (entry) {
+        const h = Math.floor(entry.contentRect.height);
+        if (h > 0) {
+          setGridHeight(prev => (prev !== h ? h : prev));
+        }
+      }
+    });
+    observer.observe(el);
+    observerRef.current = observer;
+  }, []);
+
+  return { gridHeight, measuredRef };
+}
diff --git a/superset-frontend/src/explore/components/DataTablesPane/components/useResultsPane.tsx b/superset-frontend/src/explore/components/DataTablesPane/components/useResultsPane.tsx
index 9ba54e5b62e..302be4ea51b 100644
--- a/superset-frontend/src/explore/components/DataTablesPane/components/useResultsPane.tsx
+++ b/superset-frontend/src/explore/components/DataTablesPane/components/useResultsPane.tsx
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { useState, useEffect, ReactElement, useCallback } from 'react';
+import { useState, useEffect, useMemo, ReactElement, useCallback } from 'react';
 
 import { t } from '@apache-superset/core/translation';
 import {
@@ -29,7 +29,7 @@ import { EmptyState, Loading } from '@superset-ui/core/components';
 import { getChartDataRequest } from 'src/components/Chart/chartAction';
 import { ResultsPaneProps, QueryResultInterface } from '../types';
 import { SingleQueryResultPane } from './SingleQueryResultPane';
-import { TableControls } from './DataTableControls';
+import { TableControls, ROW_LIMIT_OPTIONS } from './DataTableControls';
 
 const Error = styled.pre`
   margin-top: ${({ theme }) => `${theme.sizeUnit * 4}px`};
@@ -53,7 +53,6 @@ export const useResultsPane = ({
   errorMessage,
   setForceQuery,
   isVisible,
-  dataSize = 50,
   canDownload,
   columnDisplayNames,
 }: ResultsPaneProps): ReactElement[] => {
@@ -61,6 +60,8 @@ export const useResultsPane = ({
     queryFormData?.viz_type || queryFormData?.vizType,
   );
 
+  const chartRowLimit = Number(queryFormData?.row_limit) || 10000;
+  const [rowLimit, setRowLimit] = useState(1000);
   const [resultResp, setResultResp] = useState<QueryResultInterface[]>([]);
   const [isLoading, setIsLoading] = useState<boolean>(true);
   const [responseError, setResponseError] = useState<string>('');
@@ -69,12 +70,28 @@ export const useResultsPane = ({
 
   const noOpInputChange = useCallback(() => {}, []);
 
+  // Never exceed the chart's own row_limit
+  const effectiveRowLimit = Math.min(rowLimit, chartRowLimit);
+
+  const cappedFormData = useMemo(
+    () => ({ ...queryFormData, row_limit: effectiveRowLimit }),
+    [queryFormData, effectiveRowLimit],
+  );
+
+  const handleRowLimitChange = useCallback(
+    (limit: number) => {
+      setRowLimit(limit);
+      cache.delete(cappedFormData);
+    },
+    [cappedFormData],
+  );
+
   useEffect(() => {
     // it's an invalid formData when gets a errorMessage
     if (errorMessage) return;
-    if (isRequest && cache.has(queryFormData)) {
+    if (isRequest && cache.has(cappedFormData)) {
       setResultResp(
-        ensureIsArray(cache.get(queryFormData)) as QueryResultInterface[],
+        ensureIsArray(cache.get(cappedFormData)) as QueryResultInterface[],
       );
       setResponseError('');
       if (queryForce) {
@@ -82,10 +99,10 @@ export const useResultsPane = ({
       }
       setIsLoading(false);
     }
-    if (isRequest && !cache.has(queryFormData)) {
+    if (isRequest && !cache.has(cappedFormData)) {
       setIsLoading(true);
       getChartDataRequest({
-        formData: queryFormData,
+        formData: cappedFormData,
         force: queryForce,
         resultFormat: 'json',
         resultType: 'results',
@@ -94,7 +111,7 @@ export const useResultsPane = ({
         .then(({ json }) => {
           setResultResp(ensureIsArray(json.result) as QueryResultInterface[]);
           setResponseError('');
-          cache.set(queryFormData, json.result);
+          cache.set(cappedFormData, json.result);
           if (queryForce) {
             setForceQuery?.(false);
           }
@@ -108,7 +125,7 @@ export const useResultsPane = ({
           setIsLoading(false);
         });
     }
-  }, [queryFormData, isRequest]);
+  }, [cappedFormData, isRequest]);
 
   useEffect(() => {
     if (errorMessage) {
@@ -163,11 +180,13 @@ export const useResultsPane = ({
         colnames={result.colnames}
         coltypes={result.coltypes}
         rowcount={result.rowcount}
-        dataSize={dataSize}
         datasourceId={queryFormData.datasource}
         isVisible={isVisible}
         canDownload={canDownload}
         columnDisplayNames={columnDisplayNames}
+        rowLimit={rowLimit}
+        rowLimitOptions={ROW_LIMIT_OPTIONS}
+        onRowLimitChange={handleRowLimitChange}
       />
     </StyledDiv>
   ));
diff --git a/superset-frontend/src/explore/components/DataTablesPane/test/DataTablesPane.test.tsx b/superset-frontend/src/explore/components/DataTablesPane/test/DataTablesPane.test.tsx
index 90d3747d6fe..d60d588cb74 100644
--- a/superset-frontend/src/explore/components/DataTablesPane/test/DataTablesPane.test.tsx
+++ b/superset-frontend/src/explore/components/DataTablesPane/test/DataTablesPane.test.tsx
@@ -19,16 +19,16 @@
 import fetchMock from 'fetch-mock';
 import { FeatureFlag } from '@superset-ui/core';
 import * as copyUtils from 'src/utils/copy';
-import {
-  render,
-  screen,
-  userEvent,
-  waitForElementToBeRemoved,
-} from 'spec/helpers/testing-library';
+import { render, screen, userEvent } from 'spec/helpers/testing-library';
+import { setupAGGridModules } from '@superset-ui/core/components/ThemedAgGridReact';
 import { setItem, LocalStorageKeys } from 'src/utils/localStorageHelpers';
 import { DataTablesPane } from '..';
 import { createDataTablesPaneProps } from './fixture';
 
+beforeAll(() => {
+  setupAGGridModules();
+});
+
 // eslint-disable-next-line no-restricted-globals -- TODO: Migrate from describe blocks
 describe('DataTablesPane', () => {
   // Collapsed/expanded state depends on local storage
@@ -104,23 +104,36 @@ describe('DataTablesPane', () => {
         ],
       },
     );
+    // @ts-expect-error
+    global.featureFlags = {
+      [FeatureFlag.GranularExportControls]: true,
+    };
     const copyToClipboardSpy = jest.spyOn(copyUtils, 'default');
     const props = createDataTablesPaneProps(456);
     render(<DataTablesPane {...props} />, {
       useRedux: true,
+      initialState: {
+        user: {
+          roles: {
+            gamma: [['can_copy_clipboard', 'Superset']],
+          },
+        },
+      },
     });
     userEvent.click(screen.getByText('Results'));
     expect(await screen.findByText('1 row')).toBeVisible();
 
-    userEvent.click(screen.getByLabelText('Copy'));
+    await userEvent.click(screen.getByLabelText('Copy'));
     expect(copyToClipboardSpy).toHaveBeenCalledTimes(1);
     const value = await copyToClipboardSpy.mock.calls[0][0]();
     expect(value).toBe('__timestamp\tgenre\n2009-01-01 00:00:00\tAction\n');
     copyToClipboardSpy.mockRestore();
+    // @ts-expect-error
+    global.featureFlags = {};
     fetchMock.clearHistory().removeRoutes();
   });
 
-  test('Should not allow copy data table content when canDownload=false', async () => {
+  test('Should not allow copy data table content without clipboard permission', async () => {
     fetchMock.post(
       'glob:*/api/v1/chart/data?form_data=%7B%22slice_id%22%3A456%7D',
       {
@@ -135,16 +148,38 @@ describe('DataTablesPane', () => {
         ],
       },
     );
+    // @ts-expect-error
+    global.featureFlags = {
+      [FeatureFlag.GranularExportControls]: true,
+    };
+    const copyToClipboardSpy = jest.spyOn(copyUtils, 'default');
     const props = {
       ...createDataTablesPaneProps(456),
-      canDownload: false,
+      canDownload: true,
     };
     render(<DataTablesPane {...props} />, {
       useRedux: true,
+      initialState: {
+        user: {
+          roles: {
+            gamma: [['can_export_data', 'Superset']],
+          },
+        },
+      },
     });
     userEvent.click(screen.getByText('Results'));
     expect(await screen.findByText('1 row')).toBeVisible();
-    expect(screen.queryByLabelText('Copy')).not.toBeInTheDocument();
+    const copyButton = screen.getByLabelText('Copy');
+    expect(copyButton).toHaveAttribute('aria-disabled', 'true');
+    await userEvent.hover(copyButton);
+    expect(
+      await screen.findByText("You don't have permission to copy to clipboard"),
+    ).toBeInTheDocument();
+    await userEvent.click(copyButton);
+    expect(copyToClipboardSpy).not.toHaveBeenCalled();
+    copyToClipboardSpy.mockRestore();
+    // @ts-expect-error
+    global.featureFlags = {};
     fetchMock.clearHistory().removeRoutes();
   });
 
@@ -175,12 +210,6 @@ describe('DataTablesPane', () => {
 
     expect(screen.getByText('Action')).toBeVisible();
     expect(screen.getByText('Horror')).toBeVisible();
-
-    userEvent.type(screen.getByPlaceholderText('Search'), 'hor');
-
-    await waitForElementToBeRemoved(() => screen.queryByText('Action'));
-    expect(screen.getByText('Horror')).toBeVisible();
-    expect(screen.queryByText('Action')).not.toBeInTheDocument();
     fetchMock.clearHistory().removeRoutes();
   });
 
diff --git a/superset-frontend/src/explore/components/DataTablesPane/test/ResultsPaneOnDashboard.test.tsx b/superset-frontend/src/explore/components/DataTablesPane/test/ResultsPaneOnDashboard.test.tsx
index 6f870e0d384..145ab3e7896 100644
--- a/superset-frontend/src/explore/components/DataTablesPane/test/ResultsPaneOnDashboard.test.tsx
+++ b/superset-frontend/src/explore/components/DataTablesPane/test/ResultsPaneOnDashboard.test.tsx
@@ -20,14 +20,18 @@ import fetchMock from 'fetch-mock';
 import {
   screen,
   render,
-  userEvent,
   waitForElementToBeRemoved,
   waitFor,
 } from 'spec/helpers/testing-library';
 import { ChartMetadata, ChartPlugin, VizType } from '@superset-ui/core';
+import { setupAGGridModules } from '@superset-ui/core/components/ThemedAgGridReact';
 import { ResultsPaneOnDashboard } from '../components';
 import { createResultsPaneOnDashboardProps } from './fixture';
 
+beforeAll(() => {
+  setupAGGridModules();
+});
+
 // eslint-disable-next-line no-restricted-globals -- TODO: Migrate from describe blocks
 describe('ResultsPaneOnDashboard', () => {
   // render and render errorMessage
@@ -126,12 +130,12 @@ describe('ResultsPaneOnDashboard', () => {
     expect(await findByText('Bad request')).toBeVisible();
   });
 
-  test('force query, render and search', async () => {
+  test('force query, render', async () => {
     const props = createResultsPaneOnDashboardProps({
       sliceId: 144,
       queryForce: true,
     });
-    const { queryByText, getByPlaceholderText } = render(
+    const { queryByText } = render(
       <ResultsPaneOnDashboard {...props} setForceQuery={setForceQuery} />,
       {
         useRedux: true,
@@ -144,11 +148,6 @@ describe('ResultsPaneOnDashboard', () => {
     expect(queryByText('2 rows')).toBeVisible();
     expect(queryByText('Action')).toBeVisible();
     expect(queryByText('Horror')).toBeVisible();
-
-    userEvent.type(getByPlaceholderText('Search'), 'hor');
-    await waitForElementToBeRemoved(() => queryByText('Action'));
-    expect(queryByText('Horror')).toBeVisible();
-    expect(queryByText('Action')).not.toBeInTheDocument();
   });
 
   test('multiple results pane', async () => {
diff --git a/superset-frontend/src/explore/components/DataTablesPane/test/SamplesPane.test.tsx b/superset-frontend/src/explore/components/DataTablesPane/test/SamplesPane.test.tsx
index d5da57b6d3b..26cff940c26 100644
--- a/superset-frontend/src/explore/components/DataTablesPane/test/SamplesPane.test.tsx
+++ b/superset-frontend/src/explore/components/DataTablesPane/test/SamplesPane.test.tsx
@@ -17,19 +17,19 @@
  * under the License.
  */
 import fetchMock from 'fetch-mock';
-import {
-  render,
-  userEvent,
-  waitForElementToBeRemoved,
-  waitFor,
-} from 'spec/helpers/testing-library';
+import { render, waitFor } from 'spec/helpers/testing-library';
+import { setupAGGridModules } from '@superset-ui/core/components/ThemedAgGridReact';
 import { SamplesPane } from '../components';
 import { createSamplesPaneProps } from './fixture';
 
+beforeAll(() => {
+  setupAGGridModules();
+});
+
 // eslint-disable-next-line no-restricted-globals -- TODO: Migrate from describe blocks
 describe('SamplesPane', () => {
   fetchMock.post(
-    'end:/datasource/samples?force=false&datasource_type=table&datasource_id=34',
+    'end:/datasource/samples?force=false&datasource_type=table&datasource_id=34&per_page=100&page=1',
     {
       result: {
         data: [],
@@ -40,7 +40,7 @@ describe('SamplesPane', () => {
   );
 
   fetchMock.post(
-    'end:/datasource/samples?force=true&datasource_type=table&datasource_id=35',
+    'end:/datasource/samples?force=true&datasource_type=table&datasource_id=35&per_page=100&page=1',
     {
       result: {
         data: [
@@ -56,7 +56,7 @@ describe('SamplesPane', () => {
   );
 
   fetchMock.post(
-    'end:/datasource/samples?force=false&datasource_type=table&datasource_id=36',
+    'end:/datasource/samples?force=false&datasource_type=table&datasource_id=36&per_page=100&page=1',
     400,
   );
 
@@ -91,12 +91,12 @@ describe('SamplesPane', () => {
     expect(await findByText('Error: Bad request')).toBeVisible();
   });
 
-  test('force query, render and search', async () => {
+  test('force query, render', async () => {
     const props = createSamplesPaneProps({
       datasourceId: 35,
       queryForce: true,
     });
-    const { queryByText, getByPlaceholderText } = render(
+    const { queryByText } = render(
       <SamplesPane {...props} setForceQuery={setForceQuery} />,
       {
         useRedux: true,
@@ -109,10 +109,5 @@ describe('SamplesPane', () => {
     expect(queryByText('2 rows')).toBeVisible();
     expect(queryByText('Action')).toBeVisible();
     expect(queryByText('Horror')).toBeVisible();
-
-    userEvent.type(getByPlaceholderText('Search'), 'hor');
-    await waitForElementToBeRemoved(() => queryByText('Action'));
-    expect(queryByText('Horror')).toBeVisible();
-    expect(queryByText('Action')).not.toBeInTheDocument();
   });
 });
diff --git a/superset-frontend/src/explore/components/DataTablesPane/test/fixture.tsx b/superset-frontend/src/explore/components/DataTablesPane/test/fixture.tsx
index 8ac133742ce..8be74a02fac 100644
--- a/superset-frontend/src/explore/components/DataTablesPane/test/fixture.tsx
+++ b/superset-frontend/src/explore/components/DataTablesPane/test/fixture.tsx
@@ -90,6 +90,10 @@ export const createSamplesPaneProps = ({
   ({
     isRequest,
     datasource: { ...datasource, id: datasourceId },
+    queryFormData: {
+      ...queryFormData,
+      datasource: `${datasourceId}__table`,
+    },
     queryForce,
     isVisible: true,
     setForceQuery: jest.fn(),
diff --git a/superset-frontend/src/explore/components/DataTablesPane/types.ts b/superset-frontend/src/explore/components/DataTablesPane/types.ts
index b0fdb987c9f..6135bb6fe38 100644
--- a/superset-frontend/src/explore/components/DataTablesPane/types.ts
+++ b/superset-frontend/src/explore/components/DataTablesPane/types.ts
@@ -56,15 +56,20 @@ export interface ResultsPaneProps {
 export interface SamplesPaneProps {
   isRequest: boolean;
   datasource: Datasource;
+  queryFormData: LatestQueryFormData;
   queryForce: boolean;
   setForceQuery?: SetForceQueryAction;
-  dataSize?: number;
-  // reload OriginalFormattedTimeColumns from localStorage when isVisible is true
   isVisible: boolean;
   canDownload: boolean;
 }
 
-export interface TableControlsProps {
+export interface DrillControlsProps {
+  onDownloadCSV?: () => void;
+  onDownloadXLSX?: () => void;
+  onReload?: () => void;
+}
+
+export interface TableControlsProps extends DrillControlsProps {
   data: Record<string, any>[];
   // {datasource.id}__{datasource.type}, eg: 1__table
   datasourceId?: string;
@@ -74,6 +79,9 @@ export interface TableControlsProps {
   isLoading: boolean;
   rowcount: number;
   canDownload: boolean;
+  rowLimit?: number;
+  rowLimitOptions?: { value: number; label: string }[];
+  onRowLimitChange?: (limit: number) => void;
 }
 
 export interface QueryResultInterface {
@@ -83,14 +91,15 @@ export interface QueryResultInterface {
   data: Record<string, any>[][];
 }
 
-export interface SingleQueryResultPaneProp extends QueryResultInterface {
+export interface SingleQueryResultPaneProp
+  extends QueryResultInterface, DrillControlsProps {
   // {datasource.id}__{datasource.type}, eg: 1__table
   datasourceId?: string;
-  dataSize?: number;
-  // reload OriginalFormattedTimeColumns from localStorage when isVisible is true
   isVisible: boolean;
   canDownload: boolean;
   // Optional map of column/metric name -> verbose label
   columnDisplayNames?: Record<string, string>;
-  isPaginationSticky?: boolean;
+  rowLimit?: number;
+  rowLimitOptions?: { value: number; label: string }[];
+  onRowLimitChange?: (limit: number) => void;
 }
diff --git a/superset-frontend/src/explore/components/ExploreChartHeader/ExploreChartHeader.test.tsx b/superset-frontend/src/explore/components/ExploreChartHeader/ExploreChartHeader.test.tsx
index c060c193c3c..9ad16fcf04b 100644
--- a/superset-frontend/src/explore/components/ExploreChartHeader/ExploreChartHeader.test.tsx
+++ b/superset-frontend/src/explore/components/ExploreChartHeader/ExploreChartHeader.test.tsx
@@ -766,6 +766,7 @@ describe('Additional actions tests', () => {
       const props = createProps();
       render(<ExploreHeader {...props} />, {
         useRedux: true,
+        initialState: { explore: { can_export_image: true } },
       });
 
       userEvent.click(screen.getByLabelText('Menu actions trigger'));
@@ -967,7 +968,10 @@ describe('Additional actions tests', () => {
 
       const getSpy = mockExportCurrentViewBehavior();
 
-      render(<ExploreHeader {...props} />, { useRedux: true });
+      render(<ExploreHeader {...props} />, {
+        useRedux: true,
+        initialState: { explore: { can_export_image: true } },
+      });
 
       userEvent.click(screen.getByLabelText('Menu actions trigger'));
       userEvent.hover(await screen.findByText('Data Export Options'));
diff --git a/superset-frontend/src/explore/components/ExploreChartPanel/index.tsx b/superset-frontend/src/explore/components/ExploreChartPanel/index.tsx
index 3160189c3fb..d7393a0f99e 100644
--- a/superset-frontend/src/explore/components/ExploreChartPanel/index.tsx
+++ b/superset-frontend/src/explore/components/ExploreChartPanel/index.tsx
@@ -204,7 +204,6 @@ const ExploreChartPanel = ({
 
   const {
     ref: chartPanelRef,
-    observerRef: resizeObserverRef,
     width: chartPanelWidth,
     height: chartPanelHeight,
   } = useResizeDetectorByObserver();
@@ -378,7 +377,6 @@ const ExploreChartPanel = ({
           flex-direction: column;
           padding-top: ${theme.sizeUnit * 2}px;
         `}
-        ref={resizeObserverRef}
       >
         {vizTypeNeedsDataset && (
           <Alert
@@ -455,10 +453,11 @@ const ExploreChartPanel = ({
             })}
             {...(chart.chartStatus && { chartStatus: chart.chartStatus })}
             hideRowCount={
-              (formData?.matrixify_mode_rows !== undefined &&
+              formData?.matrixify_enable === true &&
+              ((formData?.matrixify_mode_rows !== undefined &&
                 formData?.matrixify_mode_rows !== 'disabled') ||
-              (formData?.matrixify_mode_columns !== undefined &&
-                formData?.matrixify_mode_columns !== 'disabled')
+                (formData?.matrixify_mode_columns !== undefined &&
+                  formData?.matrixify_mode_columns !== 'disabled'))
             }
             formData={formData}
           />
@@ -480,7 +479,6 @@ const ExploreChartPanel = ({
       </div>
     ),
     [
-      resizeObserverRef,
       showAlertBanner,
       errorMessage,
       onQuery,
@@ -532,7 +530,7 @@ const ExploreChartPanel = ({
       document.body.className += ` ${standaloneClass}`;
     }
     return (
-      <div id="app" data-test="standalone-app" ref={resizeObserverRef}>
+      <div id="app" data-test="standalone-app">
         {standaloneChartBody}
       </div>
     );
diff --git a/superset-frontend/src/explore/components/ExploreChartPanel/useResizeDetectorByObserver.ts b/superset-frontend/src/explore/components/ExploreChartPanel/useResizeDetectorByObserver.ts
index 04ae6c1a2f4..908fec4c4dc 100644
--- a/superset-frontend/src/explore/components/ExploreChartPanel/useResizeDetectorByObserver.ts
+++ b/superset-frontend/src/explore/components/ExploreChartPanel/useResizeDetectorByObserver.ts
@@ -31,15 +31,16 @@ export default function useResizeDetectorByObserver() {
       setChartPanelSize({ width, height });
     }
   }, []);
-  const { ref: observerRef } = useResizeDetector({
+  // Use targetRef to observe the same element we measure
+  useResizeDetector({
     refreshMode: 'debounce',
     refreshRate: 300,
     onResize,
+    targetRef: ref,
   });
 
   return {
     ref,
-    observerRef,
     width,
     height,
   };
diff --git a/superset-frontend/src/explore/components/ExploreViewContainer/ExploreViewContainer.test.tsx b/superset-frontend/src/explore/components/ExploreViewContainer/ExploreViewContainer.test.tsx
index 848e20f2f18..85d875aefb9 100644
--- a/superset-frontend/src/explore/components/ExploreViewContainer/ExploreViewContainer.test.tsx
+++ b/superset-frontend/src/explore/components/ExploreViewContainer/ExploreViewContainer.test.tsx
@@ -26,7 +26,8 @@ import {
   VizType,
 } from '@superset-ui/core';
 import { QUERY_MODE_REQUISITES } from 'src/explore/constants';
-import { MemoryRouter, Route } from 'react-router-dom';
+import { Router, Route } from 'react-router-dom';
+import { createMemoryHistory } from 'history';
 import {
   render,
   screen,
@@ -124,11 +125,13 @@ const renderWithRouter = ({
   overridePathname,
   initialState = reduxState,
   store,
+  history: existingHistory,
 }: {
   search?: string;
   overridePathname?: string;
   initialState?: object;
   store?: Store;
+  history?: ReturnType<typeof createMemoryHistory>;
 } = {}) => {
   const path = overridePathname ?? defaultPath;
   Object.defineProperty(window, 'location', {
@@ -136,14 +139,18 @@ const renderWithRouter = ({
       return { pathname: path, search };
     },
   });
-  return render(
-    <MemoryRouter initialEntries={[`${path}${search}`]}>
+  const history =
+    existingHistory ??
+    createMemoryHistory({ initialEntries: [`${path}${search}`] });
+  const result = render(
+    <Router history={history}>
       <Route path={path}>
         <ExploreViewContainer />
       </Route>
-    </MemoryRouter>,
+    </Router>,
     { useRedux: true, useDnd: true, initialState, store },
   );
+  return { ...result, history };
 };
 
 test('generates a new form_data param when none is available', async () => {
@@ -155,19 +162,18 @@ test('generates a new form_data param when none is available', async () => {
       useLegacyApi: false,
     }),
   );
-  const replaceState = jest.spyOn(window.history, 'replaceState');
-  await waitFor(() => renderWithRouter());
-  expect(replaceState).toHaveBeenCalledWith(
-    expect.anything(),
-    undefined,
+  const history = createMemoryHistory({ initialEntries: [defaultPath] });
+  const replaceSpy = jest.spyOn(history, 'replace');
+  await waitFor(() => renderWithRouter({ history }));
+  expect(replaceSpy).toHaveBeenCalledWith(
     expect.stringMatching('form_data_key'),
-  );
-  expect(replaceState).toHaveBeenCalledWith(
     expect.anything(),
-    undefined,
-    expect.stringMatching('datasource_id'),
   );
-  replaceState.mockRestore();
+  expect(replaceSpy).toHaveBeenCalledWith(
+    expect.stringMatching('datasource_id'),
+    expect.anything(),
+  );
+  replaceSpy.mockRestore();
 });
 
 test('renders chart in standalone mode', () => {
@@ -180,40 +186,37 @@ test('renders chart in standalone mode', () => {
   expect(queryByTestId('standalone-app')).toBeInTheDocument();
 });
 
-test('generates a different form_data param when one is provided and is mounting', async () => {
-  const replaceState = jest.spyOn(window.history, 'replaceState');
-  await waitFor(() => renderWithRouter({ search: SEARCH }));
-  expect(replaceState).not.toHaveBeenLastCalledWith(
-    0,
-    expect.anything(),
-    undefined,
-    expect.stringMatching(KEY),
-  );
-  expect(replaceState).toHaveBeenCalledWith(
-    expect.anything(),
-    undefined,
+test('generates a form_data param with datasource_id when mounting with existing key', async () => {
+  const history = createMemoryHistory({
+    initialEntries: [`${defaultPath}${SEARCH}`],
+  });
+  const replaceSpy = jest.spyOn(history, 'replace');
+  await waitFor(() => renderWithRouter({ search: SEARCH, history }));
+  expect(replaceSpy).toHaveBeenCalledWith(
     expect.stringMatching('datasource_id'),
+    expect.anything(),
   );
-  replaceState.mockRestore();
+  replaceSpy.mockRestore();
 });
 
 test('reuses the same form_data param when updating', async () => {
   getChartControlPanelRegistry().registerValue('table', {
     controlPanelSections: [],
   });
-  const replaceState = jest.spyOn(window.history, 'replaceState');
-  const pushState = jest.spyOn(window.history, 'pushState');
-  await waitFor(() => renderWithRouter({ search: SEARCH }));
-  expect(replaceState.mock.calls.length).toBe(1);
+  const history = createMemoryHistory({
+    initialEntries: [`${defaultPath}${SEARCH}`],
+  });
+  const replaceSpy = jest.spyOn(history, 'replace');
+  await waitFor(() => renderWithRouter({ search: SEARCH, history }));
+  expect(replaceSpy.mock.calls.length).toBe(1);
   userEvent.click(screen.getByText('Update chart'));
-  await waitFor(() => expect(pushState.mock.calls.length).toBe(1));
-  expect(replaceState.mock.calls[0]).toEqual(pushState.mock.calls[0]);
-  replaceState.mockRestore();
-  pushState.mockRestore();
+  await waitFor(() => expect(replaceSpy.mock.calls.length).toBe(2));
+  expect(replaceSpy.mock.calls[0]).toEqual(replaceSpy.mock.calls[1]);
+  replaceSpy.mockRestore();
   getChartControlPanelRegistry().remove('table');
 });
 
-test('doesnt call replaceState when pathname is not /explore', async () => {
+test('doesnt call replace when pathname is not /explore', async () => {
   getChartMetadataRegistry().registerValue(
     'table',
     new ChartMetadata({
@@ -222,24 +225,29 @@ test('doesnt call replaceState when pathname is not /explore', async () => {
       useLegacyApi: false,
     }),
   );
-  const replaceState = jest.spyOn(window.history, 'replaceState');
-  await waitFor(() => renderWithRouter({ overridePathname: '/dashboard' }));
-  expect(replaceState).not.toHaveBeenCalled();
-  replaceState.mockRestore();
+  const history = createMemoryHistory({ initialEntries: ['/dashboard'] });
+  const replaceSpy = jest.spyOn(history, 'replace');
+  await waitFor(() =>
+    renderWithRouter({ overridePathname: '/dashboard', history }),
+  );
+  expect(replaceSpy).not.toHaveBeenCalled();
+  replaceSpy.mockRestore();
 });
 
 test('preserves unknown parameters', async () => {
-  const replaceState = jest.spyOn(window.history, 'replaceState');
   const unknownParam = 'test=123';
+  const history = createMemoryHistory({
+    initialEntries: [`${defaultPath}${SEARCH}&${unknownParam}`],
+  });
+  const replaceSpy = jest.spyOn(history, 'replace');
   await waitFor(() =>
-    renderWithRouter({ search: `${SEARCH}&${unknownParam}` }),
+    renderWithRouter({ search: `${SEARCH}&${unknownParam}`, history }),
   );
-  expect(replaceState).toHaveBeenCalledWith(
-    expect.anything(),
-    undefined,
+  expect(replaceSpy).toHaveBeenCalledWith(
     expect.stringMatching(unknownParam),
+    expect.anything(),
   );
-  replaceState.mockRestore();
+  replaceSpy.mockRestore();
 });
 
 test('retains query mode requirements when query_mode is enabled', async () => {
diff --git a/superset-frontend/src/explore/components/ExploreViewContainer/index.tsx b/superset-frontend/src/explore/components/ExploreViewContainer/index.tsx
index 26110471a7f..73d732d0cce 100644
--- a/superset-frontend/src/explore/components/ExploreViewContainer/index.tsx
+++ b/superset-frontend/src/explore/components/ExploreViewContainer/index.tsx
@@ -46,6 +46,7 @@ import { t } from '@apache-superset/core/translation';
 import { logging } from '@apache-superset/core/utils';
 import { debounce, isEqual, isObjectLike, omit, pick } from 'lodash';
 import { Resizable } from 're-resizable';
+import { useHistory } from 'react-router-dom';
 import { Tooltip } from '@superset-ui/core/components';
 import { usePluginContext } from 'src/components';
 import { Global } from '@emotion/react';
@@ -63,7 +64,6 @@ import {
   LOG_ACTIONS_MOUNT_EXPLORER,
   LOG_ACTIONS_CHANGE_EXPLORE_CONTROLS,
 } from 'src/logger/LogUtils';
-import { ensureAppRoot } from 'src/utils/pathUtils';
 import { getUrlParam } from 'src/utils/urlUtils';
 import cx from 'classnames';
 import * as chartActions from 'src/components/Chart/chartAction';
@@ -170,10 +170,11 @@ const updateHistory = debounce(
     force,
     title,
     tabId,
+    history,
   ) => {
     const payload = { ...formData };
     const chartId = formData.slice_id;
-    const params = new URLSearchParams(window.location.search);
+    const params = new URLSearchParams(history.location.search);
     const additionalParam = Object.fromEntries(params);
 
     if (chartId) {
@@ -192,7 +193,6 @@ const updateHistory = debounce(
 
     try {
       let key: string | null | undefined;
-      let stateModifier: 'replaceState' | 'pushState';
       if (isReplace) {
         key = await postFormData(
           datasourceId,
@@ -201,7 +201,6 @@ const updateHistory = debounce(
           chartId,
           tabId,
         );
-        stateModifier = 'replaceState';
       } else {
         key = getUrlParam(URL_PARAMS.formDataKey);
         if (key) {
@@ -214,10 +213,9 @@ const updateHistory = debounce(
             tabId,
           );
         }
-        stateModifier = 'pushState';
       }
       // avoid race condition in case user changes route before explore updates the url
-      if (window.location.pathname.startsWith(ensureAppRoot('/explore'))) {
+      if (history.location.pathname.startsWith('/explore')) {
         const url = mountExploreUrl(
           standalone ? URL_PARAMS.standalone.name : 'base',
           {
@@ -225,8 +223,9 @@ const updateHistory = debounce(
             ...additionalParam,
           },
           force,
+          false,
         );
-        window.history[stateModifier](payload, title, url);
+        history.replace(url, payload);
       }
     } catch (e) {
       logging.warn('Failed at altering browser history', e);
@@ -387,6 +386,7 @@ function ExploreViewContainer(props: ExploreViewContainerProps) {
     getSidebarWidths(LocalStorageKeys.DatasourceWidth),
   );
   const tabId = useTabId();
+  const history = useHistory();
 
   const theme = useTheme();
 
@@ -431,6 +431,7 @@ function ExploreViewContainer(props: ExploreViewContainerProps) {
         props.force,
         title,
         tabId,
+        history,
       );
     },
     [
@@ -441,22 +442,10 @@ function ExploreViewContainer(props: ExploreViewContainerProps) {
       props.standalone,
       props.force,
       tabId,
+      history,
     ],
   );
 
-  const handlePopstate = useCallback(() => {
-    const formData = window.history.state;
-    if (formData && Object.keys(formData).length) {
-      props.actions.setExploreControls(formData);
-      props.actions.postChartFormData(
-        formData,
-        props.force,
-        props.timeout,
-        props.chart.id,
-      );
-    }
-  }, [props.actions, props.chart.id, props.timeout]);
-
   const onQuery = useCallback(() => {
     props.actions.setForceQuery(false);
 
@@ -526,17 +515,6 @@ function ExploreViewContainer(props: ExploreViewContainerProps) {
     }
   });
 
-  const previousHandlePopstate = usePrevious(handlePopstate);
-  useEffect(() => {
-    if (previousHandlePopstate) {
-      window.removeEventListener('popstate', previousHandlePopstate);
-    }
-    window.addEventListener('popstate', handlePopstate);
-    return () => {
-      window.removeEventListener('popstate', handlePopstate);
-    };
-  }, [handlePopstate, previousHandlePopstate]);
-
   const previousHandleKeyDown = usePrevious(handleKeydown);
   useEffect(() => {
     if (previousHandleKeyDown) {
diff --git a/superset-frontend/src/explore/components/SaveModal.test.tsx b/superset-frontend/src/explore/components/SaveModal.test.tsx
index e04994b1a2a..1c79be556f5 100644
--- a/superset-frontend/src/explore/components/SaveModal.test.tsx
+++ b/superset-frontend/src/explore/components/SaveModal.test.tsx
@@ -381,7 +381,7 @@ test('removes form_data_key from URL parameters after save', () => {
   // other parameters should remain
   expect(result.get('other_param')).toEqual('value');
   expect(result.get('slice_id')).toEqual('1');
-  expect(result.get('save_action')).toEqual('overwrite');
+  expect(result.has('save_action')).toBe(false);
 });
 
 test('dispatches removeChartState when saving and going to dashboard', async () => {
diff --git a/superset-frontend/src/explore/components/SaveModal.tsx b/superset-frontend/src/explore/components/SaveModal.tsx
old mode 100644
new mode 100755
index a78b4ce7dc1..6e72769f078
--- a/superset-frontend/src/explore/components/SaveModal.tsx
+++ b/superset-frontend/src/explore/components/SaveModal.tsx
@@ -93,11 +93,6 @@ export const StyledModal = styled(Modal)`
   .ant-modal-body {
     overflow: visible;
   }
-  i {
-    position: absolute;
-    top: -${({ theme }) => theme.sizeUnit * 5.25}px;
-    left: ${({ theme }) => theme.sizeUnit * 26.75}px;
-  }
 `;
 
 class SaveModal extends Component<SaveModalProps, SaveModalState> {
@@ -172,17 +167,21 @@ class SaveModal extends Component<SaveModalProps, SaveModalState> {
     this.setState({ newSliceName: event.target.value });
   }
 
-  onDashboardChange = async (dashboard: {
-    label: string;
-    value: string | number;
-  }) => {
+  onDashboardChange = async (
+    dashboard:
+      | {
+          label: string;
+          value: string | number;
+        }
+      | undefined,
+  ) => {
     this.setState({
       dashboard,
       tabsData: [],
       selectedTab: undefined,
     });
 
-    if (typeof dashboard.value === 'number') {
+    if (dashboard && typeof dashboard.value === 'number') {
       await this.loadTabs(dashboard.value);
     }
   };
@@ -196,10 +195,7 @@ class SaveModal extends Component<SaveModalProps, SaveModalState> {
 
   handleRedirect = (windowLocationSearch: string, chart: any) => {
     const searchParams = new URLSearchParams(windowLocationSearch);
-    searchParams.set('save_action', this.state.action);
-
     searchParams.delete('form_data_key');
-
     searchParams.set('slice_id', chart.id.toString());
     return searchParams;
   };
@@ -343,7 +339,9 @@ class SaveModal extends Component<SaveModalProps, SaveModalState> {
         return;
       }
       const searchParams = this.handleRedirect(window.location.search, value);
-      this.props.history.replace(`/explore/?${searchParams.toString()}`);
+      this.props.history.replace(`/explore/?${searchParams.toString()}`, {
+        saveAction: this.state.action,
+      });
 
       this.setState({ isLoading: false });
       this.onHide();
diff --git a/superset-frontend/src/explore/components/controls/ConditionalFormattingControl/ConditionalFormattingControl.test.tsx b/superset-frontend/src/explore/components/controls/ConditionalFormattingControl/ConditionalFormattingControl.test.tsx
new file mode 100644
index 00000000000..b40806bbe71
--- /dev/null
+++ b/superset-frontend/src/explore/components/controls/ConditionalFormattingControl/ConditionalFormattingControl.test.tsx
@@ -0,0 +1,103 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+import { render, screen } from 'spec/helpers/testing-library';
+import { Comparator } from '@superset-ui/chart-controls';
+import { GenericDataType } from '@apache-superset/core/common';
+import ConditionalFormattingControl from './ConditionalFormattingControl';
+import { ConditionalFormattingConfig } from './types';
+
+const columnOptions = [
+  { label: 'My Column', value: 'my_col', dataType: GenericDataType.Boolean },
+];
+
+const defaultProps = {
+  columnOptions,
+  verboseMap: {} as Record<string, string>,
+  removeIrrelevantConditions: false,
+  label: 'Conditional Formatting',
+  description: 'Test',
+  name: 'conditional_formatting',
+  onChange: jest.fn(),
+};
+
+test('renders "is false" operator label without trailing undefined', () => {
+  const value: ConditionalFormattingConfig[] = [
+    {
+      column: 'my_col',
+      operator: Comparator.IsFalse,
+      colorScheme: 'colorSuccess',
+    },
+  ];
+  render(<ConditionalFormattingControl {...defaultProps} value={value} />);
+  expect(screen.getByText('my_col is false')).toBeInTheDocument();
+});
+
+test('renders "is true" operator label without trailing undefined', () => {
+  const value: ConditionalFormattingConfig[] = [
+    {
+      column: 'my_col',
+      operator: Comparator.IsTrue,
+      colorScheme: 'colorSuccess',
+    },
+  ];
+  render(<ConditionalFormattingControl {...defaultProps} value={value} />);
+  expect(screen.getByText('my_col is true')).toBeInTheDocument();
+});
+
+test('renders "is null" operator label without trailing undefined', () => {
+  const value: ConditionalFormattingConfig[] = [
+    {
+      column: 'my_col',
+      operator: Comparator.IsNull,
+      colorScheme: 'colorSuccess',
+    },
+  ];
+  render(<ConditionalFormattingControl {...defaultProps} value={value} />);
+  expect(screen.getByText('my_col is null')).toBeInTheDocument();
+});
+
+test('renders "is not null" operator label without trailing undefined', () => {
+  const value: ConditionalFormattingConfig[] = [
+    {
+      column: 'my_col',
+      operator: Comparator.IsNotNull,
+      colorScheme: 'colorSuccess',
+    },
+  ];
+  render(<ConditionalFormattingControl {...defaultProps} value={value} />);
+  expect(screen.getByText('my_col is not null')).toBeInTheDocument();
+});
+
+test('renders verbose column name when available', () => {
+  const value: ConditionalFormattingConfig[] = [
+    {
+      column: 'my_col',
+      operator: Comparator.IsFalse,
+      colorScheme: 'colorSuccess',
+    },
+  ];
+  render(
+    <ConditionalFormattingControl
+      {...defaultProps}
+      verboseMap={{ my_col: 'My Column' }}
+      value={value}
+    />,
+  );
+  expect(screen.getByText('My Column is false')).toBeInTheDocument();
+});
diff --git a/superset-frontend/src/explore/components/controls/ConditionalFormattingControl/ConditionalFormattingControl.tsx b/superset-frontend/src/explore/components/controls/ConditionalFormattingControl/ConditionalFormattingControl.tsx
index c476cc67772..52cb263f503 100644
--- a/superset-frontend/src/explore/components/controls/ConditionalFormattingControl/ConditionalFormattingControl.tsx
+++ b/superset-frontend/src/explore/components/controls/ConditionalFormattingControl/ConditionalFormattingControl.tsx
@@ -136,6 +136,11 @@ const ConditionalFormattingControl = ({
         return `${targetValueLeft} ${Comparator.LessOrEqual} ${columnName} ${Comparator.LessThan} ${targetValueRight}`;
       case Comparator.BetweenOrRightEqual:
         return `${targetValueLeft} ${Comparator.LessThan} ${columnName} ${Comparator.LessOrEqual} ${targetValueRight}`;
+      case Comparator.IsTrue:
+      case Comparator.IsFalse:
+      case Comparator.IsNull:
+      case Comparator.IsNotNull:
+        return `${columnName} ${operator}`;
       default:
         return `${columnName} ${operator} ${targetValue}`;
     }
diff --git a/superset-frontend/src/explore/components/controls/ConditionalFormattingControl/FormattingPopoverContent.tsx b/superset-frontend/src/explore/components/controls/ConditionalFormattingControl/FormattingPopoverContent.tsx
index f7926929e2d..5bda7ba898a 100644
--- a/superset-frontend/src/explore/components/controls/ConditionalFormattingControl/FormattingPopoverContent.tsx
+++ b/superset-frontend/src/explore/components/controls/ConditionalFormattingControl/FormattingPopoverContent.tsx
@@ -170,7 +170,7 @@ const renderOperatorFields = (
           <FormItem
             name="targetValue"
             label={t('Target value')}
-            initialValue={''}
+            initialValue=""
             hidden
           />
         </Col>
diff --git a/superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterEditPopoverSimpleTabContent/AdhocFilterEditPopoverSimpleTabContent.test.tsx b/superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterEditPopoverSimpleTabContent/AdhocFilterEditPopoverSimpleTabContent.test.tsx
index 1c0cb00f7e6..a238ca38f28 100644
--- a/superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterEditPopoverSimpleTabContent/AdhocFilterEditPopoverSimpleTabContent.test.tsx
+++ b/superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterEditPopoverSimpleTabContent/AdhocFilterEditPopoverSimpleTabContent.test.tsx
@@ -269,6 +269,26 @@ test('will convert from individual comparator to array if the operator changes t
   ).toEqual(Operators.In);
 });
 
+test('will preserve boolean false comparator when converting to multi operator', () => {
+  const booleanFalseFilter = new AdhocFilter({
+    expressionType: ExpressionTypes.Simple,
+    subject: 'value',
+    operatorId: Operators.Equals,
+    operator: OPERATOR_ENUM_TO_OPERATOR_TYPE[Operators.Equals].operation,
+    comparator: false,
+    clause: Clauses.Where,
+  });
+  const props = setup({ adhocFilter: booleanFalseFilter });
+  const { onOperatorChange } = useSimpleTabFilterProps(
+    props as unknown as Props,
+  );
+  onOperatorChange(Operators.In);
+  expect(
+    props.onChange.mock.calls[props.onChange.mock.calls.length - 1][0]
+      .comparator,
+  ).toEqual([false]);
+});
+
 test('will convert from array to individual comparators if the operator changes from multi', () => {
   const props = setup({
     adhocFilter: simpleMultiAdhocFilter,
diff --git a/superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterEditPopoverSimpleTabContent/index.tsx b/superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterEditPopoverSimpleTabContent/index.tsx
index ff9c4db9274..64a590a01d8 100644
--- a/superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterEditPopoverSimpleTabContent/index.tsx
+++ b/superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterEditPopoverSimpleTabContent/index.tsx
@@ -199,7 +199,7 @@ export const useSimpleTabFilterProps = (props: Props) => {
     if (MULTI_OPERATORS.has(operatorId)) {
       newComparator = Array.isArray(currentComparator)
         ? currentComparator
-        : [currentComparator].filter(element => element);
+        : [currentComparator].filter(element => element != null);
     } else {
       newComparator = Array.isArray(currentComparator)
         ? currentComparator[0]
@@ -396,7 +396,8 @@ const AdhocFilterEditPopoverSimpleTabContent: FC<Props> = props => {
   };
 
   const comparatorHasValue =
-    comparator &&
+    comparator != null &&
+    comparator !== '' &&
     (Array.isArray(comparator)
       ? comparator.length > 0
       : String(comparator).length > 0);
diff --git a/superset-frontend/src/explore/components/controls/NumberControl/NumberControl.test.tsx b/superset-frontend/src/explore/components/controls/NumberControl/NumberControl.test.tsx
index 422b8394333..7ece02addb2 100644
--- a/superset-frontend/src/explore/components/controls/NumberControl/NumberControl.test.tsx
+++ b/superset-frontend/src/explore/components/controls/NumberControl/NumberControl.test.tsx
@@ -82,6 +82,21 @@ test('can clear field completely', async () => {
   expect(props.onChange).toHaveBeenLastCalledWith(undefined);
 });
 
+test('stepper arrows trigger onChange immediately', async () => {
+  const props = {
+    ...mockedProps,
+    value: 5,
+    onChange: jest.fn(),
+  };
+  render(<NumberControl {...props} />);
+  const upButton = document.querySelector(
+    '.ant-input-number-handler-up',
+  ) as HTMLElement;
+  expect(upButton).toBeInTheDocument();
+  await userEvent.click(upButton);
+  expect(props.onChange).toHaveBeenCalledWith(6);
+});
+
 test('updates local value when prop changes', () => {
   const props = {
     ...mockedProps,
diff --git a/superset-frontend/src/explore/components/controls/NumberControl/index.tsx b/superset-frontend/src/explore/components/controls/NumberControl/index.tsx
index ec2eb7c9c6e..db7d85b97a0 100644
--- a/superset-frontend/src/explore/components/controls/NumberControl/index.tsx
+++ b/superset-frontend/src/explore/components/controls/NumberControl/index.tsx
@@ -71,6 +71,11 @@ export default function NumberControl({
     onChange?.(pendingValueRef.current);
   };
 
+  const handleStep = (val: number) => {
+    pendingValueRef.current = val;
+    onChange?.(val);
+  };
+
   return (
     <FullWidthDiv>
       <ControlHeader {...rest} />
@@ -82,6 +87,7 @@ export default function NumberControl({
         value={value}
         onChange={handleChange}
         onBlur={handleBlur}
+        onStep={handleStep}
         disabled={disabled}
         aria-label={rest.label}
       />
diff --git a/superset-frontend/src/explore/components/controls/TextAreaControl.tsx b/superset-frontend/src/explore/components/controls/TextAreaControl.tsx
index f1e5fbd138d..e7ec1d93ca9 100644
--- a/superset-frontend/src/explore/components/controls/TextAreaControl.tsx
+++ b/superset-frontend/src/explore/components/controls/TextAreaControl.tsx
@@ -82,7 +82,6 @@ interface TextAreaControlProps {
 
 const defaultProps = {
   onChange: () => {},
-  initialValue: '',
   height: 250,
   minLines: 3,
   maxLines: 10,
@@ -136,7 +135,7 @@ class TextAreaControl extends Component<TextAreaControlProps> {
 
   componentWillUnmount() {
     if (this.debouncedOnChange) {
-      this.debouncedOnChange.cancel();
+      this.debouncedOnChange.flush();
     }
   }
 
@@ -160,6 +159,7 @@ class TextAreaControl extends Component<TextAreaControlProps> {
       readOnly,
       name,
       onChange,
+      value,
       minLines: minLinesProp,
       maxLines: maxLinesProp,
       ...editorProps
@@ -176,6 +176,7 @@ class TextAreaControl extends Component<TextAreaControlProps> {
       };
       if (resize) {
         style.resize = resize;
+        style.overflow = 'auto';
       }
       if (readOnly) {
         style.backgroundColor = theme?.colorBgMask;
@@ -206,7 +207,7 @@ class TextAreaControl extends Component<TextAreaControlProps> {
             maxLines={inModal ? 1000 : maxLinesProp}
             editorProps={{ $blockScrolling: true }}
             onLoad={onEditorLoad}
-            defaultValue={initialValue}
+            defaultValue={initialValue ?? value}
             readOnly={readOnly}
             key={name}
             {...editorProps}
diff --git a/superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeControl.test.tsx b/superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeControl.test.tsx
index f5033f49966..e35619772c2 100644
--- a/superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeControl.test.tsx
+++ b/superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeControl.test.tsx
@@ -39,7 +39,7 @@ import {
   EchartsTimeseriesLineChartPlugin,
 } from '../../../../../plugins/plugin-chart-echarts/src';
 import TableChartPlugin from '../../../../../plugins/plugin-chart-table/src';
-import { MultiChartPlugin } from '../../../../../plugins/legacy-preset-chart-deckgl/src';
+import { MultiChartPlugin } from '../../../../../plugins/preset-chart-deckgl/src';
 import VizTypeControl, { VIZ_TYPE_CONTROL_TEST_ID } from './index';
 
 // Mock scrollIntoView to avoid errors in test environment
diff --git a/superset-frontend/src/explore/components/useExploreAdditionalActionsMenu/index.tsx b/superset-frontend/src/explore/components/useExploreAdditionalActionsMenu/index.tsx
index 94eeec9a90b..f4dc6b57af8 100644
--- a/superset-frontend/src/explore/components/useExploreAdditionalActionsMenu/index.tsx
+++ b/superset-frontend/src/explore/components/useExploreAdditionalActionsMenu/index.tsx
@@ -52,6 +52,7 @@ import downloadAsImage from 'src/utils/downloadAsImage';
 import { getChartPermalink } from 'src/utils/urlUtils';
 import copyTextToClipboard from 'src/utils/copy';
 import { useHeaderReportMenuItems } from 'src/features/reports/ReportModal/HeaderReportDropdown';
+import { MenuItemTooltip } from 'src/components/Chart/DisabledMenuItemTooltip';
 import { logEvent } from 'src/logger/actions';
 import {
   LOG_ACTIONS_CHART_DOWNLOAD_AS_IMAGE,
@@ -174,6 +175,7 @@ interface ExploreState {
   charts?: Record<number, ChartState>;
   explore?: ExploreSlice & {
     chartStates?: Record<number, JsonObject>;
+    can_export_image?: boolean;
   };
   common?: {
     conf?: {
@@ -231,6 +233,36 @@ export const useExploreAdditionalActionsMenu = (
         : undefined;
     },
   );
+  const canExportImage = useSelector<ExploreState, boolean>(
+    state => state.explore?.can_export_image ?? false,
+  );
+
+  const dataExportDisabled = !canDownloadCSV;
+  const imageExportDisabled = !canExportImage;
+
+  const dataExportLabel = (text: string) =>
+    dataExportDisabled ? (
+      <span>
+        {text}
+        <MenuItemTooltip
+          title={t("You don't have permission to export data")}
+        />
+      </span>
+    ) : (
+      text
+    );
+
+  const imageExportLabel = (text: string) =>
+    imageExportDisabled ? (
+      <span>
+        {text}
+        <MenuItemTooltip
+          title={t("You don't have permission to export images")}
+        />
+      </span>
+    ) : (
+      text
+    );
 
   // Streaming export state and handlers
   const [isStreamingModalVisible, setIsStreamingModalVisible] = useState(false);
@@ -644,7 +676,7 @@ export const useExploreAdditionalActionsMenu = (
       allDataChildren.push(
         {
           key: MENU_KEYS.EXPORT_TO_CSV,
-          label: t('Export to original .CSV'),
+          label: dataExportLabel(t('Export to original .CSV')),
           icon: <Icons.FileOutlined />,
           disabled: !canDownloadCSV,
           onClick: () => {
@@ -660,7 +692,7 @@ export const useExploreAdditionalActionsMenu = (
         },
         {
           key: MENU_KEYS.EXPORT_TO_CSV_PIVOTED,
-          label: t('Export to pivoted .CSV'),
+          label: dataExportLabel(t('Export to pivoted .CSV')),
           icon: <Icons.FileOutlined />,
           disabled: !canDownloadCSV,
           onClick: () => {
@@ -676,7 +708,7 @@ export const useExploreAdditionalActionsMenu = (
         },
         {
           key: MENU_KEYS.EXPORT_TO_PIVOT_XLSX,
-          label: t('Export to Pivoted Excel'),
+          label: dataExportLabel(t('Export to Pivoted Excel')),
           icon: <Icons.FileOutlined />,
           disabled: !canDownloadCSV,
           onClick: () => {
@@ -698,7 +730,7 @@ export const useExploreAdditionalActionsMenu = (
     } else {
       allDataChildren.push({
         key: MENU_KEYS.EXPORT_TO_CSV,
-        label: t('Export to .CSV'),
+        label: dataExportLabel(t('Export to .CSV')),
         icon: <Icons.FileOutlined />,
         disabled: !canDownloadCSV,
         onClick: () => {
@@ -717,7 +749,7 @@ export const useExploreAdditionalActionsMenu = (
     allDataChildren.push(
       {
         key: MENU_KEYS.EXPORT_TO_JSON,
-        label: t('Export to .JSON'),
+        label: dataExportLabel(t('Export to .JSON')),
         icon: <Icons.FileOutlined />,
         disabled: !canDownloadCSV,
         onClick: () => {
@@ -733,8 +765,9 @@ export const useExploreAdditionalActionsMenu = (
       },
       {
         key: MENU_KEYS.EXPORT_ALL_SCREENSHOT,
-        label: t('Export screenshot (jpeg)'),
+        label: imageExportLabel(t('Export screenshot (jpeg)')),
         icon: <Icons.FileImageOutlined />,
+        disabled: imageExportDisabled,
         onClick: (e: { domEvent: React.MouseEvent | React.KeyboardEvent }) => {
           downloadAsImage(
             '.panel-body .chart-container',
@@ -753,7 +786,7 @@ export const useExploreAdditionalActionsMenu = (
       },
       {
         key: MENU_KEYS.EXPORT_TO_XLSX,
-        label: t('Export to Excel'),
+        label: dataExportLabel(t('Export to Excel')),
         icon: <Icons.FileOutlined />,
         disabled: !canDownloadCSV,
         onClick: () => {
@@ -772,7 +805,7 @@ export const useExploreAdditionalActionsMenu = (
     const currentViewChildren = [
       {
         key: MENU_KEYS.EXPORT_CURRENT_TO_CSV,
-        label: t('Export to .CSV'),
+        label: dataExportLabel(t('Export to .CSV')),
         icon: <Icons.FileOutlined />,
         disabled: !canDownloadCSV,
         onClick: () => {
@@ -808,7 +841,7 @@ export const useExploreAdditionalActionsMenu = (
       },
       {
         key: MENU_KEYS.EXPORT_CURRENT_TO_JSON,
-        label: t('Export to .JSON'),
+        label: dataExportLabel(t('Export to .JSON')),
         icon: <Icons.FileOutlined />,
         disabled: !canDownloadCSV,
         onClick: () => {
@@ -837,8 +870,9 @@ export const useExploreAdditionalActionsMenu = (
       },
       {
         key: MENU_KEYS.EXPORT_CURRENT_SCREENSHOT,
-        label: t('Export screenshot (jpeg)'),
+        label: imageExportLabel(t('Export screenshot (jpeg)')),
         icon: <Icons.FileImageOutlined />,
+        disabled: imageExportDisabled,
         onClick: (e: { domEvent: React.MouseEvent | React.KeyboardEvent }) => {
           downloadAsImage(
             '.panel-body .chart-container',
@@ -857,7 +891,7 @@ export const useExploreAdditionalActionsMenu = (
       },
       {
         key: MENU_KEYS.EXPORT_CURRENT_XLSX,
-        label: t('Export to Excel'),
+        label: dataExportLabel(t('Export to Excel')),
         icon: <Icons.FileOutlined />,
         disabled: !canDownloadCSV,
         onClick: async () => {
@@ -1037,6 +1071,7 @@ export const useExploreAdditionalActionsMenu = (
     theme.sizeUnit,
     ownState,
     hasExportCurrentView,
+    canExportImage,
   ]);
 
   // Return streaming modal state and handlers for parent to render
diff --git a/superset-frontend/src/explore/exploreUtils/getSimpleSQLExpression.test.ts b/superset-frontend/src/explore/exploreUtils/getSimpleSQLExpression.test.ts
index b13b0853035..d2319cf3268 100644
--- a/superset-frontend/src/explore/exploreUtils/getSimpleSQLExpression.test.ts
+++ b/superset-frontend/src/explore/exploreUtils/getSimpleSQLExpression.test.ts
@@ -70,3 +70,15 @@ test('Should return correct string when subject and operator are valid values',
     ]),
   ).toBe("subject operator 'comparator', 'comparator-2'");
 });
+
+test('Should handle boolean false comparator as a string value', () => {
+  expect(getSimpleSQLExpression(params.subject, params.operator, false)).toBe(
+    "subject operator 'FALSE'",
+  );
+});
+
+test('Should handle boolean true comparator as a string value', () => {
+  expect(getSimpleSQLExpression(params.subject, params.operator, true)).toBe(
+    "subject operator 'TRUE'",
+  );
+});
diff --git a/superset-frontend/src/explore/exploreUtils/index.ts b/superset-frontend/src/explore/exploreUtils/index.ts
index d67e5f8474b..e0207f22dd7 100644
--- a/superset-frontend/src/explore/exploreUtils/index.ts
+++ b/superset-frontend/src/explore/exploreUtils/index.ts
@@ -458,7 +458,8 @@ export const getSimpleSQLExpression = (
       isMulti && Array.isArray(comparator) ? comparator[0] : comparator;
     const comparatorArray = ensureIsArray(comparator);
     const isString =
-      firstValue !== undefined && Number.isNaN(Number(firstValue));
+      firstValue !== undefined &&
+      (typeof firstValue === 'boolean' || Number.isNaN(Number(firstValue)));
     const quote = isString ? "'" : '';
     const [prefix, suffix] = isMulti ? ['(', ')'] : ['', ''];
     if (comparatorArray.length > 0 && showComparator) {
diff --git a/superset-frontend/src/features/alerts/AlertReportModal.test.tsx b/superset-frontend/src/features/alerts/AlertReportModal.test.tsx
index b025a27c018..76a6527d1ad 100644
--- a/superset-frontend/src/features/alerts/AlertReportModal.test.tsx
+++ b/superset-frontend/src/features/alerts/AlertReportModal.test.tsx
@@ -25,6 +25,7 @@ import {
   waitFor,
   within,
   createStore,
+  fireEvent,
 } from 'spec/helpers/testing-library';
 import reducerIndex from 'spec/helpers/reducerIndex';
 import { buildErrorTooltipMessage } from './buildErrorTooltipMessage';
@@ -42,6 +43,14 @@ jest.mock('src/features/databases/state.ts', () => ({
   }),
 }));
 
+const mockGetChartDataRequest = jest.fn().mockResolvedValue({
+  json: { result: [{ data: [] }] },
+});
+jest.mock('src/components/Chart/chartAction', () => ({
+  ...jest.requireActual('src/components/Chart/chartAction'),
+  getChartDataRequest: (...args: unknown[]) => mockGetChartDataRequest(...args),
+}));
+
 const generateMockPayload = (dashboard = true) => {
   const mockPayload = {
     active: false,
@@ -128,6 +137,7 @@ fetchMock.get(FETCH_REPORT_WITH_FILTERS_ENDPOINT, {
     type: 'Report',
     extra: {
       dashboard: {
+        anchor: 'TAB_1',
         nativeFilters: [
           {
             nativeFilterId: 'NATIVE_FILTER-abc123',
@@ -184,17 +194,40 @@ fetchMock.get(FETCH_REPORT_OVERWRITE_ENDPOINT, {
   },
 });
 
-// Related mocks
+const FETCH_REPORT_INVALID_ANCHOR_ENDPOINT = 'glob:*/api/v1/report/7';
+fetchMock.get(FETCH_REPORT_INVALID_ANCHOR_ENDPOINT, {
+  result: {
+    ...generateMockPayload(true),
+    id: 7,
+    type: 'Report',
+    extra: {
+      dashboard: {
+        anchor: 'TAB_999',
+        nativeFilters: [],
+      },
+    },
+  },
+});
+
+// Related mocks — component uses /api/v1/report/related/* endpoints for both
+// alerts and reports, so we mock both the legacy alert paths and the actual
+// report paths used by the component.
 const ownersEndpoint = 'glob:*/api/v1/alert/related/owners?*';
 const databaseEndpoint = 'glob:*/api/v1/alert/related/database?*';
 const dashboardEndpoint = 'glob:*/api/v1/alert/related/dashboard?*';
 const chartEndpoint = 'glob:*/api/v1/alert/related/chart?*';
+const reportDashboardEndpoint = 'glob:*/api/v1/report/related/dashboard?*';
+const reportChartEndpoint = 'glob:*/api/v1/report/related/chart?*';
 const tabsEndpoint = 'glob:*/api/v1/dashboard/1/tabs';
 
 fetchMock.get(ownersEndpoint, { result: [] });
 fetchMock.get(databaseEndpoint, { result: [] });
 fetchMock.get(dashboardEndpoint, { result: [] });
 fetchMock.get(chartEndpoint, { result: [{ text: 'table chart', value: 1 }] });
+fetchMock.get(reportDashboardEndpoint, { result: [] });
+fetchMock.get(reportChartEndpoint, {
+  result: [{ text: 'table chart', value: 1 }],
+});
 fetchMock.get(
   tabsEndpoint,
   {
@@ -206,6 +239,11 @@ fetchMock.get(
   { name: tabsEndpoint },
 );
 
+// Chart detail endpoint — called by getChartVisualizationType when a chart is selected
+fetchMock.get('glob:*/api/v1/chart/*', {
+  result: { viz_type: 'table' },
+});
+
 // Restore the default tabs route and remove any test-specific overrides.
 // Called in afterEach so cleanup runs even when a test fails mid-way.
 const restoreDefaultTabsRoute = () => {
@@ -236,6 +274,33 @@ const restoreDefaultTabsRoute = () => {
 
 afterEach(() => {
   restoreDefaultTabsRoute();
+
+  // Clear call history so stale counts don't leak between tests
+  fetchMock.clearHistory();
+
+  // Remove test-specific named routes (try/catch — may not exist)
+  for (const name of [
+    'put-condition',
+    'put-edit',
+    'put-extra-dashboard',
+    'create-post',
+    'put-dashboard-payload',
+    'put-report-1',
+    'put-no-recipients',
+    'tabs-99',
+  ]) {
+    try {
+      fetchMock.removeRoute(name);
+    } catch {
+      // route may not exist
+    }
+  }
+
+  // Reset chartData mock so stale resolved values don't leak
+  mockGetChartDataRequest.mockReset();
+  mockGetChartDataRequest.mockResolvedValue({
+    json: { result: [{ data: [] }] },
+  });
 });
 
 // Create a valid alert with all required fields entered for validation check
@@ -817,6 +882,771 @@ test('renders dashboard filter dropdowns', async () => {
   expect(filterOptionDropdown).toBeInTheDocument();
 });
 
+// --------------- PHASE 2: Dashboard/Tab/Filter Interaction Tests ------------------
+
+const tabsWithFilters = {
+  result: {
+    all_tabs: { TAB_1: 'Tab 1', TAB_2: 'Tab 2' },
+    tab_tree: [
+      { title: 'Tab 1', value: 'TAB_1' },
+      { title: 'Tab 2', value: 'TAB_2' },
+    ],
+    native_filters: {
+      all: [
+        {
+          id: 'NATIVE_FILTER-F1',
+          name: 'Country Filter',
+          filterType: 'filter_select',
+          targets: [{ column: { name: 'country' }, datasetId: 1 }],
+          adhoc_filters: [],
+        },
+        {
+          id: 'NATIVE_FILTER-F2',
+          name: 'City Filter',
+          filterType: 'filter_select',
+          targets: [{ column: { name: 'city' }, datasetId: 2 }],
+          adhoc_filters: [],
+        },
+      ],
+      TAB_1: [
+        {
+          id: 'NATIVE_FILTER-F1',
+          name: 'Country Filter',
+          filterType: 'filter_select',
+          targets: [{ column: { name: 'country' }, datasetId: 1 }],
+          adhoc_filters: [],
+        },
+      ],
+      TAB_2: [
+        {
+          id: 'NATIVE_FILTER-F2',
+          name: 'City Filter',
+          filterType: 'filter_select',
+          targets: [{ column: { name: 'city' }, datasetId: 2 }],
+          adhoc_filters: [],
+        },
+      ],
+    },
+  },
+};
+
+const noTabsResponse = {
+  result: {
+    all_tabs: {},
+    tab_tree: [],
+    native_filters: {},
+  },
+};
+
+test('dashboard with no tabs disables tab selector', async () => {
+  fetchMock.removeRoute(tabsEndpoint);
+  fetchMock.get(tabsEndpoint, noTabsResponse, { name: tabsEndpoint });
+
+  render(<AlertReportModal {...generateMockedProps(true, true)} />, {
+    useRedux: true,
+  });
+
+  userEvent.click(screen.getByTestId('contents-panel'));
+  await screen.findByText(/test dashboard/i);
+
+  const tabSelector = document.querySelector('.ant-select-disabled');
+  expect(tabSelector).toBeInTheDocument();
+});
+
+test('dashboard with no tabs and no filters hides filter add link', async () => {
+  fetchMock.removeRoute(tabsEndpoint);
+  fetchMock.get(tabsEndpoint, noTabsResponse, { name: tabsEndpoint });
+
+  render(<AlertReportModal {...generateMockedProps(true, true)} />, {
+    useRedux: true,
+  });
+
+  userEvent.click(screen.getByTestId('contents-panel'));
+  await screen.findByText(/test dashboard/i);
+
+  // Wait for tabs fetch to complete
+  await waitFor(() => {
+    expect(fetchMock.callHistory.calls(tabsEndpoint).length).toBeGreaterThan(0);
+  });
+
+  // Tab selector should be disabled (no tabs)
+  const disabledSelects = document.querySelectorAll('.ant-select-disabled');
+  expect(disabledSelects.length).toBeGreaterThanOrEqual(1);
+
+  // Filter Select should also be disabled (no filter options available)
+  expect(disabledSelects.length).toBeGreaterThanOrEqual(2);
+
+  // "Apply another dashboard filter" link should NOT appear
+  // because noTabsResponse has empty native_filters ({})
+  expect(
+    screen.queryByText(/apply another dashboard filter/i),
+  ).not.toBeInTheDocument();
+});
+
+test('dashboard switching resets tab and filter selections', async () => {
+  // Return dashboard options so user can switch
+  const dashboardOptions = {
+    result: [
+      { text: 'Test Dashboard', value: 1 },
+      { text: 'Other Dashboard', value: 99 },
+    ],
+    count: 2,
+  };
+  fetchMock.removeRoute(dashboardEndpoint);
+  fetchMock.get(dashboardEndpoint, dashboardOptions);
+  fetchMock.removeRoute(reportDashboardEndpoint);
+  fetchMock.get(reportDashboardEndpoint, dashboardOptions);
+
+  // Dashboard 1 has tabs and filters
+  fetchMock.removeRoute(tabsEndpoint);
+  fetchMock.get(tabsEndpoint, tabsWithFilters, { name: tabsEndpoint });
+
+  // Dashboard 99 has no tabs
+  const tabs99 = 'glob:*/api/v1/dashboard/99/tabs';
+  fetchMock.get(tabs99, noTabsResponse, { name: tabs99 });
+
+  render(<AlertReportModal {...generateMockedProps(true, true)} />, {
+    useRedux: true,
+  });
+
+  userEvent.click(screen.getByTestId('contents-panel'));
+  await screen.findByText(/test dashboard/i);
+
+  // Wait for tabs endpoint call to complete (proves filter data is loaded)
+  await waitFor(
+    () => {
+      expect(fetchMock.callHistory.calls(tabsEndpoint).length).toBeGreaterThan(
+        0,
+      );
+    },
+    { timeout: 5000 },
+  );
+
+  // Wait for tabs to load from dashboard 1
+  await waitFor(() => {
+    expect(screen.getAllByText(/select tab/i)).toHaveLength(1);
+  });
+
+  // Verify filters are available — this proves dashboard 1 has filter options
+  const filterCombobox = await waitFor(() =>
+    screen.getByRole('combobox', { name: /select filter/i }),
+  );
+
+  // Confirm the filter dropdown has options by opening it
+  fireEvent.mouseDown(filterCombobox);
+  await screen.findByText('Country Filter', {}, { timeout: 5000 });
+  // Close the dropdown by pressing Escape
+  fireEvent.keyDown(filterCombobox, { key: 'Escape' });
+
+  // Switch to "Other Dashboard"
+  const dashboardSelect = screen.getByRole('combobox', {
+    name: /dashboard/i,
+  });
+  userEvent.clear(dashboardSelect);
+  userEvent.type(dashboardSelect, 'Other Dashboard{enter}');
+
+  // Tab selector should reset: "Other Dashboard" has no tabs, so disabled with placeholder
+  await waitFor(
+    () => {
+      expect(screen.getByText(/select a tab/i)).toBeInTheDocument();
+    },
+    { timeout: 10000 },
+  );
+
+  // Filter row should reset to empty (no filter selected)
+  await waitFor(() => {
+    const filterSelects = screen.getAllByRole('combobox', {
+      name: /select filter/i,
+    });
+    // Filter select should have no selected value (placeholder state)
+    filterSelects.forEach(select => {
+      const container = select.closest('.ant-select');
+      expect(
+        container?.querySelector('.ant-select-selection-item'),
+      ).not.toBeInTheDocument();
+    });
+  });
+
+  // Restore dashboard endpoints
+  fetchMock.removeRoute(dashboardEndpoint);
+  fetchMock.get(dashboardEndpoint, { result: [] });
+  fetchMock.removeRoute(reportDashboardEndpoint);
+  fetchMock.get(reportDashboardEndpoint, { result: [] });
+  fetchMock.removeRoute(tabs99);
+}, 45000);
+
+test('different dashboard populates its own tabs and filters', async () => {
+  // Set up a report (id:99) that uses dashboard 99 instead of dashboard 1.
+  // This tests that the component correctly loads tabs and filters for a
+  // different dashboard (the "dashboard B has its own data" case).
+  const FETCH_REPORT_DASH99_ENDPOINT = 'glob:*/api/v1/report/99';
+  fetchMock.get(FETCH_REPORT_DASH99_ENDPOINT, {
+    result: {
+      ...generateMockPayload(true),
+      id: 99,
+      type: 'Report',
+      dashboard: { id: 99, dashboard_title: 'Other Dashboard' },
+    },
+  });
+
+  // Dashboard 99 has its own tabs (Tab Alpha, Tab Beta) and a Region Filter
+  const tabs99Endpoint = 'glob:*/api/v1/dashboard/99/tabs';
+  const dash99Tabs = {
+    result: {
+      all_tabs: { TAB_A: 'Tab Alpha', TAB_B: 'Tab Beta' },
+      tab_tree: [
+        { title: 'Tab Alpha', value: 'TAB_A' },
+        { title: 'Tab Beta', value: 'TAB_B' },
+      ],
+      native_filters: {
+        all: [
+          {
+            id: 'NATIVE_FILTER-R1',
+            name: 'Region Filter',
+            filterType: 'filter_select',
+            targets: [{ column: { name: 'region' }, datasetId: 3 }],
+            adhoc_filters: [],
+          },
+        ],
+        TAB_A: [
+          {
+            id: 'NATIVE_FILTER-R1',
+            name: 'Region Filter',
+            filterType: 'filter_select',
+            targets: [{ column: { name: 'region' }, datasetId: 3 }],
+            adhoc_filters: [],
+          },
+        ],
+        TAB_B: [],
+      },
+    },
+  };
+  fetchMock.get(tabs99Endpoint, dash99Tabs, { name: 'tabs-99' });
+
+  const props = generateMockedProps(true, true);
+  const dash99Props = { ...props, alert: { ...validAlert, id: 99 } };
+
+  render(<AlertReportModal {...dash99Props} />, { useRedux: true });
+
+  userEvent.click(screen.getByTestId('contents-panel'));
+  await screen.findByText(/other dashboard/i);
+
+  // Wait for dashboard 99 tabs to load — increase timeout because the
+  // component must first fetch /api/v1/report/99, then extract dashboard_id,
+  // then fetch /api/v1/dashboard/99/tabs. This three-step async chain needs
+  // more time in CI.
+  await waitFor(
+    () => {
+      expect(fetchMock.callHistory.calls('tabs-99').length).toBeGreaterThan(0);
+    },
+    { timeout: 10000 },
+  );
+
+  // Tab selector should be enabled (dashboard 99 has tabs)
+  await waitFor(() => {
+    const treeSelect = document.querySelector('.ant-tree-select');
+    expect(treeSelect).toBeInTheDocument();
+    expect(treeSelect).not.toHaveClass('ant-select-disabled');
+  });
+
+  // Filter dropdown should show dashboard 99's "Region Filter"
+  const filterSelect = await waitFor(() =>
+    screen.getByRole('combobox', { name: /select filter/i }),
+  );
+  fireEvent.mouseDown(filterSelect);
+
+  await screen.findByText('Region Filter', {}, { timeout: 5000 });
+
+  // Dashboard 1's filters (Country/City) should NOT appear
+  expect(screen.queryByText('Country Filter')).not.toBeInTheDocument();
+
+  // Cleanup
+  fetchMock.removeRoute(FETCH_REPORT_DASH99_ENDPOINT);
+  fetchMock.removeRoute('tabs-99');
+}, 45000);
+
+test('dashboard tabs fetch failure shows error toast', async () => {
+  fetchMock.removeRoute(tabsEndpoint);
+  fetchMock.get(tabsEndpoint, 500, { name: tabsEndpoint });
+
+  const store = createStore({}, reducerIndex);
+
+  render(<AlertReportModal {...generateMockedProps(true, true)} />, {
+    useRedux: true,
+    store,
+  });
+
+  userEvent.click(screen.getByTestId('contents-panel'));
+  await screen.findByText(/test dashboard/i);
+
+  // Tab selector should remain disabled (no tabs loaded)
+  const tabSelector = document.querySelector('.ant-select-disabled');
+  expect(tabSelector).toBeInTheDocument();
+
+  // Verify the tabs request was attempted
+  const tabsCalls = fetchMock.callHistory.calls(tabsEndpoint);
+  expect(tabsCalls.length).toBeGreaterThan(0);
+
+  // Verify danger toast was dispatched for the fetch failure
+  await waitFor(() => {
+    const toasts = (store.getState() as any).messageToasts;
+    expect(toasts.length).toBeGreaterThan(0);
+    expect(
+      toasts.some((t: { text: string }) =>
+        t.text.includes('error retrieving dashboard tabs'),
+      ),
+    ).toBe(true);
+  });
+});
+
+test('switching content type to chart hides tab and filter sections', async () => {
+  fetchMock.removeRoute(tabsEndpoint);
+  fetchMock.get(tabsEndpoint, tabsWithFilters, { name: tabsEndpoint });
+
+  render(<AlertReportModal {...generateMockedProps(true, true)} />, {
+    useRedux: true,
+  });
+
+  userEvent.click(screen.getByTestId('contents-panel'));
+  await screen.findByText(/test dashboard/i);
+
+  // Tab selector and filter dropdowns should be visible for dashboard
+  expect(screen.getAllByText(/select tab/i)).toHaveLength(1);
+  expect(
+    screen.getByRole('combobox', { name: /select filter/i }),
+  ).toBeInTheDocument();
+
+  // Switch to chart
+  const contentTypeSelector = screen.getByRole('combobox', {
+    name: /select content type/i,
+  });
+  await comboboxSelect(contentTypeSelector, 'Chart', () =>
+    screen.getByRole('combobox', { name: /chart/i }),
+  );
+
+  // Tab and filter sections should be hidden
+  expect(screen.queryByText(/select tab/i)).not.toBeInTheDocument();
+  expect(
+    screen.queryByRole('combobox', { name: /select filter/i }),
+  ).not.toBeInTheDocument();
+});
+
+test('adding and removing dashboard filter rows', async () => {
+  fetchMock.removeRoute(tabsEndpoint);
+  fetchMock.get(tabsEndpoint, tabsWithFilters, { name: tabsEndpoint });
+
+  render(<AlertReportModal {...generateMockedProps(true, true)} />, {
+    useRedux: true,
+  });
+
+  userEvent.click(screen.getByTestId('contents-panel'));
+  await screen.findByText(/test dashboard/i);
+
+  // Wait for filter options to load
+  await waitFor(() => {
+    expect(
+      screen.getByRole('combobox', { name: /select filter/i }),
+    ).toBeInTheDocument();
+  });
+
+  // Should start with 1 filter row
+  const initialFilterSelects = screen.getAllByRole('combobox', {
+    name: /select filter/i,
+  });
+  expect(initialFilterSelects).toHaveLength(1);
+
+  // Click "Apply another dashboard filter"
+  const addFilterButton = screen.getByText(/apply another dashboard filter/i);
+  userEvent.click(addFilterButton);
+
+  // Should now have 2 filter rows
+  await waitFor(() => {
+    expect(
+      screen.getAllByRole('combobox', { name: /select filter/i }),
+    ).toHaveLength(2);
+  });
+
+  // Remove the second filter row by clicking its delete icon
+  const deleteIcons = document.querySelectorAll('.filters-trashcan');
+  expect(deleteIcons.length).toBeGreaterThanOrEqual(2);
+  fireEvent.click(deleteIcons[deleteIcons.length - 1]);
+
+  // Should be back to 1 filter row
+  await waitFor(() => {
+    expect(
+      screen.getAllByRole('combobox', { name: /select filter/i }),
+    ).toHaveLength(1);
+  });
+});
+
+test('alert shows condition section, report does not', () => {
+  // Alert has 5 sections
+  const { unmount } = render(
+    <AlertReportModal {...generateMockedProps(false)} />,
+    { useRedux: true },
+  );
+  expect(screen.getAllByRole('tab')).toHaveLength(5);
+  expect(screen.getByTestId('alert-condition-panel')).toBeInTheDocument();
+  unmount();
+
+  // Report has 4 sections, no condition panel
+  render(<AlertReportModal {...generateMockedProps(true)} />, {
+    useRedux: true,
+  });
+  expect(screen.getAllByRole('tab')).toHaveLength(4);
+  expect(screen.queryByTestId('alert-condition-panel')).not.toBeInTheDocument();
+});
+
+test('submit includes conditionNotNull without threshold in alert payload', async () => {
+  // Mock payload returns id:1, so updateResource PUTs to /api/v1/report/1
+  fetchMock.put(
+    'glob:*/api/v1/report/1',
+    { id: 1, result: {} },
+    { name: 'put-condition' },
+  );
+
+  render(<AlertReportModal {...generateMockedProps(false, true, false)} />, {
+    useRedux: true,
+  });
+
+  // Wait for resource to load and all validation to pass
+  await waitFor(
+    () => {
+      expect(
+        screen.queryAllByRole('img', { name: /check-circle/i }),
+      ).toHaveLength(5);
+    },
+    { timeout: 10000 },
+  );
+
+  // Open condition panel and select "not null"
+  userEvent.click(screen.getByTestId('alert-condition-panel'));
+  await screen.findByText(/smaller than/i);
+  const condition = screen.getByRole('combobox', { name: /condition/i });
+  await comboboxSelect(
+    condition,
+    'not null',
+    () => screen.getAllByText(/not null/i)[0],
+  );
+
+  // Wait for the threshold input to become disabled after "not null" selection —
+  // in CI the state update from comboboxSelect can lag behind the DOM assertion.
+  await waitFor(() => {
+    expect(screen.getByRole('spinbutton')).toBeDisabled();
+  });
+
+  // Wait for Save to be enabled and click
+  await waitFor(() => {
+    expect(screen.getByRole('button', { name: /save/i })).toBeEnabled();
+  });
+  userEvent.click(screen.getByRole('button', { name: /save/i }));
+
+  // Verify the PUT payload
+  await waitFor(() => {
+    const calls = fetchMock.callHistory.calls('put-condition');
+    expect(calls.length).toBeGreaterThan(0);
+  });
+
+  const calls = fetchMock.callHistory.calls('put-condition');
+  const body = JSON.parse(calls[calls.length - 1].options.body as string);
+  expect(body.validator_type).toBe('not null');
+  expect(body.validator_config_json).toEqual({});
+
+  fetchMock.removeRoute('put-condition');
+}, 45000);
+
+test('edit mode submit uses PUT and excludes read-only fields', async () => {
+  // Mock payload returns id:1, so updateResource PUTs to /api/v1/report/1
+  fetchMock.put(
+    'glob:*/api/v1/report/1',
+    { id: 1, result: {} },
+    { name: 'put-edit' },
+  );
+
+  render(<AlertReportModal {...generateMockedProps(false, true, false)} />, {
+    useRedux: true,
+  });
+
+  // Wait for resource to load and all validation to pass
+  await waitFor(() => {
+    expect(
+      screen.queryAllByRole('img', { name: /check-circle/i }),
+    ).toHaveLength(5);
+  });
+
+  await waitFor(() => {
+    expect(screen.getByRole('button', { name: /save/i })).toBeEnabled();
+  });
+  userEvent.click(screen.getByRole('button', { name: /save/i }));
+
+  await waitFor(() => {
+    const calls = fetchMock.callHistory.calls('put-edit');
+    expect(calls.length).toBeGreaterThan(0);
+  });
+
+  const calls = fetchMock.callHistory.calls('put-edit');
+  const body = JSON.parse(calls[calls.length - 1].options.body as string);
+
+  // Edit mode strips these read-only fields
+  expect(body).not.toHaveProperty('id');
+  expect(body).not.toHaveProperty('created_by');
+  expect(body).not.toHaveProperty('last_eval_dttm');
+  expect(body).not.toHaveProperty('last_state');
+  expect(body).not.toHaveProperty('last_value');
+  expect(body).not.toHaveProperty('last_value_row_json');
+
+  // Core fields remain
+  expect(body.type).toBe('Alert');
+  expect(body.name).toBe('Test Alert');
+
+  // Recipients from the loaded resource should be in payload
+  expect(body.recipients).toBeDefined();
+  expect(body.recipients.length).toBeGreaterThan(0);
+  expect(body.recipients[0].type).toBe('Email');
+
+  fetchMock.removeRoute('put-edit');
+});
+
+test('edit mode preserves extra.dashboard tab/filter state in payload', async () => {
+  // Report 3 has extra.dashboard.nativeFilters + anchor:'TAB_1'
+  fetchMock.put(
+    'glob:*/api/v1/report/3',
+    { id: 3, result: {} },
+    { name: 'put-extra-dashboard' },
+  );
+
+  // Provide tabs so TAB_1 is in allTabs and anchor is preserved
+  fetchMock.removeRoute(tabsEndpoint);
+  fetchMock.get(tabsEndpoint, tabsWithFilters, { name: tabsEndpoint });
+
+  const props = {
+    ...generateMockedProps(true, true, true),
+    alert: { ...validAlert, id: 3 },
+  };
+
+  render(<AlertReportModal {...props} />, {
+    useRedux: true,
+  });
+
+  // Wait for Save to be enabled (report type has fewer validation sections)
+  await waitFor(
+    () => {
+      expect(screen.getByRole('button', { name: /save/i })).toBeEnabled();
+    },
+    { timeout: 10000 },
+  );
+  userEvent.click(screen.getByRole('button', { name: /save/i }));
+
+  await waitFor(() => {
+    const calls = fetchMock.callHistory.calls('put-extra-dashboard');
+    expect(calls.length).toBeGreaterThan(0);
+  });
+
+  const calls = fetchMock.callHistory.calls('put-extra-dashboard');
+  const body = JSON.parse(calls[calls.length - 1].options.body as string);
+
+  // extra.dashboard structure must be preserved in the payload
+  expect(body.extra).toBeDefined();
+  expect(body.extra.dashboard).toBeDefined();
+  expect(body.extra.dashboard.nativeFilters).toEqual(
+    expect.arrayContaining([
+      expect.objectContaining({ nativeFilterId: 'NATIVE_FILTER-abc123' }),
+    ]),
+  );
+  expect(body.extra.dashboard.anchor).toBe('TAB_1');
+
+  fetchMock.removeRoute('put-extra-dashboard');
+  fetchMock.removeRoute(tabsEndpoint);
+  fetchMock.get(
+    tabsEndpoint,
+    { result: { all_tabs: {}, tab_tree: [] } },
+    { name: tabsEndpoint },
+  );
+});
+
+test('create mode submits POST and calls onAdd with response', async () => {
+  fetchMock.post(
+    'glob:*/api/v1/report/',
+    { id: 100, result: {} },
+    { name: 'create-post' },
+  );
+
+  const props = generateMockedProps(true); // isReport, create mode (no alert)
+  const onAdd = jest.fn();
+  const createProps = { ...props, onAdd };
+
+  render(<AlertReportModal {...createProps} />, { useRedux: true });
+
+  expect(screen.getByText('Add report')).toBeInTheDocument();
+
+  // Fill name — fireEvent.change is instant vs userEvent.type firing 13
+  // individual keystroke events, keeping this test well under the 20s timeout.
+  const nameInput = screen.getByPlaceholderText(/enter report name/i);
+  fireEvent.change(nameInput, { target: { value: 'My New Report' } });
+
+  // Open contents panel — content type defaults to Dashboard
+  userEvent.click(screen.getByTestId('contents-panel'));
+  await screen.findByRole('combobox', { name: /select content type/i });
+
+  // Switch content type to Chart (default is Dashboard)
+  const contentTypeSelect = screen.getByRole('combobox', {
+    name: /select content type/i,
+  });
+  userEvent.click(contentTypeSelect);
+  const chartOption = await screen.findByText('Chart');
+  userEvent.click(chartOption);
+
+  // Select a chart from the chart combobox
+  const chartSelect = await screen.findByRole('combobox', {
+    name: /chart/i,
+  });
+  userEvent.type(chartSelect, 'table');
+  const tableChart = await screen.findByText('table chart');
+  userEvent.click(tableChart);
+
+  // Open notification panel and set recipient email
+  userEvent.click(screen.getByTestId('notification-method-panel'));
+  const recipientInput = await screen.findByTestId('recipients');
+  fireEvent.change(recipientInput, { target: { value: 'test@example.com' } });
+
+  // Wait for Add button to be enabled (use exact name to avoid matching
+  // "Add CC Recipients" and "Add BCC Recipients" buttons)
+  await waitFor(
+    () => {
+      expect(screen.getByRole('button', { name: 'Add' })).toBeEnabled();
+    },
+    { timeout: 5000 },
+  );
+
+  // Click Add
+  userEvent.click(screen.getByRole('button', { name: 'Add' }));
+
+  // Verify POST was called (not PUT)
+  await waitFor(() => {
+    const calls = fetchMock.callHistory.calls('create-post');
+    expect(calls.length).toBeGreaterThan(0);
+  });
+
+  const calls = fetchMock.callHistory.calls('create-post');
+  const body = JSON.parse(calls[0].options.body as string);
+
+  expect(body.type).toBe('Report');
+  expect(body.name).toBe('My New Report');
+  expect(body.chart).toBe(1);
+  // Chart content type means dashboard is null (mutually exclusive)
+  expect(body.dashboard).toBeNull();
+  expect(body.recipients).toBeDefined();
+  expect(body.recipients[0].type).toBe('Email');
+  expect(body.recipients[0].recipient_config_json.target).toBe(
+    'test@example.com',
+  );
+
+  // Verify onAdd was called with the response id
+  await waitFor(() => {
+    expect(onAdd).toHaveBeenCalledWith(100);
+  });
+
+  fetchMock.removeRoute('create-post');
+}, 45000);
+
+test('create mode defaults to dashboard content type with chart null', async () => {
+  // Coverage strategy: the create-mode POST pathway is tested via the chart
+  // POST test above. The dashboard content payload (dashboard=value, chart=null)
+  // is tested via the edit-mode PUT test below. This test verifies that create
+  // mode reports default to Dashboard content type, completing the coverage:
+  //   create POST method ← chart POST test
+  //   dashboard payload shape ← edit-mode dashboard PUT test
+  //   default content type = Dashboard ← THIS test
+
+  const props = generateMockedProps(true); // isReport, create mode
+  render(<AlertReportModal {...props} />, { useRedux: true });
+
+  // Open contents panel
+  userEvent.click(screen.getByTestId('contents-panel'));
+  const contentTypeSelect = await screen.findByRole('combobox', {
+    name: /select content type/i,
+  });
+
+  // Default content type should be "Dashboard" (not "Chart")
+  const selectedItem = contentTypeSelect
+    .closest('.ant-select')
+    ?.querySelector('.ant-select-selection-item');
+  expect(selectedItem).toBeInTheDocument();
+  expect(selectedItem?.textContent).toBe('Dashboard');
+
+  // Dashboard selector should be rendered (not chart selector)
+  expect(
+    screen.getByRole('combobox', { name: /dashboard/i }),
+  ).toBeInTheDocument();
+  expect(
+    screen.queryByRole('combobox', { name: /chart/i }),
+  ).not.toBeInTheDocument();
+});
+
+test('dashboard content type submits dashboard id and null chart', async () => {
+  // Use a custom alert prop with dashboard content from the start,
+  // matching the fetched resource shape (FETCH_DASHBOARD_ENDPOINT).
+  const dashboardAlert: AlertObject = {
+    ...validAlert,
+    id: 1,
+    dashboard_id: 1,
+    chart_id: 0,
+    dashboard: {
+      id: 1,
+      value: 1,
+      label: 'Test Dashboard',
+      dashboard_title: 'Test Dashboard',
+    } as any,
+    chart: undefined as any,
+  };
+
+  fetchMock.put(
+    'glob:*/api/v1/report/1',
+    { id: 1, result: {} },
+    { name: 'put-dashboard-payload' },
+  );
+
+  const props = generateMockedProps(false, false);
+  const editProps = { ...props, alert: dashboardAlert };
+
+  render(<AlertReportModal {...editProps} />, {
+    useRedux: true,
+  });
+
+  // Wait for resource to load and all validation to pass
+  await waitFor(
+    () => {
+      expect(
+        screen.queryAllByRole('img', { name: /check-circle/i }),
+      ).toHaveLength(5);
+    },
+    { timeout: 5000 },
+  );
+
+  await waitFor(() => {
+    expect(screen.getByRole('button', { name: /save/i })).toBeEnabled();
+  });
+  userEvent.click(screen.getByRole('button', { name: /save/i }));
+
+  await waitFor(() => {
+    const calls = fetchMock.callHistory.calls('put-dashboard-payload');
+    expect(calls.length).toBeGreaterThan(0);
+  });
+
+  const calls = fetchMock.callHistory.calls('put-dashboard-payload');
+  const body = JSON.parse(calls[calls.length - 1].options.body as string);
+
+  // Dashboard payload: dashboard field is the numeric ID, chart is null
+  expect(body.dashboard).toBe(1);
+  expect(body.chart).toBeNull();
+  expect(body.name).toBe('Test Alert');
+  expect(body.recipients).toBeDefined();
+
+  fetchMock.removeRoute('put-dashboard-payload');
+});
+
+// --------------- Existing filter reappear test ------------------
+
 test('filter reappears in dropdown after clearing with X icon', async () => {
   const chartDataEndpoint = 'glob:*/api/v1/chart/data*';
 
@@ -867,19 +1697,39 @@ test('filter reappears in dropdown after clearing with X icon', async () => {
   userEvent.click(screen.getByTestId('contents-panel'));
   await screen.findByText(/test dashboard/i);
 
+  // Wait for tabs endpoint to be called so filter options are populated before
+  // opening the dropdown — in CI the async chain (fetch report → set dashboard →
+  // fetch tabs → set filter options) can lag behind the UI interactions.
+  await waitFor(
+    () => {
+      const tabsCalls = fetchMock.callHistory.calls(tabsEndpoint);
+      expect(tabsCalls.length).toBeGreaterThan(0);
+    },
+    { timeout: 5000 },
+  );
+
   const filterDropdown = screen.getByRole('combobox', {
     name: /select filter/i,
   });
   expect(filterDropdown).toBeInTheDocument();
 
-  userEvent.click(filterDropdown);
+  // Value selector should be disabled before any filter is selected
+  const valueSelect = screen.getByRole('combobox', { name: /select value/i });
+  expect(valueSelect.closest('.ant-select')).toHaveClass('ant-select-disabled');
 
-  const filterOption = await waitFor(() => {
-    const virtualList = document.querySelector('.rc-virtual-list');
-    return within(virtualList as HTMLElement).getByText('Test Filter 1');
-  });
+  // Open dropdown and find filter option. Use waitFor to retry mouseDown
+  // because Ant Design Select may not open on the first attempt in CI.
+  let filterOption: HTMLElement;
+  await waitFor(
+    () => {
+      fireEvent.mouseDown(filterDropdown);
+      filterOption = screen.getByText('Test Filter 1');
+      expect(filterOption).toBeInTheDocument();
+    },
+    { timeout: 10000 },
+  );
 
-  userEvent.click(filterOption);
+  userEvent.click(filterOption!);
 
   await waitFor(() => {
     const selectionItem = document.querySelector(
@@ -888,6 +1738,13 @@ test('filter reappears in dropdown after clearing with X icon', async () => {
     expect(selectionItem).toBeInTheDocument();
   });
 
+  // After selecting a filter, getChartDataRequest resolves and value selector becomes enabled
+  await waitFor(() => {
+    expect(valueSelect.closest('.ant-select')).not.toHaveClass(
+      'ant-select-disabled',
+    );
+  });
+
   const selectContainer = filterDropdown.closest('.ant-select');
 
   const clearIcon = selectContainer?.querySelector(
@@ -903,14 +1760,24 @@ test('filter reappears in dropdown after clearing with X icon', async () => {
     expect(selectionItem).not.toBeInTheDocument();
   });
 
-  userEvent.click(filterDropdown);
+  // After clearing, value selector should be disabled again (optionFilterValues reset)
   await waitFor(() => {
-    const virtualList = document.querySelector('.rc-virtual-list');
-    expect(
-      within(virtualList as HTMLElement).getByText('Test Filter 1'),
-    ).toBeInTheDocument();
+    expect(valueSelect.closest('.ant-select')).toHaveClass(
+      'ant-select-disabled',
+    );
   });
-});
+
+  // Re-open the dropdown — the filter should reappear as an option.
+  // Use waitFor to retry the mouseDown + text check because Ant Design
+  // may still be processing the clear event internally.
+  await waitFor(
+    () => {
+      fireEvent.mouseDown(filterDropdown);
+      expect(screen.getByText('Test Filter 1')).toBeInTheDocument();
+    },
+    { timeout: 10000 },
+  );
+}, 45000);
 
 const setupAnchorMocks = (
   nativeFilters: Record<string, unknown>,
@@ -932,7 +1799,7 @@ const setupAnchorMocks = (
   const tabs = tabsOverride ?? defaultTabs;
 
   // Clear call history so waitFor assertions don't match calls from prior tests.
-  fetchMock.callHistory.clear();
+  fetchMock.clearHistory();
 
   // Only replace the named routes that need anchor-specific overrides;
   // unnamed related-endpoint routes (owners, database, etc.) stay intact.
@@ -1101,6 +1968,17 @@ test('stale JSON array anchor is cleared without crash or toast', async () => {
       ).toBe(true);
     });
 
+    // Wait for the anchor state to be cleared. The .then() callback calls
+    // updateAnchorState(undefined) after finding that not all elements in
+    // the JSON array anchor are valid tabs. When the anchor is cleared,
+    // the tab selector shows its placeholder text instead of a selected value.
+    await waitFor(
+      () => {
+        expect(screen.getByText(/select a tab/i)).toBeInTheDocument();
+      },
+      { timeout: 10000 },
+    );
+
     // No error toast dispatched (the .then() handler ran without crashing)
     const toasts = (store.getState() as Record<string, unknown>)
       .messageToasts as { text: string }[];
@@ -1340,15 +2218,33 @@ test('anchor tab with scoped filters loads filter options correctly', async () =
     userEvent.click(screen.getByTestId('contents-panel'));
     await screen.findByText(/test dashboard/i);
 
+    // Wait for the tabs fetch to complete so filter options are populated
+    await waitFor(
+      () => {
+        expect(
+          fetchMock.callHistory
+            .calls()
+            .some(c => c.url.includes('/dashboard/1/tabs')),
+        ).toBe(true);
+      },
+      { timeout: 5000 },
+    );
+
     const filterDropdown = screen.getByRole('combobox', {
       name: /select filter/i,
     });
-    userEvent.click(filterDropdown);
-
-    const filterOption = await screen.findByRole('option', {
-      name: /Tab Scoped Filter/,
-    });
-    expect(filterOption).toBeInTheDocument();
+    // Use waitFor with mouseDown retry — the dropdown may not open or
+    // populate on the first attempt if the .then() callback hasn't
+    // finished setting filter options yet.
+    await waitFor(
+      () => {
+        fireEvent.mouseDown(filterDropdown);
+        expect(
+          screen.getByRole('option', { name: /Tab Scoped Filter/ }),
+        ).toBeInTheDocument();
+      },
+      { timeout: 10000 },
+    );
 
     const toasts = (store.getState() as Record<string, unknown>)
       .messageToasts as { text: string }[];
@@ -1488,3 +2384,288 @@ test('tabs metadata overwrites seeded filter options', async () => {
     within(selectContainer).queryByTitle('Country'),
   ).not.toBeInTheDocument();
 });
+
+test('selecting filter triggers chart data request with correct params', async () => {
+  mockGetChartDataRequest.mockReset();
+  fetchMock.removeRoute(tabsEndpoint);
+  fetchMock.get(tabsEndpoint, tabsWithFilters, { name: tabsEndpoint });
+
+  mockGetChartDataRequest.mockResolvedValue({
+    json: { result: [{ data: [{ country: 'US' }, { country: 'UK' }] }] },
+  });
+
+  render(<AlertReportModal {...generateMockedProps(true, true)} />, {
+    useRedux: true,
+  });
+
+  userEvent.click(screen.getByTestId('contents-panel'));
+  await screen.findByText(/test dashboard/i);
+
+  // Wait for filter dropdown to be available
+  const filterDropdown = await waitFor(() =>
+    screen.getByRole('combobox', { name: /select filter/i }),
+  );
+
+  // Select the Country Filter using comboboxSelect pattern
+  await comboboxSelect(filterDropdown, 'Country Filter', () =>
+    document.querySelector(
+      '.ant-select-selection-item[title="Country Filter"]',
+    ),
+  );
+
+  // getChartDataRequest should have been called for filter values
+  await waitFor(() => {
+    expect(mockGetChartDataRequest).toHaveBeenCalledTimes(1);
+  });
+
+  // Verify it was called with correct datasource and groupby
+  const callArgs = mockGetChartDataRequest.mock.calls[0][0];
+  expect(callArgs.formData.groupby).toEqual(['country']);
+  expect(callArgs.formData.datasource).toBe('1__table');
+
+  mockGetChartDataRequest.mockReset();
+});
+
+test('selected filter excluded from other row dropdowns', async () => {
+  mockGetChartDataRequest.mockReset();
+  fetchMock.removeRoute(tabsEndpoint);
+  fetchMock.get(tabsEndpoint, tabsWithFilters, { name: tabsEndpoint });
+
+  mockGetChartDataRequest.mockResolvedValue({
+    json: { result: [{ data: [{ country: 'US' }] }] },
+  });
+
+  render(<AlertReportModal {...generateMockedProps(true, true)} />, {
+    useRedux: true,
+  });
+
+  userEvent.click(screen.getByTestId('contents-panel'));
+  await screen.findByText(/test dashboard/i);
+
+  // Wait for tabs endpoint to complete so filter options are populated
+  await waitFor(
+    () => {
+      expect(fetchMock.callHistory.calls(tabsEndpoint).length).toBeGreaterThan(
+        0,
+      );
+    },
+    { timeout: 5000 },
+  );
+
+  // Wait for filter dropdown
+  const filterDropdown = await waitFor(() =>
+    screen.getByRole('combobox', { name: /select filter/i }),
+  );
+
+  // Select Country Filter in row 1
+  await comboboxSelect(filterDropdown, 'Country Filter', () =>
+    document.querySelector(
+      '.ant-select-selection-item[title="Country Filter"]',
+    ),
+  );
+
+  // Wait for getChartDataRequest to complete AND state update to propagate.
+  // The value dropdown becomes non-disabled once optionFilterValues is populated.
+  await waitFor(() => {
+    expect(mockGetChartDataRequest).toHaveBeenCalled();
+  });
+  await waitFor(
+    () => {
+      const valueSelects = screen.queryAllByRole('combobox', {
+        name: /select value/i,
+      });
+      expect(valueSelects.length).toBeGreaterThan(0);
+    },
+    { timeout: 5000 },
+  );
+
+  // Add second filter row
+  const addFilterButton = screen.getByText(/apply another dashboard filter/i);
+  userEvent.click(addFilterButton);
+
+  // Wait for second row
+  await waitFor(() => {
+    expect(
+      screen.getAllByRole('combobox', { name: /select filter/i }),
+    ).toHaveLength(2);
+  });
+
+  // Open filter dropdown in row 2 — use fireEvent.mouseDown because
+  // Ant Design Select opens on mouseDown, not click.
+  const filterDropdowns = screen.getAllByRole('combobox', {
+    name: /select filter/i,
+  });
+  fireEvent.mouseDown(filterDropdowns[1]);
+
+  // Country Filter should be excluded (dedup), City Filter should remain.
+  // Scope to the last dropdown popup to avoid matching selected items in row 1.
+  await waitFor(
+    () => {
+      const dropdowns = document.querySelectorAll('.ant-select-dropdown');
+      const lastDropdown = dropdowns[dropdowns.length - 1];
+      expect(
+        within(lastDropdown as HTMLElement).queryByText('Country Filter'),
+      ).not.toBeInTheDocument();
+      expect(
+        within(lastDropdown as HTMLElement).getByText('City Filter'),
+      ).toBeInTheDocument();
+    },
+    { timeout: 10000 },
+  );
+}, 60000);
+
+test('invalid CC email blocks submit', async () => {
+  render(<AlertReportModal {...generateMockedProps(false, true, false)} />, {
+    useRedux: true,
+  });
+
+  // Wait for validation to fully propagate (fetch → state → validate → enforce)
+  await screen.findByText('Edit alert');
+  await waitFor(
+    () => {
+      expect(screen.getByRole('button', { name: /save/i })).toBeEnabled();
+    },
+    { timeout: 5000 },
+  );
+
+  // Open notification panel and show CC field
+  userEvent.click(screen.getByTestId('notification-method-panel'));
+  const addCcButton = await screen.findByText(/Add CC Recipients/i);
+  userEvent.click(addCcButton);
+
+  // Type invalid email in CC field
+  const ccInput = await screen.findByTestId('cc');
+  userEvent.type(ccInput, 'not-an-email');
+  fireEvent.blur(ccInput);
+
+  // Save should now be disabled due to invalid email format
+  await waitFor(() => {
+    expect(screen.getByRole('button', { name: /save/i })).toBeDisabled();
+  });
+});
+
+test('invalid BCC email blocks submit', async () => {
+  render(<AlertReportModal {...generateMockedProps(false, true, false)} />, {
+    useRedux: true,
+  });
+
+  // Wait for validation to fully propagate (fetch → state → validate → enforce)
+  await screen.findByText('Edit alert');
+  await waitFor(
+    () => {
+      expect(screen.getByRole('button', { name: /save/i })).toBeEnabled();
+    },
+    { timeout: 5000 },
+  );
+
+  // Open notification panel and show BCC field
+  userEvent.click(screen.getByTestId('notification-method-panel'));
+  const addBccButton = await screen.findByText(/Add BCC Recipients/i);
+  userEvent.click(addBccButton);
+
+  // Type invalid email in BCC field
+  const bccInput = await screen.findByTestId('bcc');
+  userEvent.type(bccInput, 'not-an-email');
+  fireEvent.blur(bccInput);
+
+  // Save should now be disabled due to invalid email format
+  await waitFor(() => {
+    expect(screen.getByRole('button', { name: /save/i })).toBeDisabled();
+  });
+});
+
+test('invalid saved anchor is reset on dashboard load', async () => {
+  fetchMock.removeRoute(tabsEndpoint);
+  fetchMock.get(tabsEndpoint, tabsWithFilters, { name: tabsEndpoint });
+
+  const props = generateMockedProps(true, true);
+  const editProps = {
+    ...props,
+    alert: { ...validAlert, id: 7 },
+  };
+
+  render(<AlertReportModal {...editProps} />, {
+    useRedux: true,
+  });
+
+  userEvent.click(screen.getByTestId('contents-panel'));
+  await screen.findByText(/test dashboard/i);
+
+  // Wait for dashboard tabs to load
+  await waitFor(() => {
+    expect(fetchMock.callHistory.calls(tabsEndpoint).length).toBeGreaterThan(0);
+  });
+
+  // The saved anchor 'TAB_999' is NOT in the dashboard's tabs (TAB_1, TAB_2),
+  // so it should be reset to undefined. Tab selector shows placeholder.
+  await waitFor(() => {
+    expect(screen.getByText(/select a tab/i)).toBeInTheDocument();
+  });
+
+  // TAB_999 should NOT appear as a selected value anywhere
+  expect(screen.queryAllByTitle('TAB_999')).toHaveLength(0);
+});
+
+test('clearing notification recipients disables submit and prevents API call', async () => {
+  fetchMock.put(
+    'glob:*/api/v1/report/2',
+    { id: 2, result: {} },
+    { name: 'put-no-recipients' },
+  );
+
+  render(<AlertReportModal {...generateMockedProps(false, true, false)} />, {
+    useRedux: true,
+  });
+
+  // Wait for all validation to pass (5 checkmarks = fully valid alert)
+  await waitFor(() => {
+    expect(
+      screen.queryAllByRole('img', { name: /check-circle/i }),
+    ).toHaveLength(5);
+  });
+
+  // Save should be enabled initially
+  expect(screen.getByRole('button', { name: /save/i })).toBeEnabled();
+
+  // Open notification panel and clear the recipients field
+  userEvent.click(screen.getByTestId('notification-method-panel'));
+  const recipientInput = await screen.findByTestId('recipients');
+  userEvent.clear(recipientInput);
+  fireEvent.blur(recipientInput);
+
+  // Save should be disabled — empty recipients block submission
+  await waitFor(() => {
+    expect(screen.getByRole('button', { name: /save/i })).toBeDisabled();
+  });
+
+  // No PUT was emitted — the disabled button prevented any payload from being sent.
+  // This confirms that a payload with empty recipients is never transmitted.
+  expect(fetchMock.callHistory.calls('put-no-recipients')).toHaveLength(0);
+
+  fetchMock.removeRoute('put-no-recipients');
+});
+
+test('modal reopen resets local state', async () => {
+  const props = generateMockedProps(true, false, true);
+
+  const { unmount } = render(<AlertReportModal {...props} />, {
+    useRedux: true,
+  });
+
+  // Type a name to dirty the form
+  const nameInput = screen.getByPlaceholderText(/enter report name/i);
+  await userEvent.type(nameInput, 'Temporary Report');
+  expect(nameInput).toHaveValue('Temporary Report');
+
+  // Click Cancel
+  userEvent.click(screen.getByRole('button', { name: /cancel/i }));
+
+  // Unmount and remount to simulate reopening
+  unmount();
+  render(<AlertReportModal {...props} />, { useRedux: true });
+
+  // Fresh mount should have empty name
+  await waitFor(() => {
+    expect(screen.getByPlaceholderText(/enter report name/i)).toHaveValue('');
+  });
+});
diff --git a/superset-frontend/src/features/alerts/AlertReportModal.tsx b/superset-frontend/src/features/alerts/AlertReportModal.tsx
index f23cb98015a..ee300a5380b 100644
--- a/superset-frontend/src/features/alerts/AlertReportModal.tsx
+++ b/superset-frontend/src/features/alerts/AlertReportModal.tsx
@@ -1076,7 +1076,7 @@ const AlertReportModal: FunctionComponent<AlertReportModalProps> = ({
 
   const dashboard = currentAlert?.dashboard;
   useEffect(() => {
-    if (!tabsEnabled) return;
+    if (!tabsEnabled && !filtersEnabled) return;
 
     if (dashboard?.value) {
       SupersetClient.get({
@@ -1156,7 +1156,13 @@ const AlertReportModal: FunctionComponent<AlertReportModalProps> = ({
           addDangerToast(t('There was an error retrieving dashboard tabs.'));
         });
     }
-  }, [dashboard, tabsEnabled, currentAlert?.extra, addDangerToast]);
+  }, [
+    dashboard,
+    tabsEnabled,
+    filtersEnabled,
+    currentAlert?.extra,
+    addDangerToast,
+  ]);
 
   const databaseLabel = currentAlert?.database && !currentAlert.database.label;
   useEffect(() => {
@@ -1368,9 +1374,11 @@ const AlertReportModal: FunctionComponent<AlertReportModalProps> = ({
     updateAlertState('chart', null);
     if (tabsEnabled) {
       setTabOptions([]);
-      setNativeFilterOptions([]);
       updateAnchorState('');
     }
+    if (tabsEnabled || filtersEnabled) {
+      setNativeFilterOptions([]);
+    }
     if (filtersEnabled) {
       setNativeFilterData([
         {
diff --git a/superset-frontend/src/features/alerts/components/AlertReportCronScheduler.test.tsx b/superset-frontend/src/features/alerts/components/AlertReportCronScheduler.test.tsx
new file mode 100644
index 00000000000..7f4c55aeec8
--- /dev/null
+++ b/superset-frontend/src/features/alerts/components/AlertReportCronScheduler.test.tsx
@@ -0,0 +1,125 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+import { useState } from 'react';
+import {
+  render,
+  screen,
+  fireEvent,
+  waitFor,
+} from 'spec/helpers/testing-library';
+import { AlertReportCronScheduler } from './AlertReportCronScheduler';
+
+const defaultProps = {
+  value: '0 12 * * 1',
+  onChange: jest.fn(),
+};
+
+beforeEach(() => {
+  defaultProps.onChange = jest.fn();
+});
+
+test('renders CronPicker by default (picker mode)', () => {
+  render(<AlertReportCronScheduler {...defaultProps} />);
+  expect(screen.getByText('Schedule type')).toBeInTheDocument();
+  expect(screen.getByText('Schedule')).toBeInTheDocument();
+  // CronPicker renders combobox elements; CRON text input does not
+  expect(
+    screen.queryByPlaceholderText('CRON expression'),
+  ).not.toBeInTheDocument();
+});
+
+async function switchToCronInputMode() {
+  const scheduleTypeSelect = screen.getByRole('combobox', {
+    name: /Schedule type/i,
+  });
+  fireEvent.mouseDown(scheduleTypeSelect);
+  await waitFor(() => {
+    expect(screen.getByText('CRON Schedule')).toBeInTheDocument();
+  });
+  fireEvent.click(screen.getByText('CRON Schedule'));
+}
+
+test('switches to CRON input mode and shows text input', async () => {
+  render(<AlertReportCronScheduler {...defaultProps} />);
+
+  await switchToCronInputMode();
+
+  await waitFor(() => {
+    expect(screen.getByPlaceholderText('CRON expression')).toBeInTheDocument();
+  });
+});
+
+// Controlled wrapper: the component is fully controlled (value from props),
+// so blur/enter tests need a parent that updates value on onChange.
+function ControlledScheduler({
+  initialValue,
+  onChangeSpy,
+}: {
+  initialValue: string;
+  onChangeSpy: jest.Mock;
+}) {
+  const [value, setValue] = useState(initialValue);
+  return (
+    <AlertReportCronScheduler
+      value={value}
+      onChange={(v: string) => {
+        setValue(v);
+        onChangeSpy(v);
+      }}
+    />
+  );
+}
+
+test('calls onChange on blur in CRON input mode', async () => {
+  const onChangeSpy = jest.fn();
+  render(
+    <ControlledScheduler initialValue="0 12 * * 1" onChangeSpy={onChangeSpy} />,
+  );
+
+  await switchToCronInputMode();
+
+  const input = await screen.findByPlaceholderText('CRON expression');
+  fireEvent.change(input, { target: { value: '*/5 * * * *' } });
+
+  // Clear spy so we only assert the blur-specific call
+  onChangeSpy.mockClear();
+  fireEvent.blur(input);
+
+  expect(onChangeSpy).toHaveBeenCalledTimes(1);
+  expect(onChangeSpy).toHaveBeenCalledWith('*/5 * * * *');
+});
+
+test('calls onChange on Enter key press in CRON input mode', async () => {
+  const onChangeSpy = jest.fn();
+  render(
+    <ControlledScheduler initialValue="0 12 * * 1" onChangeSpy={onChangeSpy} />,
+  );
+
+  await switchToCronInputMode();
+
+  const input = await screen.findByPlaceholderText('CRON expression');
+  fireEvent.change(input, { target: { value: '0 9 * * 1-5' } });
+
+  // Clear spy so we only assert the Enter-specific call
+  onChangeSpy.mockClear();
+  fireEvent.keyDown(input, { key: 'Enter', code: 'Enter' });
+
+  expect(onChangeSpy).toHaveBeenCalledTimes(1);
+  expect(onChangeSpy).toHaveBeenCalledWith('0 9 * * 1-5');
+});
diff --git a/superset-frontend/src/features/alerts/components/NumberInput.test.tsx b/superset-frontend/src/features/alerts/components/NumberInput.test.tsx
new file mode 100644
index 00000000000..4ce6a366d30
--- /dev/null
+++ b/superset-frontend/src/features/alerts/components/NumberInput.test.tsx
@@ -0,0 +1,67 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+import { render, screen, fireEvent } from 'spec/helpers/testing-library';
+import NumberInput from './NumberInput';
+
+const defaultProps = {
+  timeUnit: 'seconds',
+  min: 0,
+  name: 'timeout',
+  value: '30',
+  placeholder: 'Enter value',
+  onChange: jest.fn(),
+};
+
+test('renders value with timeUnit suffix when not focused', () => {
+  render(<NumberInput {...defaultProps} />);
+  const input = screen.getByPlaceholderText('Enter value');
+  expect(input).toHaveValue('30 seconds');
+});
+
+test('strips suffix on focus and restores on blur', () => {
+  render(<NumberInput {...defaultProps} />);
+  const input = screen.getByPlaceholderText('Enter value');
+
+  fireEvent.focus(input);
+  expect(input).toHaveValue('30');
+
+  fireEvent.blur(input);
+  expect(input).toHaveValue('30 seconds');
+});
+
+test('renders empty string when value is falsy', () => {
+  render(<NumberInput {...defaultProps} value="" />);
+  const input = screen.getByPlaceholderText('Enter value');
+  expect(input).toHaveValue('');
+});
+
+test('renders empty string when value is zero', () => {
+  render(<NumberInput {...defaultProps} value={0} />);
+  const input = screen.getByPlaceholderText('Enter value');
+  expect(input).toHaveValue('');
+});
+
+test('calls onChange when input changes', () => {
+  const onChange = jest.fn();
+  render(<NumberInput {...defaultProps} onChange={onChange} />);
+  const input = screen.getByPlaceholderText('Enter value');
+
+  fireEvent.change(input, { target: { value: '60' } });
+  expect(onChange).toHaveBeenCalled();
+});
diff --git a/superset-frontend/src/features/apiKeys/ApiKeyCreateModal.tsx b/superset-frontend/src/features/apiKeys/ApiKeyCreateModal.tsx
new file mode 100644
index 00000000000..cc2cf7d4ac8
--- /dev/null
+++ b/superset-frontend/src/features/apiKeys/ApiKeyCreateModal.tsx
@@ -0,0 +1,175 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+import { useEffect, useRef, useState } from 'react';
+import { SupersetClient } from '@superset-ui/core';
+import { t } from '@apache-superset/core/translation';
+import { css, useTheme } from '@apache-superset/core/theme';
+import { Alert } from '@apache-superset/core/components';
+import {
+  FormModal,
+  FormItem,
+  Input,
+  Button,
+  Modal,
+} from '@superset-ui/core/components';
+import { useToasts } from 'src/components/MessageToasts/withToasts';
+
+interface ApiKeyCreateModalProps {
+  show: boolean;
+  onHide: () => void;
+  onSuccess: () => void;
+}
+
+interface FormValues {
+  name: string;
+}
+
+export function ApiKeyCreateModal({
+  show,
+  onHide,
+  onSuccess,
+}: ApiKeyCreateModalProps) {
+  const theme = useTheme();
+  const { addDangerToast, addSuccessToast } = useToasts();
+  const [createdKey, setCreatedKey] = useState<string | null>(null);
+  const [copied, setCopied] = useState(false);
+  const copyTimerRef = useRef<ReturnType<typeof setTimeout> | null>(null);
+
+  useEffect(
+    () => () => {
+      if (copyTimerRef.current) {
+        clearTimeout(copyTimerRef.current);
+      }
+    },
+    [],
+  );
+
+  const handleFormSubmit = async (values: FormValues) => {
+    try {
+      const response = await SupersetClient.post({
+        endpoint: '/api/v1/security/api_keys/',
+        jsonPayload: values,
+      });
+      const key = response.json?.result?.key;
+      if (!key) {
+        throw new Error('API response did not include a key');
+      }
+      setCreatedKey(key);
+      addSuccessToast(t('API key created successfully'));
+    } catch (error) {
+      addDangerToast(t('Failed to create API key'));
+      throw error;
+    }
+  };
+
+  const handleCopyKey = async () => {
+    if (!createdKey) {
+      return;
+    }
+    try {
+      await navigator.clipboard.writeText(createdKey);
+      setCopied(true);
+      if (copyTimerRef.current) {
+        clearTimeout(copyTimerRef.current);
+      }
+      copyTimerRef.current = setTimeout(() => setCopied(false), 2000);
+    } catch {
+      addDangerToast(t('Failed to copy API key to clipboard'));
+    }
+  };
+
+  const handleClose = () => {
+    if (createdKey) {
+      onSuccess();
+    }
+    setCreatedKey(null);
+    setCopied(false);
+    onHide();
+  };
+
+  if (createdKey) {
+    return (
+      <Modal
+        show={show}
+        onHide={handleClose}
+        title={t('API Key Created')}
+        maskClosable={false}
+        closable={false}
+        footer={
+          <Button type="primary" onClick={handleClose}>
+            {t('Done')}
+          </Button>
+        }
+      >
+        <Alert
+          type="warning"
+          message={t('Save this API key securely')}
+          description={t(
+            'This is the only time you will see this key. Store it securely.',
+          )}
+          showIcon
+          css={css`
+            margin-bottom: ${theme.sizeUnit * 4}px;
+          `}
+        />
+        <div
+          css={css`
+            display: flex;
+            gap: ${theme.sizeUnit * 2}px;
+            align-items: center;
+          `}
+        >
+          <Input
+            value={createdKey}
+            readOnly
+            css={css`
+              flex: 1;
+              font-family: monospace;
+            `}
+          />
+          <Button onClick={handleCopyKey}>
+            {copied ? t('Copied!') : t('Copy')}
+          </Button>
+        </div>
+      </Modal>
+    );
+  }
+
+  return (
+    <FormModal
+      show={show}
+      onHide={handleClose}
+      title={t('Create API Key')}
+      onSave={() => {}}
+      formSubmitHandler={handleFormSubmit}
+      requiredFields={['name']}
+    >
+      <FormItem
+        name="name"
+        label={t('Name')}
+        rules={[{ required: true, message: t('API key name is required') }]}
+      >
+        <Input
+          name="name"
+          placeholder={t('e.g., CI/CD Pipeline, Analytics Script')}
+        />
+      </FormItem>
+    </FormModal>
+  );
+}
diff --git a/superset-frontend/src/features/apiKeys/ApiKeyList.tsx b/superset-frontend/src/features/apiKeys/ApiKeyList.tsx
new file mode 100644
index 00000000000..9b12962eb0a
--- /dev/null
+++ b/superset-frontend/src/features/apiKeys/ApiKeyList.tsx
@@ -0,0 +1,236 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+import { useEffect, useRef, useState } from 'react';
+import { SupersetClient } from '@superset-ui/core';
+import { t } from '@apache-superset/core/translation';
+import { css, useTheme } from '@apache-superset/core/theme';
+import {
+  Button,
+  Table,
+  Modal,
+  Tag,
+  Tooltip,
+} from '@superset-ui/core/components';
+import { useToasts } from 'src/components/MessageToasts/withToasts';
+import { ApiKeyCreateModal } from './ApiKeyCreateModal';
+
+export interface ApiKey {
+  uuid: string;
+  name: string;
+  key_prefix: string;
+  active: boolean;
+  created_on: string;
+  expires_on: string | null;
+  revoked_on: string | null;
+  last_used_on: string | null;
+  scopes: string | null;
+}
+
+export function ApiKeyList() {
+  const theme = useTheme();
+  const { addDangerToast, addSuccessToast } = useToasts();
+  const [apiKeys, setApiKeys] = useState<ApiKey[]>([]);
+  const [loading, setLoading] = useState(false);
+  const [showCreateModal, setShowCreateModal] = useState(false);
+  const fetchCounterRef = useRef(0);
+
+  async function fetchApiKeys() {
+    fetchCounterRef.current += 1;
+    const thisRequest = fetchCounterRef.current;
+    setLoading(true);
+    try {
+      const response = await SupersetClient.get({
+        endpoint: '/api/v1/security/api_keys/',
+      });
+      // Only apply results if this is still the most recent request
+      if (thisRequest === fetchCounterRef.current) {
+        setApiKeys(response.json.result || []);
+      }
+    } catch (error) {
+      if (thisRequest === fetchCounterRef.current) {
+        addDangerToast(t('Failed to fetch API keys'));
+      }
+    } finally {
+      if (thisRequest === fetchCounterRef.current) {
+        setLoading(false);
+      }
+    }
+  }
+
+  useEffect(() => {
+    fetchApiKeys();
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
+
+  function handleRevokeKey(keyUuid: string) {
+    Modal.confirm({
+      title: t('Revoke API Key'),
+      content: t(
+        'Are you sure you want to revoke this API key? This action cannot be undone.',
+      ),
+      okText: t('Revoke'),
+      okType: 'danger',
+      cancelText: t('Cancel'),
+      onOk: async () => {
+        try {
+          await SupersetClient.delete({
+            endpoint: `/api/v1/security/api_keys/${keyUuid}`,
+          });
+          addSuccessToast(t('API key revoked successfully'));
+          fetchApiKeys();
+        } catch (error) {
+          addDangerToast(t('Failed to revoke API key'));
+        }
+      },
+    });
+  }
+
+  const formatDate = (dateString: string | null) => {
+    if (!dateString) return '-';
+    return new Date(dateString).toLocaleDateString(undefined, {
+      year: 'numeric',
+      month: 'short',
+      day: 'numeric',
+    });
+  };
+
+  const getStatusBadge = (key: ApiKey) => {
+    if (key.revoked_on) {
+      return <Tag color="error">{t('Revoked')}</Tag>;
+    }
+    if (key.expires_on && new Date(key.expires_on) < new Date()) {
+      return <Tag color="warning">{t('Expired')}</Tag>;
+    }
+    if (!key.active) {
+      return <Tag color="default">{t('Inactive')}</Tag>;
+    }
+    return <Tag color="success">{t('Active')}</Tag>;
+  };
+
+  const columns = [
+    {
+      title: t('Name'),
+      dataIndex: 'name',
+      key: 'name',
+    },
+    {
+      title: t('Key Prefix'),
+      dataIndex: 'key_prefix',
+      key: 'key_prefix',
+      render: (prefix: string) => (
+        <code
+          css={css`
+            background: ${theme.colorFillSecondary};
+            padding: 2px 6px;
+            border-radius: 3px;
+          `}
+        >
+          {prefix}...
+        </code>
+      ),
+    },
+    {
+      title: t('Created'),
+      dataIndex: 'created_on',
+      key: 'created_on',
+      render: formatDate,
+    },
+    {
+      title: t('Last Used'),
+      dataIndex: 'last_used_on',
+      key: 'last_used_on',
+      render: formatDate,
+    },
+    {
+      title: t('Status'),
+      key: 'status',
+      render: (_: unknown, record: ApiKey) => getStatusBadge(record),
+    },
+    {
+      title: t('Actions'),
+      key: 'actions',
+      render: (_: unknown, record: ApiKey) => (
+        <>
+          {!record.revoked_on && record.active && (
+            <Tooltip title={t('Revoke this API key')}>
+              <Button
+                type="link"
+                danger
+                onClick={() => handleRevokeKey(record.uuid)}
+              >
+                {t('Revoke')}
+              </Button>
+            </Tooltip>
+          )}
+        </>
+      ),
+    },
+  ];
+
+  return (
+    <div>
+      <div
+        css={css`
+          display: flex;
+          justify-content: space-between;
+          align-items: center;
+          margin-bottom: ${theme.sizeUnit * 4}px;
+        `}
+      >
+        <div>
+          <p
+            css={css`
+              margin-bottom: ${theme.sizeUnit * 2}px;
+            `}
+          >
+            {t('API keys allow scoped programmatic access to Superset.')}
+          </p>
+          <p
+            css={css`
+              margin-bottom: 0;
+            `}
+          >
+            {t('Keys are shown only once at creation. Store them securely.')}
+          </p>
+        </div>
+        <Button type="primary" onClick={() => setShowCreateModal(true)}>
+          {t('Create API Key')}
+        </Button>
+      </div>
+      <Table
+        columns={columns}
+        data={apiKeys}
+        loading={loading}
+        rowKey="uuid"
+        pagination={{ pageSize: 10 }}
+      />
+      {showCreateModal && (
+        <ApiKeyCreateModal
+          show={showCreateModal}
+          onHide={() => {
+            setShowCreateModal(false);
+          }}
+          onSuccess={() => {
+            fetchApiKeys();
+          }}
+        />
+      )}
+    </div>
+  );
+}
diff --git a/superset-frontend/src/features/cssTemplates/CssTemplateModal.tsx b/superset-frontend/src/features/cssTemplates/CssTemplateModal.tsx
index 4d2ada88e9d..e298bc58458 100644
--- a/superset-frontend/src/features/cssTemplates/CssTemplateModal.tsx
+++ b/superset-frontend/src/features/cssTemplates/CssTemplateModal.tsx
@@ -268,6 +268,7 @@ const CssTemplateModal: FunctionComponent<CssTemplateModalProps> = ({
           onChange={onCssChange}
           value={currentCssTemplate?.css ?? ''}
           language="css"
+          height="250px"
           width="100%"
         />
       </TemplateContainer>
diff --git a/superset-frontend/src/features/datasets/AddDataset/LeftPanel/LeftPanel.test.tsx b/superset-frontend/src/features/datasets/AddDataset/LeftPanel/LeftPanel.test.tsx
index 847ef197435..789b5783359 100644
--- a/superset-frontend/src/features/datasets/AddDataset/LeftPanel/LeftPanel.test.tsx
+++ b/superset-frontend/src/features/datasets/AddDataset/LeftPanel/LeftPanel.test.tsx
@@ -180,7 +180,7 @@ test('should render schema selector, database selector container, and selects',
     name: 'Select database or type to search databases',
   });
   const schemaSelect = screen.getByRole('combobox', {
-    name: 'Select schema or type to search schemas',
+    name: 'Select schema',
   });
   expect(databaseSelect).toBeInTheDocument();
   expect(schemaSelect).toBeInTheDocument();
@@ -211,7 +211,7 @@ test('renders list of options when user clicks on schema', async () => {
 
   // Schema select will be automatically populated if there is only one schema
   const schemaSelect = screen.getByRole('combobox', {
-    name: /select schema or type to search schemas/i,
+    name: /select schema/i,
   });
   await waitFor(() => {
     expect(schemaSelect).toBeEnabled();
@@ -231,7 +231,7 @@ test('searches for a table name', async () => {
   userEvent.click(await screen.findByText('test-postgres'));
 
   const schemaSelect = screen.getByRole('combobox', {
-    name: /select schema or type to search schemas/i,
+    name: /select schema/i,
   });
   const tableSelect = screen.getByRole('combobox', {
     name: /select table or type to search tables/i,
@@ -287,7 +287,7 @@ test('renders a warning icon when a table name has a preexisting dataset', async
   userEvent.click(await screen.findByText('test-postgres'));
 
   const schemaSelect = screen.getByRole('combobox', {
-    name: /select schema or type to search schemas/i,
+    name: /select schema/i,
   });
   const tableSelect = screen.getByRole('combobox', {
     name: /select table or type to search tables/i,
diff --git a/superset-frontend/src/features/home/Menu.test.tsx b/superset-frontend/src/features/home/Menu.test.tsx
index f2583cb20b3..6cbacebcb40 100644
--- a/superset-frontend/src/features/home/Menu.test.tsx
+++ b/superset-frontend/src/features/home/Menu.test.tsx
@@ -30,6 +30,14 @@ jest.mock('@apache-superset/core/theme', () => ({
   useTheme: jest.fn(),
 }));
 
+jest.mock('antd', () => ({
+  ...jest.requireActual('antd'),
+  Grid: {
+    ...jest.requireActual('antd').Grid,
+    useBreakpoint: () => ({ md: true }),
+  },
+}));
+
 const dropdownItems = [
   {
     label: 'Data',
diff --git a/superset-frontend/src/features/home/Menu.tsx b/superset-frontend/src/features/home/Menu.tsx
index b7eacb65cf4..9300195bda9 100644
--- a/superset-frontend/src/features/home/Menu.tsx
+++ b/superset-frontend/src/features/home/Menu.tsx
@@ -18,6 +18,7 @@
  */
 import { useState, useEffect } from 'react';
 import { styled, css, useTheme } from '@apache-superset/core/theme';
+import { t } from '@apache-superset/core/translation';
 import { ensureStaticPrefix } from 'src/utils/assetUrl';
 import { ensureAppRoot } from 'src/utils/pathUtils';
 import { getUrlParam } from 'src/utils/urlUtils';
@@ -176,6 +177,7 @@ const StyledCol = styled(Col)`
   ${({ theme }) => css`
     display: flex;
     gap: ${theme.sizeUnit * 4}px;
+    flex-wrap: wrap;
   `}
 `;
 
@@ -279,8 +281,10 @@ export function Menu({
     return {
       key: label,
       label,
-      icon: <Icons.DownOutlined iconSize="xs" />,
-      popupOffset: NAVBAR_MENU_POPUP_OFFSET,
+      ...(screens.md && {
+        icon: <Icons.DownOutlined iconSize="xs" />,
+        popupOffset: NAVBAR_MENU_POPUP_OFFSET,
+      }),
       children: childItems,
     };
   };
@@ -331,7 +335,7 @@ export function Menu({
     return <>{link}</>;
   };
   return (
-    <StyledHeader className="top" id="main-menu" role="navigation">
+    <StyledHeader className="top" id="main-menu" role="navigation" aria-label={t('Main navigation')}>
       <StyledRow>
         <StyledCol md={16} xs={24}>
           <Tooltip
@@ -348,7 +352,7 @@ export function Menu({
             </StyledBrandText>
           )}
           <StyledMainNav
-            mode="horizontal"
+            mode={screens.md ? 'horizontal' : 'inline'}
             data-test="navbar-top"
             className="main-nav"
             selectedKeys={activeTabs}
diff --git a/superset-frontend/src/features/home/SubMenu.tsx b/superset-frontend/src/features/home/SubMenu.tsx
index f71892fb501..44385e7f66e 100644
--- a/superset-frontend/src/features/home/SubMenu.tsx
+++ b/superset-frontend/src/features/home/SubMenu.tsx
@@ -210,7 +210,7 @@ const SubMenuComponent: FunctionComponent<SubMenuProps> = props => {
 
   return (
     <StyledHeader backgroundColor={props.backgroundColor}>
-      <Row className="menu" role="navigation">
+      <Row className="menu" role="navigation" aria-label={t('Page navigation')}>
         {props.name && <div className="header">{props.name}</div>}
         <Menu
           mode={showMenu}
diff --git a/superset-frontend/src/features/queries/QueryPreviewModal.tsx b/superset-frontend/src/features/queries/QueryPreviewModal.tsx
index 9e00d309c2a..823aae806c5 100644
--- a/superset-frontend/src/features/queries/QueryPreviewModal.tsx
+++ b/superset-frontend/src/features/queries/QueryPreviewModal.tsx
@@ -18,7 +18,7 @@
  */
 import { useState } from 'react';
 import { t } from '@apache-superset/core/translation';
-import { styled } from '@apache-superset/core/theme';
+import { useTheme, styled } from '@apache-superset/core/theme';
 import cx from 'classnames';
 import { Button, Modal } from '@superset-ui/core/components';
 import withToasts, {
@@ -65,6 +65,7 @@ const TabButton = styled.div`
 const StyledModal = styled(Modal)`
   .ant-modal-body {
     padding: ${({ theme }) => theme.sizeUnit * 6}px;
+    padding-top: 0;
   }
 `;
 
@@ -93,6 +94,15 @@ function QueryPreviewModal({
       currentQueryId: query.id,
       fetchData,
     });
+  const theme = useTheme();
+  const codeBlockStyle = {
+    border: 1,
+    borderColor: theme.colorBorder,
+    borderStyle: 'solid',
+    marginTop: theme.sizeUnit * 4,
+    fontSize: theme.fontSize * 0.75,
+    height: theme.sizeUnit * 100,
+  };
 
   const [currentTab, setCurrentTab] = useState<'user' | 'executed'>('user');
 
@@ -157,6 +167,7 @@ function QueryPreviewModal({
           addDangerToast={addDangerToast}
           addSuccessToast={addSuccessToast}
           language="sql"
+          customStyle={codeBlockStyle}
         >
           {(currentTab === 'user' ? sql : executed_sql) || ''}
         </SyntaxHighlighterCopy>
diff --git a/superset-frontend/src/features/queries/SavedQueryPreviewModal.tsx b/superset-frontend/src/features/queries/SavedQueryPreviewModal.tsx
index 3e6e45871b8..6f0989e1a61 100644
--- a/superset-frontend/src/features/queries/SavedQueryPreviewModal.tsx
+++ b/superset-frontend/src/features/queries/SavedQueryPreviewModal.tsx
@@ -18,7 +18,7 @@
  */
 import { FunctionComponent } from 'react';
 import { t } from '@apache-superset/core/translation';
-import { styled } from '@apache-superset/core/theme';
+import { useTheme, styled } from '@apache-superset/core/theme';
 import { Button, Modal } from '@superset-ui/core/components';
 import SyntaxHighlighterCopy from 'src/features/queries/SyntaxHighlighterCopy';
 import withToasts, {
@@ -41,6 +41,7 @@ const QueryLabel = styled.div`
 const StyledModal = styled(Modal)`
   .ant-modal-body {
     padding: 24px;
+    padding-top: 0;
   }
 `;
 
@@ -77,6 +78,15 @@ const SavedQueryPreviewModal: FunctionComponent<
       currentQueryId: savedQuery.id,
       fetchData,
     });
+  const theme = useTheme();
+  const codeBlockStyle = {
+    border: 1,
+    borderColor: theme.colorBorder,
+    borderStyle: 'solid',
+    marginTop: theme.sizeUnit * 4,
+    fontSize: theme.fontSize * 0.75,
+    height: theme.sizeUnit * 100,
+  };
 
   return (
     <div role="none" onKeyUp={handleKeyPress}>
@@ -123,6 +133,7 @@ const SavedQueryPreviewModal: FunctionComponent<
           language="sql"
           addDangerToast={addDangerToast}
           addSuccessToast={addSuccessToast}
+          customStyle={codeBlockStyle}
         >
           {savedQuery.sql || ''}
         </SyntaxHighlighterCopy>
diff --git a/superset-frontend/src/features/queries/SyntaxHighlighterCopy.tsx b/superset-frontend/src/features/queries/SyntaxHighlighterCopy.tsx
index 1daecd6d594..f247c51f61f 100644
--- a/superset-frontend/src/features/queries/SyntaxHighlighterCopy.tsx
+++ b/superset-frontend/src/features/queries/SyntaxHighlighterCopy.tsx
@@ -124,7 +124,11 @@ export default function SyntaxHighlighterCopy({
         onClick={handleCopyClick}
         onKeyDown={handleKeyDown}
       />
-      <CodeSyntaxHighlighter language={language} {...syntaxHighlighterProps}>
+      <CodeSyntaxHighlighter
+        language={language}
+        showCopyButton={false}
+        {...syntaxHighlighterProps}
+      >
         {children}
       </CodeSyntaxHighlighter>
     </SyntaxHighlighterWrapper>
diff --git a/superset-frontend/src/features/reports/ReportModal/ReportModal.test.tsx b/superset-frontend/src/features/reports/ReportModal/ReportModal.test.tsx
index c07381817b7..5fad71c7ad6 100644
--- a/superset-frontend/src/features/reports/ReportModal/ReportModal.test.tsx
+++ b/superset-frontend/src/features/reports/ReportModal/ReportModal.test.tsx
@@ -22,9 +22,10 @@ import {
   screen,
   userEvent,
   waitFor,
+  createStore,
 } from 'spec/helpers/testing-library';
+import reducerIndex from 'spec/helpers/reducerIndex';
 import { FeatureFlag, VizType, isFeatureEnabled } from '@superset-ui/core';
-import * as actions from 'src/features/reports/ReportModal/actions';
 import ReportModal from '.';
 
 const REPORT_ENDPOINT = 'glob:*/api/v1/report*';
@@ -56,115 +57,260 @@ jest.mock('@superset-ui/core', () => ({
 }));
 
 const mockedIsFeatureEnabled = isFeatureEnabled as jest.Mock;
-// eslint-disable-next-line no-restricted-globals -- TODO: Migrate from describe blocks
-describe('Email Report Modal', () => {
-  beforeEach(() => {
-    mockedIsFeatureEnabled.mockImplementation(
-      featureFlag => featureFlag === FeatureFlag.AlertReports,
-    );
-    render(<ReportModal {...defaultProps} />, { useRedux: true });
-  });
 
-  test('inputs respond correctly', () => {
-    // ----- Report name textbox
-    // Initial value
-    const reportNameTextbox = screen.getByTestId('report-name-test');
-    expect(reportNameTextbox).toHaveDisplayValue('Weekly Report');
-    // Type in the textbox and assert that it worked
-    userEvent.clear(reportNameTextbox);
-    userEvent.type(reportNameTextbox, 'Report name text test');
-    expect(reportNameTextbox).toHaveDisplayValue('Report name text test');
-
-    // ----- Report description textbox
-    // Initial value
-    const reportDescriptionTextbox = screen.getByTestId(
-      'report-description-test',
-    );
-    expect(reportDescriptionTextbox).toHaveDisplayValue('');
-    // Type in the textbox and assert that it worked
-    userEvent.type(reportDescriptionTextbox, 'Report description text test');
-    expect(reportDescriptionTextbox).toHaveDisplayValue(
-      'Report description text test',
-    );
-
-    // ----- Crontab
-    const crontabInputs = screen.getAllByRole('combobox');
-    expect(crontabInputs).toHaveLength(5);
-  });
-
-  test('does not allow user to create a report without a name', () => {
-    // Grab name textbox and add button
-    const reportNameTextbox = screen.getByTestId('report-name-test');
-    const addButton = screen.getByRole('button', { name: /add/i });
-
-    // Add button should be enabled while name textbox has text
-    expect(reportNameTextbox).toHaveDisplayValue('Weekly Report');
-    expect(addButton).toBeEnabled();
-
-    // Clear the text from the name textbox
-    userEvent.clear(reportNameTextbox);
-
-    // Add button should now be disabled, blocking user from creation
-    expect(reportNameTextbox).toHaveDisplayValue('');
-    expect(addButton).toBeDisabled();
-  });
-
-  // eslint-disable-next-line no-restricted-globals -- TODO: Migrate from describe blocks
-  describe('Email Report Modal', () => {
-    let dispatch: any;
-
-    beforeEach(async () => {
-      dispatch = jest.fn();
-    });
-
-    test('creates a new email report', async () => {
-      // ---------- Render/value setup ----------
-      const reportValues = {
-        id: 1,
-        result: {
-          active: true,
-          creation_method: 'dashboards',
-          crontab: '0 12 * * 1',
-          dashboard: 1,
-          name: 'Weekly Report',
-          owners: [1],
-          recipients: [
-            {
-              recipient_config_json: {
-                target: 'test@test.com',
-              },
-              type: 'Email',
-            },
-          ],
-          type: 'Report',
-        },
-      };
-      // This is needed to structure the reportValues to match the fetchMock return
-      const stringyReportValues = `{"id":1,"result":{"active":true,"creation_method":"dashboards","crontab":"0 12 * * 1","dashboard":${1},"name":"Weekly Report","owners":[${1}],"recipients":[{"recipient_config_json":{"target":"test@test.com"},"type":"Email"}],"type":"Report"}}`;
-      // Watch for report POST
-      fetchMock.post(REPORT_ENDPOINT, reportValues);
-
-      // Click "Add" button to create a new email report
-      const addButton = screen.getByRole('button', { name: /add/i });
-      await waitFor(() => userEvent.click(addButton));
-
-      // Mock addReport from Redux
-      const makeRequest = () => {
-        const request = actions.addReport(reportValues);
-        return request(dispatch);
-      };
-
-      await makeRequest();
-
-      // 🐞 ----- There are 2 POST calls at this point ----- 🐞
-
-      // addReport's mocked POST return should match the mocked values
-      expect(fetchMock.callHistory.lastCall()?.options?.body).toEqual(
-        stringyReportValues,
-      );
-      expect(dispatch).toHaveBeenCalledTimes(2);
-      const reportCalls = fetchMock.callHistory.calls(REPORT_ENDPOINT);
-      expect(reportCalls).toHaveLength(2);
-    });
-  });
+beforeEach(() => {
+  mockedIsFeatureEnabled.mockImplementation(
+    featureFlag => featureFlag === FeatureFlag.AlertReports,
+  );
+});
+
+test('inputs respond correctly', () => {
+  render(<ReportModal {...defaultProps} />, { useRedux: true });
+  // ----- Report name textbox
+  const reportNameTextbox = screen.getByTestId('report-name-test');
+  expect(reportNameTextbox).toHaveDisplayValue('Weekly Report');
+  userEvent.clear(reportNameTextbox);
+  userEvent.type(reportNameTextbox, 'Report name text test');
+  expect(reportNameTextbox).toHaveDisplayValue('Report name text test');
+
+  // ----- Report description textbox
+  const reportDescriptionTextbox = screen.getByTestId(
+    'report-description-test',
+  );
+  expect(reportDescriptionTextbox).toHaveDisplayValue('');
+  userEvent.type(reportDescriptionTextbox, 'Report description text test');
+  expect(reportDescriptionTextbox).toHaveDisplayValue(
+    'Report description text test',
+  );
+
+  // ----- Crontab
+  const crontabInputs = screen.getAllByRole('combobox');
+  expect(crontabInputs).toHaveLength(5);
+});
+
+test('does not allow user to create a report without a name', () => {
+  render(<ReportModal {...defaultProps} />, { useRedux: true });
+  const reportNameTextbox = screen.getByTestId('report-name-test');
+  const addButton = screen.getByRole('button', { name: /add/i });
+
+  expect(reportNameTextbox).toHaveDisplayValue('Weekly Report');
+  expect(addButton).toBeEnabled();
+
+  userEvent.clear(reportNameTextbox);
+
+  expect(reportNameTextbox).toHaveDisplayValue('');
+  expect(addButton).toBeDisabled();
+});
+
+test('creates a new email report via modal Add button', async () => {
+  fetchMock.post(
+    REPORT_ENDPOINT,
+    { id: 1, result: {} },
+    { name: 'post-report' },
+  );
+
+  render(<ReportModal {...defaultProps} />, { useRedux: true });
+
+  const addButton = screen.getByRole('button', { name: /add/i });
+  await waitFor(() => userEvent.click(addButton));
+
+  // Verify exactly one POST from the modal submit path
+  await waitFor(() => {
+    const postCalls = fetchMock.callHistory.calls('post-report');
+    expect(postCalls).toHaveLength(1);
+  });
+
+  const postCalls = fetchMock.callHistory.calls('post-report');
+  const body = JSON.parse(postCalls[0].options.body as string);
+  expect(body.name).toBe('Weekly Report');
+  expect(body.type).toBe('Report');
+  expect(body.creation_method).toBe('dashboards');
+  expect(body.crontab).toBeDefined();
+  expect(body.recipients).toBeDefined();
+  expect(body.recipients[0].type).toBe('Email');
+
+  fetchMock.removeRoute('post-report');
+});
+
+test('text-based chart hides screenshot width and shows message content', () => {
+  // Table is text-based: should show message content but hide custom width
+  const textChartProps = {
+    ...defaultProps,
+    dashboardId: undefined,
+    chart: { id: 1, sliceFormData: { viz_type: VizType.Table } },
+    chartName: 'My Table Chart',
+    creationMethod: 'charts' as const,
+  };
+  render(<ReportModal {...textChartProps} />, { useRedux: true });
+
+  // Message content section should be visible
+  expect(screen.getByText('Message content')).toBeInTheDocument();
+  expect(screen.getByText(/Text embedded in email/i)).toBeInTheDocument();
+
+  // Screenshot width should NOT be visible for text-based chart
+  expect(screen.queryByText('Screenshot width')).not.toBeInTheDocument();
+});
+
+test('non-text chart shows screenshot width and message content', () => {
+  const lineChartProps = {
+    ...defaultProps,
+    dashboardId: undefined,
+    chart: { id: 1, sliceFormData: { viz_type: VizType.Line } },
+    chartName: 'My Line Chart',
+    creationMethod: 'charts' as const,
+  };
+  render(<ReportModal {...lineChartProps} />, { useRedux: true });
+
+  // Both message content and screenshot width should be visible
+  expect(screen.getByText('Message content')).toBeInTheDocument();
+  expect(screen.getByText('Screenshot width')).toBeInTheDocument();
+});
+
+test('dashboard report hides message content section', () => {
+  const dashboardProps = {
+    ...defaultProps,
+    chart: undefined,
+    dashboardName: 'My Dashboard',
+  };
+  render(<ReportModal {...dashboardProps} />, { useRedux: true });
+
+  // Message content (radio group) should NOT be visible for dashboard
+  expect(screen.queryByText('Message content')).not.toBeInTheDocument();
+  // Screenshot width SHOULD be visible
+  expect(screen.getByText('Screenshot width')).toBeInTheDocument();
+});
+
+test('renders edit mode when report exists in store', () => {
+  const existingReport = {
+    id: 42,
+    name: 'Existing Dashboard Report',
+    description: 'An existing report',
+    crontab: '0 9 * * 1',
+    creation_method: 'dashboards',
+    report_format: 'PNG',
+    timezone: 'America/New_York',
+    active: true,
+    type: 'Report',
+    dashboard: 1,
+    owners: [1],
+    recipients: [
+      {
+        recipient_config_json: { target: 'test@test.com' },
+        type: 'Email',
+      },
+    ],
+  };
+  const store = createStore(
+    {
+      reports: {
+        dashboards: { 1: existingReport },
+      },
+    },
+    reducerIndex,
+  );
+
+  render(<ReportModal {...defaultProps} />, { useRedux: true, store });
+
+  // Edit mode title
+  expect(screen.getByText('Edit email report')).toBeInTheDocument();
+  // Report name populated from store
+  expect(screen.getByTestId('report-name-test')).toHaveDisplayValue(
+    'Existing Dashboard Report',
+  );
+  // Save button instead of Add
+  expect(screen.getByRole('button', { name: /save/i })).toBeInTheDocument();
+});
+
+test('edit mode dispatches editReport via PUT on save', async () => {
+  const existingReport = {
+    id: 42,
+    name: 'Existing Report',
+    description: '',
+    crontab: '0 12 * * 1',
+    creation_method: 'dashboards',
+    report_format: 'PNG',
+    timezone: 'America/New_York',
+    active: true,
+    type: 'Report',
+    dashboard: 1,
+    owners: [1],
+    recipients: [
+      {
+        recipient_config_json: { target: 'test@test.com' },
+        type: 'Email',
+      },
+    ],
+  };
+  const store = createStore(
+    {
+      reports: {
+        dashboards: { 1: existingReport },
+      },
+    },
+    reducerIndex,
+  );
+
+  fetchMock.put(
+    'glob:*/api/v1/report/42',
+    { id: 42, result: {} },
+    {
+      name: 'put-report-42',
+    },
+  );
+
+  render(<ReportModal {...defaultProps} />, { useRedux: true, store });
+
+  expect(screen.getByText('Edit email report')).toBeInTheDocument();
+  const saveButton = screen.getByRole('button', { name: /save/i });
+  await waitFor(() => userEvent.click(saveButton));
+
+  await waitFor(() => {
+    const calls = fetchMock.callHistory.calls('put-report-42');
+    expect(calls.length).toBeGreaterThan(0);
+  });
+
+  const calls = fetchMock.callHistory.calls('put-report-42');
+  const body = JSON.parse(calls[calls.length - 1].options.body as string);
+
+  // Pin critical payload fields to catch regressions
+  expect(body.type).toBe('Report');
+  expect(body.name).toBe('Existing Report');
+  expect(body.crontab).toBe('0 12 * * 1');
+  expect(body.report_format).toBe('PNG');
+  expect(body.dashboard).toBe(1);
+  expect(body.recipients).toBeDefined();
+  expect(body.recipients[0].type).toBe('Email');
+
+  fetchMock.removeRoute('put-report-42');
+});
+
+test('submit failure dispatches danger toast and keeps modal open', async () => {
+  fetchMock.post(REPORT_ENDPOINT, 500, { name: 'post-fail' });
+  const onHide = jest.fn();
+
+  const store = createStore({}, reducerIndex);
+  render(<ReportModal {...defaultProps} onHide={onHide} />, {
+    useRedux: true,
+    store,
+  });
+
+  const addButton = screen.getByRole('button', { name: /add/i });
+  await waitFor(() => userEvent.click(addButton));
+
+  // The addReport action catches 500 errors, dispatches a danger toast, and re-throws
+  await waitFor(() => {
+    const toasts = (store.getState() as any).messageToasts;
+    expect(toasts.length).toBeGreaterThan(0);
+    expect(
+      toasts.some((t: { text: string }) =>
+        t.text.includes('Failed to create report'),
+      ),
+    ).toBe(true);
+  });
+
+  // Modal stays open — onHide should NOT have been called
+  expect(onHide).not.toHaveBeenCalled();
+  expect(screen.getByText('Schedule a new email report')).toBeInTheDocument();
+
+  fetchMock.removeRoute('post-fail');
 });
diff --git a/superset-frontend/src/features/reports/ReportModal/actions.test.ts b/superset-frontend/src/features/reports/ReportModal/actions.test.ts
new file mode 100644
index 00000000000..4c3d2f87888
--- /dev/null
+++ b/superset-frontend/src/features/reports/ReportModal/actions.test.ts
@@ -0,0 +1,178 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+import fetchMock from 'fetch-mock';
+import {
+  addReport,
+  editReport,
+  deleteActiveReport,
+  fetchUISpecificReport,
+  ADD_REPORT,
+  EDIT_REPORT,
+  DELETE_REPORT,
+  SET_REPORT,
+} from './actions';
+
+const REPORT_ENDPOINT = 'glob:*/api/v1/report/*';
+const REPORT_POST_ENDPOINT = 'glob:*/api/v1/report/';
+
+afterEach(() => {
+  fetchMock.clearHistory().removeRoutes();
+});
+
+test('addReport dispatches ADD_REPORT and success toast on success', async () => {
+  const jsonResponse = { id: 1, result: { name: 'New Report' } };
+  fetchMock.post(REPORT_POST_ENDPOINT, jsonResponse);
+  const dispatch = jest.fn();
+
+  await addReport({ name: 'New Report' })(dispatch);
+
+  const types = dispatch.mock.calls.map(([action]: any) => action.type);
+  expect(types).toContain(ADD_REPORT);
+  expect(types).toContain('ADD_TOAST');
+  const toastAction = dispatch.mock.calls.find(
+    ([a]: any) => a.type === 'ADD_TOAST',
+  )?.[0];
+  expect(toastAction.payload.toastType).toBe('SUCCESS_TOAST');
+});
+
+test('addReport dispatches danger toast on failure and rejects', async () => {
+  fetchMock.post(REPORT_POST_ENDPOINT, 500);
+  const dispatch = jest.fn();
+
+  await expect(
+    addReport({ name: 'Bad Report' })(dispatch),
+  ).rejects.toBeDefined();
+
+  const types = dispatch.mock.calls.map(([action]: any) => action.type);
+  expect(types).not.toContain(ADD_REPORT);
+  expect(types).toContain('ADD_TOAST');
+  const toastAction = dispatch.mock.calls.find(
+    ([a]: any) => a.type === 'ADD_TOAST',
+  )?.[0];
+  expect(toastAction.payload.toastType).toBe('DANGER_TOAST');
+});
+
+test('editReport dispatches EDIT_REPORT and success toast on success', async () => {
+  const jsonResponse = { id: 5, result: { name: 'Updated Report' } };
+  fetchMock.put(REPORT_ENDPOINT, jsonResponse);
+  const dispatch = jest.fn();
+
+  await editReport(5, { name: 'Updated Report' })(dispatch);
+
+  const types = dispatch.mock.calls.map(([action]: any) => action.type);
+  expect(types).toContain(EDIT_REPORT);
+  expect(types).toContain('ADD_TOAST');
+  const toastAction = dispatch.mock.calls.find(
+    ([a]: any) => a.type === 'ADD_TOAST',
+  )?.[0];
+  expect(toastAction.payload.toastType).toBe('SUCCESS_TOAST');
+});
+
+test('editReport dispatches danger toast on failure and rejects', async () => {
+  fetchMock.put(REPORT_ENDPOINT, 500);
+  const dispatch = jest.fn();
+
+  await expect(
+    editReport(5, { name: 'Bad Update' })(dispatch),
+  ).rejects.toBeDefined();
+
+  const types = dispatch.mock.calls.map(([action]: any) => action.type);
+  expect(types).not.toContain(EDIT_REPORT);
+  const toastAction = dispatch.mock.calls.find(
+    ([a]: any) => a.type === 'ADD_TOAST',
+  )?.[0];
+  expect(toastAction.payload.toastType).toBe('DANGER_TOAST');
+});
+
+test('deleteActiveReport dispatches DELETE_REPORT and success toast on success', async () => {
+  fetchMock.delete(REPORT_ENDPOINT, {});
+  const dispatch = jest.fn();
+  const report = {
+    id: 10,
+    name: 'To Delete',
+    creation_method: 'dashboards',
+    dashboard: 1,
+  };
+
+  await deleteActiveReport(report)(dispatch);
+
+  const types = dispatch.mock.calls.map(([action]: any) => action.type);
+  expect(types).toContain(DELETE_REPORT);
+  expect(types).toContain('ADD_TOAST');
+  const toastAction = dispatch.mock.calls.find(
+    ([a]: any) => a.type === 'ADD_TOAST',
+  )?.[0];
+  expect(toastAction.payload.toastType).toBe('SUCCESS_TOAST');
+});
+
+test('deleteActiveReport dispatches danger toast on failure', async () => {
+  fetchMock.delete(REPORT_ENDPOINT, 500);
+  const dispatch = jest.fn();
+  const report = { id: 10, name: 'To Delete' };
+
+  await deleteActiveReport(report)(dispatch);
+
+  const types = dispatch.mock.calls.map(([action]: any) => action.type);
+  expect(types).not.toContain(DELETE_REPORT);
+  const toastAction = dispatch.mock.calls.find(
+    ([a]: any) => a.type === 'ADD_TOAST',
+  )?.[0];
+  expect(toastAction.payload.toastType).toBe('DANGER_TOAST');
+});
+
+test('fetchUISpecificReport dispatches SET_REPORT on success', async () => {
+  const jsonResponse = { result: [{ id: 1, name: 'Dashboard Report' }] };
+  fetchMock.get('glob:*/api/v1/report/?q=*', jsonResponse);
+  const dispatch = jest.fn();
+
+  await fetchUISpecificReport({
+    userId: 1,
+    filterField: 'dashboard_id',
+    creationMethod: 'dashboards',
+    resourceId: 42,
+  })(dispatch);
+
+  const setAction = dispatch.mock.calls.find(
+    ([a]: any) => a.type === SET_REPORT,
+  )?.[0];
+  expect(setAction).toBeDefined();
+  expect(setAction.resourceId).toBe(42);
+  expect(setAction.creationMethod).toBe('dashboards');
+  expect(setAction.filterField).toBe('dashboard_id');
+});
+
+test('fetchUISpecificReport dispatches danger toast on failure', async () => {
+  fetchMock.get('glob:*/api/v1/report/?q=*', 500);
+  const dispatch = jest.fn();
+
+  await fetchUISpecificReport({
+    userId: 1,
+    filterField: 'chart_id',
+    creationMethod: 'charts',
+    resourceId: 10,
+  })(dispatch);
+
+  const types = dispatch.mock.calls.map(([action]: any) => action.type);
+  expect(types).not.toContain(SET_REPORT);
+  expect(types).toContain('ADD_TOAST');
+  const toastAction = dispatch.mock.calls.find(
+    ([a]: any) => a.type === 'ADD_TOAST',
+  )?.[0];
+  expect(toastAction.payload.toastType).toBe('DANGER_TOAST');
+});
diff --git a/superset-frontend/src/features/reports/ReportModal/actions.ts b/superset-frontend/src/features/reports/ReportModal/actions.ts
index db28f9360ec..6ae2c3e6ee3 100644
--- a/superset-frontend/src/features/reports/ReportModal/actions.ts
+++ b/superset-frontend/src/features/reports/ReportModal/actions.ts
@@ -169,8 +169,9 @@ export const addReport =
         dispatch({ type: ADD_REPORT, json } as AddReportAction);
         dispatch(addSuccessToast(t('The report has been created')));
       })
-      .catch(() => {
+      .catch(err => {
         dispatch(addDangerToast(t('Failed to create report')));
+        throw err;
       });
 
 export const EDIT_REPORT = 'EDIT_REPORT' as const;
@@ -191,8 +192,9 @@ export const editReport =
         dispatch({ type: EDIT_REPORT, json } as EditReportAction);
         dispatch(addSuccessToast(t('Report updated')));
       })
-      .catch(() => {
+      .catch(err => {
         dispatch(addDangerToast(t('Failed to update report')));
+        throw err;
       });
 
 export function toggleActive(report: ReportObject, isActive: boolean) {
diff --git a/superset-frontend/src/features/reports/ReportModal/reducer.test.ts b/superset-frontend/src/features/reports/ReportModal/reducer.test.ts
new file mode 100644
index 00000000000..51f39302c89
--- /dev/null
+++ b/superset-frontend/src/features/reports/ReportModal/reducer.test.ts
@@ -0,0 +1,214 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+import reportsReducer, { ReportsState } from './reducer';
+import {
+  SET_REPORT,
+  ADD_REPORT,
+  EDIT_REPORT,
+  DELETE_REPORT,
+  SetReportAction,
+  AddReportAction,
+  EditReportAction,
+  DeleteReportAction,
+} from './actions';
+import { ReportObject } from 'src/features/reports/types';
+
+const makeReport = (overrides: Partial<ReportObject> = {}): ReportObject => ({
+  active: true,
+  crontab: '0 12 * * 1',
+  name: 'Test Report',
+  owners: [1],
+  recipients: [
+    {
+      recipient_config_json: { target: 'a@b.com', ccTarget: '', bccTarget: '' },
+      type: 'Email',
+    },
+  ],
+  report_format: 'PNG',
+  timezone: 'UTC',
+  type: 'Report',
+  validator_config_json: null,
+  validator_type: '',
+  working_timeout: 3600,
+  log_retention: 90,
+  creation_method: 'dashboards',
+  force_screenshot: false,
+  ...overrides,
+});
+
+test('SET_REPORT stores report keyed by resourceId under creationMethod', () => {
+  const report = makeReport({ id: 5, dashboard: 10 });
+  const action: SetReportAction = {
+    type: SET_REPORT,
+    report: { result: [report] },
+    resourceId: 10,
+    creationMethod: 'dashboards',
+    filterField: 'dashboard_id',
+  };
+
+  const result = reportsReducer({}, action);
+
+  expect(result.dashboards?.[10]).toEqual(report);
+});
+
+test('SET_REPORT removes entry when API returns empty result', () => {
+  const initial: ReportsState = {
+    dashboards: { 10: makeReport({ id: 5, dashboard: 10 }) },
+  };
+  const action: SetReportAction = {
+    type: SET_REPORT,
+    report: { result: [] },
+    resourceId: 10,
+    creationMethod: 'dashboards',
+    filterField: 'dashboard_id',
+  };
+
+  const result = reportsReducer(initial, action);
+
+  expect(result.dashboards?.[10]).toBeUndefined();
+});
+
+test('SET_REPORT uses chart property when filterField is chart_id', () => {
+  const report = makeReport({
+    id: 7,
+    chart: 42,
+    creation_method: 'charts',
+  });
+  const action: SetReportAction = {
+    type: SET_REPORT,
+    report: { result: [report] },
+    resourceId: 42,
+    creationMethod: 'charts',
+    filterField: 'chart_id',
+  };
+
+  const result = reportsReducer({}, action);
+
+  expect(result.charts?.[42]).toEqual(report);
+});
+
+test('ADD_REPORT keys dashboard report by dashboard id', () => {
+  const action: AddReportAction = {
+    type: ADD_REPORT,
+    json: {
+      id: 1,
+      result: { dashboard: 10, creation_method: 'dashboards' },
+    },
+  };
+
+  const result = reportsReducer({}, action);
+
+  expect(result.dashboards?.[10]).toMatchObject({ id: 1, dashboard: 10 });
+});
+
+test('ADD_REPORT keys alerts_reports report by report id', () => {
+  const action: AddReportAction = {
+    type: ADD_REPORT,
+    json: {
+      id: 99,
+      result: { creation_method: 'alerts_reports' },
+    },
+  };
+
+  const result = reportsReducer({}, action);
+
+  expect(result.alerts_reports?.[99]).toMatchObject({ id: 99 });
+});
+
+test('ADD_REPORT returns unchanged state when key is undefined', () => {
+  const initial: ReportsState = { dashboards: {} };
+  const action: AddReportAction = {
+    type: ADD_REPORT,
+    json: {
+      id: 1,
+      result: { creation_method: 'dashboards' },
+      // no dashboard or chart field → key is undefined
+    },
+  };
+
+  const result = reportsReducer(initial, action);
+
+  expect(result).toBe(initial);
+});
+
+test('EDIT_REPORT replaces existing report at same key', () => {
+  const initial: ReportsState = {
+    dashboards: {
+      10: makeReport({ id: 1, dashboard: 10, name: 'Old Name' }),
+    },
+  };
+  const action: EditReportAction = {
+    type: EDIT_REPORT,
+    json: {
+      id: 1,
+      result: {
+        dashboard: 10,
+        creation_method: 'dashboards',
+        name: 'New Name',
+      },
+    },
+  };
+
+  const result = reportsReducer(initial, action);
+
+  expect(result.dashboards?.[10]?.name).toBe('New Name');
+});
+
+test('DELETE_REPORT removes report from state', () => {
+  const report = makeReport({
+    id: 5,
+    dashboard: 10,
+    creation_method: 'dashboards',
+  });
+  const initial: ReportsState = { dashboards: { 10: report } };
+  const action: DeleteReportAction = {
+    type: DELETE_REPORT,
+    report: {
+      id: 5,
+      dashboard: 10,
+      creation_method: 'dashboards',
+    },
+  };
+
+  const result = reportsReducer(initial, action);
+
+  expect(result.dashboards?.[10]).toBeUndefined();
+});
+
+test('DELETE_REPORT for alerts_reports keys by report id', () => {
+  const report = makeReport({ id: 99, creation_method: 'alerts_reports' });
+  const initial: ReportsState = { alerts_reports: { 99: report } };
+  const action: DeleteReportAction = {
+    type: DELETE_REPORT,
+    report: { id: 99, creation_method: 'alerts_reports' },
+  };
+
+  const result = reportsReducer(initial, action);
+
+  expect(result.alerts_reports?.[99]).toBeUndefined();
+});
+
+test('unknown action type returns state unchanged', () => {
+  const initial: ReportsState = { dashboards: { 1: makeReport({ id: 1 }) } };
+  const action = { type: 'UNKNOWN_ACTION' } as any;
+
+  const result = reportsReducer(initial, action);
+
+  expect(result).toBe(initial);
+});
diff --git a/superset-frontend/src/features/tags/BulkTagModal.tsx b/superset-frontend/src/features/tags/BulkTagModal.tsx
index 76ce8730cf9..46adac21021 100644
--- a/superset-frontend/src/features/tags/BulkTagModal.tsx
+++ b/superset-frontend/src/features/tags/BulkTagModal.tsx
@@ -125,7 +125,7 @@ const BulkTagModal: FC<BulkTagModalProps> = ({
         <div className="bulk-tag-text">
           {t('You are adding tags to %s %ss', selected.length, resourceName)}
         </div>
-        <FormLabel>{t('tags')}</FormLabel>
+        <FormLabel>{t('Tags')}</FormLabel>
         <AsyncSelect
           ariaLabel="tags"
           // @ts-expect-error
@@ -134,6 +134,7 @@ const BulkTagModal: FC<BulkTagModalProps> = ({
           onHide={onHide}
           // @ts-expect-error
           onChange={tags => setTags(tags)}
+          getPopupContainer={() => document.body}
           placeholder={t('Select Tags')}
           mode="multiple"
         />
diff --git a/superset-frontend/src/features/tags/TagModal.tsx b/superset-frontend/src/features/tags/TagModal.tsx
index 53b059a4425..20736d4610c 100644
--- a/superset-frontend/src/features/tags/TagModal.tsx
+++ b/superset-frontend/src/features/tags/TagModal.tsx
@@ -332,6 +332,7 @@ const TagModal: FC<TagModalProps> = ({
           onChange={value =>
             handleOptionChange(TaggableResources.Dashboard, value)
           }
+          getPopupContainer={() => document.body}
           header={<FormLabel>{t('Dashboards')}</FormLabel>}
           allowClear
         />
@@ -344,6 +345,7 @@ const TagModal: FC<TagModalProps> = ({
           value={chartsToTag}
           options={loadCharts}
           onChange={value => handleOptionChange(TaggableResources.Chart, value)}
+          getPopupContainer={() => document.body}
           header={<FormLabel>{t('Charts')}</FormLabel>}
           allowClear
         />
@@ -358,6 +360,7 @@ const TagModal: FC<TagModalProps> = ({
           onChange={value =>
             handleOptionChange(TaggableResources.SavedQuery, value)
           }
+          getPopupContainer={() => document.body}
           header={<FormLabel>{t('Saved queries')}</FormLabel>}
           allowClear
         />
diff --git a/superset-frontend/src/features/themes/ThemeModal.test.tsx b/superset-frontend/src/features/themes/ThemeModal.test.tsx
index 4994863b074..2b4c29efc4f 100644
--- a/superset-frontend/src/features/themes/ThemeModal.test.tsx
+++ b/superset-frontend/src/features/themes/ThemeModal.test.tsx
@@ -712,6 +712,138 @@ test('applies theme locally when clicking Apply button', async () => {
   expect(mockThemeContext.setTemporaryTheme).toHaveBeenCalled();
 });
 
+test('shows Format button when modal is in edit mode', () => {
+  render(
+    <ThemeModal
+      addDangerToast={jest.fn()}
+      addSuccessToast={jest.fn()}
+      onThemeAdd={jest.fn()}
+      onHide={jest.fn()}
+      show
+      canDevelop={false}
+    />,
+    { useRedux: true, useRouter: true },
+  );
+
+  expect(screen.getByRole('button', { name: /format/i })).toBeInTheDocument();
+});
+
+test('does not show Format button for read-only system themes', async () => {
+  render(
+    <ThemeModal
+      addDangerToast={jest.fn()}
+      addSuccessToast={jest.fn()}
+      onThemeAdd={jest.fn()}
+      onHide={jest.fn()}
+      show
+      canDevelop={false}
+      theme={mockSystemTheme}
+    />,
+    { useRedux: true, useRouter: true },
+  );
+
+  await screen.findByText('System Theme - Read Only');
+
+  expect(
+    screen.queryByRole('button', { name: /format/i }),
+  ).not.toBeInTheDocument();
+});
+
+test('disables Format button when JSON is invalid', async () => {
+  render(
+    <ThemeModal
+      addDangerToast={jest.fn()}
+      addSuccessToast={jest.fn()}
+      onThemeAdd={jest.fn()}
+      onHide={jest.fn()}
+      show
+      canDevelop={false}
+    />,
+    { useRedux: true, useRouter: true },
+  );
+
+  const jsonEditor = screen.getByTestId('json-editor');
+  userEvent.clear(jsonEditor);
+  userEvent.type(jsonEditor, '{invalid json');
+
+  await waitFor(() => {
+    expect(screen.getByRole('button', { name: /format/i })).toBeDisabled();
+  });
+});
+
+test('enables Format button when JSON is valid', async () => {
+  render(
+    <ThemeModal
+      addDangerToast={jest.fn()}
+      addSuccessToast={jest.fn()}
+      onThemeAdd={jest.fn()}
+      onHide={jest.fn()}
+      show
+      canDevelop={false}
+    />,
+    { useRedux: true, useRouter: true },
+  );
+
+  await addValidJsonData();
+
+  await waitFor(() => {
+    expect(screen.getByRole('button', { name: /format/i })).toBeEnabled();
+  });
+});
+
+test('Format button pretty-prints minified JSON', async () => {
+  render(
+    <ThemeModal
+      addDangerToast={jest.fn()}
+      addSuccessToast={jest.fn()}
+      onThemeAdd={jest.fn()}
+      onHide={jest.fn()}
+      show
+      canDevelop={false}
+    />,
+    { useRedux: true, useRouter: true },
+  );
+
+  const minifiedJson = '{"token":{"colorPrimary":"#1890ff"}}';
+  const jsonEditor = screen.getByTestId('json-editor');
+  userEvent.clear(jsonEditor);
+  userEvent.type(jsonEditor, minifiedJson);
+
+  const formatButton = screen.getByRole('button', { name: /format/i });
+  userEvent.click(formatButton);
+
+  const expectedFormatted = JSON.stringify(
+    { token: { colorPrimary: '#1890ff' } },
+    null,
+    2,
+  );
+  await waitFor(() => {
+    expect(jsonEditor).toHaveValue(expectedFormatted);
+  });
+});
+
+test('Format button is disabled when JSON editor is empty', async () => {
+  render(
+    <ThemeModal
+      addDangerToast={jest.fn()}
+      addSuccessToast={jest.fn()}
+      onThemeAdd={jest.fn()}
+      onHide={jest.fn()}
+      show
+      canDevelop={false}
+    />,
+    { useRedux: true, useRouter: true },
+  );
+
+  // The editor initializes with `{}` — clear it to reach the empty state
+  const jsonEditor = screen.getByTestId('json-editor');
+  userEvent.clear(jsonEditor);
+
+  await waitFor(() => {
+    expect(screen.getByRole('button', { name: /format/i })).toBeDisabled();
+  });
+});
+
 test('disables Apply button when JSON configuration is invalid', async () => {
   fetchMock.clearHistory().removeRoutes();
   fetchMock.get('glob:*/api/v1/theme/*', {
diff --git a/superset-frontend/src/features/themes/ThemeModal.tsx b/superset-frontend/src/features/themes/ThemeModal.tsx
index 59d843d1d90..db7692443bb 100644
--- a/superset-frontend/src/features/themes/ThemeModal.tsx
+++ b/superset-frontend/src/features/themes/ThemeModal.tsx
@@ -71,6 +71,15 @@ const toEditorAnnotations = (
     message: ann.text,
   }));
 
+const formatJsonData = (jsonData?: string): string | undefined => {
+  if (!jsonData) return jsonData;
+  try {
+    return JSON.stringify(JSON.parse(jsonData), null, 2);
+  } catch {
+    return jsonData;
+  }
+};
+
 interface ThemeModalProps {
   addDangerToast: (msg: string) => void;
   addSuccessToast?: (msg: string) => void;
@@ -316,6 +325,15 @@ const ThemeModal: FunctionComponent<ThemeModalProps> = ({
     [currentTheme],
   );
 
+  const onFormat = useCallback(() => {
+    if (currentTheme?.json_data) {
+      const formatted = formatJsonData(currentTheme.json_data);
+      if (formatted !== currentTheme.json_data) {
+        onJsonDataChange(formatted || '');
+      }
+    }
+  }, [currentTheme?.json_data, onJsonDataChange]);
+
   const validate = () => {
     if (isReadOnly || !currentTheme) {
       setDisableSave(true);
@@ -357,8 +375,12 @@ const ThemeModal: FunctionComponent<ThemeModalProps> = ({
 
   useEffect(() => {
     if (resource) {
-      setCurrentTheme(resource);
-      setInitialTheme(resource);
+      const formatted = {
+        ...resource,
+        json_data: formatJsonData(resource.json_data),
+      };
+      setCurrentTheme(formatted);
+      setInitialTheme(formatted);
     }
   }, [resource]);
 
@@ -522,27 +544,47 @@ const ThemeModal: FunctionComponent<ThemeModalProps> = ({
                 annotations={toEditorAnnotations(validation.annotations)}
               />
             </StyledEditorWrapper>
-            {canDevelopThemes && (
-              <div className="apply-button-container">
-                <Tooltip
-                  title={t('Set local theme for testing (preview only)')}
-                  placement="top"
-                >
-                  <Button
-                    icon={<Icons.ThunderboltOutlined />}
-                    onClick={onApply}
-                    disabled={
-                      !currentTheme?.json_data ||
-                      !isValidJson(currentTheme.json_data) ||
-                      validation.hasErrors
-                    }
-                    buttonStyle="secondary"
+            <div className="apply-button-container">
+              <Space>
+                {!isReadOnly && (
+                  <Tooltip
+                    title={t('Format JSON configuration')}
+                    placement="top"
                   >
-                    {t('Apply')}
-                  </Button>
-                </Tooltip>
-              </div>
-            )}
+                    <Button
+                      icon={<Icons.AlignLeftOutlined />}
+                      buttonStyle="secondary"
+                      onClick={onFormat}
+                      disabled={
+                        !currentTheme?.json_data ||
+                        !isValidJson(currentTheme.json_data)
+                      }
+                    >
+                      {t('Format')}
+                    </Button>
+                  </Tooltip>
+                )}
+                {canDevelopThemes && (
+                  <Tooltip
+                    title={t('Set local theme for testing (preview only)')}
+                    placement="top"
+                  >
+                    <Button
+                      icon={<Icons.ThunderboltOutlined />}
+                      onClick={onApply}
+                      disabled={
+                        !currentTheme?.json_data ||
+                        !isValidJson(currentTheme.json_data) ||
+                        validation.hasErrors
+                      }
+                      buttonStyle="secondary"
+                    >
+                      {t('Apply')}
+                    </Button>
+                  </Tooltip>
+                )}
+              </Space>
+            </div>
           </Form.Item>
         </Form>
       </StyledFormWrapper>
diff --git a/superset-frontend/src/filters/components/Select/SelectFilterPlugin.tsx b/superset-frontend/src/filters/components/Select/SelectFilterPlugin.tsx
index c282b893c35..1ebe8fad437 100644
--- a/superset-frontend/src/filters/components/Select/SelectFilterPlugin.tsx
+++ b/superset-frontend/src/filters/components/Select/SelectFilterPlugin.tsx
@@ -590,6 +590,7 @@ export default function PluginFilterSelect(props: PluginFilterSelectProps) {
             <Select
               name={formData.nativeFilterId}
               allowClear
+              autoClearSearchValue
               allowNewOptions={!searchAllOptions && creatable !== false}
               allowSelectAll={!searchAllOptions}
               value={multiSelect ? filterState.value || [] : filterState.value}
diff --git a/superset-frontend/src/filters/components/TimeGrain/TimeGrainFilterPlugin.test.tsx b/superset-frontend/src/filters/components/TimeGrain/TimeGrainFilterPlugin.test.tsx
new file mode 100644
index 00000000000..d2a2c3bd7fa
--- /dev/null
+++ b/superset-frontend/src/filters/components/TimeGrain/TimeGrainFilterPlugin.test.tsx
@@ -0,0 +1,145 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+import { screen } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import { render } from 'spec/helpers/testing-library';
+import PluginFilterTimegrain from './TimeGrainFilterPlugin';
+import { PluginFilterTimeGrainProps } from './types';
+
+const mockSetDataMask = jest.fn();
+const mockSetFilterActive = jest.fn();
+const mockSetHoveredFilter = jest.fn();
+const mockUnsetHoveredFilter = jest.fn();
+const mockSetFocusedFilter = jest.fn();
+const mockUnsetFocusedFilter = jest.fn();
+
+const defaultProps: PluginFilterTimeGrainProps = {
+  data: [
+    { duration: 'P1D', name: 'Day' },
+    { duration: 'P1W', name: 'Week' },
+    { duration: 'P1M', name: 'Month' },
+    { duration: 'P1Y', name: 'Year' },
+  ],
+  formData: {
+    datasource: '3__table',
+    viz_type: 'filter_timegrain',
+    groupby: [],
+    adhoc_filters: [],
+    extra_filters: [],
+    extra_form_data: {},
+    granularity_sqla: 'ds',
+    time_range_endpoints: ['inclusive', 'exclusive'],
+    url_params: {},
+    height: 300,
+    width: 300,
+    nativeFilterId: 'filter-1',
+    defaultValue: null,
+    inputRef: { current: null },
+  },
+  filterState: {
+    value: null,
+    validateStatus: undefined,
+    validateMessage: undefined,
+  },
+  height: 300,
+  width: 300,
+  setDataMask: mockSetDataMask,
+  setFilterActive: mockSetFilterActive,
+  setHoveredFilter: mockSetHoveredFilter,
+  unsetHoveredFilter: mockUnsetHoveredFilter,
+  setFocusedFilter: mockSetFocusedFilter,
+  unsetFocusedFilter: mockUnsetFocusedFilter,
+  inputRef: { current: null },
+};
+
+test('renders all options when time_grains is not set', async () => {
+  render(<PluginFilterTimegrain {...defaultProps} />);
+
+  // Verify the select component is rendered
+  const select = screen.getByRole('combobox');
+  expect(select).toBeInTheDocument();
+
+  // Open the dropdown and verify all options are available
+  await userEvent.click(select);
+  const options = await screen.findAllByRole('option');
+  expect(options.length).toBe(4);
+  expect(options[0]).toHaveTextContent('Day');
+  expect(options[1]).toHaveTextContent('Week');
+  expect(options[2]).toHaveTextContent('Month');
+  expect(options[3]).toHaveTextContent('Year');
+});
+
+test('filters options based on time_grains allowlist', async () => {
+  const propsWithAllowlist = {
+    ...defaultProps,
+    formData: {
+      ...defaultProps.formData,
+      time_grains: ['P1D', 'P1W'],
+    },
+  };
+
+  render(<PluginFilterTimegrain {...propsWithAllowlist} />);
+
+  const select = screen.getByRole('combobox');
+  await userEvent.click(select);
+
+  // Only Day and Week should be available
+  const options = await screen.findAllByRole('option');
+  expect(options.length).toBe(2);
+  expect(options[0]).toHaveTextContent('Day');
+  expect(options[1]).toHaveTextContent('Week');
+});
+
+test('shows all options when time_grains is empty array', async () => {
+  const propsWithEmptyAllowlist = {
+    ...defaultProps,
+    formData: {
+      ...defaultProps.formData,
+      time_grains: [],
+    },
+  };
+
+  render(<PluginFilterTimegrain {...propsWithEmptyAllowlist} />);
+
+  const select = screen.getByRole('combobox');
+  await userEvent.click(select);
+
+  // All 4 options should be available
+  const options = await screen.findAllByRole('option');
+  expect(options.length).toBe(4);
+});
+
+test('shows all options when time_grains is undefined', async () => {
+  const propsWithUndefined = {
+    ...defaultProps,
+    formData: {
+      ...defaultProps.formData,
+      time_grains: undefined,
+    },
+  };
+
+  render(<PluginFilterTimegrain {...propsWithUndefined} />);
+
+  const select = screen.getByRole('combobox');
+  await userEvent.click(select);
+
+  // All 4 options should be available
+  const options = await screen.findAllByRole('option');
+  expect(options.length).toBe(4);
+});
diff --git a/superset-frontend/src/filters/components/TimeGrain/TimeGrainFilterPlugin.tsx b/superset-frontend/src/filters/components/TimeGrain/TimeGrainFilterPlugin.tsx
index 4b011a2e170..1f0dfce91e6 100644
--- a/superset-frontend/src/filters/components/TimeGrain/TimeGrainFilterPlugin.tsx
+++ b/superset-frontend/src/filters/components/TimeGrain/TimeGrainFilterPlugin.tsx
@@ -107,15 +107,22 @@ export default function PluginFilterTimegrain(
     );
   }
 
-  const options = (data || []).map(
-    (row: { name: string; duration: string }) => {
+  const options = (data || [])
+    .map((row: { name: string; duration: string }) => {
       const { name, duration } = row;
       return {
         label: name,
         value: duration,
       };
-    },
-  );
+    })
+    // Apply allowlist filter if time_grains is configured, but keep current selection visible
+    .filter(option => {
+      const allowlist = formData.time_grains;
+      if (!allowlist || allowlist.length === 0) {
+        return true;
+      }
+      return allowlist.includes(option.value) || value.includes(option.value);
+    });
 
   return (
     <FilterPluginStyle height={height} width={width}>
diff --git a/superset-frontend/src/filters/components/TimeGrain/TimeGrainPreFilter.integration.test.tsx b/superset-frontend/src/filters/components/TimeGrain/TimeGrainPreFilter.integration.test.tsx
new file mode 100644
index 00000000000..501eafe596f
--- /dev/null
+++ b/superset-frontend/src/filters/components/TimeGrain/TimeGrainPreFilter.integration.test.tsx
@@ -0,0 +1,165 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+/**
+ * Integration Test: Time Grain Pre-filter Feature (End-to-End)
+ *
+ * Tests the full flow:
+ * 1. Dashboard config: User enables pre-filter and selects allowed time grains
+ * 2. Dashboard persistence: Config is saved with time_grains array
+ * 3. Runtime filter: Dashboard displays only the pre-filtered time grains
+ *
+ * Note: This documents the expected behavior. Full E2E testing requires
+ * Playwright/browser tests since it involves dashboard state + filter interactions.
+ */
+
+import {
+  render,
+  screen,
+  userEvent,
+  waitFor,
+} from 'spec/helpers/testing-library';
+import PluginFilterTimegrain from 'src/filters/components/TimeGrain/TimeGrainFilterPlugin';
+
+/**
+ * Scenario: Dashboard owner configures a time grain filter to show only Hour, Day, Week.
+ * End-user opens the dashboard and can only select from those three options.
+ */
+test('time grain pre-filter restricts dashboard filter options', async () => {
+  // Step 1: Simulate saved dashboard config
+  // (User previously set pre-filter to ['PT1H', 'P1D', 'P1W'])
+  const setDataMask = jest.fn();
+  const dashboardConfig = {
+    data: [
+      { duration: 'PT1M', name: 'Minute' },
+      { duration: 'PT1H', name: 'Hour' },
+      { duration: 'P1D', name: 'Day' },
+      { duration: 'P1W', name: 'Week' },
+      { duration: 'P1M', name: 'Month' },
+    ],
+    formData: {
+      nativeFilterId: 'time_grain_1',
+      defaultValue: null,
+      viz_type: 'filter_timegrain',
+      // This is what was saved by the config form:
+      time_grains: ['PT1H', 'P1D', 'P1W'],
+    },
+    filterState: {
+      value: null,
+      validateStatus: undefined,
+      validateMessage: undefined,
+    },
+    height: 100,
+    width: 300,
+    setDataMask,
+    setFilterActive: jest.fn(),
+    setHoveredFilter: jest.fn(),
+    unsetHoveredFilter: jest.fn(),
+    setFocusedFilter: jest.fn(),
+    unsetFocusedFilter: jest.fn(),
+    inputRef: { current: null },
+  };
+
+  // Step 2: Render the dashboard filter
+  render(<PluginFilterTimegrain {...(dashboardConfig as any)} />);
+
+  // Ignore initialization updates and validate the explicit user-selection payload.
+  setDataMask.mockClear();
+
+  // Step 3: Verify only pre-filtered options appear
+  const select = screen.getByRole('combobox');
+  await userEvent.click(select);
+
+  await waitFor(() => {
+    const options = screen.getAllByRole('option');
+    const labels = options.map(o => o.textContent);
+
+    // Should only show Hour, Day, Week (in database order)
+    expect(labels).toEqual(['Hour', 'Day', 'Week']);
+
+    // Should NOT show Minute or Month
+    expect(labels).not.toContain('Minute');
+    expect(labels).not.toContain('Month');
+  });
+
+  // Step 4: Selecting one allowed option should update runtime payload
+  await userEvent.click(screen.getByText('Day'));
+
+  await waitFor(() => {
+    expect(setDataMask).toHaveBeenCalledWith({
+      extraFormData: {
+        time_grain_sqla: 'P1D',
+      },
+      filterState: {
+        label: 'Day',
+        value: ['P1D'],
+      },
+    });
+  });
+});
+
+/**
+ * Scenario: Dashboard owner disables pre-filter (unchecks the CollapsibleControl).
+ * No restrictions: all time grains appear in the runtime filter.
+ */
+test('all time grains appear when pre-filter is unchecked', async () => {
+  const dashboardConfig = {
+    data: [
+      { duration: 'PT1M', name: 'Minute' },
+      { duration: 'PT1H', name: 'Hour' },
+      { duration: 'P1D', name: 'Day' },
+      { duration: 'P1W', name: 'Week' },
+      { duration: 'P1M', name: 'Month' },
+    ],
+    formData: {
+      nativeFilterId: 'time_grain_1',
+      defaultValue: null,
+      viz_type: 'filter_timegrain',
+      // Pre-filter not set (checkbox unchecked in config)
+      time_grains: undefined,
+    },
+    filterState: {
+      value: null,
+      validateStatus: undefined,
+      validateMessage: undefined,
+    },
+    height: 100,
+    width: 300,
+    setDataMask: jest.fn(),
+    setFilterActive: jest.fn(),
+    setHoveredFilter: jest.fn(),
+    unsetHoveredFilter: jest.fn(),
+    setFocusedFilter: jest.fn(),
+    unsetFocusedFilter: jest.fn(),
+    inputRef: { current: null },
+  };
+
+  render(<PluginFilterTimegrain {...(dashboardConfig as any)} />);
+
+  const select = screen.getByRole('combobox');
+  await userEvent.click(select);
+
+  await waitFor(() => {
+    const options = screen.getAllByRole('option');
+    const labels = options.map(o => o.textContent);
+
+    // All 5 options should be available
+    expect(labels).toEqual(['Minute', 'Hour', 'Day', 'Week', 'Month']);
+  });
+});
diff --git a/superset-frontend/src/filters/components/TimeGrain/TimeGrainsTransformer.integration.test.ts b/superset-frontend/src/filters/components/TimeGrain/TimeGrainsTransformer.integration.test.ts
new file mode 100644
index 00000000000..704bc58a11e
--- /dev/null
+++ b/superset-frontend/src/filters/components/TimeGrain/TimeGrainsTransformer.integration.test.ts
@@ -0,0 +1,116 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { NativeFilterType } from '@superset-ui/core';
+import { getInitialDataMask } from 'src/dataMask/reducer';
+import type { NativeFiltersFormItem } from 'src/dashboard/components/nativeFilters/FiltersConfigModal/types';
+import { transformFilterForSave } from 'src/dashboard/components/nativeFilters/FiltersConfigModal/transformers';
+
+const createTimeGrainFormInput = (
+  timeGrains?: string[],
+): NativeFiltersFormItem => ({
+  type: NativeFilterType.NativeFilter,
+  scope: {
+    rootPath: ['ROOT_ID'],
+    excluded: [],
+  },
+  name: 'Time Grain',
+  filterType: 'filter_timegrain',
+  dataset: {
+    value: 10,
+    label: 'main.dataset',
+  },
+  column: 'dttm',
+  controlValues: {},
+  requiredFirst: {},
+  defaultValue: null,
+  defaultDataMask: getInitialDataMask(),
+  sortMetric: null,
+  time_grains: timeGrains,
+  description: '',
+});
+
+test('transformFilterForSave persists time_grains when a subset is selected', () => {
+  const transformed = transformFilterForSave(
+    'NATIVE_FILTER-subset',
+    createTimeGrainFormInput(['PT1H', 'P1D', 'P1W']),
+  );
+
+  expect(transformed).toBeDefined();
+  expect(transformed && 'time_grains' in transformed).toBe(true);
+  expect(transformed && transformed.type).toBe(NativeFilterType.NativeFilter);
+  expect(
+    transformed && 'time_grains' in transformed
+      ? transformed.time_grains
+      : undefined,
+  ).toEqual(['PT1H', 'P1D', 'P1W']);
+});
+
+test('transformFilterForSave omits time_grains from API payload when all are selected', () => {
+  const transformed = transformFilterForSave(
+    'NATIVE_FILTER-all',
+    createTimeGrainFormInput(undefined),
+  );
+
+  expect(transformed).toBeDefined();
+  expect(
+    transformed && 'time_grains' in transformed
+      ? transformed.time_grains
+      : undefined,
+  ).toBeUndefined();
+
+  // API boundary: undefined keys are omitted from JSON payloads.
+  const serialized = JSON.parse(JSON.stringify(transformed));
+  expect(serialized).not.toHaveProperty('time_grains');
+});
+
+test('transformFilterForSave remains backward compatible when time_grains is missing', () => {
+  const formInput = createTimeGrainFormInput();
+  delete (formInput as Partial<NativeFiltersFormItem>).time_grains;
+
+  const transformed = transformFilterForSave('NATIVE_FILTER-legacy', formInput);
+
+  expect(transformed).toBeDefined();
+  expect(
+    transformed && 'time_grains' in transformed
+      ? transformed.time_grains
+      : undefined,
+  ).toBeUndefined();
+
+  const serialized = JSON.parse(JSON.stringify(transformed));
+  expect(serialized).not.toHaveProperty('time_grains');
+});
+
+test('transformFilterForSave omits time_grains when an empty array is provided', () => {
+  const transformed = transformFilterForSave(
+    'NATIVE_FILTER-empty-array',
+    createTimeGrainFormInput([]),
+  );
+
+  expect(transformed).toBeDefined();
+  expect(
+    transformed && 'time_grains' in transformed
+      ? transformed.time_grains
+      : undefined,
+  ).toBeUndefined();
+
+  // API boundary: empty allowlist should behave like unrestricted and be omitted.
+  const serialized = JSON.parse(JSON.stringify(transformed));
+  expect(serialized).not.toHaveProperty('time_grains');
+});
diff --git a/superset-frontend/src/filters/components/TimeGrain/types.ts b/superset-frontend/src/filters/components/TimeGrain/types.ts
index 611566f0d1d..c1db6a57a8d 100644
--- a/superset-frontend/src/filters/components/TimeGrain/types.ts
+++ b/superset-frontend/src/filters/components/TimeGrain/types.ts
@@ -24,6 +24,7 @@ import { PluginFilterHooks, PluginFilterStylesProps } from '../types';
 interface PluginFilterTimeGrainCustomizeProps {
   defaultValue?: string[] | null;
   inputRef?: RefObject<HTMLInputElement>;
+  time_grains?: string[];
 }
 
 export type PluginFilterTimeGrainQueryFormData = QueryFormData &
diff --git a/superset-frontend/src/hooks/usePermissions.ts b/superset-frontend/src/hooks/usePermissions.ts
index 0d961dc249e..cbaa70e5844 100644
--- a/superset-frontend/src/hooks/usePermissions.ts
+++ b/superset-frontend/src/hooks/usePermissions.ts
@@ -34,18 +34,32 @@ export const usePermissions = () => {
   const canCsvLegacy = useSelector((state: RootState) =>
     findPermission('can_csv', 'Superset', state.user?.roles),
   );
-  const canExportData = useSelector((state: RootState) =>
+  const canExportCsvSqlLab = useSelector((state: RootState) =>
+    findPermission('can_export_csv', 'SQLLab', state.user?.roles),
+  );
+  const canExportDataGranular = useSelector((state: RootState) =>
     findPermission('can_export_data', 'Superset', state.user?.roles),
   );
-  const canExportImage = useSelector((state: RootState) =>
+  const canExportImageGranular = useSelector((state: RootState) =>
     findPermission('can_export_image', 'Superset', state.user?.roles),
   );
-  const canCopyClipboard = useSelector((state: RootState) =>
+  const canCopyClipboardGranular = useSelector((state: RootState) =>
     findPermission('can_copy_clipboard', 'Superset', state.user?.roles),
   );
-  const canDownload = isFeatureEnabled(FeatureFlag.GranularExportControls)
-    ? canExportData
+  const granularExport = isFeatureEnabled(FeatureFlag.GranularExportControls);
+  const canExportData = granularExport ? canExportDataGranular : canCsvLegacy;
+  const canExportImage = granularExport ? canExportImageGranular : canCsvLegacy;
+  const canCopyClipboard = granularExport
+    ? canCopyClipboardGranular
     : canCsvLegacy;
+  const canDownload = canExportData;
+  // SQL Lab uses a separate legacy permission (can_export_csv on SQLLab)
+  const canExportDataSqlLab = granularExport
+    ? canExportDataGranular
+    : canExportCsvSqlLab;
+  const canCopyClipboardSqlLab = granularExport
+    ? canCopyClipboardGranular
+    : canExportCsvSqlLab;
   const canDrill = useSelector((state: RootState) =>
     findPermission('can_drill', 'Dashboard', state.user?.roles),
   );
@@ -69,8 +83,10 @@ export const usePermissions = () => {
     canDatasourceSamples,
     canDownload,
     canExportData,
+    canExportDataSqlLab,
     canExportImage,
     canCopyClipboard,
+    canCopyClipboardSqlLab,
     canDrill,
     canDrillBy,
     canDrillToDetail,
diff --git a/superset-frontend/src/hooks/useUnsavedChangesPrompt/index.ts b/superset-frontend/src/hooks/useUnsavedChangesPrompt/index.ts
index 50204693aab..2301b2c515d 100644
--- a/superset-frontend/src/hooks/useUnsavedChangesPrompt/index.ts
+++ b/superset-frontend/src/hooks/useUnsavedChangesPrompt/index.ts
@@ -21,7 +21,7 @@ import { getClientErrorObject } from '@superset-ui/core';
 import { useEffect, useRef, useCallback, useState } from 'react';
 import { useHistory } from 'react-router-dom';
 import { useBeforeUnload } from 'src/hooks/useBeforeUnload';
-import type { Location } from 'history';
+import type { Location, Action } from 'history';
 
 type UseUnsavedChangesPromptProps = {
   hasUnsavedChanges: boolean;
@@ -71,13 +71,23 @@ export const useUnsavedChangesPrompt = ({
   }, [onSave]);
 
   const blockCallback = useCallback(
-    ({
-      pathname,
-      state,
-    }: {
-      pathname: Location['pathname'];
-      state: Location['state'];
-    }) => {
+    (
+      {
+        pathname,
+        search,
+        state,
+      }: {
+        pathname: Location['pathname'];
+        search: Location['search'];
+        state: Location['state'];
+      },
+      action: Action,
+    ) => {
+      // REPLACE actions are URL sync (e.g. updating form_data_key), not navigation
+      if (action === 'REPLACE') {
+        return undefined;
+      }
+
       if (manualSaveRef.current) {
         manualSaveRef.current = false;
         return undefined;
@@ -85,7 +95,11 @@ export const useUnsavedChangesPrompt = ({
 
       confirmNavigationRef.current = () => {
         unblockRef.current?.();
-        history.push(pathname, state);
+        if (action === 'POP') {
+          history.go(-1);
+        } else {
+          history.push({ pathname, search }, state);
+        }
       };
 
       setShowModal(true);
diff --git a/superset-frontend/src/hooks/useUnsavedChangesPrompt/useUnsavedChangesPrompt.test.tsx b/superset-frontend/src/hooks/useUnsavedChangesPrompt/useUnsavedChangesPrompt.test.tsx
index ccd259f22f5..889ba89a91e 100644
--- a/superset-frontend/src/hooks/useUnsavedChangesPrompt/useUnsavedChangesPrompt.test.tsx
+++ b/superset-frontend/src/hooks/useUnsavedChangesPrompt/useUnsavedChangesPrompt.test.tsx
@@ -125,7 +125,7 @@ test('should close modal when handleConfirmNavigation is called', () => {
   expect(result.current.showModal).toBe(false);
 });
 
-test('should preserve pathname and state when confirming navigation', () => {
+test('should preserve pathname, search, and state when confirming navigation', () => {
   const onSave = jest.fn();
   const history = createMemoryHistory();
   const wrapper = ({ children }: any) => (
@@ -134,6 +134,7 @@ test('should preserve pathname and state when confirming navigation', () => {
 
   const locationState = { fromDashboard: true, dashboardId: 123 };
   const pathname = '/another-page';
+  const search = '?slice_id=42&foo=bar';
 
   const { result } = renderHook(
     () => useUnsavedChangesPrompt({ hasUnsavedChanges: true, onSave }),
@@ -144,7 +145,7 @@ test('should preserve pathname and state when confirming navigation', () => {
 
   // Simulate a blocked navigation (the hook sets up history.block internally)
   act(() => {
-    history.push(pathname, locationState);
+    history.push({ pathname, search }, locationState);
   });
 
   // Modal should now be visible
@@ -158,8 +159,8 @@ test('should preserve pathname and state when confirming navigation', () => {
   // Modal should close
   expect(result.current.showModal).toBe(false);
 
-  // Verify correct call with pathname and state preserved
-  expect(pushSpy).toHaveBeenCalledWith(pathname, locationState);
+  // Verify correct call with pathname, search, and state preserved
+  expect(pushSpy).toHaveBeenCalledWith({ pathname, search }, locationState);
 
   pushSpy.mockRestore();
 });
diff --git a/superset-frontend/src/pages/AlertReportList/AlertReportList.test.tsx b/superset-frontend/src/pages/AlertReportList/AlertReportList.test.tsx
index 588478791ad..8ac726eb4d0 100644
--- a/superset-frontend/src/pages/AlertReportList/AlertReportList.test.tsx
+++ b/superset-frontend/src/pages/AlertReportList/AlertReportList.test.tsx
@@ -16,271 +16,469 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+import type React from 'react';
 import fetchMock from 'fetch-mock';
-import configureStore from 'redux-mock-store';
-import thunk from 'redux-thunk';
 import {
   render,
   screen,
   fireEvent,
   waitFor,
+  createStore,
 } from 'spec/helpers/testing-library';
+import { Provider } from 'react-redux';
 import { MemoryRouter } from 'react-router-dom';
 import { QueryParamProvider } from 'use-query-params';
 import { ReactRouter5Adapter } from 'use-query-params/adapters/react-router-5';
-import React from 'react';
 import AlertListComponent from 'src/pages/AlertReportList';
 
-// Cast to accept partial mock props in tests
+jest.setTimeout(30000);
+
 const AlertList = AlertListComponent as unknown as React.FC<
   Record<string, any>
 >;
 
-const mockStore = configureStore([thunk]);
-const store = mockStore({});
+// -- Mock data (IDs start at 1 to avoid the `if (data?.id)` falsy guard) --
 
-const alertsEndpoint = 'glob:*/api/v1/report/?*';
-const alertEndpoint = 'glob:*/api/v1/report/*';
-const alertsInfoEndpoint = 'glob:*/api/v1/report/_info*';
-const alertsCreatedByEndpoint = 'glob:*/api/v1/report/related/created_by*';
+const mockAlerts = [
+  {
+    id: 1,
+    name: 'Weekly Sales Alert',
+    active: true,
+    last_state: 'Success',
+    type: 'Alert',
+    owners: [{ id: 1, first_name: 'Admin', last_name: 'User' }],
+    recipients: [{ id: 1, type: 'Email' }],
+    changed_by: { id: 1, first_name: 'Admin', last_name: 'User' },
+    changed_on_delta_humanized: '1 day ago',
+    created_by: { id: 1, first_name: 'Admin', last_name: 'User' },
+    created_on: new Date().toISOString(),
+    last_eval_dttm: Date.now(),
+    crontab: '0 9 * * 1',
+    crontab_humanized: 'Every Monday at 09:00',
+    timezone: 'UTC',
+  },
+  {
+    id: 2,
+    name: 'Daily Error Alert',
+    active: true,
+    last_state: 'Error',
+    type: 'Alert',
+    owners: [{ id: 2, first_name: 'Data', last_name: 'Analyst' }],
+    recipients: [{ id: 2, type: 'Slack' }],
+    changed_by: { id: 2, first_name: 'Data', last_name: 'Analyst' },
+    changed_on_delta_humanized: '2 days ago',
+    created_by: { id: 2, first_name: 'Data', last_name: 'Analyst' },
+    created_on: new Date().toISOString(),
+    last_eval_dttm: Date.now(),
+    crontab: '0 8 * * *',
+    crontab_humanized: 'Every day at 08:00',
+    timezone: 'US/Pacific',
+  },
+  {
+    id: 3,
+    name: 'Monthly Revenue Alert',
+    active: false,
+    last_state: 'Working',
+    type: 'Alert',
+    owners: [{ id: 1, first_name: 'Admin', last_name: 'User' }],
+    recipients: [{ id: 3, type: 'Email' }],
+    changed_by: { id: 1, first_name: 'Admin', last_name: 'User' },
+    changed_on_delta_humanized: '5 days ago',
+    created_by: { id: 1, first_name: 'Admin', last_name: 'User' },
+    created_on: new Date().toISOString(),
+    last_eval_dttm: Date.now(),
+    crontab: '0 0 1 * *',
+    crontab_humanized: 'First day of the month',
+    timezone: 'UTC',
+  },
+];
 
-const mockalerts = Array.from({ length: 3 }, (_, i) => ({
-  active: true,
-  changed_by: {
-    first_name: `user ${i}`,
-    id: i,
+const mockReports = [
+  {
+    id: 10,
+    name: 'Weekly Dashboard Report',
+    active: true,
+    last_state: 'Success',
+    type: 'Report',
+    owners: [{ id: 1, first_name: 'Admin', last_name: 'User' }],
+    recipients: [{ id: 10, type: 'Email' }],
+    changed_by: { id: 1, first_name: 'Admin', last_name: 'User' },
+    changed_on_delta_humanized: '1 day ago',
+    created_by: { id: 1, first_name: 'Admin', last_name: 'User' },
+    created_on: new Date().toISOString(),
+    last_eval_dttm: Date.now(),
+    crontab: '0 9 * * 1',
+    crontab_humanized: 'Every Monday at 09:00',
+    timezone: 'UTC',
   },
-  changed_on_delta_humanized: `${i} day(s) ago`,
-  created_by: {
-    first_name: `user ${i}`,
-    id: i,
+  {
+    id: 11,
+    name: 'Monthly KPI Report',
+    active: false,
+    last_state: 'Not triggered',
+    type: 'Report',
+    owners: [{ id: 1, first_name: 'Admin', last_name: 'User' }],
+    recipients: [{ id: 11, type: 'Slack' }],
+    changed_by: { id: 1, first_name: 'Admin', last_name: 'User' },
+    changed_on_delta_humanized: '3 days ago',
+    created_by: { id: 1, first_name: 'Admin', last_name: 'User' },
+    created_on: new Date().toISOString(),
+    last_eval_dttm: Date.now(),
+    crontab: '0 0 1 * *',
+    crontab_humanized: 'First day of the month',
+    timezone: 'UTC',
   },
-  created_on: new Date().toISOString,
-  id: i,
-  last_eval_dttm: Date.now(),
-  last_state: 'ok',
-  name: `alert ${i}  `,
-  owners: [{ id: 1 }],
-  recipients: [
-    {
-      id: `${i}`,
-      type: 'email',
-    },
-  ],
-  type: 'alert',
-}));
+];
 
 const mockUser = {
   userId: 1,
-  firstName: 'user 1',
-  lastName: 'lastname',
+  firstName: 'Admin',
+  lastName: 'User',
 };
 
-fetchMock.get(alertsEndpoint, {
-  ids: [2, 0, 1],
-  result: mockalerts,
-  count: 3,
-});
-fetchMock.get(alertsInfoEndpoint, {
-  permissions: ['can_write'],
-});
-fetchMock.get(alertsCreatedByEndpoint, { result: [] });
-fetchMock.put(alertEndpoint, { ...mockalerts[0], active: false });
-fetchMock.put(alertsEndpoint, { ...mockalerts[0], active: false });
-fetchMock.delete(alertEndpoint, {});
-fetchMock.delete(alertsEndpoint, {});
+// -- API endpoints (named for cleanup) --
 
-const renderAlertList = (props = {}) =>
-  render(
-    <MemoryRouter>
-      <QueryParamProvider adapter={ReactRouter5Adapter}>
-        <AlertList user={mockUser} {...props} />
-      </QueryParamProvider>
-    </MemoryRouter>,
-    {
-      useRedux: true,
-      store,
+const ENDPOINTS = {
+  LIST: 'glob:*/api/v1/report/?*',
+  INFO: 'glob:*/api/v1/report/_info*',
+  SINGLE: 'glob:*/api/v1/report/*',
+  CREATED_BY: 'glob:*/api/v1/report/related/created_by*',
+  OWNERS: 'glob:*/api/v1/report/related/owners*',
+  CHANGED_BY: 'glob:*/api/v1/report/related/changed_by*',
+};
+
+// -- Render helper --
+
+const renderAlertList = (props: Record<string, any> = {}) => {
+  const store = createStore();
+  return render(
+    <Provider store={store}>
+      <MemoryRouter>
+        <QueryParamProvider adapter={ReactRouter5Adapter}>
+          <AlertList user={mockUser} {...props} />
+        </QueryParamProvider>
+      </MemoryRouter>
+    </Provider>,
+  );
+};
+
+// -- Dynamic list endpoint: returns alerts or reports based on URL filter --
+
+const setupMocks = (
+  permissions: string[] = ['can_read', 'can_write'],
+  listData?: typeof mockAlerts,
+) => {
+  fetchMock.get(ENDPOINTS.INFO, { permissions }, { name: 'info' });
+
+  fetchMock.get(
+    ENDPOINTS.LIST,
+    ({ url }: any) => {
+      if (listData) {
+        return {
+          result: listData,
+          count: listData.length,
+          ids: listData.map(a => a.id),
+        };
+      }
+      const data = url.includes('value:Report') ? mockReports : mockAlerts;
+      return { result: data, count: data.length, ids: data.map(a => a.id) };
     },
+    { name: 'list' },
   );
 
-// eslint-disable-next-line no-restricted-globals -- TODO: Migrate from describe blocks
-describe('AlertList', () => {
-  beforeEach(() => {
-    fetchMock.clearHistory();
-  });
+  fetchMock.get(ENDPOINTS.CREATED_BY, { result: [] }, { name: 'created-by' });
 
-  test('renders', async () => {
-    renderAlertList();
-    expect(await screen.findByText('Alerts & reports')).toBeInTheDocument();
-  });
+  fetchMock.get(ENDPOINTS.OWNERS, { result: [], count: 0 }, { name: 'owners' });
 
-  test('renders a SubMenu', async () => {
-    renderAlertList();
-    expect(await screen.findByRole('navigation')).toBeInTheDocument();
-  });
+  fetchMock.get(
+    ENDPOINTS.CHANGED_BY,
+    { result: [], count: 0 },
+    { name: 'changed-by' },
+  );
 
-  test('renders a ListView', async () => {
-    renderAlertList();
-    expect(await screen.findByTestId('alerts-list-view')).toBeInTheDocument();
-  });
+  fetchMock.put(
+    ENDPOINTS.SINGLE,
+    { result: { ...mockAlerts[0], active: false } },
+    { name: 'put-alert' },
+  );
 
-  test('renders switches', async () => {
-    renderAlertList();
-    // Wait for the list to load first
-    await screen.findByTestId('alerts-list-view');
-    const switches = await screen.findAllByRole('switch');
-    expect(switches).toHaveLength(3);
-  });
+  fetchMock.delete(ENDPOINTS.SINGLE, {}, { name: 'delete-alert' });
 
-  test('deletes', async () => {
-    renderAlertList();
+  fetchMock.delete(
+    ENDPOINTS.LIST,
+    { message: 'Deleted' },
+    { name: 'delete-bulk' },
+  );
+};
 
-    // Wait for list to load
-    await screen.findByTestId('alerts-list-view');
+// -- Setup / teardown --
 
-    // Find and click first delete button
-    const deleteButtons = await screen.findAllByTestId('delete-action');
-    fireEvent.click(deleteButtons[0]);
-
-    // Wait for modal to appear and find the delete input
-    const deleteInput = await screen.findByTestId('delete-modal-input');
-    fireEvent.change(deleteInput, { target: { value: 'DELETE' } });
-
-    // Click confirm button
-    const confirmButton = await screen.findByTestId('modal-confirm-button');
-    fireEvent.click(confirmButton);
-
-    // Wait for delete request
-    await waitFor(() => {
-      expect(
-        fetchMock.callHistory.calls(/report\/0/, { method: 'DELETE' }),
-      ).toHaveLength(1);
-    });
-  }, 15000);
-
-  test('shows/hides bulk actions when bulk actions is clicked', async () => {
-    renderAlertList();
-
-    // Wait for list to load and initial state
-    await screen.findByTestId('alerts-list-view');
-    expect(
-      screen.queryByTestId('bulk-select-controls'),
-    ).not.toBeInTheDocument();
-
-    // Click bulk select toggle
-    const bulkSelectButton = await screen.findByTestId('bulk-select-toggle');
-    fireEvent.click(bulkSelectButton);
-
-    // Verify bulk select controls appear
-    expect(
-      await screen.findByTestId('bulk-select-controls'),
-    ).toBeInTheDocument();
-  }, 15000);
-
-  test('hides bulk actions when switch between alert and report list', async () => {
-    // Start with alert list
-    renderAlertList();
-
-    // Wait for list to load
-    await screen.findByTestId('alerts-list-view');
-
-    // Click bulk select to show controls
-    const bulkSelectButton = await screen.findByTestId('bulk-select-toggle');
-    fireEvent.click(bulkSelectButton);
-
-    // Verify bulk select controls appear
-    expect(
-      await screen.findByTestId('bulk-select-controls'),
-    ).toBeInTheDocument();
-
-    // Verify alert tab is active
-    const alertTab = await screen.findByTestId('alert-list');
-    expect(alertTab).toHaveClass('active');
-    const reportTab = screen.getByTestId('report-list');
-    expect(reportTab).not.toHaveClass('active');
-
-    // Switch to report list
-    renderAlertList({ isReportEnabled: true });
-
-    // Wait for report list API call and tab states to update
-    await waitFor(async () => {
-      // Check API call
-      const calls = fetchMock.callHistory.calls(/report\/\?q/);
-      const hasReportCall = calls.some(call =>
-        call.url.includes('filters:!((col:type,opr:eq,value:Report))'),
-      );
-
-      // Check tab states
-      const reportTabs = screen.getAllByTestId('report-list');
-      const alertTabs = screen.getAllByTestId('alert-list');
-      const hasActiveReport = reportTabs.some(tab =>
-        tab.classList.contains('active'),
-      );
-      const hasNoActiveAlert = alertTabs.every(
-        tab => !tab.classList.contains('active'),
-      );
-
-      return hasReportCall && hasActiveReport && hasNoActiveAlert;
-    });
-
-    // Click bulk select toggle again to hide controls
-    const bulkSelectButtons =
-      await screen.findAllByTestId('bulk-select-toggle');
-    fireEvent.click(bulkSelectButtons[0]);
-
-    // Verify final state
-    await waitFor(() => {
-      expect(
-        screen.queryByTestId('bulk-select-controls'),
-      ).not.toBeInTheDocument();
-    });
-
-    // Verify correct API call was made
-    const reportCalls = fetchMock.callHistory.calls(/report\/\?q/);
-    const lastReportCall = reportCalls[reportCalls.length - 1].url;
-    expect(lastReportCall).toContain(
-      'filters:!((col:type,opr:eq,value:Report))',
-    );
-  }, 15000);
-
-  test('renders listview table correctly', async () => {
-    renderAlertList();
-    await screen.findByTestId('alerts-list-view');
-
-    const table = await screen.findByTestId('listview-table');
-    expect(table).toBeInTheDocument();
-    expect(table).toBeVisible();
-  }, 15000);
-
-  test('renders correct column headers for alerts', async () => {
-    renderAlertList();
-    await screen.findByTestId('alerts-list-view');
-
-    expect(screen.getByTitle('Last run')).toBeInTheDocument();
-    expect(
-      screen.getByRole('columnheader', { name: /name/i }),
-    ).toBeInTheDocument();
-    expect(screen.getByTitle('Schedule')).toBeInTheDocument();
-    expect(screen.getByTitle('Notification method')).toBeInTheDocument();
-    expect(screen.getByTitle('Owners')).toBeInTheDocument();
-    expect(screen.getByTitle('Last modified')).toBeInTheDocument();
-    expect(screen.getByTitle('Active')).toBeInTheDocument();
-    expect(screen.getByTitle('Actions')).toBeInTheDocument();
-  }, 15000);
-
-  test('renders correct column headers for reports', async () => {
-    renderAlertList({ isReportEnabled: true });
-    await screen.findByTestId('alerts-list-view');
-
-    expect(screen.getByTitle('Last run')).toBeInTheDocument();
-    expect(
-      screen.getByRole('columnheader', { name: /name/i }),
-    ).toBeInTheDocument();
-    expect(screen.getByTitle('Schedule')).toBeInTheDocument();
-    expect(screen.getByTitle('Notification method')).toBeInTheDocument();
-    expect(screen.getByTitle('Owners')).toBeInTheDocument();
-    expect(screen.getByTitle('Last modified')).toBeInTheDocument();
-    expect(screen.getByTitle('Active')).toBeInTheDocument();
-    expect(screen.getByTitle('Actions')).toBeInTheDocument();
-  }, 15000);
+beforeEach(() => {
+  fetchMock.removeRoutes().clearHistory();
+  setupMocks();
+});
+
+afterEach(() => {
+  fetchMock.removeRoutes().clearHistory();
+});
+
+// -- Tests --
+
+test('loads rows from API and renders alert names, status, and actions', async () => {
+  renderAlertList();
+
+  // All 3 alert names appear
+  await screen.findByText('Weekly Sales Alert');
+  expect(screen.getByText('Daily Error Alert')).toBeInTheDocument();
+  expect(screen.getByText('Monthly Revenue Alert')).toBeInTheDocument();
+
+  // Active switches rendered for each row
+  const switches = screen.getAllByRole('switch');
+  expect(switches).toHaveLength(3);
+
+  // Delete actions present for owned alerts (userId=1 owns alerts 1 and 3)
+  const deleteButtons = screen.getAllByTestId('delete-action');
+  expect(deleteButtons.length).toBeGreaterThanOrEqual(2);
+
+  // Column headers
+  expect(screen.getByTitle('Last run')).toBeInTheDocument();
+  expect(
+    screen.getByRole('columnheader', { name: /name/i }),
+  ).toBeInTheDocument();
+  expect(screen.getByTitle('Schedule')).toBeInTheDocument();
+  expect(screen.getByTitle('Active')).toBeInTheDocument();
+  expect(screen.getByTitle('Actions')).toBeInTheDocument();
+
+  // API was called with Alert filter
+  const listCalls = fetchMock.callHistory.calls('list');
+  expect(listCalls.length).toBeGreaterThanOrEqual(1);
+  expect(listCalls[0].url).toContain('value:Alert');
+});
+
+test('toggle active sends PUT and updates switch state', async () => {
+  renderAlertList();
+  await screen.findByText('Weekly Sales Alert');
+
+  const switches = screen.getAllByRole('switch');
+  // First switch is for alert id=1 (owned by user, active: true)
+  expect(switches[0]).toBeChecked();
+
+  fireEvent.click(switches[0]);
+
+  // PUT called with active=false
+  await waitFor(() => {
+    const putCalls = fetchMock.callHistory.calls('put-alert');
+    expect(putCalls).toHaveLength(1);
+  });
+
+  const putCalls = fetchMock.callHistory.calls('put-alert');
+  const body = JSON.parse(putCalls[0].options.body as string);
+  expect(body.active).toBe(false);
+  expect(putCalls[0].url).toContain('/report/1');
+});
+
+test('toggle active rolls back on failed update', async () => {
+  renderAlertList();
+  await screen.findByText('Weekly Sales Alert');
+
+  // Replace PUT with 500 error
+  fetchMock.removeRoute('put-alert');
+  fetchMock.put(ENDPOINTS.SINGLE, 500, { name: 'put-fail' });
+
+  const switches = screen.getAllByRole('switch');
+  expect(switches[0]).toBeChecked();
+
+  fireEvent.click(switches[0]);
+
+  // PUT was attempted
+  await waitFor(() => {
+    expect(fetchMock.callHistory.calls('put-fail')).toHaveLength(1);
+  });
+
+  // Switch rolls back to checked (server rejected)
+  await waitFor(() => {
+    expect(switches[0]).toBeChecked();
+  });
+});
+
+test('switching to Reports refetches and renders only report rows', async () => {
+  // Render alerts mode first
+  const { unmount } = renderAlertList();
+  await screen.findByText('Weekly Sales Alert');
+  unmount();
+
+  // Render reports mode
+  fetchMock.clearHistory();
+  renderAlertList({ isReportEnabled: true });
+
+  await screen.findByText('Weekly Dashboard Report');
+  expect(screen.getByText('Monthly KPI Report')).toBeInTheDocument();
+
+  // Alert names should not appear
+  expect(screen.queryByText('Weekly Sales Alert')).not.toBeInTheDocument();
+  expect(screen.queryByText('Daily Error Alert')).not.toBeInTheDocument();
+
+  // API called with Report filter
+  const listCalls = fetchMock.callHistory.calls('list');
+  expect(listCalls.length).toBeGreaterThanOrEqual(1);
+  const reportCall = listCalls.find((c: any) => c.url.includes('value:Report'));
+  expect(reportCall).toBeDefined();
+});
+
+test('delete removes row after confirmation', async () => {
+  // Track deletions so the GET mock reflects them on refetch
+  const deletedIds = new Set<number>();
+  fetchMock.removeRoute('list');
+  fetchMock.get(
+    ENDPOINTS.LIST,
+    (_callLog: any) => {
+      const remaining = mockAlerts.filter(a => !deletedIds.has(a.id));
+      return {
+        result: remaining,
+        count: remaining.length,
+        ids: remaining.map(a => a.id),
+      };
+    },
+    { name: 'list' },
+  );
+
+  // Override DELETE to mark the alert as deleted before returning
+  fetchMock.removeRoute('delete-alert');
+  fetchMock.delete(
+    ENDPOINTS.SINGLE,
+    ({ url }: any) => {
+      const match = url.match(/\/report\/(\d+)/);
+      if (match) deletedIds.add(Number(match[1]));
+      return {};
+    },
+    { name: 'delete-alert' },
+  );
+
+  renderAlertList();
+  await screen.findByText('Weekly Sales Alert');
+
+  // Click delete on first owned alert
+  const deleteButtons = screen.getAllByTestId('delete-action');
+  fireEvent.click(deleteButtons[0]);
+
+  // Confirm in delete modal
+  const deleteInput = await screen.findByTestId('delete-modal-input');
+  fireEvent.change(deleteInput, { target: { value: 'DELETE' } });
+  const confirmButton = await screen.findByTestId('modal-confirm-button');
+  fireEvent.click(confirmButton);
+
+  // Row disappears after refetch
+  await waitFor(() => {
+    expect(screen.queryByText('Weekly Sales Alert')).not.toBeInTheDocument();
+  });
+
+  // Other alerts remain
+  expect(screen.getByText('Daily Error Alert')).toBeInTheDocument();
+});
+
+test('delete failure leaves row visible', async () => {
+  // Replace DELETE with 500
+  fetchMock.removeRoute('delete-alert');
+  fetchMock.delete(ENDPOINTS.SINGLE, 500, { name: 'delete-fail' });
+
+  renderAlertList();
+  await screen.findByText('Weekly Sales Alert');
+
+  const deleteButtons = screen.getAllByTestId('delete-action');
+  fireEvent.click(deleteButtons[0]);
+
+  const deleteInput = await screen.findByTestId('delete-modal-input');
+  fireEvent.change(deleteInput, { target: { value: 'DELETE' } });
+  const confirmButton = await screen.findByTestId('modal-confirm-button');
+  fireEvent.click(confirmButton);
+
+  await waitFor(() => {
+    expect(fetchMock.callHistory.calls('delete-fail')).toHaveLength(1);
+  });
+
+  // Row stays visible
+  expect(screen.getByText('Weekly Sales Alert')).toBeInTheDocument();
+});
+
+test('bulk select shows selected count and enables bulk actions after row selection', async () => {
+  renderAlertList();
+  await screen.findByText('Weekly Sales Alert');
+
+  // Bulk select controls not visible initially
+  expect(screen.queryByTestId('bulk-select-controls')).not.toBeInTheDocument();
+
+  // Toggle bulk select
+  const bulkSelectButton = screen.getByTestId('bulk-select-toggle');
+  fireEvent.click(bulkSelectButton);
+
+  // Controls appear with "0 Selected" text
+  await screen.findByTestId('bulk-select-controls');
+  expect(screen.getByTestId('bulk-select-copy')).toHaveTextContent(
+    '0 Selected',
+  );
+
+  // Deselect-all and action button not yet visible (nothing selected)
+  expect(
+    screen.queryByTestId('bulk-select-deselect-all'),
+  ).not.toBeInTheDocument();
+
+  // Select all rows via checkboxes that appear in bulk mode
+  const checkboxes = screen.getAllByRole('checkbox');
+  // First checkbox is the header "select all" toggle
+  fireEvent.click(checkboxes[0]);
+
+  // Bulk action button and deselect-all appear after selection
+  await waitFor(() => {
+    expect(screen.getByTestId('bulk-select-action')).toBeInTheDocument();
+  });
+  expect(screen.getByTestId('bulk-select-deselect-all')).toBeInTheDocument();
+  expect(screen.getByTestId('bulk-select-copy')).toHaveTextContent(
+    '3 Selected',
+  );
+});
+
+test('read-only users do not see delete and bulk select controls', async () => {
+  fetchMock.removeRoutes().clearHistory();
+  setupMocks(['can_read']); // no can_write
+
+  const readOnlyUser = {
+    userId: 99,
+    firstName: 'Read',
+    lastName: 'Only',
+  };
+
+  const store = createStore();
+
+  render(
+    <Provider store={store}>
+      <MemoryRouter>
+        <QueryParamProvider adapter={ReactRouter5Adapter}>
+          <AlertList user={readOnlyUser} />
+        </QueryParamProvider>
+      </MemoryRouter>
+    </Provider>,
+  );
+
+  await screen.findByText('Weekly Sales Alert');
+
+  // No delete action buttons
+  expect(screen.queryAllByTestId('delete-action')).toHaveLength(0);
+
+  // No bulk select toggle
+  expect(screen.queryByTestId('bulk-select-toggle')).not.toBeInTheDocument();
+
+  // Switches are all disabled (user 99 doesn't own any alerts)
+  const switches = screen.getAllByRole('switch');
+  switches.forEach(sw => {
+    expect(sw).toBeDisabled();
+  });
+});
+
+test('empty API result shows empty state', async () => {
+  fetchMock.removeRoutes().clearHistory();
+  setupMocks(['can_read', 'can_write'], []);
+
+  renderAlertList();
+
+  expect(await screen.findByText(/no alerts yet/i)).toBeInTheDocument();
 });
diff --git a/superset-frontend/src/pages/AlertReportList/index.tsx b/superset-frontend/src/pages/AlertReportList/index.tsx
index c457b74617f..94ba9186706 100644
--- a/superset-frontend/src/pages/AlertReportList/index.tsx
+++ b/superset-frontend/src/pages/AlertReportList/index.tsx
@@ -242,9 +242,13 @@ function AlertList({
           }),
         );
 
-        updateResource(update_id, { active: checked }, false, false)
-          .then()
-          .catch(() => setResourceCollection(original));
+        updateResource(update_id, { active: checked }, false, false).then(
+          response => {
+            if (!response) {
+              setResourceCollection(original);
+            }
+          },
+        );
       }
     },
     [alerts, setResourceCollection, updateResource],
diff --git a/superset-frontend/src/pages/Chart/Chart.test.tsx b/superset-frontend/src/pages/Chart/Chart.test.tsx
index de3787ebde5..b80ccc32b29 100644
--- a/superset-frontend/src/pages/Chart/Chart.test.tsx
+++ b/superset-frontend/src/pages/Chart/Chart.test.tsx
@@ -32,6 +32,7 @@ import { URL_PARAMS } from 'src/constants';
 import { JsonObject, VizType } from '@superset-ui/core';
 import { useUnsavedChangesPrompt } from 'src/hooks/useUnsavedChangesPrompt';
 import { getParsedExploreURLParams } from 'src/explore/exploreUtils/getParsedExploreURLParams';
+import * as messageToastActions from 'src/components/MessageToasts/actions';
 import ChartPage from '.';
 
 jest.mock('src/hooks/useUnsavedChangesPrompt', () => ({
@@ -260,7 +261,11 @@ describe('ChartPage', () => {
       const { getByTestId } = render(
         <>
           <Link
-            to={`/?${URL_PARAMS.dashboardPageId.name}=${dashboardPageId}&${URL_PARAMS.saveAction.name}=overwrite`}
+            to={{
+              pathname: '/',
+              search: `?${URL_PARAMS.dashboardPageId.name}=${dashboardPageId}`,
+              state: { saveAction: 'overwrite' },
+            }}
           >
             Change route
           </Link>
@@ -298,5 +303,152 @@ describe('ChartPage', () => {
         }).slice(1, -1),
       );
     });
+
+    test('re-fetches explore data on back-button navigation (POP)', async () => {
+      const exploreApiRoute = 'glob:*/api/v1/explore/*';
+      const initialFormData = getExploreFormData({
+        viz_type: VizType.Table,
+        show_cell_bars: true,
+      });
+      const updatedFormData = getExploreFormData({
+        viz_type: VizType.Table,
+        show_cell_bars: false,
+      });
+      fetchMock.get(exploreApiRoute, {
+        result: { dataset: { id: 1 }, form_data: initialFormData },
+      });
+      render(
+        <>
+          <Link to="/?slice_id=99">Navigate away</Link>
+          <ChartPage />
+        </>,
+        {
+          useRouter: true,
+          useRedux: true,
+          useDnd: true,
+        },
+      );
+      await waitFor(() =>
+        expect(fetchMock.callHistory.calls(exploreApiRoute).length).toBe(1),
+      );
+      expect(screen.getByTestId('mock-explore-chart-panel')).toHaveTextContent(
+        JSON.stringify({ show_cell_bars: true }).slice(1, -1),
+      );
+
+      // Navigate forward (PUSH) then simulate back-button (POP)
+      fetchMock.clearHistory().removeRoutes();
+      fetchMock.get(exploreApiRoute, {
+        result: { dataset: { id: 1 }, form_data: updatedFormData },
+      });
+      fireEvent.click(screen.getByText('Navigate away'));
+      await waitFor(() =>
+        expect(fetchMock.callHistory.calls(exploreApiRoute).length).toBe(1),
+      );
+
+      fetchMock.clearHistory().removeRoutes();
+      fetchMock.get(exploreApiRoute, {
+        result: { dataset: { id: 1 }, form_data: initialFormData },
+      });
+      // Simulate back button
+      window.history.back();
+      await waitFor(() =>
+        expect(fetchMock.callHistory.calls(exploreApiRoute).length).toBe(1),
+      );
+      expect(screen.getByTestId('mock-explore-chart-panel')).toHaveTextContent(
+        JSON.stringify({ show_cell_bars: true }).slice(1, -1),
+      );
+    });
+  });
+
+  test('does not show error toast when request is aborted on unmount', async () => {
+    const addDangerToastSpy = jest.spyOn(messageToastActions, 'addDangerToast');
+    const exploreApiRoute = 'glob:*/api/v1/explore/*';
+    let rejectRequest: (error: Error) => void;
+    const pendingPromise = new Promise((_, reject) => {
+      rejectRequest = reject;
+    });
+
+    fetchMock.get(exploreApiRoute, () => pendingPromise);
+
+    const { unmount } = render(<ChartPage />, {
+      useRouter: true,
+      useRedux: true,
+      useDnd: true,
+    });
+
+    // Unmount before the request completes
+    unmount();
+
+    // Simulate the aborted request rejection
+    const abortError = new Error('The operation was aborted.');
+    abortError.name = 'AbortError';
+    rejectRequest!(abortError);
+
+    // Wait for the rejected request to settle before asserting no toast was shown
+    await pendingPromise.catch(() => undefined);
+    expect(addDangerToastSpy).not.toHaveBeenCalled();
+
+    addDangerToastSpy.mockRestore();
+  });
+
+  test('aborts in-flight request when a new request is made', async () => {
+    const addDangerToastSpy = jest.spyOn(messageToastActions, 'addDangerToast');
+    const exploreApiRoute = 'glob:*/api/v1/explore/*';
+    const exploreFormData = getExploreFormData({
+      viz_type: VizType.Table,
+      show_cell_bars: true,
+    });
+
+    // First request will reject with AbortError when aborted
+    let rejectFirstRequest: (error: Error) => void;
+    const firstRequestPromise = new Promise((_, reject) => {
+      rejectFirstRequest = reject;
+    });
+
+    fetchMock.get(exploreApiRoute, () => firstRequestPromise);
+
+    render(
+      <>
+        <Link to="/?slice_id=99">Navigate</Link>
+        <ChartPage />
+      </>,
+      {
+        useRouter: true,
+        useRedux: true,
+        useDnd: true,
+      },
+    );
+
+    // Wait for the first request to be initiated
+    await waitFor(() =>
+      expect(fetchMock.callHistory.calls(exploreApiRoute).length).toBe(1),
+    );
+
+    // Set up second request to return immediately
+    fetchMock.clearHistory().removeRoutes();
+    fetchMock.get(exploreApiRoute, {
+      result: { dataset: { id: 1 }, form_data: exploreFormData },
+    });
+
+    // Navigate to trigger a new request (which should abort the first)
+    fireEvent.click(screen.getByText('Navigate'));
+
+    // Simulate the first request being aborted
+    const abortError = new Error('The operation was aborted.');
+    abortError.name = 'AbortError';
+    rejectFirstRequest!(abortError);
+
+    // Wait for the first request to settle before asserting
+    await firstRequestPromise.catch(() => undefined);
+
+    // Wait for the second request to complete
+    await waitFor(() =>
+      expect(fetchMock.callHistory.calls(exploreApiRoute).length).toBe(1),
+    );
+
+    // No error toast should be shown from the aborted first request
+    expect(addDangerToastSpy).not.toHaveBeenCalled();
+
+    addDangerToastSpy.mockRestore();
   });
 });
diff --git a/superset-frontend/src/pages/Chart/index.tsx b/superset-frontend/src/pages/Chart/index.tsx
index 948abdc47f9..d1e3f7b8f75 100644
--- a/superset-frontend/src/pages/Chart/index.tsx
+++ b/superset-frontend/src/pages/Chart/index.tsx
@@ -16,9 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { useEffect, useRef, useState } from 'react';
+import { useCallback, useEffect, useRef, useState } from 'react';
 import { useDispatch } from 'react-redux';
-import { useLocation } from 'react-router-dom';
+import { useHistory } from 'react-router-dom';
+import type { Location, Action } from 'history';
 import { t } from '@apache-superset/core/translation';
 import {
   getLabelsColorMap,
@@ -49,10 +50,14 @@ const isValidResult = (rv: JsonObject): boolean =>
 const hasDatasetId = (rv: JsonObject): boolean =>
   isDefined(rv?.result?.dataset?.id);
 
-const fetchExploreData = async (exploreUrlParams: URLSearchParams) => {
+const fetchExploreData = async (
+  exploreUrlParams: URLSearchParams,
+  signal?: AbortSignal,
+) => {
   const rv = await makeApi<{}, ExploreResponsePayload>({
     method: 'GET',
     endpoint: 'api/v1/explore/',
+    signal,
   })(exploreUrlParams);
   if (isValidResult(rv)) {
     if (hasDatasetId(rv)) {
@@ -84,11 +89,11 @@ const getDashboardPageContext = (pageId?: string | null) => {
   return getItem(LocalStorageKeys.DashboardExploreContext, {})[pageId] || null;
 };
 
-const getDashboardContextFormData = () => {
-  const dashboardPageId = getUrlParam(URL_PARAMS.dashboardPageId);
+const getDashboardContextFormData = (search: string) => {
+  const dashboardPageId = getUrlParam(URL_PARAMS.dashboardPageId, search);
   const dashboardContext = getDashboardPageContext(dashboardPageId);
   if (dashboardContext) {
-    const sliceId = getUrlParam(URL_PARAMS.sliceId) || 0;
+    const sliceId = getUrlParam(URL_PARAMS.sliceId, search) || 0;
     const {
       colorScheme,
       labelsColor,
@@ -128,20 +133,34 @@ const getDashboardContextFormData = () => {
 
 export default function ExplorePage() {
   const [isLoaded, setIsLoaded] = useState(false);
-  const isExploreInitialized = useRef(false);
+  const fetchGeneration = useRef(0);
+  const abortControllerRef = useRef<AbortController | null>(null);
   const dispatch = useDispatch();
-  const location = useLocation();
+  const history = useHistory();
 
-  useEffect(() => {
-    const exploreUrlParams = getParsedExploreURLParams(location);
-    const saveAction = getUrlParam(
-      URL_PARAMS.saveAction,
-    ) as SaveActionType | null;
-    const dashboardContextFormData = getDashboardContextFormData();
+  const loadExploreData = useCallback(
+    (
+      loc: { search: string; pathname: string },
+      saveAction?: SaveActionType | null,
+    ) => {
+      // Abort any in-flight request before starting a new one
+      abortControllerRef.current?.abort();
+      const controller = new AbortController();
+      abortControllerRef.current = controller;
 
-    if (!isExploreInitialized.current || !!saveAction) {
-      fetchExploreData(exploreUrlParams)
+      fetchGeneration.current += 1;
+      const generation = fetchGeneration.current;
+      const exploreUrlParams = getParsedExploreURLParams(loc);
+      const dashboardContextFormData = getDashboardContextFormData(loc.search);
+
+      const isStale = () => generation !== fetchGeneration.current;
+
+      fetchExploreData(exploreUrlParams, controller.signal)
         .then(({ result }) => {
+          if (isStale()) {
+            return;
+          }
+
           const formData = dashboardContextFormData
             ? getFormDataWithDashboardContext(
                 result.form_data,
@@ -174,8 +193,24 @@ export default function ExplorePage() {
             }),
           );
         })
-        .catch(err => Promise.all([getClientErrorObject(err), err]))
+        .catch(err => {
+          // Silently ignore aborted requests - AbortError may be wrapped in SupersetApiError by makeApi
+          // or come through with statusText === 'abort' from SupersetClient
+          if (
+            err.name === 'AbortError' ||
+            err.statusText === 'abort' ||
+            err.originalError?.name === 'AbortError' ||
+            err.originalError?.statusText === 'abort'
+          ) {
+            return;
+          }
+          return Promise.all([getClientErrorObject(err), err]);
+        })
         .then(resolved => {
+          if (isStale()) {
+            return;
+          }
+
           const [clientError, err] = resolved || [];
           if (!err) {
             return Promise.resolve();
@@ -209,6 +244,9 @@ export default function ExplorePage() {
             )
               .then(
                 ({ result: { id, url, owners, form_data: _, ...data } }) => {
+                  if (isStale()) {
+                    return;
+                  }
                   const slice = {
                     ...data,
                     datasource: err.extra?.datasource_name,
@@ -225,6 +263,9 @@ export default function ExplorePage() {
                 },
               )
               .catch(() => {
+                if (isStale()) {
+                  return;
+                }
                 dispatch(hydrateExplore(exploreData));
               });
           }
@@ -232,12 +273,47 @@ export default function ExplorePage() {
           return Promise.resolve();
         })
         .finally(() => {
-          setIsLoaded(true);
-          isExploreInitialized.current = true;
+          if (!isStale() && !controller.signal.aborted) {
+            setIsLoaded(true);
+          }
         });
-    }
+    },
+    [dispatch],
+  );
+
+  // Cleanup: abort in-flight requests on unmount
+  useEffect(
+    () => () => {
+      abortControllerRef.current?.abort();
+    },
+    [],
+  );
+
+  // Initial fetch on mount
+  useEffect(() => {
+    loadExploreData(history.location);
     getLabelsColorMap().source = LabelsColorMapSource.Explore;
-  }, [dispatch, location]);
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
+
+  // Re-fetch on navigation or post-save.
+  // PUSH/POP: full reload (unmount + re-fetch).
+  // REPLACE with saveAction state: re-fetch without unmount (keeps chart visible).
+  // Other REPLACE: ignored (URL sync from updateHistory).
+  useEffect(() => {
+    const unlisten = history.listen((loc: Location, action: Action) => {
+      const saveAction = (loc.state as Record<string, unknown>)?.saveAction as
+        | SaveActionType
+        | undefined;
+      if (action === 'PUSH' || action === 'POP') {
+        setIsLoaded(false);
+        loadExploreData(loc, saveAction);
+      } else if (saveAction) {
+        loadExploreData(loc, saveAction);
+      }
+    });
+    return unlisten;
+  }, [history, loadExploreData]);
 
   if (!isLoaded) {
     return <Loading />;
diff --git a/superset-frontend/src/pages/ChartCreation/ChartCreation.test.tsx b/superset-frontend/src/pages/ChartCreation/ChartCreation.test.tsx
index f3e1fc231c9..ba2518c3da0 100644
--- a/superset-frontend/src/pages/ChartCreation/ChartCreation.test.tsx
+++ b/superset-frontend/src/pages/ChartCreation/ChartCreation.test.tsx
@@ -64,6 +64,7 @@ const mockUser: UserWithPermissionsAndRoles = {
   userId: 1,
   username: 'admin',
   isAnonymous: false,
+  groups: [],
 };
 
 const mockUserWithDatasetWrite: UserWithPermissionsAndRoles = {
@@ -77,6 +78,7 @@ const mockUserWithDatasetWrite: UserWithPermissionsAndRoles = {
   userId: 1,
   username: 'admin',
   isAnonymous: false,
+  groups: [],
 };
 const history = createMemoryHistory();
 
diff --git a/superset-frontend/src/pages/FileHandler/index.test.tsx b/superset-frontend/src/pages/FileHandler/index.test.tsx
index 3f7f15471f3..e1c005e37d0 100644
--- a/superset-frontend/src/pages/FileHandler/index.test.tsx
+++ b/superset-frontend/src/pages/FileHandler/index.test.tsx
@@ -189,7 +189,8 @@ test('redirects when no files are provided', async () => {
   });
 });
 
-test('handles CSV file correctly', async () => {
+// eslint-disable-next-line jest/no-disabled-tests
+test.skip('handles CSV file correctly', async () => {
   const fileHandle = createMockFileHandle('test.csv');
   setupLaunchQueue(fileHandle);
 
diff --git a/superset-frontend/src/pages/SqlLab/SqlLab.test.tsx b/superset-frontend/src/pages/SqlLab/SqlLab.test.tsx
index 50b0a49e8b4..819e0323be0 100644
--- a/superset-frontend/src/pages/SqlLab/SqlLab.test.tsx
+++ b/superset-frontend/src/pages/SqlLab/SqlLab.test.tsx
@@ -48,6 +48,7 @@ const fakeApiResult = {
       lastName: 'last name',
       permissions: {},
       roles: {},
+      groups: [],
     },
   },
 };
diff --git a/superset-frontend/src/pages/UserInfo/UserInfo.test.tsx b/superset-frontend/src/pages/UserInfo/UserInfo.test.tsx
index f445d998a27..d15b7090e23 100644
--- a/superset-frontend/src/pages/UserInfo/UserInfo.test.tsx
+++ b/superset-frontend/src/pages/UserInfo/UserInfo.test.tsx
@@ -51,6 +51,7 @@ const mockUser: UserWithPermissionsAndRoles = {
       ['can_write', 'Chart'],
     ],
   },
+  groups: ['Engineering', 'Analytics'],
   createdOn: new Date().toISOString(),
   isAnonymous: false,
   permissions: {
@@ -61,12 +62,12 @@ const mockUser: UserWithPermissionsAndRoles = {
 
 // eslint-disable-next-line no-restricted-globals -- TODO: Migrate from describe blocks
 describe('UserInfo', () => {
-  const renderPage = async () =>
+  const renderPage = async (user: UserWithPermissionsAndRoles = mockUser) =>
     act(async () => {
       render(
         <MemoryRouter>
           <QueryParamProvider adapter={ReactRouter5Adapter}>
-            <UserInfo user={mockUser} />
+            <UserInfo user={user} />
           </QueryParamProvider>
         </MemoryRouter>,
         { useRedux: true, store },
@@ -97,12 +98,20 @@ describe('UserInfo', () => {
     expect(screen.getByText('johndoe')).toBeInTheDocument();
     expect(screen.getByText('Yes')).toBeInTheDocument();
     expect(screen.getByText('Admin')).toBeInTheDocument();
+    expect(screen.getByText('Engineering, Analytics')).toBeInTheDocument();
     expect(screen.getByText('12')).toBeInTheDocument();
     expect(await screen.findByText('John')).toBeInTheDocument();
     expect(screen.getByText('Doe')).toBeInTheDocument();
     expect(screen.getByText('john@example.com')).toBeInTheDocument();
   });
 
+  test('renders "None" when the user has no groups', async () => {
+    await renderPage({ ...mockUser, groups: [] });
+
+    expect(await screen.findByText('Groups')).toBeInTheDocument();
+    expect(screen.getByText('None')).toBeInTheDocument();
+  });
+
   test('calls the /me endpoint on mount', async () => {
     await renderPage();
     await waitFor(() => {
diff --git a/superset-frontend/src/pages/UserInfo/index.tsx b/superset-frontend/src/pages/UserInfo/index.tsx
index 92a54ad0e7d..cc8d33d68e0 100644
--- a/superset-frontend/src/pages/UserInfo/index.tsx
+++ b/superset-frontend/src/pages/UserInfo/index.tsx
@@ -19,7 +19,11 @@
 
 import { useCallback, useEffect, useState } from 'react';
 import { t } from '@apache-superset/core/translation';
-import { SupersetClient } from '@superset-ui/core';
+import {
+  SupersetClient,
+  FeatureFlag,
+  isFeatureEnabled,
+} from '@superset-ui/core';
 import { css, useTheme, styled } from '@apache-superset/core/theme';
 import SubMenu, { SubMenuProps } from 'src/features/home/SubMenu';
 import { useToasts } from 'src/components/MessageToasts/withToasts';
@@ -30,6 +34,7 @@ import {
   UserInfoResetPasswordModal,
 } from 'src/features/userInfo/UserInfoModal';
 import { Icons, Collapse } from '@superset-ui/core/components';
+import { ApiKeyList } from 'src/features/apiKeys/ApiKeyList';
 
 const StyledHeader = styled.div`
   ${({ theme }) => css`
@@ -159,7 +164,16 @@ export function UserInfo({ user }: { user: UserWithPermissionsAndRoles }) {
     <StyledLayout>
       <StyledHeader>{t('Your user information')}</StyledHeader>
       <DescriptionsContainer>
-        <Collapse defaultActiveKey={['userInfo', 'personalInfo']} ghost>
+        <Collapse
+          defaultActiveKey={[
+            'userInfo',
+            'personalInfo',
+            ...(isFeatureEnabled(FeatureFlag.FabApiKeyEnabled)
+              ? ['apiKeys']
+              : []),
+          ]}
+          ghost
+        >
           <Collapse.Panel
             header={<DescriptionTitle>{t('User info')}</DescriptionTitle>}
             key="userInfo"
@@ -176,9 +190,12 @@ export function UserInfo({ user }: { user: UserWithPermissionsAndRoles }) {
               <Descriptions.Item label={t('Is Active?')}>
                 {user.isActive ? t('Yes') : t('No')}
               </Descriptions.Item>
-              <Descriptions.Item label={t('Role')}>
+              <Descriptions.Item label={t('Roles')}>
                 {user.roles ? Object.keys(user.roles).join(', ') : t('None')}
               </Descriptions.Item>
+              <Descriptions.Item label={t('Groups')}>
+                {user.groups.length ? user.groups.join(', ') : t('None')}
+              </Descriptions.Item>
               <Descriptions.Item label={t('Login count')}>
                 {user.loginCount}
               </Descriptions.Item>
@@ -205,6 +222,14 @@ export function UserInfo({ user }: { user: UserWithPermissionsAndRoles }) {
               </Descriptions.Item>
             </Descriptions>
           </Collapse.Panel>
+          {isFeatureEnabled(FeatureFlag.FabApiKeyEnabled) && (
+            <Collapse.Panel
+              header={<DescriptionTitle>{t('API Keys')}</DescriptionTitle>}
+              key="apiKeys"
+            >
+              <ApiKeyList />
+            </Collapse.Panel>
+          )}
         </Collapse>
       </DescriptionsContainer>
       {modalState.resetPassword && (
diff --git a/superset-frontend/src/setup/setupApp.ts b/superset-frontend/src/setup/setupApp.ts
index 077ca6656d5..23bd5780231 100644
--- a/superset-frontend/src/setup/setupApp.ts
+++ b/superset-frontend/src/setup/setupApp.ts
@@ -71,12 +71,12 @@ export default function setupApp() {
     });
 
     // for language picker dropdown
-    $('#language-picker a').click(function (
+    $<HTMLAnchorElement>('#language-picker a').click(function (
       ev: JQuery.ClickEvent<
-        HTMLLinkElement,
+        HTMLAnchorElement,
         null,
-        HTMLLinkElement,
-        HTMLLinkElement
+        HTMLAnchorElement,
+        HTMLAnchorElement
       >,
     ) {
       ev.preventDefault();
diff --git a/superset-frontend/src/theme/ThemeProvider.tsx b/superset-frontend/src/theme/ThemeProvider.tsx
index 64d8a2930d2..ab1beb80289 100644
--- a/superset-frontend/src/theme/ThemeProvider.tsx
+++ b/superset-frontend/src/theme/ThemeProvider.tsx
@@ -79,7 +79,8 @@ export function SupersetThemeProvider({
   // setCrudTheme removed - dashboards should NOT modify the global controller
 
   const setTemporaryTheme = useCallback(
-    (config: AnyThemeConfig) => themeController.setTemporaryTheme(config),
+    (config: AnyThemeConfig, themeId?: number | null) =>
+      themeController.setTemporaryTheme(config, themeId),
     [themeController],
   );
 
diff --git a/superset-frontend/src/theme/tests/ThemeProvider.test.tsx b/superset-frontend/src/theme/tests/ThemeProvider.test.tsx
index eeabdfbe0b2..d685d254ddc 100644
--- a/superset-frontend/src/theme/tests/ThemeProvider.test.tsx
+++ b/superset-frontend/src/theme/tests/ThemeProvider.test.tsx
@@ -81,6 +81,15 @@ describe('SupersetThemeProvider', () => {
       onChange: jest.fn().mockReturnValue(jest.fn()),
       canUpdateTheme: jest.fn().mockReturnValue(true),
       canUpdateMode: jest.fn().mockReturnValue(true),
+      setTemporaryTheme: jest.fn(),
+      clearLocalOverrides: jest.fn(),
+      getCurrentCrudThemeId: jest.fn().mockReturnValue(null),
+      hasDevOverride: jest.fn().mockReturnValue(false),
+      canSetMode: jest.fn().mockReturnValue(true),
+      canSetTheme: jest.fn().mockReturnValue(true),
+      canDetectOSPreference: jest.fn().mockReturnValue(true),
+      createDashboardThemeProvider: jest.fn(),
+      getAppliedThemeId: jest.fn().mockReturnValue(null),
       destroy: jest.fn(),
     } as unknown as jest.Mocked<ThemeController>;
 
@@ -242,5 +251,29 @@ describe('SupersetThemeProvider', () => {
 
       expect(mockThemeController.resetTheme).toHaveBeenCalled();
     });
+
+    test('should call setTemporaryTheme with config and themeId when invoked', () => {
+      const wrapper = createWrapper(mockThemeController);
+
+      const { result } = renderHook((): ThemeContextType => useThemeContext(), {
+        wrapper,
+      });
+
+      const tempTheme = {
+        token: {
+          colorPrimary: '#00ff00',
+          colorBgBase: '#ffffff',
+        },
+      };
+
+      act(() => {
+        result.current.setTemporaryTheme(tempTheme, 42);
+      });
+
+      expect(mockThemeController.setTemporaryTheme).toHaveBeenCalledWith(
+        tempTheme,
+        42,
+      );
+    });
   });
 });
diff --git a/superset-frontend/src/theme/utils/antdTokenNames.test.ts b/superset-frontend/src/theme/utils/antdTokenNames.test.ts
index 4726dfc9b30..bff105ee88d 100644
--- a/superset-frontend/src/theme/utils/antdTokenNames.test.ts
+++ b/superset-frontend/src/theme/utils/antdTokenNames.test.ts
@@ -106,3 +106,31 @@ test('getAllValidTokenNames includes known Ant Design tokens', () => {
   expect(result.antdTokens).toContain('fontSize');
   expect(result.antdTokens).toContain('padding');
 });
+
+test('label variant tokens are recognized as valid Superset custom tokens', () => {
+  const labelTokens = [
+    // Published/Draft
+    'labelPublishedColor',
+    'labelPublishedBg',
+    'labelPublishedBorderColor',
+    'labelPublishedIconColor',
+    'labelDraftColor',
+    'labelDraftBg',
+    'labelDraftBorderColor',
+    'labelDraftIconColor',
+    // Dataset type
+    'labelDatasetPhysicalColor',
+    'labelDatasetPhysicalBg',
+    'labelDatasetPhysicalBorderColor',
+    'labelDatasetPhysicalIconColor',
+    'labelDatasetVirtualColor',
+    'labelDatasetVirtualBg',
+    'labelDatasetVirtualBorderColor',
+    'labelDatasetVirtualIconColor',
+  ];
+
+  labelTokens.forEach(token => {
+    expect(isValidTokenName(token)).toBe(true);
+    expect(isSupersetCustomToken(token)).toBe(true);
+  });
+});
diff --git a/superset-frontend/src/theme/utils/antdTokenNames.ts b/superset-frontend/src/theme/utils/antdTokenNames.ts
index 567296c248a..0349d682c4e 100644
--- a/superset-frontend/src/theme/utils/antdTokenNames.ts
+++ b/superset-frontend/src/theme/utils/antdTokenNames.ts
@@ -47,6 +47,40 @@ const SUPERSET_CUSTOM_TOKENS: Set<string> = new Set([
 
   // Font loading
   'fontUrls',
+
+  // Label variant tokens — Published/Draft (dashboard status)
+  'labelPublishedColor',
+  'labelPublishedBg',
+  'labelPublishedBorderColor',
+  'labelPublishedIconColor',
+  'labelDraftColor',
+  'labelDraftBg',
+  'labelDraftBorderColor',
+  'labelDraftIconColor',
+
+  // Label variant tokens — Dataset type (Physical/Virtual)
+  'labelDatasetPhysicalColor',
+  'labelDatasetPhysicalBg',
+  'labelDatasetPhysicalBorderColor',
+  'labelDatasetPhysicalIconColor',
+  'labelDatasetVirtualColor',
+  'labelDatasetVirtualBg',
+  'labelDatasetVirtualBorderColor',
+  'labelDatasetVirtualIconColor',
+
+  // Editor tokens
+  'colorEditorSelection',
+
+  // Secondary button tokens
+  'buttonSecondaryColor',
+  'buttonSecondaryBg',
+  'buttonSecondaryBorderColor',
+  'buttonSecondaryHoverColor',
+  'buttonSecondaryHoverBg',
+  'buttonSecondaryHoverBorderColor',
+  'buttonSecondaryActiveColor',
+  'buttonSecondaryActiveBg',
+  'buttonSecondaryActiveBorderColor',
 ]);
 
 /**
diff --git a/superset-frontend/src/types/bootstrapTypes.ts b/superset-frontend/src/types/bootstrapTypes.ts
index daf8f46bacc..610767c389a 100644
--- a/superset-frontend/src/types/bootstrapTypes.ts
+++ b/superset-frontend/src/types/bootstrapTypes.ts
@@ -55,6 +55,7 @@ export interface PermissionsAndRoles {
     datasource_access?: string[];
   };
   roles: UserRoles;
+  groups: string[];
 }
 
 export type UserWithPermissionsAndRoles = User & PermissionsAndRoles;
diff --git a/superset-frontend/src/utils/copy.ts b/superset-frontend/src/utils/copy.ts
index 0980f2ab170..91e4e726e27 100644
--- a/superset-frontend/src/utils/copy.ts
+++ b/superset-frontend/src/utils/copy.ts
@@ -17,17 +17,12 @@
  * under the License.
  */
 
-import { isSafari } from './common';
+const isSafari = (): boolean => {
+  const { userAgent } = navigator;
+  return Boolean(userAgent && /^((?!chrome|android).)*safari/i.test(userAgent));
+};
 
-// Use the new Clipboard API if the browser supports it
 const copyTextWithClipboardApi = async (getText: () => Promise<string>) => {
-  // Safari (WebKit) does not support delayed generation of clipboard.
-  // This means that writing to the clipboard, from the moment the user
-  // interacts with the app, must be instantaneous.
-  // However, neither writeText nor write accepts a Promise, so
-  // we need to create a ClipboardItem that accepts said Promise to
-  // delay the text generation, as needed.
-  // Source: https://bugs.webkit.org/show_bug.cgi?id=222262P
   if (isSafari()) {
     try {
       const clipboardItem = new ClipboardItem({
@@ -35,61 +30,54 @@ const copyTextWithClipboardApi = async (getText: () => Promise<string>) => {
       });
       await navigator.clipboard.write([clipboardItem]);
     } catch {
-      // Fallback to default clipboard API implementation
       const text = await getText();
       await navigator.clipboard.writeText(text);
     }
   } else {
-    // For Blink, the above method won't work, but we can use the
-    // default (intended) API, since the delayed generation of the
-    // clipboard is now supported.
-    // Source: https://bugs.chromium.org/p/chromium/issues/detail?id=1014310
     const text = await getText();
     await navigator.clipboard.writeText(text);
   }
 };
 
 const copyTextToClipboard = (getText: () => Promise<string>) =>
-  copyTextWithClipboardApi(getText)
-    // If the Clipboard API is not supported, fallback to the older method.
-    .catch(() =>
-      getText().then(
-        text =>
-          new Promise<void>((resolve, reject) => {
-            const selection: Selection | null = document.getSelection();
-            if (selection) {
-              selection.removeAllRanges();
-              const range = document.createRange();
-              const span = document.createElement('span');
-              span.textContent = text;
-              span.style.position = 'fixed';
-              span.style.top = '0';
-              span.style.clip = 'rect(0, 0, 0, 0)';
-              span.style.whiteSpace = 'pre';
+  copyTextWithClipboardApi(getText).catch(() =>
+    getText().then(
+      text =>
+        new Promise<void>((resolve, reject) => {
+          const selection: Selection | null = document.getSelection();
+          if (selection) {
+            selection.removeAllRanges();
+            const range = document.createRange();
+            const span = document.createElement('span');
+            span.textContent = text;
+            span.style.position = 'fixed';
+            span.style.top = '0';
+            span.style.clip = 'rect(0, 0, 0, 0)';
+            span.style.whiteSpace = 'pre';
 
-              document.body.appendChild(span);
-              range.selectNode(span);
-              selection.addRange(range);
+            document.body.appendChild(span);
+            range.selectNode(span);
+            selection.addRange(range);
 
-              try {
-                if (!document.execCommand('copy')) {
-                  reject();
-                }
-              } catch (err) {
+            try {
+              if (!document.execCommand('copy')) {
                 reject();
               }
-
-              document.body.removeChild(span);
-              if (selection.removeRange) {
-                selection.removeRange(range);
-              } else {
-                selection.removeAllRanges();
-              }
+            } catch (err) {
+              reject();
             }
 
-            resolve();
-          }),
-      ),
-    );
+            document.body.removeChild(span);
+            if (selection.removeRange) {
+              selection.removeRange(range);
+            } else {
+              selection.removeAllRanges();
+            }
+          }
+
+          resolve();
+        }),
+    ),
+  );
 
 export default copyTextToClipboard;
diff --git a/superset-frontend/src/utils/downloadAsImage.test.ts b/superset-frontend/src/utils/downloadAsImage.test.ts
new file mode 100644
index 00000000000..0959a8eaa22
--- /dev/null
+++ b/superset-frontend/src/utils/downloadAsImage.test.ts
@@ -0,0 +1,685 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+import domToImage from 'dom-to-image-more';
+import { addWarningToast } from 'src/components/MessageToasts/actions';
+import downloadAsImageOptimized, {
+  waitForStableScrollHeight,
+} from './downloadAsImage';
+
+jest.mock('dom-to-image-more', () => ({
+  __esModule: true,
+  default: { toJpeg: jest.fn() },
+}));
+
+jest.mock('src/components/MessageToasts/actions', () => ({
+  addWarningToast: jest.fn(),
+}));
+
+jest.mock('@apache-superset/core/translation', () => ({
+  t: (str: string) => str,
+}));
+
+const mockToJpeg = domToImage.toJpeg as jest.Mock;
+const mockAddWarningToast = addWarningToast as jest.Mock;
+
+// document.fonts.ready is not implemented in jsdom; provide a resolved promise
+Object.defineProperty(document, 'fonts', {
+  value: { ready: Promise.resolve() },
+  configurable: true,
+});
+
+// Build a synthetic React event that resolves `currentTarget.closest()` to a given element
+function syntheticEventFor(el: Element) {
+  return { currentTarget: { closest: () => el } } as any;
+}
+
+// Build and attach an ag-grid DOM structure; returns cleanup function
+function buildAgGridElement() {
+  const container = document.createElement('div');
+  const agContainer = document.createElement('div');
+  agContainer.setAttribute('data-themed-ag-grid', 'true');
+  const agRootWrapper = document.createElement('div');
+  agRootWrapper.className = 'ag-root-wrapper';
+  agContainer.appendChild(agRootWrapper);
+  container.appendChild(agContainer);
+  document.body.appendChild(container);
+  return {
+    container,
+    agContainer,
+    agRootWrapper,
+    cleanup: () => document.body.removeChild(container),
+  };
+}
+
+// Attach a mock GridApi and set the first-data-rendered flag on the container
+function attachMockApi(
+  agContainer: HTMLElement,
+  { firstDataRendered = true } = {},
+) {
+  const api = { setGridOption: jest.fn() };
+  (agContainer as any)._agGridApi = api;
+  (agContainer as any)._agGridFirstDataRendered = firstDataRendered;
+  return api;
+}
+
+beforeEach(() => {
+  jest.clearAllMocks();
+  mockToJpeg.mockResolvedValue('data:image/jpeg;base64,test');
+});
+
+afterEach(() => {
+  jest.useRealTimers();
+});
+
+test('waitForStableScrollHeight resolves after 2 consecutive stable scrollHeight readings', async () => {
+  jest.useFakeTimers();
+  const el = document.createElement('div');
+  Object.defineProperty(el, 'scrollHeight', {
+    get: () => 100,
+    configurable: true,
+  });
+
+  const promise = waitForStableScrollHeight(el);
+  await jest.runAllTimersAsync();
+  await expect(promise).resolves.toBeUndefined();
+
+  jest.useRealTimers();
+});
+
+test('waitForStableScrollHeight respects a custom minStablePolls', async () => {
+  jest.useFakeTimers();
+  const el = document.createElement('div');
+  Object.defineProperty(el, 'scrollHeight', {
+    get: () => 100,
+    configurable: true,
+  });
+
+  // With minStablePolls=5 the promise must not resolve after just 2 polls.
+  const promise = waitForStableScrollHeight(el, 5000, 5);
+  jest.advanceTimersByTime(300);
+  let resolved = false;
+  promise.then(() => {
+    resolved = true;
+  });
+  // Flush microtasks so the .then() above has a chance to run if resolved
+  await Promise.resolve();
+  expect(resolved).toBe(false);
+
+  // Now run the remaining polls (2 more stable polls → total 5) and confirm resolution.
+  jest.advanceTimersByTime(300);
+  await expect(promise).resolves.toBeUndefined();
+
+  jest.useRealTimers();
+});
+
+test('waitForStableScrollHeight resets stable count when height changes mid-poll', async () => {
+  jest.useFakeTimers();
+  const el = document.createElement('div');
+  let height = 100;
+  Object.defineProperty(el, 'scrollHeight', {
+    get: () => height,
+    configurable: true,
+  });
+
+  const promise = waitForStableScrollHeight(el);
+  // Poll 1: height is 100, stableCount becomes 1
+  jest.advanceTimersByTime(100);
+  // Height changes — stable counter must reset
+  height = 200;
+  // Run until new height stabilises (2 consecutive 100 ms polls)
+  jest.advanceTimersByTime(300);
+  await expect(promise).resolves.toBeUndefined();
+
+  jest.useRealTimers();
+});
+
+test('waitForStableScrollHeight resolves after maxMs even if height never stabilises', async () => {
+  jest.useFakeTimers();
+  const el = document.createElement('div');
+  let height = 0;
+  Object.defineProperty(el, 'scrollHeight', {
+    // Always increments so stableFrames never reaches 4
+    get: () => {
+      height += 1;
+      return height;
+    },
+    configurable: true,
+  });
+
+  const promise = waitForStableScrollHeight(el, 200);
+  jest.advanceTimersByTime(400); // past the 200 ms deadline
+  await expect(promise).resolves.toBeUndefined();
+
+  jest.useRealTimers();
+});
+
+test('waitForStableScrollHeight resolves if scrollHeight throws (element removed from DOM)', async () => {
+  jest.useFakeTimers();
+  const el = document.createElement('div');
+  let shouldThrow = false;
+  Object.defineProperty(el, 'scrollHeight', {
+    get: () => {
+      if (shouldThrow) throw new Error('element detached');
+      return 100;
+    },
+    configurable: true,
+  });
+
+  const promise = waitForStableScrollHeight(el);
+  jest.advanceTimersByTime(100); // poll 1: stable, stableCount = 1
+  shouldThrow = true; // simulate DOM removal
+  jest.advanceTimersByTime(100); // poll 2: throws → resolves immediately
+  await expect(promise).resolves.toBeUndefined();
+
+  jest.useRealTimers();
+});
+
+test('shows warning toast when element is not found', async () => {
+  const handler = downloadAsImageOptimized('div', 'test');
+  // closest() returning null simulates a selector that matches nothing
+  await handler({ currentTarget: { closest: () => null } } as any);
+
+  expect(mockAddWarningToast).toHaveBeenCalledWith(
+    'Image download failed, please refresh and try again.',
+  );
+  expect(mockToJpeg).not.toHaveBeenCalled();
+});
+
+test('shows "still loading" toast when grid has not yet rendered its first rows', async () => {
+  const { container, agContainer, cleanup } = buildAgGridElement();
+  attachMockApi(agContainer, { firstDataRendered: false });
+
+  const handler = downloadAsImageOptimized('div', 'My Chart');
+  await handler(syntheticEventFor(container));
+
+  expect(mockAddWarningToast).toHaveBeenCalledWith(
+    'The chart is still loading. Please wait a moment and try again.',
+  );
+  expect(mockToJpeg).not.toHaveBeenCalled();
+
+  cleanup();
+});
+
+test('switches to print layout, captures JPEG, and restores normal layout', async () => {
+  jest.useFakeTimers();
+  const { container, agContainer, cleanup } = buildAgGridElement();
+  const api = attachMockApi(agContainer);
+
+  const handler = downloadAsImageOptimized('div', 'My Chart');
+  const exportPromise = handler(syntheticEventFor(container));
+  await jest.runAllTimersAsync();
+  await exportPromise;
+
+  expect(api.setGridOption).toHaveBeenCalledWith('domLayout', 'print');
+  expect(mockToJpeg).toHaveBeenCalledWith(
+    expect.any(HTMLElement),
+    expect.objectContaining({ quality: 0.95 }),
+  );
+  expect(api.setGridOption).toHaveBeenCalledWith('domLayout', 'normal');
+
+  cleanup();
+  jest.useRealTimers();
+});
+
+test('restores normal layout in finally even when image capture throws', async () => {
+  jest.useFakeTimers();
+  mockToJpeg.mockRejectedValue(new Error('capture failed'));
+  const { container, agContainer, cleanup } = buildAgGridElement();
+  const api = attachMockApi(agContainer);
+
+  const handler = downloadAsImageOptimized('div', 'My Chart');
+  const exportPromise = handler(syntheticEventFor(container));
+  await jest.runAllTimersAsync();
+  await exportPromise;
+
+  expect(api.setGridOption).toHaveBeenCalledWith('domLayout', 'normal');
+  expect(mockAddWarningToast).toHaveBeenCalledWith(
+    'Image download failed, please refresh and try again.',
+  );
+
+  cleanup();
+  jest.useRealTimers();
+});
+
+test('still captures image when _agGridApi is absent (graceful degradation)', async () => {
+  jest.useFakeTimers();
+  const { container, agContainer, cleanup } = buildAgGridElement();
+  // No API — only the first-data-rendered flag
+  (agContainer as any)._agGridFirstDataRendered = true;
+
+  const handler = downloadAsImageOptimized('div', 'My Chart');
+  const exportPromise = handler(syntheticEventFor(container));
+  await jest.runAllTimersAsync();
+  await exportPromise;
+
+  expect(mockToJpeg).toHaveBeenCalled();
+  expect(mockAddWarningToast).not.toHaveBeenCalled();
+
+  cleanup();
+  jest.useRealTimers();
+});
+
+test('resolves ag-cell min-height to row pixel height when content fits within it', async () => {
+  jest.useFakeTimers();
+  const { container, agContainer, agRootWrapper, cleanup } =
+    buildAgGridElement();
+  attachMockApi(agContainer);
+
+  // Build a row with a cell inside the grid
+  const row = document.createElement('div');
+  row.className = 'ag-row';
+  Object.defineProperty(row, 'offsetHeight', {
+    get: () => 32,
+    configurable: true,
+  });
+  const cell = document.createElement('div');
+  cell.className = 'ag-cell';
+  row.appendChild(cell);
+  agRootWrapper.appendChild(row);
+
+  let capturedMinHeight = '';
+  mockToJpeg.mockImplementation(() => {
+    capturedMinHeight = cell.style.minHeight;
+    return Promise.resolve('data:image/jpeg;base64,test');
+  });
+
+  const handler = downloadAsImageOptimized('div', 'My Chart');
+  const exportPromise = handler(syntheticEventFor(container));
+  await jest.runAllTimersAsync();
+  await exportPromise;
+
+  // Cell min-height was resolved to the row's pixel height during capture
+  expect(capturedMinHeight).toBe('32px');
+  // Cell min-height was restored after capture
+  expect(cell.style.minHeight).toBe('');
+
+  cleanup();
+  jest.useRealTimers();
+});
+
+test('uses cell scrollHeight when it exceeds row offsetHeight (stale row heights for off-screen rows)', async () => {
+  jest.useFakeTimers();
+  const { container, agContainer, agRootWrapper, cleanup } =
+    buildAgGridElement();
+  attachMockApi(agContainer);
+
+  const row = document.createElement('div');
+  row.className = 'ag-row';
+  Object.defineProperty(row, 'offsetHeight', {
+    get: () => 25,
+    configurable: true,
+  }); // stale default
+  const cell = document.createElement('div');
+  cell.className = 'ag-cell';
+  Object.defineProperty(cell, 'scrollHeight', {
+    get: () => 120,
+    configurable: true,
+  }); // actual content
+  row.appendChild(cell);
+  agRootWrapper.appendChild(row);
+
+  let capturedMinHeight = '';
+  mockToJpeg.mockImplementation(() => {
+    capturedMinHeight = cell.style.minHeight;
+    return Promise.resolve('data:image/jpeg;base64,test');
+  });
+
+  const handler = downloadAsImageOptimized('div', 'My Chart');
+  const exportPromise = handler(syntheticEventFor(container));
+  await jest.runAllTimersAsync();
+  await exportPromise;
+
+  // Uses the larger content height, not the stale row height
+  expect(capturedMinHeight).toBe('120px');
+  expect(cell.style.minHeight).toBe('');
+
+  cleanup();
+  jest.useRealTimers();
+});
+
+test('derives image width from getColumnState by summing visible column pixel widths', async () => {
+  jest.useFakeTimers();
+  const { container, agContainer, cleanup } = buildAgGridElement();
+  const api = attachMockApi(agContainer);
+
+  // 3 visible columns (200 + 350 + 150 = 700 px) plus one hidden column excluded from sum
+  (api as any).getColumnState = jest.fn(() => [
+    { colId: 'col1', width: 200, hide: false },
+    { colId: 'col2', width: 350, hide: false },
+    { colId: 'col3', width: 150, hide: false },
+    { colId: 'col4', width: 999, hide: true },
+  ]);
+  (api as any).applyColumnState = jest.fn();
+
+  let capturedWidth: number | undefined;
+  mockToJpeg.mockImplementation(
+    (_el: HTMLElement, opts: { width?: number }) => {
+      capturedWidth = opts.width;
+      return Promise.resolve('data:image/jpeg;base64,test');
+    },
+  );
+
+  const handler = downloadAsImageOptimized('div', 'My Chart');
+  const exportPromise = handler(syntheticEventFor(container));
+  await jest.runAllTimersAsync();
+  await exportPromise;
+
+  // Width passed to toJpeg is the sum of visible column widths, not agRootWrapper.offsetWidth
+  expect(capturedWidth).toBe(700);
+  expect((api as any).getColumnState).toHaveBeenCalled();
+
+  cleanup();
+  jest.useRealTimers();
+});
+
+test('restores column pixel widths via applyColumnState with flex stripped after print layout', async () => {
+  jest.useFakeTimers();
+  const { container, agContainer, cleanup } = buildAgGridElement();
+  const api = attachMockApi(agContainer);
+
+  const savedState = [
+    { colId: 'col1', width: 300, flex: 1, hide: false },
+    { colId: 'col2', width: 400, flex: 1.5, hide: false },
+  ];
+  (api as any).getColumnState = jest.fn(() => savedState);
+  (api as any).applyColumnState = jest.fn();
+
+  const handler = downloadAsImageOptimized('div', 'My Chart');
+  const exportPromise = handler(syntheticEventFor(container));
+  await jest.runAllTimersAsync();
+  await exportPromise;
+
+  // flex must be stripped (set to null) so pixel width is used, not flex ratio
+  expect((api as any).applyColumnState).toHaveBeenCalledWith({
+    state: [
+      { colId: 'col1', width: 300, flex: null },
+      { colId: 'col2', width: 400, flex: null },
+    ],
+    applyOrder: false,
+  });
+
+  cleanup();
+  jest.useRealTimers();
+});
+
+test('restores original column state with flex in finally after capture', async () => {
+  jest.useFakeTimers();
+  const { container, agContainer, cleanup } = buildAgGridElement();
+  const api = attachMockApi(agContainer);
+
+  const savedState = [
+    { colId: 'col1', width: 300, flex: 1, hide: false },
+    { colId: 'col2', width: 400, flex: 1.5, hide: false },
+  ];
+  (api as any).getColumnState = jest.fn(() => savedState);
+  (api as any).applyColumnState = jest.fn();
+
+  const handler = downloadAsImageOptimized('div', 'My Chart');
+  const exportPromise = handler(syntheticEventFor(container));
+  await jest.runAllTimersAsync();
+  await exportPromise;
+
+  // Last call must restore the original state (with flex) so the live grid is unaffected
+  expect((api as any).applyColumnState.mock.calls.at(-1)[0]).toEqual({
+    state: savedState,
+    applyOrder: false,
+  });
+
+  cleanup();
+  jest.useRealTimers();
+});
+
+test('falls back to agRootWrapper.offsetWidth when getColumnState returns no visible columns', async () => {
+  jest.useFakeTimers();
+  const { container, agContainer, agRootWrapper, cleanup } =
+    buildAgGridElement();
+  const api = attachMockApi(agContainer);
+
+  // All columns hidden → visible sum is 0 → fall back to offsetWidth
+  (api as any).getColumnState = jest.fn(() => [
+    { colId: 'col1', width: 500, hide: true },
+  ]);
+  (api as any).applyColumnState = jest.fn();
+
+  Object.defineProperty(agRootWrapper, 'offsetWidth', {
+    get: () => 600,
+    configurable: true,
+  });
+
+  let capturedWidth: number | undefined;
+  mockToJpeg.mockImplementation(
+    (_el: HTMLElement, opts: { width?: number }) => {
+      capturedWidth = opts.width;
+      return Promise.resolve('data:image/jpeg;base64,test');
+    },
+  );
+
+  const handler = downloadAsImageOptimized('div', 'My Chart');
+  const exportPromise = handler(syntheticEventFor(container));
+  await jest.runAllTimersAsync();
+  await exportPromise;
+
+  expect(capturedWidth).toBe(600);
+
+  cleanup();
+  jest.useRealTimers();
+});
+
+test('restores ag-cell styles after capture even when toJpeg throws', async () => {
+  jest.useFakeTimers();
+  mockToJpeg.mockRejectedValue(new Error('capture failed'));
+  const { container, agContainer, agRootWrapper, cleanup } =
+    buildAgGridElement();
+  attachMockApi(agContainer);
+
+  const row = document.createElement('div');
+  row.className = 'ag-row';
+  Object.defineProperty(row, 'offsetHeight', {
+    get: () => 28,
+    configurable: true,
+  });
+  const cell = document.createElement('div');
+  cell.className = 'ag-cell';
+  cell.style.minHeight = '100%';
+  cell.style.overflow = 'visible';
+  row.appendChild(cell);
+  agRootWrapper.appendChild(row);
+
+  const handler = downloadAsImageOptimized('div', 'My Chart');
+  const exportPromise = handler(syntheticEventFor(container));
+  await jest.runAllTimersAsync();
+  await exportPromise;
+
+  // Styles restored to original values despite capture error
+  expect(cell.style.minHeight).toBe('100%');
+  expect(cell.style.overflow).toBe('visible');
+
+  cleanup();
+  jest.useRealTimers();
+});
+
+test('calls resetRowHeights after print layout to force ag-grid to re-measure rows with stale cached heights', async () => {
+  jest.useFakeTimers();
+  const { container, agContainer, cleanup } = buildAgGridElement();
+  const api = attachMockApi(agContainer);
+  (api as any).resetRowHeights = jest.fn();
+
+  const handler = downloadAsImageOptimized('div', 'My Chart');
+  const exportPromise = handler(syntheticEventFor(container));
+  await jest.runAllTimersAsync();
+  await exportPromise;
+
+  expect(api.setGridOption).toHaveBeenCalledWith('domLayout', 'print');
+  expect((api as any).resetRowHeights).toHaveBeenCalled();
+  expect(api.setGridOption).toHaveBeenCalledWith('domLayout', 'normal');
+
+  cleanup();
+  jest.useRealTimers();
+});
+
+test('does not throw when resetRowHeights is absent from the api', async () => {
+  jest.useFakeTimers();
+  const { container, agContainer, cleanup } = buildAgGridElement();
+  attachMockApi(agContainer); // api has only setGridOption, no resetRowHeights
+
+  const handler = downloadAsImageOptimized('div', 'My Chart');
+  const exportPromise = handler(syntheticEventFor(container));
+  await jest.runAllTimersAsync();
+  await expect(exportPromise).resolves.toBeUndefined();
+
+  cleanup();
+  jest.useRealTimers();
+});
+
+test('falls through to clone path for dashboard export with a single ag-grid chart', async () => {
+  const dashboard = document.createElement('div');
+  dashboard.className = 'dashboard';
+
+  const agContainer = document.createElement('div');
+  agContainer.setAttribute('data-themed-ag-grid', 'true');
+  const agRootWrapper = document.createElement('div');
+  agRootWrapper.className = 'ag-root-wrapper';
+  agContainer.appendChild(agRootWrapper);
+  (agContainer as any)._agGridFirstDataRendered = true;
+  dashboard.appendChild(agContainer);
+  document.body.appendChild(dashboard);
+
+  const handler = downloadAsImageOptimized('.dashboard', 'My Dashboard', true);
+  await handler({ currentTarget: {} } as any);
+
+  expect(mockToJpeg).toHaveBeenCalledWith(
+    expect.any(HTMLElement),
+    expect.objectContaining({ quality: 0.95 }),
+  );
+  expect(mockAddWarningToast).not.toHaveBeenCalled();
+
+  document.body.removeChild(dashboard);
+});
+
+test('falls through to clone path for dashboard export with multiple ag-grid charts', async () => {
+  const dashboard = document.createElement('div');
+  dashboard.className = 'dashboard';
+
+  for (let i = 0; i < 2; i += 1) {
+    const agContainer = document.createElement('div');
+    agContainer.setAttribute('data-themed-ag-grid', 'true');
+    const agRootWrapper = document.createElement('div');
+    agRootWrapper.className = 'ag-root-wrapper';
+    agContainer.appendChild(agRootWrapper);
+    (agContainer as any)._agGridFirstDataRendered = true;
+    dashboard.appendChild(agContainer);
+  }
+  document.body.appendChild(dashboard);
+
+  const handler = downloadAsImageOptimized('.dashboard', 'My Dashboard', true);
+  await handler({ currentTarget: {} } as any);
+
+  expect(mockToJpeg).toHaveBeenCalledWith(
+    expect.any(HTMLElement),
+    expect.objectContaining({ quality: 0.95 }),
+  );
+  expect(mockAddWarningToast).not.toHaveBeenCalled();
+
+  document.body.removeChild(dashboard);
+});
+
+test('captures JPEG for non-ag-grid elements via the clone path', async () => {
+  const container = document.createElement('div');
+  document.body.appendChild(container);
+
+  const handler = downloadAsImageOptimized('div', 'Bar Chart');
+  await handler(syntheticEventFor(container));
+
+  expect(mockToJpeg).toHaveBeenCalledWith(
+    expect.any(HTMLElement),
+    expect.objectContaining({ quality: 0.95 }),
+  );
+  expect(mockAddWarningToast).not.toHaveBeenCalled();
+
+  document.body.removeChild(container);
+});
+
+test('shows warning toast when clone capture throws', async () => {
+  mockToJpeg.mockRejectedValue(new Error('clone capture failed'));
+  const container = document.createElement('div');
+  document.body.appendChild(container);
+
+  const handler = downloadAsImageOptimized('div', 'Bar Chart');
+  await handler(syntheticEventFor(container));
+
+  expect(mockAddWarningToast).toHaveBeenCalledWith(
+    'Image download failed, please refresh and try again.',
+  );
+
+  document.body.removeChild(container);
+});
+
+test('ag-grid path uses theme colorBgContainer as background', async () => {
+  jest.useFakeTimers();
+  const { container, agContainer, cleanup } = buildAgGridElement();
+  attachMockApi(agContainer);
+
+  const theme = { colorBgContainer: '#1a1a2e' } as any;
+  const handler = downloadAsImageOptimized('div', 'My Chart', false, theme);
+  const exportPromise = handler(syntheticEventFor(container));
+  await jest.runAllTimersAsync();
+  await exportPromise;
+
+  expect(mockToJpeg).toHaveBeenCalledWith(
+    expect.any(HTMLElement),
+    expect.objectContaining({ bgcolor: '#1a1a2e' }),
+  );
+
+  cleanup();
+  jest.useRealTimers();
+});
+
+test('ag-grid path falls back to white background when theme is absent', async () => {
+  jest.useFakeTimers();
+  const { container, agContainer, cleanup } = buildAgGridElement();
+  attachMockApi(agContainer);
+
+  const handler = downloadAsImageOptimized('div', 'My Chart');
+  const exportPromise = handler(syntheticEventFor(container));
+  await jest.runAllTimersAsync();
+  await exportPromise;
+
+  expect(mockToJpeg).toHaveBeenCalledWith(
+    expect.any(HTMLElement),
+    expect.objectContaining({ bgcolor: undefined }),
+  );
+
+  cleanup();
+  jest.useRealTimers();
+});
+
+test('clone path falls back to white background when theme is absent', async () => {
+  const container = document.createElement('div');
+  document.body.appendChild(container);
+
+  const handler = downloadAsImageOptimized('div', 'Bar Chart');
+  await handler(syntheticEventFor(container));
+
+  expect(mockToJpeg).toHaveBeenCalledWith(
+    expect.any(HTMLElement),
+    expect.objectContaining({ bgcolor: undefined }),
+  );
+
+  document.body.removeChild(container);
+});
diff --git a/superset-frontend/src/utils/downloadAsImage.tsx b/superset-frontend/src/utils/downloadAsImage.tsx
index ceea0f47325..db55a35e036 100644
--- a/superset-frontend/src/utils/downloadAsImage.tsx
+++ b/superset-frontend/src/utils/downloadAsImage.tsx
@@ -19,13 +19,17 @@
 import { SyntheticEvent } from 'react';
 import domToImage from 'dom-to-image-more';
 import { kebabCase } from 'lodash';
-// eslint-disable-next-line no-restricted-imports
 import { t } from '@apache-superset/core/translation';
 import { SupersetTheme } from '@apache-superset/core/theme';
 import { addWarningToast } from 'src/components/MessageToasts/actions';
+import type { AgGridContainerElement } from '@superset-ui/core/components';
 
 const IMAGE_DOWNLOAD_QUALITY = 0.95;
 const TRANSPARENT_RGBA = 'transparent';
+const POLL_INTERVAL_MS = 100;
+
+// Tracks original cell styles to restore after capture
+type CellFixup = { el: HTMLElement; minHeight: string; overflow: string };
 
 /**
  * generate a consistent file stem from a description and date
@@ -80,6 +84,9 @@ const CRITICAL_STYLE_PROPERTIES = new Set([
   'table-layout',
   'vertical-align',
   'text-align',
+  'box-sizing',
+  'min-height',
+  'min-width',
 ]);
 
 const styleCache = new WeakMap<Element, CSSStyleDeclaration>();
@@ -262,6 +269,45 @@ const createEnhancedClone = (
   return { clone, cleanup };
 };
 
+// Polls until scrollHeight is stable for minStablePolls consecutive intervals or maxMs elapses.
+// ag-grid has no "layout settled" event, so polling is the recommended workaround.
+export const waitForStableScrollHeight = (
+  el: HTMLElement,
+  maxMs = 5000,
+  minStablePolls = 2,
+): Promise<void> =>
+  new Promise<void>(resolve => {
+    const deadline = Date.now() + maxMs;
+    let lastHeight = el.scrollHeight;
+    let stableCount = 0;
+
+    const poll = () => {
+      if (Date.now() >= deadline) {
+        resolve();
+        return;
+      }
+      try {
+        const h = el.scrollHeight;
+        if (h === lastHeight) {
+          stableCount += 1;
+          if (stableCount >= minStablePolls) {
+            resolve();
+            return;
+          }
+        } else {
+          stableCount = 0;
+          lastHeight = h;
+        }
+      } catch {
+        resolve(); // element removed from DOM
+        return;
+      }
+      setTimeout(poll, POLL_INTERVAL_MS);
+    };
+
+    setTimeout(poll, POLL_INTERVAL_MS);
+  });
+
 export default function downloadAsImageOptimized(
   selector: string,
   description: string,
@@ -280,6 +326,138 @@ export default function downloadAsImageOptimized(
       return;
     }
 
+    const filter = (node: Element) =>
+      typeof node.className === 'string'
+        ? !node.className.includes('mapboxgl-control-container') &&
+          !node.className.includes('header-controls')
+        : true;
+
+    // Only apply ag-grid path for single-chart captures.
+    // Skip entirely for dashboard-level exports (selector targets the .dashboard root).
+    const isDashboardCapture = (
+      elementToPrint as HTMLElement
+    ).classList.contains('dashboard');
+    const agContainers = isDashboardCapture
+      ? []
+      : elementToPrint.querySelectorAll('[data-themed-ag-grid]');
+    const agContainer =
+      agContainers.length === 1
+        ? (agContainers[0] as AgGridContainerElement)
+        : null;
+    const agRootWrapper = agContainer
+      ? (agContainer.querySelector('.ag-root-wrapper') as HTMLElement | null)
+      : null;
+
+    if (agContainer && agRootWrapper) {
+      const api = agContainer._agGridApi;
+      const isFirstDataRendered = agContainer._agGridFirstDataRendered === true;
+
+      if (!isFirstDataRendered) {
+        addWarningToast(
+          t('The chart is still loading. Please wait a moment and try again.'),
+        );
+        return;
+      }
+
+      // Capture resolved pixel widths before print layout can re-trigger sizeColumnsToFit.
+      // sizeColumnsToFit() sets flex (not pixel widths), so after print layout expands the
+      // container it recalculates column widths wider. We restore with flex: null to force
+      // pixel widths when calling applyColumnState after the layout switch.
+      const savedColumnState = api?.getColumnState?.();
+      const visibleColumnState =
+        savedColumnState?.filter(col => !col.hide) ?? [];
+      const originalWidth =
+        visibleColumnState.reduce((sum, col) => sum + (col.width ?? 0), 0) ||
+        agRootWrapper.offsetWidth;
+
+      // Chrome SVG foreignObject bug: % min-height resolves against canvas height,
+      // causing cells to expand to full image height and overlap adjacent rows.
+      const cellFixups: CellFixup[] = [];
+
+      try {
+        await document.fonts.ready;
+
+        if (api) {
+          api.setGridOption('domLayout', 'print');
+
+          // Wait for ResizeObserver + any triggered sizeColumnsToFit() to settle,
+          // then restore column widths before measurement.
+          await new Promise<void>(resolve =>
+            requestAnimationFrame(() => requestAnimationFrame(() => resolve())),
+          );
+
+          if (visibleColumnState.length > 0) {
+            api.applyColumnState?.({
+              state: visibleColumnState.map(col => ({
+                colId: col.colId,
+                width: col.width,
+                flex: null,
+              })),
+              applyOrder: false,
+            });
+          }
+
+          // Rows never scrolled into view have stale cached heights; remeasure all.
+          api.resetRowHeights?.();
+
+          // 5 polls × POLL_INTERVAL_MS = 500 ms; autoHeight rows batch-measure slowly.
+          await waitForStableScrollHeight(agRootWrapper, 5000, 5);
+        }
+
+        agRootWrapper.querySelectorAll('.ag-cell').forEach(cell => {
+          const el = cell as HTMLElement;
+          const rowHeight =
+            (el.parentElement as HTMLElement)?.offsetHeight ?? 0;
+          // scrollHeight catches any cells where resetRowHeights lagged behind.
+          const minH = Math.max(rowHeight, el.scrollHeight);
+          cellFixups.push({
+            el,
+            minHeight: el.style.minHeight,
+            overflow: el.style.overflow,
+          });
+          el.style.minHeight = minH > 0 ? `${minH}px` : '0px';
+          el.style.overflow = 'hidden';
+        });
+
+        const imageHeight = agRootWrapper.scrollHeight;
+
+        const dataUrl = await domToImage.toJpeg(agRootWrapper, {
+          bgcolor: theme?.colorBgContainer,
+          filter,
+          quality: IMAGE_DOWNLOAD_QUALITY,
+          height: imageHeight,
+          width: originalWidth,
+          cacheBust: true,
+        });
+
+        const link = document.createElement('a');
+        link.download = `${generateFileStem(description)}.jpg`;
+        link.href = dataUrl;
+        link.click();
+      } catch (error) {
+        console.error('Creating image failed', error);
+        addWarningToast(
+          t('Image download failed, please refresh and try again.'),
+        );
+      } finally {
+        cellFixups.forEach(({ el, minHeight, overflow }) => {
+          el.style.minHeight = minHeight;
+          el.style.overflow = overflow;
+        });
+        if (api) {
+          api.setGridOption('domLayout', 'normal');
+          if (savedColumnState) {
+            api.applyColumnState?.({
+              state: savedColumnState,
+              applyOrder: false,
+            });
+          }
+        }
+      }
+      return;
+    }
+
+    // All other chart types: use the clone-based approach
     let cleanup: (() => void) | null = null;
 
     try {
@@ -289,12 +467,6 @@ export default function downloadAsImageOptimized(
       );
       cleanup = cleanupFn;
 
-      const filter = (node: Element) =>
-        typeof node.className === 'string'
-          ? !node.className.includes('mapboxgl-control-container') &&
-            !node.className.includes('header-controls')
-          : true;
-
       const dataUrl = await domToImage.toJpeg(clone, {
         bgcolor: theme?.colorBgContainer,
         filter,
diff --git a/superset-frontend/src/utils/localStorageHelpers.ts b/superset-frontend/src/utils/localStorageHelpers.ts
index 61e1bbc3505..3c59b04b9c4 100644
--- a/superset-frontend/src/utils/localStorageHelpers.ts
+++ b/superset-frontend/src/utils/localStorageHelpers.ts
@@ -51,6 +51,7 @@ export enum LocalStorageKeys {
    */
   SqllabIsAutocompleteEnabled = 'sqllab__is_autocomplete_enabled',
   SqllabIsRenderHtmlEnabled = 'sqllab__is_render_html_enabled',
+  SqllabPinnedSchemas = 'sqllab__pinned_schemas',
   ExploreDataTableOriginalFormattedTimeColumns = 'explore__data_table_original_formatted_time_columns',
   DashboardCustomFilterBarWidths = 'dashboard__custom_filter_bar_widths',
   DashboardExploreContext = 'dashboard__explore_context',
@@ -71,6 +72,7 @@ export type LocalStorageValues = {
   homepage_activity_filter: TableTab | null;
   sqllab__is_autocomplete_enabled: boolean;
   sqllab__is_render_html_enabled: boolean;
+  sqllab__pinned_schemas: Record<string, string[]>;
   explore__data_table_original_formatted_time_columns: Record<string, string[]>;
   dashboard__custom_filter_bar_widths: Record<string, number>;
   dashboard__explore_context: Record<string, DashboardContextForExplore>;
diff --git a/superset-frontend/src/utils/urlUtils.test.ts b/superset-frontend/src/utils/urlUtils.test.ts
index e81d890d873..d995d539be4 100644
--- a/superset-frontend/src/utils/urlUtils.test.ts
+++ b/superset-frontend/src/utils/urlUtils.test.ts
@@ -22,7 +22,9 @@ import {
   parseUrl,
   toQueryString,
   getDashboardUrlParams,
+  getUrlParam,
 } from './urlUtils';
+import { URL_PARAMS } from '../constants';
 
 test('isUrlExternal', () => {
   expect(isUrlExternal('http://google.com')).toBeTruthy();
@@ -145,3 +147,45 @@ test('getDashboardUrlParams should exclude multiple parameters when provided', (
   // Restore original location
   window.location = originalLocation;
 });
+
+test('getUrlParam reads from window.location.search by default', () => {
+  const originalLocation = window.location;
+  Object.defineProperty(window, 'location', {
+    value: { ...originalLocation, search: '?dashboard_page_id=from-window' },
+    writable: true,
+    configurable: true,
+  });
+
+  expect(getUrlParam(URL_PARAMS.dashboardPageId)).toBe('from-window');
+
+  Object.defineProperty(window, 'location', {
+    value: originalLocation,
+    writable: true,
+    configurable: true,
+  });
+});
+
+test('getUrlParam uses provided search string instead of window.location.search (Safari race condition fix)', () => {
+  // Simulate Safari race condition: window.location.search is stale (empty),
+  // but the correct search string is passed in from React Router's useLocation()
+  const originalLocation = window.location;
+  Object.defineProperty(window, 'location', {
+    value: { ...originalLocation, search: '' },
+    writable: true,
+    configurable: true,
+  });
+
+  // Without the search override, window.location.search is stale — returns null (the bug)
+  expect(getUrlParam(URL_PARAMS.dashboardPageId)).toBeNull();
+
+  // With the search override (the fix), returns the correct value
+  expect(
+    getUrlParam(URL_PARAMS.dashboardPageId, '?dashboard_page_id=correct-id'),
+  ).toBe('correct-id');
+
+  Object.defineProperty(window, 'location', {
+    value: originalLocation,
+    writable: true,
+    configurable: true,
+  });
+});
diff --git a/superset-frontend/src/utils/urlUtils.ts b/superset-frontend/src/utils/urlUtils.ts
index 4b218201144..dedc20c8330 100644
--- a/superset-frontend/src/utils/urlUtils.ts
+++ b/superset-frontend/src/utils/urlUtils.ts
@@ -38,22 +38,35 @@ export type UrlParamType = 'string' | 'number' | 'boolean' | 'object' | 'rison';
 export type UrlParam = (typeof URL_PARAMS)[keyof typeof URL_PARAMS];
 export function getUrlParam(
   param: UrlParam & { type: 'string' },
+  search?: string,
 ): string | null;
 export function getUrlParam(
   param: UrlParam & { type: 'number' },
+  search?: string,
 ): number | null;
 export function getUrlParam(
   param: UrlParam & { type: 'boolean' },
+  search?: string,
 ): boolean | null;
 export function getUrlParam(
   param: UrlParam & { type: 'object' },
+  search?: string,
 ): object | null;
-export function getUrlParam(param: UrlParam & { type: 'rison' }): object | null;
+export function getUrlParam(
+  param: UrlParam & { type: 'rison' },
+  search?: string,
+): string | object | null;
 export function getUrlParam(
   param: UrlParam & { type: 'rison | string' },
+  search?: string,
 ): string | object | null;
-export function getUrlParam({ name, type }: UrlParam): unknown {
-  const urlParam = new URLSearchParams(window.location.search).get(name);
+export function getUrlParam(
+  { name, type }: UrlParam,
+  search?: string,
+): unknown {
+  const urlParam = new URLSearchParams(search ?? window.location.search).get(
+    name,
+  );
   switch (type) {
     case 'number':
       if (!urlParam) {
diff --git a/superset-frontend/src/views/App.tsx b/superset-frontend/src/views/App.tsx
index 270a344d817..4f30a552e94 100644
--- a/superset-frontend/src/views/App.tsx
+++ b/superset-frontend/src/views/App.tsx
@@ -49,6 +49,14 @@ setupAGGridModules();
 
 const bootstrapData = getBootstrapData();
 
+// WCAG 3.1.2: Set the HTML lang attribute based on the current locale
+// so screen readers announce the correct language for the page content.
+// Normalize to BCP-47 format by replacing underscores with hyphens
+// so region subtags like "pt_BR" become valid "pt-BR" rather than being dropped.
+const locale =
+  bootstrapData.common?.locale || window.navigator.language || 'en';
+document.documentElement.lang = String(locale).replace(/_/g, '-');
+
 let lastLocationPathname: string;
 
 const boundActions = bindActionCreators({ logEvent }, store.dispatch);
diff --git a/superset-frontend/src/visualizations/TimeTable/utils/sortUtils/sortUtils.test.ts b/superset-frontend/src/visualizations/TimeTable/utils/sortUtils/sortUtils.test.ts
index 879a5fc861c..90e2f287458 100644
--- a/superset-frontend/src/visualizations/TimeTable/utils/sortUtils/sortUtils.test.ts
+++ b/superset-frontend/src/visualizations/TimeTable/utils/sortUtils/sortUtils.test.ts
@@ -17,29 +17,25 @@
  * under the License.
  */
 import { sortNumberWithMixedTypes } from './sortUtils';
-
-jest.mock('src/utils/sortNumericValues', () => ({
-  sortNumericValues: jest.fn((a, b, options) => {
-    const numA = Number(a);
-    const numB = Number(b);
-
-    if (Number.isNaN(numA) && Number.isNaN(numB)) return 0;
-    if (Number.isNaN(numA))
-      return options.nanTreatment === 'asSmallest' ? -1 : 1;
-    if (Number.isNaN(numB))
-      return options.nanTreatment === 'asSmallest' ? 1 : -1;
-
-    return numA - numB;
-  }),
-}));
+import type { ColumnConfig } from '../../types';
 
 // eslint-disable-next-line no-restricted-globals -- TODO: Migrate from describe blocks
 describe('sortNumberWithMixedTypes', () => {
-  const createMockRow = (value: any) => ({
+  const createMockRow = (
+    value: any,
+    columnOverrides: Partial<ColumnConfig> = {},
+  ) => ({
     values: {
       testColumn: {
         props: {
-          'data-value': value,
+          valueField: 'metric',
+          column: {
+            key: 'testColumn',
+            colType: 'time',
+            bounds: undefined,
+            ...columnOverrides,
+          },
+          reversedEntries: [{ metric: value }],
         },
       },
     },
@@ -49,7 +45,7 @@ describe('sortNumberWithMixedTypes', () => {
     const rowA = createMockRow(10);
     const rowB = createMockRow(20);
 
-    const result = sortNumberWithMixedTypes(rowA, rowB, 'testColumn', false);
+    const result = sortNumberWithMixedTypes(rowA, rowB, 'testColumn');
 
     expect(result).toBeLessThan(0); // rowA should come before rowB
   });
@@ -58,16 +54,16 @@ describe('sortNumberWithMixedTypes', () => {
     const rowA = createMockRow(10);
     const rowB = createMockRow(20);
 
-    const result = sortNumberWithMixedTypes(rowA, rowB, 'testColumn', true);
+    const result = sortNumberWithMixedTypes(rowA, rowB, 'testColumn');
 
-    expect(result).toBeGreaterThan(0); // rowB should come before rowA in descending
+    expect(result).toBeLessThan(0);
   });
 
   test('should handle equal values', () => {
     const rowA = createMockRow(15);
     const rowB = createMockRow(15);
 
-    const result = sortNumberWithMixedTypes(rowA, rowB, 'testColumn', false);
+    const result = sortNumberWithMixedTypes(rowA, rowB, 'testColumn');
 
     expect(result).toBe(0);
   });
@@ -76,16 +72,17 @@ describe('sortNumberWithMixedTypes', () => {
     const rowA = createMockRow(null);
     const rowB = createMockRow(10);
 
-    const result = sortNumberWithMixedTypes(rowA, rowB, 'testColumn', false);
+    const result = sortNumberWithMixedTypes(rowA, rowB, 'testColumn');
     expect(typeof result).toBe('number');
   });
 
   test('should handle string numbers', () => {
-    const rowA = createMockRow('10');
-    const rowB = createMockRow('20');
+    const rowA = createMockRow('10', { colType: undefined });
+    const rowB = createMockRow('20', { colType: undefined });
 
-    const result = sortNumberWithMixedTypes(rowA, rowB, 'testColumn', false);
+    const result = sortNumberWithMixedTypes(rowA, rowB, 'testColumn');
 
+    expect(typeof result).toBe('number');
     expect(result).toBeLessThan(0);
   });
 
@@ -93,7 +90,7 @@ describe('sortNumberWithMixedTypes', () => {
     const rowA = createMockRow(10);
     const rowB = createMockRow('20');
 
-    const result = sortNumberWithMixedTypes(rowA, rowB, 'testColumn', false);
+    const result = sortNumberWithMixedTypes(rowA, rowB, 'testColumn');
 
     expect(typeof result).toBe('number');
   });
@@ -102,7 +99,7 @@ describe('sortNumberWithMixedTypes', () => {
     const rowA = createMockRow(-10);
     const rowB = createMockRow(5);
 
-    const result = sortNumberWithMixedTypes(rowA, rowB, 'testColumn', false);
+    const result = sortNumberWithMixedTypes(rowA, rowB, 'testColumn');
 
     expect(result).toBeLessThan(0);
   });
@@ -111,7 +108,32 @@ describe('sortNumberWithMixedTypes', () => {
     const rowA = createMockRow(0);
     const rowB = createMockRow(10);
 
-    const result = sortNumberWithMixedTypes(rowA, rowB, 'testColumn', false);
+    const result = sortNumberWithMixedTypes(rowA, rowB, 'testColumn');
+
+    expect(result).toBeLessThan(0);
+  });
+
+  test('should sort ValueCell-like props numerically', () => {
+    const createValueCellRow = (metricValue: number | null) => ({
+      values: {
+        testColumn: {
+          props: {
+            valueField: 'metric',
+            column: {
+              key: 'testColumn',
+              colType: 'time',
+              bounds: undefined,
+            },
+            reversedEntries: [{ metric: metricValue }],
+          },
+        },
+      },
+    });
+
+    const smaller = createValueCellRow(1);
+    const larger = createValueCellRow(5);
+
+    const result = sortNumberWithMixedTypes(smaller, larger, 'testColumn');
 
     expect(result).toBeLessThan(0);
   });
diff --git a/superset-frontend/src/visualizations/TimeTable/utils/sortUtils/sortUtils.ts b/superset-frontend/src/visualizations/TimeTable/utils/sortUtils/sortUtils.ts
index a5d055aa76e..c18ce7ca948 100644
--- a/superset-frontend/src/visualizations/TimeTable/utils/sortUtils/sortUtils.ts
+++ b/superset-frontend/src/visualizations/TimeTable/utils/sortUtils/sortUtils.ts
@@ -16,6 +16,8 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+import type { ColumnConfig, Entry } from '../../types';
+import { calculateCellValue } from '../valueCalculations/valueCalculations';
 /**
  * Simple numeric value comparison that handles null, undefined, and mixed types
  * @param a - First value to compare
@@ -42,23 +44,64 @@ function compareValues(
 }
 
 /**
- * Sorts table rows with mixed data types for react-table
+ * Sorts table rows with mixed data types for react-table.
+ *
  * @param rowA - First row to compare
  * @param rowB - Second row to compare
  * @param columnId - Column identifier for sorting
  * @param descending - Whether to sort in descending order
  * @returns Numeric comparison result for react-table
+ * react-table handles the asc/desc direction flip internally after calling
+ * this function, so we only return the raw comparison result.
  */
 export function sortNumberWithMixedTypes(
   rowA: any,
   rowB: any,
   columnId: string,
-  descending: boolean,
 ) {
-  const valueA = rowA.values[columnId].props['data-value'];
-  const valueB = rowB.values[columnId].props['data-value'];
+  const cellA = rowA.values?.[columnId];
+  const cellB = rowB.values?.[columnId];
 
-  const comparison = compareValues(valueA, valueB, 'asSmallest');
+  // Both ValueCell and Sparkline cells pass React elements here.
+  // ValueCell uses { valueField, column, reversedEntries }
+  // Sparkline/SparklineCell uses { valueField, column, entries }
+  // Normalize to reversedEntries before delegating to calculateCellValue.
+  const propsA = cellA?.props as
+    | {
+        valueField: string;
+        column: ColumnConfig;
+        reversedEntries?: Entry[];
+        entries?: Entry[];
+      }
+    | undefined;
+  const propsB = cellB?.props as
+    | {
+        valueField: string;
+        column: ColumnConfig;
+        reversedEntries?: Entry[];
+        entries?: Entry[];
+      }
+    | undefined;
 
-  return comparison * (descending ? -1 : 1);
+  const reversedEntriesA =
+    propsA?.reversedEntries ?? propsA?.entries?.slice().reverse();
+  const reversedEntriesB =
+    propsB?.reversedEntries ?? propsB?.entries?.slice().reverse();
+
+  if (!propsA || !propsB || !reversedEntriesA || !reversedEntriesB) {
+    return 0;
+  }
+
+  const { value: valueA } = calculateCellValue(
+    propsA.valueField,
+    propsA.column,
+    reversedEntriesA,
+  );
+  const { value: valueB } = calculateCellValue(
+    propsB.valueField,
+    propsB.column,
+    reversedEntriesB,
+  );
+
+  return compareValues(valueA, valueB, 'asSmallest');
 }
diff --git a/superset-frontend/src/visualizations/presets/MainPreset.ts b/superset-frontend/src/visualizations/presets/MainPreset.ts
index c28dea34945..d1a12de0fb4 100644
--- a/superset-frontend/src/visualizations/presets/MainPreset.ts
+++ b/superset-frontend/src/visualizations/presets/MainPreset.ts
@@ -26,7 +26,6 @@ import CalendarChartPlugin from '@superset-ui/legacy-plugin-chart-calendar';
 import ChordChartPlugin from '@superset-ui/legacy-plugin-chart-chord';
 import CountryMapChartPlugin from '@superset-ui/legacy-plugin-chart-country-map';
 import HorizonChartPlugin from '@superset-ui/legacy-plugin-chart-horizon';
-import MapBoxChartPlugin from '@superset-ui/legacy-plugin-chart-map-box';
 import PairedTTestChartPlugin from '@superset-ui/legacy-plugin-chart-paired-t-test';
 import ParallelCoordinatesChartPlugin from '@superset-ui/legacy-plugin-chart-parallel-coordinates';
 import PartitionChartPlugin from '@superset-ui/legacy-plugin-chart-partition';
@@ -40,7 +39,8 @@ import {
   CompareChartPlugin,
   TimePivotChartPlugin,
 } from '@superset-ui/legacy-preset-chart-nvd3';
-import { DeckGLChartPreset } from '@superset-ui/legacy-preset-chart-deckgl';
+import { DeckGLChartPreset } from '@superset-ui/preset-chart-deckgl';
+import ScatterMapChartPlugin from '@superset-ui/plugin-chart-point-cluster-map';
 import { CartodiagramPlugin } from '@superset-ui/plugin-chart-cartodiagram';
 import {
   BigNumberChartPlugin,
@@ -131,7 +131,7 @@ export default class MainPreset extends Preset {
           key: VizType.MixedTimeseries,
         }),
         new HorizonChartPlugin().configure({ key: VizType.Horizon }),
-        new MapBoxChartPlugin().configure({ key: VizType.MapBox }),
+        new ScatterMapChartPlugin().configure({ key: VizType.PointClusterMap }),
         new PairedTTestChartPlugin().configure({ key: VizType.PairedTTest }),
         new ParallelCoordinatesChartPlugin().configure({
           key: VizType.ParallelCoordinates,
diff --git a/superset-frontend/tsconfig.json b/superset-frontend/tsconfig.json
index 9097f8a5082..6a05ebca0d6 100644
--- a/superset-frontend/tsconfig.json
+++ b/superset-frontend/tsconfig.json
@@ -83,17 +83,17 @@
     { "path": "./plugins/legacy-plugin-chart-chord" },
     { "path": "./plugins/legacy-plugin-chart-country-map" },
     { "path": "./plugins/legacy-plugin-chart-horizon" },
-    { "path": "./plugins/legacy-plugin-chart-map-box" },
     { "path": "./plugins/legacy-plugin-chart-paired-t-test" },
     { "path": "./plugins/legacy-plugin-chart-parallel-coordinates" },
     { "path": "./plugins/legacy-plugin-chart-partition" },
     { "path": "./plugins/legacy-plugin-chart-rose" },
     { "path": "./plugins/legacy-plugin-chart-world-map" },
-    { "path": "./plugins/legacy-preset-chart-deckgl" },
     { "path": "./plugins/legacy-preset-chart-nvd3" },
     { "path": "./plugins/plugin-chart-ag-grid-table" },
     { "path": "./plugins/plugin-chart-cartodiagram" },
+    { "path": "./plugins/preset-chart-deckgl" },
     { "path": "./plugins/plugin-chart-echarts" },
+    { "path": "./plugins/plugin-chart-point-cluster-map" },
     { "path": "./plugins/plugin-chart-handlebars" },
     { "path": "./plugins/plugin-chart-pivot-table" },
     { "path": "./plugins/plugin-chart-table" },
diff --git a/superset-frontend/webpack.config.js b/superset-frontend/webpack.config.js
index 0963b3454be..f3926c3f968 100644
--- a/superset-frontend/webpack.config.js
+++ b/superset-frontend/webpack.config.js
@@ -219,11 +219,15 @@ if (!isDevMode) {
 
 // TypeScript type checking and .d.ts generation
 // SWC handles transpilation; this plugin handles type checking separately.
-// build: true enables project references so .d.ts files are auto-generated.
+// build: true enables project references so .d.ts files are auto-generated
+// across the monorepo when editing plugins/packages.
 // mode: 'write-references' writes .d.ts output (no manual `npm run plugins:build` needed).
-// Story files are excluded because they import @storybook-shared which resolves
-// outside plugin rootDir ("src"), causing errors in --build mode.
-if (isDevMode) {
+// Set DISABLE_TS_CHECKER=true to skip this plugin entirely (~2-3 GB savings).
+// Type errors are still caught by pre-commit and CI.
+const disableTsChecker = ['true', '1'].includes(
+  (process.env.DISABLE_TS_CHECKER || '').toLowerCase(),
+);
+if (isDevMode && !disableTsChecker) {
   plugins.push(
     new ForkTsCheckerWebpackPlugin({
       async: true,
@@ -535,7 +539,7 @@ const config = {
           {
             loader: 'css-loader',
             options: {
-              sourceMap: true,
+              sourceMap: !isDevMode,
             },
           },
         ],
@@ -619,10 +623,23 @@ const config = {
   watchOptions: isDevMode
     ? {
         // Watch all plugin and package source directories
-        ignored: ['**/node_modules', '**/.git', '**/lib', '**/esm', '**/dist'],
-        // Poll less frequently to reduce file handles
+        ignored: [
+          '**/node_modules',
+          '**/.git',
+          '**/lib',
+          '**/esm',
+          '**/dist',
+          '**/.temp_cache',
+          '**/coverage',
+          '**/*.test.*',
+          '**/*.stories.*',
+          '**/cypress-base',
+          '**/*.geojson',
+        ],
+        // Poll-based watching is needed in Docker/VM where native fs events
+        // don't propagate from host to container.
         poll: 2000,
-        // Aggregate changes for 500ms before rebuilding
+        // Aggregate changes before rebuilding
         aggregateTimeout: 500,
       }
     : undefined,
diff --git a/superset-websocket/package-lock.json b/superset-websocket/package-lock.json
index 8b11dccd977..cd21970e25d 100644
--- a/superset-websocket/package-lock.json
+++ b/superset-websocket/package-lock.json
@@ -10,12 +10,12 @@
       "license": "Apache-2.0",
       "dependencies": {
         "cookie": "^1.1.1",
-        "hot-shots": "^14.1.1",
-        "ioredis": "^5.10.0",
+        "hot-shots": "^14.3.1",
+        "ioredis": "^5.10.1",
         "jsonwebtoken": "^9.0.3",
-        "lodash": "^4.17.23",
+        "lodash": "^4.18.1",
         "winston": "^3.19.0",
-        "ws": "^8.19.0"
+        "ws": "^8.20.0"
       },
       "devDependencies": {
         "@eslint/js": "^9.25.1",
@@ -23,21 +23,21 @@
         "@types/jest": "^29.5.14",
         "@types/jsonwebtoken": "^9.0.10",
         "@types/lodash": "^4.17.24",
-        "@types/node": "^25.3.3",
+        "@types/node": "^25.6.0",
         "@types/ws": "^8.18.1",
-        "@typescript-eslint/eslint-plugin": "^8.55.0",
-        "@typescript-eslint/parser": "^8.57.0",
-        "eslint": "^10.0.2",
+        "@typescript-eslint/eslint-plugin": "^8.58.0",
+        "@typescript-eslint/parser": "^8.59.0",
+        "eslint": "^10.2.1",
         "eslint-config-prettier": "^10.1.8",
         "eslint-plugin-lodash": "^8.0.0",
-        "globals": "^17.4.0",
+        "globals": "^17.5.0",
         "jest": "^29.7.0",
-        "prettier": "^3.8.1",
-        "ts-jest": "^29.4.6",
+        "prettier": "^3.8.3",
+        "ts-jest": "^29.4.9",
         "ts-node": "^10.9.2",
         "tscw-config": "^1.1.2",
         "typescript": "^5.9.3",
-        "typescript-eslint": "^8.56.1"
+        "typescript-eslint": "^8.59.0"
       },
       "engines": {
         "node": "^22.22.0",
@@ -748,15 +748,15 @@
       }
     },
     "node_modules/@eslint/config-array": {
-      "version": "0.23.2",
-      "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.23.2.tgz",
-      "integrity": "sha512-YF+fE6LV4v5MGWRGj7G404/OZzGNepVF8fxk7jqmqo3lrza7a0uUcDnROGRBG1WFC1omYUS/Wp1f42i0M+3Q3A==",
+      "version": "0.23.5",
+      "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.23.5.tgz",
+      "integrity": "sha512-Y3kKLvC1dvTOT+oGlqNQ1XLqK6D1HU2YXPc52NmAlJZbMMWDzGYXMiPRJ8TYD39muD/OTjlZmNJ4ib7dvSrMBA==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
-        "@eslint/object-schema": "^3.0.2",
+        "@eslint/object-schema": "^3.0.5",
         "debug": "^4.3.1",
-        "minimatch": "^10.2.1"
+        "minimatch": "^10.2.4"
       },
       "engines": {
         "node": "^20.19.0 || ^22.13.0 || >=24"
@@ -773,9 +773,9 @@
       }
     },
     "node_modules/@eslint/config-array/node_modules/brace-expansion": {
-      "version": "5.0.3",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.3.tgz",
-      "integrity": "sha512-fy6KJm2RawA5RcHkLa1z/ScpBeA762UF9KmZQxwIbDtRJrgLzM10depAiEQ+CXYcoiqW1/m96OAAoke2nE9EeA==",
+      "version": "5.0.5",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.5.tgz",
+      "integrity": "sha512-VZznLgtwhn+Mact9tfiwx64fA9erHH/MCXEUfB/0bX/6Fz6ny5EGTXYltMocqg4xFAQZtnO3DHWWXi8RiuN7cQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -786,13 +786,13 @@
       }
     },
     "node_modules/@eslint/config-array/node_modules/minimatch": {
-      "version": "10.2.4",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.2.4.tgz",
-      "integrity": "sha512-oRjTw/97aTBN0RHbYCdtF1MQfvusSIBQM0IZEgzl6426+8jSC0nF1a/GmnVLpfB9yyr6g6FTqWqiZVbxrtaCIg==",
+      "version": "10.2.5",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.2.5.tgz",
+      "integrity": "sha512-MULkVLfKGYDFYejP07QOurDLLQpcjk7Fw+7jXS2R2czRQzR56yHRveU5NDJEOviH+hETZKSkIk5c+T23GjFUMg==",
       "dev": true,
       "license": "BlueOak-1.0.0",
       "dependencies": {
-        "brace-expansion": "^5.0.2"
+        "brace-expansion": "^5.0.5"
       },
       "engines": {
         "node": "18 || 20 || >=22"
@@ -802,22 +802,22 @@
       }
     },
     "node_modules/@eslint/config-helpers": {
-      "version": "0.5.2",
-      "resolved": "https://registry.npmjs.org/@eslint/config-helpers/-/config-helpers-0.5.2.tgz",
-      "integrity": "sha512-a5MxrdDXEvqnIq+LisyCX6tQMPF/dSJpCfBgBauY+pNZ28yCtSsTvyTYrMhaI+LK26bVyCJfJkT0u8KIj2i1dQ==",
+      "version": "0.5.5",
+      "resolved": "https://registry.npmjs.org/@eslint/config-helpers/-/config-helpers-0.5.5.tgz",
+      "integrity": "sha512-eIJYKTCECbP/nsKaaruF6LW967mtbQbsw4JTtSVkUQc9MneSkbrgPJAbKl9nWr0ZeowV8BfsarBmPpBzGelA2w==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
-        "@eslint/core": "^1.1.0"
+        "@eslint/core": "^1.2.1"
       },
       "engines": {
         "node": "^20.19.0 || ^22.13.0 || >=24"
       }
     },
     "node_modules/@eslint/core": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@eslint/core/-/core-1.1.0.tgz",
-      "integrity": "sha512-/nr9K9wkr3P1EzFTdFdMoLuo1PmIxjmwvPozwoSodjNBdefGujXQUF93u1DDZpEaTuDvMsIQddsd35BwtrW9Xw==",
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/@eslint/core/-/core-1.2.1.tgz",
+      "integrity": "sha512-MwcE1P+AZ4C6DWlpin/OmOA54mmIZ/+xZuJiQd4SyB29oAJjN30UW9wkKNptW2ctp4cEsvhlLY/CsQ1uoHDloQ==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
@@ -841,9 +841,9 @@
       }
     },
     "node_modules/@eslint/object-schema": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/@eslint/object-schema/-/object-schema-3.0.2.tgz",
-      "integrity": "sha512-HOy56KJt48Bx8KmJ+XGQNSUMT/6dZee/M54XyUyuvTvPXJmsERRvBchsUVx1UMe1WwIH49XLAczNC7V2INsuUw==",
+      "version": "3.0.5",
+      "resolved": "https://registry.npmjs.org/@eslint/object-schema/-/object-schema-3.0.5.tgz",
+      "integrity": "sha512-vqTaUEgxzm+YDSdElad6PiRoX4t8VGDjCtt05zn4nU810UIx/uNEV7/lZJ6KwFThKZOzOxzXy48da+No7HZaMw==",
       "dev": true,
       "license": "Apache-2.0",
       "engines": {
@@ -851,13 +851,13 @@
       }
     },
     "node_modules/@eslint/plugin-kit": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.6.0.tgz",
-      "integrity": "sha512-bIZEUzOI1jkhviX2cp5vNyXQc6olzb2ohewQubuYlMXZ2Q/XjBO0x0XhGPvc9fjSIiUN0vw+0hq53BJ4eQSJKQ==",
+      "version": "0.7.1",
+      "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.7.1.tgz",
+      "integrity": "sha512-rZAP3aVgB9ds9KOeUSL+zZ21hPmo8dh6fnIFwRQj5EAZl9gzR7wxYbYXYysAM8CTqGmUGyp2S4kUdV17MnGuWQ==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
-        "@eslint/core": "^1.1.0",
+        "@eslint/core": "^1.2.1",
         "levn": "^0.4.1"
       },
       "engines": {
@@ -1798,13 +1798,13 @@
       "license": "MIT"
     },
     "node_modules/@types/node": {
-      "version": "25.3.3",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.3.3.tgz",
-      "integrity": "sha512-DpzbrH7wIcBaJibpKo9nnSQL0MTRdnWttGyE5haGwK86xgMOkFLp7vEyfQPGLOJh5wNYiJ3V9PmUMDhV9u8kkQ==",
+      "version": "25.6.0",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.6.0.tgz",
+      "integrity": "sha512-+qIYRKdNYJwY3vRCZMdJbPLJAtGjQBudzZzdzwQYkEPQd+PJGixUL5QfvCLDaULoLv+RhT3LDkwEfKaAkgSmNQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "undici-types": "~7.18.0"
+        "undici-types": "~7.19.0"
       }
     },
     "node_modules/@types/stack-utils": {
@@ -1844,20 +1844,20 @@
       "dev": true
     },
     "node_modules/@typescript-eslint/eslint-plugin": {
-      "version": "8.56.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.56.1.tgz",
-      "integrity": "sha512-Jz9ZztpB37dNC+HU2HI28Bs9QXpzCz+y/twHOwhyrIRdbuVDxSytJNDl6z/aAKlaRIwC7y8wJdkBv7FxYGgi0A==",
+      "version": "8.59.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.59.0.tgz",
+      "integrity": "sha512-HyAZtpdkgZwpq8Sz3FSUvCR4c+ScbuWa9AksK2Jweub7w4M3yTz4O11AqVJzLYjy/B9ZWPyc81I+mOdJU/bDQw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@eslint-community/regexpp": "^4.12.2",
-        "@typescript-eslint/scope-manager": "8.56.1",
-        "@typescript-eslint/type-utils": "8.56.1",
-        "@typescript-eslint/utils": "8.56.1",
-        "@typescript-eslint/visitor-keys": "8.56.1",
+        "@typescript-eslint/scope-manager": "8.59.0",
+        "@typescript-eslint/type-utils": "8.59.0",
+        "@typescript-eslint/utils": "8.59.0",
+        "@typescript-eslint/visitor-keys": "8.59.0",
         "ignore": "^7.0.5",
         "natural-compare": "^1.4.0",
-        "ts-api-utils": "^2.4.0"
+        "ts-api-utils": "^2.5.0"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -1867,9 +1867,9 @@
         "url": "https://opencollective.com/typescript-eslint"
       },
       "peerDependencies": {
-        "@typescript-eslint/parser": "^8.56.1",
+        "@typescript-eslint/parser": "^8.59.0",
         "eslint": "^8.57.0 || ^9.0.0 || ^10.0.0",
-        "typescript": ">=4.8.4 <6.0.0"
+        "typescript": ">=4.8.4 <6.1.0"
       }
     },
     "node_modules/@typescript-eslint/eslint-plugin/node_modules/ignore": {
@@ -1883,16 +1883,16 @@
       }
     },
     "node_modules/@typescript-eslint/parser": {
-      "version": "8.57.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.57.0.tgz",
-      "integrity": "sha512-XZzOmihLIr8AD1b9hL9ccNMzEMWt/dE2u7NyTY9jJG6YNiNthaD5XtUHVF2uCXZ15ng+z2hT3MVuxnUYhq6k1g==",
+      "version": "8.59.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.59.0.tgz",
+      "integrity": "sha512-TI1XGwKbDpo9tRW8UDIXCOeLk55qe9ZFGs8MTKU6/M08HWTw52DD/IYhfQtOEhEdPhLMT26Ka/x7p70nd3dzDg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/scope-manager": "8.57.0",
-        "@typescript-eslint/types": "8.57.0",
-        "@typescript-eslint/typescript-estree": "8.57.0",
-        "@typescript-eslint/visitor-keys": "8.57.0",
+        "@typescript-eslint/scope-manager": "8.59.0",
+        "@typescript-eslint/types": "8.59.0",
+        "@typescript-eslint/typescript-estree": "8.59.0",
+        "@typescript-eslint/visitor-keys": "8.59.0",
         "debug": "^4.4.3"
       },
       "engines": {
@@ -1904,187 +1904,18 @@
       },
       "peerDependencies": {
         "eslint": "^8.57.0 || ^9.0.0 || ^10.0.0",
-        "typescript": ">=4.8.4 <6.0.0"
-      }
-    },
-    "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/project-service": {
-      "version": "8.57.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.57.0.tgz",
-      "integrity": "sha512-pR+dK0BlxCLxtWfaKQWtYr7MhKmzqZxuii+ZjuFlZlIGRZm22HnXFqa2eY+90MUz8/i80YJmzFGDUsi8dMOV5w==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@typescript-eslint/tsconfig-utils": "^8.57.0",
-        "@typescript-eslint/types": "^8.57.0",
-        "debug": "^4.4.3"
-      },
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependencies": {
-        "typescript": ">=4.8.4 <6.0.0"
-      }
-    },
-    "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/scope-manager": {
-      "version": "8.57.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.57.0.tgz",
-      "integrity": "sha512-nvExQqAHF01lUM66MskSaZulpPL5pgy5hI5RfrxviLgzZVffB5yYzw27uK/ft8QnKXI2X0LBrHJFr1TaZtAibw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@typescript-eslint/types": "8.57.0",
-        "@typescript-eslint/visitor-keys": "8.57.0"
-      },
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
-    "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/tsconfig-utils": {
-      "version": "8.57.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.57.0.tgz",
-      "integrity": "sha512-LtXRihc5ytjJIQEH+xqjB0+YgsV4/tW35XKX3GTZHpWtcC8SPkT/d4tqdf1cKtesryHm2bgp6l555NYcT2NLvA==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependencies": {
-        "typescript": ">=4.8.4 <6.0.0"
-      }
-    },
-    "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/types": {
-      "version": "8.57.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.57.0.tgz",
-      "integrity": "sha512-dTLI8PEXhjUC7B9Kre+u0XznO696BhXcTlOn0/6kf1fHaQW8+VjJAVHJ3eTI14ZapTxdkOmc80HblPQLaEeJdg==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
-    "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/typescript-estree": {
-      "version": "8.57.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.57.0.tgz",
-      "integrity": "sha512-m7faHcyVg0BT3VdYTlX8GdJEM7COexXxS6KqGopxdtkQRvBanK377QDHr4W/vIPAR+ah9+B/RclSW5ldVniO1Q==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@typescript-eslint/project-service": "8.57.0",
-        "@typescript-eslint/tsconfig-utils": "8.57.0",
-        "@typescript-eslint/types": "8.57.0",
-        "@typescript-eslint/visitor-keys": "8.57.0",
-        "debug": "^4.4.3",
-        "minimatch": "^10.2.2",
-        "semver": "^7.7.3",
-        "tinyglobby": "^0.2.15",
-        "ts-api-utils": "^2.4.0"
-      },
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependencies": {
-        "typescript": ">=4.8.4 <6.0.0"
-      }
-    },
-    "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/visitor-keys": {
-      "version": "8.57.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.57.0.tgz",
-      "integrity": "sha512-zm6xx8UT/Xy2oSr2ZXD0pZo7Jx2XsCoID2IUh9YSTFRu7z+WdwYTRk6LhUftm1crwqbuoF6I8zAFeCMw0YjwDg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@typescript-eslint/types": "8.57.0",
-        "eslint-visitor-keys": "^5.0.0"
-      },
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
-    "node_modules/@typescript-eslint/parser/node_modules/balanced-match": {
-      "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-4.0.4.tgz",
-      "integrity": "sha512-BLrgEcRTwX2o6gGxGOCNyMvGSp35YofuYzw9h1IMTRmKqttAZZVU67bdb9Pr2vUHA8+j3i2tJfjO6C6+4myGTA==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": "18 || 20 || >=22"
-      }
-    },
-    "node_modules/@typescript-eslint/parser/node_modules/brace-expansion": {
-      "version": "5.0.4",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.4.tgz",
-      "integrity": "sha512-h+DEnpVvxmfVefa4jFbCf5HdH5YMDXRsmKflpf1pILZWRFlTbJpxeU55nJl4Smt5HQaGzg1o6RHFPJaOqnmBDg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "balanced-match": "^4.0.2"
-      },
-      "engines": {
-        "node": "18 || 20 || >=22"
-      }
-    },
-    "node_modules/@typescript-eslint/parser/node_modules/eslint-visitor-keys": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-5.0.1.tgz",
-      "integrity": "sha512-tD40eHxA35h0PEIZNeIjkHoDR4YjjJp34biM0mDvplBe//mB+IHCqHDGV7pxF+7MklTvighcCPPZC7ynWyjdTA==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "engines": {
-        "node": "^20.19.0 || ^22.13.0 || >=24"
-      },
-      "funding": {
-        "url": "https://opencollective.com/eslint"
-      }
-    },
-    "node_modules/@typescript-eslint/parser/node_modules/minimatch": {
-      "version": "10.2.4",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.2.4.tgz",
-      "integrity": "sha512-oRjTw/97aTBN0RHbYCdtF1MQfvusSIBQM0IZEgzl6426+8jSC0nF1a/GmnVLpfB9yyr6g6FTqWqiZVbxrtaCIg==",
-      "dev": true,
-      "license": "BlueOak-1.0.0",
-      "dependencies": {
-        "brace-expansion": "^5.0.2"
-      },
-      "engines": {
-        "node": "18 || 20 || >=22"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
+        "typescript": ">=4.8.4 <6.1.0"
       }
     },
     "node_modules/@typescript-eslint/project-service": {
-      "version": "8.56.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.56.1.tgz",
-      "integrity": "sha512-TAdqQTzHNNvlVFfR+hu2PDJrURiwKsUvxFn1M0h95BB8ah5jejas08jUWG4dBA68jDMI988IvtfdAI53JzEHOQ==",
+      "version": "8.59.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.59.0.tgz",
+      "integrity": "sha512-Lw5ITrR5s5TbC19YSvlr63ZfLaJoU6vtKTHyB0GQOpX0W7d5/Ir6vUahWi/8Sps/nOukZQ0IB3SmlxZnjaKVnw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/tsconfig-utils": "^8.56.1",
-        "@typescript-eslint/types": "^8.56.1",
+        "@typescript-eslint/tsconfig-utils": "^8.59.0",
+        "@typescript-eslint/types": "^8.59.0",
         "debug": "^4.4.3"
       },
       "engines": {
@@ -2095,18 +1926,18 @@
         "url": "https://opencollective.com/typescript-eslint"
       },
       "peerDependencies": {
-        "typescript": ">=4.8.4 <6.0.0"
+        "typescript": ">=4.8.4 <6.1.0"
       }
     },
     "node_modules/@typescript-eslint/scope-manager": {
-      "version": "8.56.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.56.1.tgz",
-      "integrity": "sha512-YAi4VDKcIZp0O4tz/haYKhmIDZFEUPOreKbfdAN3SzUDMcPhJ8QI99xQXqX+HoUVq8cs85eRKnD+rne2UAnj2w==",
+      "version": "8.59.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.59.0.tgz",
+      "integrity": "sha512-UzR16Ut8IpA3Mc4DbgAShlPPkVm8xXMWafXxB0BocaVRHs8ZGakAxGRskF7FId3sdk9lgGD73GSFaWmWFDE4dg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.56.1",
-        "@typescript-eslint/visitor-keys": "8.56.1"
+        "@typescript-eslint/types": "8.59.0",
+        "@typescript-eslint/visitor-keys": "8.59.0"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -2117,9 +1948,9 @@
       }
     },
     "node_modules/@typescript-eslint/tsconfig-utils": {
-      "version": "8.56.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.56.1.tgz",
-      "integrity": "sha512-qOtCYzKEeyr3aR9f28mPJqBty7+DBqsdd63eO0yyDwc6vgThj2UjWfJIcsFeSucYydqcuudMOprZ+x1SpF3ZuQ==",
+      "version": "8.59.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.59.0.tgz",
+      "integrity": "sha512-91Sbl3s4Kb3SybliIY6muFBmHVv+pYXfybC4Oolp3dvk8BvIE3wOPc+403CWIT7mJNkfQRGtdqghzs2+Z91Tqg==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -2130,21 +1961,21 @@
         "url": "https://opencollective.com/typescript-eslint"
       },
       "peerDependencies": {
-        "typescript": ">=4.8.4 <6.0.0"
+        "typescript": ">=4.8.4 <6.1.0"
       }
     },
     "node_modules/@typescript-eslint/type-utils": {
-      "version": "8.56.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.56.1.tgz",
-      "integrity": "sha512-yB/7dxi7MgTtGhZdaHCemf7PuwrHMenHjmzgUW1aJpO+bBU43OycnM3Wn+DdvDO/8zzA9HlhaJ0AUGuvri4oGg==",
+      "version": "8.59.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.59.0.tgz",
+      "integrity": "sha512-3TRiZaQSltGqGeNrJzzr1+8YcEobKH9rHnqIp/1psfKFmhRQDNMGP5hBufanYTGznwShzVLs3Mz+gDN7HkWfXg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.56.1",
-        "@typescript-eslint/typescript-estree": "8.56.1",
-        "@typescript-eslint/utils": "8.56.1",
+        "@typescript-eslint/types": "8.59.0",
+        "@typescript-eslint/typescript-estree": "8.59.0",
+        "@typescript-eslint/utils": "8.59.0",
         "debug": "^4.4.3",
-        "ts-api-utils": "^2.4.0"
+        "ts-api-utils": "^2.5.0"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -2155,13 +1986,13 @@
       },
       "peerDependencies": {
         "eslint": "^8.57.0 || ^9.0.0 || ^10.0.0",
-        "typescript": ">=4.8.4 <6.0.0"
+        "typescript": ">=4.8.4 <6.1.0"
       }
     },
     "node_modules/@typescript-eslint/types": {
-      "version": "8.56.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.56.1.tgz",
-      "integrity": "sha512-dbMkdIUkIkchgGDIv7KLUpa0Mda4IYjo4IAMJUZ+3xNoUXxMsk9YtKpTHSChRS85o+H9ftm51gsK1dZReY9CVw==",
+      "version": "8.59.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.59.0.tgz",
+      "integrity": "sha512-nLzdsT1gdOgFxxxwrlNVUBzSNBEEHJ86bblmk4QAS6stfig7rcJzWKqCyxFy3YRRHXDWEkb2NralA1nOYkkm/A==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -2173,21 +2004,21 @@
       }
     },
     "node_modules/@typescript-eslint/typescript-estree": {
-      "version": "8.56.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.56.1.tgz",
-      "integrity": "sha512-qzUL1qgalIvKWAf9C1HpvBjif+Vm6rcT5wZd4VoMb9+Km3iS3Cv9DY6dMRMDtPnwRAFyAi7YXJpTIEXLvdfPxg==",
+      "version": "8.59.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.59.0.tgz",
+      "integrity": "sha512-O9Re9P1BmBLFJyikRbQpLku/QA3/AueZNO9WePLBwQrvkixTmDe8u76B6CYUAITRl/rHawggEqUGn5QIkVRLMw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/project-service": "8.56.1",
-        "@typescript-eslint/tsconfig-utils": "8.56.1",
-        "@typescript-eslint/types": "8.56.1",
-        "@typescript-eslint/visitor-keys": "8.56.1",
+        "@typescript-eslint/project-service": "8.59.0",
+        "@typescript-eslint/tsconfig-utils": "8.59.0",
+        "@typescript-eslint/types": "8.59.0",
+        "@typescript-eslint/visitor-keys": "8.59.0",
         "debug": "^4.4.3",
         "minimatch": "^10.2.2",
         "semver": "^7.7.3",
         "tinyglobby": "^0.2.15",
-        "ts-api-utils": "^2.4.0"
+        "ts-api-utils": "^2.5.0"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -2197,7 +2028,7 @@
         "url": "https://opencollective.com/typescript-eslint"
       },
       "peerDependencies": {
-        "typescript": ">=4.8.4 <6.0.0"
+        "typescript": ">=4.8.4 <6.1.0"
       }
     },
     "node_modules/@typescript-eslint/typescript-estree/node_modules/balanced-match": {
@@ -2211,9 +2042,9 @@
       }
     },
     "node_modules/@typescript-eslint/typescript-estree/node_modules/brace-expansion": {
-      "version": "5.0.3",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.3.tgz",
-      "integrity": "sha512-fy6KJm2RawA5RcHkLa1z/ScpBeA762UF9KmZQxwIbDtRJrgLzM10depAiEQ+CXYcoiqW1/m96OAAoke2nE9EeA==",
+      "version": "5.0.5",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.5.tgz",
+      "integrity": "sha512-VZznLgtwhn+Mact9tfiwx64fA9erHH/MCXEUfB/0bX/6Fz6ny5EGTXYltMocqg4xFAQZtnO3DHWWXi8RiuN7cQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -2224,13 +2055,13 @@
       }
     },
     "node_modules/@typescript-eslint/typescript-estree/node_modules/minimatch": {
-      "version": "10.2.4",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.2.4.tgz",
-      "integrity": "sha512-oRjTw/97aTBN0RHbYCdtF1MQfvusSIBQM0IZEgzl6426+8jSC0nF1a/GmnVLpfB9yyr6g6FTqWqiZVbxrtaCIg==",
+      "version": "10.2.5",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.2.5.tgz",
+      "integrity": "sha512-MULkVLfKGYDFYejP07QOurDLLQpcjk7Fw+7jXS2R2czRQzR56yHRveU5NDJEOviH+hETZKSkIk5c+T23GjFUMg==",
       "dev": true,
       "license": "BlueOak-1.0.0",
       "dependencies": {
-        "brace-expansion": "^5.0.2"
+        "brace-expansion": "^5.0.5"
       },
       "engines": {
         "node": "18 || 20 || >=22"
@@ -2240,16 +2071,16 @@
       }
     },
     "node_modules/@typescript-eslint/utils": {
-      "version": "8.56.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.56.1.tgz",
-      "integrity": "sha512-HPAVNIME3tABJ61siYlHzSWCGtOoeP2RTIaHXFMPqjrQKCGB9OgUVdiNgH7TJS2JNIQ5qQ4RsAUDuGaGme/KOA==",
+      "version": "8.59.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.59.0.tgz",
+      "integrity": "sha512-I1R/K7V07XsMJ12Oaxg/O9GfrysGTmCRhvZJBv0RE0NcULMzjqVpR5kRRQjHsz3J/bElU7HwCO7zkqL+MSUz+g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.9.1",
-        "@typescript-eslint/scope-manager": "8.56.1",
-        "@typescript-eslint/types": "8.56.1",
-        "@typescript-eslint/typescript-estree": "8.56.1"
+        "@typescript-eslint/scope-manager": "8.59.0",
+        "@typescript-eslint/types": "8.59.0",
+        "@typescript-eslint/typescript-estree": "8.59.0"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -2260,17 +2091,17 @@
       },
       "peerDependencies": {
         "eslint": "^8.57.0 || ^9.0.0 || ^10.0.0",
-        "typescript": ">=4.8.4 <6.0.0"
+        "typescript": ">=4.8.4 <6.1.0"
       }
     },
     "node_modules/@typescript-eslint/visitor-keys": {
-      "version": "8.56.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.56.1.tgz",
-      "integrity": "sha512-KiROIzYdEV85YygXw6BI/Dx4fnBlFQu6Mq4QE4MOH9fFnhohw6wX/OAvDY2/C+ut0I3RSPKenvZJIVYqJNkhEw==",
+      "version": "8.59.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.59.0.tgz",
+      "integrity": "sha512-/uejZt4dSere1bx12WLlPfv8GktzcaDtuJ7s42/HEZ5zGj9oxRaD4bj7qwSunXkf+pbAhFt2zjpHYUiT5lHf0Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.56.1",
+        "@typescript-eslint/types": "8.59.0",
         "eslint-visitor-keys": "^5.0.0"
       },
       "engines": {
@@ -2963,18 +2794,18 @@
       }
     },
     "node_modules/eslint": {
-      "version": "10.0.2",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-10.0.2.tgz",
-      "integrity": "sha512-uYixubwmqJZH+KLVYIVKY1JQt7tysXhtj21WSvjcSmU5SVNzMus1bgLe+pAt816yQ8opKfheVVoPLqvVMGejYw==",
+      "version": "10.2.1",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-10.2.1.tgz",
+      "integrity": "sha512-wiyGaKsDgqXvF40P8mDwiUp/KQjE1FdrIEJsM8PZ3XCiniTMXS3OHWWUe5FI5agoCnr8x4xPrTDZuxsBlNHl+Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.8.0",
         "@eslint-community/regexpp": "^4.12.2",
-        "@eslint/config-array": "^0.23.2",
-        "@eslint/config-helpers": "^0.5.2",
-        "@eslint/core": "^1.1.0",
-        "@eslint/plugin-kit": "^0.6.0",
+        "@eslint/config-array": "^0.23.5",
+        "@eslint/config-helpers": "^0.5.5",
+        "@eslint/core": "^1.2.1",
+        "@eslint/plugin-kit": "^0.7.1",
         "@humanfs/node": "^0.16.6",
         "@humanwhocodes/module-importer": "^1.0.1",
         "@humanwhocodes/retry": "^0.4.2",
@@ -2983,9 +2814,9 @@
         "cross-spawn": "^7.0.6",
         "debug": "^4.3.2",
         "escape-string-regexp": "^4.0.0",
-        "eslint-scope": "^9.1.1",
+        "eslint-scope": "^9.1.2",
         "eslint-visitor-keys": "^5.0.1",
-        "espree": "^11.1.1",
+        "espree": "^11.2.0",
         "esquery": "^1.7.0",
         "esutils": "^2.0.2",
         "fast-deep-equal": "^3.1.3",
@@ -2996,7 +2827,7 @@
         "imurmurhash": "^0.1.4",
         "is-glob": "^4.0.0",
         "json-stable-stringify-without-jsonify": "^1.0.1",
-        "minimatch": "^10.2.1",
+        "minimatch": "^10.2.4",
         "natural-compare": "^1.4.0",
         "optionator": "^0.9.3"
       },
@@ -3051,9 +2882,9 @@
       }
     },
     "node_modules/eslint-scope": {
-      "version": "9.1.1",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-9.1.1.tgz",
-      "integrity": "sha512-GaUN0sWim5qc8KVErfPBWmc31LEsOkrUJbvJZV+xuL3u2phMUK4HIvXlWAakfC8W4nzlK+chPEAkYOYb5ZScIw==",
+      "version": "9.1.2",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-9.1.2.tgz",
+      "integrity": "sha512-xS90H51cKw0jltxmvmHy2Iai1LIqrfbw57b79w/J7MfvDfkIkFZ+kj6zC3BjtUwh150HsSSdxXZcsuv72miDFQ==",
       "dev": true,
       "license": "BSD-2-Clause",
       "dependencies": {
@@ -3236,9 +3067,9 @@
       }
     },
     "node_modules/espree": {
-      "version": "11.1.1",
-      "resolved": "https://registry.npmjs.org/espree/-/espree-11.1.1.tgz",
-      "integrity": "sha512-AVHPqQoZYc+RUM4/3Ly5udlZY/U4LS8pIG05jEjWM2lQMU/oaZ7qshzAl2YP1tfNmXfftH3ohurfwNAug+MnsQ==",
+      "version": "11.2.0",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-11.2.0.tgz",
+      "integrity": "sha512-7p3DrVEIopW1B1avAGLuCSh1jubc01H2JHc8B4qqGblmg5gI9yumBgACjWo4JlIc04ufug4xJ3SQI8HkS/Rgzw==",
       "dev": true,
       "license": "BSD-2-Clause",
       "dependencies": {
@@ -3474,9 +3305,9 @@
       }
     },
     "node_modules/flatted": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.1.tgz",
-      "integrity": "sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw==",
+      "version": "3.4.2",
+      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.4.2.tgz",
+      "integrity": "sha512-PjDse7RzhcPkIJwy5t7KPWQSZ9cAbzQXcafsetQoD7sOJRQlGikNbx7yZp2OotDnJyrDcbyRq3Ttb18iYOqkxA==",
       "dev": true,
       "license": "ISC"
     },
@@ -3571,9 +3402,9 @@
       }
     },
     "node_modules/globals": {
-      "version": "17.4.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-17.4.0.tgz",
-      "integrity": "sha512-hjrNztw/VajQwOLsMNT1cbJiH2muO3OROCHnbehc8eY5JyD2gqz4AcMHPqgaOR59DjgUjYAYLeH699g/eWi2jw==",
+      "version": "17.5.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-17.5.0.tgz",
+      "integrity": "sha512-qoV+HK2yFl/366t2/Cb3+xxPUo5BuMynomoDmiaZBIdbs+0pYbjfZU+twLhGKp4uCZ/+NbtpVepH5bGCxRyy2g==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -3590,9 +3421,9 @@
       "dev": true
     },
     "node_modules/handlebars": {
-      "version": "4.7.8",
-      "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.7.8.tgz",
-      "integrity": "sha512-vafaFqs8MZkRrSX7sFVUdo3ap/eNiLnb4IakshzvP56X5Nr1iGKAIqdX6tMlm6HcNRIkr6AxO5jFEoJzzpT8aQ==",
+      "version": "4.7.9",
+      "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.7.9.tgz",
+      "integrity": "sha512-4E71E0rpOaQuJR2A3xDZ+GM1HyWYv1clR58tC8emQNeQe3RH7MAzSbat+V0wG78LQBo6m6bzSG/L4pBuCsgnUQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -3633,12 +3464,12 @@
       }
     },
     "node_modules/hot-shots": {
-      "version": "14.1.1",
-      "resolved": "https://registry.npmjs.org/hot-shots/-/hot-shots-14.1.1.tgz",
-      "integrity": "sha512-UrhMjtZPZVqgzHdXUCHJYrul4dAYueaaIJcscvIXHI6uZB3yoHFArH6jFnM1yAZ8NfSf58d8mgQPJyBFOuTa4Q==",
+      "version": "14.3.1",
+      "resolved": "https://registry.npmjs.org/hot-shots/-/hot-shots-14.3.1.tgz",
+      "integrity": "sha512-2mKuFf3quca37vsT4u4BW9nUZIaz1uuHSpLG0uFQxdg6QAuNU8QnMU6tpEyX/EJe1oEgOrdmFq+DL0NrBIKhkA==",
       "license": "MIT",
       "engines": {
-        "node": ">=16.0.0"
+        "node": ">=18.0.0"
       },
       "optionalDependencies": {
         "unix-dgram": "2.x"
@@ -3713,9 +3544,9 @@
       "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
     },
     "node_modules/ioredis": {
-      "version": "5.10.0",
-      "resolved": "https://registry.npmjs.org/ioredis/-/ioredis-5.10.0.tgz",
-      "integrity": "sha512-HVBe9OFuqs+Z6n64q09PQvP1/R4Bm+30PAyyD4wIEqssh3v9L21QjCVk4kRLucMBcDokJTcLjsGeVRlq/nH6DA==",
+      "version": "5.10.1",
+      "resolved": "https://registry.npmjs.org/ioredis/-/ioredis-5.10.1.tgz",
+      "integrity": "sha512-HuEDBTI70aYdx1v6U97SbNx9F1+svQKBDo30o0b9fw055LMepzpOOd0Ccg9Q6tbqmBSJaMuY0fB7yw9/vjBYCA==",
       "license": "MIT",
       "dependencies": {
         "@ioredis/commands": "1.5.1",
@@ -5280,9 +5111,9 @@
       }
     },
     "node_modules/lodash": {
-      "version": "4.17.23",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.23.tgz",
-      "integrity": "sha512-LgVTMpQtIopCi79SJeDiP0TfWi5CNEc/L/aRdTh3yIvmZXTnheWpKjSZhnvMl8iXbC1tFg9gdHHDMLoV7CnG+w==",
+      "version": "4.18.1",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.18.1.tgz",
+      "integrity": "sha512-dMInicTPVE8d1e5otfwmmjlxkZoUpiVLwyeTdUsi/Caj/gfzzblBcCE5sRHV/AsjuCmxWrte2TNGSYuCeCq+0Q==",
       "license": "MIT"
     },
     "node_modules/lodash.defaults": {
@@ -5618,9 +5449,9 @@
       "dev": true
     },
     "node_modules/picomatch": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
-      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.2.tgz",
+      "integrity": "sha512-V7+vQEJ06Z+c5tSye8S+nHUfI51xoXIXjHQ99cQtKUkQqqO1kO/KCJUfZXuB47h/YBlDhah2H3hdUGXn8ie0oA==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -5662,9 +5493,9 @@
       }
     },
     "node_modules/prettier": {
-      "version": "3.8.1",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.8.1.tgz",
-      "integrity": "sha512-UOnG6LftzbdaHZcKoPFtOcCKztrQ57WkHDeRD9t/PTQtmT0NHSeWWepj6pS0z/N7+08BHFDQVUrfmfMRcZwbMg==",
+      "version": "3.8.3",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.8.3.tgz",
+      "integrity": "sha512-7igPTM53cGHMW8xWuVTydi2KO233VFiTNyF5hLJqpilHfmn8C8gPf+PS7dUT64YcXFbiMGZxS9pCSxL/Dxm/Jw==",
       "dev": true,
       "license": "MIT",
       "bin": {
@@ -5864,9 +5695,9 @@
       }
     },
     "node_modules/semver": {
-      "version": "7.7.3",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.3.tgz",
-      "integrity": "sha512-SdsKMrI9TdgjdweUSR9MweHA4EJ8YxHn8DFaDisvhVlUOe4BF1tLD7GAj0lIqWVl+dPb/rExr0Btby5loQm20Q==",
+      "version": "7.7.4",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.4.tgz",
+      "integrity": "sha512-vFKC2IEtQnVhpT78h1Yp8wzwrf8CM+MzKMHGJZfBtzhZNycRFnXsHk6E5TxIkkMsgNS7mdX3AGB7x2QM2di4lA==",
       "license": "ISC",
       "bin": {
         "semver": "bin/semver.js"
@@ -6089,14 +5920,14 @@
       "license": "MIT"
     },
     "node_modules/tinyglobby": {
-      "version": "0.2.15",
-      "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.15.tgz",
-      "integrity": "sha512-j2Zq4NyQYG5XMST4cbs02Ak8iJUdxRM0XI5QyxXuZOzKOINmWurp3smXu3y5wDcJrptwpSjgXHzIQxR0omXljQ==",
+      "version": "0.2.16",
+      "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.16.tgz",
+      "integrity": "sha512-pn99VhoACYR8nFHhxqix+uvsbXineAasWm5ojXoN8xEwK5Kd3/TrhNn1wByuD52UxWRLy8pu+kRMniEi6Eq9Zg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "fdir": "^6.5.0",
-        "picomatch": "^4.0.3"
+        "picomatch": "^4.0.4"
       },
       "engines": {
         "node": ">=12.0.0"
@@ -6124,9 +5955,9 @@
       }
     },
     "node_modules/tinyglobby/node_modules/picomatch": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz",
-      "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.4.tgz",
+      "integrity": "sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -6172,9 +6003,9 @@
       }
     },
     "node_modules/ts-api-utils": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-2.4.0.tgz",
-      "integrity": "sha512-3TaVTaAv2gTiMB35i3FiGJaRfwb3Pyn/j3m/bfAvGe8FB7CF6u+LMYqYlDh7reQf7UNvoTvdfAqHGmPGOSsPmA==",
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-2.5.0.tgz",
+      "integrity": "sha512-OJ/ibxhPlqrMM0UiNHJ/0CKQkoKF243/AEmplt3qpRgkW8VG7IfOS41h7V8TjITqdByHzrjcS/2si+y4lIh8NA==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -6185,19 +6016,19 @@
       }
     },
     "node_modules/ts-jest": {
-      "version": "29.4.6",
-      "resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-29.4.6.tgz",
-      "integrity": "sha512-fSpWtOO/1AjSNQguk43hb/JCo16oJDnMJf3CdEGNkqsEX3t0KX96xvyX1D7PfLCpVoKu4MfVrqUkFyblYoY4lA==",
+      "version": "29.4.9",
+      "resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-29.4.9.tgz",
+      "integrity": "sha512-LTb9496gYPMCqjeDLdPrKuXtncudeV1yRZnF4Wo5l3SFi0RYEnYRNgMrFIdg+FHvfzjCyQk1cLncWVqiSX+EvQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "bs-logger": "^0.2.6",
         "fast-json-stable-stringify": "^2.1.0",
-        "handlebars": "^4.7.8",
+        "handlebars": "^4.7.9",
         "json5": "^2.2.3",
         "lodash.memoize": "^4.1.2",
         "make-error": "^1.3.6",
-        "semver": "^7.7.3",
+        "semver": "^7.7.4",
         "type-fest": "^4.41.0",
         "yargs-parser": "^21.1.1"
       },
@@ -6214,7 +6045,7 @@
         "babel-jest": "^29.0.0 || ^30.0.0",
         "jest": "^29.0.0 || ^30.0.0",
         "jest-util": "^29.0.0 || ^30.0.0",
-        "typescript": ">=4.3 <6"
+        "typescript": ">=4.3 <7"
       },
       "peerDependenciesMeta": {
         "@babel/core": {
@@ -6368,16 +6199,16 @@
       }
     },
     "node_modules/typescript-eslint": {
-      "version": "8.56.1",
-      "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.56.1.tgz",
-      "integrity": "sha512-U4lM6pjmBX7J5wk4szltF7I1cGBHXZopnAXCMXb3+fZ3B/0Z3hq3wS/CCUB2NZBNAExK92mCU2tEohWuwVMsDQ==",
+      "version": "8.59.0",
+      "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.59.0.tgz",
+      "integrity": "sha512-BU3ONW9X+v90EcCH9ZS6LMackcVtxRLlI3XrYyqZIwVSHIk7Qf7bFw1z0M9Q0IUxhTMZCf8piY9hTYaNEIASrw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/eslint-plugin": "8.56.1",
-        "@typescript-eslint/parser": "8.56.1",
-        "@typescript-eslint/typescript-estree": "8.56.1",
-        "@typescript-eslint/utils": "8.56.1"
+        "@typescript-eslint/eslint-plugin": "8.59.0",
+        "@typescript-eslint/parser": "8.59.0",
+        "@typescript-eslint/typescript-estree": "8.59.0",
+        "@typescript-eslint/utils": "8.59.0"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -6388,32 +6219,7 @@
       },
       "peerDependencies": {
         "eslint": "^8.57.0 || ^9.0.0 || ^10.0.0",
-        "typescript": ">=4.8.4 <6.0.0"
-      }
-    },
-    "node_modules/typescript-eslint/node_modules/@typescript-eslint/parser": {
-      "version": "8.56.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.56.1.tgz",
-      "integrity": "sha512-klQbnPAAiGYFyI02+znpBRLyjL4/BrBd0nyWkdC0s/6xFLkXYQ8OoRrSkqacS1ddVxf/LDyODIKbQ5TgKAf/Fg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@typescript-eslint/scope-manager": "8.56.1",
-        "@typescript-eslint/types": "8.56.1",
-        "@typescript-eslint/typescript-estree": "8.56.1",
-        "@typescript-eslint/visitor-keys": "8.56.1",
-        "debug": "^4.4.3"
-      },
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependencies": {
-        "eslint": "^8.57.0 || ^9.0.0 || ^10.0.0",
-        "typescript": ">=4.8.4 <6.0.0"
+        "typescript": ">=4.8.4 <6.1.0"
       }
     },
     "node_modules/uglify-js": {
@@ -6431,9 +6237,9 @@
       }
     },
     "node_modules/undici-types": {
-      "version": "7.18.2",
-      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.18.2.tgz",
-      "integrity": "sha512-AsuCzffGHJybSaRrmr5eHr81mwJU3kjw6M+uprWvCXiNeN9SOGwQ3Jn8jb8m3Z6izVgknn1R0FTCEAP2QrLY/w==",
+      "version": "7.19.2",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.19.2.tgz",
+      "integrity": "sha512-qYVnV5OEm2AW8cJMCpdV20CDyaN3g0AjDlOGf1OW4iaDEx8MwdtChUp4zu4H0VP3nDRF/8RKWH+IPp9uW0YGZg==",
       "dev": true,
       "license": "MIT"
     },
@@ -6622,9 +6428,9 @@
       "dev": true
     },
     "node_modules/ws": {
-      "version": "8.19.0",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.19.0.tgz",
-      "integrity": "sha512-blAT2mjOEIi0ZzruJfIhb3nps74PRWTCz1IjglWEEpQl5XS/UNama6u2/rjFkDDouqr4L67ry+1aGIALViWjDg==",
+      "version": "8.20.0",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.20.0.tgz",
+      "integrity": "sha512-sAt8BhgNbzCtgGbt2OxmpuryO63ZoDk/sqaB/znQm94T4fCEsy/yV+7CdC1kJhOU9lboAEU7R3kquuycDoibVA==",
       "license": "MIT",
       "engines": {
         "node": ">=10.0.0"
@@ -7238,14 +7044,14 @@
       "dev": true
     },
     "@eslint/config-array": {
-      "version": "0.23.2",
-      "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.23.2.tgz",
-      "integrity": "sha512-YF+fE6LV4v5MGWRGj7G404/OZzGNepVF8fxk7jqmqo3lrza7a0uUcDnROGRBG1WFC1omYUS/Wp1f42i0M+3Q3A==",
+      "version": "0.23.5",
+      "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.23.5.tgz",
+      "integrity": "sha512-Y3kKLvC1dvTOT+oGlqNQ1XLqK6D1HU2YXPc52NmAlJZbMMWDzGYXMiPRJ8TYD39muD/OTjlZmNJ4ib7dvSrMBA==",
       "dev": true,
       "requires": {
-        "@eslint/object-schema": "^3.0.2",
+        "@eslint/object-schema": "^3.0.5",
         "debug": "^4.3.1",
-        "minimatch": "^10.2.1"
+        "minimatch": "^10.2.4"
       },
       "dependencies": {
         "balanced-match": {
@@ -7255,38 +7061,38 @@
           "dev": true
         },
         "brace-expansion": {
-          "version": "5.0.3",
-          "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.3.tgz",
-          "integrity": "sha512-fy6KJm2RawA5RcHkLa1z/ScpBeA762UF9KmZQxwIbDtRJrgLzM10depAiEQ+CXYcoiqW1/m96OAAoke2nE9EeA==",
+          "version": "5.0.5",
+          "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.5.tgz",
+          "integrity": "sha512-VZznLgtwhn+Mact9tfiwx64fA9erHH/MCXEUfB/0bX/6Fz6ny5EGTXYltMocqg4xFAQZtnO3DHWWXi8RiuN7cQ==",
           "dev": true,
           "requires": {
             "balanced-match": "^4.0.2"
           }
         },
         "minimatch": {
-          "version": "10.2.4",
-          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.2.4.tgz",
-          "integrity": "sha512-oRjTw/97aTBN0RHbYCdtF1MQfvusSIBQM0IZEgzl6426+8jSC0nF1a/GmnVLpfB9yyr6g6FTqWqiZVbxrtaCIg==",
+          "version": "10.2.5",
+          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.2.5.tgz",
+          "integrity": "sha512-MULkVLfKGYDFYejP07QOurDLLQpcjk7Fw+7jXS2R2czRQzR56yHRveU5NDJEOviH+hETZKSkIk5c+T23GjFUMg==",
           "dev": true,
           "requires": {
-            "brace-expansion": "^5.0.2"
+            "brace-expansion": "^5.0.5"
           }
         }
       }
     },
     "@eslint/config-helpers": {
-      "version": "0.5.2",
-      "resolved": "https://registry.npmjs.org/@eslint/config-helpers/-/config-helpers-0.5.2.tgz",
-      "integrity": "sha512-a5MxrdDXEvqnIq+LisyCX6tQMPF/dSJpCfBgBauY+pNZ28yCtSsTvyTYrMhaI+LK26bVyCJfJkT0u8KIj2i1dQ==",
+      "version": "0.5.5",
+      "resolved": "https://registry.npmjs.org/@eslint/config-helpers/-/config-helpers-0.5.5.tgz",
+      "integrity": "sha512-eIJYKTCECbP/nsKaaruF6LW967mtbQbsw4JTtSVkUQc9MneSkbrgPJAbKl9nWr0ZeowV8BfsarBmPpBzGelA2w==",
       "dev": true,
       "requires": {
-        "@eslint/core": "^1.1.0"
+        "@eslint/core": "^1.2.1"
       }
     },
     "@eslint/core": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@eslint/core/-/core-1.1.0.tgz",
-      "integrity": "sha512-/nr9K9wkr3P1EzFTdFdMoLuo1PmIxjmwvPozwoSodjNBdefGujXQUF93u1DDZpEaTuDvMsIQddsd35BwtrW9Xw==",
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/@eslint/core/-/core-1.2.1.tgz",
+      "integrity": "sha512-MwcE1P+AZ4C6DWlpin/OmOA54mmIZ/+xZuJiQd4SyB29oAJjN30UW9wkKNptW2ctp4cEsvhlLY/CsQ1uoHDloQ==",
       "dev": true,
       "requires": {
         "@types/json-schema": "^7.0.15"
@@ -7299,18 +7105,18 @@
       "dev": true
     },
     "@eslint/object-schema": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/@eslint/object-schema/-/object-schema-3.0.2.tgz",
-      "integrity": "sha512-HOy56KJt48Bx8KmJ+XGQNSUMT/6dZee/M54XyUyuvTvPXJmsERRvBchsUVx1UMe1WwIH49XLAczNC7V2INsuUw==",
+      "version": "3.0.5",
+      "resolved": "https://registry.npmjs.org/@eslint/object-schema/-/object-schema-3.0.5.tgz",
+      "integrity": "sha512-vqTaUEgxzm+YDSdElad6PiRoX4t8VGDjCtt05zn4nU810UIx/uNEV7/lZJ6KwFThKZOzOxzXy48da+No7HZaMw==",
       "dev": true
     },
     "@eslint/plugin-kit": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.6.0.tgz",
-      "integrity": "sha512-bIZEUzOI1jkhviX2cp5vNyXQc6olzb2ohewQubuYlMXZ2Q/XjBO0x0XhGPvc9fjSIiUN0vw+0hq53BJ4eQSJKQ==",
+      "version": "0.7.1",
+      "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.7.1.tgz",
+      "integrity": "sha512-rZAP3aVgB9ds9KOeUSL+zZ21hPmo8dh6fnIFwRQj5EAZl9gzR7wxYbYXYysAM8CTqGmUGyp2S4kUdV17MnGuWQ==",
       "dev": true,
       "requires": {
-        "@eslint/core": "^1.1.0",
+        "@eslint/core": "^1.2.1",
         "levn": "^0.4.1"
       }
     },
@@ -8088,12 +7894,12 @@
       "dev": true
     },
     "@types/node": {
-      "version": "25.3.3",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.3.3.tgz",
-      "integrity": "sha512-DpzbrH7wIcBaJibpKo9nnSQL0MTRdnWttGyE5haGwK86xgMOkFLp7vEyfQPGLOJh5wNYiJ3V9PmUMDhV9u8kkQ==",
+      "version": "25.6.0",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.6.0.tgz",
+      "integrity": "sha512-+qIYRKdNYJwY3vRCZMdJbPLJAtGjQBudzZzdzwQYkEPQd+PJGixUL5QfvCLDaULoLv+RhT3LDkwEfKaAkgSmNQ==",
       "dev": true,
       "requires": {
-        "undici-types": "~7.18.0"
+        "undici-types": "~7.19.0"
       }
     },
     "@types/stack-utils": {
@@ -8132,19 +7938,19 @@
       "dev": true
     },
     "@typescript-eslint/eslint-plugin": {
-      "version": "8.56.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.56.1.tgz",
-      "integrity": "sha512-Jz9ZztpB37dNC+HU2HI28Bs9QXpzCz+y/twHOwhyrIRdbuVDxSytJNDl6z/aAKlaRIwC7y8wJdkBv7FxYGgi0A==",
+      "version": "8.59.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.59.0.tgz",
+      "integrity": "sha512-HyAZtpdkgZwpq8Sz3FSUvCR4c+ScbuWa9AksK2Jweub7w4M3yTz4O11AqVJzLYjy/B9ZWPyc81I+mOdJU/bDQw==",
       "dev": true,
       "requires": {
         "@eslint-community/regexpp": "^4.12.2",
-        "@typescript-eslint/scope-manager": "8.56.1",
-        "@typescript-eslint/type-utils": "8.56.1",
-        "@typescript-eslint/utils": "8.56.1",
-        "@typescript-eslint/visitor-keys": "8.56.1",
+        "@typescript-eslint/scope-manager": "8.59.0",
+        "@typescript-eslint/type-utils": "8.59.0",
+        "@typescript-eslint/utils": "8.59.0",
+        "@typescript-eslint/visitor-keys": "8.59.0",
         "ignore": "^7.0.5",
         "natural-compare": "^1.4.0",
-        "ts-api-utils": "^2.4.0"
+        "ts-api-utils": "^2.5.0"
       },
       "dependencies": {
         "ignore": {
@@ -8156,173 +7962,80 @@
       }
     },
     "@typescript-eslint/parser": {
-      "version": "8.57.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.57.0.tgz",
-      "integrity": "sha512-XZzOmihLIr8AD1b9hL9ccNMzEMWt/dE2u7NyTY9jJG6YNiNthaD5XtUHVF2uCXZ15ng+z2hT3MVuxnUYhq6k1g==",
+      "version": "8.59.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.59.0.tgz",
+      "integrity": "sha512-TI1XGwKbDpo9tRW8UDIXCOeLk55qe9ZFGs8MTKU6/M08HWTw52DD/IYhfQtOEhEdPhLMT26Ka/x7p70nd3dzDg==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/scope-manager": "8.57.0",
-        "@typescript-eslint/types": "8.57.0",
-        "@typescript-eslint/typescript-estree": "8.57.0",
-        "@typescript-eslint/visitor-keys": "8.57.0",
+        "@typescript-eslint/scope-manager": "8.59.0",
+        "@typescript-eslint/types": "8.59.0",
+        "@typescript-eslint/typescript-estree": "8.59.0",
+        "@typescript-eslint/visitor-keys": "8.59.0",
         "debug": "^4.4.3"
-      },
-      "dependencies": {
-        "@typescript-eslint/project-service": {
-          "version": "8.57.0",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.57.0.tgz",
-          "integrity": "sha512-pR+dK0BlxCLxtWfaKQWtYr7MhKmzqZxuii+ZjuFlZlIGRZm22HnXFqa2eY+90MUz8/i80YJmzFGDUsi8dMOV5w==",
-          "dev": true,
-          "requires": {
-            "@typescript-eslint/tsconfig-utils": "^8.57.0",
-            "@typescript-eslint/types": "^8.57.0",
-            "debug": "^4.4.3"
-          }
-        },
-        "@typescript-eslint/scope-manager": {
-          "version": "8.57.0",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.57.0.tgz",
-          "integrity": "sha512-nvExQqAHF01lUM66MskSaZulpPL5pgy5hI5RfrxviLgzZVffB5yYzw27uK/ft8QnKXI2X0LBrHJFr1TaZtAibw==",
-          "dev": true,
-          "requires": {
-            "@typescript-eslint/types": "8.57.0",
-            "@typescript-eslint/visitor-keys": "8.57.0"
-          }
-        },
-        "@typescript-eslint/tsconfig-utils": {
-          "version": "8.57.0",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.57.0.tgz",
-          "integrity": "sha512-LtXRihc5ytjJIQEH+xqjB0+YgsV4/tW35XKX3GTZHpWtcC8SPkT/d4tqdf1cKtesryHm2bgp6l555NYcT2NLvA==",
-          "dev": true,
-          "requires": {}
-        },
-        "@typescript-eslint/types": {
-          "version": "8.57.0",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.57.0.tgz",
-          "integrity": "sha512-dTLI8PEXhjUC7B9Kre+u0XznO696BhXcTlOn0/6kf1fHaQW8+VjJAVHJ3eTI14ZapTxdkOmc80HblPQLaEeJdg==",
-          "dev": true
-        },
-        "@typescript-eslint/typescript-estree": {
-          "version": "8.57.0",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.57.0.tgz",
-          "integrity": "sha512-m7faHcyVg0BT3VdYTlX8GdJEM7COexXxS6KqGopxdtkQRvBanK377QDHr4W/vIPAR+ah9+B/RclSW5ldVniO1Q==",
-          "dev": true,
-          "requires": {
-            "@typescript-eslint/project-service": "8.57.0",
-            "@typescript-eslint/tsconfig-utils": "8.57.0",
-            "@typescript-eslint/types": "8.57.0",
-            "@typescript-eslint/visitor-keys": "8.57.0",
-            "debug": "^4.4.3",
-            "minimatch": "^10.2.2",
-            "semver": "^7.7.3",
-            "tinyglobby": "^0.2.15",
-            "ts-api-utils": "^2.4.0"
-          }
-        },
-        "@typescript-eslint/visitor-keys": {
-          "version": "8.57.0",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.57.0.tgz",
-          "integrity": "sha512-zm6xx8UT/Xy2oSr2ZXD0pZo7Jx2XsCoID2IUh9YSTFRu7z+WdwYTRk6LhUftm1crwqbuoF6I8zAFeCMw0YjwDg==",
-          "dev": true,
-          "requires": {
-            "@typescript-eslint/types": "8.57.0",
-            "eslint-visitor-keys": "^5.0.0"
-          }
-        },
-        "balanced-match": {
-          "version": "4.0.4",
-          "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-4.0.4.tgz",
-          "integrity": "sha512-BLrgEcRTwX2o6gGxGOCNyMvGSp35YofuYzw9h1IMTRmKqttAZZVU67bdb9Pr2vUHA8+j3i2tJfjO6C6+4myGTA==",
-          "dev": true
-        },
-        "brace-expansion": {
-          "version": "5.0.4",
-          "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.4.tgz",
-          "integrity": "sha512-h+DEnpVvxmfVefa4jFbCf5HdH5YMDXRsmKflpf1pILZWRFlTbJpxeU55nJl4Smt5HQaGzg1o6RHFPJaOqnmBDg==",
-          "dev": true,
-          "requires": {
-            "balanced-match": "^4.0.2"
-          }
-        },
-        "eslint-visitor-keys": {
-          "version": "5.0.1",
-          "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-5.0.1.tgz",
-          "integrity": "sha512-tD40eHxA35h0PEIZNeIjkHoDR4YjjJp34biM0mDvplBe//mB+IHCqHDGV7pxF+7MklTvighcCPPZC7ynWyjdTA==",
-          "dev": true
-        },
-        "minimatch": {
-          "version": "10.2.4",
-          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.2.4.tgz",
-          "integrity": "sha512-oRjTw/97aTBN0RHbYCdtF1MQfvusSIBQM0IZEgzl6426+8jSC0nF1a/GmnVLpfB9yyr6g6FTqWqiZVbxrtaCIg==",
-          "dev": true,
-          "requires": {
-            "brace-expansion": "^5.0.2"
-          }
-        }
       }
     },
     "@typescript-eslint/project-service": {
-      "version": "8.56.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.56.1.tgz",
-      "integrity": "sha512-TAdqQTzHNNvlVFfR+hu2PDJrURiwKsUvxFn1M0h95BB8ah5jejas08jUWG4dBA68jDMI988IvtfdAI53JzEHOQ==",
+      "version": "8.59.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.59.0.tgz",
+      "integrity": "sha512-Lw5ITrR5s5TbC19YSvlr63ZfLaJoU6vtKTHyB0GQOpX0W7d5/Ir6vUahWi/8Sps/nOukZQ0IB3SmlxZnjaKVnw==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/tsconfig-utils": "^8.56.1",
-        "@typescript-eslint/types": "^8.56.1",
+        "@typescript-eslint/tsconfig-utils": "^8.59.0",
+        "@typescript-eslint/types": "^8.59.0",
         "debug": "^4.4.3"
       }
     },
     "@typescript-eslint/scope-manager": {
-      "version": "8.56.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.56.1.tgz",
-      "integrity": "sha512-YAi4VDKcIZp0O4tz/haYKhmIDZFEUPOreKbfdAN3SzUDMcPhJ8QI99xQXqX+HoUVq8cs85eRKnD+rne2UAnj2w==",
+      "version": "8.59.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.59.0.tgz",
+      "integrity": "sha512-UzR16Ut8IpA3Mc4DbgAShlPPkVm8xXMWafXxB0BocaVRHs8ZGakAxGRskF7FId3sdk9lgGD73GSFaWmWFDE4dg==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/types": "8.56.1",
-        "@typescript-eslint/visitor-keys": "8.56.1"
+        "@typescript-eslint/types": "8.59.0",
+        "@typescript-eslint/visitor-keys": "8.59.0"
       }
     },
     "@typescript-eslint/tsconfig-utils": {
-      "version": "8.56.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.56.1.tgz",
-      "integrity": "sha512-qOtCYzKEeyr3aR9f28mPJqBty7+DBqsdd63eO0yyDwc6vgThj2UjWfJIcsFeSucYydqcuudMOprZ+x1SpF3ZuQ==",
+      "version": "8.59.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.59.0.tgz",
+      "integrity": "sha512-91Sbl3s4Kb3SybliIY6muFBmHVv+pYXfybC4Oolp3dvk8BvIE3wOPc+403CWIT7mJNkfQRGtdqghzs2+Z91Tqg==",
       "dev": true,
       "requires": {}
     },
     "@typescript-eslint/type-utils": {
-      "version": "8.56.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.56.1.tgz",
-      "integrity": "sha512-yB/7dxi7MgTtGhZdaHCemf7PuwrHMenHjmzgUW1aJpO+bBU43OycnM3Wn+DdvDO/8zzA9HlhaJ0AUGuvri4oGg==",
+      "version": "8.59.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.59.0.tgz",
+      "integrity": "sha512-3TRiZaQSltGqGeNrJzzr1+8YcEobKH9rHnqIp/1psfKFmhRQDNMGP5hBufanYTGznwShzVLs3Mz+gDN7HkWfXg==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/types": "8.56.1",
-        "@typescript-eslint/typescript-estree": "8.56.1",
-        "@typescript-eslint/utils": "8.56.1",
+        "@typescript-eslint/types": "8.59.0",
+        "@typescript-eslint/typescript-estree": "8.59.0",
+        "@typescript-eslint/utils": "8.59.0",
         "debug": "^4.4.3",
-        "ts-api-utils": "^2.4.0"
+        "ts-api-utils": "^2.5.0"
       }
     },
     "@typescript-eslint/types": {
-      "version": "8.56.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.56.1.tgz",
-      "integrity": "sha512-dbMkdIUkIkchgGDIv7KLUpa0Mda4IYjo4IAMJUZ+3xNoUXxMsk9YtKpTHSChRS85o+H9ftm51gsK1dZReY9CVw==",
+      "version": "8.59.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.59.0.tgz",
+      "integrity": "sha512-nLzdsT1gdOgFxxxwrlNVUBzSNBEEHJ86bblmk4QAS6stfig7rcJzWKqCyxFy3YRRHXDWEkb2NralA1nOYkkm/A==",
       "dev": true
     },
     "@typescript-eslint/typescript-estree": {
-      "version": "8.56.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.56.1.tgz",
-      "integrity": "sha512-qzUL1qgalIvKWAf9C1HpvBjif+Vm6rcT5wZd4VoMb9+Km3iS3Cv9DY6dMRMDtPnwRAFyAi7YXJpTIEXLvdfPxg==",
+      "version": "8.59.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.59.0.tgz",
+      "integrity": "sha512-O9Re9P1BmBLFJyikRbQpLku/QA3/AueZNO9WePLBwQrvkixTmDe8u76B6CYUAITRl/rHawggEqUGn5QIkVRLMw==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/project-service": "8.56.1",
-        "@typescript-eslint/tsconfig-utils": "8.56.1",
-        "@typescript-eslint/types": "8.56.1",
-        "@typescript-eslint/visitor-keys": "8.56.1",
+        "@typescript-eslint/project-service": "8.59.0",
+        "@typescript-eslint/tsconfig-utils": "8.59.0",
+        "@typescript-eslint/types": "8.59.0",
+        "@typescript-eslint/visitor-keys": "8.59.0",
         "debug": "^4.4.3",
         "minimatch": "^10.2.2",
         "semver": "^7.7.3",
         "tinyglobby": "^0.2.15",
-        "ts-api-utils": "^2.4.0"
+        "ts-api-utils": "^2.5.0"
       },
       "dependencies": {
         "balanced-match": {
@@ -8332,44 +8045,44 @@
           "dev": true
         },
         "brace-expansion": {
-          "version": "5.0.3",
-          "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.3.tgz",
-          "integrity": "sha512-fy6KJm2RawA5RcHkLa1z/ScpBeA762UF9KmZQxwIbDtRJrgLzM10depAiEQ+CXYcoiqW1/m96OAAoke2nE9EeA==",
+          "version": "5.0.5",
+          "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.5.tgz",
+          "integrity": "sha512-VZznLgtwhn+Mact9tfiwx64fA9erHH/MCXEUfB/0bX/6Fz6ny5EGTXYltMocqg4xFAQZtnO3DHWWXi8RiuN7cQ==",
           "dev": true,
           "requires": {
             "balanced-match": "^4.0.2"
           }
         },
         "minimatch": {
-          "version": "10.2.4",
-          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.2.4.tgz",
-          "integrity": "sha512-oRjTw/97aTBN0RHbYCdtF1MQfvusSIBQM0IZEgzl6426+8jSC0nF1a/GmnVLpfB9yyr6g6FTqWqiZVbxrtaCIg==",
+          "version": "10.2.5",
+          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.2.5.tgz",
+          "integrity": "sha512-MULkVLfKGYDFYejP07QOurDLLQpcjk7Fw+7jXS2R2czRQzR56yHRveU5NDJEOviH+hETZKSkIk5c+T23GjFUMg==",
           "dev": true,
           "requires": {
-            "brace-expansion": "^5.0.2"
+            "brace-expansion": "^5.0.5"
           }
         }
       }
     },
     "@typescript-eslint/utils": {
-      "version": "8.56.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.56.1.tgz",
-      "integrity": "sha512-HPAVNIME3tABJ61siYlHzSWCGtOoeP2RTIaHXFMPqjrQKCGB9OgUVdiNgH7TJS2JNIQ5qQ4RsAUDuGaGme/KOA==",
+      "version": "8.59.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.59.0.tgz",
+      "integrity": "sha512-I1R/K7V07XsMJ12Oaxg/O9GfrysGTmCRhvZJBv0RE0NcULMzjqVpR5kRRQjHsz3J/bElU7HwCO7zkqL+MSUz+g==",
       "dev": true,
       "requires": {
         "@eslint-community/eslint-utils": "^4.9.1",
-        "@typescript-eslint/scope-manager": "8.56.1",
-        "@typescript-eslint/types": "8.56.1",
-        "@typescript-eslint/typescript-estree": "8.56.1"
+        "@typescript-eslint/scope-manager": "8.59.0",
+        "@typescript-eslint/types": "8.59.0",
+        "@typescript-eslint/typescript-estree": "8.59.0"
       }
     },
     "@typescript-eslint/visitor-keys": {
-      "version": "8.56.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.56.1.tgz",
-      "integrity": "sha512-KiROIzYdEV85YygXw6BI/Dx4fnBlFQu6Mq4QE4MOH9fFnhohw6wX/OAvDY2/C+ut0I3RSPKenvZJIVYqJNkhEw==",
+      "version": "8.59.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.59.0.tgz",
+      "integrity": "sha512-/uejZt4dSere1bx12WLlPfv8GktzcaDtuJ7s42/HEZ5zGj9oxRaD4bj7qwSunXkf+pbAhFt2zjpHYUiT5lHf0Q==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/types": "8.56.1",
+        "@typescript-eslint/types": "8.59.0",
         "eslint-visitor-keys": "^5.0.0"
       },
       "dependencies": {
@@ -8865,17 +8578,17 @@
       "dev": true
     },
     "eslint": {
-      "version": "10.0.2",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-10.0.2.tgz",
-      "integrity": "sha512-uYixubwmqJZH+KLVYIVKY1JQt7tysXhtj21WSvjcSmU5SVNzMus1bgLe+pAt816yQ8opKfheVVoPLqvVMGejYw==",
+      "version": "10.2.1",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-10.2.1.tgz",
+      "integrity": "sha512-wiyGaKsDgqXvF40P8mDwiUp/KQjE1FdrIEJsM8PZ3XCiniTMXS3OHWWUe5FI5agoCnr8x4xPrTDZuxsBlNHl+Q==",
       "dev": true,
       "requires": {
         "@eslint-community/eslint-utils": "^4.8.0",
         "@eslint-community/regexpp": "^4.12.2",
-        "@eslint/config-array": "^0.23.2",
-        "@eslint/config-helpers": "^0.5.2",
-        "@eslint/core": "^1.1.0",
-        "@eslint/plugin-kit": "^0.6.0",
+        "@eslint/config-array": "^0.23.5",
+        "@eslint/config-helpers": "^0.5.5",
+        "@eslint/core": "^1.2.1",
+        "@eslint/plugin-kit": "^0.7.1",
         "@humanfs/node": "^0.16.6",
         "@humanwhocodes/module-importer": "^1.0.1",
         "@humanwhocodes/retry": "^0.4.2",
@@ -8884,9 +8597,9 @@
         "cross-spawn": "^7.0.6",
         "debug": "^4.3.2",
         "escape-string-regexp": "^4.0.0",
-        "eslint-scope": "^9.1.1",
+        "eslint-scope": "^9.1.2",
         "eslint-visitor-keys": "^5.0.1",
-        "espree": "^11.1.1",
+        "espree": "^11.2.0",
         "esquery": "^1.7.0",
         "esutils": "^2.0.2",
         "fast-deep-equal": "^3.1.3",
@@ -8897,7 +8610,7 @@
         "imurmurhash": "^0.1.4",
         "is-glob": "^4.0.0",
         "json-stable-stringify-without-jsonify": "^1.0.1",
-        "minimatch": "^10.2.1",
+        "minimatch": "^10.2.4",
         "natural-compare": "^1.4.0",
         "optionator": "^0.9.3"
       },
@@ -9017,9 +8730,9 @@
       }
     },
     "eslint-scope": {
-      "version": "9.1.1",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-9.1.1.tgz",
-      "integrity": "sha512-GaUN0sWim5qc8KVErfPBWmc31LEsOkrUJbvJZV+xuL3u2phMUK4HIvXlWAakfC8W4nzlK+chPEAkYOYb5ZScIw==",
+      "version": "9.1.2",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-9.1.2.tgz",
+      "integrity": "sha512-xS90H51cKw0jltxmvmHy2Iai1LIqrfbw57b79w/J7MfvDfkIkFZ+kj6zC3BjtUwh150HsSSdxXZcsuv72miDFQ==",
       "dev": true,
       "requires": {
         "@types/esrecurse": "^4.3.1",
@@ -9035,9 +8748,9 @@
       "dev": true
     },
     "espree": {
-      "version": "11.1.1",
-      "resolved": "https://registry.npmjs.org/espree/-/espree-11.1.1.tgz",
-      "integrity": "sha512-AVHPqQoZYc+RUM4/3Ly5udlZY/U4LS8pIG05jEjWM2lQMU/oaZ7qshzAl2YP1tfNmXfftH3ohurfwNAug+MnsQ==",
+      "version": "11.2.0",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-11.2.0.tgz",
+      "integrity": "sha512-7p3DrVEIopW1B1avAGLuCSh1jubc01H2JHc8B4qqGblmg5gI9yumBgACjWo4JlIc04ufug4xJ3SQI8HkS/Rgzw==",
       "dev": true,
       "requires": {
         "acorn": "^8.16.0",
@@ -9210,9 +8923,9 @@
       }
     },
     "flatted": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.1.tgz",
-      "integrity": "sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw==",
+      "version": "3.4.2",
+      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.4.2.tgz",
+      "integrity": "sha512-PjDse7RzhcPkIJwy5t7KPWQSZ9cAbzQXcafsetQoD7sOJRQlGikNbx7yZp2OotDnJyrDcbyRq3Ttb18iYOqkxA==",
       "dev": true
     },
     "fn.name": {
@@ -9278,9 +8991,9 @@
       }
     },
     "globals": {
-      "version": "17.4.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-17.4.0.tgz",
-      "integrity": "sha512-hjrNztw/VajQwOLsMNT1cbJiH2muO3OROCHnbehc8eY5JyD2gqz4AcMHPqgaOR59DjgUjYAYLeH699g/eWi2jw==",
+      "version": "17.5.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-17.5.0.tgz",
+      "integrity": "sha512-qoV+HK2yFl/366t2/Cb3+xxPUo5BuMynomoDmiaZBIdbs+0pYbjfZU+twLhGKp4uCZ/+NbtpVepH5bGCxRyy2g==",
       "dev": true
     },
     "graceful-fs": {
@@ -9290,9 +9003,9 @@
       "dev": true
     },
     "handlebars": {
-      "version": "4.7.8",
-      "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.7.8.tgz",
-      "integrity": "sha512-vafaFqs8MZkRrSX7sFVUdo3ap/eNiLnb4IakshzvP56X5Nr1iGKAIqdX6tMlm6HcNRIkr6AxO5jFEoJzzpT8aQ==",
+      "version": "4.7.9",
+      "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.7.9.tgz",
+      "integrity": "sha512-4E71E0rpOaQuJR2A3xDZ+GM1HyWYv1clR58tC8emQNeQe3RH7MAzSbat+V0wG78LQBo6m6bzSG/L4pBuCsgnUQ==",
       "dev": true,
       "requires": {
         "minimist": "^1.2.5",
@@ -9318,9 +9031,9 @@
       }
     },
     "hot-shots": {
-      "version": "14.1.1",
-      "resolved": "https://registry.npmjs.org/hot-shots/-/hot-shots-14.1.1.tgz",
-      "integrity": "sha512-UrhMjtZPZVqgzHdXUCHJYrul4dAYueaaIJcscvIXHI6uZB3yoHFArH6jFnM1yAZ8NfSf58d8mgQPJyBFOuTa4Q==",
+      "version": "14.3.1",
+      "resolved": "https://registry.npmjs.org/hot-shots/-/hot-shots-14.3.1.tgz",
+      "integrity": "sha512-2mKuFf3quca37vsT4u4BW9nUZIaz1uuHSpLG0uFQxdg6QAuNU8QnMU6tpEyX/EJe1oEgOrdmFq+DL0NrBIKhkA==",
       "requires": {
         "unix-dgram": "2.x"
       }
@@ -9375,9 +9088,9 @@
       "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
     },
     "ioredis": {
-      "version": "5.10.0",
-      "resolved": "https://registry.npmjs.org/ioredis/-/ioredis-5.10.0.tgz",
-      "integrity": "sha512-HVBe9OFuqs+Z6n64q09PQvP1/R4Bm+30PAyyD4wIEqssh3v9L21QjCVk4kRLucMBcDokJTcLjsGeVRlq/nH6DA==",
+      "version": "5.10.1",
+      "resolved": "https://registry.npmjs.org/ioredis/-/ioredis-5.10.1.tgz",
+      "integrity": "sha512-HuEDBTI70aYdx1v6U97SbNx9F1+svQKBDo30o0b9fw055LMepzpOOd0Ccg9Q6tbqmBSJaMuY0fB7yw9/vjBYCA==",
       "requires": {
         "@ioredis/commands": "1.5.1",
         "cluster-key-slot": "^1.1.0",
@@ -10594,9 +10307,9 @@
       }
     },
     "lodash": {
-      "version": "4.17.23",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.23.tgz",
-      "integrity": "sha512-LgVTMpQtIopCi79SJeDiP0TfWi5CNEc/L/aRdTh3yIvmZXTnheWpKjSZhnvMl8iXbC1tFg9gdHHDMLoV7CnG+w=="
+      "version": "4.18.1",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.18.1.tgz",
+      "integrity": "sha512-dMInicTPVE8d1e5otfwmmjlxkZoUpiVLwyeTdUsi/Caj/gfzzblBcCE5sRHV/AsjuCmxWrte2TNGSYuCeCq+0Q=="
     },
     "lodash.defaults": {
       "version": "4.2.0",
@@ -10866,9 +10579,9 @@
       "dev": true
     },
     "picomatch": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
-      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.2.tgz",
+      "integrity": "sha512-V7+vQEJ06Z+c5tSye8S+nHUfI51xoXIXjHQ99cQtKUkQqqO1kO/KCJUfZXuB47h/YBlDhah2H3hdUGXn8ie0oA==",
       "dev": true
     },
     "pirates": {
@@ -10893,9 +10606,9 @@
       "dev": true
     },
     "prettier": {
-      "version": "3.8.1",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.8.1.tgz",
-      "integrity": "sha512-UOnG6LftzbdaHZcKoPFtOcCKztrQ57WkHDeRD9t/PTQtmT0NHSeWWepj6pS0z/N7+08BHFDQVUrfmfMRcZwbMg==",
+      "version": "3.8.3",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.8.3.tgz",
+      "integrity": "sha512-7igPTM53cGHMW8xWuVTydi2KO233VFiTNyF5hLJqpilHfmn8C8gPf+PS7dUT64YcXFbiMGZxS9pCSxL/Dxm/Jw==",
       "dev": true
     },
     "pretty-format": {
@@ -11017,9 +10730,9 @@
       "integrity": "sha512-b3rppTKm9T+PsVCBEOUR46GWI7fdOs00VKZ1+9c1EWDaDMvjQc6tUwuFyIprgGgTcWoVHSKrU8H31ZHA2e0RHA=="
     },
     "semver": {
-      "version": "7.7.3",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.3.tgz",
-      "integrity": "sha512-SdsKMrI9TdgjdweUSR9MweHA4EJ8YxHn8DFaDisvhVlUOe4BF1tLD7GAj0lIqWVl+dPb/rExr0Btby5loQm20Q=="
+      "version": "7.7.4",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.4.tgz",
+      "integrity": "sha512-vFKC2IEtQnVhpT78h1Yp8wzwrf8CM+MzKMHGJZfBtzhZNycRFnXsHk6E5TxIkkMsgNS7mdX3AGB7x2QM2di4lA=="
     },
     "shebang-command": {
       "version": "2.0.0",
@@ -11183,13 +10896,13 @@
       "integrity": "sha512-uuVGNWzgJ4yhRaNSiubPY7OjISw4sw4E5Uv0wbjp+OzcbmVU/rsT8ujgcXJhn9ypzsgr5vlzpPqP+MBBKcGvbg=="
     },
     "tinyglobby": {
-      "version": "0.2.15",
-      "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.15.tgz",
-      "integrity": "sha512-j2Zq4NyQYG5XMST4cbs02Ak8iJUdxRM0XI5QyxXuZOzKOINmWurp3smXu3y5wDcJrptwpSjgXHzIQxR0omXljQ==",
+      "version": "0.2.16",
+      "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.16.tgz",
+      "integrity": "sha512-pn99VhoACYR8nFHhxqix+uvsbXineAasWm5ojXoN8xEwK5Kd3/TrhNn1wByuD52UxWRLy8pu+kRMniEi6Eq9Zg==",
       "dev": true,
       "requires": {
         "fdir": "^6.5.0",
-        "picomatch": "^4.0.3"
+        "picomatch": "^4.0.4"
       },
       "dependencies": {
         "fdir": {
@@ -11200,9 +10913,9 @@
           "requires": {}
         },
         "picomatch": {
-          "version": "4.0.3",
-          "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz",
-          "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
+          "version": "4.0.4",
+          "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.4.tgz",
+          "integrity": "sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==",
           "dev": true
         }
       }
@@ -11234,25 +10947,25 @@
       "integrity": "sha512-aZbgViZrg1QNcG+LULa7nhZpJTZSLm/mXnHXnbAbjmN5aSa0y7V+wvv6+4WaBtpISJzThKy+PIPxc1Nq1EJ9mg=="
     },
     "ts-api-utils": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-2.4.0.tgz",
-      "integrity": "sha512-3TaVTaAv2gTiMB35i3FiGJaRfwb3Pyn/j3m/bfAvGe8FB7CF6u+LMYqYlDh7reQf7UNvoTvdfAqHGmPGOSsPmA==",
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-2.5.0.tgz",
+      "integrity": "sha512-OJ/ibxhPlqrMM0UiNHJ/0CKQkoKF243/AEmplt3qpRgkW8VG7IfOS41h7V8TjITqdByHzrjcS/2si+y4lIh8NA==",
       "dev": true,
       "requires": {}
     },
     "ts-jest": {
-      "version": "29.4.6",
-      "resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-29.4.6.tgz",
-      "integrity": "sha512-fSpWtOO/1AjSNQguk43hb/JCo16oJDnMJf3CdEGNkqsEX3t0KX96xvyX1D7PfLCpVoKu4MfVrqUkFyblYoY4lA==",
+      "version": "29.4.9",
+      "resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-29.4.9.tgz",
+      "integrity": "sha512-LTb9496gYPMCqjeDLdPrKuXtncudeV1yRZnF4Wo5l3SFi0RYEnYRNgMrFIdg+FHvfzjCyQk1cLncWVqiSX+EvQ==",
       "dev": true,
       "requires": {
         "bs-logger": "^0.2.6",
         "fast-json-stable-stringify": "^2.1.0",
-        "handlebars": "^4.7.8",
+        "handlebars": "^4.7.9",
         "json5": "^2.2.3",
         "lodash.memoize": "^4.1.2",
         "make-error": "^1.3.6",
-        "semver": "^7.7.3",
+        "semver": "^7.7.4",
         "type-fest": "^4.41.0",
         "yargs-parser": "^21.1.1"
       }
@@ -11331,30 +11044,15 @@
       "dev": true
     },
     "typescript-eslint": {
-      "version": "8.56.1",
-      "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.56.1.tgz",
-      "integrity": "sha512-U4lM6pjmBX7J5wk4szltF7I1cGBHXZopnAXCMXb3+fZ3B/0Z3hq3wS/CCUB2NZBNAExK92mCU2tEohWuwVMsDQ==",
+      "version": "8.59.0",
+      "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.59.0.tgz",
+      "integrity": "sha512-BU3ONW9X+v90EcCH9ZS6LMackcVtxRLlI3XrYyqZIwVSHIk7Qf7bFw1z0M9Q0IUxhTMZCf8piY9hTYaNEIASrw==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/eslint-plugin": "8.56.1",
-        "@typescript-eslint/parser": "8.56.1",
-        "@typescript-eslint/typescript-estree": "8.56.1",
-        "@typescript-eslint/utils": "8.56.1"
-      },
-      "dependencies": {
-        "@typescript-eslint/parser": {
-          "version": "8.56.1",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.56.1.tgz",
-          "integrity": "sha512-klQbnPAAiGYFyI02+znpBRLyjL4/BrBd0nyWkdC0s/6xFLkXYQ8OoRrSkqacS1ddVxf/LDyODIKbQ5TgKAf/Fg==",
-          "dev": true,
-          "requires": {
-            "@typescript-eslint/scope-manager": "8.56.1",
-            "@typescript-eslint/types": "8.56.1",
-            "@typescript-eslint/typescript-estree": "8.56.1",
-            "@typescript-eslint/visitor-keys": "8.56.1",
-            "debug": "^4.4.3"
-          }
-        }
+        "@typescript-eslint/eslint-plugin": "8.59.0",
+        "@typescript-eslint/parser": "8.59.0",
+        "@typescript-eslint/typescript-estree": "8.59.0",
+        "@typescript-eslint/utils": "8.59.0"
       }
     },
     "uglify-js": {
@@ -11365,9 +11063,9 @@
       "optional": true
     },
     "undici-types": {
-      "version": "7.18.2",
-      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.18.2.tgz",
-      "integrity": "sha512-AsuCzffGHJybSaRrmr5eHr81mwJU3kjw6M+uprWvCXiNeN9SOGwQ3Jn8jb8m3Z6izVgknn1R0FTCEAP2QrLY/w==",
+      "version": "7.19.2",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.19.2.tgz",
+      "integrity": "sha512-qYVnV5OEm2AW8cJMCpdV20CDyaN3g0AjDlOGf1OW4iaDEx8MwdtChUp4zu4H0VP3nDRF/8RKWH+IPp9uW0YGZg==",
       "dev": true
     },
     "unix-dgram": {
@@ -11509,9 +11207,9 @@
       "dev": true
     },
     "ws": {
-      "version": "8.19.0",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.19.0.tgz",
-      "integrity": "sha512-blAT2mjOEIi0ZzruJfIhb3nps74PRWTCz1IjglWEEpQl5XS/UNama6u2/rjFkDDouqr4L67ry+1aGIALViWjDg==",
+      "version": "8.20.0",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.20.0.tgz",
+      "integrity": "sha512-sAt8BhgNbzCtgGbt2OxmpuryO63ZoDk/sqaB/znQm94T4fCEsy/yV+7CdC1kJhOU9lboAEU7R3kquuycDoibVA==",
       "requires": {}
     },
     "y18n": {
diff --git a/superset-websocket/package.json b/superset-websocket/package.json
index 6ed60ad10d4..7dad0028965 100644
--- a/superset-websocket/package.json
+++ b/superset-websocket/package.json
@@ -18,12 +18,12 @@
   "license": "Apache-2.0",
   "dependencies": {
     "cookie": "^1.1.1",
-    "hot-shots": "^14.1.1",
-    "ioredis": "^5.10.0",
+    "hot-shots": "^14.3.1",
+    "ioredis": "^5.10.1",
     "jsonwebtoken": "^9.0.3",
-    "lodash": "^4.17.23",
+    "lodash": "^4.18.1",
     "winston": "^3.19.0",
-    "ws": "^8.19.0"
+    "ws": "^8.20.0"
   },
   "devDependencies": {
     "@eslint/js": "^9.25.1",
@@ -31,21 +31,21 @@
     "@types/jest": "^29.5.14",
     "@types/jsonwebtoken": "^9.0.10",
     "@types/lodash": "^4.17.24",
-    "@types/node": "^25.3.3",
+    "@types/node": "^25.6.0",
     "@types/ws": "^8.18.1",
-    "@typescript-eslint/eslint-plugin": "^8.55.0",
-    "@typescript-eslint/parser": "^8.57.0",
-    "eslint": "^10.0.2",
+    "@typescript-eslint/eslint-plugin": "^8.58.0",
+    "@typescript-eslint/parser": "^8.59.0",
+    "eslint": "^10.2.1",
     "eslint-config-prettier": "^10.1.8",
     "eslint-plugin-lodash": "^8.0.0",
-    "globals": "^17.4.0",
+    "globals": "^17.5.0",
     "jest": "^29.7.0",
-    "prettier": "^3.8.1",
-    "ts-jest": "^29.4.6",
+    "prettier": "^3.8.3",
+    "ts-jest": "^29.4.9",
     "ts-node": "^10.9.2",
     "tscw-config": "^1.1.2",
     "typescript": "^5.9.3",
-    "typescript-eslint": "^8.56.1"
+    "typescript-eslint": "^8.59.0"
   },
   "engines": {
     "node": "^22.22.0",
diff --git a/superset-websocket/utils/client-ws-app/package-lock.json b/superset-websocket/utils/client-ws-app/package-lock.json
index 81ade2b6c15..a095efa3701 100644
--- a/superset-websocket/utils/client-ws-app/package-lock.json
+++ b/superset-websocket/utils/client-ws-app/package-lock.json
@@ -14,7 +14,7 @@
         "http-errors": "~2.0.1",
         "jsonwebtoken": "^9.0.3",
         "morgan": "~1.10.1",
-        "pug": "~3.0.3"
+        "pug": "~3.0.4"
       }
     },
     "node_modules/@babel/helper-validator-identifier": {
@@ -78,9 +78,9 @@
       "integrity": "sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY="
     },
     "node_modules/assert-never": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/assert-never/-/assert-never-1.2.1.tgz",
-      "integrity": "sha512-TaTivMB6pYI1kXwrFlEhLeGfOqoDNdTxjCdwRfFFkEA30Eu+k48W34nlok2EYWJfFFzqaEmichdNM7th6M5HNw=="
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/assert-never/-/assert-never-1.4.0.tgz",
+      "integrity": "sha512-5oJg84os6NMQNl27T9LnZkvvqzvAnHu03ShCnoj6bsJwS7L8AO4lf+C/XjK/nvzEqQB744moC6V128RucQd1jA=="
     },
     "node_modules/babel-walk": {
       "version": "3.0.0-canary-5",
@@ -970,12 +970,12 @@
       "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw=="
     },
     "node_modules/path-to-regexp": {
-      "version": "8.2.0",
-      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-8.2.0.tgz",
-      "integrity": "sha512-TdrF7fW9Rphjq4RjrW0Kp2AW0Ahwu9sRGTkS6bvDi0SCwZlEZYmcfDbEsTz8RVk0EHIS/Vd1bv3JhG+1xZuAyQ==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=16"
+      "version": "8.4.0",
+      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-8.4.0.tgz",
+      "integrity": "sha512-PuseHIvAnz3bjrM2rGJtSgo1zjgxapTLZ7x2pjhzWwlp4SJQgK3f3iZIQwkpEnBaKz6seKBADpM4B4ySkuYypg==",
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/express"
       }
     },
     "node_modules/promise": {
@@ -999,11 +999,11 @@
       }
     },
     "node_modules/pug": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/pug/-/pug-3.0.3.tgz",
-      "integrity": "sha512-uBi6kmc9f3SZ3PXxqcHiUZLmIXgfgWooKWXcwSGwQd2Zi5Rb0bT14+8CJjJgI8AB+nndLaNgHGrcc6bPIB665g==",
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/pug/-/pug-3.0.4.tgz",
+      "integrity": "sha512-kFfq5mMzrS7+wrl5pLJzZEzemx34OQ0w4SARfhy/3yxTlhbstsudDwJzhf1hP02yHzbjoVMSXUj/Sz6RNfMyXg==",
       "dependencies": {
-        "pug-code-gen": "^3.0.3",
+        "pug-code-gen": "^3.0.4",
         "pug-filters": "^4.0.0",
         "pug-lexer": "^5.0.1",
         "pug-linker": "^4.0.0",
@@ -1024,9 +1024,9 @@
       }
     },
     "node_modules/pug-code-gen": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/pug-code-gen/-/pug-code-gen-3.0.3.tgz",
-      "integrity": "sha512-cYQg0JW0w32Ux+XTeZnBEeuWrAY7/HNE6TWnhiHGnnRYlCgyAUPoyh9KzCMa9WhcJlJ1AtQqpEYHc+vbCzA+Aw==",
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/pug-code-gen/-/pug-code-gen-3.0.4.tgz",
+      "integrity": "sha512-6okWYIKdasTyXICyEtvobmTZAVX57JkzgzIi4iRJlin8kmhG+Xry2dsus+Mun/nGCn6F2U49haHI5mkELXB14g==",
       "dependencies": {
         "constantinople": "^4.0.1",
         "doctypes": "^1.1.0",
@@ -1475,9 +1475,9 @@
       "integrity": "sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY="
     },
     "assert-never": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/assert-never/-/assert-never-1.2.1.tgz",
-      "integrity": "sha512-TaTivMB6pYI1kXwrFlEhLeGfOqoDNdTxjCdwRfFFkEA30Eu+k48W34nlok2EYWJfFFzqaEmichdNM7th6M5HNw=="
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/assert-never/-/assert-never-1.4.0.tgz",
+      "integrity": "sha512-5oJg84os6NMQNl27T9LnZkvvqzvAnHu03ShCnoj6bsJwS7L8AO4lf+C/XjK/nvzEqQB744moC6V128RucQd1jA=="
     },
     "babel-walk": {
       "version": "3.0.0-canary-5",
@@ -2118,9 +2118,9 @@
       "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw=="
     },
     "path-to-regexp": {
-      "version": "8.2.0",
-      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-8.2.0.tgz",
-      "integrity": "sha512-TdrF7fW9Rphjq4RjrW0Kp2AW0Ahwu9sRGTkS6bvDi0SCwZlEZYmcfDbEsTz8RVk0EHIS/Vd1bv3JhG+1xZuAyQ=="
+      "version": "8.4.0",
+      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-8.4.0.tgz",
+      "integrity": "sha512-PuseHIvAnz3bjrM2rGJtSgo1zjgxapTLZ7x2pjhzWwlp4SJQgK3f3iZIQwkpEnBaKz6seKBADpM4B4ySkuYypg=="
     },
     "promise": {
       "version": "7.3.1",
@@ -2140,11 +2140,11 @@
       }
     },
     "pug": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/pug/-/pug-3.0.3.tgz",
-      "integrity": "sha512-uBi6kmc9f3SZ3PXxqcHiUZLmIXgfgWooKWXcwSGwQd2Zi5Rb0bT14+8CJjJgI8AB+nndLaNgHGrcc6bPIB665g==",
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/pug/-/pug-3.0.4.tgz",
+      "integrity": "sha512-kFfq5mMzrS7+wrl5pLJzZEzemx34OQ0w4SARfhy/3yxTlhbstsudDwJzhf1hP02yHzbjoVMSXUj/Sz6RNfMyXg==",
       "requires": {
-        "pug-code-gen": "^3.0.3",
+        "pug-code-gen": "^3.0.4",
         "pug-filters": "^4.0.0",
         "pug-lexer": "^5.0.1",
         "pug-linker": "^4.0.0",
@@ -2165,9 +2165,9 @@
       }
     },
     "pug-code-gen": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/pug-code-gen/-/pug-code-gen-3.0.3.tgz",
-      "integrity": "sha512-cYQg0JW0w32Ux+XTeZnBEeuWrAY7/HNE6TWnhiHGnnRYlCgyAUPoyh9KzCMa9WhcJlJ1AtQqpEYHc+vbCzA+Aw==",
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/pug-code-gen/-/pug-code-gen-3.0.4.tgz",
+      "integrity": "sha512-6okWYIKdasTyXICyEtvobmTZAVX57JkzgzIi4iRJlin8kmhG+Xry2dsus+Mun/nGCn6F2U49haHI5mkELXB14g==",
       "requires": {
         "constantinople": "^4.0.1",
         "doctypes": "^1.1.0",
diff --git a/superset-websocket/utils/client-ws-app/package.json b/superset-websocket/utils/client-ws-app/package.json
index d7b096647ad..95b755fbf2f 100644
--- a/superset-websocket/utils/client-ws-app/package.json
+++ b/superset-websocket/utils/client-ws-app/package.json
@@ -12,6 +12,6 @@
     "http-errors": "~2.0.1",
     "jsonwebtoken": "^9.0.3",
     "morgan": "~1.10.1",
-    "pug": "~3.0.3"
+    "pug": "~3.0.4"
   }
 }
diff --git a/superset/charts/api.py b/superset/charts/api.py
index f5dd6ce3cbd..4a8e48c29ef 100644
--- a/superset/charts/api.py
+++ b/superset/charts/api.py
@@ -81,7 +81,7 @@ from superset.commands.importers.v1.utils import get_contents_from_bundle
 from superset.constants import MODEL_API_RW_METHOD_PERMISSION_MAP, RouteMethod
 from superset.daos.chart import ChartDAO
 from superset.exceptions import ScreenshotImageNotAvailableException
-from superset.extensions import event_logger
+from superset.extensions import event_logger, security_manager
 from superset.models.slice import Slice
 from superset.tasks.thumbnails import cache_chart_thumbnail
 from superset.tasks.utils import get_current_user
@@ -574,8 +574,9 @@ class ChartRestApi(BaseSupersetModelRestApi):
     @safe
     @statsd_metrics
     @event_logger.log_this_with_context(
-        action=lambda self, *args, **kwargs: f"{self.__class__.__name__}"
-        f".cache_screenshot",
+        action=lambda self, *args, **kwargs: (
+            f"{self.__class__.__name__}.cache_screenshot"
+        ),
         log_to_statsd=False,
     )
     def cache_screenshot(self, pk: int, **kwargs: Any) -> WerkzeugResponse:
@@ -616,6 +617,10 @@ class ChartRestApi(BaseSupersetModelRestApi):
             500:
               $ref: '#/components/responses/500'
         """
+        if is_feature_enabled(
+            "GRANULAR_EXPORT_CONTROLS"
+        ) and not security_manager.can_access("can_export_image", "Superset"):
+            return self.response_403()
         rison_dict = kwargs["rison"]
         force = rison_dict.get("force")
         window_size = rison_dict.get("window_size") or DEFAULT_CHART_WINDOW_SIZE
@@ -699,6 +704,10 @@ class ChartRestApi(BaseSupersetModelRestApi):
             500:
               $ref: '#/components/responses/500'
         """
+        if is_feature_enabled(
+            "GRANULAR_EXPORT_CONTROLS"
+        ) and not security_manager.can_access("can_export_image", "Superset"):
+            return self.response_403()
         chart = self.datamodel.get(pk, self._base_filters)
 
         if not chart:
@@ -761,6 +770,10 @@ class ChartRestApi(BaseSupersetModelRestApi):
             500:
               $ref: '#/components/responses/500'
         """
+        if is_feature_enabled(
+            "GRANULAR_EXPORT_CONTROLS"
+        ) and not security_manager.can_access("can_export_image", "Superset"):
+            return self.response_403()
         chart = cast(Slice, self.datamodel.get(pk, self._base_filters))
         if not chart:
             return self.response_404()
@@ -876,8 +889,9 @@ class ChartRestApi(BaseSupersetModelRestApi):
     @rison(get_fav_star_ids_schema)
     @statsd_metrics
     @event_logger.log_this_with_context(
-        action=lambda self, *args, **kwargs: f"{self.__class__.__name__}"
-        f".favorite_status",
+        action=lambda self, *args, **kwargs: (
+            f"{self.__class__.__name__}.favorite_status"
+        ),
         log_to_statsd=False,
     )
     def favorite_status(self, **kwargs: Any) -> Response:
@@ -968,8 +982,9 @@ class ChartRestApi(BaseSupersetModelRestApi):
     @safe
     @statsd_metrics
     @event_logger.log_this_with_context(
-        action=lambda self, *args, **kwargs: f"{self.__class__.__name__}"
-        f".remove_favorite",
+        action=lambda self, *args, **kwargs: (
+            f"{self.__class__.__name__}.remove_favorite"
+        ),
         log_to_statsd=False,
     )
     def remove_favorite(self, pk: int) -> Response:
diff --git a/superset/charts/data/api.py b/superset/charts/data/api.py
index 707ce79f918..3b6fd48b4fe 100644
--- a/superset/charts/data/api.py
+++ b/superset/charts/data/api.py
@@ -31,6 +31,10 @@ from superset import is_feature_enabled, security_manager
 from superset.async_events.async_query_manager import AsyncQueryTokenException
 from superset.charts.api import ChartRestApi
 from superset.charts.client_processing import apply_client_processing
+from superset.charts.data.dashboard_filter_context import (
+    DashboardFilterContext,
+    get_dashboard_filter_context,
+)
 from superset.charts.data.query_context_cache_loader import QueryContextCacheLoader
 from superset.charts.schemas import ChartDataQueryContextSchema
 from superset.commands.chart.data.create_async_job_command import (
@@ -46,9 +50,13 @@ from superset.commands.chart.exceptions import (
 )
 from superset.common.chart_data import ChartDataResultFormat, ChartDataResultType
 from superset.connectors.sqla.models import BaseDatasource
-from superset.constants import CACHE_DISABLED_TIMEOUT
+from superset.constants import (
+    CACHE_DISABLED_TIMEOUT,
+    EXTRA_FORM_DATA_OVERRIDE_EXTRA_KEYS,
+    EXTRA_FORM_DATA_OVERRIDE_REGULAR_MAPPINGS,
+)
 from superset.daos.exceptions import DatasourceNotFound
-from superset.exceptions import QueryObjectValidationError
+from superset.exceptions import QueryObjectValidationError, SupersetSecurityException
 from superset.extensions import event_logger
 from superset.models.sql_lab import Query
 from superset.utils import json
@@ -91,7 +99,9 @@ class ChartDataRestApi(ChartRestApi):
           summary: Return payload data response for a chart
           description: >-
             Takes a chart ID and uses the query context stored when the chart was saved
-            to return payload data response.
+            to return payload data response. When filters_dashboard_id is provided,
+            the chart's compiled SQL includes in scope dashboard filter
+            default values.
           parameters:
           - in: path
             schema:
@@ -113,6 +123,16 @@ class ChartDataRestApi(ChartRestApi):
             description: Should the queries be forced to load from the source
             schema:
                 type: boolean
+          - in: query
+            name: filters_dashboard_id
+            description: >-
+              Dashboard ID whose filter defaults should be applied to the
+              chart's query context. The chart must belong to the specified dashboard.
+              Only in scope filters with static default values are applied; filters that
+              require a database query (I.E. defaultToFirstItem) or have no default are
+              reported in the dashboard_filters response metadata.
+            schema:
+              type: integer
           responses:
             200:
               description: Query result
@@ -130,6 +150,10 @@ class ChartDataRestApi(ChartRestApi):
               $ref: '#/components/responses/400'
             401:
               $ref: '#/components/responses/401'
+            403:
+              $ref: '#/components/responses/403'
+            404:
+              $ref: '#/components/responses/404'
             500:
               $ref: '#/components/responses/500'
         """
@@ -156,6 +180,67 @@ class ChartDataRestApi(ChartRestApi):
         json_body["result_type"] = request.args.get("type", ChartDataResultType.FULL)
         json_body["force"] = request.args.get("force")
 
+        # Apply dashboard filter context when filters_dashboard_id is provided
+        dashboard_filter_context: DashboardFilterContext | None = None
+        if "filters_dashboard_id" in request.args:
+            raw = request.args.get("filters_dashboard_id")
+            try:
+                filters_dashboard_id = int(raw)
+            except (ValueError, TypeError):
+                return self.response_400(
+                    message="filters_dashboard_id must be an integer"
+                )
+        else:
+            filters_dashboard_id = None
+
+        if filters_dashboard_id is not None:
+            try:
+                dashboard_filter_context = get_dashboard_filter_context(
+                    dashboard_id=filters_dashboard_id,
+                    chart_id=pk,
+                )
+            except ValueError as error:
+                return self.response_400(message=str(error))
+            except SupersetSecurityException:
+                return self.response_403()
+
+            if dashboard_filter_context.extra_form_data:
+                efd = dashboard_filter_context.extra_form_data
+                extra_filters = efd.get("filters", [])
+
+                for query in json_body.get("queries", []):
+                    if extra_filters:
+                        existing = query.get("filters") or []
+                        query["filters"] = existing + [
+                            {**f, "isExtra": True} for f in extra_filters
+                        ]
+
+                    extras = query.get("extras") or {}
+                    for key in EXTRA_FORM_DATA_OVERRIDE_EXTRA_KEYS:
+                        if key in efd:
+                            extras[key] = efd[key]
+                    if extras:
+                        query["extras"] = extras
+
+                    for (
+                        src_key,
+                        target_key,
+                    ) in EXTRA_FORM_DATA_OVERRIDE_REGULAR_MAPPINGS.items():
+                        if src_key in efd:
+                            query[target_key] = efd[src_key]
+
+                    query["extra_form_data"] = efd
+
+                # We need to apply the form data to the global context as jinja
+                # templating pulls form data from the request globally, so this
+                # fallback ensures it has the filters and extra_form_data applied
+                # when used in get_sqla_query which constructs the final query.
+
+        # Jinja macros like metric() resolve dataset context from g.form_data
+        # when not given an explicit dataset_id. For GET requests there is no
+        # JSON body, so we must always expose the saved query context here.
+        g.form_data = json_body
+
         try:
             query_context = self._create_query_context_from_form(json_body)
             command = ChartDataCommand(query_context)
@@ -194,6 +279,7 @@ class ChartDataRestApi(ChartRestApi):
             form_data=form_data,
             datasource=query_context.datasource,
             add_extra_log_payload=add_extra_log_payload,
+            dashboard_filter_context=dashboard_filter_context,
         )
 
     @expose("/data", methods=("POST",))
@@ -394,6 +480,7 @@ class ChartDataRestApi(ChartRestApi):
         datasource: BaseDatasource | Query | None = None,
         filename: str | None = None,
         expected_rows: int | None = None,
+        dashboard_filter_context: DashboardFilterContext | None = None,
     ) -> Response:
         result_type = result["query_context"].result_type
         result_format = result["query_context"].result_format
@@ -456,9 +543,14 @@ class ChartDataRestApi(ChartRestApi):
             if security_manager.is_guest_user():
                 for query in queries:
                     query.pop("query", None)
+
+            payload: dict[str, Any] = {"result": queries}
+            if dashboard_filter_context is not None:
+                payload["dashboard_filters"] = dashboard_filter_context.to_dict()
+
             with event_logger.log_context(f"{self.__class__.__name__}.json_dumps"):
                 response_data = json.dumps(
-                    {"result": queries},
+                    payload,
                     default=json.json_int_dttm_ser,
                     ignore_nan=True,
                 )
@@ -497,6 +589,7 @@ class ChartDataRestApi(ChartRestApi):
         filename: str | None = None,
         expected_rows: int | None = None,
         add_extra_log_payload: Callable[..., None] | None = None,
+        dashboard_filter_context: DashboardFilterContext | None = None,
     ) -> Response:
         """Get data response and optionally log is_cached information."""
         try:
@@ -512,7 +605,12 @@ class ChartDataRestApi(ChartRestApi):
             add_extra_log_payload(is_cached=is_cached_values)
 
         return self._send_chart_response(
-            result, form_data, datasource, filename, expected_rows
+            result,
+            form_data,
+            datasource,
+            filename,
+            expected_rows,
+            dashboard_filter_context=dashboard_filter_context,
         )
 
     def _extract_export_params_from_request(self) -> tuple[str | None, int | None]:
diff --git a/superset/charts/data/dashboard_filter_context.py b/superset/charts/data/dashboard_filter_context.py
new file mode 100644
index 00000000000..df889b52ace
--- /dev/null
+++ b/superset/charts/data/dashboard_filter_context.py
@@ -0,0 +1,306 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+from __future__ import annotations
+
+import logging
+from dataclasses import dataclass, field
+from enum import Enum
+from typing import Any
+
+from flask_babel import gettext as _
+
+from superset import db, security_manager
+from superset.constants import (
+    EXTRA_FORM_DATA_APPEND_KEYS,
+    EXTRA_FORM_DATA_OVERRIDE_EXTRA_KEYS,
+    EXTRA_FORM_DATA_OVERRIDE_REGULAR_MAPPINGS,
+)
+from superset.models.dashboard import Dashboard
+from superset.utils import json
+
+logger = logging.getLogger(__name__)
+
+CHART_TYPE = "CHART"
+
+
+class DashboardFilterStatus(str, Enum):
+    APPLIED = "applied"
+    NOT_APPLIED = "not_applied"
+    NOT_APPLIED_USES_DEFAULT_TO_FIRST_ITEM_PREQUERY = (
+        "not_applied_uses_default_to_first_item_prequery"
+    )
+
+
+@dataclass
+class DashboardFilterInfo:
+    id: str
+    name: str
+    status: DashboardFilterStatus
+    column: str | None = None
+
+
+@dataclass
+class DashboardFilterContext:
+    extra_form_data: dict[str, Any] = field(default_factory=dict)
+    filters: list[DashboardFilterInfo] = field(default_factory=list)
+
+    def to_dict(self) -> dict[str, Any]:
+        return {
+            "filters": [
+                {
+                    "id": f.id,
+                    "name": f.name,
+                    "status": f.status.value,
+                    **({"column": f.column} if f.column else {}),
+                }
+                for f in self.filters
+            ],
+        }
+
+
+def _is_filter_in_scope_for_chart(
+    filter_config: dict[str, Any],
+    chart_id: int,
+    position_json: dict[str, Any],
+) -> bool:
+    """
+    Determines whether a native filter applies to a given chart. When
+    chartsInScope is present on the filter config, uses that directly.
+    Otherwise falls back to scope.rootPath and scope.excluded with
+    the dashboard layout.
+    """
+    if (charts_in_scope := filter_config.get("chartsInScope")) is not None:
+        return chart_id in charts_in_scope
+
+    scope = filter_config.get("scope", {})
+    root_path: list[str] = scope.get("rootPath", [])
+    excluded: list[int] = scope.get("excluded", [])
+
+    if chart_id in excluded:
+        return False
+
+    chart_layout_item = _find_chart_layout_item(chart_id, position_json)
+    if not chart_layout_item:
+        return False
+
+    parents: list[str] = chart_layout_item.get("parents", [])
+    return any(parent in root_path for parent in parents)
+
+
+def _find_chart_layout_item(
+    chart_id: int,
+    position_json: dict[str, Any],
+) -> dict[str, Any] | None:
+    """Find the layout item for a chart in the dashboard position JSON."""
+    for item in position_json.values():
+        if not isinstance(item, dict):
+            continue
+        if (
+            item.get("type") == CHART_TYPE
+            and item.get("meta", {}).get("chartId") == chart_id
+        ):
+            return item
+    return None
+
+
+def _merge_extra_form_data(
+    base: dict[str, Any],
+    new: dict[str, Any],
+) -> dict[str, Any]:
+    """
+    Merge two extra_form_data dicts, appending list-type keys (like filters,
+    adhoc_filters), merging dict-type keys (like custom_form_data), and overriding
+    scalar keys (like granularity_sqla, time_range).
+    """
+    append_keys = EXTRA_FORM_DATA_APPEND_KEYS - {"custom_form_data"}
+    override_keys = (
+        set(EXTRA_FORM_DATA_OVERRIDE_REGULAR_MAPPINGS.keys())
+        | EXTRA_FORM_DATA_OVERRIDE_EXTRA_KEYS
+    )
+
+    merged: dict[str, Any] = {}
+
+    for key in append_keys:
+        base_val = base.get(key, [])
+        new_val = new.get(key, [])
+        combined = list(base_val) + list(new_val)
+        if combined:
+            merged[key] = combined
+
+    # Merge custom_form_data as dicts so multiple filters' contributions combine
+    base_custom = base.get("custom_form_data") or {}
+    new_custom = new.get("custom_form_data") or {}
+    if isinstance(base_custom, dict) and isinstance(new_custom, dict):
+        merged_custom = dict(base_custom)
+        for key, value in new_custom.items():
+            if (
+                key in merged_custom
+                and isinstance(merged_custom[key], list)
+                and isinstance(value, list)
+            ):
+                merged_custom[key] = merged_custom[key] + value
+            else:
+                merged_custom[key] = value
+        if merged_custom:
+            merged["custom_form_data"] = merged_custom
+
+    for key in override_keys:
+        if key in new:
+            merged[key] = new[key]
+        elif key in base:
+            merged[key] = base[key]
+
+    return merged
+
+
+def _extract_filter_extra_form_data(
+    filter_config: dict[str, Any],
+) -> tuple[dict[str, Any] | None, DashboardFilterStatus]:
+    """
+    Extract extra_form_data from a native filter's defaultDataMask.
+
+    Mirrors frontend dashboard behavior except for defaultToFirstItem
+    filters: filters with a static default contribute their
+    extraFormData to the query. Filters without a default or with
+    defaultToFirstItem set to True are simply not applied.
+
+    Returns (extra_form_data, status).
+    """
+    default_data_mask = filter_config.get("defaultDataMask", {})
+    control_values = filter_config.get("controlValues", {})
+
+    extra_form_data = default_data_mask.get("extraFormData")
+    filter_state = default_data_mask.get("filterState", {})
+    has_static_default = filter_state.get("value") is not None
+
+    if control_values.get("defaultToFirstItem"):
+        return (
+            None,
+            DashboardFilterStatus.NOT_APPLIED_USES_DEFAULT_TO_FIRST_ITEM_PREQUERY,
+        )
+
+    if has_static_default and extra_form_data:
+        return extra_form_data, DashboardFilterStatus.APPLIED
+
+    return None, DashboardFilterStatus.NOT_APPLIED
+
+
+def _get_filter_target_column(filter_config: dict[str, Any]) -> str | None:
+    """Extract the target column name from a native filter configuration."""
+    if targets := filter_config.get("targets", []):
+        column = targets[0].get("column", {})
+        if isinstance(column, dict):
+            return column.get("name")
+        if isinstance(column, str):
+            return column
+    return None
+
+
+def _validate_chart_on_dashboard(
+    dashboard: Dashboard,
+    chart_id: int,
+) -> None:
+    """
+    Validate that a chart belongs to a dashboard.
+
+    :raises ValueError: if the chart is not found on the dashboard
+    """
+    slice_ids = {slc.id for slc in dashboard.slices}
+    if chart_id not in slice_ids:
+        raise ValueError(
+            _(
+                "Chart %(chart_id)s is not on dashboard %(dashboard_id)s",
+                chart_id=chart_id,
+                dashboard_id=dashboard.id,
+            )
+        )
+
+
+def _check_dashboard_access(dashboard: Dashboard) -> None:
+    """
+    Check that the user has access to the dashboard.
+    Uses the security manager's raise_for_access which handles
+    guest users, admins, owners, and DASHBOARD_RBAC.
+
+    :raises SupersetSecurityException: if the user cannot access the dashboard
+    """
+    security_manager.raise_for_access(dashboard=dashboard)
+
+
+def get_dashboard_filter_context(
+    dashboard_id: int,
+    chart_id: int,
+) -> DashboardFilterContext:
+    """
+    Build a DashboardFilterContext for a chart on a dashboard.
+
+    Loads the dashboard's native filter configuration, determines which
+    filters are in scope for the given chart, extracts default filter values,
+    and returns the merged extra_form_data along with metadata about each filter.
+
+    :param dashboard_id: The ID of the dashboard
+    :param chart_id: The ID of the chart
+    :returns: DashboardFilterContext with merged extra_form_data and filter metadata
+    :raises ValueError: if dashboard not found or chart not on dashboard
+    :raises SupersetSecurityException: if the user cannot access the dashboard
+    """
+    dashboard = db.session.query(Dashboard).filter_by(id=dashboard_id).one_or_none()
+    if not dashboard:
+        raise ValueError(
+            _("Dashboard %(dashboard_id)s not found", dashboard_id=dashboard_id)
+        )
+
+    _check_dashboard_access(dashboard)
+    _validate_chart_on_dashboard(dashboard, chart_id)
+
+    metadata = json.loads(dashboard.json_metadata or "{}")
+    native_filter_config: list[dict[str, Any]] = metadata.get(
+        "native_filter_configuration", []
+    )
+
+    position_json: dict[str, Any] = json.loads(dashboard.position_json or "{}")
+
+    context = DashboardFilterContext()
+
+    for flt in native_filter_config:
+        flt_type = flt.get("type", "")
+        if flt_type == "DIVIDER":
+            continue
+
+        if not _is_filter_in_scope_for_chart(flt, chart_id, position_json):
+            continue
+
+        flt_id = flt.get("id", "")
+        flt_name = flt.get("name", "")
+        target_column = _get_filter_target_column(flt)
+        extra_form_data, status = _extract_filter_extra_form_data(flt)
+
+        if extra_form_data and status == DashboardFilterStatus.APPLIED:
+            context.extra_form_data = _merge_extra_form_data(
+                context.extra_form_data, extra_form_data
+            )
+
+        context.filters.append(
+            DashboardFilterInfo(
+                id=flt_id,
+                name=flt_name,
+                status=status,
+                column=target_column,
+            )
+        )
+
+    return context
diff --git a/superset/charts/schemas.py b/superset/charts/schemas.py
index 4c8bbbf08a0..0a603cbb6ec 100644
--- a/superset/charts/schemas.py
+++ b/superset/charts/schemas.py
@@ -1567,6 +1567,42 @@ class ChartDataResponseResult(Schema):
     )
 
 
+class DashboardFilterInfoSchema(Schema):
+    id = fields.String(
+        metadata={"description": "The native filter ID"},
+        required=True,
+    )
+    name = fields.String(
+        metadata={"description": "The native filter name"},
+        required=True,
+    )
+    status = fields.String(
+        metadata={
+            "description": "Filter status: 'applied' (default value was included "
+            "in the query), 'not_applied' (filter had no default value and was "
+            "omitted, matching dashboard initial-load behavior), or "
+            "'not_applied_uses_default_to_first_item_prequery' (filter uses "
+            "defaultToFirstItem which requires a pre-query to resolve and cannot "
+            "be applied server-side)",
+        },
+        required=True,
+    )
+    column = fields.String(
+        metadata={"description": "Target column name for the filter"},
+        allow_none=True,
+    )
+
+
+class DashboardFiltersResponseSchema(Schema):
+    filters = fields.List(
+        fields.Nested(DashboardFilterInfoSchema),
+        metadata={
+            "description": "Metadata about each in-scope dashboard native filter "
+            "and whether its default value was applied to the query"
+        },
+    )
+
+
 class ChartDataResponseSchema(Schema):
     result = fields.List(
         fields.Nested(ChartDataResponseResult),
@@ -1575,6 +1611,14 @@ class ChartDataResponseSchema(Schema):
             "request."
         },
     )
+    dashboard_filters = fields.Nested(
+        DashboardFiltersResponseSchema,
+        metadata={
+            "description": "Metadata about dashboard native filters applied to "
+            "the query. Only present when filters_dashboard_id is provided."
+        },
+        required=False,
+    )
 
 
 class ChartDataAsyncResponseSchema(Schema):
@@ -1715,6 +1759,7 @@ CHART_SCHEMAS = (
     ChartCacheWarmUpRequestSchema,
     ChartCacheWarmUpResponseSchema,
     ChartDataQueryContextSchema,
+    DashboardFiltersResponseSchema,
     ChartDataResponseSchema,
     ChartDataAsyncResponseSchema,
     # TODO: These should optimally be included in the QueryContext schema as an `anyOf`
diff --git a/superset/commands/dashboard/update.py b/superset/commands/dashboard/update.py
index 962bf1a449d..56d15befb3f 100644
--- a/superset/commands/dashboard/update.py
+++ b/superset/commands/dashboard/update.py
@@ -60,6 +60,7 @@ class UpdateDashboardCommand(UpdateMixin, BaseCommand):
         self.validate()
         assert self._model is not None
         self.process_tab_diff()
+        self.process_native_filter_diff()
 
         # Update tags
         if (tags := self._properties.pop("tags", None)) is not None:
@@ -121,7 +122,43 @@ class UpdateDashboardCommand(UpdateMixin, BaseCommand):
         if exceptions:
             raise DashboardInvalidError(exceptions=exceptions)
 
-    def process_tab_diff(self) -> None:  # noqa: C901
+    @staticmethod
+    def _send_deactivated_report_email(
+        report: ReportSchedule, description: str
+    ) -> None:
+        html_content = textwrap.dedent(
+            f"""
+                <html>
+                <head>
+                    <style type="text/css">
+                    table, th, td {{
+                        border-collapse: collapse;
+                        border-color: rgb(200, 212, 227);
+                        color: rgb(42, 63, 95);
+                        padding: 4px 8px;
+                    }}
+                    .image{{
+                        margin-bottom: 18px;
+                    }}
+                    </style>
+                </head>
+                <body>
+                    <div>{description}</div>
+                    <br>
+                </body>
+                </html>
+                """
+        )
+        for report_owner in report.owners:
+            if email := report_owner.email:
+                send_email_smtp(
+                    to=email,
+                    subject=f"[Report: {report.name}] Deactivated",
+                    html_content=html_content,
+                    config=current_app.config,
+                )
+
+    def process_tab_diff(self) -> None:
         def find_deleted_tabs() -> list[str]:
             position_json = self._properties.get("position_json", "")
             current_tabs = self._model.tabs  # type: ignore
@@ -147,50 +184,61 @@ class UpdateDashboardCommand(UpdateMixin, BaseCommand):
                 Please update your report settings to remove or change the tab used.
                 """  # noqa: E501
             )
-
-            html_content = textwrap.dedent(
-                f"""
-                    <html>
-                    <head>
-                        <style type="text/css">
-                        table, th, td {{
-                            border-collapse: collapse;
-                            border-color: rgb(200, 212, 227);
-                            color: rgb(42, 63, 95);
-                            padding: 4px 8px;
-                        }}
-                        .image{{
-                            margin-bottom: 18px;
-                        }}
-                        </style>
-                    </head>
-                    <body>
-                        <div>{description}</div>
-                        <br>
-                    </body>
-                    </html>
-                    """
-            )
-            for report_owner in report.owners:
-                if email := report_owner.email:
-                    send_email_smtp(
-                        to=email,
-                        subject=f"[Report: {report.name}] Deactivated",
-                        html_content=html_content,
-                        config=current_app.config,
-                    )
+            self._send_deactivated_report_email(report, description)
 
         def deactivate_reports(reports_list: list[ReportSchedule]) -> None:
             for report in reports_list:
-                # deactivate
                 ReportScheduleDAO.update(report, {"active": False})
-                # send email to report owner
                 send_deactivated_email_warning(report)
 
         deleted_tabs = find_deleted_tabs()
         reports = find_reports_containing_tabs(deleted_tabs)
         deactivate_reports(reports)
 
+    def process_native_filter_diff(self) -> None:
+        def find_deleted_native_filter_ids() -> list[str]:
+            new_json_metadata = self._properties.get("json_metadata", "")
+            if not new_json_metadata:
+                return []
+            current_metadata = json.loads(self._model.json_metadata or "{}")  # type: ignore
+            new_metadata = json.loads(new_json_metadata)
+            current_filter_ids = {
+                f["id"]
+                for f in (current_metadata.get("native_filter_configuration") or [])
+                if "id" in f
+            }
+            new_filter_ids = {
+                f["id"]
+                for f in (new_metadata.get("native_filter_configuration") or [])
+                if "id" in f
+            }
+            return list(current_filter_ids - new_filter_ids)
+
+        def find_reports_containing_native_filters(
+            filter_ids: list[str],
+        ) -> list[ReportSchedule]:
+            seen: set[int] = set()
+            reports: list[ReportSchedule] = []
+            for filter_id in filter_ids:
+                for report in ReportScheduleDAO.find_by_native_filter_id(filter_id):
+                    if report.dashboard_id != self._model.id:  # type: ignore
+                        continue
+                    if report.id not in seen:
+                        seen.add(report.id)
+                        reports.append(report)
+            return reports
+
+        description = textwrap.dedent(
+            """
+            The dashboard filter used in this report has been deleted and your report has not been sent.
+            Please update your report settings to remove or change the filter used.
+            """  # noqa: E501
+        )
+        deleted_filter_ids = find_deleted_native_filter_ids()
+        for report in find_reports_containing_native_filters(deleted_filter_ids):
+            ReportScheduleDAO.update(report, {"active": False})
+            self._send_deactivated_report_email(report, description)
+
 
 class UpdateDashboardNativeFiltersCommand(UpdateDashboardCommand):
     @transaction(
diff --git a/superset/commands/database/utils.py b/superset/commands/database/utils.py
index e850a9e89ee..0c25f8173c2 100644
--- a/superset/commands/database/utils.py
+++ b/superset/commands/database/utils.py
@@ -47,7 +47,8 @@ def ping(engine: Engine) -> bool:
     except (sqlite3.ProgrammingError, RuntimeError):
         # SQLite can't run on a separate thread, so ``utils.timeout`` fails
         # RuntimeError catches the equivalent error from duckdb.
-        return engine.dialect.do_ping(engine)
+        with closing(engine.raw_connection()) as conn:
+            return engine.dialect.do_ping(conn)
 
 
 def add_permissions(database: Database) -> None:
diff --git a/superset/commands/importers/v1/assets.py b/superset/commands/importers/v1/assets.py
index d8155abf558..0ec586a8cab 100644
--- a/superset/commands/importers/v1/assets.py
+++ b/superset/commands/importers/v1/assets.py
@@ -35,6 +35,7 @@ from superset.commands.dataset.importers.v1.utils import import_dataset
 from superset.commands.exceptions import CommandInvalidError, ImportFailedError
 from superset.commands.importers.v1.utils import (
     get_resource_mappings_batched,
+    import_tag,
     load_configs,
     load_metadata,
     validate_metadata_type,
@@ -45,6 +46,7 @@ from superset.connectors.sqla.models import SqlaTable
 from superset.dashboards.schemas import ImportV1DashboardSchema
 from superset.databases.schemas import ImportV1DatabaseSchema
 from superset.datasets.schemas import ImportV1DatasetSchema
+from superset.extensions import feature_flag_manager
 from superset.migrations.shared.native_filters import migrate_dashboard
 from superset.models.core import Database
 from superset.models.dashboard import dashboard_slices
@@ -90,7 +92,12 @@ class ImportAssetsCommand(BaseCommand):
 
     # pylint: disable=too-many-locals
     @staticmethod
-    def _import(configs: dict[str, Any], sparse: bool = False) -> None:  # noqa: C901
+    def _import(  # noqa: C901
+        configs: dict[str, Any],
+        sparse: bool = False,
+        contents: Optional[dict[str, Any]] = None,
+    ) -> None:
+        contents = {} if contents is None else contents
         # import databases first
         database_ids: dict[str, int] = {}
         dataset_info: dict[str, dict[str, Any]] = {}
@@ -139,6 +146,13 @@ class ImportAssetsCommand(BaseCommand):
                 charts.append(chart)
                 chart_ids[str(chart.uuid)] = chart.id
 
+                # Handle tags using import_tag function
+                if feature_flag_manager.is_feature_enabled("TAGGING_SYSTEM"):
+                    if "tags" in config:
+                        import_tag(
+                            config["tags"], contents, chart.id, "chart", db.session
+                        )
+
         # import dashboards
         for file_name, config in configs.items():
             if file_name.startswith("dashboards/"):
@@ -164,6 +178,17 @@ class ImportAssetsCommand(BaseCommand):
                 )
                 db.session.execute(insert(dashboard_slices).values(dashboard_chart_ids))
 
+                # Handle tags using import_tag function
+                if feature_flag_manager.is_feature_enabled("TAGGING_SYSTEM"):
+                    if "tags" in config:
+                        import_tag(
+                            config["tags"],
+                            contents,
+                            dashboard.id,
+                            "dashboard",
+                            db.session,
+                        )
+
                 # Migrate any filter-box charts to native dashboard filters.
                 migrate_dashboard(dashboard)
 
@@ -181,7 +206,7 @@ class ImportAssetsCommand(BaseCommand):
     )
     def run(self) -> None:
         self.validate()
-        self._import(self._configs, self.sparse)
+        self._import(self._configs, self.sparse, self.contents)
 
     def validate(self) -> None:
         exceptions: list[ValidationError] = []
diff --git a/superset/commands/importers/v1/utils.py b/superset/commands/importers/v1/utils.py
index 6e5bd93b440..26442342fd4 100644
--- a/superset/commands/importers/v1/utils.py
+++ b/superset/commands/importers/v1/utils.py
@@ -151,9 +151,13 @@ def load_configs(
             try:
                 config = load_yaml(file_name, content)
 
-                # populate passwords from the request or from existing DBs
+                # populate passwords from the request, from YAML config,
+                # or from existing DBs
                 if file_name in passwords:
                     config["password"] = passwords[file_name]
+                elif prefix == "databases" and config.get("password"):
+                    # password already in YAML config, keep it
+                    pass
                 elif prefix == "databases" and config["uuid"] in db_passwords:
                     config["password"] = db_passwords[config["uuid"]]
 
diff --git a/superset/commands/report/base.py b/superset/commands/report/base.py
index 18ea6ad1fd9..3a7ec66634f 100644
--- a/superset/commands/report/base.py
+++ b/superset/commands/report/base.py
@@ -15,10 +15,11 @@
 # specific language governing permissions and limitations
 # under the License.
 import logging
-from typing import Any
+from typing import Any, Optional
 
 from croniter import croniter
 from flask import current_app as app
+from flask_babel import gettext as _
 from marshmallow import ValidationError
 
 from superset.commands.base import BaseCommand
@@ -34,6 +35,8 @@ from superset.commands.report.exceptions import (
 from superset.daos.chart import ChartDAO
 from superset.daos.dashboard import DashboardDAO
 from superset.reports.models import ReportCreationMethod, ReportScheduleType
+from superset.reports.types import ReportScheduleExtra
+from superset.utils import json
 
 logger = logging.getLogger(__name__)
 
@@ -80,6 +83,145 @@ class BaseReportScheduleCommand(BaseCommand):
         elif not update:
             exceptions.append(ReportScheduleEitherChartOrDashboardError())
 
+    def _validate_report_extra(self, exceptions: list[ValidationError]) -> None:
+        extra: Optional[ReportScheduleExtra] = self._properties.get("extra")
+        dashboard = self._properties.get("dashboard")
+
+        # On PUT requests, dashboard may not be in the payload — fall back to the model
+        if dashboard is None:
+            model = getattr(self, "_model", None)
+            dashboard = getattr(model, "dashboard", None)
+
+        if extra is None or dashboard is None:
+            return
+
+        dashboard_state = extra.get("dashboard")
+        if not dashboard_state:
+            return
+
+        if not isinstance(dashboard_state, dict):
+            exceptions.append(
+                ValidationError(
+                    _("extra.dashboard must be an object"),
+                    "extra",
+                )
+            )
+            return
+
+        position_data = json.loads(dashboard.position_json or "{}")
+        active_tabs = dashboard_state.get("activeTabs") or []
+        invalid_tab_ids = set(active_tabs) - set(position_data.keys())
+
+        if anchor := dashboard_state.get("anchor"):
+            try:
+                anchor_list: list[str] = json.loads(anchor)
+                if _invalid_tab_ids := set(anchor_list) - set(position_data.keys()):
+                    invalid_tab_ids.update(_invalid_tab_ids)
+            except json.JSONDecodeError:
+                if anchor not in position_data:
+                    invalid_tab_ids.add(anchor)
+
+        if invalid_tab_ids:
+            exceptions.append(
+                ValidationError(
+                    _("Invalid tab ids: %(tab_ids)s", tab_ids=str(invalid_tab_ids)),
+                    "extra",
+                )
+            )
+
+        self._validate_native_filters(dashboard, dashboard_state, exceptions)
+
+    def _validate_native_filters(
+        self,
+        dashboard: Any,
+        dashboard_state: Any,
+        exceptions: list[ValidationError],
+    ) -> None:
+        native_filters = dashboard_state.get("nativeFilters")
+        if not native_filters:
+            return
+
+        if not isinstance(native_filters, list):
+            exceptions.append(
+                ValidationError(
+                    _("nativeFilters must be a list"),
+                    "extra",
+                )
+            )
+            return
+
+        required_keys = {"nativeFilterId", "filterType", "columnName", "filterValues"}
+        valid_filter_ids: set[str] | None = None
+
+        for idx, native_filter in enumerate(native_filters):
+            if not isinstance(native_filter, dict):
+                exceptions.append(
+                    ValidationError(
+                        _("nativeFilters[%(idx)s] must be an object", idx=idx),
+                        "extra",
+                    )
+                )
+                continue
+
+            missing_keys = required_keys - set(native_filter.keys())
+            if missing_keys:
+                exceptions.append(
+                    ValidationError(
+                        _(
+                            "nativeFilters[%(idx)s] missing required keys: %(keys)s",
+                            idx=idx,
+                            keys=", ".join(sorted(missing_keys)),
+                        ),
+                        "extra",
+                    )
+                )
+                continue
+
+            if not isinstance(native_filter["filterValues"], list):
+                exceptions.append(
+                    ValidationError(
+                        _(
+                            "nativeFilters[%(idx)s].filterValues must be a list",
+                            idx=idx,
+                        ),
+                        "extra",
+                    )
+                )
+                continue
+
+            filter_id = native_filter["nativeFilterId"]
+            if not isinstance(filter_id, str) or not filter_id:
+                exceptions.append(
+                    ValidationError(
+                        _(
+                            "nativeFilters[%(idx)s].nativeFilterId"
+                            " must be a non-empty string",
+                            idx=idx,
+                        ),
+                        "extra",
+                    )
+                )
+                continue
+            if valid_filter_ids is None:
+                json_metadata = json.loads(dashboard.json_metadata or "{}")
+                valid_filter_ids = {
+                    f["id"]
+                    for f in json_metadata.get("native_filter_configuration", [])
+                    if "id" in f
+                }
+            if filter_id not in valid_filter_ids:
+                exceptions.append(
+                    ValidationError(
+                        _(
+                            "nativeFilters[%(idx)s].nativeFilterId '%(filter_id)s' "
+                            "does not exist on the dashboard",
+                            idx=idx,
+                            filter_id=filter_id,
+                        ),
+                        "extra",
+                    )
+                )
+
     def validate_report_frequency(
         self,
         cron_schedule: str,
@@ -116,7 +258,7 @@ class BaseReportScheduleCommand(BaseCommand):
         schedule = croniter(cron_schedule)
         current_exec = next(schedule)
 
-        for _ in range(iterations):
+        for _i in range(iterations):
             next_exec = next(schedule)
             diff, current_exec = next_exec - current_exec, next_exec
             if int(diff) < minimum_interval:
diff --git a/superset/commands/report/create.py b/superset/commands/report/create.py
index b3cd0dd16f0..f3b9b0fc6e6 100644
--- a/superset/commands/report/create.py
+++ b/superset/commands/report/create.py
@@ -19,7 +19,6 @@ from functools import partial
 from typing import Any, Optional
 
 from flask import g
-from flask_babel import gettext as _
 from marshmallow import ValidationError
 
 from superset.commands.base import CreateMixin
@@ -41,7 +40,6 @@ from superset.reports.models import (
     ReportSchedule,
     ReportScheduleType,
 )
-from superset.reports.types import ReportScheduleExtra
 from superset.utils import json
 from superset.utils.decorators import on_error, transaction
 
@@ -164,35 +162,3 @@ class CreateReportScheduleCommand(CreateMixin, BaseReportScheduleCommand):
             exceptions.append(ex)
         if exceptions:
             raise ReportScheduleInvalidError(exceptions=exceptions)
-
-    def _validate_report_extra(self, exceptions: list[ValidationError]) -> None:
-        extra: Optional[ReportScheduleExtra] = self._properties.get("extra")
-        dashboard = self._properties.get("dashboard")
-
-        if extra is None or dashboard is None:
-            return
-
-        dashboard_state = extra.get("dashboard")
-        if not dashboard_state:
-            return
-
-        position_data = json.loads(dashboard.position_json or "{}")
-        active_tabs = dashboard_state.get("activeTabs") or []
-        invalid_tab_ids = set(active_tabs) - set(position_data.keys())
-
-        if anchor := dashboard_state.get("anchor"):
-            try:
-                anchor_list: list[str] = json.loads(anchor)
-                if _invalid_tab_ids := set(anchor_list) - set(position_data.keys()):
-                    invalid_tab_ids.update(_invalid_tab_ids)
-            except json.JSONDecodeError:
-                if anchor not in position_data:
-                    invalid_tab_ids.add(anchor)
-
-        if invalid_tab_ids:
-            exceptions.append(
-                ValidationError(
-                    _("Invalid tab ids: %s(tab_ids)", tab_ids=str(invalid_tab_ids)),
-                    "extra",
-                )
-            )
diff --git a/superset/commands/report/execute.py b/superset/commands/report/execute.py
index 11593649815..66265878dad 100644
--- a/superset/commands/report/execute.py
+++ b/superset/commands/report/execute.py
@@ -99,6 +99,7 @@ class BaseReportState:
         self._scheduled_dttm = scheduled_dttm
         self._start_dttm = datetime.utcnow()
         self._execution_id = execution_id
+        self._filter_warnings: list[str] = []
 
     def update_report_schedule_and_log(
         self,
@@ -265,10 +266,18 @@ class BaseReportState:
         if (
             dashboard_state := self._report_schedule.extra.get("dashboard")
         ) and feature_flag_manager.is_feature_enabled("ALERT_REPORT_TABS"):
-            native_filter_params = self._report_schedule.get_native_filters_params()
+            native_filter_params, filter_warnings = (
+                self._report_schedule.get_native_filters_params()
+            )
+            if filter_warnings:
+                self._filter_warnings.extend(filter_warnings)
             if anchor := dashboard_state.get("anchor"):
                 try:
-                    anchor_list: list[str] = json.loads(anchor)
+                    anchor_list = json.loads(anchor)
+                    if not isinstance(anchor_list, list):
+                        raise json.JSONDecodeError(
+                            "Anchor value is not a list", anchor, 0
+                        )
                     urls = self._get_tabs_urls(
                         anchor_list,
                         native_filter_params=native_filter_params,
@@ -278,13 +287,35 @@ class BaseReportState:
                 except json.JSONDecodeError:
                     logger.debug("Anchor value is not a list, Fall back to single tab")
 
+            # Merge native_filters into existing urlParams instead of
+            # overwriting — dashboard_state may already have urlParams
+            # (e.g. standalone=true) that must be preserved.
+            state: DashboardPermalinkState = {**dashboard_state}
+            existing_params: list[tuple[str, str]] = state.get("urlParams") or []
+            merged_params: list[list[str]] = [
+                list(p) for p in existing_params if p[0] != "native_filters"
+            ]
+            merged_params.append(["native_filters", native_filter_params or ""])
+            state["urlParams"] = merged_params  # type: ignore[typeddict-item]
+            return [
+                self._get_tab_url(
+                    state,
+                    user_friendly=user_friendly,
+                )
+            ]
+
+        native_filter_params, filter_warnings = (
+            self._report_schedule.get_native_filters_params()
+        )
+        if filter_warnings:
+            self._filter_warnings.extend(filter_warnings)
+        if native_filter_params and native_filter_params != "()":
             return [
                 self._get_tab_url(
                     {
                         "urlParams": [
                             ["native_filters", native_filter_params]  # type: ignore
                         ],
-                        **dashboard_state,
                     },
                     user_friendly=user_friendly,
                 )
@@ -470,7 +501,7 @@ class BaseReportState:
             raise ReportScheduleCsvTimeout() from ex
         except Exception as ex:
             elapsed_seconds = (datetime.utcnow() - start_time).total_seconds()
-            logger.error(
+            logger.exception(
                 "CSV generation failed after %.2fs - execution_id: %s",
                 elapsed_seconds,
                 self._execution_id,
@@ -831,7 +862,13 @@ class ReportNotTriggeredErrorState(BaseReportState):
                     )
                     return
             self.send()
-            self.update_report_schedule_and_log(ReportState.SUCCESS)
+            # Include filter warnings in the log if any were collected
+            warning_message = (
+                ";".join(self._filter_warnings) if self._filter_warnings else None
+            )
+            self.update_report_schedule_and_log(
+                ReportState.SUCCESS, error_message=warning_message
+            )
         except (SupersetErrorsException, Exception) as first_ex:
             error_message = str(first_ex)
             if isinstance(first_ex, SupersetErrorsException):
@@ -976,7 +1013,13 @@ class ReportSuccessState(BaseReportState):
 
         try:
             self.send()
-            self.update_report_schedule_and_log(ReportState.SUCCESS)
+            # Include filter warnings in the log if any were collected
+            warning_message = (
+                ";".join(self._filter_warnings) if self._filter_warnings else None
+            )
+            self.update_report_schedule_and_log(
+                ReportState.SUCCESS, error_message=warning_message
+            )
         except Exception as ex:  # pylint: disable=broad-except
             try:
                 self.update_report_schedule_and_log(
diff --git a/superset/commands/report/update.py b/superset/commands/report/update.py
index 1ee09ea7a71..e09f1414f4b 100644
--- a/superset/commands/report/update.py
+++ b/superset/commands/report/update.py
@@ -131,6 +131,7 @@ class UpdateReportScheduleCommand(UpdateMixin, BaseReportScheduleCommand):
 
         # Validate chart or dashboard relations
         self.validate_chart_dashboard(exceptions, update=True)
+        self._validate_report_extra(exceptions)
 
         if "validator_config_json" in self._properties:
             self._properties["validator_config_json"] = json.dumps(
diff --git a/superset/commands/sql_lab/estimate.py b/superset/commands/sql_lab/estimate.py
index 03aec8ade21..2baca1eeb2b 100644
--- a/superset/commands/sql_lab/estimate.py
+++ b/superset/commands/sql_lab/estimate.py
@@ -22,7 +22,7 @@ from typing import Any, TypedDict
 from flask import current_app as app
 from flask_babel import gettext as __
 
-from superset import db
+from superset import db, security_manager
 from superset.commands.base import BaseCommand
 from superset.errors import ErrorLevel, SupersetError, SupersetErrorType
 from superset.exceptions import SupersetErrorException, SupersetTimeoutException
@@ -67,6 +67,7 @@ class QueryEstimationCommand(BaseCommand):
                 ),
                 status=404,
             )
+        security_manager.raise_for_access(database=self._database)
 
     def run(
         self,
diff --git a/superset/commands/sql_lab/results.py b/superset/commands/sql_lab/results.py
index a3cff3bf1ea..94083c82616 100644
--- a/superset/commands/sql_lab/results.py
+++ b/superset/commands/sql_lab/results.py
@@ -25,7 +25,11 @@ from flask_babel import gettext as __
 from superset import db, results_backend, results_backend_use_msgpack
 from superset.commands.base import BaseCommand
 from superset.errors import ErrorLevel, SupersetError, SupersetErrorType
-from superset.exceptions import SerializationError, SupersetErrorException
+from superset.exceptions import (
+    SerializationError,
+    SupersetErrorException,
+    SupersetSecurityException,
+)
 from superset.models.sql_lab import Query
 from superset.sqllab.utils import apply_display_max_row_configuration_if_require
 from superset.utils import core as utils
@@ -83,6 +87,18 @@ class SqlExecutionResultsCommand(BaseCommand):
                 status=404,
             )
 
+        try:
+            self._query.raise_for_access()
+        except SupersetSecurityException as ex:
+            raise SupersetErrorException(
+                SupersetError(
+                    message=__("Cannot access the query"),
+                    error_type=SupersetErrorType.QUERY_SECURITY_ACCESS_ERROR,
+                    level=ErrorLevel.ERROR,
+                ),
+                status=403,
+            ) from ex
+
         # Now fetch results from backend (query exists, so this is a valid request)
         read_from_results_backend_start = now_as_float()
         self._blob = results_backend.get(self._key)
diff --git a/superset/common/query_context_factory.py b/superset/common/query_context_factory.py
index a60eac43848..0d1539a9a16 100644
--- a/superset/common/query_context_factory.py
+++ b/superset/common/query_context_factory.py
@@ -45,6 +45,7 @@ class QueryContextFactory:  # pylint: disable=too-few-public-methods
     def create(  # pylint: disable=too-many-arguments
         self,
         *,
+        current_slice: Slice | None = None,
         datasource: DatasourceDict,
         queries: list[dict[str, Any]],
         form_data: dict[str, Any] | None = None,
@@ -58,7 +59,9 @@ class QueryContextFactory:  # pylint: disable=too-few-public-methods
             datasource_model_instance = self._convert_to_model(datasource)
 
         slice_ = None
-        if form_data and form_data.get("slice_id") is not None:
+        if isinstance(current_slice, Slice):
+            slice_ = current_slice
+        elif form_data and form_data.get("slice_id") is not None:
             slice_ = self._get_slice(form_data.get("slice_id"))
 
         result_type = result_type or ChartDataResultType.FULL
diff --git a/superset/common/query_object.py b/superset/common/query_object.py
index 3f0d796ebc4..577fc66de1e 100644
--- a/superset/common/query_object.py
+++ b/superset/common/query_object.py
@@ -344,7 +344,9 @@ class QueryObject:  # pylint: disable=too-many-instance-attributes
             if clause and self.datasource:
                 try:
                     database = self.datasource.database
-                    processor = get_template_processor(database=database)
+                    processor = get_template_processor(
+                        database=database, table=self.datasource
+                    )
                     try:
                         clause = processor.process_template(clause, force=True)
                     except TemplateError as ex:
diff --git a/superset/config.py b/superset/config.py
index 4410baa3c6e..3fd7ebf2588 100644
--- a/superset/config.py
+++ b/superset/config.py
@@ -563,6 +563,10 @@ DEFAULT_FEATURE_FLAGS: dict[str, bool] = {
     # in addition to relative timeshifts (e.g., "1 day ago")
     # @lifecycle: development
     "DATE_RANGE_TIMESHIFTS_ENABLED": False,
+    # Enable API key authentication via FAB SecurityManager
+    # When enabled, users can create/manage API keys in the User Info page
+    # @lifecycle: development
+    "FAB_API_KEY_ENABLED": False,
     # Enable granular export controls (can_export_data, can_export_image,
     # can_copy_clipboard) instead of the single can_csv permission
     # @lifecycle: development
@@ -1641,6 +1645,13 @@ FAB_ADD_SECURITY_PERMISSION_VIEW = False
 FAB_ADD_SECURITY_VIEW_MENU_VIEW = False
 FAB_ADD_SECURITY_PERMISSION_VIEWS_VIEW = False
 
+# API Key Authentication via FAB SecurityManager
+# FAB reads this config directly to register the ApiKeyApi blueprint.
+# The FAB_API_KEY_ENABLED feature flag (in DEFAULT_FEATURE_FLAGS) controls
+# the frontend UI visibility independently.
+FAB_API_KEY_ENABLED = False
+FAB_API_KEY_PREFIXES = ["sst_"]
+
 # The link to a page containing common errors and their resolutions
 # It will be appended at the bottom of sql_lab errors.
 TROUBLESHOOTING_LINK = ""
@@ -2060,6 +2071,15 @@ DEFAULT_RELATIVE_END_TIME = "today"
 SQL_VALIDATORS_BY_ENGINE = {
     "presto": "PrestoDBSQLValidator",
     "postgresql": "PostgreSQLValidator",
+    # SQLite-based engines (SQLite, GSheets, Shillelagh) can use the
+    # SQLiteSQLValidator, but it requires the optional syntaqlite package:
+    #
+    #   pip install "apache-superset[sqlite]"
+    #
+    # Once installed, enable validation by uncommenting the lines below:
+    # "sqlite": "SQLiteSQLValidator",
+    # "gsheets": "SQLiteSQLValidator",
+    # "shillelagh": "SQLiteSQLValidator",
 }
 
 # A list of preferred databases, in order. These databases will be
@@ -2145,7 +2165,14 @@ TALISMAN_CONFIG = {
             "https://events.mapbox.com",
             "https://tile.openstreetmap.org",
             "https://tile.osm.ch",
-            "https://a.basemaps.cartocdn.com",
+            "https://basemaps.cartocdn.com",
+            "https://*.basemaps.cartocdn.com",
+            "https://tiles.openfreemap.org",
+            "https://*.maptiler.com",
+            "https://tiles.stadiamaps.com",
+            "https://tiles.versatiles.org",
+            "https://*.protomaps.com",
+            "https://*.maplibre.org",
         ],
         "object-src": "'none'",
         "style-src": [
@@ -2185,7 +2212,14 @@ TALISMAN_DEV_CONFIG = {
             "https://events.mapbox.com",
             "https://tile.openstreetmap.org",
             "https://tile.osm.ch",
-            "https://a.basemaps.cartocdn.com",
+            "https://basemaps.cartocdn.com",
+            "https://*.basemaps.cartocdn.com",
+            "https://tiles.openfreemap.org",
+            "https://*.maptiler.com",
+            "https://tiles.stadiamaps.com",
+            "https://tiles.versatiles.org",
+            "https://*.protomaps.com",
+            "https://*.maplibre.org",
         ],
         "object-src": "'none'",
         "style-src": [
diff --git a/superset/connectors/sqla/models.py b/superset/connectors/sqla/models.py
index b49e9ba4d33..4206f140dc3 100644
--- a/superset/connectors/sqla/models.py
+++ b/superset/connectors/sqla/models.py
@@ -299,6 +299,7 @@ class BaseDatasource(
                 "last_name": o.last_name,
                 "username": o.username,
                 "id": o.id,
+                "email": o.email,
             }
             for o in self.owners
         ]
@@ -865,7 +866,7 @@ class TableColumn(AuditMixinNullable, ImportExportMixin, CertificationMixin, Mod
     datetime_format = Column(String(100))
     extra = Column(Text)
 
-    table: Mapped[SqlaTable] = relationship(
+    table: Mapped["SqlaTable"] = relationship(
         "SqlaTable",
         back_populates="columns",
     )
@@ -1106,7 +1107,7 @@ class SqlMetric(AuditMixinNullable, ImportExportMixin, CertificationMixin, Model
     expression = Column(utils.MediumText(), nullable=False)
     extra = Column(Text)
 
-    table: Mapped[SqlaTable] = relationship(
+    table: Mapped["SqlaTable"] = relationship(
         "SqlaTable",
         back_populates="metrics",
     )
@@ -1592,6 +1593,28 @@ class SqlaTable(
 
         return self.make_sqla_column_compatible(sqla_metric, label)
 
+    def _render_adhoc_expression_for_metadata_lookup(
+        self,
+        sql_expression: str,
+        template_processor: BaseTemplateProcessor | None,
+    ) -> str:
+        """Render Jinja in *sql_expression* so the result can be matched against
+        column metadata.  Without this, a templated expression such as
+        ``{{ filter_values('x')[0] }}`` is passed raw to ``get_column``, never
+        matches, and falls back to ``literal_column`` — which breaks for virtual
+        datasets because the rendered name isn't present in the FROM subquery."""
+        if not template_processor:
+            return sql_expression
+        try:
+            return template_processor.process_template(sql_expression)
+        except SupersetSyntaxErrorException as ex:
+            raise QueryObjectValidationError(
+                _(
+                    "Error in jinja expression in adhoc column: %(msg)s",
+                    msg=str(ex),
+                )
+            ) from ex
+
     def adhoc_column_to_sqla(  # pylint: disable=too-many-locals
         self,
         col: AdhocColumn,
@@ -1617,8 +1640,12 @@ class SqlaTable(
         pdf = None
         is_column_reference = col.get("isColumnReference", False)
 
+        metadata_lookup_key = self._render_adhoc_expression_for_metadata_lookup(
+            sql_expression, template_processor
+        )
+
         # First, check if this is a column reference that exists in metadata
-        if col_in_metadata := self.get_column(sql_expression):
+        if col_in_metadata := self.get_column(metadata_lookup_key.strip()):
             # Column exists in metadata - use it directly
             sqla_column = col_in_metadata.get_sqla_col(
                 template_processor=template_processor
@@ -1652,8 +1679,20 @@ class SqlaTable(
             if has_timegrain or force_type_check:
                 try:
                     # probe adhoc column type
-                    tbl, _ = self.get_from_clause(template_processor)
-                    qry = sa.select([sqla_column]).limit(1).select_from(tbl)
+                    # Most databases populate cursor.description from query-plan
+                    # metadata, so WHERE FALSE (zero rows, no table scan) is
+                    # preferred — it avoids hitting row-read limits enforced by
+                    # engines like ClickHouse (max_rows_to_read).
+                    # A small number of drivers (Druid, Pinot) instead build
+                    # cursor.description by inspecting the first returned row;
+                    # for those we fall back to LIMIT 1.
+                    tbl, _unused_cte = self.get_from_clause(template_processor)
+                    if self.db_engine_spec.type_probe_needs_row:
+                        qry = sa.select([sqla_column]).limit(1).select_from(tbl)
+                    else:
+                        qry = (
+                            sa.select([sqla_column]).where(sa.false()).select_from(tbl)
+                        )
                     sql = self.database.compile_sqla_query(
                         qry,
                         catalog=self.catalog,
diff --git a/superset/daos/base.py b/superset/daos/base.py
index 2e5290776e3..fe72f1c63d0 100644
--- a/superset/daos/base.py
+++ b/superset/daos/base.py
@@ -623,6 +623,7 @@ class BaseDAO(CoreBaseDAO[T], Generic[T]):
 
         column_attrs = []
         relationship_loads = []
+        needs_full_model = False
         if columns is None:
             columns = []
         for name in columns:
@@ -634,11 +635,16 @@ class BaseDAO(CoreBaseDAO[T], Generic[T]):
                 column_attrs.append(attr)
             elif isinstance(prop, RelationshipProperty):
                 relationship_loads.append(joinedload(attr))
-            # Ignore properties and other non-queryable attributes
+            else:
+                # Python @property or other descriptor — requires a full
+                # model instance (Row objects don't support descriptors)
+                needs_full_model = True
 
-        if relationship_loads:
-            # If any relationships are requested, query the full model
-            # but don't add the joins yet - we'll add them after counting
+        if relationship_loads or needs_full_model:
+            # Need full model for relationships or Python @property access.
+            # Do NOT apply load_only() here — @property descriptors and
+            # serializers may access columns beyond the explicitly requested
+            # set (e.g., Slice.datasource_type accessed during serialization).
             query = data_model.session.query(cls.model_cls)
         elif column_attrs:
             # Only columns requested
diff --git a/superset/daos/report.py b/superset/daos/report.py
index ab7af8e9763..823fad80931 100644
--- a/superset/daos/report.py
+++ b/superset/daos/report.py
@@ -94,7 +94,20 @@ class ReportScheduleDAO(BaseDAO[ReportSchedule]):
     def find_by_extra_metadata(slug: str) -> list[ReportSchedule]:
         return (
             db.session.query(ReportSchedule)
-            .filter(ReportSchedule.extra_json.like(f"%{slug}%"))
+            .filter(ReportSchedule.extra_json.contains(slug, autoescape=True))
+            .all()
+        )
+
+    @staticmethod
+    def find_by_native_filter_id(native_filter_id: str) -> list[ReportSchedule]:
+        """
+        searches extra_json for a filter ID string
+        """
+        return (
+            db.session.query(ReportSchedule)
+            .filter(
+                ReportSchedule.extra_json.contains(native_filter_id, autoescape=True)
+            )
             .all()
         )
 
@@ -187,7 +200,8 @@ class ReportScheduleDAO(BaseDAO[ReportSchedule]):
             item = ReportSchedule()
 
         if attributes:
-            if recipients := attributes.pop("recipients", None):
+            if "recipients" in attributes:
+                recipients = attributes.pop("recipients")
                 attributes["recipients"] = [
                     ReportRecipients(
                         type=recipient["type"],
diff --git a/superset/dashboards/api.py b/superset/dashboards/api.py
index 58ecb69428a..3cd8f0a30d7 100644
--- a/superset/dashboards/api.py
+++ b/superset/dashboards/api.py
@@ -39,7 +39,7 @@ from marshmallow import ValidationError
 from werkzeug.wrappers import Response as WerkzeugResponse
 from werkzeug.wsgi import FileWrapper
 
-from superset import db
+from superset import db, is_feature_enabled
 from superset.charts.schemas import ChartEntityResponseSchema
 from superset.commands.dashboard.copy import CopyDashboardCommand
 from superset.commands.dashboard.create import CreateDashboardCommand
@@ -114,7 +114,7 @@ from superset.dashboards.schemas import (
     thumbnail_query_schema,
 )
 from superset.exceptions import ScreenshotImageNotAvailableException
-from superset.extensions import event_logger
+from superset.extensions import event_logger, security_manager
 from superset.models.dashboard import Dashboard
 from superset.models.embedded_dashboard import EmbeddedDashboard
 from superset.security.guest_token import GuestUser
@@ -1389,6 +1389,10 @@ class DashboardRestApi(CustomTagsOptimizationMixin, BaseSupersetModelRestApi):
             500:
               $ref: '#/components/responses/500'
         """
+        if is_feature_enabled(
+            "GRANULAR_EXPORT_CONTROLS"
+        ) and not security_manager.can_access("can_export_image", "Superset"):
+            return self.response_403()
         try:
             payload = CacheScreenshotSchema().load(request.json)
         except ValidationError as error:
@@ -1505,6 +1509,10 @@ class DashboardRestApi(CustomTagsOptimizationMixin, BaseSupersetModelRestApi):
             500:
               $ref: '#/components/responses/500'
         """
+        if is_feature_enabled(
+            "GRANULAR_EXPORT_CONTROLS"
+        ) and not security_manager.can_access("can_export_image", "Superset"):
+            return self.response_403()
         dashboard = self.datamodel.get(pk, self._base_filters)
 
         # Making sure the dashboard still exists
diff --git a/superset/databases/utils.py b/superset/databases/utils.py
index e78500665ec..51666157c92 100644
--- a/superset/databases/utils.py
+++ b/superset/databases/utils.py
@@ -99,6 +99,7 @@ def get_table_metadata(database: Any, table: Table) -> TableMetadataResponse:
         "columns": payload_columns,
         "selectStar": database.select_star(
             table,
+            show_cols=True if columns else False,
             indent=True,
             cols=columns,
             latest_partition=True,
diff --git a/superset/datasets/api.py b/superset/datasets/api.py
index dbb51b9bf35..845c6fe4579 100644
--- a/superset/datasets/api.py
+++ b/superset/datasets/api.py
@@ -1257,7 +1257,7 @@ class DatasetRestApi(BaseSupersetModelRestApi):
 
         if parse_boolean_string(request.args.get("include_rendered_sql")):
             try:
-                processor = get_template_processor(database=table.database)
+                processor = get_template_processor(database=table.database, table=table)
                 response["result"] = self.render_dataset_fields(
                     response["result"], processor
                 )
diff --git a/superset/datasets/schemas.py b/superset/datasets/schemas.py
index 1a30a6bd799..386686d5700 100644
--- a/superset/datasets/schemas.py
+++ b/superset/datasets/schemas.py
@@ -167,6 +167,7 @@ class DatasetPostSchema(Schema):
     external_url = fields.String(allow_none=True)
     normalize_columns = fields.Boolean(load_default=False)
     always_filter_main_dttm = fields.Boolean(load_default=False)
+    currency_code_column = fields.String(allow_none=True, validate=Length(0, 250))
     template_params = fields.String(allow_none=True)
     uuid = fields.UUID(allow_none=True)
 
diff --git a/superset/db_engine_specs/base.py b/superset/db_engine_specs/base.py
index 965eec46b12..6a596965b7f 100644
--- a/superset/db_engine_specs/base.py
+++ b/superset/db_engine_specs/base.py
@@ -43,7 +43,7 @@ import requests
 from apispec import APISpec
 from apispec.ext.marshmallow import MarshmallowPlugin
 from deprecation import deprecated
-from flask import current_app as app, g, url_for
+from flask import current_app as app, g
 from flask_appbuilder.security.sqla.models import User
 from flask_babel import gettext as __, lazy_gettext as _
 from marshmallow import fields, Schema
@@ -62,7 +62,11 @@ from superset import db
 from superset.constants import QUERY_CANCEL_KEY, TimeGrain as TimeGrainConstants
 from superset.databases.utils import get_table_metadata, make_url_safe
 from superset.errors import ErrorLevel, SupersetError, SupersetErrorType
-from superset.exceptions import OAuth2Error, OAuth2RedirectError
+from superset.exceptions import (
+    OAuth2Error,
+    OAuth2RedirectError,
+    OAuth2TokenRefreshError,
+)
 from superset.key_value.types import JsonKeyValueCodec, KeyValueResource
 from superset.sql.parse import (
     BaseSQLStatement,
@@ -88,6 +92,7 @@ from superset.utils.oauth2 import (
     encode_oauth2_state,
     generate_code_challenge,
     generate_code_verifier,
+    get_oauth2_redirect_uri,
 )
 
 if TYPE_CHECKING:
@@ -526,6 +531,14 @@ class BaseEngineSpec:  # pylint: disable=too-many-public-methods
     force_column_alias_quotes = False
     arraysize = 0
     max_column_name_length: int | None = None
+
+    # Some databases (e.g. Druid, Pinot) build cursor.description by inspecting
+    # the values in the first returned row rather than from query-plan metadata.
+    # For those engines WHERE FALSE returns no rows and therefore leaves
+    # cursor.description as None, which breaks the adhoc column type probe.
+    # Set this to True on any engine spec where at least one row must be
+    # fetched for cursor.description to be populated.
+    type_probe_needs_row: bool = False
     try_remove_schema_from_table_name = True  # pylint: disable=invalid-name
     run_multiple_statements_as_one = False
     custom_errors: dict[
@@ -646,10 +659,7 @@ class BaseEngineSpec:  # pylint: disable=too-many-public-methods
         from superset.daos.key_value import KeyValueDAO
 
         tab_id = str(uuid4())
-        default_redirect_uri = app.config.get(
-            "DATABASE_OAUTH2_REDIRECT_URI",
-            url_for("DatabaseRestApi.oauth2", _external=True),
-        )
+        default_redirect_uri = get_oauth2_redirect_uri()
 
         # Generate PKCE code verifier (RFC 7636)
         code_verifier = generate_code_verifier()
@@ -712,10 +722,7 @@ class BaseEngineSpec:  # pylint: disable=too-many-public-methods
             return None
 
         db_engine_spec_config = oauth2_config[cls.engine_name]
-        redirect_uri = app.config.get(
-            "DATABASE_OAUTH2_REDIRECT_URI",
-            url_for("DatabaseRestApi.oauth2", _external=True),
-        )
+        redirect_uri = get_oauth2_redirect_uri()
 
         config: OAuth2ClientConfig = {
             "id": db_engine_spec_config["id"],
@@ -825,6 +832,8 @@ class BaseEngineSpec:  # pylint: disable=too-many-public-methods
             if config["request_content_type"] == "data"
             else requests.post(uri, json=req_body, timeout=timeout)
         )
+        if response.status_code in (400, 401, 403):
+            raise OAuth2TokenRefreshError(response.text)
         response.raise_for_status()
         return response.json()
 
diff --git a/superset/db_engine_specs/crate.py b/superset/db_engine_specs/crate.py
index 916f98f3f01..dec3021f73e 100644
--- a/superset/db_engine_specs/crate.py
+++ b/superset/db_engine_specs/crate.py
@@ -37,7 +37,7 @@ class CrateEngineSpec(BaseEngineSpec):
             "CrateDB is a distributed SQL database for machine data and IoT workloads."
         ),
         "logo": "cratedb.svg",
-        "homepage_url": "https://crate.io/",
+        "homepage_url": "https://cratedb.com",
         "categories": [DatabaseCategory.TIME_SERIES, DatabaseCategory.OPEN_SOURCE],
         "pypi_packages": ["crate", "sqlalchemy-cratedb"],
         "connection_string": "crate://{host}:{port}",
diff --git a/superset/db_engine_specs/druid.py b/superset/db_engine_specs/druid.py
index 453231c3910..f80c1e1d353 100644
--- a/superset/db_engine_specs/druid.py
+++ b/superset/db_engine_specs/druid.py
@@ -46,6 +46,10 @@ class DruidEngineSpec(BaseEngineSpec):
     allows_joins = is_feature_enabled("DRUID_JOINS")
     allows_subqueries = True
 
+    # pydruid builds cursor.description from the first returned row, so a
+    # WHERE FALSE query (zero rows) leaves description as None.
+    type_probe_needs_row = True
+
     metadata = {
         "description": (
             "Apache Druid is a high performance real-time analytics database."
diff --git a/superset/db_engine_specs/gsheets.py b/superset/db_engine_specs/gsheets.py
index 3bcb3a8c871..4874102c903 100644
--- a/superset/db_engine_specs/gsheets.py
+++ b/superset/db_engine_specs/gsheets.py
@@ -30,9 +30,7 @@ from flask_babel import gettext as __
 from marshmallow import fields, Schema
 from marshmallow.exceptions import ValidationError
 from requests import Session
-from requests.exceptions import HTTPError
 from shillelagh.adapters.api.gsheets.lib import SCOPES
-from shillelagh.exceptions import UnauthenticatedError
 from sqlalchemy.engine import create_engine
 from sqlalchemy.engine.reflection import Inspector
 from sqlalchemy.engine.url import URL
@@ -43,7 +41,6 @@ from superset.db_engine_specs.base import DatabaseCategory
 from superset.db_engine_specs.shillelagh import ShillelaghEngineSpec
 from superset.errors import ErrorLevel, SupersetError, SupersetErrorType
 from superset.exceptions import SupersetException
-from superset.superset_typing import OAuth2TokenResponse
 from superset.utils import json
 from superset.utils.oauth2 import get_oauth2_access_token
 
@@ -154,7 +151,6 @@ class GSheetsEngineSpec(ShillelaghEngineSpec):
         "https://accounts.google.com/o/oauth2/v2/auth"
     )
     oauth2_token_request_uri = "https://oauth2.googleapis.com/token"  # noqa: S105
-    oauth2_exception = UnauthenticatedError
 
     @classmethod
     def get_oauth2_authorization_uri(
@@ -218,29 +214,6 @@ class GSheetsEngineSpec(ShillelaghEngineSpec):
             )
         )
 
-    @classmethod
-    def get_oauth2_fresh_token(
-        cls,
-        config: OAuth2ClientConfig,
-        refresh_token: str,
-    ) -> OAuth2TokenResponse:
-        """
-        Refresh an OAuth2 access token that has expired.
-
-        When trying to refresh an expired token that was revoked on Google side,
-        the request fails with 400 status code.
-        """
-        try:
-            return super().get_oauth2_fresh_token(config, refresh_token)
-        except HTTPError as ex:
-            if ex.response is not None and ex.response.status_code == 400:
-                error_data = ex.response.json()
-                if error_data.get("error") == "invalid_grant":
-                    raise UnauthenticatedError(
-                        error_data.get("error_description", "Token has been revoked")
-                    ) from ex
-            raise
-
     @classmethod
     def impersonate_user(
         cls,
diff --git a/superset/db_engine_specs/pinot.py b/superset/db_engine_specs/pinot.py
index 9e0b8a888da..7942df79efe 100644
--- a/superset/db_engine_specs/pinot.py
+++ b/superset/db_engine_specs/pinot.py
@@ -31,6 +31,10 @@ class PinotEngineSpec(BaseEngineSpec):
     allows_alias_in_select = False
     allows_alias_in_orderby = False
 
+    # pinotdb only sets cursor.description when the response contains
+    # columnDataTypes, which Pinot omits for zero-row results.
+    type_probe_needs_row = True
+
     metadata = {
         "description": "Apache Pinot is a real-time distributed OLAP datastore.",
         "logo": "apache-pinot.svg",
diff --git a/superset/db_engine_specs/postgres.py b/superset/db_engine_specs/postgres.py
index b744b7b440b..b1b265c78eb 100644
--- a/superset/db_engine_specs/postgres.py
+++ b/superset/db_engine_specs/postgres.py
@@ -82,6 +82,43 @@ COLUMN_DOES_NOT_EXIST_REGEX = re.compile(
 SYNTAX_ERROR_REGEX = re.compile('syntax error at or near "(?P<syntax_error>.*?)"')
 
 
+def _check_not_redshift(dbapi_connection: Any, connection_record: Any) -> None:
+    """
+    Event that checks if database is Amazon Redshift.
+
+    SQLAlchemy pool `connect` event that checks whether the database is actually
+    Amazon Redshift by running `SELECT version()`. Redshift returns a version string
+    containing `Redshift`, e.g.::
+
+        PostgreSQL 8.0.2 on ... Redshift 1.0.77467
+
+    If detected, a `ValueError` is raised so that the user is prompted to
+    switch to the `redshift+psycopg2://` driver, which ensures the correct
+    sqlglot dialect is used for SQL transpilation.
+    """
+    try:
+        cursor = dbapi_connection.cursor()
+        try:
+            cursor.execute("SELECT version()")
+            version = cursor.fetchone()[0]
+        finally:
+            cursor.close()
+
+        if "redshift" in str(version).lower():
+            raise ValueError(
+                "It looks like you're connecting to Amazon Redshift using the "
+                "PostgreSQL driver. Please use the Redshift driver instead "
+                "(redshift+psycopg2://) to ensure proper SQL dialect support."
+            )
+    except ValueError:
+        raise
+    except Exception:
+        logger.debug(
+            "Failed to check database version for Redshift detection",
+            exc_info=True,
+        )
+
+
 def parse_options(connect_args: dict[str, Any]) -> dict[str, str]:
     """
     Parse ``options`` from  ``connect_args`` into a dictionary.
@@ -570,6 +607,15 @@ class PostgresEngineSpec(BasicParametersMixin, PostgresBaseEngineSpec):
 
         return uri, connect_args
 
+    @staticmethod
+    def mutate_db_for_connection_test(database: Database) -> None:
+        """
+        Flag the database so that the Redshift `SELECT version()` check
+        runs during `test_connection`.  The actual check is injected as a
+        pool `connect` event inside `update_params_from_encrypted_extra`.
+        """
+        database._check_redshift_version = True
+
     @staticmethod
     def update_params_from_encrypted_extra(
         database: Database,
@@ -581,6 +627,13 @@ class PostgresEngineSpec(BasicParametersMixin, PostgresBaseEngineSpec):
         Handles AWS IAM authentication if configured, then merges any
         remaining encrypted_extra keys into params (standard behavior).
         """
+        # During test_connection, inject a pool event to detect Redshift by
+        # checking SELECT version().  This catches cases where the hostname
+        # doesn't reveal Redshift (custom domains, private endpoints, etc.).
+        if getattr(database, "_check_redshift_version", False) is True:
+            pool_events = params.setdefault("pool_events", [])
+            pool_events.append((_check_not_redshift, "connect"))
+
         if not database.encrypted_extra:
             return
 
diff --git a/superset/db_engine_specs/presto.py b/superset/db_engine_specs/presto.py
index d8109e1a301..baea622d92e 100644
--- a/superset/db_engine_specs/presto.py
+++ b/superset/db_engine_specs/presto.py
@@ -920,6 +920,19 @@ class PrestoEngineSpec(PrestoBaseEngineSpec):
         ],
     }
 
+    @classmethod
+    def convert_dttm(
+        cls, target_type: str, dttm: datetime, db_extra: dict[str, Any] | None = None
+    ) -> str | None:
+        sqla_type = cls.get_sqla_column_type(target_type)
+
+        if isinstance(sqla_type, types.Date):
+            return f"DATE '{dttm.date().isoformat()}'"
+        if isinstance(sqla_type, types.TIMESTAMP):
+            return f"""TIMESTAMP '{dttm.isoformat(timespec="milliseconds", sep=" ")}'"""
+
+        return None
+
     custom_errors: dict[Pattern[str], tuple[str, SupersetErrorType, dict[str, Any]]] = {
         COLUMN_DOES_NOT_EXIST_REGEX: (
             __(
diff --git a/superset/db_engine_specs/redshift.py b/superset/db_engine_specs/redshift.py
index 8621873e75b..e232a5b5496 100644
--- a/superset/db_engine_specs/redshift.py
+++ b/superset/db_engine_specs/redshift.py
@@ -129,11 +129,16 @@ class RedshiftEngineSpec(BasicParametersMixin, PostgresBaseEngineSpec):
                 },
             },
             {
-                "name": "IAM Credentials (Serverless)",
-                "description": "Use IAM-based credentials for Redshift Serverless",
+                "name": "IAM Role (Serverless)",
+                "description": (
+                    "Authenticate using the IAM role attached to the environment "
+                    "(EC2 instance profile, ECS task role, etc.). "
+                    "No credentials needed."
+                ),
                 "requirements": (
-                    "IAM role must have redshift-serverless:GetCredentials "
-                    "and redshift-serverless:GetWorkgroup permissions"
+                    "The attached IAM role must have "
+                    "redshift-serverless:GetCredentials and "
+                    "redshift-serverless:GetWorkgroup permissions."
                 ),
                 "connection_string": "redshift+redshift_connector://",
                 "engine_parameters": {
@@ -147,6 +152,34 @@ class RedshiftEngineSpec(BasicParametersMixin, PostgresBaseEngineSpec):
                     }
                 },
             },
+            {
+                "name": "IAM Access Key (Serverless)",
+                "description": (
+                    "Authenticate using explicit AWS access key and secret. "
+                    "Suitable for local development or CI environments without "
+                    "an attached IAM role."
+                ),
+                "requirements": (
+                    "The IAM user must have "
+                    "redshift-serverless:GetCredentials and "
+                    "redshift-serverless:GetWorkgroup permissions."
+                ),
+                "connection_string": "redshift+redshift_connector://",
+                "engine_parameters": {
+                    "connect_args": {
+                        "iam": True,
+                        "is_serverless": True,
+                        "serverless_acct_id": "<aws account number>",
+                        "serverless_work_group": "<redshift work group>",
+                        "database": "<database>",
+                        "host": "<endpoint>",
+                        "port": 5439,
+                        "region": "<aws region>",
+                        "access_key_id": "<aws access key id>",
+                        "secret_access_key": "<aws secret access key>",
+                    }
+                },
+            },
         ],
     }
 
diff --git a/superset/db_engine_specs/trino.py b/superset/db_engine_specs/trino.py
index 62494971728..139f1411cc2 100644
--- a/superset/db_engine_specs/trino.py
+++ b/superset/db_engine_specs/trino.py
@@ -66,16 +66,6 @@ except ImportError:
     HttpError = Exception
 
 
-class CustomTrinoAuthErrorMeta(type):
-    def __instancecheck__(cls, instance: object) -> bool:
-        logger.info("is this being called?")
-        return isinstance(instance, HttpError) and "error 401" in str(instance)
-
-
-class TrinoAuthError(HttpError, metaclass=CustomTrinoAuthErrorMeta):
-    pass
-
-
 class TrinoEngineSpec(PrestoBaseEngineSpec):
     engine = "trino"
     engine_name = "Trino"
@@ -160,9 +150,22 @@ class TrinoEngineSpec(PrestoBaseEngineSpec):
 
     # OAuth 2.0
     supports_oauth2 = True
-    oauth2_exception = TrinoAuthError
     oauth2_token_request_type = "data"  # noqa: S105
 
+    @classmethod
+    def needs_oauth2(cls, ex: Exception) -> bool:
+        """
+        Check if the exception indicates that OAuth2 authentication is required.
+
+        Trino returns an HTTP 401 error when the access token is missing or expired.
+        """
+        return (
+            bool(g)
+            and hasattr(g, "user")
+            and isinstance(ex, HttpError)
+            and "error 401" in str(ex)
+        )
+
     @classmethod
     def get_extra_table_metadata(
         cls,
diff --git a/superset/exceptions.py b/superset/exceptions.py
index 3a81a249c47..afceac9b5d6 100644
--- a/superset/exceptions.py
+++ b/superset/exceptions.py
@@ -368,6 +368,27 @@ class OAuth2RedirectError(SupersetErrorException):
         )
 
 
+class OAuth2TokenRefreshError(OAuth2RedirectError):
+    """
+    Raised when an OAuth2 refresh token request fails with a 400/401/403 error.
+    The stored token is no longer valid and the user must re-authenticate.
+
+    Subclasses OAuth2RedirectError so that existing oauth2_exception checks
+    match it automatically, triggering start_oauth2_dance() via check_for_oauth2.
+    """
+
+    def __init__(self, response_text: str) -> None:
+        SupersetErrorException.__init__(
+            self,
+            SupersetError(
+                message="OAuth2 token refresh failed, re-authentication required.",
+                error_type=SupersetErrorType.OAUTH2_REDIRECT,
+                level=ErrorLevel.WARNING,
+                extra={"error": response_text},
+            ),
+        )
+
+
 class OAuth2Error(SupersetErrorException):
     """
     Exception for when OAuth2 goes wrong.
diff --git a/superset/jinja_context.py b/superset/jinja_context.py
index 15b8d0495a1..5a4bff3fd07 100644
--- a/superset/jinja_context.py
+++ b/superset/jinja_context.py
@@ -371,11 +371,11 @@ class ExtraCache:
                 {%- for filter in get_filters('full_name', remove_filter=True) -%}
                 {%- if filter.get('op') == 'IN' -%}
                     AND
-                    full_name IN ( {{ "'" + "', '".join(filter.get('val')) + "'" }} )
+                    full_name IN {{ filter.get('val')|where_in }}
                 {%- endif -%}
                 {%- if filter.get('op') == 'LIKE' -%}
                     AND
-                    full_name LIKE {{ "'" + filter.get('val') + "'" }}
+                    full_name LIKE '{{ filter.get('val') | replace("'", "''") }}'
                 {%- endif -%}
                 {%- endfor -%}
                 UNION ALL
diff --git a/superset/mcp_service/CLAUDE.md b/superset/mcp_service/CLAUDE.md
index ae905fd35a4..2f300fbd725 100644
--- a/superset/mcp_service/CLAUDE.md
+++ b/superset/mcp_service/CLAUDE.md
@@ -2,7 +2,7 @@
 
 This guide helps LLM agents understand the Superset MCP (Model Context Protocol) service architecture and development conventions.
 
-## ⚠️ CRITICAL: Apache License Headers
+## CRITICAL: Apache License Headers
 
 **EVERY Python file in the MCP service MUST have the Apache Software Foundation license header.**
 
@@ -39,34 +39,60 @@ Use this exact template at the top of EVERY Python file:
 
 ## Architecture Overview
 
-The MCP service provides programmatic access to Superset via the Model Context Protocol, allowing AI assistants to interact with dashboards, charts, datasets, SQL Lab, and instance metadata.
+The MCP service provides programmatic access to Superset via the Model Context Protocol, allowing AI assistants to interact with dashboards, charts, datasets, databases, SQL Lab, and instance metadata.
 
 ### Key Components
 
 ```
 superset/mcp_service/
 ├── app.py                      # FastMCP app factory and tool registration
-├── auth.py                     # Authentication and authorization
+├── auth.py                     # Authentication, authorization, and RBAC
 ├── mcp_config.py              # Default configuration
 ├── mcp_core.py                # Reusable core classes for tools
 ├── flask_singleton.py         # Flask app singleton for MCP context
-├── chart/                     # Chart-related tools
-│   ├── schemas.py            # Pydantic schemas for chart responses
-│   └── tool/                 # Chart tool implementations
-│       ├── __init__.py       # Tool exports
-│       ├── list_charts.py
-│       └── get_chart_info.py
-├── dashboard/                 # Dashboard-related tools
+├── middleware.py              # FastMCP middleware (logging, errors, size guards)
+├── server.py                  # Server startup (streamable-http, multi-pod)
+├── jwt_verifier.py            # JWT token validation
+├── chart/                     # Chart tools, schemas, prompts, resources
+│   ├── schemas.py
+│   ├── chart_utils.py
+│   ├── preview_utils.py
+│   ├── validation.py
+│   ├── tool/
+│   ├── prompts/
+│   └── resources/
+├── dashboard/                 # Dashboard tools and schemas
 │   ├── schemas.py
 │   └── tool/
-├── dataset/                   # Dataset-related tools
+├── dataset/                   # Dataset tools and schemas
 │   ├── schemas.py
 │   └── tool/
-└── system/                    # System/instance tools
-    ├── schemas.py
-    └── tool/
+├── explore/                   # Explore link generation
+│   ├── schemas.py
+│   └── tool/
+├── sql_lab/                   # SQL Lab tools (execute, save, open)
+│   ├── schemas.py
+│   └── tool/
+├── system/                    # System tools (health, instance info, schema)
+│   ├── schemas.py
+│   ├── tool/
+│   ├── prompts/
+│   └── resources/
+├── common/                    # Shared error schemas
+├── commands/                  # MCP-specific command classes
+└── utils/                     # Utilities (URL, schema parsing, error builders)
 ```
 
+### Dependency Injection Architecture
+
+The `@tool` and `@prompt` decorators are defined as stubs in the `superset-core` package (`superset_core.mcp.decorators`). At startup, `app.py` calls `initialize_core_mcp_dependencies()` which replaces these stubs with concrete implementations that register tools/prompts with the FastMCP instance. This avoids circular imports between `superset_core` and `superset`.
+
+**Startup flow**:
+1. `app.py` creates the FastMCP `mcp` instance
+2. `initialize_core_mcp_dependencies()` injects the real decorator implementations
+3. Tool/prompt/resource imports at the bottom of `app.py` trigger registration
+4. `server.py` adds middleware and starts the transport
+
 ## Critical Convention: Tool, Prompt, and Resource Registration
 
 **IMPORTANT**: When creating new MCP tools, prompts, or resources, you MUST add their imports to `app.py` for auto-registration. Do NOT add them to `server.py` - that approach doesn't work properly.
@@ -74,23 +100,55 @@ superset/mcp_service/
 ### How to Add a New Tool
 
 1. **Create the tool file** in the appropriate directory (e.g., `chart/tool/my_new_tool.py`)
-2. **Decorate with `@tool`** to register it with the decorator
-3. **Add import to `app.py`** at the bottom of the file where other tools are imported (around line 210-242)
+2. **Decorate with `@tool`** using the decorator from `superset_core.mcp.decorators`
+3. **Export from the module's `__init__.py`** (e.g., `chart/tool/__init__.py`)
+4. **Add import to `app.py`** at the bottom of the file where other tools are imported
 
-**Example**:
+**Example (read-only tool)**:
 ```python
 # superset/mcp_service/chart/tool/my_new_tool.py
-from superset_core.api.mcp import tool
+from fastmcp import Context
+from superset_core.mcp.decorators import tool, ToolAnnotations
 
-@tool
-def my_new_tool(param: str) -> dict:
+from superset.extensions import event_logger
+
+@tool(
+    tags=["core"],
+    class_permission_name="Chart",
+    annotations=ToolAnnotations(
+        title="My new tool",
+        readOnlyHint=True,
+        destructiveHint=False,
+    ),
+)
+async def my_new_tool(request: MyRequest, ctx: Context) -> MyResponse:
     """Tool description for LLMs."""
-    return {"result": "success"}
+    await ctx.info("Doing something: param=%s" % (request.param,))
+    with event_logger.log_context(action="mcp.my_new_tool"):
+        result = do_something()
+    return MyResponse(data=result)
+```
+
+**Example (mutating tool)**:
+```python
+@tool(
+    tags=["mutate"],
+    class_permission_name="Chart",
+    method_permission_name="write",
+    annotations=ToolAnnotations(
+        title="Create something",
+        readOnlyHint=False,
+        destructiveHint=False,
+    ),
+)
+async def create_something(request: CreateRequest, ctx: Context) -> CreateResponse:
+    """Creates a new resource."""
+    ...
 ```
 
 **Then add to app.py**:
 ```python
-# superset/mcp_service/app.py (at the bottom, around line 207-224)
+# superset/mcp_service/app.py (at the bottom, after initialize_core_mcp_dependencies())
 from superset.mcp_service.chart.tool import (  # noqa: F401, E402
     get_chart_info,
     list_charts,
@@ -98,150 +156,126 @@ from superset.mcp_service.chart.tool import (  # noqa: F401, E402
 )
 ```
 
-**Why this matters**: Tools use `@tool` decorators and register automatically on import. The import MUST be in `app.py` at the bottom of the file (after dependency injection is initialized). If you don't import the tool in `app.py`, it won't be available to MCP clients. DO NOT add imports to `server.py` - that file is for running the server only.
+**Why this matters**: Tools register automatically on import via the `@tool` decorator. The import MUST be in `app.py` at the bottom (after `initialize_core_mcp_dependencies()` is called). DO NOT add imports to `server.py`.
 
 ### How to Add a New Prompt
 
 1. **Create the prompt file** in the appropriate directory (e.g., `chart/prompts/my_new_prompt.py`)
-2. **Decorate with `@prompt`** to register it with the unified decorator
+2. **Decorate with `@prompt`** from `superset_core.mcp.decorators`
 3. **Add import to module's `__init__.py`** (e.g., `chart/prompts/__init__.py`)
-4. **Ensure module is imported in `app.py`** (around line 244-253)
+4. **Ensure module is imported in `app.py`**
 
 **Example**:
 ```python
 # superset/mcp_service/chart/prompts/my_new_prompt.py
-from superset_core.api.mcp import prompt
+from superset_core.mcp.decorators import prompt
 
 @prompt("my_new_prompt")
-async def my_new_prompt_handler(ctx: Context) -> str:
+async def my_new_prompt_handler(
+    chart_type: str = "auto", business_goal: str = "exploration"
+) -> str:
     """Interactive prompt for doing something."""
     return "Prompt instructions here..."
 ```
 
-**Then add to `chart/prompts/__init__.py`**:
-```python
-# superset/mcp_service/chart/prompts/__init__.py
-from . import create_chart_guided  # existing
-from . import my_new_prompt  # ADD YOUR PROMPT HERE
-```
-
-**Verify module import exists in `app.py`** (around line 248):
-```python
-# superset/mcp_service/app.py
-from superset.mcp_service.chart import prompts as chart_prompts  # This imports all prompts
-```
-
 ### How to Add a New Resource
 
-1. **Create the resource file** in the appropriate directory (e.g., `chart/resources/my_new_resource.py`)
-2. **Decorate with `@mcp.resource`** to register it with FastMCP (resources still use direct FastMCP)
-3. **Add import to module's `__init__.py`** (e.g., `chart/resources/__init__.py`)
-4. **Ensure module is imported in `app.py`** (around line 244-253)
+Resources use direct FastMCP decorators and **must include `@mcp_auth_hook`** for authentication:
 
-**Example**:
 ```python
 # superset/mcp_service/chart/resources/my_new_resource.py
 from superset.mcp_service.app import mcp
-from superset.mcp_service.auth import mcp_auth_hook
+from superset.mcp_service.auth import mcp_auth_hook  # REQUIRED for resources
 
 @mcp.resource("superset://chart/my_resource")
-@mcp_auth_hook
+@mcp_auth_hook  # Always add this decorator to resources
 def get_my_resource() -> str:
     """Resource description for LLMs."""
     return "Resource data here..."
 ```
 
-**Note**: Resources continue to use the direct FastMCP decorators (`@mcp.resource`) rather than the unified `@tool()` decorator.
-
-**Then add to `chart/resources/__init__.py`**:
-```python
-# superset/mcp_service/chart/resources/__init__.py
-from . import chart_configs  # existing
-from . import my_new_resource  # ADD YOUR RESOURCE HERE
-```
-
-**Verify module import exists in `app.py`** (around line 249):
-```python
-# superset/mcp_service/app.py
-from superset.mcp_service.chart import resources as chart_resources  # This imports all resources
-```
-
-**Why this matters**: Prompts and resources work similarly to tools - they use decorators and register on import. The module-level imports (`chart/prompts/__init__.py`, `chart/resources/__init__.py`) ensure individual files are imported when the module is imported. The `app.py` imports ensure the modules are loaded when the MCP service starts.
-
 ## Tool Development Patterns
 
-### 1. Use Core Classes for Reusability
+### 1. Tool Decorator Parameters
+
+The `@tool` decorator from `superset_core.mcp.decorators` accepts:
+
+- **`tags`**: List of tags (e.g., `["core"]`, `["mutate"]`). Default: `[]`
+- **`class_permission_name`**: FAB permission class (e.g., `"Chart"`, `"Dashboard"`). Default: `None`
+- **`method_permission_name`**: Permission action (e.g., `"read"`, `"write"`). Default: Auto — `"write"` if `"mutate"` in tags, else `"read"`
+- **`protect`**: Enable authentication wrapping. Default: `True`
+- **`annotations`**: MCP `ToolAnnotations` object. Default: `None`
+
+**ToolAnnotations** (from `superset_core.mcp.decorators`):
+```python
+annotations=ToolAnnotations(
+    title="Human-readable title",
+    readOnlyHint=True,   # Whether tool only reads data
+    destructiveHint=False, # Whether tool has destructive side effects
+)
+```
+
+### 2. Use Core Classes for Reusability
 
 The `mcp_core.py` module provides reusable patterns:
 
-- **`ModelListCore`**: For listing resources (dashboards, charts, datasets)
-- **`ModelGetInfoCore`**: For getting resource details by ID/UUID
-- **`ModelGetSchemaCore`**: For retrieving comprehensive schema metadata (columns, filters, sortable columns)
+- **`ModelListCore`**: For listing resources with filtering, search, and pagination
+  - Used by: `list_charts`, `list_dashboards`, `list_datasets`, `list_databases`
+- **`ModelGetInfoCore`**: For getting resource details by ID, UUID, or slug
+  - Used by: `get_chart_info`, `get_dashboard_info`, `get_dataset_info`, `get_database_info`
+- **`ModelGetSchemaCore`**: For schema discovery (columns, filters, sortable columns)
+  - Used by: `get_schema`
+- **`InstanceInfoCore`**: For instance statistics and metadata
+  - Used by: `get_instance_info`
+
+### 3. Authentication and RBAC
+
+Authentication is handled automatically by the `@tool` decorator (via `mcp_auth_hook` internally). RBAC permission checking uses `class_permission_name` and `method_permission_name`.
 
-**Example**:
 ```python
-from superset_core.api.mcp import tool
+from superset_core.mcp.decorators import tool, ToolAnnotations
 
-from superset.mcp_service.mcp_core import ModelListCore
-from superset.daos.dashboard import DashboardDAO
-from superset.mcp_service.dashboard.schemas import DashboardList
-
-list_core = ModelListCore(
-    dao_class=DashboardDAO,
-    output_schema=DashboardList,
-    logger=logger,
+# Authentication + RBAC enabled (default)
+@tool(
+    class_permission_name="Chart",  # Checks user has Chart access
 )
+async def my_tool(request: MyRequest, ctx: Context) -> MyResponse:
+    # g.user is set automatically before this runs
+    ...
 
-@tool
-def list_dashboards(filters: List[DashboardFilter], page: int = 1) -> DashboardList:
-    return list_core.run_tool(filters=filters, page=page, page_size=10)
+# Public tool (no auth) - use sparingly
+@tool(protect=False)
+async def health_check(ctx: Context) -> dict:
+    return {"status": "healthy"}
 ```
 
-### 2. Always Use Authentication
+**Authentication priority order** (in `auth.py`):
+1. JWT context (per-request ContextVar from FastMCP)
+2. API Key authentication (via FAB SecurityManager)
+3. `MCP_DEV_USERNAME` config (development only)
+4. `g.user` fallback (set by external middleware)
 
-**Every tool must use `@tool`** with authentication enabled (default) to ensure:
-- User authentication from JWT or configured admin user
-- Permission checking via JWT scopes
-- Audit logging of tool access
+**`@mcp_auth_hook`** is only used directly on **resources** — tools get auth wrapping from `@tool(protect=True)`.
+
+### 4. Use Pydantic Schemas
+
+**All tool inputs and outputs must be Pydantic models**. Place schemas in `{module}/schemas.py`.
 
 ```python
-from superset_core.api.mcp import tool
-
-@tool  # REQUIRED - secure=True by default
-def my_tool() -> dict:
-    # g.user is set by tool decorator
-    return {"user": g.user.username}
-
-@tool(protect=False)  # Only for truly public tools
-def public_tool() -> dict:
-    # No authentication required
-    return {"status": "public"}
-```
-
-### 3. Use Pydantic Schemas
-
-**All tool inputs and outputs must be Pydantic models** for:
-- Automatic validation
-- LLM-friendly schema generation
-- Type safety
-
-**Convention**: Place schemas in `{module}/schemas.py`
-
-```python
-from pydantic import BaseModel, Field
+from pydantic import BaseModel, ConfigDict, Field
 
 class MyToolRequest(BaseModel):
+    model_config = ConfigDict(populate_by_name=True)
+
     param: str = Field(..., description="Parameter description for LLMs")
+    optional_param: str | None = Field(None, description="Optional parameter")
 
 class MyToolResponse(BaseModel):
     result: str = Field(..., description="Result description")
-    timestamp: datetime = Field(
-        default_factory=lambda: datetime.now(timezone.utc),
-        description="Response timestamp"
-    )
+    error: str | None = Field(None, description="Error message if failed")
 ```
 
-### 4. Follow the DAO Pattern
+### 5. Follow the DAO Pattern
 
 **Use Superset's DAO (Data Access Object) layer** instead of direct database queries:
 
@@ -255,185 +289,97 @@ dashboard = DashboardDAO.find_by_id(dashboard_id)
 dashboard = db.session.query(Dashboard).filter_by(id=dashboard_id).first()
 ```
 
-### 5. Python Type Hints (Python 3.10+ Style)
+### 6. Python Type Hints (Python 3.10+ Style)
 
 **CRITICAL**: Always use modern Python 3.10+ union syntax for type hints.
 
 ```python
 # GOOD - Modern Python 3.10+ syntax
-from typing import List, Dict, Any
+from typing import Any
+
 from pydantic import BaseModel, Field
 
 class MySchema(BaseModel):
     name: str | None = Field(None, description="Optional name")
-    tags: List[str] = Field(default_factory=list)
-    metadata: Dict[str, Any] = Field(default_factory=dict)
+    tags: list[str] = Field(default_factory=list)
+    metadata: dict[str, Any] = Field(default_factory=dict)
 
 def my_function(
     id: int,
-    filters: List[str] | None = None,
-    options: Dict[str, Any] | None = None
+    filters: list[str] | None = None,
 ) -> MySchema | None:
     pass
 
-# BAD - Old-style Optional (DO NOT USE)
-from typing import Optional, List, Dict, Any
-
-class MySchema(BaseModel):
-    name: Optional[str] = Field(None, description="Optional name")  # Wrong!
-
-def my_function(
-    id: int,
-    filters: Optional[List[str]] = None,  # Wrong!
-    options: Optional[Dict[str, Any]] = None  # Wrong!
-) -> Optional[MySchema]:  # Wrong!
-    pass
+# BAD - Old-style (DO NOT USE)
+from typing import Optional, List, Dict
+name: Optional[str]  # Wrong! Use str | None
+tags: List[str]      # Wrong! Use list[str]
 ```
 
-**Key rules:**
-- Use `T | None` instead of `Optional[T]`
-- Do NOT import `Optional`, `List`, `Dict` from typing, prefer `| None`, `list[]` etc
-- All new code must follow this pattern
+### 7. Event Logger Instrumentation
 
-### 6. Flexible Input Parsing (JSON String or Object)
-
-**MCP tools accept both JSON string and native object formats for parameters** using utilities from `superset.mcp_service.utils.schema_utils`. This makes tools flexible for different client types (LLM clients send objects, CLI tools send JSON strings).
-
-**PREFERRED: Use the `@parse_request` decorator** for tool functions to automatically handle request parsing:
+**All tool operations should use `event_logger`** for observability:
 
 ```python
-from superset.mcp_service.utils.schema_utils import parse_request
+from superset.extensions import event_logger
 
-@mcp.tool
-@mcp_auth_hook
-@parse_request(ListChartsRequest)  # Automatically parses string requests!
-async def list_charts(request: ListChartsRequest | str, ctx: Context) -> ChartList:
-    """List charts with filtering and search."""
-    # request is guaranteed to be ListChartsRequest here - no manual parsing needed!
-    await ctx.info(f"Listing charts: page={request.page}")
-    ...
+@tool(...)
+async def my_tool(request: MyRequest, ctx: Context) -> MyResponse:
+    with event_logger.log_context(action="mcp.my_tool.step_name"):
+        result = do_something()
+    return MyResponse(data=result)
 ```
 
-**Benefits:**
-- Eliminates 5 lines of boilerplate code per tool
-- Handles both async and sync functions automatically
-- Works with Claude Code bug (GitHub issue #5504)
-- Cleaner, more maintainable code
+### 8. Context Logging
 
-**Available utilities for other use cases:**
-
-#### parse_json_or_passthrough
-Parse JSON string or return object as-is:
+Use the FastMCP `Context` object for structured logging within tools:
 
 ```python
-from superset.mcp_service.utils.schema_utils import parse_json_or_passthrough
-
-# Accepts both formats
-config = parse_json_or_passthrough(value, param_name="config")
-# value can be: '{"key": "value"}' (JSON string) OR {"key": "value"} (dict)
+async def my_tool(request: MyRequest, ctx: Context) -> MyResponse:
+    await ctx.info("Starting: param=%s" % (request.param,))
+    await ctx.debug("Details: keys=%s" % (sorted(request.model_dump().keys()),))
+    await ctx.warning("Something unexpected: %s" % (warning_msg,))
+    await ctx.error("Failed: %s" % (str(exc),))
+    await ctx.report_progress(1, 5, "Step 1 of 5")
 ```
 
-#### parse_json_or_list
-Parse to list from JSON, list, or comma-separated string:
+### 9. Error Handling
+
+**Pattern**: Catch specific exceptions for known failure modes, use broad `Exception` only as the outermost safety net that re-raises:
 
 ```python
-from superset.mcp_service.utils.schema_utils import parse_json_or_list
+from superset.commands.dataset.exceptions import DatasetInvalidError, DatasetCreateFailedError
 
-# Accepts multiple formats
-items = parse_json_or_list(value, param_name="items")
-# value can be:
-#   '["a", "b"]' (JSON array)
-#   ["a", "b"] (Python list)
-#   "a, b, c" (comma-separated string)
-```
-
-#### parse_json_or_model
-Parse to Pydantic model from JSON or dict:
-
-```python
-from superset.mcp_service.utils.schema_utils import parse_json_or_model
-
-# Accepts JSON string or dict
-config = parse_json_or_model(value, ConfigModel, param_name="config")
-# value can be: '{"name": "test"}' OR {"name": "test"}
-```
-
-#### parse_json_or_model_list
-Parse to list of Pydantic models:
-
-```python
-from superset.mcp_service.utils.schema_utils import parse_json_or_model_list
-
-# Accepts JSON array or list of dicts
-filters = parse_json_or_model_list(value, FilterModel, param_name="filters")
-# value can be: '[{"col": "name"}]' OR [{"col": "name"}]
-```
-
-**Using with Pydantic validators:**
-
-```python
-from pydantic import BaseModel, field_validator
-from superset.mcp_service.utils.schema_utils import parse_json_or_list
-
-class MyToolRequest(BaseModel):
-    filters: List[FilterModel] = Field(default_factory=list)
-    select_columns: List[str] = Field(default_factory=list)
-
-    @field_validator("filters", mode="before")
-    @classmethod
-    def parse_filters(cls, v):
-        """Accept both JSON string and list of objects."""
-        return parse_json_or_model_list(v, FilterModel, "filters")
-
-    @field_validator("select_columns", mode="before")
-    @classmethod
-    def parse_columns(cls, v):
-        """Accept JSON array, list, or comma-separated string."""
-        return parse_json_or_list(v, "select_columns")
-```
-
-**Core classes already use these utilities:**
-- `ModelListCore` uses them for `filters` and `select_columns`
-- No need to add parsing logic in individual tools that use core classes
-
-**When to use:**
-- Tool parameters that accept complex objects (dicts, lists)
-- Parameters that may come from CLI tools (JSON strings) or LLM clients (objects)
-- Any field where you want maximum flexibility
-
-### 7. Error Handling
-
-**Use consistent error schemas**:
-
-```python
-class MyError(BaseModel):
-    error: str = Field(..., description="Error message")
-    error_type: str = Field(..., description="Type of error")
-    timestamp: datetime = Field(
-        default_factory=lambda: datetime.now(timezone.utc),
-        description="Error timestamp"
-    )
-
-@tool
-def my_tool(id: int) -> MyResponse:
+@tool(...)
+async def my_tool(request: MyRequest, ctx: Context) -> MyResponse:
     try:
-        result = process_data(id)
+        # Specific exception handling for known failure modes
+        with event_logger.log_context(action="mcp.my_tool"):
+            result = SomeCommand(properties).run()
         return MyResponse(data=result)
-    except NotFound:
-        raise ValueError(f"Resource {id} not found")
+
+    except DatasetInvalidError as exc:
+        # Return structured error response (don't raise)
+        await ctx.error("Validation failed: %s" % (exc.normalized_messages(),))
+        return MyResponse(error=str(exc.normalized_messages()))
+
+    except DatasetCreateFailedError as exc:
+        await ctx.error("Creation failed: %s" % (str(exc),))
+        return MyResponse(error=f"Failed: {exc}")
+
+    except Exception as exc:
+        # Outermost safety net: log and re-raise (middleware handles it)
+        await ctx.error("Unexpected: %s: %s" % (type(exc).__name__, str(exc)))
+        raise
 ```
 
-### 8. Dataset Validation for Chart Tools
+### 10. Dataset Validation for Chart Tools
 
-**IMPORTANT**: All chart-related tools must validate that the chart's dataset is accessible before performing operations. Use the shared `validate_chart_dataset` utility from `chart_utils.py`.
+All chart-related tools must validate that the chart's dataset is accessible:
 
-**Why this matters**: Charts can reference datasets that have been deleted or become inaccessible. Without validation, users may see confusing errors when trying to preview or get data from charts with missing datasets.
-
-**Usage pattern**:
 ```python
 from superset.mcp_service.chart.chart_utils import validate_chart_dataset
 
-# After retrieving a chart, validate its dataset
 validation_result = validate_chart_dataset(chart, check_access=True)
 if not validation_result.is_valid:
     await ctx.warning("Dataset not accessible: %s" % (validation_result.error,))
@@ -441,232 +387,216 @@ if not validation_result.is_valid:
         error=validation_result.error or "Chart's dataset is not accessible",
         error_type="DatasetNotAccessible",
     )
-
-# Log any warnings (e.g., virtual dataset warnings)
-for warning in validation_result.warnings:
-    await ctx.warning("Dataset warning: %s" % (warning,))
 ```
 
-**Tools that use this pattern**:
-- `get_chart_info` - Validates after retrieving chart metadata
-- `get_chart_preview` - Validates before generating preview
-- `get_chart_data` - Validates before querying data
-- `generate_chart` - Validates after chart creation (post-creation validation)
+Used by: `get_chart_info`, `get_chart_preview`, `get_chart_data`, `generate_chart`
 
-**The `DatasetValidationResult` contains**:
-- `is_valid`: Whether the dataset exists and is accessible
-- `dataset_id`: The dataset ID being validated
-- `dataset_name`: The dataset name (if found)
-- `warnings`: List of warnings (e.g., "virtual dataset may be deleted")
-- `error`: Error message if validation failed
+### 11. Compile Check for Chart Creation
 
-## Testing Conventions
-
-### Unit Tests
-
-Place unit tests in `tests/unit_tests/mcp_service/{module}/tool/test_{tool_name}.py`
-
-**Test structure**:
-```python
-from unittest.mock import MagicMock, patch
-import pytest
-
-class TestMyTool:
-    @pytest.fixture
-    def mock_dao(self):
-        """Create mock DAO for testing."""
-        dao = MagicMock()
-        dao.find_by_id.return_value = create_mock_object()
-        return dao
-
-    @patch("superset.mcp_service.chart.tool.my_tool.ChartDAO")
-    def test_my_tool_success(self, mock_dao_class, mock_dao):
-        """Test successful tool execution."""
-        mock_dao_class.return_value = mock_dao
-
-        result = my_tool(id=1)
-
-        assert result.data is not None
-        mock_dao.find_by_id.assert_called_once_with(1)
-```
-
-### Integration Tests
-
-Use Flask test client for integration tests:
+When creating or saving charts, run a compile check to verify the query executes:
 
 ```python
-def test_tool_with_flask_context(app):
-    """Test tool with full Flask app context."""
-    with app.app_context():
-        result = my_tool(id=1)
-        assert result is not None
+from superset.mcp_service.chart.tool.generate_chart import _compile_chart
+
+compile_result = _compile_chart(form_data, dataset.id)
+if not compile_result.success:
+    # Delete broken chart, return error
+    ...
 ```
 
-## Common Pitfalls to Avoid
+### 12. Flexible Input Parsing
 
-### 1. ❌ Forgetting Tool Import in app.py
-**Problem**: Tool exists but isn't available to MCP clients.
-**Solution**: Always add tool import to `app.py` (at the bottom) after creating it. Never add to `server.py`.
+`ModelListCore` handles JSON string vs. native object parsing automatically via utilities in `superset.mcp_service.utils.schema_utils`:
 
-### 2. ❌ Adding Tool Imports to server.py
-**Problem**: Tools won't register properly, causing runtime errors.
-**Solution**: Tool imports must be in `app.py` at the bottom of the file, not in `server.py`. The `server.py` file is only for running the server.
+- `parse_json_or_passthrough(value, param_name)` - JSON string or dict
+- `parse_json_or_list(value, param_name)` - JSON array, list, or comma-separated string
+- `parse_json_or_model(value, model_class, param_name)` - JSON string or dict to Pydantic model
+- `parse_json_or_model_list(value, model_class, param_name)` - JSON array to list of Pydantic models
 
-### 3. ❌ Missing Authentication
-**Problem**: Tool bypasses authentication and authorization.
-**Solution**: Always use `@tool` with default protect=True, or explicitly set protect=False only for public tools.
+These are used internally by `ModelListCore` for `filters` and `select_columns`. Individual tools using core classes do NOT need to add parsing logic.
 
-### 4. ❌ Using `Optional` Instead of Union Syntax
-**Problem**: Old-style Optional[T] is not Python 3.10+ style.
-**Solution**: Use `T | None` instead of `Optional[T]` for all type hints.
-```python
-# GOOD - Modern Python 3.10+ syntax
-def my_function(param: str | None = None) -> int | None:
-    pass
+## Middleware
 
-# BAD - Old-style Optional
-from typing import Optional
-def my_function(param: Optional[str] = None) -> Optional[int]:
-    pass
-```
+The MCP service uses FastMCP middleware (registered in `server.py`):
 
-### 5. ❌ Using `any` Types in Schemas
-**Problem**: Violates TypeScript modernization goals, no validation.
-**Solution**: Use proper Pydantic types with Field descriptions.
+- **`LoggingMiddleware`**: Logs tool calls with duration, entity IDs, sanitizes sensitive data
+- **`GlobalErrorHandlerMiddleware`**: Catches unhandled exceptions, converts to ToolError
+- **`StructuredContentStripperMiddleware`**: Strips structuredContent from responses (Claude.ai compatibility)
+- **`ResponseSizeGuardMiddleware`**: Prevents oversized responses from crashing clients
+- **`ResponseCachingMiddleware`**: Optional response caching (in-memory by default, Redis when store enabled)
 
-### 6. ❌ Direct Database Queries
-**Problem**: Bypasses Superset's security and caching layers.
-**Solution**: Use DAO classes (ChartDAO, DashboardDAO, etc.).
-
-### 7. ❌ Not Using Core Classes
-**Problem**: Duplicating list/get_info/schema logic across tools.
-**Solution**: Use ModelListCore, ModelGetInfoCore, ModelGetSchemaCore.
-
-### 8. ❌ Missing Apache License Headers
-**Problem**: CI fails on license check.
-**Solution**: Add Apache license header to all new .py files. Use this exact template at the top of every new Python file:
-
-```python
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-```
-
-**Note**: LLM instruction files like `CLAUDE.md`, `AGENTS.md`, etc. are excluded from this requirement (listed in `.rat-excludes`) to avoid token overhead.
-
-### 9. ❌ Using `@tool()` with Empty Parentheses
-**Problem**: Inconsistent decorator style.
-**Solution**: Use `@tool` without parentheses unless passing arguments.
-```python
-# GOOD
-from superset_core.api.mcp import tool
-
-@tool
-def my_tool():
-    pass
-
-# BAD
-from superset_core.api.mcp import tool
-
-@tool
-def my_tool():
-    pass
-```
-
-### 10. ❌ Circular Imports
-**Problem**: Importing too many things from `app.py` can create circular dependencies.
-**Solution**: Use the unified `@tool` decorator from `superset_core.api.mcp`:
-```python
-# GOOD - New pattern
-from superset_core.api.mcp import tool
-
-@tool
-def my_tool():
-    pass
-
-# ACCEPTABLE - For prompts/resources (when needed)
-from superset.mcp_service.app import mcp
-
-@prompt
-def my_prompt():
-    pass
-
-# BAD - causes circular import
-from superset.mcp_service.app import mcp, some_other_function
-```
+Middleware is applied in `server.py` and should NOT be modified in individual tools.
 
 ## Configuration
 
-Default configuration is in `mcp_config.py`. Users can override in `superset_config.py`:
+Default configuration is in `mcp_config.py`. Override in `superset_config.py`:
 
 ```python
-# superset_config.py
-MCP_ADMIN_USERNAME = "your_admin"
-MCP_AUTH_ENABLED = True
-MCP_JWT_PUBLIC_KEY = "your_public_key"
+# Authentication
+MCP_DEV_USERNAME = None          # Fallback username for dev mode
+MCP_AUTH_ENABLED = False         # Enable JWT/API key auth
+MCP_AUTH_FACTORY = None          # Custom auth factory function
+MCP_JWT_PUBLIC_KEY = None
+MCP_JWT_SECRET = None
+MCP_JWKS_URI = None
+MCP_USER_RESOLVER = None         # Custom function to extract username from JWT
+
+# RBAC
+MCP_RBAC_ENABLED = True          # Enable permission checking (default: True)
+
+
+# Response Caching (optional, uses in-memory store by default; Redis when MCP_STORE_CONFIG enabled)
+MCP_CACHE_CONFIG = {
+    "enabled": False,
+    "list_tools_ttl": 300,
+    "call_tool_ttl": 3600,
+    "excluded_tools": ["execute_sql", "generate_dashboard"],  # add tools to exclude
+}
+
+# Multi-pod Storage (optional, requires Redis)
+MCP_STORE_CONFIG = {
+    "enabled": False,
+    "CACHE_REDIS_URL": None,
+    "event_store_ttl": 3600,
+}
 ```
 
-## Tool Discovery
+## Testing Conventions
 
-MCP clients discover tools via:
-1. **Tool listing**: All tools with `@tool` are automatically listed
-2. **Schema introspection**: Pydantic schemas generate JSON Schema for LLMs
-3. **Instructions**: `DEFAULT_INSTRUCTIONS` in `app.py` documents available tools
+### Test Organization
 
-## Resources for Learning
+Tests mirror the MCP service module structure:
+```
+tests/unit_tests/mcp_service/
+├── conftest.py                    # Global fixtures (disable_mcp_rbac)
+├── chart/
+│   ├── test_chart_utils.py
+│   ├── test_chart_schemas.py
+│   └── tool/
+│       ├── test_list_charts.py
+│       ├── test_generate_chart.py
+│       └── ...
+├── dashboard/tool/
+├── dataset/tool/
+├── sql_lab/tool/
+├── system/tool/
+├── test_auth_*.py                 # Auth/RBAC tests
+└── test_middleware*.py            # Middleware tests
+```
 
-- **MCP Specification**: https://modelcontextprotocol.io/
-- **FastMCP Documentation**: https://github.com/jlowin/fastmcp
-- **Superset DAO Patterns**: See `superset/daos/` for examples
-- **Pydantic Documentation**: https://docs.pydantic.dev/
+### Async Tool Tests (primary pattern)
+
+```python
+from unittest.mock import MagicMock, patch
+import pytest
+from fastmcp import Client
+
+from superset.mcp_service.app import mcp
+from superset.utils import json
+
+@pytest.fixture
+def mcp_server():
+    return mcp
+
+@pytest.mark.asyncio
+async def test_my_tool_success(mcp_server):
+    mock_obj = MagicMock()
+    mock_obj.id = 1
+    mock_obj.name = "test"
+
+    with patch("superset.daos.chart.ChartDAO.find_by_id", return_value=mock_obj):
+        async with Client(mcp_server) as client:
+            result = await client.call_tool(
+                "my_tool", {"request": {"id": 1}}
+            )
+            data = json.loads(result.content[0].text)
+
+    assert data["id"] == 1
+```
+
+### Key Testing Patterns
+
+- **RBAC is disabled globally** via `conftest.py` autouse fixture (`MCP_RBAC_ENABLED = False`)
+- **RBAC tests** are separate in `test_auth_rbac.py` with their own `enable_mcp_rbac` fixture
+- **Auth is mocked** via `mock_auth` fixture that patches `get_user_from_request`
+- **Mock objects** must have all attributes set explicitly (no auto-generation)
+- **Patch at the DAO level**: `patch("superset.daos.chart.ChartDAO.find_by_id", ...)`
+- **Schema validation tests** are synchronous (no Client needed)
+
+## Common Pitfalls to Avoid
+
+### 1. Forgetting Tool Import in app.py
+**Problem**: Tool exists but isn't available to MCP clients.
+**Solution**: Add tool import to `app.py` at the bottom (after `initialize_core_mcp_dependencies()`).
+
+### 2. Adding Tool Imports to server.py
+**Problem**: Tools won't register properly.
+**Solution**: Tool imports MUST be in `app.py`, not `server.py`.
+
+### 3. Wrong Decorator Import Path
+**Problem**: Using stale import path.
+**Solution**: Use `from superset_core.mcp.decorators import tool, ToolAnnotations` (NOT `superset_core.api.mcp`).
+
+### 4. Missing ToolAnnotations
+**Problem**: Tool lacks MCP directory compliance metadata.
+**Solution**: Always include `annotations=ToolAnnotations(title=..., readOnlyHint=..., destructiveHint=...)`.
+
+### 5. Using `Optional` Instead of Union Syntax
+**Problem**: Old-style `Optional[T]` is not Python 3.10+ style.
+**Solution**: Use `T | None` and `list[str]` instead of `Optional[T]` and `List[str]`.
+
+### 6. Direct Database Queries
+**Problem**: Bypasses Superset's security and caching layers.
+**Solution**: Use DAO classes (ChartDAO, DashboardDAO, DatasetDAO, DatabaseDAO).
+
+### 7. Not Using Core Classes
+**Problem**: Duplicating list/get_info logic across tools.
+**Solution**: Use `ModelListCore`, `ModelGetInfoCore`, `ModelGetSchemaCore`.
+
+### 8. Missing Apache License Headers
+**Problem**: CI fails on license check.
+**Solution**: Add ASF license header to all new `.py` files (see template at top of this doc).
+
+### 9. Circular Imports
+**Problem**: Importing from `app.py` in tool files causes circular dependencies.
+**Solution**: Use `from superset_core.mcp.decorators import tool` for tools/prompts. Only import `from superset.mcp_service.app import mcp` in resource files.
+
+### 10. Missing event_logger Instrumentation
+**Problem**: Tool operations are invisible to observability.
+**Solution**: Wrap key operations with `event_logger.log_context(action="mcp.tool_name.step")`.
 
 ## Quick Checklist for New Tools
 
 - [ ] Created tool file in `{module}/tool/{tool_name}.py`
-- [ ] Added `@tool` decorator
+- [ ] Added ASF license header
+- [ ] Used `@tool(tags=[...], class_permission_name="...", annotations=ToolAnnotations(...))` decorator
+- [ ] Import: `from superset_core.mcp.decorators import tool, ToolAnnotations`
 - [ ] Created Pydantic request/response schemas in `{module}/schemas.py`
-- [ ] Used DAO classes instead of direct queries when querying Superset entities
-- [ ] Added tool import to `app.py` (around line 210-242)
-- [ ] Added Apache license header to new files
-- [ ] Created unit tests in `tests/unit_tests/mcp_service/{module}/tool/test_{tool_name}.py`
+- [ ] Used DAO classes instead of direct queries
+- [ ] Added `event_logger.log_context()` instrumentation
+- [ ] Used `await ctx.info/error/debug()` for context logging
+- [ ] Exported from `{module}/tool/__init__.py`
+- [ ] Added tool import to `app.py` at the bottom
+- [ ] Created async unit tests in `tests/unit_tests/mcp_service/{module}/tool/`
 - [ ] Updated `DEFAULT_INSTRUCTIONS` in `app.py` if adding new capability
-- [ ] Tested locally with MCP client (e.g., Claude Desktop)
 
 ## Quick Checklist for New Prompts
 
 - [ ] Created prompt file in `{module}/prompts/{prompt_name}.py`
-- [ ] Added `@prompt("prompt_name")` decorator
-- [ ] Made function async: `async def prompt_handler(ctx: Context) -> str`
+- [ ] Added ASF license header
+- [ ] Used `@prompt("prompt_name")` from `superset_core.mcp.decorators`
+- [ ] Made function async: `async def prompt_handler(...) -> str`
 - [ ] Added import to `{module}/prompts/__init__.py`
-- [ ] Verified module import exists in `app.py` (around line 244-253)
-- [ ] Added Apache license header to new file
-- [ ] Updated `DEFAULT_INSTRUCTIONS` in `app.py` to list the new prompt
-- [ ] Tested locally with MCP client (e.g., Claude Desktop)
+- [ ] Verified module import exists in `app.py`
 
 ## Quick Checklist for New Resources
 
 - [ ] Created resource file in `{module}/resources/{resource_name}.py`
-- [ ] Added `@mcp.resource("superset://{path}")` decorator with unique URI
+- [ ] Added ASF license header
+- [ ] Used `@mcp.resource("superset://{path}")` decorator
 - [ ] Added `@mcp_auth_hook` decorator
-- [ ] Implemented resource data retrieval logic
 - [ ] Added import to `{module}/resources/__init__.py`
-- [ ] Verified module import exists in `app.py` (around line 244-253)
-- [ ] Added Apache license header to new file
-- [ ] Updated `DEFAULT_INSTRUCTIONS` in `app.py` to list the new resource
-- [ ] Tested locally with MCP client (e.g., Claude Desktop)
+- [ ] Verified module import exists in `app.py`
 
 ## Getting Help
 
diff --git a/superset/mcp_service/SECURITY.md b/superset/mcp_service/SECURITY.md
index e17431d3070..a0825cae90a 100644
--- a/superset/mcp_service/SECURITY.md
+++ b/superset/mcp_service/SECURITY.md
@@ -35,9 +35,12 @@ MCP_DEV_USERNAME = "admin"
 ```
 
 **How it works**:
-1. The `@mcp_auth_hook` decorator calls `get_user_from_request()`
-2. `get_user_from_request()` reads `MCP_DEV_USERNAME` from config
-3. User is queried from database and set as `g.user`
+1. The `@mcp_auth_hook` decorator clears any stale `g.user` and calls `get_user_from_request()`
+2. `get_user_from_request()` resolves the user in priority order:
+   - **JWT auth context** (per-request ContextVar from MCP SDK) — safest, prevents stale user impersonation
+   - **`MCP_DEV_USERNAME`** from config — for development/single-user deployments
+   - **`g.user` fallback** — for external middleware (e.g., Preset's WorkspaceContextMiddleware)
+3. User is queried from database (with roles/groups eagerly loaded) and set as `g.user`
 4. All subsequent Superset operations use this user's permissions
 
 **Development Use Only**:
diff --git a/superset/mcp_service/__main__.py b/superset/mcp_service/__main__.py
index 0da7df6655e..30759c6e805 100644
--- a/superset/mcp_service/__main__.py
+++ b/superset/mcp_service/__main__.py
@@ -44,6 +44,36 @@ if os.environ.get("FASTMCP_TRANSPORT", "stdio") == "stdio":
 from superset.mcp_service.app import init_fastmcp_server, mcp
 
 
+def _add_default_middlewares() -> None:
+    """Add the standard middleware stack to the MCP instance.
+
+    This ensures all entry points (stdio, streamable-http, etc.) get
+    the same protection middlewares that the Flask CLI and server.py add.
+    Order is innermost → outermost (last-added wraps everything).
+    """
+    from superset.mcp_service.middleware import (
+        create_response_size_guard_middleware,
+        GlobalErrorHandlerMiddleware,
+        LoggingMiddleware,
+        StructuredContentStripperMiddleware,
+    )
+
+    # Response size guard (innermost among these)
+    if size_guard := create_response_size_guard_middleware():
+        mcp.add_middleware(size_guard)
+        limit = size_guard.token_limit
+        sys.stderr.write(f"[MCP] Response size guard enabled (token_limit={limit})\n")
+
+    # Logging
+    mcp.add_middleware(LoggingMiddleware())
+
+    # Global error handler
+    mcp.add_middleware(GlobalErrorHandlerMiddleware())
+
+    # Structured content stripper (must be outermost)
+    mcp.add_middleware(StructuredContentStripperMiddleware())
+
+
 def main() -> None:
     """
     Run the MCP service in stdio mode with proper output suppression.
@@ -97,6 +127,7 @@ def main() -> None:
             # Initialize the FastMCP server
             # Disable auth config for stdio mode to avoid Flask app output
             init_fastmcp_server()
+            _add_default_middlewares()
 
         # Log captured output to stderr for debugging (optional)
         captured = captured_output.getvalue()
@@ -118,6 +149,7 @@ def main() -> None:
     else:
         # For other transports, use normal initialization
         init_fastmcp_server()
+        _add_default_middlewares()
 
         # Run with specified transport
         if transport == "streamable-http":
diff --git a/superset/mcp_service/app.py b/superset/mcp_service/app.py
index 5f7ec6c64df..74ef1c91954 100644
--- a/superset/mcp_service/app.py
+++ b/superset/mcp_service/app.py
@@ -54,15 +54,21 @@ Dashboard Management:
 - generate_dashboard: Create a dashboard from chart IDs
 - add_chart_to_existing_dashboard: Add a chart to an existing dashboard
 
+Database Connections:
+- list_databases: List database connections with advanced filters (1-based pagination)
+- get_database_info: Get detailed database connection info by ID (backend, capabilities)
+
 Dataset Management:
 - list_datasets: List datasets with advanced filters (1-based pagination)
 - get_dataset_info: Get detailed dataset information by ID (includes columns/metrics)
+- create_virtual_dataset: Save a SQL query as a virtual dataset for charting
 
 Chart Management:
 - list_charts: List charts with advanced filters (1-based pagination)
 - get_chart_info: Get detailed chart information by ID
 - get_chart_preview: Get a visual preview of a chart with image URL
 - get_chart_data: Get underlying chart data in text-friendly format
+- get_chart_sql: Get the rendered SQL query for a chart (without executing it)
 - generate_chart: Create and save a new chart permanently
 - generate_explore_link: Create an interactive explore URL (preferred for exploration)
 - update_chart: Update existing saved chart configuration
@@ -88,26 +94,82 @@ Available Prompts:
 - quickstart: Interactive guide for getting started with the MCP service
 - create_chart_guided: Step-by-step chart creation wizard
 
+IMPORTANT - Using Saved Metrics vs Columns:
+When get_dataset_info returns a dataset, it includes both 'columns' and 'metrics'.
+- 'columns' are raw database columns (e.g., order_date, product_name, revenue)
+- 'metrics' are pre-defined saved metrics with SQL expressions
+  (e.g., count, total_revenue)
+
+When building chart configurations
+(generate_chart, generate_explore_link, update_chart):
+- For raw columns: use {{"name": "col_name", "aggregate": "SUM"}}
+- For saved metrics: use {{"name": "metric", "saved_metric": true}}
+  Do NOT add an aggregate when using saved_metric=true
+  (it's already defined in the metric).
+  Do NOT use a saved metric name as if it were a column — it will fail.
+
+Example: If get_dataset_info returns metrics=[{{"metric_name": "count", ...}}], use:
+  {{"name": "count", "saved_metric": true}}  ← CORRECT
+  {{"name": "count", "aggregate": "COUNT"}}  ← WRONG (count is not a column)
+
+IMPORTANT - Request Wrapper:
+For tools whose schema includes a top-level 'request' parameter, wrap all fields under request:
+  list_charts(request={{"filters": [...], "page": 1}})
+  get_chart_info(request={{"identifier": 123}})
+  get_dataset_info(request={{"identifier": 456}})
+  execute_sql(request={{"database_id": 1, "sql": "SELECT 1"}})
+Some tools do not use a request wrapper, so follow each tool's schema
+(for example: get_chart_type_schema(chart_type="xy")).
+
 Recommended Workflows:
 
-To create a chart:
-1. list_datasets -> find a dataset
-2. get_dataset_info(id) -> examine columns and metrics
-3. generate_explore_link(dataset_id, config) -> preview interactively
-4. generate_chart(dataset_id, config, save_chart=True) -> save permanently
+To add a chart to an existing dashboard:
+1. add_chart_to_existing_dashboard(dashboard_id, chart_id) -> updates dashboard directly
+   - If permission_denied=True is returned: inform the user they lack edit rights,
+     then ask if they want a new dashboard created instead. Only call generate_dashboard
+     after they confirm. Never silently create a new dashboard without asking first.
 
-To find your own charts/dashboards:
+To create a chart:
+1. list_datasets(request={{}}) -> find a dataset
+2. get_dataset_info(request={{"identifier": <id>}})
+   -> examine columns AND metrics
+3. generate_explore_link(request={{
+     "dataset_id": <id>,
+     "config": {{"chart_type": "xy", ...}}
+   }}) -> preview interactively
+4. generate_chart(request={{
+     "dataset_id": <id>,
+     "config": {{...}}, "save_chart": true
+   }}) -> save permanently
+
+To find your own charts/dashboards/databases:
 1. get_instance_info -> get current_user.id
-2. list_charts(filters=[{{"col": "created_by_fk",
-   "opr": "eq", "value": current_user.id}}])
-3. Or: list_dashboards(filters=[{{"col": "created_by_fk",
-   "opr": "eq", "value": current_user.id}}])
+2. list_charts(request={{"filters": [{{"col": "created_by_fk",
+   "opr": "eq", "value": current_user.id}}]}})
+3. Or: list_dashboards(request={{"filters": [{{"col": "created_by_fk",
+   "opr": "eq", "value": current_user.id}}]}})
+4. Or: list_databases(request={{"filters": [{{"col": "created_by_fk",
+   "opr": "eq", "value": current_user.id}}]}})
 
 To explore data with SQL:
-1. list_datasets -> find a dataset and note its database_id
-2. execute_sql(database_id, sql) -> run query
-3. save_sql_query(database_id, label, sql) -> save query for later reuse
-4. open_sql_lab_with_context(database_id) -> open SQL Lab UI
+1. list_datasets(request={{}}) -> find a dataset and note its database_id
+2. execute_sql(request={{"database_id": <id>, "sql": "SELECT ..."}})
+3. save_sql_query(request={{
+     "database_id": <id>, "label": "name", "sql": "..."
+   }})
+4. open_sql_lab_with_context(request={{
+     "database_id": <id>
+   }})
+
+To chart from a SQL query (JOIN, CTE, aggregation):
+1. execute_sql(request={{"database_id": <id>, "sql": "..."}})
+   -> verify the query returns expected data
+2. Ask the user if they want to save it as a dataset
+3. create_virtual_dataset(request={{
+     "database_id": <id>, "sql": "...",
+     "dataset_name": "name"
+   }}) -> save as chartable dataset
+4. generate_explore_link or generate_chart with the new dataset
 
 generate_explore_link vs generate_chart:
 - Use generate_explore_link for exploration (no permanent chart created)
@@ -118,11 +180,18 @@ Chart Types You Can CREATE with generate_chart/generate_explore_link:
 - chart_type="xy", kind="bar": Bar chart for category comparison
 - chart_type="xy", kind="area": Area chart for volume visualization
 - chart_type="xy", kind="scatter": Scatter plot for correlation analysis
+- chart_type="big_number": Big Number display (single metric, header only)
+- chart_type="big_number", show_trendline=True,
+  temporal_column="<date_col>": Big Number with trendline
 - chart_type="table": Data table for detailed views
 - chart_type="table", viz_type="ag-grid-table": Interactive AG Grid table
 - chart_type="pie": Pie chart for proportional data (set donut=True for donut)
 - chart_type="pivot_table": Interactive pivot table for cross-tabulation
 - chart_type="mixed_timeseries": Dual-series chart combining two chart types
+- chart_type="handlebars": Custom HTML template chart (KPI cards, leaderboards, reports)
+  Requires handlebars_template with Handlebars HTML template string.
+  Supports query_mode="aggregate" (with metrics/groupby) or "raw" (with columns).
+  Data available as {{{{data}}}} array; helpers: dateFormat, formatNumber, stringify.
 
 Time grain for temporal x-axis (time_grain parameter):
 - PT1H (hourly), P1D (daily), P1W (weekly), P1M (monthly), P1Y (yearly)
@@ -135,28 +204,42 @@ Chart Types in Existing Charts (viewable via list_charts/get_chart_info):
 
 Query Examples:
 - List all tables:
-  filters=[{{"col": "viz_type", "opr": "in", "value": ["table", "pivot_table_v2"]}}]
+  list_charts(request={{"filters": [{{"col": "viz_type",
+    "opr": "in",
+    "value": ["table", "pivot_table_v2"]}}]}})
 - List time series charts:
-  filters=[{{"col": "viz_type", "opr": "sw", "value": "echarts_timeseries"}}]
-- Search by name: search="sales"
+  list_charts(request={{"filters": [{{"col": "viz_type",
+    "opr": "sw", "value": "echarts_timeseries"}}]}})
+- Search by name: list_charts(request={{"search": "sales"}})
 - My charts (use current_user.id from get_instance_info):
-  filters=[{{"col": "created_by_fk", "opr": "eq", "value": <user_id>}}]
+  list_charts(request={{"filters": [{{"col": "created_by_fk", "opr": "eq", "value": <user_id>}}]}})
 - My dashboards:
-  filters=[{{"col": "created_by_fk", "opr": "eq", "value": <user_id>}}]
+  list_dashboards(request={{"filters": [{{"col": "created_by_fk", "opr": "eq", "value": <user_id>}}]}})
+- My databases:
+  list_databases(request={{"filters": [{{"col": "created_by_fk", "opr": "eq", "value": <user_id>}}]}})
 
-To modify an existing chart (add filters, change metrics, change dimensions, etc.):
-1. get_chart_info(chart_id) -> examine current configuration
-2. update_chart(chart_id, config) -> apply changes (filters, metrics, dimensions)
-Do NOT use execute_sql for chart modifications. Use update_chart instead.
+To modify an existing chart (add filters, change metrics, etc.):
+1. get_chart_info(request={{"identifier": <chart_id>}})
+   -> examine current configuration
+2. update_chart(request={{
+     "identifier": <chart_id>, "config": {{...}}
+   }}) -> apply changes
+Do NOT use execute_sql for chart modifications.
+Use update_chart instead.
 
 CRITICAL RULES - NEVER VIOLATE:
 - NEVER fabricate or invent URLs. ALL URLs must come from tool call results.
   If you need a link, call the appropriate tool (generate_explore_link, generate_chart,
   open_sql_lab_with_context, etc.) and use the URL it returns.
+- NEVER call generate_dashboard when the user wants to add a chart to an EXISTING
+  dashboard. Always use add_chart_to_existing_dashboard. Only call generate_dashboard
+  to create a brand-new dashboard, or after the user explicitly confirms they want
+  a new one (e.g., after a permission_denied=True response from
+  add_chart_to_existing_dashboard).
 - To modify an existing chart's filters, metrics, or dimensions, use update_chart.
   Do NOT use execute_sql for chart modifications.
-- Parameter name reminders: open_sql_lab_with_context uses "sql" (not "query"),
-  execute_sql uses "sql" (not "query").
+- Parameter name reminders: ALWAYS use the EXACT parameter names from the tool schema.
+  Do NOT use Superset's internal form_data names.
 
 IMPORTANT - Tool-Only Interaction:
 - Do NOT generate code artifacts, HTML pages, JavaScript snippets, or any code intended
@@ -181,8 +264,7 @@ General usage tips:
 
 Input format:
 - Tool request parameters accept structured objects (dicts/JSON)
-- When MCP_PARSE_REQUEST_ENABLED is True (default), string-serialized JSON is also
-  accepted as input, which works around double-serialization bugs in some MCP clients
+- FastMCP 3.1+ handles Pydantic BaseModel parameters natively
 
 Feature Availability:
 - Call get_instance_info to discover accessible menus for the current user.
@@ -397,6 +479,8 @@ from superset.mcp_service.chart.tool import (  # noqa: F401, E402
     get_chart_data,
     get_chart_info,
     get_chart_preview,
+    get_chart_sql,
+    get_chart_type_schema,
     list_charts,
     update_chart,
     update_chart_preview,
@@ -407,7 +491,12 @@ from superset.mcp_service.dashboard.tool import (  # noqa: F401, E402
     get_dashboard_info,
     list_dashboards,
 )
+from superset.mcp_service.database.tool import (  # noqa: F401, E402
+    get_database_info,
+    list_databases,
+)
 from superset.mcp_service.dataset.tool import (  # noqa: F401, E402
+    create_virtual_dataset,
     get_dataset_info,
     list_datasets,
 )
diff --git a/superset/mcp_service/auth.py b/superset/mcp_service/auth.py
index 77544f224cb..26af20ad563 100644
--- a/superset/mcp_service/auth.py
+++ b/superset/mcp_service/auth.py
@@ -19,24 +19,41 @@
 Authentication and authorization hooks for MCP tools.
 
 This module provides:
-- User authentication from JWT or configured dev user
+- User authentication from JWT, API key, or configured dev user
 - RBAC permission checking aligned with Superset's REST API permissions
 - Dataset access validation
 - Session lifecycle management
 
 The RBAC enforcement mirrors Flask-AppBuilder's @protect() decorator,
 ensuring MCP tools respect the same permission model as the REST API.
+
+Supports multiple authentication methods:
+1. API Key authentication via FAB SecurityManager (configurable prefix)
+2. JWT token authentication (via FastMCP BearerAuthProvider)
+3. Development mode (MCP_DEV_USERNAME configuration)
+
+API Key Authentication:
+- Users create API keys via FAB's /api/v1/security/api_keys/ endpoints
+- Keys use configurable prefixes (FAB_API_KEY_PREFIXES, default: ["sst_"])
+- Keys are validated by FAB's SecurityManager.validate_api_key()
+- Keys inherit the user's roles and permissions via FAB's RBAC
+
+Configuration:
+- FAB_API_KEY_ENABLED: Flask config key to enable API key auth (default: False)
+- FAB_API_KEY_PREFIXES: Key prefixes (default: ["sst_"])
+- MCP_DEV_USERNAME: Fallback username for development
 """
 
 import logging
 from contextlib import AbstractContextManager
 from typing import Any, Callable, TYPE_CHECKING, TypeVar
 
-from flask import g
+from flask import g, has_request_context
 from flask_appbuilder.security.sqla.models import Group, User
 
 if TYPE_CHECKING:
     from superset.connectors.sqla.models import SqlaTable
+    from superset.mcp_service.chart.chart_utils import DatasetValidationResult
 
 # Type variable for decorated functions
 F = TypeVar("F", bound=Callable[..., Any])
@@ -172,13 +189,140 @@ def load_user_with_relationships(
     return query.first()
 
 
+def _resolve_user_from_jwt_context(app: Any) -> User | None:
+    """
+    Resolve the current user from the MCP SDK's per-request JWT context.
+
+    Uses FastMCP's ``get_access_token()`` which returns the JWT AccessToken
+    for the current async task via a ContextVar — safe across concurrent
+    requests, unlike ``g.user`` which can be stale.
+
+    The username is extracted from token claims using a configurable resolver
+    (``MCP_USER_RESOLVER`` config) or the default ``default_user_resolver()``.
+
+    Returns:
+        User object with relationships loaded, or None if no JWT context
+        (i.e. no token present — caller should fall through to next source).
+
+    Raises:
+        ValueError: If JWT resolves a username that doesn't exist in the DB
+            (fail closed — do NOT fall through to weaker auth sources).
+    """
+    try:
+        from fastmcp.server.dependencies import get_access_token
+    except ImportError:
+        logger.debug("fastmcp.server.dependencies not available, skipping JWT context")
+        return None
+
+    access_token = get_access_token()
+    if access_token is None:
+        return None
+
+    # Use configurable resolver or default
+    from superset.mcp_service.mcp_config import default_user_resolver
+
+    resolver = app.config.get("MCP_USER_RESOLVER", default_user_resolver)
+    username = resolver(app, access_token)
+
+    if not username:
+        # Fail closed: JWT is present but identity cannot be determined.
+        # Do NOT fall through to weaker auth sources.
+        raise ValueError(
+            "JWT context present but no username could be extracted from claims"
+        )
+
+    # Try username lookup first, then email fallback for OIDC email claims
+    user = load_user_with_relationships(username)
+    if not user and "@" in username:
+        user = load_user_with_relationships(email=username)
+    if not user:
+        # Fail closed: JWT says this user should exist but they don't.
+        # Do NOT fall through to MCP_DEV_USERNAME or stale g.user.
+        raise ValueError(
+            f"JWT authenticated user '{username}' not found in Superset database. "
+            f"Ensure the user exists before granting MCP access."
+        )
+
+    return user
+
+
+def _resolve_user_from_api_key(app: Any) -> User | None:
+    """
+    Resolve the current user from an API key in the Authorization header.
+
+    Uses FAB SecurityManager's API key validation. Only attempts when
+    FAB_API_KEY_ENABLED is True and a request context is active.
+
+    Returns:
+        User object with relationships loaded, or None if no API key present
+        or API key auth is not enabled/available.
+
+    Raises:
+        PermissionError: If an API key is present but invalid/expired,
+            or if validation is not available in this FAB version.
+    """
+    if not app.config.get("FAB_API_KEY_ENABLED", False) or not has_request_context():
+        return None
+
+    sm = app.appbuilder.sm
+    # _extract_api_key_from_request is FAB's internal method for reading
+    # the Bearer token from the Authorization header and matching prefixes.
+    # Not all FAB versions include this method, so guard with hasattr.
+    if not hasattr(sm, "_extract_api_key_from_request"):
+        logger.debug(
+            "FAB SecurityManager does not have _extract_api_key_from_request; "
+            "API key authentication is not available in this FAB version"
+        )
+        return None
+
+    api_key_string = sm._extract_api_key_from_request()
+    if api_key_string is None:
+        return None
+
+    if not hasattr(sm, "validate_api_key"):
+        logger.warning(
+            "FAB SecurityManager does not have validate_api_key; "
+            "cannot validate API key"
+        )
+        raise PermissionError(
+            "API key validation is not available in this FAB version."
+        )
+
+    user = sm.validate_api_key(api_key_string)
+    if not user:
+        raise PermissionError(
+            "Invalid or expired API key. "
+            "Create a new key at /api/v1/security/api_keys/."
+        )
+
+    # Reload user with all relationships eagerly loaded to avoid
+    # detached-instance errors during later permission checks.
+    user_with_rels = load_user_with_relationships(username=user.username)
+    if user_with_rels is None:
+        logger.warning(
+            "Failed to reload API key user %s with relationships; "
+            "using original user object which may have lazy-loaded "
+            "relationships",
+            user.username,
+        )
+        return user
+    return user_with_rels
+
+
 def get_user_from_request() -> User:
     """
     Get the current user for the MCP tool request.
 
     Priority order:
-    1. g.user if already set (by Preset workspace middleware)
-    2. MCP_DEV_USERNAME from configuration (for development/testing)
+    1. JWT auth context (per-request ContextVar from MCP SDK) — safest
+    2. API key from Authorization header (via FAB SecurityManager)
+    3. MCP_DEV_USERNAME from configuration (for development/testing)
+    4. g.user fallback (for external middleware like Preset's
+       WorkspaceContextMiddleware that sets g.user fresh per request)
+
+    This ordering prevents stale ``g.user`` from a previous tool call
+    from being used in open-source deployments where no middleware
+    refreshes ``g.user`` per request.
 
     Returns:
         User object with roles and groups eagerly loaded
@@ -188,44 +332,51 @@ def get_user_from_request() -> User:
     """
     from flask import current_app
 
-    # First check if user is already set by Preset workspace middleware
+    # Priority 1: JWT context (per-request safe via ContextVar)
+    if (jwt_user := _resolve_user_from_jwt_context(current_app)) is not None:
+        return jwt_user
+
+    # Priority 2: API key authentication via FAB SecurityManager
+    if (api_key_user := _resolve_user_from_api_key(current_app)) is not None:
+        return api_key_user
+
+    # Priority 3: Configured dev username for development/single-user deployments
+    if username := current_app.config.get("MCP_DEV_USERNAME"):
+        user = load_user_with_relationships(username)
+        if not user:
+            raise ValueError(
+                f"User '{username}' not found. "
+                f"Please create admin user with: superset fab create-admin"
+            )
+        return user
+
+    # Priority 4: g.user fallback (set by external middleware, e.g. Preset)
     if hasattr(g, "user") and g.user:
         return g.user
 
-    # Fall back to configured username for development/single-user deployments
-    username = current_app.config.get("MCP_DEV_USERNAME")
-
-    if not username:
-        auth_enabled = current_app.config.get("MCP_AUTH_ENABLED", False)
-        jwt_configured = bool(
-            current_app.config.get("MCP_JWKS_URI")
-            or current_app.config.get("MCP_JWT_PUBLIC_KEY")
-            or current_app.config.get("MCP_JWT_SECRET")
-        )
-        details = []
-        details.append(
-            f"g.user was not set by JWT middleware "
-            f"(MCP_AUTH_ENABLED={auth_enabled}, "
-            f"JWT keys configured={jwt_configured})"
-        )
-        details.append("MCP_DEV_USERNAME is not configured")
-        raise ValueError(
-            "No authenticated user found. Tried:\n"
-            + "\n".join(f"  - {d}" for d in details)
-            + "\n\nEither pass a valid JWT bearer token or configure "
-            "MCP_DEV_USERNAME for development."
-        )
-
-    # Use helper function to load user with all required relationships
-    user = load_user_with_relationships(username)
-
-    if not user:
-        raise ValueError(
-            f"User '{username}' not found. "
-            f"Please create admin user with: superset fab create-admin"
-        )
-
-    return user
+    # No auth source available — raise with diagnostic details
+    auth_enabled = current_app.config.get("MCP_AUTH_ENABLED", False)
+    jwt_configured = bool(
+        current_app.config.get("MCP_JWKS_URI")
+        or current_app.config.get("MCP_JWT_PUBLIC_KEY")
+        or current_app.config.get("MCP_JWT_SECRET")
+    )
+    details = [
+        f"No JWT access token in MCP request context "
+        f"(MCP_AUTH_ENABLED={auth_enabled}, "
+        f"JWT keys configured={jwt_configured})",
+        "No API key in Authorization header",
+        "MCP_DEV_USERNAME is not configured",
+        "g.user was not set by external middleware",
+    ]
+    configured_prefixes = current_app.config.get("FAB_API_KEY_PREFIXES", ["sst_"])
+    prefix_example = configured_prefixes[0] if configured_prefixes else "sst_"
+    raise ValueError(
+        "No authenticated user found. Tried:\n"
+        + "\n".join(f"  - {d}" for d in details)
+        + f"\n\nEither pass a valid API key (Bearer {prefix_example}...), "
+        "JWT token, or configure MCP_DEV_USERNAME for development."
+    )
 
 
 def has_dataset_access(dataset: "SqlaTable") -> bool:
@@ -261,28 +412,93 @@ def has_dataset_access(dataset: "SqlaTable") -> bool:
         return False  # Deny access on error
 
 
+def check_chart_data_access(chart: Any) -> "DatasetValidationResult":
+    """Validate that the current user can access a chart's underlying dataset.
+
+    This extends the RBAC system: ``mcp_auth_hook`` enforces class-level
+    permissions before tool execution; this function enforces data-level
+    permissions inside tools after retrieving specific objects.
+
+    Args:
+        chart: A Slice ORM object with datasource_id attribute
+
+    Returns:
+        DatasetValidationResult with is_valid, error, etc.
+    """
+    from superset.mcp_service.chart.chart_utils import validate_chart_dataset
+
+    return validate_chart_dataset(chart, check_access=True)
+
+
 def _setup_user_context() -> User | None:
     """
     Set up user context for MCP tool execution.
 
+    Includes retry logic for stale database connections (e.g., SSL dropped
+    by proxy/load balancer after idle periods). On OperationalError, the
+    session is reset and the user lookup is retried once.
+
     Returns:
         User object with roles and groups loaded, or None if no Flask context
     """
-    try:
-        user = get_user_from_request()
-    except RuntimeError as e:
-        # No Flask application context (e.g., prompts before middleware runs)
-        # This is expected for some FastMCP operations - return None gracefully
-        if "application context" in str(e):
-            logger.debug("No Flask app context available for user setup")
-            return None
-        raise
+    # Clear stale g.user to prevent user impersonation across
+    # tool calls when no per-request middleware refreshes it.
+    # Only clear in app-context-only mode; preserve g.user when
+    # a request context is active (external middleware set it).
+    from flask import has_request_context
 
-    # Validate user has necessary relationships loaded
-    # (Force access to ensure they're loaded if lazy)
-    user_roles = user.roles  # noqa: F841
-    if hasattr(user, "groups"):
-        user_groups = user.groups  # noqa: F841
+    if not has_request_context():
+        g.pop("user", None)
+
+    from sqlalchemy.exc import OperationalError
+
+    user = None  # Ensure defined before loop in case of unexpected exit
+
+    for attempt in range(2):
+        try:
+            user = get_user_from_request()
+
+            # Validate user has necessary relationships loaded.
+            # Force access to ensure they're loaded if lazy.
+            # This is inside the retry loop because relationship loading
+            # also hits the DB and can fail on stale SSL connections.
+            user_roles = user.roles  # noqa: F841
+            if hasattr(user, "groups"):
+                user_groups = user.groups  # noqa: F841
+
+            break
+        except RuntimeError as e:
+            # No Flask application context (e.g., prompts before middleware runs)
+            if "application context" in str(e):
+                logger.debug("No Flask app context available for user setup")
+                return None
+            raise
+        except OperationalError as e:
+            if attempt == 0:
+                # Only retry on connection-level errors (SSL drops, server
+                # closed connection). Other OperationalErrors (e.g., lock
+                # timeouts) are unlikely to succeed on immediate retry but
+                # are bounded to one attempt so the cost is acceptable.
+                logger.warning(
+                    "Stale DB connection during user setup (attempt 1), "
+                    "resetting session and retrying: %s",
+                    e,
+                )
+                _cleanup_session_on_error()
+                continue
+            logger.error("DB connection failed on retry during user setup: %s", e)
+            _cleanup_session_on_error()
+            raise
+        except ValueError as e:
+            # User resolution failed — fail closed. Do not fall back to
+            # g.user from middleware, as that could allow a request to
+            # proceed as a different user in multi-tenant deployments.
+            # Clear g.user so error/audit logging doesn't attribute
+            # the denied request to the middleware-provided identity.
+            logger.error("MCP user resolution failed, denying request: %s", e)
+            if has_request_context():
+                g.pop("user", None)
+            raise
 
     g.user = user
     return user
@@ -319,21 +535,58 @@ def mcp_auth_hook(tool_func: F) -> F:  # noqa: C901
     import inspect
     import types
 
-    from flask import has_app_context
-
-    from superset.mcp_service.flask_singleton import get_flask_app
+    from flask import current_app, has_app_context, has_request_context
 
     def _get_app_context_manager() -> AbstractContextManager[None]:
-        """Return app context manager only if not already in one."""
-        if has_app_context():
-            # Already in app context (e.g., in tests), use null context
+        """Push a fresh app context unless a request context is active.
+
+        When a request context is present, external middleware (e.g.
+        Preset's WorkspaceContextMiddleware) has already set ``g.user``
+        on a per-request app context — reuse it via ``nullcontext()``.
+
+        When only a bare app context exists (no request context), we must
+        push a **new** app context. The MCP server typically runs inside
+        a long-lived app context (e.g. ``__main__.py`` wraps
+        ``mcp.run()`` in ``app.app_context()``). When FastMCP dispatches
+        concurrent tool calls via ``asyncio.create_task()``, each task
+        inherits the parent's ``ContextVar`` *value* — a reference to the
+        **same** ``AppContext`` object. Without a fresh push, all tasks
+        share one ``g`` namespace and concurrent ``g.user`` mutations
+        race: one user's identity can overwrite another's before
+        ``get_user_id()`` runs during the SQLAlchemy INSERT flush,
+        attributing the created asset to the wrong user.
+        """
+        if has_request_context():
             return contextlib.nullcontext()
-        # Push new app context for standalone MCP server
-        app = get_flask_app()
-        return app.app_context()
+        if has_app_context():
+            # Push a new context for the CURRENT app (not get_flask_app()
+            # which may return a different instance in test environments).
+            return current_app._get_current_object().app_context()
+        from superset.mcp_service.flask_singleton import get_flask_app
+
+        return get_flask_app().app_context()
 
     is_async = inspect.iscoroutinefunction(tool_func)
 
+    # Detect if the original function expects a ctx: Context parameter.
+    # If so, we inject it via get_context() at call time.
+    from fastmcp import Context as FMContext
+
+    _tool_sig = inspect.signature(tool_func)
+    _needs_ctx = any(
+        p.annotation is FMContext
+        or (hasattr(p.annotation, "__name__") and p.annotation.__name__ == "Context")
+        for p in _tool_sig.parameters.values()
+    )
+
+    def _inject_ctx(kwargs: dict[str, Any]) -> dict[str, Any]:
+        """Inject FastMCP Context into kwargs if the tool function expects it."""
+        if _needs_ctx and "ctx" not in kwargs:
+            from fastmcp.server.dependencies import get_context
+
+            kwargs["ctx"] = get_context()
+        return kwargs
+
     if is_async:
 
         @functools.wraps(tool_func)
@@ -348,7 +601,7 @@ def mcp_auth_hook(tool_func: F) -> F:  # noqa: C901
                         "MCP internal call without Flask context: tool=%s",
                         tool_func.__name__,
                     )
-                    return await tool_func(*args, **kwargs)
+                    return await tool_func(*args, **_inject_ctx(kwargs))
 
                 # RBAC permission check
                 if not check_tool_permission(tool_func):
@@ -366,7 +619,7 @@ def mcp_auth_hook(tool_func: F) -> F:  # noqa: C901
                         user.username,
                         tool_func.__name__,
                     )
-                    result = await tool_func(*args, **kwargs)
+                    result = await tool_func(*args, **_inject_ctx(kwargs))
                     return result
                 except Exception:
                     _cleanup_session_on_error()
@@ -388,7 +641,7 @@ def mcp_auth_hook(tool_func: F) -> F:  # noqa: C901
                         "MCP internal call without Flask context: tool=%s",
                         tool_func.__name__,
                     )
-                    return tool_func(*args, **kwargs)
+                    return tool_func(*args, **_inject_ctx(kwargs))
 
                 # RBAC permission check
                 if not check_tool_permission(tool_func):
@@ -406,7 +659,7 @@ def mcp_auth_hook(tool_func: F) -> F:  # noqa: C901
                         user.username,
                         tool_func.__name__,
                     )
-                    result = tool_func(*args, **kwargs)
+                    result = tool_func(*args, **_inject_ctx(kwargs))
                     return result
                 except Exception:
                     _cleanup_session_on_error()
@@ -442,35 +695,23 @@ def mcp_auth_hook(tool_func: F) -> F:  # noqa: C901
     # Copy docstring from original function (not wrapper, which may have lost it)
     new_wrapper.__doc__ = tool_func.__doc__
 
-    # Set __signature__ from the original function, but:
-    # 1. Remove ctx parameter - FastMCP tools don't expose it to clients
-    # 2. Skip if original has *args (parse_request output has its own handling)
-    from fastmcp import Context as FMContext
-
-    tool_sig = inspect.signature(tool_func)
-    has_var_positional = any(
-        p.kind == inspect.Parameter.VAR_POSITIONAL for p in tool_sig.parameters.values()
+    # Set __signature__ from the original function, removing ctx parameter
+    # since FastMCP tools don't expose it to clients.
+    new_params = []
+    for _name, param in _tool_sig.parameters.items():
+        # Skip ctx parameter - FastMCP tools don't expose it to clients
+        if param.annotation is FMContext or (
+            hasattr(param.annotation, "__name__")
+            and param.annotation.__name__ == "Context"
+        ):
+            continue
+        new_params.append(param)
+    new_wrapper.__signature__ = _tool_sig.replace(  # type: ignore[attr-defined]
+        parameters=new_params
     )
 
-    if not has_var_positional:
-        # For functions without *args, preserve signature but remove ctx
-        new_params = []
-        for _name, param in tool_sig.parameters.items():
-            # Skip ctx parameter - FastMCP tools don't expose it to clients
-            if param.annotation is FMContext or (
-                hasattr(param.annotation, "__name__")
-                and param.annotation.__name__ == "Context"
-            ):
-                continue
-            new_params.append(param)
-        new_wrapper.__signature__ = tool_sig.replace(  # type: ignore[attr-defined]
-            parameters=new_params
-        )
-
-        # Also remove ctx from annotations to match signature
-        if "ctx" in new_wrapper.__annotations__:
-            del new_wrapper.__annotations__["ctx"]
-    # For functions with *args (parse_request output), the signature
-    # is already set by parse_request without ctx.
+    # Also remove ctx from annotations to match signature
+    if "ctx" in new_wrapper.__annotations__:
+        del new_wrapper.__annotations__["ctx"]
 
     return new_wrapper  # type: ignore[return-value]
diff --git a/superset/mcp_service/chart/ascii_charts.py b/superset/mcp_service/chart/ascii_charts.py
new file mode 100644
index 00000000000..b5aa4d71f49
--- /dev/null
+++ b/superset/mcp_service/chart/ascii_charts.py
@@ -0,0 +1,863 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+"""
+ASCII chart rendering functions for MCP chart previews.
+
+Pure rendering functions that take data in and return strings out.
+No dependencies on MCP tools, FastMCP Context, or request objects.
+"""
+
+from __future__ import annotations
+
+import logging
+import math
+from typing import Any
+
+logger = logging.getLogger(__name__)
+
+
+def generate_ascii_chart(
+    data: list[Any], chart_type: str, width: int = 80, height: int = 20
+) -> str:
+    """Generate ASCII art chart from data."""
+    if not data:
+        return "No data available for ASCII chart"
+
+    try:
+        # Clamp to safe minimums to prevent negative plot sizes
+        width = max(width, 21)
+        height = max(height, 9)
+
+        logger.debug(
+            "generate_ascii_chart: chart_type=%s, data_rows=%s", chart_type, len(data)
+        )
+
+        if chart_type in ["bar", "column", "echarts_timeseries_bar"]:
+            return _generate_ascii_bar_chart(data, width, height)
+        elif chart_type in ["line", "echarts_timeseries_line"]:
+            return _generate_ascii_line_chart(data, width, height)
+        elif chart_type in ["scatter", "echarts_timeseries_scatter"]:
+            return _generate_ascii_scatter_chart(data, width, height)
+        else:
+            logger.debug(
+                "Unsupported chart type '%s', falling back to table", chart_type
+            )
+            return generate_ascii_table(data, width)
+    except (TypeError, ValueError, KeyError, IndexError) as e:
+        logger.error("ASCII chart generation failed: %s", e, exc_info=True)
+        return "ASCII chart generation failed"
+
+
+def _generate_ascii_bar_chart(data: list[Any], width: int, height: int) -> str:
+    """Generate enhanced ASCII bar chart with horizontal and vertical options."""
+    if not data:
+        return "No data for bar chart"
+
+    # Extract numeric values for bars
+    values = []
+    labels = []
+
+    for row in data[:12]:  # Increased limit for better charts
+        if isinstance(row, dict):
+            # Find numeric and string values
+            numeric_val = None
+            label_val = None
+
+            for _key, val in row.items():
+                if isinstance(val, (int, float)) and numeric_val is None:
+                    numeric_val = val
+                elif isinstance(val, str) and label_val is None:
+                    label_val = val
+
+            if numeric_val is not None:
+                values.append(numeric_val)
+                labels.append(label_val or f"Item {len(values)}")
+
+    if not values:
+        return "No numeric data found for bar chart"
+
+    # Decide between horizontal and vertical based on label lengths
+    avg_label_length = sum(len(str(label)) for label in labels) / len(labels)
+    use_horizontal = avg_label_length > 8 or len(values) > 8
+
+    if use_horizontal:
+        return _generate_horizontal_bar_chart(values, labels, width)
+    else:
+        return _generate_vertical_bar_chart(values, labels, width, height)
+
+
+def _generate_horizontal_bar_chart(
+    values: list[float], labels: list[str], width: int
+) -> str:
+    """Generate horizontal ASCII bar chart."""
+    lines = []
+    lines.append("📊 Horizontal Bar Chart")
+    lines.append("═" * min(width, 60))
+
+    max_val = max(values) if values else 1
+    min_val = min(values) if values else 0
+    max_bar_width = min(40, width - 20)  # Leave space for labels and values
+
+    # Add scale indicator
+    lines.append(f"Scale: {min_val:.1f} ────────────── {max_val:.1f}")
+    lines.append("")
+
+    for label, value in zip(labels, values, strict=False):
+        # Calculate bar length
+        if max_val > min_val:
+            normalized = (value - min_val) / (max_val - min_val)
+            bar_length = max(1, int(normalized * max_bar_width))
+        else:
+            bar_length = 1
+
+        # Create bar with gradient effect
+        bar = _create_gradient_bar(bar_length, value, max_val)
+
+        # Format value
+        if abs(value) >= 1000000:
+            value_str = f"{value / 1000000:.1f}M"
+        elif abs(value) >= 1000:
+            value_str = f"{value / 1000:.1f}K"
+        else:
+            value_str = f"{value:.1f}"
+
+        # Truncate label if too long
+        display_label = label[:15] if len(label) > 15 else label
+        lines.append(f"{display_label:>15} ▐{bar:<{max_bar_width}} {value_str}")
+
+    return "\n".join(lines)
+
+
+def _generate_vertical_bar_chart(  # noqa: C901
+    values: list[float], labels: list[str], width: int, height: int
+) -> str:
+    """Generate vertical ASCII bar chart."""
+    lines = []
+    lines.append("📊 Vertical Bar Chart")
+    lines.append("═" * min(width, 60))
+
+    max_val = max(values) if values else 1
+    min_val = min(values) if values else 0
+    chart_height = min(15, height - 8)  # Leave space for title and labels
+
+    # Create the chart grid
+    grid = []
+    for _ in range(chart_height):
+        grid.append([" "] * len(values))
+
+    # Fill the bars
+    for col, value in enumerate(values):
+        if max_val > min_val:
+            normalized = (value - min_val) / (max_val - min_val)
+            bar_height = max(1, int(normalized * chart_height))
+        else:
+            bar_height = 1
+
+        # Fill from bottom up
+        for row_idx in range(chart_height - bar_height, chart_height):
+            if row_idx < len(grid):
+                # Use different characters for height effect
+                if row_idx == chart_height - bar_height:
+                    grid[row_idx][col] = "▀"  # Top of bar
+                elif row_idx == chart_height - 1:
+                    grid[row_idx][col] = "█"  # Bottom of bar
+                else:
+                    grid[row_idx][col] = "█"  # Middle of bar
+
+    # Add Y-axis scale
+    for i, row_data in enumerate(grid):
+        y_val = (
+            max_val - (i / (chart_height - 1)) * (max_val - min_val)
+            if chart_height > 1
+            else max_val
+        )
+        if abs(y_val) >= 1000:
+            y_label = f"{y_val:.0f}"
+        else:
+            y_label = f"{y_val:.1f}"
+        lines.append(f"{y_label:>6} ┤ " + "".join(f"{cell:^3}" for cell in row_data))
+
+    # Add X-axis
+    lines.append("       └" + "───" * len(values))
+
+    # Add labels
+    label_line = "        "
+    for label in labels:
+        short_label = label[:3] if len(label) > 3 else label
+        label_line += f"{short_label:^3}"
+    lines.append(label_line)
+
+    return "\n".join(lines)
+
+
+def _create_gradient_bar(length: int, value: float, max_val: float) -> str:
+    """Create a gradient bar with visual effects."""
+    if length <= 0:
+        return ""
+
+    # Create gradient effect based on value intensity
+    intensity = value / max_val if max_val > 0 else 0
+
+    if intensity > 0.8:
+        # High values - solid bars
+        return "█" * length
+    elif intensity > 0.6:
+        # Medium-high values - mostly solid with some texture
+        return "█" * (length - 1) + "▉" if length > 1 else "█"
+    elif intensity > 0.4:
+        # Medium values - mixed texture
+        return "▊" * length
+    elif intensity > 0.2:
+        # Low-medium values - lighter texture
+        return "▋" * length
+    else:
+        # Low values - lightest texture
+        return "▌" * length
+
+
+def _generate_ascii_line_chart(data: list[Any], width: int, height: int) -> str:
+    """Generate enhanced ASCII line chart with trend analysis."""
+    if not data:
+        return "No data for line chart"
+
+    lines = []
+    lines.append("📈 Line Chart with Trend Analysis")
+    lines.append("═" * min(width, 60))
+
+    # Extract values and labels for plotting
+    values, labels = _extract_time_series_data(data)
+
+    if not values:
+        return "No numeric data found for line chart"
+
+    # Generate enhanced line chart
+    if len(values) >= 3:
+        lines.extend(_create_enhanced_line_chart(values, labels, width, height))
+    else:
+        # Fallback to sparkline for small datasets
+        sparkline_data = _create_sparkline(values)
+        lines.extend(sparkline_data)
+
+    # Add trend analysis
+    trend_analysis = _analyze_trend(values)
+    lines.append("")
+    lines.append("📊 Trend Analysis:")
+    lines.extend(trend_analysis)
+
+    return "\n".join(lines)
+
+
+def _extract_time_series_data(data: list[Any]) -> tuple[list[float], list[str]]:
+    """Extract time series data with labels."""
+    values = []
+    labels = []
+
+    for row in data[:20]:  # Limit points for readability
+        if isinstance(row, dict):
+            # Find the first numeric value and first string/date value
+            numeric_val = None
+            label_val = None
+
+            for key, val in row.items():
+                if isinstance(val, (int, float)) and numeric_val is None:
+                    numeric_val = val
+                elif isinstance(val, str) and label_val is None:
+                    # Use the key name if it looks like a date/time field
+                    if any(
+                        date_word in key.lower()
+                        for date_word in ["date", "time", "month", "day", "year"]
+                    ):
+                        label_val = str(val)[:10]  # Truncate long dates
+                    else:
+                        label_val = str(val)[:8]  # Truncate long strings
+
+            if numeric_val is not None:
+                values.append(numeric_val)
+                labels.append(label_val or f"P{len(values)}")
+
+    return values, labels
+
+
+def _create_enhanced_line_chart(
+    values: list[float], labels: list[str], width: int, height: int
+) -> list[str]:
+    """Create an enhanced ASCII line chart with better visualization."""
+    lines = []
+    chart_width = min(50, width - 15)
+    chart_height = min(12, height - 8)
+
+    if len(values) < 2:
+        return ["Insufficient data for line chart"]
+
+    # Normalize values to chart height
+    min_val = min(values)
+    max_val = max(values)
+    val_range = max_val - min_val if max_val != min_val else 1
+
+    # Create chart grid
+    grid = [[" " for _ in range(chart_width)] for _ in range(chart_height)]
+
+    # Plot the line with connecting segments
+    prev_x, prev_y = None, None
+
+    for i, value in enumerate(values):
+        # Map to grid coordinates
+        x = int((i / (len(values) - 1)) * (chart_width - 1)) if len(values) > 1 else 0
+        y = chart_height - 1 - int(((value - min_val) / val_range) * (chart_height - 1))
+
+        # Ensure coordinates are within bounds
+        x = max(0, min(x, chart_width - 1))
+        y = max(0, min(y, chart_height - 1))
+
+        # Mark the point
+        grid[y][x] = "●"
+
+        # Draw line segment to previous point
+        if prev_x is not None and prev_y is not None:
+            _draw_line_segment(grid, prev_x, prev_y, x, y, chart_width, chart_height)
+
+        prev_x, prev_y = x, y
+
+    # Render the chart with Y-axis labels
+    for i, row in enumerate(grid):
+        y_val = (
+            max_val - (i / (chart_height - 1)) * val_range
+            if chart_height > 1
+            else max_val
+        )
+        if abs(y_val) >= 1000:
+            y_label = f"{y_val:.0f}"
+        else:
+            y_label = f"{y_val:.1f}"
+        lines.append(f"{y_label:>8} ┤ " + "".join(row))
+
+    # Add X-axis
+    lines.append("         └" + "─" * chart_width)
+
+    # Add selected X-axis labels (show every few labels to avoid crowding)
+    label_line = "          "
+    step = max(1, len(labels) // 6)  # Show max 6 labels
+    for i in range(0, len(labels), step):
+        pos = int((i / (len(values) - 1)) * (chart_width - 1)) if len(values) > 1 else 0
+        # Add spacing to position the label
+        while len(label_line) - 10 < pos:
+            label_line += " "
+        label_line += labels[i][:8]
+
+    lines.append(label_line)
+
+    return lines
+
+
+def _draw_line_segment(
+    grid: list[list[str]], x1: int, y1: int, x2: int, y2: int, width: int, height: int
+) -> None:
+    """Draw a line segment between two points using Bresenham-like algorithm."""
+    # Simple line drawing - connect points with line characters
+    if x1 == x2:  # Vertical line
+        start_y, end_y = sorted([y1, y2])
+        for y in range(start_y + 1, end_y):
+            if 0 <= y < height and 0 <= x1 < width:
+                grid[y][x1] = "│"
+    elif y1 == y2:  # Horizontal line
+        start_x, end_x = sorted([x1, x2])
+        for x in range(start_x + 1, end_x):
+            if 0 <= y1 < height and 0 <= x < width:
+                grid[y1][x] = "─"
+    else:  # Diagonal line - use simple interpolation
+        steps = max(abs(x2 - x1), abs(y2 - y1))
+        for step in range(1, steps):
+            x = x1 + int((x2 - x1) * step / steps)
+            y = y1 + int((y2 - y1) * step / steps)
+            if 0 <= x < width and 0 <= y < height:
+                if abs(x2 - x1) > abs(y2 - y1):
+                    grid[y][x] = "─"
+                else:
+                    grid[y][x] = "│"
+
+
+def _analyze_trend(values: list[float]) -> list[str]:
+    """Analyze trend in the data."""
+    if len(values) < 2:
+        return ["• Insufficient data for trend analysis"]
+
+    analysis = []
+
+    # Calculate basic statistics
+    first_val = values[0]
+    last_val = values[-1]
+    min_val = min(values)
+    max_val = max(values)
+    avg_val = sum(values) / len(values)
+
+    # Overall trend
+    if last_val > first_val * 1.1:
+        trend_icon = "📈"
+        trend_desc = "Strong upward trend"
+    elif last_val > first_val * 1.05:
+        trend_icon = "📊"
+        trend_desc = "Moderate upward trend"
+    elif last_val < first_val * 0.9:
+        trend_icon = "📉"
+        trend_desc = "Strong downward trend"
+    elif last_val < first_val * 0.95:
+        trend_icon = "📊"
+        trend_desc = "Moderate downward trend"
+    else:
+        trend_icon = "➡️"
+        trend_desc = "Relatively stable"
+
+    analysis.append(f"• {trend_icon} {trend_desc}")
+    analysis.append(f"• Range: {min_val:.1f} to {max_val:.1f} (avg: {avg_val:.1f})")
+
+    # Volatility
+    if len(values) >= 3:
+        changes = [abs(values[i] - values[i - 1]) for i in range(1, len(values))]
+        avg_change = sum(changes) / len(changes)
+        volatility = "High" if avg_change > (max_val - min_val) * 0.1 else "Low"
+        analysis.append(f"• Volatility: {volatility}")
+
+    return analysis
+
+
+def _create_sparkline(values: list[float]) -> list[str]:
+    """Create sparkline visualization from values."""
+    if len(values) <= 1:
+        return []
+
+    max_val = max(values)
+    min_val = min(values)
+    range_val = max_val - min_val if max_val != min_val else 1
+
+    sparkline = ""
+    for val in values:
+        normalized = (val - min_val) / range_val
+        if normalized < 0.2:
+            sparkline += "▁"
+        elif normalized < 0.4:
+            sparkline += "▂"
+        elif normalized < 0.6:
+            sparkline += "▄"
+        elif normalized < 0.8:
+            sparkline += "▆"
+        else:
+            sparkline += "█"
+
+    # Safe formatting to avoid NaN display
+    if _is_nan_value(min_val) or _is_nan_value(max_val):
+        return ["Range: Unable to calculate from data", sparkline]
+    else:
+        return [f"Range: {min_val:.2f} to {max_val:.2f}", sparkline]
+
+
+def _is_nan_value(value: Any) -> bool:
+    """Check if a value is NaN or invalid."""
+    try:
+        return math.isnan(float(value))
+    except (ValueError, TypeError):
+        return True
+
+
+def _generate_ascii_scatter_chart(data: list[Any], width: int, height: int) -> str:
+    """Generate ASCII scatter plot."""
+    if not data:
+        return "No data for scatter chart"
+
+    lines = []
+    lines.append("ASCII Scatter Plot")
+    lines.append("=" * min(width, 50))
+
+    # Extract data points
+    x_values, y_values, x_column, y_column = _extract_scatter_data(data)
+
+    # Log debug info server-side only
+    logger.debug(
+        "Scatter chart: x_column=%s, y_column=%s, valid_pairs=%d",
+        x_column,
+        y_column,
+        len(x_values),
+    )
+
+    # Check if we have enough data
+    if len(x_values) < 2:
+        return generate_ascii_table(data, width)
+
+    # Add axis info
+    lines.extend(_create_axis_info(x_values, y_values, x_column, y_column))
+
+    # Create and render grid
+    grid = _create_scatter_grid(x_values, y_values, width, height)
+    lines.extend(_render_scatter_grid(grid, x_values, y_values, width, height))
+
+    return "\n".join(lines)
+
+
+def _extract_scatter_data(
+    data: list[Any],
+) -> tuple[list[float], list[float], str | None, str | None]:
+    """Extract X,Y data from scatter chart data."""
+    x_values = []
+    y_values = []
+    x_column = None
+    y_column = None
+    numeric_columns = []
+
+    if data and isinstance(data[0], dict):
+        # Find the first two numeric columns
+        for key, val in data[0].items():
+            if isinstance(val, (int, float)) and not (
+                isinstance(val, float) and (val != val)
+            ):  # Exclude NaN
+                numeric_columns.append(key)
+
+        if len(numeric_columns) >= 2:
+            x_column = numeric_columns[0]
+            y_column = numeric_columns[1]
+
+            # Extract X,Y pairs
+            for row in data[:50]:  # Limit for ASCII display
+                if isinstance(row, dict):
+                    x_val = row.get(x_column)
+                    y_val = row.get(y_column)
+                    # Check for valid numbers (not NaN)
+                    if (
+                        isinstance(x_val, (int, float))
+                        and isinstance(y_val, (int, float))
+                        and not (
+                            isinstance(x_val, float) and (x_val != x_val)
+                        )  # Not NaN
+                        and not (isinstance(y_val, float) and (y_val != y_val))
+                    ):  # Not NaN
+                        x_values.append(x_val)
+                        y_values.append(y_val)
+
+    return x_values, y_values, x_column, y_column
+
+
+def _create_axis_info(
+    x_values: list[float],
+    y_values: list[float],
+    x_column: str | None,
+    y_column: str | None,
+) -> list[str]:
+    """Create axis information lines."""
+    return [
+        f"X-axis: {x_column} (range: {min(x_values):.2f} to {max(x_values):.2f})",
+        f"Y-axis: {y_column} (range: {min(y_values):.2f} to {max(y_values):.2f})",
+        f"Showing {len(x_values)} data points",
+        "",
+    ]
+
+
+def _create_scatter_grid(
+    x_values: list[float], y_values: list[float], width: int, height: int
+) -> list[list[str]]:
+    """Create and populate the scatter plot grid."""
+    plot_width = min(40, width - 10)
+    plot_height = min(15, height - 8)
+
+    # Normalize values to fit in grid
+    x_min, x_max = min(x_values), max(x_values)
+    y_min, y_max = min(y_values), max(y_values)
+    x_range = x_max - x_min if x_max != x_min else 1
+    y_range = y_max - y_min if y_max != y_min else 1
+
+    # Create grid
+    grid = [[" " for _ in range(plot_width)] for _ in range(plot_height)]
+
+    # Plot points
+    for x, y in zip(x_values, y_values, strict=False):
+        try:
+            grid_x = int(((x - x_min) / x_range) * (plot_width - 1))
+            grid_y = int(((y - y_min) / y_range) * (plot_height - 1))
+        except (ValueError, OverflowError):
+            # Skip points that can't be converted to integers (NaN, inf, etc.)
+            continue
+        grid_y = plot_height - 1 - grid_y  # Flip Y axis for display
+
+        if 0 <= grid_x < plot_width and 0 <= grid_y < plot_height:
+            if grid[grid_y][grid_x] == " ":
+                grid[grid_y][grid_x] = "•"
+            else:
+                grid[grid_y][grid_x] = "█"  # Multiple points
+
+    return grid
+
+
+def _render_scatter_grid(
+    grid: list[list[str]],
+    x_values: list[float],
+    y_values: list[float],
+    width: int,
+    height: int,
+) -> list[str]:
+    """Render the scatter plot grid with axes and labels."""
+    lines = []
+    plot_width = min(40, width - 10)
+    plot_height = min(15, height - 8)
+
+    x_min, x_max = min(x_values), max(x_values)
+    y_min, y_max = min(y_values), max(y_values)
+    y_range = y_max - y_min if y_max != y_min else 1
+
+    # Add Y-axis labels and plot
+    for i, row in enumerate(grid):
+        y_val = y_max - (i / (plot_height - 1)) * y_range if plot_height > 1 else y_max
+        y_label = f"{y_val:.1f}" if abs(y_val) < 1000 else f"{y_val:.0f}"
+        lines.append(f"{y_label:>6} |{''.join(row)}")
+
+    # Add X-axis
+    x_axis_line = " " * 7 + "+" + "-" * plot_width
+    lines.append(x_axis_line)
+
+    # Add X-axis labels
+    x_left_label = f"{x_min:.1f}" if abs(x_min) < 1000 else f"{x_min:.0f}"
+    x_right_label = f"{x_max:.1f}" if abs(x_max) < 1000 else f"{x_max:.0f}"
+    x_labels = (
+        " " * 8
+        + x_left_label
+        + " " * (plot_width - len(x_left_label) - len(x_right_label))
+        + x_right_label
+    )
+    lines.append(x_labels)
+
+    return lines
+
+
+def generate_ascii_table(data: list[Any], width: int) -> str:
+    """Generate enhanced ASCII table with better formatting."""
+    if not data:
+        return "No data for table"
+
+    lines = []
+    lines.append("📋 Data Table")
+    lines.append("═" * min(width, 70))
+
+    # Get column headers from first row
+    if isinstance(data[0], dict):
+        # Select best columns to display
+        all_headers = list(data[0].keys())
+        headers = _select_display_columns(all_headers, data, max_cols=6)
+
+        # Calculate optimal column widths
+        col_widths = _calculate_column_widths(headers, data, width)
+
+        # Create enhanced header
+        lines.append(_create_table_header(headers, col_widths))
+        lines.append(_create_table_separator(col_widths))
+
+        # Add data rows with better formatting
+        row_count = min(15, len(data))  # Show more rows
+        for i, row in enumerate(data[:row_count]):
+            formatted_row = _format_table_row(row, headers, col_widths)
+            lines.append(formatted_row)
+
+            # Add separator every 5 rows for readability
+            if i > 0 and (i + 1) % 5 == 0 and i < row_count - 1:
+                lines.append(_create_light_separator(col_widths))
+
+        # Add footer with stats
+        lines.append(_create_table_separator(col_widths))
+        lines.append(f"📊 Showing {row_count} of {len(data)} rows")
+
+        # Add column summaries for numeric columns
+        numeric_summaries = _create_numeric_summaries(data, headers)
+        if numeric_summaries:
+            lines.append("")
+            lines.append("📈 Numeric Summaries:")
+            lines.extend(numeric_summaries)
+
+    return "\n".join(lines)
+
+
+def _select_display_columns(
+    all_headers: list[str], data: list[Any], max_cols: int = 6
+) -> list[str]:
+    """Select the most interesting columns to display."""
+    if len(all_headers) <= max_cols:
+        return all_headers
+
+    # Prioritize columns by interest level
+    priority_scores = {}
+
+    for header in all_headers:
+        score = 0
+        header_lower = header.lower()
+
+        # Higher priority for common business fields
+        if any(word in header_lower for word in ["name", "title", "id"]):
+            score += 10
+        if any(
+            word in header_lower
+            for word in ["amount", "price", "cost", "revenue", "sales"]
+        ):
+            score += 8
+        if any(word in header_lower for word in ["date", "time", "created", "updated"]):
+            score += 6
+        if any(word in header_lower for word in ["count", "total", "sum", "avg"]):
+            score += 5
+
+        # Check data variety (more variety = more interesting)
+        sample_values = [
+            str(row.get(header, "")) for row in data[:10] if isinstance(row, dict)
+        ]
+        unique_values = len(set(sample_values))
+        if unique_values > 1:
+            score += min(unique_values, 5)
+
+        priority_scores[header] = score
+
+    # Return top scoring columns
+    sorted_headers = sorted(
+        all_headers, key=lambda h: priority_scores.get(h, 0), reverse=True
+    )
+    return sorted_headers[:max_cols]
+
+
+def _calculate_column_widths(
+    headers: list[str], data: list[Any], total_width: int
+) -> list[int]:
+    """Calculate optimal column widths based on content."""
+    if not headers:
+        return []
+
+    # Start with minimum widths based on header lengths
+    min_widths = [max(8, min(len(h) + 2, 15)) for h in headers]
+
+    # Check actual data to adjust widths
+    for row in data[:10]:  # Sample first 10 rows
+        if isinstance(row, dict):
+            for i, header in enumerate(headers):
+                val = row.get(header, "")
+                if isinstance(val, float):
+                    content_len = len(f"{val:.2f}")
+                elif isinstance(val, int):
+                    content_len = len(str(val))
+                else:
+                    content_len = len(str(val))
+
+                min_widths[i] = max(min_widths[i], min(content_len + 1, 20))
+
+    # Distribute remaining space proportionally
+    used_width = sum(min_widths) + len(headers) * 3  # Account for separators
+    available_width = min(total_width - 10, 80)  # Leave margins
+
+    if used_width < available_width:
+        # Distribute extra space
+        extra_space = available_width - used_width
+        for i in range(len(min_widths)):
+            min_widths[i] += extra_space // len(min_widths)
+
+    return min_widths
+
+
+def _create_table_header(headers: list[str], widths: list[int]) -> str:
+    """Create formatted table header."""
+    formatted_headers = []
+    for header, width in zip(headers, widths, strict=False):
+        # Truncate and center header
+        display_header = header[: width - 2] if len(header) > width - 2 else header
+        formatted_headers.append(f"{display_header:^{width}}")
+
+    return (
+        "┌"
+        + "┬".join("─" * w for w in widths)
+        + "┐\n│"
+        + "│".join(formatted_headers)
+        + "│"
+    )
+
+
+def _create_table_separator(widths: list[int]) -> str:
+    """Create table separator line."""
+    return "├" + "┼".join("─" * w for w in widths) + "┤"
+
+
+def _create_light_separator(widths: list[int]) -> str:
+    """Create light separator line."""
+    return "├" + "┼".join("┈" * w for w in widths) + "┤"
+
+
+def _format_table_row(
+    row: dict[str, Any], headers: list[str], widths: list[int]
+) -> str:
+    """Format a single table row."""
+    formatted_values = []
+
+    for header, width in zip(headers, widths, strict=False):
+        val = row.get(header, "")
+
+        # Format value based on type
+        if isinstance(val, float):
+            if abs(val) >= 1000000:
+                formatted_val = f"{val / 1000000:.1f}M"
+            elif abs(val) >= 1000:
+                formatted_val = f"{val / 1000:.1f}K"
+            else:
+                formatted_val = f"{val:.2f}"
+        elif isinstance(val, int):
+            if abs(val) >= 1000000:
+                formatted_val = f"{val // 1000000}M"
+            elif abs(val) >= 1000:
+                formatted_val = f"{val // 1000}K"
+            else:
+                formatted_val = str(val)
+        else:
+            formatted_val = str(val)
+
+        # Truncate if too long
+        if len(formatted_val) > width - 2:
+            formatted_val = formatted_val[: width - 5] + "..."
+
+        # Align numbers right, text left
+        if isinstance(val, (int, float)):
+            formatted_values.append(f"{formatted_val:>{width - 2}}")
+        else:
+            formatted_values.append(f"{formatted_val:<{width - 2}}")
+
+    return "│ " + " │ ".join(formatted_values) + " │"
+
+
+def _create_numeric_summaries(data: list[Any], headers: list[str]) -> list[str]:
+    """Create summaries for numeric columns."""
+    summaries = []
+
+    for header in headers:
+        # Collect numeric values
+        values = []
+        for row in data:
+            if isinstance(row, dict):
+                val = row.get(header)
+                if isinstance(val, (int, float)):
+                    values.append(val)
+
+        if len(values) >= 2:
+            min_val = min(values)
+            max_val = max(values)
+            avg_val = sum(values) / len(values)
+
+            if abs(avg_val) >= 1000:
+                avg_str = f"{avg_val / 1000:.1f}K"
+            else:
+                avg_str = f"{avg_val:.1f}"
+
+            summaries.append(
+                f"  {header}: avg={avg_str}, range={min_val:.1f}-{max_val:.1f}"
+            )
+
+    return summaries
diff --git a/superset/mcp_service/chart/chart_helpers.py b/superset/mcp_service/chart/chart_helpers.py
new file mode 100644
index 00000000000..05477e76eee
--- /dev/null
+++ b/superset/mcp_service/chart/chart_helpers.py
@@ -0,0 +1,81 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+"""
+Shared helper functions for MCP chart tools.
+
+This module contains reusable utility functions for common operations
+across chart tools: chart lookup, cached form data retrieval, and
+URL parameter extraction. Config mapping logic lives in chart_utils.py.
+"""
+
+from __future__ import annotations
+
+import logging
+from typing import TYPE_CHECKING
+from urllib.parse import parse_qs, urlparse
+
+if TYPE_CHECKING:
+    from superset.models.slice import Slice
+
+logger = logging.getLogger(__name__)
+
+
+def find_chart_by_identifier(identifier: int | str) -> Slice | None:
+    """Find a chart by numeric ID or UUID string.
+
+    Accepts an integer ID, a string that looks like a digit (e.g. "123"),
+    or a UUID string. Returns the Slice model instance or None.
+    """
+    from superset.daos.chart import ChartDAO  # avoid circular import
+
+    if isinstance(identifier, int) or (
+        isinstance(identifier, str) and identifier.isdigit()
+    ):
+        chart_id = int(identifier) if isinstance(identifier, str) else identifier
+        return ChartDAO.find_by_id(chart_id)
+    return ChartDAO.find_by_id(identifier, id_column="uuid")
+
+
+def get_cached_form_data(form_data_key: str) -> str | None:
+    """Retrieve form_data from cache using form_data_key.
+
+    Returns the JSON string of form_data if found, None otherwise.
+    """
+    # avoid circular import — commands depend on app initialization
+    from superset.commands.exceptions import CommandException
+    from superset.commands.explore.form_data.get import GetFormDataCommand
+    from superset.commands.explore.form_data.parameters import CommandParameters
+
+    try:
+        cmd_params = CommandParameters(key=form_data_key)
+        return GetFormDataCommand(cmd_params).run()
+    except (KeyError, ValueError, CommandException) as e:
+        logger.warning("Failed to retrieve form_data from cache: %s", e)
+        return None
+
+
+def extract_form_data_key_from_url(url: str | None) -> str | None:
+    """Extract the form_data_key query parameter from an explore URL.
+
+    Returns the form_data_key value or None if not found or URL is empty.
+    """
+    if not url:
+        return None
+    parsed = urlparse(url)
+    values = parse_qs(parsed.query).get("form_data_key", [])
+    return values[0] if values else None
diff --git a/superset/mcp_service/chart/chart_utils.py b/superset/mcp_service/chart/chart_utils.py
index bdaae915703..5b865c1f0dd 100644
--- a/superset/mcp_service/chart/chart_utils.py
+++ b/superset/mcp_service/chart/chart_utils.py
@@ -26,10 +26,14 @@ import logging
 from dataclasses import dataclass
 from typing import Any, Dict
 
+from superset.constants import NO_TIME_RANGE
 from superset.mcp_service.chart.schemas import (
+    BigNumberChartConfig,
     ChartCapabilities,
     ChartSemantics,
     ColumnRef,
+    FilterConfig,
+    HandlebarsChartConfig,
     MixedTimeseriesChartConfig,
     PieChartConfig,
     PivotTableChartConfig,
@@ -38,6 +42,7 @@ from superset.mcp_service.chart.schemas import (
 )
 from superset.mcp_service.utils.url_utils import get_superset_base_url
 from superset.utils import json
+from superset.utils.core import FilterOperator
 
 logger = logging.getLogger(__name__)
 
@@ -308,7 +313,9 @@ def map_config_to_form_data(
     | XYChartConfig
     | PieChartConfig
     | PivotTableChartConfig
-    | MixedTimeseriesChartConfig,
+    | MixedTimeseriesChartConfig
+    | HandlebarsChartConfig
+    | BigNumberChartConfig,
     dataset_id: int | str | None = None,
 ) -> Dict[str, Any]:
     """Map chart config to Superset form_data."""
@@ -322,73 +329,25 @@ def map_config_to_form_data(
         return map_pivot_table_config(config)
     elif isinstance(config, MixedTimeseriesChartConfig):
         return map_mixed_timeseries_config(config, dataset_id=dataset_id)
+    elif isinstance(config, HandlebarsChartConfig):
+        return map_handlebars_config(config)
+    elif isinstance(config, BigNumberChartConfig):
+        if config.show_trendline and config.temporal_column:
+            if not is_column_truly_temporal(config.temporal_column, dataset_id):
+                raise ValueError(
+                    f"Big Number trendline requires a temporal SQL column; "
+                    f"'{config.temporal_column}' is not temporal."
+                )
+        return map_big_number_config(config)
     else:
         raise ValueError(f"Unsupported config type: {type(config)}")
 
 
-def map_table_config(config: TableChartConfig) -> Dict[str, Any]:
-    """Map table chart config to form_data with defensive validation."""
-    # Early validation to prevent empty charts
-    if not config.columns:
-        raise ValueError("Table chart must have at least one column")
-
-    # Separate columns with aggregates from raw columns
-    raw_columns = []
-    aggregated_metrics = []
-
-    for col in config.columns:
-        if col.aggregate:
-            # Column has aggregation - treat as metric
-            aggregated_metrics.append(create_metric_object(col))
-        else:
-            # No aggregation - treat as raw column
-            raw_columns.append(col.name)
-
-    # Final validation - ensure we have some data to display
-    if not raw_columns and not aggregated_metrics:
-        raise ValueError("Table chart configuration resulted in no displayable columns")
-
-    # Use the viz_type from config (defaults to "table", can be "ag-grid-table")
-    form_data: Dict[str, Any] = {
-        "viz_type": config.viz_type,
-    }
-
-    # Handle raw columns (no aggregation)
-    if raw_columns and not aggregated_metrics:
-        # Pure raw columns - show individual rows
-        form_data.update(
-            {
-                "all_columns": raw_columns,
-                "query_mode": "raw",
-                "include_time": False,
-                "order_desc": True,
-                "row_limit": 1000,  # Reasonable limit for raw data
-            }
-        )
-
-    # Handle aggregated columns only
-    elif aggregated_metrics and not raw_columns:
-        # Pure aggregation - show totals
-        form_data.update(
-            {
-                "metrics": aggregated_metrics,
-                "query_mode": "aggregate",
-            }
-        )
-
-    # Handle mixed columns (raw + aggregated)
-    elif raw_columns and aggregated_metrics:
-        # Mixed mode - group by raw columns, aggregate metrics
-        form_data.update(
-            {
-                "all_columns": raw_columns,
-                "metrics": aggregated_metrics,
-                "groupby": raw_columns,
-                "query_mode": "aggregate",
-            }
-        )
-
-    if config.filters:
+def _add_adhoc_filters(
+    form_data: Dict[str, Any], filters: list[FilterConfig] | None
+) -> None:
+    """Add adhoc filters to form_data if any are specified."""
+    if filters:
         form_data["adhoc_filters"] = [
             {
                 "clause": "WHERE",
@@ -397,18 +356,133 @@ def map_table_config(config: TableChartConfig) -> Dict[str, Any]:
                 "operator": map_filter_operator(filter_config.op),
                 "comparator": filter_config.value,
             }
-            for filter_config in config.filters
+            for filter_config in filters
             if filter_config is not None
         ]
 
+
+def adhoc_filters_to_query_filters(
+    adhoc_filters: list[Dict[str, Any]],
+) -> list[Dict[str, Any]]:
+    """Convert adhoc filter format to QueryObject filter format.
+
+    Adhoc filters use ``{subject, operator, comparator}`` keys while
+    ``QueryContextFactory`` expects ``{col, op, val}`` (QueryObjectFilterClause).
+    """
+    result: list[Dict[str, Any]] = []
+    for f in adhoc_filters:
+        if f.get("expressionType") == "SIMPLE":
+            result.append(
+                {
+                    "col": f.get("subject"),
+                    "op": f.get("operator"),
+                    "val": f.get("comparator"),
+                }
+            )
+    return result
+
+
+def map_table_config(config: TableChartConfig) -> Dict[str, Any]:
+    """Map table chart config to form_data with defensive validation."""
+    # Early validation to prevent empty charts
+    if not config.columns:
+        raise ValueError("Table chart must have at least one column")
+
+    # Use the viz_type from config (defaults to "table", can be "ag-grid-table")
+    form_data: Dict[str, Any] = {
+        "viz_type": config.viz_type,
+    }
+
+    # When query_mode is explicitly set to "raw", force raw mode for all columns.
+    # Aggregate settings on individual columns are ignored in this case.
+    if config.query_mode == "raw":
+        column_names = [col.name for col in config.columns]
+        form_data.update(
+            {
+                "all_columns": column_names,
+                "columns": column_names,
+                "query_mode": "raw",
+                "include_time": False,
+                "order_desc": True,
+            }
+        )
+    else:
+        # Auto-detect or explicit "aggregate": separate columns with aggregates
+        # from raw columns and build the appropriate form_data.
+        raw_columns = []
+        aggregated_metrics = []
+
+        for col in config.columns:
+            if col.is_metric:
+                # Saved metric or column with aggregation - treat as metric
+                aggregated_metrics.append(create_metric_object(col))
+            else:
+                # No aggregation - treat as raw column
+                raw_columns.append(col.name)
+
+        # Final validation - ensure we have some data to display
+        if not raw_columns and not aggregated_metrics:
+            raise ValueError(
+                "Table chart configuration resulted in no displayable columns"
+            )
+
+        # Handle raw columns (no aggregation)
+        if raw_columns and not aggregated_metrics:
+            # Pure raw columns - show individual rows
+            # Include both "all_columns" (Superset table viz) and "columns"
+            # (QueryContextFactory validation) to avoid "Empty query?" errors
+            form_data.update(
+                {
+                    "all_columns": raw_columns,
+                    "columns": raw_columns,
+                    "query_mode": "raw",
+                    "include_time": False,
+                    "order_desc": True,
+                }
+            )
+
+        # Handle aggregated columns only
+        elif aggregated_metrics and not raw_columns:
+            # Pure aggregation - show totals
+            form_data.update(
+                {
+                    "metrics": aggregated_metrics,
+                    "query_mode": "aggregate",
+                }
+            )
+
+        # Handle mixed columns (raw + aggregated)
+        else:
+            # Mixed mode - group by raw columns, aggregate metrics
+            form_data.update(
+                {
+                    "all_columns": raw_columns,
+                    "metrics": aggregated_metrics,
+                    "groupby": raw_columns,
+                    "query_mode": "aggregate",
+                }
+            )
+
+    _add_adhoc_filters(form_data, config.filters)
+
     if config.sort_by:
         form_data["order_by_cols"] = config.sort_by
 
+    form_data["row_limit"] = config.row_limit
+
     return form_data
 
 
-def create_metric_object(col: ColumnRef) -> Dict[str, Any]:
-    """Create a metric object for a column with enhanced validation."""
+def create_metric_object(col: ColumnRef) -> Dict[str, Any] | str:
+    """Create a metric object for a column with enhanced validation.
+
+    For saved metrics, returns the metric name as a plain string which
+    Superset's query engine resolves via its metrics_by_name lookup.
+    For ad-hoc metrics, returns a SIMPLE expression dict.
+    """
+    if col.saved_metric:
+        return col.name
+
     # Ensure aggregate is valid - default to SUM if not specified or invalid
     valid_aggregates = {
         "SUM",
@@ -493,6 +567,7 @@ def configure_temporal_handling(
     Stores any warnings in ``form_data["_mcp_warnings"]``.
     """
     if x_is_temporal:
+        form_data["granularity_sqla"] = form_data.get("x_axis")
         if time_grain:
             form_data["time_grain_sqla"] = time_grain
     else:
@@ -509,6 +584,62 @@ def configure_temporal_handling(
             )
 
 
+def _ensure_temporal_adhoc_filter(form_data: Dict[str, Any], column: str) -> None:
+    """Ensure a TEMPORAL_RANGE adhoc filter exists for the given column.
+
+    Mirrors the Explore UI behavior: when a temporal column is set as
+    the x-axis, a TEMPORAL_RANGE filter must be present so dashboard
+    time-range filters can bind to it.  Without this filter, Explore
+    shows a warning dialog asking the user to add it manually.
+    """
+    existing = form_data.get("adhoc_filters", [])
+    if any(
+        f.get("operator") == FilterOperator.TEMPORAL_RANGE.value
+        and f.get("subject") == column
+        for f in existing
+    ):
+        return
+    existing.append(
+        {
+            "clause": "WHERE",
+            "expressionType": "SIMPLE",
+            "subject": column,
+            "operator": FilterOperator.TEMPORAL_RANGE.value,
+            "comparator": NO_TIME_RANGE,
+        }
+    )
+    form_data["adhoc_filters"] = existing
+
+
+def _resolve_default_x_axis(
+    config: XYChartConfig, dataset_id: int | str | None
+) -> XYChartConfig:
+    """Resolve x-axis to the dataset's main_dttm_col when x is omitted."""
+    if config.x is not None:
+        return config
+
+    if not dataset_id:
+        raise ValueError("x-axis column is required when dataset_id is not provided")
+    from superset.daos.dataset import DatasetDAO
+
+    if isinstance(dataset_id, int) or (
+        isinstance(dataset_id, str) and dataset_id.isdigit()
+    ):
+        dataset = DatasetDAO.find_by_id(int(dataset_id))
+    else:
+        dataset = DatasetDAO.find_by_id(dataset_id, id_column="uuid")
+
+    if not dataset or not dataset.main_dttm_col:
+        raise ValueError(
+            "x-axis column is required: dataset has no primary datetime "
+            "column (main_dttm_col). Please specify the x-axis column "
+            "explicitly."
+        )
+    from superset.mcp_service.chart.schemas import ColumnRef
+
+    return config.model_copy(update={"x": ColumnRef(name=dataset.main_dttm_col)})
+
+
 def map_xy_config(
     config: XYChartConfig, dataset_id: int | str | None = None
 ) -> Dict[str, Any]:
@@ -517,6 +648,10 @@ def map_xy_config(
     if not config.y:
         raise ValueError("XY chart must have at least one Y-axis metric")
 
+    # Resolve x-axis default: use dataset's main_dttm_col when x is omitted
+    config = _resolve_default_x_axis(config, dataset_id)
+    assert config.x is not None  # _resolve_default_x_axis guarantees x is set
+
     # Check if x-axis column is truly temporal (based on actual SQL type)
     x_is_temporal = is_column_truly_temporal(config.x.name, dataset_id)
 
@@ -557,36 +692,19 @@ def map_xy_config(
     # Configure temporal handling based on whether column is truly temporal
     configure_temporal_handling(form_data, x_is_temporal, config.time_grain)
 
-    # CRITICAL FIX: For time series charts, handle groupby carefully to avoid duplicates
-    # The x_axis field already tells Superset which column to use for time grouping
-    groupby_columns = []
+    # Only add groupby columns that differ from x_axis to avoid
+    # "Duplicate column/metric labels" errors in Superset.
+    if config.group_by:
+        groupby_columns = [c.name for c in config.group_by if c.name != config.x.name]
+        if groupby_columns:
+            form_data["groupby"] = groupby_columns
 
-    # Only add groupby columns if there's an explicit group_by specified
-    # The x_axis column should NOT be duplicated in groupby as it causes
-    # "Duplicate column/metric labels" errors in Superset
-    # Only add group_by column if it's specified AND different from x_axis
-    # NEVER add the x_axis column to groupby as it creates duplicate labels
-    if config.group_by and config.group_by.name != config.x.name:
-        groupby_columns.append(config.group_by.name)
+    _add_adhoc_filters(form_data, config.filters)
 
-    # Set the groupby in form_data only if we have valid columns
-    # Don't set empty groupby - let Superset handle x_axis grouping automatically
-    if groupby_columns:
-        form_data["groupby"] = groupby_columns
+    if x_is_temporal:
+        _ensure_temporal_adhoc_filter(form_data, config.x.name)
 
-    # Add filters if specified
-    if config.filters:
-        form_data["adhoc_filters"] = [
-            {
-                "clause": "WHERE",
-                "expressionType": "SIMPLE",
-                "subject": filter_config.column,
-                "operator": map_filter_operator(filter_config.op),
-                "comparator": filter_config.value,
-            }
-            for filter_config in config.filters
-            if filter_config is not None
-        ]
+    form_data["row_limit"] = config.row_limit
 
     # Add stacking configuration
     if getattr(config, "stacked", False):
@@ -623,6 +741,73 @@ def map_pie_config(config: PieChartConfig) -> Dict[str, Any]:
         "date_format": "smart_date",
     }
 
+    _add_adhoc_filters(form_data, config.filters)
+
+    return form_data
+
+
+def map_big_number_config(config: BigNumberChartConfig) -> Dict[str, Any]:
+    """Map big number chart config to Superset form_data."""
+    # Determine viz_type: big_number (with trendline) or big_number_total
+    if config.show_trendline and config.temporal_column:
+        viz_type = "big_number"
+    else:
+        viz_type = "big_number_total"
+
+    metric = create_metric_object(config.metric)
+    form_data: Dict[str, Any] = {
+        "viz_type": viz_type,
+        "metric": metric,
+    }
+
+    if config.subheader:
+        form_data["subheader"] = config.subheader
+
+    if config.y_axis_format:
+        form_data["y_axis_format"] = config.y_axis_format
+
+    # Trendline-specific fields
+    if viz_type == "big_number":
+        # Big Number with trendline uses granularity_sqla for the temporal column
+        # (unlike XY charts which use x_axis). This is how Superset's
+        # big_number viz determines the time column for the trendline.
+        form_data["granularity_sqla"] = config.temporal_column
+        form_data["show_trend_line"] = True
+        form_data["start_y_axis_at_zero"] = config.start_y_axis_at_zero
+
+        if config.time_grain:
+            form_data["time_grain_sqla"] = config.time_grain
+
+        if config.compare_lag is not None:
+            form_data["compare_lag"] = config.compare_lag
+
+    _add_adhoc_filters(form_data, config.filters)
+
+    return form_data
+
+
+def map_handlebars_config(config: HandlebarsChartConfig) -> Dict[str, Any]:
+    """Map handlebars chart config to Superset form_data."""
+    form_data: Dict[str, Any] = {
+        "viz_type": "handlebars",
+        "handlebars_template": config.handlebars_template,
+        "row_limit": config.row_limit,
+        "order_desc": config.order_desc,
+    }
+
+    if config.style_template:
+        form_data["styleTemplate"] = config.style_template
+
+    if config.query_mode == "raw":
+        form_data["query_mode"] = "raw"
+        if config.columns:
+            form_data["all_columns"] = [col.name for col in config.columns]
+    else:
+        form_data["query_mode"] = "aggregate"
+        if config.groupby:
+            form_data["groupby"] = [col.name for col in config.groupby]
+        if config.metrics:
+            form_data["metrics"] = [create_metric_object(col) for col in config.metrics]
     if config.filters:
         form_data["adhoc_filters"] = [
             {
@@ -667,18 +852,7 @@ def map_pivot_table_config(config: PivotTableChartConfig) -> Dict[str, Any]:
         "row_limit": config.row_limit,
     }
 
-    if config.filters:
-        form_data["adhoc_filters"] = [
-            {
-                "clause": "WHERE",
-                "expressionType": "SIMPLE",
-                "subject": filter_config.column,
-                "operator": map_filter_operator(filter_config.op),
-                "comparator": filter_config.value,
-            }
-            for filter_config in config.filters
-            if filter_config is not None
-        ]
+    _add_adhoc_filters(form_data, config.filters)
 
     return form_data
 
@@ -765,28 +939,24 @@ def map_mixed_timeseries_config(
     configure_temporal_handling(form_data, x_is_temporal, config.time_grain)
 
     # Primary groupby (Query A)
-    if config.group_by and config.group_by.name != config.x.name:
-        form_data["groupby"] = [config.group_by.name]
+    if config.group_by:
+        groupby = [c.name for c in config.group_by if c.name != config.x.name]
+        if groupby:
+            form_data["groupby"] = groupby
 
     # Secondary groupby (Query B)
-    if config.group_by_secondary and config.group_by_secondary.name != config.x.name:
-        form_data["groupby_b"] = [config.group_by_secondary.name]
+    if config.group_by_secondary:
+        groupby_b = [
+            c.name for c in config.group_by_secondary if c.name != config.x.name
+        ]
+        if groupby_b:
+            form_data["groupby_b"] = groupby_b
+
+    form_data["row_limit"] = config.row_limit
 
     _add_mixed_axis_config(form_data, config)
 
-    # Filters
-    if config.filters:
-        form_data["adhoc_filters"] = [
-            {
-                "clause": "WHERE",
-                "expressionType": "SIMPLE",
-                "subject": filter_config.column,
-                "operator": map_filter_operator(filter_config.op),
-                "comparator": filter_config.value,
-            }
-            for filter_config in config.filters
-            if filter_config is not None
-        ]
+    _add_adhoc_filters(form_data, config.filters)
 
     return form_data
 
@@ -814,13 +984,15 @@ def _humanize_column(col: ColumnRef) -> str:
     if col.label:
         return col.label
     name = col.name.replace("_", " ").title()
+    if col.saved_metric:
+        return name
     if col.aggregate:
         return f"{col.aggregate.capitalize()}({name})"
     return name
 
 
 def _summarize_filters(
-    filters: list[Any] | None,
+    filters: list[FilterConfig] | None,
 ) -> str | None:
     """Extract a short context string from filter configs."""
     if not filters:
@@ -848,9 +1020,9 @@ def _truncate(name: str, max_length: int = 60) -> str:
 
 def _table_chart_what(config: TableChartConfig, dataset_name: str | None) -> str:
     """Build the descriptive fragment for a table chart."""
-    has_agg = any(col.aggregate for col in config.columns)
+    has_agg = any(col.is_metric for col in config.columns)
     if has_agg:
-        metrics = [col for col in config.columns if col.aggregate]
+        metrics = [col for col in config.columns if col.is_metric]
         what = ", ".join(_humanize_column(m) for m in metrics[:2])
         return f"{what} Summary"
     if dataset_name:
@@ -862,12 +1034,12 @@ def _table_chart_what(config: TableChartConfig, dataset_name: str | None) -> str
 def _xy_chart_what(config: XYChartConfig) -> str:
     """Build the descriptive fragment for an XY chart."""
     primary_metric = _humanize_column(config.y[0]) if config.y else "Value"
-    dimension = _humanize_column(config.x)
+    dimension = _humanize_column(config.x) if config.x else "Dimension"
 
-    if config.kind in ("line", "area") and config.group_by is None:
+    if config.kind in ("line", "area") and not config.group_by:
         return f"{primary_metric} Over Time"
-    if config.group_by is not None:
-        group_label = _humanize_column(config.group_by)
+    if config.group_by:
+        group_label = _humanize_column(config.group_by[0])
         return f"{primary_metric} by {group_label}"
     if config.kind == "scatter":
         return f"{primary_metric} vs {dimension}"
@@ -924,12 +1096,46 @@ def _mixed_timeseries_what(config: MixedTimeseriesChartConfig) -> str:
     return f"{primary} + {secondary}"
 
 
+def _handlebars_chart_what(config: HandlebarsChartConfig) -> str:
+    """Build the 'what' portion for a handlebars chart name.
+
+    Uses parentheses instead of en-dash to avoid collision with
+    ``generate_chart_name``'s ``\u2013`` context separator.
+    """
+    if config.query_mode == "raw" and config.columns:
+        cols = ", ".join(col.name for col in config.columns[:3])
+        return f"Handlebars ({cols})"
+    elif config.metrics:
+        metrics = ", ".join(col.name for col in config.metrics[:3])
+        return f"Handlebars ({metrics})"
+    return "Handlebars Chart"
+
+
+def _big_number_chart_what(config: BigNumberChartConfig) -> str:
+    """Build the 'what' portion for a big number chart name.
+
+    Uses parentheses instead of en-dash to avoid collision with
+    ``generate_chart_name``'s ``\u2013`` context separator.
+    """
+    if config.metric.label:
+        metric_label = config.metric.label
+    elif config.metric.aggregate:
+        metric_label = f"{config.metric.aggregate}({config.metric.name})"
+    else:
+        metric_label = config.metric.name
+    if config.show_trendline:
+        return f"Big Number ({metric_label}, trendline)"
+    return f"Big Number ({metric_label})"
+
+
 def generate_chart_name(
     config: TableChartConfig
     | XYChartConfig
     | PieChartConfig
     | PivotTableChartConfig
-    | MixedTimeseriesChartConfig,
+    | MixedTimeseriesChartConfig
+    | HandlebarsChartConfig
+    | BigNumberChartConfig,
     dataset_name: str | None = None,
 ) -> str:
     """Generate a descriptive chart name following a standard format.
@@ -960,6 +1166,12 @@ def generate_chart_name(
     elif isinstance(config, MixedTimeseriesChartConfig):
         what = _mixed_timeseries_what(config)
         context = _summarize_filters(config.filters)
+    elif isinstance(config, HandlebarsChartConfig):
+        what = _handlebars_chart_what(config)
+        context = _summarize_filters(getattr(config, "filters", None))
+    elif isinstance(config, BigNumberChartConfig):
+        what = _big_number_chart_what(config)
+        context = _summarize_filters(getattr(config, "filters", None))
     else:
         return "Chart"
 
@@ -969,6 +1181,37 @@ def generate_chart_name(
     return _truncate(name)
 
 
+def _resolve_viz_type(config: Any) -> str:
+    """Resolve the Superset viz_type from a chart config object."""
+    chart_type = getattr(config, "chart_type", "unknown")
+    if chart_type == "xy":
+        kind = getattr(config, "kind", "line")
+        viz_type_map = {
+            "line": "echarts_timeseries_line",
+            "bar": "echarts_timeseries_bar",
+            "area": "echarts_area",
+            "scatter": "echarts_timeseries_scatter",
+        }
+        return viz_type_map.get(kind, "echarts_timeseries_line")
+    elif chart_type == "table":
+        return getattr(config, "viz_type", "table")
+    elif chart_type == "pie":
+        return "pie"
+    elif chart_type == "pivot_table":
+        return "pivot_table_v2"
+    elif chart_type == "mixed_timeseries":
+        return "mixed_timeseries"
+    elif chart_type == "handlebars":
+        return "handlebars"
+    elif chart_type == "big_number":
+        show_trendline = getattr(config, "show_trendline", False)
+        temporal_column = getattr(config, "temporal_column", None)
+        return (
+            "big_number" if show_trendline and temporal_column else "big_number_total"
+        )
+    return "unknown"
+
+
 def analyze_chart_capabilities(chart: Any | None, config: Any) -> ChartCapabilities:
     """Analyze chart capabilities based on type and configuration."""
     if chart:
@@ -1003,7 +1246,7 @@ def analyze_chart_capabilities(chart: Any | None, config: Any) -> ChartCapabilit
     # Classify data types
     data_types = []
     if hasattr(config, "x") and config.x:
-        data_types.append("categorical" if not config.x.aggregate else "metric")
+        data_types.append("categorical" if not config.x.is_metric else "metric")
     if hasattr(config, "y") and config.y:
         data_types.extend(["metric"] * len(config.y))
     if "time" in viz_type or "timeseries" in viz_type:
@@ -1019,29 +1262,6 @@ def analyze_chart_capabilities(chart: Any | None, config: Any) -> ChartCapabilit
     )
 
 
-def _resolve_viz_type(config: Any) -> str:
-    """Resolve viz_type from a chart config object."""
-    chart_type = getattr(config, "chart_type", "unknown")
-    if chart_type == "xy":
-        kind = getattr(config, "kind", "line")
-        viz_type_map = {
-            "line": "echarts_timeseries_line",
-            "bar": "echarts_timeseries_bar",
-            "area": "echarts_area",
-            "scatter": "echarts_timeseries_scatter",
-        }
-        return viz_type_map.get(kind, "echarts_timeseries_line")
-    elif chart_type == "table":
-        return getattr(config, "viz_type", "table")
-    elif chart_type == "pie":
-        return "pie"
-    elif chart_type == "pivot_table":
-        return "pivot_table_v2"
-    elif chart_type == "mixed_timeseries":
-        return "mixed_timeseries"
-    return "unknown"
-
-
 def analyze_chart_semantics(chart: Any | None, config: Any) -> ChartSemantics:
     """Generate semantic understanding of the chart."""
     if chart:
@@ -1068,6 +1288,17 @@ def analyze_chart_semantics(chart: Any | None, config: Any) -> ChartSemantics:
             "Combines two different chart types on the same time axis "
             "for comparing related metrics with different scales"
         ),
+        "handlebars": (
+            "Renders data using a custom Handlebars HTML template for "
+            "fully flexible layouts like KPI cards, leaderboards, and reports"
+        ),
+        "big_number": (
+            "Displays a key metric with a trendline showing "
+            "how the value changes over time"
+        ),
+        "big_number_total": (
+            "Highlights a single key metric value as a prominent number"
+        ),
     }
 
     primary_insight = insights_map.get(
diff --git a/superset/mcp_service/chart/preview_utils.py b/superset/mcp_service/chart/preview_utils.py
index 5b930797b06..d585e3cda99 100644
--- a/superset/mcp_service/chart/preview_utils.py
+++ b/superset/mcp_service/chart/preview_utils.py
@@ -39,6 +39,12 @@ logger = logging.getLogger(__name__)
 
 def _build_query_columns(form_data: Dict[str, Any]) -> list[str]:
     """Build query columns list from form_data, including both x_axis and groupby."""
+    # Table charts in raw mode use all_columns or columns
+    all_columns = form_data.get("all_columns", [])
+    raw_columns_field = form_data.get("columns", [])
+    if form_data.get("query_mode") == "raw" and (all_columns or raw_columns_field):
+        return list(all_columns or raw_columns_field)
+
     x_axis_config = form_data.get("x_axis")
     groupby_columns: list[str] = form_data.get("groupby") or []
     raw_columns: list[str] = form_data.get("columns") or []
@@ -81,21 +87,37 @@ def generate_preview_from_form_data(
 
         # Create query context from form data using factory
         from superset.common.query_context_factory import QueryContextFactory
+        from superset.mcp_service.chart.chart_utils import (
+            adhoc_filters_to_query_filters,
+        )
 
         # Build columns list: include x_axis and groupby for XY charts,
         # fall back to form_data "columns" for table charts
         columns = _build_query_columns(form_data)
 
+        query_filters = adhoc_filters_to_query_filters(
+            form_data.get("adhoc_filters", [])
+        )
+
+        # Big Number charts use singular "metric" instead of "metrics"
+        metrics = form_data.get("metrics", [])
+        if not metrics and form_data.get("metric"):
+            metrics = [form_data["metric"]]
+
+        # Big Number with trendline uses granularity_sqla as the time column
+        if not columns and form_data.get("granularity_sqla"):
+            columns = [form_data["granularity_sqla"]]
+
         factory = QueryContextFactory()
         query_context_obj = factory.create(
             datasource={"id": dataset_id, "type": "table"},
             queries=[
                 {
                     "columns": columns,
-                    "metrics": form_data.get("metrics", []),
+                    "metrics": metrics,
                     "orderby": form_data.get("orderby", []),
                     "row_limit": form_data.get("row_limit", 100),
-                    "filters": form_data.get("adhoc_filters", []),
+                    "filters": query_filters,
                     "time_range": form_data.get("time_range", "No filter"),
                 }
             ],
diff --git a/superset/mcp_service/chart/resources/chart_configs.py b/superset/mcp_service/chart/resources/chart_configs.py
index 2560a503e62..2d97fa8b817 100644
--- a/superset/mcp_service/chart/resources/chart_configs.py
+++ b/superset/mcp_service/chart/resources/chart_configs.py
@@ -80,7 +80,7 @@ def get_chart_configs_resource() -> str:
                 "y": [
                     {"name": "revenue", "aggregate": "SUM", "label": "Revenue"},
                 ],
-                "group_by": {"name": "region", "label": "Region"},
+                "group_by": [{"name": "region", "label": "Region"}],
                 "stacked": True,
                 "legend": {"show": True, "position": "right"},
             },
@@ -123,7 +123,7 @@ def get_chart_configs_resource() -> str:
                         "label": "Avg Conversion Rate",
                     }
                 ],
-                "group_by": {"name": "campaign_type", "label": "Campaign"},
+                "group_by": [{"name": "campaign_type", "label": "Campaign"}],
                 "x_axis": {"format": "$,.0f"},
                 "y_axis": {"format": ".2%"},
             },
@@ -159,7 +159,7 @@ def get_chart_configs_resource() -> str:
                 "kind": "area",
                 "x": {"name": "order_date", "label": "Date"},
                 "y": [{"name": "signups", "aggregate": "SUM", "label": "Signups"}],
-                "group_by": {"name": "channel", "label": "Channel"},
+                "group_by": [{"name": "channel", "label": "Channel"}],
                 "stacked": True,
                 "time_grain": "P1W",
             },
diff --git a/superset/mcp_service/chart/schemas.py b/superset/mcp_service/chart/schemas.py
index 373f667e586..e309d528d76 100644
--- a/superset/mcp_service/chart/schemas.py
+++ b/superset/mcp_service/chart/schemas.py
@@ -21,10 +21,14 @@ Pydantic schemas for chart-related responses
 
 from __future__ import annotations
 
+import difflib
 from datetime import datetime, timezone
 from typing import Annotated, Any, Dict, List, Literal, Protocol
 
+import humanize
 from pydantic import (
+    AliasChoices,
+    AliasPath,
     BaseModel,
     ConfigDict,
     Field,
@@ -32,7 +36,10 @@ from pydantic import (
     model_serializer,
     model_validator,
     PositiveInt,
+    TypeAdapter,
+    ValidationError,
 )
+from typing_extensions import Self
 
 from superset.constants import TimeGrain
 from superset.daos.base import ColumnOperator, ColumnOperatorEnum
@@ -43,6 +50,7 @@ from superset.mcp_service.common.cache_schemas import (
     QueryCacheControl,
 )
 from superset.mcp_service.common.error_schemas import ChartGenerationError
+from superset.mcp_service.constants import DEFAULT_PAGE_SIZE, MAX_PAGE_SIZE
 from superset.mcp_service.system.schemas import (
     PaginationInfo,
     serialize_user_object,
@@ -68,6 +76,8 @@ class ChartLike(Protocol):
     cache_timeout: int | None
     form_data: Dict[str, Any] | None
     query_context: Any | None
+    certified_by: str | None
+    certification_details: str | None
     changed_by: Any | None  # User object
     changed_by_name: str | None
     changed_on: str | datetime | None
@@ -107,10 +117,26 @@ class ChartInfo(BaseModel):
     created_on_humanized: str | None = Field(
         None, description="Humanized creation time"
     )
+    certified_by: str | None = Field(
+        None, description="Name of the person or team who certified this chart"
+    )
+    certification_details: str | None = Field(
+        None, description="Certification details or reason"
+    )
     uuid: str | None = Field(None, description="Chart UUID")
     tags: List[TagInfo] = Field(default_factory=list, description="Chart tags")
     owners: List[UserInfo] = Field(default_factory=list, description="Chart owners")
 
+    # Filters extracted from form_data for easy inspection
+    filters: ChartFiltersInfo | None = Field(
+        None,
+        description=(
+            "Structured representation of all filters applied to this chart, "
+            "extracted from form_data. Includes adhoc filters, time range, "
+            "extra filters, and custom WHERE/HAVING clauses."
+        ),
+    )
+
     # Fields for unsaved state support
     form_data: Dict[str, Any] | None = Field(
         None,
@@ -267,18 +293,120 @@ class GetChartInfoRequest(BaseModel):
         return self
 
 
+def _humanize_timestamp(dt: datetime | None) -> str | None:
+    """Convert a datetime to a humanized string like '2 hours ago'."""
+    if dt is None:
+        return None
+    return humanize.naturaltime(datetime.now() - dt)
+
+
+def extract_filters_from_form_data(
+    form_data: Dict[str, Any] | None,
+) -> ChartFiltersInfo | None:
+    """Extract structured filter information from a chart's form_data.
+
+    Parses adhoc_filters, time_range, extra_filters, and custom
+    WHERE/HAVING clauses into a structured ChartFiltersInfo object.
+    Returns None if form_data is empty, not a dict, or has no filter-related fields.
+    """
+    if not form_data or not isinstance(form_data, dict):
+        return None
+
+    raw_adhoc = form_data.get("adhoc_filters", [])
+    adhoc_filters: List[AdhocFilter] = []
+    for f in raw_adhoc or []:
+        if not isinstance(f, dict):
+            continue
+        try:
+            adhoc_filters.append(
+                AdhocFilter(
+                    clause=f.get("clause"),
+                    expression_type=f.get("expressionType"),
+                    subject=f.get("subject"),
+                    operator=f.get("operator"),
+                    comparator=f.get("comparator"),
+                    sql_expression=f.get("sqlExpression"),
+                )
+            )
+        except (TypeError, ValueError, ValidationError):
+            # Skip malformed filter entries (e.g. non-string fields in
+            # corrupted cached state, legacy payloads, or Pydantic
+            # validation failures from unexpected field types)
+            continue
+
+    time_range = form_data.get("time_range")
+    granularity_sqla = form_data.get("granularity_sqla")
+    raw_extra = form_data.get("extra_filters", [])
+    extra_filters: List[Dict[str, Any]] = [
+        item
+        for item in (raw_extra if isinstance(raw_extra, list) else [])
+        if isinstance(item, dict)
+        and isinstance(item.get("col"), str)
+        and item.get("col")
+    ]
+    # Legacy top-level "filters" payload (older/simpler charts use this
+    # instead of adhoc_filters).
+    raw_filters = form_data.get("filters", [])
+    filters: List[Dict[str, Any]] = [
+        item
+        for item in (raw_filters if isinstance(raw_filters, list) else [])
+        if isinstance(item, dict)
+        and isinstance(item.get("col"), str)
+        and item.get("col")
+    ]
+    where = form_data.get("where")
+    having = form_data.get("having")
+
+    # Only return if there is at least one meaningful filter field
+    has_content = (
+        adhoc_filters
+        or time_range
+        or granularity_sqla
+        or extra_filters
+        or filters
+        or where
+        or having
+    )
+    if not has_content:
+        return None
+
+    return ChartFiltersInfo(
+        adhoc_filters=adhoc_filters,
+        time_range=time_range,
+        granularity_sqla=granularity_sqla,
+        extra_filters=extra_filters,
+        filters=filters,
+        where=where,
+        having=having,
+    )
+
+
 def serialize_chart_object(chart: ChartLike | None) -> ChartInfo | None:
     if not chart:
         return None
 
-    # Use the chart's native URL (explore URL) instead of screenshot URL
     from superset.mcp_service.utils.url_utils import get_superset_base_url
+    from superset.utils import json as utils_json
 
     chart_id = getattr(chart, "id", None)
     chart_url = None
     if chart_id:
         chart_url = f"{get_superset_base_url()}/explore/?slice_id={chart_id}"
 
+    # Parse form_data from the chart's params JSON string
+    chart_params = getattr(chart, "params", None)
+    chart_form_data = None
+    if chart_params and isinstance(chart_params, str):
+        try:
+            chart_form_data = utils_json.loads(chart_params)
+        except (TypeError, ValueError):
+            pass
+    elif isinstance(chart_params, dict):
+        chart_form_data = chart_params
+
+    # Extract structured filter information
+    filters_info = extract_filters_from_form_data(chart_form_data)
+
     return ChartInfo(
         id=chart_id,
         slice_name=getattr(chart, "slice_name", None),
@@ -287,16 +415,20 @@ def serialize_chart_object(chart: ChartLike | None) -> ChartInfo | None:
         datasource_type=getattr(chart, "datasource_type", None),
         url=chart_url,
         description=getattr(chart, "description", None),
+        certified_by=getattr(chart, "certified_by", None),
+        certification_details=getattr(chart, "certification_details", None),
         cache_timeout=getattr(chart, "cache_timeout", None),
+        form_data=chart_form_data,
+        filters=filters_info,
         changed_by=getattr(chart, "changed_by_name", None)
         or (str(chart.changed_by) if getattr(chart, "changed_by", None) else None),
         changed_by_name=getattr(chart, "changed_by_name", None),
         changed_on=getattr(chart, "changed_on", None),
-        changed_on_humanized=getattr(chart, "changed_on_humanized", None),
+        changed_on_humanized=_humanize_timestamp(getattr(chart, "changed_on", None)),
         created_by=getattr(chart, "created_by_name", None)
         or (str(chart.created_by) if getattr(chart, "created_by", None) else None),
         created_on=getattr(chart, "created_on", None),
-        created_on_humanized=getattr(chart, "created_on_humanized", None),
+        created_on_humanized=_humanize_timestamp(getattr(chart, "created_on", None)),
         uuid=str(getattr(chart, "uuid", "")) if getattr(chart, "uuid", None) else None,
         tags=[
             TagInfo.model_validate(tag, from_attributes=True)
@@ -381,12 +513,89 @@ class ChartList(BaseModel):
 
 
 # Common pieces
+
+
+def _normalize_group_by_input(v: Any) -> Any:
+    """Accept a single ColumnRef/dict/str and normalize to list of dicts."""
+    if isinstance(v, str):
+        return [{"name": v}]
+    if isinstance(v, (dict, ColumnRef)):
+        return [v]
+    if isinstance(v, list):
+        return [{"name": item} if isinstance(item, str) else item for item in v]
+    return v
+
+
+def _top_level_key(alias: str | AliasPath) -> str | None:
+    """Extract the top-level dict key from a str or AliasPath."""
+    if isinstance(alias, str):
+        return alias
+    if isinstance(alias, AliasPath) and alias.path and isinstance(alias.path[0], str):
+        return alias.path[0]
+    return None
+
+
+def _get_known_fields(model_class: type[BaseModel]) -> set[str]:
+    """Collect all valid field names including validation aliases."""
+    known: set[str] = set()
+    for field_name, field_info in model_class.model_fields.items():
+        known.add(field_name)
+        alias = field_info.validation_alias
+        if isinstance(alias, AliasChoices):
+            for choice in alias.choices:
+                key = _top_level_key(choice)
+                if key:
+                    known.add(key)
+        elif alias is not None:
+            key = _top_level_key(alias)
+            if key:
+                known.add(key)
+    return known
+
+
+def _check_unknown_fields(data: Any, model_class: type[BaseModel]) -> Any:
+    """Raise ValueError for unrecognized fields with 'did you mean?' suggestions.
+
+    Catches fields that would be silently dropped by extra='ignore' and provides
+    actionable error messages to help LLMs self-correct parameter names.
+    """
+    if not isinstance(data, dict):
+        return data
+    known = _get_known_fields(model_class)
+    unknown = set(data.keys()) - known
+    if not unknown:
+        return data
+
+    messages = []
+    for field in sorted(unknown):
+        matches = difflib.get_close_matches(field, sorted(known), n=1, cutoff=0.6)
+        if matches:
+            messages.append(f"Unknown field '{field}' — did you mean '{matches[0]}'?")
+        else:
+            messages.append(
+                f"Unknown field '{field}'. Valid fields: {', '.join(sorted(known))}"
+            )
+    raise ValueError(" | ".join(messages))
+
+
+class UnknownFieldCheckMixin(BaseModel):
+    """Mixin that rejects unknown fields with 'did you mean?' suggestions."""
+
+    @model_validator(mode="before")
+    @classmethod
+    def check_unknown_fields(cls, data: Any) -> Any:
+        return _check_unknown_fields(data, cls)
+
+
 class ColumnRef(BaseModel):
+    model_config = ConfigDict(populate_by_name=True)
+
     name: str = Field(
         ...,
         min_length=1,
         max_length=255,
         pattern=r"^[a-zA-Z0-9_][a-zA-Z0-9_\s\-\.]*$",
+        validation_alias=AliasChoices("name", "column_name"),
     )
     label: str | None = Field(None, max_length=500)
     dtype: str | None = None
@@ -405,6 +614,24 @@ class ColumnRef(BaseModel):
         ]
         | None
     ) = Field(None, description="SQL aggregate function")
+    saved_metric: bool = Field(
+        False,
+        description="If true, 'name' refers to a saved metric from the dataset "
+        "(use get_dataset_info to see available metrics). "
+        "When set, 'aggregate' is ignored.",
+    )
+
+    @property
+    def is_metric(self) -> bool:
+        """Whether this ref acts as a metric (has aggregate or is a saved metric)."""
+        return bool(self.aggregate) or self.saved_metric
+
+    @model_validator(mode="after")
+    def clear_aggregate_for_saved_metric(self) -> "ColumnRef":
+        """Clear aggregate when saved_metric is True since it's ignored."""
+        if self.saved_metric and self.aggregate is not None:
+            self.aggregate = None
+        return self
 
     @field_validator("name")
     @classmethod
@@ -435,11 +662,14 @@ class LegendConfig(BaseModel):
 
 
 class FilterConfig(BaseModel):
+    model_config = ConfigDict(populate_by_name=True)
+
     column: str = Field(
         ...,
         min_length=1,
         max_length=255,
         pattern=r"^[a-zA-Z0-9_][a-zA-Z0-9_\s\-\.]*$",
+        validation_alias=AliasChoices("column", "col"),
     )
     op: Literal[
         "=",
@@ -456,10 +686,12 @@ class FilterConfig(BaseModel):
     ] = Field(
         ...,
         description="LIKE/ILIKE use % wildcards. IN/NOT IN take a list.",
+        validation_alias=AliasChoices("op", "operator", "opr"),
     )
     value: str | int | float | bool | list[str | int | float | bool] = Field(
         ...,
         description="For IN/NOT IN, provide a list.",
+        validation_alias=AliasChoices("value", "val"),
     )
 
     @field_validator("column")
@@ -497,13 +729,19 @@ class FilterConfig(BaseModel):
 
 
 # Actual chart types
-class PieChartConfig(BaseModel):
-    model_config = ConfigDict(extra="forbid")
+class PieChartConfig(UnknownFieldCheckMixin):
+    model_config = ConfigDict(extra="ignore", populate_by_name=True)
 
     chart_type: Literal["pie"] = "pie"
-    dimension: ColumnRef = Field(..., description="Category column for slices")
+    dimension: ColumnRef = Field(
+        ...,
+        description="Category column for slices",
+        validation_alias=AliasChoices("dimension", "groupby"),
+    )
     metric: ColumnRef = Field(
-        ..., description="Value metric (needs aggregate e.g. SUM, COUNT)"
+        ...,
+        description="Value metric (use aggregate e.g. SUM, COUNT for ad-hoc, "
+        "or set saved_metric=True for a saved dataset metric)",
     )
     donut: bool = False
     show_labels: bool = True
@@ -518,7 +756,11 @@ class PieChartConfig(BaseModel):
     ] = "key_value_percent"
     sort_by_metric: bool = True
     show_legend: bool = True
-    filters: List[FilterConfig] | None = None
+    filters: List[FilterConfig] | None = Field(
+        None,
+        description="Structured filters (column/op/value). "
+        "Do NOT use adhoc_filters or raw SQL expressions.",
+    )
     row_limit: int = Field(100, description="Max slices", ge=1, le=10000)
     number_format: str = Field("SMART_NUMBER", max_length=50)
     show_total: bool = Field(False, description="Show total in center")
@@ -529,18 +771,24 @@ class PieChartConfig(BaseModel):
     )
 
 
-class PivotTableChartConfig(BaseModel):
-    model_config = ConfigDict(extra="forbid")
+class PivotTableChartConfig(UnknownFieldCheckMixin):
+    model_config = ConfigDict(extra="ignore", populate_by_name=True)
 
     chart_type: Literal["pivot_table"] = "pivot_table"
-    rows: List[ColumnRef] = Field(..., min_length=1, description="Row grouping columns")
+    rows: List[ColumnRef] = Field(
+        ...,
+        min_length=1,
+        description="Row grouping columns",
+        validation_alias=AliasChoices("rows", "groupby", "dimension"),
+    )
     columns: List[ColumnRef] | None = Field(
         None, description="Column groups for cross-tabulation"
     )
     metrics: List[ColumnRef] = Field(
         ...,
         min_length=1,
-        description="Metrics (need aggregate e.g. SUM, COUNT, AVG)",
+        description="Metrics (use aggregate e.g. SUM, COUNT, AVG for ad-hoc, "
+        "or set saved_metric=True for saved dataset metrics)",
     )
     aggregate_function: Literal[
         "Sum",
@@ -559,51 +807,318 @@ class PivotTableChartConfig(BaseModel):
     show_column_totals: bool = True
     transpose: bool = False
     combine_metric: bool = Field(False, description="Metrics side by side in columns")
-    filters: List[FilterConfig] | None = None
+    filters: List[FilterConfig] | None = Field(
+        None,
+        description="Structured filters (column/op/value). "
+        "Do NOT use adhoc_filters or raw SQL expressions.",
+    )
     row_limit: int = Field(10000, description="Max cells", ge=1, le=50000)
     value_format: str = Field("SMART_NUMBER", max_length=50)
 
 
-class MixedTimeseriesChartConfig(BaseModel):
-    model_config = ConfigDict(extra="forbid")
+class MixedTimeseriesChartConfig(UnknownFieldCheckMixin):
+    model_config = ConfigDict(extra="ignore", populate_by_name=True)
 
     chart_type: Literal["mixed_timeseries"] = "mixed_timeseries"
-    x: ColumnRef = Field(..., description="Shared temporal X-axis column")
-    time_grain: TimeGrain | None = Field(None, description="PT1H, P1D, P1W, P1M, P1Y")
+    x: ColumnRef = Field(
+        ...,
+        description="Shared temporal X-axis column",
+        validation_alias=AliasChoices("x", "x_axis"),
+    )
+    time_grain: TimeGrain | None = Field(
+        None,
+        description="PT1H, P1D, P1W, P1M, P1Y",
+        validation_alias=AliasChoices("time_grain", "time_grain_sqla"),
+    )
     # Primary series (Query A)
-    y: List[ColumnRef] = Field(..., min_length=1, description="Primary Y-axis metrics")
+    y: List[ColumnRef] = Field(
+        ...,
+        min_length=1,
+        description="Primary Y-axis metrics",
+        validation_alias=AliasChoices("y", "metrics"),
+    )
     primary_kind: Literal["line", "bar", "area", "scatter"] = "line"
-    group_by: ColumnRef | None = Field(None, description="Primary series group by")
+    group_by: List[ColumnRef] | None = Field(
+        None,
+        description="Primary series group by",
+        validation_alias=AliasChoices("group_by", "groupby", "series", "dimension"),
+    )
     # Secondary series (Query B)
     y_secondary: List[ColumnRef] = Field(
-        ..., min_length=1, description="Secondary Y-axis metrics"
+        ...,
+        min_length=1,
+        description="Secondary Y-axis metrics",
+        validation_alias=AliasChoices("y_secondary", "metrics_b"),
     )
     secondary_kind: Literal["line", "bar", "area", "scatter"] = "bar"
-    group_by_secondary: ColumnRef | None = Field(
-        None, description="Secondary series group by"
+    group_by_secondary: List[ColumnRef] | None = Field(
+        None,
+        description="Secondary series group by",
+        validation_alias=AliasChoices(
+            "group_by_secondary", "groupby_b", "groupby_secondary"
+        ),
     )
     # Display options
     show_legend: bool = True
     x_axis: AxisConfig | None = None
     y_axis: AxisConfig | None = None
     y_axis_secondary: AxisConfig | None = None
-    filters: List[FilterConfig] | None = None
+    filters: List[FilterConfig] | None = Field(
+        None,
+        description="Structured filters (column/op/value). "
+        "Do NOT use adhoc_filters or raw SQL expressions.",
+    )
+    row_limit: int = Field(10000, description="Max data points", ge=1, le=50000)
+
+    @field_validator("group_by", "group_by_secondary", mode="before")
+    @classmethod
+    def wrap_single_group_by(cls, v: Any) -> Any:
+        return _normalize_group_by_input(v)
 
 
-class TableChartConfig(BaseModel):
-    model_config = ConfigDict(extra="forbid")
+class HandlebarsChartConfig(UnknownFieldCheckMixin):
+    model_config = ConfigDict(extra="ignore")
+
+    chart_type: Literal["handlebars"] = Field(
+        ...,
+        description=(
+            "Chart type discriminator - MUST be 'handlebars' for custom HTML "
+            "template charts. Handlebars charts render query results using "
+            "Handlebars templates, enabling fully custom layouts like KPI cards, "
+            "leaderboards, and formatted reports."
+        ),
+    )
+    handlebars_template: str = Field(
+        ...,
+        description=(
+            "Handlebars HTML template string. Data is available as {{data}} array. "
+            "Built-in helpers: {{dateFormat val format='YYYY-MM-DD'}}, "
+            "{{formatNumber val}}, {{stringify obj}}. "
+            "Example: '<ul>{{#each data}}<li>{{this.name}}: {{this.value}}</li>"
+            "{{/each}}</ul>'"
+        ),
+        min_length=1,
+        max_length=50000,
+    )
+    query_mode: Literal["aggregate", "raw"] = Field(
+        "aggregate",
+        description=(
+            "Query mode: 'aggregate' groups data with metrics, "
+            "'raw' returns individual rows"
+        ),
+    )
+    columns: list[ColumnRef] | None = Field(
+        None,
+        description=(
+            "Columns to display in raw mode (query_mode='raw'). "
+            "Each column specifies a column name to include in the query results."
+        ),
+    )
+    groupby: list[ColumnRef] | None = Field(
+        None,
+        description=(
+            "Columns to group by in aggregate mode (query_mode='aggregate'). "
+            "These become the dimensions for aggregation."
+        ),
+        validation_alias=AliasChoices("groupby", "group_by"),
+    )
+    metrics: list[ColumnRef] | None = Field(
+        None,
+        description=(
+            "Metrics to aggregate in aggregate mode. "
+            "Each must have an aggregate function (e.g., SUM, COUNT)."
+        ),
+    )
+    filters: list[FilterConfig] | None = Field(None, description="Filters to apply")
+    row_limit: int = Field(
+        1000,
+        description="Maximum number of rows",
+        ge=1,
+        le=50000,
+    )
+    order_desc: bool = Field(True, description="Sort in descending order")
+    style_template: str | None = Field(
+        None,
+        description="Optional CSS styles to apply to the rendered template",
+        max_length=10000,
+    )
+
+    @model_validator(mode="after")
+    def validate_query_fields(self) -> "HandlebarsChartConfig":
+        """Validate that the right fields are provided for the query mode."""
+        if self.query_mode == "raw":
+            if not self.columns:
+                raise ValueError(
+                    "Handlebars chart in 'raw' query mode requires 'columns' field. "
+                    "Specify which columns to include in the query results."
+                )
+            if self.metrics:
+                raise ValueError(
+                    "Handlebars chart in 'raw' query mode does not use 'metrics'. "
+                    "Remove 'metrics' or switch to 'aggregate' query mode."
+                )
+            if self.groupby:
+                raise ValueError(
+                    "Handlebars chart in 'raw' query mode does not use 'groupby'. "
+                    "Remove 'groupby' or switch to 'aggregate' query mode."
+                )
+        if self.query_mode == "aggregate":
+            if not self.metrics:
+                raise ValueError(
+                    "Handlebars chart in 'aggregate' query mode requires 'metrics' "
+                    "field. Specify at least one metric with an aggregate function."
+                )
+            missing_agg = [m.name for m in self.metrics if not m.is_metric]
+            if missing_agg:
+                raise ValueError(
+                    f"Handlebars chart in 'aggregate' query mode requires an "
+                    f"aggregate function on every metric. Missing aggregate for: "
+                    f"{', '.join(missing_agg)}. "
+                    f"Use one of: SUM, COUNT, AVG, MIN, MAX, COUNT_DISTINCT, etc."
+                )
+        return self
+
+
+class BigNumberChartConfig(UnknownFieldCheckMixin):
+    model_config = ConfigDict(extra="ignore")
+
+    chart_type: Literal["big_number"] = Field(
+        ...,
+        description=(
+            "Chart type discriminator - MUST be 'big_number'. "
+            "Creates Big Number charts that display a single prominent "
+            "metric value. Set show_trendline=True with a temporal_column "
+            "for a number with trendline, or leave show_trendline=False "
+            "for a standalone number."
+        ),
+    )
+    metric: ColumnRef = Field(
+        ...,
+        description=(
+            "The metric to display as a big number. "
+            "Must include an aggregate function (e.g., SUM, COUNT)."
+        ),
+    )
+    temporal_column: str | None = Field(
+        None,
+        description=(
+            "Temporal column for the trendline x-axis. "
+            "Required when show_trendline is True."
+        ),
+        min_length=1,
+        max_length=255,
+        pattern=r"^[a-zA-Z0-9_][a-zA-Z0-9_\s\-\.]*$",
+    )
+    time_grain: TimeGrain | None = Field(
+        None,
+        description=(
+            "Time granularity for trendline data. "
+            "Common values: PT1H (hour), P1D (day), P1W (week), "
+            "P1M (month), P1Y (year)."
+        ),
+    )
+    show_trendline: bool = Field(
+        False,
+        description=(
+            "Show a trendline below the big number. "
+            "Requires 'temporal_column' to be set."
+        ),
+    )
+    subheader: str | None = Field(
+        None,
+        description="Subtitle text displayed below the big number",
+        max_length=500,
+    )
+    y_axis_format: str | None = Field(
+        None,
+        description=(
+            "Number format string for the metric value "
+            "(e.g., '$,.2f' for currency, ',.0f' for integers, "
+            "'.2%' for percentages)"
+        ),
+        max_length=50,
+    )
+    start_y_axis_at_zero: bool = Field(
+        True,
+        description="Anchor trendline y-axis at zero",
+    )
+    compare_lag: int | None = Field(
+        None,
+        description=(
+            "Number of time periods to compare against. "
+            "Displays a percentage change vs the prior period."
+        ),
+        ge=1,
+    )
+    filters: list[FilterConfig] | None = Field(
+        None,
+        description="Filters to apply",
+    )
+
+    @model_validator(mode="after")
+    def validate_trendline_fields(self) -> Self:
+        """Validate trendline requires temporal column."""
+        if self.show_trendline and not self.temporal_column:
+            raise ValueError(
+                "Big Number chart with show_trendline=True requires "
+                "'temporal_column'. Specify a date/time column for "
+                "the trendline x-axis."
+            )
+        if self.compare_lag and not self.show_trendline:
+            raise ValueError(
+                "compare_lag requires show_trendline=True. "
+                "Period comparison is only available for "
+                "trendline charts."
+            )
+        return self
+
+    @model_validator(mode="after")
+    def validate_metric_aggregate(self) -> Self:
+        """Ensure metric is a valid metric reference (aggregate or saved)."""
+        if not self.metric.is_metric:
+            raise ValueError(
+                "Big Number metric must be either a saved dataset metric "
+                "or include an aggregate function (e.g., SUM, COUNT, AVG). "
+                "Set 'saved_metric': true to use a saved metric, or add "
+                "'aggregate' to the metric specification."
+            )
+        return self
+
+
+class TableChartConfig(UnknownFieldCheckMixin):
+    model_config = ConfigDict(extra="ignore", populate_by_name=True)
 
     chart_type: Literal["table"] = "table"
     viz_type: Literal["table", "ag-grid-table"] = Field(
         "table", description="'ag-grid-table' for interactive features"
     )
+    query_mode: Literal["aggregate", "raw"] | None = Field(
+        None,
+        description=(
+            "Query mode: 'raw' returns individual rows without aggregation, "
+            "'aggregate' groups data using metrics. "
+            "When set to 'raw', all columns are treated as plain columns regardless "
+            "of any aggregate settings. "
+            "Defaults to auto-detection: 'raw' if no column has an aggregate "
+            "function, 'aggregate' otherwise."
+        ),
+    )
     columns: List[ColumnRef] = Field(
         ...,
         min_length=1,
         description="Columns with unique labels",
+        validation_alias=AliasChoices("columns", "all_columns", "groupby"),
     )
-    filters: List[FilterConfig] | None = None
-    sort_by: List[str] | None = None
+    filters: List[FilterConfig] | None = Field(
+        None,
+        description="Structured filters (column/op/value). "
+        "Do NOT use adhoc_filters or raw SQL expressions.",
+    )
+    sort_by: List[str] | None = Field(
+        None,
+        validation_alias=AliasChoices("sort_by", "order_by_cols", "order_by"),
+    )
+    row_limit: int = Field(1000, description="Max rows returned", ge=1, le=50000)
 
     @model_validator(mode="after")
     def validate_unique_column_labels(self) -> "TableChartConfig":
@@ -613,7 +1128,9 @@ class TableChartConfig(BaseModel):
 
         for i, col in enumerate(self.columns):
             # Generate the label that will be used (same logic as create_metric_object)
-            if col.aggregate:
+            if col.saved_metric:
+                label = col.label or col.name
+            elif col.aggregate:
                 label = col.label or f"{col.aggregate}({col.name})"
             else:
                 label = col.label or col.name
@@ -633,47 +1150,82 @@ class TableChartConfig(BaseModel):
         return self
 
 
-class XYChartConfig(BaseModel):
-    model_config = ConfigDict(extra="forbid")
+def _metric_display_label(col: ColumnRef) -> str:
+    """Return the display label for a metric column reference."""
+    if col.saved_metric:
+        return col.label or col.name
+    if col.aggregate:
+        return col.label or f"{col.aggregate}({col.name})"
+    return col.label or col.name
+
+
+class XYChartConfig(UnknownFieldCheckMixin):
+    model_config = ConfigDict(extra="ignore", populate_by_name=True)
 
     chart_type: Literal["xy"] = "xy"
-    x: ColumnRef = Field(..., description="X-axis column")
+    x: ColumnRef | None = Field(
+        None,
+        description=(
+            "X-axis column. If omitted, defaults to the dataset's "
+            "primary datetime column (main_dttm_col)."
+        ),
+        validation_alias=AliasChoices("x", "x_axis", "x_column"),
+    )
     y: List[ColumnRef] = Field(
-        ..., min_length=1, description="Y-axis metrics (unique labels)"
+        ...,
+        min_length=1,
+        description="Y-axis metrics (unique labels)",
+        validation_alias=AliasChoices("y", "metrics"),
     )
     kind: Literal["line", "bar", "area", "scatter"] = "line"
     time_grain: TimeGrain | None = Field(
-        None, description="PT1S, PT1M, PT1H, P1D, P1W, P1M, P3M, P1Y"
+        None,
+        description="PT1S, PT1M, PT1H, P1D, P1W, P1M, P3M, P1Y",
+        validation_alias=AliasChoices("time_grain", "time_grain_sqla"),
     )
     orientation: Literal["vertical", "horizontal"] | None = Field(
         None, description="Bar orientation (only for kind='bar')"
     )
-    stacked: bool = False
-    group_by: ColumnRef | None = Field(
-        None, description="Series breakdown column (not 'series')"
+    stacked: bool = Field(
+        False,
+        validation_alias=AliasChoices("stacked", "stack"),
+    )
+    group_by: List[ColumnRef] | None = Field(
+        None,
+        description="Series breakdown columns",
+        validation_alias=AliasChoices(
+            "group_by", "groupby", "series", "breakdown", "dimension"
+        ),
     )
     x_axis: AxisConfig | None = None
     y_axis: AxisConfig | None = None
     legend: LegendConfig | None = None
-    filters: List[FilterConfig] | None = None
+    filters: List[FilterConfig] | None = Field(
+        None,
+        description="Structured filters (column/op/value). "
+        "Do NOT use adhoc_filters or raw SQL expressions.",
+    )
+    row_limit: int = Field(10000, description="Max data points", ge=1, le=50000)
+
+    @field_validator("group_by", mode="before")
+    @classmethod
+    def wrap_single_group_by(cls, v: Any) -> Any:
+        return _normalize_group_by_input(v)
 
     @model_validator(mode="after")
     def validate_unique_column_labels(self) -> "XYChartConfig":
         """Ensure all column labels are unique across x, y, and group_by."""
-        labels_seen = {}  # label -> field_name for error reporting
-        duplicates = []
+        labels_seen: dict[str, str] = {}
+        duplicates: list[str] = []
 
-        # Check X-axis label
-        x_label = self.x.label or self.x.name
-        labels_seen[x_label] = "x"
+        # Add x-axis label if present (x may be None, resolved later)
+        if self.x is not None:
+            x_label = self.x.label or self.x.name
+            labels_seen[x_label] = "x"
 
         # Check Y-axis labels
         for i, col in enumerate(self.y):
-            if col.aggregate:
-                label = col.label or f"{col.aggregate}({col.name})"
-            else:
-                label = col.label or col.name
-
+            label = _metric_display_label(col)
             if label in labels_seen:
                 duplicates.append(
                     f"y[{i}]: '{label}' (conflicts with {labels_seen[label]})"
@@ -681,14 +1233,22 @@ class XYChartConfig(BaseModel):
             else:
                 labels_seen[label] = f"y[{i}]"
 
-        # Check group_by label if present
+        # Check group_by labels if present
         if self.group_by:
-            group_label = self.group_by.label or self.group_by.name
-            if group_label in labels_seen:
-                duplicates.append(
-                    f"group_by: '{group_label}' "
-                    f"(conflicts with {labels_seen[group_label]})"
-                )
+            for i, col in enumerate(self.group_by):
+                if self.x is not None and col.name == self.x.name:
+                    # map_xy_config() strips group_by entries that match x
+                    # to prevent Superset "duplicate label" errors, so
+                    # we allow them through validation.
+                    continue
+                group_label = col.label or col.name
+                if group_label in labels_seen:
+                    duplicates.append(
+                        f"group_by[{i}]: '{group_label}' "
+                        f"(conflicts with {labels_seen[group_label]})"
+                    )
+                else:
+                    labels_seen[group_label] = f"group_by[{i}]"
 
         if duplicates:
             raise ValueError(
@@ -700,22 +1260,85 @@ class XYChartConfig(BaseModel):
         return self
 
 
-# Discriminated union entry point with custom error handling
+# Discriminated union for runtime validation (not exposed in JSON Schema)
 ChartConfig = Annotated[
     XYChartConfig
     | TableChartConfig
     | PieChartConfig
     | PivotTableChartConfig
-    | MixedTimeseriesChartConfig,
+    | MixedTimeseriesChartConfig
+    | HandlebarsChartConfig
+    | BigNumberChartConfig,
     Field(
         discriminator="chart_type",
         description=(
             "Chart configuration - specify chart_type as 'xy', 'table', "
-            "'pie', 'pivot_table', or 'mixed_timeseries'"
+            "'pie', 'pivot_table', 'mixed_timeseries', 'handlebars', "
+            "or 'big_number'"
         ),
     ),
 ]
 
+# Module-level TypeAdapter avoids repeated schema compilation in
+# parse_chart_config() — safe because ChartConfig is fully defined above.
+_CHART_CONFIG_ADAPTER: TypeAdapter[ChartConfig] = TypeAdapter(ChartConfig)
+
+# Compact description for JSON Schema — keeps tool inputSchema small while
+# giving LLMs enough context to construct valid configs.
+_CHART_CONFIG_DESCRIPTION = (
+    "Chart configuration object. MUST include 'chart_type' to select the "
+    "schema. Types: 'xy' (x, y, kind: line/bar/area/scatter), "
+    "'table' (columns), 'pie' (dimension, metric), "
+    "'pivot_table' (rows, metrics), 'mixed_timeseries' (x, y, y_secondary), "
+    "'handlebars' (columns, handlebars_template), "
+    "'big_number' (metric). "
+    "See chart://configs resource for full field reference and examples."
+)
+
+
+def parse_chart_config(
+    config: Dict[str, Any],
+) -> (
+    XYChartConfig
+    | TableChartConfig
+    | PieChartConfig
+    | PivotTableChartConfig
+    | MixedTimeseriesChartConfig
+    | HandlebarsChartConfig
+    | BigNumberChartConfig
+):
+    """Parse a raw dict into the appropriate typed ChartConfig subclass.
+
+    Validates the dict against the discriminated union using chart_type.
+    Call this in tool function bodies to get a typed config object.
+    """
+    try:
+        return _CHART_CONFIG_ADAPTER.validate_python(config)
+    except Exception as e:
+        raise ValueError(
+            f"{e}\n\n"
+            f"Hint: read the chart://configs resource for valid configuration "
+            f"examples and field reference."
+        ) from e
+
+
+def _coerce_config_to_dict(v: Any) -> Dict[str, Any]:
+    """Accept ChartConfig objects, dicts, or JSON strings for the config field."""
+    if isinstance(v, str):
+        from superset.utils import json as json_utils
+
+        try:
+            v = json_utils.loads(v)
+        except (ValueError, TypeError) as exc:
+            raise ValueError(
+                f"config must be a JSON object string, got: {v!r}"
+            ) from exc
+    if hasattr(v, "model_dump"):
+        return v.model_dump()
+    if isinstance(v, dict):
+        return v
+    raise TypeError(f"config must be a dict or JSON string, got {type(v).__name__}")
+
 
 class ListChartsRequest(MetadataCacheControl):
     """Request schema for list_charts with clear, unambiguous types."""
@@ -786,7 +1409,13 @@ class ListChartsRequest(MetadataCacheControl):
         Field(default=1, description="Page number for pagination (1-based)"),
     ]
     page_size: Annotated[
-        PositiveInt, Field(default=10, description="Number of items per page")
+        int,
+        Field(
+            default=DEFAULT_PAGE_SIZE,
+            gt=0,
+            le=MAX_PAGE_SIZE,
+            description=f"Number of items per page (max {MAX_PAGE_SIZE})",
+        ),
     ]
 
     @model_validator(mode="after")
@@ -805,7 +1434,7 @@ class ListChartsRequest(MetadataCacheControl):
 # The tool input models
 class GenerateChartRequest(QueryCacheControl):
     dataset_id: int | str = Field(..., description="Dataset identifier (ID, UUID)")
-    config: ChartConfig = Field(..., description="Chart configuration")
+    config: Dict[str, Any] = Field(..., description=_CHART_CONFIG_DESCRIPTION)
     chart_name: str | None = Field(
         None, description="Auto-generates if omitted", max_length=255
     )
@@ -815,6 +1444,11 @@ class GenerateChartRequest(QueryCacheControl):
         default_factory=lambda: ["url"],
     )
 
+    @field_validator("config", mode="before")
+    @classmethod
+    def coerce_config(cls, v: Any) -> Dict[str, Any]:
+        return _coerce_config_to_dict(v)
+
     @field_validator("chart_name")
     @classmethod
     def sanitize_chart_name(cls, v: str | None) -> str | None:
@@ -847,19 +1481,48 @@ class GenerateChartRequest(QueryCacheControl):
 
 class GenerateExploreLinkRequest(FormDataCacheControl):
     dataset_id: int | str = Field(..., description="Dataset identifier (ID, UUID)")
-    config: ChartConfig = Field(..., description="Chart configuration")
+    config: Dict[str, Any] = Field(..., description=_CHART_CONFIG_DESCRIPTION)
+
+    @field_validator("config", mode="before")
+    @classmethod
+    def coerce_config(cls, v: Any) -> Dict[str, Any]:
+        return _coerce_config_to_dict(v)
 
 
 class UpdateChartRequest(QueryCacheControl):
     identifier: int | str = Field(..., description="Chart ID or UUID")
-    config: ChartConfig
+    config: Dict[str, Any] | None = Field(
+        None,
+        description=(
+            f"{_CHART_CONFIG_DESCRIPTION} Optional; omit to only update chart_name."
+        ),
+    )
     chart_name: str | None = Field(
         None, description="Auto-generates if omitted", max_length=255
     )
-    generate_preview: bool = True
-    preview_formats: List[Literal["url", "ascii", "vega_lite", "table"]] = Field(
-        default_factory=lambda: ["url"],
+    generate_preview: bool = Field(
+        default=True,
+        description=(
+            "When True (default), returns a preview explore URL so the user "
+            "can review changes before saving. When False, persists the "
+            "update immediately."
+        ),
     )
+    preview_formats: list[Literal["url", "ascii", "vega_lite", "table"]] = Field(
+        default_factory=lambda: ["url"],
+        description=(
+            "Extra preview formats to render after saving. Only used when "
+            "generate_preview=False. When generate_preview=True, the preview "
+            "is always an explore URL."
+        ),
+    )
+
+    @field_validator("config", mode="before")
+    @classmethod
+    def coerce_config(cls, v: Any) -> Dict[str, Any] | None:
+        if v is None:
+            return None
+        return _coerce_config_to_dict(v)
 
     @field_validator("chart_name")
     @classmethod
@@ -871,12 +1534,17 @@ class UpdateChartRequest(QueryCacheControl):
 class UpdateChartPreviewRequest(FormDataCacheControl):
     form_data_key: str = Field(..., description="Existing form_data_key to update")
     dataset_id: int | str = Field(..., description="Dataset ID or UUID")
-    config: ChartConfig
+    config: Dict[str, Any] = Field(..., description=_CHART_CONFIG_DESCRIPTION)
     generate_preview: bool = True
     preview_formats: List[Literal["url", "ascii", "vega_lite", "table"]] = Field(
         default_factory=lambda: ["url"],
     )
 
+    @field_validator("config", mode="before")
+    @classmethod
+    def coerce_config(cls, v: Any) -> Dict[str, Any]:
+        return _coerce_config_to_dict(v)
+
 
 class GetChartDataRequest(QueryCacheControl):
     """Request for chart data with cache control.
@@ -1221,3 +1889,137 @@ class ChartPreview(BaseModel):
     # Inherit versioning
     schema_version: str = Field("2.0", description="Response schema version")
     api_version: str = Field("v1", description="MCP API version")
+
+
+class GetChartSqlRequest(BaseModel):
+    """Request schema for get_chart_sql.
+
+    Returns the rendered SQL query that a chart would execute, without actually
+    running it. Useful for understanding what SQL a chart generates.
+
+    Provide a chart identifier (ID or UUID). Optionally provide form_data_key
+    to get the SQL for the unsaved chart state from the Explore view.
+    """
+
+    identifier: int | str | None = Field(
+        default=None,
+        description=(
+            "Chart identifier - can be numeric ID or UUID string. "
+            "Optional when form_data_key is provided (for unsaved charts)."
+        ),
+    )
+    form_data_key: str | None = Field(
+        default=None,
+        description=(
+            "Cache key for retrieving unsaved chart state. When a user "
+            "edits a chart in Explore but hasn't saved, the current state is stored "
+            "with this key. If provided, the tool returns the SQL for the unsaved "
+            "configuration instead of the saved version. "
+            "Can be used alone (without identifier) for unsaved charts."
+        ),
+    )
+
+    @model_validator(mode="after")
+    def validate_identifier_or_form_data_key(self) -> "GetChartSqlRequest":
+        if not self.identifier and not self.form_data_key:
+            raise ValueError(
+                "At least one of 'identifier' or 'form_data_key' must be provided."
+            )
+        return self
+
+
+class ChartSql(BaseModel):
+    """Response containing the rendered SQL for a chart."""
+
+    chart_id: int | None = Field(None, description="Chart ID (null for unsaved charts)")
+    chart_name: str | None = Field(
+        None, description="Chart name (null for unsaved charts)"
+    )
+    sql: str = Field(..., description="The rendered SQL query for this chart")
+    language: str | None = Field(None, description="Query language (e.g. 'sql')")
+    datasource_name: str | None = Field(
+        None, description="Name of the datasource the chart queries"
+    )
+    error: str | None = Field(
+        None,
+        description=(
+            "Validation or parse error if the SQL could not be fully generated. "
+            "When present, 'sql' may still contain a partial query."
+        ),
+    )
+
+
+class AdhocFilter(BaseModel):
+    """A single adhoc filter configured on a chart."""
+
+    clause: str | None = Field(None, description="SQL clause: WHERE or HAVING")
+    expression_type: str | None = Field(
+        None,
+        description=(
+            "Filter expression type: SIMPLE for column-based filters, "
+            "SQL for free-form SQL expressions"
+        ),
+    )
+    subject: str | None = Field(
+        None, description="Column name the filter applies to (SIMPLE filters)"
+    )
+    operator: str | None = Field(
+        None,
+        description="Filter operator (e.g. '==', '!=', 'IN', 'NOT IN', 'LIKE', '>')",
+    )
+    comparator: Any | None = Field(
+        None, description="Filter value(s) to compare against"
+    )
+    sql_expression: str | None = Field(
+        None,
+        description="Free-form SQL expression (SQL expression type filters only)",
+    )
+
+    model_config = ConfigDict(extra="ignore")
+
+
+class ChartFiltersInfo(BaseModel):
+    """Structured representation of all filters applied to a chart."""
+
+    adhoc_filters: List[AdhocFilter] = Field(
+        default_factory=list,
+        description=(
+            "Adhoc filters configured on the chart. These are the primary "
+            "filters visible in the chart's filter panel."
+        ),
+    )
+    time_range: str | None = Field(
+        None,
+        description=(
+            "Time range filter applied to the chart "
+            "(e.g. 'Last 7 days', 'No filter', '2024-01-01 : 2024-12-31')"
+        ),
+    )
+    granularity_sqla: str | None = Field(
+        None,
+        description="Temporal column used for time-based filtering",
+    )
+    extra_filters: List[Dict[str, Any]] = Field(
+        default_factory=list,
+        description=("Extra filters applied from dashboard context or URL parameters"),
+    )
+    filters: List[Dict[str, Any]] = Field(
+        default_factory=list,
+        description=(
+            "Legacy top-level filters payload (older/simpler charts). "
+            "These are plain column-operator-value dicts, distinct from "
+            "adhoc_filters which use the newer expressionType format."
+        ),
+    )
+    where: str | None = Field(
+        None,
+        description="Custom WHERE clause applied to the chart query",
+    )
+    having: str | None = Field(
+        None,
+        description="Custom HAVING clause applied to the chart query",
+    )
+
+
+# Rebuild ChartInfo so Pydantic can resolve the ChartFiltersInfo forward reference.
+ChartInfo.model_rebuild()
diff --git a/superset/mcp_service/chart/tool/__init__.py b/superset/mcp_service/chart/tool/__init__.py
index a3c8388a75c..d13c62859e2 100644
--- a/superset/mcp_service/chart/tool/__init__.py
+++ b/superset/mcp_service/chart/tool/__init__.py
@@ -19,6 +19,8 @@ from .generate_chart import generate_chart
 from .get_chart_data import get_chart_data
 from .get_chart_info import get_chart_info
 from .get_chart_preview import get_chart_preview
+from .get_chart_sql import get_chart_sql
+from .get_chart_type_schema import get_chart_type_schema
 from .list_charts import list_charts
 from .update_chart import update_chart
 from .update_chart_preview import update_chart_preview
@@ -26,9 +28,11 @@ from .update_chart_preview import update_chart_preview
 __all__ = [
     "list_charts",
     "get_chart_info",
+    "get_chart_sql",
     "generate_chart",
     "update_chart",
     "update_chart_preview",
     "get_chart_preview",
     "get_chart_data",
+    "get_chart_type_schema",
 ]
diff --git a/superset/mcp_service/chart/tool/generate_chart.py b/superset/mcp_service/chart/tool/generate_chart.py
index 3c9b0192cf8..7ed0a5cc6b0 100644
--- a/superset/mcp_service/chart/tool/generate_chart.py
+++ b/superset/mcp_service/chart/tool/generate_chart.py
@@ -22,14 +22,16 @@ import logging
 import time
 from dataclasses import dataclass, field
 from typing import Any, Dict, List
-from urllib.parse import parse_qs, urlparse
 
 from fastmcp import Context
+from sqlalchemy.exc import SQLAlchemyError
 from superset_core.mcp.decorators import tool, ToolAnnotations
 
 from superset.commands.exceptions import CommandException
+from superset.exceptions import OAuth2Error, OAuth2RedirectError
 from superset.extensions import event_logger
 from superset.mcp_service.auth import has_dataset_access
+from superset.mcp_service.chart.chart_helpers import extract_form_data_key_from_url
 from superset.mcp_service.chart.chart_utils import (
     analyze_chart_capabilities,
     analyze_chart_semantics,
@@ -42,9 +44,13 @@ from superset.mcp_service.chart.schemas import (
     ChartError,
     GenerateChartRequest,
     GenerateChartResponse,
+    parse_chart_config,
     PerformanceMetadata,
 )
-from superset.mcp_service.utils.schema_utils import parse_request
+from superset.mcp_service.utils.oauth2_utils import (
+    build_oauth2_redirect_message,
+    OAUTH2_CONFIG_ERROR_MESSAGE,
+)
 from superset.mcp_service.utils.url_utils import get_superset_base_url
 from superset.utils import json
 
@@ -81,20 +87,34 @@ def _compile_chart(
         ChartDataQueryFailedError,
     )
     from superset.common.query_context_factory import QueryContextFactory
+    from superset.mcp_service.chart.chart_utils import adhoc_filters_to_query_filters
     from superset.mcp_service.chart.preview_utils import _build_query_columns
 
     try:
         columns = _build_query_columns(form_data)
+        query_filters = adhoc_filters_to_query_filters(
+            form_data.get("adhoc_filters", [])
+        )
+
+        # Big Number charts use singular "metric" instead of "metrics"
+        metrics = form_data.get("metrics", [])
+        if not metrics and form_data.get("metric"):
+            metrics = [form_data["metric"]]
+
+        # Big Number with trendline uses granularity_sqla as the time column
+        if not columns and form_data.get("granularity_sqla"):
+            columns = [form_data["granularity_sqla"]]
+
         factory = QueryContextFactory()
         query_context = factory.create(
             datasource={"id": dataset_id, "type": "table"},
             queries=[
                 {
                     "columns": columns,
-                    "metrics": form_data.get("metrics", []),
+                    "metrics": metrics,
                     "orderby": form_data.get("orderby", []),
                     "row_limit": 2,
-                    "filters": form_data.get("adhoc_filters", []),
+                    "filters": query_filters,
                     "time_range": form_data.get("time_range", "No filter"),
                 }
             ],
@@ -128,7 +148,6 @@ def _compile_chart(
         destructiveHint=False,
     ),
 )
-@parse_request(GenerateChartRequest)
 async def generate_chart(  # noqa: C901
     request: GenerateChartRequest, ctx: Context
 ) -> GenerateChartResponse:
@@ -196,13 +215,17 @@ async def generate_chart(  # noqa: C901
         "save_chart=%s, preview_formats=%s"
         % (
             request.dataset_id,
-            request.config.chart_type,
+            request.config.get("chart_type", "unknown"),
             request.save_chart,
             request.preview_formats,
         )
     )
     await ctx.debug(
-        "Chart configuration details: config=%s" % (request.config.model_dump(),)
+        "Chart configuration details: chart_type=%s, keys=%s"
+        % (
+            request.config.get("chart_type", "unknown"),
+            sorted(request.config.keys()),
+        )
     )
 
     # Track runtime warnings to include in response
@@ -256,11 +279,12 @@ async def generate_chart(  # noqa: C901
                 }
             )
 
+        # Parse the raw config dict into a typed ChartConfig for downstream use
+        config = parse_chart_config(request.config)
+
         # Map the simplified config to Superset's form_data format
         # Pass dataset_id to enable column type checking for proper viz_type selection
-        form_data = map_config_to_form_data(
-            request.config, dataset_id=request.dataset_id
-        )
+        form_data = map_config_to_form_data(config, dataset_id=request.dataset_id)
 
         chart = None
         chart_id = None
@@ -354,7 +378,7 @@ async def generate_chart(  # noqa: C901
                 dataset, "table_name", None
             )
             chart_name = request.chart_name or generate_chart_name(
-                request.config, dataset_name=dataset_name
+                config, dataset_name=dataset_name
             )
             await ctx.debug("Chart name: chart_name=%s" % (chart_name,))
 
@@ -516,13 +540,8 @@ async def generate_chart(  # noqa: C901
             explore_url = generate_explore_link(request.dataset_id, form_data)
             await ctx.debug("Generated explore link: explore_url=%s" % (explore_url,))
 
-            # Extract form_data_key from the explore URL using proper URL parsing
-            if explore_url:
-                parsed = urlparse(explore_url)
-                query_params = parse_qs(parsed.query)
-                form_data_key_list = query_params.get("form_data_key", [])
-                if form_data_key_list:
-                    form_data_key = form_data_key_list[0]
+            # Extract form_data_key from the explore URL
+            form_data_key = extract_form_data_key_from_url(explore_url)
 
             # Compile check for preview-only mode
             # Validate dataset existence and user access before running queries
@@ -594,8 +613,8 @@ async def generate_chart(  # noqa: C901
                 response_warnings.extend(compile_result.warnings)
 
         # Generate semantic analysis
-        capabilities = analyze_chart_capabilities(chart, request.config)
-        semantics = analyze_chart_semantics(chart, request.config)
+        capabilities = analyze_chart_capabilities(chart, config)
+        semantics = analyze_chart_semantics(chart, config)
 
         # Create performance metadata
         execution_time = int((time.time() - start_time) * 1000)
@@ -609,7 +628,7 @@ async def generate_chart(  # noqa: C901
         chart_name = (
             chart.slice_name
             if chart and hasattr(chart, "slice_name")
-            else generate_chart_name(request.config)
+            else generate_chart_name(config)
         )
         accessibility = AccessibilityMetadata(
             color_blind_safe=True,  # Would need actual analysis
@@ -706,17 +725,61 @@ async def generate_chart(  # noqa: C901
 
         # Build chart info using serialize_chart_object for saved charts
         chart_info = None
+        chart_data = None
         if request.save_chart and chart:
-            from superset.mcp_service.chart.schemas import serialize_chart_object
+            from sqlalchemy.orm import joinedload
 
-            chart_info = serialize_chart_object(chart)
-            if chart_info:
-                # Override the URL with explore_url
-                chart_info.url = explore_url
+            from superset import db
+            from superset.daos.chart import ChartDAO
+            from superset.mcp_service.chart.schemas import serialize_chart_object
+            from superset.models.slice import Slice
+
+            # Re-fetch with eager-loaded relationships to avoid detached
+            # instance errors when serialize_chart_object accesses .tags
+            # and .owners.  The preceding commit may invalidate the session
+            # in multi-tenant environments; on failure, build a minimal
+            # chart_data dict from scalar attributes that are already loaded
+            # — relationship fields (owners, tags) would trigger
+            # lazy-loading on the same dead session.
+            try:
+                chart = (
+                    ChartDAO.find_by_id(
+                        chart.id,
+                        query_options=[
+                            joinedload(Slice.owners),
+                            joinedload(Slice.tags),
+                        ],
+                    )
+                    or chart
+                )
+            except SQLAlchemyError:
+                logger.warning(
+                    "Re-fetch of chart %s failed; returning minimal response",
+                    chart.id,
+                    exc_info=True,
+                )
+                try:
+                    db.session.rollback()  # pylint: disable=consider-using-transaction
+                except SQLAlchemyError:
+                    logger.warning(
+                        "Database rollback failed during chart re-fetch error handling",
+                        exc_info=True,
+                    )
+                chart_data = {
+                    "id": chart.id,
+                    "slice_name": chart.slice_name,
+                    "viz_type": chart.viz_type,
+                    "url": explore_url,
+                    "uuid": str(chart.uuid) if chart.uuid else None,
+                }
+
+            if chart_data is None:
+                chart_info = serialize_chart_object(chart)
+                if chart_info:
+                    chart_info.url = explore_url
 
         # Safely serialize chart_info - handle both Pydantic models and dicts
-        chart_data = None
-        if chart_info:
+        if chart_data is None and chart_info is not None:
             if hasattr(chart_info, "model_dump"):
                 chart_data = chart_info.model_dump()
             elif isinstance(chart_info, dict):
@@ -763,7 +826,46 @@ async def generate_chart(  # noqa: C901
         )
         return GenerateChartResponse.model_validate(result)
 
-    except Exception as e:
+    except OAuth2RedirectError as ex:
+        await ctx.error(
+            "Chart generation requires OAuth authentication: dataset_id=%s"
+            % request.dataset_id
+        )
+        return GenerateChartResponse.model_validate(
+            {
+                "chart": None,
+                "success": False,
+                "error": {
+                    "error_type": "OAUTH2_REDIRECT",
+                    "message": build_oauth2_redirect_message(ex),
+                    "details": "OAuth2 authentication required",
+                },
+            }
+        )
+    except OAuth2Error:
+        await ctx.error(
+            "OAuth2 configuration error: dataset_id=%s" % request.dataset_id
+        )
+        return GenerateChartResponse.model_validate(
+            {
+                "chart": None,
+                "success": False,
+                "error": {
+                    "error_type": "OAUTH2_REDIRECT_ERROR",
+                    "message": OAUTH2_CONFIG_ERROR_MESSAGE,
+                    "details": "OAuth2 configuration or provider error",
+                },
+            }
+        )
+    except (CommandException, SQLAlchemyError, KeyError, ValueError) as e:
+        from superset import db
+
+        try:
+            db.session.rollback()  # pylint: disable=consider-using-transaction
+        except SQLAlchemyError:
+            logger.warning(
+                "Database rollback failed during error handling", exc_info=True
+            )
         await ctx.error(
             "Chart generation failed: error=%s, execution_time_ms=%s"
             % (
@@ -778,9 +880,9 @@ async def generate_chart(  # noqa: C901
         # Extract chart_type from different sources for better error context
         chart_type = "unknown"
         try:
-            if hasattr(request, "config") and hasattr(request.config, "chart_type"):
-                chart_type = request.config.chart_type
-        except AttributeError as extract_error:
+            if hasattr(request, "config") and isinstance(request.config, dict):
+                chart_type = request.config.get("chart_type", "unknown")
+        except (AttributeError, TypeError) as extract_error:
             # Ignore errors when extracting chart type for error context
             logger.debug("Could not extract chart type: %s", extract_error)
 
diff --git a/superset/mcp_service/chart/tool/get_chart_data.py b/superset/mcp_service/chart/tool/get_chart_data.py
index 8bacd35217f..d901b23e638 100644
--- a/superset/mcp_service/chart/tool/get_chart_data.py
+++ b/superset/mcp_service/chart/tool/get_chart_data.py
@@ -25,15 +25,19 @@ from typing import Any, Dict, List, TYPE_CHECKING
 
 from fastmcp import Context
 from flask import current_app
+from sqlalchemy.exc import SQLAlchemyError
 from superset_core.mcp.decorators import tool, ToolAnnotations
 
 if TYPE_CHECKING:
     from superset.models.slice import Slice
 
 from superset.commands.exceptions import CommandException
-from superset.commands.explore.form_data.parameters import CommandParameters
-from superset.exceptions import SupersetException
+from superset.exceptions import OAuth2Error, OAuth2RedirectError, SupersetException
 from superset.extensions import event_logger
+from superset.mcp_service.chart.chart_helpers import (
+    find_chart_by_identifier,
+    get_cached_form_data,
+)
 from superset.mcp_service.chart.chart_utils import validate_chart_dataset
 from superset.mcp_service.chart.schemas import (
     ChartData,
@@ -43,7 +47,10 @@ from superset.mcp_service.chart.schemas import (
     PerformanceMetadata,
 )
 from superset.mcp_service.utils.cache_utils import get_cache_status_from_result
-from superset.mcp_service.utils.schema_utils import parse_request
+from superset.mcp_service.utils.oauth2_utils import (
+    build_oauth2_redirect_message,
+    OAUTH2_CONFIG_ERROR_MESSAGE,
+)
 from superset.utils.core import merge_extra_filters
 
 logger = logging.getLogger(__name__)
@@ -59,21 +66,6 @@ def _apply_extra_form_data(
     merge_extra_filters(form_data)
 
 
-def _get_cached_form_data(form_data_key: str) -> str | None:
-    """Retrieve form_data from cache using form_data_key.
-
-    Returns the JSON string of form_data if found, None otherwise.
-    """
-    from superset.commands.explore.form_data.get import GetFormDataCommand
-
-    try:
-        cmd_params = CommandParameters(key=form_data_key)
-        return GetFormDataCommand(cmd_params).run()
-    except (KeyError, ValueError, CommandException) as e:
-        logger.warning("Failed to retrieve form_data from cache: %s", e)
-        return None
-
-
 @tool(
     tags=["data"],
     class_permission_name="Chart",
@@ -83,7 +75,6 @@ def _get_cached_form_data(form_data_key: str) -> str | None:
         destructiveHint=False,
     ),
 )
-@parse_request(GetChartDataRequest)
 async def get_chart_data(  # noqa: C901
     request: GetChartDataRequest, ctx: Context
 ) -> ChartData | ChartError:
@@ -125,7 +116,6 @@ async def get_chart_data(  # noqa: C901
 
     try:
         await ctx.report_progress(1, 4, "Looking up chart")
-        from superset.daos.chart import ChartDAO
         from superset.utils import json as utils_json
 
         chart = None
@@ -139,7 +129,7 @@ async def get_chart_data(  # noqa: C901
                     "No chart identifier - querying data from unsaved chart cache: "
                     "form_data_key=%s" % (request.form_data_key,)
                 )
-                cached_form_data = _get_cached_form_data(request.form_data_key)
+                cached_form_data = get_cached_form_data(request.form_data_key)
                 if not cached_form_data:
                     return ChartError(
                         error="No cached chart data found for form_data_key. "
@@ -164,25 +154,13 @@ async def get_chart_data(  # noqa: C901
 
         # Find the chart by identifier
         with event_logger.log_context(action="mcp.get_chart_data.chart_lookup"):
-            if isinstance(request.identifier, int) or (
-                isinstance(request.identifier, str) and request.identifier.isdigit()
-            ):
-                chart_id = (
-                    int(request.identifier)
-                    if isinstance(request.identifier, str)
-                    else request.identifier
+            await ctx.debug("Looking up chart: identifier=%s" % (request.identifier,))
+            if request.identifier is None:
+                return ChartError(
+                    error="Chart identifier is required",
+                    error_type="ValidationError",
                 )
-                await ctx.debug(
-                    "Performing ID-based chart lookup: chart_id=%s" % (chart_id,)
-                )
-                chart = ChartDAO.find_by_id(chart_id)
-            elif isinstance(request.identifier, str):
-                await ctx.debug(
-                    "Performing UUID-based chart lookup: uuid=%s"
-                    % (request.identifier,)
-                )
-                # Try UUID lookup using DAO flexible method
-                chart = ChartDAO.find_by_id(request.identifier, id_column="uuid")
+            chart = find_chart_by_identifier(request.identifier)
 
         if not chart:
             await ctx.error("Chart not found: identifier=%s" % (request.identifier,))
@@ -237,7 +215,7 @@ async def get_chart_data(  # noqa: C901
                         "Retrieving unsaved chart state from cache: form_data_key=%s"
                         % (request.form_data_key,)
                     )
-                    if cached_form_data := _get_cached_form_data(request.form_data_key):
+                    if cached_form_data := get_cached_form_data(request.form_data_key):
                         try:
                             parsed_form_data = utils_json.loads(cached_form_data)
                             # Only use if it's actually a dict (not null, list, etc.)
@@ -303,7 +281,13 @@ async def get_chart_data(  # noqa: C901
                     cached_groupby: list[str] = []
                 else:
                     cached_metrics = cached_form_data_dict.get("metrics", [])
-                    cached_groupby = cached_form_data_dict.get("groupby", [])
+                    raw_groupby = cached_form_data_dict.get("groupby", [])
+                    # Guard against string groupby (e.g. heatmap_v2 migrated
+                    # from legacy heatmap where all_columns_y was a string)
+                    if isinstance(raw_groupby, str):
+                        cached_groupby = [raw_groupby]
+                    else:
+                        cached_groupby = list(raw_groupby)
 
                 _apply_extra_form_data(cached_form_data_dict, request.extra_form_data)
 
@@ -371,6 +355,29 @@ async def get_chart_data(  # noqa: C901
                 # Bubble charts use x/y/size as separate metric fields.
                 viz_type = chart.viz_type or ""
 
+                # Deck.gl chart types store spatial data (lat/lon)
+                # rather than traditional metrics/groupby. They
+                # require a saved query_context to retrieve data.
+                # Match by prefix to cover all current and future
+                # deck.gl viz types (deck_arc, deck_scatter, etc.).
+                if viz_type.startswith("deck_"):
+                    await ctx.warning(
+                        "Chart %s is a deck.gl visualization (%s) with no "
+                        "saved query_context. Data retrieval requires "
+                        "re-saving the chart in Superset." % (chart.id, viz_type)
+                    )
+                    return ChartError(
+                        error=(
+                            f"Chart {chart.id} is a deck.gl visualization "
+                            f"(type: {viz_type}) with no saved query_context. "
+                            f"Deck.gl charts use spatial data (lat/lon) that "
+                            f"cannot be reconstructed from form_data alone. "
+                            f"Please open this chart in Superset and re-save "
+                            f"it to generate a query_context."
+                        ),
+                        error_type="MissingQueryContext",
+                    )
+
                 singular_metric_no_groupby = (
                     "big_number",
                     "big_number_total",
@@ -422,7 +429,13 @@ async def get_chart_data(  # noqa: C901
                 else:
                     # Standard charts use "metrics" (plural) and "groupby"
                     metrics = form_data.get("metrics", [])
-                    groupby_columns = list(form_data.get("groupby") or [])
+                    raw_groupby = form_data.get("groupby") or []
+                    # Guard against string groupby (e.g. heatmap_v2 migrated
+                    # from legacy heatmap where all_columns_y was a string)
+                    if isinstance(raw_groupby, str):
+                        groupby_columns = [raw_groupby]
+                    else:
+                        groupby_columns = list(raw_groupby)
                     # Some chart types use "columns" instead of "groupby"
                     if not groupby_columns:
                         form_columns = form_data.get("columns")
@@ -764,7 +777,32 @@ async def get_chart_data(  # noqa: C901
                 error_type="DataError",
             )
 
-    except Exception as e:
+    except OAuth2RedirectError as ex:
+        await ctx.error(
+            "Chart data requires OAuth authentication: identifier=%s"
+            % request.identifier
+        )
+        return ChartError(
+            error=build_oauth2_redirect_message(ex),
+            error_type="OAUTH2_REDIRECT",
+        )
+    except OAuth2Error:
+        await ctx.error(
+            "OAuth2 configuration error: identifier=%s" % request.identifier
+        )
+        return ChartError(
+            error=OAUTH2_CONFIG_ERROR_MESSAGE,
+            error_type="OAUTH2_REDIRECT_ERROR",
+        )
+    except (
+        SupersetException,
+        CommandException,
+        SQLAlchemyError,
+        KeyError,
+        ValueError,
+        TypeError,
+        AttributeError,
+    ) as e:
         await ctx.error(
             "Chart data retrieval failed: identifier=%s, error=%s, error_type=%s"
             % (
diff --git a/superset/mcp_service/chart/tool/get_chart_info.py b/superset/mcp_service/chart/tool/get_chart_info.py
index e1cb5442003..fb8720a1c1b 100644
--- a/superset/mcp_service/chart/tool/get_chart_info.py
+++ b/superset/mcp_service/chart/tool/get_chart_info.py
@@ -25,42 +25,26 @@ from fastmcp import Context
 from sqlalchemy.orm import subqueryload
 from superset_core.mcp.decorators import tool, ToolAnnotations
 
-from superset.commands.exceptions import CommandException
-from superset.commands.explore.form_data.parameters import CommandParameters
 from superset.extensions import event_logger
+from superset.mcp_service.chart.chart_helpers import get_cached_form_data
 from superset.mcp_service.chart.chart_utils import validate_chart_dataset
 from superset.mcp_service.chart.schemas import (
     ChartError,
     ChartInfo,
+    extract_filters_from_form_data,
     GetChartInfoRequest,
     serialize_chart_object,
 )
 from superset.mcp_service.mcp_core import ModelGetInfoCore
-from superset.mcp_service.utils.schema_utils import parse_request
 
 logger = logging.getLogger(__name__)
 
 
-def _get_cached_form_data(form_data_key: str) -> str | None:
-    """Retrieve form_data from cache using form_data_key.
-
-    Returns the JSON string of form_data if found, None otherwise.
-    """
-    from superset.commands.explore.form_data.get import GetFormDataCommand
-
-    try:
-        cmd_params = CommandParameters(key=form_data_key)
-        return GetFormDataCommand(cmd_params).run()
-    except (KeyError, ValueError, CommandException) as e:
-        logger.warning("Failed to retrieve form_data from cache: %s", e)
-        return None
-
-
 def _build_unsaved_chart_info(form_data_key: str) -> ChartInfo | ChartError:
     """Build a ChartInfo from cached form_data when no chart identifier exists."""
     from superset.utils import json as utils_json
 
-    cached_form_data = _get_cached_form_data(form_data_key)
+    cached_form_data = get_cached_form_data(form_data_key)
     if not cached_form_data:
         return ChartError(
             error="No cached chart data found for form_data_key. "
@@ -83,6 +67,7 @@ def _build_unsaved_chart_info(form_data_key: str) -> ChartInfo | ChartError:
         viz_type=form_data.get("viz_type"),
         datasource_name=form_data.get("datasource_name"),
         datasource_type=form_data.get("datasource_type"),
+        filters=extract_filters_from_form_data(form_data),
         form_data=form_data,
         form_data_key=form_data_key,
         is_unsaved_state=True,
@@ -93,7 +78,7 @@ def _apply_unsaved_state_override(result: ChartInfo, form_data_key: str) -> None
     """Override a ChartInfo's form_data with cached unsaved state."""
     from superset.utils import json as utils_json
 
-    if cached_form_data := _get_cached_form_data(form_data_key):
+    if cached_form_data := get_cached_form_data(form_data_key):
         try:
             result.form_data = utils_json.loads(cached_form_data)
             result.form_data_key = form_data_key
@@ -102,6 +87,9 @@ def _apply_unsaved_state_override(result: ChartInfo, form_data_key: str) -> None
             # Update viz_type from cached form_data if present
             if result.form_data and "viz_type" in result.form_data:
                 result.viz_type = result.form_data["viz_type"]
+
+            # Update filters from cached form_data
+            result.filters = extract_filters_from_form_data(result.form_data)
         except (TypeError, ValueError) as e:
             logger.warning(
                 "Failed to parse cached form_data: %s. "
@@ -124,7 +112,6 @@ def _apply_unsaved_state_override(result: ChartInfo, form_data_key: str) -> None
         destructiveHint=False,
     ),
 )
-@parse_request(GetChartInfoRequest)
 async def get_chart_info(
     request: GetChartInfoRequest, ctx: Context
 ) -> ChartInfo | ChartError:
diff --git a/superset/mcp_service/chart/tool/get_chart_preview.py b/superset/mcp_service/chart/tool/get_chart_preview.py
index f844fcc630e..dbffd152ea5 100644
--- a/superset/mcp_service/chart/tool/get_chart_preview.py
+++ b/superset/mcp_service/chart/tool/get_chart_preview.py
@@ -23,11 +23,17 @@ import logging
 from typing import Any, Dict, List, Protocol
 
 from fastmcp import Context
+from sqlalchemy.exc import SQLAlchemyError
 from superset_core.mcp.decorators import tool, ToolAnnotations
 
 from superset.commands.exceptions import CommandException
-from superset.exceptions import SupersetException
+from superset.exceptions import OAuth2Error, OAuth2RedirectError, SupersetException
 from superset.extensions import event_logger
+from superset.mcp_service.chart.ascii_charts import (
+    generate_ascii_chart,
+    generate_ascii_table,
+)
+from superset.mcp_service.chart.chart_helpers import find_chart_by_identifier
 from superset.mcp_service.chart.chart_utils import validate_chart_dataset
 from superset.mcp_service.chart.schemas import (
     AccessibilityMetadata,
@@ -41,7 +47,10 @@ from superset.mcp_service.chart.schemas import (
     URLPreview,
     VegaLitePreview,
 )
-from superset.mcp_service.utils.schema_utils import parse_request
+from superset.mcp_service.utils.oauth2_utils import (
+    build_oauth2_redirect_message,
+    OAUTH2_CONFIG_ERROR_MESSAGE,
+)
 from superset.mcp_service.utils.url_utils import get_superset_base_url
 
 logger = logging.getLogger(__name__)
@@ -134,12 +143,28 @@ class ASCIIPreviewStrategy(PreviewFormatStrategy):
             groupby_columns = form_data.get("groupby", [])
             metrics = form_data.get("metrics", [])
 
-            columns = groupby_columns.copy()
-            if x_axis_config and isinstance(x_axis_config, str):
-                columns.append(x_axis_config)
-            elif x_axis_config and isinstance(x_axis_config, dict):
-                if "column_name" in x_axis_config:
-                    columns.append(x_axis_config["column_name"])
+            # Table charts in raw mode use all_columns or columns
+            all_columns = form_data.get("all_columns", [])
+            raw_columns = form_data.get("columns", [])
+            if form_data.get("query_mode") == "raw" and (all_columns or raw_columns):
+                columns = list(all_columns or raw_columns)
+            else:
+                columns = groupby_columns.copy()
+                if x_axis_config and isinstance(x_axis_config, str):
+                    columns.append(x_axis_config)
+                elif x_axis_config and isinstance(x_axis_config, dict):
+                    if "column_name" in x_axis_config:
+                        columns.append(x_axis_config["column_name"])
+
+            if not columns and not metrics:
+                return ChartError(
+                    error=(
+                        "Cannot generate ASCII preview: chart has no columns or "
+                        "metrics in its configuration. This chart type may not "
+                        "support ASCII preview."
+                    ),
+                    error_type="UnsupportedChart",
+                )
 
             factory = QueryContextFactory()
             query_context = factory.create(
@@ -243,7 +268,7 @@ class TablePreviewStrategy(PreviewFormatStrategy):
             if result and "queries" in result and len(result["queries"]) > 0:
                 data = result["queries"][0].get("data", [])
 
-            table_data = _generate_ascii_table(data, 120)
+            table_data = generate_ascii_table(data, 120)
 
             return TablePreview(
                 table_data=table_data,
@@ -945,874 +970,6 @@ class PreviewFormatGenerator:
         return strategy.generate()
 
 
-def generate_ascii_chart(
-    data: List[Any], chart_type: str, width: int = 80, height: int = 20
-) -> str:
-    """Generate ASCII art chart from data."""
-    if not data or len(data) == 0:
-        return "No data available for ASCII chart"
-
-    try:
-        logger.info(
-            "generate_ascii_chart: chart_type=%s, data_rows=%s", chart_type, len(data)
-        )
-
-        # Generate appropriate ASCII chart based on type
-        if chart_type in ["bar", "column", "echarts_timeseries_bar"]:
-            logger.info("Generating bar chart")
-            return _generate_ascii_bar_chart(data, width, height)
-        elif chart_type in ["line", "echarts_timeseries_line"]:
-            logger.info("Generating line chart")
-            return _generate_ascii_line_chart(data, width, height)
-        elif chart_type in ["scatter", "echarts_timeseries_scatter"]:
-            logger.info("Generating scatter chart")
-            return _generate_ascii_scatter_chart(data, width, height)
-        else:
-            # Default to table format for unsupported chart types
-            logger.info(
-                "Unsupported chart type '%s', falling back to table", chart_type
-            )
-            return _generate_ascii_table(data, width)
-    except (TypeError, ValueError, KeyError, IndexError) as e:
-        logger.error("ASCII chart generation failed: %s", e)
-        import traceback
-
-        logger.error("Traceback: %s", traceback.format_exc())
-        return f"ASCII chart generation failed: {str(e)}"
-
-
-def _generate_ascii_bar_chart(data: List[Any], width: int, height: int) -> str:
-    """Generate enhanced ASCII bar chart with horizontal and vertical options."""
-    if not data:
-        return "No data for bar chart"
-
-    # Extract numeric values for bars
-    values = []
-    labels = []
-
-    for row in data[:12]:  # Increased limit for better charts
-        if isinstance(row, dict):
-            # Find numeric and string values
-            numeric_val = None
-            label_val = None
-
-            for _key, val in row.items():
-                if isinstance(val, (int, float)) and numeric_val is None:
-                    numeric_val = val
-                elif isinstance(val, str) and label_val is None:
-                    label_val = val
-
-            if numeric_val is not None:
-                values.append(numeric_val)
-                labels.append(label_val or f"Item {len(values)}")
-
-    if not values:
-        return "No numeric data found for bar chart"
-
-    # Decide between horizontal and vertical based on label lengths
-    avg_label_length = sum(len(str(label)) for label in labels) / len(labels)
-    use_horizontal = avg_label_length > 8 or len(values) > 8
-
-    if use_horizontal:
-        return _generate_horizontal_bar_chart(values, labels, width)
-    else:
-        return _generate_vertical_bar_chart(values, labels, width, height)
-
-
-def _generate_horizontal_bar_chart(
-    values: List[float], labels: List[str], width: int
-) -> str:
-    """Generate horizontal ASCII bar chart."""
-    lines = []
-    lines.append("📊 Horizontal Bar Chart")
-    lines.append("═" * min(width, 60))
-
-    max_val = max(values) if values else 1
-    min_val = min(values) if values else 0
-    max_bar_width = min(40, width - 20)  # Leave space for labels and values
-
-    # Add scale indicator
-    lines.append(f"Scale: {min_val:.1f} ────────────── {max_val:.1f}")
-    lines.append("")
-
-    for label, value in zip(labels, values, strict=False):
-        # Calculate bar length
-        if max_val > min_val:
-            normalized = (value - min_val) / (max_val - min_val)
-            bar_length = max(1, int(normalized * max_bar_width))
-        else:
-            bar_length = 1
-
-        # Create bar with gradient effect
-        bar = _create_gradient_bar(bar_length, value, max_val)
-
-        # Format value
-        if abs(value) >= 1000000:
-            value_str = f"{value / 1000000:.1f}M"
-        elif abs(value) >= 1000:
-            value_str = f"{value / 1000:.1f}K"
-        else:
-            value_str = f"{value:.1f}"
-
-        # Truncate label if too long
-        display_label = label[:15] if len(label) > 15 else label
-        lines.append(f"{display_label:>15} ▐{bar:<{max_bar_width}} {value_str}")
-
-    return "\n".join(lines)
-
-
-def _generate_vertical_bar_chart(  # noqa: C901
-    values: List[float], labels: List[str], width: int, height: int
-) -> str:
-    """Generate vertical ASCII bar chart."""
-    lines = []
-    lines.append("📊 Vertical Bar Chart")
-    lines.append("═" * min(width, 60))
-
-    max_val = max(values) if values else 1
-    min_val = min(values) if values else 0
-    chart_height = min(15, height - 8)  # Leave space for title and labels
-
-    # Create the chart grid
-    grid = []
-    for _ in range(chart_height):
-        grid.append([" "] * len(values))
-
-    # Fill the bars
-    for col, value in enumerate(values):
-        if max_val > min_val:
-            normalized = (value - min_val) / (max_val - min_val)
-            bar_height = max(1, int(normalized * chart_height))
-        else:
-            bar_height = 1
-
-        # Fill from bottom up
-        for row_idx in range(chart_height - bar_height, chart_height):
-            if row_idx < len(grid):
-                # Use different characters for height effect
-                if row_idx == chart_height - bar_height:
-                    grid[row_idx][col] = "▀"  # Top of bar
-                elif row_idx == chart_height - 1:
-                    grid[row_idx][col] = "█"  # Bottom of bar
-                else:
-                    grid[row_idx][col] = "█"  # Middle of bar
-
-    # Add Y-axis scale
-    for i, row_data in enumerate(grid):
-        y_val = (
-            max_val - (i / (chart_height - 1)) * (max_val - min_val)
-            if chart_height > 1
-            else max_val
-        )
-        if abs(y_val) >= 1000:
-            y_label = f"{y_val:.0f}"
-        else:
-            y_label = f"{y_val:.1f}"
-        lines.append(f"{y_label:>6} ┤ " + "".join(f"{cell:^3}" for cell in row_data))
-
-    # Add X-axis
-    lines.append("       └" + "───" * len(values))
-
-    # Add labels
-    label_line = "        "
-    for label in labels:
-        short_label = label[:3] if len(label) > 3 else label
-        label_line += f"{short_label:^3}"
-    lines.append(label_line)
-
-    return "\n".join(lines)
-
-
-def _create_gradient_bar(length: int, value: float, max_val: float) -> str:
-    """Create a gradient bar with visual effects."""
-    if length <= 0:
-        return ""
-
-    # Create gradient effect based on value intensity
-    intensity = value / max_val if max_val > 0 else 0
-
-    if intensity > 0.8:
-        # High values - solid bars
-        return "█" * length
-    elif intensity > 0.6:
-        # Medium-high values - mostly solid with some texture
-        return "█" * (length - 1) + "▉" if length > 1 else "█"
-    elif intensity > 0.4:
-        # Medium values - mixed texture
-        return "▊" * length
-    elif intensity > 0.2:
-        # Low-medium values - lighter texture
-        return "▋" * length
-    else:
-        # Low values - lightest texture
-        return "▌" * length
-
-
-def _generate_ascii_line_chart(data: List[Any], width: int, height: int) -> str:
-    """Generate enhanced ASCII line chart with trend analysis."""
-    if not data:
-        return "No data for line chart"
-
-    lines = []
-    lines.append("📈 Line Chart with Trend Analysis")
-    lines.append("═" * min(width, 60))
-
-    # Extract values and labels for plotting
-    values, labels = _extract_time_series_data(data)
-
-    if not values:
-        return "No numeric data found for line chart"
-
-    # Generate enhanced line chart
-    if len(values) >= 3:
-        lines.extend(_create_enhanced_line_chart(values, labels, width, height))
-    else:
-        # Fallback to sparkline for small datasets
-        sparkline_data = _create_sparkline(values)
-        lines.extend(sparkline_data)
-
-    # Add trend analysis
-    trend_analysis = _analyze_trend(values)
-    lines.append("")
-    lines.append("📊 Trend Analysis:")
-    lines.extend(trend_analysis)
-
-    return "\n".join(lines)
-
-
-def _extract_time_series_data(data: List[Any]) -> tuple[List[float], List[str]]:
-    """Extract time series data with labels."""
-    values = []
-    labels = []
-
-    for row in data[:20]:  # Limit points for readability
-        if isinstance(row, dict):
-            # Find the first numeric value and first string/date value
-            numeric_val = None
-            label_val = None
-
-            for key, val in row.items():
-                if isinstance(val, (int, float)) and numeric_val is None:
-                    numeric_val = val
-                elif isinstance(val, str) and label_val is None:
-                    # Use the key name if it looks like a date/time field
-                    if any(
-                        date_word in key.lower()
-                        for date_word in ["date", "time", "month", "day", "year"]
-                    ):
-                        label_val = str(val)[:10]  # Truncate long dates
-                    else:
-                        label_val = str(val)[:8]  # Truncate long strings
-
-            if numeric_val is not None:
-                values.append(numeric_val)
-                labels.append(label_val or f"P{len(values)}")
-
-    return values, labels
-
-
-def _create_enhanced_line_chart(
-    values: List[float], labels: List[str], width: int, height: int
-) -> List[str]:
-    """Create an enhanced ASCII line chart with better visualization."""
-    lines = []
-    chart_width = min(50, width - 15)
-    chart_height = min(12, height - 8)
-
-    if len(values) < 2:
-        return ["Insufficient data for line chart"]
-
-    # Normalize values to chart height
-    min_val = min(values)
-    max_val = max(values)
-    val_range = max_val - min_val if max_val != min_val else 1
-
-    # Create chart grid
-    grid = [[" " for _ in range(chart_width)] for _ in range(chart_height)]
-
-    # Plot the line with connecting segments
-    prev_x, prev_y = None, None
-
-    for i, value in enumerate(values):
-        # Map to grid coordinates
-        x = int((i / (len(values) - 1)) * (chart_width - 1)) if len(values) > 1 else 0
-        y = chart_height - 1 - int(((value - min_val) / val_range) * (chart_height - 1))
-
-        # Ensure coordinates are within bounds
-        x = max(0, min(x, chart_width - 1))
-        y = max(0, min(y, chart_height - 1))
-
-        # Mark the point
-        grid[y][x] = "●"
-
-        # Draw line segment to previous point
-        if prev_x is not None and prev_y is not None:
-            _draw_line_segment(grid, prev_x, prev_y, x, y, chart_width, chart_height)
-
-        prev_x, prev_y = x, y
-
-    # Render the chart with Y-axis labels
-    for i, row in enumerate(grid):
-        y_val = (
-            max_val - (i / (chart_height - 1)) * val_range
-            if chart_height > 1
-            else max_val
-        )
-        if abs(y_val) >= 1000:
-            y_label = f"{y_val:.0f}"
-        else:
-            y_label = f"{y_val:.1f}"
-        lines.append(f"{y_label:>8} ┤ " + "".join(row))
-
-    # Add X-axis
-    lines.append("         └" + "─" * chart_width)
-
-    # Add selected X-axis labels (show every few labels to avoid crowding)
-    label_line = "          "
-    step = max(1, len(labels) // 6)  # Show max 6 labels
-    for i in range(0, len(labels), step):
-        pos = int((i / (len(values) - 1)) * (chart_width - 1)) if len(values) > 1 else 0
-        # Add spacing to position the label
-        while len(label_line) - 10 < pos:
-            label_line += " "
-        label_line += labels[i][:8]
-
-    lines.append(label_line)
-
-    return lines
-
-
-def _draw_line_segment(
-    grid: List[List[str]], x1: int, y1: int, x2: int, y2: int, width: int, height: int
-) -> None:
-    """Draw a line segment between two points using Bresenham-like algorithm."""
-    # Simple line drawing - connect points with line characters
-    if x1 == x2:  # Vertical line
-        start_y, end_y = sorted([y1, y2])
-        for y in range(start_y + 1, end_y):
-            if 0 <= y < height and 0 <= x1 < width:
-                grid[y][x1] = "│"
-    elif y1 == y2:  # Horizontal line
-        start_x, end_x = sorted([x1, x2])
-        for x in range(start_x + 1, end_x):
-            if 0 <= y1 < height and 0 <= x < width:
-                grid[y1][x] = "─"
-    else:  # Diagonal line - use simple interpolation
-        steps = max(abs(x2 - x1), abs(y2 - y1))
-        for step in range(1, steps):
-            x = x1 + int((x2 - x1) * step / steps)
-            y = y1 + int((y2 - y1) * step / steps)
-            if 0 <= x < width and 0 <= y < height:
-                if abs(x2 - x1) > abs(y2 - y1):
-                    grid[y][x] = "─"
-                else:
-                    grid[y][x] = "│"
-
-
-def _analyze_trend(values: List[float]) -> List[str]:
-    """Analyze trend in the data."""
-    if len(values) < 2:
-        return ["• Insufficient data for trend analysis"]
-
-    analysis = []
-
-    # Calculate basic statistics
-    first_val = values[0]
-    last_val = values[-1]
-    min_val = min(values)
-    max_val = max(values)
-    avg_val = sum(values) / len(values)
-
-    # Overall trend
-    if last_val > first_val * 1.1:
-        trend_icon = "📈"
-        trend_desc = "Strong upward trend"
-    elif last_val > first_val * 1.05:
-        trend_icon = "📊"
-        trend_desc = "Moderate upward trend"
-    elif last_val < first_val * 0.9:
-        trend_icon = "📉"
-        trend_desc = "Strong downward trend"
-    elif last_val < first_val * 0.95:
-        trend_icon = "📊"
-        trend_desc = "Moderate downward trend"
-    else:
-        trend_icon = "➡️"
-        trend_desc = "Relatively stable"
-
-    analysis.append(f"• {trend_icon} {trend_desc}")
-    analysis.append(f"• Range: {min_val:.1f} to {max_val:.1f} (avg: {avg_val:.1f})")
-
-    # Volatility
-    if len(values) >= 3:
-        changes = [abs(values[i] - values[i - 1]) for i in range(1, len(values))]
-        avg_change = sum(changes) / len(changes)
-        volatility = "High" if avg_change > (max_val - min_val) * 0.1 else "Low"
-        analysis.append(f"• Volatility: {volatility}")
-
-    return analysis
-
-
-def _extract_numeric_values(data: List[Any]) -> List[float]:
-    """Extract numeric values from data for line chart."""
-    values = []
-    for row in data[:20]:  # Limit points
-        if isinstance(row, dict):
-            for _key, val in row.items():
-                if isinstance(val, (int, float)):
-                    values.append(val)
-                    break
-    return values
-
-
-def _create_sparkline(values: List[float]) -> List[str]:
-    """Create sparkline visualization from values."""
-    if len(values) <= 1:
-        return []
-
-    max_val = max(values)
-    min_val = min(values)
-    range_val = max_val - min_val if max_val != min_val else 1
-
-    sparkline = ""
-    for val in values:
-        normalized = (val - min_val) / range_val
-        if normalized < 0.2:
-            sparkline += "▁"
-        elif normalized < 0.4:
-            sparkline += "▂"
-        elif normalized < 0.6:
-            sparkline += "▄"
-        elif normalized < 0.8:
-            sparkline += "▆"
-        else:
-            sparkline += "█"
-
-    # Safe formatting to avoid NaN display
-    if _is_nan_value(min_val) or _is_nan_value(max_val):
-        return ["Range: Unable to calculate from data", sparkline]
-    else:
-        return [f"Range: {min_val:.2f} to {max_val:.2f}", sparkline]
-
-
-def _is_nan_value(value: Any) -> bool:
-    """Check if a value is NaN or invalid."""
-    try:
-        import math
-
-        return math.isnan(float(value))
-    except (ValueError, TypeError):
-        return True
-
-
-def _generate_ascii_scatter_chart(data: List[Any], width: int, height: int) -> str:
-    """Generate ASCII scatter plot."""
-    if not data:
-        return "No data for scatter chart"
-
-    lines = []
-    lines.append("ASCII Scatter Plot")
-    lines.append("=" * min(width, 50))
-
-    # Extract data points
-    x_values, y_values, x_column, y_column = _extract_scatter_data(data)
-
-    # Debug info
-    lines.extend(_create_debug_info(x_values, y_values, x_column, y_column, data))
-
-    # Check if we have enough data
-    if len(x_values) < 2:
-        return _generate_ascii_table(data, width)
-
-    # Add axis info
-    lines.extend(_create_axis_info(x_values, y_values, x_column, y_column))
-
-    # Create and render grid
-    grid = _create_scatter_grid(x_values, y_values, width, height)
-    lines.extend(_render_scatter_grid(grid, x_values, y_values, width, height))
-
-    return "\n".join(lines)
-
-
-def _extract_scatter_data(
-    data: List[Any],
-) -> tuple[List[float], List[float], str | None, str | None]:
-    """Extract X,Y data from scatter chart data."""
-    x_values = []
-    y_values = []
-    x_column = None
-    y_column = None
-    numeric_columns = []
-
-    if data and isinstance(data[0], dict):
-        # Find the first two numeric columns
-        for key, val in data[0].items():
-            if isinstance(val, (int, float)) and not (
-                isinstance(val, float) and (val != val)
-            ):  # Exclude NaN
-                numeric_columns.append(key)
-
-        if len(numeric_columns) >= 2:
-            x_column = numeric_columns[0]
-            y_column = numeric_columns[1]
-
-            # Extract X,Y pairs
-            for row in data[:50]:  # Limit for ASCII display
-                if isinstance(row, dict):
-                    x_val = row.get(x_column)
-                    y_val = row.get(y_column)
-                    # Check for valid numbers (not NaN)
-                    if (
-                        isinstance(x_val, (int, float))
-                        and isinstance(y_val, (int, float))
-                        and not (
-                            isinstance(x_val, float) and (x_val != x_val)
-                        )  # Not NaN
-                        and not (isinstance(y_val, float) and (y_val != y_val))
-                    ):  # Not NaN
-                        x_values.append(x_val)
-                        y_values.append(y_val)
-
-    return x_values, y_values, x_column, y_column
-
-
-def _create_debug_info(
-    x_values: List[float],
-    y_values: List[float],
-    x_column: str | None,
-    y_column: str | None,
-    data: List[Any],
-) -> List[str]:
-    """Create debug information lines for scatter chart."""
-    numeric_columns = []
-    if data and isinstance(data[0], dict):
-        for key, val in data[0].items():
-            if isinstance(val, (int, float)) and not (
-                isinstance(val, float) and (val != val)
-            ):
-                numeric_columns.append(key)
-
-    return [
-        f"DEBUG: Found {len(numeric_columns)} numeric columns: {numeric_columns}",
-        f"DEBUG: X column: {x_column}, Y column: {y_column}",
-        f"DEBUG: Valid X,Y pairs: {len(x_values)}",
-    ]
-
-
-def _create_axis_info(
-    x_values: List[float],
-    y_values: List[float],
-    x_column: str | None,
-    y_column: str | None,
-) -> List[str]:
-    """Create axis information lines."""
-    return [
-        f"X-axis: {x_column} (range: {min(x_values):.2f} to {max(x_values):.2f})",
-        f"Y-axis: {y_column} (range: {min(y_values):.2f} to {max(y_values):.2f})",
-        f"Showing {len(x_values)} data points",
-        "",
-    ]
-
-
-def _create_scatter_grid(
-    x_values: List[float], y_values: List[float], width: int, height: int
-) -> List[List[str]]:
-    """Create and populate the scatter plot grid."""
-    plot_width = min(40, width - 10)
-    plot_height = min(15, height - 8)
-
-    # Normalize values to fit in grid
-    x_min, x_max = min(x_values), max(x_values)
-    y_min, y_max = min(y_values), max(y_values)
-    x_range = x_max - x_min if x_max != x_min else 1
-    y_range = y_max - y_min if y_max != y_min else 1
-
-    # Create grid
-    grid = [[" " for _ in range(plot_width)] for _ in range(plot_height)]
-
-    # Plot points
-    for x, y in zip(x_values, y_values, strict=False):
-        try:
-            grid_x = int(((x - x_min) / x_range) * (plot_width - 1))
-            grid_y = int(((y - y_min) / y_range) * (plot_height - 1))
-            grid_y = plot_height - 1 - grid_y  # Flip Y axis for display
-
-            if 0 <= grid_x < plot_width and 0 <= grid_y < plot_height:
-                if grid[grid_y][grid_x] == " ":
-                    grid[grid_y][grid_x] = "•"
-                else:
-                    grid[grid_y][grid_x] = "█"  # Multiple points
-        except (ValueError, OverflowError):
-            # Skip points that can't be converted to integers (NaN, inf, etc.)
-            continue
-
-    return grid
-
-
-def _render_scatter_grid(
-    grid: List[List[str]],
-    x_values: List[float],
-    y_values: List[float],
-    width: int,
-    height: int,
-) -> List[str]:
-    """Render the scatter plot grid with axes and labels."""
-    lines = []
-    plot_width = min(40, width - 10)
-    plot_height = min(15, height - 8)
-
-    x_min, x_max = min(x_values), max(x_values)
-    y_min, y_max = min(y_values), max(y_values)
-    y_range = y_max - y_min if y_max != y_min else 1
-
-    # Add Y-axis labels and plot
-    for i, row in enumerate(grid):
-        y_val = y_max - (i / (plot_height - 1)) * y_range if plot_height > 1 else y_max
-        y_label = f"{y_val:.1f}" if abs(y_val) < 1000 else f"{y_val:.0f}"
-        lines.append(f"{y_label:>6} |{''.join(row)}")
-
-    # Add X-axis
-    x_axis_line = " " * 7 + "+" + "-" * plot_width
-    lines.append(x_axis_line)
-
-    # Add X-axis labels
-    x_left_label = f"{x_min:.1f}" if abs(x_min) < 1000 else f"{x_min:.0f}"
-    x_right_label = f"{x_max:.1f}" if abs(x_max) < 1000 else f"{x_max:.0f}"
-    x_labels = (
-        " " * 8
-        + x_left_label
-        + " " * (plot_width - len(x_left_label) - len(x_right_label))
-        + x_right_label
-    )
-    lines.append(x_labels)
-
-    return lines
-
-
-def _generate_ascii_table(data: List[Any], width: int) -> str:
-    """Generate enhanced ASCII table with better formatting."""
-    if not data:
-        return "No data for table"
-
-    lines = []
-    lines.append("📋 Data Table")
-    lines.append("═" * min(width, 70))
-
-    # Get column headers from first row
-    if isinstance(data[0], dict):
-        # Select best columns to display
-        all_headers = list(data[0].keys())
-        headers = _select_display_columns(all_headers, data, max_cols=6)
-
-        # Calculate optimal column widths
-        col_widths = _calculate_column_widths(headers, data, width)
-
-        # Create enhanced header
-        lines.append(_create_table_header(headers, col_widths))
-        lines.append(_create_table_separator(col_widths))
-
-        # Add data rows with better formatting
-        row_count = min(15, len(data))  # Show more rows
-        for i, row in enumerate(data[:row_count]):
-            formatted_row = _format_table_row(row, headers, col_widths)
-            lines.append(formatted_row)
-
-            # Add separator every 5 rows for readability
-            if i > 0 and (i + 1) % 5 == 0 and i < row_count - 1:
-                lines.append(_create_light_separator(col_widths))
-
-        # Add footer with stats
-        lines.append(_create_table_separator(col_widths))
-        lines.append(f"📊 Showing {row_count} of {len(data)} rows")
-
-        # Add column summaries for numeric columns
-        numeric_summaries = _create_numeric_summaries(data, headers)
-        if numeric_summaries:
-            lines.append("")
-            lines.append("📈 Numeric Summaries:")
-            lines.extend(numeric_summaries)
-
-    return "\n".join(lines)
-
-
-def _select_display_columns(
-    all_headers: List[str], data: List[Any], max_cols: int = 6
-) -> List[str]:
-    """Select the most interesting columns to display."""
-    if len(all_headers) <= max_cols:
-        return all_headers
-
-    # Prioritize columns by interest level
-    priority_scores = {}
-
-    for header in all_headers:
-        score = 0
-        header_lower = header.lower()
-
-        # Higher priority for common business fields
-        if any(word in header_lower for word in ["name", "title", "id"]):
-            score += 10
-        if any(
-            word in header_lower
-            for word in ["amount", "price", "cost", "revenue", "sales"]
-        ):
-            score += 8
-        if any(word in header_lower for word in ["date", "time", "created", "updated"]):
-            score += 6
-        if any(word in header_lower for word in ["count", "total", "sum", "avg"]):
-            score += 5
-
-        # Check data variety (more variety = more interesting)
-        sample_values = [
-            str(row.get(header, "")) for row in data[:10] if isinstance(row, dict)
-        ]
-        unique_values = len(set(sample_values))
-        if unique_values > 1:
-            score += min(unique_values, 5)
-
-        priority_scores[header] = score
-
-    # Return top scoring columns
-    sorted_headers = sorted(
-        all_headers, key=lambda h: priority_scores.get(h, 0), reverse=True
-    )
-    return sorted_headers[:max_cols]
-
-
-def _calculate_column_widths(
-    headers: List[str], data: List[Any], total_width: int
-) -> List[int]:
-    """Calculate optimal column widths based on content."""
-    if not headers:
-        return []
-
-    # Start with minimum widths based on header lengths
-    min_widths = [max(8, min(len(h) + 2, 15)) for h in headers]
-
-    # Check actual data to adjust widths
-    for row in data[:10]:  # Sample first 10 rows
-        if isinstance(row, dict):
-            for i, header in enumerate(headers):
-                val = row.get(header, "")
-                if isinstance(val, float):
-                    content_len = len(f"{val:.2f}")
-                elif isinstance(val, int):
-                    content_len = len(str(val))
-                else:
-                    content_len = len(str(val))
-
-                min_widths[i] = max(min_widths[i], min(content_len + 1, 20))
-
-    # Distribute remaining space proportionally
-    used_width = sum(min_widths) + len(headers) * 3  # Account for separators
-    available_width = min(total_width - 10, 80)  # Leave margins
-
-    if used_width < available_width:
-        # Distribute extra space
-        extra_space = available_width - used_width
-        for i in range(len(min_widths)):
-            min_widths[i] += extra_space // len(min_widths)
-
-    return min_widths
-
-
-def _create_table_header(headers: List[str], widths: List[int]) -> str:
-    """Create formatted table header."""
-    formatted_headers = []
-    for header, width in zip(headers, widths, strict=False):
-        # Truncate and center header
-        display_header = header[: width - 2] if len(header) > width - 2 else header
-        formatted_headers.append(f"{display_header:^{width}}")
-
-    return (
-        "┌"
-        + "┬".join("─" * w for w in widths)
-        + "┐\n│"
-        + "│".join(formatted_headers)
-        + "│"
-    )
-
-
-def _create_table_separator(widths: List[int]) -> str:
-    """Create table separator line."""
-    return "├" + "┼".join("─" * w for w in widths) + "┤"
-
-
-def _create_light_separator(widths: List[int]) -> str:
-    """Create light separator line."""
-    return "├" + "┼".join("┈" * w for w in widths) + "┤"
-
-
-def _format_table_row(
-    row: Dict[str, Any], headers: List[str], widths: List[int]
-) -> str:
-    """Format a single table row."""
-    formatted_values = []
-
-    for header, width in zip(headers, widths, strict=False):
-        val = row.get(header, "")
-
-        # Format value based on type
-        if isinstance(val, float):
-            if abs(val) >= 1000000:
-                formatted_val = f"{val / 1000000:.1f}M"
-            elif abs(val) >= 1000:
-                formatted_val = f"{val / 1000:.1f}K"
-            else:
-                formatted_val = f"{val:.2f}"
-        elif isinstance(val, int):
-            if abs(val) >= 1000000:
-                formatted_val = f"{val // 1000000}M"
-            elif abs(val) >= 1000:
-                formatted_val = f"{val // 1000}K"
-            else:
-                formatted_val = str(val)
-        else:
-            formatted_val = str(val)
-
-        # Truncate if too long
-        if len(formatted_val) > width - 2:
-            formatted_val = formatted_val[: width - 5] + "..."
-
-        # Align numbers right, text left
-        if isinstance(val, (int, float)):
-            formatted_values.append(f"{formatted_val:>{width - 2}}")
-        else:
-            formatted_values.append(f"{formatted_val:<{width - 2}}")
-
-    return "│ " + " │ ".join(formatted_values) + " │"
-
-
-def _create_numeric_summaries(data: List[Any], headers: List[str]) -> List[str]:
-    """Create summaries for numeric columns."""
-    summaries = []
-
-    for header in headers:
-        # Collect numeric values
-        values = []
-        for row in data:
-            if isinstance(row, dict):
-                val = row.get(header)
-                if isinstance(val, (int, float)):
-                    values.append(val)
-
-        if len(values) >= 2:
-            min_val = min(values)
-            max_val = max(values)
-            avg_val = sum(values) / len(values)
-
-            if abs(avg_val) >= 1000:
-                avg_str = f"{avg_val / 1000:.1f}K"
-            else:
-                avg_str = f"{avg_val:.1f}"
-
-            summaries.append(
-                f"  {header}: avg={avg_str}, range={min_val:.1f}-{max_val:.1f}"
-            )
-
-    return summaries
-
-
 async def _get_chart_preview_internal(  # noqa: C901
     request: GetChartPreviewRequest,
     ctx: Context,
@@ -1833,7 +990,6 @@ async def _get_chart_preview_internal(  # noqa: C901
     """
     try:
         await ctx.report_progress(1, 3, "Looking up chart")
-        from superset.daos.chart import ChartDAO
 
         # Find the chart
         with event_logger.log_context(action="mcp.get_chart_preview.chart_lookup"):
@@ -1902,25 +1058,16 @@ async def _get_chart_preview_internal(  # noqa: C901
                             error_type="NotFound",
                         )
 
-            elif isinstance(request.identifier, int) or (
-                isinstance(request.identifier, str) and request.identifier.isdigit()
-            ):
-                chart_id = (
-                    int(request.identifier)
-                    if isinstance(request.identifier, str)
-                    else request.identifier
-                )
+            else:
                 await ctx.debug(
-                    "Performing ID-based chart lookup: chart_id=%s" % (chart_id,)
+                    "Looking up chart: identifier=%s" % (request.identifier,)
                 )
-                chart = ChartDAO.find_by_id(chart_id)
-            elif isinstance(request.identifier, str):
-                await ctx.debug(
-                    "Performing UUID-based chart lookup: uuid=%s"
-                    % (request.identifier,)
-                )
-                # Try UUID lookup using DAO flexible method
-                chart = ChartDAO.find_by_id(request.identifier, id_column="uuid")
+                if request.identifier is None:
+                    return ChartError(
+                        error="Chart identifier is required",
+                        error_type="ValidationError",
+                    )
+                chart = find_chart_by_identifier(request.identifier)
 
                 # If not found and looks like a form_data_key, try transient
                 if (
@@ -2186,7 +1333,6 @@ async def _get_chart_preview_internal(  # noqa: C901
         destructiveHint=False,
     ),
 )
-@parse_request(GetChartPreviewRequest)
 async def get_chart_preview(
     request: GetChartPreviewRequest, ctx: Context
 ) -> ChartPreview | ChartError:
@@ -2233,7 +1379,32 @@ async def get_chart_preview(
             )
 
         return result
-    except Exception as e:
+    except OAuth2RedirectError as ex:
+        await ctx.error(
+            "Chart preview requires OAuth authentication: identifier=%s"
+            % request.identifier
+        )
+        return ChartError(
+            error=build_oauth2_redirect_message(ex),
+            error_type="OAUTH2_REDIRECT",
+        )
+    except OAuth2Error:
+        await ctx.error(
+            "OAuth2 configuration error: identifier=%s" % request.identifier
+        )
+        return ChartError(
+            error=OAUTH2_CONFIG_ERROR_MESSAGE,
+            error_type="OAUTH2_REDIRECT_ERROR",
+        )
+    except (
+        SupersetException,
+        CommandException,
+        SQLAlchemyError,
+        KeyError,
+        ValueError,
+        TypeError,
+        AttributeError,
+    ) as e:
         await ctx.error(
             "Chart preview generation failed: identifier=%s, error=%s, error_type=%s"
             % (
diff --git a/superset/mcp_service/chart/tool/get_chart_sql.py b/superset/mcp_service/chart/tool/get_chart_sql.py
new file mode 100644
index 00000000000..861d8ea89b2
--- /dev/null
+++ b/superset/mcp_service/chart/tool/get_chart_sql.py
@@ -0,0 +1,512 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+"""
+MCP tool: get_chart_sql
+"""
+
+import logging
+from typing import Any, TYPE_CHECKING
+
+from fastmcp import Context
+from superset_core.mcp.decorators import tool, ToolAnnotations
+
+if TYPE_CHECKING:
+    from superset.models.slice import Slice
+
+from superset.commands.exceptions import CommandException
+from superset.commands.explore.form_data.parameters import CommandParameters
+from superset.exceptions import SupersetException, SupersetSecurityException
+from superset.extensions import event_logger
+from superset.mcp_service.chart.chart_utils import validate_chart_dataset
+from superset.mcp_service.chart.schemas import (
+    ChartError,
+    ChartSql,
+    GetChartSqlRequest,
+)
+
+logger = logging.getLogger(__name__)
+
+
+def _get_cached_form_data(form_data_key: str) -> str | None:
+    """Retrieve form_data from cache using form_data_key.
+
+    Returns the JSON string of form_data if found, None otherwise.
+    """
+    from superset.commands.explore.form_data.get import GetFormDataCommand
+
+    try:
+        cmd_params = CommandParameters(key=form_data_key)
+        return GetFormDataCommand(cmd_params).run()
+    except (KeyError, ValueError, CommandException) as e:
+        logger.warning("Failed to retrieve form_data from cache: %s", e)
+        return None
+
+
+def _resolve_metrics(form_data: dict[str, Any], viz_type: str) -> list[Any]:
+    """Extract metrics from form_data, handling chart-type-specific fields."""
+    # Bubble charts store measures in x, y, size fields
+    if viz_type == "bubble":
+        return [m for field in ("x", "y", "size") if (m := form_data.get(field))]
+
+    metrics = form_data.get("metrics", [])
+    # Fallback: some chart types store the measure as singular "metric"
+    if not metrics and (metric := form_data.get("metric")):
+        metrics = [metric]
+    return metrics
+
+
+def _resolve_groupby(form_data: dict[str, Any]) -> list[str]:
+    """Extract groupby columns from form_data with fallback aliases.
+
+    Normalises scalar strings (e.g. heatmap_v2 migrated from legacy
+    ``all_columns_y``) so that ``list("country")`` does not split into
+    individual characters.
+    """
+    raw_groupby = form_data.get("groupby") or []
+    if isinstance(raw_groupby, str):
+        groupby: list[str] = [raw_groupby]
+    else:
+        groupby = list(raw_groupby)
+
+    if groupby:
+        return groupby
+
+    # Fallback: some chart types store dimensions in entity/series/columns
+    for field in ("entity", "series"):
+        value = form_data.get(field)
+        if isinstance(value, str) and value not in groupby:
+            groupby.append(value)
+
+    form_columns = form_data.get("columns")
+    if isinstance(form_columns, list):
+        for col in form_columns:
+            if isinstance(col, str) and col not in groupby:
+                groupby.append(col)
+
+    return groupby
+
+
+def _resolve_metrics_and_groupby(
+    form_data: dict[str, Any],
+    chart: "Slice | None",
+) -> tuple[list[Any], list[str]]:
+    """Resolve metrics and groupby columns from form_data.
+
+    Handles chart-type-specific field names: singular ``metric`` for
+    big-number variants, bubble ``x``/``y``/``size``, and fallback
+    fields ``entity``, ``series``, and ``columns`` for dimensions.
+    """
+    viz_type = form_data.get(
+        "viz_type", getattr(chart, "viz_type", "") if chart else ""
+    )
+
+    singular_metric_no_groupby = (
+        "big_number",
+        "big_number_total",
+        "pop_kpi",
+    )
+    if viz_type in singular_metric_no_groupby:
+        metrics: list[Any] = [metric] if (metric := form_data.get("metric")) else []
+        return metrics, []
+
+    return _resolve_metrics(form_data, viz_type), _resolve_groupby(form_data)
+
+
+def _build_query_context_from_form_data(
+    form_data: dict[str, Any],
+    chart: "Slice | None" = None,
+) -> Any:
+    """Build a QueryContext from form_data with result_type=QUERY.
+
+    This constructs a query context that will return the rendered SQL
+    instead of executing the query.
+    """
+    from superset.common.chart_data import ChartDataResultType
+    from superset.common.query_context_factory import QueryContextFactory
+
+    factory = QueryContextFactory()
+
+    datasource_id = form_data.get("datasource_id")
+    datasource_type = form_data.get("datasource_type")
+
+    # Unsaved Explore state often stores datasource as a combined field
+    # like "123__table" instead of separate datasource_id/datasource_type.
+    if not datasource_id and (combined := form_data.get("datasource")):
+        if isinstance(combined, str) and "__" in combined:
+            parts = combined.split("__", 1)
+            datasource_id = int(parts[0]) if parts[0].isdigit() else parts[0]
+            datasource_type = parts[1] if len(parts) > 1 else None
+
+    if not datasource_id and chart:
+        datasource_id = getattr(chart, "datasource_id", None)
+    if not datasource_type and chart:
+        datasource_type = getattr(chart, "datasource_type", None)
+
+    metrics, groupby = _resolve_metrics_and_groupby(form_data, chart)
+
+    # Build a minimal query object; let QueryContextFactory handle temporal
+    # fields (time_range, granularity_sqla), adhoc_filters, WHERE/HAVING
+    # clauses, etc. from form_data — same approach as get_chart_data.
+    query_dict: dict[str, Any] = {
+        "columns": groupby,
+        "metrics": metrics,
+    }
+
+    if (row_limit := form_data.get("row_limit")) is not None:
+        query_dict["row_limit"] = row_limit
+
+    # Ensure datasource fields satisfy DatasourceDict typing requirements.
+    # datasource_id must be int | str; datasource_type must be str.
+    if not isinstance(datasource_id, (int, str)):
+        raise ValueError(
+            "Cannot determine datasource ID from form_data. "
+            "Provide a chart identifier or ensure form_data contains "
+            "'datasource_id' or 'datasource'."
+        )
+    resolved_id: int | str = datasource_id
+    resolved_type: str = (
+        datasource_type if isinstance(datasource_type, str) else "table"
+    )
+
+    return factory.create(
+        datasource={"id": resolved_id, "type": resolved_type},
+        queries=[query_dict],
+        form_data=form_data,
+        result_type=ChartDataResultType.QUERY,
+        force=False,
+    )
+
+
+def _find_chart_by_identifier(
+    identifier: int | str,
+) -> "Slice | None":
+    """Look up a chart by numeric ID or UUID string."""
+    from superset.daos.chart import ChartDAO
+
+    if isinstance(identifier, int) or (
+        isinstance(identifier, str) and identifier.isdigit()
+    ):
+        chart_id = int(identifier) if isinstance(identifier, str) else identifier
+        return ChartDAO.find_by_id(chart_id)
+    if isinstance(identifier, str):
+        return ChartDAO.find_by_id(identifier, id_column="uuid")
+    return None
+
+
+def _resolve_effective_form_data(
+    chart: "Slice",
+    form_data_key: str | None,
+) -> tuple[dict[str, Any], bool]:
+    """Resolve the effective form_data for a chart.
+
+    Returns (form_data_dict, using_unsaved_state).
+    """
+    from superset.utils import json as utils_json
+
+    if form_data_key:
+        if cached_raw := _get_cached_form_data(form_data_key):
+            try:
+                parsed = utils_json.loads(cached_raw)
+                if isinstance(parsed, dict):
+                    return parsed, True
+            except (TypeError, ValueError):
+                pass
+
+    try:
+        saved = utils_json.loads(chart.params) if chart.params else {}
+    except (TypeError, ValueError):
+        saved = {}
+    return saved if isinstance(saved, dict) else {}, False
+
+
+def _sql_from_saved_query_context(
+    chart: "Slice",
+) -> ChartSql | ChartError | None:
+    """Try to extract SQL from a chart's saved query_context.
+
+    Returns None if the chart has no query_context or parsing fails.
+    """
+    from superset.charts.schemas import ChartDataQueryContextSchema
+    from superset.commands.chart.data.get_data_command import ChartDataCommand
+    from superset.common.chart_data import ChartDataResultType
+    from superset.utils import json as utils_json
+
+    if not chart.query_context:
+        return None
+
+    try:
+        qc_json = utils_json.loads(chart.query_context)
+        qc_json["result_type"] = ChartDataResultType.QUERY
+        qc_json["force"] = False
+
+        query_context = ChartDataQueryContextSchema().load(qc_json)
+        query_context.result_type = ChartDataResultType.QUERY
+
+        command = ChartDataCommand(query_context)
+        command.validate()
+        result = command.run()
+
+        return _extract_sql_from_result(
+            result, chart.id, chart.slice_name, chart.datasource_name
+        )
+    except SupersetSecurityException:
+        raise  # Let access denials propagate for consistent error handling
+    except (SupersetException, CommandException, TypeError, ValueError):
+        return None
+
+
+def _sql_from_form_data(
+    form_data: dict[str, Any],
+    chart: "Slice | None",
+) -> ChartSql | ChartError:
+    """Build SQL from form_data (fallback path)."""
+    from superset.commands.chart.data.get_data_command import ChartDataCommand
+
+    query_context = _build_query_context_from_form_data(form_data, chart)
+    command = ChartDataCommand(query_context)
+    command.validate()
+    result = command.run()
+
+    return _extract_sql_from_result(
+        result,
+        chart_id=getattr(chart, "id", None),
+        chart_name=getattr(chart, "slice_name", None),
+        datasource_name=getattr(chart, "datasource_name", None),
+    )
+
+
+def _extract_sql_from_result(
+    result: dict[str, Any],
+    chart_id: int | None,
+    chart_name: str | None,
+    datasource_name: str | None,
+) -> ChartSql | ChartError:
+    """Extract SQL query string(s) from the ChartDataCommand result.
+
+    Charts with multiple queries (e.g. mixed timeseries) produce multiple
+    query entries.  This collects SQL from all of them so that composite
+    visualisations do not silently lose part of their SQL.
+    """
+    queries = result.get("queries", [])
+    if not queries:
+        return ChartError(
+            error=(
+                "No query results returned. The chart may have an empty configuration."
+            ),
+            error_type="EmptyQuery",
+        )
+
+    sql_parts: list[str] = []
+    errors: list[str] = []
+    language = "sql"
+
+    for idx, query_result in enumerate(queries, start=1):
+        if not isinstance(query_result, dict):
+            continue
+        if "language" in query_result and isinstance(query_result["language"], str):
+            language = query_result["language"]
+        query_sql = query_result.get("query", "")
+        query_error = query_result.get("error")
+
+        if query_sql:
+            sql_parts.append(
+                query_sql if len(queries) == 1 else f"-- Query {idx}\n{query_sql}"
+            )
+        if query_error:
+            errors.append(f"Query {idx}: {query_error}")
+
+    if not sql_parts and errors:
+        return ChartError(
+            error="SQL generation failed: " + "; ".join(errors),
+            error_type="QueryGenerationFailed",
+        )
+
+    return ChartSql(
+        chart_id=chart_id,
+        chart_name=chart_name,
+        sql="\n\n".join(sql_parts),
+        language=language,
+        datasource_name=datasource_name,
+        error="; ".join(errors) if errors else None,
+    )
+
+
+@tool(
+    tags=["data"],
+    class_permission_name="Chart",
+    annotations=ToolAnnotations(
+        title="Get chart SQL",
+        readOnlyHint=True,
+        destructiveHint=False,
+    ),
+)
+async def get_chart_sql(
+    request: GetChartSqlRequest, ctx: Context
+) -> ChartSql | ChartError:
+    """Get the rendered SQL query for a chart without executing it.
+
+    Returns the SQL that a chart would execute, similar to the "View Query"
+    feature in the Superset UI. Useful for understanding, debugging, or
+    auditing the SQL generated by a chart's configuration.
+
+    Note: The returned SQL is RLS-scoped to the caller and contains
+    table/schema names. Same disclosure surface as the Superset UI
+    "View Query" modal. Consumers should not log or share the output
+    without considering data-access implications.
+
+    Supports:
+    - Numeric ID or UUID lookup
+    - form_data_key: get SQL for unsaved chart state from Explore view
+
+    Example usage:
+    ```json
+    {
+        "identifier": 123
+    }
+    ```
+
+    Returns the SQL query string and metadata about the chart.
+    """
+    await ctx.info(
+        "Starting chart SQL retrieval: identifier=%s, form_data_key=%s"
+        % (request.identifier, request.form_data_key)
+    )
+
+    try:
+        return await _handle_chart_sql_request(request, ctx)
+    except SupersetException as e:
+        logger.exception("Superset error in get_chart_sql")
+        return ChartError(
+            error=f"Superset error: {e}",
+            error_type="SupersetError",
+        )
+    except (ValueError, TypeError) as e:
+        logger.exception("Unexpected error in get_chart_sql")
+        return ChartError(
+            error=f"Failed to generate chart SQL: {e}",
+            error_type="QueryGenerationFailed",
+        )
+
+
+async def _handle_chart_sql_request(
+    request: GetChartSqlRequest, ctx: Context
+) -> ChartSql | ChartError:
+    """Core logic for get_chart_sql, extracted for complexity."""
+    # Handle unsaved chart (form_data_key only, no identifier)
+    if not request.identifier and request.form_data_key:
+        return await _handle_unsaved_chart_sql(request.form_data_key, ctx)
+
+    # Find the chart by identifier
+    if request.identifier is None:
+        return ChartError(
+            error="Chart identifier is required.",
+            error_type="ValidationError",
+        )
+    with event_logger.log_context(action="mcp.get_chart_sql.chart_lookup"):
+        chart = _find_chart_by_identifier(request.identifier)
+
+    if not chart:
+        return ChartError(
+            error=f"No chart found with identifier: {request.identifier}",
+            error_type="NotFound",
+        )
+
+    await ctx.info(
+        "Chart found: chart_id=%s, chart_name=%s, viz_type=%s"
+        % (chart.id, chart.slice_name, chart.viz_type)
+    )
+
+    # Validate the chart's dataset is accessible
+    validation_result = validate_chart_dataset(chart, check_access=True)
+    if not validation_result.is_valid:
+        await ctx.warning(
+            "Chart found but dataset is not accessible: %s" % (validation_result.error,)
+        )
+        return ChartError(
+            error=validation_result.error or "Chart's dataset is not accessible.",
+            error_type="DatasetNotAccessible",
+        )
+    for warning in validation_result.warnings:
+        await ctx.warning("Dataset warning: %s" % (warning,))
+
+    # Resolve effective form_data
+    effective_form_data, using_unsaved_state = _resolve_effective_form_data(
+        chart, request.form_data_key
+    )
+
+    # Try saved query_context first (faster, more accurate)
+    with event_logger.log_context(action="mcp.get_chart_sql.build_query"):
+        if not using_unsaved_state:
+            saved_result = _sql_from_saved_query_context(chart)
+            if saved_result is not None:
+                return saved_result
+            await ctx.warning(
+                "Could not extract SQL from saved query_context. "
+                "Falling back to form_data."
+            )
+
+        # Fallback: build query context from form_data
+        try:
+            return _sql_from_form_data(effective_form_data, chart)
+        except (SupersetException, CommandException, ValueError) as e:
+            await ctx.warning("Failed to build SQL from form_data: %s" % str(e))
+            return ChartError(
+                error="Failed to generate SQL for chart %s: %s" % (chart.id, e),
+                error_type="QueryGenerationFailed",
+            )
+
+
+async def _handle_unsaved_chart_sql(
+    form_data_key: str, ctx: Context
+) -> ChartSql | ChartError:
+    """Handle SQL retrieval for unsaved charts (form_data_key only)."""
+    from superset.utils import json as utils_json
+
+    with event_logger.log_context(action="mcp.get_chart_sql.unsaved_chart_from_cache"):
+        await ctx.info(
+            "No chart identifier - getting SQL from unsaved chart cache: "
+            "form_data_key=%s" % (form_data_key,)
+        )
+        cached_form_data = _get_cached_form_data(form_data_key)
+        if not cached_form_data:
+            return ChartError(
+                error="No cached chart data found for form_data_key. "
+                "The cache may have expired.",
+                error_type="NotFound",
+            )
+        try:
+            form_data = utils_json.loads(cached_form_data)
+        except (TypeError, ValueError) as e:
+            return ChartError(
+                error=f"Failed to parse cached form_data: {e}",
+                error_type="ParseError",
+            )
+        if not isinstance(form_data, dict):
+            return ChartError(
+                error="Cached form_data is not a valid JSON object.",
+                error_type="ParseError",
+            )
+
+        try:
+            return _sql_from_form_data(form_data, chart=None)
+        except (SupersetException, CommandException, ValueError) as e:
+            await ctx.warning("Failed to generate SQL from form_data: %s" % str(e))
+            return ChartError(
+                error="Failed to generate SQL from cached form_data: %s" % str(e),
+                error_type="QueryGenerationFailed",
+            )
diff --git a/superset/mcp_service/chart/tool/get_chart_type_schema.py b/superset/mcp_service/chart/tool/get_chart_type_schema.py
new file mode 100644
index 00000000000..dc21f3c6203
--- /dev/null
+++ b/superset/mcp_service/chart/tool/get_chart_type_schema.py
@@ -0,0 +1,174 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+"""
+MCP tool: get_chart_type_schema
+"""
+
+from __future__ import annotations
+
+import logging
+from typing import Any, Dict
+
+from pydantic import TypeAdapter
+from superset_core.mcp.decorators import tool, ToolAnnotations
+
+from superset.mcp_service.chart.schemas import (
+    BigNumberChartConfig,
+    HandlebarsChartConfig,
+    MixedTimeseriesChartConfig,
+    PieChartConfig,
+    PivotTableChartConfig,
+    TableChartConfig,
+    XYChartConfig,
+)
+
+logger = logging.getLogger(__name__)
+
+# Module-level TypeAdapters — one per chart type, compiled once.
+_CHART_TYPE_ADAPTERS: Dict[str, TypeAdapter[Any]] = {
+    "xy": TypeAdapter(XYChartConfig),
+    "table": TypeAdapter(TableChartConfig),
+    "pie": TypeAdapter(PieChartConfig),
+    "pivot_table": TypeAdapter(PivotTableChartConfig),
+    "mixed_timeseries": TypeAdapter(MixedTimeseriesChartConfig),
+    "handlebars": TypeAdapter(HandlebarsChartConfig),
+    "big_number": TypeAdapter(BigNumberChartConfig),
+}
+
+VALID_CHART_TYPES = sorted(_CHART_TYPE_ADAPTERS.keys())
+
+# Per-type examples — lightweight inline examples for each chart type.
+_CHART_EXAMPLES: Dict[str, list[Dict[str, Any]]] = {
+    "xy": [
+        {
+            "chart_type": "xy",
+            "kind": "line",
+            "x": {"name": "order_date"},
+            "y": [{"name": "revenue", "aggregate": "SUM"}],
+            "time_grain": "P1D",
+        },
+        {
+            "chart_type": "xy",
+            "kind": "bar",
+            "x": {"name": "category"},
+            "y": [{"name": "sales", "aggregate": "SUM"}],
+        },
+    ],
+    "table": [
+        {
+            "chart_type": "table",
+            "columns": [
+                {"name": "customer_name"},
+                {"name": "revenue", "aggregate": "SUM"},
+            ],
+        },
+    ],
+    "pie": [
+        {
+            "chart_type": "pie",
+            "dimension": {"name": "region"},
+            "metric": {"name": "revenue", "aggregate": "SUM"},
+        },
+    ],
+    "pivot_table": [
+        {
+            "chart_type": "pivot_table",
+            "rows": [{"name": "region"}],
+            "metrics": [{"name": "revenue", "aggregate": "SUM"}],
+            "columns": [{"name": "quarter"}],
+        },
+    ],
+    "mixed_timeseries": [
+        {
+            "chart_type": "mixed_timeseries",
+            "x": {"name": "order_date"},
+            "y": [{"name": "revenue", "aggregate": "SUM"}],
+            "y_secondary": [{"name": "orders", "aggregate": "COUNT"}],
+            "time_grain": "P1M",
+        },
+    ],
+    "handlebars": [
+        {
+            "chart_type": "handlebars",
+            "query_mode": "raw",
+            "columns": [{"name": "customer_name"}, {"name": "email"}],
+            "handlebars_template": "{{#each data}}<p>{{customer_name}}</p>{{/each}}",
+        },
+    ],
+    "big_number": [
+        {
+            "chart_type": "big_number",
+            "metric": {"name": "revenue", "aggregate": "SUM"},
+        },
+    ],
+}
+
+
+def _get_chart_type_schema_impl(
+    chart_type: str,
+    include_examples: bool = True,
+) -> Dict[str, Any]:
+    """Pure logic for chart type schema lookup — no auth, no decorators."""
+    adapter = _CHART_TYPE_ADAPTERS.get(chart_type)
+    if adapter is None:
+        return {
+            "error": f"Unknown chart_type: {chart_type!r}",
+            "valid_chart_types": VALID_CHART_TYPES,
+            "hint": (
+                "Use one of the valid chart_type values listed above. "
+                "Call this tool again with a valid chart_type to see "
+                "its schema and examples."
+            ),
+        }
+
+    schema = adapter.json_schema()
+    result: Dict[str, Any] = {
+        "chart_type": chart_type,
+        "schema": schema,
+    }
+
+    if include_examples:
+        result["examples"] = _CHART_EXAMPLES.get(chart_type, [])
+
+    return result
+
+
+@tool(
+    tags=["discovery"],
+    annotations=ToolAnnotations(
+        title="Get chart type schema",
+        readOnlyHint=True,
+        destructiveHint=False,
+    ),
+)
+def get_chart_type_schema(
+    chart_type: str,
+    include_examples: bool = True,
+) -> Dict[str, Any]:
+    """Get the full JSON Schema and examples for a specific chart type.
+
+    Use this tool to discover the exact fields, types, and constraints
+    for a chart configuration before calling generate_chart or update_chart.
+
+    Valid chart_type values: xy, table, pie, pivot_table,
+    mixed_timeseries, handlebars, big_number.
+
+    Returns the JSON Schema for the requested chart type, optionally
+    with working examples.
+    """
+    return _get_chart_type_schema_impl(chart_type, include_examples)
diff --git a/superset/mcp_service/chart/tool/list_charts.py b/superset/mcp_service/chart/tool/list_charts.py
index ed92f1d057b..8bfcf347615 100644
--- a/superset/mcp_service/chart/tool/list_charts.py
+++ b/superset/mcp_service/chart/tool/list_charts.py
@@ -38,7 +38,6 @@ from superset.mcp_service.chart.schemas import (
     serialize_chart_object,
 )
 from superset.mcp_service.mcp_core import ModelListCore
-from superset.mcp_service.utils.schema_utils import parse_request
 
 logger = logging.getLogger(__name__)
 
@@ -47,7 +46,11 @@ DEFAULT_CHART_COLUMNS = [
     "id",
     "slice_name",
     "viz_type",
+    "description",
+    "certified_by",
+    "certification_details",
     "url",
+    "changed_on",
     "changed_on_humanized",
 ]
 
@@ -71,7 +74,6 @@ SORTABLE_CHART_COLUMNS = [
         destructiveHint=False,
     ),
 )
-@parse_request(ListChartsRequest)
 async def list_charts(request: ListChartsRequest, ctx: Context) -> ChartList:
     """List charts with filtering and search.
 
diff --git a/superset/mcp_service/chart/tool/update_chart.py b/superset/mcp_service/chart/tool/update_chart.py
index b10bd918621..40b9a2f6e85 100644
--- a/superset/mcp_service/chart/tool/update_chart.py
+++ b/superset/mcp_service/chart/tool/update_chart.py
@@ -21,11 +21,19 @@ MCP tool: update_chart
 
 import logging
 import time
+from typing import Any
 
 from fastmcp import Context
+from sqlalchemy.exc import SQLAlchemyError
 from superset_core.mcp.decorators import tool, ToolAnnotations
 
+from superset.commands.exceptions import CommandException
+from superset.exceptions import OAuth2Error, OAuth2RedirectError
 from superset.extensions import event_logger
+from superset.mcp_service.chart.chart_helpers import (
+    extract_form_data_key_from_url,
+    find_chart_by_identifier,
+)
 from superset.mcp_service.chart.chart_utils import (
     analyze_chart_capabilities,
     analyze_chart_semantics,
@@ -35,16 +43,165 @@ from superset.mcp_service.chart.chart_utils import (
 from superset.mcp_service.chart.schemas import (
     AccessibilityMetadata,
     GenerateChartResponse,
+    parse_chart_config,
     PerformanceMetadata,
     UpdateChartRequest,
 )
-from superset.mcp_service.utils.schema_utils import parse_request
+from superset.mcp_service.utils.oauth2_utils import (
+    build_oauth2_redirect_message,
+    OAUTH2_CONFIG_ERROR_MESSAGE,
+)
 from superset.mcp_service.utils.url_utils import get_superset_base_url
 from superset.utils import json
 
 logger = logging.getLogger(__name__)
 
 
+def _validation_error_response(message: str, details: str) -> GenerateChartResponse:
+    return GenerateChartResponse.model_validate(
+        {
+            "chart": None,
+            "error": {
+                "error_type": "ValidationError",
+                "message": message,
+                "details": details,
+            },
+            "success": False,
+            "schema_version": "2.0",
+            "api_version": "v1",
+        }
+    )
+
+
+def _missing_config_or_name_error() -> GenerateChartResponse:
+    return _validation_error_response(
+        message="Either 'config' or 'chart_name' must be provided.",
+        details=(
+            "Either 'config' or 'chart_name' must be provided. "
+            "Use config for visualization changes, chart_name for renaming."
+        ),
+    )
+
+
+def _build_update_payload(
+    request: UpdateChartRequest,
+    chart: Any,
+) -> dict[str, Any] | GenerateChartResponse:
+    """Build the update payload for a chart update.
+
+    Returns a dict payload on success, or a GenerateChartResponse error
+    when neither config nor chart_name is provided.
+    """
+    if request.config is not None:
+        config = parse_chart_config(request.config)
+        dataset_id = chart.datasource_id if chart.datasource_id else None
+        new_form_data = map_config_to_form_data(config, dataset_id=dataset_id)
+        new_form_data.pop("_mcp_warnings", None)
+
+        chart_name = (
+            request.chart_name
+            if request.chart_name
+            else chart.slice_name or generate_chart_name(config)
+        )
+
+        return {
+            "slice_name": chart_name,
+            "viz_type": new_form_data["viz_type"],
+            "params": json.dumps(new_form_data),
+            # Clear stale query_context so get_chart_data uses the updated params.
+            "query_context": None,
+        }
+
+    # Name-only update: keep existing visualization, just rename
+    if not request.chart_name:
+        return _missing_config_or_name_error()
+    return {"slice_name": request.chart_name}
+
+
+def _build_preview_form_data(
+    request: UpdateChartRequest,
+    chart: Any,
+) -> dict[str, Any] | GenerateChartResponse:
+    """Merge the existing chart's form_data with the requested changes.
+
+    Used by the preview-first flow so the user can review edits in Explore
+    before clicking Save. Returns the merged form_data dict on success, or a
+    GenerateChartResponse error when neither config nor chart_name is given.
+    """
+    existing_form_data: dict[str, Any] = {}
+    if getattr(chart, "params", None):
+        try:
+            existing_form_data = json.loads(chart.params) or {}
+        except (ValueError, TypeError):
+            logger.warning(
+                "Failed to parse existing chart.params for chart %s", chart.id
+            )
+            existing_form_data = {}
+
+    if request.config is not None:
+        config = parse_chart_config(request.config)
+        dataset_id = chart.datasource_id if chart.datasource_id else None
+        new_form_data = map_config_to_form_data(config, dataset_id=dataset_id)
+        new_form_data.pop("_mcp_warnings", None)
+        merged = {**existing_form_data, **new_form_data}
+    else:
+        if not request.chart_name:
+            return _missing_config_or_name_error()
+        merged = dict(existing_form_data)
+
+    if request.chart_name:
+        merged["slice_name"] = request.chart_name
+    elif chart.slice_name:
+        merged["slice_name"] = chart.slice_name
+
+    merged["slice_id"] = chart.id
+    if chart.datasource_id:
+        merged["datasource"] = f"{chart.datasource_id}__table"
+
+    return merged
+
+
+def _create_preview_url(
+    chart: Any, form_data: dict[str, Any]
+) -> tuple[str, str | None, list[str]]:
+    """Cache form_data and return (explore_url, form_data_key, warnings).
+
+    The URL includes both ``slice_id`` and ``form_data_key`` so that when the
+    user clicks Save in Explore, the edits overwrite the original chart.
+    """
+    from superset.commands.explore.form_data.parameters import CommandParameters
+    from superset.mcp_service.commands.create_form_data import MCPCreateFormDataCommand
+    from superset.utils.core import DatasourceType
+
+    base_url = get_superset_base_url()
+
+    if not chart.datasource_id:
+        warning = (
+            "Chart has no datasource; the preview URL shows the saved chart "
+            "state, not the pending changes. Open the URL and apply the "
+            "changes manually."
+        )
+        logger.warning(
+            "Chart %s has no datasource_id; preview URL cannot embed "
+            "form_data — user will see saved state.",
+            chart.id,
+        )
+        return f"{base_url}/explore/?slice_id={chart.id}", None, [warning]
+
+    cmd_params = CommandParameters(
+        datasource_type=DatasourceType.TABLE,
+        datasource_id=chart.datasource_id,
+        chart_id=chart.id,
+        tab_id=None,
+        form_data=json.dumps(form_data),
+    )
+    form_data_key = MCPCreateFormDataCommand(cmd_params).run()
+    explore_url = (
+        f"{base_url}/explore/?form_data_key={form_data_key}&slice_id={chart.id}"
+    )
+    return explore_url, form_data_key, []
+
+
 @tool(
     tags=["mutate"],
     class_permission_name="Chart",
@@ -54,19 +211,21 @@ logger = logging.getLogger(__name__)
         destructiveHint=True,
     ),
 )
-@parse_request(UpdateChartRequest)
-async def update_chart(
+async def update_chart(  # noqa: C901
     request: UpdateChartRequest, ctx: Context
 ) -> GenerateChartResponse:
     """Update existing chart with new configuration.
 
-    IMPORTANT:
-    - Chart must already be saved (from generate_chart with save_chart=True)
-    - LLM clients MUST display updated chart URL to users
-    - Use numeric ID or UUID string to identify the chart (NOT chart name)
-    - MUST include chart_type in config (either 'xy' or 'table')
+    IMPORTANT BEHAVIOR:
+    - By default (generate_preview=True), a preview explore URL is returned
+      so the user can review changes and click Save to overwrite the original
+      chart (if they have permission).
+    - Set generate_preview=False to persist the update immediately.
+    - LLM clients MUST display the returned explore URL to users.
+    - Use numeric ID or UUID string to identify the chart (NOT chart name).
+    - config is optional — omit it to rename a chart without changing its visualization
 
-    Example usage:
+    Example usage (preview, default):
     ```json
     {
         "identifier": 123,
@@ -79,17 +238,20 @@ async def update_chart(
     }
     ```
 
-    Or with UUID:
+    Rename only (no config required):
     ```json
     {
-        "identifier": "a1b2c3d4-5678-90ab-cdef-1234567890ab",
-        "config": {
-            "chart_type": "table",
-            "columns": [
-                {"name": "product_name"},
-                {"name": "revenue", "aggregate": "SUM"}
-            ]
-        }
+        "identifier": 123,
+        "chart_name": "Q1 Revenue"
+    }
+    ```
+
+    Example usage (persist immediately):
+    ```json
+    {
+        "identifier": 123,
+        "generate_preview": false,
+        "config": {"chart_type": "table", "columns": [{"name": "region"}]}
     }
     ```
 
@@ -99,72 +261,99 @@ async def update_chart(
     - Changing chart type or data columns
 
     Returns:
-    - Updated chart info and metadata
+    - Updated chart info, form_data (reflects what was saved), and metadata
     - Preview URL and explore URL for further editing
     """
     start_time = time.time()
 
     try:
-        # Find the existing chart
-        from superset.daos.chart import ChartDAO
-
         with event_logger.log_context(action="mcp.update_chart.chart_lookup"):
-            chart = None
-            if isinstance(request.identifier, int) or (
-                isinstance(request.identifier, str) and request.identifier.isdigit()
-            ):
-                chart_id = (
-                    int(request.identifier)
-                    if isinstance(request.identifier, str)
-                    else request.identifier
-                )
-                chart = ChartDAO.find_by_id(chart_id)
-            else:
-                # Try UUID lookup using DAO flexible method
-                chart = ChartDAO.find_by_id(request.identifier, id_column="uuid")
+            chart = find_chart_by_identifier(request.identifier)
 
         if not chart:
             return GenerateChartResponse.model_validate(
                 {
                     "chart": None,
-                    "error": f"No chart found with identifier: {request.identifier}",
+                    "error": {
+                        "error_type": "NotFound",
+                        "message": (
+                            f"No chart found with identifier: {request.identifier}"
+                        ),
+                        "details": (
+                            f"No chart found with identifier: {request.identifier}"
+                        ),
+                    },
                     "success": False,
                     "schema_version": "2.0",
                     "api_version": "v1",
                 }
             )
 
-        # Map the new config to form_data format
-        # Get dataset_id from existing chart for column type checking
-        dataset_id = chart.datasource_id if chart.datasource_id else None
-        new_form_data = map_config_to_form_data(request.config, dataset_id=dataset_id)
-        new_form_data.pop("_mcp_warnings", None)
+        # Validate dataset access before allowing update.
+        # check_chart_data_access is the centralized data-level
+        # permission check that complements the class-level RBAC
+        # enforced by mcp_auth_hook.
+        from superset.mcp_service.auth import check_chart_data_access
 
-        # Update chart using Superset's command
-        from superset.commands.chart.update import UpdateChartCommand
-
-        with event_logger.log_context(action="mcp.update_chart.db_write"):
-            # Generate new chart name if provided, otherwise keep existing
-            chart_name = (
-                request.chart_name
-                if request.chart_name
-                else chart.slice_name or generate_chart_name(request.config)
+        validation_result = check_chart_data_access(chart)
+        if not validation_result.is_valid:
+            error_msg = validation_result.error or "Chart's dataset is not accessible"
+            return GenerateChartResponse.model_validate(
+                {
+                    "chart": None,
+                    "error": {
+                        "error_type": "DatasetNotAccessible",
+                        "message": error_msg,
+                        "details": error_msg,
+                    },
+                    "success": False,
+                    "schema_version": "2.0",
+                    "api_version": "v1",
+                }
             )
 
-            update_payload = {
-                "slice_name": chart_name,
-                "viz_type": new_form_data["viz_type"],
-                "params": json.dumps(new_form_data),
-            }
+        updated_chart: Any = None
+        explore_url: str
+        form_data_key: str | None = None
+        warnings: list[str] = []
+        saved = False
+        new_form_data: dict[str, Any] | None = None
 
-            command = UpdateChartCommand(chart.id, update_payload)
-            updated_chart = command.run()
+        if not request.generate_preview:
+            from superset.commands.chart.update import UpdateChartCommand
 
-        # Generate semantic analysis
-        capabilities = analyze_chart_capabilities(updated_chart, request.config)
-        semantics = analyze_chart_semantics(updated_chart, request.config)
+            payload_or_error = _build_update_payload(request, chart)
+            if isinstance(payload_or_error, GenerateChartResponse):
+                return payload_or_error
+
+            # Extract form_data — present only for config updates, None for renames.
+            if "params" in payload_or_error:
+                new_form_data = json.loads(payload_or_error["params"])
+
+            with event_logger.log_context(action="mcp.update_chart.db_write"):
+                command = UpdateChartCommand(chart.id, payload_or_error)
+                updated_chart = command.run()
+            saved = True
+            explore_url = (
+                f"{get_superset_base_url()}/explore/?slice_id={updated_chart.id}"
+            )
+        else:
+            preview_or_error = _build_preview_form_data(request, chart)
+            if isinstance(preview_or_error, GenerateChartResponse):
+                return preview_or_error
+
+            with event_logger.log_context(action="mcp.update_chart.preview_link"):
+                explore_url, form_data_key, warnings = _create_preview_url(
+                    chart, preview_or_error
+                )
+
+        # Parse config for analysis (may be None for name-only updates)
+        config = parse_chart_config(request.config) if request.config else None
+
+        chart_for_analysis = updated_chart if saved else chart
+        capabilities = analyze_chart_capabilities(chart_for_analysis, config)
+        semantics = analyze_chart_semantics(chart_for_analysis, config)
 
-        # Create performance metadata
         execution_time = int((time.time() - start_time) * 1000)
         performance = PerformanceMetadata(
             query_duration_ms=execution_time,
@@ -172,21 +361,29 @@ async def update_chart(
             optimization_suggestions=[],
         )
 
-        # Create accessibility metadata
         chart_name = (
             updated_chart.slice_name
-            if updated_chart and hasattr(updated_chart, "slice_name")
-            else generate_chart_name(request.config)
+            if saved and updated_chart and hasattr(updated_chart, "slice_name")
+            else (
+                request.chart_name
+                or (chart.slice_name if hasattr(chart, "slice_name") else None)
+                or (generate_chart_name(config) if config else "Updated chart")
+            )
         )
         accessibility = AccessibilityMetadata(
-            color_blind_safe=True,  # Would need actual analysis
-            alt_text=f"Updated chart showing {chart_name}",
+            color_blind_safe=True,
+            alt_text=(
+                f"Updated chart showing {chart_name}"
+                if saved
+                else f"Updated chart preview showing {chart_name}"
+            ),
             high_contrast_available=False,
         )
 
-        # Generate previews if requested
-        previews = {}
-        if request.generate_preview:
+        # Generate previews for saved charts only. Unsaved previews rely on
+        # the explore URL for interactive viewing.
+        previews: dict[str, Any] = {}
+        if saved and updated_chart and request.preview_formats:
             try:
                 with event_logger.log_context(action="mcp.update_chart.preview"):
                     from superset.mcp_service.chart.tool.get_chart_preview import (
@@ -206,36 +403,53 @@ async def update_chart(
                         if hasattr(preview_result, "content"):
                             previews[format_type] = preview_result.content
 
-            except Exception as e:
-                # Log warning but don't fail the entire request
+            except (
+                OAuth2RedirectError,
+                OAuth2Error,
+                CommandException,
+                SQLAlchemyError,
+                KeyError,
+                ValueError,
+                TypeError,
+                AttributeError,
+            ) as e:
                 logger.warning("Preview generation failed: %s", e)
 
-        # Return enhanced data
+        # Fallback: extract form_data_key from explore_url if not set
+        if form_data_key is None:
+            form_data_key = extract_form_data_key_from_url(explore_url)
+
+        chart_id = updated_chart.id if saved and updated_chart else chart.id
+        chart_uuid = (
+            str(updated_chart.uuid)
+            if saved and updated_chart and updated_chart.uuid
+            else (str(chart.uuid) if chart.uuid else None)
+        )
+        viz_type = updated_chart.viz_type if saved and updated_chart else chart.viz_type
+
         result = {
             "chart": {
-                "id": updated_chart.id,
-                "slice_name": updated_chart.slice_name,
-                "viz_type": updated_chart.viz_type,
-                "url": (
-                    f"{get_superset_base_url()}/explore/?slice_id={updated_chart.id}"
-                ),
-                "uuid": str(updated_chart.uuid) if updated_chart.uuid else None,
-                "updated": True,
+                "id": chart_id,
+                "slice_name": chart_name,
+                "viz_type": viz_type,
+                "url": explore_url,
+                "uuid": chart_uuid,
+                "form_data_key": form_data_key,
+                "is_unsaved_state": not saved,
             },
             "error": None,
-            # Enhanced fields for better LLM integration
+            "warnings": warnings,
+            # Include form_data so callers can verify what was saved.
+            "form_data": new_form_data if new_form_data is not None else {},
             "previews": previews,
             "capabilities": capabilities.model_dump() if capabilities else None,
             "semantics": semantics.model_dump() if semantics else None,
-            "explore_url": (
-                f"{get_superset_base_url()}/explore/?slice_id={updated_chart.id}"
-            ),
+            "explore_url": explore_url,
+            "form_data_key": form_data_key,
             "api_endpoints": {
-                "data": (
-                    f"{get_superset_base_url()}/api/v1/chart/{updated_chart.id}/data/"
-                ),
+                "data": f"{get_superset_base_url()}/api/v1/chart/{chart_id}/data/",
                 "export": (
-                    f"{get_superset_base_url()}/api/v1/chart/{updated_chart.id}/export/"
+                    f"{get_superset_base_url()}/api/v1/chart/{chart_id}/export/"
                 ),
             },
             "performance": performance.model_dump() if performance else None,
@@ -246,12 +460,59 @@ async def update_chart(
         }
         return GenerateChartResponse.model_validate(result)
 
-    except Exception as e:
+    except OAuth2RedirectError as ex:
+        await ctx.error(
+            "Chart update requires OAuth authentication: identifier=%s"
+            % request.identifier
+        )
+        return GenerateChartResponse.model_validate(
+            {
+                "chart": None,
+                "success": False,
+                "error": {
+                    "error_type": "OAUTH2_REDIRECT",
+                    "message": build_oauth2_redirect_message(ex),
+                    "details": "OAuth2 authentication required",
+                },
+            }
+        )
+    except OAuth2Error:
+        await ctx.error("OAuth2 configuration error: chart_id=%s" % request.identifier)
+        return GenerateChartResponse.model_validate(
+            {
+                "chart": None,
+                "success": False,
+                "error": {
+                    "error_type": "OAUTH2_REDIRECT_ERROR",
+                    "message": OAUTH2_CONFIG_ERROR_MESSAGE,
+                    "details": "OAuth2 configuration or provider error",
+                },
+            }
+        )
+    except (
+        CommandException,
+        SQLAlchemyError,
+        ValueError,
+        KeyError,
+        AttributeError,
+    ) as e:
+        from superset import db
+
+        try:
+            db.session.rollback()  # pylint: disable=consider-using-transaction
+        except SQLAlchemyError:
+            logger.warning(
+                "Database rollback failed during error handling", exc_info=True
+            )
         execution_time = int((time.time() - start_time) * 1000)
         return GenerateChartResponse.model_validate(
             {
                 "chart": None,
-                "error": f"Chart update failed: {str(e)}",
+                "error": {
+                    "error_type": type(e).__name__,
+                    "message": f"Chart update failed: {e}",
+                    "details": str(e),
+                },
                 "performance": {
                     "query_duration_ms": execution_time,
                     "cache_status": "error",
diff --git a/superset/mcp_service/chart/tool/update_chart_preview.py b/superset/mcp_service/chart/tool/update_chart_preview.py
index 007be88cc1e..bc613b5a8da 100644
--- a/superset/mcp_service/chart/tool/update_chart_preview.py
+++ b/superset/mcp_service/chart/tool/update_chart_preview.py
@@ -24,9 +24,13 @@ import time
 from typing import Any, Dict
 
 from fastmcp import Context
+from sqlalchemy.exc import SQLAlchemyError
 from superset_core.mcp.decorators import tool, ToolAnnotations
 
+from superset.commands.exceptions import CommandException
+from superset.exceptions import OAuth2Error, OAuth2RedirectError, SupersetException
 from superset.extensions import event_logger
+from superset.mcp_service.chart.chart_helpers import extract_form_data_key_from_url
 from superset.mcp_service.chart.chart_utils import (
     analyze_chart_capabilities,
     analyze_chart_semantics,
@@ -36,14 +40,40 @@ from superset.mcp_service.chart.chart_utils import (
 )
 from superset.mcp_service.chart.schemas import (
     AccessibilityMetadata,
+    parse_chart_config,
     PerformanceMetadata,
     UpdateChartPreviewRequest,
 )
-from superset.mcp_service.utils.schema_utils import parse_request
+from superset.mcp_service.utils.oauth2_utils import (
+    build_oauth2_redirect_message,
+    OAUTH2_CONFIG_ERROR_MESSAGE,
+)
+from superset.utils import json as utils_json
 
 logger = logging.getLogger(__name__)
 
 
+def _get_old_adhoc_filters(form_data_key: str) -> list[Dict[str, Any]] | None:
+    """Retrieve adhoc_filters from the previously cached form_data."""
+    from superset.commands.exceptions import CommandException
+    from superset.commands.explore.form_data.get import GetFormDataCommand
+    from superset.commands.explore.form_data.parameters import CommandParameters
+
+    try:
+        cmd_params = CommandParameters(key=form_data_key)
+        cached_data = GetFormDataCommand(cmd_params).run()
+        if cached_data:
+            if isinstance(cached_data, str):
+                cached_data = utils_json.loads(cached_data)
+            if isinstance(cached_data, dict):
+                adhoc_filters = cached_data.get("adhoc_filters")
+                if adhoc_filters:
+                    return adhoc_filters
+    except (KeyError, ValueError, TypeError, CommandException):
+        logger.debug("Could not retrieve old form_data for filter preservation")
+    return None
+
+
 @tool(
     tags=["mutate"],
     class_permission_name="Chart",
@@ -54,7 +84,6 @@ logger = logging.getLogger(__name__)
         destructiveHint=True,
     ),
 )
-@parse_request(UpdateChartPreviewRequest)
 def update_chart_preview(
     request: UpdateChartPreviewRequest, ctx: Context
 ) -> Dict[str, Any]:
@@ -75,26 +104,46 @@ def update_chart_preview(
     start_time = time.time()
 
     try:
+        # Parse the raw config dict into a typed ChartConfig
+        config = parse_chart_config(request.config)
+
         with event_logger.log_context(action="mcp.update_chart_preview.form_data"):
             # Map the new config to form_data format
             # Pass dataset_id to enable column type checking
             new_form_data = map_config_to_form_data(
-                request.config, dataset_id=request.dataset_id
+                config, dataset_id=request.dataset_id
             )
             new_form_data.pop("_mcp_warnings", None)
 
+            # Preserve adhoc filters from the previous cached form_data
+            # when the new config doesn't explicitly specify filters
+            if getattr(config, "filters", None) is None and request.form_data_key:
+                old_adhoc_filters = _get_old_adhoc_filters(request.form_data_key)
+                if old_adhoc_filters:
+                    new_form_data["adhoc_filters"] = old_adhoc_filters
+
             # Generate new explore link with updated form_data
             explore_url = generate_explore_link(request.dataset_id, new_form_data)
 
         # Extract new form_data_key from the explore URL
-        new_form_data_key = None
-        if "form_data_key=" in explore_url:
-            new_form_data_key = explore_url.split("form_data_key=")[1].split("&")[0]
+        new_form_data_key = extract_form_data_key_from_url(explore_url)
+        if not new_form_data_key:
+            return {
+                "chart": None,
+                "error": {
+                    "error_type": "PreviewError",
+                    "message": "Failed to generate preview: missing form_data_key",
+                    "details": "The explore URL did not contain a form_data_key",
+                },
+                "success": False,
+                "schema_version": "2.0",
+                "api_version": "v1",
+            }
 
         with event_logger.log_context(action="mcp.update_chart_preview.metadata"):
             # Generate semantic analysis
-            capabilities = analyze_chart_capabilities(None, request.config)
-            semantics = analyze_chart_semantics(None, request.config)
+            capabilities = analyze_chart_capabilities(None, config)
+            semantics = analyze_chart_semantics(None, config)
 
         # Create performance metadata
         execution_time = int((time.time() - start_time) * 1000)
@@ -105,7 +154,7 @@ def update_chart_preview(
         )
 
         # Create accessibility metadata
-        chart_name = generate_chart_name(request.config)
+        chart_name = generate_chart_name(config)
         accessibility = AccessibilityMetadata(
             color_blind_safe=True,  # Would need actual analysis
             alt_text=f"Updated chart preview showing {chart_name}",
@@ -144,7 +193,34 @@ def update_chart_preview(
         }
         return result
 
-    except Exception as e:
+    except OAuth2RedirectError as ex:
+        logger.warning(
+            "Chart preview update requires OAuth authentication: form_data_key=%s",
+            request.form_data_key,
+        )
+        return {
+            "chart": None,
+            "error": build_oauth2_redirect_message(ex),
+            "success": False,
+        }
+    except OAuth2Error:
+        logger.warning(
+            "OAuth2 configuration error: form_data_key=%s", request.form_data_key
+        )
+        return {
+            "chart": None,
+            "error": OAUTH2_CONFIG_ERROR_MESSAGE,
+            "success": False,
+        }
+    except (
+        SupersetException,
+        CommandException,
+        SQLAlchemyError,
+        KeyError,
+        ValueError,
+        TypeError,
+        AttributeError,
+    ) as e:
         execution_time = int((time.time() - start_time) * 1000)
         return {
             "chart": None,
diff --git a/superset/mcp_service/chart/validation/dataset_validator.py b/superset/mcp_service/chart/validation/dataset_validator.py
index c50fccc6938..c7f497a426b 100644
--- a/superset/mcp_service/chart/validation/dataset_validator.py
+++ b/superset/mcp_service/chart/validation/dataset_validator.py
@@ -82,25 +82,19 @@ class DatasetValidator:
         # Collect all column references
         column_refs = DatasetValidator._extract_column_references(config)
 
-        # Validate each column exists
-        invalid_columns = []
-        for col_ref in column_refs:
-            if not DatasetValidator._column_exists(col_ref.name, dataset_context):
-                invalid_columns.append(col_ref)
+        # Validate saved metrics exist in dataset metrics specifically
+        invalid_saved = DatasetValidator._validate_saved_metrics(
+            column_refs, dataset_context
+        )
+        if invalid_saved:
+            return False, invalid_saved
 
-        if invalid_columns:
-            # Generate suggestions for invalid columns
-            suggestions_map = {}
-            for col_ref in invalid_columns:
-                suggestions = DatasetValidator._get_column_suggestions(
-                    col_ref.name, dataset_context
-                )
-                suggestions_map[col_ref.name] = suggestions
-
-            # Build error with suggestions
-            return False, DatasetValidator._build_column_error(
-                invalid_columns, suggestions_map, dataset_context
-            )
+        # Validate columns exist (skip saved metrics — already validated above)
+        column_error = DatasetValidator._validate_columns_exist(
+            column_refs, dataset_context
+        )
+        if column_error:
+            return False, column_error
 
         # Validate aggregation compatibility
         if isinstance(config, (TableChartConfig, XYChartConfig)):
@@ -112,6 +106,32 @@ class DatasetValidator:
 
         return True, None
 
+    @staticmethod
+    def _validate_columns_exist(
+        column_refs: List[ColumnRef], dataset_context: DatasetContext
+    ) -> ChartGenerationError | None:
+        """Validate that non-saved-metric column refs exist in the dataset."""
+        invalid_columns = []
+        for col_ref in column_refs:
+            if col_ref.saved_metric:
+                continue
+            if not DatasetValidator._column_exists(col_ref.name, dataset_context):
+                invalid_columns.append(col_ref)
+
+        if not invalid_columns:
+            return None
+
+        suggestions_map = {}
+        for col_ref in invalid_columns:
+            suggestions = DatasetValidator._get_column_suggestions(
+                col_ref.name, dataset_context
+            )
+            suggestions_map[col_ref.name] = suggestions
+
+        return DatasetValidator._build_column_error(
+            invalid_columns, suggestions_map, dataset_context
+        )
+
     @staticmethod
     def _get_dataset_context(dataset_id: int | str) -> DatasetContext | None:
         """Get dataset context with column information."""
@@ -184,10 +204,11 @@ class DatasetValidator:
         if isinstance(config, TableChartConfig):
             refs.extend(config.columns)
         elif isinstance(config, XYChartConfig):
-            refs.append(config.x)
+            if config.x is not None:
+                refs.append(config.x)
             refs.extend(config.y)
             if config.group_by:
-                refs.append(config.group_by)
+                refs.extend(config.group_by)
 
         # Add filter columns
         if hasattr(config, "filters") and config.filters:
@@ -265,13 +286,12 @@ class DatasetValidator:
                     y_col["name"], dataset_context
                 )
 
-        # Normalize group_by column
+        # Normalize group_by columns
         if "group_by" in config_dict and config_dict["group_by"]:
-            config_dict["group_by"]["name"] = (
-                DatasetValidator._get_canonical_column_name(
-                    config_dict["group_by"]["name"], dataset_context
+            for gb_col in config_dict["group_by"]:
+                gb_col["name"] = DatasetValidator._get_canonical_column_name(
+                    gb_col["name"], dataset_context
                 )
-            )
 
     @staticmethod
     def _normalize_table_config(
@@ -419,6 +439,49 @@ class DatasetValidator:
                 error_code="MULTIPLE_INVALID_COLUMNS",
             )
 
+    @staticmethod
+    def _validate_saved_metrics(
+        column_refs: List[ColumnRef], dataset_context: DatasetContext
+    ) -> ChartGenerationError | None:
+        """Validate that saved_metric refs exist in dataset metrics.
+
+        A ColumnRef with saved_metric=True must match an entry in
+        available_metrics, not just available_columns.  Without this check
+        a regular column name marked as saved_metric would pass
+        _column_exists (which checks both lists) but fail at query time.
+        """
+        metric_names = {m["name"].lower() for m in dataset_context.available_metrics}
+        invalid = [
+            col_ref.name
+            for col_ref in column_refs
+            if col_ref.saved_metric and col_ref.name.lower() not in metric_names
+        ]
+        if not invalid:
+            return None
+
+        from superset.mcp_service.utils.error_builder import ChartErrorBuilder
+
+        available = [m["name"] for m in dataset_context.available_metrics]
+        return ChartErrorBuilder.build_error(
+            error_type="invalid_saved_metric",
+            template_key="column_not_found",
+            template_vars={
+                "column": ", ".join(invalid),
+                "suggestions": (
+                    f"Available saved metrics: {', '.join(available[:10])}"
+                    if available
+                    else "This dataset has no saved metrics"
+                ),
+            },
+            custom_suggestions=[
+                f"'{name}' is not a saved metric in this dataset. "
+                "Remove saved_metric=True to use it as a column with an aggregate, "
+                "or use get_dataset_info to see available saved metrics."
+                for name in invalid
+            ],
+            error_code="INVALID_SAVED_METRIC",
+        )
+
     @staticmethod
     def _validate_aggregations(
         column_refs: List[ColumnRef], dataset_context: DatasetContext
@@ -427,6 +490,8 @@ class DatasetValidator:
         errors = []
 
         for col_ref in column_refs:
+            if col_ref.saved_metric:
+                continue  # Saved metrics have built-in aggregation
             if not col_ref.aggregate:
                 continue
 
diff --git a/superset/mcp_service/chart/validation/pipeline.py b/superset/mcp_service/chart/validation/pipeline.py
index a0f475ffa0e..6923de0bd0b 100644
--- a/superset/mcp_service/chart/validation/pipeline.py
+++ b/superset/mcp_service/chart/validation/pipeline.py
@@ -26,6 +26,7 @@ from typing import Any, Dict, List, Tuple
 from superset.mcp_service.chart.schemas import (
     ChartConfig,
     GenerateChartRequest,
+    parse_chart_config,
 )
 from superset.mcp_service.common.error_schemas import (
     ChartGenerationError,
@@ -171,6 +172,10 @@ class ValidationPipeline:
             if request is None:
                 return ValidationResult(is_valid=False, error=error)
 
+            # Parse the raw config dict into a typed ChartConfig for
+            # downstream validators that need typed access.
+            typed_config = parse_chart_config(request.config)
+
             # Fetch dataset context once and reuse across validation layers
             dataset_context = ValidationPipeline._get_dataset_context(
                 request.dataset_id
@@ -178,20 +183,20 @@ class ValidationPipeline:
 
             # Layer 2: Dataset validation (reuses context)
             is_valid, error = ValidationPipeline._validate_dataset(
-                request.config, request.dataset_id, dataset_context
+                typed_config, request.dataset_id, dataset_context
             )
             if not is_valid:
                 return ValidationResult(is_valid=False, request=request, error=error)
 
             # Layer 3: Runtime validation - returns warnings as metadata, not errors
             _is_valid, warnings_metadata = ValidationPipeline._validate_runtime(
-                request.config, request.dataset_id
+                typed_config, request.dataset_id
             )
             # Runtime validation always returns True now, warnings are informational
 
             # Layer 4: Column name normalization (reuses context)
             normalized_request = ValidationPipeline._normalize_column_names(
-                request, dataset_context
+                request, dataset_context, typed_config=typed_config
             )
 
             return ValidationResult(
@@ -284,6 +289,7 @@ class ValidationPipeline:
     def _normalize_column_names(
         request: GenerateChartRequest,
         dataset_context: DatasetContext | None = None,
+        typed_config: ChartConfig | None = None,
     ) -> GenerateChartRequest:
         """
         Normalize column names in the request to match canonical dataset names.
@@ -297,6 +303,8 @@ class ValidationPipeline:
             request: The validated chart generation request
             dataset_context: Pre-fetched dataset context to avoid duplicate
                 DB queries. If None, fetches from the database.
+            typed_config: Pre-parsed typed ChartConfig. If None, parses from
+                request.config dict.
 
         Returns:
             A new request with normalized column names
@@ -304,8 +312,9 @@ class ValidationPipeline:
         try:
             from .dataset_validator import DatasetValidator
 
+            config = typed_config or parse_chart_config(request.config)
             normalized_config = DatasetValidator.normalize_column_names(
-                request.config,
+                config,
                 request.dataset_id,
                 dataset_context=dataset_context,
             )
diff --git a/superset/mcp_service/chart/validation/runtime/__init__.py b/superset/mcp_service/chart/validation/runtime/__init__.py
index 7228d73481b..5e1c89d0a68 100644
--- a/superset/mcp_service/chart/validation/runtime/__init__.py
+++ b/superset/mcp_service/chart/validation/runtime/__init__.py
@@ -134,11 +134,13 @@ class RuntimeValidator:
             chart_type = config.kind if hasattr(config, "kind") else "default"
 
             # Check X-axis cardinality
+            if config.x is None:
+                return warnings, suggestions
             is_ok, cardinality_info = CardinalityValidator.check_cardinality(
                 dataset_id=dataset_id,
                 x_column=config.x.name,
                 chart_type=chart_type,
-                group_by_column=config.group_by.name if config.group_by else None,
+                group_by_column=config.group_by[0].name if config.group_by else None,
             )
 
             if not is_ok and cardinality_info:
diff --git a/superset/mcp_service/chart/validation/runtime/chart_type_suggester.py b/superset/mcp_service/chart/validation/runtime/chart_type_suggester.py
index 910b13ab66c..a707b14b5a8 100644
--- a/superset/mcp_service/chart/validation/runtime/chart_type_suggester.py
+++ b/superset/mcp_service/chart/validation/runtime/chart_type_suggester.py
@@ -68,6 +68,9 @@ class ChartTypeSuggester:
         issues = []
         suggestions = []
 
+        if config.x is None:
+            return True, None
+
         x_analysis = ChartTypeSuggester._analyze_x_axis(config.x.name)
         y_analysis = ChartTypeSuggester._analyze_y_axis(config.y)
 
@@ -147,6 +150,7 @@ class ChartTypeSuggester:
         config: XYChartConfig, x_analysis: Dict[str, Any], y_analysis: Dict[str, Any]
     ) -> Tuple[List[str], List[str]]:
         """Check for chart type specific issues."""
+        assert config.x is not None  # caller guards for None
         issues = []
         suggestions = []
 
@@ -195,6 +199,7 @@ class ChartTypeSuggester:
         x_is_id: bool,
     ) -> Tuple[List[str], List[str]]:
         """Check line chart specific issues."""
+        assert config.x is not None
         issues = []
         suggestions = []
 
@@ -228,6 +233,7 @@ class ChartTypeSuggester:
         config: XYChartConfig, x_is_categorical: bool, num_metrics: int
     ) -> Tuple[List[str], List[str]]:
         """Check scatter chart specific issues."""
+        assert config.x is not None
         issues = []
         suggestions = []
 
@@ -258,6 +264,7 @@ class ChartTypeSuggester:
         config: XYChartConfig, x_is_temporal: bool
     ) -> Tuple[List[str], List[str]]:
         """Check area chart specific issues."""
+        assert config.x is not None
         issues = []
         suggestions = []
 
@@ -295,6 +302,7 @@ class ChartTypeSuggester:
         config: XYChartConfig, x_is_id: bool
     ) -> Tuple[List[str], List[str]]:
         """Check bar chart specific issues."""
+        assert config.x is not None
         issues = []
         suggestions = []
 
diff --git a/superset/mcp_service/chart/validation/runtime/format_validator.py b/superset/mcp_service/chart/validation/runtime/format_validator.py
index 34971d47907..73f8c450fa9 100644
--- a/superset/mcp_service/chart/validation/runtime/format_validator.py
+++ b/superset/mcp_service/chart/validation/runtime/format_validator.py
@@ -79,8 +79,9 @@ class FormatTypeValidator:
 
         # Validate X-axis format (usually temporal or categorical)
         if config.x_axis and config.x_axis.format:
+            x_column = config.x or ColumnRef(name="default_x_axis")
             x_warnings = FormatTypeValidator._validate_x_axis_format(
-                config.x_axis.format, config.x
+                config.x_axis.format, x_column
             )
             warnings.extend(x_warnings)
 
diff --git a/superset/mcp_service/chart/validation/schema_validator.py b/superset/mcp_service/chart/validation/schema_validator.py
index aa50d4c843e..7cae450ff59 100644
--- a/superset/mcp_service/chart/validation/schema_validator.py
+++ b/superset/mcp_service/chart/validation/schema_validator.py
@@ -133,6 +133,9 @@ class SchemaValidator:
                     "Add 'chart_type': 'pie' for pie or donut charts",
                     "Add 'chart_type': 'pivot_table' for interactive pivot tables",
                     "Add 'chart_type': 'mixed_timeseries' for dual-series time charts",
+                    "Add 'chart_type': 'handlebars' for custom HTML template charts",
+                    "Add 'chart_type': 'big_number' for big number display",
+                    "Example: 'config': {'chart_type': 'xy', ...}",
                 ],
                 error_code="MISSING_CHART_TYPE",
             )
@@ -151,6 +154,8 @@ class SchemaValidator:
             "pie": SchemaValidator._pre_validate_pie_config,
             "pivot_table": SchemaValidator._pre_validate_pivot_table_config,
             "mixed_timeseries": SchemaValidator._pre_validate_mixed_timeseries_config,
+            "handlebars": SchemaValidator._pre_validate_handlebars_config,
+            "big_number": SchemaValidator._pre_validate_big_number_config,
         }
 
         if not isinstance(chart_type, str) or chart_type not in chart_type_validators:
@@ -166,6 +171,8 @@ class SchemaValidator:
                     "Use 'chart_type': 'pie' for pie or donut charts",
                     "Use 'chart_type': 'pivot_table' for interactive pivot tables",
                     "Use 'chart_type': 'mixed_timeseries' for dual-series time charts",
+                    "Use 'chart_type': 'handlebars' for custom HTML template charts",
+                    "Use 'chart_type': 'big_number' for big number display",
                     "Check spelling and ensure lowercase",
                 ],
                 error_code="INVALID_CHART_TYPE",
@@ -178,22 +185,15 @@ class SchemaValidator:
         config: Dict[str, Any],
     ) -> Tuple[bool, ChartGenerationError | None]:
         """Pre-validate XY chart configuration."""
-        missing_fields = []
-
-        if "x" not in config:
-            missing_fields.append("'x' (X-axis column)")
+        # x is optional — defaults to dataset's main_dttm_col in map_xy_config
         if "y" not in config:
-            missing_fields.append("'y' (Y-axis metrics)")
-
-        if missing_fields:
             return False, ChartGenerationError(
                 error_type="missing_xy_fields",
-                message=f"XY chart missing required "
-                f"fields: {', '.join(missing_fields)}",
-                details="XY charts require both X-axis (dimension) and Y-axis ("
-                "metrics) specifications",
+                message="XY chart missing required field: 'y' (Y-axis metrics)",
+                details="XY charts require Y-axis (metrics) specifications. "
+                "X-axis is optional and defaults to the dataset's primary "
+                "datetime column when omitted.",
                 suggestions=[
-                    "Add 'x' field: {'name': 'column_name'} for X-axis",
                     "Add 'y' field: [{'name': 'metric_column', 'aggregate': 'SUM'}] "
                     "for Y-axis",
                     "Example: {'chart_type': 'xy', 'x': {'name': 'date'}, "
@@ -282,6 +282,151 @@ class SchemaValidator:
 
         return True, None
 
+    @staticmethod
+    def _pre_validate_handlebars_config(
+        config: Dict[str, Any],
+    ) -> Tuple[bool, ChartGenerationError | None]:
+        """Pre-validate handlebars chart configuration."""
+        if "handlebars_template" not in config:
+            return False, ChartGenerationError(
+                error_type="missing_handlebars_template",
+                message="Handlebars chart missing required field: handlebars_template",
+                details="Handlebars charts require a 'handlebars_template' string "
+                "containing Handlebars HTML template markup",
+                suggestions=[
+                    "Add 'handlebars_template' with a Handlebars HTML template",
+                    "Data is available as {{data}} array in the template",
+                    "Example: '<ul>{{#each data}}<li>{{this.name}}: "
+                    "{{this.value}}</li>{{/each}}</ul>'",
+                ],
+                error_code="MISSING_HANDLEBARS_TEMPLATE",
+            )
+
+        template = config.get("handlebars_template")
+        if not isinstance(template, str) or not template.strip():
+            return False, ChartGenerationError(
+                error_type="invalid_handlebars_template",
+                message="Handlebars template must be a non-empty string",
+                details="The 'handlebars_template' field must be a non-empty string "
+                "containing valid Handlebars HTML template markup",
+                suggestions=[
+                    "Ensure handlebars_template is a non-empty string",
+                    "Example: '<ul>{{#each data}}<li>{{this.name}}</li>{{/each}}</ul>'",
+                ],
+                error_code="INVALID_HANDLEBARS_TEMPLATE",
+            )
+
+        query_mode = config.get("query_mode", "aggregate")
+        if query_mode not in ("aggregate", "raw"):
+            return False, ChartGenerationError(
+                error_type="invalid_query_mode",
+                message="Invalid query_mode for handlebars chart",
+                details="query_mode must be either 'aggregate' or 'raw'",
+                suggestions=[
+                    "Use 'aggregate' for aggregated data (default)",
+                    "Use 'raw' for individual rows",
+                ],
+                error_code="INVALID_QUERY_MODE",
+            )
+
+        if query_mode == "raw" and not config.get("columns"):
+            return False, ChartGenerationError(
+                error_type="missing_raw_columns",
+                message="Handlebars chart in 'raw' mode requires 'columns'",
+                details="When query_mode is 'raw', you must specify which columns "
+                "to include in the query results",
+                suggestions=[
+                    "Add 'columns': [{'name': 'column_name'}] for raw mode",
+                    "Or use query_mode='aggregate' with 'metrics' "
+                    "and optional 'groupby'",
+                ],
+                error_code="MISSING_RAW_COLUMNS",
+            )
+
+        if query_mode == "aggregate" and not config.get("metrics"):
+            return False, ChartGenerationError(
+                error_type="missing_aggregate_metrics",
+                message="Handlebars chart in 'aggregate' mode requires 'metrics'",
+                details="When query_mode is 'aggregate' (default), you must specify "
+                "at least one metric with an aggregate function",
+                suggestions=[
+                    "Add 'metrics': [{'name': 'column', 'aggregate': 'SUM'}]",
+                    "Or use query_mode='raw' with 'columns' for individual rows",
+                ],
+                error_code="MISSING_AGGREGATE_METRICS",
+            )
+
+        return True, None
+
+    @staticmethod
+    def _pre_validate_big_number_config(
+        config: Dict[str, Any],
+    ) -> Tuple[bool, ChartGenerationError | None]:
+        """Pre-validate big number chart configuration."""
+        if "metric" not in config:
+            return False, ChartGenerationError(
+                error_type="missing_metric",
+                message="Big Number chart missing required field: metric",
+                details="Big Number charts require a 'metric' field "
+                "specifying the value to display",
+                suggestions=[
+                    "Add 'metric' with name and aggregate: "
+                    "{'name': 'revenue', 'aggregate': 'SUM'}",
+                    "The aggregate function is required (SUM, COUNT, AVG, MIN, MAX)",
+                    "Example: {'chart_type': 'big_number', "
+                    "'metric': {'name': 'sales', 'aggregate': 'SUM'}}",
+                ],
+                error_code="MISSING_BIG_NUMBER_METRIC",
+            )
+
+        metric = config.get("metric", {})
+        if not isinstance(metric, dict):
+            return False, ChartGenerationError(
+                error_type="invalid_metric_type",
+                message="Big Number metric must be a dict with 'name' and 'aggregate'",
+                details="The 'metric' field must be an object, "
+                f"got {type(metric).__name__}",
+                suggestions=[
+                    "Use a dict: {'name': 'col', 'aggregate': 'SUM'}",
+                    "Valid aggregates: SUM, COUNT, AVG, MIN, MAX",
+                ],
+                error_code="INVALID_BIG_NUMBER_METRIC_TYPE",
+            )
+        if not metric.get("aggregate") and not metric.get("saved_metric"):
+            return False, ChartGenerationError(
+                error_type="missing_metric_aggregate",
+                message="Big Number metric must include an aggregate function "
+                "or reference a saved metric",
+                details="The metric must have an 'aggregate' field "
+                "or 'saved_metric': true",
+                suggestions=[
+                    "Add 'aggregate' to your metric: "
+                    "{'name': 'col', 'aggregate': 'SUM'}",
+                    "Or use a saved metric: "
+                    "{'name': 'total_sales', 'saved_metric': true}",
+                    "Valid aggregates: SUM, COUNT, AVG, MIN, MAX",
+                ],
+                error_code="MISSING_BIG_NUMBER_AGGREGATE",
+            )
+
+        show_trendline = config.get("show_trendline", False)
+        temporal_column = config.get("temporal_column")
+        if show_trendline and not temporal_column:
+            return False, ChartGenerationError(
+                error_type="missing_temporal_column",
+                message="Trendline requires a temporal column",
+                details="When 'show_trendline' is True, a "
+                "'temporal_column' must be specified",
+                suggestions=[
+                    "Add 'temporal_column': 'date_column_name'",
+                    "Or set 'show_trendline': false for number only",
+                    "Use get_dataset_info to find temporal columns",
+                ],
+                error_code="MISSING_TEMPORAL_COLUMN",
+            )
+
+        return True, None
+
     @staticmethod
     def _pre_validate_pivot_table_config(
         config: Dict[str, Any],
@@ -428,6 +573,41 @@ class SchemaValidator:
                         ],
                         error_code="TABLE_VALIDATION_ERROR",
                     )
+                elif chart_type == "handlebars":
+                    return ChartGenerationError(
+                        error_type="handlebars_validation_error",
+                        message="Handlebars chart configuration validation failed",
+                        details="The handlebars chart configuration is missing "
+                        "required fields or has invalid structure",
+                        suggestions=[
+                            "Ensure 'handlebars_template' is a non-empty string",
+                            "For aggregate mode: add 'metrics' with aggregate "
+                            "functions",
+                            "For raw mode: set 'query_mode': 'raw' and add 'columns'",
+                            "Example: {'chart_type': 'handlebars', "
+                            "'handlebars_template': '<ul>{{#each data}}<li>"
+                            "{{this.name}}</li>{{/each}}</ul>', "
+                            "'metrics': [{'name': 'sales', 'aggregate': 'SUM'}]}",
+                        ],
+                        error_code="HANDLEBARS_VALIDATION_ERROR",
+                    )
+                elif chart_type == "big_number":
+                    return ChartGenerationError(
+                        error_type="big_number_validation_error",
+                        message="Big Number chart configuration validation failed",
+                        details="The Big Number chart configuration is "
+                        "missing required fields or has invalid "
+                        "structure",
+                        suggestions=[
+                            "Ensure 'metric' field has 'name' and 'aggregate'",
+                            "Example: 'metric': {'name': 'revenue', "
+                            "'aggregate': 'SUM'}",
+                            "For trendline: add 'show_trendline': true "
+                            "and 'temporal_column': 'date_col'",
+                            "Without trendline: just provide the metric",
+                        ],
+                        error_code="BIG_NUMBER_VALIDATION_ERROR",
+                    )
 
         # Default enhanced error
         error_details = []
diff --git a/superset/mcp_service/common/schema_discovery.py b/superset/mcp_service/common/schema_discovery.py
index dda1a0d5412..5ca5a1a7424 100644
--- a/superset/mcp_service/common/schema_discovery.py
+++ b/superset/mcp_service/common/schema_discovery.py
@@ -29,6 +29,8 @@ import sqlalchemy as sa
 from pydantic import BaseModel, Field
 from sqlalchemy.inspection import inspect
 
+from superset.mcp_service.constants import ModelType
+
 
 class ColumnMetadata(BaseModel):
     """Metadata for a selectable column."""
@@ -52,7 +54,7 @@ class ModelSchemaInfo(BaseModel):
     - Default values for each
     """
 
-    model_type: Literal["chart", "dataset", "dashboard"] = Field(
+    model_type: ModelType = Field(
         ..., description="The model type this schema describes"
     )
     select_columns: list[ColumnMetadata] = Field(
@@ -82,9 +84,7 @@ class ModelSchemaInfo(BaseModel):
 class GetSchemaRequest(BaseModel):
     """Request schema for unified get_schema tool."""
 
-    model_type: Literal["chart", "dataset", "dashboard"] = Field(
-        ..., description="Model type to get schema for"
-    )
+    model_type: ModelType = Field(..., description="Model type to get schema for")
 
 
 class GetSchemaResponse(BaseModel):
@@ -169,9 +169,9 @@ _COLUMN_DESCRIPTIONS: dict[str, str] = {
     "dashboard_title": "Dashboard display title",
     "slug": "URL-friendly identifier for the dashboard",
     "published": "Whether the dashboard is published and visible",
-    "position_json": "JSON layout of dashboard components",
-    "json_metadata": "JSON metadata including filters and settings",
     "css": "Custom CSS for the dashboard",
+    "native_filters": "Native filter configuration (name, type, targets)",
+    "cross_filters_enabled": "Whether cross-filtering between charts is enabled",
     "theme_id": "Theme ID for dashboard styling",
 }
 
@@ -180,6 +180,7 @@ def get_columns_from_model(
     model_cls: Type[Any],
     default_columns: list[str],
     extra_columns: dict[str, ColumnMetadata] | None = None,
+    exclude_columns: set[str] | None = None,
 ) -> list[ColumnMetadata]:
     """
     Dynamically extract column metadata from a SQLAlchemy model.
@@ -188,6 +189,7 @@ def get_columns_from_model(
         model_cls: The SQLAlchemy model class to inspect
         default_columns: List of column names that should be marked as defaults
         extra_columns: Additional columns not on the model (e.g., computed fields)
+        exclude_columns: Column names to omit (e.g., sensitive fields)
 
     Returns:
         List of ColumnMetadata objects for all columns
@@ -197,6 +199,8 @@ def get_columns_from_model(
 
     for col in mapper.columns:
         col_name = col.key
+        if exclude_columns and col_name in exclude_columns:
+            continue
         col_type = _get_sqlalchemy_type_name(col.type)
         # Get description from column doc, comment, or fallback mapping
         description = (
@@ -234,7 +238,17 @@ def get_columns_from_model(
 # - Extra columns (computed/relationship fields not on the model)
 
 # Chart configuration
-CHART_DEFAULT_COLUMNS = ["id", "slice_name", "viz_type", "url", "changed_on_humanized"]
+CHART_DEFAULT_COLUMNS = [
+    "id",
+    "slice_name",
+    "viz_type",
+    "description",
+    "certified_by",
+    "certification_details",
+    "url",
+    "changed_on",
+    "changed_on_humanized",
+]
 CHART_SORTABLE_COLUMNS = [
     "id",
     "slice_name",
@@ -302,6 +316,18 @@ CHART_EXTRA_COLUMNS: dict[str, ColumnMetadata] = {
         type="str",
         is_default=False,
     ),
+    "certified_by": ColumnMetadata(
+        name="certified_by",
+        description="Name of the person who certified this chart",
+        type="str",
+        is_default=True,
+    ),
+    "certification_details": ColumnMetadata(
+        name="certification_details",
+        description="Certification details or reason",
+        type="str",
+        is_default=True,
+    ),
     "tags": ColumnMetadata(
         name="tags", description="Chart tags", type="list", is_default=False
     ),
@@ -311,7 +337,16 @@ CHART_EXTRA_COLUMNS: dict[str, ColumnMetadata] = {
 }
 
 # Dataset configuration
-DATASET_DEFAULT_COLUMNS = ["id", "table_name", "schema", "changed_on_humanized"]
+DATASET_DEFAULT_COLUMNS = [
+    "id",
+    "table_name",
+    "schema",
+    "description",
+    "certified_by",
+    "certification_details",
+    "changed_on",
+    "changed_on_humanized",
+]
 DATASET_SORTABLE_COLUMNS = [
     "id",
     "table_name",
@@ -363,6 +398,18 @@ DATASET_EXTRA_COLUMNS: dict[str, ColumnMetadata] = {
         type="str",
         is_default=False,
     ),
+    "certified_by": ColumnMetadata(
+        name="certified_by",
+        description="Name of the person who certified this dataset",
+        type="str",
+        is_default=True,
+    ),
+    "certification_details": ColumnMetadata(
+        name="certification_details",
+        description="Certification details or reason",
+        type="str",
+        is_default=True,
+    ),
     "metrics": ColumnMetadata(
         name="metrics",
         description="Dataset metrics definitions",
@@ -388,7 +435,11 @@ DASHBOARD_DEFAULT_COLUMNS = [
     "id",
     "dashboard_title",
     "slug",
+    "description",
+    "certified_by",
+    "certification_details",
     "url",
+    "changed_on",
     "changed_on_humanized",
 ]
 DASHBOARD_SORTABLE_COLUMNS = [
@@ -452,6 +503,68 @@ DASHBOARD_EXTRA_COLUMNS: dict[str, ColumnMetadata] = {
 }
 
 
+# Database configuration
+DATABASE_DEFAULT_COLUMNS = [
+    "id",
+    "database_name",
+    "backend",
+    "expose_in_sqllab",
+    "changed_on",
+    "changed_on_humanized",
+]
+DATABASE_SORTABLE_COLUMNS = [
+    "id",
+    "database_name",
+    "changed_on",
+    "created_on",
+]
+DATABASE_SEARCH_COLUMNS = ["database_name"]
+DATABASE_EXTRA_COLUMNS: dict[str, ColumnMetadata] = {
+    "backend": ColumnMetadata(
+        name="backend",
+        description="Database backend type (e.g., postgresql, mysql)",
+        type="str",
+        is_default=True,
+    ),
+    "changed_by": ColumnMetadata(
+        name="changed_by",
+        description="Last modifier username",
+        type="str",
+        is_default=False,
+    ),
+    "changed_by_name": ColumnMetadata(
+        name="changed_by_name",
+        description="Last modifier display name",
+        type="str",
+        is_default=False,
+    ),
+    "changed_on_humanized": ColumnMetadata(
+        name="changed_on_humanized",
+        description="Humanized modification time",
+        type="str",
+        is_default=True,
+    ),
+    "created_by": ColumnMetadata(
+        name="created_by",
+        description="Creator username",
+        type="str",
+        is_default=False,
+    ),
+    "created_by_name": ColumnMetadata(
+        name="created_by_name",
+        description="Creator display name",
+        type="str",
+        is_default=False,
+    ),
+    "created_on_humanized": ColumnMetadata(
+        name="created_on_humanized",
+        description="Humanized creation time",
+        type="str",
+        is_default=False,
+    ),
+}
+
+
 def get_chart_columns() -> list[ColumnMetadata]:
     """Get column metadata for Chart model dynamically."""
     from superset.models.slice import Slice
@@ -477,6 +590,27 @@ def get_dashboard_columns() -> list[ColumnMetadata]:
     )
 
 
+# Sensitive columns that should not be exposed via schema discovery
+DATABASE_EXCLUDE_COLUMNS = {
+    "sqlalchemy_uri",
+    "password",
+    "encrypted_extra",
+    "server_cert",
+}
+
+
+def get_database_columns() -> list[ColumnMetadata]:
+    """Get column metadata for Database model dynamically."""
+    from superset.models.core import Database
+
+    return get_columns_from_model(
+        Database,
+        DATABASE_DEFAULT_COLUMNS,
+        DATABASE_EXTRA_COLUMNS,
+        exclude_columns=DATABASE_EXCLUDE_COLUMNS,
+    )
+
+
 def get_all_column_names(columns: list[ColumnMetadata]) -> list[str]:
     """Extract all column names from column metadata list."""
     return [col.name for col in columns]
@@ -487,3 +621,4 @@ def get_all_column_names(columns: list[ColumnMetadata]) -> list[str]:
 CHART_ALL_COLUMNS: list[str] = []
 DATASET_ALL_COLUMNS: list[str] = []
 DASHBOARD_ALL_COLUMNS: list[str] = []
+DATABASE_ALL_COLUMNS: list[str] = []
diff --git a/superset/mcp_service/constants.py b/superset/mcp_service/constants.py
index 7abf91147a8..6315ef8755f 100644
--- a/superset/mcp_service/constants.py
+++ b/superset/mcp_service/constants.py
@@ -16,6 +16,15 @@
 # under the License.
 """Constants for the MCP service."""
 
+from typing import Literal
+
+# Supported model types for schema discovery and MCP tools
+ModelType = Literal["chart", "dataset", "dashboard", "database"]
+
+# Pagination defaults
+DEFAULT_PAGE_SIZE = 10  # Default number of items per page
+MAX_PAGE_SIZE = 100  # Maximum allowed page_size to prevent oversized responses
+
 # Response size guard defaults
 DEFAULT_TOKEN_LIMIT = 25_000  # ~25k tokens prevents overwhelming LLM context windows
 DEFAULT_WARN_THRESHOLD_PCT = 80  # Log warnings above 80% of limit
diff --git a/superset/mcp_service/dashboard/schemas.py b/superset/mcp_service/dashboard/schemas.py
index ba56cf774b0..6973245ad64 100644
--- a/superset/mcp_service/dashboard/schemas.py
+++ b/superset/mcp_service/dashboard/schemas.py
@@ -28,7 +28,7 @@ Example usage:
         dashboard_title="Sales Dashboard",
         published=True,
         owners=[UserInfo(id=1, username="admin")],
-        charts=[ChartInfo(id=1, slice_name="Sales Chart")]
+        charts=[DashboardChartSummary(id=1, slice_name="Sales Chart")]
     )
 
     # For dashboard list responses
@@ -65,9 +65,11 @@ Example usage:
 
 from __future__ import annotations
 
+import logging
 from datetime import datetime
 from typing import Annotated, Any, Dict, List, Literal, TYPE_CHECKING
 
+import humanize
 from pydantic import (
     BaseModel,
     ConfigDict,
@@ -82,8 +84,8 @@ if TYPE_CHECKING:
     from superset.models.dashboard import Dashboard
 
 from superset.daos.base import ColumnOperator, ColumnOperatorEnum
-from superset.mcp_service.chart.schemas import ChartInfo, serialize_chart_object
 from superset.mcp_service.common.cache_schemas import MetadataCacheControl
+from superset.mcp_service.constants import DEFAULT_PAGE_SIZE, MAX_PAGE_SIZE
 from superset.mcp_service.system.schemas import (
     PaginationInfo,
     RoleInfo,
@@ -91,6 +93,11 @@ from superset.mcp_service.system.schemas import (
     TagInfo,
     UserInfo,
 )
+from superset.mcp_service.utils.sanitization import (
+    _remove_dangerous_unicode,
+    _strip_html_tags,
+)
+from superset.utils.json import loads as json_loads
 
 
 class DashboardError(BaseModel):
@@ -244,7 +251,13 @@ class ListDashboardsRequest(MetadataCacheControl):
         Field(default=1, description="Page number for pagination (1-based)"),
     ]
     page_size: Annotated[
-        PositiveInt, Field(default=10, description="Number of items per page")
+        int,
+        Field(
+            default=DEFAULT_PAGE_SIZE,
+            gt=0,
+            le=MAX_PAGE_SIZE,
+            description=f"Number of items per page (max {MAX_PAGE_SIZE})",
+        ),
     ]
 
     @model_validator(mode="after")
@@ -286,6 +299,43 @@ class GetDashboardInfoRequest(MetadataCacheControl):
     )
 
 
+logger = logging.getLogger(__name__)
+
+
+class NativeFilterSummary(BaseModel):
+    """Lightweight summary of a native filter for LLM consumption.
+
+    Extracts only the fields needed to understand what filters are
+    available on a dashboard: name, type, and which columns they target.
+    """
+
+    id: str | None = Field(None, description="Filter ID")
+    name: str | None = Field(None, description="Filter display name")
+    filter_type: str | None = Field(
+        None, description="Filter type (e.g. filter_select, filter_range)"
+    )
+    targets: List[Dict[str, Any]] = Field(
+        default_factory=list,
+        description="Filter targets (column name and dataset ID)",
+    )
+
+
+class DashboardChartSummary(BaseModel):
+    """Lightweight chart representation for dashboard context.
+
+    Contains only the fields needed for LLMs to understand which charts
+    are on a dashboard, omitting verbose fields like form_data, tags,
+    owners, and timestamps that bloat the response.
+    """
+
+    id: int | None = Field(None, description="Chart ID")
+    slice_name: str | None = Field(None, description="Chart name")
+    viz_type: str | None = Field(None, description="Visualization type")
+    datasource_name: str | None = Field(None, description="Datasource name")
+    url: str | None = Field(None, description="Chart explore page URL")
+    description: str | None = Field(None, description="Chart description")
+
+
 class DashboardInfo(BaseModel):
     id: int | None = None
     dashboard_title: str | None = None
@@ -294,8 +344,6 @@ class DashboardInfo(BaseModel):
     css: str | None = None
     certified_by: str | None = None
     certification_details: str | None = None
-    json_metadata: str | None = None
-    position_json: str | None = None
     published: bool | None = None
     is_managed_externally: bool | None = None
     external_url: str | None = None
@@ -311,7 +359,32 @@ class DashboardInfo(BaseModel):
     owners: List[UserInfo] = Field(default_factory=list)
     tags: List[TagInfo] = Field(default_factory=list)
     roles: List[RoleInfo] = Field(default_factory=list)
-    charts: List[ChartInfo] = Field(default_factory=list)
+    charts: List[DashboardChartSummary] = Field(default_factory=list)
+
+    # Structured filter information extracted from json_metadata
+    native_filters: List[NativeFilterSummary] = Field(
+        default_factory=list,
+        description=(
+            "Native filters configured on this dashboard. Extracted from "
+            "json_metadata for LLM consumption — includes filter name, type, "
+            "and target columns."
+        ),
+    )
+    cross_filters_enabled: bool | None = Field(
+        None,
+        description="Whether cross-filtering between charts is enabled.",
+    )
+
+    # Omission metadata — tells the agent what was stripped and why
+    omitted_fields: Dict[str, str] = Field(
+        default_factory=dict,
+        description=(
+            "Fields omitted from this response to reduce size. Keys are field "
+            "names, values describe what was omitted and how to access the full "
+            "data. Useful filter information has been extracted into "
+            "native_filters and cross_filters_enabled above."
+        ),
+    )
 
     # Fields for permalink/filter state support
     permalink_key: str | None = Field(
@@ -420,6 +493,15 @@ class AddChartToDashboardResponse(BaseModel):
         None, description="Position information for the added chart"
     )
     error: str | None = Field(None, description="Error message, if operation failed")
+    permission_denied: bool = Field(
+        default=False,
+        description=(
+            "True when the operation failed because the current user does not "
+            "have edit rights on the target dashboard. When True, inform the "
+            "user and ask if they would like a new dashboard created instead. "
+            "Do NOT silently create a new dashboard — always confirm first."
+        ),
+    )
 
 
 class GenerateDashboardRequest(BaseModel):
@@ -437,9 +519,19 @@ class GenerateDashboardRequest(BaseModel):
     )
     description: str | None = Field(None, description="Description for the dashboard")
     published: bool = Field(
-        default=True, description="Whether to publish the dashboard"
+        default=False, description="Whether to publish the dashboard"
     )
 
+    @field_validator("dashboard_title")
+    @classmethod
+    def sanitize_dashboard_title(cls, v: str | None) -> str | None:
+        """Strip HTML tags from dashboard title to prevent XSS."""
+        if v is None:
+            return None
+        v = _strip_html_tags(v.strip())
+        v = _remove_dangerous_unicode(v)
+        return v
+
 
 class GenerateDashboardResponse(BaseModel):
     """Response schema for dashboard generation."""
@@ -451,6 +543,121 @@ class GenerateDashboardResponse(BaseModel):
     error: str | None = Field(None, description="Error message, if creation failed")
 
 
+def _parse_json_metadata(json_metadata_str: str | None) -> Dict[str, Any] | None:
+    """Parse json_metadata string into a dict, returning None on any failure.
+
+    Handles None/empty input, invalid JSON, and non-dict JSON values
+    (e.g. ``"[]"``, ``"123"``) by returning None instead of raising.
+    """
+    if not json_metadata_str:
+        return None
+    try:
+        metadata = json_loads(json_metadata_str)
+    except (ValueError, TypeError):
+        return None
+    if not isinstance(metadata, dict):
+        return None
+    return metadata
+
+
+def _extract_native_filters(json_metadata_str: str | None) -> List[NativeFilterSummary]:
+    """Extract native filter summaries from raw json_metadata string.
+
+    Parses the json_metadata JSON blob and pulls out only the filter
+    name, type, and targets — dropping verbose fields like controlValues,
+    defaultDataMask, scope, and cascadeParentIds.
+    """
+    metadata = _parse_json_metadata(json_metadata_str)
+    if metadata is None:
+        return []
+
+    native_filters = metadata.get("native_filter_configuration", [])
+    if not isinstance(native_filters, list):
+        return []
+
+    summaries: List[NativeFilterSummary] = []
+    for f in native_filters:
+        if not isinstance(f, dict):
+            continue
+        raw_targets = f.get("targets", [])
+        if not isinstance(raw_targets, list):
+            raw_targets = []
+        targets = [t for t in raw_targets if isinstance(t, dict)]
+        summaries.append(
+            NativeFilterSummary(
+                id=f.get("id"),
+                name=f.get("name"),
+                filter_type=f.get("filterType"),
+                targets=targets,
+            )
+        )
+    return summaries
+
+
+def _extract_cross_filters_enabled(json_metadata_str: str | None) -> bool | None:
+    """Extract the cross_filters_enabled flag from json_metadata."""
+    metadata = _parse_json_metadata(json_metadata_str)
+    if metadata is None:
+        return None
+    cross_filters = metadata.get("cross_filters_enabled")
+    if isinstance(cross_filters, bool):
+        return cross_filters
+    return None
+
+
+def _build_omitted_fields(
+    json_metadata_str: str | None, position_json_str: str | None
+) -> Dict[str, str]:
+    """Build omission metadata describing which fields were stripped and why.
+
+    Uses the shared OmittedFieldsBuilder utility so the pattern is consistent
+    across all MCP tool serializers.
+    """
+    from superset.mcp_service.utils.response_utils import OmittedFieldsBuilder
+
+    return (
+        OmittedFieldsBuilder()
+        .add_raw_field(
+            "position_json",
+            raw_value=position_json_str,
+            reason=(
+                "Internal layout tree with component positions/hierarchy. "
+                "Not useful for analysis or LLM context."
+            ),
+        )
+        .add_extracted_field(
+            "json_metadata",
+            raw_value=json_metadata_str,
+            reason=(
+                "native_filters and cross_filters_enabled extracted into "
+                "dedicated fields above."
+            ),
+        )
+        .build()
+    )
+
+
+def serialize_chart_summary(chart: Any) -> DashboardChartSummary | None:
+    """Serialize a chart to a lightweight summary for dashboard context."""
+    if not chart:
+        return None
+    from superset.mcp_service.utils.url_utils import get_superset_base_url
+
+    chart_id = getattr(chart, "id", None)
+    chart_url = None
+    if chart_id is not None:
+        chart_url = f"{get_superset_base_url()}/explore/?slice_id={chart_id}"
+
+    return DashboardChartSummary(
+        id=chart_id,
+        slice_name=getattr(chart, "slice_name", None),
+        viz_type=getattr(chart, "viz_type", None),
+        datasource_name=getattr(chart, "datasource_name", None),
+        url=chart_url,
+        description=getattr(chart, "description", None),
+    )
+
+
 def dashboard_serializer(dashboard: "Dashboard") -> DashboardInfo:
     from superset.mcp_service.utils.url_utils import get_superset_base_url
 
@@ -466,8 +673,6 @@ def dashboard_serializer(dashboard: "Dashboard") -> DashboardInfo:
         css=dashboard.css,
         certified_by=dashboard.certified_by,
         certification_details=dashboard.certification_details,
-        json_metadata=dashboard.json_metadata,
-        position_json=dashboard.position_json,
         published=dashboard.published,
         is_managed_externally=dashboard.is_managed_externally,
         external_url=dashboard.external_url,
@@ -484,6 +689,16 @@ def dashboard_serializer(dashboard: "Dashboard") -> DashboardInfo:
         created_on_humanized=dashboard.created_on_humanized,
         changed_on_humanized=dashboard.changed_on_humanized,
         chart_count=len(dashboard.slices) if dashboard.slices else 0,
+        native_filters=_extract_native_filters(
+            getattr(dashboard, "json_metadata", None)
+        ),
+        cross_filters_enabled=_extract_cross_filters_enabled(
+            getattr(dashboard, "json_metadata", None)
+        ),
+        omitted_fields=_build_omitted_fields(
+            getattr(dashboard, "json_metadata", None),
+            getattr(dashboard, "position_json", None),
+        ),
         owners=[
             info
             for owner in dashboard.owners
@@ -502,12 +717,23 @@ def dashboard_serializer(dashboard: "Dashboard") -> DashboardInfo:
         ]
         if dashboard.roles
         else [],
-        charts=[serialize_chart_object(chart) for chart in dashboard.slices]
+        charts=[
+            summary
+            for chart in dashboard.slices
+            if (summary := serialize_chart_summary(chart)) is not None
+        ]
         if dashboard.slices
         else [],
     )
 
 
+def _humanize_timestamp(dt: datetime | None) -> str | None:
+    """Convert a datetime to a humanized string like '2 hours ago'."""
+    if dt is None:
+        return None
+    return humanize.naturaltime(datetime.now() - dt)
+
+
 def serialize_dashboard_object(dashboard: Any) -> DashboardInfo:
     """Simple dashboard serializer that safely handles object attributes."""
     from superset.mcp_service.utils.url_utils import get_superset_base_url
@@ -522,24 +748,32 @@ def serialize_dashboard_object(dashboard: Any) -> DashboardInfo:
             f"{get_superset_base_url()}/superset/dashboard/{slug or dashboard_id}/"
         )
 
+    json_metadata_str = getattr(dashboard, "json_metadata", None)
+    position_json_str = getattr(dashboard, "position_json", None)
+
     return DashboardInfo(
         id=dashboard_id,
         dashboard_title=getattr(dashboard, "dashboard_title", None),
-        slug=slug,
+        slug=slug or "",
         url=dashboard_url,
         published=getattr(dashboard, "published", None),
         changed_by=getattr(dashboard, "changed_by_name", None),
         changed_on=getattr(dashboard, "changed_on", None),
-        changed_on_humanized=getattr(dashboard, "changed_on_humanized", None),
+        changed_on_humanized=_humanize_timestamp(
+            getattr(dashboard, "changed_on", None)
+        ),
         created_by=getattr(dashboard, "created_by_name", None),
         created_on=getattr(dashboard, "created_on", None),
-        created_on_humanized=getattr(dashboard, "created_on_humanized", None),
+        created_on_humanized=_humanize_timestamp(
+            getattr(dashboard, "created_on", None)
+        ),
         description=getattr(dashboard, "description", None),
         css=getattr(dashboard, "css", None),
         certified_by=getattr(dashboard, "certified_by", None),
         certification_details=getattr(dashboard, "certification_details", None),
-        json_metadata=getattr(dashboard, "json_metadata", None),
-        position_json=getattr(dashboard, "position_json", None),
+        native_filters=_extract_native_filters(json_metadata_str),
+        cross_filters_enabled=_extract_cross_filters_enabled(json_metadata_str),
+        omitted_fields=_build_omitted_fields(json_metadata_str, position_json_str),
         is_managed_externally=getattr(dashboard, "is_managed_externally", None),
         external_url=getattr(dashboard, "external_url", None),
         uuid=str(getattr(dashboard, "uuid", ""))
@@ -547,8 +781,9 @@ def serialize_dashboard_object(dashboard: Any) -> DashboardInfo:
         else None,
         chart_count=len(getattr(dashboard, "slices", [])),
         owners=[
-            UserInfo.model_validate(owner, from_attributes=True)
+            info
             for owner in getattr(dashboard, "owners", [])
+            if (info := serialize_user_object(owner)) is not None
         ]
         if getattr(dashboard, "owners", None)
         else [],
@@ -565,7 +800,9 @@ def serialize_dashboard_object(dashboard: Any) -> DashboardInfo:
         if getattr(dashboard, "roles", None)
         else [],
         charts=[
-            serialize_chart_object(chart) for chart in getattr(dashboard, "slices", [])
+            summary
+            for chart in getattr(dashboard, "slices", [])
+            if (summary := serialize_chart_summary(chart)) is not None
         ]
         if getattr(dashboard, "slices", None)
         else [],
diff --git a/superset/mcp_service/dashboard/tool/add_chart_to_existing_dashboard.py b/superset/mcp_service/dashboard/tool/add_chart_to_existing_dashboard.py
index 9765cace49c..da511c29eb3 100644
--- a/superset/mcp_service/dashboard/tool/add_chart_to_existing_dashboard.py
+++ b/superset/mcp_service/dashboard/tool/add_chart_to_existing_dashboard.py
@@ -26,10 +26,11 @@ import re
 from typing import Any, Dict
 
 from fastmcp import Context
+from sqlalchemy.exc import SQLAlchemyError
 from superset_core.mcp.decorators import tool, ToolAnnotations
 
+from superset.commands.exceptions import CommandException
 from superset.extensions import event_logger
-from superset.mcp_service.chart.schemas import serialize_chart_object
 from superset.mcp_service.dashboard.constants import (
     generate_id,
     GRID_COLUMN_COUNT,
@@ -39,8 +40,8 @@ from superset.mcp_service.dashboard.schemas import (
     AddChartToDashboardRequest,
     AddChartToDashboardResponse,
     DashboardInfo,
+    serialize_chart_summary,
 )
-from superset.mcp_service.utils.schema_utils import parse_request
 from superset.mcp_service.utils.url_utils import get_superset_base_url
 from superset.utils import json
 
@@ -290,8 +291,17 @@ def _ensure_layout_structure(
     if "ROOT_ID" in layout:
         if "children" not in layout["ROOT_ID"]:
             layout["ROOT_ID"]["children"] = []
-        if "GRID_ID" not in layout["ROOT_ID"]["children"]:
-            layout["ROOT_ID"]["children"].append("GRID_ID")
+        # Only add GRID_ID to ROOT_ID when TABS are not already a direct
+        # child of ROOT_ID.  Real Superset dashboards with tabs place a
+        # TABS container directly under ROOT_ID (ROOT_ID → TABS → TABs).
+        # Adding GRID_ID as a sibling of TABS confuses the frontend layout
+        # engine and makes charts invisible.
+        root_children = layout["ROOT_ID"]["children"]
+        has_tabs_under_root = any(
+            layout.get(c, {}).get("type") == "TABS" for c in root_children
+        )
+        if not has_tabs_under_root and "GRID_ID" not in root_children:
+            root_children.append("GRID_ID")
     else:
         # Create ROOT_ID if it doesn't exist
         layout["ROOT_ID"] = {
@@ -305,6 +315,47 @@ def _ensure_layout_structure(
         layout["DASHBOARD_VERSION_KEY"] = "v2"
 
 
+def _find_and_authorize_dashboard(
+    dashboard_id: int,
+) -> tuple[Any, AddChartToDashboardResponse | None]:
+    """Return (dashboard, None) on success or (None, error_response) on failure.
+
+    Handles both the not-found case and the ownership check so the main tool
+    function doesn't need two separate branches for these pre-conditions.
+    """
+    from superset import security_manager
+    from superset.daos.dashboard import DashboardDAO
+    from superset.exceptions import SupersetSecurityException
+
+    dashboard = DashboardDAO.find_by_id(dashboard_id)
+    if not dashboard:
+        return None, AddChartToDashboardResponse(
+            dashboard=None,
+            dashboard_url=None,
+            position=None,
+            error=f"Dashboard with ID {dashboard_id} not found",
+        )
+
+    try:
+        security_manager.raise_for_ownership(dashboard)
+    except SupersetSecurityException:
+        return None, AddChartToDashboardResponse(
+            dashboard=None,
+            dashboard_url=None,
+            position=None,
+            permission_denied=True,
+            error=(
+                f"You don't have permission to edit dashboard "
+                f"'{dashboard.dashboard_title}' (ID: {dashboard_id}). "
+                "Ask the user if they would like a new dashboard "
+                "created with this chart instead, and only proceed "
+                "if they confirm."
+            ),
+        )
+
+    return dashboard, None
+
+
 @tool(
     tags=["mutate"],
     class_permission_name="Dashboard",
@@ -314,7 +365,6 @@ def _ensure_layout_structure(
         destructiveHint=False,
     ),
 )
-@parse_request(AddChartToDashboardRequest)
 def add_chart_to_existing_dashboard(
     request: AddChartToDashboardRequest, ctx: Context
 ) -> AddChartToDashboardResponse:
@@ -324,18 +374,12 @@ def add_chart_to_existing_dashboard(
     """
     try:
         from superset.commands.dashboard.update import UpdateDashboardCommand
-        from superset.daos.dashboard import DashboardDAO
 
-        # Validate dashboard and chart exist
+        # Validate dashboard exists and user has edit permission
         with event_logger.log_context(action="mcp.add_chart_to_dashboard.validation"):
-            dashboard = DashboardDAO.find_by_id(request.dashboard_id)
-            if not dashboard:
-                return AddChartToDashboardResponse(
-                    dashboard=None,
-                    dashboard_url=None,
-                    position=None,
-                    error=(f"Dashboard with ID {request.dashboard_id} not found"),
-                )
+            dashboard, auth_error = _find_and_authorize_dashboard(request.dashboard_id)
+            if auth_error is not None:
+                return auth_error
 
             # Get chart object for SQLAlchemy relationships and validation
             from superset import db
@@ -350,6 +394,24 @@ def add_chart_to_existing_dashboard(
                     error=f"Chart with ID {request.chart_id} not found",
                 )
 
+            # Validate dataset access for the chart.
+            # check_chart_data_access is the centralized data-level
+            # permission check that complements the class-level RBAC
+            # enforced by mcp_auth_hook.
+            from superset.mcp_service.auth import check_chart_data_access
+
+            validation = check_chart_data_access(new_chart)
+            if not validation.is_valid:
+                return AddChartToDashboardResponse(
+                    dashboard=None,
+                    dashboard_url=None,
+                    position=None,
+                    error=(
+                        f"Chart {request.chart_id} is not accessible: "
+                        f"{validation.error}"
+                    ),
+                )
+
             # Check if chart is already in dashboard
             current_chart_ids = [slice.id for slice in dashboard.slices]
             if request.chart_id in current_chart_ids:
@@ -406,6 +468,66 @@ def add_chart_to_existing_dashboard(
             command = UpdateDashboardCommand(request.dashboard_id, update_data)
             updated_dashboard = command.run()
 
+        # Re-fetch the dashboard with eager-loaded relationships to avoid
+        # "Instance is not bound to a Session" errors when serializing
+        # chart .tags and .owners.  The preceding command.run() commit may
+        # invalidate the session in multi-tenant environments; on failure,
+        # return a minimal response using only scalar attributes that are
+        # already loaded — relationship fields (owners, tags, slices) would
+        # trigger lazy-loading on the same dead session.
+        from sqlalchemy.orm import subqueryload
+
+        from superset.daos.dashboard import DashboardDAO
+        from superset.models.dashboard import Dashboard
+        from superset.models.slice import Slice
+
+        try:
+            updated_dashboard = (
+                DashboardDAO.find_by_id(
+                    updated_dashboard.id,
+                    query_options=[
+                        subqueryload(Dashboard.slices).subqueryload(Slice.owners),
+                        subqueryload(Dashboard.slices).subqueryload(Slice.tags),
+                        subqueryload(Dashboard.owners),
+                        subqueryload(Dashboard.tags),
+                    ],
+                )
+                or updated_dashboard
+            )
+        except SQLAlchemyError:
+            logger.warning(
+                "Re-fetch of dashboard %s failed; returning minimal response",
+                updated_dashboard.id,
+                exc_info=True,
+            )
+            try:
+                db.session.rollback()  # pylint: disable=consider-using-transaction
+            except SQLAlchemyError:
+                logger.warning(
+                    "Database rollback failed during dashboard re-fetch error handling",
+                    exc_info=True,
+                )
+            dashboard_url = (
+                f"{get_superset_base_url()}/superset/dashboard/{updated_dashboard.id}/"
+            )
+            position_info = {
+                "row": row_key,
+                "chart_key": chart_key,
+                "row_key": row_key,
+            }
+            return AddChartToDashboardResponse(
+                dashboard=DashboardInfo(
+                    id=updated_dashboard.id,
+                    dashboard_title=updated_dashboard.dashboard_title,
+                    published=updated_dashboard.published,
+                    chart_count=len(all_chart_objects),
+                    url=dashboard_url,
+                ),
+                dashboard_url=dashboard_url,
+                position=position_info,
+                error=None,
+            )
+
         # Convert to response format
         from superset.mcp_service.dashboard.schemas import (
             serialize_tag_object,
@@ -420,12 +542,8 @@ def add_chart_to_existing_dashboard(
             published=updated_dashboard.published,
             created_on=updated_dashboard.created_on,
             changed_on=updated_dashboard.changed_on,
-            created_by=updated_dashboard.created_by.username
-            if updated_dashboard.created_by
-            else None,
-            changed_by=updated_dashboard.changed_by.username
-            if updated_dashboard.changed_by
-            else None,
+            created_by=updated_dashboard.created_by_name or None,
+            changed_by=updated_dashboard.changed_by_name or None,
             uuid=str(updated_dashboard.uuid) if updated_dashboard.uuid else None,
             url=f"{get_superset_base_url()}/superset/dashboard/{updated_dashboard.id}/",
             chart_count=len(updated_dashboard.slices),
@@ -441,8 +559,9 @@ def add_chart_to_existing_dashboard(
             ],
             roles=[],
             charts=[
-                serialize_chart_object(chart)
+                obj
                 for chart in getattr(updated_dashboard, "slices", [])
+                if (obj := serialize_chart_summary(chart)) is not None
             ],
         )
 
@@ -464,7 +583,15 @@ def add_chart_to_existing_dashboard(
             error=None,
         )
 
-    except Exception as e:
+    except (CommandException, SQLAlchemyError, KeyError, ValueError) as e:
+        from superset import db
+
+        try:
+            db.session.rollback()  # pylint: disable=consider-using-transaction
+        except SQLAlchemyError:
+            logger.warning(
+                "Database rollback failed during error handling", exc_info=True
+            )
         logger.error("Error adding chart to dashboard: %s", e)
         return AddChartToDashboardResponse(
             dashboard=None,
diff --git a/superset/mcp_service/dashboard/tool/generate_dashboard.py b/superset/mcp_service/dashboard/tool/generate_dashboard.py
index 52bdb8b501a..aa1bb900a31 100644
--- a/superset/mcp_service/dashboard/tool/generate_dashboard.py
+++ b/superset/mcp_service/dashboard/tool/generate_dashboard.py
@@ -25,10 +25,10 @@ import logging
 from typing import Any, Dict, List
 
 from fastmcp import Context
+from flask import g
 from superset_core.mcp.decorators import tool, ToolAnnotations
 
 from superset.extensions import event_logger
-from superset.mcp_service.chart.schemas import serialize_chart_object
 from superset.mcp_service.dashboard.constants import (
     generate_id,
     GRID_COLUMN_COUNT,
@@ -39,7 +39,6 @@ from superset.mcp_service.dashboard.schemas import (
     GenerateDashboardRequest,
     GenerateDashboardResponse,
 )
-from superset.mcp_service.utils.schema_utils import parse_request
 from superset.mcp_service.utils.url_utils import get_superset_base_url
 from superset.utils import json
 
@@ -187,23 +186,27 @@ def _generate_title_from_charts(chart_objects: List[Any]) -> str:
         destructiveHint=False,
     ),
 )
-@parse_request(GenerateDashboardRequest)
-def generate_dashboard(
+def generate_dashboard(  # noqa: C901
     request: GenerateDashboardRequest, ctx: Context
 ) -> GenerateDashboardResponse:
-    """Create dashboard from chart IDs.
+    """Create a NEW dashboard from chart IDs.
 
     IMPORTANT:
+    - Use this tool ONLY when creating a brand-new dashboard.
+    - To add a chart to an EXISTING dashboard, use add_chart_to_existing_dashboard.
+      Never use this tool as a fallback when add_chart_to_existing_dashboard fails.
     - All charts must exist and be accessible to current user
     - Charts arranged automatically in 2-column grid layout
 
     Returns:
     - Dashboard ID and URL
     """
+    from pydantic import ValidationError
+    from sqlalchemy.exc import SQLAlchemyError
+
     try:
         # Get chart objects from IDs (required for SQLAlchemy relationships)
         from superset import db
-        from superset.commands.dashboard.create import CreateDashboardCommand
         from superset.models.slice import Slice
 
         with event_logger.log_context(action="mcp.generate_dashboard.chart_validation"):
@@ -224,6 +227,23 @@ def generate_dashboard(
                     error=f"Charts not found: {list(missing_chart_ids)}",
                 )
 
+            # Validate dataset access for each chart.
+            # check_chart_data_access is the centralized data-level
+            # permission check that complements the class-level RBAC
+            # enforced by mcp_auth_hook.
+            from superset.mcp_service.auth import check_chart_data_access
+
+            for chart in chart_objects:
+                validation = check_chart_data_access(chart)
+                if not validation.is_valid:
+                    return GenerateDashboardResponse(
+                        dashboard=None,
+                        dashboard_url=None,
+                        error=(
+                            f"Chart {chart.id} is not accessible: {validation.error}"
+                        ),
+                    )
+
         # Create dashboard layout with chart objects
         with event_logger.log_context(action="mcp.generate_dashboard.layout"):
             layout = _create_dashboard_layout(chart_objects)
@@ -235,47 +255,149 @@ def generate_dashboard(
             else _generate_title_from_charts(chart_objects)
         )
 
-        # Prepare dashboard data and create dashboard
+        # Create the dashboard directly with db.session instead of using
+        # CreateDashboardCommand.  The command's @transaction decorator
+        # may operate in a different SQLAlchemy scoped-session than the
+        # one g.user and chart ORM objects are bound to in the MCP
+        # context, causing "Object is already attached to session X
+        # (this is Y)" errors.  By re-querying all ORM objects in the
+        # tool's own db.session we keep everything in a single session.
+        from sqlalchemy.orm import subqueryload
+
+        from superset.models.dashboard import Dashboard
+
         with event_logger.log_context(action="mcp.generate_dashboard.db_write"):
-            dashboard_data = {
-                "dashboard_title": dashboard_title,
-                "slug": None,  # Let Superset auto-generate slug
-                "css": "",
-                "json_metadata": json.dumps(
-                    {
-                        "filter_scopes": {},
-                        "expanded_slices": {},
-                        "refresh_frequency": 0,
-                        "timed_refresh_immune_slices": [],
-                        "color_scheme": None,
-                        "label_colors": {},
-                        "shared_label_colors": {},
-                        "color_scheme_domain": [],
-                        "cross_filters_enabled": False,
-                        "native_filter_configuration": [],
-                        "global_chart_configuration": {
-                            "scope": {
-                                "rootPath": ["ROOT_ID"],
-                                "excluded": [],
-                            }
-                        },
-                        "chart_configuration": {},
-                    }
+            json_metadata = json.dumps(
+                {
+                    "filter_scopes": {},
+                    "expanded_slices": {},
+                    "refresh_frequency": 0,
+                    "timed_refresh_immune_slices": [],
+                    "color_scheme": None,
+                    "label_colors": {},
+                    "shared_label_colors": {},
+                    "color_scheme_domain": [],
+                    "cross_filters_enabled": False,
+                    "native_filter_configuration": [],
+                    "global_chart_configuration": {
+                        "scope": {
+                            "rootPath": ["ROOT_ID"],
+                            "excluded": [],
+                        }
+                    },
+                    "chart_configuration": {},
+                }
+            )
+
+            try:
+                dashboard = Dashboard()
+                dashboard.dashboard_title = dashboard_title
+                dashboard.json_metadata = json_metadata
+                dashboard.position_json = json.dumps(layout)
+                dashboard.published = request.published
+
+                if request.description:
+                    dashboard.description = request.description
+
+                # Re-query the current user and charts directly in the
+                # current db.session.  g.user was loaded in a Flask
+                # app_context that has since been torn down (the
+                # middleware's ``with flask_app.app_context()`` exits
+                # before the tool function runs), so the User object
+                # is bound to a dead/different scoped session.
+                # Querying fresh avoids all cross-session errors.
+                from superset.extensions import security_manager
+
+                current_user = (
+                    db.session.query(security_manager.user_model)
+                    .filter_by(id=g.user.id)
+                    .first()
+                )
+                if current_user:
+                    dashboard.owners = [current_user]
+
+                fresh_charts = (
+                    db.session.query(Slice)
+                    .filter(Slice.id.in_(request.chart_ids))
+                    .order_by(Slice.id)
+                    .all()
+                )
+                dashboard.slices = fresh_charts
+
+                db.session.add(dashboard)
+                db.session.commit()  # pylint: disable=consider-using-transaction
+            except SQLAlchemyError as db_err:
+                try:
+                    db.session.rollback()  # pylint: disable=consider-using-transaction
+                except SQLAlchemyError:
+                    logger.warning(
+                        "Database rollback failed during error handling",
+                        exc_info=True,
+                    )
+                logger.error(
+                    "Dashboard creation failed: %s",
+                    db_err,
+                    exc_info=True,
+                )
+                return GenerateDashboardResponse(
+                    dashboard=None,
+                    dashboard_url=None,
+                    error="Failed to create dashboard due to a database error.",
+                )
+
+        # Re-fetch with eager-loaded relationships for serialization.
+        # The preceding commit may invalidate the session in multi-tenant
+        # environments, causing "Can't reconnect until invalid transaction
+        # is rolled back".  Wrap the DAO re-fetch in try/except; on failure,
+        # return a minimal response using only scalar attributes that are
+        # already loaded — relationship fields (owners, tags, slices) would
+        # trigger lazy-loading on the same dead session.
+        from superset.daos.dashboard import DashboardDAO
+
+        try:
+            dashboard = (
+                DashboardDAO.find_by_id(
+                    dashboard.id,
+                    query_options=[
+                        subqueryload(Dashboard.slices).subqueryload(Slice.owners),
+                        subqueryload(Dashboard.slices).subqueryload(Slice.tags),
+                        subqueryload(Dashboard.owners),
+                        subqueryload(Dashboard.tags),
+                    ],
+                )
+                or dashboard
+            )
+        except SQLAlchemyError:
+            logger.warning(
+                "Re-fetch of dashboard %s failed; returning minimal response",
+                dashboard.id,
+                exc_info=True,
+            )
+            try:
+                db.session.rollback()  # pylint: disable=consider-using-transaction
+            except SQLAlchemyError:
+                logger.warning(
+                    "Database rollback failed during dashboard re-fetch error handling",
+                    exc_info=True,
+                )
+            dashboard_url = (
+                f"{get_superset_base_url()}/superset/dashboard/{dashboard.id}/"
+            )
+            return GenerateDashboardResponse(
+                dashboard=DashboardInfo(
+                    id=dashboard.id,
+                    dashboard_title=dashboard.dashboard_title,
+                    url=dashboard_url,
+                    chart_count=len(request.chart_ids),
+                    published=dashboard.published,
                 ),
-                "position_json": json.dumps(layout),
-                "published": request.published,
-                "slices": chart_objects,  # Pass ORM objects, not IDs
-            }
-
-            if request.description:
-                dashboard_data["description"] = request.description
-
-            # Create the dashboard using Superset's command pattern
-            command = CreateDashboardCommand(dashboard_data)
-            dashboard = command.run()
+                dashboard_url=dashboard_url,
+                error=None,
+            )
 
         # Convert to our response format
         from superset.mcp_service.dashboard.schemas import (
+            serialize_chart_summary,
             serialize_tag_object,
             serialize_user_object,
         )
@@ -288,8 +410,8 @@ def generate_dashboard(
             published=dashboard.published,
             created_on=dashboard.created_on,
             changed_on=dashboard.changed_on,
-            created_by=dashboard.created_by.username if dashboard.created_by else None,
-            changed_by=dashboard.changed_by.username if dashboard.changed_by else None,
+            created_by=dashboard.created_by_name or None,
+            changed_by=dashboard.changed_by_name or None,
             uuid=str(dashboard.uuid) if dashboard.uuid else None,
             url=f"{get_superset_base_url()}/superset/dashboard/{dashboard.id}/",
             chart_count=len(request.chart_ids),
@@ -307,7 +429,7 @@ def generate_dashboard(
             charts=[
                 obj
                 for chart in getattr(dashboard, "slices", [])
-                if (obj := serialize_chart_object(chart)) is not None
+                if (obj := serialize_chart_summary(chart)) is not None
             ],
         )
 
@@ -321,8 +443,16 @@ def generate_dashboard(
             dashboard=dashboard_info, dashboard_url=dashboard_url, error=None
         )
 
-    except Exception as e:
-        logger.error("Error creating dashboard: %s", e)
+    except (SQLAlchemyError, ValueError, AttributeError, ValidationError) as e:
+        from superset import db
+
+        try:
+            db.session.rollback()  # pylint: disable=consider-using-transaction
+        except SQLAlchemyError:
+            logger.warning(
+                "Database rollback failed during error handling", exc_info=True
+            )
+        logger.error("Error creating dashboard: %s", e, exc_info=True)
         return GenerateDashboardResponse(
             dashboard=None,
             dashboard_url=None,
diff --git a/superset/mcp_service/dashboard/tool/get_dashboard_info.py b/superset/mcp_service/dashboard/tool/get_dashboard_info.py
index 7ad42e97955..46f5ae4eedd 100644
--- a/superset/mcp_service/dashboard/tool/get_dashboard_info.py
+++ b/superset/mcp_service/dashboard/tool/get_dashboard_info.py
@@ -39,7 +39,6 @@ from superset.mcp_service.dashboard.schemas import (
     GetDashboardInfoRequest,
 )
 from superset.mcp_service.mcp_core import ModelGetInfoCore
-from superset.mcp_service.utils.schema_utils import parse_request
 
 logger = logging.getLogger(__name__)
 
@@ -68,7 +67,6 @@ def _get_permalink_state(permalink_key: str) -> DashboardPermalinkValue | None:
         destructiveHint=False,
     ),
 )
-@parse_request(GetDashboardInfoRequest)
 async def get_dashboard_info(
     request: GetDashboardInfoRequest, ctx: Context
 ) -> DashboardInfo | DashboardError:
diff --git a/superset/mcp_service/dashboard/tool/list_dashboards.py b/superset/mcp_service/dashboard/tool/list_dashboards.py
index 1feee0d2b6e..ded7d076144 100644
--- a/superset/mcp_service/dashboard/tool/list_dashboards.py
+++ b/superset/mcp_service/dashboard/tool/list_dashboards.py
@@ -40,7 +40,6 @@ from superset.mcp_service.dashboard.schemas import (
     serialize_dashboard_object,
 )
 from superset.mcp_service.mcp_core import ModelListCore
-from superset.mcp_service.utils.schema_utils import parse_request
 
 logger = logging.getLogger(__name__)
 
@@ -49,7 +48,11 @@ DEFAULT_DASHBOARD_COLUMNS = [
     "id",
     "dashboard_title",
     "slug",
+    "description",
+    "certified_by",
+    "certification_details",
     "url",
+    "changed_on",
     "changed_on_humanized",
 ]
 
@@ -72,7 +75,6 @@ SORTABLE_DASHBOARD_COLUMNS = [
         destructiveHint=False,
     ),
 )
-@parse_request(ListDashboardsRequest)
 async def list_dashboards(
     request: ListDashboardsRequest, ctx: Context
 ) -> DashboardList:
diff --git a/superset/mcp_service/database/__init__.py b/superset/mcp_service/database/__init__.py
new file mode 100644
index 00000000000..13a83393a91
--- /dev/null
+++ b/superset/mcp_service/database/__init__.py
@@ -0,0 +1,16 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
diff --git a/superset/mcp_service/database/schemas.py b/superset/mcp_service/database/schemas.py
new file mode 100644
index 00000000000..d93ea630b30
--- /dev/null
+++ b/superset/mcp_service/database/schemas.py
@@ -0,0 +1,364 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+"""
+Pydantic schemas for database-related responses
+"""
+
+from __future__ import annotations
+
+from datetime import datetime
+from typing import Annotated, Any, Dict, List, Literal
+
+import humanize
+from pydantic import (
+    BaseModel,
+    ConfigDict,
+    Field,
+    field_validator,
+    model_serializer,
+    model_validator,
+    PositiveInt,
+)
+
+from superset.daos.base import ColumnOperator, ColumnOperatorEnum
+from superset.mcp_service.common.cache_schemas import MetadataCacheControl
+from superset.mcp_service.constants import DEFAULT_PAGE_SIZE, MAX_PAGE_SIZE
+from superset.mcp_service.system.schemas import PaginationInfo
+from superset.mcp_service.utils.schema_utils import (
+    parse_json_or_list,
+    parse_json_or_model_list,
+)
+from superset.utils import json
+
+
+class DatabaseFilter(ColumnOperator):
+    """
+    Filter object for database listing.
+    col: The column to filter on. Must be one of the allowed filter fields.
+    opr: The operator to use. Must be one of the supported operators.
+    value: The value to filter by (type depends on col and opr).
+    """
+
+    col: Literal[
+        "database_name",
+        "expose_in_sqllab",
+        "allow_file_upload",
+        "created_by_fk",
+        "changed_by_fk",
+    ] = Field(
+        ...,
+        description="Column to filter on. Use get_schema(model_type='database') for "
+        "available filter columns. Use created_by_fk with the user "
+        "ID from get_instance_info's current_user to find "
+        "databases created by a specific user.",
+    )
+    opr: ColumnOperatorEnum = Field(
+        ...,
+        description="Operator to use. Use get_schema(model_type='database') for "
+        "available operators.",
+    )
+    value: str | int | float | bool | List[str | int | float | bool] = Field(
+        ..., description="Value to filter by (type depends on col and opr)"
+    )
+
+
+class DatabaseInfo(BaseModel):
+    id: int | None = Field(None, description="Database ID")
+    uuid: str | None = Field(None, description="Database UUID")
+    database_name: str | None = Field(None, description="Database connection name")
+    backend: str | None = Field(None, description="Database backend (e.g., postgresql)")
+    expose_in_sqllab: bool | None = Field(
+        None, description="Whether exposed in SQL Lab"
+    )
+    allow_ctas: bool | None = Field(
+        None, description="Whether CREATE TABLE AS is allowed"
+    )
+    allow_cvas: bool | None = Field(
+        None, description="Whether CREATE VIEW AS is allowed"
+    )
+    allow_dml: bool | None = Field(
+        None, description="Whether DML statements are allowed"
+    )
+    allow_file_upload: bool | None = Field(
+        None, description="Whether file upload is allowed"
+    )
+    allow_run_async: bool | None = Field(
+        None, description="Whether async query execution is allowed"
+    )
+    cache_timeout: int | None = Field(
+        None, description="Cache timeout override in seconds"
+    )
+    configuration_method: str | None = Field(
+        None, description="Configuration method (sqlalchemy_form or dynamic_form)"
+    )
+    force_ctas_schema: str | None = Field(
+        None, description="Schema to force for CTAS queries"
+    )
+    impersonate_user: bool | None = Field(
+        None, description="Whether to impersonate the logged-in user"
+    )
+    is_managed_externally: bool | None = Field(
+        None, description="Whether managed by an external system"
+    )
+    external_url: str | None = Field(
+        None, description="URL of the external management system"
+    )
+    extra: Dict[str, Any | None] | None = Field(None, description="Extra configuration")
+    changed_by: str | None = Field(None, description="Last modifier (username)")
+    changed_on: str | datetime | None = Field(
+        None, description="Last modification timestamp"
+    )
+    changed_on_humanized: str | None = Field(
+        None, description="Humanized modification time"
+    )
+    created_by: str | None = Field(None, description="Database creator (username)")
+    created_on: str | datetime | None = Field(None, description="Creation timestamp")
+    created_on_humanized: str | None = Field(
+        None, description="Humanized creation time"
+    )
+    model_config = ConfigDict(
+        from_attributes=True,
+        ser_json_timedelta="iso8601",
+        populate_by_name=True,
+    )
+
+    @model_serializer(mode="wrap", when_used="json")
+    def _filter_fields_by_context(self, serializer: Any, info: Any) -> Dict[str, Any]:
+        """Filter fields based on serialization context.
+
+        If context contains 'select_columns', only include those fields.
+        Otherwise, include all fields (default behavior).
+        """
+        data = serializer(self)
+
+        if info.context and isinstance(info.context, dict):
+            select_columns = info.context.get("select_columns")
+            if select_columns:
+                requested_fields = set(select_columns)
+                return {k: v for k, v in data.items() if k in requested_fields}
+
+        return data
+
+
+class DatabaseList(BaseModel):
+    databases: List[DatabaseInfo]
+    count: int
+    total_count: int
+    page: int
+    page_size: int
+    total_pages: int
+    has_previous: bool
+    has_next: bool
+    columns_requested: List[str] = Field(
+        default_factory=list,
+        description="Requested columns for the response",
+    )
+    columns_loaded: List[str] = Field(
+        default_factory=list,
+        description="Columns that were actually loaded for each database",
+    )
+    columns_available: List[str] = Field(
+        default_factory=list,
+        description="All columns available for selection via select_columns parameter",
+    )
+    sortable_columns: List[str] = Field(
+        default_factory=list,
+        description="Columns that can be used with order_column parameter",
+    )
+    filters_applied: List[DatabaseFilter] = Field(
+        default_factory=list,
+        description="List of advanced filter dicts applied to the query.",
+    )
+    pagination: PaginationInfo | None = None
+    timestamp: datetime | None = None
+    model_config = ConfigDict(ser_json_timedelta="iso8601")
+
+
+class ListDatabasesRequest(MetadataCacheControl):
+    """Request schema for list_databases with clear, unambiguous types."""
+
+    filters: Annotated[
+        List[DatabaseFilter],
+        Field(
+            default_factory=list,
+            description="List of filter objects (column, operator, value). Each "
+            "filter is an object with 'col', 'opr', and 'value' "
+            "properties. Cannot be used together with 'search'.",
+        ),
+    ]
+    select_columns: Annotated[
+        List[str],
+        Field(
+            default_factory=list,
+            description="List of columns to select. Defaults to common columns if not "
+            "specified.",
+        ),
+    ]
+    search: Annotated[
+        str | None,
+        Field(
+            default=None,
+            description="Text search string to match against database fields. Cannot "
+            "be used together with 'filters'.",
+        ),
+    ]
+    order_column: Annotated[
+        str | None, Field(default=None, description="Column to order results by")
+    ]
+    order_direction: Annotated[
+        Literal["asc", "desc"],
+        Field(
+            default="desc", description="Direction to order results ('asc' or 'desc')"
+        ),
+    ]
+    page: Annotated[
+        PositiveInt,
+        Field(default=1, description="Page number for pagination (1-based)"),
+    ]
+    page_size: Annotated[
+        int,
+        Field(
+            default=DEFAULT_PAGE_SIZE,
+            gt=0,
+            le=MAX_PAGE_SIZE,
+            description=f"Number of items per page (max {MAX_PAGE_SIZE})",
+        ),
+    ]
+
+    @field_validator("filters", mode="before")
+    @classmethod
+    def parse_filters(cls, v: Any) -> List[DatabaseFilter]:
+        """Accept both JSON string and list of objects."""
+        return parse_json_or_model_list(v, DatabaseFilter, "filters")
+
+    @field_validator("select_columns", mode="before")
+    @classmethod
+    def parse_columns(cls, v: Any) -> List[str]:
+        """Accept JSON array, list, or comma-separated string."""
+        return parse_json_or_list(v, "select_columns")
+
+    @model_validator(mode="after")
+    def validate_search_and_filters(self) -> "ListDatabasesRequest":
+        """Prevent using both search and filters simultaneously to avoid query
+        conflicts."""
+        if self.search and self.filters:
+            raise ValueError(
+                "Cannot use both 'search' and 'filters' parameters simultaneously. "
+                "Use either 'search' for text-based searching across multiple fields, "
+                "or 'filters' for precise column-based filtering, but not both."
+            )
+        return self
+
+
+class DatabaseError(BaseModel):
+    error: str = Field(..., description="Error message")
+    error_type: str = Field(..., description="Type of error")
+    timestamp: str | datetime | None = Field(None, description="Error timestamp")
+    model_config = ConfigDict(ser_json_timedelta="iso8601")
+
+    @classmethod
+    def create(cls, error: str, error_type: str) -> "DatabaseError":
+        """Create a standardized DatabaseError with timestamp."""
+        from datetime import datetime, timezone
+
+        return cls(
+            error=error, error_type=error_type, timestamp=datetime.now(timezone.utc)
+        )
+
+
+class GetDatabaseInfoRequest(MetadataCacheControl):
+    """Request schema for get_database_info with support for ID or UUID."""
+
+    identifier: Annotated[
+        int | str,
+        Field(description="Database identifier - can be numeric ID or UUID string"),
+    ]
+
+
+def _parse_json_field(obj: Any, field_name: str) -> Dict[str, Any] | None:
+    """Parse a field that may be stored as a JSON string into a dict."""
+    value = getattr(obj, field_name, None)
+    if isinstance(value, str):
+        try:
+            parsed = json.loads(value)
+            if isinstance(parsed, dict):
+                return parsed
+        except (ValueError, TypeError):
+            pass
+        return None
+    return value
+
+
+def _humanize_timestamp(dt: datetime | None) -> str | None:
+    """Convert a datetime to a humanized string like '2 hours ago'."""
+    if dt is None:
+        return None
+    now = datetime.now(dt.tzinfo) if dt.tzinfo else datetime.now()
+    return humanize.naturaltime(now - dt)
+
+
+def _get_backend(database: Any) -> str | None:
+    """Safely get backend from a Database object or row proxy.
+
+    backend is a @property that decrypts sqlalchemy_uri, which fails on
+    row proxies returned by column-only DAO list queries. Fall back to None
+    when the property raises.
+    """
+    try:
+        return database.backend
+    except (AttributeError, TypeError):
+        return None
+
+
+def serialize_database_object(database: Any) -> DatabaseInfo | None:
+    if not database:
+        return None
+
+    return DatabaseInfo(
+        id=getattr(database, "id", None),
+        uuid=str(getattr(database, "uuid", ""))
+        if getattr(database, "uuid", None)
+        else None,
+        database_name=getattr(database, "database_name", None),
+        backend=_get_backend(database),
+        expose_in_sqllab=getattr(database, "expose_in_sqllab", None),
+        allow_ctas=getattr(database, "allow_ctas", None),
+        allow_cvas=getattr(database, "allow_cvas", None),
+        allow_dml=getattr(database, "allow_dml", None),
+        allow_file_upload=getattr(database, "allow_file_upload", None),
+        allow_run_async=getattr(database, "allow_run_async", None),
+        cache_timeout=getattr(database, "cache_timeout", None),
+        configuration_method=getattr(database, "configuration_method", None),
+        force_ctas_schema=getattr(database, "force_ctas_schema", None),
+        impersonate_user=getattr(database, "impersonate_user", None),
+        is_managed_externally=getattr(database, "is_managed_externally", None),
+        external_url=getattr(database, "external_url", None),
+        extra=_parse_json_field(database, "extra"),
+        changed_by=getattr(database, "changed_by_name", None)
+        or (
+            str(database.changed_by) if getattr(database, "changed_by", None) else None
+        ),
+        changed_on=getattr(database, "changed_on", None),
+        changed_on_humanized=_humanize_timestamp(getattr(database, "changed_on", None)),
+        created_by=getattr(database, "created_by_name", None)
+        or (
+            str(database.created_by) if getattr(database, "created_by", None) else None
+        ),
+        created_on=getattr(database, "created_on", None),
+        created_on_humanized=_humanize_timestamp(getattr(database, "created_on", None)),
+    )
diff --git a/superset/mcp_service/database/tool/__init__.py b/superset/mcp_service/database/tool/__init__.py
new file mode 100644
index 00000000000..bb87106908e
--- /dev/null
+++ b/superset/mcp_service/database/tool/__init__.py
@@ -0,0 +1,24 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+from .get_database_info import get_database_info
+from .list_databases import list_databases
+
+__all__ = [
+    "list_databases",
+    "get_database_info",
+]
diff --git a/superset/mcp_service/database/tool/get_database_info.py b/superset/mcp_service/database/tool/get_database_info.py
new file mode 100644
index 00000000000..56aef1d2bb4
--- /dev/null
+++ b/superset/mcp_service/database/tool/get_database_info.py
@@ -0,0 +1,137 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+"""
+Get database info FastMCP tool
+
+This module contains the FastMCP tool for getting detailed information
+about a specific database connection.
+"""
+
+import logging
+from datetime import datetime, timezone
+
+from fastmcp import Context
+from superset_core.mcp.decorators import tool, ToolAnnotations
+
+from superset.extensions import event_logger
+from superset.mcp_service.database.schemas import (
+    DatabaseError,
+    DatabaseInfo,
+    GetDatabaseInfoRequest,
+    serialize_database_object,
+)
+from superset.mcp_service.mcp_core import ModelGetInfoCore
+
+logger = logging.getLogger(__name__)
+
+
+@tool(
+    tags=["discovery"],
+    class_permission_name="Database",
+    annotations=ToolAnnotations(
+        title="Get database info",
+        readOnlyHint=True,
+        destructiveHint=False,
+    ),
+)
+async def get_database_info(
+    request: GetDatabaseInfoRequest, ctx: Context
+) -> DatabaseInfo | DatabaseError:
+    """Get database connection metadata by ID or UUID.
+
+    Returns database configuration including backend type and capabilities
+    (allow_ctas, allow_dml, expose_in_sqllab, etc.).
+
+    IMPORTANT FOR LLM CLIENTS:
+    - Use numeric ID (e.g., 123) or UUID string (e.g., "a1b2c3d4-...")
+    - To find a database ID, use the list_databases tool first
+
+    Example usage:
+    ```json
+    {
+        "identifier": 1
+    }
+    ```
+
+    Or with UUID:
+    ```json
+    {
+        "identifier": "a1b2c3d4-5678-90ab-cdef-1234567890ab"
+    }
+    ```
+    """
+    await ctx.info(
+        "Retrieving database information: identifier=%s" % (request.identifier,)
+    )
+    await ctx.debug(
+        "Metadata cache settings: use_cache=%s refresh_metadata=%s force_refresh=%s"
+        % (
+            request.use_cache,
+            request.refresh_metadata,
+            request.force_refresh,
+        )
+    )
+
+    try:
+        from superset.daos.database import DatabaseDAO
+
+        with event_logger.log_context(action="mcp.get_database_info.lookup"):
+            get_tool = ModelGetInfoCore(
+                dao_class=DatabaseDAO,
+                output_schema=DatabaseInfo,
+                error_schema=DatabaseError,
+                serializer=serialize_database_object,
+                supports_slug=False,
+                logger=logger,
+            )
+
+            result = get_tool.run_tool(request.identifier)
+
+        if isinstance(result, DatabaseInfo):
+            await ctx.info(
+                "Database information retrieved successfully: "
+                "database_id=%s, database_name=%s, backend=%s"
+                % (
+                    result.id,
+                    result.database_name,
+                    result.backend,
+                )
+            )
+        else:
+            await ctx.warning(
+                "Database retrieval failed: error_type=%s, error=%s"
+                % (result.error_type, result.error)
+            )
+
+        return result
+
+    except Exception as e:
+        await ctx.error(
+            "Database information retrieval failed: identifier=%s, error=%s, "
+            "error_type=%s"
+            % (
+                request.identifier,
+                str(e),
+                type(e).__name__,
+            )
+        )
+        return DatabaseError(
+            error=f"Failed to get database info: {str(e)}",
+            error_type="InternalError",
+            timestamp=datetime.now(timezone.utc),
+        )
diff --git a/superset/mcp_service/database/tool/list_databases.py b/superset/mcp_service/database/tool/list_databases.py
new file mode 100644
index 00000000000..8db4e0fbb35
--- /dev/null
+++ b/superset/mcp_service/database/tool/list_databases.py
@@ -0,0 +1,166 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+"""
+List databases FastMCP tool (Advanced with metadata cache control)
+
+This module contains the FastMCP tool for listing databases using
+advanced filtering with clear, unambiguous request schema and metadata cache control.
+"""
+
+import logging
+from typing import TYPE_CHECKING
+
+from fastmcp import Context
+from superset_core.mcp.decorators import tool, ToolAnnotations
+
+if TYPE_CHECKING:
+    from superset.models.core import Database
+
+from superset.extensions import event_logger
+from superset.mcp_service.database.schemas import (
+    DatabaseFilter,
+    DatabaseInfo,
+    DatabaseList,
+    ListDatabasesRequest,
+    serialize_database_object,
+)
+from superset.mcp_service.mcp_core import ModelListCore
+
+logger = logging.getLogger(__name__)
+
+
+@tool(
+    tags=["core"],
+    class_permission_name="Database",
+    annotations=ToolAnnotations(
+        title="List databases",
+        readOnlyHint=True,
+        destructiveHint=False,
+    ),
+)
+async def list_databases(request: ListDatabasesRequest, ctx: Context) -> DatabaseList:
+    """List database connections with filtering and search.
+
+    Returns database metadata including name, backend type, and permissions.
+
+    Sortable columns for order_column: id, database_name, changed_on,
+    created_on
+    """
+    await ctx.info(
+        "Listing databases: page=%s, page_size=%s, search=%s"
+        % (
+            request.page,
+            request.page_size,
+            request.search,
+        )
+    )
+    await ctx.debug(
+        "Database listing parameters: filters=%s, order_column=%s, "
+        "order_direction=%s, select_columns=%s"
+        % (
+            request.filters,
+            request.order_column,
+            request.order_direction,
+            request.select_columns,
+        )
+    )
+    await ctx.debug(
+        "Metadata cache settings: use_cache=%s, refresh_metadata=%s, force_refresh=%s"
+        % (
+            request.use_cache,
+            request.refresh_metadata,
+            request.force_refresh,
+        )
+    )
+
+    try:
+        from superset.daos.database import DatabaseDAO
+        from superset.mcp_service.common.schema_discovery import (
+            DATABASE_DEFAULT_COLUMNS,
+            DATABASE_SORTABLE_COLUMNS,
+            get_all_column_names,
+            get_database_columns,
+        )
+
+        # Get all column names dynamically from the model
+        all_columns = get_all_column_names(get_database_columns())
+
+        def _serialize_database(
+            obj: "Database | None", cols: list[str] | None
+        ) -> DatabaseInfo | None:
+            """Serialize database (filtering via model_serializer)."""
+            return serialize_database_object(obj)
+
+        # Create tool with standard serialization
+        list_tool = ModelListCore(
+            dao_class=DatabaseDAO,
+            output_schema=DatabaseInfo,
+            item_serializer=_serialize_database,
+            filter_type=DatabaseFilter,
+            default_columns=DATABASE_DEFAULT_COLUMNS,
+            search_columns=["database_name"],
+            list_field_name="databases",
+            output_list_schema=DatabaseList,
+            all_columns=all_columns,
+            sortable_columns=DATABASE_SORTABLE_COLUMNS,
+            logger=logger,
+        )
+
+        with event_logger.log_context(action="mcp.list_databases.query"):
+            result = list_tool.run_tool(
+                filters=request.filters,
+                search=request.search,
+                select_columns=request.select_columns,
+                order_column=request.order_column,
+                order_direction=request.order_direction,
+                page=max(request.page - 1, 0),
+                page_size=request.page_size,
+            )
+
+        await ctx.info(
+            "Databases listed successfully: count=%s, total_count=%s, total_pages=%s"
+            % (
+                len(result.databases) if hasattr(result, "databases") else 0,
+                getattr(result, "total_count", None),
+                getattr(result, "total_pages", None),
+            )
+        )
+
+        # Apply field filtering via serialization context
+        columns_to_filter = result.columns_requested
+        await ctx.debug(
+            "Applying field filtering via serialization context: columns=%s"
+            % (columns_to_filter,)
+        )
+        with event_logger.log_context(action="mcp.list_databases.serialization"):
+            return result.model_dump(
+                mode="json",
+                context={"select_columns": columns_to_filter},
+            )
+
+    except Exception as e:
+        await ctx.error(
+            "Database listing failed: page=%s, page_size=%s, error=%s, error_type=%s"
+            % (
+                request.page,
+                request.page_size,
+                str(e),
+                type(e).__name__,
+            )
+        )
+        raise
diff --git a/superset/mcp_service/dataset/schemas.py b/superset/mcp_service/dataset/schemas.py
index 1fc5d67e112..ff25404427e 100644
--- a/superset/mcp_service/dataset/schemas.py
+++ b/superset/mcp_service/dataset/schemas.py
@@ -24,10 +24,12 @@ from __future__ import annotations
 from datetime import datetime
 from typing import Annotated, Any, Dict, List, Literal
 
+import humanize
 from pydantic import (
     BaseModel,
     ConfigDict,
     Field,
+    field_validator,
     model_serializer,
     model_validator,
     PositiveInt,
@@ -35,6 +37,7 @@ from pydantic import (
 
 from superset.daos.base import ColumnOperator, ColumnOperatorEnum
 from superset.mcp_service.common.cache_schemas import MetadataCacheControl
+from superset.mcp_service.constants import DEFAULT_PAGE_SIZE, MAX_PAGE_SIZE
 from superset.mcp_service.system.schemas import (
     PaginationInfo,
     serialize_user_object,
@@ -83,7 +86,11 @@ class TableColumnInfo(BaseModel):
 
 
 class SqlMetricInfo(BaseModel):
-    metric_name: str = Field(..., description="Metric name")
+    metric_name: str = Field(
+        ...,
+        description="Saved metric name. In chart configs, reference as "
+        '{"name": "<metric_name>", "saved_metric": true}.',
+    )
     verbose_name: str | None = Field(None, description="Verbose name")
     expression: str | None = Field(None, description="SQL expression")
     description: str | None = Field(None, description="Metric description")
@@ -96,6 +103,12 @@ class DatasetInfo(BaseModel):
     schema_name: str | None = Field(None, description="Schema name", alias="schema")
     database_name: str | None = Field(None, description="Database name")
     description: str | None = Field(None, description="Dataset description")
+    certified_by: str | None = Field(
+        None, description="Name of the person or team who certified this dataset"
+    )
+    certification_details: str | None = Field(
+        None, description="Certification details or reason"
+    )
     changed_by: str | None = Field(None, description="Last modifier (username)")
     changed_on: str | datetime | None = Field(
         None, description="Last modification timestamp"
@@ -132,7 +145,9 @@ class DatasetInfo(BaseModel):
         default_factory=list, description="Columns in the dataset"
     )
     metrics: List[SqlMetricInfo] = Field(
-        default_factory=list, description="Metrics in the dataset"
+        default_factory=list,
+        description="Saved metrics (pre-defined aggregations). "
+        "NOT columns — use saved_metric=true in chart configs.",
     )
     is_favorite: bool | None = Field(
         None, description="Whether this dataset is favorited by the current user"
@@ -247,7 +262,13 @@ class ListDatasetsRequest(MetadataCacheControl):
         Field(default=1, description="Page number for pagination (1-based)"),
     ]
     page_size: Annotated[
-        PositiveInt, Field(default=10, description="Number of items per page")
+        int,
+        Field(
+            default=DEFAULT_PAGE_SIZE,
+            gt=0,
+            le=MAX_PAGE_SIZE,
+            description=f"Number of items per page (max {MAX_PAGE_SIZE})",
+        ),
     ]
 
     @model_validator(mode="after")
@@ -286,6 +307,82 @@ class GetDatasetInfoRequest(MetadataCacheControl):
     ]
 
 
+class CreateVirtualDatasetRequest(BaseModel):
+    """Request schema for create_virtual_dataset."""
+
+    model_config = ConfigDict(populate_by_name=True)
+
+    database_id: int = Field(
+        ...,
+        description="ID of the database connection to use. "
+        "Use list_databases to find valid IDs.",
+    )
+    sql: str = Field(
+        ...,
+        description="SQL query to save as a virtual dataset. "
+        "Can be a JOIN, CTE, aggregation, or any valid SELECT.",
+    )
+    dataset_name: str = Field(
+        ...,
+        min_length=1,
+        max_length=250,
+        description="Name for the new virtual dataset.",
+    )
+    schema_name: str | None = Field(
+        None,
+        alias="schema",
+        description="Schema to associate with the dataset (optional).",
+    )
+    catalog: str | None = Field(
+        None,
+        description="Catalog to associate with the dataset (optional).",
+    )
+    description: str | None = Field(
+        None,
+        description="Human-readable description of the dataset (optional).",
+    )
+
+    @field_validator("sql")
+    @classmethod
+    def sql_must_not_be_empty(cls, v: str) -> str:
+        if not v.strip():
+            raise ValueError("sql must not be empty")
+        return v.strip()
+
+    @field_validator("dataset_name")
+    @classmethod
+    def dataset_name_must_not_be_empty(cls, v: str) -> str:
+        if not v.strip():
+            raise ValueError("dataset_name must not be empty")
+        return v.strip()
+
+
+class CreateVirtualDatasetResponse(BaseModel):
+    """Response schema for create_virtual_dataset."""
+
+    id: int | None = Field(
+        None,
+        description="Dataset ID. Pass this as dataset_id to generate_chart "
+        "or generate_explore_link. None if creation failed.",
+    )
+    dataset_name: str = Field(..., description="Name of the created dataset.")
+    sql: str = Field(..., description="SQL query stored in the dataset.")
+    database_id: int = Field(..., description="Database ID used.")
+    columns: List[str] = Field(
+        default_factory=list,
+        description="Column names available for charting. "
+        "Use these when building chart configs.",
+    )
+    url: str | None = Field(
+        None,
+        description="URL to view/edit the dataset in Superset. None if failed.",
+    )
+    error: str | None = Field(
+        None,
+        description="Error message if creation failed, otherwise null.",
+    )
+
+
 def _parse_json_field(obj: Any, field_name: str) -> Dict[str, Any] | None:
     """Parse a field that may be stored as a JSON string into a dict."""
     value = getattr(obj, field_name, None)
@@ -300,9 +397,19 @@ def _parse_json_field(obj: Any, field_name: str) -> Dict[str, Any] | None:
     return value
 
 
+def _humanize_timestamp(dt: datetime | None) -> str | None:
+    """Convert a datetime to a humanized string like '2 hours ago'."""
+    if dt is None:
+        return None
+    return humanize.naturaltime(datetime.now() - dt)
+
+
 def serialize_dataset_object(dataset: Any) -> DatasetInfo | None:
     if not dataset:
         return None
+
+    from superset.mcp_service.utils.url_utils import get_superset_base_url
+
     params = getattr(dataset, "params", None)
     if isinstance(params, str):
         try:
@@ -339,14 +446,16 @@ def serialize_dataset_object(dataset: Any) -> DatasetInfo | None:
         if getattr(dataset, "database", None)
         else None,
         description=getattr(dataset, "description", None),
+        certified_by=getattr(dataset, "certified_by", None),
+        certification_details=getattr(dataset, "certification_details", None),
         changed_by=getattr(dataset, "changed_by_name", None)
         or (str(dataset.changed_by) if getattr(dataset, "changed_by", None) else None),
         changed_on=getattr(dataset, "changed_on", None),
-        changed_on_humanized=getattr(dataset, "changed_on_humanized", None),
+        changed_on_humanized=_humanize_timestamp(getattr(dataset, "changed_on", None)),
         created_by=getattr(dataset, "created_by_name", None)
         or (str(dataset.created_by) if getattr(dataset, "created_by", None) else None),
         created_on=getattr(dataset, "created_on", None),
-        created_on_humanized=getattr(dataset, "created_on_humanized", None),
+        created_on_humanized=_humanize_timestamp(getattr(dataset, "created_on", None)),
         tags=[
             TagInfo.model_validate(tag, from_attributes=True)
             for tag in getattr(dataset, "tags", [])
@@ -366,7 +475,12 @@ def serialize_dataset_object(dataset: Any) -> DatasetInfo | None:
         if getattr(dataset, "uuid", None)
         else None,
         schema_perm=getattr(dataset, "schema_perm", None),
-        url=getattr(dataset, "url", None),
+        url=(
+            f"{get_superset_base_url()}/tablemodelview/edit/"
+            f"{getattr(dataset, 'id', None)}"
+            if getattr(dataset, "id", None)
+            else None
+        ),
         sql=getattr(dataset, "sql", None),
         main_dttm_col=getattr(dataset, "main_dttm_col", None),
         offset=getattr(dataset, "offset", None),
diff --git a/superset/mcp_service/dataset/tool/__init__.py b/superset/mcp_service/dataset/tool/__init__.py
index 4446d2173ff..d396ce9e2d1 100644
--- a/superset/mcp_service/dataset/tool/__init__.py
+++ b/superset/mcp_service/dataset/tool/__init__.py
@@ -15,10 +15,12 @@
 # specific language governing permissions and limitations
 # under the License.
 
+from .create_virtual_dataset import create_virtual_dataset
 from .get_dataset_info import get_dataset_info
 from .list_datasets import list_datasets
 
 __all__ = [
+    "create_virtual_dataset",
     "list_datasets",
     "get_dataset_info",
 ]
diff --git a/superset/mcp_service/dataset/tool/create_virtual_dataset.py b/superset/mcp_service/dataset/tool/create_virtual_dataset.py
new file mode 100644
index 00000000000..272509b1572
--- /dev/null
+++ b/superset/mcp_service/dataset/tool/create_virtual_dataset.py
@@ -0,0 +1,137 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+import logging
+from typing import Any
+
+from fastmcp import Context
+from superset_core.mcp.decorators import tool, ToolAnnotations
+
+from superset.extensions import event_logger
+from superset.mcp_service.dataset.schemas import (
+    CreateVirtualDatasetRequest,
+    CreateVirtualDatasetResponse,
+)
+
+logger = logging.getLogger(__name__)
+
+
+@tool(
+    tags=["mutate"],
+    class_permission_name="Dataset",
+    method_permission_name="write",
+    annotations=ToolAnnotations(
+        title="Create virtual dataset from SQL",
+        readOnlyHint=False,
+        destructiveHint=False,
+    ),
+)
+async def create_virtual_dataset(
+    request: CreateVirtualDatasetRequest, ctx: Context
+) -> CreateVirtualDatasetResponse:
+    """Save a SQL query as a virtual dataset so it can be charted.
+
+    Use this tool when a user wants to visualize data from a SQL query
+    (e.g., a JOIN or complex aggregation) that doesn't map to a single
+    physical table.
+
+    Workflow:
+    1. Call this tool with the SQL query and a dataset name
+    2. Use the returned ``id`` as the ``dataset_id`` in generate_chart or
+       generate_explore_link
+    3. Use the returned ``columns`` list to pick columns for the chart config
+    """
+    await ctx.info(
+        "Creating virtual dataset: database_id=%s, dataset_name=%r"
+        % (request.database_id, request.dataset_name)
+    )
+
+    try:
+        from superset.commands.dataset.create import CreateDatasetCommand
+        from superset.commands.dataset.exceptions import (
+            DatasetCreateFailedError,
+            DatasetInvalidError,
+        )
+        from superset.mcp_service.utils.url_utils import get_superset_base_url
+
+        # Create the virtual dataset — CreateDatasetCommand enforces access control
+        # and validates that the database exists (raises DatasetInvalidError otherwise)
+        with event_logger.log_context(action="mcp.create_virtual_dataset.create"):
+            properties: dict[str, Any] = {
+                "database": request.database_id,
+                "table_name": request.dataset_name,
+                "sql": request.sql,
+            }
+            if request.schema_name is not None:
+                properties["schema"] = request.schema_name
+            if request.catalog is not None:
+                properties["catalog"] = request.catalog
+            if request.description is not None:
+                properties["description"] = request.description
+
+            dataset = CreateDatasetCommand(properties).run()
+
+        # Build response
+        columns = [col.column_name for col in dataset.columns]
+        dataset_url = (
+            f"{get_superset_base_url()}"
+            f"/explore/?datasource_type=table&datasource_id={dataset.id}"
+        )
+
+        await ctx.info(
+            "Virtual dataset created: id=%s, dataset_name=%r, columns=%s"
+            % (dataset.id, dataset.table_name, columns)
+        )
+
+        return CreateVirtualDatasetResponse(
+            id=dataset.id,
+            dataset_name=dataset.table_name,
+            sql=request.sql,
+            database_id=request.database_id,
+            columns=columns,
+            url=dataset_url,
+        )
+
+    except DatasetInvalidError as exc:
+        messages = exc.normalized_messages()
+        await ctx.error("Virtual dataset validation failed: %s" % (messages,))
+        return CreateVirtualDatasetResponse(
+            id=None,
+            dataset_name=request.dataset_name,
+            sql=request.sql,
+            database_id=request.database_id,
+            columns=[],
+            url=None,
+            error=str(messages),
+        )
+    except DatasetCreateFailedError as exc:
+        await ctx.error("Virtual dataset creation failed: %s" % (str(exc),))
+        return CreateVirtualDatasetResponse(
+            id=None,
+            dataset_name=request.dataset_name,
+            sql=request.sql,
+            database_id=request.database_id,
+            columns=[],
+            url=None,
+            error=f"Failed to create dataset: {exc}",
+        )
+    except Exception as exc:
+        await ctx.error(
+            "Unexpected error creating virtual dataset: %s: %s"
+            % (type(exc).__name__, str(exc))
+        )
+        raise
diff --git a/superset/mcp_service/dataset/tool/get_dataset_info.py b/superset/mcp_service/dataset/tool/get_dataset_info.py
index 888e1452d7e..c211c618d63 100644
--- a/superset/mcp_service/dataset/tool/get_dataset_info.py
+++ b/superset/mcp_service/dataset/tool/get_dataset_info.py
@@ -37,7 +37,6 @@ from superset.mcp_service.dataset.schemas import (
     serialize_dataset_object,
 )
 from superset.mcp_service.mcp_core import ModelGetInfoCore
-from superset.mcp_service.utils.schema_utils import parse_request
 
 logger = logging.getLogger(__name__)
 
@@ -51,7 +50,6 @@ logger = logging.getLogger(__name__)
         destructiveHint=False,
     ),
 )
-@parse_request(GetDatasetInfoRequest)
 async def get_dataset_info(
     request: GetDatasetInfoRequest, ctx: Context
 ) -> DatasetInfo | DatasetError:
@@ -64,6 +62,11 @@ async def get_dataset_info(
     - DO NOT use schema.table_name format (e.g., "public.customers")
     - To find a dataset ID, use the list_datasets tool first
 
+    IMPORTANT - Saved Metrics vs Columns:
+    The response includes both 'columns' (raw database columns) and 'metrics'
+    (pre-defined saved metrics). When building chart configs, use saved_metric=true
+    for metrics — do not treat them as columns. See instructions for details.
+
     Example usage:
     ```json
     {
diff --git a/superset/mcp_service/dataset/tool/list_datasets.py b/superset/mcp_service/dataset/tool/list_datasets.py
index 97a8b0597a3..e4d2d3bd427 100644
--- a/superset/mcp_service/dataset/tool/list_datasets.py
+++ b/superset/mcp_service/dataset/tool/list_datasets.py
@@ -40,15 +40,23 @@ from superset.mcp_service.dataset.schemas import (
     serialize_dataset_object,
 )
 from superset.mcp_service.mcp_core import ModelListCore
-from superset.mcp_service.utils.schema_utils import parse_request
 
 logger = logging.getLogger(__name__)
 
 # Minimal defaults for reduced token usage - users can request more via select_columns
+# NOTE: "database" (relationship) is included so the DAO eagerly loads it
+# via joinedload, which avoids N+1 lazy-load queries when the serializer
+# accesses dataset.database.name (via the database_name @property).
 DEFAULT_DATASET_COLUMNS = [
     "id",
     "table_name",
     "schema",
+    "database_name",
+    "database",
+    "description",
+    "certified_by",
+    "certification_details",
+    "changed_on",
     "changed_on_humanized",
 ]
 
@@ -70,7 +78,6 @@ SORTABLE_DATASET_COLUMNS = [
         destructiveHint=False,
     ),
 )
-@parse_request(ListDatasetsRequest)
 async def list_datasets(request: ListDatasetsRequest, ctx: Context) -> DatasetList:
     """List datasets with filtering and search.
 
diff --git a/superset/mcp_service/explore/tool/generate_explore_link.py b/superset/mcp_service/explore/tool/generate_explore_link.py
index 0c5f11824ea..40473a9cfe8 100644
--- a/superset/mcp_service/explore/tool/generate_explore_link.py
+++ b/superset/mcp_service/explore/tool/generate_explore_link.py
@@ -23,20 +23,20 @@ chart configuration.
 """
 
 from typing import Any, Dict
-from urllib.parse import parse_qs, urlparse
 
 from fastmcp import Context
 from superset_core.mcp.decorators import tool, ToolAnnotations
 
 from superset.extensions import event_logger
+from superset.mcp_service.chart.chart_helpers import extract_form_data_key_from_url
 from superset.mcp_service.chart.chart_utils import (
     generate_explore_link as generate_url,
     map_config_to_form_data,
 )
 from superset.mcp_service.chart.schemas import (
     GenerateExploreLinkRequest,
+    parse_chart_config,
 )
-from superset.mcp_service.utils.schema_utils import parse_request
 
 
 @tool(
@@ -48,7 +48,6 @@ from superset.mcp_service.utils.schema_utils import parse_request
         destructiveHint=False,
     ),
 )
-@parse_request(GenerateExploreLinkRequest)
 async def generate_explore_link(
     request: GenerateExploreLinkRequest, ctx: Context
 ) -> Dict[str, Any]:
@@ -91,7 +90,7 @@ async def generate_explore_link(
     """
     await ctx.info(
         "Generating explore link for dataset_id=%s, chart_type=%s"
-        % (request.dataset_id, request.config.chart_type)
+        % (request.dataset_id, request.config.get("chart_type", "unknown"))
     )
     await ctx.debug(
         "Configuration details: use_cache=%s, force_refresh=%s, cache_form_data=%s"
@@ -99,7 +98,41 @@ async def generate_explore_link(
     )
 
     try:
-        await ctx.report_progress(1, 3, "Converting configuration to form data")
+        # Parse the raw config dict into a typed ChartConfig
+        config = parse_chart_config(request.config)
+
+        await ctx.report_progress(1, 4, "Validating dataset exists")
+        with event_logger.log_context(action="mcp.generate_explore_link.dataset_check"):
+            from superset.daos.dataset import DatasetDAO
+
+            dataset = None
+            if isinstance(request.dataset_id, int) or (
+                isinstance(request.dataset_id, str) and request.dataset_id.isdigit()
+            ):
+                dataset_id_int = (
+                    int(request.dataset_id)
+                    if isinstance(request.dataset_id, str)
+                    else request.dataset_id
+                )
+                dataset = DatasetDAO.find_by_id(dataset_id_int)
+            else:
+                dataset = DatasetDAO.find_by_id(request.dataset_id, id_column="uuid")
+
+            if not dataset:
+                await ctx.error(
+                    "Dataset not found: dataset_id=%s" % (request.dataset_id,)
+                )
+                return {
+                    "url": "",
+                    "form_data": {},
+                    "form_data_key": None,
+                    "error": (
+                        f"Dataset not found: {request.dataset_id}. "
+                        "Use list_datasets to find valid dataset IDs."
+                    ),
+                }
+
+        await ctx.report_progress(2, 4, "Converting configuration to form data")
         with event_logger.log_context(action="mcp.generate_explore_link.form_data"):
             # Normalize column names to match canonical dataset column names
             # This fixes case sensitivity issues (e.g., 'order_date' vs 'OrderDate')
@@ -109,10 +142,10 @@ async def generate_explore_link(
                 )
 
                 normalized_config = DatasetValidator.normalize_column_names(
-                    request.config, request.dataset_id
+                    config, request.dataset_id
                 )
             except (ImportError, AttributeError, KeyError, ValueError, TypeError):
-                normalized_config = request.config
+                normalized_config = config
 
             # Map config to form_data using shared utilities
             form_data = map_config_to_form_data(
@@ -133,7 +166,7 @@ async def generate_explore_link(
             )
         )
 
-        await ctx.report_progress(2, 3, "Generating explore URL")
+        await ctx.report_progress(3, 4, "Generating explore URL")
         with event_logger.log_context(
             action="mcp.generate_explore_link.url_generation"
         ):
@@ -142,16 +175,10 @@ async def generate_explore_link(
                 dataset_id=request.dataset_id, form_data=form_data
             )
 
-        # Extract form_data_key from the explore URL using proper URL parsing
-        form_data_key = None
-        if explore_url:
-            parsed = urlparse(explore_url)
-            query_params = parse_qs(parsed.query)
-            form_data_key_list = query_params.get("form_data_key", [])
-            if form_data_key_list:
-                form_data_key = form_data_key_list[0]
+        # Extract form_data_key from the explore URL
+        form_data_key = extract_form_data_key_from_url(explore_url)
 
-        await ctx.report_progress(3, 3, "URL generation complete")
+        await ctx.report_progress(4, 4, "URL generation complete")
         await ctx.info(
             "Explore link generated successfully: url_length=%s, dataset_id=%s, "
             "form_data_key=%s"
@@ -168,7 +195,12 @@ async def generate_explore_link(
     except Exception as e:
         await ctx.error(
             "Explore link generation failed for dataset_id=%s, chart_type=%s: %s: %s"
-            % (request.dataset_id, request.config.chart_type, type(e).__name__, str(e))
+            % (
+                request.dataset_id,
+                request.config.get("chart_type", "unknown"),
+                type(e).__name__,
+                str(e),
+            )
         )
         return {
             "url": "",
diff --git a/superset/mcp_service/mcp_config.py b/superset/mcp_service/mcp_config.py
index e1e65c11f0b..62a771bc783 100644
--- a/superset/mcp_service/mcp_config.py
+++ b/superset/mcp_service/mcp_config.py
@@ -59,12 +59,6 @@ MCP_RBAC_ENABLED = True
 # per RFC 6750 Section 3.1. This flag NEVER affects client-facing output.
 MCP_JWT_DEBUG_ERRORS = False
 
-# Enable parse_request decorator for MCP tools.
-# When True (default), tool requests are automatically parsed from JSON strings
-# to Pydantic models, working around a Claude Code double-serialization bug
-# (https://github.com/anthropics/claude-code/issues/5504).
-# Set to False to disable and let FastMCP handle request parsing natively.
-MCP_PARSE_REQUEST_ENABLED = True
 
 # Session configuration for local development
 MCP_SESSION_CONFIG = {
@@ -248,9 +242,31 @@ MCP_RESPONSE_SIZE_CONFIG: Dict[str, Any] = {
 # - "bm25": Natural language search using BM25 ranking (recommended)
 # - "regex": Pattern-based search using regular expressions
 #
+# Schema Compaction:
+# ------------------
+# When compact_schemas=True, search results strip $defs sections and replace
+# $ref pointers with {"type": "object"}, and truncate tool descriptions.
+# This reduces per-search token cost by ~40-60%.  Full schemas remain
+# available when the tool is actually invoked via call_tool.
+#
 # Rollback:
 # ---------
-# Set enabled=False in superset_config.py for instant rollback.
+# - Set enabled=False to disable tool search entirely (full catalog exposed).
+# - Set compact_schemas=False to disable schema compaction only (full $defs
+#   and descriptions in search results, tool search still active).
+# - Set max_description_length=0 to disable description truncation only.
+#
+# Summary Mode (include_schemas):
+# --------------------------------
+# When include_schemas=False (default), search results omit inputSchema
+# entirely and include a lightweight "parameters_hint" field listing
+# top-level parameter names (e.g. "page, page_size, search, filters").
+# This reduces per-search token cost by ~80% vs compact mode while still
+# conveying what parameters a tool accepts.  Full schemas remain available
+# when invoking the tool via call_tool.
+# - Set include_schemas=True to restore full inputSchema in search results.
+# - compact_schemas is ignored when include_schemas=False (no schema to
+#   compact); max_description_length still applies in summary mode.
 # =============================================================================
 MCP_TOOL_SEARCH_CONFIG: Dict[str, Any] = {
     "enabled": True,  # Enabled by default — reduces initial context by ~70%
@@ -262,6 +278,9 @@ MCP_TOOL_SEARCH_CONFIG: Dict[str, Any] = {
     ],
     "search_tool_name": "search_tools",  # Name of the search tool
     "call_tool_name": "call_tool",  # Name of the call proxy tool
+    "compact_schemas": True,  # Strip $defs/$ref (requires include_schemas=True)
+    "max_description_length": 300,  # Truncate tool descriptions (0 = no truncation)
+    "include_schemas": False,  # False=summary mode (name+hint), True=full inputSchema
 }
 
 
@@ -318,11 +337,30 @@ def create_default_mcp_auth_factory(app: Flask) -> Optional[Any]:
         return None
 
 
-def default_user_resolver(app: Any, access_token: Any) -> Optional[str]:
-    """Extract username from JWT token claims."""
-    if hasattr(access_token, "subject"):
+def default_user_resolver(app: Any, access_token: Any) -> str | None:
+    """Extract username from JWT token claims.
+
+    Checks the ``claims`` dict first (FastMCP's AccessToken format),
+    then falls back to legacy attribute access for backward compatibility.
+    """
+    # FastMCP AccessToken stores JWT claims in a dict
+    claims = getattr(access_token, "claims", None)
+    if isinstance(claims, dict) and claims:
+        # Prefer human-readable username claims over opaque `sub`
+        # (OIDC `sub` is often a stable opaque ID, not a Superset username)
+        username = (
+            claims.get("preferred_username")
+            or claims.get("username")
+            or claims.get("email")
+            or claims.get("sub")
+        )
+        if username:
+            return username
+
+    # Legacy attribute access for backward compatibility
+    if hasattr(access_token, "subject") and access_token.subject:
         return access_token.subject
-    if hasattr(access_token, "client_id"):
+    if hasattr(access_token, "client_id") and access_token.client_id:
         return access_token.client_id
     if hasattr(access_token, "payload") and isinstance(access_token.payload, dict):
         return (
diff --git a/superset/mcp_service/mcp_core.py b/superset/mcp_service/mcp_core.py
index 0b1a817d26d..4b4aba29928 100644
--- a/superset/mcp_service/mcp_core.py
+++ b/superset/mcp_service/mcp_core.py
@@ -25,6 +25,7 @@ from typing import Any, Callable, Dict, Generic, List, Literal, Type, TypeVar
 from pydantic import BaseModel
 
 from superset.daos.base import BaseDAO
+from superset.mcp_service.constants import ModelType
 from superset.mcp_service.utils import _is_uuid
 
 # Type variables for generic model tools
@@ -142,6 +143,11 @@ class ModelListCore(BaseCore, Generic[L]):
         page: int = 0,
         page_size: int = 10,
     ) -> L:
+        from superset.mcp_service.constants import MAX_PAGE_SIZE
+
+        # Clamp page_size to MAX_PAGE_SIZE as defense-in-depth
+        page_size = min(page_size, MAX_PAGE_SIZE)
+
         # Parse filters using generic utility (accepts JSON string or object)
         from superset.mcp_service.utils.schema_utils import (
             parse_json_or_list,
@@ -155,11 +161,23 @@ class ModelListCore(BaseCore, Generic[L]):
             select_columns = parse_json_or_list(
                 select_columns, param_name="select_columns"
             )
-            columns_to_load = select_columns
+            columns_to_load = list(select_columns)
             columns_requested = select_columns
         else:
-            columns_to_load = self.default_columns
+            columns_to_load = list(self.default_columns)
             columns_requested = self.default_columns
+
+        # Ensure computed columns have their dependencies loaded.
+        # Humanized timestamps are derived from their raw counterparts —
+        # if the raw column isn't loaded, the serializer produces null.
+        computed_deps: dict[str, str] = {
+            "changed_on_humanized": "changed_on",
+            "created_on_humanized": "created_on",
+        }
+        for computed, dependency in computed_deps.items():
+            if computed in columns_to_load and dependency not in columns_to_load:
+                columns_to_load.append(dependency)
+
         # Query the DAO
         items: List[Any]
         items, total_count = self.dao_class.list(
@@ -516,7 +534,7 @@ class ModelGetSchemaCore(BaseCore, Generic[S]):
 
     def __init__(
         self,
-        model_type: Literal["chart", "dataset", "dashboard"],
+        model_type: ModelType,
         dao_class: Type[BaseDAO[Any]],
         output_schema: Type[S],
         select_columns: List[Any],
@@ -525,13 +543,14 @@ class ModelGetSchemaCore(BaseCore, Generic[S]):
         search_columns: List[str],
         default_sort: str = "changed_on",
         default_sort_direction: Literal["asc", "desc"] = "desc",
+        exclude_filter_columns: set[str] | None = None,
         logger: logging.Logger | None = None,
     ) -> None:
         """
         Initialize the schema discovery core.
 
         Args:
-            model_type: The type of model (chart, dataset, dashboard)
+            model_type: The type of model (chart, dataset, dashboard, database)
             dao_class: The DAO class to query for filter columns
             output_schema: Pydantic schema for the response (e.g., ModelSchemaInfo)
             select_columns: Column metadata (List[ColumnMetadata] or similar)
@@ -540,6 +559,8 @@ class ModelGetSchemaCore(BaseCore, Generic[S]):
             search_columns: Column names used for text search
             default_sort: Default sort column
             default_sort_direction: Default sort direction
+            exclude_filter_columns: Column names to omit from filter discovery
+                (e.g., sensitive fields like passwords or connection URIs)
             logger: Optional logger instance
         """
         super().__init__(logger)
@@ -552,6 +573,7 @@ class ModelGetSchemaCore(BaseCore, Generic[S]):
         self.search_columns = search_columns
         self.default_sort = default_sort
         self.default_sort_direction = default_sort_direction
+        self.exclude_filter_columns = exclude_filter_columns or set()
 
     def _get_filter_columns(self) -> Dict[str, List[str]]:
         """Get filterable columns and operators from the DAO."""
@@ -562,16 +584,25 @@ class ModelGetSchemaCore(BaseCore, Generic[S]):
                 return {}
             # Convert to dict safely - handle both dict and dict-like objects
             if isinstance(filterable, dict):
-                return dict(filterable)
-            # Try to convert mapping-like objects
-            try:
-                return dict(filterable)
-            except (TypeError, ValueError):
-                self._log_warning(
-                    f"Unexpected filter columns type for {self.model_type}: "
-                    f"{type(filterable)}"
-                )
-                return {}
+                result = dict(filterable)
+            else:
+                # Try to convert mapping-like objects
+                try:
+                    result = dict(filterable)
+                except (TypeError, ValueError):
+                    self._log_warning(
+                        f"Unexpected filter columns type for {self.model_type}: "
+                        f"{type(filterable)}"
+                    )
+                    return {}
+            # Remove excluded columns (e.g., sensitive fields)
+            if self.exclude_filter_columns:
+                result = {
+                    k: v
+                    for k, v in result.items()
+                    if k not in self.exclude_filter_columns
+                }
+            return result
         except Exception as e:
             self._log_warning(
                 f"Failed to get filter columns for {self.model_type}: {e}"
diff --git a/superset/mcp_service/middleware.py b/superset/mcp_service/middleware.py
index 0fadd648ae8..797bb70076c 100644
--- a/superset/mcp_service/middleware.py
+++ b/superset/mcp_service/middleware.py
@@ -18,10 +18,13 @@
 import logging
 import time
 from collections import defaultdict
-from typing import Any, Awaitable, Callable, Dict, Protocol
+from typing import Any, Awaitable, Callable, Dict, Protocol, Sequence
 
+import mcp.types as mt
 from fastmcp.exceptions import ToolError
 from fastmcp.server.middleware import Middleware, MiddlewareContext
+from fastmcp.server.middleware.middleware import CallNext
+from fastmcp.tools.tool import Tool, ToolResult
 from flask import has_app_context
 from pydantic import ValidationError
 from sqlalchemy.exc import OperationalError, TimeoutError
@@ -127,6 +130,18 @@ class LoggingMiddleware(Middleware):
     in on_message().
     """
 
+    def _is_error_response(self, result: ToolResult) -> bool:
+        """Check if a tool result contains an error schema response.
+
+        MCP tools return error schemas (ChartError, DashboardError, etc.)
+        instead of raising exceptions. These serialize to JSON containing
+        an "error_type" field.
+        """
+        try:
+            return '"error_type"' in result.content[0].text
+        except (AttributeError, IndexError):
+            return False
+
     def _extract_context_info(
         self, context: MiddlewareContext
     ) -> tuple[
@@ -168,8 +183,11 @@ class LoggingMiddleware(Middleware):
         success = False
         try:
             result = await call_next(context)
-            success = True
+            success = not self._is_error_response(result)
             return result
+        except Exception:
+            success = False
+            raise
         finally:
             duration_ms = int((time.time() - start_time) * 1000)
             if has_app_context():
@@ -259,6 +277,62 @@ class PrivateToolMiddleware(Middleware):
         return await call_next(context)
 
 
+class StructuredContentStripperMiddleware(Middleware):
+    """Strip ``outputSchema`` and ``structured_content`` to prevent encoding errors.
+
+    FastMCP 3.x auto-generates ``outputSchema`` in tool definitions
+    (``tools/list``) and ``structuredContent`` in tool call responses
+    (``tools/call``) when the tool has a typed return annotation.
+
+    Some MCP client transports (e.g. Claude.ai's MCP bridge) cannot handle
+    ``structuredContent`` dicts, causing ``TypeError: encoding without a
+    string argument``.  Additionally, if ``outputSchema`` is advertised but
+    ``structuredContent`` is stripped from the response, clients may raise
+    ``Output validation error: outputSchema defined but no structured output
+    returned``.
+
+    This middleware handles both sides:
+    - ``on_list_tools``: removes ``output_schema`` from every tool definition
+    - ``on_call_tool``: removes ``structured_content`` from every tool result
+    """
+
+    async def on_list_tools(
+        self,
+        context: MiddlewareContext[mt.ListToolsRequest],
+        call_next: CallNext[mt.ListToolsRequest, Sequence[Tool]],
+    ) -> Sequence[Tool]:
+        tools = await call_next(context)
+        return [
+            t.model_copy(update={"output_schema": None})
+            if t.output_schema is not None
+            else t
+            for t in tools
+        ]
+
+    async def on_call_tool(
+        self,
+        context: MiddlewareContext[mt.CallToolRequestParams],
+        call_next: Callable[[MiddlewareContext], Awaitable[ToolResult]],
+    ) -> ToolResult:
+        try:
+            result = await call_next(context)
+        except Exception as e:
+            # When exceptions propagate past the middleware chain to the
+            # MCP SDK layer, they become CallToolResult(isError=True).
+            # Some transports (Claude.ai's MCP bridge) cannot encode these
+            # error responses, producing "encoding without a string argument".
+            # Catch ALL exceptions (not just specific types) because any
+            # unhandled exception — including ToolError from
+            # GlobalErrorHandlerMiddleware, ValueError, TypeError, etc. —
+            # will cause encoding failures on the wire.
+            return ToolResult(
+                content=[mt.TextContent(type="text", text=f"Error: {e}")],
+            )
+        if isinstance(result, ToolResult) and result.structured_content is not None:
+            result = ToolResult(content=result.content, meta=result.meta)
+        return result
+
+
 class GlobalErrorHandlerMiddleware(Middleware):
     """
     Global error handler middleware that provides consistent error responses
@@ -877,6 +951,72 @@ class ResponseSizeGuardMiddleware(Middleware):
             excluded_tools = [excluded_tools]
         self.excluded_tools = set(excluded_tools or [])
 
+    def _try_truncate_info_response(
+        self,
+        tool_name: str,
+        response: Any,
+        estimated_tokens: int,
+    ) -> Any | None:
+        """Attempt to dynamically truncate an info tool response to fit the limit.
+
+        Returns the truncated response if successful, None otherwise.
+        """
+        from superset.mcp_service.utils.token_utils import (
+            estimate_response_tokens,
+            truncate_oversized_response,
+        )
+
+        try:
+            truncated, was_truncated, notes = truncate_oversized_response(
+                response, self.token_limit
+            )
+        except (MemoryError, RecursionError) as trunc_error:
+            logger.warning(
+                "Truncation failed for %s due to %s: %s",
+                tool_name,
+                type(trunc_error).__name__,
+                trunc_error,
+            )
+            return None
+
+        if not was_truncated:
+            return None
+
+        truncated_tokens = estimate_response_tokens(truncated)
+        if truncated_tokens > self.token_limit:
+            return None
+
+        logger.warning(
+            "Response for %s truncated from ~%d to ~%d tokens (limit: %d). Fields: %s",
+            tool_name,
+            estimated_tokens,
+            truncated_tokens,
+            self.token_limit,
+            "; ".join(notes),
+        )
+
+        try:
+            user_id = get_user_id()
+            event_logger.log(
+                user_id=user_id,
+                action="mcp_response_truncated",
+                curated_payload={
+                    "tool": tool_name,
+                    "original_tokens": estimated_tokens,
+                    "truncated_tokens": truncated_tokens,
+                    "token_limit": self.token_limit,
+                    "truncation_notes": notes,
+                },
+            )
+        except Exception as log_error:  # noqa: BLE001
+            logger.warning("Failed to log truncation event: %s", log_error)
+
+        if isinstance(truncated, dict):
+            truncated["_response_truncated"] = True
+            truncated["_truncation_notes"] = notes
+
+        return truncated
+
     async def on_call_tool(
         self,
         context: MiddlewareContext,
@@ -925,9 +1065,18 @@ class ResponseSizeGuardMiddleware(Middleware):
 
         # Block if over limit
         if estimated_tokens > self.token_limit:
-            # Extract params for smart suggestions
             params = getattr(context.message, "params", {}) or {}
 
+            # For info tools, try dynamic truncation before blocking
+            from superset.mcp_service.utils.token_utils import INFO_TOOLS
+
+            if tool_name in INFO_TOOLS:
+                truncated = self._try_truncate_info_response(
+                    tool_name, response, estimated_tokens
+                )
+                if truncated is not None:
+                    return truncated
+
             # Log the blocked response
             logger.error(
                 "Response blocked for %s: ~%d tokens exceeds limit of %d",
@@ -952,9 +1101,6 @@ class ResponseSizeGuardMiddleware(Middleware):
             except Exception as log_error:  # noqa: BLE001
                 logger.warning("Failed to log size exceeded event: %s", log_error)
 
-            # Generate helpful error message with suggestions
-            # Avoid passing the full `response` (which may be huge) into the formatter
-            # to prevent large-memory operations during error formatting.
             error_message = format_size_limit_error(
                 tool_name=tool_name,
                 params=params,
diff --git a/superset/mcp_service/server.py b/superset/mcp_service/server.py
index 732e8f4622f..735f75c5df8 100644
--- a/superset/mcp_service/server.py
+++ b/superset/mcp_service/server.py
@@ -25,9 +25,10 @@ For multi-pod deployments, configure MCP_EVENT_STORE_CONFIG with Redis URL.
 import logging
 import os
 from collections.abc import Sequence
-from typing import Any
+from typing import Annotated, Any
 
 import uvicorn
+from fastmcp.server.middleware import Middleware
 
 from superset.mcp_service.app import create_mcp_app, init_fastmcp_server
 from superset.mcp_service.mcp_config import (
@@ -39,8 +40,10 @@ from superset.mcp_service.middleware import (
     create_response_size_guard_middleware,
     GlobalErrorHandlerMiddleware,
     LoggingMiddleware,
+    StructuredContentStripperMiddleware,
 )
 from superset.mcp_service.storage import _create_redis_store
+from superset.utils import json
 
 logger = logging.getLogger(__name__)
 
@@ -173,6 +176,98 @@ def _strip_titles(obj: Any, in_properties_map: bool = False) -> Any:
     return obj
 
 
+def _simplify_optional_union(result: dict[str, Any]) -> dict[str, Any]:
+    """Collapse ``anyOf``/``oneOf`` with exactly one non-null variant.
+
+    Pydantic encodes ``Optional[X]`` as ``{"anyOf": [<X>, {"type": "null"}]}``.
+    This replaces the union with the non-null variant while preserving any
+    ``description`` or ``default`` from the parent node.
+    """
+    for union_key in ("anyOf", "oneOf"):
+        variants = result.get(union_key)
+        if not isinstance(variants, list) or len(variants) != 2:
+            continue
+        non_null = [v for v in variants if v.get("type") != "null"]
+        if len(non_null) != 1:
+            continue
+        simplified = dict(non_null[0])
+        for keep in ("description", "default"):
+            if keep in result and keep not in simplified:
+                simplified[keep] = result[keep]
+        result.pop(union_key)
+        result.pop("description", None)
+        result.pop("default", None)
+        result.update(simplified)
+    return result
+
+
+def _compact_schema(obj: Any) -> Any:
+    """Collapse ``$defs`` and ``$ref`` pointers in a JSON Schema.
+
+    Search results only need enough schema detail for the LLM to identify
+    which tool to call and construct a basic invocation.  Full schemas
+    (with all nested model definitions) are still available when the tool
+    is actually invoked via ``call_tool``.
+
+    Transformations applied:
+
+    * ``$defs`` sections are removed entirely.
+    * ``{"$ref": "..."}`` is replaced with ``{"type": "object"}``.
+    * ``anyOf``/``oneOf`` lists containing only a ``$ref`` and
+      ``{"type": "null"}`` (Pydantic's Optional encoding) are collapsed
+      to the simplified non-null variant.
+    """
+    if isinstance(obj, list):
+        return [_compact_schema(item) for item in obj]
+    if not isinstance(obj, dict):
+        return obj
+
+    # Direct $ref → generic object type
+    if "$ref" in obj:
+        replacement: dict[str, Any] = {"type": "object"}
+        if desc := obj.get("description"):
+            replacement["description"] = desc
+        return replacement
+
+    result: dict[str, Any] = {}
+    for key, value in obj.items():
+        if key == "$defs":
+            continue
+        result[key] = _compact_schema(value)
+
+    return _simplify_optional_union(result)
+
+
+def _truncate_description(text: str, max_length: int) -> str:
+    """Truncate a tool description for search results.
+
+    Cuts at the last sentence boundary before *max_length*, or at
+    *max_length* with an ellipsis if no sentence boundary is found.
+    """
+    if not text or len(text) <= max_length:
+        return text
+    # Try to cut at the last sentence boundary
+    truncated = text[:max_length]
+    last_period = truncated.rfind(". ")
+    if last_period > max_length // 2:
+        return truncated[: last_period + 1]
+    return truncated.rstrip() + "..."
+
+
+def _extract_parameter_names(input_schema: dict[str, Any]) -> str:
+    """Extract top-level parameter names from a JSON Schema as a hint string.
+
+    Returns a comma-separated string of property names from the schema's
+    ``properties`` key, or an empty string if none are found.
+
+    Example: ``"page, page_size, search, filters, select_columns"``
+    """
+    properties = input_schema.get("properties", {})
+    if not properties:
+        return ""
+    return ", ".join(properties.keys())
+
+
 def _serialize_tools_without_output_schema(
     tools: Sequence[Any],
 ) -> list[dict[str, Any]]:
@@ -184,7 +279,9 @@ def _serialize_tools_without_output_schema(
     """
     results = []
     for tool in tools:
-        data = tool.to_mcp_tool().model_dump(mode="json", exclude_none=True)
+        data = tool.to_mcp_tool().model_dump(
+            mode="json", exclude_none=True, exclude={"outputSchema"}
+        )
         data.pop("outputSchema", None)
         if input_schema := data.get("inputSchema"):
             data["inputSchema"] = _strip_titles(input_schema)
@@ -192,6 +289,84 @@ def _serialize_tools_without_output_schema(
     return results
 
 
+def _build_summary_serializer(max_desc: int) -> Any:
+    """Build a summary-mode serializer that omits ``inputSchema``.
+
+    Returns a callable that serializes each tool to ``name``,
+    ``description`` (optionally truncated), and a ``parameters_hint``
+    string listing top-level parameter names.  ``inputSchema`` and
+    ``outputSchema`` are stripped entirely.
+    """
+
+    def _summary_serializer(tools: Sequence[Any]) -> list[dict[str, Any]]:
+        results = []
+        for tool in tools:
+            data = tool.to_mcp_tool().model_dump(
+                mode="json", exclude_none=True, exclude={"outputSchema"}
+            )
+            data.pop("outputSchema", None)
+            if input_schema := data.pop("inputSchema", None):
+                hint = _extract_parameter_names(input_schema)
+                if hint:
+                    data["parameters_hint"] = hint
+            if max_desc and (desc := data.get("description")):
+                data["description"] = _truncate_description(desc, max_desc)
+            results.append(data)
+        return results
+
+    return _summary_serializer
+
+
+def _create_search_result_serializer(
+    config: dict[str, Any],
+) -> Any:
+    """Build a search-result serializer from the tool-search config.
+
+    When ``include_schemas`` is False (default), delegates to
+    :func:`_build_summary_serializer`, which strips ``inputSchema``
+    entirely and adds a ``parameters_hint`` field with comma-separated
+    top-level parameter names.  This reduces per-search token cost by
+    ~80% vs compact mode while still conveying what parameters a tool
+    accepts.
+
+    When ``include_schemas`` is True, the full ``compact_schemas``/
+    ``max_description_length`` pipeline applies (existing behavior):
+
+    * ``$defs`` sections and ``$ref`` pointers are collapsed when
+      ``compact_schemas`` is True (see :func:`_compact_schema`).
+    * Tool descriptions are truncated to ``max_description_length`` chars.
+
+    Full schemas remain available when the tool is invoked via ``call_tool``.
+    """
+    include_schemas = config.get("include_schemas", False)
+
+    if not include_schemas:
+        max_desc = config.get("max_description_length", 300)
+        return _build_summary_serializer(max_desc)
+
+    # include_schemas=True: apply full compact_schemas/max_description_length pipeline
+    compact = config.get("compact_schemas", True)
+    # Description truncation defaults to 300 when compact_schemas is on,
+    # but is disabled when compact_schemas is off (unless explicitly set).
+    max_desc_default = 300 if compact else 0
+    max_desc = config.get("max_description_length", max_desc_default)
+
+    if not compact and not max_desc:
+        return _serialize_tools_without_output_schema
+
+    def _serializer(tools: Sequence[Any]) -> list[dict[str, Any]]:
+        results = _serialize_tools_without_output_schema(tools)
+        for data in results:
+            if compact:
+                if input_schema := data.get("inputSchema"):
+                    data["inputSchema"] = _compact_schema(input_schema)
+            if max_desc and (desc := data.get("description")):
+                data["description"] = _truncate_description(desc, max_desc)
+        return results
+
+    return _serializer
+
+
 def _fix_call_tool_arguments(tool: Any) -> Any:
     """Fix anyOf schema in call_tool ``arguments`` for MCP bridge compatibility.
 
@@ -213,6 +388,37 @@ def _fix_call_tool_arguments(tool: Any) -> Any:
     return tool
 
 
+def _normalize_call_tool_arguments(
+    arguments: dict[str, Any] | None,
+    tool_schema: dict[str, Any] | None,
+) -> dict[str, Any] | None:
+    """JSON-serialize dict/list values when the tool schema accepts both
+    string and object variants (anyOf or oneOf with a string type).
+
+    When the BM25/regex ``call_tool`` proxy forwards arguments to the
+    actual tool, dict/list values must be serialized if the tool's schema
+    declares ``anyOf``/``oneOf`` with a string variant
+    (e.g. ``request: str | RequestModel``).
+
+    Without this, the MCP transport calls ``bytes(dict, 'utf-8')``
+    which raises ``TypeError: encoding without a string argument``.
+    """
+    if not arguments or not isinstance(tool_schema, dict):
+        return arguments
+
+    properties = tool_schema.get("properties", {})
+    result = dict(arguments)
+    for key, value in result.items():
+        if not isinstance(value, (dict, list)) or key not in properties:
+            continue
+        prop_schema = properties[key]
+        variants = prop_schema.get("oneOf") or prop_schema.get("anyOf") or []
+        has_string = any(v.get("type") == "string" for v in variants)
+        if has_string:
+            result[key] = json.dumps(value)
+    return result
+
+
 def _apply_tool_search_transform(mcp_instance: Any, config: dict[str, Any]) -> None:
     """Apply tool search transform to reduce initial context size.
 
@@ -221,39 +427,80 @@ def _apply_tool_search_transform(mcp_instance: Any, config: dict[str, Any]) -> N
     discover other tools on-demand via natural language search.
 
     Uses subclassing (not monkey-patching) to override ``_make_call_tool``
-    and fix the ``arguments`` schema for MCP bridge compatibility.
+    and fix the ``arguments`` schema for MCP bridge compatibility, and
+    normalize forwarded arguments to prevent encoding errors.
 
     NOTE: ``_make_call_tool`` is a private API in FastMCP 3.x
     (fastmcp>=3.1.0,<4.0). If FastMCP changes or removes this method
     in a future major version, these subclasses will need to be updated.
     """
+    from fastmcp.server.context import Context
+    from fastmcp.tools.tool import Tool, ToolResult
+
     strategy = config.get("strategy", "bm25")
     kwargs: dict[str, Any] = {
         "max_results": config.get("max_results", 5),
         "always_visible": config.get("always_visible", []),
         "search_tool_name": config.get("search_tool_name", "search_tools"),
         "call_tool_name": config.get("call_tool_name", "call_tool"),
-        "search_result_serializer": _serialize_tools_without_output_schema,
+        "search_result_serializer": _create_search_result_serializer(config),
     }
 
+    def _make_normalizing_call_tool(transform: Any) -> Tool:
+        """Create a call_tool proxy that normalizes arguments before forwarding.
+
+        This fixes two issues:
+        1. anyOf schema incompatibility with MCP bridges (schema fix).
+        2. ``encoding without a string argument`` TypeError when dict/list
+           values are forwarded for parameters declared as
+           ``str | SomeModel`` (argument normalization).
+        """
+
+        async def call_tool(
+            name: Annotated[str, "The name of the tool to call"],
+            arguments: Annotated[
+                dict[str, Any] | None, "Arguments to pass to the tool"
+            ] = None,
+            ctx: Context = None,
+        ) -> ToolResult:
+            """Call a tool by name with the given arguments.
+
+            Use this to execute tools discovered via search_tools.
+            """
+            if name in {transform._call_tool_name, transform._search_tool_name}:
+                raise ValueError(
+                    f"'{name}' is a synthetic search tool and cannot be "
+                    f"called via the call_tool proxy"
+                )
+            if arguments:
+                target_tool = await ctx.fastmcp.get_tool(name)
+                if target_tool is not None:
+                    arguments = _normalize_call_tool_arguments(
+                        arguments, target_tool.parameters
+                    )
+            return await ctx.fastmcp.call_tool(name, arguments)
+
+        tool = Tool.from_function(fn=call_tool, name=transform._call_tool_name)
+        return _fix_call_tool_arguments(tool)
+
     if strategy == "regex":
         from fastmcp.server.transforms.search import RegexSearchTransform
 
         class _FixedRegexSearchTransform(RegexSearchTransform):
-            """Regex search with fixed call_tool arguments schema."""
+            """Regex search with fixed call_tool schema and arg normalization."""
 
-            def _make_call_tool(self) -> Any:
-                return _fix_call_tool_arguments(super()._make_call_tool())
+            def _make_call_tool(self) -> Tool:
+                return _make_normalizing_call_tool(self)
 
         transform = _FixedRegexSearchTransform(**kwargs)
     else:
         from fastmcp.server.transforms.search import BM25SearchTransform
 
         class _FixedBM25SearchTransform(BM25SearchTransform):
-            """BM25 search with fixed call_tool arguments schema."""
+            """BM25 search with fixed call_tool schema and arg normalization."""
 
-            def _make_call_tool(self) -> Any:
-                return _fix_call_tool_arguments(super()._make_call_tool())
+            def _make_call_tool(self) -> Tool:
+                return _make_normalizing_call_tool(self)
 
         transform = _FixedBM25SearchTransform(**kwargs)
 
@@ -300,6 +547,24 @@ def _create_auth_provider(flask_app: Any) -> Any | None:
     return auth_provider
 
 
+def build_middleware_list() -> list[Middleware]:
+    """Build the core MCP middleware list in the correct order.
+
+    FastMCP wraps handlers so that the FIRST-added middleware is
+    outermost.  Order here is outermost → innermost:
+
+    1. StructuredContentStripper — safety net, converts exceptions
+       to safe ToolResult text for transports that can't encode errors
+    2. LoggingMiddleware — logs tool calls with success/failure status
+    3. GlobalErrorHandler — catches tool exceptions, raises ToolError
+    """
+    return [
+        StructuredContentStripperMiddleware(),
+        LoggingMiddleware(),
+        GlobalErrorHandlerMiddleware(),
+    ]
+
+
 def run_server(
     host: str = "127.0.0.1",
     port: int = 5008,
@@ -347,24 +612,15 @@ def run_server(
         flask_app = get_flask_app()
         auth_provider = _create_auth_provider(flask_app)
 
-        # Build middleware list
-        # FastMCP wraps handlers so that the LAST-added middleware is
-        # outermost.  Order here is innermost → outermost.
-        middleware_list = []
+        middleware_list = build_middleware_list()
 
-        # Add caching middleware (innermost – runs closest to the tool)
-        if caching_middleware := create_response_caching_middleware():
-            middleware_list.append(caching_middleware)
-
-        # Add response size guard (protects LLM clients from huge responses)
-        if size_guard_middleware := create_response_size_guard_middleware():
+        # Add optional middleware (innermost, closest to tool)
+        size_guard_middleware = create_response_size_guard_middleware()
+        if size_guard_middleware:
             middleware_list.append(size_guard_middleware)
 
-        # Add logging middleware (logs all tool calls with duration tracking)
-        middleware_list.append(LoggingMiddleware())
-
-        # Add global error handler (outermost – catches all exceptions)
-        middleware_list.append(GlobalErrorHandlerMiddleware())
+        if caching_middleware := create_response_caching_middleware():
+            middleware_list.append(caching_middleware)
 
         mcp_instance = init_fastmcp_server(
             auth=auth_provider,
diff --git a/superset/mcp_service/sql_lab/schemas.py b/superset/mcp_service/sql_lab/schemas.py
index 2e0268774cc..f7c25266fdb 100644
--- a/superset/mcp_service/sql_lab/schemas.py
+++ b/superset/mcp_service/sql_lab/schemas.py
@@ -17,9 +17,33 @@
 
 """Schemas for SQL Lab MCP tools."""
 
-from typing import Any
+from typing import Any, Dict
 
-from pydantic import AliasChoices, BaseModel, ConfigDict, Field, field_validator
+from pydantic import (
+    AliasChoices,
+    BaseModel,
+    ConfigDict,
+    Field,
+    field_validator,
+    model_serializer,
+)
+
+
+class _SchemaFieldNormalizer(BaseModel):
+    """Mixin that renames schema_name → schema in JSON output.
+
+    Pydantic serializes using field names by default, but the MCP/API
+    convention uses the alias ``schema``.  Adding this as a base class
+    to any response model that carries a ``schema_name`` field with
+    ``alias="schema"`` keeps the JSON key consistent.
+    """
+
+    @model_serializer(mode="wrap", when_used="json")
+    def _normalize_schema_field(self, serializer: Any, _info: Any) -> Dict[str, Any]:
+        data = serializer(self)
+        if "schema_name" in data:
+            data["schema"] = data.pop("schema_name")
+        return data
 
 
 class ExecuteSqlRequest(BaseModel):
@@ -33,6 +57,7 @@ class ExecuteSqlRequest(BaseModel):
     sql: str = Field(
         ...,
         description="SQL query to execute (supports Jinja2 {{ var }} template syntax)",
+        validation_alias=AliasChoices("sql", "query"),
     )
     schema_name: str | None = Field(
         None, description="Schema to use for query execution", alias="schema"
@@ -83,6 +108,27 @@ class ColumnInfo(BaseModel):
     type: str = Field(..., description="Column data type")
     is_nullable: bool | None = Field(None, description="Whether column allows NULL")
 
+    @field_validator("is_nullable", mode="before")
+    @classmethod
+    def coerce_is_nullable(cls, v: Any) -> bool | None:
+        """Coerce non-boolean values (e.g. Athena's 'UNKNOWN') to None."""
+        if v is None or isinstance(v, bool):
+            return v
+        if isinstance(v, (int, float)):
+            if v == 1:
+                return True
+            if v == 0:
+                return False
+            return None
+        if isinstance(v, str):
+            lowered = v.strip().lower()
+            if lowered in ("true", "1", "yes"):
+                return True
+            if lowered in ("false", "0", "no"):
+                return False
+            return None
+        return None
+
 
 class StatementData(BaseModel):
     """Row data and column metadata for a single SQL statement."""
@@ -150,6 +196,8 @@ class ExecuteSqlResponse(BaseModel):
 class SaveSqlQueryRequest(BaseModel):
     """Request schema for saving a SQL query."""
 
+    model_config = ConfigDict(populate_by_name=True)
+
     database_id: int = Field(
         ..., description="Database connection ID the query runs against"
     )
@@ -188,9 +236,11 @@ class SaveSqlQueryRequest(BaseModel):
         return v.strip()
 
 
-class SaveSqlQueryResponse(BaseModel):
+class SaveSqlQueryResponse(_SchemaFieldNormalizer):
     """Response schema for a saved SQL query."""
 
+    model_config = ConfigDict(populate_by_name=True)
+
     id: int = Field(..., description="Saved query ID")
     label: str = Field(..., description="Query name")
     sql: str = Field(..., description="SQL query text")
@@ -230,7 +280,7 @@ class OpenSqlLabRequest(BaseModel):
     title: str | None = Field(None, description="Title for the SQL Lab tab/query")
 
 
-class SqlLabResponse(BaseModel):
+class SqlLabResponse(_SchemaFieldNormalizer):
     """Response schema for SQL Lab URL generation."""
 
     model_config = ConfigDict(populate_by_name=True)
diff --git a/superset/mcp_service/sql_lab/tool/execute_sql.py b/superset/mcp_service/sql_lab/tool/execute_sql.py
index 5490dc1b5d7..60842383dbc 100644
--- a/superset/mcp_service/sql_lab/tool/execute_sql.py
+++ b/superset/mcp_service/sql_lab/tool/execute_sql.py
@@ -22,11 +22,11 @@ Tool for executing SQL queries against databases using the unified
 Database.execute() API with RLS, template rendering, and security validation.
 """
 
-from __future__ import annotations
-
 import logging
+from decimal import Decimal
 from typing import Any
 
+import pandas as pd
 from fastmcp import Context
 from superset_core.mcp.decorators import tool, ToolAnnotations
 from superset_core.queries.types import (
@@ -36,8 +36,8 @@ from superset_core.queries.types import (
     QueryStatus,
 )
 
-from superset.errors import ErrorLevel, SupersetError, SupersetErrorType
-from superset.exceptions import SupersetErrorException, SupersetSecurityException
+from superset.errors import SupersetErrorType
+from superset.exceptions import OAuth2Error, OAuth2RedirectError
 from superset.extensions import event_logger
 from superset.mcp_service.sql_lab.schemas import (
     ColumnInfo,
@@ -46,7 +46,10 @@ from superset.mcp_service.sql_lab.schemas import (
     StatementData,
     StatementInfo,
 )
-from superset.mcp_service.utils.schema_utils import parse_request
+from superset.mcp_service.utils.oauth2_utils import (
+    build_oauth2_redirect_message,
+    OAUTH2_CONFIG_ERROR_MESSAGE,
+)
 
 logger = logging.getLogger(__name__)
 
@@ -61,7 +64,6 @@ logger = logging.getLogger(__name__)
         destructiveHint=True,
     ),
 )
-@parse_request(ExecuteSqlRequest)
 async def execute_sql(request: ExecuteSqlRequest, ctx: Context) -> ExecuteSqlResponse:
     """Execute SQL query against database using the unified Database.execute() API."""
     await ctx.info(
@@ -93,21 +95,23 @@ async def execute_sql(request: ExecuteSqlRequest, ctx: Context) -> ExecuteSqlRes
                 db.session.query(Database).filter_by(id=request.database_id).first()
             )
             if not database:
-                raise SupersetErrorException(
-                    SupersetError(
-                        message=f"Database with ID {request.database_id} not found",
-                        error_type=SupersetErrorType.DATABASE_NOT_FOUND_ERROR,
-                        level=ErrorLevel.ERROR,
-                    )
+                await ctx.error(
+                    "Database not found: database_id=%s" % request.database_id
+                )
+                return ExecuteSqlResponse(
+                    success=False,
+                    error=f"Database with ID {request.database_id} not found",
+                    error_type=SupersetErrorType.DATABASE_NOT_FOUND_ERROR.value,
                 )
 
             if not security_manager.can_access_database(database):
-                raise SupersetSecurityException(
-                    SupersetError(
-                        message=(f"Access denied to database {database.database_name}"),
-                        error_type=SupersetErrorType.DATABASE_SECURITY_ACCESS_ERROR,
-                        level=ErrorLevel.ERROR,
-                    )
+                await ctx.error(
+                    "Access denied to database: %s" % database.database_name
+                )
+                return ExecuteSqlResponse(
+                    success=False,
+                    error=f"Access denied to database {database.database_name}",
+                    error_type=SupersetErrorType.DATABASE_SECURITY_ACCESS_ERROR.value,
                 )
 
         # 2. Build QueryOptions and execute query
@@ -148,6 +152,25 @@ async def execute_sql(request: ExecuteSqlRequest, ctx: Context) -> ExecuteSqlRes
 
         return response
 
+    except OAuth2RedirectError as ex:
+        await ctx.error(
+            "Database requires OAuth authentication: database_id=%s"
+            % request.database_id
+        )
+        return ExecuteSqlResponse(
+            success=False,
+            error=build_oauth2_redirect_message(ex),
+            error_type=SupersetErrorType.OAUTH2_REDIRECT.value,
+        )
+    except OAuth2Error:
+        await ctx.error(
+            "OAuth2 configuration/flow error: database_id=%s" % request.database_id
+        )
+        return ExecuteSqlResponse(
+            success=False,
+            error=OAUTH2_CONFIG_ERROR_MESSAGE,
+            error_type=SupersetErrorType.OAUTH2_REDIRECT_ERROR.value,
+        )
     except Exception as e:
         await ctx.error(
             "SQL execution failed: error=%s, database_id=%s"
@@ -159,6 +182,62 @@ async def execute_sql(request: ExecuteSqlRequest, ctx: Context) -> ExecuteSqlRes
         raise
 
 
+def _sanitize_row_values(rows: list[dict[str, Any]]) -> None:
+    """Sanitize non-serializable values in rows for JSON serialization."""
+    for row in rows:
+        for key, value in row.items():
+            if isinstance(value, (bytes, memoryview)):
+                raw = bytes(value) if isinstance(value, memoryview) else value
+                try:
+                    row[key] = raw.decode("utf-8")
+                except (UnicodeDecodeError, AttributeError):
+                    row[key] = raw.hex()
+            elif isinstance(value, Decimal):
+                row[key] = float(value)
+            elif not isinstance(value, (str, int, float, bool, type(None), list, dict)):
+                row[key] = str(value)
+
+
+def _data_to_statement_data(data: Any) -> StatementData:
+    """Convert statement data (DataFrame, list, dict, bytes) to StatementData.
+
+    When results come from cache, data may be a dict/list/bytes instead of
+    a pandas DataFrame. This function handles all cases defensively.
+    """
+    from superset.utils import json as json_utils
+
+    if isinstance(data, list):
+        rows_data = data
+    elif isinstance(data, dict):
+        rows_data = data.get("data", [data])
+        if not isinstance(rows_data, list):
+            rows_data = [rows_data]
+    elif isinstance(data, pd.DataFrame):
+        rows_data = data.to_dict(orient="records")
+        _sanitize_row_values(rows_data)
+        return StatementData(
+            rows=rows_data,
+            columns=[
+                ColumnInfo(name=col, type=str(data[col].dtype)) for col in data.columns
+            ],
+        )
+    elif isinstance(data, bytes):
+        try:
+            decoded = json_utils.loads(data)
+            rows_data = decoded if isinstance(decoded, list) else [decoded]
+        except (ValueError, UnicodeDecodeError):
+            rows_data = []
+    else:
+        rows_data = [{"value": str(data)}]
+
+    _sanitize_row_values(rows_data)
+    col_names = list(rows_data[0].keys()) if rows_data else []
+    return StatementData(
+        rows=rows_data,
+        columns=[ColumnInfo(name=col, type="object") for col in col_names],
+    )
+
+
 def _convert_to_response(result: QueryResult) -> ExecuteSqlResponse:
     """Convert QueryResult to ExecuteSqlResponse."""
     if result.status != QueryStatus.SUCCESS:
@@ -176,13 +255,7 @@ def _convert_to_response(result: QueryResult) -> ExecuteSqlResponse:
     for stmt in result.statements:
         stmt_data: StatementData | None = None
         if stmt.data is not None:
-            df = stmt.data
-            stmt_data = StatementData(
-                rows=df.to_dict(orient="records"),
-                columns=[
-                    ColumnInfo(name=col, type=str(df[col].dtype)) for col in df.columns
-                ],
-            )
+            stmt_data = _data_to_statement_data(stmt.data)
             data_bearing_count += 1
 
         statements.append(
diff --git a/superset/mcp_service/sql_lab/tool/open_sql_lab_with_context.py b/superset/mcp_service/sql_lab/tool/open_sql_lab_with_context.py
index 6e46b483eed..04fb93d7d80 100644
--- a/superset/mcp_service/sql_lab/tool/open_sql_lab_with_context.py
+++ b/superset/mcp_service/sql_lab/tool/open_sql_lab_with_context.py
@@ -27,12 +27,11 @@ from urllib.parse import urlencode
 from fastmcp import Context
 from superset_core.mcp.decorators import tool, ToolAnnotations
 
-from superset.extensions import event_logger
+from superset.extensions import db, event_logger
 from superset.mcp_service.sql_lab.schemas import (
     OpenSqlLabRequest,
     SqlLabResponse,
 )
-from superset.mcp_service.utils.schema_utils import parse_request
 from superset.mcp_service.utils.url_utils import get_superset_base_url
 
 logger = logging.getLogger(__name__)
@@ -48,7 +47,6 @@ logger = logging.getLogger(__name__)
         destructiveHint=False,
     ),
 )
-@parse_request(OpenSqlLabRequest)
 def open_sql_lab_with_context(
     request: OpenSqlLabRequest, ctx: Context
 ) -> SqlLabResponse:
@@ -120,6 +118,15 @@ def open_sql_lab_with_context(
         )
 
     except Exception as e:
+        try:
+            db.session.rollback()  # pylint: disable=consider-using-transaction
+        except Exception:  # noqa: BLE001
+            # Broad catch: the DB connection itself may be broken (e.g.,
+            # SSL drop), so even rollback can fail with non-SQLAlchemy
+            # errors. This is a cleanup path — swallow and log.
+            logger.warning(
+                "Database rollback failed during error handling", exc_info=True
+            )
         logger.error("Error generating SQL Lab URL: %s", e)
         return SqlLabResponse(
             url="",
diff --git a/superset/mcp_service/sql_lab/tool/save_sql_query.py b/superset/mcp_service/sql_lab/tool/save_sql_query.py
index f13a1b65bd6..8126bf19efb 100644
--- a/superset/mcp_service/sql_lab/tool/save_sql_query.py
+++ b/superset/mcp_service/sql_lab/tool/save_sql_query.py
@@ -23,8 +23,6 @@ so it appears in SQL Lab's "Saved Queries" list and can be
 reloaded/shared via URL.
 """
 
-from __future__ import annotations
-
 import logging
 
 from fastmcp import Context
@@ -38,14 +36,13 @@ from superset.mcp_service.sql_lab.schemas import (
     SaveSqlQueryRequest,
     SaveSqlQueryResponse,
 )
-from superset.mcp_service.utils.schema_utils import parse_request
 
 logger = logging.getLogger(__name__)
 
 
 @tool(
     tags=["mutate"],
-    class_permission_name="SQLLab",
+    class_permission_name="SavedQuery",
     method_permission_name="write",
     annotations=ToolAnnotations(
         title="Save SQL query",
@@ -53,7 +50,6 @@ logger = logging.getLogger(__name__)
         destructiveHint=False,
     ),
 )
-@parse_request(SaveSqlQueryRequest)
 async def save_sql_query(
     request: SaveSqlQueryRequest, ctx: Context
 ) -> SaveSqlQueryResponse:
@@ -126,10 +122,10 @@ async def save_sql_query(
             id=saved_query.id,
             label=saved_query.label,
             sql=saved_query.sql,
-            database_id=request.database_id,
-            schema_name=request.schema_name,
+            database_id=saved_query.db_id,
+            schema_name=saved_query.schema or None,
             catalog=getattr(saved_query, "catalog", None),
-            description=request.description,
+            description=saved_query.description or None,
             url=saved_query_url,
         )
 
diff --git a/superset/mcp_service/system/tool/get_instance_info.py b/superset/mcp_service/system/tool/get_instance_info.py
index f6f162570e1..80bf8b915a7 100644
--- a/superset/mcp_service/system/tool/get_instance_info.py
+++ b/superset/mcp_service/system/tool/get_instance_info.py
@@ -23,9 +23,10 @@ InstanceInfoCore for flexible, extensible metrics calculation.
 import logging
 
 from fastmcp import Context
+from sqlalchemy.exc import OperationalError
 from superset_core.mcp.decorators import tool, ToolAnnotations
 
-from superset.extensions import event_logger
+from superset.extensions import db, event_logger
 from superset.mcp_service.mcp_core import InstanceInfoCore
 from superset.mcp_service.system.schemas import (
     GetSupersetInstanceInfoRequest,
@@ -40,7 +41,6 @@ from superset.mcp_service.system.system_utils import (
     calculate_popular_content,
     calculate_recent_activity,
 )
-from superset.mcp_service.utils.schema_utils import parse_request
 
 logger = logging.getLogger(__name__)
 
@@ -73,6 +73,9 @@ _instance_info_core = InstanceInfoCore(
 )
 
 
+_DEFAULT_INSTANCE_INFO_REQUEST = GetSupersetInstanceInfoRequest()
+
+
 @tool(
     tags=["core"],
     annotations=ToolAnnotations(
@@ -81,47 +84,84 @@ _instance_info_core = InstanceInfoCore(
         destructiveHint=False,
     ),
 )
-@parse_request(GetSupersetInstanceInfoRequest)
 def get_instance_info(
-    request: GetSupersetInstanceInfoRequest, ctx: Context
+    request: GetSupersetInstanceInfoRequest = _DEFAULT_INSTANCE_INFO_REQUEST,
+    ctx: Context = None,
 ) -> InstanceInfo:
     """Get instance statistics.
 
     Returns counts, activity metrics, and database types.
     """
     try:
-        # Import DAOs at runtime to avoid circular imports
-        from flask import g
+        return _run_instance_info()
 
-        from superset.daos.chart import ChartDAO
-        from superset.daos.dashboard import DashboardDAO
-        from superset.daos.database import DatabaseDAO
-        from superset.daos.dataset import DatasetDAO
-        from superset.daos.tag import TagDAO
-        from superset.daos.user import UserDAO
+    except OperationalError as e:
+        logger.warning(
+            "Database connection error in get_instance_info, "
+            "resetting session and retrying: %s",
+            e,
+        )
+        try:
+            db.session.rollback()  # pylint: disable=consider-using-transaction
+        except Exception:  # noqa: BLE001
+            # Broad catch: the DB connection itself may be broken (e.g.,
+            # SSL drop), so even rollback can fail with non-SQLAlchemy
+            # errors. This is a cleanup path — swallow and log.
+            logger.warning(
+                "Rollback failed during get_instance_info connection reset",
+                exc_info=True,
+            )
+        try:
+            db.session.remove()  # pylint: disable=consider-using-transaction
+        except Exception:  # noqa: BLE001
+            # Same as above — cleanup must not prevent the retry.
+            logger.warning(
+                "Session remove failed during get_instance_info connection reset",
+                exc_info=True,
+            )
 
-        # Configure DAO classes at runtime
-        _instance_info_core.dao_classes = {
-            "dashboards": DashboardDAO,
-            "charts": ChartDAO,
-            "datasets": DatasetDAO,
-            "databases": DatabaseDAO,
-            "users": UserDAO,
-            "tags": TagDAO,
-        }
-
-        # Run the configurable core
-        with event_logger.log_context(action="mcp.get_instance_info.metrics"):
-            result = _instance_info_core.run_tool()
-
-        # Attach the authenticated user's identity to the response
-        user = getattr(g, "user", None)
-        if user is not None:
-            result.current_user = serialize_user_object(user)
-
-        return result
+        try:
+            result = _run_instance_info()
+            logger.info("get_instance_info retry succeeded after connection reset")
+            return result
+        except OperationalError as retry_error:
+            logger.error(
+                "get_instance_info retry failed after connection reset: %s",
+                retry_error,
+                exc_info=True,
+            )
+            raise
 
     except Exception as e:
         error_msg = f"Unexpected error in instance info: {str(e)}"
         logger.error(error_msg, exc_info=True)
         raise
+
+
+def _run_instance_info() -> InstanceInfo:
+    """Execute the instance info core logic."""
+    from flask import g
+
+    from superset.daos.chart import ChartDAO
+    from superset.daos.dashboard import DashboardDAO
+    from superset.daos.database import DatabaseDAO
+    from superset.daos.dataset import DatasetDAO
+    from superset.daos.tag import TagDAO
+    from superset.daos.user import UserDAO
+
+    _instance_info_core.dao_classes = {
+        "dashboards": DashboardDAO,
+        "charts": ChartDAO,
+        "datasets": DatasetDAO,
+        "databases": DatabaseDAO,
+        "users": UserDAO,
+        "tags": TagDAO,
+    }
+
+    with event_logger.log_context(action="mcp.get_instance_info.metrics"):
+        result = _instance_info_core.run_tool()
+
+    if (user := getattr(g, "user", None)) is not None:
+        result.current_user = serialize_user_object(user)
+
+    return result
diff --git a/superset/mcp_service/system/tool/get_schema.py b/superset/mcp_service/system/tool/get_schema.py
index 0757b028e05..a0bc8213a4f 100644
--- a/superset/mcp_service/system/tool/get_schema.py
+++ b/superset/mcp_service/system/tool/get_schema.py
@@ -24,7 +24,7 @@ Column metadata is extracted dynamically from SQLAlchemy models.
 """
 
 import logging
-from typing import Callable, Literal
+from typing import Callable
 
 from fastmcp import Context
 from superset_core.mcp.decorators import tool, ToolAnnotations
@@ -37,18 +37,22 @@ from superset.mcp_service.common.schema_discovery import (
     DASHBOARD_DEFAULT_COLUMNS,
     DASHBOARD_SEARCH_COLUMNS,
     DASHBOARD_SORTABLE_COLUMNS,
+    DATABASE_DEFAULT_COLUMNS,
+    DATABASE_SEARCH_COLUMNS,
+    DATABASE_SORTABLE_COLUMNS,
     DATASET_DEFAULT_COLUMNS,
     DATASET_SEARCH_COLUMNS,
     DATASET_SORTABLE_COLUMNS,
     get_chart_columns,
     get_dashboard_columns,
+    get_database_columns,
     get_dataset_columns,
     GetSchemaRequest,
     GetSchemaResponse,
     ModelSchemaInfo,
 )
+from superset.mcp_service.constants import ModelType
 from superset.mcp_service.mcp_core import ModelGetSchemaCore
-from superset.mcp_service.utils.schema_utils import parse_request
 
 logger = logging.getLogger(__name__)
 
@@ -110,14 +114,36 @@ def _get_dashboard_schema_core() -> ModelGetSchemaCore[ModelSchemaInfo]:
     )
 
 
+def _get_database_schema_core() -> ModelGetSchemaCore[ModelSchemaInfo]:
+    """Create database schema core with dynamically extracted columns."""
+    # Lazy import to avoid circular dependency at module load time
+    from superset.daos.database import DatabaseDAO
+    from superset.mcp_service.common.schema_discovery import DATABASE_EXCLUDE_COLUMNS
+
+    return ModelGetSchemaCore(
+        model_type="database",
+        dao_class=DatabaseDAO,
+        output_schema=ModelSchemaInfo,
+        select_columns=get_database_columns(),
+        sortable_columns=DATABASE_SORTABLE_COLUMNS,
+        default_columns=DATABASE_DEFAULT_COLUMNS,
+        search_columns=DATABASE_SEARCH_COLUMNS,
+        default_sort="changed_on",
+        default_sort_direction="desc",
+        exclude_filter_columns=DATABASE_EXCLUDE_COLUMNS,
+        logger=logger,
+    )
+
+
 # Map model types to their core factory functions
 _SCHEMA_CORE_FACTORIES: dict[
-    Literal["chart", "dataset", "dashboard"],
+    ModelType,
     Callable[[], ModelGetSchemaCore[ModelSchemaInfo]],
 ] = {
     "chart": _get_chart_schema_core,
     "dataset": _get_dataset_schema_core,
     "dashboard": _get_dashboard_schema_core,
+    "database": _get_database_schema_core,
 }
 
 
@@ -129,7 +155,6 @@ _SCHEMA_CORE_FACTORIES: dict[
         destructiveHint=False,
     ),
 )
-@parse_request(GetSchemaRequest)
 async def get_schema(request: GetSchemaRequest, ctx: Context) -> GetSchemaResponse:
     """
     Get comprehensive schema metadata for a model type.
@@ -145,7 +170,7 @@ async def get_schema(request: GetSchemaRequest, ctx: Context) -> GetSchemaRespon
     Column metadata is extracted dynamically from SQLAlchemy models.
 
     Args:
-        model_type: One of "chart", "dataset", or "dashboard"
+        model_type: One of "chart", "dataset", "dashboard", or "database"
 
     Returns:
         Comprehensive schema information for the requested model type
diff --git a/superset/mcp_service/utils/oauth2_utils.py b/superset/mcp_service/utils/oauth2_utils.py
new file mode 100644
index 00000000000..f6f6f87068a
--- /dev/null
+++ b/superset/mcp_service/utils/oauth2_utils.py
@@ -0,0 +1,47 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+"""
+Utilities for handling OAuth2 errors in MCP tools.
+"""
+
+from superset.exceptions import OAuth2RedirectError
+
+
+def build_oauth2_redirect_message(ex: OAuth2RedirectError) -> str:
+    """
+    Build a user-facing message for OAuth2RedirectError.
+
+    Extracts the authorization URL from the exception and includes it
+    so the MCP client can present it to the user for authentication.
+    """
+    # extra is always set by OAuth2RedirectError.__init__
+    assert ex.error.extra is not None  # noqa: S101
+    oauth_url = ex.error.extra["url"]
+    return (
+        "This database uses OAuth for authentication. "
+        "Please open the following URL in your browser to "
+        "authorize access, then retry this request:\n\n"
+        f"{oauth_url}"
+    )
+
+
+OAUTH2_CONFIG_ERROR_MESSAGE = (
+    "OAuth authentication failed due to a configuration "
+    "or provider error. "
+    "Please contact your Superset administrator."
+)
diff --git a/superset/mcp_service/utils/permissions_utils.py b/superset/mcp_service/utils/permissions_utils.py
index a3864206532..62d9c3d0840 100644
--- a/superset/mcp_service/utils/permissions_utils.py
+++ b/superset/mcp_service/utils/permissions_utils.py
@@ -44,8 +44,6 @@ SENSITIVE_FIELDS = {
         "created_by_fk",  # Internal user references
     },
     "dashboard": {
-        "json_metadata",  # May contain sensitive configuration
-        "position_json",  # Internal layout data
         "css",  # May contain sensitive styling info
         "changed_by_fk",  # Internal user references
         "created_by_fk",  # Internal user references
@@ -64,8 +62,6 @@ SENSITIVE_FIELD_PERMISSIONS = {
     "database_id": "can_this_form_get",  # Database access permissions
     "query_context": "can_explore_json",  # Explore permissions
     "cache_key": "can_warm_up_cache",  # Cache management permissions
-    "json_metadata": "can_this_form_get",  # Advanced dashboard permissions
-    "position_json": "can_this_form_get",  # Dashboard edit permissions
     "css": "can_this_form_get",  # Dashboard styling permissions
 }
 
diff --git a/superset/mcp_service/utils/response_utils.py b/superset/mcp_service/utils/response_utils.py
new file mode 100644
index 00000000000..777c619cfb2
--- /dev/null
+++ b/superset/mcp_service/utils/response_utils.py
@@ -0,0 +1,152 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+"""
+Utilities for building MCP tool responses with explicit omission metadata.
+
+When MCP tool responses strip large fields to reduce context window usage,
+the LLM agent should be told *what* was omitted and *why* — otherwise it
+cannot distinguish "field is empty" from "field was stripped for size".
+
+This module provides a reusable builder for omission metadata that any
+MCP tool serializer can use.
+
+Industry context (as of 2026):
+- The MCP spec has no standard for field omission signaling.
+- Silent omission is considered an anti-pattern (Grafana MCP #557).
+- Production servers (mcp-git-polite, Blockscout, Axiom) converge on
+  explicit omission indicators with size hints and retrieval guidance.
+- Anthropic's "Writing Tools for Agents" blog recommends surfacing
+  what was stripped so agents can decide whether to fetch full data.
+
+Usage example::
+
+    from superset.mcp_service.utils.response_utils import OmittedFieldsBuilder
+
+    omitted = (
+        OmittedFieldsBuilder()
+        .add_raw_field(
+            "position_json",
+            raw_value=dashboard.position_json,
+            reason="Internal layout tree — not useful for analysis.",
+        )
+        .add_extracted_field(
+            "json_metadata",
+            raw_value=dashboard.json_metadata,
+            reason="native_filters and cross_filters_enabled extracted above.",
+        )
+        .build()
+    )
+    # Returns: {"position_json": "Omitted (~42 KB) — ...", ...}
+"""
+
+from __future__ import annotations
+
+from typing import Dict
+
+
+def _byte_size_label(value: str | None) -> str:
+    """Return a human-readable size label for a string value."""
+    if not value or not isinstance(value, str):
+        return "empty"
+    size_bytes = len(value.encode("utf-8", errors="replace"))
+    if size_bytes < 1024:
+        return f"{size_bytes} B"
+    return f"{size_bytes / 1024:.0f} KB"
+
+
+class OmittedFieldsBuilder:
+    """Builder for constructing omission metadata dicts.
+
+    Produces a ``Dict[str, str]`` mapping field names to human-readable
+    descriptions of what was omitted, including approximate sizes.
+
+    Two field types are supported:
+
+    - **Raw fields** (``add_raw_field``): The field was stripped entirely
+      with no replacement. The agent has no way to access this data
+      unless a companion tool exists.
+
+    - **Extracted fields** (``add_extracted_field``): The raw blob was
+      stripped, but useful subsets were extracted into structured fields
+      on the same response object (e.g. ``native_filters`` extracted
+      from ``json_metadata``).
+
+    All methods return ``self`` for fluent chaining.
+    """
+
+    def __init__(self) -> None:
+        self._fields: Dict[str, str] = {}
+
+    def add_raw_field(
+        self,
+        field_name: str,
+        raw_value: str | None,
+        reason: str,
+    ) -> "OmittedFieldsBuilder":
+        """Record a field that was stripped with no replacement.
+
+        Parameters
+        ----------
+        field_name:
+            The original field name (e.g. ``"position_json"``).
+        raw_value:
+            The raw value that was omitted (used only to compute size).
+            Pass ``None`` if the field was empty/unset.
+        reason:
+            Why the field was omitted, written for an LLM audience.
+        """
+        size = _byte_size_label(raw_value)
+        has_data = isinstance(raw_value, str) and len(raw_value) > 0
+        if has_data:
+            self._fields[field_name] = f"Omitted (~{size}) — {reason}"
+        else:
+            self._fields[field_name] = f"Omitted ({size}) — {reason}"
+        return self
+
+    def add_extracted_field(
+        self,
+        field_name: str,
+        raw_value: str | None,
+        reason: str,
+    ) -> "OmittedFieldsBuilder":
+        """Record a field whose useful parts were extracted into other fields.
+
+        Parameters
+        ----------
+        field_name:
+            The original raw field name (e.g. ``"json_metadata"``).
+        raw_value:
+            The raw value that was omitted (used only to compute size).
+        reason:
+            Explanation of what was extracted and where, for LLM context.
+        """
+        size = _byte_size_label(raw_value)
+        has_data = isinstance(raw_value, str) and len(raw_value) > 0
+        if has_data:
+            self._fields[field_name] = (
+                f"Omitted (~{size}), useful parts extracted — {reason}"
+            )
+        else:
+            self._fields[field_name] = (
+                f"Omitted ({size}), useful parts extracted — {reason}"
+            )
+        return self
+
+    def build(self) -> Dict[str, str]:
+        """Return the omission metadata dict."""
+        return dict(self._fields)
diff --git a/superset/mcp_service/utils/schema_utils.py b/superset/mcp_service/utils/schema_utils.py
index f75e122b6ff..768be762ba5 100644
--- a/superset/mcp_service/utils/schema_utils.py
+++ b/superset/mcp_service/utils/schema_utils.py
@@ -24,9 +24,7 @@ for input parameters, making MCP tools more flexible for different clients.
 
 from __future__ import annotations
 
-import asyncio
 import logging
-from functools import wraps
 from typing import Any, Callable, List, Type, TypeVar
 
 from pydantic import BaseModel, ValidationError
@@ -381,198 +379,3 @@ def json_or_model_list_validator(
         return parse_json_or_model_list(v, model_class, field_name)
 
     return validator
-
-
-def _is_parse_request_enabled() -> bool:
-    """Check if parse_request decorator is enabled via config."""
-    try:
-        from flask import current_app, has_app_context
-
-        if has_app_context():
-            return bool(current_app.config["MCP_PARSE_REQUEST_ENABLED"])
-    except (ImportError, RuntimeError, KeyError):
-        pass
-    try:
-        from superset.mcp_service.flask_singleton import app as flask_app
-
-        return bool(flask_app.config["MCP_PARSE_REQUEST_ENABLED"])
-    except (ImportError, RuntimeError, AttributeError, KeyError):
-        pass
-    return True
-
-
-def parse_request(
-    request_class: Type[BaseModel],
-) -> Callable[[Callable[..., Any]], Callable[..., Any]]:
-    """
-    Decorator to handle Claude Code bug where requests are double-serialized as strings.
-
-    Automatically parses string requests to Pydantic models before calling
-    the tool function. Also modifies the function's type annotations to accept
-    str | RequestModel to pass FastMCP validation.
-
-    Can be disabled by setting MCP_PARSE_REQUEST_ENABLED = False in config.
-    When disabled, string-to-model parsing is skipped but ctx injection and
-    signature stripping still apply.
-
-    See: https://github.com/anthropics/claude-code/issues/5504
-
-    Args:
-        request_class: The Pydantic model class for the request
-
-    Returns:
-        Decorator function that wraps the tool function
-
-    Usage:
-        @mcp.tool
-        @mcp_auth_hook
-        @parse_request(ListChartsRequest)
-        async def list_charts(
-            request: ListChartsRequest, ctx: Context  # Keep clean type hint
-        ) -> ChartList:
-            # Decorator handles string conversion and type annotation
-            await ctx.info(f"Listing charts: page={request.page}")
-            ...
-
-    Note:
-        - Works with both async and sync functions
-        - Request must be the first positional argument
-        - Modifies __annotations__ to accept str | RequestModel for FastMCP
-        - Function implementation can use clean RequestModel type hint
-        - If request is already a model instance, it passes through unchanged
-        - Handles JSON string parsing with helpful error messages
-    """
-
-    def decorator(func: Callable[..., Any]) -> Callable[..., Any]:
-        import types
-
-        def _maybe_parse(request: Any) -> Any:
-            if _is_parse_request_enabled():
-                try:
-                    return parse_json_or_model(request, request_class, "request")
-                except ValidationError as e:
-                    from fastmcp.exceptions import ToolError
-
-                    details = []
-                    for err in e.errors():
-                        field = " -> ".join(str(loc) for loc in err["loc"])
-                        details.append(f"{field}: {err['msg']}")
-                    required_fields = [
-                        f.alias or name
-                        for name, f in request_class.model_fields.items()
-                        if f.is_required()
-                    ]
-                    raise ToolError(
-                        f"Invalid request parameters: {'; '.join(details)}. "
-                        f"Required fields for {request_class.__name__}: "
-                        f"{', '.join(required_fields)}"
-                    ) from None
-            return request
-
-        if asyncio.iscoroutinefunction(func):
-
-            @wraps(func)
-            async def async_wrapper(request: Any, *args: Any, **kwargs: Any) -> Any:
-                from fastmcp.server.dependencies import get_context
-
-                ctx = get_context()
-                return await func(_maybe_parse(request), ctx, *args, **kwargs)
-
-            wrapper = async_wrapper
-        else:
-
-            @wraps(func)
-            def sync_wrapper(request: Any, *args: Any, **kwargs: Any) -> Any:
-                from fastmcp.server.dependencies import get_context
-
-                ctx = get_context()
-                return func(_maybe_parse(request), ctx, *args, **kwargs)
-
-            wrapper = sync_wrapper
-
-        # Merge original function's __globals__ into wrapper's __globals__
-        # This allows get_type_hints() to resolve type annotations from the
-        # original module (e.g., Context from fastmcp)
-        # FastMCP 2.13.2+ uses get_type_hints() which needs access to these types
-        merged_globals = {**wrapper.__globals__, **func.__globals__}  # type: ignore[attr-defined]
-        new_wrapper = types.FunctionType(
-            wrapper.__code__,  # type: ignore[attr-defined]
-            merged_globals,
-            wrapper.__name__,
-            wrapper.__defaults__,  # type: ignore[attr-defined]
-            wrapper.__closure__,  # type: ignore[attr-defined]
-        )
-        # Copy __dict__ but exclude __wrapped__
-        # NOTE: We intentionally do NOT preserve __wrapped__ here.
-        # Setting __wrapped__ causes inspect.signature() to follow the chain
-        # and find 'ctx' in the original function's signature, even after
-        # FastMCP's create_function_without_params removes it from annotations.
-        # This breaks Pydantic's TypeAdapter which expects signature params
-        # to match type_hints.
-        new_wrapper.__dict__.update(
-            {k: v for k, v in wrapper.__dict__.items() if k != "__wrapped__"}
-        )
-        new_wrapper.__module__ = wrapper.__module__
-        new_wrapper.__qualname__ = wrapper.__qualname__
-        # Copy docstring from original function (not wrapper, which has no docstring)
-        new_wrapper.__doc__ = func.__doc__
-
-        request_annotation = str | request_class
-        _apply_signature_for_fastmcp(new_wrapper, func, request_annotation)
-
-        return new_wrapper
-
-    return decorator
-
-
-def _apply_signature_for_fastmcp(
-    wrapper: Any,
-    original_func: Callable[..., Any],
-    request_annotation: Any,
-) -> None:
-    """Apply annotations and signature to wrapper, stripping ctx for FastMCP.
-
-    FastMCP injects ctx via dependency injection, so it must not appear in
-    the function's annotations or signature. This helper copies annotations
-    from the original function, swaps the request type, and removes ctx.
-    """
-    import inspect as sig_inspect
-
-    from fastmcp import Context as FMContext
-
-    # Copy annotations, remove ctx, set request type
-    if hasattr(original_func, "__annotations__"):
-        wrapper.__annotations__ = {
-            k: v for k, v in original_func.__annotations__.items() if k != "ctx"
-        }
-        wrapper.__annotations__["request"] = request_annotation
-    else:
-        wrapper.__annotations__ = {"request": request_annotation}
-
-    # Build signature without ctx parameter
-    orig_sig = sig_inspect.signature(original_func)
-    new_params = []
-    for name, param in orig_sig.parameters.items():
-        if _is_context_param(param, name, FMContext):
-            continue
-        if name == "request":
-            new_params.append(param.replace(annotation=request_annotation))
-        else:
-            new_params.append(param)
-    wrapper.__signature__ = orig_sig.replace(parameters=new_params)
-
-
-def _is_context_param(param: Any, name: str, context_type: Any) -> bool:
-    """Check if a parameter is a FastMCP Context parameter."""
-    return (
-        param.annotation is context_type
-        or (
-            hasattr(param.annotation, "__name__")
-            and param.annotation.__name__ == "Context"
-        )
-        or (
-            isinstance(param.annotation, str)
-            and (param.annotation == "Context" or param.annotation.endswith(".Context"))
-        )
-        or name == "ctx"
-    )
diff --git a/superset/mcp_service/utils/token_utils.py b/superset/mcp_service/utils/token_utils.py
index b7f12a2c1cb..423bbc6a224 100644
--- a/superset/mcp_service/utils/token_utils.py
+++ b/superset/mcp_service/utils/token_utils.py
@@ -220,6 +220,11 @@ def generate_size_reduction_suggestions(
                 f"Add a 'limit' or 'page_size' parameter (suggested: 10-25 items) "
                 f"to reduce response size by ~{reduction_pct}%"
             )
+        elif tool_name == "execute_sql":
+            suggestions.append(
+                f"Use the 'limit' parameter (e.g., limit=100) to cap the number "
+                f"of rows returned — need ~{reduction_pct}% reduction"
+            )
 
     # Suggestion 2: Use select_columns to reduce fields
     current_columns = query_params.get("select_columns") or query_params.get("columns")
@@ -348,9 +353,13 @@ def _get_tool_specific_suggestions(
 
     elif tool_name == "execute_sql":
         suggestions.append(
-            "Add LIMIT clause to your SQL query to restrict the number of rows "
-            "(e.g., SELECT * FROM table LIMIT 100)"
+            "Add a LIMIT clause to your SQL query (e.g., SELECT * FROM table LIMIT 100)"
         )
+        if not query_params.get("limit"):
+            suggestions.append(
+                "Use the execute_sql 'limit' parameter to cap rows returned "
+                "(e.g., limit=100) — this overrides any SQL LIMIT clause"
+            )
 
     elif tool_name in ("get_chart_info", "get_dashboard_info", "get_dataset_info"):
         suggestions.append(
@@ -373,6 +382,210 @@ def _get_tool_specific_suggestions(
     return suggestions
 
 
+# Tools eligible for dynamic response truncation instead of hard blocking.
+# These tools return single objects (not paginated lists) where truncation
+# is preferable to returning an error.
+INFO_TOOLS = frozenset(
+    {
+        "get_chart_info",
+        "get_dataset_info",
+        "get_dashboard_info",
+        "get_instance_info",
+    }
+)
+
+# Maximum character length for string fields before truncation
+_MAX_STRING_CHARS = 500
+# Maximum items to keep in list fields before truncation
+_MAX_LIST_ITEMS = 30
+# Maximum keys to keep when summarizing large dict fields
+_MAX_DICT_KEYS = 20
+
+
+def _truncate_strings(
+    data: Dict[str, Any], notes: List[str], max_chars: int = _MAX_STRING_CHARS
+) -> bool:
+    """Truncate string fields exceeding max_chars at the top level only."""
+    changed = False
+    for key, value in data.items():
+        if isinstance(value, str) and len(value) > max_chars:
+            original_len = len(value)
+            data[key] = value[:max_chars] + f"... [truncated from {original_len} chars]"
+            notes.append(f"Field '{key}' truncated from {original_len} chars")
+            changed = True
+    return changed
+
+
+def _truncate_strings_recursive(
+    data: Any,
+    notes: List[str],
+    max_chars: int = _MAX_STRING_CHARS,
+    path: str = "",
+    _depth: int = 0,
+) -> bool:
+    """Recursively truncate strings throughout the entire data tree.
+
+    Walks nested dicts and list items to catch strings like
+    ``charts[0].description`` that top-level truncation misses.
+    Depth is capped at 10 to avoid runaway recursion.
+    """
+    if _depth > 10:
+        return False
+    changed = False
+    if isinstance(data, dict):
+        for key, value in data.items():
+            field_path = f"{path}.{key}" if path else key
+            if isinstance(value, str) and len(value) > max_chars:
+                original_len = len(value)
+                data[key] = (
+                    value[:max_chars] + f"... [truncated from {original_len} chars]"
+                )
+                notes.append(
+                    f"Field '{field_path}' truncated from {original_len} chars"
+                )
+                changed = True
+            elif isinstance(value, (dict, list)):
+                changed |= _truncate_strings_recursive(
+                    value, notes, max_chars, field_path, _depth + 1
+                )
+    elif isinstance(data, list):
+        for i, item in enumerate(data):
+            if isinstance(item, (dict, list)):
+                changed |= _truncate_strings_recursive(
+                    item, notes, max_chars, f"{path}[{i}]", _depth + 1
+                )
+    return changed
+
+
+def _truncate_lists(data: Dict[str, Any], notes: List[str], max_items: int) -> bool:
+    """Truncate list fields exceeding max_items. Returns True if any truncated.
+
+    Does NOT append marker objects into the list to preserve the element type
+    contract (e.g. ``List[TableColumnInfo]`` stays homogeneous).  Truncation
+    metadata is communicated through the *notes* list and top-level response
+    fields ``_response_truncated`` / ``_truncation_notes``.
+    """
+    changed = False
+    for key, value in data.items():
+        if isinstance(value, list) and len(value) > max_items:
+            original_len = len(value)
+            data[key] = value[:max_items]
+            notes.append(
+                f"Field '{key}' truncated from {original_len} to {max_items} items"
+            )
+            changed = True
+    return changed
+
+
+def _summarize_large_dicts(
+    data: Dict[str, Any], notes: List[str], max_keys: int = _MAX_DICT_KEYS
+) -> bool:
+    """Replace large dict fields with key summaries. Returns True if any changed."""
+    changed = False
+    for key, value in data.items():
+        if isinstance(value, dict) and len(value) > max_keys:
+            keys_list = list(value.keys())[:max_keys]
+            data[key] = {
+                "_truncated": True,
+                "_message": (
+                    f"Dict with {len(value)} keys truncated. "
+                    f"Keys: {', '.join(str(k) for k in keys_list)}..."
+                ),
+            }
+            notes.append(f"Field '{key}' dict summarized ({len(value)} keys)")
+            changed = True
+    return changed
+
+
+def _replace_collections_with_summaries(data: Dict[str, Any], notes: List[str]) -> bool:
+    """Replace all non-empty list/dict fields with empty/minimal values.
+
+    Lists are emptied (preserving the list type) rather than replaced with
+    marker objects to avoid breaking typed list contracts.
+    """
+    changed = False
+    for key, value in list(data.items()):
+        if not isinstance(value, (list, dict)) or not value:
+            continue
+        count = len(value)
+        if isinstance(value, list):
+            data[key] = []
+            notes.append(f"Field '{key}' list ({count} items) cleared to fit limit")
+        else:
+            data[key] = {}
+            notes.append(f"Field '{key}' dict ({count} keys) cleared to fit limit")
+        changed = True
+    return changed
+
+
+def _is_under_limit(data: Dict[str, Any], token_limit: int) -> bool:
+    """Check if the serialized data fits within the token limit."""
+    from superset.utils import json as utils_json
+
+    return estimate_token_count(utils_json.dumps(data)) <= token_limit
+
+
+def truncate_oversized_response(
+    response: ToolResponse,
+    token_limit: int,
+) -> tuple[ToolResponse, bool, list[str]]:
+    """
+    Dynamically truncate large fields in a response to fit within the token limit.
+
+    Applies five progressive phases of truncation:
+    1. Truncate long top-level string fields
+    2. Truncate large list fields to _MAX_LIST_ITEMS
+    3. Recursively truncate strings in nested structures (list items, nested dicts)
+    4. Aggressively reduce lists to 10 items and summarize large dicts
+    5. Replace all collections with empty values
+
+    Args:
+        response: The tool response (Pydantic model, dict, or other).
+        token_limit: Maximum estimated tokens allowed.
+
+    Returns:
+        A tuple of (possibly-truncated response, was_truncated, list of notes).
+    """
+    notes: list[str] = []
+
+    # Convert to a mutable dict for manipulation
+    if hasattr(response, "model_dump"):
+        data = response.model_dump()
+    elif isinstance(response, dict):
+        data = dict(response)
+    else:
+        return response, False, notes
+
+    was_truncated = False
+
+    # Phase 1: Truncate long string fields
+    was_truncated |= _truncate_strings(data, notes)
+    if _is_under_limit(data, token_limit):
+        return data, was_truncated, notes
+
+    # Phase 2: Truncate large list fields
+    was_truncated |= _truncate_lists(data, notes, _MAX_LIST_ITEMS)
+    if _is_under_limit(data, token_limit):
+        return data, was_truncated, notes
+
+    # Phase 3: Recursively truncate strings inside nested structures
+    # (e.g. charts[i].description, native_filters[i].config, etc.)
+    was_truncated |= _truncate_strings_recursive(data, notes)
+    if _is_under_limit(data, token_limit):
+        return data, was_truncated, notes
+
+    # Phase 4: Aggressively reduce lists and summarize large dicts
+    was_truncated |= _truncate_lists(data, notes, max_items=10)
+    was_truncated |= _summarize_large_dicts(data, notes)
+    if _is_under_limit(data, token_limit):
+        return data, was_truncated, notes
+
+    # Phase 5: Nuclear — replace all collections with empty values
+    was_truncated |= _replace_collections_with_summaries(data, notes)
+
+    return data, was_truncated, notes
+
+
 def format_size_limit_error(
     tool_name: str,
     params: Dict[str, Any] | None,
diff --git a/superset/migrations/shared/utils.py b/superset/migrations/shared/utils.py
index dbcfa2f9f5b..f91f3d1a45e 100644
--- a/superset/migrations/shared/utils.py
+++ b/superset/migrations/shared/utils.py
@@ -199,6 +199,18 @@ def has_table(table_name: str) -> bool:
     return table_exists
 
 
+def get_foreign_key_names(table_name: str) -> set[str]:
+    """
+    Get the set of foreign key constraint names for a table.
+
+    :param table_name: The table name
+    :returns: A set of foreign key constraint names
+    """
+    connection = op.get_bind()
+    inspector = Inspector.from_engine(connection)
+    return {fk["name"] for fk in inspector.get_foreign_keys(table_name)}
+
+
 def drop_fks_for_table(
     table_name: str, foreign_key_names: list[str] | None = None
 ) -> None:
@@ -211,13 +223,12 @@ def drop_fks_for_table(
     If None is provided, all will be dropped.
     """
     connection = op.get_bind()
-    inspector = Inspector.from_engine(connection)
 
     if isinstance(connection.dialect, SQLiteDialect):
         return  # sqlite doesn't like constraints
 
     if has_table(table_name):
-        existing_fks = {fk["name"] for fk in inspector.get_foreign_keys(table_name)}
+        existing_fks = get_foreign_key_names(table_name)
 
         # What to delete based on whether the list was passed
         if foreign_key_names is not None:
@@ -523,6 +534,18 @@ def create_fks_for_table(
         )
         return
 
+    if foreign_key_name in get_foreign_key_names(table_name):
+        logger.info(
+            "Foreign key %s%s%s already exists on table %s%s%s. Skipping...",
+            GREEN,
+            foreign_key_name,
+            RESET,
+            GREEN,
+            table_name,
+            RESET,
+        )
+        return
+
     if isinstance(connection.dialect, SQLiteDialect):
         # SQLite requires batch mode since ALTER TABLE is limited
         with op.batch_alter_table(table_name) as batch_op:
diff --git a/superset/migrations/versions/2026-03-02_00-00_ce6bd21901ab_migrate_deckgl_and_mapbox.py b/superset/migrations/versions/2026-03-02_00-00_ce6bd21901ab_migrate_deckgl_and_mapbox.py
new file mode 100644
index 00000000000..ac6011e3965
--- /dev/null
+++ b/superset/migrations/versions/2026-03-02_00-00_ce6bd21901ab_migrate_deckgl_and_mapbox.py
@@ -0,0 +1,172 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+"""migrate mapbox and deckgl charts to point_cluster_map
+
+Revision ID: ce6bd21901ab
+Revises: 4b2a8c9d3e1f
+Create Date: 2026-03-02 00:00:00.000000
+
+
+"""
+
+import copy
+import logging
+from typing import Any
+
+from alembic import op
+from sqlalchemy.orm import Session
+
+from superset import db
+from superset.migrations.shared.migrate_viz.base import (
+    FORM_DATA_BAK_FIELD_NAME,
+    MigrateViz,
+    QUERIES_BAK_FIELD_NAME,
+    Slice,
+)
+from superset.migrations.shared.utils import paginated_update, try_load_json
+from superset.utils import json
+
+logger = logging.getLogger("alembic.env")
+
+# revision identifiers, used by Alembic.
+revision = "ce6bd21901ab"
+down_revision = "a1b2c3d4e5f6"
+
+DECKGL_VIZ_TYPES = [
+    "deck_arc",
+    "deck_contour",
+    "deck_geojson",
+    "deck_grid",
+    "deck_heatmap",
+    "deck_hex",
+    "deck_multi",
+    "deck_path",
+    "deck_polygon",
+    "deck_scatter",
+    "deck_screengrid",
+]
+
+
+class MigrateMapBox(MigrateViz):
+    """Migrate the legacy standalone Mapbox scatter chart to point_cluster_map."""
+
+    has_x_axis_control = False
+    source_viz_type = "mapbox"
+    target_viz_type = "point_cluster_map"
+    rename_keys = {
+        "mapbox_label": "map_label",
+        "mapbox_color": "map_color",
+    }
+    remove_keys = set()
+
+    def _post_action(self) -> None:
+        # If the style URL is a mapbox:// URL, the chart was using Mapbox GL.
+        # Set map_renderer so the new chart continues to use the Mapbox renderer,
+        # which will pick up MAPBOX_API_KEY from the server config.
+        mapbox_style = self.data.get("mapbox_style", "")
+        if isinstance(mapbox_style, str) and mapbox_style.startswith("mapbox://"):
+            self.data["map_renderer"] = "mapbox"
+
+    @classmethod
+    def upgrade_slice(cls, slc: Slice) -> None:
+        try:
+            clz = cls(slc.params)
+            form_data_bak = copy.deepcopy(clz.data)
+
+            clz._pre_action()
+            clz._migrate()
+            clz._post_action()
+
+            slc.viz_type = clz.target_viz_type
+
+            backup: Any | dict[str, Any] = {FORM_DATA_BAK_FIELD_NAME: form_data_bak}
+
+            query_context = try_load_json(slc.query_context)
+            queries_bak = None
+
+            if query_context:
+                if "form_data" in query_context:
+                    query_context["form_data"] = clz.data
+                queries_bak = copy.deepcopy(query_context.get("queries"))
+            else:
+                query_context = {}
+
+            slc.query_context = json.dumps(query_context)
+            if queries_bak is not None:
+                backup[QUERIES_BAK_FIELD_NAME] = queries_bak
+
+            slc.params = json.dumps({**clz.data, **backup})
+
+        except (ValueError, KeyError, TypeError) as e:
+            logger.warning("Failed to migrate slice %s: %s", slc.id, e)
+
+
+def _migrate_deckgl_slice(slc: Slice) -> bool:
+    """Set map_renderer='mapbox' for all existing deck.gl slices.
+
+    This ensures full backwards compatibility: existing charts keep using the
+    Mapbox renderer. Users can later switch to MapLibre in the chart controls.
+    Only new charts will default to MapLibre.
+
+    Returns True if the slice was modified.
+    """
+    params = try_load_json(slc.params)
+    if not params:
+        return False
+
+    if "map_renderer" in params:
+        return False
+
+    params["map_renderer"] = "mapbox"
+    slc.params = json.dumps(params)
+    return True
+
+
+def _downgrade_deckgl_slice(slc: Slice) -> bool:
+    """Reverse _migrate_deckgl_slice. Returns True if the slice was modified."""
+    params = try_load_json(slc.params)
+    if not params or "map_renderer" not in params:
+        return False
+
+    params.pop("map_renderer", None)
+    slc.params = json.dumps(params)
+    return True
+
+
+def _migrate_deckgl_slices(session: Session, *, upgrade: bool) -> None:
+    fn = _migrate_deckgl_slice if upgrade else _downgrade_deckgl_slice
+    query = session.query(Slice).filter(Slice.viz_type.in_(DECKGL_VIZ_TYPES))
+    for slc in paginated_update(query):
+        try:
+            fn(slc)
+        except (ValueError, KeyError, TypeError) as e:
+            logger.warning("Failed to migrate deck.gl slice %s: %s", slc.id, e)
+    session.commit()
+
+
+def upgrade() -> None:
+    bind = op.get_bind()
+    session = db.Session(bind=bind)
+    MigrateMapBox.upgrade(session)
+    _migrate_deckgl_slices(session, upgrade=True)
+
+
+def downgrade() -> None:
+    bind = op.get_bind()
+    session = db.Session(bind=bind)
+    MigrateMapBox.downgrade(session)
+    _migrate_deckgl_slices(session, upgrade=False)
diff --git a/superset/migrations/versions/2026-04-13_19-28_fd0c8583b46d_add_sort_by_series_to_word_cloud_charts.py b/superset/migrations/versions/2026-04-13_19-28_fd0c8583b46d_add_sort_by_series_to_word_cloud_charts.py
new file mode 100644
index 00000000000..bf66a2264f3
--- /dev/null
+++ b/superset/migrations/versions/2026-04-13_19-28_fd0c8583b46d_add_sort_by_series_to_word_cloud_charts.py
@@ -0,0 +1,89 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+"""add sort_by_series to word_cloud charts
+
+Revision ID: fd0c8583b46d
+Revises: ce6bd21901ab
+Create Date: 2026-04-13 19:28:19.021839
+
+"""
+
+from alembic import op
+from sqlalchemy import Column, Integer, String, Text
+from sqlalchemy.ext.declarative import declarative_base
+
+from superset import db
+from superset.migrations.shared.utils import paginated_update
+from superset.utils import json
+
+# revision identifiers, used by Alembic.
+revision = "fd0c8583b46d"
+down_revision = "ce6bd21901ab"
+
+Base = declarative_base()
+
+
+class Slice(Base):
+    __tablename__ = "slices"
+    id = Column(Integer, primary_key=True)
+    viz_type = Column(String(250))
+    params = Column(Text)
+
+
+def upgrade_params(params: dict) -> dict:
+    if "sort_by_series" not in params:
+        params["sort_by_series"] = True
+    return params
+
+
+def downgrade_params(params: dict) -> dict:
+    params.pop("sort_by_series", None)
+    return params
+
+
+def upgrade():
+    bind = op.get_bind()
+    session = db.Session(bind=bind)
+
+    for slc in paginated_update(
+        session.query(Slice).filter(Slice.viz_type == "word_cloud")
+    ):
+        try:
+            params = json.loads(slc.params or "{}")
+            if not isinstance(params, dict):
+                continue
+            slc.params = json.dumps(upgrade_params(params))
+        except (json.JSONDecodeError, TypeError):
+            continue
+    session.close()
+
+
+def downgrade():
+    bind = op.get_bind()
+    session = db.Session(bind=bind)
+
+    for slc in paginated_update(
+        session.query(Slice).filter(Slice.viz_type == "word_cloud")
+    ):
+        try:
+            params = json.loads(slc.params or "{}")
+            if not isinstance(params, dict):
+                continue
+            slc.params = json.dumps(downgrade_params(params))
+        except (json.JSONDecodeError, TypeError):
+            continue
+    session.close()
diff --git a/superset/models/helpers.py b/superset/models/helpers.py
index 56c0611bc67..71958d8cf83 100644
--- a/superset/models/helpers.py
+++ b/superset/models/helpers.py
@@ -2399,7 +2399,7 @@ class ExploreMixin:  # pylint: disable=too-many-public-methods
         time_grain: Optional[str] = None,
         label: Optional[str] = "__time",
         template_processor: Optional[BaseTemplateProcessor] = None,
-    ) -> ColumnElement:
+    ) -> Optional[ColumnElement]:
         col = (
             time_col.get_timestamp_expression(
                 time_grain=time_grain,
@@ -2427,6 +2427,8 @@ class ExploreMixin:  # pylint: disable=too-many-public-methods
                     self.dttm_sql_literal(end_dttm, time_col)
                 )
             )
+        if not l:
+            return None
         return and_(True, *l)
 
     def values_for_column(  # pylint: disable=too-many-locals
@@ -2945,14 +2947,14 @@ class ExploreMixin:  # pylint: disable=too-many-public-methods
                 and self.main_dttm_col != dttm_col.column_name
                 and self.main_dttm_col not in removed_filters
             ):
-                time_filters.append(
-                    self.get_time_filter(
-                        time_col=columns_by_name[self.main_dttm_col],
-                        start_dttm=from_dttm,
-                        end_dttm=to_dttm,
-                        template_processor=template_processor,
-                    )
+                _main_dttm_filter = self.get_time_filter(
+                    time_col=columns_by_name[self.main_dttm_col],
+                    start_dttm=from_dttm,
+                    end_dttm=to_dttm,
+                    template_processor=template_processor,
                 )
+                if _main_dttm_filter is not None:
+                    time_filters.append(_main_dttm_filter)
 
             # Check if time filter should be skipped because it was handled in template.
             # Check both the actual column name and __timestamp alias
@@ -2968,7 +2970,8 @@ class ExploreMixin:  # pylint: disable=too-many-public-methods
                     end_dttm=to_dttm,
                     template_processor=template_processor,
                 )
-                time_filters.append(time_filter_column)
+                if time_filter_column is not None:
+                    time_filters.append(time_filter_column)
 
         # Always remove duplicates by column name, as sometimes `metrics_exprs`
         # can have the same name as a groupby column (e.g. when users use
@@ -3009,7 +3012,11 @@ class ExploreMixin:  # pylint: disable=too-many-public-methods
                 col_obj = dttm_col
             elif is_adhoc_column(flt_col):
                 try:
-                    sqla_col = self.adhoc_column_to_sqla(flt_col, force_type_check=True)
+                    sqla_col = self.adhoc_column_to_sqla(
+                        flt_col,
+                        force_type_check=True,
+                        template_processor=template_processor,
+                    )
                     applied_adhoc_filters_columns.append(flt_col)
                 except ColumnNotFoundException:
                     rejected_adhoc_filters_columns.append(flt_col)
@@ -3205,16 +3212,16 @@ class ExploreMixin:  # pylint: disable=too-many-public-methods
                             time_shift=time_shift,
                             extras=extras,
                         )
-                        target_clause_list.append(
-                            self.get_time_filter(
-                                time_col=col_obj,
-                                start_dttm=_since,
-                                end_dttm=_until,
-                                time_grain=flt_grain,
-                                label=sqla_col.key,
-                                template_processor=template_processor,
-                            )
+                        _temporal_filter = self.get_time_filter(
+                            time_col=col_obj,
+                            start_dttm=_since,
+                            end_dttm=_until,
+                            time_grain=flt_grain,
+                            label=sqla_col.key,
+                            template_processor=template_processor,
                         )
+                        if _temporal_filter is not None:
+                            target_clause_list.append(_temporal_filter)
                     else:
                         raise QueryObjectValidationError(
                             _("Invalid filter operation type: %(op)s", op=op)
@@ -3301,14 +3308,14 @@ class ExploreMixin:  # pylint: disable=too-many-public-methods
                 inner_time_filter = []
 
                 if dttm_col and not db_engine_spec.time_groupby_inline:
-                    inner_time_filter = [
-                        self.get_time_filter(
-                            time_col=dttm_col,
-                            start_dttm=inner_from_dttm or from_dttm,
-                            end_dttm=inner_to_dttm or to_dttm,
-                            template_processor=template_processor,
-                        )
-                    ]
+                    _inner_filter = self.get_time_filter(
+                        time_col=dttm_col,
+                        start_dttm=inner_from_dttm or from_dttm,
+                        end_dttm=inner_to_dttm or to_dttm,
+                        template_processor=template_processor,
+                    )
+                    if _inner_filter is not None:
+                        inner_time_filter = [_inner_filter]
                 subq = subq.where(and_(*(where_clause_and + inner_time_filter)))
                 subq = subq.group_by(*inner_groupby_exprs)
 
diff --git a/superset/models/slice.py b/superset/models/slice.py
index 5fce86d79e2..04c698ce95d 100644
--- a/superset/models/slice.py
+++ b/superset/models/slice.py
@@ -164,10 +164,13 @@ class Slice(  # pylint: disable=too-many-public-methods
 
     @renders("datasource_url")
     def datasource_url(self) -> str | None:
+        # Use getattr to guard against datasource types that don't have explore_url
+        # (e.g. Query objects), which would otherwise raise AttributeError and cause
+        # the entire chart list response to fail.
         if self.table:
-            return self.table.explore_url
+            return getattr(self.table, "explore_url", None)
         datasource = self.datasource
-        return datasource.explore_url if datasource else None
+        return getattr(datasource, "explore_url", None) if datasource else None
 
     def datasource_name_text(self) -> str | None:
         if self.table:
@@ -274,7 +277,7 @@ class Slice(  # pylint: disable=too-many-public-methods
         if self.query_context:
             try:
                 return self.get_query_context_factory().create(
-                    **json.loads(self.query_context)
+                    **{**json.loads(self.query_context), "current_slice": self}
                 )
             except json.JSONDecodeError as ex:
                 logger.error("Malformed json in slice's query context", exc_info=True)
diff --git a/superset/models/sql_lab.py b/superset/models/sql_lab.py
index 7a6b246990d..7d303ffa99a 100644
--- a/superset/models/sql_lab.py
+++ b/superset/models/sql_lab.py
@@ -540,7 +540,7 @@ class TabState(AuditMixinNullable, ExtraJSONMixin, Model):
 
     # latest query that was run
     latest_query_id = Column(
-        Integer, ForeignKey("query.client_id", ondelete="SET NULL")
+        String(11), ForeignKey("query.client_id", ondelete="SET NULL")
     )
     latest_query = relationship("Query")
 
diff --git a/superset/reports/models.py b/superset/reports/models.py
index 4fa573d6f1e..5bea67c6d68 100644
--- a/superset/reports/models.py
+++ b/superset/reports/models.py
@@ -16,6 +16,7 @@
 # under the License.
 """A collection of ORM sqlalchemy models for Superset"""
 
+import logging
 from typing import Any, Optional
 
 import prison
@@ -47,6 +48,8 @@ from superset.reports.types import ReportScheduleExtra
 from superset.utils.backports import StrEnum
 from superset.utils.core import MediumText
 
+logger = logging.getLogger(__name__)
+
 metadata = Model.metadata  # pylint: disable=no-member
 
 
@@ -187,24 +190,46 @@ class ReportSchedule(AuditMixinNullable, ExtraJSONMixin, Model):
     def crontab_humanized(self) -> str:
         return get_description(self.crontab)
 
-    def get_native_filters_params(self) -> str:
+    def get_native_filters_params(self) -> tuple[str, list[str]]:
+        """
+        Generate native filter params for dashboard URL.
+
+        Returns:
+            A tuple of (rison_encoded_params, list_of_warning_messages).
+            Warnings are returned so they can be surfaced to users in the
+            execution log.
+        """
         params: dict[str, Any] = {}
+        warnings: list[str] = []
         dashboard = self.extra.get("dashboard")
         if dashboard and dashboard.get("nativeFilters"):
-            for filter in dashboard.get("nativeFilters") or []:  # type: ignore
-                params = {
-                    **params,
-                    **self._generate_native_filter(
-                        filter["nativeFilterId"],
-                        filter["filterType"],
-                        filter["columnName"],
-                        filter["filterValues"],
-                    ),
-                }
+            native_filters = dashboard.get("nativeFilters") or []
+            for native_filter in native_filters:  # type: ignore
+                native_filter_id = native_filter.get("nativeFilterId")
+                filter_type = native_filter.get("filterType")
+
+                if native_filter_id is None or filter_type is None:
+                    warning_msg = (
+                        f"Skipping malformed native filter missing required "
+                        f"fields: {native_filter}"
+                    )
+                    warnings.append(warning_msg)
+                    logger.warning(warning_msg)
+                    continue
+
+                filter_config, filter_warning = self._generate_native_filter(
+                    native_filter_id,
+                    filter_type,
+                    native_filter.get("columnName") or "",
+                    native_filter.get("filterValues") or [],
+                )
+                if filter_warning:
+                    warnings.append(filter_warning)
+                params = {**params, **filter_config}
         # hack(hughhh): workaround for escaping prison not handling quotes right
         rison = prison.dumps(params)
         rison = rison.replace("'", "%27")
-        return rison
+        return rison, warnings
 
     def _generate_native_filter(
         self,
@@ -212,62 +237,99 @@ class ReportSchedule(AuditMixinNullable, ExtraJSONMixin, Model):
         filter_type: str,
         column_name: str,
         values: list[Optional[str]],
-    ) -> dict[str, Any]:
+    ) -> tuple[dict[str, Any], Optional[str]]:
+        """
+        Generate a native filter configuration for the given filter type.
+
+        Returns:
+            A tuple of (filter_config, warning_message). If the filter type is
+            unrecognized, returns an empty dict and a warning message.
+        """
+        # Filter types that require at least one value
+        requires_values = (
+            "filter_time",
+            "filter_timegrain",
+            "filter_timecolumn",
+            "filter_range",
+        )
+        if filter_type in requires_values and not values:
+            warning_msg = (
+                f"Skipping {filter_type} with empty filterValues "
+                f"(filter_id: {native_filter_id})"
+            )
+            logger.warning(warning_msg)
+            return {}, warning_msg
+
         if filter_type == "filter_time":
-            # For select filters, we need to use the "IN" operator
-            return {
-                native_filter_id or "": {
-                    "id": native_filter_id or "",
-                    "extraFormData": {"time_range": values[0]},
-                    "filterState": {"value": values[0]},
-                    "ownState": {},
-                }
-            }
-        elif filter_type == "filter_timegrain":
-            return {
-                native_filter_id or "": {
-                    "id": native_filter_id or "",
-                    "extraFormData": {
-                        "time_grain_sqla": values[0],  # grain
-                    },
-                    "filterState": {
-                        # "label": "30 second", # grain_label
-                        "value": values  # grain
-                    },
-                    "ownState": {},
-                }
-            }
+            return (
+                {
+                    native_filter_id or "": {
+                        "id": native_filter_id or "",
+                        "extraFormData": {"time_range": values[0]},
+                        "filterState": {"value": values[0]},
+                        "ownState": {},
+                    }
+                },
+                None,
+            )
+        if filter_type == "filter_timegrain":
+            return (
+                {
+                    native_filter_id or "": {
+                        "id": native_filter_id or "",
+                        "extraFormData": {
+                            "time_grain_sqla": values[0],  # grain
+                        },
+                        "filterState": {
+                            # "label": "30 second", # grain_label
+                            "value": values  # grain
+                        },
+                        "ownState": {},
+                    }
+                },
+                None,
+            )
 
-        elif filter_type == "filter_timecolumn":
-            return {
-                native_filter_id or "": {
-                    "extraFormData": {
-                        "granularity_sqla": values[0]  # column_name
-                    },
-                    "filterState": {
-                        "value": values  # column_name
-                    },
-                }
-            }
+        if filter_type == "filter_timecolumn":
+            return (
+                {
+                    native_filter_id or "": {
+                        "extraFormData": {
+                            "granularity_sqla": values[0]  # column_name
+                        },
+                        "filterState": {
+                            "value": values  # column_name
+                        },
+                    }
+                },
+                None,
+            )
 
-        elif filter_type == "filter_select":
-            return {
-                native_filter_id or "": {
-                    "id": native_filter_id or "",
-                    "extraFormData": {
-                        "filters": [
-                            {"col": column_name or "", "op": "IN", "val": values or []}
-                        ]
-                    },
-                    "filterState": {
-                        "label": column_name or "",
-                        "validateStatus": False,
-                        "value": values or [],
-                    },
-                    "ownState": {},
-                }
-            }
-        elif filter_type == "filter_range":
+        if filter_type == "filter_select":
+            return (
+                {
+                    native_filter_id or "": {
+                        "id": native_filter_id or "",
+                        "extraFormData": {
+                            "filters": [
+                                {
+                                    "col": column_name or "",
+                                    "op": "IN",
+                                    "val": values or [],
+                                }
+                            ]
+                        },
+                        "filterState": {
+                            "label": column_name or "",
+                            "validateStatus": False,
+                            "value": values or [],
+                        },
+                        "ownState": {},
+                    }
+                },
+                None,
+            )
+        if filter_type == "filter_range":
             # For range filters, values should be [min, max] or [value] for single value
             min_val = values[0] if len(values) > 0 else None
             max_val = values[1] if len(values) > 1 else None
@@ -278,25 +340,33 @@ class ReportSchedule(AuditMixinNullable, ExtraJSONMixin, Model):
             if max_val is not None:
                 filters.append({"col": column_name or "", "op": "<=", "val": max_val})
 
-            return {
-                native_filter_id or "": {
-                    "id": native_filter_id or "",
-                    "extraFormData": {"filters": filters},
-                    "filterState": {
-                        "value": [min_val, max_val],
-                        "label": f"{min_val} ≤ x ≤ {max_val}"
-                        if min_val and max_val
-                        else f"x ≥ {min_val}"
-                        if min_val
-                        else f"x ≤ {max_val}"
-                        if max_val
-                        else "",
-                    },
-                    "ownState": {},
-                }
-            }
+            return (
+                {
+                    native_filter_id or "": {
+                        "id": native_filter_id or "",
+                        "extraFormData": {"filters": filters},
+                        "filterState": {
+                            "value": [min_val, max_val],
+                            "label": f"{min_val} ≤ x ≤ {max_val}"
+                            if min_val is not None and max_val is not None
+                            else f"x ≥ {min_val}"
+                            if min_val is not None
+                            else f"x ≤ {max_val}"
+                            if max_val is not None
+                            else "",
+                        },
+                        "ownState": {},
+                    }
+                },
+                None,
+            )
 
-        return {}
+        warning_msg = (
+            f"Skipping native filter with unrecognized filter type '{filter_type}' "
+            f"(filter_id: {native_filter_id})"
+        )
+        logger.warning(warning_msg)
+        return {}, warning_msg
 
 
 class ReportRecipients(Model, AuditMixinNullable):
diff --git a/superset/reports/schemas.py b/superset/reports/schemas.py
index 055ebc75d24..81d58e537c2 100644
--- a/superset/reports/schemas.py
+++ b/superset/reports/schemas.py
@@ -14,6 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
+import re
 from typing import Any, Optional, Union
 
 from croniter import croniter
@@ -120,8 +121,10 @@ class ValidatorConfigJSONSchema(Schema):
     threshold = fields.Float()
 
 
+EMAIL_REGEX = re.compile(r"^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$")
+
+
 class ReportRecipientConfigJSONSchema(Schema):
-    # TODO if email check validity
     target = fields.String()
     ccTarget = fields.String()  # noqa: N815
     bccTarget = fields.String()  # noqa: N815
@@ -138,6 +141,34 @@ class ReportRecipientSchema(Schema):
     )
     recipient_config_json = fields.Nested(ReportRecipientConfigJSONSchema)
 
+    @validates_schema
+    def validate_email_recipients(self, data: dict[str, Any], **kwargs: Any) -> None:
+        if data.get("type") != ReportRecipientType.EMAIL.value:
+            return
+
+        config = data.get("recipient_config_json") or {}
+
+        def validate_addresses(field: str, value: str | None, required: bool) -> None:
+            if not value or not value.strip():
+                if required:
+                    raise ValidationError(
+                        {field: ["Email target is required for Email recipients"]}
+                    )
+                return
+            invalid = [
+                addr.strip()
+                for addr in re.split(r"[,;]", value)
+                if addr.strip() and not EMAIL_REGEX.match(addr.strip())
+            ]
+            if invalid:
+                raise ValidationError(
+                    {field: [f"Invalid email address(es): {', '.join(invalid)}"]}
+                )
+
+        validate_addresses("target", config.get("target"), required=True)
+        validate_addresses("ccTarget", config.get("ccTarget"), required=False)
+        validate_addresses("bccTarget", config.get("bccTarget"), required=False)
+
 
 class ReportSchedulePostSchema(Schema):
     type = fields.String(
@@ -199,7 +230,6 @@ class ReportSchedulePostSchema(Schema):
         metadata={"description": creation_method_description},
     )
     dashboard = fields.Integer(required=False, allow_none=True)
-    selected_tabs = fields.List(fields.Integer(), required=False, allow_none=True)
     database = fields.Integer(required=False)
     owners = fields.List(fields.Integer(metadata={"description": owners_description}))
     validator_type = fields.String(
diff --git a/superset/result_set.py b/superset/result_set.py
index ff65453aff1..13446d4c33e 100644
--- a/superset/result_set.py
+++ b/superset/result_set.py
@@ -99,6 +99,38 @@ def convert_to_string(value: Any) -> str:
     return str(value)
 
 
+def normalize_cursor_description_names(
+    cursor_description: DbapiDescription,
+) -> list[str]:
+    """
+    Replace empty cursor.description names with synthetic names that do not
+    collide with any explicit column names.
+    """
+    normalized_names: list[str] = []
+    unavailable_names = {
+        convert_to_string(col[0])
+        for col in cursor_description
+        if convert_to_string(col[0])
+    }
+    synthetic_index = 0
+
+    for col in cursor_description:
+        column_name = convert_to_string(col[0])
+        if column_name:
+            normalized_names.append(column_name)
+            continue
+
+        while True:
+            synthetic_name = f"_col_{synthetic_index}"
+            synthetic_index += 1
+            if synthetic_name not in unavailable_names:
+                unavailable_names.add(synthetic_name)
+                normalized_names.append(synthetic_name)
+                break
+
+    return normalized_names
+
+
 class SupersetResultSet:
     def __init__(  # pylint: disable=too-many-locals  # noqa: C901
         self,
@@ -116,9 +148,14 @@ class SupersetResultSet:
 
         if cursor_description:
             # get deduped list of column names
-            column_names = dedup(
-                [convert_to_string(col[0]) for col in cursor_description]
-            )
+            # Some databases (e.g. SQL Server) return an empty string as the
+            # column name for un-aliased expressions like SELECT COUNT(*).
+            # An empty field name is illegal in NumPy structured arrays and in
+            # PyArrow tables, so we substitute a synthetic name when needed.
+            # Synthetic names are chosen to avoid colliding with any explicit
+            # column names before deduplication runs.
+            # See https://github.com/apache/superset/issues/23848
+            column_names = dedup(normalize_cursor_description_names(cursor_description))
 
             # fix cursor descriptor with the deduped names
             deduped_cursor_desc = [
diff --git a/superset/security/manager.py b/superset/security/manager.py
index 32bc75e079e..2fbc5d7c4da 100644
--- a/superset/security/manager.py
+++ b/superset/security/manager.py
@@ -26,7 +26,7 @@ from typing import Any, Callable, cast, NamedTuple, Optional, TYPE_CHECKING
 from flask import current_app, Flask, g, Request
 from flask_appbuilder import Model
 from flask_appbuilder.models.filters import BaseFilter
-from flask_appbuilder.security.sqla.apis import RoleApi, UserApi
+from flask_appbuilder.security.sqla.apis import GroupApi, RoleApi, UserApi
 from flask_appbuilder.security.sqla.manager import SecurityManager
 from flask_appbuilder.security.sqla.models import (
     assoc_group_role,
@@ -121,9 +121,38 @@ _RLSCacheKey = tuple[str, int | str]
 _RLSCache = dict[_RLSCacheKey, list[SqlaQuery]]
 
 
+def _log_audit_event(action: str, payload: dict[str, Any]) -> None:
+    """Log an audit event via the configured event logger.
+
+    Delegates to the AbstractEventLogger interface so that every
+    configured implementation (DBEventLogger, S3EventLogger, etc.)
+    receives these security audit events.
+    """
+    from superset.extensions import (
+        event_logger,  # pylint: disable=import-outside-toplevel
+    )
+
+    user_id = get_user_id()
+    try:
+        event_logger.log(
+            user_id=user_id,
+            action=action,
+            dashboard_id=None,
+            duration_ms=None,
+            slice_id=None,
+            referrer=None,
+            curated_payload=None,
+            curated_form_data=None,
+            records=[payload],
+        )
+    except Exception:  # pylint: disable=broad-except
+        logger.warning("Failed to log audit event: %s", action, exc_info=True)
+
+
 class SupersetRoleApi(RoleApi):
     """
     Overriding the RoleApi to be able to delete roles with permissions
+    and to add audit logging for role CRUD operations.
     """
 
     def pre_delete(self, item: Model) -> None:
@@ -132,6 +161,15 @@ class SupersetRoleApi(RoleApi):
         """
         item.permissions = []
 
+    def post_add(self, item: Model) -> None:
+        _log_audit_event("RoleCreated", {"role_name": item.name, "role_id": item.id})
+
+    def post_update(self, item: Model) -> None:
+        _log_audit_event("RoleUpdated", {"role_name": item.name, "role_id": item.id})
+
+    def post_delete(self, item: Model) -> None:
+        _log_audit_event("RoleDeleted", {"role_name": item.name, "role_id": item.id})
+
 
 class ExcludeUsersFilter(BaseFilter):  # pylint: disable=too-few-public-methods
     """
@@ -159,6 +197,7 @@ class ExcludeUsersFilter(BaseFilter):  # pylint: disable=too-few-public-methods
 class SupersetUserApi(UserApi):
     """
     Overriding the UserApi to be able to delete users and filter excluded users
+    and to add audit logging for user CRUD operations.
     """
 
     base_filters = [["username", ExcludeUsersFilter, lambda: []]]
@@ -184,6 +223,51 @@ class SupersetUserApi(UserApi):
         """
         item.roles = []
 
+    def post_add(self, item: Model) -> None:
+        _log_audit_event(
+            "UserCreated",
+            {
+                "target_username": item.username,
+                "target_user_id": item.id,
+                "email": item.email,
+            },
+        )
+
+    def post_update(self, item: Model) -> None:
+        _log_audit_event(
+            "UserUpdated",
+            {
+                "target_username": item.username,
+                "target_user_id": item.id,
+                "email": item.email,
+                "active": item.active,
+            },
+        )
+
+    def post_delete(self, item: Model) -> None:
+        _log_audit_event(
+            "UserDeleted",
+            {
+                "target_username": item.username,
+                "target_user_id": item.id,
+            },
+        )
+
+
+class SupersetGroupApi(GroupApi):
+    """
+    Overriding the GroupApi to add audit logging for group CRUD operations.
+    """
+
+    def post_add(self, item: Model) -> None:
+        _log_audit_event("GroupCreated", {"group_name": item.name, "group_id": item.id})
+
+    def post_update(self, item: Model) -> None:
+        _log_audit_event("GroupUpdated", {"group_name": item.name, "group_id": item.id})
+
+    def post_delete(self, item: Model) -> None:
+        _log_audit_event("GroupDeleted", {"group_name": item.name, "group_id": item.id})
+
 
 # Limiting routes on FAB model views
 PermissionViewModelView.include_route_methods = {RouteMethod.LIST}
@@ -259,10 +343,15 @@ class SupersetSecurityManager(  # pylint: disable=too-many-public-methods
     SecurityManager
 ):
     userstatschartview = None
+    register_superset_auth_view = True
+    """Set to False in subclasses that provide their own auth view."""
+    register_superset_registeruser_view = True
+    """Set to False in subclasses that provide their own register user view."""
     READ_ONLY_MODEL_VIEWS = {"Database", "DynamicPlugin"}
 
     role_api = SupersetRoleApi
     user_api = SupersetUserApi
+    group_api = SupersetGroupApi
 
     USER_MODEL_VIEWS = {
         "RegisterUserModelView",
@@ -272,6 +361,7 @@ class SupersetSecurityManager(  # pylint: disable=too-many-public-methods
         "UserOAuthModelView",
         "UserOIDModelView",
         "UserRemoteUserModelView",
+        "UserSAMLModelView",
     }
 
     GAMMA_READ_ONLY_MODEL_VIEWS = {
@@ -480,6 +570,27 @@ class SupersetSecurityManager(  # pylint: disable=too-many-public-methods
         lm.request_loader(self.request_loader)
         return lm
 
+    def on_user_login(self, user: Any) -> None:
+        _log_audit_event(
+            "UserLoggedIn",
+            {"username": user.username, "user_id": user.id},
+        )
+
+    def on_user_login_failed(self, user: Any) -> None:
+        _log_audit_event(
+            "UserLoginFailed",
+            {"username": user.username, "user_id": user.id},
+        )
+
+    def on_user_logout(self, user: Any) -> None:
+        _log_audit_event(
+            "UserLoggedOut",
+            {
+                "username": getattr(user, "username", None),
+                "user_id": getattr(user, "id", None),
+            },
+        )
+
     def request_loader(self, request: Request) -> Optional[User]:
         # pylint: disable=import-outside-toplevel
         from superset.extensions import feature_flag_manager
@@ -721,27 +832,36 @@ class SupersetSecurityManager(  # pylint: disable=too-many-public-methods
         except (json.JSONDecodeError, TypeError):
             return False
 
-    def has_drill_by_access(
+    def has_drill_access(
         self,
         form_data: dict[str, Any],
         dashboard: "Dashboard",
         datasource: "BaseDatasource | Explorable",
     ) -> bool:
         """
-        Return True if the form_data is performing a supported drill by operation,
-        False otherwise.
+        Return True if the form_data is performing a supported drill operation
+        (Drill to Detail or Drill By), False otherwise.
 
         :param form_data: The form_data included in the request.
         :param dashboard: The dashboard the user is drilling from.
         :param datasource: The datasource being queried
-        :returns: Whether the user has drill by access.
+        :returns: Whether the user has drill access.
         """
 
         from superset.models.slice import Slice
 
+        # Drill to Detail: no slice/chart context, dataset must belong to the dashboard
+        if (
+            form_data.get("slice_id") is None
+            and form_data.get("chart_id") is None
+            and datasource in dashboard.datasources
+        ):
+            return True
+
+        # Drill By: slice_id is 0 (sentinel), chart_id identifies the source chart,
+        # and the requested groupby columns must be drillable
         return bool(
-            form_data.get("type") != "NATIVE_FILTER"
-            and form_data.get("slice_id") == 0
+            form_data.get("slice_id") == 0
             and (chart_id := form_data.get("chart_id"))
             and (
                 slc := self.session.query(Slice)
@@ -2626,40 +2746,51 @@ class SupersetSecurityManager(  # pylint: disable=too-many-public-methods
                             )
                         )
                         or (
-                            # Chart.
                             form_data.get("type") != "NATIVE_FILTER"
-                            and (slice_id := form_data.get("slice_id"))
                             and (
-                                # Direct chart access (no parent)
                                 (
-                                    form_data.get("parent_slice_id") is None
+                                    # Chart.
+                                    (slice_id := form_data.get("slice_id"))
                                     and (
-                                        slc := self.session.query(Slice)
-                                        .filter(Slice.id == slice_id)
-                                        .one_or_none()
+                                        # Direct chart access (no parent)
+                                        (
+                                            form_data.get("parent_slice_id") is None
+                                            and (
+                                                slc := self.session.query(Slice)
+                                                .filter(Slice.id == slice_id)
+                                                .one_or_none()
+                                            )
+                                            and slc in dashboard_.slices
+                                            and slc.datasource == datasource
+                                        )
+                                        or
+                                        # Multi-layer chart child access (has parent)
+                                        (
+                                            (
+                                                parent_id := form_data.get(
+                                                    "parent_slice_id"
+                                                )
+                                            )
+                                            and (
+                                                parent_slc := self.session.query(Slice)
+                                                .filter(Slice.id == parent_id)
+                                                .one_or_none()
+                                            )
+                                            and parent_slc in dashboard_.slices
+                                            # Validate child is actually part of parent's config    # noqa: E501
+                                            and self._validate_child_in_parent_multilayer(  # noqa: E501
+                                                child_slice_id=slice_id,
+                                                parent_slice=parent_slc,
+                                            )
+                                        )
                                     )
-                                    and slc in dashboard_.slices
-                                    and slc.datasource == datasource
                                 )
-                                or
-                                # Multi-layer chart child access (has parent)
-                                (
-                                    (parent_id := form_data.get("parent_slice_id"))
-                                    and (
-                                        parent_slc := self.session.query(Slice)
-                                        .filter(Slice.id == parent_id)
-                                        .one_or_none()
-                                    )
-                                    and parent_slc in dashboard_.slices
-                                    # Validate child is actually part of parent's config
-                                    and self._validate_child_in_parent_multilayer(
-                                        child_slice_id=slice_id,
-                                        parent_slice=parent_slc,
-                                    )
+                                # D2D or Drill By
+                                or self.has_drill_access(
+                                    form_data, dashboard_, datasource
                                 )
                             )
                         )
-                        or self.has_drill_by_access(form_data, dashboard_, datasource)
                     )
                     and self.can_access_dashboard(dashboard_)
                 )
@@ -3167,10 +3298,12 @@ class SupersetSecurityManager(  # pylint: disable=too-many-public-methods
     def register_views(self) -> None:
         from superset.views.auth import SupersetAuthView, SupersetRegisterUserView
 
-        self.auth_view = self.appbuilder.add_view_no_menu(SupersetAuthView)
-        self.registeruser_view = self.appbuilder.add_view_no_menu(
-            SupersetRegisterUserView
-        )
+        if self.register_superset_auth_view:
+            self.auth_view = self.appbuilder.add_view_no_menu(SupersetAuthView)
+        if self.register_superset_registeruser_view:
+            self.registeruser_view = self.appbuilder.add_view_no_menu(
+                SupersetRegisterUserView
+            )
 
         # Apply rate limiting to auth view if enabled
         # This needs to be done after the view is added, otherwise the blueprint
diff --git a/superset/sql/dialects/__init__.py b/superset/sql/dialects/__init__.py
index 71c8958a80f..0334efb5f11 100644
--- a/superset/sql/dialects/__init__.py
+++ b/superset/sql/dialects/__init__.py
@@ -18,6 +18,7 @@
 from .db2 import DB2
 from .dremio import Dremio
 from .firebolt import Firebolt, FireboltOld
+from .opensearch import OpenSearch
 from .pinot import Pinot
 
-__all__ = ["DB2", "Dremio", "Firebolt", "FireboltOld", "Pinot"]
+__all__ = ["DB2", "Dremio", "Firebolt", "FireboltOld", "OpenSearch", "Pinot"]
diff --git a/superset/sql/dialects/firebolt.py b/superset/sql/dialects/firebolt.py
index d0a562dfa5e..f930da0e2d1 100644
--- a/superset/sql/dialects/firebolt.py
+++ b/superset/sql/dialects/firebolt.py
@@ -58,6 +58,8 @@ class Firebolt(Dialect):
         Custom generator for Firebolt.
         """
 
+        STAR_EXCEPT = "EXCLUDE"
+
         TYPE_MAPPING = {
             **generator.Generator.TYPE_MAPPING,
             exp.DataType.Type.VARBINARY: "BYTEA",
diff --git a/superset/sql/dialects/opensearch.py b/superset/sql/dialects/opensearch.py
new file mode 100644
index 00000000000..5cde7469b68
--- /dev/null
+++ b/superset/sql/dialects/opensearch.py
@@ -0,0 +1,34 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+"""
+OpenSearch SQL dialect.
+
+OpenSearch SQL is syntactically close to MySQL but accepts both backticks and
+double-quotes as identifier delimiters. Treating ``"`` as an identifier (rather
+than a string delimiter, as MySQL does) is what keeps mixed-case column names
+from being emitted as string literals after a SQLGlot round-trip.
+"""
+
+from __future__ import annotations
+
+from sqlglot.dialects.mysql import MySQL
+
+
+class OpenSearch(MySQL):
+    class Tokenizer(MySQL.Tokenizer):
+        IDENTIFIERS = ['"', "`"]
diff --git a/superset/sql/execution/executor.py b/superset/sql/execution/executor.py
index 87d9fa671c5..13e12fc1a47 100644
--- a/superset/sql/execution/executor.py
+++ b/superset/sql/execution/executor.py
@@ -69,6 +69,8 @@ from flask import current_app as app, g, has_app_context
 from superset import db
 from superset.errors import ErrorLevel, SupersetError, SupersetErrorType
 from superset.exceptions import (
+    OAuth2Error,
+    OAuth2RedirectError,
     SupersetSecurityException,
     SupersetTimeoutException,
 )
@@ -318,6 +320,10 @@ class SQLExecutor:
             )
         except SupersetSecurityException as ex:
             return self._create_error_result(QueryStatus.FAILED, str(ex), start_time)
+        except (OAuth2RedirectError, OAuth2Error):
+            # Let OAuth2 exceptions propagate so callers (MCP, API) can
+            # handle them with context-appropriate responses.
+            raise
         except Exception as ex:
             error_msg = self.database.db_engine_spec.extract_error_message(ex)
             return self._create_error_result(QueryStatus.FAILED, error_msg, start_time)
@@ -839,13 +845,22 @@ class SQLExecutor:
             or app.config.get("CACHE_DEFAULT_TIMEOUT", 300)
         )
 
-        # Serialize statement results for caching
+        # Serialize statement results for caching.
+        # Convert DataFrames to list-of-dicts so the cache backend
+        # does not need to pickle pandas objects (which can fail to
+        # deserialize correctly with some backends or pandas versions).
+        import pandas as pd
+
         cached_data = {
             "statements": [
                 {
                     "original_sql": stmt.original_sql,
                     "executed_sql": stmt.executed_sql,
-                    "data": stmt.data,
+                    "data": (
+                        stmt.data.to_dict(orient="records")
+                        if isinstance(stmt.data, pd.DataFrame)
+                        else stmt.data
+                    ),
                     "row_count": stmt.row_count,
                     "execution_time_ms": stmt.execution_time_ms,
                 }
diff --git a/superset/sql/parse.py b/superset/sql/parse.py
index 314ddb40dd7..6f07c15c164 100644
--- a/superset/sql/parse.py
+++ b/superset/sql/parse.py
@@ -45,7 +45,7 @@ from sqlglot.optimizer.scope import (
 )
 
 from superset.exceptions import QueryClauseValidationException, SupersetParseError
-from superset.sql.dialects import DB2, Dremio, Firebolt, Pinot
+from superset.sql.dialects import DB2, Dremio, Firebolt, OpenSearch, Pinot
 
 if TYPE_CHECKING:
     from superset.models.core import Database
@@ -93,7 +93,7 @@ SQLGLOT_DIALECTS = {
     "netezza": Dialects.POSTGRES,
     "oceanbase": Dialects.MYSQL,
     # "ocient": ???
-    # "odelasticsearch": ???
+    "odelasticsearch": OpenSearch,
     "oracle": Dialects.ORACLE,
     "parseable": Dialects.POSTGRES,
     "pinot": Pinot,
@@ -1557,7 +1557,7 @@ def sanitize_clause(clause: str, engine: str) -> str:
         return Dialect.get_or_raise(dialect).generate(
             statement._parsed,  # pylint: disable=protected-access
             copy=True,
-            comments=False,
+            comments=True,
             pretty=False,
         )
     except SupersetParseError as ex:
diff --git a/superset/sql_validators/__init__.py b/superset/sql_validators/__init__.py
index 0298cf32edb..2bc1170a934 100644
--- a/superset/sql_validators/__init__.py
+++ b/superset/sql_validators/__init__.py
@@ -16,7 +16,7 @@
 # under the License.
 from typing import Optional
 
-from . import base, postgres, presto_db
+from . import base, postgres, presto_db, sqlite
 from .base import SQLValidationAnnotation  # noqa: F401
 
 
@@ -24,4 +24,5 @@ def get_validator_by_name(name: str) -> Optional[type[base.BaseSQLValidator]]:
     return {
         "PrestoDBSQLValidator": presto_db.PrestoDBSQLValidator,
         "PostgreSQLValidator": postgres.PostgreSQLValidator,
+        "SQLiteSQLValidator": sqlite.SQLiteSQLValidator,
     }.get(name)
diff --git a/superset/sql_validators/sqlite.py b/superset/sql_validators/sqlite.py
new file mode 100644
index 00000000000..074918dccfb
--- /dev/null
+++ b/superset/sql_validators/sqlite.py
@@ -0,0 +1,142 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+from __future__ import annotations
+
+import logging
+import re
+import subprocess
+
+from superset.models.core import Database
+from superset.sql_validators.base import BaseSQLValidator, SQLValidationAnnotation
+
+try:
+    from syntaqlite import get_binary_path
+except ModuleNotFoundError:
+    get_binary_path = None
+
+logger = logging.getLogger(__name__)
+
+DIAGNOSTIC_RE = re.compile(
+    r"^(?:error|warning): (.+)\n"
+    r" --> .+?:(\d+):(\d+)\n"
+    r" +\|\n"
+    r"\d+ \| .+\n"
+    r" +\| +\^(~*)",
+    re.MULTILINE,
+)
+
+
+class SQLiteSQLValidator(BaseSQLValidator):  # pylint: disable=too-few-public-methods
+    """Validate SQL queries using the syntaqlite binary"""
+
+    name = "SQLiteSQLValidator"
+
+    @classmethod
+    def validate(
+        cls,
+        sql: str,
+        catalog: str | None,
+        schema: str | None,
+        database: Database,
+    ) -> list[SQLValidationAnnotation]:
+        annotations: list[SQLValidationAnnotation] = []
+
+        if get_binary_path is None:
+            return [
+                SQLValidationAnnotation(
+                    message=(
+                        "syntaqlite is not installed. Install it with: "
+                        'pip install "apache-superset[sqlite]"'
+                    ),
+                    line_number=None,
+                    start_column=None,
+                    end_column=None,
+                )
+            ]
+
+        try:
+            result = subprocess.run(  # noqa: S603
+                [
+                    get_binary_path(),
+                    "--no-config",
+                    "validate",
+                    "--allow",
+                    "schema",
+                ],
+                input=sql,
+                capture_output=True,
+                text=True,
+                timeout=10,
+            )
+        except FileNotFoundError:
+            logger.warning("syntaqlite binary not found")
+            return [
+                SQLValidationAnnotation(
+                    message=(
+                        "syntaqlite binary not found. Ensure it is correctly installed "
+                        'via "pip install \\"apache-superset[sqlite]\\"" and available '
+                        "on the system PATH."
+                    ),
+                    line_number=None,
+                    start_column=None,
+                    end_column=None,
+                )
+            ]
+        except subprocess.TimeoutExpired:
+            logger.warning("syntaqlite timed out validating SQL")
+            return [
+                SQLValidationAnnotation(
+                    message="SQL validation timed out — the query may be too complex.",
+                    line_number=None,
+                    start_column=None,
+                    end_column=None,
+                )
+            ]
+
+        if result.returncode == 0:
+            return annotations
+
+        output = (result.stderr or result.stdout).replace("\r\n", "\n")
+        for match in DIAGNOSTIC_RE.finditer(output):
+            message = match.group(1)
+            line_number = int(match.group(2))
+            start_column = int(match.group(3))
+            # The caret (^) plus tildes (~) span the error token
+            end_column = start_column + 1 + len(match.group(4))
+
+            annotations.append(
+                SQLValidationAnnotation(
+                    message=message,
+                    line_number=line_number,
+                    start_column=start_column,
+                    end_column=end_column,
+                )
+            )
+
+        # If we couldn't parse the output but got a non-zero exit, add a generic error
+        if not annotations and result.returncode != 0:
+            annotations.append(
+                SQLValidationAnnotation(
+                    message=output.strip() or "SQL syntax validation failed",
+                    line_number=None,
+                    start_column=None,
+                    end_column=None,
+                )
+            )
+
+        return annotations
diff --git a/superset/sqllab/api.py b/superset/sqllab/api.py
index f81031a601c..c94b26bed17 100644
--- a/superset/sqllab/api.py
+++ b/superset/sqllab/api.py
@@ -37,7 +37,7 @@ from superset.commands.sql_lab.streaming_export_command import (
 from superset.constants import MODEL_API_RW_METHOD_PERMISSION_MAP
 from superset.daos.database import DatabaseDAO
 from superset.daos.query import QueryDAO
-from superset.extensions import event_logger
+from superset.extensions import event_logger, security_manager
 from superset.jinja_context import get_template_processor
 from superset.models.sql_lab import Query
 from superset.sql.parse import SQLScript
@@ -149,8 +149,9 @@ class SqlLabRestApi(BaseSupersetApi):
     @statsd_metrics
     @requires_json
     @event_logger.log_this_with_context(
-        action=lambda self, *args, **kwargs: f"{self.__class__.__name__}"
-        f".estimate_query_cost",
+        action=lambda self, *args, **kwargs: (
+            f"{self.__class__.__name__}.estimate_query_cost"
+        ),
         log_to_statsd=False,
     )
     def estimate_query_cost(self) -> Response:
@@ -237,31 +238,36 @@ class SqlLabRestApi(BaseSupersetApi):
             sql = model["sql"]
             template_params = model.get("template_params")
             database_id = model.get("database_id")
+            database_engine = None
 
-            # Process Jinja templates if template_params and database_id are provided
-            if template_params and database_id is not None:
+            # Process Jinja templates if template_params are provided
+            if database_id is not None:
                 database = DatabaseDAO.find_by_id(database_id)
-                if database:
-                    try:
-                        template_params = (
-                            json.loads(template_params)
-                            if isinstance(template_params, str)
-                            else template_params
-                        )
-                        if template_params:
-                            template_processor = get_template_processor(
-                                database=database
-                            )
-                            sql = template_processor.process_template(
-                                sql, **template_params
-                            )
-                    except json.JSONDecodeError:
-                        logger.warning(
-                            "Invalid template parameter %s. Skipping processing",
-                            str(template_params),
-                        )
 
-            result = SQLScript(sql, model.get("engine")).format()
+                if database:
+                    database_engine = database.db_engine_spec.engine
+
+                    if template_params:
+                        try:
+                            template_params = (
+                                json.loads(template_params)
+                                if isinstance(template_params, str)
+                                else template_params
+                            )
+                            if template_params:
+                                template_processor = get_template_processor(
+                                    database=database
+                                )
+                                sql = template_processor.process_template(
+                                    sql, **template_params
+                                )
+                        except json.JSONDecodeError:
+                            logger.warning(
+                                "Invalid template parameter %s. Skipping processing",
+                                str(template_params),
+                            )
+
+            result = SQLScript(sql, model.get("engine", database_engine)).format()
             return self.response(200, result=result)
         except ValidationError as error:
             return self.response_400(message=error.messages)
@@ -302,6 +308,10 @@ class SqlLabRestApi(BaseSupersetApi):
             500:
               $ref: '#/components/responses/500'
         """
+        if is_feature_enabled(
+            "GRANULAR_EXPORT_CONTROLS"
+        ) and not security_manager.can_access("can_export_data", "Superset"):
+            return self.response_403()
         result = SqlResultExportCommand(client_id=client_id).run()
 
         query, data, row_count = result["query"], result["data"], result["count"]
@@ -331,9 +341,9 @@ class SqlLabRestApi(BaseSupersetApi):
     @permission_name("read")
     @statsd_metrics
     @event_logger.log_this_with_context(
-        action=lambda self,
-        *args,
-        **kwargs: f"{self.__class__.__name__}.export_streaming_csv",
+        action=lambda self, *args, **kwargs: (
+            f"{self.__class__.__name__}.export_streaming_csv"
+        ),
         log_to_statsd=False,
     )
     def export_streaming_csv(self) -> Response:
@@ -376,6 +386,10 @@ class SqlLabRestApi(BaseSupersetApi):
             500:
               $ref: '#/components/responses/500'
         """
+        if is_feature_enabled(
+            "GRANULAR_EXPORT_CONTROLS"
+        ) and not security_manager.can_access("can_export_data", "Superset"):
+            return self.response_403()
         # Extract parameters from form data
         client_id = request.form.get("client_id")
         filename = request.form.get("filename")
diff --git a/superset/translations/fr/LC_MESSAGES/messages.po b/superset/translations/fr/LC_MESSAGES/messages.po
index 9af7e3e5e84..32d09d04483 100644
--- a/superset/translations/fr/LC_MESSAGES/messages.po
+++ b/superset/translations/fr/LC_MESSAGES/messages.po
@@ -1245,7 +1245,7 @@ msgstr ""
 "dans les paramètres de fragment SQL du jeu de données virtuel."
 
 msgid "Aggregate"
-msgstr "Agrégger"
+msgstr "Agréger"
 
 msgid "Aggregate Mean"
 msgstr "Moyenne agrégée"
@@ -3232,7 +3232,6 @@ msgstr "Diagramme d'accord"
 msgid "Chosen non-numeric column"
 msgstr "Colonne non numérique choisie"
 
-#, fuzzy
 msgid "Circle"
 msgstr "Cercle"
 
@@ -3262,36 +3261,29 @@ msgstr "Clause"
 msgid "Clear"
 msgstr "Effacer"
 
-#, fuzzy
 msgid "Clear Sort"
 msgstr "Effacer le tri"
 
 msgid "Clear all"
 msgstr "Effacer tout"
 
-#, fuzzy
 msgid "Clear all data"
 msgstr "Effacer toutes les données"
 
-#, fuzzy
 msgid "Clear all filters"
-msgstr "reinitialiser tous les filtres"
+msgstr "Réinitialiser tous les filtres"
 
-#, fuzzy
 msgid "Clear default dark theme"
-msgstr "Horodatage par défaut"
+msgstr "Réinitialiser le thème sombre par défaut"
 
-#, fuzzy
 msgid "Clear default light theme"
-msgstr "Reinitialiser tous les filtres"
+msgstr "Réinitialiser le thème clair par défaut"
 
-#, fuzzy
 msgid "Clear form"
 msgstr "Effacer le formulaire"
 
-#, fuzzy
 msgid "Clear local theme"
-msgstr "Reinitialiser tous les filtres"
+msgstr "Réinitialiser le thème local"
 
 msgid "Clear the selection to revert to the system default theme"
 msgstr "Effacer la sélection pour revenir au thème par défaut du système"
@@ -4019,18 +4011,15 @@ msgstr ""
 "Créer un ensemble de données pour commencer à visualiser vos données sous"
 " forme de graphique ou aller à SQL Lab pour interroger vos données."
 
-#, fuzzy
 msgid "Create a new Tag"
-msgstr "créer un nouveau graphique"
+msgstr "Créer une nouvelle balise"
 
 msgid "Create a new chart"
 msgstr "Créer un nouveau graphique"
 
-#, fuzzy
 msgid "Create and explore dataset"
-msgstr "Créer un ensemble de données"
+msgstr "Créer et explorer un ensemble de données"
 
-#, fuzzy
 msgid "Create chart"
 msgstr "Créer un graphique"
 
@@ -4038,7 +4027,6 @@ msgstr "Créer un graphique"
 msgid "Create dataframe index"
 msgstr "Index des cadres de données"
 
-#, fuzzy
 msgid "Create dataset"
 msgstr "Créer un ensemble de données"
 
@@ -4060,14 +4048,12 @@ msgstr "Crée"
 msgid "Created by"
 msgstr "Créé par"
 
-#, fuzzy
 msgid "Created by me"
 msgstr "Créé par moi"
 
 msgid "Created on"
 msgstr "Créé le"
 
-#, fuzzy
 msgid "Creating SSH Tunnel failed for an unknown reason"
 msgstr "La création d'un tunnel SSH a échoué pour une raison inconnue"
 
@@ -6852,9 +6838,8 @@ msgstr ""
 "comparer plusieurs mesures sur l'ensemble des échantillons ou des lignes "
 "de données"
 
-#, fuzzy
 msgid "Folders"
-msgstr "Filtres"
+msgstr "Dossiers"
 
 msgid "Font size"
 msgstr "Taille de la police"
@@ -7173,9 +7158,8 @@ msgstr "Grille"
 msgid "Grid Size"
 msgstr "Taille de la grille"
 
-#, fuzzy
 msgid "Group"
-msgstr "Grouper par"
+msgstr "Grouper"
 
 msgid "Group By"
 msgstr "Grouper par"
@@ -7485,9 +7469,8 @@ msgstr "Importer des requêtes"
 msgid "Import saved query failed for an unknown reason."
 msgstr "L'import de la requête sauvegardée a échoué pour une raison inconnue."
 
-#, fuzzy
 msgid "Import themes"
-msgstr "Importer des requêtes"
+msgstr "Importer des thèmes"
 
 #, fuzzy
 msgid "In"
@@ -9180,9 +9163,8 @@ msgstr "Pas encore de règles"
 msgid "No SQL query found"
 msgstr "Requête SQL"
 
-#, fuzzy
 msgid "No Tags created"
-msgstr "a été créé"
+msgstr "Aucune balise créée"
 
 #, fuzzy
 msgid "No actions"
@@ -9593,9 +9575,8 @@ msgstr "Sélectionner les colonnes numériques pour dessiner l’histogramme"
 msgid "Numerical range"
 msgstr "Interval numérique"
 
-#, fuzzy
 msgid "OAuth2 client information"
-msgstr "Informations supplémentaires"
+msgstr "Informations client OAuth2"
 
 msgid "OCT"
 msgstr "OCT"
@@ -9603,9 +9584,8 @@ msgstr "OCT"
 msgid "OK"
 msgstr "OK"
 
-#, fuzzy
 msgid "OR"
-msgstr "ou"
+msgstr "OU"
 
 msgid "OVERWRITE"
 msgstr "REMPLACER"
@@ -9619,9 +9599,8 @@ msgstr "Hors ligne"
 msgid "On Grace"
 msgstr "Sur la grâce"
 
-#, fuzzy
 msgid "On dashboards"
-msgstr "tableaux de bord "
+msgstr "Sur tableaux de bords"
 
 msgid ""
 "One or many columns to group by. High cardinality groupings should "
@@ -11696,13 +11675,11 @@ msgstr "Rechercher les mesures et les colonnes"
 msgid "Search all charts"
 msgstr "Rechercher tous les graphiques"
 
-#, fuzzy
 msgid "Search all metrics & columns"
-msgstr "Rechercher les mesures et les colonnes"
+msgstr "Rechercher toutes les mesures et colonnes"
 
-#, fuzzy
 msgid "Search box"
-msgstr "Boîte de echerche"
+msgstr "Zone de recherche"
 
 msgid "Search by query text"
 msgstr "Recherche par texte d'interrogation"
@@ -12530,9 +12507,8 @@ msgstr "Afficher l'horodatage"
 msgid "Show column headers"
 msgstr "L'étiquette de l'en-tête de la colonne"
 
-#, fuzzy
 msgid "Show columns subtotal"
-msgstr "Pas de colonne"
+msgstr "Afficher le sous-total des colonnes"
 
 #, fuzzy
 msgid "Show columns total"
@@ -12609,9 +12585,8 @@ msgstr "Voir les détails de la requête"
 msgid "Show row labels"
 msgstr "Afficher les étiquettes"
 
-#, fuzzy
 msgid "Show rows subtotal"
-msgstr "Pas de colonne"
+msgstr "Afficher le sous-total des rangées"
 
 msgid "Show rows total"
 msgstr "Afficher le total des rangées"
@@ -14558,25 +14533,20 @@ msgstr "La largeur des lignes"
 msgid "The width of the lines"
 msgstr "La largeur des lignes"
 
-#, fuzzy
 msgid "Theme"
-msgstr "ici"
+msgstr "Thème"
 
-#, fuzzy
 msgid "Theme imported"
-msgstr "Données importées"
+msgstr "Thème importé"
 
-#, fuzzy
 msgid "Theme not found."
-msgstr "Modèle CSS non trouvé."
+msgstr "Thème non trouvé."
 
-#, fuzzy
 msgid "Themes"
-msgstr "Rues"
+msgstr "Thèmes"
 
-#, fuzzy
 msgid "Themes could not be deleted."
-msgstr "L'ensemble de données n'a pas pu être supprimé."
+msgstr "Les thèmes n'ont pas pu être supprimés."
 
 msgid "There are associated alerts or reports"
 msgstr "Il y a des alertes ou des rapports associés"
@@ -16176,19 +16146,16 @@ msgid "User registrations"
 msgstr "Imputation nulle"
 
 msgid "Username"
-msgstr "Username"
+msgstr "Nom d'utilisateur"
 
-#, fuzzy
 msgid "Username is required"
-msgstr "Le nom est obligatoire"
+msgstr "Le nom d'utilisateur est obligatoire"
 
-#, fuzzy
 msgid "Username:"
-msgstr "Username"
+msgstr "Nom d'utilisateur:"
 
-#, fuzzy
 msgid "Users"
-msgstr "série"
+msgstr "Utilisateurs"
 
 #, fuzzy
 msgid "Users are not allowed to set a search path for security reasons."
diff --git a/superset/translations/it/LC_MESSAGES/messages.po b/superset/translations/it/LC_MESSAGES/messages.po
index a5fd27fcc7a..3d0c375318e 100644
--- a/superset/translations/it/LC_MESSAGES/messages.po
+++ b/superset/translations/it/LC_MESSAGES/messages.po
@@ -5212,36 +5212,35 @@ msgid "Edit CSS template properties"
 msgstr "Template CSS"
 
 msgid "Edit Dashboard"
-msgstr ""
+msgstr "Modifica Dashboard"
 
 msgid "Edit Dataset "
-msgstr "Mostra database"
+msgstr "Modifica Dataset"
+
 
-#, fuzzy
 msgid "Edit Group"
-msgstr "Ricerca Query"
+msgstr "Modifica Gruppo"
 
 msgid "Edit Log"
-msgstr "Modifica"
+msgstr "Modifica Log"
 
 msgid "Edit Plugin"
-msgstr "Edita colonna"
+msgstr "Modifica Plugin"
+
 
-#, fuzzy
 msgid "Edit Role"
-msgstr "Ricerca Query"
+msgstr "Modifica Ruolo"
+
 
-#, fuzzy
 msgid "Edit Rule"
-msgstr "Ricerca Query"
+msgstr "Modifica Regola"
+
 
-#, fuzzy
 msgid "Edit Tag"
-msgstr "Modifica"
+msgstr "Modifica Tag"
 
-#, fuzzy
 msgid "Edit User"
-msgstr "Query vuota?"
+msgstr "Modifica Utente"
 
 #, fuzzy
 msgid "Edit alert"
diff --git a/superset/utils/log.py b/superset/utils/log.py
index 6685010b4d2..b0667bae68f 100644
--- a/superset/utils/log.py
+++ b/superset/utils/log.py
@@ -384,6 +384,13 @@ class DBEventLogger(AbstractEventLogger):
         from superset.models.core import Log
 
         records = kwargs.get("records", [])
+        curated_payload = kwargs.get("curated_payload")
+
+        # If no records but curated_payload exists, use it as a single record
+        # This enables MCP middleware logging which passes curated_payload
+        if not records and curated_payload:
+            records = [curated_payload]
+
         logs = []
         for record in records:
             json_string: str | None
@@ -412,7 +419,7 @@ class DBEventLogger(AbstractEventLogger):
             logging.exception(ex)
             # Rollback to clean up the session state
             try:
-                db.session.rollback()
+                db.session.rollback()  # pylint: disable=consider-using-transaction
             except Exception:  # pylint: disable=broad-except
                 # If rollback also fails, just continue - don't let issues crash the app
                 logging.error(
diff --git a/superset/utils/oauth2.py b/superset/utils/oauth2.py
index 4978c0af5c5..a2a2666e7c0 100644
--- a/superset/utils/oauth2.py
+++ b/superset/utils/oauth2.py
@@ -29,10 +29,11 @@ import backoff
 import jwt
 from flask import current_app as app, url_for
 from marshmallow import EXCLUDE, fields, post_load, Schema, validate
+from werkzeug.routing import BuildError
 
 from superset import db
 from superset.distributed_lock import DistributedLock
-from superset.exceptions import AcquireDistributedLockFailedException
+from superset.exceptions import AcquireDistributedLockFailedException, OAuth2Error
 from superset.superset_typing import OAuth2ClientConfig, OAuth2State
 
 if TYPE_CHECKING:
@@ -78,9 +79,11 @@ def generate_code_challenge(code_verifier: str) -> str:
 @backoff.on_exception(
     backoff.expo,
     AcquireDistributedLockFailedException,
-    factor=10,
+    factor=0.1,
     base=2,
-    max_tries=5,
+    max_tries=8,
+    raise_on_giveup=False,
+    giveup_log_level=logging.DEBUG,
 )
 def get_oauth2_access_token(
     config: OAuth2ClientConfig,
@@ -140,14 +143,17 @@ def refresh_oauth2_token(
                 config,
                 token.refresh_token,
             )
-        except db_engine_spec.oauth2_exception:
+        except db_engine_spec.oauth2_exception as ex:
             # OAuth token is no longer valid, delete it and start OAuth2 dance
             logger.warning(
-                "OAuth2 token refresh failed for user=%s db=%s, deleting invalid token",
+                "OAuth2 token refresh failed for user=%s db=%s, "
+                "deleting token. Error: %s",
                 user_id,
                 database_id,
+                ex,
             )
             db.session.delete(token)
+            db.session.flush()
             raise
         except Exception:
             # non-OAuth related failure, log the exception
@@ -245,16 +251,34 @@ def decode_oauth2_state(encoded_state: str) -> OAuth2State:
     return state
 
 
+def get_oauth2_redirect_uri() -> str:
+    """
+    Return the OAuth2 redirect URI.
+
+    Tries the explicit config first, then falls back to url_for().
+    If url_for() fails (e.g. in headless/MCP contexts where the
+    DatabaseRestApi blueprint may not be registered), raises
+    OAuth2Error so callers don't silently proceed with an invalid URI.
+    """
+    if configured := app.config.get("DATABASE_OAUTH2_REDIRECT_URI"):
+        return configured
+
+    try:
+        return url_for("DatabaseRestApi.oauth2", _external=True)
+    except (BuildError, RuntimeError):
+        raise OAuth2Error(
+            "Unable to determine the OAuth2 redirect URI. "
+            "Set DATABASE_OAUTH2_REDIRECT_URI in the configuration."
+        ) from None
+
+
 class OAuth2ClientConfigSchema(Schema):
     id = fields.String(required=True)
     secret = fields.String(required=True)
     scope = fields.String(required=True)
     redirect_uri = fields.String(
         required=False,
-        load_default=lambda: app.config.get(
-            "DATABASE_OAUTH2_REDIRECT_URI",
-            url_for("DatabaseRestApi.oauth2", _external=True),
-        ),
+        load_default=get_oauth2_redirect_uri,
     )
     authorization_request_uri = fields.String(required=True)
     token_request_uri = fields.String(required=True)
diff --git a/superset/utils/webdriver.py b/superset/utils/webdriver.py
index 416d3f0e5bf..f38c67fd64c 100644
--- a/superset/utils/webdriver.py
+++ b/superset/utils/webdriver.py
@@ -387,8 +387,7 @@ class WebDriverPlaywright(WebDriverProxy):
                     )
 
             except PlaywrightTimeout:
-                # raise again for the finally block, but handled above
-                pass
+                raise
             except PlaywrightError:
                 logger.exception(
                     "Encountered an unexpected error when requesting url %s", url
diff --git a/superset/views/base.py b/superset/views/base.py
index 4351ef01743..3f8b56e74bd 100644
--- a/superset/views/base.py
+++ b/superset/views/base.py
@@ -101,6 +101,7 @@ FRONTEND_CONF_KEYS = (
     "COLUMNAR_EXTENSIONS",
     "ALLOWED_EXTENSIONS",
     "SAMPLES_ROW_LIMIT",
+    "ROW_LIMIT",
     "DEFAULT_TIME_FILTER",
     "HTML_SANITIZATION",
     "HTML_SANITIZATION_SCHEMA_EXTENSIONS",
diff --git a/superset/views/datasource/schemas.py b/superset/views/datasource/schemas.py
index b3da2158123..dedab22731f 100644
--- a/superset/views/datasource/schemas.py
+++ b/superset/views/datasource/schemas.py
@@ -100,7 +100,7 @@ class SamplesRequestSchema(Schema):
     force = fields.Boolean(load_default=False)
     page = fields.Integer(load_default=1)
     per_page = fields.Integer(
-        validate=validate.Range(min=1, max=1000),
+        validate=validate.Range(min=1, max=10000),
         load_default=None,
     )
     dashboard_id = fields.Integer(required=False, allow_none=True, load_default=None)
diff --git a/superset/views/datasource/utils.py b/superset/views/datasource/utils.py
index 096b8482c59..deec4067a56 100644
--- a/superset/views/datasource/utils.py
+++ b/superset/views/datasource/utils.py
@@ -94,13 +94,15 @@ def get_samples(  # pylint: disable=too-many-arguments
     force: bool = False,
     page: int = 1,
     per_page: int = 1000,
-    payload: Optional[SamplesPayloadSchema] = None,
+    payload: SamplesPayloadSchema | None = None,
+    dashboard_id: int | None = None,
 ) -> dict[str, Any]:
     datasource = DatasourceDAO.get_datasource(
         datasource_type=datasource_type,
         database_id_or_uuid=str(datasource_id),
     )
 
+    form_data = {"dashboardId": dashboard_id} if dashboard_id else None
     limit_clause = get_limit_clause(page, per_page)
 
     # todo(yongjie): Constructing count(*) and samples in the same query_context,
@@ -112,6 +114,7 @@ def get_samples(  # pylint: disable=too-many-arguments
                 "id": datasource.id,
             },
             queries=[limit_clause],
+            form_data=form_data,
             result_type=ChartDataResultType.SAMPLES,
             force=force,
         )
@@ -128,6 +131,7 @@ def get_samples(  # pylint: disable=too-many-arguments
                 "id": datasource.id,
             },
             queries=[{**payload, **limit_clause}],
+            form_data=form_data,
             result_type=ChartDataResultType.DRILL_DETAIL,
             force=force,
         )
@@ -148,6 +152,7 @@ def get_samples(  # pylint: disable=too-many-arguments
             "id": datasource.id,
         },
         queries=[{**payload, **count_star_metric} if payload else count_star_metric],
+        form_data=form_data,
         result_type=ChartDataResultType.FULL,
         force=force,
     )
diff --git a/superset/views/datasource/views.py b/superset/views/datasource/views.py
index d0a4b6851c5..c7b130a4b9a 100644
--- a/superset/views/datasource/views.py
+++ b/superset/views/datasource/views.py
@@ -90,8 +90,7 @@ class Datasource(BaseSupersetView):
         )
         orm_datasource.database_id = database_id
 
-        if "owners" in datasource_dict and orm_datasource.owner_class is not None:
-            # Check ownership
+        if orm_datasource.owner_class is not None:
             try:
                 security_manager.raise_for_ownership(orm_datasource)
             except SupersetSecurityException as ex:
@@ -131,6 +130,7 @@ class Datasource(BaseSupersetView):
         datasource = DatasourceDAO.get_datasource(
             DatasourceType(datasource_type), datasource_id
         )
+        security_manager.raise_for_access(datasource=datasource)
         return self.json_response(sanitize_datasource_data(datasource.data))
 
     @expose("/external_metadata/<datasource_type>/<datasource_id>/")
@@ -145,6 +145,7 @@ class Datasource(BaseSupersetView):
             DatasourceType(datasource_type),
             datasource_id,
         )
+        security_manager.raise_for_access(datasource=datasource)
         try:
             external_metadata = datasource.external_metadata()
         except SupersetException as ex:
@@ -174,6 +175,7 @@ class Datasource(BaseSupersetView):
         try:
             if datasource is not None:
                 # Get columns from Superset metadata
+                security_manager.raise_for_access(datasource=datasource)
                 external_metadata = datasource.external_metadata()
             else:
                 # Use the SQLAlchemy inspector to get columns
@@ -182,9 +184,18 @@ class Datasource(BaseSupersetView):
                     .filter_by(database_name=params["database_name"])
                     .one()
                 )
+                table = Table(
+                    params["table_name"],
+                    params["schema_name"],
+                    params.get("catalog_name"),
+                )
+                security_manager.raise_for_access(
+                    database=database,
+                    table=table,
+                )
                 external_metadata = get_physical_table_metadata(
                     database=database,
-                    table=Table(params["table_name"], params["schema_name"]),
+                    table=table,
                     normalize_columns=params.get("normalize_columns") or False,
                 )
         except (NoResultFound, NoSuchTableError) as ex:
@@ -201,16 +212,15 @@ class Datasource(BaseSupersetView):
             payload = SamplesPayloadSchema().load(request.json)
         except ValidationError as err:
             return json_error_response(err.messages, status=400)
-
+        dashboard_id = None
         if security_manager.is_guest_user():
             if not params["dashboard_id"]:
                 return json_error_response(_("Forbidden"), status=403)
+            dashboard_id = params["dashboard_id"]
             dataset = DatasetDAO.find_by_id(
                 params["datasource_id"], skip_base_filter=True
             )
-            dashboard = DashboardDAO.find_by_id(
-                params["dashboard_id"], skip_base_filter=True
-            )
+            dashboard = DashboardDAO.find_by_id(dashboard_id, skip_base_filter=True)
             if not (dashboard and dataset):
                 return self.response_404()
             if not security_manager.can_drill_dataset_via_dashboard_access(
@@ -226,6 +236,7 @@ class Datasource(BaseSupersetView):
             page=params["page"],
             per_page=params["per_page"],
             payload=payload,
+            dashboard_id=dashboard_id,
         )
         return self.json_response({"result": rv})
 
diff --git a/superset/views/utils.py b/superset/views/utils.py
index 56f0a567cf9..8d8f1170285 100644
--- a/superset/views/utils.py
+++ b/superset/views/utils.py
@@ -133,6 +133,7 @@ def bootstrap_user_data(user: User, include_perms: bool = False) -> dict[str, An
         roles, permissions = get_permissions(user)
         payload["roles"] = roles
         payload["permissions"] = permissions
+        payload["groups"] = [group.name for group in getattr(user, "groups", [])]
 
     return payload
 
diff --git a/superset/viz.py b/superset/viz.py
index 9bde6d38254..ab5f3f03458 100644
--- a/superset/viz.py
+++ b/superset/viz.py
@@ -1521,6 +1521,29 @@ class MapboxViz(BaseViz):
         }
 
 
+class MapLibreViz(MapboxViz):
+    """Rich maps made with MapLibre"""
+
+    viz_type = "point_cluster_map"
+    verbose_name = _("Point Cluster Map")
+    credits = '<a href="https://maplibre.org/">MapLibre GL JS</a>'
+
+    @deprecated(deprecated_in="3.0")
+    def query_obj(self) -> QueryObjectDict:
+        self.form_data["mapbox_label"] = self.form_data.get("map_label")
+        return super().query_obj()
+
+    @deprecated(deprecated_in="3.0")
+    def get_data(self, df: pd.DataFrame) -> VizData:
+        self.form_data["mapbox_label"] = self.form_data.get("map_label")
+        self.form_data["mapbox_style"] = self.form_data.get("map_style")
+        self.form_data["mapbox_color"] = self.form_data.get("map_color")
+        data = super().get_data(df)
+        if data:
+            data.pop("mapboxApiKey", None)
+        return data
+
+
 class DeckGLMultiLayer(BaseViz):
     """Pile on multiple DeckGL layers"""
 
diff --git a/tests/integration_tests/charts/data/api_tests.py b/tests/integration_tests/charts/data/api_tests.py
index a4c1b95c9e6..d22b920e2d2 100644
--- a/tests/integration_tests/charts/data/api_tests.py
+++ b/tests/integration_tests/charts/data/api_tests.py
@@ -1810,3 +1810,218 @@ def test_chart_data_subquery_allowed(
     rv = test_client.post(CHART_DATA_URI, json=physical_query_context)
 
     assert rv.status_code == status_code
+
+
+@pytest.mark.chart_data_flow
+class TestGetChartDataWithDashboardFilter(BaseTestChartDataApi):
+    """Tests for the filters_dashboard_id parameter on GET /api/v1/chart/<pk>/data/."""
+
+    def _setup_chart_with_query_context(self) -> Slice:
+        chart = db.session.query(Slice).filter_by(slice_name="Genders").one()
+        chart.query_context = json.dumps(
+            {
+                "datasource": {"id": chart.table.id, "type": "table"},
+                "force": False,
+                "queries": [
+                    {
+                        "time_range": "1900-01-01T00:00:00 : 2000-01-01T00:00:00",
+                        "granularity": "ds",
+                        "filters": [],
+                        "extras": {"having": "", "where": ""},
+                        "applied_time_extras": {},
+                        "columns": ["gender"],
+                        "metrics": ["sum__num"],
+                        "orderby": [["sum__num", False]],
+                        "annotation_layers": [],
+                        "row_limit": 50000,
+                        "timeseries_limit": 0,
+                        "order_desc": True,
+                        "url_params": {},
+                        "custom_params": {},
+                        "custom_form_data": {},
+                    }
+                ],
+                "result_format": "json",
+                "result_type": "full",
+            }
+        )
+        return chart
+
+    @pytest.mark.usefixtures("load_birth_names_dashboard_with_slices")
+    @mock.patch("superset.charts.data.api.get_dashboard_filter_context")
+    def test_get_data_with_dashboard_filter_context(self, mock_get_filter_ctx):
+        """
+        Chart data API: Test GET with filters_dashboard_id returns
+        dashboard_filters metadata in the response.
+        """
+        from superset.charts.data.dashboard_filter_context import (
+            DashboardFilterContext,
+            DashboardFilterInfo,
+            DashboardFilterStatus,
+        )
+
+        chart = self._setup_chart_with_query_context()
+        mock_get_filter_ctx.return_value = DashboardFilterContext(
+            extra_form_data={},
+            filters=[
+                DashboardFilterInfo(
+                    id="f1",
+                    name="Region",
+                    status=DashboardFilterStatus.APPLIED,
+                    column="region",
+                ),
+                DashboardFilterInfo(
+                    id="f2",
+                    name="City",
+                    status=DashboardFilterStatus.NOT_APPLIED,
+                    column="city",
+                ),
+            ],
+        )
+
+        rv = self.get_assert_metric(
+            f"api/v1/chart/{chart.id}/data/?filters_dashboard_id=1", "get_data"
+        )
+        data = json.loads(rv.data.decode("utf-8"))
+
+        assert rv.status_code == 200
+        assert "dashboard_filters" in data
+        assert len(data["dashboard_filters"]["filters"]) == 2
+        assert data["dashboard_filters"]["filters"][0]["status"] == "applied"
+        assert data["dashboard_filters"]["filters"][1]["status"] == "not_applied"
+
+    @pytest.mark.usefixtures("load_birth_names_dashboard_with_slices")
+    @mock.patch("superset.charts.data.api.get_dashboard_filter_context")
+    def test_get_data_with_dashboard_filter_applies_filters_to_query(
+        self, mock_get_filter_ctx
+    ):
+        """
+        Chart data API: Test GET with filters_dashboard_id merges
+        extra_form_data filters into the query so they appear in the
+        compiled SQL.
+        """
+        from superset.charts.data.dashboard_filter_context import (
+            DashboardFilterContext,
+            DashboardFilterInfo,
+            DashboardFilterStatus,
+        )
+
+        chart = self._setup_chart_with_query_context()
+        mock_get_filter_ctx.return_value = DashboardFilterContext(
+            extra_form_data={
+                "filters": [{"col": "gender", "op": "IN", "val": ["boy"]}],
+            },
+            filters=[
+                DashboardFilterInfo(
+                    id="f1",
+                    name="Gender",
+                    status=DashboardFilterStatus.APPLIED,
+                    column="gender",
+                ),
+            ],
+        )
+
+        rv = self.get_assert_metric(
+            f"api/v1/chart/{chart.id}/data/?filters_dashboard_id=1&type=query",
+            "get_data",
+        )
+        data = json.loads(rv.data.decode("utf-8"))
+
+        assert rv.status_code == 200
+        assert "dashboard_filters" in data
+        assert data["dashboard_filters"]["filters"][0]["status"] == "applied"
+
+        query_sql = data["result"][0]["query"]
+        assert "gender" in query_sql.lower()
+        assert "boy" in query_sql.lower()
+
+    @pytest.mark.usefixtures("load_birth_names_dashboard_with_slices")
+    @mock.patch("superset.charts.data.api.get_dashboard_filter_context")
+    def test_get_data_without_dashboard_filter_has_no_metadata(
+        self, mock_get_filter_ctx
+    ):
+        """
+        Chart data API: Test GET without filters_dashboard_id does not
+        include dashboard_filters in the response.
+        """
+        chart = self._setup_chart_with_query_context()
+
+        rv = self.get_assert_metric(f"api/v1/chart/{chart.id}/data/", "get_data")
+        data = json.loads(rv.data.decode("utf-8"))
+
+        assert rv.status_code == 200
+        assert "dashboard_filters" not in data
+        mock_get_filter_ctx.assert_not_called()
+
+    @pytest.mark.usefixtures("load_birth_names_dashboard_with_slices")
+    def test_get_data_invalid_filters_dashboard_id_returns_400(self):
+        """
+        Chart data API: Test GET with non-integer filters_dashboard_id returns 400.
+        Invalid values (e.g. 'abc', '1.5', empty) are not silently ignored.
+        """
+        chart = self._setup_chart_with_query_context()
+
+        rv = self.get_assert_metric(
+            f"api/v1/chart/{chart.id}/data/?filters_dashboard_id=abc", "get_data"
+        )
+        data = json.loads(rv.data.decode("utf-8"))
+
+        assert rv.status_code == 400
+        assert "filters_dashboard_id" in data["message"].lower()
+        assert "integer" in data["message"].lower()
+
+    @pytest.mark.usefixtures("load_birth_names_dashboard_with_slices")
+    @mock.patch("superset.charts.data.api.get_dashboard_filter_context")
+    def test_get_data_dashboard_not_found_returns_400(self, mock_get_filter_ctx):
+        """
+        Chart data API: Test GET with invalid dashboard ID returns 400.
+        """
+        chart = self._setup_chart_with_query_context()
+        mock_get_filter_ctx.side_effect = ValueError("Dashboard 999 not found")
+
+        rv = self.get_assert_metric(
+            f"api/v1/chart/{chart.id}/data/?filters_dashboard_id=999", "get_data"
+        )
+
+        assert rv.status_code == 400
+
+    @pytest.mark.usefixtures("load_birth_names_dashboard_with_slices")
+    @mock.patch("superset.charts.data.api.get_dashboard_filter_context")
+    def test_get_data_dashboard_access_denied_returns_403(self, mock_get_filter_ctx):
+        """
+        Chart data API: Test GET with inaccessible dashboard returns 403.
+        """
+        from superset.errors import SupersetError, SupersetErrorType
+        from superset.exceptions import SupersetSecurityException
+
+        chart = self._setup_chart_with_query_context()
+        mock_get_filter_ctx.side_effect = SupersetSecurityException(
+            SupersetError(
+                error_type=SupersetErrorType.DASHBOARD_SECURITY_ACCESS_ERROR,
+                message="Access denied",
+                level="warning",
+            )
+        )
+
+        rv = self.get_assert_metric(
+            f"api/v1/chart/{chart.id}/data/?filters_dashboard_id=1", "get_data"
+        )
+
+        assert rv.status_code == 403
+
+    @pytest.mark.usefixtures("load_birth_names_dashboard_with_slices")
+    @mock.patch("superset.charts.data.api.get_dashboard_filter_context")
+    def test_get_data_chart_not_on_dashboard_returns_400(self, mock_get_filter_ctx):
+        """
+        Chart data API: Test GET where chart is not on the dashboard returns 400.
+        """
+        chart = self._setup_chart_with_query_context()
+        mock_get_filter_ctx.side_effect = ValueError("Chart 10 is not on dashboard 42")
+
+        rv = self.get_assert_metric(
+            f"api/v1/chart/{chart.id}/data/?filters_dashboard_id=42", "get_data"
+        )
+
+        assert rv.status_code == 400
+        data = json.loads(rv.data.decode("utf-8"))
+        assert "not on dashboard" in data["message"]
diff --git a/tests/integration_tests/datasets/api_tests.py b/tests/integration_tests/datasets/api_tests.py
index c0692fe9741..d250b34958f 100644
--- a/tests/integration_tests/datasets/api_tests.py
+++ b/tests/integration_tests/datasets/api_tests.py
@@ -861,6 +861,29 @@ class TestDatasetApi(SupersetTestCase):
         assert alpha in model.owners
         self.items_to_delete = [model]
 
+    @pytest.mark.usefixtures("load_energy_table_with_slice")
+    def test_create_dataset_with_currency_code_column(self):
+        """
+        Dataset API: Test create dataset persists currency_code_column
+        """
+
+        energy_usage_ds = self.get_energy_usage_dataset()
+        self.login(ALPHA_USERNAME)
+        table_data = {
+            "database": energy_usage_ds.database_id,
+            "table_name": "energy_usage_virtual_currency_column",
+            "sql": "select * from energy_usage",
+            "currency_code_column": "currency",
+        }
+        if schema := get_example_default_schema():
+            table_data["schema"] = schema
+        rv = self.post_assert_metric("/api/v1/dataset/", table_data, "post")
+        assert rv.status_code == 201
+        data = json.loads(rv.data.decode("utf-8"))
+        model = db.session.query(SqlaTable).get(data.get("id"))
+        assert model.currency_code_column == "currency"
+        self.items_to_delete = [model]
+
     @unittest.skip("test is failing stochastically")
     def test_create_dataset_same_name_different_schema(self):
         if backend() == "sqlite":
diff --git a/tests/integration_tests/datasource_tests.py b/tests/integration_tests/datasource_tests.py
index 319b8573720..0129ba4b2fc 100644
--- a/tests/integration_tests/datasource_tests.py
+++ b/tests/integration_tests/datasource_tests.py
@@ -24,7 +24,7 @@ import prison
 import pytest
 from flask import current_app
 
-from superset import db
+from superset import db, security_manager as sm
 from superset.commands.dataset.exceptions import DatasetNotFoundError
 from superset.common.utils.query_cache_manager import QueryCacheManager
 from superset.connectors.sqla.models import (  # noqa: F401
@@ -531,17 +531,26 @@ class TestDatasource(SupersetTestCase):
         self, mock_has_guest_access, mock_is_guest_user, mock_rls
     ):
         """
-        Embedded user can access the /samples view.
+        Embedded guest user can access /samples (for D2D) via the dashboard context
+        passed as form_data to QueryContextFactory.
         """
-        self.login(ADMIN_USERNAME)
+        # Gamma role doesn't have dataset access (mimic embedded role),
+        # but needs access to the /samples endpoint
+        gamma_role = sm.find_role("Gamma")
+        perm_view = sm.find_permission_view_menu("can_samples", "Datasource")
+        sm.add_permission_role(gamma_role, perm_view)
+        self.login(GAMMA_USERNAME)
         mock_is_guest_user.return_value = True
         mock_has_guest_access.return_value = True
         mock_rls.return_value = []
         tbl = self.get_table(name="birth_names")
         dash = self.get_dash_by_slug("births")
-        uri = f"/datasource/samples?datasource_id={tbl.id}&datasource_type=table&dashboard_id={dash.id}"  # noqa: E501
-        resp = self.client.post(uri, json={})
-        assert resp.status_code == 200
+        try:
+            uri = f"/datasource/samples?datasource_id={tbl.id}&datasource_type=table&dashboard_id={dash.id}"  # noqa: E501
+            resp = self.client.post(uri, json={})
+            assert resp.status_code == 200
+        finally:
+            sm.del_permission_role(gamma_role, perm_view)
 
     @pytest.mark.usefixtures("load_birth_names_dashboard_with_slices")
     @mock.patch(
@@ -798,7 +807,7 @@ def test_get_samples_pagination(test_client, login_as_admin, virtual_dataset):
     assert rv.json["result"]["total_count"] == 10
 
     # 2. incorrect per_page
-    per_pages = (current_app.config["SAMPLES_ROW_LIMIT"] + 1, 0, "xx")
+    per_pages = (10001, 0, "xx")
     for per_page in per_pages:
         uri = f"/datasource/samples?datasource_id={virtual_dataset.id}&datasource_type=table&per_page={per_page}"  # noqa: E501
         rv = test_client.post(uri, json={})
diff --git a/tests/integration_tests/event_logger_tests.py b/tests/integration_tests/event_logger_tests.py
index f87b5a782e3..6bd8b96a945 100644
--- a/tests/integration_tests/event_logger_tests.py
+++ b/tests/integration_tests/event_logger_tests.py
@@ -254,3 +254,64 @@ class TestEventLogger(unittest.TestCase):
                 }
             ]
             assert payload["duration_ms"] >= 100
+
+    @patch("superset.db")
+    def test_curated_payload_used_when_records_empty(self, mock_db):
+        """Test that curated_payload is used when records is empty (MCP pattern).
+
+        MCP middleware passes curated_payload instead of records. This test verifies
+        that DBEventLogger.log() creates a Log entry from curated_payload when
+        records is empty.
+        """
+        logger = DBEventLogger()
+
+        with app.test_request_context():
+            logger.log(
+                user_id=1,
+                action="mcp_tool_call",
+                dashboard_id=None,
+                duration_ms=100,
+                slice_id=None,
+                referrer=None,
+                curated_payload={"tool": "list_charts", "success": True},
+            )
+
+        # Verify bulk_save_objects was called with one Log object
+        mock_db.session.bulk_save_objects.assert_called_once()
+        logs = mock_db.session.bulk_save_objects.call_args[0][0]
+        assert len(logs) == 1
+        assert logs[0].action == "mcp_tool_call"
+        assert logs[0].duration_ms == 100
+        # Verify JSON contains the curated_payload data
+        from superset.utils import json as json_utils
+
+        payload = json_utils.loads(logs[0].json)
+        assert payload["tool"] == "list_charts"
+        assert payload["success"] is True
+
+    @patch("superset.db")
+    def test_records_takes_precedence_over_curated_payload(self, mock_db):
+        """Test that records takes precedence over curated_payload."""
+        logger = DBEventLogger()
+
+        with app.test_request_context():
+            logger.log(
+                user_id=1,
+                action="test_action",
+                dashboard_id=None,
+                duration_ms=50,
+                slice_id=None,
+                referrer=None,
+                records=[{"from_records": True}],
+                curated_payload={"from_curated": True},
+            )
+
+        # Verify only records data is used, not curated_payload
+        mock_db.session.bulk_save_objects.assert_called_once()
+        logs = mock_db.session.bulk_save_objects.call_args[0][0]
+        assert len(logs) == 1
+        from superset.utils import json as json_utils
+
+        payload = json_utils.loads(logs[0].json)
+        assert payload.get("from_records") is True
+        assert "from_curated" not in payload
diff --git a/tests/integration_tests/migrations/ce6bd21901ab_migrate_deckgl_and_mapbox__test.py b/tests/integration_tests/migrations/ce6bd21901ab_migrate_deckgl_and_mapbox__test.py
new file mode 100644
index 00000000000..ce1e73cd70f
--- /dev/null
+++ b/tests/integration_tests/migrations/ce6bd21901ab_migrate_deckgl_and_mapbox__test.py
@@ -0,0 +1,187 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+from importlib import import_module
+
+import pytest
+
+from superset.utils import json
+
+migrate_deckgl_and_mapbox = import_module(
+    "superset.migrations.versions."
+    "2026-03-02_00-00_ce6bd21901ab_migrate_deckgl_and_mapbox",
+)
+
+Slice = migrate_deckgl_and_mapbox.Slice
+MigrateMapBox = migrate_deckgl_and_mapbox.MigrateMapBox
+_migrate_deckgl_slice = migrate_deckgl_and_mapbox._migrate_deckgl_slice
+_downgrade_deckgl_slice = migrate_deckgl_and_mapbox._downgrade_deckgl_slice
+
+
+@pytest.mark.usefixtures("app_context")
+def test_upgrade_mapbox():
+    slc = Slice(
+        slice_name="Test Mapbox",
+        viz_type="mapbox",
+        params=json.dumps(
+            {
+                "viz_type": "mapbox",
+                "mapbox_style": "mapbox://styles/mapbox/streets-v11",
+                "mapbox_label": ["name"],
+                "mapbox_color": "#ff0000",
+                "other_param": "value",
+            }
+        ),
+        query_context=json.dumps(
+            {
+                "form_data": {
+                    "viz_type": "mapbox",
+                    "mapbox_style": "mapbox://styles/mapbox/streets-v11",
+                }
+            }
+        ),
+    )
+
+    MigrateMapBox.upgrade_slice(slc)
+
+    assert slc.viz_type == "point_cluster_map"
+
+    params = json.loads(slc.params)
+    assert params["viz_type"] == "point_cluster_map"
+    assert params["mapbox_style"] == "mapbox://styles/mapbox/streets-v11"
+    assert params["map_renderer"] == "mapbox"
+    assert params["map_label"] == ["name"]
+    assert params["map_color"] == "#ff0000"
+    assert "mapbox_label" not in params
+    assert "mapbox_color" not in params
+    assert params["other_param"] == "value"
+
+    query_context = json.loads(slc.query_context)
+    assert query_context["form_data"]["viz_type"] == "point_cluster_map"
+    assert (
+        query_context["form_data"]["mapbox_style"]
+        == "mapbox://styles/mapbox/streets-v11"
+    )
+
+
+@pytest.mark.usefixtures("app_context")
+def test_upgrade_mapbox_with_non_mapbox_style():
+    """Charts with non-mapbox:// style URLs should not get map_provider=mapbox."""
+    slc = Slice(
+        slice_name="Test Mapbox Open Style",
+        viz_type="mapbox",
+        params=json.dumps(
+            {
+                "viz_type": "mapbox",
+                "mapbox_style": "https://tiles.openfreemap.org/styles/liberty",
+                "other_param": "value",
+            }
+        ),
+        query_context=json.dumps({}),
+    )
+
+    MigrateMapBox.upgrade_slice(slc)
+
+    assert slc.viz_type == "point_cluster_map"
+    params = json.loads(slc.params)
+    assert params["mapbox_style"] == "https://tiles.openfreemap.org/styles/liberty"
+    assert "map_renderer" not in params
+
+
+def test_migrate_deckgl_slice_mapbox_style():
+    slc = Slice(
+        slice_name="Test Arc",
+        viz_type="deck_arc",
+        params=json.dumps(
+            {
+                "viz_type": "deck_arc",
+                "mapbox_style": "mapbox://styles/mapbox/dark-v9",
+                "other_param": "value",
+            }
+        ),
+    )
+
+    modified = _migrate_deckgl_slice(slc)
+
+    assert modified is True
+    params = json.loads(slc.params)
+    assert params["mapbox_style"] == "mapbox://styles/mapbox/dark-v9"
+    assert params["map_renderer"] == "mapbox"
+    assert params["viz_type"] == "deck_arc"  # viz_type unchanged
+    assert params["other_param"] == "value"
+
+
+def test_migrate_deckgl_slice_open_style():
+    """All existing deck_* charts get map_renderer='mapbox' for backwards compat."""
+    slc = Slice(
+        slice_name="Test Scatter",
+        viz_type="deck_scatter",
+        params=json.dumps(
+            {
+                "viz_type": "deck_scatter",
+                "mapbox_style": "https://basemaps.cartocdn.com/gl/positron-gl-style/style.json",
+            }
+        ),
+    )
+
+    modified = _migrate_deckgl_slice(slc)
+
+    assert modified is True
+    params = json.loads(slc.params)
+    assert (
+        params["mapbox_style"]
+        == "https://basemaps.cartocdn.com/gl/positron-gl-style/style.json"
+    )
+    assert params["map_renderer"] == "mapbox"
+
+
+def test_migrate_deckgl_slice_no_mapbox_style():
+    """Slices without mapbox_style still get map_renderer='mapbox'."""
+    slc = Slice(
+        slice_name="Test Arc No Style",
+        viz_type="deck_arc",
+        params=json.dumps({"viz_type": "deck_arc", "other_param": "value"}),
+    )
+
+    modified = _migrate_deckgl_slice(slc)
+
+    assert modified is True
+    params = json.loads(slc.params)
+    assert params["map_renderer"] == "mapbox"
+    assert params["other_param"] == "value"
+
+
+def test_downgrade_deckgl_slice():
+    slc = Slice(
+        slice_name="Test Arc",
+        viz_type="deck_arc",
+        params=json.dumps(
+            {
+                "viz_type": "deck_arc",
+                "mapbox_style": "mapbox://styles/mapbox/dark-v9",
+                "map_renderer": "mapbox",
+                "other_param": "value",
+            }
+        ),
+    )
+
+    modified = _downgrade_deckgl_slice(slc)
+
+    assert modified is True
+    params = json.loads(slc.params)
+    assert params["mapbox_style"] == "mapbox://styles/mapbox/dark-v9"
+    assert "map_renderer" not in params
+    assert params["other_param"] == "value"
diff --git a/tests/integration_tests/reports/api_tests.py b/tests/integration_tests/reports/api_tests.py
index 87fb8ccf046..ad49736fa9b 100644
--- a/tests/integration_tests/reports/api_tests.py
+++ b/tests/integration_tests/reports/api_tests.py
@@ -1527,6 +1527,177 @@ class TestReportSchedulesApi(SupersetTestCase):
         assert updated_model.chart_id == report_schedule_data["chart"]
         assert updated_model.database_id == report_schedule_data["database"]
 
+    @pytest.mark.usefixtures("create_report_schedules")
+    def test_update_report_schedule_clear_recipients(self):
+        """
+        ReportSchedule API: clear recipients on empty list
+        """
+        report_schedule = (
+            db.session.query(ReportSchedule)
+            .filter(ReportSchedule.name == "name2")
+            .one_or_none()
+        )
+        assert len(report_schedule.recipients) == 2
+
+        self.login(ADMIN_USERNAME)
+        report_schedule_data = {
+            "recipients": [],
+        }
+
+        uri = f"api/v1/report/{report_schedule.id}"
+        rv = self.put_assert_metric(uri, report_schedule_data, "put")
+        assert rv.status_code == 200
+        db.session.expire(report_schedule)
+        assert report_schedule.recipients == []
+
+    @pytest.mark.usefixtures("create_report_schedules")
+    def test_update_report_schedule_empty_email_target(self):
+        """
+        ReportSchedule API: Test update with empty email target returns 400
+        """
+        report_schedule = (
+            db.session.query(ReportSchedule)
+            .filter(ReportSchedule.name == "name2")
+            .one_or_none()
+        )
+        self.login(ADMIN_USERNAME)
+        report_schedule_data = {
+            "recipients": [
+                {
+                    "type": ReportRecipientType.EMAIL,
+                    "recipient_config_json": {"target": ""},
+                }
+            ],
+        }
+        uri = f"api/v1/report/{report_schedule.id}"
+        rv = self.put_assert_metric(uri, report_schedule_data, "put")
+        assert rv.status_code == 400
+
+    @pytest.mark.usefixtures("create_report_schedules")
+    def test_update_report_schedule_invalid_email(self):
+        """
+        ReportSchedule API: Test update with invalid email returns 400
+        """
+        report_schedule = (
+            db.session.query(ReportSchedule)
+            .filter(ReportSchedule.name == "name2")
+            .one_or_none()
+        )
+        self.login(ADMIN_USERNAME)
+        report_schedule_data = {
+            "recipients": [
+                {
+                    "type": ReportRecipientType.EMAIL,
+                    "recipient_config_json": {"target": "notanemail"},
+                }
+            ],
+        }
+        uri = f"api/v1/report/{report_schedule.id}"
+        rv = self.put_assert_metric(uri, report_schedule_data, "put")
+        assert rv.status_code == 400
+
+    @pytest.mark.usefixtures("create_report_schedules")
+    def test_update_report_schedule_invalid_cc_email(self):
+        """
+        ReportSchedule API: Test update with invalid ccTarget
+        """
+        report_schedule = (
+            db.session.query(ReportSchedule)
+            .filter(ReportSchedule.name == "name2")
+            .one_or_none()
+        )
+        self.login(ADMIN_USERNAME)
+        report_schedule_data = {
+            "recipients": [
+                {
+                    "type": ReportRecipientType.EMAIL,
+                    "recipient_config_json": {
+                        "target": "valid@example.com",
+                        "ccTarget": "bademail",
+                    },
+                }
+            ],
+        }
+        uri = f"api/v1/report/{report_schedule.id}"
+        rv = self.put_assert_metric(uri, report_schedule_data, "put")
+        assert rv.status_code == 400
+
+    @pytest.mark.usefixtures("create_report_schedules")
+    def test_update_report_schedule_invalid_bcc_email(self):
+        """
+        ReportSchedule API: Test update with invalid bccTarget
+        """
+        report_schedule = (
+            db.session.query(ReportSchedule)
+            .filter(ReportSchedule.name == "name2")
+            .one_or_none()
+        )
+        self.login(ADMIN_USERNAME)
+        report_schedule_data = {
+            "recipients": [
+                {
+                    "type": ReportRecipientType.EMAIL,
+                    "recipient_config_json": {
+                        "target": "valid@example.com",
+                        "bccTarget": "bademail",
+                    },
+                }
+            ],
+        }
+        uri = f"api/v1/report/{report_schedule.id}"
+        rv = self.put_assert_metric(uri, report_schedule_data, "put")
+        assert rv.status_code == 400
+
+    @pytest.mark.usefixtures("create_report_schedules")
+    def test_update_report_schedule_slack_empty_target_allowed(self):
+        """
+        ReportSchedule API: Test that Slack recipients skip email validation
+        """
+        report_schedule = (
+            db.session.query(ReportSchedule)
+            .filter(ReportSchedule.name == "name2")
+            .one_or_none()
+        )
+        self.login(ADMIN_USERNAME)
+        report_schedule_data = {
+            "recipients": [
+                {
+                    "type": ReportRecipientType.SLACK,
+                    "recipient_config_json": {"target": ""},
+                }
+            ],
+        }
+        uri = f"api/v1/report/{report_schedule.id}"
+        rv = self.put_assert_metric(uri, report_schedule_data, "put")
+        assert rv.status_code == 200
+
+    @pytest.mark.usefixtures("create_report_schedules")
+    def test_update_report_schedule_valid_email_with_cc_bcc(self):
+        """
+        ReportSchedule API: Test update with valid email fields
+        """
+        report_schedule = (
+            db.session.query(ReportSchedule)
+            .filter(ReportSchedule.name == "name2")
+            .one_or_none()
+        )
+        self.login(ADMIN_USERNAME)
+        report_schedule_data = {
+            "recipients": [
+                {
+                    "type": ReportRecipientType.EMAIL,
+                    "recipient_config_json": {
+                        "target": "valid@example.com",
+                        "ccTarget": "cc@example.com",
+                        "bccTarget": "bcc@example.com",
+                    },
+                }
+            ],
+        }
+        uri = f"api/v1/report/{report_schedule.id}"
+        rv = self.put_assert_metric(uri, report_schedule_data, "put")
+        assert rv.status_code == 200
+
     @pytest.mark.usefixtures("create_working_shared_report_schedule")
     def test_update_report_schedule_state_working(self):
         """
@@ -2345,3 +2516,371 @@ class TestReportSchedulesApi(SupersetTestCase):
         )
 
         assert json.loads(report_schedule.extra_json) == extra_json
+
+    @pytest.mark.usefixtures("create_report_schedules")
+    def test_create_report_schedule_with_garbage_native_filters(self):
+        """
+        ReportSchedule API: POST with nativeFilters containing garbage data returns 422
+        """
+        dashboard = db.session.query(Dashboard).first()
+        self.login(ADMIN_USERNAME)
+        report_schedule_data = {
+            "type": ReportScheduleType.REPORT,
+            "name": "garbage_native_filters_test",
+            "description": "description",
+            "creation_method": ReportCreationMethod.ALERTS_REPORTS,
+            "crontab": "0 9 * * *",
+            "working_timeout": 3600,
+            "dashboard": dashboard.id,
+            "extra": {"dashboard": {"nativeFilters": [{"garbage": True}]}},
+        }
+        uri = "api/v1/report/"
+        rv = self.post_assert_metric(uri, report_schedule_data, "post")
+        assert rv.status_code == 422
+        data = json.loads(rv.data.decode("utf-8"))
+        assert "message" in data
+        assert "extra" in data["message"]
+
+    @pytest.mark.usefixtures("create_report_schedules")
+    def test_create_report_schedule_with_missing_native_filter_keys(self):
+        """
+        ReportSchedule API: POST with nativeFilters missing required keys returns 422
+        """
+        dashboard = db.session.query(Dashboard).first()
+        self.login(ADMIN_USERNAME)
+        report_schedule_data = {
+            "type": ReportScheduleType.REPORT,
+            "name": "missing_keys_native_filters_test",
+            "description": "description",
+            "creation_method": ReportCreationMethod.ALERTS_REPORTS,
+            "crontab": "0 9 * * *",
+            "working_timeout": 3600,
+            "dashboard": dashboard.id,
+            "extra": {
+                "dashboard": {
+                    "nativeFilters": [{"nativeFilterId": "NATIVE_FILTER-abc"}]
+                }
+            },
+        }
+        uri = "api/v1/report/"
+        rv = self.post_assert_metric(uri, report_schedule_data, "post")
+        assert rv.status_code == 422
+        data = json.loads(rv.data.decode("utf-8"))
+        assert "message" in data
+        assert "extra" in data["message"]
+
+    @pytest.mark.usefixtures("create_report_schedules")
+    def test_create_report_schedule_with_nonexistent_native_filter_id(self):
+        """
+        ReportSchedule API: POST with nativeFilterId not on dashboard returns 422
+        """
+        dashboard = db.session.query(Dashboard).first()
+        self.login(ADMIN_USERNAME)
+        report_schedule_data = {
+            "type": ReportScheduleType.REPORT,
+            "name": "nonexistent_filter_id_test",
+            "description": "description",
+            "creation_method": ReportCreationMethod.ALERTS_REPORTS,
+            "crontab": "0 9 * * *",
+            "working_timeout": 3600,
+            "dashboard": dashboard.id,
+            "extra": {
+                "dashboard": {
+                    "nativeFilters": [
+                        {
+                            "nativeFilterId": "NATIVE_FILTER-does-not-exist",
+                            "filterType": "filter_select",
+                            "columnName": "col",
+                            "filterValues": ["a"],
+                        }
+                    ]
+                }
+            },
+        }
+        uri = "api/v1/report/"
+        rv = self.post_assert_metric(uri, report_schedule_data, "post")
+        assert rv.status_code == 422
+        data = json.loads(rv.data.decode("utf-8"))
+        assert "message" in data
+        assert "extra" in data["message"]
+
+    def test_create_report_schedule_with_valid_native_filter_empty_values(self):
+        """
+        ReportSchedule API: POST with valid nativeFilterId and empty filterValues
+        returns 201
+        """
+        # Create a dashboard with a native filter in json_metadata
+        filter_id = "NATIVE_FILTER-valid123"
+        dashboard = Dashboard()
+        dashboard.dashboard_title = "dash_with_native_filter"
+        dashboard.slug = "dash_with_native_filter"
+        dashboard.json_metadata = json.dumps(
+            {"native_filter_configuration": [{"id": filter_id, "name": "Test Filter"}]}
+        )
+        db.session.add(dashboard)
+        db.session.commit()
+
+        self.login(ADMIN_USERNAME)
+        report_schedule_data = {
+            "type": ReportScheduleType.REPORT,
+            "name": "valid_native_filter_empty_values",
+            "description": "description",
+            "creation_method": ReportCreationMethod.ALERTS_REPORTS,
+            "crontab": "0 9 * * *",
+            "working_timeout": 3600,
+            "dashboard": dashboard.id,
+            "extra": {
+                "dashboard": {
+                    "nativeFilters": [
+                        {
+                            "nativeFilterId": filter_id,
+                            "filterType": "filter_select",
+                            "columnName": "col",
+                            "filterValues": [],
+                        }
+                    ]
+                }
+            },
+        }
+        uri = "api/v1/report/"
+        rv = self.post_assert_metric(uri, report_schedule_data, "post")
+        assert rv.status_code == 201
+
+        created_id = json.loads(rv.data.decode("utf-8")).get("id")
+        created_model = db.session.query(ReportSchedule).get(created_id)
+        db.session.delete(created_model)
+        db.session.delete(dashboard)
+        db.session.commit()
+
+    @pytest.mark.usefixtures("create_report_schedules")
+    def test_update_report_schedule_with_garbage_native_filters(self):
+        """
+        ReportSchedule API: PUT with nativeFilters containing garbage data returns 422
+        """
+        report_schedule = (
+            db.session.query(ReportSchedule)
+            .filter(ReportSchedule.name == "name2")
+            .one_or_none()
+        )
+        dashboard = db.session.query(Dashboard).first()
+        self.login(ADMIN_USERNAME)
+        report_schedule_data = {
+            "type": ReportScheduleType.REPORT,
+            "name": "name2",
+            "crontab": "0 10 * * *",
+            "dashboard": dashboard.id,
+            "extra": {"dashboard": {"nativeFilters": [{"garbage": True}]}},
+        }
+        uri = f"api/v1/report/{report_schedule.id}"
+        rv = self.put_assert_metric(uri, report_schedule_data, "put")
+        assert rv.status_code == 422
+        data = json.loads(rv.data.decode("utf-8"))
+        assert "message" in data
+        assert "extra" in data["message"]
+
+    @pytest.mark.usefixtures("create_report_schedules")
+    def test_update_report_schedule_with_stale_native_filter_id(self):
+        """
+        ReportSchedule API: PUT with nativeFilterId no longer on dashboard returns 422
+        """
+        report_schedule = (
+            db.session.query(ReportSchedule)
+            .filter(ReportSchedule.name == "name2")
+            .one_or_none()
+        )
+        # Dashboard with no native filters configured
+        dashboard = db.session.query(Dashboard).first()
+        self.login(ADMIN_USERNAME)
+        report_schedule_data = {
+            "type": ReportScheduleType.REPORT,
+            "name": "name2",
+            "crontab": "0 10 * * *",
+            "dashboard": dashboard.id,
+            "extra": {
+                "dashboard": {
+                    "nativeFilters": [
+                        {
+                            "nativeFilterId": "NATIVE_FILTER-stale",
+                            "filterType": "filter_select",
+                            "columnName": "col",
+                            "filterValues": ["val"],
+                        }
+                    ]
+                }
+            },
+        }
+        uri = f"api/v1/report/{report_schedule.id}"
+        rv = self.put_assert_metric(uri, report_schedule_data, "put")
+        assert rv.status_code == 422
+        data = json.loads(rv.data.decode("utf-8"))
+        assert "message" in data
+        assert "extra" in data["message"]
+
+    @patch("superset.commands.dashboard.update.send_email_smtp")
+    def test_dashboard_update_deletes_native_filter_deactivates_reports(
+        self, mock_send_email: Any
+    ):
+        """
+        Dashboard API: removing a native filter deactivates referencing reports
+        and emails each owner
+        """
+        filter_id = "NATIVE_FILTER-todelete"
+
+        # Create dashboard with that filter
+        dashboard = Dashboard()
+        dashboard.dashboard_title = "dash_filter_delete"
+        dashboard.slug = "dash_filter_delete"
+        dashboard.json_metadata = json.dumps(
+            {"native_filter_configuration": [{"id": filter_id, "name": "To Delete"}]}
+        )
+        db.session.add(dashboard)
+        db.session.flush()
+
+        admin = self.get_user("admin")
+
+        # Create report referencing that filter
+        report = insert_report_schedule(
+            type=ReportScheduleType.REPORT,
+            name="report_with_filter",
+            crontab="0 9 * * *",
+            owners=[admin],
+            dashboard=dashboard,
+            extra={
+                "dashboard": {
+                    "nativeFilters": [
+                        {
+                            "nativeFilterId": filter_id,
+                            "filterType": "filter_select",
+                            "columnName": "col",
+                            "filterValues": [],
+                        }
+                    ]
+                }
+            },
+        )
+
+        db.session.commit()
+
+        self.login(ADMIN_USERNAME)
+        # Update dashboard removing the native filter
+        uri = f"api/v1/dashboard/{dashboard.id}"
+        rv = self.put_assert_metric(
+            uri,
+            {"json_metadata": json.dumps({"native_filter_configuration": []})},
+            "put",
+        )
+        assert rv.status_code == 200
+
+        db.session.refresh(report)
+        assert report.active is False
+        assert mock_send_email.called
+
+        db.session.delete(report)
+        db.session.delete(dashboard)
+        db.session.commit()
+
+    @patch("superset.commands.dashboard.update.send_email_smtp")
+    def test_dashboard_update_unrelated_filter_removal_no_side_effects(
+        self, mock_send_email: Any
+    ):
+        """
+        Dashboard API: removing a filter not referenced by any report has no
+        side effects
+        """
+        filter_id = "NATIVE_FILTER-unreferenced"
+
+        dashboard = Dashboard()
+        dashboard.dashboard_title = "dash_no_reports"
+        dashboard.slug = "dash_no_reports"
+        dashboard.json_metadata = json.dumps(
+            {"native_filter_configuration": [{"id": filter_id, "name": "Unused"}]}
+        )
+        db.session.add(dashboard)
+        db.session.commit()
+
+        self.login(ADMIN_USERNAME)
+        uri = f"api/v1/dashboard/{dashboard.id}"
+        rv = self.put_assert_metric(
+            uri,
+            {"json_metadata": json.dumps({"native_filter_configuration": []})},
+            "put",
+        )
+        assert rv.status_code == 200
+        assert not mock_send_email.called
+
+        db.session.delete(dashboard)
+        db.session.commit()
+
+    @patch("superset.commands.dashboard.update.send_email_smtp")
+    def test_dashboard_update_deleted_filter_multiple_reports_notifies_all_owners(
+        self, mock_send_email: Any
+    ):
+        """
+        Dashboard API: removing a filter referenced by multiple reports deactivates
+        all of them and emails each owner once per report
+        """
+        filter_id = "NATIVE_FILTER-shared"
+
+        dashboard = Dashboard()
+        dashboard.dashboard_title = "dash_shared_filter"
+        dashboard.slug = "dash_shared_filter"
+        dashboard.json_metadata = json.dumps(
+            {"native_filter_configuration": [{"id": filter_id, "name": "Shared"}]}
+        )
+        db.session.add(dashboard)
+        db.session.flush()
+
+        admin = self.get_user("admin")
+
+        native_filter_extra = {
+            "dashboard": {
+                "nativeFilters": [
+                    {
+                        "nativeFilterId": filter_id,
+                        "filterType": "filter_select",
+                        "columnName": "col",
+                        "filterValues": [],
+                    }
+                ]
+            }
+        }
+
+        report_a = insert_report_schedule(
+            type=ReportScheduleType.REPORT,
+            name="report_shared_filter_a",
+            crontab="0 9 * * *",
+            owners=[admin],
+            dashboard=dashboard,
+            extra=native_filter_extra,
+        )
+        report_b = insert_report_schedule(
+            type=ReportScheduleType.REPORT,
+            name="report_shared_filter_b",
+            crontab="0 10 * * *",
+            owners=[admin],
+            dashboard=dashboard,
+            extra=native_filter_extra,
+        )
+
+        db.session.commit()
+
+        self.login(ADMIN_USERNAME)
+        uri = f"api/v1/dashboard/{dashboard.id}"
+        rv = self.put_assert_metric(
+            uri,
+            {"json_metadata": json.dumps({"native_filter_configuration": []})},
+            "put",
+        )
+        assert rv.status_code == 200
+
+        db.session.refresh(report_a)
+        db.session.refresh(report_b)
+        assert report_a.active is False
+        assert report_b.active is False
+        # One email call per report (admin owns both)
+        assert mock_send_email.call_count == 2
+
+        db.session.delete(report_a)
+        db.session.delete(report_b)
+        db.session.delete(dashboard)
+        db.session.commit()
diff --git a/tests/integration_tests/security/guest_token_security_tests.py b/tests/integration_tests/security/guest_token_security_tests.py
index edc1e0a649f..9caf4706a03 100644
--- a/tests/integration_tests/security/guest_token_security_tests.py
+++ b/tests/integration_tests/security/guest_token_security_tests.py
@@ -356,7 +356,100 @@ class TestGuestUserDatasourceAccess(SupersetTestCase):
                     }
                 )
 
-    def test_raise_for_access__no_chart_in_form_data(self):
+    def test_raise_for_access__drill_to_detail_happy_path(self):
+        """
+        Drill to Detail: no slice_id in form_data, datasource is on the dashboard
+        the embedded user has access to.
+        """
+        g.user = self.authorized_guest
+        for kwarg in ["viz", "query_context"]:
+            security_manager.raise_for_access(
+                **{
+                    kwarg: Mock(
+                        datasource=self.datasource,
+                        form_data={
+                            "dashboardId": self.dash.id,
+                        },
+                        slice_=None,
+                        queries=[],
+                    )
+                }
+            )
+
+    def test_raise_for_access__drill_to_detail_datasource_not_on_dashboard(self):
+        """
+        Drill to Detail is denied when the target datasource is not associated
+        with the dashboard the embedded user has access to.
+        """
+        g.user = self.authorized_guest
+        for kwarg in ["viz", "query_context"]:
+            with self.assertRaises(SupersetSecurityException):  # noqa: PT027
+                security_manager.raise_for_access(
+                    **{
+                        kwarg: Mock(
+                            datasource=self.other_datasource,
+                            form_data={
+                                "dashboardId": self.dash.id,
+                            },
+                            slice_=None,
+                            queries=[],
+                        )
+                    }
+                )
+
+    def test_raise_for_access__drill_by_happy_path(self):
+        """
+        Drill By: slice_id=0 (sentinel), chart_id points to a chart on the dashboard
+        whose datasource matches, the requested groupby column is drillable and the
+        embedded user has access to.
+        """
+        g.user = self.authorized_guest
+        for kwarg in ["viz", "query_context"]:
+            security_manager.raise_for_access(
+                **{
+                    kwarg: Mock(
+                        datasource=self.datasource,
+                        form_data={
+                            "dashboardId": self.dash.id,
+                            "slice_id": 0,
+                            "chart_id": self.chart.id,
+                            "groupby": ["gender"],
+                        },
+                        slice_=None,
+                        queries=[],
+                    )
+                }
+            )
+
+    def test_raise_for_access__drill_by_chart_not_on_dashboard(self):
+        """
+        Drill By is denied when chart_id refers to a chart that is not on the
+        dashboard the embedded user has access to.
+        """
+        g.user = self.authorized_guest
+        for kwarg in ["viz", "query_context"]:
+            with self.assertRaises(SupersetSecurityException):  # noqa: PT027
+                security_manager.raise_for_access(
+                    **{
+                        kwarg: Mock(
+                            datasource=self.other_datasource,
+                            form_data={
+                                "dashboardId": self.dash.id,
+                                "slice_id": 0,
+                                "chart_id": self.other_chart.id,
+                                "groupby": ["gender"],
+                            },
+                            slice_=None,
+                            queries=[],
+                        )
+                    }
+                )
+
+    def test_raise_for_access__drill_by_columns_not_drillable(self):
+        """
+        Drill By is denied when the requested groupby columns are not marked as
+        drillable (groupby=True) on the datasource.
+        """
         g.user = self.authorized_guest
         for kwarg in ["viz", "query_context"]:
             with self.assertRaises(SupersetSecurityException):  # noqa: PT027
@@ -366,7 +459,12 @@ class TestGuestUserDatasourceAccess(SupersetTestCase):
                             datasource=self.datasource,
                             form_data={
                                 "dashboardId": self.dash.id,
+                                "slice_id": 0,
+                                "chart_id": self.chart.id,
+                                "groupby": ["__not_a_drillable_column__"],
                             },
+                            slice_=None,
+                            queries=[],
                         )
                     }
                 )
diff --git a/tests/integration_tests/security_tests.py b/tests/integration_tests/security_tests.py
index e59dd417b57..1191c7fd9d8 100644
--- a/tests/integration_tests/security_tests.py
+++ b/tests/integration_tests/security_tests.py
@@ -1895,16 +1895,19 @@ class TestSecurityManager(SupersetTestCase):
                         }
                     )
 
-                # Undefined dashboard chart.
-                with self.assertRaises(SupersetSecurityException):  # noqa: PT027
-                    security_manager.raise_for_access(
-                        **{
-                            kwarg: Mock(
-                                datasource=birth_names,
-                                form_data={"dashboardId": births.id},
-                            )
-                        }
-                    )
+                # Drill to Detail (no slice_id/chart_id): datasource on dashboard.
+                # Access is granted via DASHBOARD_RBAC — D2D is a valid operation
+                # for users who have dashboard access.
+                security_manager.raise_for_access(
+                    **{
+                        kwarg: Mock(
+                            datasource=birth_names,
+                            form_data={"dashboardId": births.id},
+                            slice_=None,
+                            queries=[],
+                        )
+                    }
+                )
 
                 # Ill-defined dashboard chart.
                 with self.assertRaises(SupersetSecurityException):  # noqa: PT027
diff --git a/tests/integration_tests/sql_lab/api_tests.py b/tests/integration_tests/sql_lab/api_tests.py
index 9454e7c9b10..4e9f50f1310 100644
--- a/tests/integration_tests/sql_lab/api_tests.py
+++ b/tests/integration_tests/sql_lab/api_tests.py
@@ -39,6 +39,7 @@ from superset.utils.database import (
 from superset.utils import core as utils, json
 from superset.models.sql_lab import Query
 
+from superset.sql.parse import SQLScript
 from tests.integration_tests.base_tests import SupersetTestCase
 from tests.integration_tests.constants import (
     ADMIN_USERNAME,
@@ -288,10 +289,38 @@ class TestSqlLabApi(SupersetTestCase):
         self.assertDictEqual(resp_data, success_resp)  # noqa: PT009
         assert rv.status_code == 200
 
+    def test_format_sql_request_with_db_id(self):
+        self.login(ADMIN_USERNAME)
+        example_db = get_example_database()
+
+        # IIF is normalized differently per dialect:
+        # SQLite preserves IIF(), Postgres/base converts to CASE WHEN.
+        # Compute the expected result from the actual engine so the test is
+        # environment-independent.
+        sql = "select IIF(score > 0, 'positive', 'negative') from my_table"
+        engine = example_db.db_engine_spec.engine
+        expected = SQLScript(sql, engine).format()
+
+        data = {"sql": sql, "database_id": example_db.id}
+        rv = self.client.post(
+            "/api/v1/sqllab/format_sql/",
+            json=data,
+        )
+        resp_data = json.loads(rv.data.decode("utf-8"))
+        assert rv.status_code == 200
+        assert resp_data["result"] == expected
+
     def test_format_sql_request_with_jinja(self):
         self.login(ADMIN_USERNAME)
         example_db = get_example_database()
 
+        # Quoted identifier formatting varies by dialect (e.g., MySQL uses backticks).
+        # Compute the expected result from the actual engine so the test is
+        # environment-independent.
+        rendered_sql = 'select * from "Vehicle Sales"'
+        engine = example_db.db_engine_spec.engine
+        expected = SQLScript(rendered_sql, engine).format()
+
         data = {
             "sql": "select * from {{tbl}}",
             "database_id": example_db.id,
@@ -302,10 +331,10 @@ class TestSqlLabApi(SupersetTestCase):
             json=data,
         )
         resp_data = json.loads(rv.data.decode("utf-8"))
+        assert rv.status_code == 200
         # Verify that Jinja template was processed before formatting
         assert "{{tbl}}" not in resp_data["result"]
-        assert '"Vehicle Sales"' in resp_data["result"]
-        assert rv.status_code == 200
+        assert resp_data["result"] == expected
 
     @mock.patch("superset.commands.sql_lab.results.results_backend_use_msgpack", False)
     def test_execute_required_params(self):
diff --git a/tests/integration_tests/sql_lab/commands_tests.py b/tests/integration_tests/sql_lab/commands_tests.py
index e3c09fc5091..d272a895383 100644
--- a/tests/integration_tests/sql_lab/commands_tests.py
+++ b/tests/integration_tests/sql_lab/commands_tests.py
@@ -37,6 +37,7 @@ from superset.models.sql_lab import Query
 from superset.sqllab.limiting_factor import LimitingFactor
 from superset.sqllab.schemas import EstimateQueryCostSchema
 from superset.utils import core as utils
+from superset.utils.core import override_user
 from superset.utils.database import get_example_database
 from tests.integration_tests.base_tests import SupersetTestCase
 
@@ -251,6 +252,7 @@ class TestSqlExecutionResultsCommand(SupersetTestCase):
     def create_database_and_query(self):
         with self.create_app().app_context():
             database = get_example_database()
+            admin = self.get_user("admin")
             query_obj = Query(
                 client_id="test",
                 database=database,
@@ -264,6 +266,7 @@ class TestSqlExecutionResultsCommand(SupersetTestCase):
                 rows=104,
                 error_message="none",
                 results_key="abc_query",
+                user_id=admin.id,
             )
 
             db.session.add(query_obj)
@@ -344,6 +347,29 @@ class TestSqlExecutionResultsCommand(SupersetTestCase):
                 == SupersetErrorType.RESULTS_BACKEND_ERROR
             )
 
+    @pytest.mark.usefixtures("create_database_and_query")
+    @patch("superset.commands.sql_lab.results.results_backend_use_msgpack", False)
+    def test_validation_unauthorized_access(self) -> None:
+        command = results.SqlExecutionResultsCommand("abc_query", 1000)
+
+        with mock.patch(
+            "superset.models.sql_lab.Query.raise_for_access",
+            side_effect=SupersetSecurityException(
+                SupersetError(
+                    "dummy",
+                    SupersetErrorType.DATASOURCE_SECURITY_ACCESS_ERROR,
+                    ErrorLevel.ERROR,
+                )
+            ),
+        ):
+            with pytest.raises(SupersetErrorException) as ex_info:
+                command.run()
+            assert (
+                ex_info.value.error.error_type
+                == SupersetErrorType.QUERY_SECURITY_ACCESS_ERROR
+            )
+            assert ex_info.value.status == 403
+
     @pytest.mark.usefixtures("create_database_and_query")
     @patch("superset.commands.sql_lab.results.results_backend_use_msgpack", False)
     def test_run_succeeds(self) -> None:
@@ -359,8 +385,11 @@ class TestSqlExecutionResultsCommand(SupersetTestCase):
         results.results_backend = mock.Mock()
         results.results_backend.get.return_value = compressed
 
-        command = results.SqlExecutionResultsCommand("abc_query", 1000)
-        result = command.run()
+        admin = self.get_user("admin")
+        with current_app.test_request_context():
+            with override_user(admin):
+                command = results.SqlExecutionResultsCommand("abc_query", 1000)
+                result = command.run()
 
         assert result.get("status") == "success"
         assert result["query"].get("rows") == 104
diff --git a/tests/integration_tests/test_granular_export_api.py b/tests/integration_tests/test_granular_export_api.py
new file mode 100644
index 00000000000..18dd718dd64
--- /dev/null
+++ b/tests/integration_tests/test_granular_export_api.py
@@ -0,0 +1,275 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+"""Integration tests for Phase 2 granular export controls.
+
+These tests verify that the GRANULAR_EXPORT_CONTROLS feature flag gates
+access to chart/dashboard screenshot endpoints (can_export_image) and
+SQL Lab export endpoints (can_export_data).
+"""
+
+from unittest.mock import patch
+
+import prison
+import pytest
+
+from superset.security import SupersetSecurityManager
+from tests.integration_tests.base_tests import SupersetTestCase
+from tests.integration_tests.conftest import with_feature_flags
+from tests.integration_tests.constants import ADMIN_USERNAME
+from tests.integration_tests.fixtures.birth_names_dashboard import (
+    load_birth_names_dashboard_with_slices,  # noqa: F401
+    load_birth_names_data,  # noqa: F401
+)
+
+
+def _deny_can_export_image(perm: str, view: str) -> bool:
+    """Return False only for can_export_image on Superset, allow everything else."""
+    return perm != "can_export_image" or view != "Superset"
+
+
+def _deny_can_export_data(perm: str, view: str) -> bool:
+    """Return False only for can_export_data on Superset, allow everything else."""
+    return perm != "can_export_data" or view != "Superset"
+
+
+class TestGranularExportChartAPI(SupersetTestCase):
+    """Test granular export controls on chart screenshot endpoints."""
+
+    @pytest.mark.usefixtures("load_birth_names_dashboard_with_slices")
+    @with_feature_flags(GRANULAR_EXPORT_CONTROLS=True, THUMBNAILS=True)
+    @patch.object(
+        SupersetSecurityManager,
+        "can_access",
+        side_effect=_deny_can_export_image,
+    )
+    def test_chart_cache_screenshot_403_without_can_export_image(
+        self, mock_can_access
+    ) -> None:
+        """When GRANULAR_EXPORT_CONTROLS is ON and user lacks can_export_image,
+        cache_screenshot should return 403."""
+        self.login(ADMIN_USERNAME)
+        chart = self.get_slice("Girls")
+        uri = f"api/v1/chart/{chart.id}/cache_screenshot/"
+        rison_params = prison.dumps({"force": False})
+        rv = self.client.get(f"{uri}?q={rison_params}")
+        assert rv.status_code == 403
+
+    @pytest.mark.usefixtures("load_birth_names_dashboard_with_slices")
+    @with_feature_flags(GRANULAR_EXPORT_CONTROLS=True, THUMBNAILS=True)
+    @patch.object(
+        SupersetSecurityManager,
+        "can_access",
+        side_effect=_deny_can_export_image,
+    )
+    def test_chart_screenshot_403_without_can_export_image(
+        self, mock_can_access
+    ) -> None:
+        """When GRANULAR_EXPORT_CONTROLS is ON and user lacks can_export_image,
+        screenshot should return 403."""
+        self.login(ADMIN_USERNAME)
+        chart = self.get_slice("Girls")
+        uri = f"api/v1/chart/{chart.id}/screenshot/fake_digest/"
+        rv = self.client.get(uri)
+        assert rv.status_code == 403
+
+    @pytest.mark.usefixtures("load_birth_names_dashboard_with_slices")
+    @with_feature_flags(GRANULAR_EXPORT_CONTROLS=True, THUMBNAILS=True)
+    @patch.object(
+        SupersetSecurityManager,
+        "can_access",
+        side_effect=_deny_can_export_image,
+    )
+    def test_chart_thumbnail_403_without_can_export_image(
+        self, mock_can_access
+    ) -> None:
+        """When GRANULAR_EXPORT_CONTROLS is ON and user lacks can_export_image,
+        thumbnail should return 403."""
+        self.login(ADMIN_USERNAME)
+        chart = self.get_slice("Girls")
+        uri = f"api/v1/chart/{chart.id}/thumbnail/{chart.digest}/"
+        rv = self.client.get(uri)
+        assert rv.status_code == 403
+
+    @pytest.mark.usefixtures("load_birth_names_dashboard_with_slices")
+    @with_feature_flags(GRANULAR_EXPORT_CONTROLS=False)
+    def test_chart_cache_screenshot_allowed_when_flag_disabled(self) -> None:
+        """When GRANULAR_EXPORT_CONTROLS is OFF, no permission check occurs
+        and the request proceeds (may return 404/422 due to missing thumbnails
+        config, but NOT 403)."""
+        self.login(ADMIN_USERNAME)
+        chart = self.get_slice("Girls")
+        uri = f"api/v1/chart/{chart.id}/cache_screenshot/"
+        rison_params = prison.dumps({"force": False})
+        rv = self.client.get(f"{uri}?q={rison_params}")
+        assert rv.status_code != 403
+
+    @pytest.mark.usefixtures("load_birth_names_dashboard_with_slices")
+    @with_feature_flags(GRANULAR_EXPORT_CONTROLS=False)
+    def test_chart_screenshot_allowed_when_flag_disabled(self) -> None:
+        """When GRANULAR_EXPORT_CONTROLS is OFF, screenshot endpoint does
+        not enforce granular permission."""
+        self.login(ADMIN_USERNAME)
+        chart = self.get_slice("Girls")
+        uri = f"api/v1/chart/{chart.id}/screenshot/fake_digest/"
+        rv = self.client.get(uri)
+        assert rv.status_code != 403
+
+
+class TestGranularExportDashboardAPI(SupersetTestCase):
+    """Test granular export controls on dashboard screenshot endpoints."""
+
+    @pytest.mark.usefixtures("load_birth_names_dashboard_with_slices")
+    @with_feature_flags(
+        GRANULAR_EXPORT_CONTROLS=True,
+        THUMBNAILS=True,
+        ENABLE_DASHBOARD_SCREENSHOT_ENDPOINTS=True,
+    )
+    @patch.object(
+        SupersetSecurityManager,
+        "can_access",
+        side_effect=_deny_can_export_image,
+    )
+    def test_dashboard_cache_screenshot_403_without_can_export_image(
+        self, mock_can_access
+    ) -> None:
+        """When GRANULAR_EXPORT_CONTROLS is ON and user lacks can_export_image,
+        cache_dashboard_screenshot should return 403."""
+        self.login(ADMIN_USERNAME)
+        dashboard = self.get_dash_by_slug("births") or self.get_dash_by_slug(
+            "birth_names"
+        )
+        uri = f"api/v1/dashboard/{dashboard.id}/cache_dashboard_screenshot/"
+        rison_params = prison.dumps({"force": False})
+        rv = self.client.post(
+            f"{uri}?q={rison_params}",
+            json={},
+        )
+        assert rv.status_code == 403
+
+    @pytest.mark.usefixtures("load_birth_names_dashboard_with_slices")
+    @with_feature_flags(
+        GRANULAR_EXPORT_CONTROLS=True,
+        THUMBNAILS=True,
+        ENABLE_DASHBOARD_SCREENSHOT_ENDPOINTS=True,
+    )
+    @patch.object(
+        SupersetSecurityManager,
+        "can_access",
+        side_effect=_deny_can_export_image,
+    )
+    def test_dashboard_screenshot_403_without_can_export_image(
+        self, mock_can_access
+    ) -> None:
+        """When GRANULAR_EXPORT_CONTROLS is ON and user lacks can_export_image,
+        screenshot should return 403."""
+        self.login(ADMIN_USERNAME)
+        dashboard = self.get_dash_by_slug("births") or self.get_dash_by_slug(
+            "birth_names"
+        )
+        uri = f"api/v1/dashboard/{dashboard.id}/screenshot/fake_digest/"
+        rv = self.client.get(uri)
+        assert rv.status_code == 403
+
+    @pytest.mark.usefixtures("load_birth_names_dashboard_with_slices")
+    @with_feature_flags(
+        GRANULAR_EXPORT_CONTROLS=False,
+        THUMBNAILS=True,
+        ENABLE_DASHBOARD_SCREENSHOT_ENDPOINTS=True,
+    )
+    @patch.object(
+        SupersetSecurityManager,
+        "can_access",
+        side_effect=_deny_can_export_image,
+    )
+    def test_dashboard_cache_screenshot_allowed_when_flag_disabled(
+        self, mock_can_access
+    ) -> None:
+        """When GRANULAR_EXPORT_CONTROLS is OFF, the granular permission check
+        is skipped even if the user lacks can_export_image."""
+        self.login(ADMIN_USERNAME)
+        dashboard = self.get_dash_by_slug("births") or self.get_dash_by_slug(
+            "birth_names"
+        )
+        uri = f"api/v1/dashboard/{dashboard.id}/cache_dashboard_screenshot/"
+        rison_params = prison.dumps({"force": False})
+        rv = self.client.post(f"{uri}?q={rison_params}", json={})
+        assert rv.status_code == 202
+
+
+class TestGranularExportSqlLabAPI(SupersetTestCase):
+    """Test granular export controls on SQL Lab export endpoints."""
+
+    @with_feature_flags(GRANULAR_EXPORT_CONTROLS=True)
+    @patch.object(
+        SupersetSecurityManager,
+        "can_access",
+        side_effect=_deny_can_export_data,
+    )
+    def test_export_csv_403_without_can_export_data(self, mock_can_access) -> None:
+        """When GRANULAR_EXPORT_CONTROLS is ON and user lacks can_export_data,
+        export_csv should return 403."""
+        self.login(ADMIN_USERNAME)
+        uri = "api/v1/sqllab/export/fake_client_id/"
+        rv = self.client.get(uri)
+        assert rv.status_code == 403
+
+    @with_feature_flags(GRANULAR_EXPORT_CONTROLS=True)
+    @patch.object(
+        SupersetSecurityManager,
+        "can_access",
+        side_effect=_deny_can_export_data,
+    )
+    def test_export_streaming_csv_403_without_can_export_data(
+        self, mock_can_access
+    ) -> None:
+        """When GRANULAR_EXPORT_CONTROLS is ON and user lacks can_export_data,
+        export_streaming_csv should return 403."""
+        self.login(ADMIN_USERNAME)
+        uri = "api/v1/sqllab/export_streaming/"
+        rv = self.client.post(uri, data={"client_id": "fake_client_id"})
+        assert rv.status_code == 403
+
+    @with_feature_flags(GRANULAR_EXPORT_CONTROLS=False)
+    @patch.object(
+        SupersetSecurityManager,
+        "can_access",
+        side_effect=_deny_can_export_data,
+    )
+    def test_export_csv_allowed_when_flag_disabled(self, mock_can_access) -> None:
+        """When GRANULAR_EXPORT_CONTROLS is OFF, no granular permission check
+        is enforced. The request may fail for other reasons (no query found),
+        but must not return 403."""
+        self.login(ADMIN_USERNAME)
+        uri = "api/v1/sqllab/export/fake_client_id/"
+        rv = self.client.get(uri)
+        assert rv.status_code != 403
+
+    @with_feature_flags(GRANULAR_EXPORT_CONTROLS=False)
+    @patch.object(
+        SupersetSecurityManager,
+        "can_access",
+        side_effect=_deny_can_export_data,
+    )
+    def test_export_streaming_csv_allowed_when_flag_disabled(
+        self, mock_can_access
+    ) -> None:
+        """When GRANULAR_EXPORT_CONTROLS is OFF, the granular permission check
+        is skipped even if the user lacks can_export_data."""
+        self.login(ADMIN_USERNAME)
+        uri = "api/v1/sqllab/export_streaming/"
+        rv = self.client.post(uri, data={"client_id": "fake_client_id"})
+        assert rv.status_code != 403
diff --git a/tests/integration_tests/users/api_tests.py b/tests/integration_tests/users/api_tests.py
index 0b6822ebbf3..85985f9f35b 100644
--- a/tests/integration_tests/users/api_tests.py
+++ b/tests/integration_tests/users/api_tests.py
@@ -50,6 +50,8 @@ class TestCurrentUserApi(SupersetTestCase):
         response = json.loads(rv.data.decode("utf-8"))
         roles = list(response["result"]["roles"].keys())
         assert "Admin" == roles.pop()
+        assert "groups" in response["result"]
+        assert isinstance(response["result"]["groups"], list)
 
     @patch("superset.security.manager.g")
     def test_get_my_roles_anonymous(self, mock_g):
diff --git a/tests/unit_tests/charts/test_chart_data_api.py b/tests/unit_tests/charts/test_chart_data_api.py
new file mode 100644
index 00000000000..51218258c81
--- /dev/null
+++ b/tests/unit_tests/charts/test_chart_data_api.py
@@ -0,0 +1,71 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+from __future__ import annotations
+
+from flask import Flask, g
+
+from superset.utils import json
+
+
+def test_get_data_sets_g_form_data_without_dashboard_filter() -> None:
+    """
+    Regression test: GET /api/v1/chart/<pk>/data/ must populate g.form_data
+    with the saved query context even when filters_dashboard_id is absent.
+
+    Without this, Jinja macros like metric() that call
+    get_dataset_id_from_context() cannot resolve the dataset and raise a 500.
+    """
+    query_context_json = {
+        "datasource": {"id": 42, "type": "table"},
+        "force": False,
+        "queries": [
+            {
+                "columns": ["col1"],
+                "metrics": ["count"],
+            }
+        ],
+        "result_format": "json",
+        "result_type": "full",
+    }
+
+    app = Flask(__name__)
+
+    with app.test_request_context("/api/v1/chart/1/data/"):
+        # Simulate the code path from ChartDataRestApi.get_data that
+        # parses the saved query_context and sets g.form_data.
+        json_body = json.loads(json.dumps(query_context_json))
+
+        # Override saved query context (mirrors the API endpoint)
+        json_body["result_format"] = "json"
+        json_body["result_type"] = "full"
+        json_body["force"] = None
+
+        # No filters_dashboard_id → the dashboard-filter block is skipped
+        filters_dashboard_id = None
+
+        if filters_dashboard_id is not None:
+            # This block would merge dashboard filters and set g.form_data
+            # inside the conditional — the old (broken) behavior.
+            pass
+
+        # The fix: g.form_data is set unconditionally
+        g.form_data = json_body
+
+        # Verify metric() Jinja macro can find the datasource
+        assert hasattr(g, "form_data")
+        assert g.form_data["datasource"] == {"id": 42, "type": "table"}
+        assert g.form_data["queries"][0]["columns"] == ["col1"]
diff --git a/tests/unit_tests/charts/test_dashboard_filter_context.py b/tests/unit_tests/charts/test_dashboard_filter_context.py
new file mode 100644
index 00000000000..9be05929f64
--- /dev/null
+++ b/tests/unit_tests/charts/test_dashboard_filter_context.py
@@ -0,0 +1,525 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+from __future__ import annotations
+
+from typing import Any
+from unittest.mock import MagicMock, patch
+
+import pytest
+
+from superset.charts.data.dashboard_filter_context import (
+    _extract_filter_extra_form_data,
+    _find_chart_layout_item,
+    _is_filter_in_scope_for_chart,
+    _merge_extra_form_data,
+    _validate_chart_on_dashboard,
+    DashboardFilterContext,
+    DashboardFilterStatus,
+    get_dashboard_filter_context,
+)
+from superset.utils import json
+
+SAMPLE_POSITION_JSON = {
+    "ROOT_ID": {
+        "id": "ROOT_ID",
+        "type": "ROOT",
+        "children": ["GRID_ID"],
+    },
+    "GRID_ID": {
+        "id": "GRID_ID",
+        "type": "GRID",
+        "children": ["ROW-abc"],
+        "parents": ["ROOT_ID"],
+    },
+    "ROW-abc": {
+        "id": "ROW-abc",
+        "type": "ROW",
+        "children": ["CHART-xyz"],
+        "parents": ["ROOT_ID", "GRID_ID"],
+    },
+    "CHART-xyz": {
+        "id": "CHART-xyz",
+        "type": "CHART",
+        "meta": {"chartId": 10},
+        "parents": ["ROOT_ID", "GRID_ID", "ROW-abc"],
+    },
+    "CHART-other": {
+        "id": "CHART-other",
+        "type": "CHART",
+        "meta": {"chartId": 20},
+        "parents": ["ROOT_ID", "GRID_ID", "ROW-abc"],
+    },
+}
+
+
+def _make_filter(
+    flt_id: str = "NATIVE_FILTER-1",
+    name: str = "Region Filter",
+    scope_root: list[str] | None = None,
+    scope_excluded: list[int] | None = None,
+    charts_in_scope: list[int] | None = None,
+    default_value: list[str] | None = None,
+    extra_form_data: dict[str, Any] | None = None,
+    default_to_first_item: bool = False,
+    target_column: str | None = "region",
+    flt_type: str = "NATIVE_FILTER",
+) -> dict[str, Any]:
+    """Helper to build a native filter config dict for testing."""
+    flt: dict[str, Any] = {
+        "id": flt_id,
+        "name": name,
+        "type": flt_type,
+        "filterType": "filter_select",
+        "targets": [{"datasetId": 1, "column": {"name": target_column}}]
+        if target_column
+        else [],
+        "scope": {
+            "rootPath": scope_root or ["ROOT_ID"],
+            "excluded": scope_excluded or [],
+        },
+        "controlValues": {
+            "defaultToFirstItem": default_to_first_item,
+            "multiSelect": True,
+            "enableEmptyFilter": False,
+        },
+        "defaultDataMask": {},
+    }
+    if charts_in_scope is not None:
+        flt["chartsInScope"] = charts_in_scope
+    if default_value is not None:
+        flt["defaultDataMask"]["filterState"] = {"value": default_value}
+        if extra_form_data is None:
+            extra_form_data = {
+                "filters": [{"col": target_column, "op": "IN", "val": default_value}]
+            }
+    if extra_form_data is not None:
+        flt["defaultDataMask"]["extraFormData"] = extra_form_data
+    return flt
+
+
+# --- _find_chart_layout_item ---
+
+
+def test_find_chart_layout_item_found() -> None:
+    result = _find_chart_layout_item(10, SAMPLE_POSITION_JSON)
+    assert result is not None
+    assert result["id"] == "CHART-xyz"
+    assert result["meta"]["chartId"] == 10
+
+
+def test_find_chart_layout_item_not_found() -> None:
+    result = _find_chart_layout_item(999, SAMPLE_POSITION_JSON)
+    assert result is None
+
+
+def test_find_chart_layout_item_skips_non_dict_entries() -> None:
+    position = {**SAMPLE_POSITION_JSON, "DASHBOARD_VERSION_KEY": "v2"}
+    result = _find_chart_layout_item(10, position)
+    assert result is not None
+
+
+# --- _is_filter_in_scope_for_chart ---
+
+
+def test_filter_in_scope_via_charts_in_scope() -> None:
+    flt = _make_filter(charts_in_scope=[10, 20])
+    assert _is_filter_in_scope_for_chart(flt, 10, SAMPLE_POSITION_JSON) is True
+
+
+def test_filter_not_in_scope_via_charts_in_scope() -> None:
+    flt = _make_filter(charts_in_scope=[20, 30])
+    assert _is_filter_in_scope_for_chart(flt, 10, SAMPLE_POSITION_JSON) is False
+
+
+def test_filter_empty_charts_in_scope_not_in_scope() -> None:
+    """Empty chartsInScope means in scope for no charts; do not fall back to rootPath"""
+    flt = _make_filter(charts_in_scope=[], scope_root=["ROOT_ID"])
+    assert _is_filter_in_scope_for_chart(flt, 10, SAMPLE_POSITION_JSON) is False
+
+
+def test_filter_in_scope_via_root_path() -> None:
+    flt = _make_filter(scope_root=["ROOT_ID"])
+    assert _is_filter_in_scope_for_chart(flt, 10, SAMPLE_POSITION_JSON) is True
+
+
+def test_filter_excluded_from_scope() -> None:
+    flt = _make_filter(scope_root=["ROOT_ID"], scope_excluded=[10])
+    assert _is_filter_in_scope_for_chart(flt, 10, SAMPLE_POSITION_JSON) is False
+
+
+def test_filter_not_in_scope_different_root() -> None:
+    flt = _make_filter(scope_root=["TABS-nonexistent"])
+    assert _is_filter_in_scope_for_chart(flt, 10, SAMPLE_POSITION_JSON) is False
+
+
+def test_filter_in_scope_chart_not_in_layout() -> None:
+    flt = _make_filter(scope_root=["ROOT_ID"])
+    assert _is_filter_in_scope_for_chart(flt, 999, SAMPLE_POSITION_JSON) is False
+
+
+# --- _extract_filter_extra_form_data ---
+
+
+def test_extract_static_default_applied() -> None:
+    flt = _make_filter(default_value=["US", "UK"])
+    extra_form_data, status = _extract_filter_extra_form_data(flt)
+    assert status == DashboardFilterStatus.APPLIED
+    assert extra_form_data is not None
+    assert extra_form_data["filters"][0]["val"] == ["US", "UK"]
+
+
+def test_extract_default_to_first_item_not_applied() -> None:
+    """defaultToFirstItem filters require a pre-query and cannot be applied."""
+    flt = _make_filter(default_to_first_item=True)
+    extra_form_data, status = _extract_filter_extra_form_data(flt)
+    assert (
+        status == DashboardFilterStatus.NOT_APPLIED_USES_DEFAULT_TO_FIRST_ITEM_PREQUERY
+    )
+    assert extra_form_data is None
+
+
+def test_extract_no_default_value_not_applied() -> None:
+    """Filters with no default are not applied, matching dashboard initial load."""
+    flt = _make_filter()
+    extra_form_data, status = _extract_filter_extra_form_data(flt)
+    assert status == DashboardFilterStatus.NOT_APPLIED
+    assert extra_form_data is None
+
+
+def test_extract_default_to_first_item_overrides_static_default() -> None:
+    """defaultToFirstItem takes precedence even when a static default exists."""
+    flt = _make_filter(default_value=["US"], default_to_first_item=True)
+    extra_form_data, status = _extract_filter_extra_form_data(flt)
+    assert (
+        status == DashboardFilterStatus.NOT_APPLIED_USES_DEFAULT_TO_FIRST_ITEM_PREQUERY
+    )
+    assert extra_form_data is None
+
+
+def test_extract_filter_state_value_but_no_extra_form_data() -> None:
+    """Edge case: filterState.value set but extraFormData not persisted."""
+    flt = _make_filter()
+    flt["defaultDataMask"] = {"filterState": {"value": ["US"]}}
+    extra_form_data, status = _extract_filter_extra_form_data(flt)
+    assert status == DashboardFilterStatus.NOT_APPLIED
+    assert extra_form_data is None
+
+
+# --- _merge_extra_form_data ---
+
+
+def test_merge_extra_form_data_appends_filters() -> None:
+    base = {"filters": [{"col": "a", "op": "IN", "val": ["x"]}]}
+    new = {"filters": [{"col": "b", "op": "IN", "val": ["y"]}]}
+    merged = _merge_extra_form_data(base, new)
+    assert len(merged["filters"]) == 2
+
+
+def test_merge_extra_form_data_overrides_scalars() -> None:
+    base = {"time_range": "last week"}
+    new = {"time_range": "last month"}
+    merged = _merge_extra_form_data(base, new)
+    assert merged["time_range"] == "last month"
+
+
+def test_merge_extra_form_data_empty_inputs() -> None:
+    assert _merge_extra_form_data({}, {}) == {}
+
+
+def test_merge_extra_form_data_merges_custom_form_data_dicts() -> None:
+    """custom_form_data is a dict; multiple filters' contributions are merged."""
+    base = {"custom_form_data": {"groupby": ["col1"]}}
+    new = {"custom_form_data": {"foo": "bar"}}
+    merged = _merge_extra_form_data(base, new)
+    assert merged["custom_form_data"] == {"groupby": ["col1"], "foo": "bar"}
+
+
+# --- _get_filter_target_column ---
+
+
+def test_target_column_from_dict() -> None:
+    from superset.charts.data.dashboard_filter_context import _get_filter_target_column
+
+    flt = _make_filter(target_column="country")
+    assert _get_filter_target_column(flt) == "country"
+
+
+def test_target_column_no_targets() -> None:
+    from superset.charts.data.dashboard_filter_context import _get_filter_target_column
+
+    flt = _make_filter(target_column=None)
+    flt["targets"] = []
+    assert _get_filter_target_column(flt) is None
+
+
+# --- validate_chart_on_dashboard ---
+
+
+def test_validate_chart_on_dashboard_success() -> None:
+    dashboard = MagicMock()
+    slice_obj = MagicMock()
+    slice_obj.id = 10
+    dashboard.slices = [slice_obj]
+    _validate_chart_on_dashboard(dashboard, 10)
+
+
+def test_validate_chart_on_dashboard_fails() -> None:
+    dashboard = MagicMock()
+    dashboard.id = 42
+    slice_obj = MagicMock()
+    slice_obj.id = 10
+    dashboard.slices = [slice_obj]
+    with pytest.raises(ValueError, match="not on dashboard"):
+        _validate_chart_on_dashboard(dashboard, 999)
+
+
+# --- DashboardFilterContext.to_dict ---
+
+
+def test_dashboard_filter_context_to_dict() -> None:
+    from superset.charts.data.dashboard_filter_context import DashboardFilterInfo
+
+    ctx = DashboardFilterContext(
+        extra_form_data={"filters": [{"col": "a", "op": "IN", "val": ["x"]}]},
+        filters=[
+            DashboardFilterInfo(
+                id="f1",
+                name="Filter 1",
+                status=DashboardFilterStatus.APPLIED,
+                column="a",
+            ),
+            DashboardFilterInfo(
+                id="f2",
+                name="Filter 2",
+                status=DashboardFilterStatus.NOT_APPLIED,
+            ),
+        ],
+    )
+    result = ctx.to_dict()
+    assert len(result["filters"]) == 2
+    assert result["filters"][0]["status"] == "applied"
+    assert result["filters"][0]["column"] == "a"
+    assert result["filters"][1]["status"] == "not_applied"
+    assert "column" not in result["filters"][1]
+
+
+# --- get_dashboard_filter_context (integration with mocks) ---
+
+
+@patch("superset.charts.data.dashboard_filter_context._check_dashboard_access")
+@patch("superset.charts.data.dashboard_filter_context.db")
+def test_get_dashboard_filter_context_dashboard_not_found(
+    mock_db: MagicMock,
+    mock_check_access: MagicMock,
+) -> None:
+    (
+        mock_db.session.query.return_value.filter_by.return_value.one_or_none.return_value
+    ) = None
+    with pytest.raises(ValueError, match="not found"):
+        get_dashboard_filter_context(dashboard_id=999, chart_id=10)
+
+
+@patch("superset.charts.data.dashboard_filter_context._check_dashboard_access")
+@patch("superset.charts.data.dashboard_filter_context.db")
+def test_get_dashboard_filter_context_chart_not_on_dashboard(
+    mock_db: MagicMock,
+    mock_check_access: MagicMock,
+) -> None:
+    dashboard = MagicMock()
+    dashboard.id = 42
+    slice_obj = MagicMock()
+    slice_obj.id = 20
+    dashboard.slices = [slice_obj]
+    dashboard.json_metadata = "{}"
+    dashboard.position_json = "{}"
+    (
+        mock_db.session.query.return_value.filter_by.return_value.one_or_none.return_value
+    ) = dashboard
+    with pytest.raises(ValueError, match="not on dashboard"):
+        get_dashboard_filter_context(dashboard_id=42, chart_id=10)
+
+
+@patch("superset.charts.data.dashboard_filter_context._check_dashboard_access")
+@patch("superset.charts.data.dashboard_filter_context.db")
+def test_get_dashboard_filter_context_static_defaults(
+    mock_db: MagicMock,
+    mock_check_access: MagicMock,
+) -> None:
+    filter_config = [
+        _make_filter(
+            flt_id="f1",
+            name="Region",
+            scope_root=["ROOT_ID"],
+            default_value=["US", "UK"],
+            target_column="region",
+        ),
+    ]
+    metadata = {"native_filter_configuration": filter_config}
+
+    dashboard = MagicMock()
+    dashboard.id = 1
+    slice_obj = MagicMock()
+    slice_obj.id = 10
+    dashboard.slices = [slice_obj]
+    dashboard.json_metadata = json.dumps(metadata)
+    dashboard.position_json = json.dumps(SAMPLE_POSITION_JSON)
+    (
+        mock_db.session.query.return_value.filter_by.return_value.one_or_none.return_value
+    ) = dashboard
+
+    ctx = get_dashboard_filter_context(dashboard_id=1, chart_id=10)
+
+    assert len(ctx.filters) == 1
+    assert ctx.filters[0].status == DashboardFilterStatus.APPLIED
+    assert ctx.filters[0].column == "region"
+    assert len(ctx.extra_form_data.get("filters", [])) == 1
+    assert ctx.extra_form_data["filters"][0]["val"] == ["US", "UK"]
+
+
+@patch("superset.charts.data.dashboard_filter_context._check_dashboard_access")
+@patch("superset.charts.data.dashboard_filter_context.db")
+def test_get_dashboard_filter_context_mixed_filter_types(
+    mock_db: MagicMock,
+    mock_check_access: MagicMock,
+) -> None:
+    """Test with a mix of static, dynamic, and no-default filters."""
+    filter_config = [
+        _make_filter(
+            flt_id="f1",
+            name="Region",
+            scope_root=["ROOT_ID"],
+            default_value=["US"],
+            target_column="region",
+        ),
+        _make_filter(
+            flt_id="f2",
+            name="City",
+            scope_root=["ROOT_ID"],
+            default_to_first_item=True,
+            target_column="city",
+        ),
+        _make_filter(
+            flt_id="f3",
+            name="Status",
+            scope_root=["ROOT_ID"],
+            target_column="status",
+        ),
+    ]
+    metadata = {"native_filter_configuration": filter_config}
+
+    dashboard = MagicMock()
+    dashboard.id = 1
+    slice_obj = MagicMock()
+    slice_obj.id = 10
+    dashboard.slices = [slice_obj]
+    dashboard.json_metadata = json.dumps(metadata)
+    dashboard.position_json = json.dumps(SAMPLE_POSITION_JSON)
+    (
+        mock_db.session.query.return_value.filter_by.return_value.one_or_none.return_value
+    ) = dashboard
+
+    ctx = get_dashboard_filter_context(dashboard_id=1, chart_id=10)
+
+    assert len(ctx.filters) == 3
+    assert ctx.filters[0].status == DashboardFilterStatus.APPLIED
+    assert (
+        ctx.filters[1].status
+        == DashboardFilterStatus.NOT_APPLIED_USES_DEFAULT_TO_FIRST_ITEM_PREQUERY
+    )
+    assert ctx.filters[2].status == DashboardFilterStatus.NOT_APPLIED
+
+    # Only the static-default filter should contribute to extra_form_data
+    assert len(ctx.extra_form_data.get("filters", [])) == 1
+
+
+@patch("superset.charts.data.dashboard_filter_context._check_dashboard_access")
+@patch("superset.charts.data.dashboard_filter_context.db")
+def test_get_dashboard_filter_context_skips_dividers(
+    mock_db: MagicMock,
+    mock_check_access: MagicMock,
+) -> None:
+    filter_config = [
+        {
+            "id": "div-1",
+            "type": "DIVIDER",
+            "name": "Separator",
+        },
+        _make_filter(
+            flt_id="f1",
+            name="Region",
+            scope_root=["ROOT_ID"],
+            default_value=["US"],
+            target_column="region",
+        ),
+    ]
+    metadata = {"native_filter_configuration": filter_config}
+
+    dashboard = MagicMock()
+    dashboard.id = 1
+    slice_obj = MagicMock()
+    slice_obj.id = 10
+    dashboard.slices = [slice_obj]
+    dashboard.json_metadata = json.dumps(metadata)
+    dashboard.position_json = json.dumps(SAMPLE_POSITION_JSON)
+    (
+        mock_db.session.query.return_value.filter_by.return_value.one_or_none.return_value
+    ) = dashboard
+
+    ctx = get_dashboard_filter_context(dashboard_id=1, chart_id=10)
+    assert len(ctx.filters) == 1
+    assert ctx.filters[0].name == "Region"
+
+
+@patch("superset.charts.data.dashboard_filter_context._check_dashboard_access")
+@patch("superset.charts.data.dashboard_filter_context.db")
+def test_get_dashboard_filter_context_out_of_scope_filter_excluded(
+    mock_db: MagicMock,
+    mock_check_access: MagicMock,
+) -> None:
+    """Filters not in scope for the chart should be excluded."""
+    filter_config = [
+        _make_filter(
+            flt_id="f1",
+            name="In-scope",
+            scope_root=["ROOT_ID"],
+            default_value=["US"],
+            target_column="region",
+        ),
+        _make_filter(
+            flt_id="f2",
+            name="Out-of-scope",
+            scope_root=["TABS-nonexistent"],
+            default_value=["active"],
+            target_column="status",
+        ),
+    ]
+    metadata = {"native_filter_configuration": filter_config}
+
+    dashboard = MagicMock()
+    dashboard.id = 1
+    slice_obj = MagicMock()
+    slice_obj.id = 10
+    dashboard.slices = [slice_obj]
+    dashboard.json_metadata = json.dumps(metadata)
+    dashboard.position_json = json.dumps(SAMPLE_POSITION_JSON)
+    (
+        mock_db.session.query.return_value.filter_by.return_value.one_or_none.return_value
+    ) = dashboard
+
+    ctx = get_dashboard_filter_context(dashboard_id=1, chart_id=10)
+    assert len(ctx.filters) == 1
+    assert ctx.filters[0].id == "f1"
diff --git a/tests/unit_tests/commands/databases/importers/v1/command_test.py b/tests/unit_tests/commands/databases/importers/v1/command_test.py
index 529b43d7343..bb4228af86f 100644
--- a/tests/unit_tests/commands/databases/importers/v1/command_test.py
+++ b/tests/unit_tests/commands/databases/importers/v1/command_test.py
@@ -93,3 +93,43 @@ def test_import_mask_password(
         == "postgresql://user:XXXXXXXXXX@localhost:5432/superset"
     )
     assert database.password == "password"  # noqa: S105
+
+
+def test_import_database_with_password_in_config(
+    mocker: MockerFixture,
+    session: Session,
+) -> None:
+    """
+    Test that passwords in the YAML config are used when importing databases.
+    """
+    from superset import db, security_manager
+    from superset.commands.database.importers.v1 import ImportDatabasesCommand
+    from superset.models.core import Database
+
+    mocker.patch("superset.commands.database.importers.v1.utils.add_permissions")
+    mocker.patch.object(security_manager, "can_access", return_value=True)
+
+    configs: dict[str, dict[str, Any]] = {
+        "databases/examples.yaml": {
+            "database_name": "examples_with_password",
+            "sqlalchemy_uri": "postgresql://user:XXXXXXXXXX@localhost:5432/superset",
+            "cache_timeout": None,
+            "expose_in_sqllab": True,
+            "allow_run_async": False,
+            "allow_ctas": False,
+            "allow_cvas": False,
+            "extra": {},
+            "uuid": "b3dc77af-e654-49bb-b321-40f6b559a1ee",
+            "version": "1.0.0",
+            "password": "yaml_password",  # Password provided in YAML config
+            "allow_csv_upload": False,
+        },
+    }
+
+    engine = db.session.get_bind()
+    Database.metadata.create_all(engine)  # pylint: disable=no-member
+
+    ImportDatabasesCommand._import(configs)
+    uuid = configs["databases/examples.yaml"]["uuid"]
+    database = db.session.query(Database).filter_by(uuid=uuid).one()
+    assert database.password == "yaml_password"  # noqa: S105
diff --git a/tests/unit_tests/commands/databases/utils_test.py b/tests/unit_tests/commands/databases/utils_test.py
index 04512e47f4f..a8fb3a36e54 100644
--- a/tests/unit_tests/commands/databases/utils_test.py
+++ b/tests/unit_tests/commands/databases/utils_test.py
@@ -77,7 +77,7 @@ def test_ping_sqlite_exception(mocker: MockerFixture, mock_engine: MockerFixture
     assert result is True
 
     mock_dialect.do_ping.assert_has_calls(
-        [mocker.call(mock_connection), mocker.call(mock_engine)]
+        [mocker.call(mock_connection), mocker.call(mock_connection)]
     )
 
 
@@ -85,7 +85,7 @@ def test_ping_runtime_exception(mocker: MockerFixture, mock_engine: MockerFixtur
     """
     Test the ``ping`` method when a RuntimeError is raised.
     """
-    mock_engine, _, mock_dialect = mock_engine
+    mock_engine, mock_connection, mock_dialect = mock_engine
     mock_timeout = mocker.patch("superset.commands.database.utils.timeout")
     mock_timeout.side_effect = RuntimeError("timeout")
     mock_dialect.do_ping.return_value = True
@@ -93,7 +93,7 @@ def test_ping_runtime_exception(mocker: MockerFixture, mock_engine: MockerFixtur
     result = ping(mock_engine)
 
     assert result is True
-    mock_dialect.do_ping.assert_called_once_with(mock_engine)
+    mock_dialect.do_ping.assert_called_once_with(mock_connection)
 
 
 @pytest.fixture
diff --git a/tests/unit_tests/commands/importers/v1/assets_test.py b/tests/unit_tests/commands/importers/v1/assets_test.py
index 0f2a05ad12d..51c1194947d 100644
--- a/tests/unit_tests/commands/importers/v1/assets_test.py
+++ b/tests/unit_tests/commands/importers/v1/assets_test.py
@@ -17,6 +17,7 @@
 
 import copy
 
+import yaml
 from pytest_mock import MockerFixture
 from sqlalchemy.orm.session import Session
 from sqlalchemy.sql import select
@@ -102,6 +103,119 @@ def test_import_adds_dashboard_charts(mocker: MockerFixture, session: Session) -
     assert len(dashboard_ids) == expected_number_of_dashboards
 
 
+def test_import_assets_imports_tags(mocker: MockerFixture, session: Session) -> None:
+    """
+    Test that tags on charts and dashboards are imported when importing assets
+    via ``ImportAssetsCommand`` (the code path used by the CLI ``sync native``
+    command). Previously tags were silently dropped for the CLI path.
+    """
+    from superset import db, security_manager
+    from superset.commands.importers.v1.assets import ImportAssetsCommand
+    from superset.extensions import feature_flag_manager
+    from superset.models.dashboard import Dashboard
+    from superset.models.slice import Slice
+    from superset.tags.models import Tag, TaggedObject
+
+    mocker.patch.object(security_manager, "can_access", return_value=True)
+    mocker.patch.object(feature_flag_manager, "is_feature_enabled", return_value=True)
+
+    engine = db.session.get_bind()
+    Slice.metadata.create_all(engine)  # pylint: disable=no-member
+    Tag.metadata.create_all(engine)  # pylint: disable=no-member
+
+    charts_with_tags = copy.deepcopy(charts_config_1)
+    for chart_config in charts_with_tags.values():
+        chart_config["tags"] = ["chart_tag"]
+
+    dashboards_with_tags = copy.deepcopy(dashboards_config_1)
+    for dashboard_config in dashboards_with_tags.values():
+        dashboard_config["tags"] = ["dashboard_tag"]
+
+    configs = {
+        **copy.deepcopy(databases_config),
+        **copy.deepcopy(datasets_config),
+        **charts_with_tags,
+        **dashboards_with_tags,
+    }
+    contents = {
+        "tags.yaml": yaml.dump(
+            {
+                "tags": [
+                    {"tag_name": "chart_tag", "description": "Tag for charts"},
+                    {
+                        "tag_name": "dashboard_tag",
+                        "description": "Tag for dashboards",
+                    },
+                ]
+            }
+        )
+    }
+
+    ImportAssetsCommand._import(configs, contents=contents)
+
+    chart_uuids = {config["uuid"] for config in charts_with_tags.values()}
+    imported_charts = db.session.query(Slice).filter(Slice.uuid.in_(chart_uuids)).all()
+    assert len(imported_charts) == len(chart_uuids)
+    for chart in imported_charts:
+        assocs = (
+            db.session.query(TaggedObject)
+            .filter_by(object_id=chart.id, object_type="chart")
+            .all()
+        )
+        assert len(assocs) == 1
+        assert assocs[0].tag.name == "chart_tag"
+
+    dashboard_uuids = {config["uuid"] for config in dashboards_with_tags.values()}
+    imported_dashboards = (
+        db.session.query(Dashboard).filter(Dashboard.uuid.in_(dashboard_uuids)).all()
+    )
+    assert len(imported_dashboards) == len(dashboard_uuids)
+    for dashboard in imported_dashboards:
+        assocs = (
+            db.session.query(TaggedObject)
+            .filter_by(object_id=dashboard.id, object_type="dashboard")
+            .all()
+        )
+        assert len(assocs) == 1
+        assert assocs[0].tag.name == "dashboard_tag"
+
+
+def test_import_assets_skips_tags_when_feature_disabled(
+    mocker: MockerFixture, session: Session
+) -> None:
+    """
+    Test that tag import is skipped when the ``TAGGING_SYSTEM`` feature flag
+    is disabled, even when the configs include tags.
+    """
+    from superset import db, security_manager
+    from superset.commands.importers.v1.assets import ImportAssetsCommand
+    from superset.extensions import feature_flag_manager
+    from superset.models.slice import Slice
+    from superset.tags.models import Tag, TaggedObject
+
+    mocker.patch.object(security_manager, "can_access", return_value=True)
+    mocker.patch.object(feature_flag_manager, "is_feature_enabled", return_value=False)
+
+    engine = db.session.get_bind()
+    Slice.metadata.create_all(engine)  # pylint: disable=no-member
+    Tag.metadata.create_all(engine)  # pylint: disable=no-member
+
+    charts_with_tags = copy.deepcopy(charts_config_1)
+    for chart_config in charts_with_tags.values():
+        chart_config["tags"] = ["chart_tag"]
+
+    configs = {
+        **copy.deepcopy(databases_config),
+        **copy.deepcopy(datasets_config),
+        **charts_with_tags,
+        **copy.deepcopy(dashboards_config_1),
+    }
+
+    ImportAssetsCommand._import(configs)
+
+    assert db.session.query(TaggedObject).count() == 0
+
+
 def test_import_removes_dashboard_charts(
     mocker: MockerFixture, session: Session
 ) -> None:
diff --git a/tests/unit_tests/commands/report/create_test.py b/tests/unit_tests/commands/report/create_test.py
new file mode 100644
index 00000000000..aa3f92a71a7
--- /dev/null
+++ b/tests/unit_tests/commands/report/create_test.py
@@ -0,0 +1,222 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+from typing import Any
+from unittest.mock import MagicMock
+
+import pytest
+from marshmallow import ValidationError
+from pytest_mock import MockerFixture
+
+from superset.commands.report.create import CreateReportScheduleCommand
+from superset.commands.report.exceptions import (
+    DatabaseNotFoundValidationError,
+    ReportScheduleAlertRequiredDatabaseValidationError,
+    ReportScheduleInvalidError,
+)
+from superset.reports.models import ReportScheduleType
+from superset.utils import json
+
+
+def _make_dashboard(position: dict[str, Any]) -> MagicMock:
+    dashboard = MagicMock()
+    dashboard.position_json = json.dumps(position)
+    return dashboard
+
+
+def test_validate_report_extra_null_extra() -> None:
+    command = CreateReportScheduleCommand({})
+    command._properties = {"extra": None}
+
+    exceptions: list[ValidationError] = []
+    command._validate_report_extra(exceptions)
+
+    assert len(exceptions) == 0
+
+
+def test_validate_report_extra_null_dashboard() -> None:
+    command = CreateReportScheduleCommand({})
+    command._properties = {"extra": {"dashboard": {}}, "dashboard": None}
+
+    exceptions: list[ValidationError] = []
+    command._validate_report_extra(exceptions)
+
+    assert len(exceptions) == 0
+
+
+def test_validate_report_extra_empty_active_tabs() -> None:
+    command = CreateReportScheduleCommand({})
+    command._properties = {
+        "extra": {"dashboard": {"activeTabs": []}},
+        "dashboard": _make_dashboard({"TAB-1": {}, "TAB-2": {}}),
+    }
+
+    exceptions: list[ValidationError] = []
+    command._validate_report_extra(exceptions)
+
+    assert len(exceptions) == 0
+
+
+def test_validate_report_extra_valid_tabs() -> None:
+    command = CreateReportScheduleCommand({})
+    command._properties = {
+        "extra": {"dashboard": {"activeTabs": ["TAB-1"]}},
+        "dashboard": _make_dashboard({"TAB-1": {}, "TAB-2": {}}),
+    }
+
+    exceptions: list[ValidationError] = []
+    command._validate_report_extra(exceptions)
+
+    assert len(exceptions) == 0
+
+
+def test_validate_report_extra_invalid_tabs() -> None:
+    command = CreateReportScheduleCommand({})
+    command._properties = {
+        "extra": {"dashboard": {"activeTabs": ["TAB-999"]}},
+        "dashboard": _make_dashboard({"TAB-1": {}}),
+    }
+
+    exceptions: list[ValidationError] = []
+    command._validate_report_extra(exceptions)
+
+    assert len(exceptions) == 1
+    assert exceptions[0].field_name == "extra"
+
+
+def test_validate_report_extra_anchor_json_valid() -> None:
+    command = CreateReportScheduleCommand({})
+    command._properties = {
+        "extra": {"dashboard": {"anchor": '["TAB-1"]'}},
+        "dashboard": _make_dashboard({"TAB-1": {}}),
+    }
+
+    exceptions: list[ValidationError] = []
+    command._validate_report_extra(exceptions)
+
+    assert len(exceptions) == 0
+
+
+def test_validate_report_extra_anchor_invalid_ids() -> None:
+    command = CreateReportScheduleCommand({})
+    command._properties = {
+        "extra": {"dashboard": {"anchor": '["TAB-999"]'}},
+        "dashboard": _make_dashboard({"TAB-1": {}}),
+    }
+
+    exceptions: list[ValidationError] = []
+    command._validate_report_extra(exceptions)
+
+    assert len(exceptions) == 1
+    assert exceptions[0].field_name == "extra"
+
+
+def test_validate_report_extra_anchor_string_valid() -> None:
+    command = CreateReportScheduleCommand({})
+    command._properties = {
+        "extra": {"dashboard": {"anchor": "TAB-1"}},
+        "dashboard": _make_dashboard({"TAB-1": {}}),
+    }
+
+    exceptions: list[ValidationError] = []
+    command._validate_report_extra(exceptions)
+
+    assert len(exceptions) == 0
+
+
+def test_validate_report_extra_anchor_string_invalid() -> None:
+    command = CreateReportScheduleCommand({})
+    command._properties = {
+        "extra": {"dashboard": {"anchor": "TAB-999"}},
+        "dashboard": _make_dashboard({"TAB-1": {}}),
+    }
+
+    exceptions: list[ValidationError] = []
+    command._validate_report_extra(exceptions)
+
+    assert len(exceptions) == 1
+    assert exceptions[0].field_name == "extra"
+
+
+# ---------------------------------------------------------------------------
+# Phase 1 gap closure: validate() — alert + database combos
+# ---------------------------------------------------------------------------
+
+
+def _stub_validate_deps(mocker: MockerFixture) -> None:
+    """Stub out all DAO and base-class calls inside validate() so the test
+    can exercise a single validation branch in isolation."""
+    mocker.patch.object(CreateReportScheduleCommand, "_populate_recipients")
+    mocker.patch(
+        "superset.commands.report.create.ReportScheduleDAO.validate_update_uniqueness",
+        return_value=True,
+    )
+    mocker.patch.object(CreateReportScheduleCommand, "validate_report_frequency")
+    mocker.patch.object(CreateReportScheduleCommand, "validate_chart_dashboard")
+    mocker.patch.object(CreateReportScheduleCommand, "_validate_report_extra")
+    mocker.patch(
+        "superset.commands.report.create.ReportScheduleDAO"
+        ".validate_unique_creation_method",
+        return_value=True,
+    )
+    mocker.patch.object(CreateReportScheduleCommand, "populate_owners", return_value=[])
+
+
+def test_validate_alert_missing_database_key(mocker: MockerFixture) -> None:
+    """Alert type without a 'database' key raises the required-database error."""
+    _stub_validate_deps(mocker)
+
+    command = CreateReportScheduleCommand({})
+    command._properties = {
+        "type": ReportScheduleType.ALERT,
+        "name": "Test Alert",
+        "crontab": "* * * * *",
+        "creation_method": "alerts_reports",
+    }
+
+    with pytest.raises(ReportScheduleInvalidError) as exc:
+        command.validate()
+
+    assert any(
+        isinstance(e, ReportScheduleAlertRequiredDatabaseValidationError)
+        for e in exc.value._exceptions
+    )
+
+
+def test_validate_alert_nonexistent_database(mocker: MockerFixture) -> None:
+    """Alert type with a database ID that doesn't exist raises not-found."""
+    _stub_validate_deps(mocker)
+    mocker.patch(
+        "superset.commands.report.create.DatabaseDAO.find_by_id",
+        return_value=None,
+    )
+
+    command = CreateReportScheduleCommand({})
+    command._properties = {
+        "type": ReportScheduleType.ALERT,
+        "name": "Test Alert",
+        "crontab": "* * * * *",
+        "creation_method": "alerts_reports",
+        "database": 999,
+    }
+
+    with pytest.raises(ReportScheduleInvalidError) as exc:
+        command.validate()
+
+    assert any(
+        isinstance(e, DatabaseNotFoundValidationError) for e in exc.value._exceptions
+    )
diff --git a/tests/unit_tests/commands/report/execute_test.py b/tests/unit_tests/commands/report/execute_test.py
index b2481be1bb3..d7ff25a3434 100644
--- a/tests/unit_tests/commands/report/execute_test.py
+++ b/tests/unit_tests/commands/report/execute_test.py
@@ -16,23 +16,42 @@
 # under the License.
 
 import json  # noqa: TID251
-from datetime import datetime
+from datetime import datetime, timedelta
 from unittest.mock import patch
-from uuid import UUID
+from uuid import UUID, uuid4
 
 import pytest
 from pytest_mock import MockerFixture
 
 from superset.app import SupersetApp
 from superset.commands.exceptions import UpdateFailedError
-from superset.commands.report.execute import BaseReportState
+from superset.commands.report.exceptions import (
+    ReportScheduleAlertGracePeriodError,
+    ReportScheduleCsvFailedError,
+    ReportSchedulePreviousWorkingError,
+    ReportScheduleScreenshotFailedError,
+    ReportScheduleScreenshotTimeout,
+    ReportScheduleStateNotFoundError,
+    ReportScheduleUnexpectedError,
+    ReportScheduleWorkingTimeoutError,
+)
+from superset.commands.report.execute import (
+    BaseReportState,
+    ReportNotTriggeredErrorState,
+    ReportScheduleStateMachine,
+    ReportSuccessState,
+    ReportWorkingState,
+)
+from superset.daos.report import REPORT_SCHEDULE_ERROR_NOTIFICATION_MARKER
 from superset.dashboards.permalink.types import DashboardPermalinkState
 from superset.reports.models import (
+    ReportDataFormat,
     ReportRecipients,
     ReportRecipientType,
     ReportSchedule,
     ReportScheduleType,
     ReportSourceFormat,
+    ReportState,
 )
 from superset.utils.core import HeaderDataType
 from superset.utils.screenshots import ChartScreenshot
@@ -259,6 +278,12 @@ def test_log_data_with_missing_values(mocker: MockerFixture) -> None:
             ["url1"],
             ["superset/dashboard/p/url1/"],
         ),
+        # Test JSON scalar string anchor falls back to single tab
+        (
+            json.dumps("mock_tab_anchor_1"),
+            ["url1"],
+            ["superset/dashboard/p/url1/"],
+        ),
     ],
 )
 @patch(
@@ -284,6 +309,10 @@ def test_get_dashboard_urls_with_multiple_tabs(
             "urlParams": None,
         }
     }
+    mock_report_schedule.get_native_filters_params.return_value = (  # type: ignore
+        "()",
+        [],
+    )
 
     class_instance: BaseReportState = BaseReportState(
         mock_report_schedule, "January 1, 2021", "execution_id_example"
@@ -327,6 +356,10 @@ def test_get_dashboard_urls_with_exporting_dashboard_only(
             "urlParams": None,
         }
     }
+    mock_report_schedule.get_native_filters_params.return_value = (  # type: ignore
+        "()",
+        [],
+    )
     mock_run.return_value = "url1"
 
     class_instance: BaseReportState = BaseReportState(
@@ -343,6 +376,227 @@ def test_get_dashboard_urls_with_exporting_dashboard_only(
     assert expected_url == result[0]
 
 
+@patch("superset.commands.report.execute.CreateDashboardPermalinkCommand")
+@with_feature_flags(ALERT_REPORT_TABS=True)
+def test_get_dashboard_urls_with_filters_and_tabs(
+    mock_permalink_cls,
+    mocker: MockerFixture,
+    app,
+) -> None:
+    mock_report_schedule: ReportSchedule = mocker.Mock(spec=ReportSchedule)
+    mock_report_schedule.chart = False
+    mock_report_schedule.chart_id = None
+    mock_report_schedule.dashboard_id = 123
+    mock_report_schedule.type = "report_type"
+    mock_report_schedule.report_format = "report_format"
+    mock_report_schedule.owners = [1, 2]
+    mock_report_schedule.recipients = []
+    native_filter_rison = "(NATIVE_FILTER-1:(filterType:filter_select))"
+    mock_report_schedule.extra = {
+        "dashboard": {
+            "anchor": json.dumps(["TAB-1", "TAB-2"]),
+            "dataMask": {"NATIVE_FILTER-1": {"filterState": {"value": ["Sales"]}}},
+            "activeTabs": ["TAB-1", "TAB-2"],
+            "urlParams": None,
+            "nativeFilters": [  # type: ignore[typeddict-unknown-key]
+                {
+                    "nativeFilterId": "NATIVE_FILTER-1",
+                    "filterType": "filter_select",
+                    "columnName": "department",
+                    "filterValues": ["Sales"],
+                }
+            ],
+        }
+    }
+    mock_report_schedule.get_native_filters_params.return_value = (  # type: ignore[attr-defined]
+        native_filter_rison,
+        [],
+    )
+    mock_permalink_cls.return_value.run.side_effect = ["key1", "key2"]
+
+    class_instance: BaseReportState = BaseReportState(
+        mock_report_schedule, "January 1, 2021", "execution_id_example"
+    )
+    class_instance._report_schedule = mock_report_schedule
+
+    result: list[str] = class_instance.get_dashboard_urls()
+
+    import urllib.parse
+
+    base_url = app.config.get("WEBDRIVER_BASEURL", "http://0.0.0.0:8080/")
+    assert result == [
+        urllib.parse.urljoin(base_url, "superset/dashboard/p/key1/"),
+        urllib.parse.urljoin(base_url, "superset/dashboard/p/key2/"),
+    ]
+    mock_report_schedule.get_native_filters_params.assert_called_once()  # type: ignore[attr-defined]
+    assert mock_permalink_cls.call_count == 2
+    for call in mock_permalink_cls.call_args_list:
+        state = call.kwargs["state"]
+        assert state["urlParams"] == [["native_filters", native_filter_rison]]
+    assert mock_permalink_cls.call_args_list[0].kwargs["state"]["anchor"] == "TAB-1"
+    assert mock_permalink_cls.call_args_list[1].kwargs["state"]["anchor"] == "TAB-2"
+
+
+@patch("superset.commands.report.execute.CreateDashboardPermalinkCommand")
+@with_feature_flags(ALERT_REPORT_TABS=True)
+def test_get_dashboard_urls_with_filters_no_tabs(
+    mock_permalink_cls,
+    mocker: MockerFixture,
+    app,
+) -> None:
+    mock_report_schedule: ReportSchedule = mocker.Mock(spec=ReportSchedule)
+    mock_report_schedule.chart = False
+    mock_report_schedule.chart_id = None
+    mock_report_schedule.dashboard_id = 123
+    mock_report_schedule.type = "report_type"
+    mock_report_schedule.report_format = "report_format"
+    mock_report_schedule.owners = [1, 2]
+    mock_report_schedule.recipients = []
+    native_filter_rison = "(NATIVE_FILTER-1:(filterType:filter_select))"
+    mock_report_schedule.extra = {
+        "dashboard": {
+            "anchor": "",
+            "dataMask": {"NATIVE_FILTER-1": {"filterState": {"value": ["Sales"]}}},
+            "activeTabs": None,
+            "urlParams": None,
+            "nativeFilters": [  # type: ignore[typeddict-unknown-key]
+                {
+                    "nativeFilterId": "NATIVE_FILTER-1",
+                    "filterType": "filter_select",
+                    "columnName": "department",
+                    "filterValues": ["Sales"],
+                }
+            ],
+        }
+    }
+    mock_report_schedule.get_native_filters_params.return_value = (  # type: ignore[attr-defined]
+        native_filter_rison,
+        [],
+    )
+    mock_permalink_cls.return_value.run.return_value = "key1"
+
+    class_instance: BaseReportState = BaseReportState(
+        mock_report_schedule, "January 1, 2021", "execution_id_example"
+    )
+    class_instance._report_schedule = mock_report_schedule
+
+    result: list[str] = class_instance.get_dashboard_urls()
+
+    import urllib.parse
+
+    base_url = app.config.get("WEBDRIVER_BASEURL", "http://0.0.0.0:8080/")
+    assert result == [
+        urllib.parse.urljoin(base_url, "superset/dashboard/p/key1/"),
+    ]
+    mock_report_schedule.get_native_filters_params.assert_called_once()  # type: ignore[attr-defined]
+    assert mock_permalink_cls.call_count == 1
+    state = mock_permalink_cls.call_args_list[0].kwargs["state"]
+    assert state["urlParams"] == [["native_filters", native_filter_rison]]
+
+
+@patch("superset.commands.report.execute.CreateDashboardPermalinkCommand")
+@with_feature_flags(ALERT_REPORT_TABS=True)
+def test_get_dashboard_urls_preserves_existing_url_params(
+    mock_permalink_cls,
+    mocker: MockerFixture,
+    app,
+) -> None:
+    """Existing urlParams (e.g. standalone) must survive native_filters merge."""
+    mock_report_schedule: ReportSchedule = mocker.Mock(spec=ReportSchedule)
+    mock_report_schedule.chart = False
+    mock_report_schedule.chart_id = None
+    mock_report_schedule.dashboard_id = 123
+    mock_report_schedule.type = "report_type"
+    mock_report_schedule.report_format = "report_format"
+    mock_report_schedule.owners = [1, 2]
+    mock_report_schedule.recipients = []
+    native_filter_rison = "(NATIVE_FILTER-1:(filterType:filter_select))"
+    mock_report_schedule.extra = {
+        "dashboard": {
+            "anchor": "",
+            "dataMask": {},
+            "activeTabs": None,
+            "urlParams": [("standalone", "true"), ("show_filters", "0")],
+            "nativeFilters": [  # type: ignore[typeddict-unknown-key]
+                {
+                    "nativeFilterId": "NATIVE_FILTER-1",
+                    "filterType": "filter_select",
+                    "columnName": "dept",
+                    "filterValues": ["Sales"],
+                }
+            ],
+        }
+    }
+    mock_report_schedule.get_native_filters_params.return_value = (  # type: ignore[attr-defined]
+        native_filter_rison,
+        [],
+    )
+    mock_permalink_cls.return_value.run.return_value = "key1"
+
+    class_instance: BaseReportState = BaseReportState(
+        mock_report_schedule, "January 1, 2021", "execution_id_example"
+    )
+    class_instance._report_schedule = mock_report_schedule
+
+    class_instance.get_dashboard_urls()
+
+    state = mock_permalink_cls.call_args_list[0].kwargs["state"]
+    assert state["urlParams"] == [
+        ["standalone", "true"],
+        ["show_filters", "0"],
+        ["native_filters", native_filter_rison],
+    ]
+
+
+@patch("superset.commands.report.execute.CreateDashboardPermalinkCommand")
+@with_feature_flags(ALERT_REPORT_TABS=True)
+def test_get_dashboard_urls_deduplicates_stale_native_filters(
+    mock_permalink_cls,
+    mocker: MockerFixture,
+    app,
+) -> None:
+    """A stale native_filters entry in urlParams is replaced, not duplicated."""
+    mock_report_schedule: ReportSchedule = mocker.Mock(spec=ReportSchedule)
+    mock_report_schedule.chart = False
+    mock_report_schedule.chart_id = None
+    mock_report_schedule.dashboard_id = 123
+    mock_report_schedule.type = "report_type"
+    mock_report_schedule.report_format = "report_format"
+    mock_report_schedule.owners = [1, 2]
+    mock_report_schedule.recipients = []
+    native_filter_rison = "(NATIVE_FILTER-1:(new:value))"
+    mock_report_schedule.extra = {
+        "dashboard": {
+            "anchor": "",
+            "dataMask": {},
+            "activeTabs": None,
+            "urlParams": [
+                ("standalone", "true"),
+                ("native_filters", "(old:stale_value)"),
+            ],
+            "nativeFilters": [],  # type: ignore[typeddict-unknown-key]
+        }
+    }
+    mock_report_schedule.get_native_filters_params.return_value = (  # type: ignore[attr-defined]
+        native_filter_rison,
+        [],
+    )
+    mock_permalink_cls.return_value.run.return_value = "key1"
+
+    class_instance: BaseReportState = BaseReportState(
+        mock_report_schedule, "January 1, 2021", "execution_id_example"
+    )
+    class_instance._report_schedule = mock_report_schedule
+
+    class_instance.get_dashboard_urls()
+
+    state = mock_permalink_cls.call_args_list[0].kwargs["state"]
+    assert state["urlParams"] == [
+        ["standalone", "true"],
+        ["native_filters", native_filter_rison],
+    ]
+
+
 @patch(
     "superset.commands.dashboard.permalink.create.CreateDashboardPermalinkCommand.run"
 )
@@ -399,6 +653,55 @@ def test_get_tab_url(
     assert result == urllib.parse.urljoin(base_url, "superset/dashboard/p/uri/")
 
 
+@patch(
+    "superset.commands.dashboard.permalink.create.CreateDashboardPermalinkCommand.run"
+)
+@with_feature_flags(ALERT_REPORT_TABS=False)
+def test_get_dashboard_urls_native_filters_without_tabs(
+    mock_run,
+    mocker: MockerFixture,
+    app,
+) -> None:
+    """Native filters should be applied even when ALERT_REPORT_TABS is disabled."""
+    mock_report_schedule: ReportSchedule = mocker.Mock(spec=ReportSchedule)
+    mock_report_schedule.chart = False
+    mock_report_schedule.chart_id = None
+    mock_report_schedule.dashboard_id = 123
+    mock_report_schedule.force_screenshot = False
+    extra = {
+        "dashboard": {
+            "nativeFilters": [
+                {
+                    "nativeFilterId": "NATIVE_FILTER-abc",
+                    "filterType": "filter_select",
+                    "columnName": "col1",
+                    "filterValues": ["val1"],
+                }
+            ]
+        }
+    }
+    mock_report_schedule.extra = extra  # type: ignore[assignment]
+    mock_report_schedule.get_native_filters_params.return_value = (  # type: ignore
+        "(NATIVE_FILTER-abc:!(val1))",
+        [],
+    )
+
+    mock_dashboard = mocker.MagicMock()
+    mock_dashboard.uuid = UUID("12345678-1234-1234-1234-123456789abc")
+    mock_report_schedule.dashboard = mock_dashboard
+
+    class_instance: BaseReportState = BaseReportState(
+        mock_report_schedule, "January 1, 2021", "execution_id_example"
+    )
+    class_instance._report_schedule = mock_report_schedule
+    mock_run.return_value = "permalink_key"
+
+    result: list[str] = class_instance.get_dashboard_urls()
+
+    assert len(result) == 1
+    assert "permalink_key" in result[0]
+
+
 def create_report_schedule(
     mocker: MockerFixture,
     custom_width: int | None = None,
@@ -582,3 +885,485 @@ def test_update_recipient_to_slack_v2_missing_channels(mocker: MockerFixture):
     )
     with pytest.raises(UpdateFailedError):
         mock_cmmd.update_report_schedule_slack_v2()
+
+
+# ---------------------------------------------------------------------------
+# Tier 1: _update_query_context + create_log
+# ---------------------------------------------------------------------------
+
+
+def test_update_query_context_wraps_screenshot_failure(mocker: MockerFixture) -> None:
+    """_update_query_context wraps ScreenshotFailedError as CsvFailedError."""
+    schedule = mocker.Mock(spec=ReportSchedule)
+    state = BaseReportState(schedule, datetime.utcnow(), uuid4())
+    state._report_schedule = schedule
+    mocker.patch.object(
+        state,
+        "_get_screenshots",
+        side_effect=ReportScheduleScreenshotFailedError("boom"),
+    )
+    with pytest.raises(ReportScheduleCsvFailedError, match="query context"):
+        state._update_query_context()
+
+
+def test_update_query_context_wraps_screenshot_timeout(mocker: MockerFixture) -> None:
+    """_update_query_context wraps ScreenshotTimeout as CsvFailedError."""
+    schedule = mocker.Mock(spec=ReportSchedule)
+    state = BaseReportState(schedule, datetime.utcnow(), uuid4())
+    state._report_schedule = schedule
+    mocker.patch.object(
+        state,
+        "_get_screenshots",
+        side_effect=ReportScheduleScreenshotTimeout(),
+    )
+    with pytest.raises(ReportScheduleCsvFailedError, match="query context"):
+        state._update_query_context()
+
+
+def test_create_log_stale_data_raises_unexpected_error(mocker: MockerFixture) -> None:
+    """StaleDataError during create_log should rollback and raise UnexpectedError."""
+    from sqlalchemy.orm.exc import StaleDataError
+
+    schedule = mocker.Mock(spec=ReportSchedule)
+    schedule.last_value = None
+    schedule.last_value_row_json = None
+    schedule.last_state = ReportState.WORKING
+
+    state = BaseReportState(schedule, datetime.utcnow(), uuid4())
+    state._report_schedule = schedule
+
+    mock_db = mocker.patch("superset.commands.report.execute.db")
+    mock_db.session.commit.side_effect = StaleDataError("stale")
+    # Prevent SQLAlchemy from inspecting the mock schedule during log creation
+    mocker.patch(
+        "superset.commands.report.execute.ReportExecutionLog",
+        return_value=mocker.Mock(),
+    )
+
+    with pytest.raises(ReportScheduleUnexpectedError):
+        state.create_log()
+    mock_db.session.rollback.assert_called_once()
+
+
+# ---------------------------------------------------------------------------
+# Tier 2: _get_notification_content branches
+# ---------------------------------------------------------------------------
+
+
+def _make_notification_state(
+    mocker: MockerFixture,
+    *,
+    report_format: ReportDataFormat = ReportDataFormat.PNG,
+    schedule_type: ReportScheduleType = ReportScheduleType.REPORT,
+    has_chart: bool = True,
+    email_subject: str | None = None,
+    chart_name: str = "My Chart",
+    dashboard_title: str = "My Dashboard",
+) -> BaseReportState:
+    """Build a BaseReportState with a mock schedule for notification tests."""
+    schedule = mocker.Mock(spec=ReportSchedule)
+    schedule.type = schedule_type
+    schedule.report_format = report_format
+    schedule.name = "Test Schedule"
+    schedule.description = "desc"
+    schedule.email_subject = email_subject
+    schedule.force_screenshot = False
+    schedule.recipients = []
+    schedule.owners = []
+
+    if has_chart:
+        schedule.chart = mocker.Mock()
+        schedule.chart.slice_name = chart_name
+        schedule.dashboard = None
+    else:
+        schedule.chart = None
+        schedule.dashboard = mocker.Mock()
+        schedule.dashboard.dashboard_title = dashboard_title
+        schedule.dashboard.uuid = "dash-uuid"
+        schedule.dashboard.id = 1
+
+    schedule.extra = {}
+
+    state = BaseReportState(schedule, datetime.utcnow(), uuid4())
+    state._report_schedule = schedule
+
+    # Stub helpers that _get_notification_content calls
+    mocker.patch.object(state, "_get_log_data", return_value={})
+    mocker.patch.object(state, "_get_url", return_value="http://example.com")
+
+    return state
+
+
+@patch("superset.commands.report.execute.feature_flag_manager")
+def test_get_notification_content_png_screenshot(
+    mock_ff, mocker: MockerFixture
+) -> None:
+    mock_ff.is_feature_enabled.return_value = False
+    state = _make_notification_state(mocker, report_format=ReportDataFormat.PNG)
+    mocker.patch.object(state, "_get_screenshots", return_value=[b"img1", b"img2"])
+
+    content = state._get_notification_content()
+    assert content.screenshots == [b"img1", b"img2"]
+    assert content.text is None
+
+
+@patch("superset.commands.report.execute.feature_flag_manager")
+def test_get_notification_content_png_empty_returns_error(
+    mock_ff, mocker: MockerFixture
+) -> None:
+    mock_ff.is_feature_enabled.return_value = False
+    state = _make_notification_state(mocker, report_format=ReportDataFormat.PNG)
+    mocker.patch.object(state, "_get_screenshots", return_value=[])
+
+    content = state._get_notification_content()
+    assert content.text == "Unexpected missing screenshot"
+
+
+@patch("superset.commands.report.execute.feature_flag_manager")
+def test_get_notification_content_csv_format(mock_ff, mocker: MockerFixture) -> None:
+    mock_ff.is_feature_enabled.return_value = False
+    state = _make_notification_state(
+        mocker, report_format=ReportDataFormat.CSV, has_chart=True
+    )
+    mocker.patch.object(state, "_get_csv_data", return_value=b"col1,col2\n1,2")
+
+    content = state._get_notification_content()
+    assert content.csv == b"col1,col2\n1,2"
+
+
+@patch("superset.commands.report.execute.feature_flag_manager")
+def test_get_notification_content_text_format(mock_ff, mocker: MockerFixture) -> None:
+    import pandas as pd
+
+    mock_ff.is_feature_enabled.return_value = False
+    state = _make_notification_state(
+        mocker, report_format=ReportDataFormat.TEXT, has_chart=True
+    )
+    df = pd.DataFrame({"a": [1]})
+    mocker.patch.object(state, "_get_embedded_data", return_value=df)
+
+    content = state._get_notification_content()
+    assert content.embedded_data is not None
+    assert list(content.embedded_data.columns) == ["a"]
+
+
+@pytest.mark.parametrize(
+    "email_subject,has_chart,expected_name",
+    [
+        ("Custom Subject", True, "Custom Subject"),
+        (None, True, "Test Schedule: My Chart"),
+        (None, False, "Test Schedule: My Dashboard"),
+    ],
+    ids=["email_subject", "chart_name", "dashboard_name"],
+)
+@patch("superset.commands.report.execute.feature_flag_manager")
+def test_get_notification_content_name(
+    mock_ff,
+    mocker: MockerFixture,
+    email_subject: str | None,
+    has_chart: bool,
+    expected_name: str,
+) -> None:
+    """Notification name comes from email_subject, chart, or dashboard."""
+    mock_ff.is_feature_enabled.return_value = False
+    state = _make_notification_state(
+        mocker,
+        report_format=ReportDataFormat.PNG,
+        email_subject=email_subject,
+        has_chart=has_chart,
+    )
+    mocker.patch.object(state, "_get_screenshots", return_value=[b"img"])
+
+    content = state._get_notification_content()
+    assert content.name == expected_name
+
+
+# ---------------------------------------------------------------------------
+# Tier 3: State machine top-level branches
+# ---------------------------------------------------------------------------
+
+
+def _make_state_instance(
+    mocker: MockerFixture,
+    cls: type,
+    *,
+    schedule_type: ReportScheduleType = ReportScheduleType.ALERT,
+    last_state: ReportState = ReportState.NOOP,
+    grace_period: int = 3600,
+    working_timeout: int = 3600,
+) -> BaseReportState:
+    """Create a state-machine state instance with a mocked schedule."""
+    schedule = mocker.Mock(spec=ReportSchedule)
+    schedule.type = schedule_type
+    schedule.last_state = last_state
+    schedule.grace_period = grace_period
+    schedule.working_timeout = working_timeout
+    schedule.last_eval_dttm = datetime.utcnow()
+    schedule.name = "Test"
+    schedule.owners = []
+    schedule.recipients = []
+    schedule.force_screenshot = False
+    schedule.extra = {}
+
+    instance = cls(schedule, datetime.utcnow(), uuid4())
+    instance._report_schedule = schedule
+    return instance
+
+
+def test_working_state_timeout_raises_timeout_error(mocker: MockerFixture) -> None:
+    """Working state past timeout should raise WorkingTimeoutError and log ERROR."""
+    state = _make_state_instance(mocker, ReportWorkingState)
+    mocker.patch.object(state, "is_on_working_timeout", return_value=True)
+
+    mock_log = mocker.Mock()
+    mock_log.end_dttm = datetime.utcnow() - timedelta(hours=2)
+    mocker.patch(
+        "superset.commands.report.execute.ReportScheduleDAO.find_last_entered_working_log",
+        return_value=mock_log,
+    )
+    mocker.patch.object(state, "update_report_schedule_and_log")
+
+    with pytest.raises(ReportScheduleWorkingTimeoutError):
+        state.next()
+
+    state.update_report_schedule_and_log.assert_called_once_with(  # type: ignore[attr-defined]
+        ReportState.ERROR,
+        error_message=str(ReportScheduleWorkingTimeoutError()),
+    )
+
+
+def test_working_state_still_working_raises_previous_working(
+    mocker: MockerFixture,
+) -> None:
+    """Working state not yet timed out should raise PreviousWorkingError."""
+    state = _make_state_instance(mocker, ReportWorkingState)
+    mocker.patch.object(state, "is_on_working_timeout", return_value=False)
+    mocker.patch.object(state, "update_report_schedule_and_log")
+
+    with pytest.raises(ReportSchedulePreviousWorkingError):
+        state.next()
+
+    state.update_report_schedule_and_log.assert_called_once_with(  # type: ignore[attr-defined]
+        ReportState.WORKING,
+        error_message=str(ReportSchedulePreviousWorkingError()),
+    )
+
+
+def test_success_state_grace_period_returns_without_sending(
+    mocker: MockerFixture,
+) -> None:
+    """Alert in grace period should set GRACE state and not send."""
+    state = _make_state_instance(
+        mocker,
+        ReportSuccessState,
+        schedule_type=ReportScheduleType.ALERT,
+    )
+    mocker.patch.object(state, "is_in_grace_period", return_value=True)
+    mocker.patch.object(state, "update_report_schedule_and_log")
+    mock_send = mocker.patch.object(state, "send")
+
+    state.next()
+
+    mock_send.assert_not_called()
+    state.update_report_schedule_and_log.assert_called_once_with(  # type: ignore[attr-defined]
+        ReportState.GRACE,
+        error_message=str(ReportScheduleAlertGracePeriodError()),
+    )
+
+
+def test_not_triggered_error_state_send_failure_logs_error_and_reraises(
+    mocker: MockerFixture,
+) -> None:
+    """When send() fails in NOOP/ERROR state, error should be logged and re-raised."""
+    state = _make_state_instance(
+        mocker,
+        ReportNotTriggeredErrorState,
+        schedule_type=ReportScheduleType.REPORT,
+    )
+    send_error = RuntimeError("send failed")
+    mocker.patch.object(state, "send", side_effect=send_error)
+    mocker.patch.object(state, "update_report_schedule_and_log")
+    mocker.patch.object(state, "is_in_error_grace_period", return_value=True)
+
+    with pytest.raises(RuntimeError, match="send failed"):
+        state.next()
+
+    # Should have logged WORKING, then ERROR
+    calls = state.update_report_schedule_and_log.call_args_list  # type: ignore[attr-defined]
+    assert calls[0].args[0] == ReportState.WORKING
+    assert calls[1].args[0] == ReportState.ERROR
+    error_msg = calls[1].kwargs.get("error_message") or (
+        calls[1].args[1] if len(calls[1].args) > 1 else ""
+    )
+    assert "send failed" in error_msg
+
+
+# ---------------------------------------------------------------------------
+# Phase 1 remaining gaps
+# ---------------------------------------------------------------------------
+
+
+def test_get_dashboard_urls_no_state_fallback(
+    mocker: MockerFixture, app: SupersetApp
+) -> None:
+    """No dashboard state in extra -> standard dashboard URL, not permalink."""
+    mock_report_schedule = mocker.Mock(spec=ReportSchedule)
+    mock_report_schedule.chart = False
+    mock_report_schedule.force_screenshot = False
+    mock_report_schedule.extra = {}  # no dashboard state
+    mock_report_schedule.dashboard = mocker.Mock()
+    mock_report_schedule.dashboard.uuid = "dash-uuid-123"
+    mock_report_schedule.dashboard.id = 42
+    mock_report_schedule.recipients = []
+    mock_report_schedule.get_native_filters_params.return_value = ("", [])
+
+    state = BaseReportState(mock_report_schedule, "Jan 1", "exec_id")
+    state._report_schedule = mock_report_schedule
+
+    result = state.get_dashboard_urls()
+
+    assert len(result) == 1
+    assert "superset/dashboard/" in result[0]
+    assert "dashboard/p/" not in result[0]  # not a permalink
+
+
+def test_success_state_alert_command_error_sends_error_and_reraises(
+    mocker: MockerFixture,
+) -> None:
+    """AlertCommand exception -> send_error + ERROR state with marker."""
+    state = _make_state_instance(
+        mocker, ReportSuccessState, schedule_type=ReportScheduleType.ALERT
+    )
+    mocker.patch.object(state, "is_in_grace_period", return_value=False)
+    mocker.patch.object(state, "update_report_schedule_and_log")
+    mocker.patch.object(state, "send_error")
+    mocker.patch(
+        "superset.commands.report.execute.AlertCommand"
+    ).return_value.run.side_effect = RuntimeError("alert boom")
+
+    with pytest.raises(RuntimeError, match="alert boom"):
+        state.next()
+
+    state.send_error.assert_called_once()  # type: ignore[attr-defined]
+    calls = state.update_report_schedule_and_log.call_args_list  # type: ignore[attr-defined]
+    # First call: WORKING, second call: ERROR with marker
+    assert calls[0].args[0] == ReportState.WORKING
+    assert calls[1].args[0] == ReportState.ERROR
+    assert (
+        calls[1].kwargs.get("error_message")
+        == REPORT_SCHEDULE_ERROR_NOTIFICATION_MARKER
+    )
+
+
+def test_success_state_send_error_logs_and_reraises(
+    mocker: MockerFixture,
+) -> None:
+    """send() exception for REPORT type -> ERROR state + re-raise."""
+    state = _make_state_instance(
+        mocker, ReportSuccessState, schedule_type=ReportScheduleType.REPORT
+    )
+    mocker.patch.object(state, "send", side_effect=RuntimeError("send boom"))
+    mocker.patch.object(state, "update_report_schedule_and_log")
+
+    with pytest.raises(RuntimeError, match="send boom"):
+        state.next()
+
+    calls = state.update_report_schedule_and_log.call_args_list  # type: ignore[attr-defined]
+    assert calls[-1].args[0] == ReportState.ERROR
+
+
+@patch("superset.commands.report.execute.feature_flag_manager")
+def test_get_notification_content_pdf_format(mock_ff, mocker: MockerFixture) -> None:
+    """PDF report format branch produces pdf content."""
+    mock_ff.is_feature_enabled.return_value = False
+    state = _make_notification_state(mocker, report_format=ReportDataFormat.PDF)
+    mocker.patch.object(state, "_get_pdf", return_value=b"%PDF-fake")
+
+    content = state._get_notification_content()
+    assert content.pdf == b"%PDF-fake"
+    assert content.text is None
+
+
+# ---------------------------------------------------------------------------
+# Phase 1 gap closure: state machine, feature flag, create_log, success path
+# ---------------------------------------------------------------------------
+
+
+def test_state_machine_unknown_state_raises_not_found(
+    mocker: MockerFixture,
+) -> None:
+    """State machine raises StateNotFoundError when last_state matches no class."""
+    schedule = mocker.Mock(spec=ReportSchedule)
+    # Use a string that isn't in any state class's current_states
+    schedule.last_state = "NONEXISTENT_STATE"
+
+    sm = ReportScheduleStateMachine(uuid4(), schedule, datetime.utcnow())
+    with pytest.raises(ReportScheduleStateNotFoundError):
+        sm.run()
+
+
+@patch("superset.commands.report.execute.feature_flag_manager")
+def test_get_notification_content_alert_no_flag_skips_attachment(
+    mock_ff, mocker: MockerFixture
+) -> None:
+    """Alert with ALERTS_ATTACH_REPORTS=False skips screenshot/pdf/csv attachment."""
+    mock_ff.is_feature_enabled.return_value = False
+    state = _make_notification_state(
+        mocker,
+        report_format=ReportDataFormat.PNG,
+        schedule_type=ReportScheduleType.ALERT,
+        has_chart=True,
+    )
+    mock_screenshots = mocker.patch.object(state, "_get_screenshots")
+
+    content = state._get_notification_content()
+
+    # _get_screenshots should NOT be called — the attachment block is skipped
+    mock_screenshots.assert_not_called()
+    assert content.screenshots == []
+    assert content.text is None
+
+
+def test_create_log_success_commits(mocker: MockerFixture) -> None:
+    """Successful create_log creates a log entry and commits."""
+    schedule = mocker.Mock(spec=ReportSchedule)
+    schedule.last_value = "42"
+    schedule.last_value_row_json = '{"col": 42}'
+    schedule.last_state = ReportState.SUCCESS
+
+    state = BaseReportState(schedule, datetime.utcnow(), uuid4())
+    state._report_schedule = schedule
+
+    mock_db = mocker.patch("superset.commands.report.execute.db")
+    mock_log_cls = mocker.patch(
+        "superset.commands.report.execute.ReportExecutionLog",
+        return_value=mocker.Mock(),
+    )
+
+    state.create_log(error_message=None)
+
+    mock_log_cls.assert_called_once()
+    mock_db.session.add.assert_called_once()
+    mock_db.session.commit.assert_called_once()
+    mock_db.session.rollback.assert_not_called()
+
+
+def test_success_state_report_sends_and_logs_success(
+    mocker: MockerFixture,
+) -> None:
+    """REPORT type success path: send() + update state to SUCCESS."""
+    state = _make_state_instance(
+        mocker,
+        ReportSuccessState,
+        schedule_type=ReportScheduleType.REPORT,
+    )
+    mock_send = mocker.patch.object(state, "send")
+    mocker.patch.object(state, "update_report_schedule_and_log")
+
+    state.next()
+
+    mock_send.assert_called_once()
+    state.update_report_schedule_and_log.assert_called_once_with(  # type: ignore[attr-defined]
+        ReportState.SUCCESS,
+        error_message=None,
+    )
diff --git a/tests/unit_tests/commands/report/update_test.py b/tests/unit_tests/commands/report/update_test.py
index 6b515781b4d..32be92073c4 100644
--- a/tests/unit_tests/commands/report/update_test.py
+++ b/tests/unit_tests/commands/report/update_test.py
@@ -24,10 +24,13 @@ import pytest
 from pytest_mock import MockerFixture
 
 from superset.commands.report.exceptions import (
+    ReportScheduleForbiddenError,
     ReportScheduleInvalidError,
 )
 from superset.commands.report.update import UpdateReportScheduleCommand
-from superset.reports.models import ReportScheduleType
+from superset.errors import ErrorLevel, SupersetError, SupersetErrorType
+from superset.exceptions import SupersetSecurityException
+from superset.reports.models import ReportScheduleType, ReportState
 
 
 def _make_model(
@@ -252,3 +255,71 @@ def test_report_to_alert_with_db_accepted(mocker: MockerFixture) -> None:
         data={"type": ReportScheduleType.ALERT, "database": 5},
     )
     cmd.validate()  # should not raise
+
+
+# --- Deactivation state reset ---
+
+
+def test_deactivation_resets_working_state_to_noop(mocker: MockerFixture) -> None:
+    """Deactivating a report in WORKING state should reset last_state to NOOP."""
+    model = _make_model(mocker, model_type=ReportScheduleType.REPORT, database_id=None)
+    model.last_state = ReportState.WORKING
+    _setup_mocks(mocker, model)
+
+    cmd = UpdateReportScheduleCommand(model_id=1, data={"active": False})
+    cmd.validate()
+    assert cmd._properties["last_state"] == ReportState.NOOP
+
+
+def test_deactivation_from_non_working_does_not_reset(mocker: MockerFixture) -> None:
+    """Deactivating a report NOT in WORKING state should not touch last_state."""
+    model = _make_model(mocker, model_type=ReportScheduleType.REPORT, database_id=None)
+    model.last_state = ReportState.SUCCESS
+    _setup_mocks(mocker, model)
+
+    cmd = UpdateReportScheduleCommand(model_id=1, data={"active": False})
+    cmd.validate()
+    assert "last_state" not in cmd._properties
+
+
+# --- Ownership check ---
+
+
+def test_ownership_check_raises_forbidden(mocker: MockerFixture) -> None:
+    """Non-owner should get ReportScheduleForbiddenError."""
+    model = _make_model(mocker, model_type=ReportScheduleType.REPORT, database_id=None)
+    _setup_mocks(mocker, model)
+    mocker.patch(
+        "superset.commands.report.update.security_manager.raise_for_ownership",
+        side_effect=SupersetSecurityException(
+            SupersetError(
+                message="Forbidden",
+                error_type=SupersetErrorType.GENERIC_BACKEND_ERROR,
+                level=ErrorLevel.ERROR,
+            )
+        ),
+    )
+
+    cmd = UpdateReportScheduleCommand(model_id=1, data={})
+    with pytest.raises(ReportScheduleForbiddenError):
+        cmd.validate()
+
+
+# --- Database not found for alert ---
+
+
+def test_alert_with_nonexistent_database_rejected(mocker: MockerFixture) -> None:
+    """Alert with a database ID that doesn't exist should fail validation."""
+    model = _make_model(mocker, model_type=ReportScheduleType.ALERT, database_id=None)
+    _setup_mocks(mocker, model)
+    mocker.patch(
+        "superset.commands.report.update.DatabaseDAO.find_by_id",
+        return_value=None,
+    )
+
+    cmd = UpdateReportScheduleCommand(model_id=1, data={"database": 99999})
+    with pytest.raises(ReportScheduleInvalidError) as exc_info:
+        cmd.validate()
+    messages = _get_validation_messages(exc_info)
+    assert "database" in messages
+    assert "does not exist" in messages["database"].lower()
diff --git a/tests/unit_tests/commands/sql_lab/test_estimate.py b/tests/unit_tests/commands/sql_lab/test_estimate.py
new file mode 100644
index 00000000000..a7b9d98d339
--- /dev/null
+++ b/tests/unit_tests/commands/sql_lab/test_estimate.py
@@ -0,0 +1,145 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+"""Unit tests for resource-level authorization in QueryEstimationCommand."""
+
+from unittest.mock import MagicMock, patch
+
+import pytest
+
+from superset.commands.sql_lab.estimate import (
+    EstimateQueryCostType,
+    QueryEstimationCommand,
+)
+from superset.errors import ErrorLevel, SupersetError, SupersetErrorType
+from superset.exceptions import SupersetErrorException, SupersetSecurityException
+
+
+def _make_params(**kwargs: object) -> EstimateQueryCostType:
+    base: EstimateQueryCostType = {
+        "database_id": 1,
+        "sql": "SELECT 1",
+        "template_params": {},
+        "catalog": None,
+        "schema": None,
+    }
+    base.update(kwargs)  # type: ignore[typeddict-item]
+    return base
+
+
+def _security_exception() -> SupersetSecurityException:
+    return SupersetSecurityException(
+        SupersetError(
+            message="Access denied",
+            error_type=SupersetErrorType.DATASOURCE_SECURITY_ACCESS_ERROR,
+            level=ErrorLevel.WARNING,
+        )
+    )
+
+
+# ---------------------------------------------------------------------------
+# Existing behaviour: database not found
+# ---------------------------------------------------------------------------
+
+
+@patch("superset.commands.sql_lab.estimate.security_manager", new_callable=MagicMock)
+@patch("superset.commands.sql_lab.estimate.db")
+def test_validate_raises_when_database_not_found(
+    mock_db: MagicMock,
+    mock_security_manager: MagicMock,
+) -> None:
+    """404 is raised before the access check when the database does not exist."""
+    mock_db.session.query.return_value.get.return_value = None
+
+    command = QueryEstimationCommand(_make_params())
+    with pytest.raises(SupersetErrorException) as exc_info:
+        command.validate()
+
+    assert exc_info.value.error.error_type == SupersetErrorType.RESULTS_BACKEND_ERROR
+    mock_security_manager.raise_for_access.assert_not_called()
+
+
+# ---------------------------------------------------------------------------
+# New behaviour: database exists but caller has no access
+# ---------------------------------------------------------------------------
+
+
+@patch("superset.commands.sql_lab.estimate.security_manager", new_callable=MagicMock)
+@patch("superset.commands.sql_lab.estimate.db")
+def test_validate_raises_when_database_access_denied(
+    mock_db: MagicMock,
+    mock_security_manager: MagicMock,
+) -> None:
+    """SupersetSecurityException propagates when raise_for_access denies access."""
+    mock_database = MagicMock()
+    mock_db.session.query.return_value.get.return_value = mock_database
+    mock_security_manager.raise_for_access.side_effect = _security_exception()
+
+    command = QueryEstimationCommand(_make_params())
+    with pytest.raises(SupersetSecurityException):
+        command.validate()
+
+    mock_security_manager.raise_for_access.assert_called_once_with(
+        database=mock_database
+    )
+
+
+# ---------------------------------------------------------------------------
+# New behaviour: authorised caller succeeds
+# ---------------------------------------------------------------------------
+
+
+@patch("superset.commands.sql_lab.estimate.security_manager", new_callable=MagicMock)
+@patch("superset.commands.sql_lab.estimate.db")
+def test_validate_succeeds_for_authorised_user(
+    mock_db: MagicMock,
+    mock_security_manager: MagicMock,
+) -> None:
+    """validate() completes without error when access is granted."""
+    mock_database = MagicMock()
+    mock_db.session.query.return_value.get.return_value = mock_database
+    mock_security_manager.raise_for_access.return_value = None
+
+    command = QueryEstimationCommand(_make_params())
+    command.validate()  # must not raise
+
+    mock_security_manager.raise_for_access.assert_called_once_with(
+        database=mock_database
+    )
+
+
+# ---------------------------------------------------------------------------
+# Kwarg correctness
+# ---------------------------------------------------------------------------
+
+
+@patch("superset.commands.sql_lab.estimate.security_manager", new_callable=MagicMock)
+@patch("superset.commands.sql_lab.estimate.db")
+def test_raise_for_access_called_with_correct_database(
+    mock_db: MagicMock,
+    mock_security_manager: MagicMock,
+) -> None:
+    """The database object fetched from the session is passed to raise_for_access."""
+    mock_database = MagicMock()
+    mock_database.id = 42
+    mock_db.session.query.return_value.get.return_value = mock_database
+    mock_security_manager.raise_for_access.return_value = None
+
+    command = QueryEstimationCommand(_make_params(database_id=42))
+    command.validate()
+
+    call_kwargs = mock_security_manager.raise_for_access.call_args.kwargs
+    assert call_kwargs["database"] is mock_database
diff --git a/tests/unit_tests/connectors/sqla/models_test.py b/tests/unit_tests/connectors/sqla/models_test.py
index 9c4dd73997e..a8af52b2dfd 100644
--- a/tests/unit_tests/connectors/sqla/models_test.py
+++ b/tests/unit_tests/connectors/sqla/models_test.py
@@ -946,3 +946,34 @@ def test_data_for_slices_handles_missing_datasource(mocker: MockerFixture) -> No
     assert "columns" in result
     assert "metrics" in result
     assert "verbose_map" in result
+
+
+def test_owners_data_includes_email(mocker: MockerFixture) -> None:
+    """Test that the owners_data property includes the email field."""
+    database = mocker.MagicMock()
+
+    table = SqlaTable(
+        table_name="test_table",
+        database=database,
+        columns=[],
+        metrics=[],
+    )
+
+    mock_owner = mocker.MagicMock()
+    mock_owner.first_name = "John"
+    mock_owner.last_name = "Doe"
+    mock_owner.username = "johndoe"
+    mock_owner.id = 1
+    mock_owner.email = "john@example.com"
+
+    table.owners = [mock_owner]
+
+    owners_data = table.owners_data
+    assert len(owners_data) == 1
+    assert owners_data[0] == {
+        "first_name": "John",
+        "last_name": "Doe",
+        "username": "johndoe",
+        "id": 1,
+        "email": "john@example.com",
+    }
diff --git a/tests/unit_tests/daos/test_report_dao.py b/tests/unit_tests/daos/test_report_dao.py
new file mode 100644
index 00000000000..55d089d2226
--- /dev/null
+++ b/tests/unit_tests/daos/test_report_dao.py
@@ -0,0 +1,92 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+from __future__ import annotations
+
+import pytest
+from sqlalchemy.orm.session import Session
+
+from superset.daos.report import ReportScheduleDAO
+from superset.reports.models import ReportSchedule, ReportScheduleType
+from superset.utils import json
+
+
+@pytest.fixture(autouse=True)
+def _create_tables(session: Session) -> None:
+    ReportSchedule.metadata.create_all(session.get_bind())  # pylint: disable=no-member
+
+
+def _create_report(
+    session: Session,
+    name: str,
+    extra_json: str = "{}",
+) -> ReportSchedule:
+    report = ReportSchedule(
+        name=name,
+        type=ReportScheduleType.REPORT,
+        crontab="0 9 * * *",
+        extra_json=extra_json,
+    )
+    session.add(report)
+    session.flush()
+    return report
+
+
+def test_find_by_extra_metadata_returns_matching_reports(
+    session: Session,
+) -> None:
+    extra = json.dumps({"dashboard_tab_ids": ["TAB-abc123"]})
+    _create_report(session, "match", extra_json=extra)
+    _create_report(session, "no-match", extra_json="{}")
+
+    results = ReportScheduleDAO.find_by_extra_metadata("TAB-abc123")
+
+    assert len(results) == 1
+    assert results[0].name == "match"
+
+
+def test_find_by_extra_metadata_returns_empty_when_no_match(
+    session: Session,
+) -> None:
+    _create_report(session, "report1", extra_json='{"key": "value"}')
+
+    results = ReportScheduleDAO.find_by_extra_metadata("nonexistent")
+
+    assert results == []
+
+
+def test_find_by_extra_metadata_escapes_percent_wildcard(
+    session: Session,
+) -> None:
+    _create_report(session, "with-percent", extra_json='{"slug": "100%done"}')
+    _create_report(session, "other", extra_json='{"slug": "100xdone"}')
+
+    results = ReportScheduleDAO.find_by_extra_metadata("100%done")
+
+    assert len(results) == 1
+    assert results[0].name == "with-percent"
+
+
+def test_find_by_extra_metadata_escapes_underscore_wildcard(
+    session: Session,
+) -> None:
+    _create_report(session, "with-underscore", extra_json='{"slug": "a_b"}')
+    _create_report(session, "other", extra_json='{"slug": "axb"}')
+
+    results = ReportScheduleDAO.find_by_extra_metadata("a_b")
+
+    assert len(results) == 1
+    assert results[0].name == "with-underscore"
diff --git a/tests/unit_tests/dashboards/commands/importers/v1/utils_test.py b/tests/unit_tests/dashboards/commands/importers/v1/utils_test.py
index 72bf490a5b0..0edd659bb21 100644
--- a/tests/unit_tests/dashboards/commands/importers/v1/utils_test.py
+++ b/tests/unit_tests/dashboards/commands/importers/v1/utils_test.py
@@ -199,3 +199,88 @@ def test_update_id_refs_cross_filter_handles_string_excluded():
     fixed = update_id_refs(config, chart_ids, dataset_info)
     # Should not raise and should remap key
     assert "1" in fixed["metadata"]["chart_configuration"]
+
+
+def test_update_id_refs_preserves_time_grains_in_native_filters():
+    """
+    Test that time_grains allowlist is preserved during dashboard import.
+
+    The time_grains field is a top-level filter configuration key that should
+    survive the update_id_refs transformation without modification.
+    """
+    from superset.commands.dashboard.importers.v1.utils import update_id_refs
+
+    config: dict[str, Any] = {
+        "position": {
+            "CHART1": {
+                "id": "CHART1",
+                "meta": {"chartId": 101, "uuid": "uuid1"},
+                "type": "CHART",
+            },
+        },
+        "metadata": {
+            "native_filter_configuration": [
+                {
+                    "id": "NATIVE_FILTER-abc123",
+                    "filterType": "filter_timegrain",
+                    "name": "Time Grain",
+                    "scope": {"rootPath": ["ROOT_ID"], "excluded": []},
+                    "targets": [{"datasetId": 201, "column": {"name": "dttm"}}],
+                    "controlValues": {},
+                    "time_grains": ["P1D", "P1W", "P1M"],
+                }
+            ]
+        },
+    }
+
+    chart_ids = {"uuid1": 1}
+    dataset_info: dict[str, dict[str, Any]] = {}
+
+    fixed = update_id_refs(config, chart_ids, dataset_info)
+
+    # Verify time_grains is preserved unchanged
+    filter_config = fixed["metadata"]["native_filter_configuration"][0]
+    assert filter_config.get("time_grains") == ["P1D", "P1W", "P1M"]
+    assert filter_config.get("filterType") == "filter_timegrain"
+
+
+def test_update_id_refs_handles_missing_time_grains():
+    """
+    Test backward compatibility when time_grains is not present.
+
+    Existing filters without time_grains should not break during import.
+    """
+    from superset.commands.dashboard.importers.v1.utils import update_id_refs
+
+    config: dict[str, Any] = {
+        "position": {
+            "CHART1": {
+                "id": "CHART1",
+                "meta": {"chartId": 101, "uuid": "uuid1"},
+                "type": "CHART",
+            },
+        },
+        "metadata": {
+            "native_filter_configuration": [
+                {
+                    "id": "NATIVE_FILTER-legacy",
+                    "filterType": "filter_timegrain",
+                    "name": "Legacy Time Grain",
+                    "scope": {"rootPath": ["ROOT_ID"], "excluded": []},
+                    "targets": [{"datasetId": 201, "column": {"name": "dttm"}}],
+                    "controlValues": {},
+                    # Note: no time_grains key (legacy filter)
+                }
+            ]
+        },
+    }
+
+    chart_ids = {"uuid1": 1}
+    dataset_info: dict[str, dict[str, Any]] = {}
+
+    fixed = update_id_refs(config, chart_ids, dataset_info)
+
+    # Verify filter is still valid and legacy payload keeps time_grains absent
+    filter_config = fixed["metadata"]["native_filter_configuration"][0]
+    assert filter_config.get("filterType") == "filter_timegrain"
+    assert "time_grains" not in filter_config
diff --git a/tests/unit_tests/datasets/api_tests.py b/tests/unit_tests/datasets/api_tests.py
index 5296c1bba2a..82e8453c878 100644
--- a/tests/unit_tests/datasets/api_tests.py
+++ b/tests/unit_tests/datasets/api_tests.py
@@ -16,6 +16,7 @@
 # under the License.
 
 from typing import Any
+from unittest.mock import MagicMock, patch
 
 from sqlalchemy.orm.session import Session
 
@@ -72,3 +73,50 @@ def test_put_invalid_dataset(
             }
         ]
     }
+
+
+def test_get_dataset_include_rendered_sql_passes_table_to_template_processor(
+    session: Session,
+    client: Any,
+    full_api_access: None,
+) -> None:
+    """
+    Dataset API: Test that include_rendered_sql passes the table
+    to get_template_processor.
+
+    Regression test for the bug where get_template_processor was called without
+    the `table` argument, leaving self._schema as None in processors like
+    PrestoTemplateProcessor and causing NPEs when templates reference partition
+    functions without an explicit schema.
+    """
+    from superset.connectors.sqla.models import SqlaTable
+    from superset.models.core import Database
+
+    SqlaTable.metadata.create_all(db.session.get_bind())
+
+    database = Database(
+        database_name="my_db",
+        sqlalchemy_uri="sqlite://",
+    )
+    dataset = SqlaTable(
+        table_name="test_render_sql_table",
+        schema="my_schema",
+        database=database,
+        sql="SELECT 1",
+    )
+    db.session.add(dataset)
+    db.session.flush()
+
+    mock_processor = MagicMock()
+    mock_processor.process_template.return_value = "SELECT 1"
+
+    with patch(
+        "superset.datasets.api.get_template_processor",
+        return_value=mock_processor,
+    ) as mock_get_processor:
+        response = client.get(
+            f"/api/v1/dataset/{dataset.id}?include_rendered_sql=true",
+        )
+
+    assert response.status_code == 200
+    mock_get_processor.assert_called_once_with(database=database, table=dataset)
diff --git a/tests/unit_tests/datasets/schema_tests.py b/tests/unit_tests/datasets/schema_tests.py
index 40d63f3af8b..dcea6e795a6 100644
--- a/tests/unit_tests/datasets/schema_tests.py
+++ b/tests/unit_tests/datasets/schema_tests.py
@@ -48,35 +48,60 @@ def test_validate_python_date_format_raises(payload) -> None:
         validate_python_date_format(payload)
 
 
-def test_dataset_put_schema_includes_currency_code_column() -> None:
-    """Test that DatasetPutSchema properly handles currency_code_column field."""
-    from superset.datasets.schemas import DatasetPutSchema
+def test_dataset_post_schema_has_all_put_scalar_fields() -> None:
+    """
+    Every scalar model field accepted by DatasetPutSchema should also be accepted
+    by DatasetPostSchema, unless it is intentionally excluded (fields that only
+    make sense after a dataset already exists).
 
-    schema = DatasetPutSchema()
+    This prevents the class of bug where a new column is added to the update
+    schema but forgotten in the create schema.
+    """
+    from superset.datasets.schemas import DatasetPostSchema, DatasetPutSchema
 
-    # Dataset with currency code column
+    # Fields that are intentionally only on Put: they require an existing dataset
+    # or are populated server-side during creation.
+    put_only_fields = {
+        "columns",
+        "metrics",
+        "folders",
+        "database_id",  # Post uses "database" (integer id) instead
+        "description",
+        "main_dttm_col",
+        "filter_select_enabled",
+        "fetch_values_predicate",
+        "offset",
+        "default_endpoint",
+        "cache_timeout",
+        "is_sqllab_view",
+        "extra",
+    }
+
+    put_fields = set(DatasetPutSchema().fields.keys())
+    post_fields = set(DatasetPostSchema().fields.keys())
+
+    missing = put_fields - post_fields - put_only_fields
+    assert missing == set(), (
+        f"Fields {missing} are in DatasetPutSchema but missing from "
+        f"DatasetPostSchema. Either add them to DatasetPostSchema or to "
+        f"the put_only_fields exclusion list in this test."
+    )
+
+
+def test_dataset_post_schema_includes_currency_code_column() -> None:
+    """Test that DatasetPostSchema accepts currency_code_column."""
+    from superset.datasets.schemas import DatasetPostSchema
+
+    schema = DatasetPostSchema()
     data = {
+        "database": 1,
+        "table_name": "virtual_dataset",
         "currency_code_column": "currency",
     }
     result = schema.load(data)
     assert result["currency_code_column"] == "currency"
 
 
-def test_dataset_put_schema_currency_code_column_optional() -> None:
-    """Test that currency_code_column is optional in DatasetPutSchema."""
-    from superset.datasets.schemas import DatasetPutSchema
-
-    schema = DatasetPutSchema()
-
-    # Dataset without currency code column (should not fail)
-    data: dict[str, str | None] = {}
-    result = schema.load(data)
-    assert (
-        "currency_code_column" not in result
-        or result.get("currency_code_column") is None
-    )
-
-
 def test_dataset_metrics_put_schema_parses_currency_string() -> None:
     """Test that DatasetMetricsPutSchema parses string currency payloads."""
     from superset.datasets.schemas import DatasetMetricsPutSchema
diff --git a/tests/unit_tests/db_engine_specs/test_base.py b/tests/unit_tests/db_engine_specs/test_base.py
index 14fa82b55af..5eae41458de 100644
--- a/tests/unit_tests/db_engine_specs/test_base.py
+++ b/tests/unit_tests/db_engine_specs/test_base.py
@@ -21,6 +21,7 @@ from __future__ import annotations
 
 import json  # noqa: TID251
 import re
+from datetime import timedelta
 from textwrap import dedent
 from typing import Any
 from urllib.parse import parse_qs, urlparse
@@ -44,6 +45,7 @@ from superset.superset_typing import (
 )
 from superset.utils.core import FilterOperator, GenericDataType
 from superset.utils.oauth2 import decode_oauth2_state
+from tests.conftest import with_config
 from tests.unit_tests.db_engine_specs.utils import assert_column_spec
 
 
@@ -597,6 +599,19 @@ def test_extract_errors(mocker: MockerFixture) -> None:
     assert result == [expected]
 
 
+@with_config(
+    {
+        "CUSTOM_DATABASE_ERRORS": {
+            "examples": {
+                re.compile("This connector does not support roles"): (
+                    "Custom error message",
+                    SupersetErrorType.GENERIC_DB_ENGINE_ERROR,
+                    {},
+                )
+            }
+        }
+    },
+)
 def test_extract_errors_from_config(mocker: MockerFixture) -> None:
     """
     Test that custom error messages are extracted correctly from app config
@@ -606,21 +621,6 @@ def test_extract_errors_from_config(mocker: MockerFixture) -> None:
     class TestEngineSpec(BaseEngineSpec):
         engine_name = "ExampleEngine"
 
-    mocker.patch(
-        "flask.current_app.config",
-        {
-            "CUSTOM_DATABASE_ERRORS": {
-                "examples": {
-                    re.compile("This connector does not support roles"): (
-                        "Custom error message",
-                        SupersetErrorType.GENERIC_DB_ENGINE_ERROR,
-                        {},
-                    )
-                }
-            }
-        },
-    )
-
     msg = "This connector does not support roles"
     result = TestEngineSpec.extract_errors(Exception(msg), database_name="examples")
 
@@ -631,6 +631,19 @@ def test_extract_errors_from_config(mocker: MockerFixture) -> None:
     assert result == [expected]
 
 
+@with_config(
+    {
+        "CUSTOM_DATABASE_ERRORS": {
+            "examples": {
+                re.compile("This connector does not support roles"): (
+                    "Custom error message",
+                    SupersetErrorType.GENERIC_DB_ENGINE_ERROR,
+                    {},
+                )
+            }
+        }
+    },
+)
 def test_extract_errors_only_to_specified_database(mocker: MockerFixture) -> None:
     """
     Test that custom error messages are only applied to the specified database_name.
@@ -639,21 +652,6 @@ def test_extract_errors_only_to_specified_database(mocker: MockerFixture) -> Non
     class TestEngineSpec(BaseEngineSpec):
         engine_name = "ExampleEngine"
 
-    mocker.patch(
-        "flask.current_app.config",
-        {
-            "CUSTOM_DATABASE_ERRORS": {
-                "examples": {
-                    re.compile("This connector does not support roles"): (
-                        "Custom error message",
-                        SupersetErrorType.GENERIC_DB_ENGINE_ERROR,
-                        {},
-                    )
-                }
-            }
-        },
-    )
-
     msg = "This connector does not support roles"
     # database_name doesn't match configured one, so default message is used
     result = TestEngineSpec.extract_errors(Exception(msg), database_name="examples_2")
@@ -665,6 +663,27 @@ def test_extract_errors_only_to_specified_database(mocker: MockerFixture) -> Non
     assert result == [expected]
 
 
+@with_config(
+    {
+        "CUSTOM_DATABASE_ERRORS": {
+            "examples": {
+                re.compile(r'message="(?P<message>[^"]*)"'): (
+                    'Unexpected error: "%(message)s"',
+                    SupersetErrorType.GENERIC_DB_ENGINE_ERROR,
+                    {
+                        "custom_doc_links": [
+                            {
+                                "url": "https://example.com/docs",
+                                "label": "Check documentation",
+                            },
+                        ],
+                        "show_issue_info": False,
+                    },
+                )
+            }
+        }
+    },
+)
 def test_extract_errors_from_config_with_regex(mocker: MockerFixture) -> None:
     """
     Test that custom error messages with regex, custom_doc_links,
@@ -674,29 +693,6 @@ def test_extract_errors_from_config_with_regex(mocker: MockerFixture) -> None:
     class TestEngineSpec(BaseEngineSpec):
         engine_name = "ExampleEngine"
 
-    mocker.patch(
-        "flask.current_app.config",
-        {
-            "CUSTOM_DATABASE_ERRORS": {
-                "examples": {
-                    re.compile(r'message="(?P<message>[^"]*)"'): (
-                        'Unexpected error: "%(message)s"',
-                        SupersetErrorType.GENERIC_DB_ENGINE_ERROR,
-                        {
-                            "custom_doc_links": [
-                                {
-                                    "url": "https://example.com/docs",
-                                    "label": "Check documentation",
-                                },
-                            ],
-                            "show_issue_info": False,
-                        },
-                    )
-                }
-            }
-        },
-    )
-
     msg = (
         "db error: SomeUserError(type=USER_ERROR, name=TABLE_NOT_FOUND, "
         'message="line 3:6: Table '
@@ -735,6 +731,7 @@ def test_extract_errors_from_config_with_regex(mocker: MockerFixture) -> None:
     ]
 
 
+@with_config({"CUSTOM_DATABASE_ERRORS": {"examples": "not a dict"}})
 def test_extract_errors_with_non_dict_custom_errors(mocker: MockerFixture):
     """
     Test that extract_errors doesn't fail when custom database errors
@@ -744,11 +741,6 @@ def test_extract_errors_with_non_dict_custom_errors(mocker: MockerFixture):
     class TestEngineSpec(BaseEngineSpec):
         engine_name = "ExampleEngine"
 
-    mocker.patch(
-        "flask.current_app.config",
-        {"CUSTOM_DATABASE_ERRORS": "not a dict"},
-    )
-
     msg = "This connector does not support roles"
     result = TestEngineSpec.extract_errors(Exception(msg))
 
@@ -759,6 +751,7 @@ def test_extract_errors_with_non_dict_custom_errors(mocker: MockerFixture):
     assert result == [expected]
 
 
+@with_config({"CUSTOM_DATABASE_ERRORS": {"examples": "not a dict"}})
 def test_extract_errors_with_non_dict_engine_custom_errors(mocker: MockerFixture):
     """
     Test that extract_errors doesn't fail when database-specific custom errors
@@ -768,11 +761,6 @@ def test_extract_errors_with_non_dict_engine_custom_errors(mocker: MockerFixture
     class TestEngineSpec(BaseEngineSpec):
         engine_name = "ExampleEngine"
 
-    mocker.patch(
-        "flask.current_app.config",
-        {"CUSTOM_DATABASE_ERRORS": {"examples": "not a dict"}},
-    )
-
     msg = "This connector does not support roles"
     result = TestEngineSpec.extract_errors(Exception(msg), database_name="examples")
 
@@ -783,6 +771,19 @@ def test_extract_errors_with_non_dict_engine_custom_errors(mocker: MockerFixture
     assert result == [expected]
 
 
+@with_config(
+    {
+        "CUSTOM_DATABASE_ERRORS": {
+            "examples": {
+                re.compile("This connector does not support roles"): (
+                    "",
+                    SupersetErrorType.GENERIC_DB_ENGINE_ERROR,
+                    {},
+                )
+            }
+        }
+    },
+)
 def test_extract_errors_with_empty_custom_error_message(mocker: MockerFixture):
     """
     Test that when the custom error message is empty,
@@ -792,21 +793,6 @@ def test_extract_errors_with_empty_custom_error_message(mocker: MockerFixture):
     class TestEngineSpec(BaseEngineSpec):
         engine_name = "ExampleEngine"
 
-    mocker.patch(
-        "flask.current_app.config",
-        {
-            "CUSTOM_DATABASE_ERRORS": {
-                "examples": {
-                    re.compile("This connector does not support roles"): (
-                        "",
-                        SupersetErrorType.GENERIC_DB_ENGINE_ERROR,
-                        {},
-                    )
-                }
-            }
-        },
-    )
-
     msg = "This connector does not support roles"
     result = TestEngineSpec.extract_errors(Exception(msg), database_name="examples")
 
@@ -817,6 +803,26 @@ def test_extract_errors_with_empty_custom_error_message(mocker: MockerFixture):
     assert result == [expected]
 
 
+@with_config(
+    {
+        "CUSTOM_DATABASE_ERRORS": {
+            "examples": {
+                re.compile("connection error"): (
+                    "Examples DB error message",
+                    SupersetErrorType.GENERIC_DB_ENGINE_ERROR,
+                    {},
+                )
+            },
+            "examples_2": {
+                re.compile("connection error"): (
+                    "Examples_2 DB error message",
+                    SupersetErrorType.GENERIC_DB_ENGINE_ERROR,
+                    {},
+                )
+            },
+        }
+    },
+)
 def test_extract_errors_matches_database_name_selection(mocker: MockerFixture) -> None:
     """
     Test that custom error messages are matched by database_name.
@@ -825,28 +831,6 @@ def test_extract_errors_matches_database_name_selection(mocker: MockerFixture) -
     class TestEngineSpec(BaseEngineSpec):
         engine_name = "ExampleEngine"
 
-    mocker.patch(
-        "flask.current_app.config",
-        {
-            "CUSTOM_DATABASE_ERRORS": {
-                "examples": {
-                    re.compile("connection error"): (
-                        "Examples DB error message",
-                        SupersetErrorType.GENERIC_DB_ENGINE_ERROR,
-                        {},
-                    )
-                },
-                "examples_2": {
-                    re.compile("connection error"): (
-                        "Examples_2 DB error message",
-                        SupersetErrorType.GENERIC_DB_ENGINE_ERROR,
-                        {},
-                    )
-                },
-            }
-        },
-    )
-
     msg = "connection error occurred"
     # When database_name is examples_2 we should get that specific message
     result = TestEngineSpec.extract_errors(Exception(msg), database_name="examples_2")
@@ -858,6 +842,19 @@ def test_extract_errors_matches_database_name_selection(mocker: MockerFixture) -
     assert result == [expected]
 
 
+@with_config(
+    {
+        "CUSTOM_DATABASE_ERRORS": {
+            "examples": {
+                re.compile("connection error"): (
+                    "Examples DB error message",
+                    SupersetErrorType.GENERIC_DB_ENGINE_ERROR,
+                    {},
+                )
+            },
+        }
+    },
+)
 def test_extract_errors_no_match_falls_back(mocker: MockerFixture) -> None:
     """
     Test that when database_name has no match, the original error message is preserved.
@@ -866,21 +863,6 @@ def test_extract_errors_no_match_falls_back(mocker: MockerFixture) -> None:
     class TestEngineSpec(BaseEngineSpec):
         engine_name = "ExampleEngine"
 
-    mocker.patch(
-        "flask.current_app.config",
-        {
-            "CUSTOM_DATABASE_ERRORS": {
-                "examples": {
-                    re.compile("connection error"): (
-                        "Examples DB error message",
-                        SupersetErrorType.GENERIC_DB_ENGINE_ERROR,
-                        {},
-                    )
-                },
-            }
-        },
-    )
-
     msg = "some other error"
     result = TestEngineSpec.extract_errors(Exception(msg), database_name="examples_2")
 
@@ -980,16 +962,13 @@ def test_get_oauth2_authorization_uri_with_pkce(mocker: MockerFixture) -> None:
     assert query["code_challenge"][0] == expected_challenge
 
 
+@with_config({"DATABASE_OAUTH2_TIMEOUT": timedelta(seconds=30)})
 def test_get_oauth2_token_without_pkce(mocker: MockerFixture) -> None:
     """
     Test that BaseEngineSpec.get_oauth2_token works without PKCE code_verifier.
     """
     from superset.db_engine_specs.base import BaseEngineSpec
 
-    mocker.patch(
-        "flask.current_app.config",
-        {"DATABASE_OAUTH2_TIMEOUT": mocker.MagicMock(total_seconds=lambda: 30)},
-    )
     mock_post = mocker.patch("superset.db_engine_specs.base.requests.post")
     mock_post.return_value.json.return_value = {
         "access_token": "test-access-token",  # noqa: S105
@@ -1015,6 +994,7 @@ def test_get_oauth2_token_without_pkce(mocker: MockerFixture) -> None:
     assert "code_verifier" not in request_body
 
 
+@with_config({"DATABASE_OAUTH2_TIMEOUT": timedelta(seconds=30)})
 def test_get_oauth2_token_with_pkce(mocker: MockerFixture) -> None:
     """
     Test BaseEngineSpec.get_oauth2_token includes code_verifier when provided.
@@ -1022,10 +1002,6 @@ def test_get_oauth2_token_with_pkce(mocker: MockerFixture) -> None:
     from superset.db_engine_specs.base import BaseEngineSpec
     from superset.utils.oauth2 import generate_code_verifier
 
-    mocker.patch(
-        "flask.current_app.config",
-        {"DATABASE_OAUTH2_TIMEOUT": mocker.MagicMock(total_seconds=lambda: 30)},
-    )
     mock_post = mocker.patch("superset.db_engine_specs.base.requests.post")
     mock_post.return_value.json.return_value = {
         "access_token": "test-access-token",  # noqa: S105
@@ -1097,6 +1073,7 @@ def test_get_oauth2_authorization_uri_additional_params(
     assert query["access_type"][0] == "offline"
 
 
+@with_config({"DATABASE_OAUTH2_TIMEOUT": timedelta(seconds=30)})
 def test_get_oauth2_token_additional_params(mocker: MockerFixture) -> None:
     """
     Test that a subclass can inject additional params into the token request body
@@ -1109,10 +1086,6 @@ def test_get_oauth2_token_additional_params(mocker: MockerFixture) -> None:
             "audience": "https://api.example.com",
         }
 
-    mocker.patch(
-        "flask.current_app.config",
-        {"DATABASE_OAUTH2_TIMEOUT": mocker.MagicMock(total_seconds=lambda: 30)},
-    )
     mock_post = mocker.patch("superset.db_engine_specs.base.requests.post")
     mock_post.return_value.json.return_value = {
         "access_token": "test-access-token",  # noqa: S105
@@ -1143,6 +1116,94 @@ def test_get_oauth2_token_additional_params(mocker: MockerFixture) -> None:
     assert request_body["audience"] == "https://api.example.com"
 
 
+@with_config({"DATABASE_OAUTH2_TIMEOUT": timedelta(seconds=30)})
+def test_get_oauth2_fresh_token_success(mocker: MockerFixture) -> None:
+    """
+    Test that get_oauth2_fresh_token returns the token response on success.
+    """
+    from superset.db_engine_specs.base import BaseEngineSpec
+
+    mock_post = mocker.patch("superset.db_engine_specs.base.requests.post")
+    mock_post.return_value.status_code = 200
+    mock_post.return_value.json.return_value = {
+        "access_token": "new-access-token",
+        "expires_in": 3600,
+    }
+
+    config: OAuth2ClientConfig = {
+        "id": "client-id",
+        "secret": "client-secret",
+        "scope": "read write",
+        "redirect_uri": "http://localhost:8088/api/v1/database/oauth2/",
+        "authorization_request_uri": "https://oauth.example.com/authorize",
+        "token_request_uri": "https://oauth.example.com/token",
+        "request_content_type": "json",
+    }
+
+    result = BaseEngineSpec.get_oauth2_fresh_token(config, "refresh-token")
+    assert result == {"access_token": "new-access-token", "expires_in": 3600}
+
+
+@pytest.mark.parametrize("status_code", [400, 401, 403])
+@with_config({"DATABASE_OAUTH2_TIMEOUT": timedelta(seconds=30)})
+def test_get_oauth2_fresh_token_raises_on_auth_error(
+    mocker: MockerFixture,
+    status_code: int,
+) -> None:
+    """
+    Test that get_oauth2_fresh_token raises OAuth2TokenRefreshError on 400/401/403.
+    """
+    from superset.db_engine_specs.base import BaseEngineSpec
+    from superset.exceptions import OAuth2TokenRefreshError
+
+    mock_post = mocker.patch("superset.db_engine_specs.base.requests.post")
+    mock_post.return_value.status_code = status_code
+    mock_post.return_value.text = '{"error": "invalid_grant"}'
+
+    config: OAuth2ClientConfig = {
+        "id": "client-id",
+        "secret": "client-secret",
+        "scope": "read write",
+        "redirect_uri": "http://localhost:8088/api/v1/database/oauth2/",
+        "authorization_request_uri": "https://oauth.example.com/authorize",
+        "token_request_uri": "https://oauth.example.com/token",
+        "request_content_type": "json",
+    }
+
+    with pytest.raises(OAuth2TokenRefreshError) as exc_info:
+        BaseEngineSpec.get_oauth2_fresh_token(config, "refresh-token")
+
+    assert exc_info.value.error.extra["error"] == '{"error": "invalid_grant"}'
+
+
+@with_config({"DATABASE_OAUTH2_TIMEOUT": timedelta(seconds=30)})
+def test_get_oauth2_fresh_token_raises_on_server_error(mocker: MockerFixture) -> None:
+    """
+    Test that get_oauth2_fresh_token raises HTTPError (not OAuth2TokenRefreshError)
+    on 5xx.
+    """
+    from requests.exceptions import HTTPError
+
+    from superset.db_engine_specs.base import BaseEngineSpec
+
+    mock_post = mocker.patch("superset.db_engine_specs.base.requests.post")
+    mock_post.return_value.status_code = 500
+    mock_post.return_value.raise_for_status.side_effect = HTTPError("500 Server Error")
+
+    config: OAuth2ClientConfig = {
+        "id": "client-id",
+        "secret": "client-secret",
+        "scope": "read write",
+        "redirect_uri": "http://localhost:8088/api/v1/database/oauth2/",
+        "authorization_request_uri": "https://oauth.example.com/authorize",
+        "token_request_uri": "https://oauth.example.com/token",
+        "request_content_type": "json",
+    }
+
+    with pytest.raises(HTTPError):
+        BaseEngineSpec.get_oauth2_fresh_token(config, "refresh-token")
+
+
 def test_start_oauth2_dance_uses_config_redirect_uri(mocker: MockerFixture) -> None:
     """
     Test that start_oauth2_dance uses DATABASE_OAUTH2_REDIRECT_URI config if set.
@@ -1182,6 +1243,12 @@ def test_start_oauth2_dance_uses_config_redirect_uri(mocker: MockerFixture) -> N
     assert error.extra["redirect_uri"] == custom_redirect_uri
 
 
+@with_config(
+    {
+        "SECRET_KEY": "test-secret-key",
+        "DATABASE_OAUTH2_JWT_ALGORITHM": "HS256",
+    }
+)
 def test_start_oauth2_dance_falls_back_to_url_for(mocker: MockerFixture) -> None:
     """
     Test that start_oauth2_dance falls back to url_for when no config is set.
@@ -1189,14 +1256,7 @@ def test_start_oauth2_dance_falls_back_to_url_for(mocker: MockerFixture) -> None
     fallback_uri = "http://localhost:8088/api/v1/database/oauth2/"
 
     mocker.patch(
-        "flask.current_app.config",
-        {
-            "SECRET_KEY": "test-secret-key",
-            "DATABASE_OAUTH2_JWT_ALGORITHM": "HS256",
-        },
-    )
-    mocker.patch(
-        "superset.db_engine_specs.base.url_for",
+        "superset.utils.oauth2.url_for",
         return_value=fallback_uri,
     )
     mocker.patch("superset.daos.key_value.KeyValueDAO")
diff --git a/tests/unit_tests/db_engine_specs/test_gsheets.py b/tests/unit_tests/db_engine_specs/test_gsheets.py
index aac67ea1fe2..77f27344858 100644
--- a/tests/unit_tests/db_engine_specs/test_gsheets.py
+++ b/tests/unit_tests/db_engine_specs/test_gsheets.py
@@ -24,11 +24,10 @@ import pandas as pd
 import pytest
 from pytest_mock import MockerFixture
 from requests.exceptions import HTTPError
-from shillelagh.exceptions import UnauthenticatedError
 from sqlalchemy.engine.url import make_url
 
 from superset.errors import ErrorLevel, SupersetError, SupersetErrorType
-from superset.exceptions import SupersetException
+from superset.exceptions import OAuth2TokenRefreshError, SupersetException
 from superset.sql.parse import Table
 from superset.superset_typing import OAuth2ClientConfig
 from superset.utils import json
@@ -817,26 +816,20 @@ def test_get_oauth2_fresh_token_invalid_grant(
     oauth2_config: OAuth2ClientConfig,
 ) -> None:
     """
-    Test that get_oauth2_fresh_token raises UnauthenticatedError for invalid_grant.
+    Test that get_oauth2_fresh_token raises OAuth2TokenRefreshError for a 400 response.
 
-    When a token is revoked on Google side, the refresh request returns 400
-    with error=invalid_grant.
+    When a token is revoked on Google side, the refresh request returns 400.
     """
     from superset.db_engine_specs.gsheets import GSheetsEngineSpec
 
-    mock_response = mocker.MagicMock()
-    mock_response.status_code = 400
-    mock_response.json.return_value = {
-        "error": "invalid_grant",
-        "error_description": "Token has been expired or revoked.",
-    }
-    http_error = HTTPError()
-    http_error.response = mock_response
-
     requests = mocker.patch("superset.db_engine_specs.base.requests")
-    requests.post().raise_for_status.side_effect = http_error
+    requests.post().status_code = 400
+    requests.post().text = (
+        '{"error": "invalid_grant",'
+        ' "error_description": "Token has been expired or revoked."}'
+    )
 
-    with pytest.raises(UnauthenticatedError):
+    with pytest.raises(OAuth2TokenRefreshError):
         GSheetsEngineSpec.get_oauth2_fresh_token(oauth2_config, "refresh-token")
 
 
diff --git a/tests/unit_tests/db_engine_specs/test_postgres.py b/tests/unit_tests/db_engine_specs/test_postgres.py
index ff11dd9aa42..88ce789e131 100644
--- a/tests/unit_tests/db_engine_specs/test_postgres.py
+++ b/tests/unit_tests/db_engine_specs/test_postgres.py
@@ -17,6 +17,7 @@
 
 from datetime import datetime
 from typing import Any, Optional
+from unittest.mock import MagicMock
 
 import pytest
 from pytest_mock import MockerFixture
@@ -25,7 +26,10 @@ from sqlalchemy.dialects.postgresql import DOUBLE_PRECISION, ENUM, JSON
 from sqlalchemy.engine.interfaces import Dialect
 from sqlalchemy.engine.url import make_url
 
-from superset.db_engine_specs.postgres import PostgresEngineSpec as spec  # noqa: N813
+from superset.db_engine_specs.postgres import (
+    _check_not_redshift,
+    PostgresEngineSpec as spec,  # noqa: N813
+)
 from superset.exceptions import SupersetSecurityException
 from superset.sql.parse import Table
 from superset.utils.core import GenericDataType
@@ -280,3 +284,82 @@ SELECT * \nFROM my_schema.my_table
  LIMIT :param_1
     """.strip()
     )
+
+
+class TestRedshiftDetection:
+    """
+    Tests for detecting Redshift connections via the PostgreSQL dialect.
+    """
+
+    def test_check_not_redshift_detects_redshift(self) -> None:
+        """
+        Pool connect event raises for a Redshift version string.
+        """
+        cursor = MagicMock()
+        cursor.fetchone.return_value = (
+            "PostgreSQL 8.0.2 on i686-pc-linux-gnu, compiled by GCC gcc (GCC) "
+            "3.4.2 20041017 (Red Hat 3.4.2-6.fc3), Redshift 1.0.77467",
+        )
+        dbapi_conn = MagicMock()
+        dbapi_conn.cursor.return_value = cursor
+
+        with pytest.raises(ValueError, match="Redshift"):
+            _check_not_redshift(dbapi_conn, None)
+
+    def test_check_not_redshift_allows_postgres(self) -> None:
+        """
+        Pool connect event allows a regular PostgreSQL version string.
+        """
+        cursor = MagicMock()
+        cursor.fetchone.return_value = (
+            "PostgreSQL 15.2 on x86_64-pc-linux-gnu, compiled by gcc",
+        )
+        dbapi_conn = MagicMock()
+        dbapi_conn.cursor.return_value = cursor
+
+        _check_not_redshift(dbapi_conn, None)  # should not raise
+
+    def test_check_not_redshift_fails_open(self) -> None:
+        """
+        If SELECT version() errors, the connection is still allowed.
+        """
+        cursor = MagicMock()
+        cursor.execute.side_effect = Exception("permission denied")
+        dbapi_conn = MagicMock()
+        dbapi_conn.cursor.return_value = cursor
+
+        _check_not_redshift(dbapi_conn, None)  # should not raise
+
+    def test_mutate_db_sets_flag(self) -> None:
+        """
+        mutate_db_for_connection_test sets the check flag.
+        """
+        database = MagicMock()
+        spec.mutate_db_for_connection_test(database)
+        assert database._check_redshift_version is True
+
+    def test_pool_event_injected_when_flag_set(self, mocker: MockerFixture) -> None:
+        """
+        Pool event is added during test_connection.
+        """
+        database = mocker.MagicMock(
+            encrypted_extra=None,
+            _check_redshift_version=True,
+        )
+        params: dict[str, Any] = {}
+        spec.update_params_from_encrypted_extra(database, params)
+
+        assert "pool_events" in params
+        fns = [fn for fn, _ in params["pool_events"]]
+        assert _check_not_redshift in fns
+
+    def test_pool_event_not_injected_without_flag(self, mocker: MockerFixture) -> None:
+        """
+        Pool event is NOT added during normal operation.
+        """
+        database = mocker.MagicMock(encrypted_extra=None)
+        database._check_redshift_version = False
+        params: dict[str, Any] = {}
+        spec.update_params_from_encrypted_extra(database, params)
+
+        assert "pool_events" not in params
diff --git a/tests/unit_tests/db_engine_specs/test_presto.py b/tests/unit_tests/db_engine_specs/test_presto.py
index d73b46f861d..8dd31a4f9c9 100644
--- a/tests/unit_tests/db_engine_specs/test_presto.py
+++ b/tests/unit_tests/db_engine_specs/test_presto.py
@@ -42,17 +42,17 @@ from tests.unit_tests.db_engine_specs.utils import (
         (
             "TIMESTAMP",
             datetime(2022, 1, 1, 1, 23, 45, 600000),
-            "TIMESTAMP '2022-01-01 01:23:45.600000'",
+            "TIMESTAMP '2022-01-01 01:23:45.600'",
         ),
         (
             "TIMESTAMP WITH TIME ZONE",
             datetime(2022, 1, 1, 1, 23, 45, 600000),
-            "TIMESTAMP '2022-01-01 01:23:45.600000'",
+            "TIMESTAMP '2022-01-01 01:23:45.600'",
         ),
         (
             "TIMESTAMP WITH TIME ZONE",
             datetime(2022, 1, 1, 1, 23, 45, 600000, tzinfo=pytz.UTC),
-            "TIMESTAMP '2022-01-01 01:23:45.600000+00:00'",
+            "TIMESTAMP '2022-01-01 01:23:45.600+00:00'",
         ),
     ],
 )
diff --git a/tests/unit_tests/db_engine_specs/test_trino.py b/tests/unit_tests/db_engine_specs/test_trino.py
index dc998d8fdc1..5d86272e987 100644
--- a/tests/unit_tests/db_engine_specs/test_trino.py
+++ b/tests/unit_tests/db_engine_specs/test_trino.py
@@ -859,6 +859,64 @@ def test_get_oauth2_token(
     )
 
 
+def test_needs_oauth2_with_401_error(mocker: MockerFixture) -> None:
+    """
+    Test that needs_oauth2 returns True when Trino raises an HTTP 401 error.
+    """
+    from trino.exceptions import HttpError
+
+    from superset.db_engine_specs.trino import TrinoEngineSpec
+
+    g = mocker.patch("superset.db_engine_specs.trino.g")
+    g.user = mocker.MagicMock()
+
+    ex = HttpError("error 401: Unauthorized")
+    assert TrinoEngineSpec.needs_oauth2(ex) is True
+
+
+def test_needs_oauth2_without_401_error(mocker: MockerFixture) -> None:
+    """
+    Test that needs_oauth2 returns False when the error is not a 401.
+    """
+    from trino.exceptions import HttpError
+
+    from superset.db_engine_specs.trino import TrinoEngineSpec
+
+    g = mocker.patch("superset.db_engine_specs.trino.g")
+    g.user = mocker.MagicMock()
+
+    ex = HttpError("error 500: Internal Server Error")
+    assert TrinoEngineSpec.needs_oauth2(ex) is False
+
+
+def test_needs_oauth2_with_non_http_error(mocker: MockerFixture) -> None:
+    """
+    Test that needs_oauth2 returns False for non-HttpError exceptions.
+    """
+    from superset.db_engine_specs.trino import TrinoEngineSpec
+
+    g = mocker.patch("superset.db_engine_specs.trino.g")
+    g.user = mocker.MagicMock()
+
+    ex = RuntimeError("error 401: something else")
+    assert TrinoEngineSpec.needs_oauth2(ex) is False
+
+
+def test_needs_oauth2_without_user(mocker: MockerFixture) -> None:
+    """
+    Test that needs_oauth2 returns False when there is no authenticated user.
+    """
+    from trino.exceptions import HttpError
+
+    from superset.db_engine_specs.trino import TrinoEngineSpec
+
+    g = mocker.patch("superset.db_engine_specs.trino.g")
+    del g.user
+
+    ex = HttpError("error 401: Unauthorized")
+    assert TrinoEngineSpec.needs_oauth2(ex) is False
+
+
 @pytest.mark.parametrize(
     "time_grain,expected_result",
     [
diff --git a/tests/unit_tests/mcp_service/chart/test_big_number_chart.py b/tests/unit_tests/mcp_service/chart/test_big_number_chart.py
new file mode 100644
index 00000000000..59e142333bd
--- /dev/null
+++ b/tests/unit_tests/mcp_service/chart/test_big_number_chart.py
@@ -0,0 +1,524 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+"""Tests for Big Number chart type support in MCP service."""
+
+import pytest
+from pydantic import ValidationError
+
+from superset.mcp_service.chart.chart_utils import (
+    _resolve_viz_type,
+    analyze_chart_capabilities,
+    analyze_chart_semantics,
+    generate_chart_name,
+    map_big_number_config,
+    map_config_to_form_data,
+)
+from superset.mcp_service.chart.schemas import (
+    BigNumberChartConfig,
+    ColumnRef,
+    FilterConfig,
+)
+from superset.mcp_service.chart.validation.schema_validator import (
+    SchemaValidator,
+)
+
+
+class TestBigNumberChartConfig:
+    """Test BigNumberChartConfig Pydantic schema."""
+
+    def test_minimal_config(self) -> None:
+        config = BigNumberChartConfig(
+            chart_type="big_number",
+            metric=ColumnRef(name="revenue", aggregate="SUM"),
+        )
+        assert config.chart_type == "big_number"
+        assert config.metric.name == "revenue"
+        assert config.metric.aggregate == "SUM"
+        assert config.show_trendline is False
+
+    def test_with_trendline(self) -> None:
+        config = BigNumberChartConfig(
+            chart_type="big_number",
+            metric=ColumnRef(name="revenue", aggregate="SUM"),
+            temporal_column="ds",
+            show_trendline=True,
+        )
+        assert config.show_trendline is True
+        assert config.temporal_column == "ds"
+
+    def test_trendline_without_temporal_column_fails(self) -> None:
+        with pytest.raises(ValidationError, match="requires 'temporal_column'"):
+            BigNumberChartConfig(
+                chart_type="big_number",
+                metric=ColumnRef(name="revenue", aggregate="SUM"),
+                show_trendline=True,
+            )
+
+    def test_metric_without_aggregate_fails(self) -> None:
+        with pytest.raises(ValidationError, match="saved dataset metric"):
+            BigNumberChartConfig(
+                chart_type="big_number",
+                metric=ColumnRef(name="revenue"),
+            )
+
+    def test_saved_metric_accepted(self) -> None:
+        config = BigNumberChartConfig(
+            chart_type="big_number",
+            metric=ColumnRef(name="total_sales", saved_metric=True),
+        )
+        assert config.metric.saved_metric is True
+        assert config.metric.is_metric is True
+
+    def test_saved_metric_passes_pre_validation(self) -> None:
+        """Verify saved metrics pass through SchemaValidator pre-validation."""
+        data = {
+            "chart_type": "big_number",
+            "metric": {"name": "total_sales", "saved_metric": True},
+        }
+        is_valid, error = SchemaValidator._pre_validate_big_number_config(data)
+        assert is_valid is True
+        assert error is None
+
+    def test_with_subheader(self) -> None:
+        config = BigNumberChartConfig(
+            chart_type="big_number",
+            metric=ColumnRef(name="revenue", aggregate="SUM"),
+            subheader="Total revenue this quarter",
+        )
+        assert config.subheader == "Total revenue this quarter"
+
+    def test_with_y_axis_format(self) -> None:
+        config = BigNumberChartConfig(
+            chart_type="big_number",
+            metric=ColumnRef(name="revenue", aggregate="SUM"),
+            y_axis_format="$,.2f",
+        )
+        assert config.y_axis_format == "$,.2f"
+
+    def test_with_compare_lag(self) -> None:
+        config = BigNumberChartConfig(
+            chart_type="big_number",
+            metric=ColumnRef(name="revenue", aggregate="SUM"),
+            temporal_column="ds",
+            show_trendline=True,
+            compare_lag=1,
+        )
+        assert config.compare_lag == 1
+
+    def test_compare_lag_zero_fails(self) -> None:
+        with pytest.raises(ValidationError, match="greater than or equal"):
+            BigNumberChartConfig(
+                chart_type="big_number",
+                metric=ColumnRef(name="revenue", aggregate="SUM"),
+                compare_lag=0,
+            )
+
+    def test_compare_lag_requires_trendline(self) -> None:
+        with pytest.raises(
+            ValidationError, match="compare_lag requires show_trendline"
+        ):
+            BigNumberChartConfig(
+                chart_type="big_number",
+                metric=ColumnRef(name="revenue", aggregate="SUM"),
+                compare_lag=1,
+            )
+
+    def test_with_filters(self) -> None:
+        config = BigNumberChartConfig(
+            chart_type="big_number",
+            metric=ColumnRef(name="revenue", aggregate="SUM"),
+            filters=[
+                FilterConfig(column="region", op="=", value="US"),
+            ],
+        )
+        assert config.filters is not None
+        assert len(config.filters) == 1
+
+    def test_extra_fields_forbidden(self) -> None:
+        with pytest.raises(ValueError, match="Unknown field 'unknown_field'"):
+            BigNumberChartConfig(
+                chart_type="big_number",
+                metric=ColumnRef(name="revenue", aggregate="SUM"),
+                unknown_field="bad",
+            )
+
+    def test_with_time_grain(self) -> None:
+        config = BigNumberChartConfig(
+            chart_type="big_number",
+            metric=ColumnRef(name="revenue", aggregate="SUM"),
+            temporal_column="ds",
+            show_trendline=True,
+            time_grain="P1M",
+        )
+        assert config.time_grain == "P1M"
+
+    def test_with_custom_label(self) -> None:
+        config = BigNumberChartConfig(
+            chart_type="big_number",
+            metric=ColumnRef(name="revenue", aggregate="SUM", label="Total Sales"),
+        )
+        assert config.metric.label == "Total Sales"
+
+
+class TestMapBigNumberConfig:
+    """Test map_big_number_config function."""
+
+    def test_basic_total(self) -> None:
+        config = BigNumberChartConfig(
+            chart_type="big_number",
+            metric=ColumnRef(name="revenue", aggregate="SUM"),
+        )
+        form_data = map_big_number_config(config)
+        assert form_data["viz_type"] == "big_number_total"
+        assert form_data["metric"]["aggregate"] == "SUM"
+        assert form_data["metric"]["column"]["column_name"] == "revenue"
+
+    def test_with_trendline(self) -> None:
+        config = BigNumberChartConfig(
+            chart_type="big_number",
+            metric=ColumnRef(name="revenue", aggregate="SUM"),
+            temporal_column="order_date",
+            show_trendline=True,
+        )
+        form_data = map_big_number_config(config)
+        assert form_data["viz_type"] == "big_number"
+        assert form_data["show_trend_line"] is True
+        assert "x_axis" not in form_data
+        assert form_data["granularity_sqla"] == "order_date"
+        assert form_data["start_y_axis_at_zero"] is True
+
+    def test_with_time_grain(self) -> None:
+        config = BigNumberChartConfig(
+            chart_type="big_number",
+            metric=ColumnRef(name="revenue", aggregate="SUM"),
+            temporal_column="order_date",
+            show_trendline=True,
+            time_grain="P1M",
+        )
+        form_data = map_big_number_config(config)
+        assert form_data["time_grain_sqla"] == "P1M"
+
+    def test_with_subheader(self) -> None:
+        config = BigNumberChartConfig(
+            chart_type="big_number",
+            metric=ColumnRef(name="revenue", aggregate="SUM"),
+            subheader="Year to date",
+        )
+        form_data = map_big_number_config(config)
+        assert form_data["subheader"] == "Year to date"
+
+    def test_with_y_axis_format(self) -> None:
+        config = BigNumberChartConfig(
+            chart_type="big_number",
+            metric=ColumnRef(name="revenue", aggregate="SUM"),
+            y_axis_format="$,.2f",
+        )
+        form_data = map_big_number_config(config)
+        assert form_data["y_axis_format"] == "$,.2f"
+
+    def test_with_compare_lag(self) -> None:
+        config = BigNumberChartConfig(
+            chart_type="big_number",
+            metric=ColumnRef(name="revenue", aggregate="SUM"),
+            temporal_column="ds",
+            show_trendline=True,
+            compare_lag=7,
+        )
+        form_data = map_big_number_config(config)
+        assert form_data["compare_lag"] == 7
+
+    def test_with_filters(self) -> None:
+        config = BigNumberChartConfig(
+            chart_type="big_number",
+            metric=ColumnRef(name="revenue", aggregate="SUM"),
+            filters=[
+                FilterConfig(column="region", op="=", value="US"),
+            ],
+        )
+        form_data = map_big_number_config(config)
+        assert "adhoc_filters" in form_data
+        assert len(form_data["adhoc_filters"]) == 1
+        assert form_data["adhoc_filters"][0]["subject"] == "region"
+        assert form_data["adhoc_filters"][0]["operator"] == "=="
+        assert form_data["adhoc_filters"][0]["comparator"] == "US"
+
+    def test_no_trendline_fields_for_total(self) -> None:
+        config = BigNumberChartConfig(
+            chart_type="big_number",
+            metric=ColumnRef(name="revenue", aggregate="SUM"),
+        )
+        form_data = map_big_number_config(config)
+        assert "x_axis" not in form_data
+        assert "granularity_sqla" not in form_data
+        assert "time_grain_sqla" not in form_data
+        assert "start_y_axis_at_zero" not in form_data
+
+
+class TestMapConfigToFormDataBigNumber:
+    """Test map_config_to_form_data dispatch for big number."""
+
+    def test_dispatches_big_number(self) -> None:
+        config = BigNumberChartConfig(
+            chart_type="big_number",
+            metric=ColumnRef(name="revenue", aggregate="SUM"),
+        )
+        form_data = map_config_to_form_data(config)
+        assert form_data["viz_type"] == "big_number_total"
+
+    def test_dispatches_big_number_trendline(self) -> None:
+        config = BigNumberChartConfig(
+            chart_type="big_number",
+            metric=ColumnRef(name="revenue", aggregate="SUM"),
+            temporal_column="ds",
+            show_trendline=True,
+        )
+        form_data = map_config_to_form_data(config)
+        assert form_data["viz_type"] == "big_number"
+
+
+class TestGenerateChartNameBigNumber:
+    """Test generate_chart_name for big number configs."""
+
+    def test_basic_total_name(self) -> None:
+        config = BigNumberChartConfig(
+            chart_type="big_number",
+            metric=ColumnRef(name="revenue", aggregate="SUM"),
+        )
+        name = generate_chart_name(config)
+        assert "Big Number" in name
+        assert "SUM(revenue)" in name
+
+    def test_with_trendline_name(self) -> None:
+        config = BigNumberChartConfig(
+            chart_type="big_number",
+            metric=ColumnRef(name="revenue", aggregate="SUM"),
+            temporal_column="ds",
+            show_trendline=True,
+        )
+        name = generate_chart_name(config)
+        assert "Big Number" in name
+        assert "trendline" in name
+
+    def test_with_custom_label(self) -> None:
+        config = BigNumberChartConfig(
+            chart_type="big_number",
+            metric=ColumnRef(
+                name="revenue",
+                aggregate="SUM",
+                label="Total Sales",
+            ),
+        )
+        name = generate_chart_name(config)
+        assert "Total Sales" in name
+
+
+class TestResolveVizTypeBigNumber:
+    """Test _resolve_viz_type for big number configs."""
+
+    def test_big_number_total(self) -> None:
+        config = BigNumberChartConfig(
+            chart_type="big_number",
+            metric=ColumnRef(name="revenue", aggregate="SUM"),
+        )
+        assert _resolve_viz_type(config) == "big_number_total"
+
+    def test_big_number_with_trendline(self) -> None:
+        config = BigNumberChartConfig(
+            chart_type="big_number",
+            metric=ColumnRef(name="revenue", aggregate="SUM"),
+            temporal_column="ds",
+            show_trendline=True,
+        )
+        assert _resolve_viz_type(config) == "big_number"
+
+
+class TestAnalyzeChartCapabilitiesBigNumber:
+    """Test analyze_chart_capabilities for big number configs."""
+
+    def test_big_number_total_capabilities(self) -> None:
+        config = BigNumberChartConfig(
+            chart_type="big_number",
+            metric=ColumnRef(name="revenue", aggregate="SUM"),
+        )
+        result = analyze_chart_capabilities(None, config)
+        assert result.supports_export is True
+        assert result.supports_interaction is False
+        assert result.supports_drill_down is False
+
+    def test_big_number_trendline_capabilities(self) -> None:
+        config = BigNumberChartConfig(
+            chart_type="big_number",
+            metric=ColumnRef(name="revenue", aggregate="SUM"),
+            temporal_column="ds",
+            show_trendline=True,
+        )
+        result = analyze_chart_capabilities(None, config)
+        assert result.supports_export is True
+        assert result.supports_interaction is False
+        assert result.supports_drill_down is False
+
+
+class TestAnalyzeChartSemanticsBigNumber:
+    """Test analyze_chart_semantics for big number configs."""
+
+    def test_big_number_total_semantics(self) -> None:
+        config = BigNumberChartConfig(
+            chart_type="big_number",
+            metric=ColumnRef(name="revenue", aggregate="SUM"),
+        )
+        result = analyze_chart_semantics(None, config)
+        assert result is not None
+        assert "metric" in result.primary_insight.lower()
+        assert result.data_story != ""
+        assert len(result.recommended_actions) > 0
+
+    def test_big_number_trendline_semantics(self) -> None:
+        config = BigNumberChartConfig(
+            chart_type="big_number",
+            metric=ColumnRef(name="revenue", aggregate="SUM"),
+            temporal_column="ds",
+            show_trendline=True,
+        )
+        result = analyze_chart_semantics(None, config)
+        assert result is not None
+        assert "trend" in result.primary_insight.lower()
+        assert result.data_story != ""
+        assert len(result.recommended_actions) > 0
+
+
+class TestSchemaValidatorBigNumber:
+    """Test SchemaValidator for big number chart type."""
+
+    def test_valid_big_number_request(self) -> None:
+        data = {
+            "dataset_id": 1,
+            "config": {
+                "chart_type": "big_number",
+                "metric": {"name": "revenue", "aggregate": "SUM"},
+            },
+        }
+        is_valid, request, error = SchemaValidator.validate_request(data)
+        assert is_valid is True
+        assert request is not None
+        assert error is None
+
+    def test_valid_big_number_with_trendline(self) -> None:
+        data = {
+            "dataset_id": 1,
+            "config": {
+                "chart_type": "big_number",
+                "metric": {"name": "revenue", "aggregate": "SUM"},
+                "temporal_column": "ds",
+                "show_trendline": True,
+            },
+        }
+        is_valid, request, error = SchemaValidator.validate_request(data)
+        assert is_valid is True
+        assert request is not None
+
+    def test_missing_metric(self) -> None:
+        data = {
+            "dataset_id": 1,
+            "config": {
+                "chart_type": "big_number",
+            },
+        }
+        is_valid, request, error = SchemaValidator.validate_request(data)
+        assert is_valid is False
+        assert error is not None
+        assert error.error_code == "MISSING_BIG_NUMBER_METRIC"
+
+    def test_invalid_metric_type(self) -> None:
+        data = {
+            "dataset_id": 1,
+            "config": {
+                "chart_type": "big_number",
+                "metric": "not_a_dict",
+            },
+        }
+        is_valid, request, error = SchemaValidator.validate_request(data)
+        assert is_valid is False
+        assert error is not None
+        assert error.error_code == "INVALID_BIG_NUMBER_METRIC_TYPE"
+
+    def test_missing_metric_aggregate(self) -> None:
+        data = {
+            "dataset_id": 1,
+            "config": {
+                "chart_type": "big_number",
+                "metric": {"name": "revenue"},
+            },
+        }
+        is_valid, request, error = SchemaValidator.validate_request(data)
+        assert is_valid is False
+        assert error is not None
+        assert error.error_code == "MISSING_BIG_NUMBER_AGGREGATE"
+
+    def test_trendline_without_temporal(self) -> None:
+        data = {
+            "dataset_id": 1,
+            "config": {
+                "chart_type": "big_number",
+                "metric": {"name": "revenue", "aggregate": "SUM"},
+                "show_trendline": True,
+            },
+        }
+        is_valid, request, error = SchemaValidator.validate_request(data)
+        assert is_valid is False
+        assert error is not None
+        assert error.error_code == "MISSING_TEMPORAL_COLUMN"
+
+    def test_big_number_accepted_in_chart_type_check(self) -> None:
+        """Verify big_number passes the chart_type validation."""
+        is_valid, error = SchemaValidator._pre_validate(
+            {
+                "dataset_id": 1,
+                "config": {
+                    "chart_type": "big_number",
+                    "metric": {"name": "revenue", "aggregate": "SUM"},
+                },
+            }
+        )
+        assert is_valid is True
+        assert error is None
+
+    def test_invalid_chart_type_still_rejected(self) -> None:
+        """Ensure unknown chart types are still rejected."""
+        is_valid, error = SchemaValidator._pre_validate(
+            {
+                "dataset_id": 1,
+                "config": {"chart_type": "nonexistent_chart"},
+            }
+        )
+        assert is_valid is False
+        assert error is not None
+        assert error.error_code == "INVALID_CHART_TYPE"
+
+    def test_big_number_with_subheader_and_format(self) -> None:
+        data = {
+            "dataset_id": 1,
+            "config": {
+                "chart_type": "big_number",
+                "metric": {"name": "revenue", "aggregate": "SUM"},
+                "subheader": "Year to date",
+                "y_axis_format": "$,.2f",
+            },
+        }
+        is_valid, request, error = SchemaValidator.validate_request(data)
+        assert is_valid is True
+        assert request is not None
diff --git a/tests/unit_tests/mcp_service/chart/test_chart_helpers.py b/tests/unit_tests/mcp_service/chart/test_chart_helpers.py
new file mode 100644
index 00000000000..5318f0fe8ac
--- /dev/null
+++ b/tests/unit_tests/mcp_service/chart/test_chart_helpers.py
@@ -0,0 +1,108 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+from unittest.mock import MagicMock, patch
+
+from superset.mcp_service.chart.chart_helpers import (
+    extract_form_data_key_from_url,
+    find_chart_by_identifier,
+    get_cached_form_data,
+)
+
+
+def test_extract_form_data_key_from_url_with_key():
+    url = "http://localhost:8088/explore/?form_data_key=abc123&slice_id=1"
+    assert extract_form_data_key_from_url(url) == "abc123"
+
+
+def test_extract_form_data_key_from_url_no_key():
+    url = "http://localhost:8088/explore/?slice_id=1"
+    assert extract_form_data_key_from_url(url) is None
+
+
+def test_extract_form_data_key_from_url_none():
+    assert extract_form_data_key_from_url(None) is None
+
+
+def test_extract_form_data_key_from_url_empty():
+    assert extract_form_data_key_from_url("") is None
+
+
+def test_extract_form_data_key_from_url_multiple_params():
+    url = "http://localhost:8088/explore/?slice_id=5&form_data_key=xyz789&other=val"
+    assert extract_form_data_key_from_url(url) == "xyz789"
+
+
+@patch("superset.daos.chart.ChartDAO.find_by_id")
+def test_find_chart_by_identifier_int(mock_find):
+    mock_chart = MagicMock()
+    mock_chart.id = 42
+    mock_find.return_value = mock_chart
+
+    result = find_chart_by_identifier(42)
+    mock_find.assert_called_once_with(42)
+    assert result == mock_chart
+
+
+@patch("superset.daos.chart.ChartDAO.find_by_id")
+def test_find_chart_by_identifier_str_digit(mock_find):
+    mock_chart = MagicMock()
+    mock_find.return_value = mock_chart
+
+    result = find_chart_by_identifier("123")
+    mock_find.assert_called_once_with(123)
+    assert result == mock_chart
+
+
+@patch("superset.daos.chart.ChartDAO.find_by_id")
+def test_find_chart_by_identifier_uuid(mock_find):
+    mock_chart = MagicMock()
+    mock_find.return_value = mock_chart
+
+    uuid_str = "a1b2c3d4-5678-90ab-cdef-1234567890ab"
+    result = find_chart_by_identifier(uuid_str)
+    mock_find.assert_called_once_with(uuid_str, id_column="uuid")
+    assert result == mock_chart
+
+
+@patch("superset.daos.chart.ChartDAO.find_by_id")
+def test_find_chart_by_identifier_not_found(mock_find):
+    mock_find.return_value = None
+    result = find_chart_by_identifier(999)
+    assert result is None
+
+
+@patch(
+    "superset.commands.explore.form_data.get.GetFormDataCommand.run",
+    return_value='{"viz_type": "table"}',
+)
+@patch("superset.commands.explore.form_data.get.GetFormDataCommand.__init__")
+def test_get_cached_form_data_success(mock_init, mock_run):
+    mock_init.return_value = None
+    result = get_cached_form_data("test_key")
+    assert result == '{"viz_type": "table"}'
+
+
+@patch(
+    "superset.commands.explore.form_data.get.GetFormDataCommand.run",
+    side_effect=KeyError("not found"),
+)
+@patch("superset.commands.explore.form_data.get.GetFormDataCommand.__init__")
+def test_get_cached_form_data_key_error(mock_init, mock_run):
+    mock_init.return_value = None
+    result = get_cached_form_data("bad_key")
+    assert result is None
diff --git a/tests/unit_tests/mcp_service/chart/test_chart_schemas.py b/tests/unit_tests/mcp_service/chart/test_chart_schemas.py
index cea45bf0244..1d3b671fa7a 100644
--- a/tests/unit_tests/mcp_service/chart/test_chart_schemas.py
+++ b/tests/unit_tests/mcp_service/chart/test_chart_schemas.py
@@ -24,6 +24,8 @@ from pydantic import ValidationError
 
 from superset.mcp_service.chart.schemas import (
     ColumnRef,
+    GenerateChartRequest,
+    parse_chart_config,
     TableChartConfig,
     XYChartConfig,
 )
@@ -107,6 +109,44 @@ class TestTableChartConfig:
                 columns=[ColumnRef(name="product")],
             )
 
+    def test_explicit_raw_query_mode_accepted(self) -> None:
+        """Test that TableChartConfig accepts explicit query_mode='raw'."""
+        config = TableChartConfig(
+            chart_type="table",
+            query_mode="raw",
+            columns=[ColumnRef(name="product"), ColumnRef(name="category")],
+        )
+        assert config.query_mode == "raw"
+        assert len(config.columns) == 2
+
+    def test_explicit_aggregate_query_mode_accepted(self) -> None:
+        """Test that TableChartConfig accepts explicit query_mode='aggregate'."""
+        config = TableChartConfig(
+            chart_type="table",
+            query_mode="aggregate",
+            columns=[ColumnRef(name="sales", aggregate="SUM")],
+        )
+        assert config.query_mode == "aggregate"
+
+    def test_default_query_mode_is_none(self) -> None:
+        """Test that default query_mode is None (auto-detect)."""
+        config = TableChartConfig(
+            chart_type="table",
+            columns=[ColumnRef(name="product")],
+        )
+        assert config.query_mode is None
+
+    def test_invalid_query_mode_rejected(self) -> None:
+        """Test that invalid query_mode values are rejected."""
+        from pydantic import ValidationError
+
+        with pytest.raises(ValidationError):
+            TableChartConfig(
+                chart_type="table",
+                query_mode="invalid",
+                columns=[ColumnRef(name="product")],
+            )
+
 
 class TestXYChartConfig:
     """Test XYChartConfig validation."""
@@ -158,16 +198,31 @@ class TestXYChartConfig:
         )
         assert len(config.y) == 2
 
-    def test_group_by_duplicate_with_x_rejected(self) -> None:
-        """Test that group_by conflicts with x are rejected."""
+    def test_group_by_duplicate_label_with_x_rejected(self) -> None:
+        """Test that group_by with a custom label conflicting with x is rejected."""
         with pytest.raises(ValidationError, match="Duplicate column/metric labels"):
             XYChartConfig(
                 chart_type="xy",
                 x=ColumnRef(name="region"),
                 y=[ColumnRef(name="sales", aggregate="SUM")],
-                group_by=ColumnRef(name="category", label="region"),
+                group_by=[ColumnRef(name="category", label="region")],
             )
 
+    def test_group_by_same_column_as_x_allowed(self) -> None:
+        """Test that group_by with the same column name as x is allowed.
+
+        The mapping layer filters these out, so validation should not reject them.
+        """
+        config = XYChartConfig(
+            chart_type="xy",
+            x=ColumnRef(name="date"),
+            y=[ColumnRef(name="sales", aggregate="SUM")],
+            kind="line",
+            group_by=[ColumnRef(name="date")],
+        )
+        assert config.group_by is not None
+        assert config.group_by[0].name == "date"
+
     def test_realistic_chart_configurations(self) -> None:
         """Test realistic chart configurations."""
         # This should work - COUNT(product_line) != product_line
@@ -220,19 +275,33 @@ class TestXYChartConfig:
         )
         assert config.kind == "area"
 
-    def test_unknown_fields_rejected(self) -> None:
-        """Test that unknown fields like 'series' are rejected."""
-        with pytest.raises(ValidationError, match="Extra inputs are not permitted"):
+    def test_unknown_fields_raise_error(self) -> None:
+        """Test that unknown fields raise ValueError with suggestions."""
+        with pytest.raises(ValidationError, match="Unknown field"):
             XYChartConfig(
                 chart_type="xy",
                 x=ColumnRef(name="territory"),
                 y=[ColumnRef(name="sales", aggregate="SUM")],
                 kind="bar",
-                series=ColumnRef(name="year"),
+                unknown_field="bad",
             )
 
+    def test_series_alias_accepted(self) -> None:
+        """Test that 'series' is accepted as alias for 'group_by'."""
+        config = XYChartConfig.model_validate(
+            {
+                "chart_type": "xy",
+                "x": {"name": "territory"},
+                "y": [{"name": "sales", "aggregate": "SUM"}],
+                "kind": "bar",
+                "series": {"name": "year"},
+            }
+        )
+        assert config.group_by is not None
+        assert config.group_by[0].name == "year"
+
     def test_group_by_accepted(self) -> None:
-        """Test that group_by is the correct field for series grouping."""
+        """Test that group_by accepts a single ColumnRef (auto-wrapped in list)."""
         config = XYChartConfig(
             chart_type="xy",
             x=ColumnRef(name="territory"),
@@ -241,7 +310,33 @@ class TestXYChartConfig:
             group_by=ColumnRef(name="year"),
         )
         assert config.group_by is not None
-        assert config.group_by.name == "year"
+        assert len(config.group_by) == 1
+        assert config.group_by[0].name == "year"
+
+    def test_group_by_multiple(self) -> None:
+        """Test that group_by accepts a list of ColumnRefs."""
+        config = XYChartConfig(
+            chart_type="xy",
+            x=ColumnRef(name="territory"),
+            y=[ColumnRef(name="sales", aggregate="SUM")],
+            kind="bar",
+            group_by=[ColumnRef(name="year"), ColumnRef(name="region")],
+        )
+        assert config.group_by is not None
+        assert len(config.group_by) == 2
+
+    def test_group_by_bare_string(self) -> None:
+        """Test that group_by accepts a bare string (auto-wrapped)."""
+        config = XYChartConfig(
+            chart_type="xy",
+            x=ColumnRef(name="territory"),
+            y=[ColumnRef(name="sales", aggregate="SUM")],
+            kind="bar",
+            group_by="region",
+        )
+        assert config.group_by is not None
+        assert len(config.group_by) == 1
+        assert config.group_by[0].name == "region"
 
     def test_orientation_horizontal_accepted(self) -> None:
         """Test that orientation='horizontal' is accepted for bar charts."""
@@ -299,14 +394,319 @@ class TestXYChartConfig:
         assert config.orientation == "horizontal"
 
 
+class TestRowLimit:
+    """Test row_limit field on chart configs."""
+
+    def test_xy_chart_default_row_limit(self) -> None:
+        """Test that XYChartConfig has default row_limit of 10000."""
+        config = XYChartConfig(
+            chart_type="xy",
+            x=ColumnRef(name="date"),
+            y=[ColumnRef(name="revenue", aggregate="SUM")],
+        )
+        assert config.row_limit == 10000
+
+    def test_xy_chart_custom_row_limit(self) -> None:
+        """Test that XYChartConfig accepts custom row_limit."""
+        config = XYChartConfig(
+            chart_type="xy",
+            x=ColumnRef(name="date"),
+            y=[ColumnRef(name="revenue", aggregate="SUM")],
+            row_limit=100,
+        )
+        assert config.row_limit == 100
+
+    def test_xy_chart_row_limit_validation(self) -> None:
+        """Test that XYChartConfig rejects invalid row_limit."""
+        with pytest.raises(ValidationError):
+            XYChartConfig(
+                chart_type="xy",
+                x=ColumnRef(name="date"),
+                y=[ColumnRef(name="revenue", aggregate="SUM")],
+                row_limit=0,
+            )
+        with pytest.raises(ValidationError):
+            XYChartConfig(
+                chart_type="xy",
+                x=ColumnRef(name="date"),
+                y=[ColumnRef(name="revenue", aggregate="SUM")],
+                row_limit=100000,
+            )
+
+    def test_table_chart_default_row_limit(self) -> None:
+        """Test that TableChartConfig has default row_limit of 1000."""
+        config = TableChartConfig(
+            chart_type="table",
+            columns=[ColumnRef(name="product")],
+        )
+        assert config.row_limit == 1000
+
+    def test_table_chart_custom_row_limit(self) -> None:
+        """Test that TableChartConfig accepts custom row_limit."""
+        config = TableChartConfig(
+            chart_type="table",
+            columns=[ColumnRef(name="product")],
+            row_limit=500,
+        )
+        assert config.row_limit == 500
+
+    def test_table_chart_row_limit_validation(self) -> None:
+        """Test that TableChartConfig rejects invalid row_limit."""
+        with pytest.raises(ValidationError):
+            TableChartConfig(
+                chart_type="table",
+                columns=[ColumnRef(name="product")],
+                row_limit=0,
+            )
+        with pytest.raises(ValidationError):
+            TableChartConfig(
+                chart_type="table",
+                columns=[ColumnRef(name="product")],
+                row_limit=100000,
+            )
+
+
 class TestTableChartConfigExtraFields:
     """Test TableChartConfig rejects unknown fields."""
 
-    def test_unknown_fields_rejected(self) -> None:
-        """Test that unknown fields are rejected."""
-        with pytest.raises(ValidationError, match="Extra inputs are not permitted"):
+    def test_unknown_fields_raise_error(self) -> None:
+        """Test that unknown fields raise ValueError with valid field list."""
+        with pytest.raises(ValidationError, match="Unknown field 'foo'"):
             TableChartConfig(
                 chart_type="table",
                 columns=[ColumnRef(name="product")],
                 foo="bar",
             )
+
+
+class TestAliasChoices:
+    """Test that common Superset form_data aliases are accepted."""
+
+    def test_xy_stack_alias_for_stacked(self) -> None:
+        """Test that 'stack' is accepted as alias for 'stacked'."""
+        config = XYChartConfig.model_validate(
+            {
+                "chart_type": "xy",
+                "x": {"name": "category"},
+                "y": [{"name": "sales", "aggregate": "SUM"}],
+                "stack": True,
+            }
+        )
+        assert config.stacked is True
+
+    def test_xy_stacked_still_works(self) -> None:
+        """Test that 'stacked' still works as primary field name."""
+        config = XYChartConfig(
+            chart_type="xy",
+            x=ColumnRef(name="category"),
+            y=[ColumnRef(name="sales", aggregate="SUM")],
+            stacked=True,
+        )
+        assert config.stacked is True
+
+    def test_xy_time_grain_sqla_alias(self) -> None:
+        """Test that 'time_grain_sqla' is accepted as alias for 'time_grain'."""
+        config = XYChartConfig.model_validate(
+            {
+                "chart_type": "xy",
+                "x": {"name": "order_date"},
+                "y": [{"name": "sales", "aggregate": "SUM"}],
+                "time_grain_sqla": "P1D",
+            }
+        )
+        assert config.time_grain is not None
+
+    def test_table_order_by_alias_for_sort_by(self) -> None:
+        """Test that 'order_by' is accepted as alias for 'sort_by'."""
+        config = TableChartConfig.model_validate(
+            {
+                "chart_type": "table",
+                "columns": [{"name": "product"}],
+                "order_by": ["product"],
+            }
+        )
+        assert config.sort_by == ["product"]
+
+    def test_mixed_timeseries_time_grain_sqla_alias(self) -> None:
+        """Test that 'time_grain_sqla' works for MixedTimeseriesChartConfig."""
+        from superset.mcp_service.chart.schemas import MixedTimeseriesChartConfig
+
+        config = MixedTimeseriesChartConfig.model_validate(
+            {
+                "chart_type": "mixed_timeseries",
+                "x": {"name": "order_date"},
+                "y": [{"name": "sales", "aggregate": "SUM"}],
+                "y_secondary": [{"name": "profit", "aggregate": "SUM"}],
+                "time_grain_sqla": "P1M",
+            }
+        )
+        assert config.time_grain is not None
+
+
+class TestUnknownFieldDetection:
+    """Test that unknown fields produce helpful error messages."""
+
+    def test_near_miss_suggests_correct_field(self) -> None:
+        """Test that a near-miss field name produces 'did you mean?' suggestion."""
+        with pytest.raises(ValidationError, match="did you mean"):
+            XYChartConfig.model_validate(
+                {
+                    "chart_type": "xy",
+                    "x": {"name": "category"},
+                    "y": [{"name": "sales", "aggregate": "SUM"}],
+                    "stacks": True,
+                }
+            )
+
+    def test_completely_unknown_field_lists_valid_fields(self) -> None:
+        """Test that a completely unknown field lists valid fields."""
+        with pytest.raises(ValidationError, match="Valid fields:"):
+            XYChartConfig.model_validate(
+                {
+                    "chart_type": "xy",
+                    "x": {"name": "category"},
+                    "y": [{"name": "sales", "aggregate": "SUM"}],
+                    "zzz_nonexistent": True,
+                }
+            )
+
+    def test_pie_chart_unknown_field(self) -> None:
+        """Test unknown field detection on PieChartConfig."""
+        from superset.mcp_service.chart.schemas import PieChartConfig
+
+        with pytest.raises(ValidationError, match="Unknown field"):
+            PieChartConfig.model_validate(
+                {
+                    "chart_type": "pie",
+                    "dimension": {"name": "category"},
+                    "metric": {"name": "sales", "aggregate": "SUM"},
+                    "bad_field": True,
+                }
+            )
+
+    def test_table_chart_unknown_field(self) -> None:
+        """Test unknown field detection on TableChartConfig."""
+        with pytest.raises(ValidationError, match="Unknown field"):
+            TableChartConfig.model_validate(
+                {
+                    "chart_type": "table",
+                    "columns": [{"name": "product"}],
+                    "invalid_param": "test",
+                }
+            )
+
+    def test_known_aliases_not_flagged_as_unknown(self) -> None:
+        """Test that known aliases pass validation without errors."""
+        config = XYChartConfig.model_validate(
+            {
+                "chart_type": "xy",
+                "x_axis": {"name": "category"},
+                "metrics": [{"name": "sales", "aggregate": "SUM"}],
+                "groupby": [{"name": "region"}],
+                "stack": True,
+                "time_grain_sqla": "P1D",
+            }
+        )
+        assert config.stacked is True
+        assert config.row_limit == 10000
+        assert config.group_by is not None
+
+
+class TestColumnRefSavedMetric:
+    """Test ColumnRef saved_metric support."""
+
+    def test_saved_metric_defaults_to_false(self) -> None:
+        col = ColumnRef(name="revenue", aggregate="SUM")
+        assert col.saved_metric is False
+
+    def test_saved_metric_flag_accepted(self) -> None:
+        col = ColumnRef(name="total_revenue", saved_metric=True)
+        assert col.saved_metric is True
+        assert col.name == "total_revenue"
+
+    def test_saved_metric_clears_aggregate(self) -> None:
+        col = ColumnRef(name="total_revenue", saved_metric=True, aggregate="SUM")
+        assert col.saved_metric is True
+        assert col.aggregate is None
+
+    def test_saved_metric_preserves_label(self) -> None:
+        col = ColumnRef(name="total_revenue", saved_metric=True, label="Revenue")
+        assert col.label == "Revenue"
+
+    def test_saved_metric_in_table_config_unique_labels(self) -> None:
+        config = TableChartConfig(
+            chart_type="table",
+            columns=[
+                ColumnRef(name="product_line"),
+                ColumnRef(name="total_revenue", saved_metric=True),
+            ],
+        )
+        assert len(config.columns) == 2
+
+    def test_saved_metric_in_xy_config_unique_labels(self) -> None:
+        config = XYChartConfig(
+            chart_type="xy",
+            x=ColumnRef(name="order_date"),
+            y=[ColumnRef(name="total_revenue", saved_metric=True)],
+        )
+        assert len(config.y) == 1
+
+    def test_saved_metric_duplicate_label_rejected(self) -> None:
+        with pytest.raises(ValidationError, match="Duplicate column/metric labels"):
+            XYChartConfig(
+                chart_type="xy",
+                x=ColumnRef(name="order_date"),
+                y=[
+                    ColumnRef(name="total_revenue", saved_metric=True),
+                    ColumnRef(
+                        name="other_metric",
+                        saved_metric=True,
+                        label="total_revenue",
+                    ),
+                ],
+            )
+
+
+class TestParseChartConfig:
+    """Tests for parse_chart_config and config coercion."""
+
+    def test_parse_valid_xy_config(self) -> None:
+        config = parse_chart_config(
+            {"chart_type": "xy", "x": {"name": "date"}, "y": [{"name": "v"}]}
+        )
+        assert config.chart_type == "xy"
+        assert config.x.name == "date"
+        assert len(config.y) == 1
+        assert config.y[0].name == "v"
+
+    def test_parse_valid_table_config(self) -> None:
+        config = parse_chart_config(
+            {"chart_type": "table", "columns": [{"name": "col1"}]}
+        )
+        assert config.chart_type == "table"
+        assert len(config.columns) == 1
+        assert config.columns[0].name == "col1"
+
+    def test_parse_missing_chart_type_raises(self) -> None:
+        with pytest.raises(ValueError, match="chart://configs"):
+            parse_chart_config({"x": {"name": "date"}, "y": [{"name": "v"}]})
+
+    def test_parse_unknown_chart_type_raises(self) -> None:
+        with pytest.raises(ValueError, match="chart://configs"):
+            parse_chart_config({"chart_type": "nonexistent", "x": {"name": "d"}})
+
+    def test_coerce_json_string_config(self) -> None:
+        raw = '{"chart_type": "table", "columns": [{"name": "c"}]}'
+        req = GenerateChartRequest(dataset_id=1, config=raw)
+        assert isinstance(req.config, dict)
+        assert req.config["chart_type"] == "table"
+
+    def test_coerce_typed_config_object(self) -> None:
+        typed = TableChartConfig(chart_type="table", columns=[ColumnRef(name="c")])
+        req = GenerateChartRequest(dataset_id=1, config=typed)
+        assert isinstance(req.config, dict)
+        assert req.config["chart_type"] == "table"
+
+    def test_coerce_invalid_json_string_raises(self) -> None:
+        with pytest.raises(ValidationError):
+            GenerateChartRequest(dataset_id=1, config="not valid json")
diff --git a/tests/unit_tests/mcp_service/chart/test_chart_utils.py b/tests/unit_tests/mcp_service/chart/test_chart_utils.py
index ce5c618e03b..7c2da4e5de7 100644
--- a/tests/unit_tests/mcp_service/chart/test_chart_utils.py
+++ b/tests/unit_tests/mcp_service/chart/test_chart_utils.py
@@ -22,7 +22,11 @@ from unittest.mock import MagicMock, patch
 
 import pytest
 
+from superset.constants import NO_TIME_RANGE
 from superset.mcp_service.chart.chart_utils import (
+    _add_adhoc_filters,
+    _ensure_temporal_adhoc_filter,
+    adhoc_filters_to_query_filters,
     configure_temporal_handling,
     create_metric_object,
     generate_chart_name,
@@ -42,7 +46,7 @@ from superset.mcp_service.chart.schemas import (
     TableChartConfig,
     XYChartConfig,
 )
-from superset.utils.core import GenericDataType
+from superset.utils.core import FilterOperator, GenericDataType
 
 
 class TestCreateMetricObject:
@@ -53,6 +57,7 @@ class TestCreateMetricObject:
         col = ColumnRef(name="revenue", aggregate="SUM", label="Total Revenue")
         result = create_metric_object(col)
 
+        assert isinstance(result, dict)
         assert result["aggregate"] == "SUM"
         assert result["column"]["column_name"] == "revenue"
         assert result["label"] == "Total Revenue"
@@ -64,11 +69,28 @@ class TestCreateMetricObject:
         col = ColumnRef(name="orders")
         result = create_metric_object(col)
 
+        assert isinstance(result, dict)
         assert result["aggregate"] == "SUM"
         assert result["column"]["column_name"] == "orders"
         assert result["label"] == "SUM(orders)"
         assert result["optionName"] == "metric_orders"
 
+    def test_create_metric_object_saved_metric_returns_string(self) -> None:
+        """Test that saved metrics return a plain string metric name"""
+        col = ColumnRef(name="total_revenue", saved_metric=True)
+        result = create_metric_object(col)
+
+        assert result == "total_revenue"
+        assert isinstance(result, str)
+
+    def test_create_metric_object_saved_metric_ignores_aggregate(self) -> None:
+        """Test that saved metrics ignore aggregate even if somehow set"""
+        col = ColumnRef(name="total_revenue", saved_metric=True, aggregate="SUM")
+        result = create_metric_object(col)
+
+        # saved_metric validator clears aggregate, result is plain string
+        assert result == "total_revenue"
+
 
 class TestMapFilterOperator:
     """Test map_filter_operator function"""
@@ -313,6 +335,154 @@ class TestMapTableConfig:
 
         assert result["viz_type"] == "table"
 
+    def test_map_table_config_row_limit(self) -> None:
+        """Test that row_limit is mapped to form_data."""
+        config = TableChartConfig(
+            chart_type="table",
+            columns=[ColumnRef(name="product")],
+            row_limit=500,
+        )
+
+        result = map_table_config(config)
+
+        assert result["row_limit"] == 500
+
+    def test_map_table_config_default_row_limit(self) -> None:
+        """Test that default row_limit is mapped to form_data."""
+        config = TableChartConfig(
+            chart_type="table",
+            columns=[ColumnRef(name="product", aggregate="SUM")],
+        )
+
+        result = map_table_config(config)
+
+        assert result["row_limit"] == 1000
+
+    def test_map_table_config_saved_metric_as_metric(self) -> None:
+        """Test that saved metrics are routed to metrics, not raw columns."""
+        config = TableChartConfig(
+            chart_type="table",
+            columns=[
+                ColumnRef(name="product_line"),
+                ColumnRef(name="total_revenue", saved_metric=True),
+            ],
+        )
+
+        result = map_table_config(config)
+
+        assert result["query_mode"] == "aggregate"
+        assert result["metrics"] == ["total_revenue"]
+        assert "product_line" in result["groupby"]
+
+    def test_map_table_config_saved_metric_only(self) -> None:
+        """Test table with only saved metrics (no raw columns)."""
+        config = TableChartConfig(
+            chart_type="table",
+            columns=[
+                ColumnRef(name="total_revenue", saved_metric=True),
+                ColumnRef(name="avg_order_value", saved_metric=True),
+            ],
+        )
+
+        result = map_table_config(config)
+
+        assert result["query_mode"] == "aggregate"
+        assert result["metrics"] == ["total_revenue", "avg_order_value"]
+        assert "all_columns" not in result
+
+    def test_map_table_config_explicit_raw_mode(self) -> None:
+        """Test that explicit query_mode='raw' forces raw mode."""
+        config = TableChartConfig(
+            chart_type="table",
+            query_mode="raw",
+            columns=[
+                ColumnRef(name="product"),
+                ColumnRef(name="category"),
+            ],
+        )
+
+        result = map_table_config(config)
+
+        assert result["viz_type"] == "table"
+        assert result["query_mode"] == "raw"
+        assert result["all_columns"] == ["product", "category"]
+        assert result["columns"] == ["product", "category"]
+        assert "metrics" not in result
+
+    def test_map_table_config_explicit_raw_mode_ignores_aggregates(self) -> None:
+        """Test that explicit query_mode='raw' ignores aggregate settings on columns."""
+        config = TableChartConfig(
+            chart_type="table",
+            query_mode="raw",
+            columns=[
+                ColumnRef(name="product"),
+                ColumnRef(name="sales", aggregate="SUM"),
+            ],
+        )
+
+        result = map_table_config(config)
+
+        assert result["query_mode"] == "raw"
+        # Both columns treated as raw; aggregate setting on "sales" is ignored
+        assert result["all_columns"] == ["product", "sales"]
+        assert result["columns"] == ["product", "sales"]
+        assert "metrics" not in result
+
+    def test_map_table_config_explicit_aggregate_mode(self) -> None:
+        """Test that explicit query_mode='aggregate' uses inference logic."""
+        config = TableChartConfig(
+            chart_type="table",
+            query_mode="aggregate",
+            columns=[
+                ColumnRef(name="product"),
+                ColumnRef(name="revenue", aggregate="SUM"),
+            ],
+        )
+
+        result = map_table_config(config)
+
+        assert result["query_mode"] == "aggregate"
+        assert len(result["metrics"]) == 1
+        assert result["metrics"][0]["aggregate"] == "SUM"
+        assert "product" in result["groupby"]
+
+
+class TestAddAdhocFilters:
+    """Test _add_adhoc_filters helper function"""
+
+    def test_adds_filters_to_form_data(self) -> None:
+        """Test that filters are correctly added to form_data."""
+        form_data: dict[str, Any] = {}
+        filters = [
+            FilterConfig(column="region", op="=", value="US"),
+            FilterConfig(column="year", op=">", value=2020),
+        ]
+
+        _add_adhoc_filters(form_data, filters)
+
+        assert "adhoc_filters" in form_data
+        assert len(form_data["adhoc_filters"]) == 2
+        assert form_data["adhoc_filters"][0]["subject"] == "region"
+        assert form_data["adhoc_filters"][0]["operator"] == "=="
+        assert form_data["adhoc_filters"][1]["subject"] == "year"
+        assert form_data["adhoc_filters"][1]["operator"] == ">"
+
+    def test_no_filters_does_nothing(self) -> None:
+        """Test that None filters leave form_data unchanged."""
+        form_data: dict[str, Any] = {"viz_type": "table"}
+
+        _add_adhoc_filters(form_data, None)
+
+        assert "adhoc_filters" not in form_data
+
+    def test_empty_list_does_nothing(self) -> None:
+        """Test that empty filter list leaves form_data unchanged."""
+        form_data: dict[str, Any] = {"viz_type": "table"}
+
+        _add_adhoc_filters(form_data, [])
+
+        assert "adhoc_filters" not in form_data
+
 
 class TestMapXYConfig:
     """Test map_xy_config function"""
@@ -538,6 +708,98 @@ class TestMapXYConfig:
         assert result["stack"] == "Stack"
         assert result["groupby"] == ["level"]
 
+    @patch("superset.mcp_service.chart.chart_utils.is_column_truly_temporal")
+    def test_map_xy_config_with_filters(self, mock_is_temporal) -> None:
+        """Test that filters are mapped to adhoc_filters in XY form_data."""
+        mock_is_temporal.return_value = True
+        config = XYChartConfig(
+            chart_type="xy",
+            x=ColumnRef(name="date"),
+            y=[ColumnRef(name="revenue", aggregate="SUM")],
+            kind="line",
+            filters=[FilterConfig(column="region", op="=", value="US")],
+        )
+
+        result = map_xy_config(config)
+
+        assert "adhoc_filters" in result
+        # User filter + auto-added TEMPORAL_RANGE filter for temporal x-axis
+        assert len(result["adhoc_filters"]) == 2
+        assert result["adhoc_filters"][0]["subject"] == "region"
+        assert result["adhoc_filters"][0]["operator"] == "=="
+        assert result["adhoc_filters"][0]["comparator"] == "US"
+        assert result["adhoc_filters"][1]["operator"] == "TEMPORAL_RANGE"
+        assert result["adhoc_filters"][1]["subject"] == "date"
+
+    @patch("superset.mcp_service.chart.chart_utils.is_column_truly_temporal")
+    def test_map_xy_config_row_limit(self, mock_is_temporal) -> None:
+        """Test that row_limit is mapped to form_data."""
+        mock_is_temporal.return_value = True
+        config = XYChartConfig(
+            chart_type="xy",
+            x=ColumnRef(name="date"),
+            y=[ColumnRef(name="revenue", aggregate="SUM")],
+            kind="line",
+            row_limit=250,
+        )
+
+        result = map_xy_config(config)
+
+        assert result["row_limit"] == 250
+
+    @patch("superset.mcp_service.chart.chart_utils.is_column_truly_temporal")
+    def test_map_xy_config_default_row_limit(self, mock_is_temporal) -> None:
+        """Test that default row_limit is mapped to form_data."""
+        mock_is_temporal.return_value = True
+        config = XYChartConfig(
+            chart_type="xy",
+            x=ColumnRef(name="date"),
+            y=[ColumnRef(name="revenue", aggregate="SUM")],
+            kind="bar",
+        )
+
+        result = map_xy_config(config)
+
+        assert result["row_limit"] == 10000
+
+    @patch("superset.mcp_service.chart.chart_utils.is_column_truly_temporal")
+    def test_map_xy_config_saved_metric(self, mock_is_temporal: Any) -> None:
+        """Test XY config with saved metric emits string in metrics list"""
+        mock_is_temporal.return_value = True
+        config = XYChartConfig(
+            chart_type="xy",
+            x=ColumnRef(name="order_date"),
+            y=[ColumnRef(name="total_revenue", saved_metric=True)],
+            kind="line",
+        )
+
+        result = map_xy_config(config, dataset_id=1)
+
+        assert result["metrics"] == ["total_revenue"]
+
+    @patch("superset.mcp_service.chart.chart_utils.is_column_truly_temporal")
+    def test_map_xy_config_mixed_saved_and_adhoc_metrics(
+        self, mock_is_temporal: Any
+    ) -> None:
+        """Test XY config with both saved and ad-hoc metrics"""
+        mock_is_temporal.return_value = True
+        config = XYChartConfig(
+            chart_type="xy",
+            x=ColumnRef(name="order_date"),
+            y=[
+                ColumnRef(name="total_revenue", saved_metric=True),
+                ColumnRef(name="quantity", aggregate="SUM"),
+            ],
+            kind="line",
+        )
+
+        result = map_xy_config(config, dataset_id=1)
+
+        assert len(result["metrics"]) == 2
+        assert result["metrics"][0] == "total_revenue"
+        assert isinstance(result["metrics"][1], dict)
+        assert result["metrics"][1]["aggregate"] == "SUM"
+
 
 class TestMapConfigToFormData:
     """Test map_config_to_form_data function"""
@@ -564,6 +826,62 @@ class TestMapConfigToFormData:
         with pytest.raises(ValueError, match="Unsupported config type"):
             map_config_to_form_data("invalid_config")  # type: ignore
 
+    @patch(
+        "superset.mcp_service.chart.chart_utils.is_column_truly_temporal",
+        return_value=True,
+    )
+    @patch("superset.daos.dataset.DatasetDAO.find_by_id")
+    def test_map_xy_config_x_none_defaults_to_main_dttm_col(
+        self, mock_find_by_id: Any, mock_is_temporal: Any
+    ) -> None:
+        """When x is None, map_xy_config resolves it from dataset.main_dttm_col."""
+        mock_dataset = MagicMock()
+        mock_dataset.main_dttm_col = "order_date"
+        mock_find_by_id.return_value = mock_dataset
+
+        config = XYChartConfig(
+            chart_type="xy",
+            x=None,
+            y=[ColumnRef(name="revenue", aggregate="SUM")],
+            kind="bar",
+        )
+
+        result = map_xy_config(config, dataset_id=42)
+
+        assert result["x_axis"] == "order_date"
+        mock_find_by_id.assert_called_once_with(42)
+
+    def test_map_xy_config_x_none_no_dataset_id_raises(self) -> None:
+        """When x is None and no dataset_id, raise ValueError."""
+        config = XYChartConfig(
+            chart_type="xy",
+            x=None,
+            y=[ColumnRef(name="revenue", aggregate="SUM")],
+            kind="line",
+        )
+
+        with pytest.raises(ValueError, match="x-axis column is required"):
+            map_xy_config(config, dataset_id=None)
+
+    @patch("superset.daos.dataset.DatasetDAO.find_by_id")
+    def test_map_xy_config_x_none_no_main_dttm_col_raises(
+        self, mock_find_by_id: Any
+    ) -> None:
+        """When x is None and dataset has no main_dttm_col, raise ValueError."""
+        mock_dataset = MagicMock()
+        mock_dataset.main_dttm_col = None
+        mock_find_by_id.return_value = mock_dataset
+
+        config = XYChartConfig(
+            chart_type="xy",
+            x=None,
+            y=[ColumnRef(name="revenue", aggregate="SUM")],
+            kind="line",
+        )
+
+        with pytest.raises(ValueError, match="no primary datetime column"):
+            map_xy_config(config, dataset_id=42)
+
 
 class TestGenerateChartName:
     """Test generate_chart_name function"""
@@ -1083,16 +1401,18 @@ class TestConfigureTemporalHandling:
     """Test configure_temporal_handling function"""
 
     def test_temporal_column_with_time_grain(self) -> None:
-        """Test temporal column sets time_grain_sqla"""
-        form_data: dict[str, Any] = {}
+        """Test temporal column sets time_grain_sqla and granularity_sqla"""
+        form_data: dict[str, Any] = {"x_axis": "order_date"}
         configure_temporal_handling(form_data, x_is_temporal=True, time_grain="P1M")
         assert form_data["time_grain_sqla"] == "P1M"
+        assert form_data["granularity_sqla"] == "order_date"
 
     def test_temporal_column_without_time_grain(self) -> None:
-        """Test temporal column without time_grain doesn't set time_grain_sqla"""
-        form_data: dict[str, Any] = {}
+        """Test temporal column sets granularity_sqla but not time_grain_sqla"""
+        form_data: dict[str, Any] = {"x_axis": "order_date"}
         configure_temporal_handling(form_data, x_is_temporal=True, time_grain=None)
         assert "time_grain_sqla" not in form_data
+        assert form_data["granularity_sqla"] == "order_date"
 
     def test_non_temporal_column_sets_categorical_config(self) -> None:
         """Test non-temporal column sets categorical configuration"""
@@ -1154,7 +1474,16 @@ class TestMapXYConfigWithNonTemporalColumn:
 
         assert result["x_axis"] == "created_at"
         assert result["time_grain_sqla"] == "P1W"
+        assert result["granularity_sqla"] == "created_at"
         assert "x_axis_sort_series_type" not in result
+        # Temporal x-axis should have a TEMPORAL_RANGE adhoc filter
+        temporal_filters = [
+            f
+            for f in result.get("adhoc_filters", [])
+            if f.get("operator") == "TEMPORAL_RANGE"
+        ]
+        assert len(temporal_filters) == 1
+        assert temporal_filters[0]["subject"] == "created_at"
 
     @patch("superset.mcp_service.chart.chart_utils.is_column_truly_temporal")
     def test_non_temporal_ignores_time_grain_param(self, mock_is_temporal) -> None:
@@ -1176,6 +1505,112 @@ class TestMapXYConfigWithNonTemporalColumn:
         assert result["x_axis_sort_series_type"] == "name"
 
 
+class TestEnsureTemporalAdhocFilter:
+    """Test _ensure_temporal_adhoc_filter helper and its integration in map_xy_config"""
+
+    def test_adds_filter_to_empty_form_data(self) -> None:
+        """Test adds TEMPORAL_RANGE filter when no adhoc_filters exist"""
+        form_data: dict[str, Any] = {}
+        _ensure_temporal_adhoc_filter(form_data, "order_date")
+
+        assert len(form_data["adhoc_filters"]) == 1
+        f = form_data["adhoc_filters"][0]
+        assert f["operator"] == FilterOperator.TEMPORAL_RANGE.value
+        assert f["subject"] == "order_date"
+        assert f["comparator"] == NO_TIME_RANGE
+        assert f["expressionType"] == "SIMPLE"
+        assert f["clause"] == "WHERE"
+
+    def test_appends_to_existing_filters(self) -> None:
+        """Test appends temporal filter after existing user filters"""
+        form_data: dict[str, Any] = {
+            "adhoc_filters": [
+                {"subject": "region", "operator": "==", "comparator": "US"}
+            ]
+        }
+        _ensure_temporal_adhoc_filter(form_data, "order_date")
+
+        assert len(form_data["adhoc_filters"]) == 2
+        assert form_data["adhoc_filters"][0]["subject"] == "region"
+        assert (
+            form_data["adhoc_filters"][1]["operator"]
+            == FilterOperator.TEMPORAL_RANGE.value
+        )
+
+    def test_does_not_duplicate_existing_temporal_filter(self) -> None:
+        """Test skips adding if a TEMPORAL_RANGE filter already exists for the column"""
+        form_data: dict[str, Any] = {
+            "adhoc_filters": [
+                {
+                    "subject": "order_date",
+                    "operator": FilterOperator.TEMPORAL_RANGE.value,
+                    "comparator": "Last 7 days",
+                }
+            ]
+        }
+        _ensure_temporal_adhoc_filter(form_data, "order_date")
+
+        # Should still be just 1 filter (no duplicate)
+        assert len(form_data["adhoc_filters"]) == 1
+
+    def test_adds_filter_for_different_column(self) -> None:
+        """Test adds filter when existing temporal filter is on a different column"""
+        form_data: dict[str, Any] = {
+            "adhoc_filters": [
+                {
+                    "subject": "created_at",
+                    "operator": FilterOperator.TEMPORAL_RANGE.value,
+                    "comparator": NO_TIME_RANGE,
+                }
+            ]
+        }
+        _ensure_temporal_adhoc_filter(form_data, "order_date")
+
+        assert len(form_data["adhoc_filters"]) == 2
+
+    @patch("superset.mcp_service.chart.chart_utils.is_column_truly_temporal")
+    def test_temporal_x_axis_adds_filter_in_map_xy(self, mock_is_temporal) -> None:
+        """Test map_xy_config adds TEMPORAL_RANGE filter for temporal x-axis"""
+        mock_is_temporal.return_value = True
+        config = XYChartConfig(
+            chart_type="xy",
+            x=ColumnRef(name="order_date"),
+            y=[ColumnRef(name="revenue", aggregate="SUM")],
+            kind="bar",
+        )
+
+        result = map_xy_config(config, dataset_id=123)
+
+        temporal_filters = [
+            f
+            for f in result.get("adhoc_filters", [])
+            if f.get("operator") == FilterOperator.TEMPORAL_RANGE.value
+        ]
+        assert len(temporal_filters) == 1
+        assert temporal_filters[0]["subject"] == "order_date"
+        assert temporal_filters[0]["comparator"] == NO_TIME_RANGE
+
+    @patch("superset.mcp_service.chart.chart_utils.is_column_truly_temporal")
+    def test_non_temporal_x_axis_no_temporal_filter(self, mock_is_temporal) -> None:
+        """Test non-temporal x-axis skips TEMPORAL_RANGE filter"""
+        mock_is_temporal.return_value = False
+        config = XYChartConfig(
+            chart_type="xy",
+            x=ColumnRef(name="year"),
+            y=[ColumnRef(name="sales", aggregate="SUM")],
+            kind="bar",
+        )
+
+        result = map_xy_config(config, dataset_id=123)
+
+        temporal_filters = [
+            f
+            for f in result.get("adhoc_filters", [])
+            if f.get("operator") == FilterOperator.TEMPORAL_RANGE.value
+        ]
+        assert len(temporal_filters) == 0
+
+
 class TestFilterConfigValidation:
     """Test FilterConfig validation for new operators"""
 
@@ -1335,3 +1770,56 @@ class TestValidateChartDataset:
         mock_find.side_effect = SQLAlchemyError("db gone")
         url = generate_explore_link(5, {"viz_type": "table"})
         assert "datasource_id=5" in url
+
+
+class TestAdhocFiltersToQueryFilters:
+    """Tests for adhoc_filters_to_query_filters conversion."""
+
+    def test_converts_simple_filters(self) -> None:
+        adhoc = [
+            {
+                "clause": "WHERE",
+                "expressionType": "SIMPLE",
+                "subject": "genre",
+                "operator": "==",
+                "comparator": "Action",
+            }
+        ]
+        result = adhoc_filters_to_query_filters(adhoc)
+        assert result == [{"col": "genre", "op": "==", "val": "Action"}]
+
+    def test_converts_multiple_filters(self) -> None:
+        adhoc = [
+            {
+                "clause": "WHERE",
+                "expressionType": "SIMPLE",
+                "subject": "genre",
+                "operator": "==",
+                "comparator": "Action",
+            },
+            {
+                "clause": "WHERE",
+                "expressionType": "SIMPLE",
+                "subject": "year",
+                "operator": ">=",
+                "comparator": "2010",
+            },
+        ]
+        result = adhoc_filters_to_query_filters(adhoc)
+        assert len(result) == 2
+        assert result[0] == {"col": "genre", "op": "==", "val": "Action"}
+        assert result[1] == {"col": "year", "op": ">=", "val": "2010"}
+
+    def test_empty_list(self) -> None:
+        assert adhoc_filters_to_query_filters([]) == []
+
+    def test_skips_non_simple_expression_types(self) -> None:
+        adhoc = [
+            {
+                "clause": "WHERE",
+                "expressionType": "SQL",
+                "sqlExpression": "col > 5",
+            }
+        ]
+        result = adhoc_filters_to_query_filters(adhoc)
+        assert result == []
diff --git a/tests/unit_tests/mcp_service/chart/test_handlebars_chart.py b/tests/unit_tests/mcp_service/chart/test_handlebars_chart.py
new file mode 100644
index 00000000000..377a9cb9006
--- /dev/null
+++ b/tests/unit_tests/mcp_service/chart/test_handlebars_chart.py
@@ -0,0 +1,565 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+"""Tests for Handlebars chart type support in MCP service."""
+
+from unittest.mock import MagicMock
+
+import pytest
+
+from superset.mcp_service.chart.chart_utils import (
+    _resolve_viz_type,
+    analyze_chart_capabilities,
+    analyze_chart_semantics,
+    generate_chart_name,
+    map_config_to_form_data,
+    map_handlebars_config,
+)
+from superset.mcp_service.chart.schemas import (
+    ColumnRef,
+    FilterConfig,
+    HandlebarsChartConfig,
+)
+from superset.mcp_service.chart.validation.schema_validator import SchemaValidator
+
+
+class TestHandlebarsChartConfig:
+    """Test HandlebarsChartConfig Pydantic schema."""
+
+    def test_minimal_aggregate_config(self) -> None:
+        template = "<ul>{{#each data}}<li>{{this.name}}</li>{{/each}}</ul>"
+        config = HandlebarsChartConfig(
+            chart_type="handlebars",
+            handlebars_template=template,
+            metrics=[ColumnRef(name="sales", aggregate="SUM")],
+        )
+        assert config.chart_type == "handlebars"
+        assert config.query_mode == "aggregate"
+        assert config.row_limit == 1000
+
+    def test_minimal_raw_config(self) -> None:
+        template = (
+            "<table>{{#each data}}<tr><td>{{this.name}}</td></tr>{{/each}}</table>"
+        )
+        config = HandlebarsChartConfig(
+            chart_type="handlebars",
+            handlebars_template=template,
+            query_mode="raw",
+            columns=[ColumnRef(name="product"), ColumnRef(name="price")],
+        )
+        assert config.query_mode == "raw"
+        assert config.columns is not None
+        assert len(config.columns) == 2
+
+    def test_aggregate_mode_requires_metrics(self) -> None:
+        with pytest.raises(ValueError, match="requires 'metrics'"):
+            HandlebarsChartConfig(
+                chart_type="handlebars",
+                handlebars_template="<p>test</p>",
+                query_mode="aggregate",
+            )
+
+    def test_raw_mode_requires_columns(self) -> None:
+        with pytest.raises(ValueError, match="requires 'columns'"):
+            HandlebarsChartConfig(
+                chart_type="handlebars",
+                handlebars_template="<p>test</p>",
+                query_mode="raw",
+            )
+
+    def test_template_min_length(self) -> None:
+        with pytest.raises(ValueError, match="at least 1 character"):
+            HandlebarsChartConfig(
+                chart_type="handlebars",
+                handlebars_template="",
+                metrics=[ColumnRef(name="sales", aggregate="SUM")],
+            )
+
+    def test_raw_mode_rejects_metrics(self) -> None:
+        with pytest.raises(ValueError, match="does not use 'metrics'"):
+            HandlebarsChartConfig(
+                chart_type="handlebars",
+                handlebars_template="<p>test</p>",
+                query_mode="raw",
+                columns=[ColumnRef(name="product")],
+                metrics=[ColumnRef(name="sales", aggregate="SUM")],
+            )
+
+    def test_raw_mode_rejects_groupby(self) -> None:
+        with pytest.raises(ValueError, match="does not use 'groupby'"):
+            HandlebarsChartConfig(
+                chart_type="handlebars",
+                handlebars_template="<p>test</p>",
+                query_mode="raw",
+                columns=[ColumnRef(name="product")],
+                groupby=[ColumnRef(name="region")],
+            )
+
+    def test_aggregate_mode_requires_aggregate_function(self) -> None:
+        with pytest.raises(ValueError, match="Missing aggregate for"):
+            HandlebarsChartConfig(
+                chart_type="handlebars",
+                handlebars_template="<p>test</p>",
+                query_mode="aggregate",
+                metrics=[ColumnRef(name="sales")],
+            )
+
+    def test_extra_fields_forbidden(self) -> None:
+        with pytest.raises(ValueError, match="Unknown field 'unknown_field'"):
+            HandlebarsChartConfig(
+                chart_type="handlebars",
+                handlebars_template="<p>test</p>",
+                metrics=[ColumnRef(name="sales", aggregate="SUM")],
+                unknown_field="bad",
+            )
+
+    def test_full_aggregate_config(self) -> None:
+        template = (
+            "<div>{{#each data}}<span>"
+            "{{this.region}}: {{this.total}}"
+            "</span>{{/each}}</div>"
+        )
+        config = HandlebarsChartConfig(
+            chart_type="handlebars",
+            handlebars_template=template,
+            query_mode="aggregate",
+            groupby=[ColumnRef(name="region")],
+            metrics=[ColumnRef(name="sales", aggregate="SUM", label="total")],
+            filters=[FilterConfig(column="status", op="=", value="active")],
+            row_limit=500,
+            order_desc=False,
+            style_template="div { color: blue; }",
+        )
+        assert config.row_limit == 500
+        assert config.order_desc is False
+        assert config.style_template == "div { color: blue; }"
+        assert config.filters is not None
+        assert len(config.filters) == 1
+        assert config.groupby is not None
+        assert len(config.groupby) == 1
+
+    def test_row_limit_too_low(self) -> None:
+        with pytest.raises(ValueError, match="greater than or equal to 1"):
+            HandlebarsChartConfig(
+                chart_type="handlebars",
+                handlebars_template="<p>test</p>",
+                metrics=[ColumnRef(name="x", aggregate="COUNT")],
+                row_limit=0,
+            )
+
+    def test_row_limit_too_high(self) -> None:
+        with pytest.raises(ValueError, match="less than or equal to 50000"):
+            HandlebarsChartConfig(
+                chart_type="handlebars",
+                handlebars_template="<p>test</p>",
+                metrics=[ColumnRef(name="x", aggregate="COUNT")],
+                row_limit=50001,
+            )
+
+
+class TestMapHandlebarsConfig:
+    """Test map_handlebars_config function."""
+
+    def test_aggregate_mode_basic(self) -> None:
+        config = HandlebarsChartConfig(
+            chart_type="handlebars",
+            handlebars_template="<p>{{data}}</p>",
+            metrics=[ColumnRef(name="sales", aggregate="SUM")],
+        )
+        result = map_handlebars_config(config)
+
+        assert result["viz_type"] == "handlebars"
+        assert result["handlebars_template"] == "<p>{{data}}</p>"
+        assert result["query_mode"] == "aggregate"
+        assert result["row_limit"] == 1000
+        assert result["order_desc"] is True
+        assert len(result["metrics"]) == 1
+        assert result["metrics"][0]["aggregate"] == "SUM"
+
+    def test_aggregate_mode_with_groupby(self) -> None:
+        config = HandlebarsChartConfig(
+            chart_type="handlebars",
+            handlebars_template="<p>{{data}}</p>",
+            groupby=[ColumnRef(name="region")],
+            metrics=[ColumnRef(name="sales", aggregate="SUM")],
+        )
+        result = map_handlebars_config(config)
+
+        assert result["groupby"] == ["region"]
+
+    def test_raw_mode(self) -> None:
+        config = HandlebarsChartConfig(
+            chart_type="handlebars",
+            handlebars_template="<table>rows</table>",
+            query_mode="raw",
+            columns=[ColumnRef(name="product"), ColumnRef(name="price")],
+        )
+        result = map_handlebars_config(config)
+
+        assert result["query_mode"] == "raw"
+        assert result["all_columns"] == ["product", "price"]
+        assert "metrics" not in result
+        assert "groupby" not in result
+
+    def test_with_filters(self) -> None:
+        config = HandlebarsChartConfig(
+            chart_type="handlebars",
+            handlebars_template="<p>test</p>",
+            metrics=[ColumnRef(name="count", aggregate="COUNT")],
+            filters=[FilterConfig(column="status", op="=", value="active")],
+        )
+        result = map_handlebars_config(config)
+
+        assert "adhoc_filters" in result
+        assert len(result["adhoc_filters"]) == 1
+        assert result["adhoc_filters"][0]["subject"] == "status"
+        assert result["adhoc_filters"][0]["operator"] == "=="
+        assert result["adhoc_filters"][0]["comparator"] == "active"
+
+    def test_with_style_template(self) -> None:
+        config = HandlebarsChartConfig(
+            chart_type="handlebars",
+            handlebars_template="<p>test</p>",
+            metrics=[ColumnRef(name="x", aggregate="COUNT")],
+            style_template="p { font-size: 24px; }",
+        )
+        result = map_handlebars_config(config)
+
+        assert result["styleTemplate"] == "p { font-size: 24px; }"
+
+    def test_without_style_template(self) -> None:
+        config = HandlebarsChartConfig(
+            chart_type="handlebars",
+            handlebars_template="<p>test</p>",
+            metrics=[ColumnRef(name="x", aggregate="COUNT")],
+        )
+        result = map_handlebars_config(config)
+
+        assert "styleTemplate" not in result
+
+    def test_custom_row_limit_and_order(self) -> None:
+        config = HandlebarsChartConfig(
+            chart_type="handlebars",
+            handlebars_template="<p>test</p>",
+            metrics=[ColumnRef(name="x", aggregate="COUNT")],
+            row_limit=50,
+            order_desc=False,
+        )
+        result = map_handlebars_config(config)
+
+        assert result["row_limit"] == 50
+        assert result["order_desc"] is False
+
+
+class TestMapConfigToFormDataHandlebars:
+    """Test map_config_to_form_data dispatches to handlebars correctly."""
+
+    def test_dispatches_handlebars_config(self) -> None:
+        config = HandlebarsChartConfig(
+            chart_type="handlebars",
+            handlebars_template="<p>test</p>",
+            metrics=[ColumnRef(name="sales", aggregate="SUM")],
+        )
+        result = map_config_to_form_data(config)
+        assert result["viz_type"] == "handlebars"
+
+
+class TestGenerateChartNameHandlebars:
+    """Test generate_chart_name for handlebars configs."""
+
+    def test_raw_mode_with_columns(self) -> None:
+        config = HandlebarsChartConfig(
+            chart_type="handlebars",
+            handlebars_template="<p>test</p>",
+            query_mode="raw",
+            columns=[ColumnRef(name="product"), ColumnRef(name="price")],
+        )
+        name = generate_chart_name(config)
+        assert "Handlebars" in name
+        assert "product" in name
+        assert "price" in name
+
+    def test_aggregate_mode_with_metrics(self) -> None:
+        config = HandlebarsChartConfig(
+            chart_type="handlebars",
+            handlebars_template="<p>test</p>",
+            metrics=[ColumnRef(name="sales", aggregate="SUM")],
+        )
+        name = generate_chart_name(config)
+        assert "Handlebars" in name
+        assert "sales" in name
+
+    def test_aggregate_mode_no_groupby(self) -> None:
+        config = HandlebarsChartConfig(
+            chart_type="handlebars",
+            handlebars_template="<p>test</p>",
+            metrics=[ColumnRef(name="count", aggregate="COUNT")],
+        )
+        name = generate_chart_name(config)
+        assert "Handlebars" in name
+        assert "count" in name
+
+    def test_truncates_to_three_columns(self) -> None:
+        config = HandlebarsChartConfig(
+            chart_type="handlebars",
+            handlebars_template="<p>test</p>",
+            query_mode="raw",
+            columns=[
+                ColumnRef(name="alpha"),
+                ColumnRef(name="bravo"),
+                ColumnRef(name="charlie"),
+                ColumnRef(name="delta"),
+            ],
+        )
+        name = generate_chart_name(config)
+        assert "alpha" in name
+        assert "bravo" in name
+        assert "charlie" in name
+        assert "delta" not in name
+
+
+class TestResolveVizType:
+    """Test _resolve_viz_type helper."""
+
+    def test_xy_line(self) -> None:
+        config = MagicMock(chart_type="xy", kind="line")
+        assert _resolve_viz_type(config) == "echarts_timeseries_line"
+
+    def test_xy_bar(self) -> None:
+        config = MagicMock(chart_type="xy", kind="bar")
+        assert _resolve_viz_type(config) == "echarts_timeseries_bar"
+
+    def test_xy_area(self) -> None:
+        config = MagicMock(chart_type="xy", kind="area")
+        assert _resolve_viz_type(config) == "echarts_area"
+
+    def test_xy_scatter(self) -> None:
+        config = MagicMock(chart_type="xy", kind="scatter")
+        assert _resolve_viz_type(config) == "echarts_timeseries_scatter"
+
+    def test_table(self) -> None:
+        config = MagicMock(chart_type="table", viz_type="table")
+        assert _resolve_viz_type(config) == "table"
+
+    def test_ag_grid_table(self) -> None:
+        config = MagicMock(chart_type="table", viz_type="ag-grid-table")
+        assert _resolve_viz_type(config) == "ag-grid-table"
+
+    def test_handlebars(self) -> None:
+        config = MagicMock(chart_type="handlebars")
+        assert _resolve_viz_type(config) == "handlebars"
+
+    def test_unknown(self) -> None:
+        config = MagicMock(chart_type="unknown_type")
+        assert _resolve_viz_type(config) == "unknown"
+
+
+class TestAnalyzeChartCapabilitiesHandlebars:
+    """Test analyze_chart_capabilities for handlebars config."""
+
+    def test_handlebars_capabilities(self) -> None:
+        config = HandlebarsChartConfig(
+            chart_type="handlebars",
+            handlebars_template="<p>test</p>",
+            metrics=[ColumnRef(name="sales", aggregate="SUM")],
+        )
+        caps = analyze_chart_capabilities(None, config)
+
+        assert caps.supports_interaction is False
+        assert caps.supports_drill_down is False
+        assert caps.supports_export is True
+        assert "url" in caps.optimal_formats
+
+
+class TestAnalyzeChartSemanticsHandlebars:
+    """Test analyze_chart_semantics for handlebars config."""
+
+    def test_handlebars_semantics(self) -> None:
+        config = HandlebarsChartConfig(
+            chart_type="handlebars",
+            handlebars_template="<p>test</p>",
+            metrics=[ColumnRef(name="sales", aggregate="SUM")],
+        )
+        semantics = analyze_chart_semantics(None, config)
+
+        assert (
+            "Handlebars" in semantics.primary_insight
+            or "template" in semantics.primary_insight
+        )
+        assert semantics.data_story is not None
+
+
+class TestSchemaValidatorHandlebars:
+    """Test SchemaValidator pre-validation for handlebars chart type."""
+
+    def test_handlebars_accepted_as_valid_chart_type(self) -> None:
+        data = {
+            "dataset_id": 1,
+            "config": {
+                "chart_type": "handlebars",
+                "handlebars_template": "<p>{{data}}</p>",
+                "metrics": [{"name": "sales", "aggregate": "SUM"}],
+            },
+        }
+        is_valid, request, error = SchemaValidator.validate_request(data)
+        assert is_valid is True
+        assert request is not None
+        assert error is None
+
+    def test_missing_handlebars_template(self) -> None:
+        data = {
+            "dataset_id": 1,
+            "config": {
+                "chart_type": "handlebars",
+                "metrics": [{"name": "sales", "aggregate": "SUM"}],
+            },
+        }
+        is_valid, _, error = SchemaValidator.validate_request(data)
+        assert is_valid is False
+        assert error is not None
+        assert error.error_code == "MISSING_HANDLEBARS_TEMPLATE"
+
+    def test_empty_handlebars_template(self) -> None:
+        data = {
+            "dataset_id": 1,
+            "config": {
+                "chart_type": "handlebars",
+                "handlebars_template": "   ",
+                "metrics": [{"name": "sales", "aggregate": "SUM"}],
+            },
+        }
+        is_valid, _, error = SchemaValidator.validate_request(data)
+        assert is_valid is False
+        assert error is not None
+        assert error.error_code == "INVALID_HANDLEBARS_TEMPLATE"
+
+    def test_non_string_handlebars_template(self) -> None:
+        data = {
+            "dataset_id": 1,
+            "config": {
+                "chart_type": "handlebars",
+                "handlebars_template": 123,
+                "metrics": [{"name": "sales", "aggregate": "SUM"}],
+            },
+        }
+        is_valid, _, error = SchemaValidator.validate_request(data)
+        assert is_valid is False
+        assert error is not None
+        assert error.error_code == "INVALID_HANDLEBARS_TEMPLATE"
+
+    def test_invalid_query_mode_rejected(self) -> None:
+        data = {
+            "dataset_id": 1,
+            "config": {
+                "chart_type": "handlebars",
+                "handlebars_template": "<p>test</p>",
+                "query_mode": "invalid",
+            },
+        }
+        is_valid, _, error = SchemaValidator.validate_request(data)
+        assert is_valid is False
+        assert error is not None
+        assert error.error_code == "INVALID_QUERY_MODE"
+
+    def test_raw_mode_missing_columns(self) -> None:
+        data = {
+            "dataset_id": 1,
+            "config": {
+                "chart_type": "handlebars",
+                "handlebars_template": "<p>test</p>",
+                "query_mode": "raw",
+            },
+        }
+        is_valid, _, error = SchemaValidator.validate_request(data)
+        assert is_valid is False
+        assert error is not None
+        assert error.error_code == "MISSING_RAW_COLUMNS"
+
+    def test_aggregate_mode_missing_metrics(self) -> None:
+        data = {
+            "dataset_id": 1,
+            "config": {
+                "chart_type": "handlebars",
+                "handlebars_template": "<p>test</p>",
+                "query_mode": "aggregate",
+            },
+        }
+        is_valid, _, error = SchemaValidator.validate_request(data)
+        assert is_valid is False
+        assert error is not None
+        assert error.error_code == "MISSING_AGGREGATE_METRICS"
+
+    def test_default_aggregate_mode_missing_metrics(self) -> None:
+        data = {
+            "dataset_id": 1,
+            "config": {
+                "chart_type": "handlebars",
+                "handlebars_template": "<p>test</p>",
+            },
+        }
+        is_valid, _, error = SchemaValidator.validate_request(data)
+        assert is_valid is False
+        assert error is not None
+        assert error.error_code == "MISSING_AGGREGATE_METRICS"
+
+    def test_handlebars_raw_mode_valid(self) -> None:
+        data = {
+            "dataset_id": 1,
+            "config": {
+                "chart_type": "handlebars",
+                "handlebars_template": "<p>{{#each data}}{{this.name}}{{/each}}</p>",
+                "query_mode": "raw",
+                "columns": [{"name": "product"}, {"name": "price"}],
+            },
+        }
+        is_valid, request, error = SchemaValidator.validate_request(data)
+        assert is_valid is True
+        assert request is not None
+        assert error is None
+
+    def test_non_string_chart_type_rejected(self) -> None:
+        data = {
+            "dataset_id": 1,
+            "config": {"chart_type": ["handlebars"]},
+        }
+        is_valid, _, error = SchemaValidator.validate_request(data)
+        assert is_valid is False
+        assert error is not None
+        assert error.error_code == "INVALID_CHART_TYPE"
+
+    def test_handlebars_in_error_messages(self) -> None:
+        """Verify 'handlebars' appears in missing chart_type suggestions."""
+        data = {
+            "dataset_id": 1,
+            "config": {},
+        }
+        is_valid, _, error = SchemaValidator.validate_request(data)
+        assert is_valid is False
+        assert error is not None
+        suggestions_text = " ".join(error.suggestions or [])
+        assert "handlebars" in suggestions_text
+
+    def test_invalid_chart_type_mentions_handlebars(self) -> None:
+        """Invalid chart_type error should mention handlebars as option."""
+        data = {
+            "dataset_id": 1,
+            "config": {"chart_type": "invalid"},
+        }
+        is_valid, _, error = SchemaValidator.validate_request(data)
+        assert is_valid is False
+        assert error is not None
+        assert "handlebars" in (error.details or "")
diff --git a/tests/unit_tests/mcp_service/chart/test_new_chart_types.py b/tests/unit_tests/mcp_service/chart/test_new_chart_types.py
index e2e37ba99e6..9469f63b39a 100644
--- a/tests/unit_tests/mcp_service/chart/test_new_chart_types.py
+++ b/tests/unit_tests/mcp_service/chart/test_new_chart_types.py
@@ -104,7 +104,7 @@ class TestPieChartConfigSchema:
         assert len(config.filters) == 1
 
     def test_pie_config_rejects_extra_fields(self) -> None:
-        with pytest.raises(ValidationError):
+        with pytest.raises(ValidationError, match="Unknown field"):
             PieChartConfig(
                 chart_type="pie",
                 dimension=ColumnRef(name="product"),
@@ -324,7 +324,7 @@ class TestPivotTableChartConfigSchema:
             )
 
     def test_pivot_table_rejects_extra_fields(self) -> None:
-        with pytest.raises(ValidationError):
+        with pytest.raises(ValidationError, match="Unknown field"):
             PivotTableChartConfig(
                 chart_type="pivot_table",
                 rows=[ColumnRef(name="product")],
@@ -459,10 +459,10 @@ class TestMixedTimeseriesChartConfigSchema:
             time_grain="P1M",
             y=[ColumnRef(name="revenue", aggregate="SUM")],
             primary_kind="area",
-            group_by=ColumnRef(name="region"),
+            group_by=[ColumnRef(name="region")],
             y_secondary=[ColumnRef(name="orders", aggregate="COUNT")],
             secondary_kind="scatter",
-            group_by_secondary=ColumnRef(name="channel"),
+            group_by_secondary=[ColumnRef(name="channel")],
             show_legend=False,
             x_axis=AxisConfig(title="Date"),
             y_axis=AxisConfig(title="Revenue", format="$,.2f"),
@@ -473,9 +473,9 @@ class TestMixedTimeseriesChartConfigSchema:
         assert config.secondary_kind == "scatter"
         assert config.time_grain == "P1M"
         assert config.group_by is not None
-        assert config.group_by.name == "region"
+        assert config.group_by[0].name == "region"
         assert config.group_by_secondary is not None
-        assert config.group_by_secondary.name == "channel"
+        assert config.group_by_secondary[0].name == "channel"
 
     def test_mixed_timeseries_missing_y(self) -> None:
         with pytest.raises(ValidationError):
@@ -503,7 +503,7 @@ class TestMixedTimeseriesChartConfigSchema:
             )
 
     def test_mixed_timeseries_rejects_extra_fields(self) -> None:
-        with pytest.raises(ValidationError):
+        with pytest.raises(ValidationError, match="Unknown field"):
             MixedTimeseriesChartConfig(
                 chart_type="mixed_timeseries",
                 x=ColumnRef(name="date"),
@@ -512,6 +512,25 @@ class TestMixedTimeseriesChartConfigSchema:
                 unknown_field="bad",
             )
 
+    def test_mixed_timeseries_default_row_limit(self) -> None:
+        config = MixedTimeseriesChartConfig(
+            chart_type="mixed_timeseries",
+            x=ColumnRef(name="date"),
+            y=[ColumnRef(name="revenue", aggregate="SUM")],
+            y_secondary=[ColumnRef(name="orders", aggregate="COUNT")],
+        )
+        assert config.row_limit == 10000
+
+    def test_mixed_timeseries_custom_row_limit(self) -> None:
+        config = MixedTimeseriesChartConfig(
+            chart_type="mixed_timeseries",
+            x=ColumnRef(name="date"),
+            y=[ColumnRef(name="revenue", aggregate="SUM")],
+            y_secondary=[ColumnRef(name="orders", aggregate="COUNT")],
+            row_limit=500,
+        )
+        assert config.row_limit == 500
+
 
 # ============================================================
 # Mixed Timeseries Form Data Mapping Tests
@@ -587,9 +606,9 @@ class TestMapMixedTimeseriesConfig:
             chart_type="mixed_timeseries",
             x=ColumnRef(name="date"),
             y=[ColumnRef(name="revenue", aggregate="SUM")],
-            group_by=ColumnRef(name="region"),
+            group_by=[ColumnRef(name="region")],
             y_secondary=[ColumnRef(name="orders", aggregate="COUNT")],
-            group_by_secondary=ColumnRef(name="channel"),
+            group_by_secondary=[ColumnRef(name="channel")],
         )
         result = map_mixed_timeseries_config(config, dataset_id=1)
 
@@ -604,9 +623,9 @@ class TestMapMixedTimeseriesConfig:
             chart_type="mixed_timeseries",
             x=ColumnRef(name="date"),
             y=[ColumnRef(name="revenue", aggregate="SUM")],
-            group_by=ColumnRef(name="date"),  # same as x
+            group_by=[ColumnRef(name="date")],  # same as x
             y_secondary=[ColumnRef(name="orders", aggregate="COUNT")],
-            group_by_secondary=ColumnRef(name="date"),  # same as x
+            group_by_secondary=[ColumnRef(name="date")],  # same as x
         )
         result = map_mixed_timeseries_config(config, dataset_id=1)
 
@@ -636,6 +655,35 @@ class TestMapMixedTimeseriesConfig:
         assert result["y_axis_format_secondary"] == ",d"
         assert result["logAxisSecondary"] is True
 
+    @patch("superset.mcp_service.chart.chart_utils.is_column_truly_temporal")
+    def test_mixed_form_data_row_limit(self, mock_is_temporal) -> None:
+        mock_is_temporal.return_value = True
+
+        config = MixedTimeseriesChartConfig(
+            chart_type="mixed_timeseries",
+            x=ColumnRef(name="date"),
+            y=[ColumnRef(name="revenue", aggregate="SUM")],
+            y_secondary=[ColumnRef(name="orders", aggregate="COUNT")],
+            row_limit=300,
+        )
+        result = map_mixed_timeseries_config(config, dataset_id=1)
+
+        assert result["row_limit"] == 300
+
+    @patch("superset.mcp_service.chart.chart_utils.is_column_truly_temporal")
+    def test_mixed_form_data_default_row_limit(self, mock_is_temporal) -> None:
+        mock_is_temporal.return_value = True
+
+        config = MixedTimeseriesChartConfig(
+            chart_type="mixed_timeseries",
+            x=ColumnRef(name="date"),
+            y=[ColumnRef(name="revenue", aggregate="SUM")],
+            y_secondary=[ColumnRef(name="orders", aggregate="COUNT")],
+        )
+        result = map_mixed_timeseries_config(config, dataset_id=1)
+
+        assert result["row_limit"] == 10000
+
     @patch("superset.mcp_service.chart.chart_utils.is_column_truly_temporal")
     def test_mixed_form_data_with_filters(self, mock_is_temporal) -> None:
         mock_is_temporal.return_value = True
diff --git a/tests/unit_tests/mcp_service/chart/tool/test_generate_chart.py b/tests/unit_tests/mcp_service/chart/tool/test_generate_chart.py
index f4d834c5306..2a7f1854dfb 100644
--- a/tests/unit_tests/mcp_service/chart/tool/test_generate_chart.py
+++ b/tests/unit_tests/mcp_service/chart/tool/test_generate_chart.py
@@ -19,9 +19,10 @@
 Unit tests for MCP generate_chart tool
 """
 
-from unittest.mock import MagicMock, patch
+from unittest.mock import MagicMock, Mock, patch
 
 import pytest
+from sqlalchemy.orm.exc import DetachedInstanceError
 
 from superset.mcp_service.chart.schemas import (
     AxisConfig,
@@ -56,10 +57,11 @@ class TestGenerateChart:
         )
         table_request = GenerateChartRequest(dataset_id="1", config=table_config)
         assert table_request.dataset_id == "1"
-        assert table_request.config.chart_type == "table"
-        assert len(table_request.config.columns) == 2
-        assert table_request.config.columns[0].name == "region"
-        assert table_request.config.columns[1].aggregate == "SUM"
+        # config is now Dict[str, Any] in the schema; validate via dict access
+        assert table_request.config["chart_type"] == "table"
+        assert len(table_request.config["columns"]) == 2
+        assert table_request.config["columns"][0]["name"] == "region"
+        assert table_request.config["columns"][1]["aggregate"] == "SUM"
 
         # XY chart request
         xy_config = XYChartConfig(
@@ -73,12 +75,12 @@ class TestGenerateChart:
             legend=LegendConfig(show=True, position="top"),
         )
         xy_request = GenerateChartRequest(dataset_id="2", config=xy_config)
-        assert xy_request.config.chart_type == "xy"
-        assert xy_request.config.x.name == "date"
-        assert xy_request.config.y[0].aggregate == "SUM"
-        assert xy_request.config.kind == "line"
-        assert xy_request.config.x_axis.title == "Date"
-        assert xy_request.config.legend.show is True
+        assert xy_request.config["chart_type"] == "xy"
+        assert xy_request.config["x"]["name"] == "date"
+        assert xy_request.config["y"][0]["aggregate"] == "SUM"
+        assert xy_request.config["kind"] == "line"
+        assert xy_request.config["x_axis"]["title"] == "Date"
+        assert xy_request.config["legend"]["show"] is True
 
     @pytest.mark.asyncio
     async def test_generate_chart_validation_error_handling(self):
@@ -351,3 +353,142 @@ class TestCompileChart:
 
         assert result.success is False
         assert "invalid metric" in (result.error or "")
+
+
+def _make_mock_chart(chart_id: int = 42) -> Mock:
+    """Create a mock chart with all attributes needed by serialize_chart_object."""
+    chart = Mock()
+    chart.id = chart_id
+    chart.slice_name = "Test Chart"
+    chart.viz_type = "echarts_timeseries_bar"
+    chart.datasource_name = "test_table"
+    chart.datasource_type = "table"
+    chart.description = None
+    chart.certified_by = None
+    chart.certification_details = None
+    chart.cache_timeout = None
+    chart.changed_by = None
+    chart.changed_by_name = "admin"
+    chart.changed_on = None
+    chart.changed_on_humanized = "1 day ago"
+    chart.created_by = None
+    chart.created_by_name = "admin"
+    chart.created_on = None
+    chart.created_on_humanized = "2 days ago"
+    chart.uuid = "test-uuid-42"
+    chart.tags = []
+    chart.owners = []
+    return chart
+
+
+class TestChartSerializationEagerLoading:
+    """Tests for eager loading fix in generate_chart serialization path."""
+
+    def test_serialize_chart_object_succeeds_with_loaded_relationships(self):
+        """serialize_chart_object works when tags/owners are already loaded."""
+        from superset.mcp_service.chart.schemas import serialize_chart_object
+
+        chart = _make_mock_chart()
+        result = serialize_chart_object(chart)
+
+        assert result is not None
+        assert result.id == 42
+        assert result.slice_name == "Test Chart"
+        assert result.tags == []
+        assert result.owners == []
+
+    def test_serialize_chart_object_with_certification_fields(self):
+        """serialize_chart_object correctly serializes non-None certification values."""
+        from superset.mcp_service.chart.schemas import serialize_chart_object
+
+        chart = _make_mock_chart()
+        chart.certified_by = "Data Team"
+        chart.certification_details = "Verified Q1 2026 metrics"
+
+        result = serialize_chart_object(chart)
+
+        assert result is not None
+        assert result.certified_by == "Data Team"
+        assert result.certification_details == "Verified Q1 2026 metrics"
+
+    def test_serialize_chart_object_fails_on_detached_instance(self):
+        """serialize_chart_object raises when accessing lazy attrs on detached
+        instance — this is the bug scenario that the eager-loading fix prevents."""
+        from superset.mcp_service.chart.schemas import serialize_chart_object
+
+        chart = _make_mock_chart()
+        # Simulate detached instance: accessing .tags raises DetachedInstanceError
+        type(chart).tags = property(
+            lambda self: (_ for _ in ()).throw(
+                DetachedInstanceError("Instance <Slice> is not bound to a Session")
+            )
+        )
+
+        with pytest.raises(DetachedInstanceError):
+            serialize_chart_object(chart)
+
+    def test_generate_chart_refetches_via_dao(self):
+        """The serialization path re-fetches the chart via
+        ChartDAO.find_by_id() with query_options for owners and tags."""
+        refetched_chart = _make_mock_chart()
+        refetched_chart.tags = [Mock(id=1, name="tag1", type="custom")]
+        refetched_chart.tags[0].description = ""
+
+        mock_dao = MagicMock()
+        mock_dao.find_by_id.return_value = refetched_chart
+
+        chart = (
+            mock_dao.find_by_id(42, query_options=[Mock(), Mock()])
+            or _make_mock_chart()
+        )
+
+        assert chart is refetched_chart
+        mock_dao.find_by_id.assert_called()
+
+    def test_generate_chart_falls_back_to_original_on_dao_none(self):
+        """Falls back to original chart if ChartDAO.find_by_id()
+        returns None."""
+        original_chart = _make_mock_chart()
+
+        mock_dao = MagicMock()
+        mock_dao.find_by_id.return_value = None
+
+        chart = mock_dao.find_by_id(42, query_options=[Mock()]) or original_chart
+
+        assert chart is original_chart
+
+    def test_generate_chart_refetch_sqlalchemy_error_rollback(self):
+        """When the DAO re-fetch raises SQLAlchemyError, the session is
+        rolled back and a minimal chart_data dict is built from scalar
+        attributes instead of calling serialize_chart_object (which would
+        trigger lazy-loading on the same dead session)."""
+        from sqlalchemy.exc import SQLAlchemyError
+
+        original_chart = _make_mock_chart()
+        mock_dao = MagicMock()
+        mock_dao.find_by_id.side_effect = SQLAlchemyError("session error")
+        mock_session = MagicMock()
+        explore_url = "http://example.com/explore/?slice_id=42"
+
+        chart_data = None
+        try:
+            mock_dao.find_by_id(42, query_options=[Mock()])
+        except SQLAlchemyError:
+            mock_session.rollback()
+            chart_data = {
+                "id": original_chart.id,
+                "slice_name": original_chart.slice_name,
+                "viz_type": original_chart.viz_type,
+                "url": explore_url,
+                "uuid": str(original_chart.uuid) if original_chart.uuid else None,
+            }
+
+        mock_session.rollback.assert_called()
+        # Minimal chart_data should contain scalar fields only
+        assert chart_data is not None
+        assert chart_data["id"] == original_chart.id
+        assert chart_data["slice_name"] == original_chart.slice_name
+        assert chart_data["url"] == explore_url
+        # No tags/owners keys — those would require relationship access
+        assert "tags" not in chart_data
+        assert "owners" not in chart_data
diff --git a/tests/unit_tests/mcp_service/chart/tool/test_get_chart_sql.py b/tests/unit_tests/mcp_service/chart/tool/test_get_chart_sql.py
new file mode 100644
index 00000000000..00fa65991c5
--- /dev/null
+++ b/tests/unit_tests/mcp_service/chart/tool/test_get_chart_sql.py
@@ -0,0 +1,592 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+"""
+Unit tests for get_chart_sql MCP tool
+"""
+
+import importlib
+from unittest.mock import Mock, patch
+
+import pytest
+
+from superset.mcp_service.chart.schemas import (
+    ChartError,
+    ChartSql,
+    GetChartSqlRequest,
+)
+from superset.mcp_service.chart.tool.get_chart_sql import (
+    _build_query_context_from_form_data,
+    _extract_sql_from_result,
+    _find_chart_by_identifier,
+    _resolve_effective_form_data,
+    _resolve_groupby,
+    _resolve_metrics,
+    _resolve_metrics_and_groupby,
+)
+
+_get_chart_sql_mod = importlib.import_module(
+    "superset.mcp_service.chart.tool.get_chart_sql"
+)
+
+
+class TestGetChartSqlRequestSchema:
+    """Tests for GetChartSqlRequest schema validation."""
+
+    def test_valid_request_with_identifier(self):
+        """Test creating request with a numeric identifier."""
+        request = GetChartSqlRequest(identifier=123)
+        assert request.identifier == 123
+        assert request.form_data_key is None
+
+    def test_valid_request_with_uuid_identifier(self):
+        """Test creating request with a UUID string identifier."""
+        request = GetChartSqlRequest(identifier="abc-def-123")
+        assert request.identifier == "abc-def-123"
+        assert request.form_data_key is None
+
+    def test_valid_request_with_form_data_key_only(self):
+        """Test creating request with form_data_key only (unsaved chart)."""
+        request = GetChartSqlRequest(form_data_key="some-key")
+        assert request.identifier is None
+        assert request.form_data_key == "some-key"
+
+    def test_valid_request_with_both(self):
+        """Test creating request with both identifier and form_data_key."""
+        request = GetChartSqlRequest(identifier=42, form_data_key="some-key")
+        assert request.identifier == 42
+        assert request.form_data_key == "some-key"
+
+    def test_invalid_request_neither_provided(self):
+        """Test request fails when neither identifier nor key given."""
+        with pytest.raises(ValueError, match="At least one of"):
+            GetChartSqlRequest()
+
+
+class TestExtractSqlFromResult:
+    """Tests for the _extract_sql_from_result helper."""
+
+    def test_successful_sql_extraction(self):
+        """Test extracting SQL from a normal result."""
+        result = {
+            "queries": [
+                {
+                    "query": "SELECT * FROM my_table WHERE x > 1",
+                    "language": "sql",
+                }
+            ]
+        }
+        output = _extract_sql_from_result(
+            result,
+            chart_id=10,
+            chart_name="Sales Chart",
+            datasource_name="my_table",
+        )
+        assert isinstance(output, ChartSql)
+        assert output.sql == "SELECT * FROM my_table WHERE x > 1"
+        assert output.language == "sql"
+        assert output.chart_id == 10
+        assert output.chart_name == "Sales Chart"
+        assert output.datasource_name == "my_table"
+        assert output.error is None
+
+    def test_empty_queries_returns_error(self):
+        """Test that empty query results return a ChartError."""
+        result = {"queries": []}
+        output = _extract_sql_from_result(
+            result, chart_id=1, chart_name="Test", datasource_name="ds"
+        )
+        assert isinstance(output, ChartError)
+        assert output.error_type == "EmptyQuery"
+
+    def test_missing_queries_key_returns_error(self):
+        """Test that missing 'queries' key returns a ChartError."""
+        result = {}
+        output = _extract_sql_from_result(
+            result, chart_id=1, chart_name="Test", datasource_name="ds"
+        )
+        assert isinstance(output, ChartError)
+        assert output.error_type == "EmptyQuery"
+
+    def test_no_sql_with_error_returns_chart_error(self):
+        """Test that empty sql with an error message returns ChartError."""
+        result = {
+            "queries": [
+                {
+                    "query": "",
+                    "language": "sql",
+                    "error": "Unknown column 'foo'",
+                }
+            ]
+        }
+        output = _extract_sql_from_result(
+            result, chart_id=5, chart_name="Bad Chart", datasource_name="ds"
+        )
+        assert isinstance(output, ChartError)
+        assert output.error_type == "QueryGenerationFailed"
+        assert "Unknown column" in output.error
+
+    def test_sql_with_error_returns_chart_sql(self):
+        """Test that partial SQL with a non-fatal error returns ChartSql with error."""
+        result = {
+            "queries": [
+                {
+                    "query": "SELECT col1 FROM tbl",
+                    "language": "sql",
+                    "error": "Warning: column col2 not found",
+                }
+            ]
+        }
+        output = _extract_sql_from_result(
+            result, chart_id=7, chart_name="Partial", datasource_name="tbl"
+        )
+        assert isinstance(output, ChartSql)
+        assert output.sql == "SELECT col1 FROM tbl"
+        assert output.error is not None
+
+    def test_null_chart_metadata(self):
+        """Test extraction when chart metadata is None."""
+        result = {"queries": [{"query": "SELECT 1", "language": "sql"}]}
+        output = _extract_sql_from_result(
+            result, chart_id=None, chart_name=None, datasource_name=None
+        )
+        assert isinstance(output, ChartSql)
+        assert output.chart_id is None
+        assert output.chart_name is None
+        assert output.datasource_name is None
+
+
+class TestFindChartByIdentifier:
+    """Tests for the _find_chart_by_identifier helper."""
+
+    @patch("superset.daos.chart.ChartDAO.find_by_id")
+    def test_find_by_numeric_id(self, mock_find):
+        """Test finding chart by numeric ID."""
+        mock_chart = Mock()
+        mock_find.return_value = mock_chart
+
+        result = _find_chart_by_identifier(42)
+
+        mock_find.assert_called_once_with(42)
+        assert result == mock_chart
+
+    @patch("superset.daos.chart.ChartDAO.find_by_id")
+    def test_find_by_digit_string(self, mock_find):
+        """Test finding chart by digit string (treated as numeric ID)."""
+        mock_chart = Mock()
+        mock_find.return_value = mock_chart
+
+        result = _find_chart_by_identifier("123")
+
+        mock_find.assert_called_once_with(123)
+        assert result == mock_chart
+
+    @patch("superset.daos.chart.ChartDAO.find_by_id")
+    def test_find_by_uuid_string(self, mock_find):
+        """Test finding chart by UUID string."""
+        mock_chart = Mock()
+        mock_find.return_value = mock_chart
+
+        result = _find_chart_by_identifier("abc-123-def")
+
+        mock_find.assert_called_once_with("abc-123-def", id_column="uuid")
+        assert result == mock_chart
+
+    @patch("superset.daos.chart.ChartDAO.find_by_id")
+    def test_not_found_returns_none(self, mock_find):
+        """Test that None is returned when chart is not found."""
+        mock_find.return_value = None
+
+        result = _find_chart_by_identifier(999)
+
+        assert result is None
+
+
+class TestResolveEffectiveFormData:
+    """Tests for the _resolve_effective_form_data helper."""
+
+    def test_returns_saved_params_when_no_form_data_key(self):
+        """Test that saved chart params are returned when no form_data_key."""
+        mock_chart = Mock()
+        mock_chart.params = '{"metrics": ["count"], "viz_type": "table"}'
+
+        form_data, using_unsaved = _resolve_effective_form_data(
+            mock_chart, form_data_key=None
+        )
+
+        assert form_data == {"metrics": ["count"], "viz_type": "table"}
+        assert using_unsaved is False
+
+    def test_returns_empty_dict_when_no_params(self):
+        """Test that empty dict is returned when chart has no params."""
+        mock_chart = Mock()
+        mock_chart.params = None
+
+        form_data, using_unsaved = _resolve_effective_form_data(
+            mock_chart, form_data_key=None
+        )
+
+        assert form_data == {}
+        assert using_unsaved is False
+
+    def test_returns_empty_dict_for_invalid_json_params(self):
+        """Test that invalid JSON in params returns empty dict."""
+        mock_chart = Mock()
+        mock_chart.params = "not-valid-json"
+
+        form_data, using_unsaved = _resolve_effective_form_data(
+            mock_chart, form_data_key=None
+        )
+
+        assert form_data == {}
+        assert using_unsaved is False
+
+    @patch.object(_get_chart_sql_mod, "_get_cached_form_data")
+    def test_returns_cached_form_data_when_key_provided(self, mock_get_cached):
+        """Test that cached form_data is used when form_data_key is provided."""
+        mock_get_cached.return_value = '{"metrics": ["sum_sales"], "unsaved": true}'
+        mock_chart = Mock()
+        mock_chart.params = '{"metrics": ["count"]}'
+
+        form_data, using_unsaved = _resolve_effective_form_data(
+            mock_chart, form_data_key="test-key-123"
+        )
+
+        assert form_data == {"metrics": ["sum_sales"], "unsaved": True}
+        assert using_unsaved is True
+
+    @patch.object(_get_chart_sql_mod, "_get_cached_form_data")
+    def test_falls_back_to_saved_when_cache_miss(self, mock_get_cached):
+        """Test fallback to saved params when cache returns nothing."""
+        mock_get_cached.return_value = None
+        mock_chart = Mock()
+        mock_chart.params = '{"metrics": ["count"]}'
+
+        form_data, using_unsaved = _resolve_effective_form_data(
+            mock_chart, form_data_key="expired-key"
+        )
+
+        assert form_data == {"metrics": ["count"]}
+        assert using_unsaved is False
+
+
+class TestResolveMetricsAndGroupby:
+    """Tests for metric/groupby resolution helpers."""
+
+    def test_bubble_chart_extracts_x_y_size(self):
+        """Bubble charts store measures in x, y, size fields."""
+        form_data = {
+            "viz_type": "bubble",
+            "x": "col_x",
+            "y": "col_y",
+            "size": "col_size",
+        }
+        metrics = _resolve_metrics(form_data, "bubble")
+        assert metrics == ["col_x", "col_y", "col_size"]
+
+    def test_bubble_chart_via_resolve_metrics_and_groupby(self):
+        """Integration: _resolve_metrics_and_groupby handles bubble type."""
+        form_data = {
+            "viz_type": "bubble",
+            "x": "metric_a",
+            "y": "metric_b",
+            "size": "metric_c",
+            "groupby": ["dim1"],
+        }
+        metrics, groupby = _resolve_metrics_and_groupby(form_data, chart=None)
+        assert metrics == ["metric_a", "metric_b", "metric_c"]
+        assert groupby == ["dim1"]
+
+    def test_bubble_chart_missing_fields(self):
+        """Bubble charts with missing x/y/size fields produce partial metrics."""
+        form_data = {"viz_type": "bubble", "x": "only_x"}
+        metrics = _resolve_metrics(form_data, "bubble")
+        assert metrics == ["only_x"]
+
+    def test_string_groupby_normalised_to_list(self):
+        """A scalar string groupby must become a single-item list, not chars."""
+        groupby = _resolve_groupby({"groupby": "country"})
+        assert groupby == ["country"]
+
+    def test_list_groupby_unchanged(self):
+        """A list groupby should pass through normally."""
+        groupby = _resolve_groupby({"groupby": ["col_a", "col_b"]})
+        assert groupby == ["col_a", "col_b"]
+
+    def test_empty_groupby_falls_back_to_entity_series(self):
+        """Missing groupby falls back to entity/series/columns."""
+        form_data = {"entity": "country", "series": "year"}
+        groupby = _resolve_groupby(form_data)
+        assert groupby == ["country", "year"]
+
+    def test_empty_groupby_falls_back_to_columns(self):
+        """Missing groupby falls back to columns list."""
+        form_data = {"columns": ["a", "b"]}
+        groupby = _resolve_groupby(form_data)
+        assert groupby == ["a", "b"]
+
+
+class TestBuildQueryContextFromFormData:
+    """Regression tests for fallback query context construction.
+
+    Verifies that temporal fields, adhoc_filters, and legacy filters from
+    form_data are passed through to QueryContextFactory (not dropped).
+    """
+
+    @patch("superset.common.query_context_factory.QueryContextFactory")
+    def test_temporal_fields_passed_to_factory(self, mock_factory_cls):
+        """time_range, granularity_sqla, adhoc_filters from form_data are
+        forwarded via form_data= to the factory, not dropped."""
+        mock_factory = Mock()
+        mock_factory.create.return_value = Mock()
+        mock_factory_cls.return_value = mock_factory
+
+        form_data = {
+            "datasource_id": 1,
+            "datasource_type": "table",
+            "metrics": ["count"],
+            "groupby": ["country"],
+            "time_range": "Last 7 days",
+            "granularity_sqla": "created_at",
+            "adhoc_filters": [
+                {
+                    "clause": "WHERE",
+                    "expressionType": "SIMPLE",
+                    "subject": "status",
+                    "operator": "==",
+                    "comparator": "active",
+                }
+            ],
+            "where": "region = 'US'",
+            "having": "count > 10",
+            "filters": [{"col": "city", "op": "==", "val": "NYC"}],
+        }
+
+        with patch(
+            "superset.common.chart_data.ChartDataResultType"
+        ) as mock_result_type:
+            mock_result_type.QUERY = "QUERY"
+            _build_query_context_from_form_data(form_data, chart=None)
+
+        # Verify factory.create was called with form_data containing all fields
+        call_kwargs = mock_factory.create.call_args[1]
+        assert call_kwargs["form_data"] is form_data
+        assert call_kwargs["form_data"]["time_range"] == "Last 7 days"
+        assert call_kwargs["form_data"]["granularity_sqla"] == "created_at"
+        assert call_kwargs["form_data"]["adhoc_filters"] is not None
+        assert call_kwargs["form_data"]["where"] == "region = 'US'"
+        assert call_kwargs["form_data"]["having"] == "count > 10"
+        assert call_kwargs["form_data"]["filters"] == [
+            {"col": "city", "op": "==", "val": "NYC"}
+        ]
+
+    @patch("superset.common.query_context_factory.QueryContextFactory")
+    def test_metrics_and_groupby_in_queries(self, mock_factory_cls):
+        """Resolved metrics and groupby are passed in queries parameter."""
+        mock_factory = Mock()
+        mock_factory.create.return_value = Mock()
+        mock_factory_cls.return_value = mock_factory
+
+        form_data = {
+            "datasource_id": 1,
+            "datasource_type": "table",
+            "metrics": ["sum_revenue"],
+            "groupby": ["product"],
+        }
+
+        with patch(
+            "superset.common.chart_data.ChartDataResultType"
+        ) as mock_result_type:
+            mock_result_type.QUERY = "QUERY"
+            _build_query_context_from_form_data(form_data, chart=None)
+
+        call_kwargs = mock_factory.create.call_args[1]
+        queries = call_kwargs["queries"]
+        assert len(queries) == 1
+        assert queries[0]["metrics"] == ["sum_revenue"]
+        assert queries[0]["columns"] == ["product"]
+
+
+class TestGetChartSqlTool:
+    """Integration-style tests for the get_chart_sql MCP tool via Client."""
+
+    @pytest.fixture(autouse=True)
+    def mock_auth(self):
+        """Mock authentication for all tests."""
+        with patch("superset.mcp_service.auth.get_user_from_request") as mock_get_user:
+            mock_user = Mock()
+            mock_user.id = 1
+            mock_user.username = "admin"
+            mock_get_user.return_value = mock_user
+            yield mock_get_user
+
+    @pytest.fixture
+    def mcp_server(self):
+        from superset.mcp_service.app import mcp
+
+        return mcp
+
+    @patch.object(_get_chart_sql_mod, "validate_chart_dataset")
+    @patch.object(_get_chart_sql_mod, "_find_chart_by_identifier")
+    @pytest.mark.asyncio
+    async def test_chart_not_found(self, mock_find, mock_validate, mcp_server):
+        """Test that a not-found chart returns an error."""
+        from fastmcp import Client
+
+        mock_find.return_value = None
+
+        async with Client(mcp_server) as client:
+            result = await client.call_tool(
+                "get_chart_sql", {"request": {"identifier": 999}}
+            )
+
+            data = result.structured_content.get("result", result.structured_content)
+            assert data["error_type"] == "NotFound"
+            assert "999" in data["error"]
+
+    @patch.object(_get_chart_sql_mod, "_sql_from_form_data")
+    @patch.object(_get_chart_sql_mod, "_sql_from_saved_query_context")
+    @patch.object(_get_chart_sql_mod, "_resolve_effective_form_data")
+    @patch.object(_get_chart_sql_mod, "validate_chart_dataset")
+    @patch.object(_get_chart_sql_mod, "_find_chart_by_identifier")
+    @pytest.mark.asyncio
+    async def test_success_via_saved_query_context(
+        self,
+        mock_find,
+        mock_validate,
+        mock_resolve,
+        mock_saved_qc,
+        mock_form_data_sql,
+        mcp_server,
+    ):
+        """Test successful SQL retrieval via saved query_context."""
+        from fastmcp import Client
+
+        from superset.mcp_service.chart.chart_utils import (
+            DatasetValidationResult,
+        )
+
+        mock_chart = Mock()
+        mock_chart.id = 10
+        mock_chart.slice_name = "Sales Chart"
+        mock_chart.viz_type = "table"
+        mock_find.return_value = mock_chart
+
+        mock_validate.return_value = DatasetValidationResult(
+            is_valid=True, dataset_id=1, dataset_name="ds", warnings=[]
+        )
+        mock_resolve.return_value = ({"metrics": ["count"]}, False)
+        mock_saved_qc.return_value = ChartSql(
+            chart_id=10,
+            chart_name="Sales Chart",
+            sql="SELECT COUNT(*) FROM sales",
+            language="sql",
+            datasource_name="sales",
+        )
+
+        async with Client(mcp_server) as client:
+            result = await client.call_tool(
+                "get_chart_sql", {"request": {"identifier": 10}}
+            )
+
+            data = result.structured_content.get("result", result.structured_content)
+            assert "SELECT COUNT(*) FROM sales" in data["sql"]
+            assert data["chart_id"] == 10
+
+    @patch.object(_get_chart_sql_mod, "_sql_from_form_data")
+    @patch.object(_get_chart_sql_mod, "_sql_from_saved_query_context")
+    @patch.object(_get_chart_sql_mod, "_resolve_effective_form_data")
+    @patch.object(_get_chart_sql_mod, "validate_chart_dataset")
+    @patch.object(_get_chart_sql_mod, "_find_chart_by_identifier")
+    @pytest.mark.asyncio
+    async def test_fallback_to_form_data_when_saved_qc_fails(
+        self,
+        mock_find,
+        mock_validate,
+        mock_resolve,
+        mock_saved_qc,
+        mock_form_data_sql,
+        mcp_server,
+    ):
+        """Test fallback to form_data path when saved query_context returns None."""
+        from fastmcp import Client
+
+        from superset.mcp_service.chart.chart_utils import (
+            DatasetValidationResult,
+        )
+
+        mock_chart = Mock()
+        mock_chart.id = 20
+        mock_chart.slice_name = "Revenue"
+        mock_chart.viz_type = "bar"
+        mock_find.return_value = mock_chart
+
+        mock_validate.return_value = DatasetValidationResult(
+            is_valid=True, dataset_id=2, dataset_name="revenue", warnings=[]
+        )
+        mock_resolve.return_value = ({"metrics": ["sum_revenue"]}, False)
+        mock_saved_qc.return_value = None
+        mock_form_data_sql.return_value = ChartSql(
+            chart_id=20,
+            chart_name="Revenue",
+            sql="SELECT SUM(revenue) FROM orders",
+            language="sql",
+            datasource_name="orders",
+        )
+
+        async with Client(mcp_server) as client:
+            result = await client.call_tool(
+                "get_chart_sql", {"request": {"identifier": 20}}
+            )
+
+            data = result.structured_content.get("result", result.structured_content)
+            assert "SELECT SUM(revenue) FROM orders" in data["sql"]
+            mock_form_data_sql.assert_called_once()
+
+    @patch.object(_get_chart_sql_mod, "validate_chart_dataset")
+    @patch.object(_get_chart_sql_mod, "_find_chart_by_identifier")
+    @pytest.mark.asyncio
+    async def test_dataset_not_accessible(self, mock_find, mock_validate, mcp_server):
+        """Test that inaccessible dataset returns error."""
+        from fastmcp import Client
+
+        from superset.mcp_service.chart.chart_utils import (
+            DatasetValidationResult,
+        )
+
+        mock_chart = Mock()
+        mock_chart.id = 30
+        mock_chart.slice_name = "Restricted"
+        mock_chart.viz_type = "table"
+        mock_find.return_value = mock_chart
+
+        mock_validate.return_value = DatasetValidationResult(
+            is_valid=False,
+            dataset_id=3,
+            dataset_name="secret_ds",
+            warnings=[],
+            error="Access denied to dataset secret_ds",
+        )
+
+        async with Client(mcp_server) as client:
+            result = await client.call_tool(
+                "get_chart_sql", {"request": {"identifier": 30}}
+            )
+
+            data = result.structured_content.get("result", result.structured_content)
+            assert data["error_type"] == "DatasetNotAccessible"
+            assert "Access denied" in data["error"]
diff --git a/tests/unit_tests/mcp_service/chart/tool/test_get_chart_type_schema.py b/tests/unit_tests/mcp_service/chart/tool/test_get_chart_type_schema.py
new file mode 100644
index 00000000000..f7f2d166a5a
--- /dev/null
+++ b/tests/unit_tests/mcp_service/chart/tool/test_get_chart_type_schema.py
@@ -0,0 +1,86 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+"""Tests for get_chart_type_schema tool logic."""
+
+import pytest
+
+from superset.mcp_service.chart.tool.get_chart_type_schema import (
+    _CHART_EXAMPLES,
+    _get_chart_type_schema_impl as _call_schema,
+    VALID_CHART_TYPES,
+)
+
+
+class TestGetChartTypeSchema:
+    @pytest.mark.parametrize("chart_type", VALID_CHART_TYPES)
+    def test_valid_chart_type_returns_schema(self, chart_type: str) -> None:
+        result = _call_schema(chart_type)
+        assert "schema" in result
+        assert result["chart_type"] == chart_type
+        assert isinstance(result["schema"], dict)
+        assert "properties" in result["schema"]
+        assert "examples" in result
+
+    def test_xy_schema_has_expected_fields(self) -> None:
+        result = _call_schema("xy")
+        props = result["schema"]["properties"]
+        assert "x" in props
+        assert "y" in props
+        assert "kind" in props
+
+    def test_table_schema_has_columns(self) -> None:
+        result = _call_schema("table")
+        props = result["schema"]["properties"]
+        assert "columns" in props
+
+    def test_pie_schema_has_dimension_metric(self) -> None:
+        result = _call_schema("pie")
+        props = result["schema"]["properties"]
+        assert "dimension" in props
+        assert "metric" in props
+
+    def test_big_number_schema_has_metric(self) -> None:
+        result = _call_schema("big_number")
+        props = result["schema"]["properties"]
+        assert "metric" in props
+
+    def test_include_examples_false_omits_examples(self) -> None:
+        result = _call_schema("xy", include_examples=False)
+        assert "schema" in result
+        assert "examples" not in result
+
+    def test_invalid_chart_type_returns_error(self) -> None:
+        result = _call_schema("nonexistent")
+        assert "error" in result
+        assert "valid_chart_types" in result
+        assert result["valid_chart_types"] == VALID_CHART_TYPES
+
+    def test_examples_match_chart_type(self) -> None:
+        result = _call_schema("pie")
+        for example in result["examples"]:
+            assert example["chart_type"] == "pie"
+
+    def test_valid_chart_types_constant(self) -> None:
+        assert len(VALID_CHART_TYPES) == 7
+        assert "xy" in VALID_CHART_TYPES
+        assert "table" in VALID_CHART_TYPES
+
+    def test_all_chart_types_have_examples(self) -> None:
+        for chart_type in VALID_CHART_TYPES:
+            assert chart_type in _CHART_EXAMPLES
+            assert len(_CHART_EXAMPLES[chart_type]) >= 1
diff --git a/tests/unit_tests/mcp_service/chart/tool/test_list_charts.py b/tests/unit_tests/mcp_service/chart/tool/test_list_charts.py
index c7fa505ac93..9d4d053b8c0 100644
--- a/tests/unit_tests/mcp_service/chart/tool/test_list_charts.py
+++ b/tests/unit_tests/mcp_service/chart/tool/test_list_charts.py
@@ -28,6 +28,7 @@ from superset.mcp_service.chart.schemas import (
     ChartFilter,
     ListChartsRequest,
 )
+from superset.mcp_service.constants import MAX_PAGE_SIZE
 
 
 @pytest.fixture
@@ -45,6 +46,8 @@ def mock_chart():
     chart.datasource_name = "test_dataset"
     chart.datasource_type = "table"
     chart.description = "Test chart"
+    chart.certified_by = None
+    chart.certification_details = None
     chart.url = "/chart/1"
     chart.changed_by_name = "admin"
     chart.changed_on = None
@@ -133,6 +136,19 @@ class TestListChartsRequestSchema:
         with pytest.raises(ValueError, match="Input should be greater than 0"):
             ListChartsRequest(page_size=0)
 
+    def test_page_size_exceeds_max(self):
+        """Test that page_size over MAX_PAGE_SIZE raises validation error."""
+        with pytest.raises(
+            ValueError,
+            match=f"Input should be less than or equal to {MAX_PAGE_SIZE}",
+        ):
+            ListChartsRequest(page_size=MAX_PAGE_SIZE + 1)
+
+    def test_page_size_at_max(self):
+        """Test that page_size at MAX_PAGE_SIZE is accepted."""
+        request = ListChartsRequest(page_size=MAX_PAGE_SIZE)
+        assert request.page_size == MAX_PAGE_SIZE
+
     def test_filter_validation(self):
         """Test that filter validation works correctly."""
         # Valid filter
@@ -183,20 +199,21 @@ class TestChartDefaultColumnFiltering:
         """Test that minimal default columns are properly defined."""
         from superset.mcp_service.common.schema_discovery import CHART_DEFAULT_COLUMNS
 
-        # Required minimal columns must be present
-        required_columns = {
+        assert set(CHART_DEFAULT_COLUMNS) == {
             "id",
             "slice_name",
             "viz_type",
+            "description",
+            "certified_by",
+            "certification_details",
             "url",
+            "changed_on",
             "changed_on_humanized",
         }
-        assert required_columns.issubset(set(CHART_DEFAULT_COLUMNS))
 
         # Heavy columns should NOT be in defaults
         assert "form_data" not in CHART_DEFAULT_COLUMNS
         assert "query_context" not in CHART_DEFAULT_COLUMNS
-        assert "description" not in CHART_DEFAULT_COLUMNS
         assert "datasource_name" not in CHART_DEFAULT_COLUMNS
         assert "uuid" not in CHART_DEFAULT_COLUMNS
 
diff --git a/tests/unit_tests/mcp_service/chart/tool/test_update_chart.py b/tests/unit_tests/mcp_service/chart/tool/test_update_chart.py
index f21c4ee11e6..d6a49c42674 100644
--- a/tests/unit_tests/mcp_service/chart/tool/test_update_chart.py
+++ b/tests/unit_tests/mcp_service/chart/tool/test_update_chart.py
@@ -19,17 +19,36 @@
 Unit tests for update_chart MCP tool
 """
 
-import pytest
+import importlib
+from unittest.mock import Mock, patch
 
+import pytest
+from fastmcp import Client
+
+from superset.mcp_service.app import mcp
+from superset.mcp_service.chart.chart_helpers import find_chart_by_identifier
+from superset.mcp_service.chart.chart_utils import DatasetValidationResult
 from superset.mcp_service.chart.schemas import (
     AxisConfig,
     ColumnRef,
     FilterConfig,
+    GenerateChartResponse,
     LegendConfig,
     TableChartConfig,
     UpdateChartRequest,
     XYChartConfig,
 )
+from superset.mcp_service.chart.tool.update_chart import (
+    _build_preview_form_data,
+    _build_update_payload,
+)
+
+# The __init__.py re-exports the update_chart *function*, so a plain
+# `from ... import update_chart` gives the function, not the module.
+# Use importlib to get the module for patch.object().
+update_chart_module = importlib.import_module(
+    "superset.mcp_service.chart.tool.update_chart"
+)
 
 
 class TestUpdateChart:
@@ -50,10 +69,11 @@ class TestUpdateChart:
         )
         table_request = UpdateChartRequest(identifier=123, config=table_config)
         assert table_request.identifier == 123
-        assert table_request.config.chart_type == "table"
-        assert len(table_request.config.columns) == 2
-        assert table_request.config.columns[0].name == "region"
-        assert table_request.config.columns[1].aggregate == "SUM"
+        # config is now Dict[str, Any] in the schema; validate via dict access
+        assert table_request.config["chart_type"] == "table"
+        assert len(table_request.config["columns"]) == 2
+        assert table_request.config["columns"][0]["name"] == "region"
+        assert table_request.config["columns"][1]["aggregate"] == "SUM"
 
         # XY chart update with UUID
         xy_config = XYChartConfig(
@@ -70,10 +90,10 @@ class TestUpdateChart:
             identifier="a1b2c3d4-e5f6-7890-abcd-ef1234567890", config=xy_config
         )
         assert xy_request.identifier == "a1b2c3d4-e5f6-7890-abcd-ef1234567890"
-        assert xy_request.config.chart_type == "xy"
-        assert xy_request.config.x.name == "date"
-        assert xy_request.config.y[0].aggregate == "SUM"
-        assert xy_request.config.kind == "line"
+        assert xy_request.config["chart_type"] == "xy"
+        assert xy_request.config["x"]["name"] == "date"
+        assert xy_request.config["y"][0]["aggregate"] == "SUM"
+        assert xy_request.config["kind"] == "line"
 
     @pytest.mark.asyncio
     async def test_update_chart_with_chart_name(self):
@@ -94,33 +114,28 @@ class TestUpdateChart:
         assert request2.chart_name == "Updated Sales Report"
 
     @pytest.mark.asyncio
-    async def test_update_chart_preview_generation(self):
-        """Test preview generation options in update request."""
+    async def test_update_chart_preview_formats(self):
+        """Test preview_formats options in update request."""
         config = TableChartConfig(
             chart_type="table",
             columns=[ColumnRef(name="col1")],
         )
 
-        # Default preview generation
+        # Default preview formats
         request1 = UpdateChartRequest(identifier=123, config=config)
-        assert request1.generate_preview is True
         assert request1.preview_formats == ["url"]
 
         # Custom preview formats
         request2 = UpdateChartRequest(
             identifier=123,
             config=config,
-            generate_preview=True,
             preview_formats=["url", "ascii", "table"],
         )
-        assert request2.generate_preview is True
         assert set(request2.preview_formats) == {"url", "ascii", "table"}
 
-        # Disable preview generation
-        request3 = UpdateChartRequest(
-            identifier=123, config=config, generate_preview=False
-        )
-        assert request3.generate_preview is False
+        # Empty preview formats (no extra previews after save)
+        request3 = UpdateChartRequest(identifier=123, config=config, preview_formats=[])
+        assert request3.preview_formats == []
 
     @pytest.mark.asyncio
     async def test_update_chart_identifier_types(self):
@@ -160,7 +175,7 @@ class TestUpdateChart:
                 kind=chart_type,
             )
             request = UpdateChartRequest(identifier=1, config=config)
-            assert request.config.kind == chart_type
+            assert request.config["kind"] == chart_type
 
         # Test multiple Y columns
         multi_y_config = XYChartConfig(
@@ -174,8 +189,8 @@ class TestUpdateChart:
             kind="line",
         )
         request = UpdateChartRequest(identifier=1, config=multi_y_config)
-        assert len(request.config.y) == 3
-        assert request.config.y[1].aggregate == "AVG"
+        assert len(request.config["y"]) == 3
+        assert request.config["y"][1]["aggregate"] == "AVG"
 
         # Test filter operators
         operators = ["=", "!=", ">", ">=", "<", "<="]
@@ -186,7 +201,7 @@ class TestUpdateChart:
             filters=filters,
         )
         request = UpdateChartRequest(identifier=1, config=table_config)
-        assert len(request.config.filters) == 6
+        assert len(request.config["filters"]) == 6
 
     @pytest.mark.asyncio
     async def test_update_chart_response_structure(self):
@@ -242,12 +257,12 @@ class TestUpdateChart:
             ),
         )
         request = UpdateChartRequest(identifier=1, config=config)
-        assert request.config.x_axis.title == "Date"
-        assert request.config.x_axis.format == "smart_date"
-        assert request.config.x_axis.scale == "linear"
-        assert request.config.y_axis.title == "Sales Amount"
-        assert request.config.y_axis.format == "$,.2f"
-        assert request.config.y_axis.scale == "log"
+        assert request.config["x_axis"]["title"] == "Date"
+        assert request.config["x_axis"]["format"] == "smart_date"
+        assert request.config["x_axis"]["scale"] == "linear"
+        assert request.config["y_axis"]["title"] == "Sales Amount"
+        assert request.config["y_axis"]["format"] == "$,.2f"
+        assert request.config["y_axis"]["scale"] == "log"
 
     @pytest.mark.asyncio
     async def test_update_chart_legend_configurations(self):
@@ -261,8 +276,8 @@ class TestUpdateChart:
                 legend=LegendConfig(show=True, position=pos),
             )
             request = UpdateChartRequest(identifier=1, config=config)
-            assert request.config.legend.position == pos
-            assert request.config.legend.show is True
+            assert request.config["legend"]["position"] == pos
+            assert request.config["legend"]["show"] is True
 
         # Hidden legend
         config = XYChartConfig(
@@ -272,7 +287,7 @@ class TestUpdateChart:
             legend=LegendConfig(show=False),
         )
         request = UpdateChartRequest(identifier=1, config=config)
-        assert request.config.legend.show is False
+        assert request.config["legend"]["show"] is False
 
     @pytest.mark.asyncio
     async def test_update_chart_aggregation_functions(self):
@@ -284,33 +299,48 @@ class TestUpdateChart:
                 columns=[ColumnRef(name="value", aggregate=agg)],
             )
             request = UpdateChartRequest(identifier=1, config=config)
-            assert request.config.columns[0].aggregate == agg
+            assert request.config["columns"][0]["aggregate"] == agg
 
     @pytest.mark.asyncio
     async def test_update_chart_error_responses(self):
-        """Test expected error response structures."""
+        """Test expected error response structures use ChartGenerationError."""
         # Chart not found error
-        error_response = {
-            "chart": None,
-            "error": "No chart found with identifier: 999",
-            "success": False,
-            "schema_version": "2.0",
-            "api_version": "v1",
-        }
-        assert error_response["success"] is False
-        assert error_response["chart"] is None
-        assert "chart found" in error_response["error"].lower()
+        error_response = GenerateChartResponse.model_validate(
+            {
+                "chart": None,
+                "error": {
+                    "error_type": "NotFound",
+                    "message": "No chart found with identifier: 999",
+                    "details": "No chart found with identifier: 999",
+                },
+                "success": False,
+                "schema_version": "2.0",
+                "api_version": "v1",
+            }
+        )
+        assert error_response.success is False
+        assert error_response.chart is None
+        assert error_response.error is not None
+        assert error_response.error.error_type == "NotFound"
+        assert "chart found" in error_response.error.message.lower()
 
         # General update error
-        update_error = {
-            "chart": None,
-            "error": "Chart update failed: Permission denied",
-            "success": False,
-            "schema_version": "2.0",
-            "api_version": "v1",
-        }
-        assert update_error["success"] is False
-        assert "failed" in update_error["error"].lower()
+        update_error = GenerateChartResponse.model_validate(
+            {
+                "chart": None,
+                "error": {
+                    "error_type": "ValueError",
+                    "message": "Chart update failed: Permission denied",
+                    "details": "Permission denied",
+                },
+                "success": False,
+                "schema_version": "2.0",
+                "api_version": "v1",
+            }
+        )
+        assert update_error.success is False
+        assert update_error.error is not None
+        assert "failed" in update_error.error.message.lower()
 
     @pytest.mark.asyncio
     async def test_chart_name_sanitization(self):
@@ -353,10 +383,10 @@ class TestUpdateChart:
         )
 
         request = UpdateChartRequest(identifier=1, config=config)
-        assert len(request.config.filters) == 3
-        assert request.config.filters[0].column == "region"
-        assert request.config.filters[1].op == ">="
-        assert request.config.filters[2].value == "2024-01-01"
+        assert len(request.config["filters"]) == 3
+        assert request.config["filters"][0]["column"] == "region"
+        assert request.config["filters"][1]["op"] == ">="
+        assert request.config["filters"][2]["value"] == "2024-01-01"
 
     @pytest.mark.asyncio
     async def test_update_chart_cache_control(self):
@@ -383,3 +413,727 @@ class TestUpdateChart:
         assert request2.use_cache is False
         assert request2.force_refresh is True
         assert request2.cache_timeout == 300
+
+
+@pytest.fixture
+def mcp_server():
+    return mcp
+
+
+@pytest.fixture(autouse=True)
+def mock_auth():
+    """Mock authentication for all tests."""
+    with patch("superset.mcp_service.auth.get_user_from_request") as mock_get_user:
+        mock_user = Mock()
+        mock_user.id = 1
+        mock_user.username = "admin"
+        mock_get_user.return_value = mock_user
+        yield mock_get_user
+
+
+class TestUpdateChartDatasetAccess:
+    """Tests for dataset access validation in update_chart."""
+
+    @patch(
+        "superset.mcp_service.auth.check_chart_data_access",
+        new_callable=Mock,
+    )
+    @patch("superset.daos.chart.ChartDAO.find_by_id", new_callable=Mock)
+    @patch("superset.db.session")
+    @pytest.mark.asyncio
+    async def test_update_chart_dataset_access_denied(
+        self, mock_db_session, mock_find_by_id, mock_validate, mcp_server
+    ):
+        """Test that update_chart returns error when dataset is inaccessible."""
+        mock_chart = Mock()
+        mock_chart.id = 1
+        mock_chart.datasource_id = 10
+        mock_find_by_id.return_value = mock_chart
+
+        mock_validate.return_value = DatasetValidationResult(
+            is_valid=False,
+            dataset_id=10,
+            dataset_name="restricted_dataset",
+            warnings=[],
+            error="Access denied to dataset 'restricted_dataset' (ID: 10). "
+            "You do not have permission to view this dataset.",
+        )
+
+        request = {
+            "identifier": 1,
+            "config": {
+                "chart_type": "table",
+                "columns": [{"name": "col1"}],
+            },
+        }
+
+        async with Client(mcp_server) as client:
+            result = await client.call_tool("update_chart", {"request": request})
+
+            assert result.structured_content["success"] is False
+            assert result.structured_content["chart"] is None
+            error = result.structured_content["error"]
+            assert error["error_type"] == "DatasetNotAccessible"
+            assert "Access denied" in error["message"]
+
+    @patch(
+        "superset.mcp_service.auth.check_chart_data_access",
+        new_callable=Mock,
+    )
+    @patch("superset.daos.chart.ChartDAO.find_by_id", new_callable=Mock)
+    @patch("superset.db.session")
+    @pytest.mark.asyncio
+    async def test_update_chart_dataset_not_found(
+        self, mock_db_session, mock_find_by_id, mock_validate, mcp_server
+    ):
+        """Test that update_chart returns error when dataset is deleted."""
+        mock_chart = Mock()
+        mock_chart.id = 1
+        mock_chart.datasource_id = 99
+        mock_find_by_id.return_value = mock_chart
+
+        mock_validate.return_value = DatasetValidationResult(
+            is_valid=False,
+            dataset_id=99,
+            dataset_name=None,
+            warnings=[],
+            error="Dataset (ID: 99) has been deleted or does not exist.",
+        )
+
+        request = {
+            "identifier": 1,
+            "config": {
+                "chart_type": "table",
+                "columns": [{"name": "col1"}],
+            },
+        }
+
+        async with Client(mcp_server) as client:
+            result = await client.call_tool("update_chart", {"request": request})
+
+            assert result.structured_content["success"] is False
+            assert result.structured_content["chart"] is None
+            error = result.structured_content["error"]
+            assert error["error_type"] == "DatasetNotAccessible"
+            assert "deleted" in error["message"]
+
+
+class TestFindChart:
+    """Tests for find_chart_by_identifier helper (moved to chart_helpers)."""
+
+    @patch("superset.daos.chart.ChartDAO.find_by_id")
+    def test_find_chart_by_numeric_id(self, mock_find):
+        """Numeric int identifier calls find_by_id with int."""
+        mock_chart = Mock()
+        mock_find.return_value = mock_chart
+
+        result = find_chart_by_identifier(42)
+
+        mock_find.assert_called_once_with(42)
+        assert result is mock_chart
+
+    @patch("superset.daos.chart.ChartDAO.find_by_id")
+    def test_find_chart_by_numeric_string(self, mock_find):
+        """String-digit identifier is converted to int."""
+        mock_chart = Mock()
+        mock_find.return_value = mock_chart
+
+        result = find_chart_by_identifier("123")
+
+        mock_find.assert_called_once_with(123)
+        assert result is mock_chart
+
+    @patch("superset.daos.chart.ChartDAO.find_by_id")
+    def test_find_chart_by_uuid(self, mock_find):
+        """Non-digit string identifier looks up by uuid column."""
+        mock_chart = Mock()
+        mock_find.return_value = mock_chart
+
+        uuid = "a1b2c3d4-e5f6-7890-abcd-ef1234567890"
+        result = find_chart_by_identifier(uuid)
+
+        mock_find.assert_called_once_with(uuid, id_column="uuid")
+        assert result is mock_chart
+
+    @patch("superset.daos.chart.ChartDAO.find_by_id")
+    def test_find_chart_returns_none(self, mock_find):
+        """Returns None when chart is not found."""
+        mock_find.return_value = None
+
+        result = find_chart_by_identifier(999)
+
+        assert result is None
+
+
+class TestBuildUpdatePayload:
+    """Tests for _build_update_payload helper."""
+
+    def test_name_only_update(self):
+        """Name-only update returns a dict with just slice_name."""
+        request = UpdateChartRequest(
+            identifier=1,
+            chart_name="New Name",
+        )
+        chart = Mock()
+
+        result = _build_update_payload(request, chart)
+
+        assert isinstance(result, dict)
+        assert result == {"slice_name": "New Name"}
+
+    def test_error_when_no_config_and_no_name(self):
+        """Returns GenerateChartResponse error when neither config nor chart_name."""
+        request = UpdateChartRequest(identifier=1)
+        chart = Mock()
+
+        result = _build_update_payload(request, chart)
+
+        assert isinstance(result, GenerateChartResponse)
+        assert result.success is False
+        assert result.error is not None
+        assert result.error.error_type == "ValidationError"
+        assert "config" in result.error.message.lower()
+        assert "chart_name" in result.error.message.lower()
+
+    def test_config_update_uses_request_chart_name(self):
+        """When config and chart_name are both provided, uses chart_name."""
+        config = TableChartConfig(
+            chart_type="table",
+            columns=[ColumnRef(name="col1")],
+        )
+        request = UpdateChartRequest(
+            identifier=1,
+            config=config,
+            chart_name="My Custom Name",
+        )
+        chart = Mock()
+        chart.datasource_id = None  # Avoid dataset lookup
+
+        result = _build_update_payload(request, chart)
+
+        assert isinstance(result, dict)
+        assert result["slice_name"] == "My Custom Name"
+        assert "viz_type" in result
+        assert "params" in result
+        # query_context must be cleared so get_chart_data uses updated params
+        assert result["query_context"] is None
+
+    def test_config_update_keeps_existing_name(self):
+        """When config is provided but no chart_name, keeps existing slice_name."""
+        config = TableChartConfig(
+            chart_type="table",
+            columns=[ColumnRef(name="col1")],
+        )
+        request = UpdateChartRequest(identifier=1, config=config)
+        chart = Mock()
+        chart.datasource_id = None
+        chart.slice_name = "Existing Name"
+
+        result = _build_update_payload(request, chart)
+
+        assert isinstance(result, dict)
+        assert result["slice_name"] == "Existing Name"
+        # query_context must be cleared so get_chart_data uses updated params
+        assert result["query_context"] is None
+
+
+class TestUpdateChartNameOnly:
+    """Integration-style tests for name-only update via MCP tool."""
+
+    @patch(
+        "superset.mcp_service.auth.check_chart_data_access",
+        new_callable=Mock,
+    )
+    @patch(
+        "superset.commands.chart.update.UpdateChartCommand",
+        new_callable=Mock,
+    )
+    @patch("superset.daos.chart.ChartDAO.find_by_id", new_callable=Mock)
+    @patch("superset.db.session")
+    @pytest.mark.asyncio
+    async def test_name_only_update_success(
+        self,
+        mock_db_session,
+        mock_find_by_id,
+        mock_update_cmd_cls,
+        mock_check_access,
+        mcp_server,
+    ):
+        """Successful name-only update (identifier + chart_name, no config)."""
+        mock_chart = Mock()
+        mock_chart.id = 1
+        mock_chart.datasource_id = 10
+        mock_chart.slice_name = "Old Name"
+        mock_chart.viz_type = "table"
+        mock_chart.uuid = "abc-123"
+        mock_find_by_id.return_value = mock_chart
+
+        mock_check_access.return_value = DatasetValidationResult(
+            is_valid=True,
+            dataset_id=10,
+            dataset_name="my_dataset",
+            warnings=[],
+        )
+
+        updated_chart = Mock()
+        updated_chart.id = 1
+        updated_chart.slice_name = "Renamed Chart"
+        updated_chart.viz_type = "table"
+        updated_chart.uuid = "abc-123"
+        mock_update_cmd_cls.return_value.run.return_value = updated_chart
+
+        request = {
+            "identifier": 1,
+            "chart_name": "Renamed Chart",
+            "generate_preview": False,
+        }
+
+        async with Client(mcp) as client:
+            result = await client.call_tool("update_chart", {"request": request})
+
+            assert result.structured_content["success"] is True
+            assert result.structured_content["chart"]["slice_name"] == "Renamed Chart"
+            assert result.structured_content["chart"]["is_unsaved_state"] is False
+            # Rename-only: form_data should be empty (visualization unchanged)
+            assert result.structured_content["form_data"] == {}
+
+            # Verify UpdateChartCommand was called with name-only payload
+            mock_update_cmd_cls.assert_called_once_with(
+                1, {"slice_name": "Renamed Chart"}
+            )
+
+    @patch("superset.daos.chart.ChartDAO.find_by_id", new_callable=Mock)
+    @patch("superset.db.session")
+    @pytest.mark.asyncio
+    async def test_no_config_no_name_returns_error(
+        self,
+        mock_db_session,
+        mock_find_by_id,
+        mcp_server,
+    ):
+        """Error when neither config nor chart_name is provided."""
+        mock_chart = Mock()
+        mock_chart.id = 1
+        mock_chart.datasource_id = 10
+        mock_find_by_id.return_value = mock_chart
+
+        with patch(
+            "superset.mcp_service.auth.check_chart_data_access",
+            new_callable=Mock,
+        ) as mock_check_access:
+            mock_check_access.return_value = DatasetValidationResult(
+                is_valid=True,
+                dataset_id=10,
+                dataset_name="my_dataset",
+                warnings=[],
+            )
+
+            request = {
+                "identifier": 1,
+            }
+
+            async with Client(mcp) as client:
+                result = await client.call_tool("update_chart", {"request": request})
+
+                assert result.structured_content["success"] is False
+                error = result.structured_content["error"]
+                assert error["error_type"] == "ValidationError"
+                assert "config" in error["message"].lower()
+                assert "chart_name" in error["message"].lower()
+
+
+class TestUpdateChartPreviewFirst:
+    """Integration-style tests for the preview-first default flow."""
+
+    @patch.object(update_chart_module, "_create_preview_url", new_callable=Mock)
+    @patch(
+        "superset.commands.chart.update.UpdateChartCommand",
+        new_callable=Mock,
+    )
+    @patch(
+        "superset.mcp_service.auth.check_chart_data_access",
+        new_callable=Mock,
+    )
+    @patch("superset.daos.chart.ChartDAO.find_by_id", new_callable=Mock)
+    @patch("superset.db.session")
+    @pytest.mark.asyncio
+    async def test_default_generates_preview_without_saving(
+        self,
+        mock_db_session,
+        mock_find_by_id,
+        mock_check_access,
+        mock_update_cmd_cls,
+        mock_create_preview,
+        mcp_server,
+    ):
+        """Default update flow returns a preview URL and does NOT save."""
+        mock_chart = Mock()
+        mock_chart.id = 1
+        mock_chart.datasource_id = 10
+        mock_chart.slice_name = "Existing Chart"
+        mock_chart.viz_type = "table"
+        mock_chart.uuid = "abc-123"
+        mock_chart.params = '{"viz_type": "table", "datasource": "10__table"}'
+        mock_find_by_id.return_value = mock_chart
+
+        mock_check_access.return_value = DatasetValidationResult(
+            is_valid=True,
+            dataset_id=10,
+            dataset_name="my_dataset",
+            warnings=[],
+        )
+
+        preview_url = (
+            "http://localhost:8088/explore/?form_data_key=preview_key&slice_id=1"
+        )
+        mock_create_preview.return_value = (preview_url, "preview_key", [])
+
+        request = {
+            "identifier": 1,
+            "config": {
+                "chart_type": "table",
+                "columns": [{"name": "col1"}],
+            },
+        }
+
+        async with Client(mcp) as client:
+            result = await client.call_tool("update_chart", {"request": request})
+
+            assert result.structured_content["success"] is True
+            assert result.structured_content["chart"]["is_unsaved_state"] is True
+            assert result.structured_content["chart"]["id"] == 1
+            assert result.structured_content["chart"]["form_data_key"] == "preview_key"
+            assert result.structured_content["explore_url"] == preview_url
+            assert result.structured_content["form_data_key"] == "preview_key"
+
+            # Ensure the chart was NOT persisted
+            mock_update_cmd_cls.assert_not_called()
+            mock_create_preview.assert_called_once()
+
+    @patch.object(update_chart_module, "_create_preview_url", new_callable=Mock)
+    @patch(
+        "superset.mcp_service.auth.check_chart_data_access",
+        new_callable=Mock,
+    )
+    @patch("superset.daos.chart.ChartDAO.find_by_id", new_callable=Mock)
+    @patch("superset.db.session")
+    @pytest.mark.asyncio
+    async def test_preview_missing_config_and_name_returns_error(
+        self,
+        mock_db_session,
+        mock_find_by_id,
+        mock_check_access,
+        mock_create_preview,
+        mcp_server,
+    ):
+        """Preview flow also errors when neither config nor chart_name given."""
+        mock_chart = Mock()
+        mock_chart.id = 1
+        mock_chart.datasource_id = 10
+        mock_chart.params = "{}"
+        mock_find_by_id.return_value = mock_chart
+
+        mock_check_access.return_value = DatasetValidationResult(
+            is_valid=True,
+            dataset_id=10,
+            dataset_name="my_dataset",
+            warnings=[],
+        )
+
+        async with Client(mcp) as client:
+            result = await client.call_tool(
+                "update_chart", {"request": {"identifier": 1}}
+            )
+
+            assert result.structured_content["success"] is False
+            error = result.structured_content["error"]
+            assert error["error_type"] == "ValidationError"
+            mock_create_preview.assert_not_called()
+
+
+class TestBuildPreviewFormData:
+    """Unit tests for _build_preview_form_data helper."""
+
+    def test_merges_existing_params_with_new_config(self):
+        """New config values override existing form_data keys."""
+        config = TableChartConfig(
+            chart_type="table",
+            columns=[ColumnRef(name="region")],
+        )
+        request = UpdateChartRequest(identifier=1, config=config)
+        chart = Mock()
+        chart.id = 42
+        chart.datasource_id = 7
+        chart.slice_name = "Existing"
+        chart.params = '{"viz_type": "line", "custom_flag": true}'
+
+        result = _build_preview_form_data(request, chart)
+
+        assert isinstance(result, dict)
+        # Existing keys not touched by the new config are preserved
+        assert result["custom_flag"] is True
+        # New config overrides existing keys
+        assert result["viz_type"] == "table"
+        # slice_id and datasource are always stamped onto the preview
+        assert result["slice_id"] == 42
+        assert result["datasource"] == "7__table"
+        assert result["slice_name"] == "Existing"
+
+    def test_name_only_preview_keeps_existing_form_data(self):
+        """Name-only preview preserves existing form_data and renames."""
+        request = UpdateChartRequest(identifier=1, chart_name="Brand New Name")
+        chart = Mock()
+        chart.id = 5
+        chart.datasource_id = 3
+        chart.slice_name = "Old"
+        chart.params = '{"viz_type": "big_number", "metric": "count"}'
+
+        result = _build_preview_form_data(request, chart)
+
+        assert isinstance(result, dict)
+        assert result["viz_type"] == "big_number"
+        assert result["metric"] == "count"
+        assert result["slice_name"] == "Brand New Name"
+        assert result["slice_id"] == 5
+
+    def test_missing_config_and_name_returns_validation_error(self):
+        """Matches the _build_update_payload validation behavior."""
+        request = UpdateChartRequest(identifier=1)
+        chart = Mock()
+        chart.id = 1
+        chart.datasource_id = 10
+        chart.params = "{}"
+
+        result = _build_preview_form_data(request, chart)
+
+        assert isinstance(result, GenerateChartResponse)
+        assert result.success is False
+        assert result.error is not None
+        assert result.error.error_type == "ValidationError"
+
+    def test_handles_invalid_existing_params(self):
+        """Gracefully recovers when chart.params is not valid JSON."""
+        config = TableChartConfig(
+            chart_type="table",
+            columns=[ColumnRef(name="col1")],
+        )
+        request = UpdateChartRequest(identifier=1, config=config)
+        chart = Mock()
+        chart.id = 9
+        chart.datasource_id = 4
+        chart.slice_name = "Broken"
+        chart.params = "not-json"
+
+        result = _build_preview_form_data(request, chart)
+
+        assert isinstance(result, dict)
+        assert result["slice_id"] == 9
+        assert result["slice_name"] == "Broken"
+
+
+class TestUpdateChartSaveWithConfig:
+    """Save-path integration tests for update_chart with a full config payload."""
+
+    @patch(
+        "superset.commands.chart.update.UpdateChartCommand",
+        new_callable=Mock,
+    )
+    @patch(
+        "superset.mcp_service.auth.check_chart_data_access",
+        new_callable=Mock,
+    )
+    @patch("superset.daos.chart.ChartDAO.find_by_id", new_callable=Mock)
+    @patch("superset.db.session")
+    @pytest.mark.asyncio
+    async def test_save_chart_with_config_success(
+        self,
+        mock_db_session,
+        mock_find_by_id,
+        mock_check_access,
+        mock_update_cmd_cls,
+        mcp_server,
+    ):
+        """generate_preview=False with config persists and returns saved chart."""
+        mock_chart = Mock()
+        mock_chart.id = 77
+        mock_chart.datasource_id = 10
+        mock_chart.slice_name = "Pre-save"
+        mock_chart.viz_type = "table"
+        mock_chart.uuid = "uuid-77"
+        mock_chart.params = '{"viz_type": "table"}'
+        mock_find_by_id.return_value = mock_chart
+
+        mock_check_access.return_value = DatasetValidationResult(
+            is_valid=True,
+            dataset_id=10,
+            dataset_name="my_dataset",
+            warnings=[],
+        )
+
+        updated_chart = Mock()
+        updated_chart.id = 77
+        updated_chart.slice_name = "After-save"
+        updated_chart.viz_type = "table"
+        updated_chart.uuid = "uuid-77"
+        mock_update_cmd_cls.return_value.run.return_value = updated_chart
+
+        request = {
+            "identifier": 77,
+            "generate_preview": False,
+            "config": {
+                "chart_type": "table",
+                "columns": [{"name": "col1"}],
+            },
+        }
+
+        async with Client(mcp) as client:
+            result = await client.call_tool("update_chart", {"request": request})
+
+        assert result.structured_content["success"] is True
+        chart = result.structured_content["chart"]
+        assert chart["is_unsaved_state"] is False
+        assert chart["id"] == 77
+        assert chart["slice_name"] == "After-save"
+        assert "slice_id=77" in result.structured_content["explore_url"]
+        mock_update_cmd_cls.assert_called_once()
+
+        # Verify query_context is cleared so get_chart_data uses updated params
+        payload = mock_update_cmd_cls.call_args[0][1]
+        assert payload["query_context"] is None
+
+        # Verify form_data is returned in the response
+        form_data = result.structured_content["form_data"]
+        assert isinstance(form_data, dict)
+        assert "viz_type" in form_data
+
+
+class TestUpdateChartErrorPaths:
+    """Integration tests for error-handling branches in update_chart."""
+
+    @patch("superset.daos.chart.ChartDAO.find_by_id", new_callable=Mock)
+    @patch("superset.db.session")
+    @pytest.mark.asyncio
+    async def test_chart_not_found_returns_notfound_error(
+        self,
+        mock_db_session,
+        mock_find_by_id,
+        mcp_server,
+    ):
+        """Missing chart returns a structured NotFound error without raising."""
+        mock_find_by_id.return_value = None
+
+        async with Client(mcp) as client:
+            result = await client.call_tool(
+                "update_chart", {"request": {"identifier": 9999}}
+            )
+
+        assert result.structured_content["success"] is False
+        error = result.structured_content["error"]
+        assert error["error_type"] == "NotFound"
+        assert "9999" in error["message"]
+
+    @patch(
+        "superset.commands.chart.update.UpdateChartCommand",
+        new_callable=Mock,
+    )
+    @patch(
+        "superset.mcp_service.auth.check_chart_data_access",
+        new_callable=Mock,
+    )
+    @patch("superset.daos.chart.ChartDAO.find_by_id", new_callable=Mock)
+    @patch("superset.db.session")
+    @pytest.mark.asyncio
+    async def test_update_command_exception_is_caught(
+        self,
+        mock_db_session,
+        mock_find_by_id,
+        mock_check_access,
+        mock_update_cmd_cls,
+        mcp_server,
+    ):
+        """CommandException from UpdateChartCommand.run() is captured and returned."""
+        from superset.commands.exceptions import CommandException
+
+        mock_chart = Mock()
+        mock_chart.id = 5
+        mock_chart.datasource_id = 10
+        mock_chart.slice_name = "Name"
+        mock_chart.viz_type = "table"
+        mock_chart.uuid = "uuid-5"
+        mock_chart.params = "{}"
+        mock_find_by_id.return_value = mock_chart
+
+        mock_check_access.return_value = DatasetValidationResult(
+            is_valid=True,
+            dataset_id=10,
+            dataset_name="my_dataset",
+            warnings=[],
+        )
+
+        mock_update_cmd_cls.return_value.run.side_effect = CommandException("boom")
+
+        request = {
+            "identifier": 5,
+            "generate_preview": False,
+            "chart_name": "Retry",
+        }
+
+        async with Client(mcp) as client:
+            result = await client.call_tool("update_chart", {"request": request})
+
+        assert result.structured_content["success"] is False
+        error = result.structured_content["error"]
+        assert error["error_type"] == "CommandException"
+        assert "boom" in error["details"]
+
+    @patch.object(update_chart_module, "_create_preview_url", new_callable=Mock)
+    @patch(
+        "superset.mcp_service.auth.check_chart_data_access",
+        new_callable=Mock,
+    )
+    @patch("superset.daos.chart.ChartDAO.find_by_id", new_callable=Mock)
+    @patch("superset.db.session")
+    @pytest.mark.asyncio
+    async def test_preview_extracts_form_data_key_from_url_fallback(
+        self,
+        mock_db_session,
+        mock_find_by_id,
+        mock_check_access,
+        mock_create_preview,
+        mcp_server,
+    ):
+        """If _create_preview_url returns (url, None), form_data_key comes from url."""
+        mock_chart = Mock()
+        mock_chart.id = 8
+        mock_chart.datasource_id = 10
+        mock_chart.slice_name = "Chart"
+        mock_chart.viz_type = "table"
+        mock_chart.uuid = "uuid-8"
+        mock_chart.params = '{"viz_type": "table"}'
+        mock_find_by_id.return_value = mock_chart
+
+        mock_check_access.return_value = DatasetValidationResult(
+            is_valid=True,
+            dataset_id=10,
+            dataset_name="my_dataset",
+            warnings=[],
+        )
+
+        preview_url = (
+            "http://localhost:8088/explore/?form_data_key=url_embedded_key&slice_id=8"
+        )
+        mock_create_preview.return_value = (preview_url, None, [])
+
+        request = {
+            "identifier": 8,
+            "config": {
+                "chart_type": "table",
+                "columns": [{"name": "col1"}],
+            },
+        }
+
+        async with Client(mcp) as client:
+            result = await client.call_tool("update_chart", {"request": request})
+
+        assert result.structured_content["success"] is True
+        assert result.structured_content["form_data_key"] == "url_embedded_key"
diff --git a/tests/unit_tests/mcp_service/chart/tool/test_update_chart_preview.py b/tests/unit_tests/mcp_service/chart/tool/test_update_chart_preview.py
index f51a1e80afe..c80f2797a47 100644
--- a/tests/unit_tests/mcp_service/chart/tool/test_update_chart_preview.py
+++ b/tests/unit_tests/mcp_service/chart/tool/test_update_chart_preview.py
@@ -53,9 +53,9 @@ class TestUpdateChartPreview:
         )
         assert table_request.form_data_key == "abc123def456"
         assert table_request.dataset_id == 1
-        assert table_request.config.chart_type == "table"
-        assert len(table_request.config.columns) == 2
-        assert table_request.config.columns[0].name == "region"
+        assert table_request.config["chart_type"] == "table"
+        assert len(table_request.config["columns"]) == 2
+        assert table_request.config["columns"][0]["name"] == "region"
 
         # XY chart preview update
         xy_config = XYChartConfig(
@@ -73,9 +73,9 @@ class TestUpdateChartPreview:
         )
         assert xy_request.form_data_key == "xyz789ghi012"
         assert xy_request.dataset_id == "2"
-        assert xy_request.config.chart_type == "xy"
-        assert xy_request.config.x.name == "date"
-        assert xy_request.config.kind == "line"
+        assert xy_request.config["chart_type"] == "xy"
+        assert xy_request.config["x"]["name"] == "date"
+        assert xy_request.config["kind"] == "line"
 
     @pytest.mark.asyncio
     async def test_update_chart_preview_dataset_id_types(self):
@@ -158,7 +158,7 @@ class TestUpdateChartPreview:
             request = UpdateChartPreviewRequest(
                 form_data_key="abc123", dataset_id=1, config=config
             )
-            assert request.config.kind == chart_type
+            assert request.config["kind"] == chart_type
 
         # Test multiple Y columns
         multi_y_config = XYChartConfig(
@@ -174,8 +174,8 @@ class TestUpdateChartPreview:
         request = UpdateChartPreviewRequest(
             form_data_key="abc123", dataset_id=1, config=multi_y_config
         )
-        assert len(request.config.y) == 3
-        assert request.config.y[1].aggregate == "AVG"
+        assert len(request.config["y"]) == 3
+        assert request.config["y"][1]["aggregate"] == "AVG"
 
         # Test filter operators
         operators = ["=", "!=", ">", ">=", "<", "<="]
@@ -188,7 +188,7 @@ class TestUpdateChartPreview:
         request = UpdateChartPreviewRequest(
             form_data_key="abc123", dataset_id=1, config=table_config
         )
-        assert len(request.config.filters) == 6
+        assert len(request.config["filters"]) == 6
 
     @pytest.mark.asyncio
     async def test_update_chart_preview_response_structure(self):
@@ -251,10 +251,10 @@ class TestUpdateChartPreview:
         request = UpdateChartPreviewRequest(
             form_data_key="abc123", dataset_id=1, config=config
         )
-        assert request.config.x_axis.title == "Date"
-        assert request.config.x_axis.format == "smart_date"
-        assert request.config.y_axis.title == "Sales Amount"
-        assert request.config.y_axis.format == "$,.2f"
+        assert request.config["x_axis"]["title"] == "Date"
+        assert request.config["x_axis"]["format"] == "smart_date"
+        assert request.config["y_axis"]["title"] == "Sales Amount"
+        assert request.config["y_axis"]["format"] == "$,.2f"
 
     @pytest.mark.asyncio
     async def test_update_chart_preview_legend_configurations(self):
@@ -270,8 +270,8 @@ class TestUpdateChartPreview:
             request = UpdateChartPreviewRequest(
                 form_data_key="abc123", dataset_id=1, config=config
             )
-            assert request.config.legend.position == pos
-            assert request.config.legend.show is True
+            assert request.config["legend"]["position"] == pos
+            assert request.config["legend"]["show"] is True
 
         # Hidden legend
         config = XYChartConfig(
@@ -283,7 +283,7 @@ class TestUpdateChartPreview:
         request = UpdateChartPreviewRequest(
             form_data_key="abc123", dataset_id=1, config=config
         )
-        assert request.config.legend.show is False
+        assert request.config["legend"]["show"] is False
 
     @pytest.mark.asyncio
     async def test_update_chart_preview_aggregation_functions(self):
@@ -297,7 +297,7 @@ class TestUpdateChartPreview:
             request = UpdateChartPreviewRequest(
                 form_data_key="abc123", dataset_id=1, config=config
             )
-            assert request.config.columns[0].aggregate == agg
+            assert request.config["columns"][0]["aggregate"] == agg
 
     @pytest.mark.asyncio
     async def test_update_chart_preview_error_responses(self):
@@ -347,10 +347,10 @@ class TestUpdateChartPreview:
         request = UpdateChartPreviewRequest(
             form_data_key="abc123", dataset_id=1, config=config
         )
-        assert len(request.config.filters) == 3
-        assert request.config.filters[0].column == "region"
-        assert request.config.filters[1].op == ">="
-        assert request.config.filters[2].value == "2024-01-01"
+        assert len(request.config["filters"]) == 3
+        assert request.config["filters"][0]["column"] == "region"
+        assert request.config["filters"][1]["op"] == ">="
+        assert request.config["filters"][2]["value"] == "2024-01-01"
 
     @pytest.mark.asyncio
     async def test_update_chart_preview_form_data_key_handling(self):
@@ -447,12 +447,12 @@ class TestUpdateChartPreview:
         request = UpdateChartPreviewRequest(
             form_data_key="abc123", dataset_id=1, config=config
         )
-        assert len(request.config.y) == 4
-        assert request.config.y[0].name == "revenue"
-        assert request.config.y[1].name == "cost"
-        assert request.config.y[2].name == "profit"
-        assert request.config.y[3].name == "orders"
-        assert request.config.y[3].aggregate == "COUNT"
+        assert len(request.config["y"]) == 4
+        assert request.config["y"][0]["name"] == "revenue"
+        assert request.config["y"][1]["name"] == "cost"
+        assert request.config["y"][2]["name"] == "profit"
+        assert request.config["y"][3]["name"] == "orders"
+        assert request.config["y"][3]["aggregate"] == "COUNT"
 
     @pytest.mark.asyncio
     async def test_update_chart_preview_table_sorting(self):
@@ -470,5 +470,5 @@ class TestUpdateChartPreview:
         request = UpdateChartPreviewRequest(
             form_data_key="abc123", dataset_id=1, config=config
         )
-        assert request.config.sort_by == ["sales", "profit"]
-        assert len(request.config.columns) == 3
+        assert request.config["sort_by"] == ["sales", "profit"]
+        assert len(request.config["columns"]) == 3
diff --git a/tests/unit_tests/mcp_service/chart/validation/test_column_name_normalization.py b/tests/unit_tests/mcp_service/chart/validation/test_column_name_normalization.py
index 77fdf64143f..ab663ebc811 100644
--- a/tests/unit_tests/mcp_service/chart/validation/test_column_name_normalization.py
+++ b/tests/unit_tests/mcp_service/chart/validation/test_column_name_normalization.py
@@ -163,12 +163,12 @@ class TestNormalizeXYConfig:
             "x": {"name": "OrderDate"},
             "y": [{"name": "Sales", "aggregate": "SUM"}],
             "kind": "line",
-            "group_by": {"name": "productline"},
+            "group_by": [{"name": "productline"}],
         }
 
         DatasetValidator._normalize_xy_config(config_dict, mock_dataset_context)
 
-        assert config_dict["group_by"]["name"] == "ProductLine"
+        assert config_dict["group_by"][0]["name"] == "ProductLine"
 
 
 class TestNormalizeTableConfig:
@@ -397,7 +397,7 @@ class TestNormalizeUppercaseDataset:
         assert normalized.x.name == "ds"
         assert normalized.y[0].name == "DISTANCE"
         assert normalized.group_by is not None
-        assert normalized.group_by.name == "AIRLINE"
+        assert normalized.group_by[0].name == "AIRLINE"
         assert normalized.filters is not None
         assert normalized.filters[0].column == "AIRLINE"
 
@@ -531,7 +531,7 @@ class TestNormalizeEdgeCases:
         assert normalized.y[0].name == "Sales"
         assert normalized.y[1].name == "quantity_ordered"
         assert normalized.group_by is not None
-        assert normalized.group_by.name == "ProductLine"
+        assert normalized.group_by[0].name == "ProductLine"
         assert normalized.filters is not None
         assert normalized.filters[0].column == "ProductLine"
         assert normalized.filters[1].column == "OrderDate"
@@ -678,4 +678,54 @@ class TestNormalizeXAxisFilterConsistency:
 
         assert normalized.group_by is not None
         assert normalized.filters is not None
-        assert normalized.group_by.name == normalized.filters[0].column == "AIRLINE"
+        assert normalized.group_by[0].name == normalized.filters[0].column == "AIRLINE"
+
+
+class TestValidateSavedMetrics:
+    """Test that saved_metric refs are validated against dataset metrics."""
+
+    def test_valid_saved_metric_passes(
+        self, mock_dataset_context: DatasetContext
+    ) -> None:
+        config = XYChartConfig(
+            chart_type="xy",
+            x=ColumnRef(name="OrderDate"),
+            y=[ColumnRef(name="TotalRevenue", saved_metric=True)],
+        )
+        is_valid, error = DatasetValidator.validate_against_dataset(
+            config, dataset_id=18, dataset_context=mock_dataset_context
+        )
+        assert is_valid
+        assert error is None
+
+    def test_column_name_as_saved_metric_fails(
+        self, mock_dataset_context: DatasetContext
+    ) -> None:
+        """A regular column marked as saved_metric should be rejected."""
+        config = XYChartConfig(
+            chart_type="xy",
+            x=ColumnRef(name="OrderDate"),
+            y=[ColumnRef(name="Sales", saved_metric=True)],
+        )
+        is_valid, error = DatasetValidator.validate_against_dataset(
+            config, dataset_id=18, dataset_context=mock_dataset_context
+        )
+        assert not is_valid
+        assert error is not None
+        assert error.error_code == "INVALID_SAVED_METRIC"
+
+    def test_nonexistent_saved_metric_fails(
+        self, mock_dataset_context: DatasetContext
+    ) -> None:
+        """A nonexistent saved metric should produce a specific error."""
+        config = XYChartConfig(
+            chart_type="xy",
+            x=ColumnRef(name="OrderDate"),
+            y=[ColumnRef(name="nonexistent_metric", saved_metric=True)],
+        )
+        is_valid, error = DatasetValidator.validate_against_dataset(
+            config, dataset_id=18, dataset_context=mock_dataset_context
+        )
+        assert not is_valid
+        assert error is not None
+        assert error.error_code == "INVALID_SAVED_METRIC"
diff --git a/tests/unit_tests/mcp_service/dashboard/test_dashboard_schemas.py b/tests/unit_tests/mcp_service/dashboard/test_dashboard_schemas.py
new file mode 100644
index 00000000000..98fe464a24f
--- /dev/null
+++ b/tests/unit_tests/mcp_service/dashboard/test_dashboard_schemas.py
@@ -0,0 +1,341 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+"""
+Unit tests for dashboard schema serialization.
+
+Tests that serialize_dashboard_object correctly handles slug and other fields.
+"""
+
+from typing import Any
+from unittest.mock import MagicMock, patch
+
+from superset.mcp_service.dashboard.schemas import (
+    _extract_cross_filters_enabled,
+    _extract_native_filters,
+    serialize_dashboard_object,
+)
+from superset.utils.json import dumps as json_dumps
+
+
+def _mock_dashboard(
+    id: int = 1,
+    title: str = "Test Dashboard",
+    slug: str | None = None,
+    owners: list[Any] | None = None,
+    slices: list[Any] | None = None,
+    tags: list[Any] | None = None,
+    roles: list[Any] | None = None,
+) -> MagicMock:
+    """Create a mock Dashboard ORM object."""
+    dashboard = MagicMock()
+    dashboard.id = id
+    dashboard.dashboard_title = title
+    dashboard.slug = slug
+    dashboard.published = True
+    dashboard.changed_by_name = "admin"
+    dashboard.changed_on = None
+    dashboard.changed_on_humanized = "2 hours ago"
+    dashboard.created_by_name = "admin"
+    dashboard.created_on = None
+    dashboard.created_on_humanized = "1 day ago"
+    dashboard.description = "A test dashboard"
+    dashboard.css = None
+    dashboard.certified_by = None
+    dashboard.certification_details = None
+    dashboard.json_metadata = None
+    dashboard.position_json = None
+    dashboard.is_managed_externally = False
+    dashboard.external_url = None
+    dashboard.uuid = None
+    dashboard.owners = owners or []
+    dashboard.slices = slices or []
+    dashboard.tags = tags or []
+    dashboard.roles = roles or []
+    return dashboard
+
+
+class TestSerializeDashboardObject:
+    """Tests for serialize_dashboard_object slug handling."""
+
+    @patch("superset.mcp_service.utils.url_utils.get_superset_base_url")
+    def test_slug_none_returns_empty_string(self, mock_base_url):
+        """Dashboards with slug=None should return slug="" for consistency
+        with dashboard_serializer."""
+        mock_base_url.return_value = "http://localhost:8088"
+
+        dashboard = _mock_dashboard(id=1, slug=None)
+        result = serialize_dashboard_object(dashboard)
+
+        assert result.slug == ""
+
+    @patch("superset.mcp_service.utils.url_utils.get_superset_base_url")
+    def test_slug_empty_string_returns_empty_string(self, mock_base_url):
+        """Dashboards with slug="" should return slug=""."""
+        mock_base_url.return_value = "http://localhost:8088"
+
+        dashboard = _mock_dashboard(id=2, slug="")
+        result = serialize_dashboard_object(dashboard)
+
+        assert result.slug == ""
+
+    @patch("superset.mcp_service.utils.url_utils.get_superset_base_url")
+    def test_slug_with_value_preserved(self, mock_base_url):
+        """Dashboards with a real slug should preserve it."""
+        mock_base_url.return_value = "http://localhost:8088"
+
+        dashboard = _mock_dashboard(id=3, slug="my-dashboard")
+        result = serialize_dashboard_object(dashboard)
+
+        assert result.slug == "my-dashboard"
+
+    @patch("superset.mcp_service.utils.url_utils.get_superset_base_url")
+    def test_url_uses_id_when_no_slug(self, mock_base_url):
+        """URL should use dashboard id when slug is None."""
+        mock_base_url.return_value = "http://localhost:8088"
+
+        dashboard = _mock_dashboard(id=42, slug=None)
+        result = serialize_dashboard_object(dashboard)
+
+        assert result.url == "http://localhost:8088/superset/dashboard/42/"
+
+    @patch("superset.mcp_service.utils.url_utils.get_superset_base_url")
+    def test_url_uses_slug_when_available(self, mock_base_url):
+        """URL should use slug when available."""
+        mock_base_url.return_value = "http://localhost:8088"
+
+        dashboard = _mock_dashboard(id=42, slug="my-dashboard")
+        result = serialize_dashboard_object(dashboard)
+
+        assert result.url == "http://localhost:8088/superset/dashboard/my-dashboard/"
+
+    @patch("superset.mcp_service.utils.url_utils.get_superset_base_url")
+    def test_no_json_metadata_or_position_json_in_response(self, mock_base_url):
+        """DashboardInfo should not contain json_metadata or position_json."""
+        mock_base_url.return_value = "http://localhost:8088"
+
+        dashboard = _mock_dashboard(id=1)
+        result = serialize_dashboard_object(dashboard)
+
+        assert not hasattr(result, "json_metadata")
+        assert not hasattr(result, "position_json")
+
+    @patch("superset.mcp_service.utils.url_utils.get_superset_base_url")
+    def test_native_filters_extracted_from_json_metadata(self, mock_base_url):
+        """Native filters should be extracted from json_metadata."""
+        mock_base_url.return_value = "http://localhost:8088"
+
+        metadata = {
+            "native_filter_configuration": [
+                {
+                    "id": "NATIVE_FILTER-abc123",
+                    "name": "Region Filter",
+                    "filterType": "filter_select",
+                    "targets": [{"column": {"name": "region"}, "datasetId": 10}],
+                    "controlValues": {"multiSelect": True},
+                    "defaultDataMask": {"filterState": {"value": ["US"]}},
+                    "scope": {"rootPath": ["ROOT_ID"]},
+                },
+                {
+                    "id": "NATIVE_FILTER-def456",
+                    "name": "Date Range",
+                    "filterType": "filter_range",
+                    "targets": [{"column": {"name": "order_date"}, "datasetId": 10}],
+                },
+            ],
+            "cross_filters_enabled": True,
+            "color_scheme": "supersetColors",
+            "shared_label_colors": {"Sales": "#1FA8C9"},
+        }
+        dashboard = _mock_dashboard(id=1)
+        dashboard.json_metadata = json_dumps(metadata)
+
+        result = serialize_dashboard_object(dashboard)
+
+        assert len(result.native_filters) == 2
+        assert result.native_filters[0].id == "NATIVE_FILTER-abc123"
+        assert result.native_filters[0].name == "Region Filter"
+        assert result.native_filters[0].filter_type == "filter_select"
+        assert len(result.native_filters[0].targets) == 1
+        assert result.native_filters[1].name == "Date Range"
+        assert result.cross_filters_enabled is True
+
+    @patch("superset.mcp_service.utils.url_utils.get_superset_base_url")
+    def test_chart_summaries_are_lightweight(self, mock_base_url):
+        """Charts in dashboard response should only have core fields."""
+        mock_base_url.return_value = "http://localhost:8088"
+
+        chart = MagicMock()
+        chart.id = 5
+        chart.slice_name = "Revenue Chart"
+        chart.viz_type = "echarts_timeseries_bar"
+        chart.datasource_name = "sales"
+        chart.description = "Monthly revenue"
+
+        dashboard = _mock_dashboard(id=1, slices=[chart])
+        result = serialize_dashboard_object(dashboard)
+
+        assert len(result.charts) == 1
+        assert result.charts[0].id == 5
+        assert result.charts[0].slice_name == "Revenue Chart"
+        assert result.charts[0].viz_type == "echarts_timeseries_bar"
+        assert result.charts[0].datasource_name == "sales"
+        assert result.charts[0].url == "http://localhost:8088/explore/?slice_id=5"
+        # Verify no heavy fields
+        assert not hasattr(result.charts[0], "form_data")
+        assert not hasattr(result.charts[0], "tags")
+        assert not hasattr(result.charts[0], "owners")
+
+
+class TestExtractNativeFilters:
+    """Tests for _extract_native_filters helper."""
+
+    def test_none_input(self):
+        assert _extract_native_filters(None) == []
+
+    def test_empty_string(self):
+        assert _extract_native_filters("") == []
+
+    def test_invalid_json(self):
+        assert _extract_native_filters("not json") == []
+
+    def test_no_filter_config(self):
+        assert _extract_native_filters("{}") == []
+
+    def test_non_list_filter_config(self):
+        assert _extract_native_filters('{"native_filter_configuration": "bad"}') == []
+
+    def test_valid_filters(self):
+        metadata = json_dumps(
+            {
+                "native_filter_configuration": [
+                    {
+                        "id": "f1",
+                        "name": "Filter 1",
+                        "filterType": "filter_select",
+                        "targets": [{"column": {"name": "col1"}}],
+                    }
+                ]
+            }
+        )
+        result = _extract_native_filters(metadata)
+        assert len(result) == 1
+        assert result[0].id == "f1"
+        assert result[0].name == "Filter 1"
+        assert result[0].filter_type == "filter_select"
+
+    def test_skips_non_dict_entries(self):
+        metadata = json_dumps(
+            {"native_filter_configuration": [{"id": "f1", "name": "ok"}, "bad", 123]}
+        )
+        result = _extract_native_filters(metadata)
+        assert len(result) == 1
+
+    def test_non_dict_top_level_json(self):
+        """json_metadata that parses to a list/number should return empty."""
+        assert _extract_native_filters("[]") == []
+        assert _extract_native_filters("123") == []
+        assert _extract_native_filters('"just a string"') == []
+
+
+class TestExtractCrossFiltersEnabled:
+    """Tests for _extract_cross_filters_enabled helper."""
+
+    def test_none_input(self):
+        assert _extract_cross_filters_enabled(None) is None
+
+    def test_empty_json(self):
+        assert _extract_cross_filters_enabled("{}") is None
+
+    def test_true(self):
+        assert _extract_cross_filters_enabled('{"cross_filters_enabled": true}') is True
+
+    def test_false(self):
+        assert (
+            _extract_cross_filters_enabled('{"cross_filters_enabled": false}') is False
+        )
+
+    def test_non_bool_value(self):
+        assert (
+            _extract_cross_filters_enabled('{"cross_filters_enabled": "yes"}') is None
+        )
+
+    def test_non_dict_top_level_json(self):
+        """json_metadata that parses to a list/number should return None."""
+        assert _extract_cross_filters_enabled("[]") is None
+        assert _extract_cross_filters_enabled("123") is None
+        assert _extract_cross_filters_enabled('"just a string"') is None
+
+
+class TestOmittedFieldsBuilder:
+    """Tests for the shared OmittedFieldsBuilder utility."""
+
+    def test_builder_basic(self):
+        from superset.mcp_service.utils.response_utils import OmittedFieldsBuilder
+
+        result = (
+            OmittedFieldsBuilder()
+            .add_raw_field("big_field", "x" * 2048, "Too large for context.")
+            .add_extracted_field("meta_field", "y" * 512, "Useful parts above.")
+            .build()
+        )
+        assert "big_field" in result
+        assert "~2 KB" in result["big_field"]
+        assert "Too large" in result["big_field"]
+        assert "meta_field" in result
+        assert "extracted" in result["meta_field"]
+
+    def test_builder_none_values(self):
+        from superset.mcp_service.utils.response_utils import OmittedFieldsBuilder
+
+        result = (
+            OmittedFieldsBuilder()
+            .add_raw_field("empty_field", None, "Was not set.")
+            .add_extracted_field("also_empty", None, "Nothing to extract.")
+            .build()
+        )
+        assert "empty" in result["empty_field"]
+        assert "empty" in result["also_empty"]
+
+    @patch("superset.mcp_service.utils.url_utils.get_superset_base_url")
+    def test_omitted_fields_in_serialized_dashboard(self, mock_base_url):
+        """omitted_fields should describe what was stripped and include sizes."""
+        mock_base_url.return_value = "http://localhost:8088"
+
+        dashboard = _mock_dashboard(id=1)
+        dashboard.json_metadata = json_dumps(
+            {"color_scheme": "preset", "native_filter_configuration": []}
+        )
+        dashboard.position_json = json_dumps({"ROOT_ID": {"children": ["GRID_ID"]}})
+
+        result = serialize_dashboard_object(dashboard)
+
+        assert "json_metadata" in result.omitted_fields
+        assert "position_json" in result.omitted_fields
+        assert "extracted" in result.omitted_fields["json_metadata"]
+        assert "layout tree" in result.omitted_fields["position_json"].lower()
+
+    @patch("superset.mcp_service.utils.url_utils.get_superset_base_url")
+    def test_omitted_fields_with_none_values(self, mock_base_url):
+        """omitted_fields should still be present when raw fields are None."""
+        mock_base_url.return_value = "http://localhost:8088"
+
+        dashboard = _mock_dashboard(id=1)
+        result = serialize_dashboard_object(dashboard)
+
+        assert "json_metadata" in result.omitted_fields
+        assert "position_json" in result.omitted_fields
diff --git a/tests/unit_tests/mcp_service/dashboard/tool/test_add_chart_to_existing_dashboard.py b/tests/unit_tests/mcp_service/dashboard/tool/test_add_chart_to_existing_dashboard.py
new file mode 100644
index 00000000000..de8058c92de
--- /dev/null
+++ b/tests/unit_tests/mcp_service/dashboard/tool/test_add_chart_to_existing_dashboard.py
@@ -0,0 +1,297 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+"""
+Unit tests for add_chart_to_existing_dashboard MCP tool.
+
+Follows the same pattern used in test_dashboard_generation.py:
+- Tests run through the async MCP Client (not direct function calls)
+- Patches applied at source locations (superset.daos.dashboard.*, superset.db.*, etc.)
+- auth is mocked via the autouse mock_auth fixture (same as other tool test files)
+
+Covers:
+- Dashboard not found
+- Permission denied (user does not own the dashboard) -> permission_denied=True
+- Chart not found
+- Chart already in dashboard
+- Successful add (happy path)
+"""
+
+import logging
+from unittest.mock import Mock, patch
+
+import pytest
+from fastmcp import Client
+
+from superset.mcp_service.app import mcp
+from superset.mcp_service.chart.chart_utils import DatasetValidationResult
+
+logging.basicConfig(level=logging.DEBUG)
+logger = logging.getLogger(__name__)
+
+
+# ---------------------------------------------------------------------------
+# Fixtures
+# ---------------------------------------------------------------------------
+
+
+@pytest.fixture
+def mcp_server() -> object:
+    """Return the FastMCP app instance for use in MCP client tests."""
+    return mcp
+
+
+@pytest.fixture(autouse=True)
+def mock_auth():
+    """Mock authentication for all tests."""
+    with patch("superset.mcp_service.auth.get_user_from_request") as mock_get_user:
+        mock_user = Mock()
+        mock_user.id = 1
+        mock_user.username = "admin"
+        mock_get_user.return_value = mock_user
+        yield mock_get_user
+
+
+@pytest.fixture(autouse=True)
+def mock_chart_access():
+    """Allow chart data access by default so tests focus on dashboard logic."""
+    with patch(
+        "superset.mcp_service.auth.check_chart_data_access",
+        return_value=DatasetValidationResult(
+            is_valid=True,
+            dataset_id=1,
+            dataset_name="test_dataset",
+            warnings=[],
+            error=None,
+        ),
+    ):
+        yield
+
+
+# ---------------------------------------------------------------------------
+# Helpers
+# ---------------------------------------------------------------------------
+
+
+def _mock_chart(id: int = 10, slice_name: str = "Test Chart") -> Mock:
+    """Create a minimal mock Slice object with the given ID and name."""
+    chart = Mock()
+    chart.id = id
+    chart.slice_name = slice_name
+    chart.uuid = f"chart-uuid-{id}"
+    chart.tags = []
+    chart.owners = []
+    chart.viz_type = "table"
+    chart.datasource_name = None
+    chart.description = None
+    return chart
+
+
+def _mock_dashboard(
+    id: int = 1,
+    title: str = "Sales Dashboard",
+    slices: list[Mock] | None = None,
+) -> Mock:
+    """Create a minimal mock Dashboard object with the given ID, title and slices."""
+    dashboard = Mock()
+    dashboard.id = id
+    dashboard.dashboard_title = title
+    dashboard.slug = f"test-dashboard-{id}"
+    dashboard.description = None
+    dashboard.published = True
+    dashboard.created_on = None
+    dashboard.changed_on = None
+    dashboard.created_by_name = "test_user"
+    dashboard.changed_by_name = "test_user"
+    dashboard.uuid = f"dashboard-uuid-{id}"
+    dashboard.slices = slices or []
+    dashboard.owners = []
+    dashboard.tags = []
+    dashboard.roles = []
+    dashboard.position_json = "{}"
+    dashboard.json_metadata = None
+    dashboard.css = None
+    dashboard.certified_by = None
+    dashboard.certification_details = None
+    dashboard.is_managed_externally = False
+    dashboard.external_url = None
+    return dashboard
+
+
+# ---------------------------------------------------------------------------
+# Tests
+# ---------------------------------------------------------------------------
+
+
+@patch("superset.daos.dashboard.DashboardDAO.find_by_id")
+@pytest.mark.asyncio
+async def test_dashboard_not_found(mock_find_by_id: Mock, mcp_server: object) -> None:
+    """Returns a clear error when the target dashboard does not exist."""
+    mock_find_by_id.return_value = None
+
+    async with Client(mcp_server) as client:
+        result = await client.call_tool(
+            "add_chart_to_existing_dashboard",
+            {"request": {"dashboard_id": 999, "chart_id": 10}},
+        )
+
+    assert result.structured_content["dashboard"] is None
+    assert result.structured_content["dashboard_url"] is None
+    assert result.structured_content["permission_denied"] is False
+    assert "not found" in (result.structured_content["error"] or "").lower()
+
+
+@patch("superset.security_manager.raise_for_ownership")
+@patch("superset.daos.dashboard.DashboardDAO.find_by_id")
+@pytest.mark.asyncio
+async def test_permission_denied(
+    mock_find_by_id: Mock, mock_raise_for_ownership: Mock, mcp_server: object
+) -> None:
+    """Returns permission_denied=True and an actionable error when the user
+    cannot edit the dashboard.
+
+    This is the core regression test for the bug fix: before the fix the tool
+    returned a generic error that caused the LLM to silently call
+    generate_dashboard instead.  After the fix it returns permission_denied=True
+    with a message that explicitly tells the LLM to ask the user first.
+    """
+    from superset.errors import ErrorLevel, SupersetError, SupersetErrorType
+    from superset.exceptions import SupersetSecurityException
+
+    dashboard = _mock_dashboard(id=1, title="Sales Dashboard")
+    mock_find_by_id.return_value = dashboard
+    mock_raise_for_ownership.side_effect = SupersetSecurityException(
+        SupersetError(
+            message="Changing this Dashboard is forbidden",
+            error_type=SupersetErrorType.GENERIC_BACKEND_ERROR,
+            level=ErrorLevel.ERROR,
+        )
+    )
+
+    async with Client(mcp_server) as client:
+        result = await client.call_tool(
+            "add_chart_to_existing_dashboard",
+            {"request": {"dashboard_id": 1, "chart_id": 10}},
+        )
+
+    content = result.structured_content
+    assert content["dashboard"] is None
+    assert content["permission_denied"] is True, (
+        "Expected permission_denied=True so the LLM knows to ask the user "
+        "before creating a new dashboard — this is the fix for the bug"
+    )
+    assert content["error"] is not None
+    assert "Sales Dashboard" in content["error"]
+    assert "permission" in content["error"].lower()
+    assert "new dashboard" in content["error"].lower()
+
+
+@patch("superset.db.session.get")
+@patch("superset.security_manager.raise_for_ownership")
+@patch("superset.daos.dashboard.DashboardDAO.find_by_id")
+@pytest.mark.asyncio
+async def test_chart_not_found(
+    mock_find_by_id: Mock,
+    mock_raise_for_ownership: Mock,
+    mock_session_get: Mock,
+    mcp_server: object,
+) -> None:
+    """Returns an error when the requested chart does not exist."""
+    dashboard = _mock_dashboard()
+    mock_find_by_id.return_value = dashboard
+    mock_raise_for_ownership.return_value = None
+    mock_session_get.return_value = None  # chart not found
+
+    async with Client(mcp_server) as client:
+        result = await client.call_tool(
+            "add_chart_to_existing_dashboard",
+            {"request": {"dashboard_id": 1, "chart_id": 99}},
+        )
+
+    content = result.structured_content
+    assert content["dashboard"] is None
+    assert content["permission_denied"] is False
+    assert "99" in (content["error"] or "")
+
+
+@patch("superset.db.session.get")
+@patch("superset.security_manager.raise_for_ownership")
+@patch("superset.daos.dashboard.DashboardDAO.find_by_id")
+@pytest.mark.asyncio
+async def test_chart_already_in_dashboard(
+    mock_find_by_id: Mock,
+    mock_raise_for_ownership: Mock,
+    mock_session_get: Mock,
+    mcp_server: object,
+) -> None:
+    """Returns an error when the chart is already present on the dashboard."""
+    chart = _mock_chart(id=10)
+    dashboard = _mock_dashboard(slices=[chart])
+    mock_find_by_id.return_value = dashboard
+    mock_raise_for_ownership.return_value = None
+    mock_session_get.return_value = chart
+
+    async with Client(mcp_server) as client:
+        result = await client.call_tool(
+            "add_chart_to_existing_dashboard",
+            {"request": {"dashboard_id": 1, "chart_id": 10}},
+        )
+
+    content = result.structured_content
+    assert content["dashboard"] is None
+    assert content["permission_denied"] is False
+    assert "already" in (content["error"] or "").lower()
+
+
+@patch("superset.commands.dashboard.update.UpdateDashboardCommand")
+@patch("superset.db.session.get")
+@patch("superset.security_manager.raise_for_ownership")
+@patch("superset.daos.dashboard.DashboardDAO.find_by_id")
+@pytest.mark.asyncio
+async def test_successful_add(
+    mock_find_by_id: Mock,
+    mock_raise_for_ownership: Mock,
+    mock_session_get: Mock,
+    mock_update_cmd_cls: Mock,
+    mcp_server: object,
+) -> None:
+    """Happy path: chart added, permission_denied=False, URL and position returned."""
+    chart = _mock_chart(id=10)
+    dashboard = _mock_dashboard(id=1)
+    updated_dashboard = _mock_dashboard(id=1, slices=[chart])
+
+    mock_find_by_id.side_effect = [dashboard, updated_dashboard]
+    mock_raise_for_ownership.return_value = None
+    mock_session_get.return_value = chart
+
+    mock_update_cmd = Mock()
+    mock_update_cmd.run.return_value = updated_dashboard
+    mock_update_cmd_cls.return_value = mock_update_cmd
+
+    async with Client(mcp_server) as client:
+        result = await client.call_tool(
+            "add_chart_to_existing_dashboard",
+            {"request": {"dashboard_id": 1, "chart_id": 10}},
+        )
+
+    content = result.structured_content
+    assert content["error"] is None
+    assert content["permission_denied"] is False
+    assert content["dashboard_url"] is not None
+    assert "/superset/dashboard/1/" in content["dashboard_url"]
+    assert content["position"] is not None
+    assert "chart_key" in content["position"]
diff --git a/tests/unit_tests/mcp_service/dashboard/tool/test_dashboard_generation.py b/tests/unit_tests/mcp_service/dashboard/tool/test_dashboard_generation.py
index b382f1f4ab2..b5df3e91abc 100644
--- a/tests/unit_tests/mcp_service/dashboard/tool/test_dashboard_generation.py
+++ b/tests/unit_tests/mcp_service/dashboard/tool/test_dashboard_generation.py
@@ -26,6 +26,7 @@ import pytest
 from fastmcp import Client
 
 from superset.mcp_service.app import mcp
+from superset.mcp_service.chart.chart_utils import DatasetValidationResult
 from superset.mcp_service.dashboard.constants import generate_id
 from superset.mcp_service.dashboard.tool.add_chart_to_existing_dashboard import (
     _add_chart_to_layout,
@@ -51,11 +52,28 @@ def mcp_server():
 def mock_auth():
     """Mock authentication for all tests."""
     with patch("superset.mcp_service.auth.get_user_from_request") as mock_get_user:
-        mock_user = Mock()
-        mock_user.id = 1
-        mock_user.username = "admin"
-        mock_get_user.return_value = mock_user
-        yield mock_get_user
+        with patch("superset.security_manager.raise_for_ownership"):
+            mock_user = Mock()
+            mock_user.id = 1
+            mock_user.username = "admin"
+            mock_get_user.return_value = mock_user
+            yield mock_get_user
+
+
+@pytest.fixture(autouse=True)
+def mock_chart_access():
+    """Mock chart dataset validation so tests don't hit real security manager."""
+    with patch(
+        "superset.mcp_service.auth.check_chart_data_access",
+        return_value=DatasetValidationResult(
+            is_valid=True,
+            dataset_id=1,
+            dataset_name="test_dataset",
+            warnings=[],
+            error=None,
+        ),
+    ):
+        yield
 
 
 def _mock_chart(id: int = 1, slice_name: str = "Test Chart") -> Mock:
@@ -70,6 +88,8 @@ def _mock_chart(id: int = 1, slice_name: str = "Test Chart") -> Mock:
     chart.datasource_name = None
     chart.datasource_type = None
     chart.description = None
+    chart.certified_by = None
+    chart.certification_details = None
     chart.cache_timeout = None
     chart.changed_by = None
     chart.changed_by_name = None
@@ -96,6 +116,8 @@ def _mock_dashboard(id: int = 1, title: str = "Test Dashboard") -> Mock:
     dashboard.created_by.username = "test_user"
     dashboard.changed_by = Mock()
     dashboard.changed_by.username = "test_user"
+    dashboard.created_by_name = "test_user"
+    dashboard.changed_by_name = "test_user"
     dashboard.uuid = f"dashboard-uuid-{id}"
     dashboard.slices = []
     dashboard.owners = []
@@ -103,28 +125,59 @@ def _mock_dashboard(id: int = 1, title: str = "Test Dashboard") -> Mock:
     return dashboard
 
 
+def _setup_generate_dashboard_mocks(
+    mock_db_session,
+    mock_find_by_id,
+    mock_dashboard_cls,
+    charts,
+    dashboard,
+):
+    """Set up common mocks for generate_dashboard tests.
+
+    The tool creates dashboards directly via db.session (bypassing
+    CreateDashboardCommand) and re-queries user/charts in the tool's
+    own session.  This helper wires up the mock chain for that path.
+    """
+    mock_user = Mock()
+    mock_user.id = 1
+    mock_user.username = "admin"
+    mock_user.first_name = "Admin"
+    mock_user.last_name = "User"
+    mock_user.email = "admin@example.com"
+    mock_user.active = True
+
+    mock_query = Mock()
+    mock_filter = Mock()
+    mock_query.filter.return_value = mock_filter
+    mock_query.filter_by.return_value = mock_filter
+    mock_filter.order_by.return_value = mock_filter
+    mock_filter.all.return_value = charts
+    mock_filter.first.return_value = mock_user
+    mock_db_session.query.return_value = mock_query
+
+    mock_dashboard_cls.return_value = dashboard
+    mock_find_by_id.return_value = dashboard
+
+
 class TestGenerateDashboard:
     """Tests for generate_dashboard MCP tool."""
 
-    @patch("superset.commands.dashboard.create.CreateDashboardCommand")
+    @patch("superset.models.dashboard.Dashboard")
+    @patch("superset.daos.dashboard.DashboardDAO.find_by_id")
     @patch("superset.db.session")
     @pytest.mark.asyncio
     async def test_generate_dashboard_basic(
-        self, mock_db_session, mock_create_command, mcp_server
+        self, mock_db_session, mock_find_by_id, mock_dashboard_cls, mcp_server
     ):
         """Test basic dashboard generation with valid charts."""
-        mock_query = Mock()
-        mock_filter = Mock()
-        mock_query.filter.return_value = mock_filter
-        mock_filter.order_by.return_value = mock_filter
-        mock_filter.all.return_value = [
+        charts = [
             _mock_chart(id=1, slice_name="Sales Chart"),
             _mock_chart(id=2, slice_name="Revenue Chart"),
         ]
-        mock_db_session.query.return_value = mock_query
-
         mock_dashboard = _mock_dashboard(id=10, title="Analytics Dashboard")
-        mock_create_command.return_value.run.return_value = mock_dashboard
+        _setup_generate_dashboard_mocks(
+            mock_db_session, mock_find_by_id, mock_dashboard_cls, charts, mock_dashboard
+        )
 
         request = {
             "chart_ids": [1, 2],
@@ -169,22 +222,80 @@ class TestGenerateDashboard:
             assert result.structured_content["dashboard"] is None
             assert result.structured_content["dashboard_url"] is None
 
-    @patch("superset.commands.dashboard.create.CreateDashboardCommand")
     @patch("superset.db.session")
     @pytest.mark.asyncio
-    async def test_generate_dashboard_single_chart(
-        self, mock_db_session, mock_create_command, mcp_server
+    async def test_generate_dashboard_inaccessible_charts(
+        self, mock_db_session, mock_chart_access, mcp_server
     ):
-        """Test dashboard generation with a single chart."""
+        """Test error when user lacks access to some charts."""
+        charts = [
+            _mock_chart(id=1, slice_name="Accessible"),
+            _mock_chart(id=2, slice_name="Restricted"),
+            _mock_chart(id=3, slice_name="Also Restricted"),
+        ]
+
         mock_query = Mock()
         mock_filter = Mock()
         mock_query.filter.return_value = mock_filter
         mock_filter.order_by.return_value = mock_filter
-        mock_filter.all.return_value = [_mock_chart(id=5, slice_name="Single Chart")]
+        mock_filter.all.return_value = charts
         mock_db_session.query.return_value = mock_query
 
+        # Override the autouse fixture: chart 2 has inaccessible dataset
+        def mock_validate(chart, check_access=False):
+            if chart.id == 2:
+                return DatasetValidationResult(
+                    is_valid=False,
+                    dataset_id=10,
+                    dataset_name="restricted_dataset",
+                    warnings=[],
+                    error=(
+                        "Access denied to dataset 'restricted_dataset' "
+                        "(ID: 10). You do not have permission to view "
+                        "this dataset."
+                    ),
+                )
+            return DatasetValidationResult(
+                is_valid=True,
+                dataset_id=chart.id,
+                dataset_name=f"dataset_{chart.id}",
+                warnings=[],
+                error=None,
+            )
+
+        with patch(
+            "superset.mcp_service.auth.check_chart_data_access",
+            side_effect=mock_validate,
+        ):
+            request = {
+                "chart_ids": [1, 2, 3],
+                "dashboard_title": "Test Dashboard",
+            }
+
+            async with Client(mcp_server) as client:
+                result = await client.call_tool(
+                    "generate_dashboard", {"request": request}
+                )
+
+                assert result.structured_content["error"] is not None
+                assert "not accessible" in result.structured_content["error"]
+                assert "2" in result.structured_content["error"]
+                assert result.structured_content["dashboard"] is None
+                assert result.structured_content["dashboard_url"] is None
+
+    @patch("superset.models.dashboard.Dashboard")
+    @patch("superset.daos.dashboard.DashboardDAO.find_by_id")
+    @patch("superset.db.session")
+    @pytest.mark.asyncio
+    async def test_generate_dashboard_single_chart(
+        self, mock_db_session, mock_find_by_id, mock_dashboard_cls, mcp_server
+    ):
+        """Test dashboard generation with a single chart."""
+        charts = [_mock_chart(id=5, slice_name="Single Chart")]
         mock_dashboard = _mock_dashboard(id=20, title="Single Chart Dashboard")
-        mock_create_command.return_value.run.return_value = mock_dashboard
+        _setup_generate_dashboard_mocks(
+            mock_db_session, mock_find_by_id, mock_dashboard_cls, charts, mock_dashboard
+        )
 
         request = {
             "chart_ids": [5],
@@ -197,27 +308,22 @@ class TestGenerateDashboard:
 
             assert result.structured_content["error"] is None
             assert result.structured_content["dashboard"]["chart_count"] == 1
-            assert result.structured_content["dashboard"]["published"] is True
+            assert result.structured_content["dashboard"]["published"] is False
 
-    @patch("superset.commands.dashboard.create.CreateDashboardCommand")
+    @patch("superset.models.dashboard.Dashboard")
+    @patch("superset.daos.dashboard.DashboardDAO.find_by_id")
     @patch("superset.db.session")
     @pytest.mark.asyncio
     async def test_generate_dashboard_many_charts(
-        self, mock_db_session, mock_create_command, mcp_server
+        self, mock_db_session, mock_find_by_id, mock_dashboard_cls, mcp_server
     ):
         """Test dashboard generation with many charts (grid layout)."""
         chart_ids = list(range(1, 7))
-        mock_query = Mock()
-        mock_filter = Mock()
-        mock_query.filter.return_value = mock_filter
-        mock_filter.order_by.return_value = mock_filter
-        mock_filter.all.return_value = [
-            _mock_chart(id=i, slice_name=f"Chart {i}") for i in chart_ids
-        ]
-        mock_db_session.query.return_value = mock_query
-
+        charts = [_mock_chart(id=i, slice_name=f"Chart {i}") for i in chart_ids]
         mock_dashboard = _mock_dashboard(id=30, title="Multi Chart Dashboard")
-        mock_create_command.return_value.run.return_value = mock_dashboard
+        _setup_generate_dashboard_mocks(
+            mock_db_session, mock_find_by_id, mock_dashboard_cls, charts, mock_dashboard
+        )
 
         request = {"chart_ids": chart_ids, "dashboard_title": "Multi Chart Dashboard"}
 
@@ -227,10 +333,14 @@ class TestGenerateDashboard:
             assert result.structured_content["error"] is None
             assert result.structured_content["dashboard"]["chart_count"] == 6
 
-            mock_create_command.assert_called_once()
-            call_args = mock_create_command.call_args[0][0]
+            # Verify db.session.add and commit were called
+            # (commit is called multiple times: once by tool + event_logger contexts)
+            mock_db_session.add.assert_called_once()
+            assert mock_db_session.commit.call_count >= 1
 
-            position_json = json.loads(call_args["position_json"])
+            # Verify layout was set on the dashboard object
+            created_dashboard = mock_dashboard_cls.return_value
+            position_json = json.loads(created_dashboard.position_json)
             assert "ROOT_ID" in position_json
             assert "GRID_ID" in position_json
             assert "DASHBOARD_VERSION_KEY" in position_json
@@ -270,20 +380,33 @@ class TestGenerateDashboard:
                 assert row_data["type"] == "ROW"
                 assert column_key in row_data["children"]
 
-    @patch("superset.commands.dashboard.create.CreateDashboardCommand")
+    @patch("superset.models.dashboard.Dashboard")
     @patch("superset.db.session")
     @pytest.mark.asyncio
     async def test_generate_dashboard_creation_failure(
-        self, mock_db_session, mock_create_command, mcp_server
+        self, mock_db_session, mock_dashboard_cls, mcp_server
     ):
         """Test error handling when dashboard creation fails."""
+        from sqlalchemy.exc import SQLAlchemyError
+
         mock_query = Mock()
         mock_filter = Mock()
         mock_query.filter.return_value = mock_filter
+        mock_query.filter_by.return_value = mock_filter
         mock_filter.order_by.return_value = mock_filter
         mock_filter.all.return_value = [_mock_chart(id=1)]
+        mock_filter.first.return_value = Mock(
+            id=1,
+            username="admin",
+            first_name="Admin",
+            last_name="User",
+            email="admin@example.com",
+            active=True,
+        )
         mock_db_session.query.return_value = mock_query
-        mock_create_command.return_value.run.side_effect = Exception("Creation failed")
+        mock_db_session.commit.side_effect = SQLAlchemyError("Creation failed")
+
+        mock_dashboard_cls.return_value = _mock_dashboard(id=99)
 
         request = {"chart_ids": [1], "dashboard_title": "Failed Dashboard"}
 
@@ -293,23 +416,22 @@ class TestGenerateDashboard:
             assert result.structured_content["error"] is not None
             assert "Failed to create dashboard" in result.structured_content["error"]
             assert result.structured_content["dashboard"] is None
+            # rollback called by tool + event_logger error handling
+            assert mock_db_session.rollback.call_count >= 1
 
-    @patch("superset.commands.dashboard.create.CreateDashboardCommand")
+    @patch("superset.models.dashboard.Dashboard")
+    @patch("superset.daos.dashboard.DashboardDAO.find_by_id")
     @patch("superset.db.session")
     @pytest.mark.asyncio
     async def test_generate_dashboard_minimal_request(
-        self, mock_db_session, mock_create_command, mcp_server
+        self, mock_db_session, mock_find_by_id, mock_dashboard_cls, mcp_server
     ):
         """Test dashboard generation with minimal required parameters."""
-        mock_query = Mock()
-        mock_filter = Mock()
-        mock_query.filter.return_value = mock_filter
-        mock_filter.order_by.return_value = mock_filter
-        mock_filter.all.return_value = [_mock_chart(id=3)]
-        mock_db_session.query.return_value = mock_query
-
+        charts = [_mock_chart(id=3)]
         mock_dashboard = _mock_dashboard(id=40, title="Minimal Dashboard")
-        mock_create_command.return_value.run.return_value = mock_dashboard
+        _setup_generate_dashboard_mocks(
+            mock_db_session, mock_find_by_id, mock_dashboard_cls, charts, mock_dashboard
+        )
 
         request = {
             "chart_ids": [3],
@@ -325,31 +447,53 @@ class TestGenerateDashboard:
                 == "Minimal Dashboard"
             )
 
-            call_args = mock_create_command.call_args[0][0]
-            assert call_args["published"] is True
-            assert (
-                "description" not in call_args or call_args.get("description") is None
-            )
+            # Verify dashboard was created with default published=False
+            created = mock_dashboard_cls.return_value
+            assert created.published is False
 
-    @patch("superset.commands.dashboard.create.CreateDashboardCommand")
+    @patch("superset.models.dashboard.Dashboard")
+    @patch("superset.daos.dashboard.DashboardDAO.find_by_id")
+    @patch("superset.db.session")
+    @pytest.mark.asyncio
+    async def test_generate_dashboard_explicit_published(
+        self, mock_db_session, mock_find_by_id, mock_dashboard_cls, mcp_server
+    ):
+        """Test dashboard generation with published explicitly set to True."""
+        charts = [_mock_chart(id=3)]
+        mock_dashboard = _mock_dashboard(id=41, title="Published Dashboard")
+        _setup_generate_dashboard_mocks(
+            mock_db_session, mock_find_by_id, mock_dashboard_cls, charts, mock_dashboard
+        )
+
+        request = {
+            "chart_ids": [3],
+            "dashboard_title": "Published Dashboard",
+            "published": True,
+        }
+
+        async with Client(mcp_server) as client:
+            result = await client.call_tool("generate_dashboard", {"request": request})
+
+            assert result.structured_content["error"] is None
+            created = mock_dashboard_cls.return_value
+            assert created.published is True
+
+    @patch("superset.models.dashboard.Dashboard")
+    @patch("superset.daos.dashboard.DashboardDAO.find_by_id")
     @patch("superset.db.session")
     @pytest.mark.asyncio
     async def test_generate_dashboard_auto_title_from_charts(
-        self, mock_db_session, mock_create_command, mcp_server
+        self, mock_db_session, mock_find_by_id, mock_dashboard_cls, mcp_server
     ):
         """Test that omitting dashboard_title generates a title from chart names."""
-        mock_query = Mock()
-        mock_filter = Mock()
-        mock_query.filter.return_value = mock_filter
-        mock_filter.order_by.return_value = mock_filter
-        mock_filter.all.return_value = [
+        charts = [
             _mock_chart(id=1, slice_name="Sales Revenue"),
             _mock_chart(id=2, slice_name="Customer Count"),
         ]
-        mock_db_session.query.return_value = mock_query
-
         mock_dashboard = _mock_dashboard(id=50, title="Sales Revenue & Customer Count")
-        mock_create_command.return_value.run.return_value = mock_dashboard
+        _setup_generate_dashboard_mocks(
+            mock_db_session, mock_find_by_id, mock_dashboard_cls, charts, mock_dashboard
+        )
 
         # No dashboard_title provided
         request = {"chart_ids": [1, 2]}
@@ -359,27 +503,23 @@ class TestGenerateDashboard:
 
             assert result.structured_content["error"] is None
 
-            call_args = mock_create_command.call_args[0][0]
-            assert call_args["dashboard_title"] == "Sales Revenue & Customer Count"
+            # Verify auto-generated title was set on dashboard
+            created = mock_dashboard_cls.return_value
+            assert created.dashboard_title == "Sales Revenue & Customer Count"
 
-    @patch("superset.commands.dashboard.create.CreateDashboardCommand")
+    @patch("superset.models.dashboard.Dashboard")
+    @patch("superset.daos.dashboard.DashboardDAO.find_by_id")
     @patch("superset.db.session")
     @pytest.mark.asyncio
     async def test_generate_dashboard_empty_string_title_preserved(
-        self, mock_db_session, mock_create_command, mcp_server
+        self, mock_db_session, mock_find_by_id, mock_dashboard_cls, mcp_server
     ):
         """Test that an explicit empty-string title is NOT replaced by auto-gen."""
-        mock_query = Mock()
-        mock_filter = Mock()
-        mock_query.filter.return_value = mock_filter
-        mock_filter.order_by.return_value = mock_filter
-        mock_filter.all.return_value = [
-            _mock_chart(id=1, slice_name="Sales Revenue"),
-        ]
-        mock_db_session.query.return_value = mock_query
-
+        charts = [_mock_chart(id=1, slice_name="Sales Revenue")]
         mock_dashboard = _mock_dashboard(id=60, title="")
-        mock_create_command.return_value.run.return_value = mock_dashboard
+        _setup_generate_dashboard_mocks(
+            mock_db_session, mock_find_by_id, mock_dashboard_cls, charts, mock_dashboard
+        )
 
         # Explicit empty string title
         request = {"chart_ids": [1], "dashboard_title": ""}
@@ -389,8 +529,9 @@ class TestGenerateDashboard:
 
             assert result.structured_content["error"] is None
 
-            call_args = mock_create_command.call_args[0][0]
-            assert call_args["dashboard_title"] == ""
+            # Verify empty string title was preserved (not replaced by auto-gen)
+            created = mock_dashboard_cls.return_value
+            assert created.dashboard_title == ""
 
 
 class TestAddChartToExistingDashboard:
@@ -439,17 +580,19 @@ class TestAddChartToExistingDashboard:
                 "DASHBOARD_VERSION_KEY": "v2",
             }
         )
-        mock_find_dashboard.return_value = mock_dashboard
-
-        mock_chart = _mock_chart(id=30, slice_name="New Chart")
-        mock_db_session.get.return_value = mock_chart
-
         updated_dashboard = _mock_dashboard(id=1, title="Existing Dashboard")
         updated_dashboard.slices = [
             _mock_chart(id=10),
             _mock_chart(id=20),
             _mock_chart(id=30),
         ]
+        # First call: initial validation returns original dashboard
+        # Second call: re-fetch after update returns updated dashboard
+        mock_find_dashboard.side_effect = [mock_dashboard, updated_dashboard]
+
+        mock_chart = _mock_chart(id=30, slice_name="New Chart")
+        mock_db_session.get.return_value = mock_chart
+
         mock_update_command.return_value.run.return_value = updated_dashboard
 
         request = {"dashboard_id": 1, "chart_id": 30}
@@ -516,6 +659,43 @@ class TestAddChartToExistingDashboard:
             assert result.structured_content["error"] is not None
             assert "Chart with ID 999 not found" in result.structured_content["error"]
 
+    @patch("superset.daos.dashboard.DashboardDAO.find_by_id")
+    @patch("superset.db.session")
+    @pytest.mark.asyncio
+    async def test_add_chart_dataset_not_accessible(
+        self, mock_db_session, mock_find_dashboard, mcp_server
+    ):
+        """Test error when chart's dataset is not accessible."""
+        mock_find_dashboard.return_value = _mock_dashboard()
+        mock_chart = _mock_chart(id=7)
+        mock_db_session.get.return_value = mock_chart
+
+        # Override autouse fixture: chart 7 has inaccessible dataset
+        with patch(
+            "superset.mcp_service.auth.check_chart_data_access",
+            return_value=DatasetValidationResult(
+                is_valid=False,
+                dataset_id=10,
+                dataset_name="restricted_dataset",
+                warnings=[],
+                error=(
+                    "Access denied to dataset 'restricted_dataset' "
+                    "(ID: 10). You do not have permission to view "
+                    "this dataset."
+                ),
+            ),
+        ):
+            request = {"dashboard_id": 1, "chart_id": 7}
+
+            async with Client(mcp_server) as client:
+                result = await client.call_tool(
+                    "add_chart_to_existing_dashboard", {"request": request}
+                )
+                assert result.structured_content["error"] is not None
+                assert "not accessible" in result.structured_content["error"]
+                assert "7" in result.structured_content["error"]
+                assert result.structured_content["dashboard"] is None
+
     @patch("superset.daos.dashboard.DashboardDAO.find_by_id")
     @patch("superset.db.session")
     @pytest.mark.asyncio
@@ -659,8 +839,6 @@ class TestAddChartToExistingDashboard:
                 "DASHBOARD_VERSION_KEY": "v2",
             }
         )
-        mock_find_dashboard.return_value = mock_dashboard
-
         mock_chart = _mock_chart(id=25, slice_name="Tab Chart")
         mock_db_session.get.return_value = mock_chart
 
@@ -668,6 +846,10 @@ class TestAddChartToExistingDashboard:
         updated_dashboard.slices = [_mock_chart(id=10), _mock_chart(id=25)]
         mock_update_command.return_value.run.return_value = updated_dashboard
 
+        # side_effect: first call returns initial dashboard (validation),
+        # second call returns updated dashboard (re-fetch after update)
+        mock_find_dashboard.side_effect = [mock_dashboard, updated_dashboard]
+
         request = {"dashboard_id": 3, "chart_id": 25}
 
         async with Client(mcp_server) as client:
@@ -759,8 +941,6 @@ class TestAddChartToExistingDashboard:
                 "DASHBOARD_VERSION_KEY": "v2",
             }
         )
-        mock_find_dashboard.return_value = mock_dashboard
-
         mock_chart = _mock_chart(id=30, slice_name="Customer Chart")
         mock_db_session.get.return_value = mock_chart
 
@@ -768,6 +948,10 @@ class TestAddChartToExistingDashboard:
         updated_dashboard.slices = [_mock_chart(id=10), _mock_chart(id=30)]
         mock_update_command.return_value.run.return_value = updated_dashboard
 
+        # side_effect: first call returns initial dashboard (validation),
+        # second call returns updated dashboard (re-fetch after update)
+        mock_find_dashboard.side_effect = [mock_dashboard, updated_dashboard]
+
         request = {"dashboard_id": 3, "chart_id": 30, "target_tab": "Customers"}
 
         async with Client(mcp_server) as client:
@@ -796,6 +980,118 @@ class TestAddChartToExistingDashboard:
             assert "TAB-tab2" in chart_parents
             assert "TAB-tab1" not in chart_parents
 
+    @patch("superset.commands.dashboard.update.UpdateDashboardCommand")
+    @patch("superset.daos.dashboard.DashboardDAO.find_by_id")
+    @patch("superset.db.session")
+    @pytest.mark.asyncio
+    async def test_add_chart_to_tabbed_dashboard_tabs_under_root(
+        self, mock_db_session, mock_find_dashboard, mock_update_command, mcp_server
+    ):
+        """Test adding chart when TABS are under ROOT_ID (real-world layout).
+
+        Real Superset dashboards place TABS directly under ROOT_ID with an
+        empty GRID_ID, unlike test fixtures that place TABS under GRID_ID.
+        The tool must NOT inject GRID_ID into ROOT_ID.children alongside
+        TABS, as the frontend hides non-TABS content when a TABS container
+        is a ROOT_ID child.
+        """
+        mock_dashboard = _mock_dashboard(id=7, title="COVID Vaccine Dashboard")
+        mock_dashboard.slices = [_mock_chart(id=10)]
+        mock_dashboard.position_json = json.dumps(
+            {
+                "ROOT_ID": {
+                    "children": ["TABS-wUKya7eQ0Z"],
+                    "id": "ROOT_ID",
+                    "type": "ROOT",
+                },
+                "GRID_ID": {
+                    "children": [],
+                    "id": "GRID_ID",
+                    "parents": ["ROOT_ID"],
+                    "type": "GRID",
+                },
+                "TABS-wUKya7eQ0Z": {
+                    "children": ["TAB-BCIJF4NvgQ", "TAB-kl2Hkh2IR"],
+                    "id": "TABS-wUKya7eQ0Z",
+                    "parents": ["ROOT_ID"],
+                    "type": "TABS",
+                },
+                "TAB-BCIJF4NvgQ": {
+                    "children": ["ROW-existing"],
+                    "id": "TAB-BCIJF4NvgQ",
+                    "meta": {"text": "Vaccine Candidates"},
+                    "parents": ["ROOT_ID", "TABS-wUKya7eQ0Z"],
+                    "type": "TAB",
+                },
+                "TAB-kl2Hkh2IR": {
+                    "children": [],
+                    "id": "TAB-kl2Hkh2IR",
+                    "meta": {"text": "Doses Administered"},
+                    "parents": ["ROOT_ID", "TABS-wUKya7eQ0Z"],
+                    "type": "TAB",
+                },
+                "ROW-existing": {
+                    "children": ["CHART-10"],
+                    "id": "ROW-existing",
+                    "meta": {"background": "BACKGROUND_TRANSPARENT"},
+                    "parents": [
+                        "ROOT_ID",
+                        "TABS-wUKya7eQ0Z",
+                        "TAB-BCIJF4NvgQ",
+                    ],
+                    "type": "ROW",
+                },
+                "CHART-10": {
+                    "id": "CHART-10",
+                    "type": "CHART",
+                    "parents": [
+                        "ROOT_ID",
+                        "TABS-wUKya7eQ0Z",
+                        "TAB-BCIJF4NvgQ",
+                        "ROW-existing",
+                    ],
+                },
+                "DASHBOARD_VERSION_KEY": "v2",
+            }
+        )
+        mock_chart = _mock_chart(id=91, slice_name="Vaccines by Stage")
+        mock_db_session.get.return_value = mock_chart
+
+        updated_dashboard = _mock_dashboard(id=7, title="COVID Vaccine Dashboard")
+        updated_dashboard.slices = [_mock_chart(id=10), _mock_chart(id=91)]
+        mock_update_command.return_value.run.return_value = updated_dashboard
+
+        mock_find_dashboard.side_effect = [mock_dashboard, updated_dashboard]
+
+        request = {"dashboard_id": 7, "chart_id": 91}
+
+        async with Client(mcp_server) as client:
+            result = await client.call_tool(
+                "add_chart_to_existing_dashboard", {"request": request}
+            )
+
+            assert result.structured_content["error"] is None
+
+            call_args = mock_update_command.call_args[0][1]
+            layout = json.loads(call_args["position_json"])
+
+            row_key = result.structured_content["position"]["row_key"]
+            assert row_key in layout
+
+            # Chart must be inside the first tab, not GRID_ID
+            assert row_key in layout["TAB-BCIJF4NvgQ"]["children"]
+            assert row_key not in layout["GRID_ID"]["children"]
+
+            # GRID_ID must NOT be added to ROOT_ID.children alongside TABS
+            assert "GRID_ID" not in layout["ROOT_ID"]["children"]
+            assert layout["ROOT_ID"]["children"] == ["TABS-wUKya7eQ0Z"]
+
+            # Parent chain must include the tab hierarchy, not GRID_ID
+            chart_parents = layout["CHART-91"]["parents"]
+            assert "TABS-wUKya7eQ0Z" in chart_parents
+            assert "TAB-BCIJF4NvgQ" in chart_parents
+            assert "GRID_ID" not in chart_parents
+
     @patch("superset.commands.dashboard.update.UpdateDashboardCommand")
     @patch("superset.daos.dashboard.DashboardDAO.find_by_id")
     @patch("superset.db.session")
@@ -957,6 +1253,28 @@ class TestLayoutHelpers:
             _find_tab_insert_target(layout, target_tab="Nonexistent Tab") == "TAB-first"
         )
 
+    def test_find_tab_insert_target_tabs_under_root(self):
+        """Test _find_tab_insert_target when TABS are under ROOT_ID (real layout)."""
+        layout = {
+            "ROOT_ID": {"children": ["TABS-xxx"], "type": "ROOT"},
+            "GRID_ID": {"children": [], "type": "GRID", "parents": ["ROOT_ID"]},
+            "TABS-xxx": {"children": ["TAB-a", "TAB-b"], "type": "TABS"},
+            "TAB-a": {"children": [], "type": "TAB", "meta": {"text": "Overview"}},
+            "TAB-b": {"children": [], "type": "TAB", "meta": {"text": "Details"}},
+        }
+        assert _find_tab_insert_target(layout) == "TAB-a"
+
+    def test_find_tab_insert_target_tabs_under_root_by_name(self):
+        """Test _find_tab_insert_target matches tab name when TABS under ROOT_ID."""
+        layout = {
+            "ROOT_ID": {"children": ["TABS-xxx"], "type": "ROOT"},
+            "GRID_ID": {"children": [], "type": "GRID", "parents": ["ROOT_ID"]},
+            "TABS-xxx": {"children": ["TAB-a", "TAB-b"], "type": "TABS"},
+            "TAB-a": {"children": [], "type": "TAB", "meta": {"text": "Overview"}},
+            "TAB-b": {"children": [], "type": "TAB", "meta": {"text": "Details"}},
+        }
+        assert _find_tab_insert_target(layout, target_tab="Details") == "TAB-b"
+
     def test_find_tab_insert_target_no_grid(self):
         """Test _find_tab_insert_target with missing GRID_ID."""
         assert _find_tab_insert_target({"ROOT_ID": {"type": "ROOT"}}) is None
@@ -1014,6 +1332,56 @@ class TestLayoutHelpers:
         assert "ROW-new" in layout["TAB-first"]["children"]
         assert "ROW-new" not in layout["GRID_ID"]["children"]
 
+    def test_ensure_layout_structure_tabs_under_root_no_grid_added(self):
+        """Test _ensure_layout_structure does NOT add GRID_ID to ROOT_ID
+        when TABS already exists as a ROOT_ID child.
+
+        Real Superset tabbed dashboards place TABS under ROOT_ID, not
+        GRID_ID.  Adding GRID_ID as a sibling of TABS confuses the
+        frontend and makes charts invisible.
+        """
+        layout = {
+            "ROOT_ID": {"children": ["TABS-xxx"], "type": "ROOT"},
+            "GRID_ID": {"children": [], "type": "GRID", "parents": ["ROOT_ID"]},
+            "TABS-xxx": {
+                "children": ["TAB-a", "TAB-b"],
+                "type": "TABS",
+                "parents": ["ROOT_ID"],
+            },
+            "TAB-a": {
+                "children": ["ROW-existing"],
+                "type": "TAB",
+                "meta": {"text": "Overview"},
+                "parents": ["ROOT_ID", "TABS-xxx"],
+            },
+            "TAB-b": {
+                "children": [],
+                "type": "TAB",
+                "meta": {"text": "Details"},
+                "parents": ["ROOT_ID", "TABS-xxx"],
+            },
+        }
+        _ensure_layout_structure(layout, "ROW-new", "TAB-a")
+
+        # Row added to the correct tab
+        assert "ROW-new" in layout["TAB-a"]["children"]
+        # GRID_ID must NOT be injected into ROOT_ID alongside TABS
+        assert "GRID_ID" not in layout["ROOT_ID"]["children"]
+        assert layout["ROOT_ID"]["children"] == ["TABS-xxx"]
+
+    def test_ensure_layout_structure_no_tabs_adds_grid_to_root(self):
+        """Test _ensure_layout_structure still adds GRID_ID to ROOT_ID
+        when the dashboard has no tabs (non-tabbed dashboard regression check).
+        """
+        layout = {
+            "ROOT_ID": {"children": [], "type": "ROOT"},
+            "GRID_ID": {"children": [], "type": "GRID", "parents": ["ROOT_ID"]},
+        }
+        _ensure_layout_structure(layout, "ROW-new", "GRID_ID")
+
+        assert "GRID_ID" in layout["ROOT_ID"]["children"]
+        assert "ROW-new" in layout["GRID_ID"]["children"]
+
 
 class TestGenerateTitleFromCharts:
     """Tests for _generate_title_from_charts helper."""
@@ -1065,3 +1433,106 @@ class TestGenerateTitleFromCharts:
         title = _generate_title_from_charts(charts)
         assert len(title) <= 150
         assert title.endswith("\u2026")
+
+
+class TestDashboardSerializationEagerLoading:
+    """Tests for eager loading fix in dashboard serialization paths."""
+
+    @patch("superset.models.dashboard.Dashboard")
+    @patch("superset.daos.dashboard.DashboardDAO.find_by_id")
+    @patch("superset.db.session")
+    @pytest.mark.asyncio
+    async def test_generate_dashboard_refetches_via_dao(
+        self, mock_db_session, mock_find_by_id, mock_dashboard_cls, mcp_server
+    ):
+        """generate_dashboard re-fetches dashboard via DashboardDAO.find_by_id
+        with eager-loaded slice relationships before serialization."""
+        charts = [_mock_chart(id=1, slice_name="Refetched Chart")]
+        refetched_dashboard = _mock_dashboard(id=10)
+        refetched_dashboard.slices = charts
+
+        _setup_generate_dashboard_mocks(
+            mock_db_session,
+            mock_find_by_id,
+            mock_dashboard_cls,
+            charts,
+            refetched_dashboard,
+        )
+
+        request = {"chart_ids": [1]}
+
+        async with Client(mcp_server) as client:
+            result = await client.call_tool("generate_dashboard", {"request": request})
+
+            assert result.structured_content["error"] is None
+            # Verify DashboardDAO.find_by_id was called for re-fetch
+            mock_find_by_id.assert_called()
+
+    @patch("superset.commands.dashboard.update.UpdateDashboardCommand")
+    @patch("superset.daos.dashboard.DashboardDAO.find_by_id")
+    @patch("superset.db.session")
+    @pytest.mark.asyncio
+    async def test_add_chart_refetches_dashboard_via_dao(
+        self, mock_db_session, mock_find_dashboard, mock_update_command, mcp_server
+    ):
+        """add_chart_to_existing_dashboard re-fetches dashboard via
+        DashboardDAO.find_by_id with eager-loaded slice relationships."""
+        mock_dashboard = _mock_dashboard(id=1)
+        mock_dashboard.slices = []
+        mock_dashboard.position_json = "{}"
+
+        mock_chart = _mock_chart(id=5, slice_name="New Chart")
+        mock_db_session.get.return_value = mock_chart
+
+        updated_dashboard = _mock_dashboard(id=1)
+        updated_dashboard.slices = [mock_chart]
+        mock_update_command.return_value.run.return_value = updated_dashboard
+
+        # side_effect: first call returns initial dashboard (validation),
+        # second call returns updated dashboard (re-fetch with eager loading)
+        mock_find_dashboard.side_effect = [mock_dashboard, updated_dashboard]
+
+        request = {"dashboard_id": 1, "chart_id": 5}
+
+        async with Client(mcp_server) as client:
+            result = await client.call_tool(
+                "add_chart_to_existing_dashboard", {"request": request}
+            )
+
+            assert result.structured_content["error"] is None
+            # DashboardDAO.find_by_id called twice: validation + re-fetch
+            assert mock_find_dashboard.call_count == 2
+
+    @patch("superset.commands.dashboard.update.UpdateDashboardCommand")
+    @patch("superset.daos.dashboard.DashboardDAO.find_by_id")
+    @patch("superset.db.session")
+    @pytest.mark.asyncio
+    async def test_add_chart_falls_back_on_refetch_failure(
+        self, mock_db_session, mock_find_dashboard, mock_update_command, mcp_server
+    ):
+        """add_chart_to_existing_dashboard falls back to original dashboard
+        if DashboardDAO.find_by_id returns None on re-fetch."""
+        mock_dashboard = _mock_dashboard(id=1)
+        mock_dashboard.slices = []
+        mock_dashboard.position_json = "{}"
+
+        mock_chart = _mock_chart(id=5, slice_name="New Chart")
+        mock_db_session.get.return_value = mock_chart
+
+        updated_dashboard = _mock_dashboard(id=1)
+        updated_dashboard.slices = [mock_chart]
+        mock_update_command.return_value.run.return_value = updated_dashboard
+
+        # side_effect: first call returns dashboard (validation),
+        # second call returns None (re-fetch fails, should fall back)
+        mock_find_dashboard.side_effect = [mock_dashboard, None]
+
+        request = {"dashboard_id": 1, "chart_id": 5}
+
+        async with Client(mcp_server) as client:
+            result = await client.call_tool(
+                "add_chart_to_existing_dashboard", {"request": request}
+            )
+
+            # Tool should still succeed using fallback dashboard
+            assert result.structured_content["error"] is None
diff --git a/tests/unit_tests/mcp_service/dashboard/tool/test_dashboard_tools.py b/tests/unit_tests/mcp_service/dashboard/tool/test_dashboard_tools.py
index fea9a05e3f1..e2af01c4e06 100644
--- a/tests/unit_tests/mcp_service/dashboard/tool/test_dashboard_tools.py
+++ b/tests/unit_tests/mcp_service/dashboard/tool/test_dashboard_tools.py
@@ -75,7 +75,6 @@ async def test_list_dashboards_basic(mock_list, mcp_server):
     dashboard.certified_by = None
     dashboard.certification_details = None
     dashboard.json_metadata = None
-    dashboard.position_json = None
     dashboard.is_managed_externally = False
     dashboard.external_url = None
     dashboard.uuid = "test-dashboard-uuid-1"
@@ -142,7 +141,6 @@ async def test_list_dashboards_with_filters(mock_list, mcp_server):
     dashboard.certified_by = None
     dashboard.certification_details = None
     dashboard.json_metadata = None
-    dashboard.position_json = None
     dashboard.is_managed_externally = False
     dashboard.external_url = None
     dashboard.uuid = None
@@ -236,7 +234,6 @@ async def test_list_dashboards_with_search(mock_list, mcp_server):
     dashboard.certified_by = None
     dashboard.certification_details = None
     dashboard.json_metadata = None
-    dashboard.position_json = None
     dashboard.is_managed_externally = False
     dashboard.external_url = None
     dashboard.uuid = None
@@ -303,7 +300,6 @@ async def test_get_dashboard_info_success(mock_info, mcp_server):
     dashboard.certified_by = None
     dashboard.certification_details = None
     dashboard.json_metadata = None
-    dashboard.position_json = None
     dashboard.published = True
     dashboard.is_managed_externally = False
     dashboard.external_url = None
@@ -383,7 +379,6 @@ async def test_get_dashboard_info_by_uuid(mock_find_object, mcp_server):
     dashboard.certified_by = None
     dashboard.certification_details = None
     dashboard.json_metadata = "{}"
-    dashboard.position_json = "{}"
     dashboard.published = True
     dashboard.is_managed_externally = False
     dashboard.external_url = None
@@ -423,7 +418,6 @@ async def test_get_dashboard_info_by_slug(mock_find_object, mcp_server):
     dashboard.certified_by = None
     dashboard.certification_details = None
     dashboard.json_metadata = "{}"
-    dashboard.position_json = "{}"
     dashboard.published = True
     dashboard.is_managed_externally = False
     dashboard.external_url = None
@@ -475,7 +469,6 @@ async def test_list_dashboards_custom_uuid_slug_columns(mock_list, mcp_server):
     dashboard.certified_by = None
     dashboard.certification_details = None
     dashboard.json_metadata = None
-    dashboard.position_json = None
     dashboard.is_managed_externally = False
     dashboard.external_url = None
     dashboard.thumbnail_url = None
@@ -529,21 +522,23 @@ class TestDashboardDefaultColumnFiltering:
             DASHBOARD_DEFAULT_COLUMNS,
         )
 
-        # Should have exactly 5 minimal columns
-        assert len(DASHBOARD_DEFAULT_COLUMNS) == 5
         assert set(DASHBOARD_DEFAULT_COLUMNS) == {
             "id",
             "dashboard_title",
             "slug",
+            "description",
+            "certified_by",
+            "certification_details",
             "url",
+            "changed_on",
             "changed_on_humanized",
         }
 
         # Heavy columns should NOT be in defaults
         assert "charts" not in DASHBOARD_DEFAULT_COLUMNS
         assert "published" not in DASHBOARD_DEFAULT_COLUMNS
-        assert "json_metadata" not in DASHBOARD_DEFAULT_COLUMNS
-        assert "position_json" not in DASHBOARD_DEFAULT_COLUMNS
+        assert "native_filters" not in DASHBOARD_DEFAULT_COLUMNS
+        assert "cross_filters_enabled" not in DASHBOARD_DEFAULT_COLUMNS
         assert "uuid" not in DASHBOARD_DEFAULT_COLUMNS
 
     def test_empty_select_columns_default(self):
@@ -587,7 +582,6 @@ class TestDashboardDefaultColumnFiltering:
         dashboard.certified_by = None
         dashboard.certification_details = None
         dashboard.json_metadata = None
-        dashboard.position_json = None
         dashboard.is_managed_externally = False
         dashboard.external_url = None
         dashboard.thumbnail_url = None
@@ -610,8 +604,8 @@ class TestDashboardDefaultColumnFiltering:
             assert "changed_on_humanized" in data["columns_requested"]
 
             # Verify heavy columns are NOT in columns_loaded by default
-            assert "json_metadata" not in data["columns_loaded"]
-            assert "position_json" not in data["columns_loaded"]
+            assert "native_filters" not in data["columns_loaded"]
+            assert "cross_filters_enabled" not in data["columns_loaded"]
 
 
 class TestDashboardSortableColumns:
diff --git a/tests/unit_tests/mcp_service/database/__init__.py b/tests/unit_tests/mcp_service/database/__init__.py
new file mode 100644
index 00000000000..13a83393a91
--- /dev/null
+++ b/tests/unit_tests/mcp_service/database/__init__.py
@@ -0,0 +1,16 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
diff --git a/tests/unit_tests/mcp_service/database/tool/__init__.py b/tests/unit_tests/mcp_service/database/tool/__init__.py
new file mode 100644
index 00000000000..13a83393a91
--- /dev/null
+++ b/tests/unit_tests/mcp_service/database/tool/__init__.py
@@ -0,0 +1,16 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
diff --git a/tests/unit_tests/mcp_service/database/tool/test_database_tools.py b/tests/unit_tests/mcp_service/database/tool/test_database_tools.py
new file mode 100644
index 00000000000..78ae81c9962
--- /dev/null
+++ b/tests/unit_tests/mcp_service/database/tool/test_database_tools.py
@@ -0,0 +1,206 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+
+import logging
+from unittest.mock import MagicMock, patch
+
+import pytest
+from fastmcp import Client
+from fastmcp.exceptions import ToolError
+
+from superset.mcp_service.app import mcp
+from superset.mcp_service.database.schemas import ListDatabasesRequest
+from superset.utils import json
+
+logging.basicConfig(level=logging.DEBUG)
+logger = logging.getLogger(__name__)
+
+
+def create_mock_database(
+    database_id: int = 1,
+    database_name: str = "examples",
+    backend: str = "postgresql",
+    expose_in_sqllab: bool = True,
+    allow_ctas: bool = False,
+    allow_cvas: bool = False,
+    allow_dml: bool = False,
+    allow_file_upload: bool = False,
+    allow_run_async: bool = False,
+) -> MagicMock:
+    """Factory function to create mock database objects with sensible defaults."""
+    database = MagicMock()
+    database.id = database_id
+    database.database_name = database_name
+    database.backend = backend
+    database.verbose_name = None
+    database.expose_in_sqllab = expose_in_sqllab
+    database.allow_ctas = allow_ctas
+    database.allow_cvas = allow_cvas
+    database.allow_dml = allow_dml
+    database.allow_file_upload = allow_file_upload
+    database.allow_run_async = allow_run_async
+    database.cache_timeout = None
+    database.configuration_method = "sqlalchemy_form"
+    database.force_ctas_schema = None
+    database.impersonate_user = False
+    database.is_managed_externally = False
+    database.external_url = None
+    database.extra = '{"metadata_params": {}, "engine_params": {}}'
+    database.uuid = f"test-database-uuid-{database_id}"
+    database.changed_by_name = "admin"
+    database.changed_by = None
+    database.changed_on = None
+    database.created_by_name = "admin"
+    database.created_by = None
+    database.created_on = None
+    database.owners = []
+    return database
+
+
+@pytest.fixture
+def mcp_server():
+    return mcp
+
+
+@pytest.fixture(autouse=True)
+def mock_auth():
+    """Mock authentication for all tests."""
+    from unittest.mock import Mock, patch
+
+    with patch("superset.mcp_service.auth.get_user_from_request") as mock_get_user:
+        mock_user = Mock()
+        mock_user.id = 1
+        mock_user.username = "admin"
+        mock_get_user.return_value = mock_user
+        yield mock_get_user
+
+
+@patch("superset.daos.database.DatabaseDAO.list")
+@pytest.mark.asyncio
+async def test_list_databases_basic(mock_list, mcp_server):
+    """Test basic database listing functionality."""
+    database = create_mock_database()
+    database._mapping = {
+        "id": database.id,
+        "database_name": database.database_name,
+        "backend": database.backend,
+        "expose_in_sqllab": database.expose_in_sqllab,
+    }
+    mock_list.return_value = ([database], 1)
+    async with Client(mcp_server) as client:
+        request = ListDatabasesRequest(page=1, page_size=10)
+        result = await client.call_tool(
+            "list_databases", {"request": request.model_dump()}
+        )
+        assert result.content is not None
+        data = json.loads(result.content[0].text)
+        assert data["databases"] is not None
+        assert len(data["databases"]) == 1
+        assert data["databases"][0]["id"] == 1
+        assert data["databases"][0]["database_name"] == "examples"
+
+
+@patch("superset.daos.database.DatabaseDAO.list")
+@pytest.mark.asyncio
+async def test_list_databases_with_search(mock_list, mcp_server):
+    """Test database listing with search functionality."""
+    database = create_mock_database(database_name="production_db")
+    database._mapping = {
+        "id": database.id,
+        "database_name": database.database_name,
+    }
+    mock_list.return_value = ([database], 1)
+    async with Client(mcp_server) as client:
+        request = ListDatabasesRequest(page=1, page_size=10, search="production")
+        result = await client.call_tool(
+            "list_databases", {"request": request.model_dump()}
+        )
+        assert result.content is not None
+        data = json.loads(result.content[0].text)
+        assert data["databases"] is not None
+        assert len(data["databases"]) == 1
+        assert data["databases"][0]["database_name"] == "production_db"
+
+
+@patch("superset.daos.database.DatabaseDAO.list")
+@pytest.mark.asyncio
+async def test_list_databases_with_filters(mock_list, mcp_server):
+    """Test database listing with filters."""
+    database = create_mock_database(expose_in_sqllab=True)
+    database._mapping = {
+        "id": database.id,
+        "database_name": database.database_name,
+        "expose_in_sqllab": database.expose_in_sqllab,
+    }
+    mock_list.return_value = ([database], 1)
+    async with Client(mcp_server) as client:
+        request = ListDatabasesRequest(
+            page=1,
+            page_size=10,
+            filters=[
+                {"col": "expose_in_sqllab", "opr": "eq", "value": True},
+            ],
+        )
+        result = await client.call_tool(
+            "list_databases", {"request": request.model_dump()}
+        )
+        assert result.content is not None
+        data = json.loads(result.content[0].text)
+        assert data["databases"] is not None
+        assert len(data["databases"]) == 1
+
+
+@patch("superset.daos.database.DatabaseDAO.list")
+@pytest.mark.asyncio
+async def test_list_databases_api_error(mock_list, mcp_server):
+    """Test error handling when DAO raises an exception."""
+    mock_list.side_effect = ToolError("Database error")
+    async with Client(mcp_server) as client:
+        request = ListDatabasesRequest(page=1, page_size=10)
+        with pytest.raises(ToolError) as excinfo:  # noqa: PT012
+            await client.call_tool("list_databases", {"request": request.model_dump()})
+        assert "Database error" in str(excinfo.value)
+
+
+@patch("superset.daos.database.DatabaseDAO.find_by_id")
+@pytest.mark.asyncio
+async def test_get_database_info_basic(mock_find, mcp_server):
+    """Test basic get database info functionality."""
+    database = create_mock_database()
+    mock_find.return_value = database
+    async with Client(mcp_server) as client:
+        result = await client.call_tool(
+            "get_database_info", {"request": {"identifier": 1}}
+        )
+        assert result.content is not None
+        data = json.loads(result.content[0].text)
+        assert data["id"] == 1
+        assert data["database_name"] == "examples"
+        assert data["backend"] == "postgresql"
+
+
+@patch("superset.daos.database.DatabaseDAO.find_by_id")
+@pytest.mark.asyncio
+async def test_get_database_info_not_found(mock_find, mcp_server):
+    """Test get database info when database does not exist."""
+    mock_find.return_value = None
+    async with Client(mcp_server) as client:
+        result = await client.call_tool(
+            "get_database_info", {"request": {"identifier": 999}}
+        )
+        assert result.data["error_type"] == "not_found"
diff --git a/tests/unit_tests/mcp_service/dataset/tool/test_dataset_tools.py b/tests/unit_tests/mcp_service/dataset/tool/test_dataset_tools.py
index 48742973863..c64801df22f 100644
--- a/tests/unit_tests/mcp_service/dataset/tool/test_dataset_tools.py
+++ b/tests/unit_tests/mcp_service/dataset/tool/test_dataset_tools.py
@@ -25,7 +25,10 @@ from fastmcp import Client
 from fastmcp.exceptions import ToolError
 
 from superset.mcp_service.app import mcp
-from superset.mcp_service.dataset.schemas import ListDatasetsRequest
+from superset.mcp_service.dataset.schemas import (
+    CreateVirtualDatasetRequest,
+    ListDatasetsRequest,
+)
 from superset.utils import json
 
 logging.basicConfig(level=logging.DEBUG)
@@ -46,6 +49,8 @@ def create_mock_dataset(
     dataset.table_name = table_name
     dataset.schema = schema
     dataset.description = "desc"
+    dataset.certified_by = None
+    dataset.certification_details = None
     dataset.changed_by_name = "admin"
     dataset.changed_on = None
     dataset.changed_on_humanized = None
@@ -106,6 +111,8 @@ async def test_list_datasets_basic(mock_list, mcp_server):
     dataset.table_name = "Test DatasetInfo"
     dataset.schema = "main"
     dataset.description = "desc"
+    dataset.certified_by = None
+    dataset.certification_details = None
     dataset.changed_by_name = "admin"
     dataset.changed_on = None
     dataset.changed_on_humanized = None
@@ -212,6 +219,8 @@ async def test_list_datasets_custom_uuid_columns(mock_list, mcp_server):
     dataset.table_name = "custom_dataset"
     dataset.schema = "public"
     dataset.description = "desc"
+    dataset.certified_by = None
+    dataset.certification_details = None
     dataset.changed_by_name = "admin"
     dataset.changed_on = None
     dataset.changed_on_humanized = None
@@ -290,6 +299,8 @@ async def test_list_datasets_with_filters(mock_list, mcp_server):
     dataset.table_name = "Filtered Dataset"
     dataset.schema = "main"
     dataset.description = "desc"
+    dataset.certified_by = None
+    dataset.certification_details = None
     dataset.changed_by_name = "admin"
     dataset.changed_on = None
     dataset.changed_on_humanized = None
@@ -391,6 +402,8 @@ async def test_list_datasets_with_string_filters(mock_list, mcp_server):
     dataset.table_name = "String Filter Dataset"
     dataset.schema = "main"
     dataset.description = "desc"
+    dataset.certified_by = None
+    dataset.certification_details = None
     dataset.changed_by_name = "admin"
     dataset.changed_on = None
     dataset.changed_on_humanized = None
@@ -468,6 +481,8 @@ async def test_list_datasets_with_search(mock_list, mcp_server):
     dataset.database_name = "test_db"
     dataset.database = None
     dataset.description = "A test dataset"
+    dataset.certified_by = None
+    dataset.certification_details = None
     dataset.changed_by = "admin"
     dataset.changed_by_name = "admin"
     dataset.changed_on = None
@@ -559,6 +574,8 @@ async def test_list_datasets_simple_with_search(mock_list, mcp_server):
     dataset.database_name = "analytics_db"
     dataset.database = None
     dataset.description = "Another test dataset"
+    dataset.certified_by = None
+    dataset.certification_details = None
     dataset.changed_by = "user"
     dataset.changed_by_name = "user"
     dataset.changed_on = None
@@ -648,6 +665,8 @@ async def test_list_datasets_simple_basic(mock_list, mcp_server):
     dataset.table_name = "Test DatasetInfo"
     dataset.schema = "main"
     dataset.description = "desc"
+    dataset.certified_by = None
+    dataset.certification_details = None
     dataset.changed_by_name = "admin"
     dataset.changed_on = None
     dataset.changed_on_humanized = None
@@ -743,6 +762,8 @@ async def test_list_datasets_simple_with_filters(mock_list, mcp_server):
     dataset.table_name = "Sales Dataset"
     dataset.schema = "main"
     dataset.description = "desc"
+    dataset.certified_by = None
+    dataset.certification_details = None
     dataset.changed_by_name = "admin"
     dataset.changed_on = None
     dataset.changed_on_humanized = None
@@ -853,6 +874,8 @@ async def test_get_dataset_info_success(mock_info, mcp_server):
     dataset.table_name = "Test DatasetInfo"
     dataset.schema = "main"
     dataset.description = "desc"
+    dataset.certified_by = None
+    dataset.certification_details = None
     dataset.changed_by_name = "admin"
     dataset.changed_on = None
     dataset.changed_on_humanized = None
@@ -990,6 +1013,8 @@ async def test_get_dataset_info_includes_columns_and_metrics(mock_info, mcp_serv
     dataset.database = MagicMock()
     dataset.database.database_name = "examples"
     dataset.description = "desc"
+    dataset.certified_by = None
+    dataset.certification_details = None
     dataset.changed_by_name = "admin"
     dataset.changed_on = None
     dataset.changed_on_humanized = None
@@ -1080,6 +1105,8 @@ async def test_list_datasets_includes_columns_and_metrics(mock_list, mcp_server)
     dataset.database = MagicMock()
     dataset.database.database_name = "examples"
     dataset.description = "desc"
+    dataset.certified_by = None
+    dataset.certification_details = None
     dataset.changed_by_name = "admin"
     dataset.changed_on = None
     dataset.changed_on_humanized = None
@@ -1154,6 +1181,8 @@ async def test_get_dataset_info_by_uuid(mock_find_object, mcp_server):
     dataset.table_name = "Test Dataset UUID"
     dataset.schema = "main"
     dataset.description = "desc"
+    dataset.certified_by = None
+    dataset.certification_details = None
     dataset.changed_by_name = "admin"
     dataset.changed_on = None
     dataset.changed_on_humanized = None
@@ -1190,6 +1219,36 @@ async def test_get_dataset_info_by_uuid(mock_find_object, mcp_server):
         assert data["table_name"] == "Test Dataset UUID"
 
 
+class TestDatasetCertificationSerialization:
+    """Test certification fields flow through dataset serialization."""
+
+    def test_serialize_dataset_with_certification_fields(self):
+        """Serializes non-None certification values."""
+        from superset.mcp_service.dataset.schemas import serialize_dataset_object
+
+        dataset = create_mock_dataset()
+        dataset.certified_by = "Analytics Engineering"
+        dataset.certification_details = "Production-ready, SLA-backed"
+
+        result = serialize_dataset_object(dataset)
+
+        assert result is not None
+        assert result.certified_by == "Analytics Engineering"
+        assert result.certification_details == "Production-ready, SLA-backed"
+
+    def test_serialize_dataset_with_none_certification(self):
+        """serialize_dataset_object handles None certification fields."""
+        from superset.mcp_service.dataset.schemas import serialize_dataset_object
+
+        dataset = create_mock_dataset()
+
+        result = serialize_dataset_object(dataset)
+
+        assert result is not None
+        assert result.certified_by is None
+        assert result.certification_details is None
+
+
 class TestDatasetDefaultColumnFiltering:
     """Test default column filtering behavior for datasets."""
 
@@ -1197,12 +1256,14 @@ class TestDatasetDefaultColumnFiltering:
         """Test that minimal default columns are properly defined."""
         from superset.mcp_service.common.schema_discovery import DATASET_DEFAULT_COLUMNS
 
-        # Should have exactly 4 minimal columns
-        assert len(DATASET_DEFAULT_COLUMNS) == 4
         assert set(DATASET_DEFAULT_COLUMNS) == {
             "id",
             "table_name",
             "schema",
+            "description",
+            "certified_by",
+            "certification_details",
+            "changed_on",
             "changed_on_humanized",
         }
         assert "uuid" not in DATASET_DEFAULT_COLUMNS
@@ -1210,7 +1271,6 @@ class TestDatasetDefaultColumnFiltering:
         # Heavy columns should NOT be in defaults
         assert "columns" not in DATASET_DEFAULT_COLUMNS
         assert "metrics" not in DATASET_DEFAULT_COLUMNS
-        assert "description" not in DATASET_DEFAULT_COLUMNS
         assert "database_name" not in DATASET_DEFAULT_COLUMNS
 
     @patch("superset.daos.dataset.DatasetDAO.list")
@@ -1236,6 +1296,12 @@ class TestDatasetDefaultColumnFiltering:
                 "id",
                 "table_name",
                 "schema",
+                "database_name",
+                "database",
+                "description",
+                "certified_by",
+                "certification_details",
+                "changed_on",
                 "changed_on_humanized",
             }
 
@@ -1319,7 +1385,21 @@ class TestDatasetDefaultColumnFiltering:
             dataset_item = data["datasets"][0]
 
             # Verify ONLY default columns are present in the response item
-            expected_keys = {"id", "table_name", "schema", "changed_on_humanized"}
+            # Note: "database" is in DEFAULT_DATASET_COLUMNS to trigger eager
+            # loading of the relationship, but it's not a field on DatasetInfo
+            # so it won't appear in the serialized output. "database_name" IS
+            # a field and will appear.
+            expected_keys = {
+                "id",
+                "table_name",
+                "schema",
+                "database_name",
+                "description",
+                "certified_by",
+                "certification_details",
+                "changed_on",
+                "changed_on_humanized",
+            }
             actual_keys = set(dataset_item.keys())
 
             # The response should only contain the default columns, NOT all columns
@@ -1332,10 +1412,7 @@ class TestDatasetDefaultColumnFiltering:
 
             # Verify non-default columns are NOT present (not even with null values)
             non_default_columns = [
-                "description",
-                "database_name",
                 "changed_by",
-                "changed_on",
                 "columns",
                 "metrics",
             ]
@@ -1432,3 +1509,291 @@ class TestDatasetSortableColumns:
             data = json.loads(result.content[0].text)
             assert data["count"] == 0
             assert data["datasets"] == []
+
+
+# ---------------------------------------------------------------------------
+# create_virtual_dataset tests
+# ---------------------------------------------------------------------------
+
+
+def _make_mock_db(database_name: str = "examples") -> MagicMock:
+    """Create a mock database object with a configurable database name."""
+    db = MagicMock()
+    db.database_name = database_name
+    return db
+
+
+def _make_mock_virtual_dataset(
+    id: int = 21,
+    table_name: str = "Customer Revenue",
+    column_names: list[str] | None = None,
+) -> MagicMock:
+    """Create a mock virtual dataset object with configurable columns."""
+    if column_names is None:
+        column_names = ["name", "revenue"]
+    dataset = MagicMock()
+    dataset.id = id
+    dataset.table_name = table_name
+    dataset.columns = [MagicMock(column_name=c) for c in column_names]
+    return dataset
+
+
+# --- Schema tests ---
+
+
+def test_create_virtual_dataset_request_valid() -> None:
+    req = CreateVirtualDatasetRequest(
+        database_id=1,
+        sql="SELECT a.name, COUNT(*) FROM a JOIN b ON a.id = b.a_id GROUP BY a.name",
+        dataset_name="Customer Revenue",
+    )
+    assert req.database_id == 1
+    assert req.dataset_name == "Customer Revenue"
+    assert req.schema_name is None
+
+
+def test_create_virtual_dataset_request_empty_sql_fails() -> None:
+    from pydantic import ValidationError
+
+    with pytest.raises(ValidationError, match="sql must not be empty"):
+        CreateVirtualDatasetRequest(database_id=1, sql="   ", dataset_name="Test")
+
+
+def test_create_virtual_dataset_request_empty_name_fails() -> None:
+    from pydantic import ValidationError
+
+    with pytest.raises(ValidationError, match="dataset_name must not be empty"):
+        CreateVirtualDatasetRequest(database_id=1, sql="SELECT 1", dataset_name="   ")
+
+
+def test_create_virtual_dataset_request_name_too_long() -> None:
+    from pydantic import ValidationError
+
+    with pytest.raises(ValidationError):
+        CreateVirtualDatasetRequest(
+            database_id=1, sql="SELECT 1", dataset_name="a" * 251
+        )
+
+
+def test_create_virtual_dataset_request_optional_fields() -> None:
+    req = CreateVirtualDatasetRequest(
+        database_id=1,
+        sql="SELECT 1",
+        dataset_name="Test",
+        schema_name="public",
+        catalog="main",
+        description="A virtual dataset",
+    )
+    assert req.schema_name == "public"
+    assert req.catalog == "main"
+    assert req.description == "A virtual dataset"
+
+
+# --- Tool logic tests ---
+
+
+@pytest.mark.asyncio
+async def test_create_virtual_dataset_success(mcp_server: object) -> None:
+    """Happy path: dataset created, columns and URL returned."""
+    mock_dataset = _make_mock_virtual_dataset(
+        id=21, table_name="Customer Revenue", column_names=["name", "revenue"]
+    )
+    mock_command = MagicMock()
+    mock_command.run.return_value = mock_dataset
+
+    with (
+        patch(
+            "superset.commands.dataset.create.CreateDatasetCommand",
+            return_value=mock_command,
+        ),
+        patch(
+            "superset.mcp_service.utils.url_utils.get_superset_base_url",
+            return_value="http://localhost:8088",
+        ),
+    ):
+        async with Client(mcp_server) as client:
+            sql = (
+                "SELECT a.name, SUM(b.revenue) FROM a"
+                " JOIN b ON a.id = b.a_id GROUP BY a.name"
+            )
+            request = CreateVirtualDatasetRequest(
+                database_id=1,
+                sql=sql,
+                dataset_name="Customer Revenue",
+            )
+            result = await client.call_tool(
+                "create_virtual_dataset", {"request": request.model_dump()}
+            )
+            data = json.loads(result.content[0].text)
+
+    assert data["id"] == 21
+    assert data["dataset_name"] == "Customer Revenue"
+    assert data["columns"] == ["name", "revenue"]
+    assert "datasource_type=table" in data["url"]
+    assert "datasource_id=21" in data["url"]
+    assert data["error"] is None
+
+
+@pytest.mark.asyncio
+async def test_create_virtual_dataset_db_not_found(mcp_server: object) -> None:
+    """When the database ID does not exist, CreateDatasetCommand raises
+    DatasetInvalidError containing DatabaseNotFoundValidationError."""
+    from superset.commands.dataset.exceptions import (
+        DatabaseNotFoundValidationError,
+        DatasetInvalidError,
+    )
+
+    invalid_exc = DatasetInvalidError()
+    invalid_exc.append(DatabaseNotFoundValidationError())
+    mock_command = MagicMock()
+    mock_command.run.side_effect = invalid_exc
+
+    with patch(
+        "superset.commands.dataset.create.CreateDatasetCommand",
+        return_value=mock_command,
+    ):
+        async with Client(mcp_server) as client:
+            request = CreateVirtualDatasetRequest(
+                database_id=999, sql="SELECT 1", dataset_name="Test"
+            )
+            result = await client.call_tool(
+                "create_virtual_dataset", {"request": request.model_dump()}
+            )
+            data = json.loads(result.content[0].text)
+
+    assert data["id"] is None
+    assert data["columns"] == []
+    assert data["error"] is not None
+
+
+@pytest.mark.asyncio
+async def test_create_virtual_dataset_invalid_error(mcp_server: object) -> None:
+    """DatasetInvalidError is caught and returned as an error response."""
+    from marshmallow.exceptions import ValidationError as MarshmallowValidationError
+
+    from superset.commands.dataset.exceptions import DatasetInvalidError
+
+    invalid_exc = DatasetInvalidError()
+    invalid_exc.append(
+        MarshmallowValidationError(
+            {"table_name": ["Dataset with this name already exists"]}
+        )
+    )
+    mock_command = MagicMock()
+    mock_command.run.side_effect = invalid_exc
+
+    with patch(
+        "superset.commands.dataset.create.CreateDatasetCommand",
+        return_value=mock_command,
+    ):
+        async with Client(mcp_server) as client:
+            request = CreateVirtualDatasetRequest(
+                database_id=1, sql="SELECT 1", dataset_name="Test"
+            )
+            result = await client.call_tool(
+                "create_virtual_dataset", {"request": request.model_dump()}
+            )
+            data = json.loads(result.content[0].text)
+
+    assert data["id"] is None
+    assert data["columns"] == []
+    assert data["error"] is not None
+
+
+@pytest.mark.asyncio
+async def test_create_virtual_dataset_create_failed(mcp_server: object) -> None:
+    """DatasetCreateFailedError is caught and returned as an error response."""
+    from superset.commands.dataset.exceptions import DatasetCreateFailedError
+
+    mock_command = MagicMock()
+    mock_command.run.side_effect = DatasetCreateFailedError()
+
+    with patch(
+        "superset.commands.dataset.create.CreateDatasetCommand",
+        return_value=mock_command,
+    ):
+        async with Client(mcp_server) as client:
+            request = CreateVirtualDatasetRequest(
+                database_id=1, sql="SELECT 1", dataset_name="Test"
+            )
+            result = await client.call_tool(
+                "create_virtual_dataset", {"request": request.model_dump()}
+            )
+            data = json.loads(result.content[0].text)
+
+    assert data["id"] is None
+    assert data["columns"] == []
+    assert data["error"] is not None
+    assert "Failed to create dataset" in data["error"]
+
+
+@pytest.mark.asyncio
+async def test_create_virtual_dataset_permission_denied(mcp_server: object) -> None:
+    """SQL access denied surfaces as DatasetInvalidError with id=None."""
+    from superset.commands.dataset.exceptions import (
+        DatasetDataAccessIsNotAllowed,
+        DatasetInvalidError,
+    )
+
+    invalid_exc = DatasetInvalidError()
+    invalid_exc.append(DatasetDataAccessIsNotAllowed("Access denied to schema public"))
+    mock_command = MagicMock()
+    mock_command.run.side_effect = invalid_exc
+
+    with patch(
+        "superset.commands.dataset.create.CreateDatasetCommand",
+        return_value=mock_command,
+    ):
+        async with Client(mcp_server) as client:
+            request = CreateVirtualDatasetRequest(
+                database_id=1,
+                sql="SELECT * FROM sensitive_table",
+                dataset_name="Restricted",
+            )
+            result = await client.call_tool(
+                "create_virtual_dataset", {"request": request.model_dump()}
+            )
+            data = json.loads(result.content[0].text)
+
+    assert data["id"] is None
+    assert data["columns"] == []
+    assert data["error"] is not None
+
+
+@pytest.mark.asyncio
+async def test_create_virtual_dataset_optional_fields_forwarded(
+    mcp_server: object,
+) -> None:
+    """schema_name, catalog, and description are forwarded to CreateDatasetCommand."""
+    mock_dataset = _make_mock_virtual_dataset(column_names=["col1"])
+    mock_command_instance = MagicMock()
+    mock_command_instance.run.return_value = mock_dataset
+    mock_command_cls = MagicMock(return_value=mock_command_instance)
+
+    with (
+        patch(
+            "superset.commands.dataset.create.CreateDatasetCommand",
+            mock_command_cls,
+        ),
+        patch(
+            "superset.mcp_service.utils.url_utils.get_superset_base_url",
+            return_value="http://localhost:8088",
+        ),
+    ):
+        async with Client(mcp_server) as client:
+            request = CreateVirtualDatasetRequest(
+                database_id=1,
+                sql="SELECT col1 FROM t",
+                dataset_name="My Dataset",
+                schema="public",
+                catalog="main",
+                description="A test dataset",
+            )
+            await client.call_tool(
+                "create_virtual_dataset", {"request": request.model_dump()}
+            )
+
+    props = mock_command_cls.call_args[0][0]
+    assert props["schema"] == "public"
+    assert props["catalog"] == "main"
+    assert props["description"] == "A test dataset"
diff --git a/tests/unit_tests/mcp_service/explore/tool/test_generate_explore_link.py b/tests/unit_tests/mcp_service/explore/tool/test_generate_explore_link.py
index 0a8771e48ba..fb8aee539b0 100644
--- a/tests/unit_tests/mcp_service/explore/tool/test_generate_explore_link.py
+++ b/tests/unit_tests/mcp_service/explore/tool/test_generate_explore_link.py
@@ -312,15 +312,19 @@ class TestGenerateExploreLink:
             )
             mock_create_form_data.assert_called_once()
 
+    @patch("superset.daos.dataset.DatasetDAO.find_by_id")
     @patch(
         "superset.mcp_service.commands.create_form_data.MCPCreateFormDataCommand.run"
     )
     @pytest.mark.asyncio
     async def test_generate_explore_link_cache_failure_fallback(
-        self, mock_create_form_data, mcp_server
+        self, mock_create_form_data, mock_find_dataset, mcp_server
     ):
         """Test fallback when form_data cache creation fails."""
-        mock_create_form_data.side_effect = Exception("Cache storage failed")
+        mock_find_dataset.return_value = _mock_dataset(id=1)
+        from superset.commands.exceptions import CommandException
+
+        mock_create_form_data.side_effect = CommandException("Cache storage failed")
 
         config = TableChartConfig(
             chart_type="table", columns=[ColumnRef(name="test_col")]
@@ -339,16 +343,18 @@ class TestGenerateExploreLink:
                 == "http://localhost:9001/explore/?datasource_type=table&datasource_id=1"
             )
 
+    @patch("superset.daos.dataset.DatasetDAO.find_by_id")
     @patch(
         "superset.mcp_service.commands.create_form_data.MCPCreateFormDataCommand.run"
     )
     @pytest.mark.asyncio
     async def test_generate_explore_link_database_lock_fallback(
-        self, mock_create_form_data, mcp_server
+        self, mock_create_form_data, mock_find_dataset, mcp_server
     ):
         """Test fallback when database is locked."""
         from sqlalchemy.exc import OperationalError
 
+        mock_find_dataset.return_value = _mock_dataset(id=5)
         mock_create_form_data.side_effect = OperationalError(
             "database is locked", None, None
         )
@@ -584,15 +590,19 @@ class TestGenerateExploreLink:
             )
             mock_create_form_data.assert_called_once()
 
+    @patch("superset.daos.dataset.DatasetDAO.find_by_id")
     @patch(
         "superset.mcp_service.commands.create_form_data.MCPCreateFormDataCommand.run"
     )
     @pytest.mark.asyncio
     async def test_fallback_url_different_datasets(
-        self, mock_create_form_data, mcp_server
+        self, mock_create_form_data, mock_find_dataset, mcp_server
     ):
         """Test fallback URLs are correct for different dataset IDs."""
-        mock_create_form_data.side_effect = Exception(
+        mock_find_dataset.return_value = _mock_dataset(id=1)
+        from superset.commands.exceptions import CommandException
+
+        mock_create_form_data.side_effect = CommandException(
             "Always fail for fallback testing"
         )
 
@@ -612,9 +622,13 @@ class TestGenerateExploreLink:
                 assert result.data["error"] is None
                 assert result.data["url"] == expected_url
 
+    @patch("superset.daos.dataset.DatasetDAO.find_by_id")
     @pytest.mark.asyncio
-    async def test_generate_explore_link_tool_exception_handling(self, mcp_server):
+    async def test_generate_explore_link_tool_exception_handling(
+        self, mock_find_dataset, mcp_server
+    ):
         """Test that tool-level exceptions are properly handled and return error."""
+        mock_find_dataset.return_value = _mock_dataset(id=1)
         import sys
 
         # Get the actual module object from sys.modules (not via __init__.py which
@@ -708,6 +722,55 @@ class TestGenerateExploreLink:
             # Verify datasource field format: "{dataset_id}__table"
             assert result.data["form_data"].get("datasource") == "1__table"
 
+    @patch("superset.daos.dataset.DatasetDAO.find_by_id")
+    @pytest.mark.asyncio
+    async def test_generate_explore_link_nonexistent_dataset(
+        self, mock_find_dataset, mcp_server
+    ):
+        """Test nonexistent dataset_id returns error instead of broken URL."""
+        mock_find_dataset.return_value = None
+
+        config = TableChartConfig(
+            chart_type="table", columns=[ColumnRef(name="test_col")]
+        )
+        request = GenerateExploreLinkRequest(dataset_id="99999", config=config)
+
+        async with Client(mcp_server) as client:
+            result = await client.call_tool(
+                "generate_explore_link", {"request": request.model_dump()}
+            )
+
+            assert result.data["url"] == ""
+            assert result.data["form_data"] == {}
+            assert result.data["form_data_key"] is None
+            assert "Dataset not found: 99999" in result.data["error"]
+            assert "list_datasets" in result.data["error"]
+
+    @patch("superset.daos.dataset.DatasetDAO.find_by_id")
+    @pytest.mark.asyncio
+    async def test_generate_explore_link_nonexistent_uuid_dataset(
+        self, mock_find_dataset, mcp_server
+    ):
+        """Test that nonexistent UUID dataset_id returns structured error."""
+        mock_find_dataset.return_value = None
+
+        config = TableChartConfig(
+            chart_type="table", columns=[ColumnRef(name="test_col")]
+        )
+        request = GenerateExploreLinkRequest(
+            dataset_id="00000000-0000-0000-0000-000000000000", config=config
+        )
+
+        async with Client(mcp_server) as client:
+            result = await client.call_tool(
+                "generate_explore_link", {"request": request.model_dump()}
+            )
+
+            assert result.data["url"] == ""
+            assert result.data["form_data"] == {}
+            assert result.data["form_data_key"] is None
+            assert "Dataset not found" in result.data["error"]
+
 
 class TestGenerateExploreLinkColumnNormalization:
     """Tests that generate_explore_link normalizes column names.
@@ -816,8 +879,12 @@ class TestGenerateExploreLinkColumnNormalization:
             assert form_data["x_axis"] == "OrderDate"
             # filter subject normalized to match x-axis
             adhoc_filters = form_data.get("adhoc_filters", [])
-            assert len(adhoc_filters) == 1
+            # User filter + auto-added TEMPORAL_RANGE for temporal x-axis
+            assert len(adhoc_filters) == 2
             assert adhoc_filters[0]["subject"] == "OrderDate"
+            assert adhoc_filters[0]["operator"] == ">"
+            assert adhoc_filters[1]["operator"] == "TEMPORAL_RANGE"
+            assert adhoc_filters[1]["subject"] == "OrderDate"
 
     @patch(
         "superset.mcp_service.chart.validation.dataset_validator.DatasetValidator._get_dataset_context"
diff --git a/tests/unit_tests/mcp_service/sql_lab/tool/test_execute_sql.py b/tests/unit_tests/mcp_service/sql_lab/tool/test_execute_sql.py
index 764e1bf2cee..e1d3dee8e39 100644
--- a/tests/unit_tests/mcp_service/sql_lab/tool/test_execute_sql.py
+++ b/tests/unit_tests/mcp_service/sql_lab/tool/test_execute_sql.py
@@ -23,6 +23,7 @@ and response conversion logic.
 """
 
 import logging
+from decimal import Decimal
 from typing import Any
 from unittest.mock import MagicMock, Mock, patch
 
@@ -33,6 +34,7 @@ from fastmcp.exceptions import ToolError
 from superset_core.queries.types import QueryResult, QueryStatus, StatementResult
 
 from superset.mcp_service.app import mcp
+from superset.mcp_service.sql_lab.schemas import ColumnInfo
 
 logging.basicConfig(level=logging.DEBUG)
 logger = logging.getLogger(__name__)
@@ -236,7 +238,7 @@ class TestExecuteSql:
         mock_security_manager,  # noqa: PT019
         mcp_server,
     ):
-        """Test error when database is not found."""
+        """Test graceful error when database is not found."""
         # mock_security_manager is patched but not used (error happens first)
         del mock_security_manager  # Silence unused variable warning
         mock_db.session.query.return_value.filter_by.return_value.first.return_value = (
@@ -250,8 +252,10 @@ class TestExecuteSql:
         }
 
         async with Client(mcp_server) as client:
-            with pytest.raises(ToolError, match="Database with ID 999 not found"):
-                await client.call_tool("execute_sql", {"request": request})
+            result = await client.call_tool("execute_sql", {"request": request})
+            data = result.structured_content
+            assert data["success"] is False
+            assert "Database with ID 999 not found" in data["error"]
 
     @patch("superset.security_manager", new_callable=MagicMock)
     @patch("superset.db")
@@ -273,8 +277,10 @@ class TestExecuteSql:
         }
 
         async with Client(mcp_server) as client:
-            with pytest.raises(ToolError, match="Access denied to database"):
-                await client.call_tool("execute_sql", {"request": request})
+            result = await client.call_tool("execute_sql", {"request": request})
+            data = result.structured_content
+            assert data["success"] is False
+            assert "Access denied to database" in data["error"]
 
     @patch("superset.security_manager")
     @patch("superset.db")
@@ -883,3 +889,332 @@ class TestExecuteSql:
             options = call_args[0][1]
             assert options.cache is not None
             assert options.cache.force_refresh is True
+
+    @patch("superset.security_manager")
+    @patch("superset.db")
+    @pytest.mark.asyncio
+    async def test_execute_sql_bytes_in_dataframe(
+        self, mock_db, mock_security_manager, mcp_server
+    ):
+        """Test that bytes/memoryview values in DataFrame are sanitized for JSON.
+
+        Regression test: execute_sql fails with 'encoding without a string
+        argument' when queries return binary/bytea data.
+        """
+        mock_database = _mock_database()
+        df = pd.DataFrame(
+            [
+                {
+                    "id": 1,
+                    "name": "test",
+                    "utf8_data": b"hello world",
+                    "binary_data": b"\x00\x01\x02\xff",
+                },
+            ]
+        )
+        mock_database.execute.return_value = QueryResult(
+            status=QueryStatus.SUCCESS,
+            statements=[
+                StatementResult(
+                    original_sql="SELECT * FROM files",
+                    executed_sql="SELECT * FROM files",
+                    data=df,
+                    row_count=1,
+                    execution_time_ms=5.0,
+                )
+            ],
+            query_id=None,
+            total_execution_time_ms=5.0,
+            is_cached=False,
+        )
+        mock_db.session.query.return_value.filter_by.return_value.first.return_value = (
+            mock_database
+        )
+        mock_security_manager.can_access_database.return_value = True
+
+        request = {
+            "database_id": 1,
+            "sql": "SELECT * FROM files",
+            "limit": 10,
+        }
+
+        async with Client(mcp_server) as client:
+            result = await client.call_tool("execute_sql", {"request": request})
+
+            data = result.structured_content
+            assert data["success"] is True
+            assert data["row_count"] == 1
+            row = data["rows"][0]
+            # UTF-8 decodable bytes should become string
+            assert row["utf8_data"] == "hello world"
+            # Non-UTF-8 bytes should become hex
+            assert row["binary_data"] == "000102ff"
+
+    @patch("superset.security_manager")
+    @patch("superset.db")
+    @pytest.mark.asyncio
+    async def test_execute_sql_decimal_in_dataframe(
+        self, mock_db, mock_security_manager, mcp_server
+    ):
+        """Test that Decimal values in DataFrame are converted to float for JSON.
+
+        Regression test: execute_sql fails with 'encoding without a string
+        argument' when queries return Decimal types (common with SUM/AVG).
+        """
+        mock_database = _mock_database()
+        df = pd.DataFrame(
+            [
+                {
+                    "id": 1,
+                    "price": Decimal("19.99"),
+                    "total": Decimal("1234567.89"),
+                },
+            ]
+        )
+        mock_database.execute.return_value = QueryResult(
+            status=QueryStatus.SUCCESS,
+            statements=[
+                StatementResult(
+                    original_sql="SELECT * FROM orders",
+                    executed_sql="SELECT * FROM orders",
+                    data=df,
+                    row_count=1,
+                    execution_time_ms=5.0,
+                )
+            ],
+            query_id=None,
+            total_execution_time_ms=5.0,
+            is_cached=False,
+        )
+        mock_db.session.query.return_value.filter_by.return_value.first.return_value = (
+            mock_database
+        )
+        mock_security_manager.can_access_database.return_value = True
+
+        request = {
+            "database_id": 1,
+            "sql": "SELECT * FROM orders",
+            "limit": 10,
+        }
+
+        async with Client(mcp_server) as client:
+            result = await client.call_tool("execute_sql", {"request": request})
+
+            data = result.structured_content
+            assert data["success"] is True
+            assert data["row_count"] == 1
+            row = data["rows"][0]
+            assert row["price"] == 19.99
+            assert row["total"] == 1234567.89
+            assert isinstance(row["price"], float)
+
+
+class TestSanitizeRowValues:
+    """Unit tests for _sanitize_row_values helper function."""
+
+    def test_sanitize_utf8_bytes(self):
+        from superset.mcp_service.sql_lab.tool.execute_sql import _sanitize_row_values
+
+        rows = [{"data": b"hello"}]
+        _sanitize_row_values(rows)
+        assert rows[0]["data"] == "hello"
+
+    def test_sanitize_non_utf8_bytes(self):
+        from superset.mcp_service.sql_lab.tool.execute_sql import _sanitize_row_values
+
+        rows = [{"data": b"\x00\xff"}]
+        _sanitize_row_values(rows)
+        assert rows[0]["data"] == "00ff"
+
+    def test_sanitize_memoryview(self):
+        from superset.mcp_service.sql_lab.tool.execute_sql import _sanitize_row_values
+
+        rows = [{"data": memoryview(b"test")}]
+        _sanitize_row_values(rows)
+        assert rows[0]["data"] == "test"
+
+    def test_sanitize_decimal(self):
+        from superset.mcp_service.sql_lab.tool.execute_sql import _sanitize_row_values
+
+        rows = [{"price": Decimal("19.99"), "count": Decimal("42")}]
+        _sanitize_row_values(rows)
+        assert rows[0]["price"] == 19.99
+        assert isinstance(rows[0]["price"], float)
+        assert rows[0]["count"] == 42.0
+
+    def test_sanitize_custom_type_uses_str(self):
+        from superset.mcp_service.sql_lab.tool.execute_sql import _sanitize_row_values
+
+        class CustomType:
+            def __str__(self):
+                return "custom_value"
+
+        rows = [{"data": CustomType()}]
+        _sanitize_row_values(rows)
+        assert rows[0]["data"] == "custom_value"
+
+    def test_preserves_json_serializable_types(self):
+        from superset.mcp_service.sql_lab.tool.execute_sql import _sanitize_row_values
+
+        rows = [
+            {
+                "str_val": "hello",
+                "int_val": 42,
+                "float_val": 3.14,
+                "bool_val": True,
+                "none_val": None,
+                "list_val": [1, 2],
+                "dict_val": {"a": 1},
+            }
+        ]
+        original = [dict(row) for row in rows]
+        _sanitize_row_values(rows)
+        assert rows == original
+
+    def test_sanitize_empty_rows(self):
+        from superset.mcp_service.sql_lab.tool.execute_sql import _sanitize_row_values
+
+        rows: list[dict[str, Any]] = []
+        _sanitize_row_values(rows)
+        assert rows == []
+
+    def test_sanitize_mixed_types_in_single_row(self):
+        from superset.mcp_service.sql_lab.tool.execute_sql import _sanitize_row_values
+
+        rows = [
+            {
+                "id": 1,
+                "name": "test",
+                "price": Decimal("9.99"),
+                "blob": b"\x00\x01\x02\xff",
+            }
+        ]
+        _sanitize_row_values(rows)
+        assert rows[0]["id"] == 1
+        assert rows[0]["name"] == "test"
+        assert rows[0]["price"] == 9.99
+        assert rows[0]["blob"] == "000102ff"
+
+
+class TestExecuteSqlOAuth2:
+    """Tests for OAuth2 error handling in execute_sql."""
+
+    @patch("superset.security_manager")
+    @patch("superset.db")
+    @pytest.mark.asyncio
+    async def test_execute_sql_oauth2_redirect_error(
+        self, mock_db, mock_security_manager, mcp_server
+    ):
+        """Test that OAuth2RedirectError is caught and returns a clear message."""
+        from superset.exceptions import OAuth2RedirectError
+
+        mock_database = _mock_database()
+        mock_database.execute.side_effect = OAuth2RedirectError(
+            url="https://oauth.example.com/authorize",
+            tab_id="test-tab-id",
+            redirect_uri="https://superset.example.com/callback",
+        )
+        mock_db.session.query.return_value.filter_by.return_value.first.return_value = (
+            mock_database
+        )
+        mock_security_manager.can_access_database.return_value = True
+
+        request = {
+            "database_id": 1,
+            "sql": "SELECT 1",
+            "limit": 100,
+        }
+
+        async with Client(mcp_server) as client:
+            result = await client.call_tool("execute_sql", {"request": request})
+
+            data = result.structured_content
+            assert data["success"] is False
+            assert "OAuth" in data["error"]
+            assert "https://oauth.example.com/authorize" in data["error"]
+            assert data["error_type"] == "OAUTH2_REDIRECT"
+
+    @patch("superset.security_manager")
+    @patch("superset.db")
+    @pytest.mark.asyncio
+    async def test_execute_sql_oauth2_error(
+        self, mock_db, mock_security_manager, mcp_server
+    ):
+        """Test that OAuth2Error is caught and returns a clear message."""
+        from superset.exceptions import OAuth2Error
+
+        mock_database = _mock_database()
+        mock_database.execute.side_effect = OAuth2Error(
+            "Unable to determine the OAuth2 redirect URI."
+        )
+        mock_db.session.query.return_value.filter_by.return_value.first.return_value = (
+            mock_database
+        )
+        mock_security_manager.can_access_database.return_value = True
+
+        request = {
+            "database_id": 1,
+            "sql": "SELECT 1",
+            "limit": 100,
+        }
+
+        async with Client(mcp_server) as client:
+            result = await client.call_tool("execute_sql", {"request": request})
+
+            data = result.structured_content
+            assert data["success"] is False
+            assert "configuration" in data["error"]
+            assert data["error_type"] == "OAUTH2_REDIRECT_ERROR"
+
+
+class TestColumnInfoIsNullable:
+    """Tests for ColumnInfo.is_nullable coercion (Athena returns 'UNKNOWN')."""
+
+    def test_unknown_string_becomes_none(self):
+        assert (
+            ColumnInfo(name="c", type="int", is_nullable="UNKNOWN").is_nullable is None
+        )
+
+    def test_arbitrary_string_becomes_none(self):
+        assert ColumnInfo(name="c", type="int", is_nullable="maybe").is_nullable is None
+
+    def test_true_bool(self):
+        assert ColumnInfo(name="c", type="int", is_nullable=True).is_nullable is True
+
+    def test_false_bool(self):
+        assert ColumnInfo(name="c", type="int", is_nullable=False).is_nullable is False
+
+    def test_none(self):
+        assert ColumnInfo(name="c", type="int", is_nullable=None).is_nullable is None
+
+    def test_default_is_none(self):
+        assert ColumnInfo(name="c", type="int").is_nullable is None
+
+    def test_true_string(self):
+        assert ColumnInfo(name="c", type="int", is_nullable="true").is_nullable is True
+
+    def test_false_string(self):
+        assert (
+            ColumnInfo(name="c", type="int", is_nullable="false").is_nullable is False
+        )
+
+    def test_one_string(self):
+        assert ColumnInfo(name="c", type="int", is_nullable="1").is_nullable is True
+
+    def test_zero_string(self):
+        assert ColumnInfo(name="c", type="int", is_nullable="0").is_nullable is False
+
+    def test_integer_one(self):
+        assert ColumnInfo(name="c", type="int", is_nullable=1).is_nullable is True
+
+    def test_integer_zero(self):
+        assert ColumnInfo(name="c", type="int", is_nullable=0).is_nullable is False
+
+    def test_integer_two_becomes_none(self):
+        assert ColumnInfo(name="c", type="int", is_nullable=2).is_nullable is None
+
+    def test_model_validate_unknown(self):
+        col = ColumnInfo.model_validate(
+            {"name": "c", "type": "int", "is_nullable": "UNKNOWN"}
+        )
+        assert col.is_nullable is None
diff --git a/tests/unit_tests/mcp_service/sql_lab/tool/test_save_sql_query.py b/tests/unit_tests/mcp_service/sql_lab/tool/test_save_sql_query.py
index 469ca9fd43c..9bffcf66c88 100644
--- a/tests/unit_tests/mcp_service/sql_lab/tool/test_save_sql_query.py
+++ b/tests/unit_tests/mcp_service/sql_lab/tool/test_save_sql_query.py
@@ -228,9 +228,8 @@ class TestSaveSqlQueryToolLogic:
     from superset import db, etc.). We patch at the import source so that
     when the function runs, it picks up our mocks.
 
-    The @parse_request decorator injects ctx via get_context() and strips
-    __wrapped__, so we mock get_context and call the decorated function
-    directly (without unwrapping).
+    With passthrough decorators, we call the tool function directly
+    and pass a mock Context as the second argument.
     """
 
     @pytest.mark.anyio
@@ -248,6 +247,9 @@ class TestSaveSqlQueryToolLogic:
             mock_sq.id = 42
             mock_sq.label = "Revenue Query"
             mock_sq.sql = "SELECT SUM(revenue) FROM sales"
+            mock_sq.db_id = 1
+            mock_sq.schema = ""
+            mock_sq.description = ""
             mock_sq.catalog = None
 
             request = SaveSqlQueryRequest(
@@ -277,10 +279,6 @@ class TestSaveSqlQueryToolLogic:
             )
 
             with (
-                patch(
-                    "fastmcp.server.dependencies.get_context",
-                    return_value=mock_ctx,
-                ),
                 patch("superset.db", mock_db_session),
                 patch("superset.security_manager", mock_sm),
                 patch("superset.daos.query.SavedQueryDAO", mock_dao),
@@ -291,7 +289,7 @@ class TestSaveSqlQueryToolLogic:
                 patch("flask.g", mock_g),
                 patch.object(mod, "event_logger", mock_event_logger),
             ):
-                result = await mod.save_sql_query(request)
+                result = await mod.save_sql_query(request, mock_ctx)
 
                 assert result.id == 42
                 assert result.label == "Revenue Query"
@@ -333,10 +331,6 @@ class TestSaveSqlQueryToolLogic:
             )
 
             with (
-                patch(
-                    "fastmcp.server.dependencies.get_context",
-                    return_value=mock_ctx,
-                ),
                 patch("superset.db", mock_db_session),
                 patch("flask.g", mock_g),
                 patch.object(mod, "event_logger", mock_event_logger),
@@ -344,7 +338,7 @@ class TestSaveSqlQueryToolLogic:
                 from superset.exceptions import SupersetErrorException
 
                 with pytest.raises(SupersetErrorException, match="not found"):
-                    await mod.save_sql_query(request)
+                    await mod.save_sql_query(request, mock_ctx)
         finally:
             _restore_modules(saved)
 
@@ -382,10 +376,6 @@ class TestSaveSqlQueryToolLogic:
             )
 
             with (
-                patch(
-                    "fastmcp.server.dependencies.get_context",
-                    return_value=mock_ctx,
-                ),
                 patch("superset.db", mock_db_session),
                 patch("superset.security_manager", mock_sm),
                 patch("flask.g", mock_g),
@@ -394,7 +384,7 @@ class TestSaveSqlQueryToolLogic:
                 from superset.exceptions import SupersetSecurityException
 
                 with pytest.raises(SupersetSecurityException, match="Access denied"):
-                    await mod.save_sql_query(request)
+                    await mod.save_sql_query(request, mock_ctx)
         finally:
             _restore_modules(saved)
 
@@ -412,6 +402,9 @@ class TestSaveSqlQueryToolLogic:
             mock_sq.id = 10
             mock_sq.label = "Test"
             mock_sq.sql = "SELECT 1"
+            mock_sq.db_id = 1
+            mock_sq.schema = "public"
+            mock_sq.description = ""
             mock_sq.catalog = None
 
             request = SaveSqlQueryRequest(
@@ -443,10 +436,6 @@ class TestSaveSqlQueryToolLogic:
             )
 
             with (
-                patch(
-                    "fastmcp.server.dependencies.get_context",
-                    return_value=mock_ctx,
-                ),
                 patch("superset.db", mock_db_session),
                 patch("superset.security_manager", mock_sm),
                 patch("superset.daos.query.SavedQueryDAO", mock_dao),
@@ -457,7 +446,7 @@ class TestSaveSqlQueryToolLogic:
                 patch("flask.g", mock_g),
                 patch.object(mod, "event_logger", mock_event_logger),
             ):
-                result = await mod.save_sql_query(request)
+                result = await mod.save_sql_query(request, mock_ctx)
 
                 assert result.id == 10
                 call_attrs = mock_dao.create.call_args[1]["attributes"]
diff --git a/tests/unit_tests/mcp_service/system/tool/test_get_schema.py b/tests/unit_tests/mcp_service/system/tool/test_get_schema.py
index 1d4e857be33..20abfdd7999 100644
--- a/tests/unit_tests/mcp_service/system/tool/test_get_schema.py
+++ b/tests/unit_tests/mcp_service/system/tool/test_get_schema.py
@@ -153,16 +153,18 @@ class TestModelSchemaInfo:
 
     def test_chart_default_columns(self):
         """Test chart default columns include required minimal set."""
-        required_columns = {
+        assert set(CHART_DEFAULT_COLUMNS) == {
             "id",
             "slice_name",
             "viz_type",
+            "description",
+            "certified_by",
+            "certification_details",
             "url",
+            "changed_on",
             "changed_on_humanized",
         }
-        assert required_columns.issubset(set(CHART_DEFAULT_COLUMNS))
-        # These should NOT be in defaults
-        assert "description" not in CHART_DEFAULT_COLUMNS
+        # Heavy columns should NOT be in defaults
         assert "form_data" not in CHART_DEFAULT_COLUMNS
         assert "uuid" not in CHART_DEFAULT_COLUMNS
 
@@ -269,28 +271,6 @@ class TestGetSchemaToolViaClient:
             assert "dashboard_title" in info["sortable_columns"]
             assert "changed_on" in info["sortable_columns"]
 
-    @patch(
-        "superset.mcp_service.utils.schema_utils._is_parse_request_enabled",
-        return_value=True,
-    )
-    @patch("superset.daos.chart.ChartDAO.get_filterable_columns_and_operators")
-    @pytest.mark.asyncio
-    async def test_get_schema_with_json_string_request(
-        self, mock_filters, mock_parse_enabled, mcp_server
-    ):
-        """Test get_schema accepts JSON string request (Claude Code compatibility)."""
-        mock_filters.return_value = {"slice_name": ["eq"]}
-
-        async with Client(mcp_server) as client:
-            # Send request as JSON string (Claude Code bug workaround)
-            result = await client.call_tool(
-                "get_schema", {"request": '{"model_type": "chart"}'}
-            )
-
-            assert result.content is not None
-            data = json.loads(result.content[0].text)
-            assert data["schema_info"]["model_type"] == "chart"
-
     @patch("superset.daos.chart.ChartDAO.get_filterable_columns_and_operators")
     @pytest.mark.asyncio
     async def test_get_schema_select_columns_have_metadata(
@@ -313,12 +293,17 @@ class TestGetSchemaToolViaClient:
             assert id_col["type"] == "int"
             assert id_col["is_default"] is True
 
-            # Find a non-default column (description is on the model)
+            # description is now a default column
             desc_col = next(
                 (c for c in select_cols if c["name"] == "description"), None
             )
             assert desc_col is not None
-            assert desc_col["is_default"] is False
+            assert desc_col["is_default"] is True
+
+            # Find a non-default column (uuid is on the model but not default)
+            uuid_col = next((c for c in select_cols if c["name"] == "uuid"), None)
+            assert uuid_col is not None
+            assert uuid_col["is_default"] is False
 
 
 class TestGetSchemaEdgeCases:
diff --git a/tests/unit_tests/mcp_service/test_auth_api_key.py b/tests/unit_tests/mcp_service/test_auth_api_key.py
new file mode 100644
index 00000000000..e1bbf13bf43
--- /dev/null
+++ b/tests/unit_tests/mcp_service/test_auth_api_key.py
@@ -0,0 +1,222 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+"""Tests for API key authentication in get_user_from_request()."""
+
+from unittest.mock import MagicMock, patch
+
+import pytest
+from flask import g
+
+from superset.mcp_service.auth import get_user_from_request
+
+
+@pytest.fixture
+def mock_user():
+    user = MagicMock()
+    user.username = "api_key_user"
+    return user
+
+
+@pytest.fixture
+def _enable_api_keys(app):
+    """Enable FAB API key auth and clear MCP_DEV_USERNAME so the API key
+    path is exercised instead of falling through to the dev-user fallback."""
+    app.config["FAB_API_KEY_ENABLED"] = True
+    old_dev = app.config.pop("MCP_DEV_USERNAME", None)
+    yield
+    app.config.pop("FAB_API_KEY_ENABLED", None)
+    if old_dev is not None:
+        app.config["MCP_DEV_USERNAME"] = old_dev
+
+
+@pytest.fixture
+def _disable_api_keys(app):
+    app.config["FAB_API_KEY_ENABLED"] = False
+    old_dev = app.config.pop("MCP_DEV_USERNAME", None)
+    yield
+    app.config.pop("FAB_API_KEY_ENABLED", None)
+    if old_dev is not None:
+        app.config["MCP_DEV_USERNAME"] = old_dev
+
+
+# -- Valid API key -> user loaded --
+
+
+@pytest.mark.usefixtures("_enable_api_keys")
+def test_valid_api_key_returns_user(app, mock_user) -> None:
+    """A valid API key should authenticate and return the user."""
+    mock_sm = MagicMock()
+    mock_sm._extract_api_key_from_request.return_value = "sst_abc123"
+    mock_sm.validate_api_key.return_value = mock_user
+
+    with app.test_request_context(headers={"Authorization": "Bearer sst_abc123"}):
+        g.user = None
+        app.appbuilder = MagicMock()
+        app.appbuilder.sm = mock_sm
+
+        with patch(
+            "superset.mcp_service.auth.load_user_with_relationships",
+            return_value=mock_user,
+        ):
+            result = get_user_from_request()
+
+    assert result.username == "api_key_user"
+    mock_sm.validate_api_key.assert_called_once_with("sst_abc123")
+
+
+# -- Invalid API key -> PermissionError --
+
+
+@pytest.mark.usefixtures("_enable_api_keys")
+def test_invalid_api_key_raises(app) -> None:
+    """An invalid API key should raise PermissionError."""
+    mock_sm = MagicMock()
+    mock_sm._extract_api_key_from_request.return_value = "sst_bad_key"
+    mock_sm.validate_api_key.return_value = None
+
+    with app.test_request_context(headers={"Authorization": "Bearer sst_bad_key"}):
+        g.user = None
+        app.appbuilder = MagicMock()
+        app.appbuilder.sm = mock_sm
+
+        with pytest.raises(PermissionError, match="Invalid or expired API key"):
+            get_user_from_request()
+
+
+# -- API key disabled -> falls through to next auth method --
+
+
+@pytest.mark.usefixtures("_disable_api_keys")
+def test_api_key_disabled_skips_auth(app) -> None:
+    """When FAB_API_KEY_ENABLED is False, API key auth is skipped entirely."""
+    mock_sm = MagicMock()
+
+    with app.test_request_context(headers={"Authorization": "Bearer sst_abc123"}):
+        g.user = None
+        app.appbuilder = MagicMock()
+        app.appbuilder.sm = mock_sm
+
+        # Without API key auth or MCP_DEV_USERNAME, should raise ValueError
+        # about no authenticated user (not about invalid API key)
+        with pytest.raises(ValueError, match="No authenticated user found"):
+            get_user_from_request()
+
+    # SecurityManager API key methods should never be called
+    mock_sm._extract_api_key_from_request.assert_not_called()
+
+
+# -- No request context -> API key auth skipped --
+
+
+@pytest.mark.usefixtures("_enable_api_keys")
+def test_no_request_context_skips_api_key_auth(app) -> None:
+    """Without a request context, API key auth should be skipped
+    (e.g., during MCP tool discovery with only an app context)."""
+    mock_sm = MagicMock()
+
+    with app.app_context():
+        g.user = None
+        app.appbuilder = MagicMock()
+        app.appbuilder.sm = mock_sm
+
+        # Explicitly mock has_request_context to False because the test
+        # framework's app fixture may implicitly provide a request context.
+        with patch("superset.mcp_service.auth.has_request_context", return_value=False):
+            with pytest.raises(ValueError, match="No authenticated user found"):
+                get_user_from_request()
+
+    mock_sm._extract_api_key_from_request.assert_not_called()
+
+
+# -- g.user fallback when no higher-priority auth succeeds --
+
+
+@pytest.mark.usefixtures("_disable_api_keys")
+def test_g_user_fallback_when_no_jwt_or_api_key(app, mock_user) -> None:
+    """When no JWT or API key auth succeeds and MCP_DEV_USERNAME is not set,
+    g.user (set by external middleware) is used as fallback."""
+    with app.test_request_context():
+        g.user = mock_user
+
+        result = get_user_from_request()
+
+    assert result.username == "api_key_user"
+
+
+# -- FAB version without _extract_api_key_from_request --
+
+
+@pytest.mark.usefixtures("_enable_api_keys")
+def test_fab_without_extract_method_skips_gracefully(app) -> None:
+    """If FAB SecurityManager lacks _extract_api_key_from_request,
+    API key auth should be skipped with a debug log, not crash."""
+    mock_sm = MagicMock(spec=[])  # empty spec = no attributes
+
+    with app.test_request_context():
+        g.user = None
+        app.appbuilder = MagicMock()
+        app.appbuilder.sm = mock_sm
+
+        with pytest.raises(ValueError, match="No authenticated user found"):
+            get_user_from_request()
+
+
+# -- FAB version without validate_api_key --
+
+
+@pytest.mark.usefixtures("_enable_api_keys")
+def test_fab_without_validate_method_raises(app) -> None:
+    """If FAB has _extract_api_key_from_request but not validate_api_key,
+    should raise PermissionError about unavailable validation."""
+    mock_sm = MagicMock(spec=["_extract_api_key_from_request"])
+    mock_sm._extract_api_key_from_request.return_value = "sst_abc123"
+
+    with app.test_request_context(headers={"Authorization": "Bearer sst_abc123"}):
+        g.user = None
+        app.appbuilder = MagicMock()
+        app.appbuilder.sm = mock_sm
+
+        with pytest.raises(
+            PermissionError, match="API key validation is not available"
+        ):
+            get_user_from_request()
+
+
+# -- Relationship reload fallback --
+
+
+@pytest.mark.usefixtures("_enable_api_keys")
+def test_relationship_reload_failure_returns_original_user(app, mock_user) -> None:
+    """If load_user_with_relationships fails, the original user from
+    validate_api_key should be returned as fallback."""
+    mock_sm = MagicMock()
+    mock_sm._extract_api_key_from_request.return_value = "sst_abc123"
+    mock_sm.validate_api_key.return_value = mock_user
+
+    with app.test_request_context(headers={"Authorization": "Bearer sst_abc123"}):
+        g.user = None
+        app.appbuilder = MagicMock()
+        app.appbuilder.sm = mock_sm
+
+        with patch(
+            "superset.mcp_service.auth.load_user_with_relationships",
+            return_value=None,
+        ):
+            result = get_user_from_request()
+
+    assert result is mock_user
diff --git a/tests/unit_tests/mcp_service/test_auth_user_resolution.py b/tests/unit_tests/mcp_service/test_auth_user_resolution.py
new file mode 100644
index 00000000000..658e131f18b
--- /dev/null
+++ b/tests/unit_tests/mcp_service/test_auth_user_resolution.py
@@ -0,0 +1,456 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+"""Tests for MCP user resolution priority and stale g.user prevention."""
+
+from unittest.mock import MagicMock, patch
+
+import pytest
+from flask import g
+
+from superset.mcp_service.auth import (
+    _resolve_user_from_jwt_context,
+    get_user_from_request,
+    mcp_auth_hook,
+)
+from superset.mcp_service.mcp_config import default_user_resolver
+
+
+def _make_mock_user(username: str = "testuser") -> MagicMock:
+    """Create a mock User with required attributes."""
+    user = MagicMock()
+    user.username = username
+    user.roles = []
+    user.groups = []
+    return user
+
+
+def _make_access_token(
+    claims: dict[str, str] | None = None, **kwargs: str
+) -> MagicMock:
+    """Create a mock AccessToken matching FastMCP's format."""
+    token = MagicMock()
+    token.claims = claims or {}
+    token.client_id = kwargs.get("client_id", "")
+    token.scopes = kwargs.get("scopes", [])
+    # Remove auto-created attributes so getattr fallbacks work correctly
+    for attr in ("subject", "payload"):
+        if attr not in kwargs:
+            delattr(token, attr)
+    for attr in kwargs:
+        setattr(token, attr, kwargs[attr])
+    return token
+
+
+# -- _resolve_user_from_jwt_context --
+
+
+def test_jwt_context_resolves_correct_user(app) -> None:
+    """JWT context with valid claims resolves the correct DB user."""
+    mock_user = _make_mock_user("alice")
+    token = _make_access_token(claims={"sub": "alice"})
+
+    with app.app_context():
+        with (
+            patch("fastmcp.server.dependencies.get_access_token", return_value=token),
+            patch(
+                "superset.mcp_service.auth.load_user_with_relationships",
+                return_value=mock_user,
+            ),
+        ):
+            result = _resolve_user_from_jwt_context(app)
+
+    assert result is not None
+    assert result.username == "alice"
+
+
+def test_jwt_context_returns_none_when_no_token(app) -> None:
+    """No JWT token present returns None (fall through to next source)."""
+    with app.app_context():
+        with patch("fastmcp.server.dependencies.get_access_token", return_value=None):
+            result = _resolve_user_from_jwt_context(app)
+
+    assert result is None
+
+
+def test_jwt_context_raises_for_unknown_user(app) -> None:
+    """JWT resolves a username not in DB — raises ValueError (fail closed)."""
+    token = _make_access_token(claims={"sub": "nonexistent"})
+
+    with app.app_context():
+        with (
+            patch("fastmcp.server.dependencies.get_access_token", return_value=token),
+            patch(
+                "superset.mcp_service.auth.load_user_with_relationships",
+                return_value=None,
+            ),
+        ):
+            with pytest.raises(ValueError, match="not found in Superset database"):
+                _resolve_user_from_jwt_context(app)
+
+
+def test_jwt_context_raises_when_no_username_in_claims(app) -> None:
+    """JWT present but claims have no extractable username — fails closed."""
+    token = _make_access_token(claims={"iss": "some-issuer"})
+
+    with app.app_context():
+        with patch("fastmcp.server.dependencies.get_access_token", return_value=token):
+            with pytest.raises(ValueError, match="no username could be extracted"):
+                _resolve_user_from_jwt_context(app)
+
+
+def test_jwt_context_uses_custom_resolver(app) -> None:
+    """Custom MCP_USER_RESOLVER config is used when set."""
+    mock_user = _make_mock_user("custom_user")
+    token = _make_access_token(claims={"custom_field": "custom_user"})
+    custom_resolver = MagicMock(return_value="custom_user")
+
+    with app.app_context():
+        app.config["MCP_USER_RESOLVER"] = custom_resolver
+        try:
+            with (
+                patch(
+                    "fastmcp.server.dependencies.get_access_token", return_value=token
+                ),
+                patch(
+                    "superset.mcp_service.auth.load_user_with_relationships",
+                    return_value=mock_user,
+                ),
+            ):
+                result = _resolve_user_from_jwt_context(app)
+        finally:
+            app.config.pop("MCP_USER_RESOLVER", None)
+
+    assert result is not None
+    assert result.username == "custom_user"
+    custom_resolver.assert_called_once_with(app, token)
+
+
+def test_jwt_context_email_fallback_lookup(app) -> None:
+    """When resolver returns an email, tries email lookup after username miss."""
+    mock_user = _make_mock_user("alice")
+    token = _make_access_token(claims={"email": "alice@example.com"})
+
+    def _load_side_effect(username=None, email=None):
+        if email == "alice@example.com":
+            return mock_user
+        return None
+
+    with app.app_context():
+        with (
+            patch("fastmcp.server.dependencies.get_access_token", return_value=token),
+            patch(
+                "superset.mcp_service.auth.load_user_with_relationships",
+                side_effect=_load_side_effect,
+            ),
+        ):
+            result = _resolve_user_from_jwt_context(app)
+
+    assert result is not None
+    assert result.username == "alice"
+
+
+# -- get_user_from_request priority order --
+
+
+def test_jwt_takes_priority_over_stale_g_user(app) -> None:
+    """Core regression test: JWT user wins over stale g.user."""
+    stale_user = _make_mock_user("stale_bob")
+    jwt_user = _make_mock_user("jwt_alice")
+    token = _make_access_token(claims={"sub": "jwt_alice"})
+
+    with app.app_context():
+        g.user = stale_user
+        with (
+            patch("fastmcp.server.dependencies.get_access_token", return_value=token),
+            patch(
+                "superset.mcp_service.auth.load_user_with_relationships",
+                return_value=jwt_user,
+            ),
+        ):
+            result = get_user_from_request()
+
+    assert result.username == "jwt_alice"
+
+
+def test_dev_username_fallback_when_no_jwt(app) -> None:
+    """MCP_DEV_USERNAME used when no JWT context available."""
+    mock_user = _make_mock_user("dev_admin")
+
+    with app.app_context():
+        app.config["MCP_DEV_USERNAME"] = "dev_admin"
+        try:
+            with (
+                patch(
+                    "fastmcp.server.dependencies.get_access_token", return_value=None
+                ),
+                patch(
+                    "superset.mcp_service.auth.load_user_with_relationships",
+                    return_value=mock_user,
+                ),
+            ):
+                result = get_user_from_request()
+        finally:
+            app.config.pop("MCP_DEV_USERNAME", None)
+
+    assert result.username == "dev_admin"
+
+
+def test_g_user_fallback_when_no_jwt_and_no_dev_username(app) -> None:
+    """g.user used as last-resort fallback (Preset middleware compatibility)."""
+    preset_user = _make_mock_user("preset_user")
+
+    with app.app_context():
+        app.config.pop("MCP_DEV_USERNAME", None)
+        g.user = preset_user
+        with patch("fastmcp.server.dependencies.get_access_token", return_value=None):
+            result = get_user_from_request()
+
+    assert result.username == "preset_user"
+
+
+def test_raises_when_no_auth_source(app) -> None:
+    """ValueError raised when no auth source is available."""
+    with app.app_context():
+        app.config.pop("MCP_DEV_USERNAME", None)
+        g.pop("user", None)
+        with patch("fastmcp.server.dependencies.get_access_token", return_value=None):
+            with pytest.raises(ValueError, match="No authenticated user found"):
+                get_user_from_request()
+
+
+def test_dev_username_not_found_raises(app) -> None:
+    """MCP_DEV_USERNAME configured but user not in DB raises ValueError."""
+    with app.app_context():
+        app.config["MCP_DEV_USERNAME"] = "ghost"
+        try:
+            with (
+                patch(
+                    "fastmcp.server.dependencies.get_access_token", return_value=None
+                ),
+                patch(
+                    "superset.mcp_service.auth.load_user_with_relationships",
+                    return_value=None,
+                ),
+            ):
+                with pytest.raises(ValueError, match="not found"):
+                    get_user_from_request()
+        finally:
+            app.config.pop("MCP_DEV_USERNAME", None)
+
+
+# -- g.user clearing in mcp_auth_hook --
+
+
+def test_mcp_auth_hook_clears_stale_g_user(app) -> None:
+    """mcp_auth_hook clears g.user before setting up user context.
+
+    Uses a side_effect that asserts g.user was cleared before user
+    resolution runs, so the test fails if g.pop("user") is removed.
+    """
+    stale_user = _make_mock_user("stale")
+    fresh_user = _make_mock_user("fresh")
+
+    def dummy_tool():
+        """Dummy tool."""
+        return g.user.username
+
+    wrapped = mcp_auth_hook(dummy_tool)
+
+    def _assert_cleared_then_return():
+        """Verify stale g.user was cleared before returning fresh user."""
+        assert not hasattr(g, "user") or g.user is None, (
+            "g.user should have been cleared before get_user_from_request() "
+            f"but found g.user={getattr(g, 'user', '<missing>')}"
+        )
+        return fresh_user
+
+    with app.app_context():
+        g.user = stale_user
+        # Explicitly mock has_request_context to False because the test
+        # framework's autouse app_context fixture may implicitly provide
+        # a request context in some CI environments.
+        with (
+            patch("flask.has_request_context", return_value=False),
+            patch(
+                "superset.mcp_service.auth.get_user_from_request",
+                side_effect=lambda: _assert_cleared_then_return(),
+            ),
+        ):
+            result = wrapped()
+
+    assert result == "fresh"
+
+
+def test_mcp_auth_hook_clears_stale_g_user_async(app) -> None:
+    """mcp_auth_hook clears g.user before setting up user context (async).
+
+    Uses a side_effect that asserts g.user was cleared before user
+    resolution runs, so the test fails if g.pop("user") is removed.
+    """
+    import asyncio
+
+    stale_user = _make_mock_user("stale")
+    fresh_user = _make_mock_user("fresh")
+
+    async def dummy_tool():
+        """Dummy tool."""
+        return g.user.username
+
+    wrapped = mcp_auth_hook(dummy_tool)
+
+    def _assert_cleared_then_return():
+        """Verify stale g.user was cleared before returning fresh user."""
+        assert not hasattr(g, "user") or g.user is None, (
+            "g.user should have been cleared before get_user_from_request() "
+            f"but found g.user={getattr(g, 'user', '<missing>')}"
+        )
+        return fresh_user
+
+    with app.app_context():
+        g.user = stale_user
+        with (
+            patch("flask.has_request_context", return_value=False),
+            patch(
+                "superset.mcp_service.auth.get_user_from_request",
+                side_effect=lambda: _assert_cleared_then_return(),
+            ),
+        ):
+            result = asyncio.run(wrapped())
+
+    assert result == "fresh"
+
+
+def test_mcp_auth_hook_preserves_g_user_in_request_context(app) -> None:
+    """g.user is NOT cleared when a request context is active (middleware compat).
+
+    Uses a side_effect that asserts g.user is still the middleware-set
+    user when get_user_from_request() is called, proving the hook did
+    NOT clear it.
+    """
+    middleware_user = _make_mock_user("middleware_user")
+
+    def dummy_tool():
+        """Dummy tool."""
+        return g.user.username
+
+    wrapped = mcp_auth_hook(dummy_tool)
+
+    def _assert_preserved_then_return():
+        """Verify g.user was preserved (not cleared) before returning."""
+        assert hasattr(g, "user"), (
+            "g.user should be preserved in request context but was removed"
+        )
+        assert g.user is middleware_user, (
+            "g.user should be preserved in request context but was changed; "
+            f"g.user={g.user}"
+        )
+        return middleware_user
+
+    with app.test_request_context():
+        g.user = middleware_user
+        with patch(
+            "superset.mcp_service.auth.get_user_from_request",
+            side_effect=lambda: _assert_preserved_then_return(),
+        ):
+            result = wrapped()
+
+    assert result == "middleware_user"
+
+
+# -- default_user_resolver --
+
+
+def test_default_resolver_extracts_sub_from_claims() -> None:
+    """Extracts 'sub' claim as last-resort from AccessToken.claims dict."""
+    token = _make_access_token(claims={"sub": "alice"})
+    assert default_user_resolver(None, token) == "alice"
+
+
+def test_default_resolver_extracts_preferred_username() -> None:
+    """Extracts 'preferred_username' claim (common OIDC claim)."""
+    token = _make_access_token(claims={"preferred_username": "alice"})
+    assert default_user_resolver(None, token) == "alice"
+
+
+def test_default_resolver_extracts_email_from_claims() -> None:
+    """Falls back to 'email' claim when 'sub' is absent."""
+    token = _make_access_token(claims={"email": "alice@example.com"})
+    assert default_user_resolver(None, token) == "alice@example.com"
+
+
+def test_default_resolver_extracts_username_from_claims() -> None:
+    """Falls back to 'username' claim."""
+    token = _make_access_token(claims={"username": "alice"})
+    assert default_user_resolver(None, token) == "alice"
+
+
+def test_default_resolver_falls_back_to_subject_attr() -> None:
+    """Falls back to legacy .subject attribute when claims empty."""
+    token = _make_access_token(claims={}, subject="legacy_user")
+    assert default_user_resolver(None, token) == "legacy_user"
+
+
+def test_default_resolver_falls_back_to_client_id() -> None:
+    """Falls back to .client_id when claims empty and no subject."""
+    token = _make_access_token(claims={}, client_id="service-account")
+    assert default_user_resolver(None, token) == "service-account"
+
+
+def test_default_resolver_returns_none_for_empty_token() -> None:
+    """Returns None when no claims or attributes have a username."""
+    token = _make_access_token(claims={}, client_id="")
+    assert default_user_resolver(None, token) is None
+
+
+def test_default_resolver_preferred_username_takes_priority() -> None:
+    """'preferred_username' takes priority over 'sub' and 'email' in claims."""
+    token = _make_access_token(
+        claims={
+            "sub": "opaque-id-123",
+            "preferred_username": "alice",
+            "email": "alice@example.com",
+        }
+    )
+    assert default_user_resolver(None, token) == "alice"
+
+
+def test_setup_user_context_propagates_valueerror(app) -> None:
+    """ValueError from get_user_from_request propagates — no g.user fallback.
+
+    This is a security-critical test: when JWT resolution explicitly fails
+    (user not in DB), the request must be denied. The auth layer must NOT
+    silently fall back to g.user from middleware.
+
+    Uses test_request_context() so g.user is preserved (not cleared by
+    the no-request-context guard), validating that the ValueError still
+    propagates even when middleware has set g.user.
+    """
+    from superset.mcp_service.auth import _setup_user_context
+
+    fallback_user = _make_mock_user("middleware_user")
+
+    with app.test_request_context():
+        g.user = fallback_user
+        with patch(
+            "superset.mcp_service.auth.get_user_from_request",
+            side_effect=ValueError("User 'ghost' not found"),
+        ):
+            with pytest.raises(ValueError, match="User 'ghost' not found"):
+                _setup_user_context()
+            # g.user should be cleared after ValueError (no misleading audit)
+            assert not hasattr(g, "user") or g.user is None
diff --git a/tests/unit_tests/mcp_service/test_g_user_race_condition.py b/tests/unit_tests/mcp_service/test_g_user_race_condition.py
new file mode 100644
index 00000000000..5e9d3aac2b8
--- /dev/null
+++ b/tests/unit_tests/mcp_service/test_g_user_race_condition.py
@@ -0,0 +1,164 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+"""
+Tests for g.user isolation across concurrent MCP tool calls.
+
+The MCP server pushes a parent app_context at startup (__main__.py).
+asyncio.create_task() copies the ContextVar VALUE — a reference to the
+SAME AppContext object. Without pushing a fresh app_context() per tool
+call, concurrent tasks share one g namespace and g.user mutations race.
+
+These tests verify that:
+- Always pushing a new app_context() per task isolates g.user (SAFE)
+- Reusing a shared parent context via nullcontext() causes races (UNSAFE)
+- When a request context is active, nullcontext() is safe (middleware path)
+"""
+
+import asyncio
+from types import SimpleNamespace
+
+import pytest
+from flask import Flask, g
+
+
+def _make_user(user_id: int, username: str) -> SimpleNamespace:
+    return SimpleNamespace(id=user_id, username=username)
+
+
+ALICE = _make_user(1, "alice")
+BOB = _make_user(2, "bob")
+
+
+def _get_user_id() -> int | None:
+    """Mirrors superset.utils.core.get_user_id."""
+    try:
+        return g.user.id
+    except AttributeError:
+        return None
+
+
+@pytest.mark.asyncio
+async def test_fresh_app_context_per_task_isolates_g_user():
+    """
+    Each task pushes its own app_context(). g.user is isolated.
+    This is the fixed code path in _get_app_context_manager() when
+    no request context is active (app-context-only mode).
+    """
+    app = Flask(__name__)
+
+    async def tool_call(user, results, key):
+        with app.app_context():
+            g.user = user
+            await asyncio.sleep(0)  # yield to other tasks
+            results[key] = _get_user_id()
+
+    # Parent context exists (like __main__.py:138)
+    with app.app_context():
+        for _ in range(200):
+            results: dict[str, int | None] = {}
+            await asyncio.gather(
+                tool_call(ALICE, results, "alice"),
+                tool_call(BOB, results, "bob"),
+            )
+            assert results["alice"] == ALICE.id
+            assert results["bob"] == BOB.id
+
+
+@pytest.mark.asyncio
+async def test_nullcontext_shared_context_causes_race():
+    """
+    Both tasks reuse the parent's app context (nullcontext path).
+    g.user is shared — one task overwrites the other's identity.
+    Uses asyncio.Event for deterministic interleaving.
+    """
+    app = Flask(__name__)
+
+    alice_set = asyncio.Event()
+    bob_set = asyncio.Event()
+
+    async def alice_task(results):
+        g.user = ALICE
+        alice_set.set()  # Signal: Alice has set g.user
+        await bob_set.wait()  # Wait for Bob to overwrite g.user
+        results["alice"] = _get_user_id()
+
+    async def bob_task(results):
+        await alice_set.wait()  # Wait for Alice to set g.user first
+        g.user = BOB  # Overwrite the shared g.user
+        bob_set.set()  # Signal: Bob has overwritten
+        results["bob"] = _get_user_id()
+
+    with app.app_context():
+        results: dict[str, int | None] = {}
+        await asyncio.gather(
+            alice_task(results),
+            bob_task(results),
+        )
+        # Alice reads Bob's ID because they share the same g
+        assert results["alice"] == BOB.id, (
+            "Expected Alice to see Bob's ID due to shared g"
+        )
+        assert results["bob"] == BOB.id
+
+
+@pytest.mark.asyncio
+async def test_request_context_preserves_g_user():
+    """
+    When a request context is active (middleware set g.user), each task
+    pushes its own test_request_context. The per-task app_context +
+    request_context provides isolation even with nullcontext() in the
+    auth hook.
+    """
+    app = Flask(__name__)
+
+    async def tool_call(user, results, key):
+        with app.app_context():
+            with app.test_request_context(path="/mcp"):
+                g.user = user
+                await asyncio.sleep(0)
+                results[key] = _get_user_id()
+
+    with app.app_context():
+        for _ in range(200):
+            results: dict[str, int | None] = {}
+            await asyncio.gather(
+                tool_call(ALICE, results, "alice"),
+                tool_call(BOB, results, "bob"),
+            )
+            assert results["alice"] == ALICE.id
+            assert results["bob"] == BOB.id
+
+
+@pytest.mark.asyncio
+async def test_high_contention_isolation():
+    """10 concurrent users, 50 iterations — stress test."""
+    app = Flask(__name__)
+    users = [_make_user(i, f"user_{i}") for i in range(10)]
+
+    async def tool_call(user, results, key):
+        with app.app_context():
+            g.user = user
+            await asyncio.sleep(0)
+            await asyncio.sleep(0)
+            results[key] = _get_user_id()
+
+    with app.app_context():
+        for _ in range(50):
+            results: dict[str, int | None] = {}
+            await asyncio.gather(*(tool_call(u, results, u.username) for u in users))
+            for u in users:
+                assert results[u.username] == u.id
diff --git a/tests/unit_tests/mcp_service/test_middleware.py b/tests/unit_tests/mcp_service/test_middleware.py
index d380320b790..bcc164e048f 100644
--- a/tests/unit_tests/mcp_service/test_middleware.py
+++ b/tests/unit_tests/mcp_service/test_middleware.py
@@ -207,6 +207,106 @@ class TestResponseSizeGuardMiddleware:
         call_args = mock_event_logger.log.call_args
         assert call_args.kwargs["action"] == "mcp_response_size_exceeded"
 
+    @pytest.mark.asyncio
+    async def test_truncates_info_tool_instead_of_blocking(self) -> None:
+        """Should truncate info tool responses instead of blocking them."""
+        middleware = ResponseSizeGuardMiddleware(token_limit=500)
+
+        context = MagicMock()
+        context.message.name = "get_dataset_info"
+        context.message.params = {}
+
+        # Large info tool response with a big description
+        large_response = {
+            "id": 1,
+            "table_name": "test",
+            "description": "x" * 50000,
+        }
+        call_next = AsyncMock(return_value=large_response)
+
+        with (
+            patch("superset.mcp_service.middleware.get_user_id", return_value=1),
+            patch("superset.mcp_service.middleware.event_logger"),
+        ):
+            result = await middleware.on_call_tool(context, call_next)
+
+        # Should return truncated response, not raise ToolError
+        assert isinstance(result, dict)
+        assert result["id"] == 1
+        assert result["_response_truncated"] is True
+        assert "[truncated" in result["description"]
+
+    @pytest.mark.asyncio
+    async def test_truncates_chart_info_with_large_form_data(self) -> None:
+        """Should truncate get_chart_info with large form_data."""
+        middleware = ResponseSizeGuardMiddleware(token_limit=500)
+
+        context = MagicMock()
+        context.message.name = "get_chart_info"
+        context.message.params = {}
+
+        large_response = {
+            "id": 1,
+            "slice_name": "My Chart",
+            "form_data": {f"key_{i}": f"value_{i}" for i in range(100)},
+        }
+        call_next = AsyncMock(return_value=large_response)
+
+        with (
+            patch("superset.mcp_service.middleware.get_user_id", return_value=1),
+            patch("superset.mcp_service.middleware.event_logger"),
+        ):
+            result = await middleware.on_call_tool(context, call_next)
+
+        assert isinstance(result, dict)
+        assert result["id"] == 1
+        assert result["_response_truncated"] is True
+
+    @pytest.mark.asyncio
+    async def test_still_blocks_non_info_tools(self) -> None:
+        """Should still block non-info tools that exceed limit."""
+        middleware = ResponseSizeGuardMiddleware(token_limit=100)
+
+        context = MagicMock()
+        context.message.name = "list_charts"  # Not an info tool
+        context.message.params = {}
+
+        large_response = {"data": "x" * 10000}
+        call_next = AsyncMock(return_value=large_response)
+
+        with (
+            patch("superset.mcp_service.middleware.get_user_id", return_value=1),
+            patch("superset.mcp_service.middleware.event_logger"),
+            pytest.raises(ToolError),
+        ):
+            await middleware.on_call_tool(context, call_next)
+
+    @pytest.mark.asyncio
+    async def test_logs_truncation_event(self) -> None:
+        """Should log mcp_response_truncated event on successful truncation."""
+        middleware = ResponseSizeGuardMiddleware(token_limit=500)
+
+        context = MagicMock()
+        context.message.name = "get_dashboard_info"
+        context.message.params = {}
+
+        large_response = {
+            "id": 1,
+            "description": "x" * 50000,
+        }
+        call_next = AsyncMock(return_value=large_response)
+
+        with (
+            patch("superset.mcp_service.middleware.get_user_id", return_value=1),
+            patch("superset.mcp_service.middleware.event_logger") as mock_event_logger,
+        ):
+            await middleware.on_call_tool(context, call_next)
+
+        # Should log truncation event (not size_exceeded)
+        mock_event_logger.log.assert_called()
+        call_args = mock_event_logger.log.call_args
+        assert call_args.kwargs["action"] == "mcp_response_truncated"
+
 
 class TestCreateResponseSizeGuardMiddleware:
     """Test create_response_size_guard_middleware factory function."""
diff --git a/tests/unit_tests/mcp_service/test_middleware_logging.py b/tests/unit_tests/mcp_service/test_middleware_logging.py
index 1f48d531ccc..50d23449707 100644
--- a/tests/unit_tests/mcp_service/test_middleware_logging.py
+++ b/tests/unit_tests/mcp_service/test_middleware_logging.py
@@ -102,6 +102,34 @@ class TestLoggingMiddlewareOnCallTool:
         assert call_kwargs["curated_payload"]["success"] is False
         assert call_kwargs["duration_ms"] >= 0
 
+    @patch("superset.mcp_service.middleware.event_logger")
+    @patch("superset.mcp_service.middleware.get_user_id", return_value=42)
+    @pytest.mark.asyncio
+    async def test_on_call_tool_logs_failure_on_tool_error(
+        self, mock_get_user_id, mock_event_logger
+    ):
+        """on_call_tool records success=False when GlobalErrorHandler raises ToolError.
+
+        This simulates the real middleware chain: GlobalErrorHandler catches
+        tool exceptions and re-raises them as ToolError. Since LoggingMiddleware
+        sits between GlobalErrorHandler and StructuredContentStripper, it
+        catches the ToolError directly.
+        """
+        from fastmcp.exceptions import ToolError
+
+        middleware = LoggingMiddleware()
+        ctx = _make_context(name="get_chart_info")
+        call_next = AsyncMock(side_effect=ToolError("Chart 999999 not found"))
+
+        with pytest.raises(ToolError, match="Chart 999999 not found"):
+            await middleware.on_call_tool(ctx, call_next)
+
+        mock_event_logger.log.assert_called_once()
+        call_kwargs = mock_event_logger.log.call_args[1]
+        assert call_kwargs["curated_payload"]["success"] is False
+        assert call_kwargs["curated_payload"]["tool"] == "get_chart_info"
+        assert call_kwargs["duration_ms"] >= 0
+
     @patch("superset.mcp_service.middleware.event_logger")
     @patch("superset.mcp_service.middleware.get_user_id", return_value=42)
     @pytest.mark.asyncio
@@ -205,3 +233,132 @@ class TestExtractContextInfo:
         _, _, _, slice_id, _, _ = middleware._extract_context_info(ctx)
 
         assert slice_id == 66
+
+
+class TestIsErrorResponse:
+    """Tests for LoggingMiddleware._is_error_response()."""
+
+    def test_detects_error_schema_response(self):
+        """Detects ToolResult containing a serialized error schema
+        (ChartError, DashboardError, etc.) via "error_type" field."""
+        from fastmcp.tools.tool import ToolResult
+        from mcp import types as mt
+
+        middleware = LoggingMiddleware()
+        error_json = (
+            '{"error": "Chart 999 not found",'
+            ' "error_type": "not_found",'
+            ' "timestamp": "2026-04-09T00:00:00Z"}'
+        )
+        result = ToolResult(content=[mt.TextContent(type="text", text=error_json)])
+        assert middleware._is_error_response(result) is True
+
+    def test_success_response_not_detected_as_error(self):
+        """Normal ToolResult is not detected as error."""
+        from fastmcp.tools.tool import ToolResult
+        from mcp import types as mt
+
+        middleware = LoggingMiddleware()
+        result = ToolResult(
+            content=[mt.TextContent(type="text", text="Successfully retrieved data")]
+        )
+        assert middleware._is_error_response(result) is False
+
+    def test_empty_content_not_detected_as_error(self):
+        """ToolResult with empty content is not detected as error."""
+        from fastmcp.tools.tool import ToolResult
+
+        middleware = LoggingMiddleware()
+        assert middleware._is_error_response(ToolResult(content=[])) is False
+
+    @patch("superset.mcp_service.middleware.event_logger")
+    @patch("superset.mcp_service.middleware.get_user_id", return_value=42)
+    @pytest.mark.asyncio
+    async def test_on_call_tool_logs_failure_for_error_schema(
+        self, mock_get_user_id, mock_event_logger
+    ):
+        """on_call_tool logs success=False when tool returns an
+        error schema (e.g. ChartError)."""
+        from fastmcp.tools.tool import ToolResult
+        from mcp import types as mt
+
+        middleware = LoggingMiddleware()
+        ctx = _make_context(name="get_chart_info")
+
+        error_json = (
+            '{"error": "Chart 999999 not found",'
+            ' "error_type": "not_found",'
+            ' "timestamp": "2026-04-09T00:00:00Z"}'
+        )
+        error_result = ToolResult(
+            content=[mt.TextContent(type="text", text=error_json)]
+        )
+        call_next = AsyncMock(return_value=error_result)
+
+        result = await middleware.on_call_tool(ctx, call_next)
+
+        assert result == error_result
+        mock_event_logger.log.assert_called_once()
+        call_kwargs = mock_event_logger.log.call_args[1]
+        assert call_kwargs["curated_payload"]["success"] is False
+        assert call_kwargs["curated_payload"]["tool"] == "get_chart_info"
+
+
+class TestMiddlewareChainOrder:
+    """Test that the middleware order from server.py logs failures correctly.
+
+    If the order is wrong (StructuredContentStripper innermost),
+    it swallows exceptions before LoggingMiddleware can see them,
+    causing success=True for failures.
+    """
+
+    @patch("superset.mcp_service.middleware.event_logger")
+    @patch("superset.mcp_service.middleware.get_user_id", return_value=42)
+    @pytest.mark.asyncio
+    async def test_real_middleware_chain_logs_exception_as_failure(
+        self, mock_get_user_id, mock_event_logger
+    ):
+        """Tool exception is logged as success=False through the
+        real middleware chain from build_middleware_list()."""
+        from functools import partial
+
+        from fastmcp.tools.tool import ToolResult
+
+        from superset.mcp_service.server import build_middleware_list
+
+        middleware_list = build_middleware_list()
+
+        async def failing_tool(context: Any) -> Any:
+            raise ValueError("chart not found")
+
+        # Build chain same way FastMCP does
+        chain = failing_tool
+        for mw in reversed(middleware_list):
+            chain = partial(mw, call_next=chain)
+
+        ctx = _make_context(name="get_chart_info")
+        result = await chain(ctx)
+
+        # StructuredContentStripper (outermost) must catch the re-raised
+        # exception and convert it to a safe ToolResult with "Error:" text.
+        # If it's not outermost, the exception would leak to the MCP SDK.
+        assert isinstance(result, ToolResult)
+        assert result.content[0].text.startswith("Error:")
+
+        # LoggingMiddleware must log
+        # success=False. If the middleware order is wrong
+        # (StructuredContentStripper innermost), this would be
+        # success=True because the exception gets swallowed
+        # before LoggingMiddleware sees it.
+        log_calls = [
+            c
+            for c in mock_event_logger.log.call_args_list
+            if c[1].get("action") == "mcp_tool_call"
+        ]
+        assert len(log_calls) == 1
+        assert log_calls[0][1]["curated_payload"]["success"] is False, (
+            "Middleware order is wrong: StructuredContentStripper is "
+            "swallowing exceptions before LoggingMiddleware can detect "
+            "them. Ensure StructuredContentStripper is outermost "
+            "(first added) in build_middleware_list()."
+        )
diff --git a/tests/unit_tests/mcp_service/test_tool_search_transform.py b/tests/unit_tests/mcp_service/test_tool_search_transform.py
index 7adfeacad47..74de17b88e5 100644
--- a/tests/unit_tests/mcp_service/test_tool_search_transform.py
+++ b/tests/unit_tests/mcp_service/test_tool_search_transform.py
@@ -25,9 +25,15 @@ from fastmcp.server.transforms.search import BM25SearchTransform, RegexSearchTra
 from superset.mcp_service.mcp_config import MCP_TOOL_SEARCH_CONFIG
 from superset.mcp_service.server import (
     _apply_tool_search_transform,
+    _compact_schema,
+    _create_search_result_serializer,
+    _extract_parameter_names,
     _fix_call_tool_arguments,
+    _normalize_call_tool_arguments,
     _serialize_tools_without_output_schema,
+    _truncate_description,
 )
+from superset.utils import json
 
 
 def test_tool_search_config_defaults():
@@ -39,6 +45,7 @@ def test_tool_search_config_defaults():
     assert "get_instance_info" in MCP_TOOL_SEARCH_CONFIG["always_visible"]
     assert MCP_TOOL_SEARCH_CONFIG["search_tool_name"] == "search_tools"
     assert MCP_TOOL_SEARCH_CONFIG["call_tool_name"] == "call_tool"
+    assert MCP_TOOL_SEARCH_CONFIG["include_schemas"] is False
 
 
 def test_apply_bm25_transform():
@@ -171,3 +178,673 @@ def test_serialize_tools_handles_no_output_schema():
     assert len(result) == 1
     assert result[0]["name"] == "simple_tool"
     assert "outputSchema" not in result[0]
+
+
+# -- _normalize_call_tool_arguments tests --
+
+
+def test_normalize_serializes_dict_with_anyof_string():
+    """Dict value is JSON-serialized when schema has anyOf with string type."""
+    arguments = {"request": {"dataset_id": 1, "config": {"key": "val"}}}
+    schema = {
+        "properties": {
+            "request": {
+                "anyOf": [
+                    {"type": "string"},
+                    {"$ref": "#/$defs/SomeModel"},
+                ]
+            }
+        }
+    }
+
+    result = _normalize_call_tool_arguments(arguments, schema)
+
+    assert isinstance(result["request"], str)
+    assert json.loads(result["request"]) == {
+        "dataset_id": 1,
+        "config": {"key": "val"},
+    }
+
+
+def test_normalize_serializes_dict_with_oneof_string():
+    """Dict value is JSON-serialized when schema has oneOf with string type."""
+    arguments = {"request": {"name": "test"}}
+    schema = {
+        "properties": {
+            "request": {
+                "oneOf": [
+                    {"type": "string"},
+                    {"type": "object"},
+                ]
+            }
+        }
+    }
+
+    result = _normalize_call_tool_arguments(arguments, schema)
+
+    assert isinstance(result["request"], str)
+
+
+def test_normalize_leaves_dict_without_string_variant():
+    """Dict value is left as-is when schema has no string variant."""
+    arguments = {"config": {"key": "val"}}
+    schema = {
+        "properties": {
+            "config": {
+                "anyOf": [
+                    {"type": "object"},
+                    {"type": "null"},
+                ]
+            }
+        }
+    }
+
+    result = _normalize_call_tool_arguments(arguments, schema)
+
+    assert isinstance(result["config"], dict)
+    assert result["config"] == {"key": "val"}
+
+
+def test_normalize_leaves_non_dict_unchanged():
+    """Non-dict/list values pass through unchanged."""
+    arguments = {"name": "test", "count": 42, "flag": True}
+    schema = {
+        "properties": {
+            "name": {"type": "string"},
+            "count": {"type": "integer"},
+            "flag": {"type": "boolean"},
+        }
+    }
+
+    result = _normalize_call_tool_arguments(arguments, schema)
+
+    assert result == {"name": "test", "count": 42, "flag": True}
+
+
+def test_normalize_returns_none_for_none_arguments():
+    """None arguments returns None."""
+    result = _normalize_call_tool_arguments(None, {"properties": {}})
+
+    assert result is None
+
+
+def test_normalize_returns_arguments_for_non_dict_schema():
+    """Non-dict schema returns arguments unchanged."""
+    arguments = {"request": {"key": "val"}}
+
+    result = _normalize_call_tool_arguments(arguments, None)
+
+    assert result is arguments
+
+
+def test_normalize_serializes_list_with_anyof_string():
+    """List value is JSON-serialized when schema has anyOf with string type."""
+    arguments = {"items": [1, 2, 3]}
+    schema = {
+        "properties": {
+            "items": {
+                "anyOf": [
+                    {"type": "string"},
+                    {"type": "array", "items": {"type": "integer"}},
+                ]
+            }
+        }
+    }
+
+    result = _normalize_call_tool_arguments(arguments, schema)
+
+    assert isinstance(result["items"], str)
+    assert json.loads(result["items"]) == [1, 2, 3]
+
+
+def test_normalize_ignores_keys_not_in_schema():
+    """Dict values for keys not in schema properties are left unchanged."""
+    arguments = {"unknown_key": {"nested": True}}
+    schema = {"properties": {"other_key": {"type": "string"}}}
+
+    result = _normalize_call_tool_arguments(arguments, schema)
+
+    assert isinstance(result["unknown_key"], dict)
+
+
+# -- _compact_schema tests --
+
+
+def test_compact_schema_removes_defs():
+    """$defs section is stripped from the schema."""
+    schema = {
+        "type": "object",
+        "properties": {
+            "filters": {"items": {"$ref": "#/$defs/MyFilter"}, "type": "array"},
+        },
+        "$defs": {
+            "MyFilter": {
+                "type": "object",
+                "properties": {"col": {"type": "string"}},
+            }
+        },
+    }
+
+    result = _compact_schema(schema)
+
+    assert "$defs" not in result
+    assert result["properties"]["filters"]["items"] == {"type": "object"}
+
+
+def test_compact_schema_replaces_ref_with_object():
+    """Direct $ref is replaced with {"type": "object"}."""
+    schema = {"$ref": "#/$defs/SomeModel"}
+
+    result = _compact_schema(schema)
+
+    assert result == {"type": "object"}
+
+
+def test_compact_schema_preserves_ref_description():
+    """$ref replacement preserves sibling description if present."""
+    schema = {"$ref": "#/$defs/SomeModel", "description": "A model"}
+
+    result = _compact_schema(schema)
+
+    assert result == {"type": "object", "description": "A model"}
+
+
+def test_compact_schema_simplifies_optional_ref():
+    """anyOf with $ref and null is collapsed to the non-null variant."""
+    schema = {
+        "anyOf": [
+            {"$ref": "#/$defs/SomeModel"},
+            {"type": "null"},
+        ],
+        "description": "Optional model",
+    }
+
+    result = _compact_schema(schema)
+
+    assert "anyOf" not in result
+    assert result["type"] == "object"
+    assert result["description"] == "Optional model"
+
+
+def test_compact_schema_simplifies_optional_primitive():
+    """anyOf with primitive type and null is collapsed."""
+    schema = {
+        "anyOf": [
+            {"type": "integer"},
+            {"type": "null"},
+        ],
+        "default": None,
+    }
+
+    result = _compact_schema(schema)
+
+    assert "anyOf" not in result
+    assert result["type"] == "integer"
+    assert result["default"] is None
+
+
+def test_compact_schema_preserves_multi_variant_anyof():
+    """anyOf with >2 variants or no null is left unchanged."""
+    schema = {
+        "anyOf": [
+            {"type": "integer"},
+            {"type": "string"},
+        ]
+    }
+
+    result = _compact_schema(schema)
+
+    assert "anyOf" in result
+    assert len(result["anyOf"]) == 2
+
+
+def test_compact_schema_nested_in_items():
+    """$ref nested inside items/properties is also replaced."""
+    schema = {
+        "type": "object",
+        "properties": {
+            "filters": {
+                "type": "array",
+                "items": {"$ref": "#/$defs/Filter"},
+            },
+            "name": {"type": "string"},
+        },
+    }
+
+    result = _compact_schema(schema)
+
+    assert result["properties"]["filters"]["items"] == {"type": "object"}
+    assert result["properties"]["name"] == {"type": "string"}
+
+
+def test_compact_schema_passthrough_simple():
+    """Simple schema without $defs/$ref passes through unchanged."""
+    schema = {
+        "type": "object",
+        "properties": {
+            "page": {"type": "integer", "default": 1},
+            "search": {"type": "string"},
+        },
+    }
+
+    result = _compact_schema(schema)
+
+    assert result == schema
+
+
+def test_compact_schema_handles_non_dict():
+    """Non-dict inputs pass through unchanged."""
+    assert _compact_schema("hello") == "hello"
+    assert _compact_schema(42) == 42
+    assert _compact_schema(None) is None
+    assert _compact_schema([1, 2]) == [1, 2]
+
+
+# -- _truncate_description tests --
+
+
+def test_truncate_description_short_text():
+    """Short text is returned as-is."""
+    assert _truncate_description("Hello world", 300) == "Hello world"
+
+
+def test_truncate_description_cuts_at_sentence():
+    """Long text is cut at the last sentence boundary."""
+    text = "First sentence. Second sentence. Third sentence that is quite long."
+    result = _truncate_description(text, 40)
+    assert result == "First sentence. Second sentence."
+
+
+def test_truncate_description_ellipsis_fallback():
+    """When no sentence boundary, truncates with ellipsis."""
+    text = "A very long single sentence without periods that goes on and on"
+    result = _truncate_description(text, 30)
+    assert result.endswith("...")
+    assert len(result) <= 33  # 30 + "..."
+
+
+def test_truncate_description_empty():
+    """Empty string returns empty."""
+    assert _truncate_description("", 300) == ""
+
+
+def test_truncate_description_zero_max():
+    """Zero max_length produces ellipsis; the serializer skips calling this."""
+    text = "Some text"
+    # _truncate_description(text, 0) truncates to 0 chars and appends "...".
+    # The caller (_create_search_result_serializer) skips calling it when
+    # max_desc=0 so this edge case only matters for direct callers.
+    result = _truncate_description(text, 0)
+    assert result == "..."
+
+
+# -- _create_search_result_serializer tests --
+
+
+def _make_mock_tool(name, description, input_schema):
+    """Helper to create a mock tool for serializer tests."""
+    mock_tool = MagicMock()
+    mock_mcp_tool = MagicMock()
+    mock_mcp_tool.model_dump.return_value = {
+        "name": name,
+        "description": description,
+        "inputSchema": input_schema,
+    }
+    mock_tool.to_mcp_tool.return_value = mock_mcp_tool
+    return mock_tool
+
+
+def test_create_serializer_compacts_schemas():
+    """Compact serializer strips $defs and replaces $ref."""
+    tool = _make_mock_tool(
+        "list_charts",
+        "List charts with filtering.",
+        {
+            "type": "object",
+            "properties": {
+                "filters": {
+                    "type": "array",
+                    "items": {"$ref": "#/$defs/ChartFilter"},
+                }
+            },
+            "$defs": {
+                "ChartFilter": {
+                    "type": "object",
+                    "properties": {"col": {"type": "string"}},
+                }
+            },
+        },
+    )
+
+    serializer = _create_search_result_serializer(
+        {"include_schemas": True, "compact_schemas": True}
+    )
+    result = serializer([tool])
+
+    assert len(result) == 1
+    schema = result[0]["inputSchema"]
+    assert "$defs" not in schema
+    assert schema["properties"]["filters"]["items"] == {"type": "object"}
+
+
+def test_create_serializer_truncates_descriptions():
+    """Compact serializer truncates long tool descriptions."""
+    long_desc = "Short intro. " + "x" * 500
+    tool = _make_mock_tool(
+        "generate_chart",
+        long_desc,
+        {"type": "object"},
+    )
+
+    serializer = _create_search_result_serializer({"max_description_length": 50})
+    result = serializer([tool])
+
+    assert len(result[0]["description"]) <= 53  # 50 + potential "..."
+
+
+def test_create_serializer_disabled():
+    """When compact_schemas=False and max_description_length=0, no compaction."""
+    tool = _make_mock_tool(
+        "test_tool",
+        "A long description " * 20,
+        {
+            "type": "object",
+            "$defs": {"Model": {"type": "object"}},
+        },
+    )
+
+    serializer = _create_search_result_serializer(
+        {"include_schemas": True, "compact_schemas": False, "max_description_length": 0}
+    )
+    result = serializer([tool])
+
+    # $defs should still be present (compaction disabled)
+    assert "$defs" in result[0]["inputSchema"]
+    # Description should not be truncated
+    assert result[0]["description"] == "A long description " * 20
+
+
+def test_create_serializer_compact_false_disables_truncation():
+    """compact_schemas=False also disables description truncation by default."""
+    long_desc = "A very long description. " * 30
+    tool = _make_mock_tool(
+        "test_tool",
+        long_desc,
+        {"type": "object", "$defs": {"Model": {"type": "object"}}},
+    )
+
+    serializer = _create_search_result_serializer(
+        {"include_schemas": True, "compact_schemas": False}
+    )
+    result = serializer([tool])
+
+    # $defs should still be present (compaction disabled)
+    assert "$defs" in result[0]["inputSchema"]
+    # Description should NOT be truncated (max_desc defaults to 0 when compact=False)
+    assert result[0]["description"] == long_desc
+
+
+def test_create_serializer_compact_false_explicit_truncation():
+    """compact_schemas=False with explicit max_description_length still truncates."""
+    long_desc = "First sentence. " + "x" * 500
+    tool = _make_mock_tool(
+        "test_tool",
+        long_desc,
+        {"type": "object", "$defs": {"Model": {"type": "object"}}},
+    )
+
+    serializer = _create_search_result_serializer(
+        {
+            "include_schemas": True,
+            "compact_schemas": False,
+            "max_description_length": 200,
+        }
+    )
+    result = serializer([tool])
+
+    # $defs should still be present (compaction disabled)
+    assert "$defs" in result[0]["inputSchema"]
+    # Description SHOULD be truncated (explicitly requested)
+    assert len(result[0]["description"]) <= 203
+
+
+def test_create_serializer_uses_config_defaults():
+    """Empty config defaults to summary mode (include_schemas=False).
+
+    The new default omits inputSchema and adds parameters_hint instead.
+    Descriptions are still truncated to 300 chars.
+    """
+    long_desc = "First sentence. " + "x" * 500
+    tool = _make_mock_tool(
+        "test_tool",
+        long_desc,
+        {
+            "type": "object",
+            "$defs": {"Model": {"type": "object"}},
+            "properties": {"x": {"$ref": "#/$defs/Model"}},
+        },
+    )
+
+    serializer = _create_search_result_serializer({})
+    result = serializer([tool])
+
+    # Summary mode: no inputSchema, parameters_hint present
+    assert "inputSchema" not in result[0]
+    assert result[0]["parameters_hint"] == "x"
+    # Description still truncated to default 300
+    assert len(result[0]["description"]) <= 303
+
+
+def test_apply_transform_uses_compact_serializer():
+    """_apply_tool_search_transform wires _create_search_result_serializer."""
+    mock_mcp = MagicMock()
+    config = {
+        "strategy": "bm25",
+        "max_results": 5,
+        "always_visible": ["health_check"],
+        "search_tool_name": "search_tools",
+        "call_tool_name": "call_tool",
+        "compact_schemas": True,
+        "max_description_length": 200,
+    }
+
+    _apply_tool_search_transform(mock_mcp, config)
+
+    mock_mcp.add_transform.assert_called_once()
+    transform = mock_mcp.add_transform.call_args[0][0]
+    # The serializer should NOT be the plain _serialize_tools_without_output_schema
+    assert (
+        transform._search_result_serializer
+        is not _serialize_tools_without_output_schema
+    )
+
+
+# -- _extract_parameter_names tests --
+
+
+def test_extract_parameter_names_basic():
+    """Returns comma-separated top-level property names."""
+    schema = {
+        "type": "object",
+        "properties": {
+            "page": {"type": "integer"},
+            "page_size": {"type": "integer"},
+            "search": {"type": "string"},
+        },
+    }
+
+    result = _extract_parameter_names(schema)
+
+    assert result == "page, page_size, search"
+
+
+def test_extract_parameter_names_empty_properties():
+    """Returns empty string when properties dict is empty."""
+    schema = {"type": "object", "properties": {}}
+
+    result = _extract_parameter_names(schema)
+
+    assert result == ""
+
+
+def test_extract_parameter_names_no_properties_key():
+    """Returns empty string when properties key is absent."""
+    schema = {"type": "object"}
+
+    result = _extract_parameter_names(schema)
+
+    assert result == ""
+
+
+def test_extract_parameter_names_with_refs():
+    """Extracts names regardless of the shape of property values."""
+    schema = {
+        "type": "object",
+        "properties": {
+            "filters": {"type": "array", "items": {"$ref": "#/$defs/ChartFilter"}},
+            "select_columns": {"type": "array"},
+        },
+        "$defs": {"ChartFilter": {"type": "object"}},
+    }
+
+    result = _extract_parameter_names(schema)
+
+    assert result == "filters, select_columns"
+
+
+# -- _create_search_result_serializer summary mode (include_schemas=False) --
+
+
+def test_create_serializer_summary_mode_strips_input_schema():
+    """When include_schemas=False, inputSchema is absent from results."""
+    tool = _make_mock_tool(
+        "list_charts",
+        "List charts.",
+        {
+            "type": "object",
+            "properties": {
+                "page": {"type": "integer"},
+                "search": {"type": "string"},
+            },
+        },
+    )
+
+    serializer = _create_search_result_serializer({"include_schemas": False})
+    result = serializer([tool])
+
+    assert len(result) == 1
+    assert "inputSchema" not in result[0]
+    assert result[0]["name"] == "list_charts"
+
+
+def test_create_serializer_summary_mode_adds_parameters_hint():
+    """When include_schemas=False, parameters_hint lists top-level param names."""
+    tool = _make_mock_tool(
+        "list_charts",
+        "List charts.",
+        {
+            "type": "object",
+            "properties": {
+                "page": {"type": "integer"},
+                "page_size": {"type": "integer"},
+                "search": {"type": "string"},
+            },
+        },
+    )
+
+    serializer = _create_search_result_serializer({"include_schemas": False})
+    result = serializer([tool])
+
+    assert result[0]["parameters_hint"] == "page, page_size, search"
+
+
+def test_create_serializer_summary_mode_no_hint_when_no_properties():
+    """When inputSchema has no properties, parameters_hint is absent."""
+    tool = _make_mock_tool(
+        "health_check",
+        "Health check.",
+        {"type": "object"},
+    )
+
+    serializer = _create_search_result_serializer({"include_schemas": False})
+    result = serializer([tool])
+
+    assert "inputSchema" not in result[0]
+    assert "parameters_hint" not in result[0]
+
+
+def test_create_serializer_summary_mode_truncates_description():
+    """Summary mode still truncates descriptions to max_description_length."""
+    long_desc = "First sentence. " + "x" * 500
+    tool = _make_mock_tool(
+        "list_charts",
+        long_desc,
+        {"type": "object", "properties": {"page": {"type": "integer"}}},
+    )
+
+    serializer = _create_search_result_serializer(
+        {"include_schemas": False, "max_description_length": 50}
+    )
+    result = serializer([tool])
+
+    assert len(result[0]["description"]) <= 53
+
+
+def test_create_serializer_summary_mode_is_default():
+    """Empty config defaults to summary mode (include_schemas=False)."""
+    tool = _make_mock_tool(
+        "list_charts",
+        "List charts.",
+        {
+            "type": "object",
+            "properties": {"page": {"type": "integer"}},
+        },
+    )
+
+    serializer = _create_search_result_serializer({})
+    result = serializer([tool])
+
+    assert "inputSchema" not in result[0]
+    assert "parameters_hint" in result[0]
+
+
+def test_create_serializer_include_schemas_true_restores_full_schema():
+    """include_schemas=True preserves inputSchema in results."""
+    schema = {
+        "type": "object",
+        "properties": {"page": {"type": "integer"}},
+        "$defs": {"Model": {"type": "object"}},
+    }
+    tool = _make_mock_tool("list_charts", "List charts.", schema)
+
+    serializer = _create_search_result_serializer(
+        {"include_schemas": True, "compact_schemas": False, "max_description_length": 0}
+    )
+    result = serializer([tool])
+
+    assert "inputSchema" in result[0]
+    assert "parameters_hint" not in result[0]
+    assert "$defs" in result[0]["inputSchema"]
+
+
+def test_create_serializer_include_schemas_true_with_compact():
+    """include_schemas=True + compact_schemas=True still compacts the schema."""
+    schema = {
+        "type": "object",
+        "properties": {
+            "filters": {"type": "array", "items": {"$ref": "#/$defs/ChartFilter"}}
+        },
+        "$defs": {"ChartFilter": {"type": "object"}},
+    }
+    tool = _make_mock_tool("list_charts", "List charts.", schema)
+
+    serializer = _create_search_result_serializer(
+        {"include_schemas": True, "compact_schemas": True}
+    )
+    result = serializer([tool])
+
+    assert "inputSchema" in result[0]
+    assert "$defs" not in result[0]["inputSchema"]
+    assert result[0]["inputSchema"]["properties"]["filters"]["items"] == {
+        "type": "object"
+    }
diff --git a/tests/unit_tests/mcp_service/utils/test_schema_utils.py b/tests/unit_tests/mcp_service/utils/test_schema_utils.py
index ab3450e6182..cac25c5d665 100644
--- a/tests/unit_tests/mcp_service/utils/test_schema_utils.py
+++ b/tests/unit_tests/mcp_service/utils/test_schema_utils.py
@@ -28,7 +28,6 @@ from superset.mcp_service.utils.schema_utils import (
     parse_json_or_model,
     parse_json_or_model_list,
     parse_json_or_passthrough,
-    parse_request,
 )
 
 
@@ -343,224 +342,3 @@ class TestEdgeCases:
         """Should handle special characters in CSV strings."""
         result = parse_json_or_list("item-1, item_2, item.3", "items")
         assert result == ["item-1", "item_2", "item.3"]
-
-
-class TestParseRequestDecorator:
-    """Test parse_request decorator for MCP tools."""
-
-    class RequestModel(BaseModel):
-        """Test request model."""
-
-        name: str
-        count: int
-
-    @pytest.fixture(autouse=True)
-    def _enable_parse_request(self):
-        """Ensure MCP_PARSE_REQUEST_ENABLED=True for all parsing tests."""
-        from unittest.mock import patch
-
-        with patch(
-            "superset.mcp_service.utils.schema_utils._is_parse_request_enabled",
-            return_value=True,
-        ):
-            yield
-
-    def test_decorator_with_json_string_async(self):
-        """Should parse JSON string request in async function."""
-        from unittest.mock import MagicMock, patch
-
-        @parse_request(self.RequestModel)
-        async def async_tool(request, ctx=None):
-            return f"{request.name}:{request.count}"
-
-        import asyncio
-
-        mock_ctx = MagicMock()
-        with patch("fastmcp.server.dependencies.get_context", return_value=mock_ctx):
-            result = asyncio.run(async_tool('{"name": "test", "count": 5}'))
-        assert result == "test:5"
-
-    def test_decorator_with_json_string_sync(self):
-        """Should parse JSON string request in sync function."""
-        from unittest.mock import MagicMock, patch
-
-        @parse_request(self.RequestModel)
-        def sync_tool(request, ctx=None):
-            return f"{request.name}:{request.count}"
-
-        mock_ctx = MagicMock()
-        with patch("fastmcp.server.dependencies.get_context", return_value=mock_ctx):
-            result = sync_tool('{"name": "test", "count": 5}')
-        assert result == "test:5"
-
-    def test_decorator_with_dict_async(self):
-        """Should handle dict request in async function."""
-        from unittest.mock import MagicMock, patch
-
-        @parse_request(self.RequestModel)
-        async def async_tool(request, ctx=None):
-            return f"{request.name}:{request.count}"
-
-        import asyncio
-
-        mock_ctx = MagicMock()
-        with patch("fastmcp.server.dependencies.get_context", return_value=mock_ctx):
-            result = asyncio.run(async_tool({"name": "test", "count": 5}))
-        assert result == "test:5"
-
-    def test_decorator_with_dict_sync(self):
-        """Should handle dict request in sync function."""
-        from unittest.mock import MagicMock, patch
-
-        @parse_request(self.RequestModel)
-        def sync_tool(request, ctx=None):
-            return f"{request.name}:{request.count}"
-
-        mock_ctx = MagicMock()
-        with patch("fastmcp.server.dependencies.get_context", return_value=mock_ctx):
-            result = sync_tool({"name": "test", "count": 5})
-        assert result == "test:5"
-
-    def test_decorator_with_model_instance_async(self):
-        """Should pass through model instance in async function."""
-        from unittest.mock import MagicMock, patch
-
-        @parse_request(self.RequestModel)
-        async def async_tool(request, ctx=None):
-            return f"{request.name}:{request.count}"
-
-        import asyncio
-
-        mock_ctx = MagicMock()
-        instance = self.RequestModel(name="test", count=5)
-        with patch("fastmcp.server.dependencies.get_context", return_value=mock_ctx):
-            result = asyncio.run(async_tool(instance))
-        assert result == "test:5"
-
-    def test_decorator_with_model_instance_sync(self):
-        """Should pass through model instance in sync function."""
-        from unittest.mock import MagicMock, patch
-
-        @parse_request(self.RequestModel)
-        def sync_tool(request, ctx=None):
-            return f"{request.name}:{request.count}"
-
-        mock_ctx = MagicMock()
-        instance = self.RequestModel(name="test", count=5)
-        with patch("fastmcp.server.dependencies.get_context", return_value=mock_ctx):
-            result = sync_tool(instance)
-        assert result == "test:5"
-
-    def test_decorator_preserves_function_signature_async(self):
-        """Should preserve original async function signature."""
-        from unittest.mock import MagicMock, patch
-
-        @parse_request(self.RequestModel)
-        async def async_tool(request, ctx=None, extra=None):
-            return f"{request.name}:{request.count}:{extra}"
-
-        import asyncio
-
-        mock_ctx = MagicMock()
-        with patch("fastmcp.server.dependencies.get_context", return_value=mock_ctx):
-            result = asyncio.run(
-                async_tool('{"name": "test", "count": 5}', extra="data")
-            )
-        assert result == "test:5:data"
-
-    def test_decorator_preserves_function_signature_sync(self):
-        """Should preserve original sync function signature."""
-        from unittest.mock import MagicMock, patch
-
-        @parse_request(self.RequestModel)
-        def sync_tool(request, ctx=None, extra=None):
-            return f"{request.name}:{request.count}:{extra}"
-
-        mock_ctx = MagicMock()
-        with patch("fastmcp.server.dependencies.get_context", return_value=mock_ctx):
-            result = sync_tool('{"name": "test", "count": 5}', extra="data")
-        assert result == "test:5:data"
-
-    def test_decorator_raises_tool_error_for_invalid_data_async(self):
-        """Should raise ToolError with field details for invalid data."""
-        from unittest.mock import MagicMock, patch
-
-        from fastmcp.exceptions import ToolError
-
-        @parse_request(self.RequestModel)
-        async def async_tool(request, ctx=None):
-            return f"{request.name}:{request.count}"
-
-        import asyncio
-
-        mock_ctx = MagicMock()
-        with patch("fastmcp.server.dependencies.get_context", return_value=mock_ctx):
-            with pytest.raises(ToolError, match="Required fields for RequestModel"):
-                asyncio.run(async_tool('{"name": "test"}'))  # Missing count
-
-    def test_decorator_raises_tool_error_for_invalid_data_sync(self):
-        """Should raise ToolError with field details for invalid data."""
-        from unittest.mock import MagicMock, patch
-
-        from fastmcp.exceptions import ToolError
-
-        @parse_request(self.RequestModel)
-        def sync_tool(request, ctx=None):
-            return f"{request.name}:{request.count}"
-
-        mock_ctx = MagicMock()
-        with patch("fastmcp.server.dependencies.get_context", return_value=mock_ctx):
-            with pytest.raises(ToolError, match="Required fields for RequestModel"):
-                sync_tool('{"name": "test"}')  # Missing count
-
-    def test_decorator_with_complex_model_async(self):
-        """Should handle complex nested models in async function."""
-        from unittest.mock import MagicMock, patch
-
-        class NestedModel(BaseModel):
-            """Nested model."""
-
-            value: int
-
-        class ComplexModel(BaseModel):
-            """Complex request model."""
-
-            name: str
-            nested: NestedModel
-
-        @parse_request(ComplexModel)
-        async def async_tool(request, ctx=None):
-            return f"{request.name}:{request.nested.value}"
-
-        import asyncio
-
-        mock_ctx = MagicMock()
-        json_str = '{"name": "test", "nested": {"value": 42}}'
-        with patch("fastmcp.server.dependencies.get_context", return_value=mock_ctx):
-            result = asyncio.run(async_tool(json_str))
-        assert result == "test:42"
-
-    def test_decorator_with_complex_model_sync(self):
-        """Should handle complex nested models in sync function."""
-        from unittest.mock import MagicMock, patch
-
-        class NestedModel(BaseModel):
-            """Nested model."""
-
-            value: int
-
-        class ComplexModel(BaseModel):
-            """Complex request model."""
-
-            name: str
-            nested: NestedModel
-
-        @parse_request(ComplexModel)
-        def sync_tool(request, ctx=None):
-            return f"{request.name}:{request.nested.value}"
-
-        mock_ctx = MagicMock()
-        json_str = '{"name": "test", "nested": {"value": 42}}'
-        with patch("fastmcp.server.dependencies.get_context", return_value=mock_ctx):
-            result = sync_tool(json_str)
-        assert result == "test:42"
diff --git a/tests/unit_tests/mcp_service/utils/test_token_utils.py b/tests/unit_tests/mcp_service/utils/test_token_utils.py
index 649536019bb..2e540902c93 100644
--- a/tests/unit_tests/mcp_service/utils/test_token_utils.py
+++ b/tests/unit_tests/mcp_service/utils/test_token_utils.py
@@ -24,6 +24,11 @@ from typing import Any, List
 from pydantic import BaseModel
 
 from superset.mcp_service.utils.token_utils import (
+    _replace_collections_with_summaries,
+    _summarize_large_dicts,
+    _truncate_lists,
+    _truncate_strings,
+    _truncate_strings_recursive,
     CHARS_PER_TOKEN,
     estimate_response_tokens,
     estimate_token_count,
@@ -31,6 +36,8 @@ from superset.mcp_service.utils.token_utils import (
     format_size_limit_error,
     generate_size_reduction_suggestions,
     get_response_size_bytes,
+    INFO_TOOLS,
+    truncate_oversized_response,
 )
 
 
@@ -222,7 +229,25 @@ class TestGenerateSizeReductionSuggestions:
             estimated_tokens=50000,
             token_limit=25000,
         )
-        assert any("LIMIT" in s or "limit" in s.lower() for s in suggestions)
+        combined = " ".join(suggestions)
+        # Should suggest SQL LIMIT clause
+        assert "LIMIT" in combined
+        # Should suggest the tool's limit parameter
+        assert "'limit' parameter" in combined.lower() or "limit=" in combined.lower()
+
+    def test_execute_sql_with_limit_param_no_duplicate_suggestion(self) -> None:
+        """When limit param is already set, should not suggest adding it again."""
+        suggestions = generate_size_reduction_suggestions(
+            tool_name="execute_sql",
+            params={"sql": "SELECT * FROM table", "limit": 500},
+            estimated_tokens=50000,
+            token_limit=25000,
+        )
+        combined = " ".join(suggestions)
+        # Should still suggest SQL LIMIT
+        assert "LIMIT" in combined
+        # Should suggest reducing the existing limit (from general suggestion)
+        assert "500" in combined or "limit" in combined.lower()
 
     def test_tool_specific_suggestions_list_charts(self) -> None:
         """Should provide chart-specific suggestions for list_charts."""
@@ -356,3 +381,259 @@ class TestCalculatedSuggestions:
         # Should mention ~66% reduction needed (int truncation of 66.6%)
         combined = " ".join(suggestions)
         assert "66%" in combined
+
+
+class TestInfoToolsSet:
+    """Test the INFO_TOOLS constant."""
+
+    def test_info_tools_contains_expected_tools(self) -> None:
+        """Should contain all info tools."""
+        assert "get_chart_info" in INFO_TOOLS
+        assert "get_dataset_info" in INFO_TOOLS
+        assert "get_dashboard_info" in INFO_TOOLS
+        assert "get_instance_info" in INFO_TOOLS
+
+    def test_info_tools_does_not_contain_list_tools(self) -> None:
+        """Should not contain list or write tools."""
+        assert "list_charts" not in INFO_TOOLS
+        assert "execute_sql" not in INFO_TOOLS
+        assert "generate_chart" not in INFO_TOOLS
+
+
+class TestTruncateStrings:
+    """Test _truncate_strings helper."""
+
+    def test_truncates_long_strings(self) -> None:
+        """Should truncate strings exceeding max_chars."""
+        data: dict[str, Any] = {"description": "x" * 1000, "name": "short"}
+        notes: list[str] = []
+        changed = _truncate_strings(data, notes, max_chars=500)
+        assert changed is True
+        assert len(data["description"]) < 1000
+        assert "[truncated from 1000 chars]" in data["description"]
+        assert data["name"] == "short"
+        assert len(notes) == 1
+
+    def test_does_not_truncate_short_strings(self) -> None:
+        """Should not truncate strings within limit."""
+        data: dict[str, Any] = {"name": "hello", "id": 123}
+        notes: list[str] = []
+        changed = _truncate_strings(data, notes, max_chars=500)
+        assert changed is False
+        assert data["name"] == "hello"
+        assert len(notes) == 0
+
+
+class TestTruncateStringsRecursive:
+    """Test _truncate_strings_recursive helper."""
+
+    def test_truncates_nested_strings_in_list_items(self) -> None:
+        """Should truncate strings inside list items (e.g. charts[i].description)."""
+        data: dict[str, Any] = {
+            "id": 1,
+            "charts": [
+                {"id": 1, "description": "x" * 1000},
+                {"id": 2, "description": "short"},
+            ],
+        }
+        notes: list[str] = []
+        changed = _truncate_strings_recursive(data, notes, max_chars=500)
+        assert changed is True
+        assert "[truncated" in data["charts"][0]["description"]
+        assert data["charts"][1]["description"] == "short"
+        assert len(notes) == 1
+        assert "charts[0].description" in notes[0]
+
+    def test_truncates_nested_strings_in_dicts(self) -> None:
+        """Should truncate strings inside nested dicts."""
+        data: dict[str, Any] = {
+            "filter_state": {
+                "dataMask": {"some_filter": "y" * 2000},
+            },
+        }
+        notes: list[str] = []
+        changed = _truncate_strings_recursive(data, notes, max_chars=500)
+        assert changed is True
+        assert "[truncated" in data["filter_state"]["dataMask"]["some_filter"]
+
+    def test_respects_depth_limit(self) -> None:
+        """Should stop recursing at depth 10."""
+        # Build a deeply nested structure (15 levels)
+        data: dict[str, Any] = {"level": "x" * 1000}
+        current = data
+        for _ in range(15):
+            current["nested"] = {"level": "x" * 1000}
+            current = current["nested"]
+        notes: list[str] = []
+        _truncate_strings_recursive(data, notes, max_chars=500)
+        # Should truncate levels 0-10 but stop before 15
+        assert len(notes) <= 11
+
+    def test_handles_empty_structures(self) -> None:
+        """Should handle empty dicts and lists gracefully."""
+        data: dict[str, Any] = {"items": [], "meta": {}, "name": "ok"}
+        notes: list[str] = []
+        changed = _truncate_strings_recursive(data, notes, max_chars=500)
+        assert changed is False
+
+    def test_dashboard_with_many_charts_edge_case(self) -> None:
+        """Simulate a dashboard with 30 charts each having long descriptions."""
+        data: dict[str, Any] = {
+            "id": 1,
+            "dashboard_title": "Big Dashboard",
+            "charts": [
+                {"id": i, "slice_name": f"Chart {i}", "description": "d" * 2000}
+                for i in range(30)
+            ],
+        }
+        notes: list[str] = []
+        changed = _truncate_strings_recursive(data, notes, max_chars=500)
+        assert changed is True
+        # All 30 chart descriptions should be truncated
+        assert len(notes) == 30
+        for chart in data["charts"]:
+            assert len(chart["description"]) < 2000
+            assert "[truncated" in chart["description"]
+
+
+class TestTruncateLists:
+    """Test _truncate_lists helper."""
+
+    def test_truncates_long_lists(self) -> None:
+        """Should truncate lists exceeding max_items without inline markers."""
+        data: dict[str, Any] = {
+            "columns": [{"name": f"col_{i}"} for i in range(50)],
+            "tags": [1, 2],
+        }
+        notes: list[str] = []
+        changed = _truncate_lists(data, notes, max_items=10)
+        assert changed is True
+        # Exactly 10 items — no marker appended (preserves type contract)
+        assert len(data["columns"]) == 10
+        assert all(isinstance(c, dict) and "name" in c for c in data["columns"])
+        assert data["tags"] == [1, 2]  # Not truncated
+        assert len(notes) == 1
+        assert "50" in notes[0]
+
+    def test_does_not_truncate_short_lists(self) -> None:
+        """Should not truncate lists within limit."""
+        data: dict[str, Any] = {"items": [1, 2, 3]}
+        notes: list[str] = []
+        changed = _truncate_lists(data, notes, max_items=10)
+        assert changed is False
+
+
+class TestSummarizeLargeDicts:
+    """Test _summarize_large_dicts helper."""
+
+    def test_summarizes_large_dicts(self) -> None:
+        """Should replace large dicts with key summaries."""
+        big_dict = {f"key_{i}": f"value_{i}" for i in range(30)}
+        data: dict[str, Any] = {"form_data": big_dict, "id": 1}
+        notes: list[str] = []
+        changed = _summarize_large_dicts(data, notes, max_keys=20)
+        assert changed is True
+        assert data["form_data"]["_truncated"] is True
+        assert "30 keys" in data["form_data"]["_message"]
+        assert data["id"] == 1
+
+    def test_does_not_summarize_small_dicts(self) -> None:
+        """Should not summarize dicts within limit."""
+        data: dict[str, Any] = {"params": {"a": 1, "b": 2}}
+        notes: list[str] = []
+        changed = _summarize_large_dicts(data, notes, max_keys=20)
+        assert changed is False
+
+
+class TestReplaceCollectionsWithSummaries:
+    """Test _replace_collections_with_summaries helper."""
+
+    def test_replaces_lists_and_dicts(self) -> None:
+        """Should clear non-empty collections to reduce size."""
+        data: dict[str, Any] = {
+            "columns": [1, 2, 3],
+            "params": {"a": 1},
+            "name": "test",
+            "empty": [],
+        }
+        notes: list[str] = []
+        changed = _replace_collections_with_summaries(data, notes)
+        assert changed is True
+        # Lists become empty lists (preserves type)
+        assert data["columns"] == []
+        # Dicts become empty dicts (preserves type)
+        assert data["params"] == {}
+        # Scalars unchanged
+        assert data["name"] == "test"
+        # Empty collections unchanged
+        assert data["empty"] == []
+        assert len(notes) == 2
+
+
+class TestTruncateOversizedResponse:
+    """Test truncate_oversized_response function."""
+
+    def test_no_truncation_needed(self) -> None:
+        """Should return original data when under limit."""
+        response = {"id": 1, "name": "test"}
+        result, was_truncated, notes = truncate_oversized_response(response, 10000)
+        assert was_truncated is False
+        assert notes == []
+
+    def test_truncates_large_string_fields(self) -> None:
+        """Should truncate long strings to fit."""
+        response = {
+            "id": 1,
+            "description": "x" * 50000,  # Very large description
+        }
+        result, was_truncated, notes = truncate_oversized_response(response, 500)
+        assert was_truncated is True
+        assert isinstance(result, dict)
+        assert "[truncated" in result["description"]
+        assert any("description" in n for n in notes)
+
+    def test_truncates_large_lists(self) -> None:
+        """Should truncate lists when strings alone are not enough."""
+        response = {
+            "id": 1,
+            "columns": [{"name": f"col_{i}", "type": "VARCHAR"} for i in range(200)],
+        }
+        result, was_truncated, notes = truncate_oversized_response(response, 500)
+        assert was_truncated is True
+        assert isinstance(result, dict)
+        # Should have been truncated
+        assert len(result["columns"]) < 200
+
+    def test_handles_pydantic_model(self) -> None:
+        """Should handle Pydantic model input."""
+
+        class FakeInfo(BaseModel):
+            id: int = 1
+            description: str = "x" * 5000
+
+        response = FakeInfo()
+        result, was_truncated, notes = truncate_oversized_response(response, 200)
+        assert was_truncated is True
+        assert isinstance(result, dict)
+
+    def test_returns_non_dict_unchanged(self) -> None:
+        """Should return non-dict/model responses unchanged."""
+        result, was_truncated, notes = truncate_oversized_response("just a string", 100)
+        assert was_truncated is False
+        assert result == "just a string"
+
+    def test_progressive_truncation(self) -> None:
+        """Should progressively apply truncation phases."""
+        # Build a response that's quite large
+        response = {
+            "id": 1,
+            "description": "x" * 2000,
+            "css": "y" * 2000,
+            "columns": [{"name": f"col_{i}"} for i in range(100)],
+            "form_data": {f"key_{i}": f"val_{i}" for i in range(50)},
+        }
+        result, was_truncated, notes = truncate_oversized_response(response, 300)
+        assert was_truncated is True
+        assert isinstance(result, dict)
+        assert result["id"] == 1  # Scalar fields preserved
+        assert len(notes) > 0
diff --git a/tests/unit_tests/models/helpers_test.py b/tests/unit_tests/models/helpers_test.py
index c0354844737..75d89519c78 100644
--- a/tests/unit_tests/models/helpers_test.py
+++ b/tests/unit_tests/models/helpers_test.py
@@ -20,7 +20,7 @@
 from __future__ import annotations
 
 from contextlib import contextmanager
-from typing import TYPE_CHECKING
+from typing import cast, TYPE_CHECKING
 from unittest.mock import patch
 
 import pytest
@@ -33,6 +33,7 @@ from sqlalchemy.sql.elements import ColumnElement
 from superset.superset_typing import AdhocColumn
 
 if TYPE_CHECKING:
+    from superset.jinja_context import BaseTemplateProcessor
     from superset.models.core import Database
 
 
@@ -1429,6 +1430,79 @@ def test_adhoc_column_to_sqla_with_column_reference(database: Database) -> None:
     assert "Customer Name" in result_str or '"Customer Name"' in result_str
 
 
+def test_virtual_dataset_calculated_column_selected_via_templated_adhoc_dimension(
+    database: Database,
+) -> None:
+    """
+    Calculated columns on virtual datasets must be resolvable when the column
+    reference comes from a templated `sqlExpression` (e.g. using `filter_values`).
+
+    Regression test for cases where selecting a calculated column by name would
+    fall back to treating the resolved name as a bare identifier (breaking SQL
+    execution because the calculated expression is not present in the virtual
+    dataset's FROM subquery).
+    """
+    from superset.connectors.sqla.models import SqlaTable, TableColumn
+
+    table = SqlaTable(
+        database=database,
+        schema=None,
+        table_name="virtual_t",
+        # Non-empty `sql` makes the table a virtual dataset.
+        sql="SELECT random_value, category FROM t",
+        columns=[
+            TableColumn(column_name="random_value", type="INTEGER"),
+            TableColumn(column_name="category", type="TEXT"),
+            TableColumn(
+                column_name="gt_or_lt_50",
+                type="TEXT",
+                expression=(
+                    "CASE WHEN random_value > 50 THEN 'GT 50' ELSE 'LT 50' END"
+                ),
+            ),
+        ],
+    )
+
+    class DummyTemplateProcessor:
+        def process_template(self, sql_expression: str) -> str:
+            # Only resolve the templated column name; leave other expressions
+            # (like the calculated column's CASE expression) untouched.
+            if "filter_values('aggregation')" in sql_expression:
+                return "gt_or_lt_50"
+            return sql_expression
+
+    adhoc_col: AdhocColumn = {
+        "sqlExpression": (
+            "{{ filter_values('aggregation')[0] if "
+            "filter_values('aggregation') else \"'Total'\" }}"
+        ),
+        "label": "breakdown_by",
+        "isColumnReference": True,
+    }
+
+    result = table.adhoc_column_to_sqla(
+        adhoc_col,
+        template_processor=cast("BaseTemplateProcessor", DummyTemplateProcessor()),
+    )
+    assert result is not None
+
+    # The calculated column expression should be inlined (not treated as a bare
+    # identifier), so SQL must contain the CASE expression.
+    with database.get_sqla_engine() as engine:
+        sql = str(
+            result.compile(
+                dialect=engine.dialect,
+                compile_kwargs={"literal_binds": True},
+            )
+        )
+
+    assert "CASE WHEN" in sql
+    assert "random_value" in sql
+    assert "'GT 50'" in sql
+    assert "'LT 50'" in sql
+    assert "gt_or_lt_50" not in sql
+
+
 def test_adhoc_column_to_sqla_preserves_column_type_for_time_grain(
     database: Database,
 ) -> None:
@@ -1856,3 +1930,112 @@ def test_extras_having_is_parenthesized(
         assert "(COUNT(*) > 0 OR 1 = 1)" in sql, (
             f"extras.having should be wrapped in parentheses. Generated SQL: {sql}"
         )
+
+
+def _run_probe(
+    database: Database,
+    type_probe_needs_row: bool = False,
+) -> str:
+    """
+    Run adhoc_column_to_sqla with a mocked get_columns_description and
+    return the SQL that was passed to it.
+
+    ``type_probe_needs_row`` is patched onto the database's real engine spec
+    class so every other method keeps working normally.
+    """
+    from unittest.mock import patch
+
+    from superset.connectors.sqla.models import SqlaTable, TableColumn
+
+    table = SqlaTable(
+        database=database,
+        schema=None,
+        table_name="t",
+        columns=[TableColumn(column_name="a", type="INTEGER")],
+    )
+
+    adhoc_col: AdhocColumn = {
+        "sqlExpression": "round(a / 50) * 50 / 1000",
+        "label": "Duration",
+        "columnType": "BASE_AXIS",
+        "timeGrain": "P1D",
+    }
+    captured: list[str] = []
+
+    def fake_get_columns_description(
+        db: object,
+        catalog: object,
+        schema: object,
+        sql: str,
+    ) -> list[dict[str, object]]:
+        captured.append(sql)
+        return [
+            {
+                "column_name": "Duration",
+                "name": "Duration",
+                "type": "FLOAT",
+                "is_dttm": False,
+            }
+        ]
+
+    spec_cls = database.db_engine_spec
+    with (
+        patch(
+            "superset.connectors.sqla.models.get_columns_description",
+            side_effect=fake_get_columns_description,
+        ),
+        patch.object(spec_cls, "type_probe_needs_row", type_probe_needs_row),
+    ):
+        result = table.adhoc_column_to_sqla(adhoc_col)
+
+    assert result is not None
+    assert len(captured) == 1, "Expected exactly one type-probe query"
+    return captured[0]
+
+
+def test_adhoc_column_type_probe_uses_where_false(database: Database) -> None:
+    """
+    Most engines populate cursor.description from query-plan metadata, so the
+    probe uses WHERE FALSE — zero rows read, no table scan.
+
+    SQLAlchemy renders sa.false() differently per dialect:
+      - Most databases:  WHERE false
+      - SQLite:          WHERE 0 = 1
+    """
+    probe_sql = _run_probe(database, type_probe_needs_row=False).lower()
+
+    always_false_patterns = ("where false", "where 0 = 1")
+    assert any(p in probe_sql for p in always_false_patterns), (
+        f"Probe query should use a WHERE false condition to avoid scanning the "
+        f"table, but got: {probe_sql}"
+    )
+    assert "limit" not in probe_sql, (
+        f"WHERE false probe must not contain LIMIT, but got: {probe_sql}"
+    )
+
+
+def test_adhoc_column_type_probe_uses_limit_1_for_row_dependent_engines(
+    database: Database,
+) -> None:
+    """
+    Druid and Pinot build cursor.description by inspecting the first returned
+    row. WHERE FALSE yields no rows, so description stays None. These engines
+    must fall back to LIMIT 1.
+    """
+    from superset.db_engine_specs.druid import DruidEngineSpec
+    from superset.db_engine_specs.pinot import PinotEngineSpec
+
+    for spec_cls in (DruidEngineSpec, PinotEngineSpec):
+        assert spec_cls.type_probe_needs_row is True, (
+            f"{spec_cls.__name__} must declare type_probe_needs_row = True"
+        )
+
+    probe_sql = _run_probe(database, type_probe_needs_row=True).lower()
+
+    assert "limit 1" in probe_sql, (
+        f"Row-dependent engines: probe should use LIMIT 1, got: {probe_sql}"
+    )
+    always_false_patterns = ("where false", "where 0 = 1")
+    assert not any(p in probe_sql for p in always_false_patterns), (
+        f"Row-dependent engines: probe must NOT use WHERE false, got: {probe_sql}"
+    )
diff --git a/tests/unit_tests/models/slice_test.py b/tests/unit_tests/models/slice_test.py
index dc6bbb86552..e55d00dede0 100644
--- a/tests/unit_tests/models/slice_test.py
+++ b/tests/unit_tests/models/slice_test.py
@@ -85,3 +85,41 @@ class TestSlice:
         """Test id_or_uuid_filter returns correct BinaryExpression."""
         result = id_or_uuid_filter(input_value)
         assert result is not None
+
+    def test_datasource_url_returns_none_when_datasource_lacks_explore_url(self):
+        """datasource_url() must not raise when the datasource has no explore_url.
+
+        Charts whose datasource resolves to a Query (or any other type without
+        explore_url) used to raise AttributeError, which caused the entire chart
+        list API response to fail instead of just skipping that one chart.
+        """
+        slc = Slice()
+        slc.id = 1
+
+        # Simulate a datasource object that does NOT have explore_url (e.g. Query)
+        mock_datasource = MagicMock(spec=[])  # spec=[] means no attributes at all
+        slc.table = mock_datasource
+
+        result = slc.datasource_url()
+        assert result is None
+
+    def test_datasource_url_returns_explore_url_when_present(self):
+        """datasource_url() returns the datasource explore_url when it exists."""
+        slc = Slice()
+        slc.id = 1
+
+        mock_table = MagicMock()
+        mock_table.explore_url = "/explore/?datasource_type=table&datasource_id=1"
+        slc.table = mock_table
+
+        result = slc.datasource_url()
+        assert result == "/explore/?datasource_type=table&datasource_id=1"
+
+    def test_datasource_url_returns_none_when_no_datasource(self):
+        """datasource_url() returns None when there is no datasource."""
+        slc = Slice()
+        slc.id = 1
+        slc.table = None
+
+        result = slc.datasource_url()
+        assert result is None
diff --git a/tests/unit_tests/models/test_no_filter_time_range.py b/tests/unit_tests/models/test_no_filter_time_range.py
new file mode 100644
index 00000000000..09139920897
--- /dev/null
+++ b/tests/unit_tests/models/test_no_filter_time_range.py
@@ -0,0 +1,307 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+"""Tests that 'No filter' temporal range produces no WHERE 1 = 1 clause."""
+
+from __future__ import annotations
+
+from datetime import datetime, timezone
+
+from flask import Flask
+from pytest_mock import MockerFixture
+
+from superset.connectors.sqla.models import SqlaTable, SqlMetric, TableColumn
+from superset.models.core import Database
+from superset.superset_typing import QueryObjectDict
+
+
+def _make_dataset(mocker: MockerFixture) -> SqlaTable:
+    database = Database(
+        id=1,
+        database_name="test_db",
+        sqlalchemy_uri="sqlite://",
+    )
+    columns = [
+        TableColumn(column_name="time_start", is_dttm=1, type="TIMESTAMP"),
+        TableColumn(column_name="value", type="INTEGER"),
+    ]
+    dataset = SqlaTable(
+        table_name="test_table",
+        columns=columns,
+        main_dttm_col="time_start",
+        database=database,
+        metrics=[SqlMetric(metric_name="count", expression="COUNT(*)")],
+    )
+    mocker.patch(
+        "superset.connectors.sqla.models.security_manager.get_guest_rls_filters",
+        return_value=[],
+    )
+    mocker.patch(
+        "superset.connectors.sqla.models.security_manager.is_guest_user",
+        return_value=False,
+    )
+    return dataset
+
+
+def test_get_time_filter_returns_none_when_no_bounds(
+    mocker: MockerFixture,
+    app: Flask,
+) -> None:
+    """get_time_filter returns None when both start_dttm and end_dttm are None."""
+    dataset = _make_dataset(mocker)
+    time_col = dataset.columns[0]
+
+    with app.test_request_context():
+        result = dataset.get_time_filter(
+            time_col=time_col,
+            start_dttm=None,
+            end_dttm=None,
+        )
+
+    assert result is None
+
+
+def test_get_time_filter_returns_clause_with_partial_bounds(
+    mocker: MockerFixture,
+    app: Flask,
+) -> None:
+    """get_time_filter returns a clause when at least one bound is set."""
+    dataset = _make_dataset(mocker)
+    time_col = dataset.columns[0]
+
+    with app.test_request_context():
+        result_start_only = dataset.get_time_filter(
+            time_col=time_col,
+            start_dttm=datetime(2024, 1, 1, tzinfo=timezone.utc),
+            end_dttm=None,
+        )
+        result_end_only = dataset.get_time_filter(
+            time_col=time_col,
+            start_dttm=None,
+            end_dttm=datetime(2024, 1, 31, tzinfo=timezone.utc),
+        )
+        result_both = dataset.get_time_filter(
+            time_col=time_col,
+            start_dttm=datetime(2024, 1, 1, tzinfo=timezone.utc),
+            end_dttm=datetime(2024, 1, 31, tzinfo=timezone.utc),
+        )
+
+    assert result_start_only is not None
+    assert result_end_only is not None
+    assert result_both is not None
+
+
+def test_no_filter_temporal_range_omits_where_1_equals_1(
+    mocker: MockerFixture,
+    app: Flask,
+) -> None:
+    """Generating SQL with 'No filter' time range must not produce WHERE 1 = 1."""
+    dataset = _make_dataset(mocker)
+
+    # "No filter" is represented as None/None for from_dttm/to_dttm
+    query_obj: QueryObjectDict = {
+        "granularity": "time_start",
+        "from_dttm": None,
+        "to_dttm": None,
+        "is_timeseries": False,
+        "filter": [
+            {
+                "col": "time_start",
+                "op": "TEMPORAL_RANGE",
+                "val": "No filter",
+            }
+        ],
+        "metrics": ["count"],
+        "columns": [],
+    }
+
+    with app.test_request_context():
+        sqla_query = dataset.get_query_str_extended(query_obj, mutate=False)
+        generated_sql = sqla_query.sql
+
+    assert "1 = 1" not in generated_sql, (
+        f"Expected no '1 = 1' in generated SQL when 'No filter' is selected, "
+        f"but got: {generated_sql}"
+    )
+
+
+def test_no_filter_with_other_filters_preserved(
+    mocker: MockerFixture,
+    app: Flask,
+) -> None:
+    """'No filter' time range + regular filter => WHERE has only the regular filter."""
+    dataset = _make_dataset(mocker)
+
+    query_obj: QueryObjectDict = {
+        "granularity": "time_start",
+        "from_dttm": None,
+        "to_dttm": None,
+        "is_timeseries": False,
+        "filter": [
+            {
+                "col": "time_start",
+                "op": "TEMPORAL_RANGE",
+                "val": "No filter",
+            },
+            {
+                "col": "value",
+                "op": "==",
+                "val": "42",
+            },
+        ],
+        "metrics": ["count"],
+        "columns": [],
+    }
+
+    with app.test_request_context():
+        sqla_query = dataset.get_query_str_extended(query_obj, mutate=False)
+        generated_sql = sqla_query.sql
+
+    assert "1 = 1" not in generated_sql, (
+        f"Expected no '1 = 1' with 'No filter' + regular filter, got: {generated_sql}"
+    )
+    # Regular filter should still be present
+    assert "value" in generated_sql.lower(), (
+        f"Regular filter on 'value' should still appear in SQL, got: {generated_sql}"
+    )
+
+
+def test_actual_from_to_dttm_produces_time_filter(
+    mocker: MockerFixture,
+    app: Flask,
+) -> None:
+    """Generating SQL with actual from/to dates applies a WHERE time filter."""
+    dataset = _make_dataset(mocker)
+
+    query_obj: QueryObjectDict = {
+        "granularity": "time_start",
+        "from_dttm": datetime(2024, 1, 1, tzinfo=timezone.utc),
+        "to_dttm": datetime(2024, 1, 31, tzinfo=timezone.utc),
+        "is_timeseries": False,
+        "filter": [],
+        "metrics": ["count"],
+        "columns": [],
+    }
+
+    with app.test_request_context():
+        sqla_query = dataset.get_query_str_extended(query_obj, mutate=False)
+        generated_sql = sqla_query.sql
+
+    assert "1 = 1" not in generated_sql, (
+        f"Expected no '1 = 1' in SQL with actual date bounds, got: {generated_sql}"
+    )
+    assert "time_start" in generated_sql.lower(), (
+        f"Expected time_start column in WHERE clause, got: {generated_sql}"
+    )
+
+
+def test_series_limit_with_time_filter_includes_time_in_inner_subquery(
+    mocker: MockerFixture,
+    app: Flask,
+) -> None:
+    """Series limit subquery includes time filter when actual dates are provided.
+
+    This covers the branch at helpers.py where inner_time_filter is set to
+    [_inner_filter] when get_time_filter returns a non-None clause inside the
+    series-limit subquery block.
+    """
+    database = Database(
+        id=1,
+        database_name="test_db",
+        sqlalchemy_uri="sqlite://",
+    )
+    columns = [
+        TableColumn(column_name="time_start", is_dttm=1, type="TIMESTAMP"),
+        TableColumn(column_name="category", type="VARCHAR(100)"),
+        TableColumn(column_name="value", type="INTEGER"),
+    ]
+    dataset = SqlaTable(
+        table_name="test_table",
+        columns=columns,
+        main_dttm_col="time_start",
+        database=database,
+        metrics=[SqlMetric(metric_name="count", expression="COUNT(*)")],
+    )
+    mocker.patch(
+        "superset.connectors.sqla.models.security_manager.get_guest_rls_filters",
+        return_value=[],
+    )
+    mocker.patch(
+        "superset.connectors.sqla.models.security_manager.is_guest_user",
+        return_value=False,
+    )
+
+    query_obj: QueryObjectDict = {
+        "granularity": "time_start",
+        "from_dttm": datetime(2024, 1, 1, tzinfo=timezone.utc),
+        "to_dttm": datetime(2024, 1, 31, tzinfo=timezone.utc),
+        "is_timeseries": True,
+        "groupby": ["category"],
+        "series_limit": 5,
+        "filter": [],
+        "metrics": ["count"],
+        "columns": [],
+    }
+
+    with app.test_request_context():
+        sqla_query = dataset.get_query_str_extended(query_obj, mutate=False)
+        generated_sql = sqla_query.sql
+
+    assert "1 = 1" not in generated_sql, (
+        f"Expected no '1 = 1' in generated SQL with series_limit and actual dates, "
+        f"but got: {generated_sql}"
+    )
+    assert "time_start" in generated_sql.lower(), (
+        f"Expected time_start to appear in SQL (inner subquery WHERE), "
+        f"but got: {generated_sql}"
+    )
+
+
+def test_temporal_range_filter_with_actual_dates_produces_time_filter(
+    mocker: MockerFixture,
+    app: Flask,
+) -> None:
+    """TEMPORAL_RANGE filter with actual dates applies a WHERE time filter."""
+    dataset = _make_dataset(mocker)
+
+    query_obj: QueryObjectDict = {
+        "granularity": None,
+        "from_dttm": None,
+        "to_dttm": None,
+        "is_timeseries": False,
+        "filter": [
+            {
+                "col": "time_start",
+                "op": "TEMPORAL_RANGE",
+                "val": "2024-01-01T00:00:00 : 2024-01-31T00:00:00",
+            }
+        ],
+        "metrics": ["count"],
+        "columns": [],
+    }
+
+    with app.test_request_context():
+        sqla_query = dataset.get_query_str_extended(query_obj, mutate=False)
+        generated_sql = sqla_query.sql
+
+    assert "time_start" in generated_sql.lower(), (
+        f"Expected time_start in WHERE clause for TEMPORAL_RANGE with dates, "
+        f"got: {generated_sql}"
+    )
+    assert "1 = 1" not in generated_sql, (
+        f"Expected no '1 = 1' for TEMPORAL_RANGE with actual dates, "
+        f"got: {generated_sql}"
+    )
diff --git a/tests/unit_tests/reports/api_test.py b/tests/unit_tests/reports/api_test.py
new file mode 100644
index 00000000000..6656b623bb1
--- /dev/null
+++ b/tests/unit_tests/reports/api_test.py
@@ -0,0 +1,52 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+from typing import Any
+from unittest.mock import patch
+
+import prison
+
+from superset.exceptions import SupersetException
+from tests.unit_tests.conftest import with_feature_flags
+
+
+@with_feature_flags(ALERT_REPORTS=True)
+@patch("superset.reports.api.get_channels_with_search")
+def test_slack_channels_success(
+    mock_search: Any,
+    client: Any,
+    full_api_access: None,
+) -> None:
+    mock_search.return_value = [{"id": "C123", "name": "general"}]
+    params = prison.dumps({})
+    rv = client.get(f"/api/v1/report/slack_channels/?q={params}")
+    assert rv.status_code == 200
+    data = rv.json
+    assert data["result"] == [{"id": "C123", "name": "general"}]
+
+
+@with_feature_flags(ALERT_REPORTS=True)
+@patch("superset.reports.api.get_channels_with_search")
+def test_slack_channels_handles_superset_exception(
+    mock_search: Any,
+    client: Any,
+    full_api_access: None,
+) -> None:
+    mock_search.side_effect = SupersetException("Slack API error")
+    params = prison.dumps({})
+    rv = client.get(f"/api/v1/report/slack_channels/?q={params}")
+    assert rv.status_code == 422
+    assert "Slack API error" in rv.json["message"]
diff --git a/tests/unit_tests/reports/dao_test.py b/tests/unit_tests/reports/dao_test.py
new file mode 100644
index 00000000000..d77c42a9fd7
--- /dev/null
+++ b/tests/unit_tests/reports/dao_test.py
@@ -0,0 +1,91 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+from unittest.mock import MagicMock, patch
+
+
+@patch("superset.daos.report.get_user_id", return_value=1)
+@patch("superset.daos.report.db")
+def test_validate_unique_creation_method_duplicate_returns_false(
+    mock_db: MagicMock,
+    mock_uid: MagicMock,
+) -> None:
+    from superset.daos.report import ReportScheduleDAO
+
+    # Simulate that a matching report already exists
+    mock_db.session.query.return_value.filter_by.return_value.filter.return_value = (
+        MagicMock()
+    )
+    mock_db.session.query.return_value.scalar.return_value = True
+    assert ReportScheduleDAO.validate_unique_creation_method(dashboard_id=1) is False
+
+
+@patch("superset.daos.report.get_user_id", return_value=1)
+@patch("superset.daos.report.db")
+def test_validate_unique_creation_method_no_duplicate_returns_true(
+    mock_db: MagicMock,
+    mock_uid: MagicMock,
+) -> None:
+    from superset.daos.report import ReportScheduleDAO
+
+    mock_db.session.query.return_value.filter_by.return_value.filter.return_value = (
+        MagicMock()
+    )
+    mock_db.session.query.return_value.scalar.return_value = False
+    assert ReportScheduleDAO.validate_unique_creation_method(dashboard_id=1) is True
+
+
+@patch("superset.daos.report.db")
+def test_find_last_error_notification_returns_none_after_success(
+    mock_db: MagicMock,
+) -> None:
+    from superset.daos.report import ReportScheduleDAO
+
+    schedule = MagicMock()
+    error_log = MagicMock()
+    success_log = MagicMock()
+
+    # Build the query chain so each .query().filter().order_by().first() call
+    # returns a different result. The DAO calls db.session.query() twice:
+    # 1st call finds the error marker log
+    # 2nd call finds a non-error log after it (success happened since last error email)
+    query_mock = MagicMock()
+    mock_db.session.query.return_value = query_mock
+    chain = query_mock.filter.return_value.order_by.return_value
+    chain.first.side_effect = [error_log, success_log]
+
+    result = ReportScheduleDAO.find_last_error_notification(schedule)
+    # Success log exists after error → should return None (no re-notification needed)
+    assert result is None
+
+
+@patch("superset.daos.report.db")
+def test_find_last_error_notification_returns_log_when_only_errors(
+    mock_db: MagicMock,
+) -> None:
+    from superset.daos.report import ReportScheduleDAO
+
+    schedule = MagicMock()
+    error_log = MagicMock()
+
+    query_mock = MagicMock()
+    mock_db.session.query.return_value = query_mock
+    chain = query_mock.filter.return_value.order_by.return_value
+    # 1st call: error marker log found; 2nd call: no success log after it
+    chain.first.side_effect = [error_log, None]
+
+    result = ReportScheduleDAO.find_last_error_notification(schedule)
+    assert result is error_log
diff --git a/tests/unit_tests/reports/filters_test.py b/tests/unit_tests/reports/filters_test.py
new file mode 100644
index 00000000000..308eb439136
--- /dev/null
+++ b/tests/unit_tests/reports/filters_test.py
@@ -0,0 +1,64 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+from unittest.mock import MagicMock, patch
+
+
+@patch("superset.reports.filters.security_manager", new_callable=MagicMock)
+def test_report_schedule_filter_admin_sees_all(mock_sm: MagicMock) -> None:
+    from superset.reports.filters import ReportScheduleFilter
+
+    mock_sm.can_access_all_datasources.return_value = True
+    query = MagicMock()
+    f = ReportScheduleFilter("id", MagicMock())
+    result = f.apply(query, None)
+    assert result is query
+    query.filter.assert_not_called()
+
+
+@patch("superset.reports.filters.security_manager", new_callable=MagicMock)
+@patch("superset.reports.filters.db")
+def test_report_schedule_filter_non_admin_filtered(
+    mock_db: MagicMock, mock_sm: MagicMock
+) -> None:
+    from superset.reports.filters import ReportScheduleFilter
+
+    mock_sm.can_access_all_datasources.return_value = False
+    mock_sm.user_model.get_user_id.return_value = 1
+    mock_sm.user_model.id = 1
+    query = MagicMock()
+    f = ReportScheduleFilter("id", MagicMock())
+    f.apply(query, None)
+    query.filter.assert_called_once()
+
+
+def test_report_schedule_all_text_filter_empty_noop() -> None:
+    from superset.reports.filters import ReportScheduleAllTextFilter
+
+    query = MagicMock()
+    f = ReportScheduleAllTextFilter("name", MagicMock())
+    result = f.apply(query, "")
+    assert result is query
+    query.filter.assert_not_called()
+
+
+def test_report_schedule_all_text_filter_applies_ilike() -> None:
+    from superset.reports.filters import ReportScheduleAllTextFilter
+
+    query = MagicMock()
+    f = ReportScheduleAllTextFilter("name", MagicMock())
+    f.apply(query, "test")
+    query.filter.assert_called_once()
diff --git a/tests/unit_tests/reports/model_test.py b/tests/unit_tests/reports/model_test.py
index 19e12e14072..5f44307a08a 100644
--- a/tests/unit_tests/reports/model_test.py
+++ b/tests/unit_tests/reports/model_test.py
@@ -14,7 +14,6 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-import pytest
 
 from superset.reports.models import ReportSchedule
 
@@ -37,9 +36,14 @@ def test_get_native_filters_params():
         }
     }
 
-    assert report_schedule.get_native_filters_params() == (
-        "(filter_id:(extraFormData:(filters:!((col:column_name,op:IN,val:!(value1,value2)))),filterState:(label:column_name,validateStatus:!f,value:!(value1,value2)),id:filter_id,ownState:()))"
+    result, warnings = report_schedule.get_native_filters_params()
+    expected = (
+        "(filter_id:(extraFormData:(filters:!((col:column_name,op:IN,"
+        "val:!(value1,value2)))),filterState:(label:column_name,"
+        "validateStatus:!f,value:!(value1,value2)),id:filter_id,ownState:()))"
     )
+    assert result == expected
+    assert warnings == []
 
 
 def test_get_native_filters_params_multiple_filters():
@@ -66,9 +70,17 @@ def test_get_native_filters_params_multiple_filters():
         }
     }
 
-    assert report_schedule.get_native_filters_params() == (
-        "(filter_id_1:(extraFormData:(filters:!((col:column_name_1,op:IN,val:!(value1,value2)))),filterState:(label:column_name_1,validateStatus:!f,value:!(value1,value2)),id:filter_id_1,ownState:()),filter_id_2:(extraFormData:(filters:!((col:column_name_2,op:IN,val:!(value3,value4)))),filterState:(label:column_name_2,validateStatus:!f,value:!(value3,value4)),id:filter_id_2,ownState:()))"
+    result, warnings = report_schedule.get_native_filters_params()
+    expected = (
+        "(filter_id_1:(extraFormData:(filters:!((col:column_name_1,op:IN,"
+        "val:!(value1,value2)))),filterState:(label:column_name_1,"
+        "validateStatus:!f,value:!(value1,value2)),id:filter_id_1,ownState:()),"
+        "filter_id_2:(extraFormData:(filters:!((col:column_name_2,op:IN,"
+        "val:!(value3,value4)))),filterState:(label:column_name_2,"
+        "validateStatus:!f,value:!(value3,value4)),id:filter_id_2,ownState:()))"
     )
+    assert result == expected
+    assert warnings == []
 
 
 def test_report_generate_native_filter_no_values():
@@ -79,11 +91,12 @@ def test_report_generate_native_filter_no_values():
     native_filter_id = "filter_id"
     column_name = "column_name"
     filter_type = "filter_select"
-    values = None
+    values: list[str | None] = []
 
-    assert report_schedule._generate_native_filter(
+    result, warning = report_schedule._generate_native_filter(
         native_filter_id, filter_type, column_name, values
-    ) == {
+    )
+    assert result == {
         "filter_id": {
             "id": "filter_id",
             "extraFormData": {
@@ -97,11 +110,13 @@ def test_report_generate_native_filter_no_values():
             "ownState": {},
         }
     }
+    assert warning is None
 
 
-def test_get_native_filters_params_invalid_structure():
+def test_get_native_filters_params_missing_filter_values():
     """
-    Test the ``get_native_filters_params`` method with invalid structure.
+    Test the ``get_native_filters_params`` method with missing filterValues.
+    Should handle gracefully by using empty list as default.
     """
     report_schedule = ReportSchedule()
     report_schedule.extra = {
@@ -111,29 +126,85 @@ def test_get_native_filters_params_invalid_structure():
                     "nativeFilterId": "filter_id",
                     "columnName": "column_name",
                     "filterType": "filter_select",
-                    # Missing "filterValues" key
+                    # Missing "filterValues" key - should default to []
                 }
             ]
         }
     }
 
-    with pytest.raises(KeyError, match="'filterValues'"):
-        report_schedule.get_native_filters_params()
+    # Should not raise, should handle gracefully with empty filterValues
+    result, warnings = report_schedule.get_native_filters_params()
+    assert "filter_id" in result
+    assert "column_name" in result
+    assert warnings == []
 
 
-# todo(hugh): how do we want to handle this case?
-# def test_report_generate_native_filter_invalid_filter_id():
-#     """
-#     Test the ``_generate_native_filter`` method with invalid filter id.
-#     """
-#     report_schedule = ReportSchedule()
-#     native_filter_id = None
-#     column_name = "column_name"
-#     values = ["value1", "value2"]
+def test_get_native_filters_params_explicit_none_values():
+    """
+    Test the ``get_native_filters_params`` method with explicit None values.
+    Should handle gracefully by coercing None to empty string/list.
+    """
+    report_schedule = ReportSchedule()
+    report_schedule.extra = {
+        "dashboard": {
+            "nativeFilters": [
+                {
+                    "nativeFilterId": "filter_id",
+                    "columnName": None,  # Explicit None
+                    "filterType": "filter_select",
+                    "filterValues": None,  # Explicit None
+                }
+            ]
+        }
+    }
 
-#     assert report_schedule._generate_native_filter(
-#         native_filter_id, column_name, values
-#     ) == {}
+    # Should not raise TypeError, should handle gracefully
+    result, warnings = report_schedule.get_native_filters_params()
+    assert "filter_id" in result
+    assert warnings == []
+
+
+def test_get_native_filters_params_missing_required_fields():
+    """
+    Test the ``get_native_filters_params`` method with missing required fields.
+    Filters missing nativeFilterId or filterType should be skipped.
+    """
+    report_schedule = ReportSchedule()
+    report_schedule.extra = {
+        "dashboard": {
+            "nativeFilters": [
+                {
+                    # Missing nativeFilterId - should be skipped
+                    "filterType": "filter_select",
+                    "columnName": "column_name",
+                    "filterValues": ["value1"],
+                },
+                {
+                    # Missing filterType - should be skipped
+                    "nativeFilterId": "filter_2",
+                    "columnName": "column_name",
+                    "filterValues": ["value2"],
+                },
+                {
+                    # Valid filter - should be processed
+                    "nativeFilterId": "filter_3",
+                    "filterType": "filter_select",
+                    "columnName": "column_name",
+                    "filterValues": ["value3"],
+                },
+            ]
+        }
+    }
+
+    result, warnings = report_schedule.get_native_filters_params()
+    # Only the valid filter should be in the result
+    assert "filter_3" in result
+    assert "filter_2" not in result
+    assert "value1" not in result
+    assert "value3" in result
+    # Two malformed filters should generate two warnings
+    assert len(warnings) == 2
+    assert all("Skipping malformed native filter" in w for w in warnings)
 
 
 def test_report_generate_native_filter():
@@ -146,9 +217,10 @@ def test_report_generate_native_filter():
     column_name = "column_name"
     values = ["value1", "value2"]
 
-    assert report_schedule._generate_native_filter(
+    result, warning = report_schedule._generate_native_filter(
         native_filter_id, filter_type, column_name, values
-    ) == {
+    )
+    assert result == {
         "filter_id": {
             "extraFormData": {
                 "filters": [
@@ -164,6 +236,7 @@ def test_report_generate_native_filter():
             "ownState": {},
         }
     }
+    assert warning is None
 
 
 def test_get_native_filters_params_empty():
@@ -173,7 +246,9 @@ def test_get_native_filters_params_empty():
     report_schedule = ReportSchedule()
     report_schedule.extra = {}
 
-    assert report_schedule.get_native_filters_params() == "()"
+    result, warnings = report_schedule.get_native_filters_params()
+    assert result == "()"
+    assert warnings == []
 
 
 def test_get_native_filters_params_no_native_filters():
@@ -183,7 +258,9 @@ def test_get_native_filters_params_no_native_filters():
     report_schedule = ReportSchedule()
     report_schedule.extra = {"dashboard": {"nativeFilters": []}}
 
-    assert report_schedule.get_native_filters_params() == "()"
+    result, warnings = report_schedule.get_native_filters_params()
+    assert result == "()"
+    assert warnings == []
 
 
 def test_report_generate_native_filter_empty_values():
@@ -196,9 +273,10 @@ def test_report_generate_native_filter_empty_values():
     column_name = "column_name"
     values = []
 
-    assert report_schedule._generate_native_filter(
+    result, warning = report_schedule._generate_native_filter(
         native_filter_id, filter_type, column_name, values
-    ) == {
+    )
+    assert result == {
         "filter_id": {
             "extraFormData": {
                 "filters": [{"col": "column_name", "op": "IN", "val": []}]
@@ -212,6 +290,7 @@ def test_report_generate_native_filter_empty_values():
             "ownState": {},
         }
     }
+    assert warning is None
 
 
 def test_report_generate_native_filter_no_column_name():
@@ -224,9 +303,10 @@ def test_report_generate_native_filter_no_column_name():
     column_name = ""
     values = ["value1", "value2"]
 
-    assert report_schedule._generate_native_filter(
+    result, warning = report_schedule._generate_native_filter(
         native_filter_id, filter_type, column_name, values
-    ) == {
+    )
+    assert result == {
         "filter_id": {
             "extraFormData": {
                 "filters": [{"col": "", "op": "IN", "val": ["value1", "value2"]}]
@@ -240,3 +320,431 @@ def test_report_generate_native_filter_no_column_name():
             "ownState": {},
         }
     }
+    assert warning is None
+
+
+def test_report_generate_native_filter_select_null_column():
+    report_schedule = ReportSchedule()
+    result, warning = report_schedule._generate_native_filter(
+        "F1", "filter_select", None, ["US"]
+    )
+    assert result["F1"]["extraFormData"]["filters"][0]["col"] == ""
+    assert result["F1"]["filterState"]["label"] == ""
+    assert warning is None
+
+
+def test_generate_native_filter_time_normal():
+    report_schedule = ReportSchedule()
+    result, warning = report_schedule._generate_native_filter(
+        "F2", "filter_time", "ignored", ["Last week"]
+    )
+    assert result == {
+        "F2": {
+            "id": "F2",
+            "extraFormData": {"time_range": "Last week"},
+            "filterState": {"value": "Last week"},
+            "ownState": {},
+        }
+    }
+    assert warning is None
+
+
+def test_generate_native_filter_timegrain_normal():
+    report_schedule = ReportSchedule()
+    result, warning = report_schedule._generate_native_filter(
+        "F3", "filter_timegrain", "ignored", ["P1D"]
+    )
+    assert result == {
+        "F3": {
+            "id": "F3",
+            "extraFormData": {"time_grain_sqla": "P1D"},
+            "filterState": {"value": ["P1D"]},
+            "ownState": {},
+        }
+    }
+    assert warning is None
+
+
+def test_generate_native_filter_timecolumn_normal():
+    """filter_timecolumn is the only branch missing 'id' in its output."""
+    report_schedule = ReportSchedule()
+    result, warning = report_schedule._generate_native_filter(
+        "F4", "filter_timecolumn", "ignored", ["ds"]
+    )
+    assert result == {
+        "F4": {
+            "extraFormData": {"granularity_sqla": "ds"},
+            "filterState": {"value": ["ds"]},
+        }
+    }
+    assert "id" not in result["F4"]
+    assert warning is None
+
+
+def test_generate_native_filter_range_normal():
+    report_schedule = ReportSchedule()
+    result, warning = report_schedule._generate_native_filter(
+        "F5", "filter_range", "price", [10, 100]
+    )
+    assert result == {
+        "F5": {
+            "id": "F5",
+            "extraFormData": {
+                "filters": [
+                    {"col": "price", "op": ">=", "val": 10},
+                    {"col": "price", "op": "<=", "val": 100},
+                ]
+            },
+            "filterState": {
+                "value": [10, 100],
+                "label": "10 ≤ x ≤ 100",
+            },
+            "ownState": {},
+        }
+    }
+    assert warning is None
+
+
+def test_generate_native_filter_range_min_only():
+    report_schedule = ReportSchedule()
+    result, warning = report_schedule._generate_native_filter(
+        "F5", "filter_range", "price", [10]
+    )
+    assert result["F5"]["extraFormData"]["filters"] == [
+        {"col": "price", "op": ">=", "val": 10}
+    ]
+    assert result["F5"]["filterState"]["label"] == "x ≥ 10"
+    assert result["F5"]["filterState"]["value"] == [10, None]
+    assert warning is None
+
+
+def test_generate_native_filter_range_max_only():
+    report_schedule = ReportSchedule()
+    result, warning = report_schedule._generate_native_filter(
+        "F5", "filter_range", "price", [None, 100]
+    )
+    assert result["F5"]["extraFormData"]["filters"] == [
+        {"col": "price", "op": "<=", "val": 100}
+    ]
+    assert result["F5"]["filterState"]["label"] == "x ≤ 100"
+    assert warning is None
+
+
+def test_report_generate_native_filter_unknown_filter_type():
+    """
+    Test the ``_generate_native_filter`` method with an unknown filter type.
+    Should return empty dict and a warning message.
+    """
+    report_schedule = ReportSchedule()
+    native_filter_id = "filter_id"
+    filter_type = "filter_unknown"
+    column_name = "column_name"
+    values = ["value1", "value2"]
+
+    result, warning = report_schedule._generate_native_filter(
+        native_filter_id, filter_type, column_name, values
+    )
+    assert result == {}
+    assert warning is not None
+    assert "unrecognized filter type" in warning
+    assert "filter_unknown" in warning
+    assert "filter_id" in warning
+
+
+def test_get_native_filters_params_null_native_filters():
+    report_schedule = ReportSchedule()
+    report_schedule.extra = {"dashboard": {"nativeFilters": None}}
+    result, warnings = report_schedule.get_native_filters_params()
+    assert result == "()"
+    assert warnings == []
+
+
+def test_get_native_filters_params_rison_quote_escaping():
+    report_schedule = ReportSchedule()
+    report_schedule.extra = {
+        "dashboard": {
+            "nativeFilters": [
+                {
+                    "nativeFilterId": "F1",
+                    "filterType": "filter_select",
+                    "columnName": "name",
+                    "filterValues": ["O'Brien"],
+                }
+            ]
+        }
+    }
+    result, warnings = report_schedule.get_native_filters_params()
+    assert "'" not in result
+    assert "%27" in result
+    assert warnings == []
+
+
+def test_get_native_filters_params_unknown_filter_type():
+    """
+    Test the ``get_native_filters_params`` method with an unknown filter type.
+    Should skip the filter and include a warning.
+    """
+    report_schedule = ReportSchedule()
+    report_schedule.extra = {
+        "dashboard": {
+            "nativeFilters": [
+                {
+                    "nativeFilterId": "filter_1",
+                    "filterType": "filter_unknown_type",
+                    "columnName": "column_name",
+                    "filterValues": ["value1"],
+                },
+                {
+                    "nativeFilterId": "filter_2",
+                    "filterType": "filter_select",
+                    "columnName": "column_name",
+                    "filterValues": ["value2"],
+                },
+            ]
+        }
+    }
+
+    result, warnings = report_schedule.get_native_filters_params()
+    # The unknown filter should be skipped, valid filter should be present
+    assert "filter_2" in result
+    assert "filter_1" not in result
+    assert "value2" in result
+    # Should have one warning for the unknown filter type
+    assert len(warnings) == 1
+    assert "unrecognized filter type" in warnings[0]
+    assert "filter_unknown_type" in warnings[0]
+
+
+def test_report_generate_native_filter_time_empty_values():
+    """
+    Test filter_time with empty values returns empty dict and warning.
+    """
+    report_schedule = ReportSchedule()
+    result, warning = report_schedule._generate_native_filter(
+        "filter_id", "filter_time", "column_name", []
+    )
+    assert result == {}
+    assert warning is not None
+    assert "filter_time" in warning
+    assert "empty filterValues" in warning
+    assert "filter_id" in warning
+
+
+def test_report_generate_native_filter_timegrain_empty_values():
+    """
+    Test filter_timegrain with empty values returns empty dict and warning.
+    """
+    report_schedule = ReportSchedule()
+    result, warning = report_schedule._generate_native_filter(
+        "filter_id", "filter_timegrain", "column_name", []
+    )
+    assert result == {}
+    assert warning is not None
+    assert "filter_timegrain" in warning
+    assert "empty filterValues" in warning
+    assert "filter_id" in warning
+
+
+def test_report_generate_native_filter_timecolumn_empty_values():
+    """
+    Test filter_timecolumn with empty values returns empty dict and warning.
+    """
+    report_schedule = ReportSchedule()
+    result, warning = report_schedule._generate_native_filter(
+        "filter_id", "filter_timecolumn", "column_name", []
+    )
+    assert result == {}
+    assert warning is not None
+    assert "filter_timecolumn" in warning
+    assert "empty filterValues" in warning
+    assert "filter_id" in warning
+
+
+def test_report_generate_native_filter_range_empty_values():
+    """
+    Test filter_range with empty values returns empty dict and warning.
+    """
+    report_schedule = ReportSchedule()
+    result, warning = report_schedule._generate_native_filter(
+        "filter_id", "filter_range", "column_name", []
+    )
+    assert result == {}
+    assert warning is not None
+    assert "filter_range" in warning
+    assert "empty filterValues" in warning
+    assert "filter_id" in warning
+
+
+def test_get_native_filters_params_time_filters_empty_values():
+    """
+    Test get_native_filters_params with time filters having empty values.
+    Should skip those filters and include warnings.
+    """
+    report_schedule = ReportSchedule()
+    report_schedule.extra = {
+        "dashboard": {
+            "nativeFilters": [
+                {
+                    "nativeFilterId": "time_filter",
+                    "filterType": "filter_time",
+                    "columnName": "time_col",
+                    "filterValues": [],  # Empty values
+                },
+                {
+                    "nativeFilterId": "timegrain_filter",
+                    "filterType": "filter_timegrain",
+                    "columnName": "grain_col",
+                    "filterValues": None,  # None values (coerced to [])
+                },
+                {
+                    "nativeFilterId": "select_filter",
+                    "filterType": "filter_select",
+                    "columnName": "select_col",
+                    "filterValues": ["value1"],  # Valid filter
+                },
+            ]
+        }
+    }
+
+    result, warnings = report_schedule.get_native_filters_params()
+    # The time filters should be skipped, select filter should be present
+    assert "select_filter" in result
+    assert "time_filter" not in result
+    assert "timegrain_filter" not in result
+    assert "value1" in result
+    # Should have two warnings for the empty time filters
+    assert len(warnings) == 2
+    assert any("filter_time" in w for w in warnings)
+    assert any("filter_timegrain" in w for w in warnings)
+
+
+def test_get_native_filters_params_missing_filter_id_key():
+    report_schedule = ReportSchedule()
+    report_schedule.extra = {
+        "dashboard": {
+            "nativeFilters": [
+                {
+                    "filterType": "filter_select",
+                    "columnName": "col",
+                    "filterValues": ["v"],
+                    # Missing "nativeFilterId" key — skipped by defensive guard
+                }
+            ]
+        }
+    }
+    result, warnings = report_schedule.get_native_filters_params()
+    assert result == "()"
+    assert len(warnings) == 1
+    assert "Skipping malformed native filter" in warnings[0]
+
+
+def test_generate_native_filter_empty_filter_id():
+    """Empty native_filter_id triggers the ``or ""`` fallback branches."""
+    report_schedule = ReportSchedule()
+    result, warning = report_schedule._generate_native_filter(
+        "", "filter_select", "col", ["x"]
+    )
+    assert "" in result
+    assert result[""]["id"] == ""
+    assert warning is None
+
+
+def test_generate_native_filter_range_zero_min():
+    """Zero min_val should produce a two-sided label, not a max-only label."""
+    report_schedule = ReportSchedule()
+    result, _ = report_schedule._generate_native_filter(
+        "F5", "filter_range", "price", [0, 100]
+    )
+    assert result["F5"]["extraFormData"]["filters"] == [
+        {"col": "price", "op": ">=", "val": 0},
+        {"col": "price", "op": "<=", "val": 100},
+    ]
+    # Label generation correctly treats zero as a valid bound
+    assert result["F5"]["filterState"]["label"] == "0 ≤ x ≤ 100"
+
+
+def test_generate_native_filter_range_zero_max():
+    """Zero max_val should produce a two-sided label, not a min-only label."""
+    report_schedule = ReportSchedule()
+    result, _ = report_schedule._generate_native_filter(
+        "F5", "filter_range", "price", [10, 0]
+    )
+    assert result["F5"]["extraFormData"]["filters"] == [
+        {"col": "price", "op": ">=", "val": 10},
+        {"col": "price", "op": "<=", "val": 0},
+    ]
+    assert result["F5"]["filterState"]["label"] == "10 ≤ x ≤ 0"
+
+
+def test_generate_native_filter_range_both_zero():
+    """Both values zero should produce a two-sided label, not an empty string."""
+    report_schedule = ReportSchedule()
+    result, _ = report_schedule._generate_native_filter(
+        "F5", "filter_range", "price", [0, 0]
+    )
+    assert result["F5"]["extraFormData"]["filters"] == [
+        {"col": "price", "op": ">=", "val": 0},
+        {"col": "price", "op": "<=", "val": 0},
+    ]
+    assert result["F5"]["filterState"]["label"] == "0 ≤ x ≤ 0"
+
+
+def test_get_native_filters_params_missing_filter_type():
+    """Missing filterType skips the filter and emits a warning."""
+    report_schedule = ReportSchedule()
+    report_schedule.extra = {
+        "dashboard": {
+            "nativeFilters": [
+                {
+                    "nativeFilterId": "F1",
+                    "columnName": "col",
+                    "filterValues": ["v"],
+                }
+            ]
+        }
+    }
+    result, warnings = report_schedule.get_native_filters_params()
+    assert result == "()"
+    assert len(warnings) == 1
+    assert "Skipping malformed native filter" in warnings[0]
+
+
+def test_get_native_filters_params_missing_column_name():
+    """Missing columnName defaults to empty string via .get() fallback."""
+    report_schedule = ReportSchedule()
+    report_schedule.extra = {
+        "dashboard": {
+            "nativeFilters": [
+                {
+                    "nativeFilterId": "F1",
+                    "filterType": "filter_select",
+                    "filterValues": ["v"],
+                }
+            ]
+        }
+    }
+    result, warnings = report_schedule.get_native_filters_params()
+    assert "F1" in result
+    assert warnings == []
+
+
+def test_generate_native_filter_range_null_column():
+    """Range filter with None column_name falls back to empty string."""
+    report_schedule = ReportSchedule()
+    result, warning = report_schedule._generate_native_filter(
+        "F5", "filter_range", None, [10, 100]
+    )
+    assert result["F5"]["extraFormData"]["filters"][0]["col"] == ""
+    assert result["F5"]["extraFormData"]["filters"][1]["col"] == ""
+    assert warning is None
+
+
+def test_generate_native_filter_time_empty_id():
+    """Empty string filter ID for filter_time uses the ``or ""`` fallback."""
+    report_schedule = ReportSchedule()
+    result, warning = report_schedule._generate_native_filter(
+        "", "filter_time", "ignored", ["Last week"]
+    )
+    assert "" in result
+    assert result[""]["id"] == ""
+    assert warning is None
diff --git a/tests/unit_tests/reports/notifications/slack_tests.py b/tests/unit_tests/reports/notifications/slack_tests.py
index 1457544ec7e..d1a1a99d95e 100644
--- a/tests/unit_tests/reports/notifications/slack_tests.py
+++ b/tests/unit_tests/reports/notifications/slack_tests.py
@@ -377,3 +377,57 @@ def test_send_slack_no_feature_flag(
 ```
 """,
     )
+
+
+@patch("superset.reports.notifications.slackv2.g")
+@patch("superset.reports.notifications.slackv2.get_slack_client")
+def test_slackv2_send_without_channels_raises(
+    slack_client_mock: MagicMock,
+    flask_global_mock: MagicMock,
+    mock_header_data,
+) -> None:
+    from superset.reports.models import ReportRecipients, ReportRecipientType
+    from superset.reports.notifications.base import NotificationContent
+    from superset.reports.notifications.exceptions import NotificationParamException
+
+    flask_global_mock.logs_context = {}
+    content = NotificationContent(name="test", header_data=mock_header_data)
+    notification = SlackV2Notification(
+        recipient=ReportRecipients(
+            type=ReportRecipientType.SLACKV2,
+            recipient_config_json='{"target": ""}',
+        ),
+        content=content,
+    )
+    with pytest.raises(NotificationParamException, match="No recipients"):
+        notification.send()
+
+
+@patch("superset.reports.notifications.slackv2.g")
+@patch("superset.reports.notifications.slackv2.get_slack_client")
+def test_slack_mixin_get_body_truncates_large_table(
+    slack_client_mock: MagicMock,
+    flask_global_mock: MagicMock,
+    mock_header_data,
+) -> None:
+    from superset.reports.models import ReportRecipients, ReportRecipientType
+    from superset.reports.notifications.base import NotificationContent
+
+    flask_global_mock.logs_context = {}
+    # Create a large DataFrame that exceeds the 4000-char message limit
+    large_df = pd.DataFrame({"col_" + str(i): range(100) for i in range(10)})
+    content = NotificationContent(
+        name="test",
+        header_data=mock_header_data,
+        embedded_data=large_df,
+        description="desc",
+    )
+    notification = SlackV2Notification(
+        recipient=ReportRecipients(
+            type=ReportRecipientType.SLACKV2,
+            recipient_config_json='{"target": "some_channel"}',
+        ),
+        content=content,
+    )
+    body = notification._get_body(content=content)
+    assert "(table was truncated)" in body
diff --git a/tests/unit_tests/reports/schemas_test.py b/tests/unit_tests/reports/schemas_test.py
index cf72149070b..49e7fdfe649 100644
--- a/tests/unit_tests/reports/schemas_test.py
+++ b/tests/unit_tests/reports/schemas_test.py
@@ -19,7 +19,7 @@ import pytest
 from marshmallow import ValidationError
 from pytest_mock import MockerFixture
 
-from superset.reports.schemas import ReportSchedulePostSchema
+from superset.reports.schemas import ReportSchedulePostSchema, ReportSchedulePutSchema
 
 
 def test_report_post_schema_custom_width_validation(mocker: MockerFixture) -> None:
@@ -75,3 +75,184 @@ def test_report_post_schema_custom_width_validation(mocker: MockerFixture) -> No
     assert excinfo.value.messages == {
         "custom_width": ["Screenshot width must be between 100px and 200px"]
     }
+
+
+MINIMAL_POST_PAYLOAD = {
+    "type": "Report",
+    "name": "A report",
+    "crontab": "* * * * *",
+    "timezone": "America/Los_Angeles",
+}
+
+CUSTOM_WIDTH_CONFIG = {
+    "ALERT_REPORTS_MIN_CUSTOM_SCREENSHOT_WIDTH": 600,
+    "ALERT_REPORTS_MAX_CUSTOM_SCREENSHOT_WIDTH": 2400,
+}
+
+
+@pytest.mark.parametrize(
+    "schema_class,payload_base",
+    [
+        (ReportSchedulePostSchema, MINIMAL_POST_PAYLOAD),
+        (ReportSchedulePutSchema, {}),
+    ],
+    ids=["post", "put"],
+)
+@pytest.mark.parametrize(
+    "width,should_pass",
+    [
+        (599, False),
+        (600, True),
+        (2400, True),
+        (2401, False),
+        (None, True),
+    ],
+)
+def test_custom_width_boundary_values(
+    mocker: MockerFixture,
+    schema_class: type,
+    payload_base: dict[str, object],
+    width: int | None,
+    should_pass: bool,
+) -> None:
+    mocker.patch("flask.current_app.config", CUSTOM_WIDTH_CONFIG)
+    schema = schema_class()
+    payload = {**payload_base, "custom_width": width}
+
+    if should_pass:
+        schema.load(payload)
+    else:
+        with pytest.raises(ValidationError) as exc:
+            schema.load(payload)
+        assert "custom_width" in exc.value.messages
+
+
+def test_working_timeout_validation(mocker: MockerFixture) -> None:
+    mocker.patch("flask.current_app.config", CUSTOM_WIDTH_CONFIG)
+    post_schema = ReportSchedulePostSchema()
+    put_schema = ReportSchedulePutSchema()
+
+    # POST: working_timeout=0 and -1 are invalid (min=1)
+    with pytest.raises(ValidationError) as exc:
+        post_schema.load({**MINIMAL_POST_PAYLOAD, "working_timeout": 0})
+    assert "working_timeout" in exc.value.messages
+
+    with pytest.raises(ValidationError) as exc:
+        post_schema.load({**MINIMAL_POST_PAYLOAD, "working_timeout": -1})
+    assert "working_timeout" in exc.value.messages
+
+    # POST: working_timeout=1 is valid
+    post_schema.load({**MINIMAL_POST_PAYLOAD, "working_timeout": 1})
+
+    # PUT: working_timeout=None is valid (allow_none=True)
+    put_schema.load({"working_timeout": None})
+
+
+def test_log_retention_post_vs_put_parity(mocker: MockerFixture) -> None:
+    mocker.patch("flask.current_app.config", CUSTOM_WIDTH_CONFIG)
+    post_schema = ReportSchedulePostSchema()
+    put_schema = ReportSchedulePutSchema()
+
+    # POST: log_retention=0 is invalid (min=1)
+    with pytest.raises(ValidationError) as exc:
+        post_schema.load({**MINIMAL_POST_PAYLOAD, "log_retention": 0})
+    assert "log_retention" in exc.value.messages
+
+    # POST: log_retention=1 is valid
+    post_schema.load({**MINIMAL_POST_PAYLOAD, "log_retention": 1})
+
+    # PUT: log_retention=0 is valid (min=0)
+    put_schema.load({"log_retention": 0})
+
+
+def test_report_type_disallows_database(mocker: MockerFixture) -> None:
+    mocker.patch("flask.current_app.config", CUSTOM_WIDTH_CONFIG)
+    schema = ReportSchedulePostSchema()
+
+    with pytest.raises(ValidationError) as exc:
+        schema.load({**MINIMAL_POST_PAYLOAD, "database": 1})
+    assert "database" in exc.value.messages
+
+
+def test_alert_type_allows_database(mocker: MockerFixture) -> None:
+    """Alert type should accept database; only Report type blocks it."""
+    mocker.patch("flask.current_app.config", CUSTOM_WIDTH_CONFIG)
+    schema = ReportSchedulePostSchema()
+    result = schema.load({**MINIMAL_POST_PAYLOAD, "type": "Alert", "database": 1})
+    assert result["database"] == 1
+
+
+# ---------------------------------------------------------------------------
+# Phase 1b gap closure: crontab validator, name length, PUT parity
+# ---------------------------------------------------------------------------
+
+
+@pytest.mark.parametrize(
+    "crontab,should_pass",
+    [
+        ("* * * * *", True),
+        ("0 0 * * 0", True),
+        ("*/5 * * * *", True),
+        ("not a cron", False),
+        ("* * * *", False),  # too few fields
+        ("", False),
+    ],
+    ids=["every-min", "weekly", "every-5", "invalid-text", "too-few-fields", "empty"],
+)
+def test_crontab_validation(
+    mocker: MockerFixture,
+    crontab: str,
+    should_pass: bool,
+) -> None:
+    mocker.patch("flask.current_app.config", CUSTOM_WIDTH_CONFIG)
+    schema = ReportSchedulePostSchema()
+    payload = {**MINIMAL_POST_PAYLOAD, "crontab": crontab}
+
+    if should_pass:
+        result = schema.load(payload)
+        assert result["crontab"] == crontab
+    else:
+        with pytest.raises(ValidationError) as exc:
+            schema.load(payload)
+        assert "crontab" in exc.value.messages
+
+
+def test_name_empty_rejected(mocker: MockerFixture) -> None:
+    mocker.patch("flask.current_app.config", CUSTOM_WIDTH_CONFIG)
+    schema = ReportSchedulePostSchema()
+
+    with pytest.raises(ValidationError) as exc:
+        schema.load({**MINIMAL_POST_PAYLOAD, "name": ""})
+    assert "name" in exc.value.messages
+
+
+def test_name_at_max_length_accepted(mocker: MockerFixture) -> None:
+    mocker.patch("flask.current_app.config", CUSTOM_WIDTH_CONFIG)
+    schema = ReportSchedulePostSchema()
+    long_name = "x" * 150
+    result = schema.load({**MINIMAL_POST_PAYLOAD, "name": long_name})
+    assert result["name"] == long_name
+
+
+def test_name_over_max_length_rejected(mocker: MockerFixture) -> None:
+    mocker.patch("flask.current_app.config", CUSTOM_WIDTH_CONFIG)
+    schema = ReportSchedulePostSchema()
+
+    with pytest.raises(ValidationError) as exc:
+        schema.load({**MINIMAL_POST_PAYLOAD, "name": "x" * 151})
+    assert "name" in exc.value.messages
+
+
+def test_put_schema_allows_database_on_report_type(mocker: MockerFixture) -> None:
+    """PUT schema lacks validate_report_references — database on Report type is
+    accepted (documents current behavior; POST schema correctly rejects this)."""
+    mocker.patch("flask.current_app.config", CUSTOM_WIDTH_CONFIG)
+    put_schema = ReportSchedulePutSchema()
+    result = put_schema.load({"type": "Report", "database": 1})
+    assert result["database"] == 1
+
+    # POST schema rejects it (verify the asymmetry)
+    post_schema = ReportSchedulePostSchema()
+    with pytest.raises(ValidationError) as exc:
+        post_schema.load({**MINIMAL_POST_PAYLOAD, "database": 1})
+    assert "database" in exc.value.messages
diff --git a/tests/unit_tests/result_set_test.py b/tests/unit_tests/result_set_test.py
index da5dcdafabc..25df635247d 100644
--- a/tests/unit_tests/result_set_test.py
+++ b/tests/unit_tests/result_set_test.py
@@ -185,3 +185,62 @@ def test_get_column_description_from_empty_data_using_cursor_description(
     )
     assert any(col.get("column_name") == "__time" for col in result_set.columns)
     logger.exception.assert_not_called()
+
+
+def test_empty_column_names_get_synthetic_names() -> None:
+    """
+    SQL Server returns an empty-string column name in cursor.description for
+    any un-aliased expression (e.g. ``SELECT COUNT(*) FROM t``).  An empty
+    field name is illegal in NumPy structured arrays and PyArrow tables.
+
+    SupersetResultSet must replace empty column names with synthetic names
+    so queries like ``SELECT COUNT(*) FROM t`` succeed on MSSQL.
+
+    Regression test for https://github.com/apache/superset/issues/23848
+    """
+    data = [(42,)]
+    description = [("", 3, None, None, None, None, None)]
+    result_set = SupersetResultSet(data, description, BaseEngineSpec)  # type: ignore
+
+    assert result_set.columns[0]["column_name"] == "_col_0"
+    df = result_set.to_pandas_df()
+    assert list(df.columns) == ["_col_0"]
+    assert df["_col_0"].iloc[0] == 42
+
+
+def test_multiple_empty_column_names_get_unique_synthetic_names() -> None:
+    """
+    When several columns have empty names (e.g. ``SELECT COUNT(*), SUM(x)``
+    on MSSQL), each must receive a distinct synthetic name.
+    """
+    data = [(10, 20)]
+    description = [
+        ("", 3, None, None, None, None, None),
+        ("", 3, None, None, None, None, None),
+    ]
+    result_set = SupersetResultSet(data, description, BaseEngineSpec)  # type: ignore
+
+    col_names = [c["column_name"] for c in result_set.columns]
+    assert len(col_names) == 2
+    assert len(set(col_names)) == 2  # all unique
+    df = result_set.to_pandas_df()
+    assert df.iloc[0].tolist() == [10, 20]
+
+
+def test_empty_column_names_do_not_rename_explicit_synthetic_names() -> None:
+    """
+    Synthetic names assigned to empty columns must not collide with explicit
+    user-selected names that already look like Superset fallbacks.
+    """
+    data = [(10, 20)]
+    description = [
+        ("", 3, None, None, None, None, None),
+        ("_col_0", 3, None, None, None, None, None),
+    ]
+    result_set = SupersetResultSet(data, description, BaseEngineSpec)  # type: ignore
+
+    col_names = [c["column_name"] for c in result_set.columns]
+    assert col_names == ["_col_1", "_col_0"]
+    df = result_set.to_pandas_df()
+    assert list(df.columns) == ["_col_1", "_col_0"]
+    assert df.iloc[0].tolist() == [10, 20]
diff --git a/tests/unit_tests/security/api_test.py b/tests/unit_tests/security/api_test.py
index 869b3308478..b26d2687990 100644
--- a/tests/unit_tests/security/api_test.py
+++ b/tests/unit_tests/security/api_test.py
@@ -14,6 +14,8 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
+from typing import Any
+
 import pytest
 
 from superset.extensions import csrf
@@ -24,12 +26,13 @@ from superset.extensions import csrf
     [{"WTF_CSRF_ENABLED": True}],
     indirect=True,
 )
-def test_csrf_not_exempt(app_context: None) -> None:
+def test_csrf_exempt_blueprints(app_context: None) -> None:
     """
-    Test that REST API is not exempt from CSRF.
+    Test that only FAB security API blueprints (which use token-based auth)
+    are exempt from CSRF protection.
     """
     assert {blueprint.name for blueprint in csrf._exempt_blueprints} == {
-        "GroupApi",
+        "SupersetGroupApi",
         "MenuApi",
         "SecurityApi",
         "OpenApi",
@@ -39,3 +42,21 @@ def test_csrf_not_exempt(app_context: None) -> None:
         "PermissionApi",
         "ViewMenuApi",
     }
+
+
+@pytest.mark.parametrize(
+    "app",
+    [
+        {
+            "WTF_CSRF_ENABLED": True,
+            "FAB_API_KEY_ENABLED": True,
+        }
+    ],
+    indirect=True,
+)
+def test_csrf_exempt_blueprints_with_api_key(app: Any, app_context: None) -> None:
+    """
+    Test that ApiKeyApi blueprint is CSRF-exempt when FAB_API_KEY_ENABLED
+    config is enabled.
+    """
+    assert "ApiKeyApi" in {blueprint.name for blueprint in csrf._exempt_blueprints}
diff --git a/tests/unit_tests/security/audit_log_test.py b/tests/unit_tests/security/audit_log_test.py
new file mode 100644
index 00000000000..276da24a6f9
--- /dev/null
+++ b/tests/unit_tests/security/audit_log_test.py
@@ -0,0 +1,251 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+from unittest.mock import MagicMock, patch
+
+from flask_appbuilder.security.sqla.models import Group, Role, User
+
+from superset.security.manager import (
+    _log_audit_event,
+    SupersetGroupApi,
+    SupersetRoleApi,
+    SupersetSecurityManager,
+    SupersetUserApi,
+)
+
+
+@patch("superset.extensions.event_logger")
+@patch("superset.security.manager.get_user_id", return_value=1)
+def test_log_audit_event_calls_event_logger(
+    mock_get_user_id: MagicMock,
+    mock_event_logger: MagicMock,
+) -> None:
+    """_log_audit_event delegates to the configured event_logger."""
+    _log_audit_event("TestAction", {"key": "value"})
+
+    mock_event_logger.log.assert_called_once_with(
+        user_id=1,
+        action="TestAction",
+        dashboard_id=None,
+        duration_ms=None,
+        slice_id=None,
+        referrer=None,
+        curated_payload=None,
+        curated_form_data=None,
+        records=[{"key": "value"}],
+    )
+
+
+@patch("superset.extensions.event_logger")
+@patch("superset.security.manager.get_user_id", return_value=1)
+def test_log_audit_event_handles_logger_error(
+    mock_get_user_id: MagicMock,
+    mock_event_logger: MagicMock,
+) -> None:
+    """_log_audit_event does not raise on event_logger errors."""
+    mock_event_logger.log.side_effect = Exception("Logger error")
+    # Should not raise
+    _log_audit_event("TestAction", {"key": "value"})
+
+
+# --- Role CRUD ---
+
+
+@patch("superset.security.manager._log_audit_event")
+def test_role_api_post_add_logs_event(mock_log: MagicMock) -> None:
+    """SupersetRoleApi.post_add logs a RoleCreated event."""
+    api = SupersetRoleApi.__new__(SupersetRoleApi)
+    role = MagicMock(spec=Role)
+    role.name = "TestRole"
+    role.id = 42
+    api.post_add(role)
+    mock_log.assert_called_once_with(
+        "RoleCreated", {"role_name": "TestRole", "role_id": 42}
+    )
+
+
+@patch("superset.security.manager._log_audit_event")
+def test_role_api_post_update_logs_event(mock_log: MagicMock) -> None:
+    """SupersetRoleApi.post_update logs a RoleUpdated event."""
+    api = SupersetRoleApi.__new__(SupersetRoleApi)
+    role = MagicMock(spec=Role)
+    role.name = "TestRole"
+    role.id = 42
+    api.post_update(role)
+    mock_log.assert_called_once_with(
+        "RoleUpdated", {"role_name": "TestRole", "role_id": 42}
+    )
+
+
+@patch("superset.security.manager._log_audit_event")
+def test_role_api_post_delete_logs_event(mock_log: MagicMock) -> None:
+    """SupersetRoleApi.post_delete logs a RoleDeleted event."""
+    api = SupersetRoleApi.__new__(SupersetRoleApi)
+    role = MagicMock(spec=Role)
+    role.name = "TestRole"
+    role.id = 42
+    api.post_delete(role)
+    mock_log.assert_called_once_with(
+        "RoleDeleted", {"role_name": "TestRole", "role_id": 42}
+    )
+
+
+# --- User CRUD ---
+
+
+@patch("superset.security.manager._log_audit_event")
+def test_user_api_post_add_logs_event(mock_log: MagicMock) -> None:
+    """SupersetUserApi.post_add logs a UserCreated event."""
+    api = SupersetUserApi.__new__(SupersetUserApi)
+    user = MagicMock(spec=User)
+    user.username = "testuser"
+    user.id = 7
+    user.email = "test@example.com"
+    api.post_add(user)
+    mock_log.assert_called_once_with(
+        "UserCreated",
+        {
+            "target_username": "testuser",
+            "target_user_id": 7,
+            "email": "test@example.com",
+        },
+    )
+
+
+@patch("superset.security.manager._log_audit_event")
+def test_user_api_post_update_logs_event(mock_log: MagicMock) -> None:
+    """SupersetUserApi.post_update logs a UserUpdated event."""
+    api = SupersetUserApi.__new__(SupersetUserApi)
+    user = MagicMock(spec=User)
+    user.username = "testuser"
+    user.id = 7
+    user.email = "test@example.com"
+    user.active = True
+    api.post_update(user)
+    mock_log.assert_called_once_with(
+        "UserUpdated",
+        {
+            "target_username": "testuser",
+            "target_user_id": 7,
+            "email": "test@example.com",
+            "active": True,
+        },
+    )
+
+
+@patch("superset.security.manager._log_audit_event")
+def test_user_api_post_delete_logs_event(mock_log: MagicMock) -> None:
+    """SupersetUserApi.post_delete logs a UserDeleted event."""
+    api = SupersetUserApi.__new__(SupersetUserApi)
+    user = MagicMock(spec=User)
+    user.username = "testuser"
+    user.id = 7
+    api.post_delete(user)
+    mock_log.assert_called_once_with(
+        "UserDeleted",
+        {"target_username": "testuser", "target_user_id": 7},
+    )
+
+
+# --- Group CRUD ---
+
+
+@patch("superset.security.manager._log_audit_event")
+def test_group_api_post_add_logs_event(mock_log: MagicMock) -> None:
+    """SupersetGroupApi.post_add logs a GroupCreated event."""
+    api = SupersetGroupApi.__new__(SupersetGroupApi)
+    group = MagicMock(spec=Group)
+    group.name = "TestGroup"
+    group.id = 10
+    api.post_add(group)
+    mock_log.assert_called_once_with(
+        "GroupCreated", {"group_name": "TestGroup", "group_id": 10}
+    )
+
+
+@patch("superset.security.manager._log_audit_event")
+def test_group_api_post_update_logs_event(mock_log: MagicMock) -> None:
+    """SupersetGroupApi.post_update logs a GroupUpdated event."""
+    api = SupersetGroupApi.__new__(SupersetGroupApi)
+    group = MagicMock(spec=Group)
+    group.name = "TestGroup"
+    group.id = 10
+    api.post_update(group)
+    mock_log.assert_called_once_with(
+        "GroupUpdated", {"group_name": "TestGroup", "group_id": 10}
+    )
+
+
+@patch("superset.security.manager._log_audit_event")
+def test_group_api_post_delete_logs_event(mock_log: MagicMock) -> None:
+    """SupersetGroupApi.post_delete logs a GroupDeleted event."""
+    api = SupersetGroupApi.__new__(SupersetGroupApi)
+    group = MagicMock(spec=Group)
+    group.name = "TestGroup"
+    group.id = 10
+    api.post_delete(group)
+    mock_log.assert_called_once_with(
+        "GroupDeleted", {"group_name": "TestGroup", "group_id": 10}
+    )
+
+
+# --- Login / Logout ---
+
+
+@patch("superset.security.manager._log_audit_event")
+def test_on_user_login_logs_event(mock_log: MagicMock) -> None:
+    """on_user_login logs a UserLoggedIn event."""
+    sm = SupersetSecurityManager.__new__(SupersetSecurityManager)
+    user = MagicMock(spec=User)
+    user.username = "testuser"
+    user.id = 7
+
+    sm.on_user_login(user)
+
+    mock_log.assert_called_once_with(
+        "UserLoggedIn", {"username": "testuser", "user_id": 7}
+    )
+
+
+@patch("superset.security.manager._log_audit_event")
+def test_on_user_login_failed_logs_event(mock_log: MagicMock) -> None:
+    """on_user_login_failed logs a UserLoginFailed event."""
+    sm = SupersetSecurityManager.__new__(SupersetSecurityManager)
+    user = MagicMock(spec=User)
+    user.username = "testuser"
+    user.id = 7
+
+    sm.on_user_login_failed(user)
+
+    mock_log.assert_called_once_with(
+        "UserLoginFailed", {"username": "testuser", "user_id": 7}
+    )
+
+
+@patch("superset.security.manager._log_audit_event")
+def test_on_user_logout_logs_event(mock_log: MagicMock) -> None:
+    """on_user_logout logs a UserLoggedOut event."""
+    sm = SupersetSecurityManager.__new__(SupersetSecurityManager)
+    user = MagicMock(spec=User)
+    user.username = "testuser"
+    user.id = 7
+
+    sm.on_user_logout(user)
+
+    mock_log.assert_called_once_with(
+        "UserLoggedOut", {"username": "testuser", "user_id": 7}
+    )
diff --git a/tests/unit_tests/sql/dialects/opensearch_tests.py b/tests/unit_tests/sql/dialects/opensearch_tests.py
new file mode 100644
index 00000000000..c68c343a7ad
--- /dev/null
+++ b/tests/unit_tests/sql/dialects/opensearch_tests.py
@@ -0,0 +1,240 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+import pytest
+import sqlglot
+
+from superset.sql.dialects.opensearch import OpenSearch
+
+
+def test_opensearch_dialect_registered() -> None:
+    """
+    Test that OpenSearch dialect is properly registered for odelasticsearch.
+    """
+    from superset.sql.parse import SQLGLOT_DIALECTS
+
+    assert "odelasticsearch" in SQLGLOT_DIALECTS
+    assert SQLGLOT_DIALECTS["odelasticsearch"] == OpenSearch
+
+
+def test_double_quotes_as_identifiers() -> None:
+    """
+    Test that double quotes are treated as identifiers, not string literals.
+    """
+    sql = 'SELECT "AvgTicketPrice" FROM "flights"'
+    ast = sqlglot.parse_one(sql, OpenSearch)
+
+    assert (
+        OpenSearch().generate(expression=ast, pretty=True)
+        == """
+SELECT
+  "AvgTicketPrice"
+FROM "flights"
+        """.strip()
+    )
+
+
+def test_single_quotes_for_strings() -> None:
+    """
+    Test that single quotes are used for string literals.
+    """
+    sql = "SELECT * FROM flights WHERE Carrier = 'Kibana Airlines'"
+    ast = sqlglot.parse_one(sql, OpenSearch)
+
+    assert (
+        OpenSearch().generate(expression=ast, pretty=True)
+        == """
+SELECT
+  *
+FROM flights
+WHERE
+  Carrier = 'Kibana Airlines'
+        """.strip()
+    )
+
+
+def test_backticks_as_identifiers() -> None:
+    """
+    Test that backticks work as identifiers (MySQL-style).
+    Backticks are normalized to double quotes in output.
+    """
+    sql = "SELECT `AvgTicketPrice` FROM `flights`"
+    ast = sqlglot.parse_one(sql, OpenSearch)
+
+    assert (
+        OpenSearch().generate(expression=ast, pretty=True)
+        == """
+SELECT
+  "AvgTicketPrice"
+FROM "flights"
+        """.strip()
+    )
+
+
+def test_mixed_identifier_quotes() -> None:
+    """
+    Test mixing double quotes and backticks for identifiers.
+    """
+    sql = 'SELECT "AvgTicketPrice" AS `AvgTicketPrice` FROM `default`.`flights`'
+    ast = sqlglot.parse_one(sql, OpenSearch)
+
+    assert (
+        OpenSearch().generate(expression=ast, pretty=True)
+        == """
+SELECT
+  "AvgTicketPrice" AS "AvgTicketPrice"
+FROM "default"."flights"
+        """.strip()
+    )
+
+
+@pytest.mark.parametrize(
+    "sql, expected",
+    [
+        (
+            'SELECT COUNT(*) FROM "flights" WHERE "Cancelled" = true',
+            """
+SELECT
+  COUNT(*)
+FROM "flights"
+WHERE
+  "Cancelled" = TRUE
+            """.strip(),
+        ),
+        (
+            'SELECT "Carrier", SUM("AvgTicketPrice") FROM "flights" GROUP BY "Carrier"',
+            """
+SELECT
+  "Carrier",
+  SUM("AvgTicketPrice")
+FROM "flights"
+GROUP BY
+  "Carrier"
+            """.strip(),
+        ),
+        (
+            "SELECT * FROM \"flights\" WHERE \"DestCountry\" IN ('US', 'CA', 'MX')",
+            """
+SELECT
+  *
+FROM "flights"
+WHERE
+  "DestCountry" IN ('US', 'CA', 'MX')
+            """.strip(),
+        ),
+    ],
+)
+def test_various_queries(sql: str, expected: str) -> None:
+    """
+    Test various SQL queries with OpenSearch dialect.
+    """
+    ast = sqlglot.parse_one(sql, OpenSearch)
+    assert OpenSearch().generate(expression=ast, pretty=True) == expected
+
+
+def test_aggregate_functions() -> None:
+    """
+    Test aggregate functions with quoted identifiers.
+    """
+    sql = """
+SELECT
+    "Carrier",
+    COUNT(*),
+    AVG("AvgTicketPrice"),
+    MAX("FlightDelayMin")
+FROM "flights"
+GROUP BY "Carrier"
+    """
+    ast = sqlglot.parse_one(sql, OpenSearch)
+
+    assert (
+        OpenSearch().generate(expression=ast, pretty=True)
+        == """
+SELECT
+  "Carrier",
+  COUNT(*),
+  AVG("AvgTicketPrice"),
+  MAX("FlightDelayMin")
+FROM "flights"
+GROUP BY
+  "Carrier"
+        """.strip()
+    )
+
+
+def test_subquery_with_quoted_identifiers() -> None:
+    """
+    Test subqueries with quoted identifiers.
+    """
+    sql = 'SELECT * FROM (SELECT "Carrier", "AvgTicketPrice" FROM "flights") AS "sub"'
+    ast = sqlglot.parse_one(sql, OpenSearch)
+
+    assert (
+        OpenSearch().generate(expression=ast, pretty=True)
+        == """
+SELECT
+  *
+FROM (
+  SELECT
+    "Carrier",
+    "AvgTicketPrice"
+  FROM "flights"
+) AS "sub"
+        """.strip()
+    )
+
+
+def test_order_by_with_quoted_identifiers() -> None:
+    """
+    Test ORDER BY clause with quoted identifiers.
+    """
+    sql = (
+        'SELECT "Carrier", "AvgTicketPrice" FROM "flights" '
+        'ORDER BY "AvgTicketPrice" DESC, "Carrier" ASC'
+    )
+    ast = sqlglot.parse_one(sql, OpenSearch)
+
+    assert (
+        OpenSearch().generate(expression=ast, pretty=True)
+        == """
+SELECT
+  "Carrier",
+  "AvgTicketPrice"
+FROM "flights"
+ORDER BY
+  "AvgTicketPrice" DESC,
+  "Carrier" ASC
+        """.strip()
+    )
+
+
+def test_limit_clause() -> None:
+    """
+    Test LIMIT clause with quoted identifiers.
+    """
+    sql = 'SELECT * FROM "flights" LIMIT 10'
+    ast = sqlglot.parse_one(sql, OpenSearch)
+
+    assert (
+        OpenSearch().generate(expression=ast, pretty=True)
+        == """
+SELECT
+  *
+FROM "flights"
+LIMIT 10
+        """.strip()
+    )
diff --git a/tests/unit_tests/sql/execution/test_executor.py b/tests/unit_tests/sql/execution/test_executor.py
index 18b814a54d9..fdaf52f8a79 100644
--- a/tests/unit_tests/sql/execution/test_executor.py
+++ b/tests/unit_tests/sql/execution/test_executor.py
@@ -644,6 +644,78 @@ def test_execute_error(
     assert "Database error" in result.error_message
 
 
+def test_execute_oauth2_redirect_error_propagates(
+    mocker: MockerFixture, database: Database, app_context: None
+) -> None:
+    """Test that OAuth2RedirectError propagates instead of being swallowed."""
+    from superset.exceptions import OAuth2RedirectError
+
+    mock_conn = MagicMock()
+    mock_cursor = MagicMock()
+    mock_conn.cursor.return_value = mock_cursor
+    mock_conn.__enter__ = MagicMock(return_value=mock_conn)
+    mock_conn.__exit__ = MagicMock(return_value=False)
+    mocker.patch.object(database, "get_raw_connection", return_value=mock_conn)
+    mocker.patch.object(
+        database, "mutate_sql_based_on_config", side_effect=lambda sql, **kw: sql
+    )
+    mocker.patch.object(
+        database.db_engine_spec,
+        "execute",
+        side_effect=OAuth2RedirectError(
+            url="https://oauth.example.com/authorize",
+            tab_id="test-tab",
+            redirect_uri="https://superset.example.com/callback",
+        ),
+    )
+    mocker.patch.dict(
+        current_app.config,
+        {
+            "SQL_QUERY_MUTATOR": None,
+            "SQLLAB_TIMEOUT": 30,
+            "SQL_MAX_ROW": None,
+            "QUERY_LOGGER": None,
+        },
+    )
+
+    with pytest.raises(OAuth2RedirectError):
+        database.execute("SELECT 1")
+
+
+def test_execute_oauth2_error_propagates(
+    mocker: MockerFixture, database: Database, app_context: None
+) -> None:
+    """Test that OAuth2Error propagates instead of being swallowed."""
+    from superset.exceptions import OAuth2Error
+
+    mock_conn = MagicMock()
+    mock_cursor = MagicMock()
+    mock_conn.cursor.return_value = mock_cursor
+    mock_conn.__enter__ = MagicMock(return_value=mock_conn)
+    mock_conn.__exit__ = MagicMock(return_value=False)
+    mocker.patch.object(database, "get_raw_connection", return_value=mock_conn)
+    mocker.patch.object(
+        database, "mutate_sql_based_on_config", side_effect=lambda sql, **kw: sql
+    )
+    mocker.patch.object(
+        database.db_engine_spec,
+        "execute",
+        side_effect=OAuth2Error("No configuration found for OAuth2"),
+    )
+    mocker.patch.dict(
+        current_app.config,
+        {
+            "SQL_QUERY_MUTATOR": None,
+            "SQLLAB_TIMEOUT": 30,
+            "SQL_MAX_ROW": None,
+            "QUERY_LOGGER": None,
+        },
+    )
+
+    with pytest.raises(OAuth2Error):
+        database.execute("SELECT 1")
+
+
 # =============================================================================
 # Async Execution Tests
 # =============================================================================
diff --git a/tests/unit_tests/sql/parse_tests.py b/tests/unit_tests/sql/parse_tests.py
index 274acc01b5a..78b00f4487d 100644
--- a/tests/unit_tests/sql/parse_tests.py
+++ b/tests/unit_tests/sql/parse_tests.py
@@ -2693,9 +2693,19 @@ def test_is_valid_cvas(sql: str, engine: str, expected: bool) -> None:
         ),  # Compact format
         (
             "col = 'abc' -- comment",
-            "col = 'abc'",
+            "col = 'abc' /* comment */",
             "base",
-        ),  # Comments removed for compact format
+        ),  # Line comments converted to block comments
+        (
+            "TRUE /* precise_count_distinct=true */",
+            "TRUE /* precise_count_distinct=true */",
+            "base",
+        ),  # Block comments preserved
+        (
+            "col > 1 /* hint=value */",
+            "col > 1 /* hint=value */",
+            "base",
+        ),  # Block comments preserved
         ("col = 'col1 = 1) AND (col2 = 2'", "col = 'col1 = 1) AND (col2 = 2'", "base"),
         ("col = 'select 1; select 2'", "col = 'select 1; select 2'", "base"),
         ("col = 'abc -- comment'", "col = 'abc -- comment'", "base"),
diff --git a/tests/unit_tests/sql/test_firebolt_dialect.py b/tests/unit_tests/sql/test_firebolt_dialect.py
new file mode 100644
index 00000000000..88d9e89e680
--- /dev/null
+++ b/tests/unit_tests/sql/test_firebolt_dialect.py
@@ -0,0 +1,62 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+"""Tests for Firebolt dialect support in sqlglot."""
+
+from superset.sql.parse import SQLScript
+
+
+def test_firebolt_exclude_syntax() -> None:
+    """Test that Firebolt EXCLUDE syntax is preserved (not transformed to EXCEPT)."""
+    sql = "SELECT g.* EXCLUDE (source_file_timestamp) FROM public.games g"
+    script = SQLScript(sql, "firebolt")
+
+    generated = script.format()
+    assert "EXCLUDE" in generated
+    assert "EXCEPT" not in generated
+    assert "source_file_timestamp" in generated
+
+
+def test_firebolt_exclude_multiple_columns() -> None:
+    """Test EXCLUDE with multiple columns."""
+    sql = "SELECT * EXCLUDE (col1, col2, col3) FROM my_table"
+    script = SQLScript(sql, "firebolt")
+
+    generated = script.format()
+    assert "EXCLUDE" in generated
+    assert "EXCEPT" not in generated
+    assert "col1" in generated
+    assert "col2" in generated
+    assert "col3" in generated
+
+
+def test_firebolt_sql_parsing() -> None:
+    """Test that Firebolt SQL can be parsed without errors."""
+    sql = "SELECT * FROM my_table LIMIT 10"
+    script = SQLScript(sql, "firebolt")
+    assert len(script.statements) == 1
+    assert not script.has_mutation()
+
+
+def test_firebolt_not_in_parenthesized() -> None:
+    """Test that NOT IN is properly parenthesized in Firebolt."""
+    sql = "SELECT * FROM my_table WHERE id NOT IN (1, 2, 3)"
+    script = SQLScript(sql, "firebolt")
+
+    generated = script.format()
+    assert "NOT" in generated
+    assert "IN" in generated
diff --git a/tests/unit_tests/sql_validators/#sqlite_test.py# b/tests/unit_tests/sql_validators/#sqlite_test.py#
new file mode 100644
index 00000000000..ae5a07f4d2a
--- /dev/null
+++ b/tests/unit_tests/sql_validators/#sqlite_test.py#
@@ -0,0 +1,303 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+from __future__ import annotations
+
+import subprocess
+from subprocess import CompletedProcess
+from unittest.mock import MagicMock, patch
+
+from superset.sql_validators.sqlite import SQLiteSQLValidator
+
+
+def _mock_result(
+    returncode: int,
+    stderr: str = "",
+    stdout: str = "",
+) -> CompletedProcess[str]:
+    return CompletedProcess(
+        args=[],
+        returncode=returncode,
+        stdout=stdout,
+        stderr=stderr,
+    )
+
+
+def test_valid_syntax() -> None:
+    mock_database = MagicMock()
+    sql = "SELECT 1, col FROM my_table"
+
+    with (
+        patch(
+            "superset.sql_validators.sqlite.get_binary_path",
+            return_value="syntaqlite",
+        ),
+        patch(
+            "superset.sql_validators.sqlite.subprocess.run",
+            return_value=_mock_result(returncode=0),
+        ) as run,
+    ):
+        annotations = SQLiteSQLValidator.validate(
+            sql=sql,
+            catalog=None,
+            schema="",
+            database=mock_database,
+        )
+
+    assert annotations == []
+    run.assert_called_once()
+    command = run.call_args.args[0]
+    assert "--input" not in command
+    assert "-e" not in command
+    assert run.call_args.kwargs["input"] == sql
+
+
+def test_invalid_syntax_single_error() -> None:
+    mock_database = MagicMock()
+    stderr = (
+        'error: near "SELEC": syntax error\n'
+        " --> <input>:1:1\n"
+        "  |\n"
+        "1 | SELEC * FROM foo\n"
+        "  | ^~~~~\n"
+    )
+
+    with (
+        patch(
+            "superset.sql_validators.sqlite.get_binary_path", return_value="syntaqlite"
+        ),
+        patch(
+            "superset.sql_validators.sqlite.subprocess.run",
+            return_value=_mock_result(returncode=1, stderr=stderr),
+        ),
+    ):
+        annotations = SQLiteSQLValidator.validate(
+            sql="SELEC * FROM foo",
+            catalog=None,
+            schema="",
+            database=mock_database,
+        )
+
+    assert len(annotations) == 1
+    annotation = annotations[0]
+    assert annotation.line_number == 1
+    assert annotation.start_column == 1
+    # "SELEC" is 5 chars → caret + 4 tildes → end_column = 1 + 1 + 4 = 6
+    assert annotation.end_column == 6
+    assert "SELEC" in annotation.message
+
+
+def test_invalid_syntax_multiple_errors() -> None:
+    mock_database = MagicMock()
+    stderr = (
+        'error: near "SELEC": syntax error\n'
+        " --> <input>:1:1\n"
+        "  |\n"
+        "1 | SELEC * FROM foo; SELEC * FROM bar\n"
+        "  | ^~~~~\n\n"
+        'error: near "SELEC": syntax error\n'
+        " --> <input>:1:20\n"
+        "  |\n"
+        "1 | SELEC * FROM foo; SELEC * FROM bar\n"
+        "  |                    ^~~~~\n"
+    )
+
+    with (
+        patch(
+            "superset.sql_validators.sqlite.get_binary_path", return_value="syntaqlite"
+        ),
+        patch(
+            "superset.sql_validators.sqlite.subprocess.run",
+            return_value=_mock_result(returncode=1, stderr=stderr),
+        ),
+    ):
+        annotations = SQLiteSQLValidator.validate(
+            sql="SELEC * FROM foo; SELEC * FROM bar",
+            catalog=None,
+            schema="",
+            database=mock_database,
+        )
+
+    assert len(annotations) == 2
+    assert "SELEC" in annotations[0].message
+    # "SELEC" is 5 chars → caret + 4 tildes → end_column = start_column + 1 + 4
+    assert isinstance(annotations[0].start_column, int)
+    assert isinstance(annotations[0].start_column, int)
+    assert annotations[0].end_column == annotations[0].start_column + 5
+    assert annotations[1].end_column == annotations[1].start_column + 5
+
+
+def test_multiline_error_reports_correct_line() -> None:
+    mock_database = MagicMock()
+    stderr = (
+        'error: near "SELEC": syntax error\n'
+        " --> <input>:2:1\n"
+        "  |\n"
+        "2 | SELEC * FROM foo\n"
+        "  | ^~~~~\n"
+    )
+
+    with (
+        patch(
+            "superset.sql_validators.sqlite.get_binary_path", return_value="syntaqlite"
+        ),
+        patch(
+            "superset.sql_validators.sqlite.subprocess.run",
+            return_value=_mock_result(returncode=1, stderr=stderr),
+        ),
+    ):
+        annotations = SQLiteSQLValidator.validate(
+            sql="SELECT 1;\nSELEC * FROM foo",
+            catalog=None,
+            schema="",
+            database=mock_database,
+        )
+
+    assert len(annotations) == 1
+    assert annotations[0].line_number == 2
+
+
+def test_empty_sql() -> None:
+    mock_database = MagicMock()
+
+    with (
+        patch(
+            "superset.sql_validators.sqlite.get_binary_path", return_value="syntaqlite"
+        ),
+        patch(
+            "superset.sql_validators.sqlite.subprocess.run",
+            return_value=_mock_result(returncode=0),
+        ),
+    ):
+        annotations = SQLiteSQLValidator.validate(
+            sql="",
+            catalog=None,
+            schema="",
+            database=mock_database,
+        )
+
+    assert annotations == []
+
+
+def test_valid_complex_query() -> None:
+    mock_database = MagicMock()
+
+    with (
+        patch(
+            "superset.sql_validators.sqlite.get_binary_path", return_value="syntaqlite"
+        ),
+        patch(
+            "superset.sql_validators.sqlite.subprocess.run",
+            return_value=_mock_result(returncode=0),
+        ),
+    ):
+        annotations = SQLiteSQLValidator.validate(
+            sql=(
+                "SELECT a, COUNT(*) AS cnt "
+                "FROM my_table "
+                "WHERE b > 10 "
+                "GROUP BY a "
+                "HAVING cnt > 1 "
+                "ORDER BY cnt DESC "
+                "LIMIT 100"
+            ),
+            catalog=None,
+            schema="",
+            database=mock_database,
+        )
+
+    assert annotations == []
+
+
+def test_annotation_to_dict() -> None:
+    mock_database = MagicMock()
+    stderr = (
+        'error: near "SELEC": syntax error\n'
+        " --> <input>:1:1\n"
+        "  |\n"
+        "1 | SELEC * FROM foo\n"
+        "  | ^~~~~\n"
+    )
+
+    with (
+        patch(
+            "superset.sql_validators.sqlite.get_binary_path", return_value="syntaqlite"
+        ),
+        patch(
+            "superset.sql_validators.sqlite.subprocess.run",
+            return_value=_mock_result(returncode=1, stderr=stderr),
+        ),
+    ):
+        annotations = SQLiteSQLValidator.validate(
+            sql="SELEC * FROM foo",
+            catalog=None,
+            schema="",
+            database=mock_database,
+        )
+
+    assert len(annotations) == 1
+    result = annotations[0].to_dict()
+    assert "line_number" in result
+    assert "start_column" in result
+    assert "end_column" in result
+    assert "message" in result
+
+
+def test_missing_syntaqlite_returns_annotation() -> None:
+    mock_database = MagicMock()
+    with patch("superset.sql_validators.sqlite.get_binary_path", None):
+        annotations = SQLiteSQLValidator.validate(
+            sql="SELECT 1",
+            catalog=None,
+            schema="",
+            database=mock_database,
+        )
+
+    assert len(annotations) == 1
+    assert "syntaqlite is not installed" in annotations[0].message
+    assert annotations[0].line_number is None
+
+
+def test_timeout_returns_annotation() -> None:
+    mock_database = MagicMock()
+
+    with (
+        patch(
+            "superset.sql_validators.sqlite.get_binary_path", return_value="syntaqlite"
+        ),
+        patch(
+            "superset.sql_validators.sqlite.subprocess.run",
+            side_effect=subprocess.TimeoutExpired(cmd="syntaqlite", timeout=10),
+        ),
+    ):
+        annotations = SQLiteSQLValidator.validate(
+            sql="SELECT 1",
+            catalog=None,
+            schema="",
+            database=mock_database,
+        )
+
+    assert len(annotations) == 1
+    assert "timed out" in annotations[0].message
+    assert annotations[0].line_number is None
+
+
+def test_get_validator_by_name() -> None:
+    from superset.sql_validators import get_validator_by_name
+
+    validator = get_validator_by_name("SQLiteSQLValidator")
+    assert validator is SQLiteSQLValidator
diff --git a/tests/unit_tests/sql_validators/sqlite_test.py b/tests/unit_tests/sql_validators/sqlite_test.py
new file mode 100644
index 00000000000..a950580eafc
--- /dev/null
+++ b/tests/unit_tests/sql_validators/sqlite_test.py
@@ -0,0 +1,303 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+from __future__ import annotations
+
+import subprocess
+from subprocess import CompletedProcess
+from unittest.mock import MagicMock, patch
+
+from superset.sql_validators.sqlite import SQLiteSQLValidator
+
+
+def _mock_result(
+    returncode: int,
+    stderr: str = "",
+    stdout: str = "",
+) -> CompletedProcess[str]:
+    return CompletedProcess(
+        args=[],
+        returncode=returncode,
+        stdout=stdout,
+        stderr=stderr,
+    )
+
+
+def test_valid_syntax() -> None:
+    mock_database = MagicMock()
+    sql = "SELECT 1, col FROM my_table"
+
+    with (
+        patch(
+            "superset.sql_validators.sqlite.get_binary_path",
+            return_value="syntaqlite",
+        ),
+        patch(
+            "superset.sql_validators.sqlite.subprocess.run",
+            return_value=_mock_result(returncode=0),
+        ) as run,
+    ):
+        annotations = SQLiteSQLValidator.validate(
+            sql=sql,
+            catalog=None,
+            schema="",
+            database=mock_database,
+        )
+
+    assert annotations == []
+    run.assert_called_once()
+    command = run.call_args.args[0]
+    assert "--input" not in command
+    assert "-e" not in command
+    assert run.call_args.kwargs["input"] == sql
+
+
+def test_invalid_syntax_single_error() -> None:
+    mock_database = MagicMock()
+    stderr = (
+        'error: near "SELEC": syntax error\n'
+        " --> <input>:1:1\n"
+        "  |\n"
+        "1 | SELEC * FROM foo\n"
+        "  | ^~~~~\n"
+    )
+
+    with (
+        patch(
+            "superset.sql_validators.sqlite.get_binary_path", return_value="syntaqlite"
+        ),
+        patch(
+            "superset.sql_validators.sqlite.subprocess.run",
+            return_value=_mock_result(returncode=1, stderr=stderr),
+        ),
+    ):
+        annotations = SQLiteSQLValidator.validate(
+            sql="SELEC * FROM foo",
+            catalog=None,
+            schema="",
+            database=mock_database,
+        )
+
+    assert len(annotations) == 1
+    annotation = annotations[0]
+    assert annotation.line_number == 1
+    assert annotation.start_column == 1
+    # "SELEC" is 5 chars → caret + 4 tildes → end_column = 1 + 1 + 4 = 6
+    assert annotation.end_column == 6
+    assert "SELEC" in annotation.message
+
+
+def test_invalid_syntax_multiple_errors() -> None:
+    mock_database = MagicMock()
+    stderr = (
+        'error: near "SELEC": syntax error\n'
+        " --> <input>:1:1\n"
+        "  |\n"
+        "1 | SELEC * FROM foo; SELEC * FROM bar\n"
+        "  | ^~~~~\n\n"
+        'error: near "SELEC": syntax error\n'
+        " --> <input>:1:20\n"
+        "  |\n"
+        "1 | SELEC * FROM foo; SELEC * FROM bar\n"
+        "  |                    ^~~~~\n"
+    )
+
+    with (
+        patch(
+            "superset.sql_validators.sqlite.get_binary_path", return_value="syntaqlite"
+        ),
+        patch(
+            "superset.sql_validators.sqlite.subprocess.run",
+            return_value=_mock_result(returncode=1, stderr=stderr),
+        ),
+    ):
+        annotations = SQLiteSQLValidator.validate(
+            sql="SELEC * FROM foo; SELEC * FROM bar",
+            catalog=None,
+            schema="",
+            database=mock_database,
+        )
+
+    assert len(annotations) == 2
+    assert "SELEC" in annotations[0].message
+    # "SELEC" is 5 chars → caret + 4 tildes → end_column = start_column + 1 + 4
+    assert isinstance(annotations[0].start_column, int)
+    assert annotations[0].end_column == annotations[0].start_column + 5
+    assert isinstance(annotations[1].start_column, int)
+    assert annotations[1].end_column == annotations[1].start_column + 5
+
+
+def test_multiline_error_reports_correct_line() -> None:
+    mock_database = MagicMock()
+    stderr = (
+        'error: near "SELEC": syntax error\n'
+        " --> <input>:2:1\n"
+        "  |\n"
+        "2 | SELEC * FROM foo\n"
+        "  | ^~~~~\n"
+    )
+
+    with (
+        patch(
+            "superset.sql_validators.sqlite.get_binary_path", return_value="syntaqlite"
+        ),
+        patch(
+            "superset.sql_validators.sqlite.subprocess.run",
+            return_value=_mock_result(returncode=1, stderr=stderr),
+        ),
+    ):
+        annotations = SQLiteSQLValidator.validate(
+            sql="SELECT 1;\nSELEC * FROM foo",
+            catalog=None,
+            schema="",
+            database=mock_database,
+        )
+
+    assert len(annotations) == 1
+    assert annotations[0].line_number == 2
+
+
+def test_empty_sql() -> None:
+    mock_database = MagicMock()
+
+    with (
+        patch(
+            "superset.sql_validators.sqlite.get_binary_path", return_value="syntaqlite"
+        ),
+        patch(
+            "superset.sql_validators.sqlite.subprocess.run",
+            return_value=_mock_result(returncode=0),
+        ),
+    ):
+        annotations = SQLiteSQLValidator.validate(
+            sql="",
+            catalog=None,
+            schema="",
+            database=mock_database,
+        )
+
+    assert annotations == []
+
+
+def test_valid_complex_query() -> None:
+    mock_database = MagicMock()
+
+    with (
+        patch(
+            "superset.sql_validators.sqlite.get_binary_path", return_value="syntaqlite"
+        ),
+        patch(
+            "superset.sql_validators.sqlite.subprocess.run",
+            return_value=_mock_result(returncode=0),
+        ),
+    ):
+        annotations = SQLiteSQLValidator.validate(
+            sql=(
+                "SELECT a, COUNT(*) AS cnt "
+                "FROM my_table "
+                "WHERE b > 10 "
+                "GROUP BY a "
+                "HAVING cnt > 1 "
+                "ORDER BY cnt DESC "
+                "LIMIT 100"
+            ),
+            catalog=None,
+            schema="",
+            database=mock_database,
+        )
+
+    assert annotations == []
+
+
+def test_annotation_to_dict() -> None:
+    mock_database = MagicMock()
+    stderr = (
+        'error: near "SELEC": syntax error\n'
+        " --> <input>:1:1\n"
+        "  |\n"
+        "1 | SELEC * FROM foo\n"
+        "  | ^~~~~\n"
+    )
+
+    with (
+        patch(
+            "superset.sql_validators.sqlite.get_binary_path", return_value="syntaqlite"
+        ),
+        patch(
+            "superset.sql_validators.sqlite.subprocess.run",
+            return_value=_mock_result(returncode=1, stderr=stderr),
+        ),
+    ):
+        annotations = SQLiteSQLValidator.validate(
+            sql="SELEC * FROM foo",
+            catalog=None,
+            schema="",
+            database=mock_database,
+        )
+
+    assert len(annotations) == 1
+    result = annotations[0].to_dict()
+    assert "line_number" in result
+    assert "start_column" in result
+    assert "end_column" in result
+    assert "message" in result
+
+
+def test_missing_syntaqlite_returns_annotation() -> None:
+    mock_database = MagicMock()
+    with patch("superset.sql_validators.sqlite.get_binary_path", None):
+        annotations = SQLiteSQLValidator.validate(
+            sql="SELECT 1",
+            catalog=None,
+            schema="",
+            database=mock_database,
+        )
+
+    assert len(annotations) == 1
+    assert "syntaqlite is not installed" in annotations[0].message
+    assert annotations[0].line_number is None
+
+
+def test_timeout_returns_annotation() -> None:
+    mock_database = MagicMock()
+
+    with (
+        patch(
+            "superset.sql_validators.sqlite.get_binary_path", return_value="syntaqlite"
+        ),
+        patch(
+            "superset.sql_validators.sqlite.subprocess.run",
+            side_effect=subprocess.TimeoutExpired(cmd="syntaqlite", timeout=10),
+        ),
+    ):
+        annotations = SQLiteSQLValidator.validate(
+            sql="SELECT 1",
+            catalog=None,
+            schema="",
+            database=mock_database,
+        )
+
+    assert len(annotations) == 1
+    assert "timed out" in annotations[0].message
+    assert annotations[0].line_number is None
+
+
+def test_get_validator_by_name() -> None:
+    from superset.sql_validators import get_validator_by_name
+
+    validator = get_validator_by_name("SQLiteSQLValidator")
+    assert validator is SQLiteSQLValidator
diff --git a/tests/unit_tests/utils/oauth2_tests.py b/tests/unit_tests/utils/oauth2_tests.py
index f04ae26e7c2..c74b2f9570b 100644
--- a/tests/unit_tests/utils/oauth2_tests.py
+++ b/tests/unit_tests/utils/oauth2_tests.py
@@ -33,6 +33,7 @@ from superset.utils.oauth2 import (
     generate_code_challenge,
     generate_code_verifier,
     get_oauth2_access_token,
+    get_oauth2_redirect_uri,
     refresh_oauth2_token,
 )
 
@@ -136,6 +137,7 @@ def test_refresh_oauth2_token_deletes_token_on_oauth2_exception(
         refresh_oauth2_token(DUMMY_OAUTH2_CONFIG, 1, 1, db_engine_spec, token)
 
     db.session.delete.assert_called_with(token)
+    db.session.flush.assert_called_once()
 
 
 def test_refresh_oauth2_token_keeps_token_on_other_exception(
@@ -335,3 +337,105 @@ def test_encode_decode_oauth2_state(
     assert "code_verifier" not in decoded
     assert decoded["database_id"] == 1
     assert decoded["user_id"] == 2
+
+
+def test_get_oauth2_access_token_lock_not_acquired_no_error_log(
+    mocker: MockerFixture,
+    caplog: pytest.LogCaptureFixture,
+) -> None:
+    """
+    Test that when a distributed lock can't be acquired, no error is logged and
+    the function returns None instead of raising.
+
+    This scenario occurs when a dashboard with multiple charts from the same
+    OAuth2-enabled DB has an expired token: simultaneous requests compete for
+    the lock, and only the first one wins. The rest should silently return None.
+    """
+    import logging
+
+    from superset.exceptions import AcquireDistributedLockFailedException
+
+    mocker.patch("time.sleep")  # avoid backoff delays in tests
+
+    db = mocker.patch("superset.utils.oauth2.db")
+    db_engine_spec = mocker.MagicMock()
+    token = mocker.MagicMock()
+    token.access_token = "access-token"  # noqa: S105
+    token.access_token_expiration = datetime(2024, 1, 1)
+    token.refresh_token = "refresh-token"  # noqa: S105
+    db.session.query().filter_by().one_or_none.return_value = token
+
+    mocker.patch(
+        "superset.utils.oauth2.refresh_oauth2_token",
+        side_effect=AcquireDistributedLockFailedException("Lock not available"),
+    )
+
+    with freeze_time("2024-01-02"):
+        with caplog.at_level(logging.DEBUG):
+            result = get_oauth2_access_token({}, 1, 1, db_engine_spec)
+
+    assert result is None
+    assert not any(record.levelno >= logging.ERROR for record in caplog.records)
+
+
+def test_get_oauth2_redirect_uri_from_config(mocker: MockerFixture) -> None:
+    """
+    Test that get_oauth2_redirect_uri returns the configured value when set.
+    """
+    custom_uri = "https://proxy.example.com/oauth2/"
+    mocker.patch(
+        "flask.current_app.config",
+        {"DATABASE_OAUTH2_REDIRECT_URI": custom_uri},
+    )
+    assert get_oauth2_redirect_uri() == custom_uri
+
+
+def test_get_oauth2_redirect_uri_falls_back_to_url_for(mocker: MockerFixture) -> None:
+    """
+    Test that get_oauth2_redirect_uri falls back to url_for when config is not set.
+    """
+    fallback_uri = "http://localhost:8088/api/v1/database/oauth2/"
+    mocker.patch("flask.current_app.config", {})
+    mocker.patch(
+        "superset.utils.oauth2.url_for",
+        return_value=fallback_uri,
+    )
+    assert get_oauth2_redirect_uri() == fallback_uri
+
+
+def test_get_oauth2_redirect_uri_raises_on_build_error(
+    mocker: MockerFixture,
+) -> None:
+    """
+    Test that get_oauth2_redirect_uri raises OAuth2Error when url_for raises
+    BuildError (e.g. in headless/MCP contexts).
+    """
+    from werkzeug.routing import BuildError
+
+    from superset.exceptions import OAuth2Error
+
+    mocker.patch("flask.current_app.config", {})
+    mocker.patch(
+        "superset.utils.oauth2.url_for",
+        side_effect=BuildError("DatabaseRestApi.oauth2", {}, ("GET",)),
+    )
+    with pytest.raises(OAuth2Error):
+        get_oauth2_redirect_uri()
+
+
+def test_get_oauth2_redirect_uri_raises_on_runtime_error(
+    mocker: MockerFixture,
+) -> None:
+    """
+    Test that get_oauth2_redirect_uri raises OAuth2Error when url_for raises
+    RuntimeError (e.g. no request context and no SERVER_NAME).
+    """
+    from superset.exceptions import OAuth2Error
+
+    mocker.patch("flask.current_app.config", {})
+    mocker.patch(
+        "superset.utils.oauth2.url_for",
+        side_effect=RuntimeError("Unable to build URL outside of request context"),
+    )
+    with pytest.raises(OAuth2Error):
+        get_oauth2_redirect_uri()
diff --git a/tests/unit_tests/utils/webdriver_test.py b/tests/unit_tests/utils/webdriver_test.py
index ab3490e0956..ad55f4b68e6 100644
--- a/tests/unit_tests/utils/webdriver_test.py
+++ b/tests/unit_tests/utils/webdriver_test.py
@@ -530,6 +530,7 @@ class TestWebDriverPlaywrightFallback:
                 "SCREENSHOT_PLAYWRIGHT_DEFAULT_TIMEOUT": 30000,
                 "SCREENSHOT_PLAYWRIGHT_WAIT_EVENT": "networkidle",
                 "SCREENSHOT_SELENIUM_HEADSTART": 5,
+                "SCREENSHOT_SELENIUM_ANIMATION_WAIT": 1,
                 "SCREENSHOT_LOCATE_WAIT": 10,
                 "SCREENSHOT_LOAD_WAIT": 10,
                 "SCREENSHOT_WAIT_FOR_ERROR_MODAL_VISIBLE": 10,
@@ -546,8 +547,10 @@ class TestWebDriverPlaywrightFallback:
                     "http://example.com", "test-element", mock_user
                 )
 
-        # Should handle timeout gracefully and return None
-        assert result is None
+        # page.goto() timeout is caught and logged without aborting; execution
+        # continues to the element waits, which succeed here, so a screenshot
+        # is taken and returned (not None).
+        assert result is not None
         mock_logger.exception.assert_called()
         exception_call = mock_logger.exception.call_args[0][0]
         assert "Web event %s not detected" in exception_call
@@ -640,10 +643,10 @@ class TestWebDriverPlaywrightErrorHandling:
     @patch("superset.utils.webdriver.PLAYWRIGHT_AVAILABLE", True)
     @patch("superset.utils.webdriver.sync_playwright")
     @patch("superset.utils.webdriver.logger")
-    def test_get_screenshot_logs_multiple_timeouts(
+    def test_get_screenshot_raises_on_element_wait_timeout(
         self, mock_logger, mock_sync_playwright
     ):
-        """Test that multiple timeout scenarios are logged appropriately."""
+        """Test that PlaywrightTimeout propagates when waiting for page elements."""
         from superset.utils.webdriver import PlaywrightTimeout
 
         mock_user = MagicMock()
@@ -663,9 +666,10 @@ class TestWebDriverPlaywrightErrorHandling:
         mock_browser.new_context.return_value = mock_context
         mock_context.new_page.return_value = mock_page
 
-        # Mock locator to raise timeout on element wait
+        # Keep a reference to the exact instance so we can verify identity below.
+        timeout = PlaywrightTimeout()
         mock_page.locator.return_value = mock_element
-        mock_element.wait_for.side_effect = PlaywrightTimeout()
+        mock_element.wait_for.side_effect = timeout
 
         with patch("superset.utils.webdriver.app") as mock_app:
             mock_app.config = {
@@ -686,10 +690,15 @@ class TestWebDriverPlaywrightErrorHandling:
                 mock_auth.return_value = mock_context
 
                 driver = WebDriverPlaywright("chrome")
-                result = driver.get_screenshot(
-                    "http://example.com", "test-element", mock_user
-                )
+                with pytest.raises(PlaywrightTimeout) as exc_info:
+                    driver.get_screenshot(
+                        "http://example.com", "test-element", mock_user
+                    )
 
-        assert result is None
-        # Should log timeout for element wait
-        assert mock_logger.exception.call_count >= 1
+        # The exact injected instance must propagate — guards against the
+        # fallback alias (PlaywrightTimeout = Exception when playwright is
+        # not installed) accepting unrelated exceptions.
+        assert exc_info.value is timeout
+        mock_logger.exception.assert_any_call(
+            "Timed out requesting url %s", "http://example.com"
+        )
diff --git a/tests/unit_tests/views/datasource/views_test.py b/tests/unit_tests/views/datasource/views_test.py
new file mode 100644
index 00000000000..3a54932d80c
--- /dev/null
+++ b/tests/unit_tests/views/datasource/views_test.py
@@ -0,0 +1,314 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+"""Unit tests for resource-level authorization in superset/views/datasource/views.py.
+
+Tests use ``inspect.unwrap`` to call the underlying view logic directly,
+bypassing the Flask-AppBuilder permission decorator machinery.
+"""
+
+import inspect
+from unittest.mock import MagicMock, patch
+
+import pytest
+
+from superset.errors import ErrorLevel, SupersetError, SupersetErrorType
+from superset.exceptions import SupersetSecurityException
+from superset.utils import json as superset_json
+
+
+def _security_exception() -> SupersetSecurityException:
+    return SupersetSecurityException(
+        SupersetError(
+            message="Access denied",
+            error_type=SupersetErrorType.DATASOURCE_SECURITY_ACCESS_ERROR,
+            level=ErrorLevel.WARNING,
+        )
+    )
+
+
+def _get_view_func(name: str):
+    """Return the unwrapped body of a Datasource view method."""
+    from superset.views.datasource.views import Datasource
+
+    return inspect.unwrap(getattr(Datasource, name))
+
+
+def _view_self() -> MagicMock:
+    """Create a minimal stand-in for a Datasource view instance."""
+    self = MagicMock()
+    self.json_response = MagicMock(return_value="ok")
+    return self
+
+
+# ---------------------------------------------------------------------------
+# Datasource.get
+# ---------------------------------------------------------------------------
+
+
+@patch("superset.views.datasource.views.security_manager", new_callable=MagicMock)
+@patch("superset.views.datasource.views.DatasourceDAO.get_datasource")
+def test_get_raises_when_access_denied(
+    mock_get_datasource: MagicMock,
+    mock_security_manager: MagicMock,
+) -> None:
+    """raise_for_access is called and propagates for unauthorised callers."""
+    mock_datasource = MagicMock()
+    mock_get_datasource.return_value = mock_datasource
+    mock_security_manager.raise_for_access.side_effect = _security_exception()
+
+    raw_get = _get_view_func("get")
+    with pytest.raises(SupersetSecurityException):
+        raw_get(_view_self(), "table", 1)
+
+    mock_security_manager.raise_for_access.assert_called_once_with(
+        datasource=mock_datasource
+    )
+
+
+@patch("superset.views.datasource.views.sanitize_datasource_data")
+@patch("superset.views.datasource.views.security_manager", new_callable=MagicMock)
+@patch("superset.views.datasource.views.DatasourceDAO.get_datasource")
+def test_get_succeeds_for_authorised_user(
+    mock_get_datasource: MagicMock,
+    mock_security_manager: MagicMock,
+    mock_sanitize: MagicMock,
+) -> None:
+    """raise_for_access is called without raising; sanitized data is returned."""
+    mock_datasource = MagicMock()
+    mock_datasource.data = {"id": 1}
+    mock_get_datasource.return_value = mock_datasource
+    mock_security_manager.raise_for_access.return_value = None
+    mock_sanitize.return_value = {"id": 1}
+
+    view = _view_self()
+    raw_get = _get_view_func("get")
+    raw_get(view, "table", 1)
+
+    mock_security_manager.raise_for_access.assert_called_once_with(
+        datasource=mock_datasource
+    )
+    view.json_response.assert_called_once_with({"id": 1})
+
+
+# ---------------------------------------------------------------------------
+# Datasource.external_metadata
+# ---------------------------------------------------------------------------
+
+
+@patch("superset.views.datasource.views.security_manager", new_callable=MagicMock)
+@patch("superset.views.datasource.views.DatasourceDAO.get_datasource")
+def test_external_metadata_raises_when_access_denied(
+    mock_get_datasource: MagicMock,
+    mock_security_manager: MagicMock,
+) -> None:
+    mock_datasource = MagicMock()
+    mock_get_datasource.return_value = mock_datasource
+    mock_security_manager.raise_for_access.side_effect = _security_exception()
+
+    raw_fn = _get_view_func("external_metadata")
+    with pytest.raises(SupersetSecurityException):
+        raw_fn(_view_self(), "table", 1)
+
+    mock_security_manager.raise_for_access.assert_called_once_with(
+        datasource=mock_datasource
+    )
+
+
+@patch("superset.views.datasource.views.security_manager", new_callable=MagicMock)
+@patch("superset.views.datasource.views.DatasourceDAO.get_datasource")
+def test_external_metadata_succeeds_for_authorised_user(
+    mock_get_datasource: MagicMock,
+    mock_security_manager: MagicMock,
+) -> None:
+    mock_datasource = MagicMock()
+    mock_datasource.external_metadata.return_value = [{"name": "col1"}]
+    mock_get_datasource.return_value = mock_datasource
+    mock_security_manager.raise_for_access.return_value = None
+
+    view = _view_self()
+    raw_fn = _get_view_func("external_metadata")
+    raw_fn(view, "table", 1)
+
+    mock_security_manager.raise_for_access.assert_called_once_with(
+        datasource=mock_datasource
+    )
+    view.json_response.assert_called_once_with([{"name": "col1"}])
+
+
+# ---------------------------------------------------------------------------
+# Datasource.external_metadata_by_name
+# ---------------------------------------------------------------------------
+
+
+@patch("superset.views.datasource.views.security_manager", new_callable=MagicMock)
+@patch("superset.views.datasource.views.SqlaTable.get_datasource_by_name")
+@patch("superset.views.datasource.views.ExternalMetadataSchema")
+def test_external_metadata_by_name_known_datasource_raises_when_access_denied(
+    mock_schema_cls: MagicMock,
+    mock_get_by_name: MagicMock,
+    mock_security_manager: MagicMock,
+) -> None:
+    """When a datasource exists, raise_for_access(datasource=...) is enforced."""
+    params = {
+        "database_name": "mydb",
+        "schema_name": "public",
+        "table_name": "private_table",
+    }
+    mock_schema_cls.return_value.load.return_value = params
+
+    mock_datasource = MagicMock()
+    mock_get_by_name.return_value = mock_datasource
+    mock_security_manager.raise_for_access.side_effect = _security_exception()
+
+    raw_fn = _get_view_func("external_metadata_by_name")
+    with pytest.raises(SupersetSecurityException):
+        raw_fn(_view_self(), rison=params)
+
+    mock_security_manager.raise_for_access.assert_called_once_with(
+        datasource=mock_datasource
+    )
+
+
+@patch("superset.views.datasource.views.security_manager", new_callable=MagicMock)
+@patch("superset.views.datasource.views.SqlaTable.get_datasource_by_name")
+@patch("superset.views.datasource.views.ExternalMetadataSchema")
+@patch("superset.views.datasource.views.db")
+def test_external_metadata_by_name_no_datasource_raises_when_access_denied(
+    mock_db: MagicMock,
+    mock_schema_cls: MagicMock,
+    mock_get_by_name: MagicMock,
+    mock_security_manager: MagicMock,
+) -> None:
+    """When no datasource exists, raise_for_access(database=..., table=...) runs."""
+    params = {
+        "database_name": "mydb",
+        "schema_name": "public",
+        "table_name": "new_table",
+    }
+    mock_schema_cls.return_value.load.return_value = params
+    mock_get_by_name.return_value = None
+
+    mock_database = MagicMock()
+    mock_db.session.query.return_value.filter_by.return_value.one.return_value = (
+        mock_database
+    )
+    mock_security_manager.raise_for_access.side_effect = _security_exception()
+
+    raw_fn = _get_view_func("external_metadata_by_name")
+    with pytest.raises(SupersetSecurityException):
+        raw_fn(_view_self(), rison=params)
+
+    mock_security_manager.raise_for_access.assert_called_once()
+    call_kwargs = mock_security_manager.raise_for_access.call_args.kwargs
+    assert call_kwargs["database"] is mock_database
+    assert call_kwargs["table"].table == "new_table"
+    assert call_kwargs["table"].schema == "public"
+
+
+# ---------------------------------------------------------------------------
+# Datasource.save — ownership bypass prevention
+# ---------------------------------------------------------------------------
+
+
+@patch("superset.views.datasource.views.security_manager", new_callable=MagicMock)
+@patch("superset.views.datasource.views.DatasourceDAO.get_datasource")
+def test_save_always_checks_ownership_even_without_owners_field(
+    mock_get_datasource: MagicMock,
+    mock_security_manager: MagicMock,
+) -> None:
+    """Ownership check runs even when 'owners' is absent from the payload."""
+    mock_orm = MagicMock()
+    mock_orm.owner_class = MagicMock()  # not None — model supports ownership
+    mock_get_datasource.return_value = mock_orm
+    mock_security_manager.raise_for_ownership.side_effect = SupersetSecurityException(
+        SupersetError(
+            message="Not an owner",
+            error_type=SupersetErrorType.DATASOURCE_SECURITY_ACCESS_ERROR,
+            level=ErrorLevel.WARNING,
+        )
+    )
+
+    from flask import Flask
+
+    from superset.commands.dataset.exceptions import DatasetForbiddenError
+
+    raw_save = _get_view_func("save")
+    app = Flask(__name__)
+    with app.test_request_context(
+        "/datasource/save/",
+        method="POST",
+        data={
+            "data": superset_json.dumps(
+                {
+                    "id": 1,
+                    "type": "table",
+                    "database": {"id": 1},
+                    "columns": [],
+                    # 'owners' intentionally omitted
+                }
+            )
+        },
+    ):
+        with pytest.raises(DatasetForbiddenError):
+            raw_save(_view_self())
+
+    mock_security_manager.raise_for_ownership.assert_called_once_with(mock_orm)
+
+
+@patch("superset.views.datasource.views.security_manager", new_callable=MagicMock)
+@patch("superset.views.datasource.views.DatasourceDAO.get_datasource")
+def test_save_non_owner_with_owners_field_is_rejected(
+    mock_get_datasource: MagicMock,
+    mock_security_manager: MagicMock,
+) -> None:
+    """A non-owner cannot use the save endpoint even when supplying an owners list."""
+    mock_orm = MagicMock()
+    mock_orm.owner_class = MagicMock()
+    mock_get_datasource.return_value = mock_orm
+    mock_security_manager.raise_for_ownership.side_effect = SupersetSecurityException(
+        SupersetError(
+            message="Not an owner",
+            error_type=SupersetErrorType.DATASOURCE_SECURITY_ACCESS_ERROR,
+            level=ErrorLevel.WARNING,
+        )
+    )
+
+    from flask import Flask
+
+    from superset.commands.dataset.exceptions import DatasetForbiddenError
+
+    raw_save = _get_view_func("save")
+    app = Flask(__name__)
+    with app.test_request_context(
+        "/datasource/save/",
+        method="POST",
+        data={
+            "data": superset_json.dumps(
+                {
+                    "id": 1,
+                    "type": "table",
+                    "database": {"id": 1},
+                    "columns": [],
+                    "owners": [99],  # attacker-supplied owners list
+                }
+            )
+        },
+    ):
+        with pytest.raises(DatasetForbiddenError):
+            raw_save(_view_self())
+
+    mock_security_manager.raise_for_ownership.assert_called_once_with(mock_orm)