From 360bae3871d6e80b17c1d9a027ce5b4c69af0fd4 Mon Sep 17 00:00:00 2001
From: "supabase-supabase-autofixer[bot]"
 <248690971+supabase-supabase-autofixer[bot]@users.noreply.github.com>
Date: Wed, 15 Jul 2026 19:25:03 +0300
Subject: [PATCH 1/7] feat: update @supabase/*-js libraries to v2.110.6
 (#47968)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This PR updates @supabase/*-js libraries to version 2.110.6.

**Source**: supabase-js-stable-release

**Changes**:
- Updated @supabase/supabase-js to 2.110.6
- Updated @supabase/auth-js to 2.110.6
- Updated @supabase/realtime-js to 2.110.6
- Updated @supabase/postgest-js to 2.110.6
- Refreshed pnpm-lock.yaml

---

## Release Notes

## v2.110.6

## 2.110.6 (2026-07-15)

### 🩹 Fixes

- **postgrest:** type hinted self-referencing embeds as arrays
([#2520](https://github.com/supabase/supabase-js/pull/2520))
- **realtime:** forward opts to send() in track()
([#2490](https://github.com/supabase/supabase-js/pull/2490))
- **supabase:** warn instead of throw for unrecognized sb_ API key
subtypes ([#2526](https://github.com/supabase/supabase-js/pull/2526))

### ❤️ Thank You

- Franco Kaddour @FrancoKaddour
- Katerina Skroumpelou @mandarini
## v2.110.5

## 2.110.5 (2026-07-14)

### 🩹 Fixes

- **supabase:** avoid edge runtime warning
([#2522](https://github.com/supabase/supabase-js/pull/2522))

### ❤️ Thank You

- Vaibhav @7ttp
## v2.110.4

## 2.110.4 (2026-07-14)

### 🩹 Fixes

- **functions:** stop sending API key in Authorization header for
function calls
([#2511](https://github.com/supabase/supabase-js/pull/2511))
- **realtime:** encode broadcast header fields as UTF-8
([#2516](https://github.com/supabase/supabase-js/pull/2516))

### ❤️ Thank You

- Katerina Skroumpelou @mandarini
- Pedro Henrique
## v2.110.3

## 2.110.3 (2026-07-13)

### 🩹 Fixes

- **auth:** preserve pkce verifier
([#2513](https://github.com/supabase/supabase-js/pull/2513))
- **postgrest:** pin tstyche target off floating latest
([#2509](https://github.com/supabase/supabase-js/pull/2509))

### ❤️ Thank You

- Katerina Skroumpelou @mandarini
- Vaibhav @7ttp
## v2.110.2

## 2.110.2 (2026-07-09)

### 🩹 Fixes

- **auth:** clear local session on signout failures
([#2504](https://github.com/supabase/supabase-js/pull/2504))

### ❤️ Thank You

- Luc Peng

This PR was created automatically.

Co-authored-by: supabase-workflow-trigger[bot] <266661614+supabase-workflow-trigger[bot]@users.noreply.github.com>
---
 pnpm-lock.yaml      | 102 ++++++++++++++++++++++----------------------
 pnpm-workspace.yaml |   8 ++--
 2 files changed, 55 insertions(+), 55 deletions(-)

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index a84a21d4ee028..af20adfc6833c 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -16,20 +16,20 @@ catalogs:
       specifier: ^10.59.0
       version: 10.59.0
     '@supabase/auth-js':
-      specifier: 2.110.1
-      version: 2.110.1
+      specifier: 2.110.6
+      version: 2.110.6
     '@supabase/postgrest-js':
-      specifier: 2.110.1
-      version: 2.110.1
+      specifier: 2.110.6
+      version: 2.110.6
     '@supabase/realtime-js':
-      specifier: 2.110.1
-      version: 2.110.1
+      specifier: 2.110.6
+      version: 2.110.6
     '@supabase/ssr':
       specifier: 0.10.2
       version: 0.10.2
     '@supabase/supabase-js':
-      specifier: 2.110.1
-      version: 2.110.1
+      specifier: 2.110.6
+      version: 2.110.6
     '@tanstack/react-router':
       specifier: ^1.169.2
       version: 1.170.10
@@ -380,7 +380,7 @@ importers:
         version: 10.59.0(@opentelemetry/core@2.8.0(@opentelemetry/api@1.9.1))(@opentelemetry/sdk-trace-base@2.8.0(@opentelemetry/api@1.9.1))(encoding@0.1.13)(next@15.5.18(@babel/core@7.29.7(supports-color@8.1.1))(@opentelemetry/api@1.9.1)(@playwright/test@1.59.1)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)(sass@1.77.4))(react@19.2.6)(supports-color@8.1.1)(vite@8.0.16(@types/node@22.13.14)(esbuild@0.28.1)(jiti@2.7.0)(sass@1.77.4)(terser@5.39.0)(tsx@4.22.4)(yaml@2.9.0))(webpack@5.105.4(esbuild@0.28.1))
       '@supabase/supabase-js':
         specifier: 'catalog:'
-        version: 2.110.1
+        version: 2.110.6
       '@tanstack/react-query':
         specifier: ~5.83.0
         version: 5.83.0(react@19.2.6)
@@ -974,7 +974,7 @@ importers:
         version: 1.0.32(@types/node@22.13.14)(supports-color@8.1.1)
       '@supabase/auth-js':
         specifier: 'catalog:'
-        version: 2.110.1
+        version: 2.110.6
       '@supabase/mcp-server-supabase':
         specifier: ^0.7.0
         version: 0.7.0(@modelcontextprotocol/sdk@1.29.0(supports-color@8.1.1)(zod@3.25.76))(zod@3.25.76)
@@ -983,13 +983,13 @@ importers:
         version: link:../../packages/pg-meta
       '@supabase/realtime-js':
         specifier: 'catalog:'
-        version: 2.110.1
+        version: 2.110.6
       '@supabase/shared-types':
         specifier: 0.1.88
         version: 0.1.88
       '@supabase/supabase-js':
         specifier: 'catalog:'
-        version: 2.110.1
+        version: 2.110.6
       '@tanstack/react-devtools':
         specifier: ^0.10.3
         version: 0.10.7(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(csstype@3.2.3)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)(solid-js@1.9.13)
@@ -1413,7 +1413,7 @@ importers:
         version: 0.1.0
       '@supabase/postgrest-js':
         specifier: 'catalog:'
-        version: 2.110.1
+        version: 2.110.6
       '@supabase/supa-mdx-lint':
         specifier: 0.2.6-alpha
         version: 0.2.6-alpha
@@ -1558,10 +1558,10 @@ importers:
         version: 1.6.0
       '@supabase/ssr':
         specifier: 'catalog:'
-        version: 0.10.2(@supabase/supabase-js@2.110.1)
+        version: 0.10.2(@supabase/supabase-js@2.110.6)
       '@supabase/supabase-js':
         specifier: 'catalog:'
-        version: 2.110.1
+        version: 2.110.6
       '@tanstack/react-router':
         specifier: 'catalog:'
         version: 1.170.10(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
@@ -1675,10 +1675,10 @@ importers:
         version: 10.59.0(@opentelemetry/core@2.8.0(@opentelemetry/api@1.9.1))(@opentelemetry/sdk-trace-base@2.8.0(@opentelemetry/api@1.9.1))(encoding@0.1.13)(next@15.5.18(@babel/core@7.29.7(supports-color@8.1.1))(@opentelemetry/api@1.9.1)(@playwright/test@1.59.1)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)(sass@1.77.4))(react@19.2.6)(supports-color@8.1.1)(vite@8.0.16(@types/node@22.13.14)(esbuild@0.28.1)(jiti@2.7.0)(sass@1.77.4)(terser@5.39.0)(tsx@4.22.4)(yaml@2.9.0))(webpack@5.105.4(esbuild@0.28.1))
       '@supabase/ssr':
         specifier: 'catalog:'
-        version: 0.10.2(@supabase/supabase-js@2.110.1)
+        version: 0.10.2(@supabase/supabase-js@2.110.6)
       '@supabase/supabase-js':
         specifier: 'catalog:'
-        version: 2.110.1
+        version: 2.110.6
       '@typescript/native':
         specifier: 'catalog:'
         version: typescript@7.0.2
@@ -1940,13 +1940,13 @@ importers:
     dependencies:
       '@supabase/postgrest-js':
         specifier: 'catalog:'
-        version: 2.110.1
+        version: 2.110.6
       '@supabase/ssr':
         specifier: 'catalog:'
-        version: 0.10.2(@supabase/supabase-js@2.110.1)
+        version: 0.10.2(@supabase/supabase-js@2.110.6)
       '@supabase/supabase-js':
         specifier: 'catalog:'
-        version: 2.110.1
+        version: 2.110.6
       '@vueuse/core':
         specifier: ^14.1.0
         version: 14.1.0(vue@3.5.35(typescript@6.0.2))
@@ -1998,7 +1998,7 @@ importers:
         version: 1.59.1
       '@supabase/supabase-js':
         specifier: 'catalog:'
-        version: 2.110.1
+        version: 2.110.6
       cross-fetch:
         specifier: ^4.1.0
         version: 4.1.0(encoding@0.1.13)
@@ -2026,7 +2026,7 @@ importers:
         version: 0.18.5
       '@supabase/supabase-js':
         specifier: 'catalog:'
-        version: 2.110.1
+        version: 2.110.6
       ai:
         specifier: 5.0.52
         version: 5.0.52(zod@3.25.76)
@@ -2123,10 +2123,10 @@ importers:
     dependencies:
       '@supabase/auth-js':
         specifier: 'catalog:'
-        version: 2.110.1
+        version: 2.110.6
       '@supabase/supabase-js':
         specifier: 'catalog:'
-        version: 2.110.1
+        version: 2.110.6
       '@types/dat.gui':
         specifier: ^0.7.12
         version: 0.7.12
@@ -2598,7 +2598,7 @@ importers:
         version: 0.1.6(encoding@0.1.13)(supports-color@8.1.1)
       '@supabase/supabase-js':
         specifier: 'catalog:'
-        version: 2.110.1
+        version: 2.110.6
       '@tanstack/react-table':
         specifier: 'catalog:'
         version: 8.21.3(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
@@ -7617,12 +7617,12 @@ packages:
   '@supabase-labs/y-supabase@0.1.0':
     resolution: {integrity: sha512-1ItaKbcImgy7ueYfJcyVYihqCKi9RAee9MKBV8wcCqSMNsrWvw4ibhW8ai91kWsewsiWzIDXVPONgcUcxagk9g==}
 
-  '@supabase/auth-js@2.110.1':
-    resolution: {integrity: sha512-8EJUoRoqzAYWkieHrLCrGrxs3cBbRB94xK8GzHe0aSLlSa4mt1enYLCiMgLiKJOF8GNYeX6PLTBNef0XAhILgw==}
+  '@supabase/auth-js@2.110.6':
+    resolution: {integrity: sha512-20v99wV4dodllbDOsD8AUVkQ7Ie+vwcgPeORY9YlC9YyJSmVgWff9gRTdgmyfE6GJHoSMJuQ4HZokSLHA/7YUg==}
     engines: {node: '>=22.0.0'}
 
-  '@supabase/functions-js@2.110.1':
-    resolution: {integrity: sha512-Pm9HD9Qth6zQO0aOGZ3DxYb6QlCzrkTkP6eUEOvhTlbvcvYRDSCZXIJ5dkDLpqxD+gdrXfWDFOpU9BpRKYjsIQ==}
+  '@supabase/functions-js@2.110.6':
+    resolution: {integrity: sha512-Ih/I766vc579WfNzXSv1ERssCHKzaPj9rpST/j9wsMuUv+AfmRteKrJn3sVmrJIwQU5qJya2+aWTlvhf4WoMsg==}
     engines: {node: '>=22.0.0'}
 
   '@supabase/mcp-server-supabase@0.7.0':
@@ -7641,12 +7641,12 @@ packages:
   '@supabase/phoenix@0.4.4':
     resolution: {integrity: sha512-Gt0pqoXuIqX/8dvG0OKp/wMCobXNH3klNbUPBNyOfN0YA1IswrM3HyWFMOPk1Jy+BRaIyDPcFx4jLBwHNmlyfQ==}
 
-  '@supabase/postgrest-js@2.110.1':
-    resolution: {integrity: sha512-BILNhS40oGlP2bn/VJjh/1hCyrWNMmpGZGcCrPvqd5R3s8gf8Bd5qyKoHZdMwTKynGCuJGjagRXa069abhibMw==}
+  '@supabase/postgrest-js@2.110.6':
+    resolution: {integrity: sha512-kDNKncLtYBI/QT8HuVGSui/F3KrC3iWy7KM5M3EvWbEujf1cL+fdwMr2eeA8PEZUIPBeNbDxRzdFZo5t86iqUQ==}
     engines: {node: '>=22.0.0'}
 
-  '@supabase/realtime-js@2.110.1':
-    resolution: {integrity: sha512-JmWCpMoe2iJPNrXIdHqIvf2Mie6NfSuWHS9Ve6YCmLkn1mNl3vrK3a67IukJ5lPjgmAzB+jFagyMz2oSIX+Xnw==}
+  '@supabase/realtime-js@2.110.6':
+    resolution: {integrity: sha512-F2BhRmbC1dJlNA6cdjtbIWQJNV112TYbzEc0/0UFZYvKL52mL0PR0ZrlpIPEludV85WEmjA1RpjW2H5tNQka9g==}
     engines: {node: '>=22.0.0'}
 
   '@supabase/shared-types@0.1.88':
@@ -7660,8 +7660,8 @@ packages:
     peerDependencies:
       '@supabase/supabase-js': ^2.102.1
 
-  '@supabase/storage-js@2.110.1':
-    resolution: {integrity: sha512-UqJGzhFMiIRBe8vT7a6ZtrN2U5YufH4Tk9nyc9KKfa2TUtV11BkSg/v3lyy/c4A8SbekVH3UywTF0s42zpF4zw==}
+  '@supabase/storage-js@2.110.6':
+    resolution: {integrity: sha512-DHS7Jy8MCu2sltDBjANu6oGjeUBUY+bowBnga6CySwtAF2BBKCTJGULnt7wyKPSLSXsoiCyzTwyU1r3SAx++Rg==}
     engines: {node: '>=22.0.0'}
 
   '@supabase/supa-mdx-lint-darwin@0.2.6-alpha':
@@ -7799,8 +7799,8 @@ packages:
     resolution: {integrity: sha512-iqJHDk/ToyxFMa/um9A5gsp9jYN7iI0cIabNq9nyBpK/Yat/J9I2IIMueQwIMy3TsG6a2qdPyUkZkuPC37SdRg==}
     hasBin: true
 
-  '@supabase/supabase-js@2.110.1':
-    resolution: {integrity: sha512-MiJh0THZgyAvTWm91FOLknjH5dYjXRKOdxpuUsyTVZVXIf7FxCShzevIm4KGCubHRU2n25Gyt8PhTXIFzcD9FA==}
+  '@supabase/supabase-js@2.110.6':
+    resolution: {integrity: sha512-UJTAz1NUiSRI2mQYhUPvNMwqfkSucV1iSCcMJz8jgsSUTOfic9C3D6LGNOrH6KTvYUhxRvnf3ktq2Sd3IXIQzQ==}
     engines: {node: '>=22.0.0'}
 
   '@swc/helpers@0.5.15':
@@ -23469,15 +23469,15 @@ snapshots:
 
   '@supabase-labs/y-supabase@0.1.0':
     dependencies:
-      '@supabase/supabase-js': 2.110.1
+      '@supabase/supabase-js': 2.110.6
       y-protocols: 1.0.7(yjs@13.6.29)
       yjs: 13.6.29
 
-  '@supabase/auth-js@2.110.1':
+  '@supabase/auth-js@2.110.6':
     dependencies:
       tslib: 2.8.1
 
-  '@supabase/functions-js@2.110.1':
+  '@supabase/functions-js@2.110.6':
     dependencies:
       tslib: 2.8.1
 
@@ -23499,11 +23499,11 @@ snapshots:
 
   '@supabase/phoenix@0.4.4': {}
 
-  '@supabase/postgrest-js@2.110.1':
+  '@supabase/postgrest-js@2.110.6':
     dependencies:
       tslib: 2.8.1
 
-  '@supabase/realtime-js@2.110.1':
+  '@supabase/realtime-js@2.110.6':
     dependencies:
       '@supabase/phoenix': 0.4.4
       tslib: 2.8.1
@@ -23519,12 +23519,12 @@ snapshots:
       - encoding
       - supports-color
 
-  '@supabase/ssr@0.10.2(@supabase/supabase-js@2.110.1)':
+  '@supabase/ssr@0.10.2(@supabase/supabase-js@2.110.6)':
     dependencies:
-      '@supabase/supabase-js': 2.110.1
+      '@supabase/supabase-js': 2.110.6
       cookie: 1.0.2
 
-  '@supabase/storage-js@2.110.1':
+  '@supabase/storage-js@2.110.6':
     dependencies:
       iceberg-js: 0.8.1
       tslib: 2.8.1
@@ -23625,13 +23625,13 @@ snapshots:
       '@supabase/supa-mdx-lint-win32-x64': 0.3.2
       node-pty: 1.0.0
 
-  '@supabase/supabase-js@2.110.1':
+  '@supabase/supabase-js@2.110.6':
     dependencies:
-      '@supabase/auth-js': 2.110.1
-      '@supabase/functions-js': 2.110.1
-      '@supabase/postgrest-js': 2.110.1
-      '@supabase/realtime-js': 2.110.1
-      '@supabase/storage-js': 2.110.1
+      '@supabase/auth-js': 2.110.6
+      '@supabase/functions-js': 2.110.6
+      '@supabase/postgrest-js': 2.110.6
+      '@supabase/realtime-js': 2.110.6
+      '@supabase/storage-js': 2.110.6
 
   '@swc/helpers@0.5.15':
     dependencies:
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
index a5efde9543dd8..44b5c9e1b6ae4 100644
--- a/pnpm-workspace.yaml
+++ b/pnpm-workspace.yaml
@@ -10,11 +10,11 @@ catalog:
   '@monaco-editor/react': ^4.7.0
   '@sentry/nextjs': ^10.59.0
   '@sentry/tanstackstart-react': ^10.59.0
-  '@supabase/auth-js': 2.110.1
-  '@supabase/postgrest-js': 2.110.1
-  '@supabase/realtime-js': 2.110.1
+  '@supabase/auth-js': 2.110.6
+  '@supabase/postgrest-js': 2.110.6
+  '@supabase/realtime-js': 2.110.6
   '@supabase/ssr': 0.10.2
-  '@supabase/supabase-js': 2.110.1
+  '@supabase/supabase-js': 2.110.6
   '@tanstack/react-router': ^1.169.2
   '@tanstack/react-start': ^1.167.65
   '@tanstack/react-table': ^8.21.3

From 2279c4e69ea4b99117267da41216f2dca4f4a0a8 Mon Sep 17 00:00:00 2001
From: Danny White <3104761+dnywh@users.noreply.github.com>
Date: Thu, 16 Jul 2026 03:01:25 +1000
Subject: [PATCH 2/7] fix(studio,www): repair Join us on Discord buttons
 (#47711)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## What kind of change does this PR introduce?

Bug fix

## What is the current behavior?

The "Join us on Discord" buttons are broken in two places:

- **Studio support sidebar** (`HelpPanel`): on light mode the button
background is not white, so the intended white button with purple icon
and text is broken.
- **www `/support` page** (shared `secondary` button variant): the text
disappears on hover, and the Discord icon is never rendered (always
invisible). Both issues occur on light and dark mode.

## What is the new behavior?

- **Studio support sidebar**: force a white background on all colour
schemes via `bg-white hover:bg-white/90`, matching the existing pattern
in `DiscordCTACard`. The purple icon and text now render correctly on
light mode.
- **Shared `secondary` button variant** (`packages/ui`):
- The icon container used `text-border-muted`, which blended into the
`bg-foreground` button, so the icon was invisible. Changed to
`text-background` to match the button's text colour.
- The hover state used `text-border-stronger`, which had no contrast
against the background, so text disappeared on hover. Changed to
`text-background/80`.
- Removed the ineffective `fill="var(--background-default)"` from
`IconDiscord` on the `/support` page — the SVG path uses `currentColor`,
so the fill prop had no effect.

These `secondary` variant fixes apply globally, so other secondary
buttons benefit too.

| Before | After |
| --- | --- |
| <img width="868" height="642" alt="CleanShot 2026-07-07 at 15 39
42@2x"
src="https://github.com/user-attachments/assets/6897b6ba-311e-43c7-bb5a-7b70017a54cc"
/> | <img width="906" height="610" alt="CleanShot 2026-07-07 at 16 21
31@2x"
src="https://github.com/user-attachments/assets/16104cf0-8ed1-4857-8467-532c1f7fdb5f"
/> |
| <img width="636" height="620" alt="CleanShot 2026-07-07 at 15 24
53@2x"
src="https://github.com/user-attachments/assets/75f55f6c-eaa7-45ee-94fe-eac513126eff"
/> | <img width="656" height="404" alt="CleanShot 2026-07-07 at 16 24
23@2x"
src="https://github.com/user-attachments/assets/35649b23-fcdd-42fd-8140-e4aaf394667e"
/> |

<!-- This is an auto-generated comment: release notes by coderabbit.ai
-->
## Summary by CodeRabbit

## Summary by CodeRabbit

* **Style**
* Refreshed secondary button styling for a more consistent look,
including updated hover and loading text/icon colors.
* Improved the “Join us on Discord” button’s background and hover
appearance.
* Simplified the Discord card’s icon rendering to rely on the default
icon styling.
<!-- end of auto-generated comment: release notes by coderabbit.ai -->
---
 apps/studio/components/ui/HelpPanel/HelpPanel.tsx | 1 +
 apps/www/data/support.tsx                         | 2 +-
 packages/ui/src/components/Button/Button.tsx      | 6 +++---
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/apps/studio/components/ui/HelpPanel/HelpPanel.tsx b/apps/studio/components/ui/HelpPanel/HelpPanel.tsx
index 82db3d0c7d32d..211639e3e9b79 100644
--- a/apps/studio/components/ui/HelpPanel/HelpPanel.tsx
+++ b/apps/studio/components/ui/HelpPanel/HelpPanel.tsx
@@ -109,6 +109,7 @@ export const HelpPanel = ({
                     <Button
                       variant="secondary"
                       size="tiny"
+                      className="bg-white hover:bg-white/90"
                       icon={
                         <SVG src={`${router.basePath}/img/discord-icon.svg`} className="h-4 w-4" />
                       }
diff --git a/apps/www/data/support.tsx b/apps/www/data/support.tsx
index b4edd7d90396b..2870fb5b9347a 100644
--- a/apps/www/data/support.tsx
+++ b/apps/www/data/support.tsx
@@ -19,7 +19,7 @@ const data = {
           label: 'Join us on Discord',
           link: 'https://discord.supabase.com/',
           target: '_blank',
-          icon: <IconDiscord fill="var(--background-default)" />,
+          icon: <IconDiscord />,
           type: 'secondary',
         },
       ],
diff --git a/packages/ui/src/components/Button/Button.tsx b/packages/ui/src/components/Button/Button.tsx
index 807c016eb5545..f110cb94061ae 100644
--- a/packages/ui/src/components/Button/Button.tsx
+++ b/packages/ui/src/components/Button/Button.tsx
@@ -51,7 +51,7 @@ const buttonVariants = cva(
           `,
         secondary: `
           bg-foreground
-          text-background hover:text-border-stronger
+          text-background hover:text-background/80
           focus-visible:text-border-control
           border-foreground-light hover:border-foreground-lighter
           focus-visible:outline-border-strong
@@ -157,7 +157,7 @@ const IconContainerVariants = cva('inline-flex items-center justify-center shrin
     variant: {
       primary: 'text-brand-600',
       default: 'text-foreground-lighter',
-      secondary: 'text-border-muted',
+      secondary: 'text-background',
       alternative: 'text-foreground-lighter',
       outline: 'text-foreground-lighter',
       dashed: 'text-foreground-lighter',
@@ -175,7 +175,7 @@ const loadingVariants = cva('', {
     variant: {
       primary: 'text-brand-600',
       default: 'text-foreground-lighter',
-      secondary: 'text-border-muted',
+      secondary: 'text-background',
       alternative: 'text-foreground-lighter',
       outline: 'text-foreground-lighter',
       dashed: 'text-foreground-lighter',

From 9e80a159b5fed01cd2ac338f9d920e471a3b84ca Mon Sep 17 00:00:00 2001
From: Charis <26616127+charislam@users.noreply.github.com>
Date: Wed, 15 Jul 2026 13:10:09 -0400
Subject: [PATCH 3/7] refactor(sql-editor): decompose into controller contexts
 + presentational components (decompose 6/6) (#47938)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## What

Final step (**6 of 6**) of the `SQLEditor.tsx` decomposition. Splits the
two `ResizablePanel` bodies out of the `SQLEditorContent` monolith into
presentational sub-components:

- **`SQLEditorPane`** — the editor panel: loading state, `DiffEditor` +
diff ask-AI widget, `MonacoEditor` + ask-AI widget. Reads the Monaco
refs (`editorRef`/`monacoRef`/`diffEditorRef`) from `SQLEditorContext`,
and receives the `diff`/`prompt`/`ai` controllers plus reactive state as
props.
- **`SQLEditorResults`** — the results panel: loading state +
`UtilityPanel`.

`SQLEditorContent` is now a composition root: shared-ref provider, hook
composition, and the run-query warning modal.

## Result

`SQLEditor.tsx` goes from the original **1056-line** monolith down to
**259 lines** (≈75% reduction). The remaining size over a bare ~140-line
root is the run-query warning modal, kept inline **deliberately**: its
handlers hold the `acceptUntrustedSql` promotion, which must stay at the
explicit user-action boundary in the root rather than moving into a
presentational pane.

## Behavior-preserving

The moved JSX is byte-identical aside from prop threading. No logic,
effects, dependency arrays, or `eslint-disable`s changed. The two
**render-time ref reads** — the editor placeholder (`!promptState.isOpen
&& !editorRef.current?.getValue()`) and the ask-AI widget gate
(`editorRef.current && promptState.isOpen && !isDiffOpen`) — are
preserved verbatim in `SQLEditorPane`, which re-renders whenever the
`prompt`/`diff` props change, keeping those reads fresh (the guardrail
from the plan).

Verification (all green):
- `SQLEditor.test.tsx` characterization suite — 11/11 pass
- `tsc --noEmit` — no new errors
- eslint — clean (no new ratchet entries)
- prettier — clean

## Stack

Builds on decompose 5 (#47935). This is the last PR in the series — the
decomposition is complete after this merges.


<!-- This is an auto-generated comment: release notes by coderabbit.ai
-->
## Summary by CodeRabbit

* **New Features**
* Added a resizable SQL editor layout with run warnings, query results,
and an Explain view.
* Introduced centralized SQL editor controllers and expanded AI-assisted
prompt/diff workflows.
  * Added keyboard support for running and Explain analysis.
* **Bug Fixes**
  * Restored editor focus after accepting or discarding AI changes.
  * Improved handling and validation of SQL Explain actions.
  * Preserved editor scroll position when switching snippets.
* **Refactor**
* Streamlined the SQLEditor into a composed layout and improved
memoization to reduce unnecessary re-renders.
<!-- end of auto-generated comment: release notes by coderabbit.ai -->
---
 .../interfaces/SQLEditor/SQLEditor.tsx        | 373 +-----------------
 .../interfaces/SQLEditor/SQLEditor.types.ts   |   3 +
 .../SQLEditor/SQLEditorControllers.tsx        | 264 +++++++++++++
 .../SQLEditor/SQLEditorEditorPanel.tsx        | 189 +++++++++
 .../interfaces/SQLEditor/SQLEditorLayout.tsx  | 146 +++++++
 .../components/interfaces/SQLEditor/hooks.ts  |  51 ++-
 .../interfaces/SQLEditor/useEditorMount.ts    |  36 +-
 .../interfaces/SQLEditor/useSqlEditorAi.ts    | 125 +++---
 .../SQLEditor/useSqlEditorExecution.ts        |   6 +-
 .../SQLEditor/useSqlEditorExplain.ts          |   3 +-
 .../SQLEditor/useSqlEditorShortcuts.ts        |  22 +-
 11 files changed, 758 insertions(+), 460 deletions(-)
 create mode 100644 apps/studio/components/interfaces/SQLEditor/SQLEditorControllers.tsx
 create mode 100644 apps/studio/components/interfaces/SQLEditor/SQLEditorEditorPanel.tsx
 create mode 100644 apps/studio/components/interfaces/SQLEditor/SQLEditorLayout.tsx

diff --git a/apps/studio/components/interfaces/SQLEditor/SQLEditor.tsx b/apps/studio/components/interfaces/SQLEditor/SQLEditor.tsx
index aa10baf4cf820..34f4efdcbeff5 100644
--- a/apps/studio/components/interfaces/SQLEditor/SQLEditor.tsx
+++ b/apps/studio/components/interfaces/SQLEditor/SQLEditor.tsx
@@ -1,372 +1,11 @@
-import { acceptUntrustedSql, untrustedSql, type UntrustedSqlFragment } from '@supabase/pg-meta'
-import { LOCAL_STORAGE_KEYS, useFlag, useParams } from 'common'
-import { Loader2 } from 'lucide-react'
-import dynamic from 'next/dynamic'
-import { useCallback, useEffect, useEffectEvent, useState } from 'react'
-import { cn, ResizableHandle, ResizablePanel, ResizablePanelGroup } from 'ui'
-
-import { useSqlEditorDiff, useSqlEditorPrompt } from './hooks'
-import { RunQueryWarningModal } from './RunQueryWarningModal'
-import { appendEnableRLSStatements } from './SQLEditor.utils'
-import { SQLEditorProvider, useSQLEditorContext } from './SQLEditorContext'
-import { useAddDefinitions } from './useAddDefinitions'
-import { useEditorMount } from './useEditorMount'
-import { usePrettifyQuery } from './usePrettifyQuery'
-import { useSnippetIdentity } from './useSnippetIdentity'
-import { useSnippetTitleGenerator } from './useSnippetTitleGenerator'
-import { useSqlEditorAi } from './useSqlEditorAi'
-import { useSqlEditorExecution } from './useSqlEditorExecution'
-import { useSqlEditorExplain } from './useSqlEditorExplain'
-import { useSqlEditorShortcuts } from './useSqlEditorShortcuts'
-import { UtilityActions } from './UtilityPanel/UtilityActions'
-import { UtilityPanel } from './UtilityPanel/UtilityPanel'
-import ResizableAIWidget from '@/components/ui/AIEditor/ResizableAIWidget'
-import { isValidConnString } from '@/data/fetchers'
-import { useReadReplicasQuery } from '@/data/read-replicas/replicas-query'
-import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'
-import { detectOS } from '@/lib/helpers'
-import { useDatabaseSelectorStateSnapshot } from '@/state/database-selector'
-import {
-  getSqlEditorV2StateSnapshot,
-  useSqlEditorV2StateSnapshot,
-} from '@/state/sql-editor/sql-editor-state'
-import { createTabId, useTabsStateSnapshot } from '@/state/tabs'
-
-// Load the monaco editor client-side only (does not behave well server-side)
-const MonacoEditor = dynamic(
-  () => import('./MonacoEditor').then(({ MonacoEditor }) => MonacoEditor),
-  { ssr: false }
-)
-const DiffEditor = dynamic(
-  () => import('../../ui/DiffEditor').then(({ DiffEditor }) => DiffEditor),
-  { ssr: false }
-)
-
-const SQLEditorContent = () => {
-  const {
-    editorRef,
-    monacoRef,
-    diffEditorRef,
-    scrollTopRef,
-    refocusEditor,
-    clearPendingRunRefocus,
-    markRefocusAfterRun,
-    getEditorSql: getEditorSqlFromEditor,
-  } = useSQLEditorContext()
-
-  const os = detectOS()
-  const { ref } = useParams()
-
-  const { data: project } = useSelectedProjectQuery()
-
-  const tabs = useTabsStateSnapshot()
-  const snapV2 = useSqlEditorV2StateSnapshot()
-  const databaseSelectorState = useDatabaseSelectorStateSnapshot()
-
-  // [Ali] Kill switch to hide the SQL Editor Explain tab and its entry points
-  const disablePrettyExplain = useFlag('DisablePrettyExplainOnSqlEditor')
-
-  const diff = useSqlEditorDiff()
-  const { isDiffOpen, defaultSqlDiff } = diff
-  const prompt = useSqlEditorPrompt()
-  const { promptState, setPromptState, promptInput, setPromptInput, resetPrompt } = prompt
-
-  const [hasSelection, setHasSelection] = useState<boolean>(false)
-  const [activeUtilityTab, setActiveUtilityTab] = useState<string>('results')
-
-  const { id, urlId, generatedNewSnippetName, isLoading } = useSnippetIdentity()
-  const { onMount, editorMountCount } = useEditorMount({ id })
-
-  useAddDefinitions(id, monacoRef.current)
-
-  const { data: databases, isSuccess: isSuccessReadReplicas } = useReadReplicasQuery(
-    {
-      projectRef: ref,
-    },
-    { enabled: isValidConnString(project?.connectionString) }
-  )
-
-  const { setAiTitle } = useSnippetTitleGenerator()
-
-  const prettifyQuery = usePrettifyQuery({ id, isDiffOpen })
-
-  // Reads the SQL to run from the editor as an UntrustedSqlFragment. The
-  // untrusted→safe promotion (acceptUntrustedSql) happens in the run / explain
-  // gesture + warning-modal handlers below — as close to the user action as
-  // possible — before the SQL reaches the execute* pipelines.
-  const readEditorSql = useCallback((): UntrustedSqlFragment | undefined => {
-    const snippet = getSqlEditorV2StateSnapshot().snippets[id]
-    return getEditorSqlFromEditor(snippet?.snippet.content?.unchecked_sql)
-  }, [getEditorSqlFromEditor, id])
-
-  const { executeQuery, isExecuting, potentialIssues, resetPotentialIssues } =
-    useSqlEditorExecution({
-      id,
-      isDiffOpen,
-      hasSelection,
-      activeUtilityTab,
-      setActiveUtilityTab,
-      setAiTitle,
-    })
-
-  const { executeExplainQuery, isExplainExecuting } = useSqlEditorExplain({
-    id,
-    isDiffOpen,
-    setActiveUtilityTab,
-  })
-
-  // Run/explain gestures. These are the deliberate user actions, so the
-  // untrusted→safe promotion (acceptUntrustedSql) happens here — as close to the
-  // event handler as possible — before the SQL reaches the execute* pipelines.
-  const executeQueryFromButton = useCallback(() => {
-    markRefocusAfterRun()
-    refocusEditor()
-    const sql = readEditorSql()
-    if (sql === undefined) return clearPendingRunRefocus()
-    void executeQuery(acceptUntrustedSql(sql))
-  }, [clearPendingRunRefocus, executeQuery, markRefocusAfterRun, readEditorSql, refocusEditor])
-
-  const handleRunShortcut = useCallback(() => {
-    const sql = readEditorSql()
-    if (sql !== undefined) void executeQuery(acceptUntrustedSql(sql))
-  }, [executeQuery, readEditorSql])
-
-  const handleRunExplain = useCallback(() => {
-    const sql = readEditorSql()
-    if (sql !== undefined) void executeExplainQuery(acceptUntrustedSql(sql))
-  }, [executeExplainQuery, readEditorSql])
-
-  const {
-    handlePrompt,
-    acceptAiHandler,
-    discardAiHandler,
-    onDebug,
-    buildDebugPrompt,
-    handleDiffEditorMount,
-    isCompletionLoading,
-    showWidget,
-  } = useSqlEditorAi({ id, editorMountCount, diff, prompt })
-
-  useSqlEditorShortcuts({
-    isDiffOpen,
-    isPromptOpen: promptState.isOpen,
-    disablePrettyExplain,
-    prettifyQuery,
-    runExplain: handleRunExplain,
-    acceptAiHandler,
-    discardAiHandler,
-    resetPrompt,
-  })
-
-  /** All useEffects are at the bottom before returning the TSX */
-
-  const saveScrollPosition = useEffectEvent((snippetId: string) => {
-    if (ref) {
-      const tabId = createTabId('sql', { id: snippetId })
-      tabs.updateTab(tabId, { scrollTop: scrollTopRef.current })
-    }
-  })
-  useEffect(() => {
-    // Save the departing snippet's scroll position on unmount / snippet switch.
-    return () => saveScrollPosition(id)
-    // Temporary until we update eslint to ignore useEffectEvent
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [id])
-
-  useEffect(() => {
-    if (isSuccessReadReplicas) {
-      const primaryDatabase = databases.find((db) => db.identifier === ref)
-      databaseSelectorState.setSelectedDatabaseId(primaryDatabase?.identifier)
-    }
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [isSuccessReadReplicas, databases, ref])
-
-  return (
-    <>
-      <RunQueryWarningModal
-        visible={!!potentialIssues}
-        potentialIssues={potentialIssues}
-        onCancel={() => {
-          clearPendingRunRefocus()
-          resetPotentialIssues()
-          refocusEditor()
-        }}
-        onConfirm={() => {
-          markRefocusAfterRun()
-          resetPotentialIssues()
-          refocusEditor()
-          // The user has reviewed the warning and confirmed — promote here.
-          const sql = readEditorSql()
-          if (sql === undefined) return clearPendingRunRefocus()
-          void executeQuery(acceptUntrustedSql(sql), true)
-        }}
-        onConfirmWithRLS={() => {
-          const tables = potentialIssues?.createTablesMissingRLS ?? []
-          if (tables.length === 0) return
-          const baseSql = readEditorSql() ?? untrustedSql('')
-          const rewrittenSql = appendEnableRLSStatements(baseSql, tables)
-          markRefocusAfterRun()
-          resetPotentialIssues()
-          refocusEditor()
-          // The user has reviewed the warning and confirmed — promote here.
-          void executeQuery(acceptUntrustedSql(untrustedSql(rewrittenSql)), true)
-        }}
-      />
-
-      <div className="flex flex-col h-full">
-        <UtilityActions
-          id={id}
-          isExecuting={isExecuting}
-          isDisabled={isDiffOpen}
-          hasSelection={hasSelection}
-          prettifyQuery={prettifyQuery}
-          executeQuery={executeQueryFromButton}
-          className="px-4 min-h-[42px] border-b shrink-0"
-        />
-        <ResizablePanelGroup
-          className="relative flex-1 min-h-0"
-          orientation="vertical"
-          autoSaveId={LOCAL_STORAGE_KEYS.SQL_EDITOR_SPLIT_SIZE}
-        >
-          <ResizablePanel defaultSize="50" maxSize="70">
-            <div className="grow overflow-y-auto border-b h-full">
-              {isLoading ? (
-                <div className="flex h-full w-full items-center justify-center">
-                  <Loader2 className="animate-spin text-brand" />
-                </div>
-              ) : (
-                <>
-                  {isDiffOpen && (
-                    <div className="w-full h-full">
-                      <DiffEditor
-                        language="pgsql"
-                        original={defaultSqlDiff.original}
-                        modified={defaultSqlDiff.modified}
-                        onMount={handleDiffEditorMount}
-                      />
-                      {showWidget && (
-                        <ResizableAIWidget
-                          editor={diffEditorRef.current!}
-                          id="ask-ai-diff"
-                          value={promptInput}
-                          onChange={setPromptInput}
-                          onSubmit={(prompt: string) => {
-                            handlePrompt(prompt, {
-                              beforeSelection: promptState.beforeSelection,
-                              selection: promptState.selection || defaultSqlDiff.modified,
-                              afterSelection: promptState.afterSelection,
-                            })
-                          }}
-                          onAccept={acceptAiHandler}
-                          onReject={discardAiHandler}
-                          onCancel={resetPrompt}
-                          isDiffVisible={true}
-                          isLoading={isCompletionLoading}
-                          startLineNumber={Math.max(0, promptState.startLineNumber)}
-                          endLineNumber={promptState.endLineNumber}
-                        />
-                      )}
-                    </div>
-                  )}
-                  <div key={id} className="w-full h-full relative">
-                    <MonacoEditor
-                      autoFocus
-                      placeholder={
-                        !promptState.isOpen && !editorRef.current?.getValue()
-                          ? 'Hit ' +
-                            (os === 'macos' ? 'CMD+SHIFT+K' : `CTRL+SHIFT+K`) +
-                            ' to generate query or just start typing'
-                          : ''
-                      }
-                      id={id}
-                      snippetName={
-                        urlId === 'new'
-                          ? generatedNewSnippetName
-                          : (snapV2.snippets[id]?.snippet.name ?? generatedNewSnippetName)
-                      }
-                      className={cn(isDiffOpen && 'hidden')}
-                      editorRef={editorRef}
-                      monacoRef={monacoRef}
-                      executeQuery={handleRunShortcut}
-                      executeExplainQuery={handleRunExplain}
-                      showExplainAction={!disablePrettyExplain}
-                      prettifyQuery={prettifyQuery}
-                      onHasSelection={setHasSelection}
-                      onMount={onMount}
-                      onPrompt={({
-                        selection,
-                        beforeSelection,
-                        afterSelection,
-                        startLineNumber,
-                        endLineNumber,
-                      }) => {
-                        setPromptState((prev) => ({
-                          ...prev,
-                          isOpen: true,
-                          selection,
-                          beforeSelection,
-                          afterSelection,
-                          startLineNumber,
-                          endLineNumber,
-                        }))
-                      }}
-                    />
-                    {editorRef.current && promptState.isOpen && !isDiffOpen && (
-                      <ResizableAIWidget
-                        editor={editorRef.current}
-                        id="ask-ai"
-                        value={promptInput}
-                        onChange={setPromptInput}
-                        onSubmit={(prompt: string) => {
-                          handlePrompt(prompt, {
-                            beforeSelection: promptState.beforeSelection,
-                            selection: promptState.selection,
-                            afterSelection: promptState.afterSelection,
-                          })
-                        }}
-                        onCancel={resetPrompt}
-                        isDiffVisible={false}
-                        isLoading={isCompletionLoading}
-                        startLineNumber={Math.max(0, promptState.startLineNumber)}
-                        endLineNumber={promptState.endLineNumber}
-                      />
-                    )}
-                  </div>
-                </>
-              )}
-            </div>
-          </ResizablePanel>
-
-          <ResizableHandle withHandle />
-
-          <ResizablePanel defaultSize="50" maxSize="70">
-            {isLoading ? (
-              <div className="flex h-full w-full items-center justify-center">
-                <Loader2 className="animate-spin text-brand" />
-              </div>
-            ) : (
-              <UtilityPanel
-                id={id}
-                isExecuting={isExecuting}
-                isExplainExecuting={isExplainExecuting}
-                isDisabled={isDiffOpen}
-                executeExplainQuery={handleRunExplain}
-                showExplainTab={!disablePrettyExplain}
-                onDebug={onDebug}
-                buildDebugPrompt={buildDebugPrompt}
-                activeTab={activeUtilityTab}
-                onActiveTabChange={setActiveUtilityTab}
-              />
-            )}
-          </ResizablePanel>
-        </ResizablePanelGroup>
-      </div>
-    </>
-  )
-}
+import { SQLEditorProvider } from './SQLEditorContext'
+import { SQLEditorControllersProvider } from './SQLEditorControllers'
+import { SQLEditorLayout } from './SQLEditorLayout'
 
 export const SQLEditor = () => (
   <SQLEditorProvider>
-    <SQLEditorContent />
+    <SQLEditorControllersProvider>
+      <SQLEditorLayout />
+    </SQLEditorControllersProvider>
   </SQLEditorProvider>
 )
diff --git a/apps/studio/components/interfaces/SQLEditor/SQLEditor.types.ts b/apps/studio/components/interfaces/SQLEditor/SQLEditor.types.ts
index 185196f6fcc54..8c87cea61a163 100644
--- a/apps/studio/components/interfaces/SQLEditor/SQLEditor.types.ts
+++ b/apps/studio/components/interfaces/SQLEditor/SQLEditor.types.ts
@@ -37,3 +37,6 @@ export type PotentialIssues = {
   hasAlterDatabasePreventConnection?: boolean
   createTablesMissingRLS?: { schema?: string; tableName: string }[]
 }
+
+/** The tabs available in the SQL editor's results/utility panel. */
+export type UtilityTab = 'results' | 'explain'
diff --git a/apps/studio/components/interfaces/SQLEditor/SQLEditorControllers.tsx b/apps/studio/components/interfaces/SQLEditor/SQLEditorControllers.tsx
new file mode 100644
index 0000000000000..44b0998b55d2c
--- /dev/null
+++ b/apps/studio/components/interfaces/SQLEditor/SQLEditorControllers.tsx
@@ -0,0 +1,264 @@
+import { type UntrustedSqlFragment } from '@supabase/pg-meta'
+import { useFlag, useParams } from 'common'
+import {
+  createContext,
+  use,
+  useCallback,
+  useEffect,
+  useEffectEvent,
+  useMemo,
+  useState,
+  type Context,
+  type Dispatch,
+  type PropsWithChildren,
+  type SetStateAction,
+} from 'react'
+
+import { useSqlEditorDiff, useSqlEditorPrompt } from './hooks'
+import type { UtilityTab } from './SQLEditor.types'
+import { useSQLEditorContext } from './SQLEditorContext'
+import { useAddDefinitions } from './useAddDefinitions'
+import { useEditorMount } from './useEditorMount'
+import { usePrettifyQuery } from './usePrettifyQuery'
+import { useSnippetIdentity } from './useSnippetIdentity'
+import { useSnippetTitleGenerator } from './useSnippetTitleGenerator'
+import { useSqlEditorAi } from './useSqlEditorAi'
+import { useSqlEditorExecution } from './useSqlEditorExecution'
+import { useSqlEditorExplain } from './useSqlEditorExplain'
+import { useSqlEditorShortcuts } from './useSqlEditorShortcuts'
+import { isValidConnString } from '@/data/fetchers'
+import { useReadReplicasQuery } from '@/data/read-replicas/replicas-query'
+import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'
+import { useDatabaseSelectorStateSnapshot } from '@/state/database-selector'
+import {
+  getSqlEditorV2StateSnapshot,
+  useSqlEditorV2StateSnapshot,
+} from '@/state/sql-editor/sql-editor-state'
+import { createTabId, useTabsStateSnapshot } from '@/state/tabs'
+
+/**
+ * Reactive SQL-editor controllers, distributed via a handful of focused
+ * contexts so the visual tree consumes exactly the slice it needs instead of
+ * prop-drilling whole hook bundles. The stable Monaco refs + imperative helpers
+ * live in `SQLEditorContext`; this provider owns everything that changes with
+ * state.
+ *
+ * SQL that a user runs is NOT promoted to safety here — the provider only
+ * exposes the already-safe `executeQuery` / `executeExplainQuery` pipelines plus
+ * `readEditorSql` (which returns an `UntrustedSqlFragment`). Each user-action
+ * site (the toolbar/editor/results components and the shortcut handlers)
+ * promotes with `acceptUntrustedSql` right where the user acts, so the promotion
+ * is auditable.
+ */
+
+type SnippetContextValue = {
+  id: string
+  snippetName: string
+  isLoading: boolean
+}
+
+type AssistantContextValue = {
+  diff: ReturnType<typeof useSqlEditorDiff>
+  prompt: ReturnType<typeof useSqlEditorPrompt>
+  ai: ReturnType<typeof useSqlEditorAi>
+}
+
+type SqlEditorExecution = ReturnType<typeof useSqlEditorExecution>
+type SqlEditorExplain = ReturnType<typeof useSqlEditorExplain>
+type SqlEditorMount = ReturnType<typeof useEditorMount>
+
+/** Running SQL: the safe execute pipelines, their status, and formatting. */
+type RunContextValue = {
+  executeQuery: SqlEditorExecution['executeQuery']
+  executeExplainQuery: SqlEditorExplain['executeExplainQuery']
+  readEditorSql: () => UntrustedSqlFragment | undefined
+  isExecuting: boolean
+  isExplainExecuting: boolean
+  potentialIssues: SqlEditorExecution['potentialIssues']
+  resetPotentialIssues: () => void
+  prettifyQuery: () => void
+}
+
+/** Editor-surface UI state: selection, the active results tab, and mount. */
+type UiContextValue = {
+  hasSelection: boolean
+  setHasSelection: Dispatch<SetStateAction<boolean>>
+  activeUtilityTab: UtilityTab
+  setActiveUtilityTab: Dispatch<SetStateAction<UtilityTab>>
+  onMount: SqlEditorMount['onMount']
+}
+
+const SnippetContext = createContext<SnippetContextValue | null>(null)
+const AssistantContext = createContext<AssistantContextValue | null>(null)
+const RunContext = createContext<RunContextValue | null>(null)
+const UiContext = createContext<UiContextValue | null>(null)
+
+function useGuardedContext<T>(context: Context<T | null>, hookName: string): T {
+  const value = use(context)
+  if (!value) {
+    throw new Error(`${hookName} must be used within a SQLEditorControllersProvider`)
+  }
+  return value
+}
+
+/** Snippet identity + display name for the current tab. */
+export const useSqlEditorSnippet = () => useGuardedContext(SnippetContext, 'useSqlEditorSnippet')
+
+/** The Assistant / diff cluster controllers (diff, prompt, ai). */
+export const useSqlEditorAssistant = () =>
+  useGuardedContext(AssistantContext, 'useSqlEditorAssistant')
+
+/** Run / explain execution, warnings, and query formatting. */
+export const useSqlEditorRun = () => useGuardedContext(RunContext, 'useSqlEditorRun')
+
+/** Editor-surface UI state (selection, active results tab, editor mount). */
+export const useSqlEditorUi = () => useGuardedContext(UiContext, 'useSqlEditorUi')
+
+export const SQLEditorControllersProvider = ({ children }: PropsWithChildren) => {
+  const { monacoRef, scrollTopRef, getEditorSql: getEditorSqlFromEditor } = useSQLEditorContext()
+
+  const { ref } = useParams()
+  const { data: project } = useSelectedProjectQuery()
+
+  const tabs = useTabsStateSnapshot()
+  const snapV2 = useSqlEditorV2StateSnapshot()
+  const { setSelectedDatabaseId } = useDatabaseSelectorStateSnapshot()
+
+  // [Ali] Kill switch to hide the SQL Editor Explain tab and its entry points
+  const disablePrettyExplain = useFlag('DisablePrettyExplainOnSqlEditor')
+
+  const diff = useSqlEditorDiff()
+  const { isDiffOpen } = diff
+  const prompt = useSqlEditorPrompt()
+  const { promptState, resetPrompt } = prompt
+
+  const [hasSelection, setHasSelection] = useState<boolean>(false)
+  const [activeUtilityTab, setActiveUtilityTab] = useState<UtilityTab>('results')
+
+  const { id, urlId, generatedNewSnippetName, isLoading } = useSnippetIdentity()
+  const { onMount, editorMountCount } = useEditorMount({ id })
+
+  useAddDefinitions(id, monacoRef.current)
+
+  const { data: databases, isSuccess: isSuccessReadReplicas } = useReadReplicasQuery(
+    {
+      projectRef: ref,
+    },
+    { enabled: isValidConnString(project?.connectionString) }
+  )
+
+  const { setAiTitle } = useSnippetTitleGenerator()
+
+  const prettifyQuery = usePrettifyQuery({ id, isDiffOpen })
+
+  // Reads the SQL to run from the editor as an UntrustedSqlFragment. Promotion
+  // to safety (acceptUntrustedSql) happens at each user-action site, never here.
+  const readEditorSql = useCallback((): UntrustedSqlFragment | undefined => {
+    const snippet = getSqlEditorV2StateSnapshot().snippets[id]
+    return getEditorSqlFromEditor(snippet?.snippet.content?.unchecked_sql)
+  }, [getEditorSqlFromEditor, id])
+
+  const { executeQuery, isExecuting, potentialIssues, resetPotentialIssues } =
+    useSqlEditorExecution({
+      id,
+      isDiffOpen,
+      hasSelection,
+      activeUtilityTab,
+      setActiveUtilityTab,
+      setAiTitle,
+    })
+
+  const { executeExplainQuery, isExplainExecuting } = useSqlEditorExplain({
+    id,
+    isDiffOpen,
+    setActiveUtilityTab,
+  })
+
+  const ai = useSqlEditorAi({ id, editorMountCount, diff, prompt })
+  const { acceptAiHandler, discardAiHandler } = ai
+
+  useSqlEditorShortcuts({
+    isDiffOpen,
+    isPromptOpen: promptState.isOpen,
+    disablePrettyExplain,
+    prettifyQuery,
+    readEditorSql,
+    executeExplainQuery,
+    acceptAiHandler,
+    discardAiHandler,
+    resetPrompt,
+  })
+
+  const saveScrollPosition = useEffectEvent((snippetId: string) => {
+    if (ref) {
+      const tabId = createTabId('sql', { id: snippetId })
+      tabs.updateTab(tabId, { scrollTop: scrollTopRef.current })
+    }
+  })
+  useEffect(() => {
+    // Save the departing snippet's scroll position on unmount / snippet switch.
+    return () => saveScrollPosition(id)
+    // Temporary until we update eslint to ignore useEffectEvent
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [id])
+
+  useEffect(() => {
+    if (isSuccessReadReplicas) {
+      const primaryDatabase = databases.find((db) => db.identifier === ref)
+      setSelectedDatabaseId(primaryDatabase?.identifier)
+    }
+  }, [isSuccessReadReplicas, databases, ref, setSelectedDatabaseId])
+
+  const snippetName =
+    urlId === 'new'
+      ? generatedNewSnippetName
+      : (snapV2.snippets[id]?.snippet.name ?? generatedNewSnippetName)
+
+  const snippetValue = useMemo<SnippetContextValue>(
+    () => ({ id, snippetName, isLoading }),
+    [id, snippetName, isLoading]
+  )
+
+  const assistantValue = useMemo<AssistantContextValue>(
+    () => ({ diff, prompt, ai }),
+    [diff, prompt, ai]
+  )
+
+  const runValue = useMemo<RunContextValue>(
+    () => ({
+      executeQuery,
+      executeExplainQuery,
+      readEditorSql,
+      isExecuting,
+      isExplainExecuting,
+      potentialIssues,
+      resetPotentialIssues,
+      prettifyQuery,
+    }),
+    [
+      executeQuery,
+      executeExplainQuery,
+      readEditorSql,
+      isExecuting,
+      isExplainExecuting,
+      potentialIssues,
+      resetPotentialIssues,
+      prettifyQuery,
+    ]
+  )
+
+  const uiValue = useMemo<UiContextValue>(
+    () => ({ hasSelection, setHasSelection, activeUtilityTab, setActiveUtilityTab, onMount }),
+    [hasSelection, activeUtilityTab, onMount]
+  )
+
+  return (
+    <SnippetContext.Provider value={snippetValue}>
+      <AssistantContext.Provider value={assistantValue}>
+        <RunContext.Provider value={runValue}>
+          <UiContext.Provider value={uiValue}>{children}</UiContext.Provider>
+        </RunContext.Provider>
+      </AssistantContext.Provider>
+    </SnippetContext.Provider>
+  )
+}
diff --git a/apps/studio/components/interfaces/SQLEditor/SQLEditorEditorPanel.tsx b/apps/studio/components/interfaces/SQLEditor/SQLEditorEditorPanel.tsx
new file mode 100644
index 0000000000000..bc29180ca05ab
--- /dev/null
+++ b/apps/studio/components/interfaces/SQLEditor/SQLEditorEditorPanel.tsx
@@ -0,0 +1,189 @@
+import { acceptUntrustedSql } from '@supabase/pg-meta'
+import { useFlag } from 'common'
+import { Loader2 } from 'lucide-react'
+import dynamic from 'next/dynamic'
+import { useCallback } from 'react'
+import { cn } from 'ui'
+
+import { useSQLEditorContext } from './SQLEditorContext'
+import {
+  useSqlEditorAssistant,
+  useSqlEditorRun,
+  useSqlEditorSnippet,
+  useSqlEditorUi,
+} from './SQLEditorControllers'
+import ResizableAIWidget from '@/components/ui/AIEditor/ResizableAIWidget'
+import { detectOS } from '@/lib/helpers'
+
+// Load the monaco editor client-side only (does not behave well server-side)
+const MonacoEditor = dynamic(
+  () => import('./MonacoEditor').then(({ MonacoEditor }) => MonacoEditor),
+  { ssr: false }
+)
+const DiffEditor = dynamic(
+  () => import('../../ui/DiffEditor').then(({ DiffEditor }) => DiffEditor),
+  { ssr: false }
+)
+
+const generatePlaceholder = (os: string | undefined) =>
+  `Hit ${os === 'macos' ? 'CMD+SHIFT+K' : 'CTRL+SHIFT+K'} to generate query or just start typing`
+
+/**
+ * The ask-AI widget anchored to the diff editor's modified pane. Reads the diff
+ * editor ref from context and assembles the prompt context from the current
+ * selection.
+ */
+const DiffPromptWidget = () => {
+  const { diffEditorRef } = useSQLEditorContext()
+  const { diff, prompt, ai } = useSqlEditorAssistant()
+  const { defaultSqlDiff } = diff
+  const { promptState, promptInput, setPromptInput, resetPrompt } = prompt
+  const { handlePrompt, acceptAiHandler, discardAiHandler, isCompletionLoading } = ai
+
+  return (
+    <ResizableAIWidget
+      editor={diffEditorRef.current!}
+      id="ask-ai-diff"
+      value={promptInput}
+      onChange={setPromptInput}
+      onSubmit={(value: string) => {
+        handlePrompt(value, {
+          beforeSelection: promptState.beforeSelection,
+          selection: promptState.selection || defaultSqlDiff.modified,
+          afterSelection: promptState.afterSelection,
+        })
+      }}
+      onAccept={acceptAiHandler}
+      onReject={discardAiHandler}
+      onCancel={resetPrompt}
+      isDiffVisible={true}
+      isLoading={isCompletionLoading}
+      startLineNumber={Math.max(0, promptState.startLineNumber)}
+      endLineNumber={promptState.endLineNumber}
+    />
+  )
+}
+
+/** The diff editor + its ask-AI widget, shown while a diff is open. */
+const SQLEditorDiffView = () => {
+  const { diff, ai } = useSqlEditorAssistant()
+  const { defaultSqlDiff } = diff
+  const { handleDiffEditorMount, showWidget } = ai
+
+  return (
+    <div className="w-full h-full">
+      <DiffEditor
+        language="pgsql"
+        original={defaultSqlDiff.original}
+        modified={defaultSqlDiff.modified}
+        onMount={handleDiffEditorMount}
+      />
+      {showWidget && <DiffPromptWidget />}
+    </div>
+  )
+}
+
+/** The ask-AI widget anchored to the main editor. */
+const MainPromptWidget = () => {
+  const { editorRef } = useSQLEditorContext()
+  const { prompt, ai } = useSqlEditorAssistant()
+  const { promptState, promptInput, setPromptInput, resetPrompt } = prompt
+  const { handlePrompt, isCompletionLoading } = ai
+
+  return (
+    <ResizableAIWidget
+      editor={editorRef.current!}
+      id="ask-ai"
+      value={promptInput}
+      onChange={setPromptInput}
+      onSubmit={(value: string) => {
+        handlePrompt(value, {
+          beforeSelection: promptState.beforeSelection,
+          selection: promptState.selection,
+          afterSelection: promptState.afterSelection,
+        })
+      }}
+      onCancel={resetPrompt}
+      isDiffVisible={false}
+      isLoading={isCompletionLoading}
+      startLineNumber={Math.max(0, promptState.startLineNumber)}
+      endLineNumber={promptState.endLineNumber}
+    />
+  )
+}
+
+/**
+ * The main Monaco editor + its ask-AI widget. Always mounted (hidden behind the
+ * diff editor while a diff is open) so the editor instance and its model survive
+ * the diff lifecycle. The `editorRef.current` reads in the placeholder and the
+ * widget gate happen during render and stay fresh because this component
+ * subscribes to `promptState` / `isDiffOpen` via context.
+ */
+const SQLEditorMainView = () => {
+  const { editorRef, monacoRef } = useSQLEditorContext()
+  const { id, snippetName } = useSqlEditorSnippet()
+  const { diff, prompt } = useSqlEditorAssistant()
+  const { isDiffOpen } = diff
+  const { promptState, openPrompt } = prompt
+  const { executeQuery, executeExplainQuery, readEditorSql, prettifyQuery } = useSqlEditorRun()
+  const { onMount, setHasSelection } = useSqlEditorUi()
+
+  const os = detectOS()
+  const showExplainAction = !useFlag('DisablePrettyExplainOnSqlEditor')
+
+  // Run/explain gestures from the editor — promote here, at the user action.
+  const runQuery = useCallback(() => {
+    const sql = readEditorSql()
+    if (sql !== undefined) void executeQuery(acceptUntrustedSql(sql))
+  }, [executeQuery, readEditorSql])
+
+  const runExplain = useCallback(() => {
+    const sql = readEditorSql()
+    if (sql !== undefined) void executeExplainQuery(acceptUntrustedSql(sql))
+  }, [executeExplainQuery, readEditorSql])
+
+  return (
+    <div key={id} className="w-full h-full relative">
+      <MonacoEditor
+        autoFocus
+        placeholder={
+          !promptState.isOpen && !editorRef.current?.getValue() ? generatePlaceholder(os) : ''
+        }
+        id={id}
+        snippetName={snippetName}
+        className={cn(isDiffOpen && 'hidden')}
+        editorRef={editorRef}
+        monacoRef={monacoRef}
+        executeQuery={runQuery}
+        executeExplainQuery={runExplain}
+        showExplainAction={showExplainAction}
+        prettifyQuery={prettifyQuery}
+        onHasSelection={setHasSelection}
+        onMount={onMount}
+        onPrompt={openPrompt}
+      />
+      {editorRef.current && promptState.isOpen && !isDiffOpen && <MainPromptWidget />}
+    </div>
+  )
+}
+
+/** The top (editor) resizable panel: loading state, diff view, and main editor. */
+export const SQLEditorEditorPanel = () => {
+  const { isLoading } = useSqlEditorSnippet()
+  const { diff } = useSqlEditorAssistant()
+
+  return (
+    <div className="grow overflow-y-auto border-b h-full">
+      {isLoading ? (
+        <div className="flex h-full w-full items-center justify-center">
+          <Loader2 className="animate-spin text-brand" />
+        </div>
+      ) : (
+        <>
+          {diff.isDiffOpen && <SQLEditorDiffView />}
+          <SQLEditorMainView />
+        </>
+      )}
+    </div>
+  )
+}
diff --git a/apps/studio/components/interfaces/SQLEditor/SQLEditorLayout.tsx b/apps/studio/components/interfaces/SQLEditor/SQLEditorLayout.tsx
new file mode 100644
index 0000000000000..85bc92e32717f
--- /dev/null
+++ b/apps/studio/components/interfaces/SQLEditor/SQLEditorLayout.tsx
@@ -0,0 +1,146 @@
+import { acceptUntrustedSql, untrustedSql } from '@supabase/pg-meta'
+import { LOCAL_STORAGE_KEYS, useFlag } from 'common'
+import { Loader2 } from 'lucide-react'
+import { useCallback } from 'react'
+import { ResizableHandle, ResizablePanel, ResizablePanelGroup } from 'ui'
+
+import { RunQueryWarningModal } from './RunQueryWarningModal'
+import type { UtilityTab } from './SQLEditor.types'
+import { appendEnableRLSStatements } from './SQLEditor.utils'
+import { useSQLEditorContext } from './SQLEditorContext'
+import {
+  useSqlEditorAssistant,
+  useSqlEditorRun,
+  useSqlEditorSnippet,
+  useSqlEditorUi,
+} from './SQLEditorControllers'
+import { SQLEditorEditorPanel } from './SQLEditorEditorPanel'
+import { UtilityActions } from './UtilityPanel/UtilityActions'
+import { UtilityPanel } from './UtilityPanel/UtilityPanel'
+
+const SQLEditorRunWarningModal = () => {
+  const { refocusEditor, clearPendingRunRefocus, markRefocusAfterRun } = useSQLEditorContext()
+  const { potentialIssues, resetPotentialIssues, executeQuery, readEditorSql } = useSqlEditorRun()
+
+  return (
+    <RunQueryWarningModal
+      visible={!!potentialIssues}
+      potentialIssues={potentialIssues}
+      onCancel={() => {
+        clearPendingRunRefocus()
+        resetPotentialIssues()
+        refocusEditor()
+      }}
+      onConfirm={() => {
+        markRefocusAfterRun()
+        resetPotentialIssues()
+        const sql = readEditorSql()
+        if (sql === undefined) return clearPendingRunRefocus()
+        // The user has reviewed the warning and confirmed — promote here.
+        void executeQuery(acceptUntrustedSql(sql), true)
+      }}
+      onConfirmWithRLS={() => {
+        const tables = potentialIssues?.createTablesMissingRLS ?? []
+        if (tables.length === 0) return
+        const baseSql = readEditorSql() ?? untrustedSql('')
+        const rewrittenSql = appendEnableRLSStatements(baseSql, tables)
+        markRefocusAfterRun()
+        resetPotentialIssues()
+        // The user has reviewed the warning and confirmed — promote here.
+        void executeQuery(acceptUntrustedSql(untrustedSql(rewrittenSql)), true)
+      }}
+    />
+  )
+}
+
+/** The top-bar controls (run / prettify / etc.). */
+const SQLEditorToolbar = () => {
+  const { clearPendingRunRefocus, markRefocusAfterRun } = useSQLEditorContext()
+  const { id } = useSqlEditorSnippet()
+  const { diff } = useSqlEditorAssistant()
+  const { executeQuery, readEditorSql, isExecuting, prettifyQuery } = useSqlEditorRun()
+  const { hasSelection } = useSqlEditorUi()
+
+  // Run gesture from the toolbar button — promote here, at the user action.
+  const runQuery = useCallback(() => {
+    markRefocusAfterRun()
+    const sql = readEditorSql()
+    if (sql === undefined) return clearPendingRunRefocus()
+    void executeQuery(acceptUntrustedSql(sql))
+  }, [clearPendingRunRefocus, executeQuery, markRefocusAfterRun, readEditorSql])
+
+  return (
+    <UtilityActions
+      id={id}
+      isExecuting={isExecuting}
+      isDisabled={diff.isDiffOpen}
+      hasSelection={hasSelection}
+      prettifyQuery={prettifyQuery}
+      executeQuery={runQuery}
+      className="px-4 min-h-[42px] border-b shrink-0"
+    />
+  )
+}
+
+/** The bottom (results) resizable panel: loading state + utility panel. */
+const SQLEditorResultsPanel = () => {
+  const { id, isLoading } = useSqlEditorSnippet()
+  const { diff, ai } = useSqlEditorAssistant()
+  const { executeExplainQuery, readEditorSql, isExecuting, isExplainExecuting } = useSqlEditorRun()
+  const { activeUtilityTab, setActiveUtilityTab } = useSqlEditorUi()
+
+  const showExplainTab = !useFlag('DisablePrettyExplainOnSqlEditor')
+
+  // Explain gesture from the results panel — promote here, at the user action.
+  const runExplain = useCallback(() => {
+    const sql = readEditorSql()
+    if (sql !== undefined) void executeExplainQuery(acceptUntrustedSql(sql))
+  }, [executeExplainQuery, readEditorSql])
+
+  return isLoading ? (
+    <div className="flex h-full w-full items-center justify-center">
+      <Loader2 className="animate-spin text-brand" />
+    </div>
+  ) : (
+    <UtilityPanel
+      id={id}
+      isExecuting={isExecuting}
+      isExplainExecuting={isExplainExecuting}
+      isDisabled={diff.isDiffOpen}
+      executeExplainQuery={runExplain}
+      showExplainTab={showExplainTab}
+      onDebug={ai.onDebug}
+      buildDebugPrompt={ai.buildDebugPrompt}
+      activeTab={activeUtilityTab}
+      onActiveTabChange={(tab) => setActiveUtilityTab(tab as UtilityTab)}
+    />
+  )
+}
+
+/** The SQL editor shell: warning modal, toolbar, and the editor/results split. */
+export const SQLEditorLayout = () => {
+  return (
+    <>
+      <SQLEditorRunWarningModal />
+
+      <div className="flex flex-col h-full">
+        <SQLEditorToolbar />
+        <ResizablePanelGroup
+          className="relative flex-1 min-h-0"
+          orientation="vertical"
+          autoSaveId={LOCAL_STORAGE_KEYS.SQL_EDITOR_SPLIT_SIZE}
+        >
+          <ResizablePanel defaultSize="50" maxSize="70">
+            <SQLEditorEditorPanel />
+          </ResizablePanel>
+
+          <ResizableHandle withHandle />
+
+          <ResizablePanel defaultSize="50" maxSize="70">
+            <SQLEditorResultsPanel />
+          </ResizablePanel>
+        </ResizablePanelGroup>
+      </div>
+    </>
+  )
+}
diff --git a/apps/studio/components/interfaces/SQLEditor/hooks.ts b/apps/studio/components/interfaces/SQLEditor/hooks.ts
index 7c7b2e391ce18..3f531c4aba4dc 100644
--- a/apps/studio/components/interfaces/SQLEditor/hooks.ts
+++ b/apps/studio/components/interfaces/SQLEditor/hooks.ts
@@ -95,17 +95,20 @@ export function useSqlEditorDiff() {
     setSelectedDiffType(undefined)
   }, [])
 
-  return {
-    sourceSqlDiff,
-    setSourceSqlDiff,
-    selectedDiffType,
-    setSelectedDiffType,
-    isAcceptDiffLoading,
-    setIsAcceptDiffLoading,
-    isDiffOpen,
-    defaultSqlDiff,
-    closeDiff,
-  }
+  return useMemo(
+    () => ({
+      sourceSqlDiff,
+      setSourceSqlDiff,
+      selectedDiffType,
+      setSelectedDiffType,
+      isAcceptDiffLoading,
+      setIsAcceptDiffLoading,
+      isDiffOpen,
+      defaultSqlDiff,
+      closeDiff,
+    }),
+    [sourceSqlDiff, selectedDiffType, isAcceptDiffLoading, isDiffOpen, defaultSqlDiff, closeDiff]
+  )
 }
 
 interface PromptState {
@@ -136,16 +139,24 @@ export function useSqlEditorPrompt() {
     }
   }, [promptState.isOpen])
 
-  const resetPrompt = () => {
+  const resetPrompt = useCallback(() => {
     setPromptState(initialPromptState)
     setPromptInput('')
-  }
+  }, [])
 
-  return {
-    promptState,
-    setPromptState,
-    promptInput,
-    setPromptInput,
-    resetPrompt,
-  }
+  const openPrompt = useCallback((context: Omit<PromptState, 'isOpen'>) => {
+    setPromptState((prev) => ({ ...prev, isOpen: true, ...context }))
+  }, [])
+
+  return useMemo(
+    () => ({
+      promptState,
+      setPromptState,
+      promptInput,
+      setPromptInput,
+      resetPrompt,
+      openPrompt,
+    }),
+    [promptState, promptInput, resetPrompt, openPrompt]
+  )
 }
diff --git a/apps/studio/components/interfaces/SQLEditor/useEditorMount.ts b/apps/studio/components/interfaces/SQLEditor/useEditorMount.ts
index 12714c2e400f2..c5ff808e13539 100644
--- a/apps/studio/components/interfaces/SQLEditor/useEditorMount.ts
+++ b/apps/studio/components/interfaces/SQLEditor/useEditorMount.ts
@@ -1,8 +1,9 @@
-import { useState } from 'react'
+import { useCallback, useContext, useState } from 'react'
+import { snapshot } from 'valtio'
 
 import type { IStandaloneCodeEditor } from './SQLEditor.types'
 import { useSQLEditorContext } from './SQLEditorContext'
-import { createTabId, useTabsStateSnapshot } from '@/state/tabs'
+import { createTabId, TabsStateContext } from '@/state/tabs'
 
 /**
  * Owns the editor `onMount` handler (scroll-position restore + tracking) and the
@@ -11,26 +12,31 @@ import { createTabId, useTabsStateSnapshot } from '@/state/tabs'
  */
 export function useEditorMount({ id }: { id: string }) {
   const { scrollTopRef } = useSQLEditorContext()
-  const tabs = useTabsStateSnapshot()
+  // The proxy store (stable reference), read non-reactively in onMount so the
+  // callback identity doesn't churn on every tab-state change.
+  const tabsState = useContext(TabsStateContext)
 
   // Bumped on every editor mount (including the keyed remount on snippet switch)
   // so a diff request that arrived before the editor was ready gets re-processed.
   const [editorMountCount, setEditorMountCount] = useState(0)
 
-  const onMount = (editor: IStandaloneCodeEditor) => {
-    setEditorMountCount((count) => count + 1)
+  const onMount = useCallback(
+    (editor: IStandaloneCodeEditor) => {
+      setEditorMountCount((count) => count + 1)
 
-    const tabId = createTabId('sql', { id })
-    const tabData = tabs.tabsMap[tabId]
+      const tabId = createTabId('sql', { id })
+      const tabData = snapshot(tabsState).tabsMap[tabId]
 
-    // [Joshen] Tiny timeout to give a bit of time for the content to load before scrolling
-    setTimeout(() => {
-      if (tabData?.metadata?.scrollTop) {
-        editor.setScrollTop(tabData.metadata.scrollTop)
-      }
-    }, 20)
-    editor.onDidScrollChange((e) => (scrollTopRef.current = e.scrollTop))
-  }
+      // [Joshen] Tiny timeout to give a bit of time for the content to load before scrolling
+      setTimeout(() => {
+        if (tabData?.metadata?.scrollTop) {
+          editor.setScrollTop(tabData.metadata.scrollTop)
+        }
+      }, 20)
+      editor.onDidScrollChange((e) => (scrollTopRef.current = e.scrollTop))
+    },
+    [id, scrollTopRef, tabsState]
+  )
 
   return { onMount, editorMountCount }
 }
diff --git a/apps/studio/components/interfaces/SQLEditor/useSqlEditorAi.ts b/apps/studio/components/interfaces/SQLEditor/useSqlEditorAi.ts
index d49d4fa036c4e..ca0fec82805b9 100644
--- a/apps/studio/components/interfaces/SQLEditor/useSqlEditorAi.ts
+++ b/apps/studio/components/interfaces/SQLEditor/useSqlEditorAi.ts
@@ -1,6 +1,6 @@
 import { useParams } from 'common'
 import { useRouter } from 'next/router'
-import { useCallback, useEffect, useEffectEvent, useState } from 'react'
+import { useCallback, useEffect, useEffectEvent, useMemo, useState } from 'react'
 import { toast } from 'sonner'
 
 import type { useSqlEditorDiff, useSqlEditorPrompt } from './hooks'
@@ -55,7 +55,7 @@ export function useSqlEditorAi({ id, editorMountCount, diff, prompt }: UseSqlEdi
   } = diff
   const { promptState, setPromptState, resetPrompt } = prompt
 
-  const { editorRef, diffEditorRef } = useSQLEditorContext()
+  const { editorRef, diffEditorRef, refocusEditor } = useSQLEditorContext()
 
   const router = useRouter()
   const { ref } = useParams()
@@ -163,6 +163,7 @@ export function useSqlEditorAi({ id, editorMountCount, diff, prompt }: UseSqlEdi
       setSelectedDiffType(DiffType.Modification)
       resetPrompt()
       closeDiff()
+      refocusEditor()
     } finally {
       setIsAcceptDiffLoading(false)
     }
@@ -178,13 +179,15 @@ export function useSqlEditorAi({ id, editorMountCount, diff, prompt }: UseSqlEdi
     setSelectedDiffType,
     resetPrompt,
     closeDiff,
+    refocusEditor,
   ])
 
   const discardAiHandler = useCallback(() => {
     track('assistant_sql_diff_handler_evaluated', { handlerAccepted: false })
     resetPrompt()
     closeDiff()
-  }, [closeDiff, resetPrompt, track])
+    refocusEditor()
+  }, [closeDiff, resetPrompt, track, refocusEditor])
 
   const complete = useCallback(
     async (
@@ -244,46 +247,54 @@ export function useSqlEditorAi({ id, editorMountCount, diff, prompt }: UseSqlEdi
     ]
   )
 
-  const handlePrompt = async (
-    prompt: string,
-    context: {
-      beforeSelection: string
-      selection: string
-      afterSelection: string
-    }
-  ) => {
-    try {
-      setPromptState((prev) => ({
-        ...prev,
-        selection: context.selection,
-        beforeSelection: context.beforeSelection,
-        afterSelection: context.afterSelection,
-      }))
-      const headerData = await constructHeaders()
-
-      const authorizationHeader = headerData.get('Authorization')
-
-      await complete(prompt, {
-        ...(authorizationHeader ? { headers: { Authorization: authorizationHeader } } : undefined),
-        body: {
-          completionMetadata: {
-            textBeforeCursor: context.beforeSelection,
-            textAfterCursor: context.afterSelection,
-            language: 'pgsql',
-            prompt,
-            selection: context.selection,
+  const handlePrompt = useCallback(
+    async (
+      prompt: string,
+      context: {
+        beforeSelection: string
+        selection: string
+        afterSelection: string
+      }
+    ) => {
+      try {
+        setPromptState((prev) => ({
+          ...prev,
+          selection: context.selection,
+          beforeSelection: context.beforeSelection,
+          afterSelection: context.afterSelection,
+        }))
+        const headerData = await constructHeaders()
+
+        const authorizationHeader = headerData.get('Authorization')
+
+        await complete(prompt, {
+          ...(authorizationHeader
+            ? { headers: { Authorization: authorizationHeader } }
+            : undefined),
+          body: {
+            completionMetadata: {
+              textBeforeCursor: context.beforeSelection,
+              textAfterCursor: context.afterSelection,
+              language: 'pgsql',
+              prompt,
+              selection: context.selection,
+            },
           },
-        },
-      })
-    } catch (error) {
-      setPromptState((prev) => ({ ...prev, isLoading: false }))
-    }
-  }
+        })
+      } catch (error) {
+        setPromptState((prev) => ({ ...prev, isLoading: false }))
+      }
+    },
+    [complete, setPromptState]
+  )
 
-  const handleDiffEditorMount = (editor: IStandaloneDiffEditor) => {
-    diffEditorRef.current = editor
-    setIsDiffEditorMounted(true)
-  }
+  const handleDiffEditorMount = useCallback(
+    (editor: IStandaloneDiffEditor) => {
+      diffEditorRef.current = editor
+      setIsDiffEditorMounted(true)
+    },
+    [diffEditorRef]
+  )
 
   const resetDiff = useEffectEvent(() => {
     if (id) {
@@ -360,14 +371,26 @@ export function useSqlEditorAi({ id, editorMountCount, diff, prompt }: UseSqlEdi
     }
   }, [diffEditorRef, isDiffOpen, isDiffEditorMounted])
 
-  return {
-    handlePrompt,
-    acceptAiHandler,
-    discardAiHandler,
-    onDebug,
-    buildDebugPrompt,
-    handleDiffEditorMount,
-    isCompletionLoading,
-    showWidget,
-  }
+  return useMemo(
+    () => ({
+      handlePrompt,
+      acceptAiHandler,
+      discardAiHandler,
+      onDebug,
+      buildDebugPrompt,
+      handleDiffEditorMount,
+      isCompletionLoading,
+      showWidget,
+    }),
+    [
+      handlePrompt,
+      acceptAiHandler,
+      discardAiHandler,
+      onDebug,
+      buildDebugPrompt,
+      handleDiffEditorMount,
+      isCompletionLoading,
+      showWidget,
+    ]
+  )
 }
diff --git a/apps/studio/components/interfaces/SQLEditor/useSqlEditorExecution.ts b/apps/studio/components/interfaces/SQLEditor/useSqlEditorExecution.ts
index 2eadbbf5dba51..00a49baf654f2 100644
--- a/apps/studio/components/interfaces/SQLEditor/useSqlEditorExecution.ts
+++ b/apps/studio/components/interfaces/SQLEditor/useSqlEditorExecution.ts
@@ -5,7 +5,7 @@ import { useCallback, useState } from 'react'
 import { toast } from 'sonner'
 
 import { untitledSnippetTitle } from './SQLEditor.constants'
-import type { PotentialIssues } from './SQLEditor.types'
+import type { PotentialIssues, UtilityTab } from './SQLEditor.types'
 import {
   checkAlterDatabaseConnection,
   checkDestructiveQuery,
@@ -39,8 +39,8 @@ type UseSqlEditorExecutionArgs = {
   id: string
   isDiffOpen: boolean
   hasSelection: boolean
-  activeUtilityTab: string
-  setActiveUtilityTab: (tab: string) => void
+  activeUtilityTab: UtilityTab
+  setActiveUtilityTab: (tab: UtilityTab) => void
   setAiTitle: (id: string, sql: string) => void
 }
 
diff --git a/apps/studio/components/interfaces/SQLEditor/useSqlEditorExplain.ts b/apps/studio/components/interfaces/SQLEditor/useSqlEditorExplain.ts
index 48386d6e400a5..32c4cfe8f00a0 100644
--- a/apps/studio/components/interfaces/SQLEditor/useSqlEditorExplain.ts
+++ b/apps/studio/components/interfaces/SQLEditor/useSqlEditorExplain.ts
@@ -3,6 +3,7 @@ import { useParams } from 'common'
 import { useCallback } from 'react'
 import { toast } from 'sonner'
 
+import type { UtilityTab } from './SQLEditor.types'
 import { buildExplainSql } from './SQLEditor.utils'
 import { useSQLEditorContext } from './SQLEditorContext'
 import { splitSqlStatements } from '@/components/interfaces/ExplainVisualizer/ExplainVisualizer.utils'
@@ -20,7 +21,7 @@ import { useSqlEditorSessionSnapshot } from '@/state/sql-editor/sql-editor-sessi
 type UseSqlEditorExplainArgs = {
   id: string
   isDiffOpen: boolean
-  setActiveUtilityTab: (tab: string) => void
+  setActiveUtilityTab: (tab: UtilityTab) => void
 }
 
 export function useSqlEditorExplain({
diff --git a/apps/studio/components/interfaces/SQLEditor/useSqlEditorShortcuts.ts b/apps/studio/components/interfaces/SQLEditor/useSqlEditorShortcuts.ts
index 4f119980d36ef..19204b6b1c4d0 100644
--- a/apps/studio/components/interfaces/SQLEditor/useSqlEditorShortcuts.ts
+++ b/apps/studio/components/interfaces/SQLEditor/useSqlEditorShortcuts.ts
@@ -1,3 +1,8 @@
+import {
+  acceptUntrustedSql,
+  type SafeSqlFragment,
+  type UntrustedSqlFragment,
+} from '@supabase/pg-meta'
 import { useParams } from 'common'
 import { useRouter } from 'next/router'
 import { useCallback, useEffect } from 'react'
@@ -12,7 +17,8 @@ type UseSqlEditorShortcutsArgs = {
   isPromptOpen: boolean
   disablePrettyExplain: boolean
   prettifyQuery: () => void
-  runExplain: () => void
+  readEditorSql: () => UntrustedSqlFragment | undefined
+  executeExplainQuery: (sql: SafeSqlFragment) => unknown
   acceptAiHandler: () => void
   discardAiHandler: () => void
   resetPrompt: () => void
@@ -28,7 +34,8 @@ export function useSqlEditorShortcuts({
   isPromptOpen,
   disablePrettyExplain,
   prettifyQuery,
-  runExplain,
+  readEditorSql,
+  executeExplainQuery,
   acceptAiHandler,
   discardAiHandler,
   resetPrompt,
@@ -46,6 +53,15 @@ export function useSqlEditorShortcuts({
     router.push(`/project/${ref}/sql/new?skip=true`)
   }, [ref, router])
 
+  // The Explain keyboard shortcut is an explicit user action, so the
+  // untrusted→safe promotion (acceptUntrustedSql) happens here in the shortcut
+  // handler itself — right next to where it is registered — before the SQL
+  // reaches the explain pipeline.
+  const runExplainShortcut = useCallback(() => {
+    const sql = readEditorSql()
+    if (sql !== undefined) void executeExplainQuery(acceptUntrustedSql(sql))
+  }, [executeExplainQuery, readEditorSql])
+
   useShortcut(SHORTCUT_IDS.SQL_EDITOR_FOCUS_EDITOR, refocusEditor, {
     registerInCommandMenu: true,
   })
@@ -58,7 +74,7 @@ export function useSqlEditorShortcuts({
     registerInCommandMenu: true,
   })
 
-  useShortcut(SHORTCUT_IDS.SQL_EDITOR_EXPLAIN, runExplain, {
+  useShortcut(SHORTCUT_IDS.SQL_EDITOR_EXPLAIN, runExplainShortcut, {
     enabled: !disablePrettyExplain,
     registerInCommandMenu: true,
   })

From 4df3c86e9314a295db87176de7490f3e3554bc62 Mon Sep 17 00:00:00 2001
From: Charis <26616127+charislam@users.noreply.github.com>
Date: Wed, 15 Jul 2026 13:11:46 -0400
Subject: [PATCH 4/7] feat: add admin studio link (#47976)

Add link to Admin Studio in top bar for internal use only.

Resolves FE-3864

<!-- This is an auto-generated comment: release notes by coderabbit.ai
-->

## Summary by CodeRabbit

* **New Features**
* Added a conditional Admin Studio shortcut to the desktop project
header.
* The shortcut opens the relevant project in Admin Studio and is
available only when configured and enabled.

<!-- end of auto-generated comment: release notes by coderabbit.ai -->
---
 .../LayoutHeader/AdminStudioButton.tsx        | 37 +++++++++++++++++++
 .../Navigation/LayoutHeader/LayoutHeader.tsx  |  2 +
 apps/studio/lib/constants/index.ts            |  6 +++
 3 files changed, 45 insertions(+)
 create mode 100644 apps/studio/components/layouts/Navigation/LayoutHeader/AdminStudioButton.tsx

diff --git a/apps/studio/components/layouts/Navigation/LayoutHeader/AdminStudioButton.tsx b/apps/studio/components/layouts/Navigation/LayoutHeader/AdminStudioButton.tsx
new file mode 100644
index 0000000000000..70069950c82b2
--- /dev/null
+++ b/apps/studio/components/layouts/Navigation/LayoutHeader/AdminStudioButton.tsx
@@ -0,0 +1,37 @@
+import { useFlag, useParams } from 'common'
+import { Wrench } from 'lucide-react'
+import Link from 'next/link'
+
+import { ButtonTooltip } from '@/components/ui/ButtonTooltip'
+import { ADMIN_STUDIO_URL, IS_PLATFORM } from '@/lib/constants'
+
+export const AdminStudioButton = () => {
+  const params = useParams()
+  const adminStudioLinkEnabled = useFlag('adminStudioLink')
+
+  const isVisible = IS_PLATFORM ? adminStudioLinkEnabled : false
+
+  if (!isVisible || !ADMIN_STUDIO_URL || !params.ref) return null
+
+  return (
+    <ButtonTooltip
+      asChild
+      variant="default"
+      className="rounded-full w-[26px] h-[26px]"
+      icon={<Wrench size={16} strokeWidth={1.5} />}
+      tooltip={{
+        content: {
+          text: 'Open in Admin Studio',
+          side: 'bottom',
+          align: 'center',
+        },
+      }}
+    >
+      <Link
+        href={`${ADMIN_STUDIO_URL}?identifier=${params.ref}`}
+        target="_blank"
+        rel="noreferrer noopener"
+      />
+    </ButtonTooltip>
+  )
+}
diff --git a/apps/studio/components/layouts/Navigation/LayoutHeader/LayoutHeader.tsx b/apps/studio/components/layouts/Navigation/LayoutHeader/LayoutHeader.tsx
index c5dea166e95b1..b1e0b34bd3d85 100644
--- a/apps/studio/components/layouts/Navigation/LayoutHeader/LayoutHeader.tsx
+++ b/apps/studio/components/layouts/Navigation/LayoutHeader/LayoutHeader.tsx
@@ -8,6 +8,7 @@ import { ReactNode, useMemo } from 'react'
 import { Badge, cn } from 'ui'
 import { CommandMenuTriggerInput } from 'ui-patterns/CommandMenu'
 
+import { AdminStudioButton } from './AdminStudioButton'
 import { BreadcrumbsView } from './BreadcrumbsView'
 import { FeedbackDropdown } from './FeedbackDropdown/FeedbackDropdown'
 import { HomeIcon } from './HomeIcon'
@@ -216,6 +217,7 @@ export const LayoutHeader = ({
                   }}
                 >
                   {IS_PLATFORM && <MergeRequestButton />}
+                  <AdminStudioButton />
                   <ConnectButton buttonVariant={connectButtonVariant} />
                 </motion.div>
               )}
diff --git a/apps/studio/lib/constants/index.ts b/apps/studio/lib/constants/index.ts
index b177951c71619..2dc1022e152ef 100644
--- a/apps/studio/lib/constants/index.ts
+++ b/apps/studio/lib/constants/index.ts
@@ -26,6 +26,12 @@ export const IS_STAGING_OR_LOCAL =
   process.env.NEXT_PUBLIC_ENVIRONMENT === 'staging' ||
   process.env.NEXT_PUBLIC_ENVIRONMENT === 'local'
 
+/**
+ * Base URL for the internal Admin Studio tool (kept out of source since this
+ * repo is public).
+ */
+export const ADMIN_STUDIO_URL = process.env.NEXT_PUBLIC_ADMIN_STUDIO_URL
+
 export const API_URL = (() => {
   if (process.env.NODE_ENV === 'test') return 'http://localhost:3000/api'
   //  If running in platform, use API_URL from the env var

From 129d3ccfd568d86c7dfc07a388d1804e96fbde60 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 15 Jul 2026 13:50:09 -0400
Subject: [PATCH 5/7] chore(deps): bump pnpm/action-setup from 4.2.0 to 6.0.9
 (#47928)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Bumps [pnpm/action-setup](https://github.com/pnpm/action-setup) from
4.2.0 to 6.0.9.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/pnpm/action-setup/releases">pnpm/action-setup's
releases</a>.</em></p>
<blockquote>
<h2>v6.0.9</h2>
<h2>What's Changed</h2>
<ul>
<li>fix: update pnpm to v11.7.0 by <a
href="https://github.com/zkochan"><code>@​zkochan</code></a> in <a
href="https://redirect.github.com/pnpm/action-setup/pull/267">pnpm/action-setup#267</a></li>
</ul>
<p><strong>Full Changelog</strong>: <a
href="https://github.com/pnpm/action-setup/compare/v6...v6.0.9">https://github.com/pnpm/action-setup/compare/v6...v6.0.9</a></p>
<h2>v6.0.8</h2>
<h2>What's Changed</h2>
<ul>
<li>docs(README): fix <code>cache_dependency_path</code> type by <a
href="https://github.com/haines"><code>@​haines</code></a> in <a
href="https://redirect.github.com/pnpm/action-setup/pull/257">pnpm/action-setup#257</a></li>
<li>fix: drop patchPnpmEnv so standalone+self-update works on Windows by
<a href="https://github.com/zkochan"><code>@​zkochan</code></a> in <a
href="https://redirect.github.com/pnpm/action-setup/pull/258">pnpm/action-setup#258</a></li>
<li>fix: update pnpm to 11.1.1 by <a
href="https://github.com/mungodewar"><code>@​mungodewar</code></a> in <a
href="https://redirect.github.com/pnpm/action-setup/pull/248">pnpm/action-setup#248</a></li>
</ul>
<h2>New Contributors</h2>
<ul>
<li><a
href="https://github.com/mungodewar"><code>@​mungodewar</code></a> made
their first contribution in <a
href="https://redirect.github.com/pnpm/action-setup/pull/248">pnpm/action-setup#248</a></li>
</ul>
<p><strong>Full Changelog</strong>: <a
href="https://github.com/pnpm/action-setup/compare/v6.0.7...v6.0.8">https://github.com/pnpm/action-setup/compare/v6.0.7...v6.0.8</a></p>
<h2>v6.0.7</h2>
<h2>What's Changed</h2>
<ul>
<li>fix: honor devEngines.packageManager.onFail=error (<a
href="https://redirect.github.com/pnpm/action-setup/issues/252">#252</a>)
by <a href="https://github.com/zkochan"><code>@​zkochan</code></a> in <a
href="https://redirect.github.com/pnpm/action-setup/pull/254">pnpm/action-setup#254</a></li>
<li>fix: restore inputs from state in post by <a
href="https://github.com/haines"><code>@​haines</code></a> in <a
href="https://redirect.github.com/pnpm/action-setup/pull/255">pnpm/action-setup#255</a></li>
<li>fix: self-update bootstrap to packageManager-pinned version (<a
href="https://redirect.github.com/pnpm/action-setup/issues/233">#233</a>)
by <a href="https://github.com/zkochan"><code>@​zkochan</code></a> in <a
href="https://redirect.github.com/pnpm/action-setup/pull/256">pnpm/action-setup#256</a></li>
</ul>
<h2>New Contributors</h2>
<ul>
<li><a href="https://github.com/haines"><code>@​haines</code></a> made
their first contribution in <a
href="https://redirect.github.com/pnpm/action-setup/pull/255">pnpm/action-setup#255</a></li>
</ul>
<p><strong>Full Changelog</strong>: <a
href="https://github.com/pnpm/action-setup/compare/v6.0.6...v6.0.7">https://github.com/pnpm/action-setup/compare/v6.0.6...v6.0.7</a></p>
<h2>v6.0.6</h2>
<h2>What's Changed</h2>
<ul>
<li>fix: bin_dest output points to self-updated pnpm, not bootstrap by
<a href="https://github.com/zkochan"><code>@​zkochan</code></a> in <a
href="https://redirect.github.com/pnpm/action-setup/pull/249">pnpm/action-setup#249</a></li>
</ul>
<p><strong>Full Changelog</strong>: <a
href="https://github.com/pnpm/action-setup/compare/v6.0.5...v6.0.6">https://github.com/pnpm/action-setup/compare/v6.0.5...v6.0.6</a></p>
<h2>v6.0.5</h2>
<h2>What's Changed</h2>
<ul>
<li>fix: append (not prepend) action node dir to PATH for npm bootstrap
by <a href="https://github.com/zkochan"><code>@​zkochan</code></a> in <a
href="https://redirect.github.com/pnpm/action-setup/pull/241">pnpm/action-setup#241</a></li>
</ul>
<p><strong>Full Changelog</strong>: <a
href="https://github.com/pnpm/action-setup/compare/v6.0.4...v6.0.5">https://github.com/pnpm/action-setup/compare/v6.0.4...v6.0.5</a></p>
<h2>v6.0.4</h2>
<h2>What's Changed</h2>
<ul>
<li>fix: use npm co-located with the action node binary by <a
href="https://github.com/benquarmby"><code>@​benquarmby</code></a> in <a
href="https://redirect.github.com/pnpm/action-setup/pull/239">pnpm/action-setup#239</a></li>
</ul>
<h2>New Contributors</h2>
<ul>
<li><a
href="https://github.com/benquarmby"><code>@​benquarmby</code></a> made
their first contribution in <a
href="https://redirect.github.com/pnpm/action-setup/pull/239">pnpm/action-setup#239</a></li>
</ul>
<!-- raw HTML omitted -->
</blockquote>
<p>... (truncated)</p>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/pnpm/action-setup/commit/0ebf47130e4866e96fce0953f49152a61190b271"><code>0ebf471</code></a>
fix: update pnpm to v11.7.0 (<a
href="https://redirect.github.com/pnpm/action-setup/issues/267">#267</a>)</li>
<li><a
href="https://github.com/pnpm/action-setup/commit/0e279bb959325dab635dd2c09392533439d90093"><code>0e279bb</code></a>
fix: update pnpm to 11.1.1 (<a
href="https://redirect.github.com/pnpm/action-setup/issues/248">#248</a>)</li>
<li><a
href="https://github.com/pnpm/action-setup/commit/3e835812ef01165f4f8ae08ade56da44427ed4e0"><code>3e83581</code></a>
fix: drop patchPnpmEnv so standalone+self-update works on Windows (<a
href="https://redirect.github.com/pnpm/action-setup/issues/258">#258</a>)</li>
<li><a
href="https://github.com/pnpm/action-setup/commit/551b42e879e37e74d986effdd2a1647d2b02d464"><code>551b42e</code></a>
docs(README): fix <code>cache_dependency_path</code> type (<a
href="https://redirect.github.com/pnpm/action-setup/issues/257">#257</a>)</li>
<li><a
href="https://github.com/pnpm/action-setup/commit/739bfe42ca9233c5e6aca07c1a25a9d34aca49b0"><code>739bfe4</code></a>
fix: self-update bootstrap to packageManager-pinned version (<a
href="https://redirect.github.com/pnpm/action-setup/issues/233">#233</a>)
(<a
href="https://redirect.github.com/pnpm/action-setup/issues/256">#256</a>)</li>
<li><a
href="https://github.com/pnpm/action-setup/commit/f61705d907761b3b5209e83910fafd1fea50c5a1"><code>f61705d</code></a>
chore: add CODEOWNERS</li>
<li><a
href="https://github.com/pnpm/action-setup/commit/7a5507b117647ab83e96e9db317ba2234056ebf3"><code>7a5507b</code></a>
fix: restore inputs from state in post (<a
href="https://redirect.github.com/pnpm/action-setup/issues/255">#255</a>)</li>
<li><a
href="https://github.com/pnpm/action-setup/commit/1155470f3e5fb872accd4d104b8dfcda41f676ce"><code>1155470</code></a>
fix: honor devEngines.packageManager.onFail=error (<a
href="https://redirect.github.com/pnpm/action-setup/issues/252">#252</a>)
(<a
href="https://redirect.github.com/pnpm/action-setup/issues/254">#254</a>)</li>
<li><a
href="https://github.com/pnpm/action-setup/commit/91ab88e2619ed1f46221f0ba42d1492c02baf788"><code>91ab88e</code></a>
fix: bin_dest output points to self-updated pnpm, not bootstrap (<a
href="https://redirect.github.com/pnpm/action-setup/issues/249">#249</a>)</li>
<li><a
href="https://github.com/pnpm/action-setup/commit/e578e19d19d31b011b841ba2aca34731a5f706a5"><code>e578e19</code></a>
fix: update pnpm to 11.0.4</li>
<li>Additional commits viewable in <a
href="https://github.com/pnpm/action-setup/compare/41ff72655975bd51cab0327fa583b6e92b6d3061...0ebf47130e4866e96fce0953f49152a61190b271">compare
view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=pnpm/action-setup&package-manager=github_actions&previous-version=4.2.0&new-version=6.0.9)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)


</details>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Charis <26616127+charislam@users.noreply.github.com>
---
 .github/workflows/ai-tests.yml                          | 2 +-
 .github/workflows/authorize-vercel-deploys.yml          | 2 +-
 .github/workflows/autofix_linters.yml                   | 2 +-
 .github/workflows/braintrust-evals.yml                  | 4 ++--
 .github/workflows/braintrust-preview-scorers-deploy.yml | 2 +-
 .github/workflows/braintrust-scorers-deploy.yml         | 2 +-
 .github/workflows/dashboard-pr-reminder.yml             | 2 +-
 .github/workflows/docs-js-libs-update.yml               | 2 +-
 .github/workflows/docs-last-changed.yml                 | 2 +-
 .github/workflows/docs-mgmt-api-update.yml              | 2 +-
 .github/workflows/docs-sync-auto-troubleshooting.yml    | 2 +-
 .github/workflows/docs-sync-troubleshooting.yml         | 2 +-
 .github/workflows/docs-sync.yml                         | 2 +-
 .github/workflows/docs-tests-smoke.yml                  | 2 +-
 .github/workflows/docs-tests.yml                        | 2 +-
 .github/workflows/pg-meta-tests.yml                     | 2 +-
 .github/workflows/prettier.yml                          | 2 +-
 .github/workflows/search.yml                            | 2 +-
 .github/workflows/studio-e2e-test.yml                   | 2 +-
 .github/workflows/studio-lint-ratchet-decrease.yml      | 2 +-
 .github/workflows/studio-lint-ratchet.yml               | 2 +-
 .github/workflows/studio-unit-tests.yml                 | 2 +-
 .github/workflows/typecheck.yml                         | 2 +-
 .github/workflows/ui-patterns-tests.yml                 | 2 +-
 .github/workflows/ui-tests.yml                          | 2 +-
 .github/workflows/update-js-libs.yml                    | 2 +-
 .github/workflows/update-ssr.yml                        | 2 +-
 .github/workflows/www-tests.yml                         | 2 +-
 28 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/.github/workflows/ai-tests.yml b/.github/workflows/ai-tests.yml
index f8db88a83dcf3..fc38bce548228 100644
--- a/.github/workflows/ai-tests.yml
+++ b/.github/workflows/ai-tests.yml
@@ -38,7 +38,7 @@ jobs:
           sparse-checkout: |
             packages
             patches
-      - uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0
+      - uses: pnpm/action-setup@0ebf47130e4866e96fce0953f49152a61190b271 # v6.0.9
         name: Install pnpm
         with:
           run_install: false
diff --git a/.github/workflows/authorize-vercel-deploys.yml b/.github/workflows/authorize-vercel-deploys.yml
index 747cddbf5d947..7d6ce653a4ac5 100644
--- a/.github/workflows/authorize-vercel-deploys.yml
+++ b/.github/workflows/authorize-vercel-deploys.yml
@@ -31,7 +31,7 @@ jobs:
           sparse-checkout: |
             scripts
             patches
-      - uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0
+      - uses: pnpm/action-setup@0ebf47130e4866e96fce0953f49152a61190b271 # v6.0.9
         name: Install pnpm
         with:
           run_install: false
diff --git a/.github/workflows/autofix_linters.yml b/.github/workflows/autofix_linters.yml
index 4ddc87ba5629d..672c69f3756d8 100644
--- a/.github/workflows/autofix_linters.yml
+++ b/.github/workflows/autofix_linters.yml
@@ -36,7 +36,7 @@ jobs:
             apps
             patches
 
-      - uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0
+      - uses: pnpm/action-setup@0ebf47130e4866e96fce0953f49152a61190b271 # v6.0.9
         name: Install pnpm
 
       - uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
diff --git a/.github/workflows/braintrust-evals.yml b/.github/workflows/braintrust-evals.yml
index dc903993293f7..4f6e25d0d95d3 100644
--- a/.github/workflows/braintrust-evals.yml
+++ b/.github/workflows/braintrust-evals.yml
@@ -31,7 +31,7 @@ jobs:
           persist-credentials: false
 
       - name: Install pnpm
-        uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0
+        uses: pnpm/action-setup@0ebf47130e4866e96fce0953f49152a61190b271 # v6.0.9
         with:
           run_install: false
 
@@ -71,7 +71,7 @@ jobs:
           ref: ${{ github.head_ref || github.ref_name }}
 
       - name: Install pnpm
-        uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0
+        uses: pnpm/action-setup@0ebf47130e4866e96fce0953f49152a61190b271 # v6.0.9
         with:
           run_install: false
 
diff --git a/.github/workflows/braintrust-preview-scorers-deploy.yml b/.github/workflows/braintrust-preview-scorers-deploy.yml
index 94c6ab8517938..7811b7360c06b 100644
--- a/.github/workflows/braintrust-preview-scorers-deploy.yml
+++ b/.github/workflows/braintrust-preview-scorers-deploy.yml
@@ -48,7 +48,7 @@ jobs:
 
       - name: Install pnpm
         if: steps.changed.outputs.skip != 'true'
-        uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0
+        uses: pnpm/action-setup@0ebf47130e4866e96fce0953f49152a61190b271 # v6.0.9
         with:
           run_install: false
 
diff --git a/.github/workflows/braintrust-scorers-deploy.yml b/.github/workflows/braintrust-scorers-deploy.yml
index 8298ba28f917d..cd5d7d83e6890 100644
--- a/.github/workflows/braintrust-scorers-deploy.yml
+++ b/.github/workflows/braintrust-scorers-deploy.yml
@@ -28,7 +28,7 @@ jobs:
           persist-credentials: false
 
       - name: Install pnpm
-        uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0
+        uses: pnpm/action-setup@0ebf47130e4866e96fce0953f49152a61190b271 # v6.0.9
         with:
           run_install: false
 
diff --git a/.github/workflows/dashboard-pr-reminder.yml b/.github/workflows/dashboard-pr-reminder.yml
index 0ea53f030ebe4..9b4470882f269 100644
--- a/.github/workflows/dashboard-pr-reminder.yml
+++ b/.github/workflows/dashboard-pr-reminder.yml
@@ -24,7 +24,7 @@ jobs:
             scripts
             patches
 
-      - uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0
+      - uses: pnpm/action-setup@0ebf47130e4866e96fce0953f49152a61190b271 # v6.0.9
         name: Install pnpm
         with:
           run_install: false
diff --git a/.github/workflows/docs-js-libs-update.yml b/.github/workflows/docs-js-libs-update.yml
index a423b46502b67..617eebbce328f 100644
--- a/.github/workflows/docs-js-libs-update.yml
+++ b/.github/workflows/docs-js-libs-update.yml
@@ -27,7 +27,7 @@ jobs:
           persist-credentials: false
           ref: master
 
-      - uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0
+      - uses: pnpm/action-setup@0ebf47130e4866e96fce0953f49152a61190b271 # v6.0.9
         name: Install pnpm
         with:
           run_install: false
diff --git a/.github/workflows/docs-last-changed.yml b/.github/workflows/docs-last-changed.yml
index 3e138de62b3d0..8779e70cc2082 100644
--- a/.github/workflows/docs-last-changed.yml
+++ b/.github/workflows/docs-last-changed.yml
@@ -31,7 +31,7 @@ jobs:
             apps/docs
             patches
 
-      - uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0
+      - uses: pnpm/action-setup@0ebf47130e4866e96fce0953f49152a61190b271 # v6.0.9
         name: Install pnpm
         with:
           run_install: false
diff --git a/.github/workflows/docs-mgmt-api-update.yml b/.github/workflows/docs-mgmt-api-update.yml
index a455e489a03d8..951aeec76c92e 100644
--- a/.github/workflows/docs-mgmt-api-update.yml
+++ b/.github/workflows/docs-mgmt-api-update.yml
@@ -24,7 +24,7 @@ jobs:
             patches
             packages/generator
 
-      - uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0
+      - uses: pnpm/action-setup@0ebf47130e4866e96fce0953f49152a61190b271 # v6.0.9
         name: Install pnpm
         with:
           run_install: false
diff --git a/.github/workflows/docs-sync-auto-troubleshooting.yml b/.github/workflows/docs-sync-auto-troubleshooting.yml
index 3e6ada03f6f2f..4d6884a03d14a 100644
--- a/.github/workflows/docs-sync-auto-troubleshooting.yml
+++ b/.github/workflows/docs-sync-auto-troubleshooting.yml
@@ -22,7 +22,7 @@ jobs:
           persist-credentials: true
 
       - name: Install pnpm
-        uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0
+        uses: pnpm/action-setup@0ebf47130e4866e96fce0953f49152a61190b271 # v6.0.9
         with:
           run_install: false
 
diff --git a/.github/workflows/docs-sync-troubleshooting.yml b/.github/workflows/docs-sync-troubleshooting.yml
index 468b0f3fce138..4b671232b4ef3 100644
--- a/.github/workflows/docs-sync-troubleshooting.yml
+++ b/.github/workflows/docs-sync-troubleshooting.yml
@@ -31,7 +31,7 @@ jobs:
             apps/docs
             patches
 
-      - uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0
+      - uses: pnpm/action-setup@0ebf47130e4866e96fce0953f49152a61190b271 # v6.0.9
         name: Install pnpm
         with:
           run_install: false
diff --git a/.github/workflows/docs-sync.yml b/.github/workflows/docs-sync.yml
index 3c8f90a05c995..7e6aa0ad0a3cb 100644
--- a/.github/workflows/docs-sync.yml
+++ b/.github/workflows/docs-sync.yml
@@ -34,7 +34,7 @@ jobs:
             packages
             patches
 
-      - uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0
+      - uses: pnpm/action-setup@0ebf47130e4866e96fce0953f49152a61190b271 # v6.0.9
         name: Install pnpm
         with:
           run_install: false
diff --git a/.github/workflows/docs-tests-smoke.yml b/.github/workflows/docs-tests-smoke.yml
index 2fc1579b41632..dbf0259e058fc 100644
--- a/.github/workflows/docs-tests-smoke.yml
+++ b/.github/workflows/docs-tests-smoke.yml
@@ -27,7 +27,7 @@ jobs:
             packages
             patches
 
-      - uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0
+      - uses: pnpm/action-setup@0ebf47130e4866e96fce0953f49152a61190b271 # v6.0.9
         name: Install pnpm
         with:
           run_install: false
diff --git a/.github/workflows/docs-tests.yml b/.github/workflows/docs-tests.yml
index 5acd99674a21e..b92cdead161a9 100644
--- a/.github/workflows/docs-tests.yml
+++ b/.github/workflows/docs-tests.yml
@@ -33,7 +33,7 @@ jobs:
             supabase
             patches
 
-      - uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0
+      - uses: pnpm/action-setup@0ebf47130e4866e96fce0953f49152a61190b271 # v6.0.9
         name: Install pnpm
         with:
           run_install: false
diff --git a/.github/workflows/pg-meta-tests.yml b/.github/workflows/pg-meta-tests.yml
index f46c0360cd1d3..006120baceb1c 100644
--- a/.github/workflows/pg-meta-tests.yml
+++ b/.github/workflows/pg-meta-tests.yml
@@ -32,7 +32,7 @@ jobs:
             packages/tsconfig
             patches
 
-      - uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0
+      - uses: pnpm/action-setup@0ebf47130e4866e96fce0953f49152a61190b271 # v6.0.9
         name: Install pnpm
         with:
           run_install: false
diff --git a/.github/workflows/prettier.yml b/.github/workflows/prettier.yml
index 6b8a5b6e4ed7a..ed93ad9798cf5 100644
--- a/.github/workflows/prettier.yml
+++ b/.github/workflows/prettier.yml
@@ -28,7 +28,7 @@ jobs:
             i18n
             packages
             patches
-      - uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0
+      - uses: pnpm/action-setup@0ebf47130e4866e96fce0953f49152a61190b271 # v6.0.9
         name: Install pnpm
         with:
           run_install: false
diff --git a/.github/workflows/search.yml b/.github/workflows/search.yml
index be8a466334b42..4a929c17e3562 100644
--- a/.github/workflows/search.yml
+++ b/.github/workflows/search.yml
@@ -51,7 +51,7 @@ jobs:
             supabase
             patches
 
-      - uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0
+      - uses: pnpm/action-setup@0ebf47130e4866e96fce0953f49152a61190b271 # v6.0.9
         name: Install pnpm
         with:
           run_install: false
diff --git a/.github/workflows/studio-e2e-test.yml b/.github/workflows/studio-e2e-test.yml
index 7840b6e618150..890ee7d2be283 100644
--- a/.github/workflows/studio-e2e-test.yml
+++ b/.github/workflows/studio-e2e-test.yml
@@ -51,7 +51,7 @@ jobs:
               - 'pnpm-lock.yaml'
               - '.github/workflows/studio-e2e-test.yml'
 
-      - uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0
+      - uses: pnpm/action-setup@0ebf47130e4866e96fce0953f49152a61190b271 # v6.0.9
         if: steps.filter.outputs.studio == 'true'
         name: Install pnpm
         with:
diff --git a/.github/workflows/studio-lint-ratchet-decrease.yml b/.github/workflows/studio-lint-ratchet-decrease.yml
index 937d25ed4b88a..0b0faabf5f356 100644
--- a/.github/workflows/studio-lint-ratchet-decrease.yml
+++ b/.github/workflows/studio-lint-ratchet-decrease.yml
@@ -23,7 +23,7 @@ jobs:
             packages
             patches
 
-      - uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0
+      - uses: pnpm/action-setup@0ebf47130e4866e96fce0953f49152a61190b271 # v6.0.9
         name: Install pnpm
         with:
           run_install: false
diff --git a/.github/workflows/studio-lint-ratchet.yml b/.github/workflows/studio-lint-ratchet.yml
index 51657bade07b2..2e4e91df52042 100644
--- a/.github/workflows/studio-lint-ratchet.yml
+++ b/.github/workflows/studio-lint-ratchet.yml
@@ -29,7 +29,7 @@ jobs:
             packages
             patches
 
-      - uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0
+      - uses: pnpm/action-setup@0ebf47130e4866e96fce0953f49152a61190b271 # v6.0.9
         name: Install pnpm
         with:
           run_install: false
diff --git a/.github/workflows/studio-unit-tests.yml b/.github/workflows/studio-unit-tests.yml
index d499d32112c48..bed6790239f47 100644
--- a/.github/workflows/studio-unit-tests.yml
+++ b/.github/workflows/studio-unit-tests.yml
@@ -46,7 +46,7 @@ jobs:
             relevant:
               - 'apps/studio/**'
               - 'pnpm-lock.yaml'
-      - uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0
+      - uses: pnpm/action-setup@0ebf47130e4866e96fce0953f49152a61190b271 # v6.0.9
         if: steps.filter.outputs.relevant == 'true'
         name: Install pnpm
         with:
diff --git a/.github/workflows/typecheck.yml b/.github/workflows/typecheck.yml
index 538d6eb3c2806..fc7643f580952 100644
--- a/.github/workflows/typecheck.yml
+++ b/.github/workflows/typecheck.yml
@@ -26,7 +26,7 @@ jobs:
         with:
           persist-credentials: false
 
-      - uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0
+      - uses: pnpm/action-setup@0ebf47130e4866e96fce0953f49152a61190b271 # v6.0.9
         name: Install pnpm
         with:
           run_install: false
diff --git a/.github/workflows/ui-patterns-tests.yml b/.github/workflows/ui-patterns-tests.yml
index be38c2332d827..6ccfbb0083aca 100644
--- a/.github/workflows/ui-patterns-tests.yml
+++ b/.github/workflows/ui-patterns-tests.yml
@@ -26,7 +26,7 @@ jobs:
             packages
             patches
 
-      - uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0
+      - uses: pnpm/action-setup@0ebf47130e4866e96fce0953f49152a61190b271 # v6.0.9
         name: Install pnpm
         with:
           run_install: false
diff --git a/.github/workflows/ui-tests.yml b/.github/workflows/ui-tests.yml
index aff844ce3d13f..056fe71db18bc 100644
--- a/.github/workflows/ui-tests.yml
+++ b/.github/workflows/ui-tests.yml
@@ -36,7 +36,7 @@ jobs:
             packages
             patches
 
-      - uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0
+      - uses: pnpm/action-setup@0ebf47130e4866e96fce0953f49152a61190b271 # v6.0.9
         if: steps.filter.outputs.relevant == 'true'
         name: Install pnpm
         with:
diff --git a/.github/workflows/update-js-libs.yml b/.github/workflows/update-js-libs.yml
index c0a59cc1fb56a..fd91d5d744ef9 100644
--- a/.github/workflows/update-js-libs.yml
+++ b/.github/workflows/update-js-libs.yml
@@ -27,7 +27,7 @@ jobs:
           persist-credentials: false
           ref: master
 
-      - uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0
+      - uses: pnpm/action-setup@0ebf47130e4866e96fce0953f49152a61190b271 # v6.0.9
         name: Install pnpm
         with:
           run_install: false
diff --git a/.github/workflows/update-ssr.yml b/.github/workflows/update-ssr.yml
index 542b8c041d1c5..c716a6f851613 100644
--- a/.github/workflows/update-ssr.yml
+++ b/.github/workflows/update-ssr.yml
@@ -27,7 +27,7 @@ jobs:
           persist-credentials: false
           ref: master
 
-      - uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0
+      - uses: pnpm/action-setup@0ebf47130e4866e96fce0953f49152a61190b271 # v6.0.9
         name: Install pnpm
         with:
           run_install: false
diff --git a/.github/workflows/www-tests.yml b/.github/workflows/www-tests.yml
index bbc838989e421..a31cffd6d628e 100644
--- a/.github/workflows/www-tests.yml
+++ b/.github/workflows/www-tests.yml
@@ -33,7 +33,7 @@ jobs:
             supabase
             patches
 
-      - uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0
+      - uses: pnpm/action-setup@0ebf47130e4866e96fce0953f49152a61190b271 # v6.0.9
         name: Install pnpm
         with:
           run_install: false

From 963182f58e91b6cd4a71c4071c183cd4171e53c9 Mon Sep 17 00:00:00 2001
From: Nik Richers <nrichers@gmail.com>
Date: Wed, 15 Jul 2026 11:06:19 -0700
Subject: [PATCH 6/7] fix: add hasLightIcon field to ContentListings; revert
 getting-started-overview to GlassPanel (#47467)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## I have read the
[CONTRIBUTING.md](https://github.com/supabase/supabase/blob/master/CONTRIBUTING.md)
file.

YES

## What kind of change does this PR introduce?

Bug fix + partial revert.

## What is the current behavior?

1. `ContentListings.client.tsx` unconditionally derives `hasLightIcon`
from `Boolean(item.icon)`. `GlassPanel` appends `-light.svg` to the icon
path in light mode whenever `hasLightIcon` is true. Framework icons
(react, nuxt, hono, redwood, flutter, swift, kotlin, svelte, solidjs,
vue, refine, angular, ionic) have no `-light.svg` variants, causing
broken image requests in light mode for any ContentListings card that
uses them.

2. `getting-started.mdx` uses `<ContentListings
id="getting-started-overview" />` (added in #47097) for the top
three-card grid (Build with AI tools, API Keys, Local Development).

## What is the new behavior?

1. `hasLightIcon` is now an optional field in the item schema (defaults
to `Boolean(item.icon)` for backward compatibility). The component reads
`item.hasLightIcon ?? Boolean(item.icon)`, so data files can opt
specific icons out of the light-mode variant.

2. `<ContentListings id="getting-started-overview" />` is removed and
the original hand-authored GlassPanel grid is restored. The
`gettingStartedGetStarted` data entry and its registry import are also
removed.

ContentListings has no mandate to cover every section of every page: the
goal was for hub and overview pages to have a reasonable, standardized
link section that tooling can lint for. This page doesn't fit that
pattern.

## Additional context

| Check | Result |
|-------|--------|
| `pnpm vitest run lib/content-listings.test.ts` | ✅ 12/12 passed |
| `pnpm lint:mdx` (getting-started.mdx) | ✅ No warnings |

<!-- This is an auto-generated comment: release notes by coderabbit.ai
-->
## Summary by CodeRabbit

* **New Features**
* Updated the Getting Started guide with dedicated tiles for Build with
AI Tools, API Keys, and Local Development.
  * Expanded the available Getting Started content listings.

* **Bug Fixes**
* Improved icon styling in content listings so light icon treatment
reflects each item’s configuration.
<!-- end of auto-generated comment: release notes by coderabbit.ai -->

---------

Co-authored-by: Nik Richers <nik@validmind.ai>
---
 .../ContentListings.client.tsx                |  2 +-
 apps/docs/content/guides/getting-started.mdx  | 31 ++++++++++++++++++-
 .../content-listings/getting-started.data.ts  | 23 --------------
 apps/docs/data/content-listings/index.ts      |  2 --
 4 files changed, 31 insertions(+), 27 deletions(-)
 delete mode 100644 apps/docs/data/content-listings/getting-started.data.ts

diff --git a/apps/docs/components/ContentListings/ContentListings.client.tsx b/apps/docs/components/ContentListings/ContentListings.client.tsx
index 3d36bc1ef50ce..f8b3d4ee3107a 100644
--- a/apps/docs/components/ContentListings/ContentListings.client.tsx
+++ b/apps/docs/components/ContentListings/ContentListings.client.tsx
@@ -78,7 +78,7 @@ function ContentListingsGroup({ group }: { group: ContentListingGroup }) {
                     <GlassPanel
                       title={item.title}
                       icon={item.icon}
-                      hasLightIcon={item.hasLightIcon ?? true}
+                      hasLightIcon={item.hasLightIcon ?? Boolean(item.icon)}
                       badge={item.badge ? <Badge variant="success">{item.badge}</Badge> : undefined}
                     >
                       {item.description}
diff --git a/apps/docs/content/guides/getting-started.mdx b/apps/docs/content/guides/getting-started.mdx
index f0ff033351aed..45a0a7892cc69 100644
--- a/apps/docs/content/guides/getting-started.mdx
+++ b/apps/docs/content/guides/getting-started.mdx
@@ -5,7 +5,36 @@ description: 'Resources for getting started with Supabase.'
 hideToc: true
 ---
 
-<ContentListings id="getting-started-overview" />
+<div className="flex flex-col gap-12 my-12">
+
+<div>
+
+<div className="grid grid-cols-12 gap-6 not-prose">
+  <Link href="/guides/ai-tools" className="col-span-12 md:col-span-4" passHref>
+    <GlassPanel
+      title="Build with AI tools"
+      hasLightIcon={true}
+      background={false}
+      showIconBg={true}
+    >
+      Develop with Supabase AI-first using plugins, MCP, and skills.
+    </GlassPanel>
+  </Link>
+  <Link href="/guides/getting-started/api-keys" className="col-span-12 md:col-span-4" passHref>
+    <GlassPanel title="API Keys" hasLightIcon={true} background={false} showIconBg={true}>
+      Learn about the different API keys in Supabase and how to use them.
+    </GlassPanel>
+  </Link>
+  <Link href="/guides/local-development" className="col-span-12 md:col-span-4" passHref>
+    <GlassPanel title="Local Development" hasLightIcon={true} background={false} showIconBg={true}>
+      Use the Supabase CLI to develop locally and collaborate between teams.
+    </GlassPanel>
+  </Link>
+</div>
+
+</div>
+
+</div>
 
 ### Use cases
 
diff --git a/apps/docs/data/content-listings/getting-started.data.ts b/apps/docs/data/content-listings/getting-started.data.ts
deleted file mode 100644
index 33d36e08e8b91..0000000000000
--- a/apps/docs/data/content-listings/getting-started.data.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import type { ContentListingGroup } from '~/lib/content-listings.schema'
-
-export const gettingStartedGetStarted: ContentListingGroup = {
-  id: 'getting-started-overview',
-  type: 'grid',
-  items: [
-    {
-      title: 'Build with AI tools',
-      href: '/guides/ai-tools',
-      description: 'Develop with Supabase AI-first using plugins, MCP, and skills.',
-    },
-    {
-      title: 'API Keys',
-      href: '/guides/getting-started/api-keys',
-      description: 'Learn about the different API keys in Supabase and how to use them.',
-    },
-    {
-      title: 'Local Development',
-      href: '/guides/local-development',
-      description: 'Use the Supabase CLI to develop locally and collaborate between teams.',
-    },
-  ],
-}
diff --git a/apps/docs/data/content-listings/index.ts b/apps/docs/data/content-listings/index.ts
index dc94dece7e8f0..c0e242c02a506 100644
--- a/apps/docs/data/content-listings/index.ts
+++ b/apps/docs/data/content-listings/index.ts
@@ -10,7 +10,6 @@ import {
   functionsExamplesWebhooksPayments,
   functionsGetStarted,
 } from './functions.data'
-import { gettingStartedGetStarted } from './getting-started.data'
 import { realtimeExamples, realtimeGetStarted, realtimeResources } from './realtime.data'
 import {
   selfHostingCommunity,
@@ -33,7 +32,6 @@ const ALL_GROUPS: readonly ContentListingGroup[] = [
   functionsExamplesAiMedia,
   functionsExamplesMessaging,
   functionsExamplesOperations,
-  gettingStartedGetStarted,
   realtimeGetStarted,
   realtimeExamples,
   realtimeResources,

From 9669e5ea17b1db1471d36224b4a722445d884814 Mon Sep 17 00:00:00 2001
From: Joey Lei <6957385+leizerbeam@users.noreply.github.com>
Date: Wed, 15 Jul 2026 14:18:53 -0700
Subject: [PATCH 7/7] adding joey to the humans.txt (#47983)

## I have read the
[CONTRIBUTING.md](https://github.com/supabase/supabase/blob/master/CONTRIBUTING.md)
file.

YES

## What kind of change does this PR introduce?

Updates Joey Lei to the list of Supabase team members

## What is the current behavior?

Missing joey!

## What is the new behavior?

Adds Joey

## Additional context

None


<!-- This is an auto-generated comment: release notes by coderabbit.ai
-->

## Summary by CodeRabbit

* **Documentation**
  * Added Joey Lei to the team credits listed in the documentation.

<!-- end of auto-generated comment: release notes by coderabbit.ai -->
---
 apps/docs/public/humans.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apps/docs/public/humans.txt b/apps/docs/public/humans.txt
index 2399351a9598a..7fc5b607de38d 100644
--- a/apps/docs/public/humans.txt
+++ b/apps/docs/public/humans.txt
@@ -146,6 +146,7 @@ Joanna Michniewicz
 Joaquim Moreno
 Joel Low
 Joey Freeland
+Joey Lei
 John Fitzgerald
 Joel Martin
 Johan Bergström