diff --git a/apps/docs/content/guides/deployment/branching.mdx b/apps/docs/content/guides/deployment/branching.mdx
index 23342dd4c89..d4f3ed3ca11 100644
--- a/apps/docs/content/guides/deployment/branching.mdx
+++ b/apps/docs/content/guides/deployment/branching.mdx
@@ -15,7 +15,8 @@ Supabase branches create separate environments that spin off from your main proj
 - **Preview Branches**: Preview branches are ephemeral and best suited for focused testing. They are automatically deleted when a PR is merged or closed.
 - **Persistent Branches**: Persistent branches are long-lived and recommended for environments like staging, QA, or development. They aren't automatically paused or deleted due to inactivity or when a PR is merged or closed.
 - **Managing Branches**: You can create, review, and merge branches either automatically via our [GitHub integration](/docs/guides/deployment/branching/github-integration) or directly [through the dashboard](/docs/guides/deployment/branching/dashboard) (currently in beta). All branches show up in the branches page in the dashboard, regardless of how they were created.
-- **Data-less**: New branches do not start with any data from your main project. This is meant to better protect your sensitive production data. To start your branches with data, you can use a [seed file](/docs/guides/deployment/branching/github-integration#seeding) if using the GitHub integration.
+- **Cloned from your main project**: Each new branch is created as a clone of your main project. It starts with that project's Edge Functions deployed and the configuration set.
+- **Data-less by default**: By default, new branches do not start with any data or storage objects from your main project. This is meant to better protect your sensitive production data. To start your branches with data, you can use a [seed file](/docs/guides/deployment/branching/github-integration#seeding) if using the GitHub integration, or the [Include data](/docs/guides/deployment/branching/dashboard#include-production-data) option if you create the branch from the dashboard.
 
 ## Deploying to production
 
diff --git a/apps/docs/content/guides/deployment/branching/dashboard.mdx b/apps/docs/content/guides/deployment/branching/dashboard.mdx
index ad1ae7021c8..e10efb1c2ce 100644
--- a/apps/docs/content/guides/deployment/branching/dashboard.mdx
+++ b/apps/docs/content/guides/deployment/branching/dashboard.mdx
@@ -41,6 +41,24 @@ Once you've enabled the feature, you can create a new branch:
 1. Click the arrows next to the branch name in the top menu bar. (The top menu bar has the format `YOUR_ORGANIZATION / YOUR_PROJECT / CURRENT_BRANCH_NAME`.)
 2. Click `Create branch`.
 
+The new branch is a clone of your base project. It starts with the project's schema, Edge Functions, and the configuration set.
+
+### Include production data
+
+By default, a branch starts without any of your production data or storage objects. If your project has the Point-in-Time Recovery add-on, you can turn on **Include data** when you create the branch to copy your production data into it.
+
+<Admonition type="caution">
+
+A branch created with **Include data** holds a copy of your production data, treat it with the same care as production.
+
+</Admonition>
+
+<Admonition type="note">
+
+A branch uses a larger disk and matches the compute size of your project, which increases its cost.
+
+</Admonition>
+
 ## Making changes to a branch
 
 Use the branch selector in the top bar to change to your branch. Any changes you make (including SQL run in the SQL editor, table editor changes, and configuration changes) are now made against the currently selected branch.
diff --git a/apps/docs/content/guides/deployment/branching/github-integration.mdx b/apps/docs/content/guides/deployment/branching/github-integration.mdx
index c04cb14f4fe..cb81e3bff72 100644
--- a/apps/docs/content/guides/deployment/branching/github-integration.mdx
+++ b/apps/docs/content/guides/deployment/branching/github-integration.mdx
@@ -83,19 +83,25 @@ Enable the **Automatic branching** option in your GitHub Integration configurati
 
 When a new branch is created in GitHub, a corresponding branch is created in Supabase. (You can enable the **Supabase changes only** option to only create Supabase branches when Supabase files change.)
 
+Every Supabase branch, preview or persistent, is created as a clone of your base project. The new branch starts with the Edge Functions and configuration of that project. Its database schema is not cloned. Instead, it is built from the migrations you commit to your repository.
+
 ### Configuration
 
 You can test configuration changes on your Preview Branch by configuring the `config.toml` file in your Supabase directory. See the [Configuration docs](/docs/guides/deployment/branching/configuration) for more information.
 
+Your branch starts with the configuration of your base project. The settings in your `config.toml` file are applied on top of that clone.
+
 A comment is added to your PR with the deployment status of your preview branch.
 
 ### Migrations
 
-The migrations in the `migrations` subdirectory of your Supabase directory are automatically run.
+The migrations in the `migrations` subdirectory of your Supabase directory are automatically run when the branch is created. Each later commit runs only the migrations that haven't been applied yet.
+
+If you want to rerun existing migrations, reset the branch from the Supabase dashboard to start from scratch. Note that existing data on your branch will also be dropped by a reset.
 
 ### Seeding
 
-No production data is copied to your Preview branch. This is meant to protect your sensitive production data.
+Cloning your base project copies its Edge Functions and configuration, but not its data or storage objects. This is meant to protect your sensitive production data. Your branch starts with the tables your migrations create, and the only rows in them are the ones your seed files add.
 
 You can seed your Preview Branch with sample data using the `seed.sql` file in your Supabase directory. See the [Seeding docs](/docs/guides/local-development/seeding-your-database) for more information.
 
diff --git a/apps/docs/content/guides/deployment/branching/troubleshooting.mdx b/apps/docs/content/guides/deployment/branching/troubleshooting.mdx
index 6e77b2c1768..1fd9194c40c 100644
--- a/apps/docs/content/guides/deployment/branching/troubleshooting.mdx
+++ b/apps/docs/content/guides/deployment/branching/troubleshooting.mdx
@@ -27,7 +27,9 @@ You might want to roll back changes you've made in an earlier migration change.
 
 To fix this, push the latest changes, then delete the preview branch in Supabase and reopen it.
 
-The new preview branch is reseeded from the `./supabase/seed.sql` file by default. Any additional data changes made on the old preview branch are lost. This is equivalent to running `supabase db reset` locally. All migrations are rerun in sequential order.
+The new preview branch is a fresh clone of your base project and is reseeded from the `./supabase/seed.sql` file by default. Any additional data changes made on the old preview branch are lost.
+
+To rerun migrations that your base project has already applied, reset the branch from the Supabase dashboard instead. A reset reruns all migrations in sequential order and drops existing data on the branch.
 
 ### Deployment failures
 
diff --git a/apps/docs/content/guides/deployment/branching/working-with-branches.mdx b/apps/docs/content/guides/deployment/branching/working-with-branches.mdx
index ecdceb08658..c007f17cf5f 100644
--- a/apps/docs/content/guides/deployment/branching/working-with-branches.mdx
+++ b/apps/docs/content/guides/deployment/branching/working-with-branches.mdx
@@ -181,7 +181,7 @@ After completing the steps above, you should receive a Slack message whenever an
 
 Migrations are run in sequential order. Each migration builds upon the previous one.
 
-The preview branch has a record of which migrations have been applied, and only applies new migrations for each commit. This can create an issue when rolling back migrations.
+The preview branch inherits the migration history of your base project, so it only applies migrations that haven't been run yet. This can create an issue when rolling back migrations.
 
 ### Using ORM or custom seed scripts
 
@@ -237,7 +237,9 @@ You might want to roll back changes you've made in an earlier migration change.
 
 To fix this, push the latest changes, then delete the preview branch in Supabase and reopen it.
 
-The new preview branch is reseeded from the `./supabase/seed.sql` file by default. Any additional data changes made on the old preview branch are lost. This is equivalent to running `supabase db reset` locally. All migrations are rerun in sequential order.
+The new preview branch is a fresh clone of your base project and is reseeded from the `./supabase/seed.sql` file by default. Any additional data changes made on the old preview branch are lost.
+
+To rerun migrations that your base project has already applied, reset the branch from the Supabase dashboard instead. A reset reruns all migrations in sequential order and drops existing data on the branch.
 
 ### Seeding behavior
 
diff --git a/apps/docs/content/guides/platform/upgrading.mdx b/apps/docs/content/guides/platform/upgrading.mdx
index 1400a906e59..13f873a7228 100644
--- a/apps/docs/content/guides/platform/upgrading.mdx
+++ b/apps/docs/content/guides/platform/upgrading.mdx
@@ -192,7 +192,7 @@ Existing projects on pg_graphql 1.5.x are not impacted unless they choose to upg
 
 ### Ltree indexes require reindexing after upgrade
 
-_Applies when upgrading to Postgres 15.18 or 17.10._
+_Applies when upgrading to Postgres 15.19 or 17.11._
 
 <Admonition type="caution">
 
@@ -221,29 +221,115 @@ To mitigate this issue:
 2. If `reindex_required` is `true`, find the affected indexes:
 
    ```sql
-   select schemaname, tablename, indexname
-   from pg_indexes
+   select distinct
+     n.nspname as schema_name,
+     cls.relname as table_name,
+     ic.relname as index_name
+   from pg_index idx
+     join pg_class ic on idx.indexrelid = ic.oid
+     join pg_class cls on idx.indrelid = cls.oid
+     join pg_namespace n on ic.relnamespace = n.oid
+     join lateral unnest(idx.indclass::oid[]) with ordinality as k(opclass, pos) on true
+     join pg_opclass oc on oc.oid = k.opclass
+     join pg_type ty on ty.oid = oc.opcintype
    where
-     indexname in (
-       select c.relname
-       from
-         pg_index as i
-         join pg_class as c on i.indexrelid = c.oid
-         join pg_attribute as a on a.attrelid = i.indrelid and a.attnum = ANY(i.indkey)
-         join pg_type as t on a.atttypid = t.oid
-       where t.typname in ('ltree', '_ltree')
-     );
+     k.pos <= idx.indnkeyatts -- key columns only, excludes INCLUDE
+     and ty.typname in ('ltree', '_ltree');
    ```
 
-3. Reindex each affected index. `REINDEX INDEX CONCURRENTLY` runs online with no downtime:
+3. Reindex each affected index using its schema-qualified name. `REINDEX INDEX CONCURRENTLY` runs online with no downtime, but cannot run inside a transaction block:
 
    ```sql
-   REINDEX INDEX CONCURRENTLY <index_name>;
+   REINDEX INDEX CONCURRENTLY <schema_name>.<index_name>;
+   ```
+
+Separately from the encoding case above, this release also fixes an integer overflow in `ltree` comparisons: values with more than about 14,653 labels could compare incorrectly, which can corrupt B-tree indexes built over them, regardless of your database encoding. The following query lists only the B-tree indexes whose `ltree` column or expression actually contains such values, so they are the ones to reindex (an empty result means no action is needed):
+
+```sql
+SELECT s.schema_name || '.' || s.index_name AS index_to_reindex
+FROM (
+  SELECT
+    n.nspname AS schema_name,
+    c.relname AS table_name,
+    ic.relname AS index_name,
+    min(pg_get_expr(i.indpred, i.indrelid)) AS pred, -- partial-index predicate, if any
+    string_agg('nlevel(' || pg_get_indexdef(i.indexrelid, k.pos::int, true) || ') > 14653', ' OR ') AS keys_cond
+  FROM pg_index i
+  JOIN pg_class ic ON ic.oid = i.indexrelid
+  JOIN pg_class c ON c.oid = i.indrelid
+  JOIN pg_namespace n ON n.oid = c.relnamespace
+  JOIN pg_am am ON am.oid = ic.relam
+  JOIN LATERAL generate_series(1, i.indnkeyatts) AS k(pos) ON true
+  JOIN pg_attribute ia ON ia.attrelid = i.indexrelid AND ia.attnum = k.pos
+  JOIN pg_type t ON t.oid = ia.atttypid
+  WHERE am.amname = 'btree'
+    AND t.typname = 'ltree'
+    AND n.nspname NOT IN ('pg_catalog', 'information_schema')
+  GROUP BY n.nspname, c.relname, ic.relname
+) s
+WHERE (xpath(
+         '/row/cnt/text()',
+         query_to_xml(
+           format('SELECT count(*) AS cnt FROM %I.%I WHERE %s(%s)',
+                  s.schema_name, s.table_name,
+                  CASE WHEN s.pred IS NOT NULL THEN '(' || s.pred || ') AND ' ELSE '' END,
+                  s.keys_cond),
+           false, true, ''
+         )
+       ))[1]::text::bigint > 0
+ORDER BY 1;
+```
+
+Reindex each index it returns, using the schema-qualified name. `REINDEX INDEX CONCURRENTLY` runs online with no downtime, but cannot run inside a transaction block:
+
+```sql
+REINDEX INDEX CONCURRENTLY <schema_name>.<index_name>;
+```
+
+### Btree_gist indexes on float columns require reindexing after upgrade
+
+_Applies when upgrading to Postgres 15.19 or 17.11._
+
+<Admonition type="caution">
+
+You are affected only if you have `btree_gist` indexes on `float4` or `float8` columns that may contain `NaN` values.
+
+</Admonition>
+
+This release fixes `NaN` handling in `btree_gist`'s `float4` and `float8` operator classes. Indexes on those columns built under the previous version can return wrong results for rows containing `NaN` until the index is rebuilt.
+
+To mitigate this issue:
+
+1. Find `btree_gist` indexes on float columns:
+
+   ```sql
+   select distinct
+     n.nspname as schema_name,
+     cls.relname as table_name,
+     ic.relname as index_name
+   from pg_index idx
+     join pg_class ic on idx.indexrelid = ic.oid
+     join pg_am am on ic.relam = am.oid
+     join pg_class cls on idx.indrelid = cls.oid
+     join pg_namespace n on ic.relnamespace = n.oid
+     join lateral unnest(idx.indclass::oid[]) with ordinality as k(opclass, pos) on true
+     join pg_opclass oc on oc.oid = k.opclass
+     join pg_type ty on ty.oid = oc.opcintype
+   where
+     am.amname = 'gist'
+     and k.pos <= idx.indnkeyatts
+     and ty.typname in ('float4', 'float8');
+   ```
+
+2. If any indexes are returned and those columns may contain `NaN` values, reindex them using the schema-qualified name. `REINDEX INDEX CONCURRENTLY` runs online with no downtime, but cannot run inside a transaction block:
+
+   ```sql
+   REINDEX INDEX CONCURRENTLY <schema_name>.<index_name>;
    ```
 
 ### Custom operator selectivity estimators
 
-_Applies when upgrading to Postgres 15.18 or 17.10._
+_Applies when upgrading to Postgres 15.19 or 17.11._
 
 Attaching a non-built-in (extension- or user-provided) selectivity estimator function to an operator now requires superuser. Existing operators continue to work — the check only fires when an operator is (re)created, most commonly during `pg_dump` / `pg_restore`, a logical restore, or a branch.
 
@@ -256,7 +342,9 @@ ERROR: must be superuser to specify a non-built-in restriction estimator functio
 Most projects are not affected. To check whether your database has any user-defined operators that reference a non-built-in estimator:
 
 ```sql
-SELECT n.nspname AS schema, o.oprname AS operator
+SELECT n.nspname AS schema, o.oprname AS operator,
+       o.oprrest::regproc AS restrict_estimator,
+       o.oprjoin::regproc AS join_estimator
 FROM pg_operator o
 JOIN pg_namespace n ON o.oprnamespace = n.oid
 WHERE n.nspname NOT IN ('pg_catalog', 'information_schema')
diff --git a/apps/docs/content/troubleshooting/realtime-postgres-changes-troubleshooting.mdx b/apps/docs/content/troubleshooting/realtime-postgres-changes-troubleshooting.mdx
new file mode 100644
index 00000000000..2d5bcfa2608
--- /dev/null
+++ b/apps/docs/content/troubleshooting/realtime-postgres-changes-troubleshooting.mdx
@@ -0,0 +1,225 @@
+---
+title = "Realtime: Postgres Changes Troubleshooting"
+topics = [
+  "database",
+  "realtime",
+]
+keywords = [ "postgres changes", "rls", "replica identity", "subscription", "websocket" ] # any strings (topics are automatically added so no need to duplicate)
+---
+
+A Realtime subscription connects, a row changes in the database, and nothing arrives on the client. No error, no event — silence. This is one of the more common issues developers run into with Supabase Realtime, and the cause is almost always one of a handful of things.
+
+The order below reflects how often each one turns out to be the actual problem. Check RLS early, even if the subscription code looks fine — it's the single biggest source of "silently missing" events, by a wide margin.
+
+For a broader index of Realtime-specific issues, see the [Troubleshooting](/docs/guides/troubleshooting) directory.
+
+## Step 1: Is the table in the Realtime publication?
+
+Realtime doesn't watch every table by default. Each one has to be added to a publication called `supabase_realtime`. If it isn't, Realtime has no visibility into that table at all — no matter how the client subscription is set up.
+
+```sql
+select * from pg_publication_tables where pubname = 'supabase_realtime';
+```
+
+If the table's missing from the results:
+
+```sql
+alter publication supabase_realtime add table your_table;
+```
+
+Or toggle it on from **Database → Replication** in the dashboard.
+
+This gets overlooked on a table created recently — creating the table and enabling Realtime on it are two separate steps:
+
+```sql
+alter publication supabase_realtime add table messages;
+```
+
+## Step 2: Is RLS quietly blocking the row?
+
+This is the most common cause, and it's the one that wastes the most time, because nothing errors. The event doesn't show up.
+
+Realtime enforces RLS the same way a normal query would — as the subscribing client's role. `SUBSCRIBED` only means the WebSocket connected. It says nothing about whether that client is allowed to see the data.
+
+Test it directly with either options:
+
+Using the same credentials the client uses, try to select the row that changed:
+
+```js
+const { data, error } = await supabase.from('messages').select('*').eq('id', theRowIdThatChanged)
+
+console.log({ data, error })
+```
+
+Or on the dashboard, open Table Editor, and try to view the row as the subscribing user's role.
+
+Empty `data`? That's the answer. The policy is blocking this row for this user, and Realtime is doing exactly what it's supposed to.
+
+A fix might look like:
+
+```sql
+create policy "Users can view messages in their rooms"
+on messages for select
+using (
+  exists (
+    select 1 from room_members
+    where room_members.room_id = messages.room_id
+    and room_members.user_id = auth.uid()
+  )
+);
+```
+
+One trap specific to `UPDATE` events: RLS generally has to allow both the old and new row state. If a policy only permits `status = 'active'`, and an update flips the status to `archived`, the event can fail to deliver — the row was visible a second ago, but the new state no longer passes the check.
+
+See [Row Level Security](/docs/guides/database/postgres/row-level-security) for the underlying model, and [why a select can return an empty data array](./why-is-my-select-returning-an-empty-data-array-and-i-have-data-in-the-table-xvOPgx), which is directly relevant to the test above.
+
+## Step 3: Missing fields in `payload.old`?
+
+If events are arriving but `payload.old` is mostly empty or `null`, that's a replica identity problem, not a delivery problem.
+
+By default, Postgres only sends the primary key in the "old row" for `UPDATE` and `DELETE`. If your code compares old vs. new values, that's not enough:
+
+```sql
+alter table messages replica identity full;
+```
+
+If the table has Row Level Security enabled, `replica identity full` isn't enough by itself: the `old` record still contains only the primary key. There's no way around this while RLS is on — don't rely on other `payload.old` fields for a policy-protected table.
+
+A typical case: a `status` column moves from `pending` to `completed`, and the client checks
+
+```js
+if (payload.old.status !== payload.new.status) {
+  notifyUser()
+}
+```
+
+Without `replica identity full` (or with RLS enabled), `payload.old.status` is `undefined`, and `undefined !== 'completed'` is `true` — so the check fires `notifyUser()` on every update, not just the ones where status actually changed.
+
+## Step 4: Check the subscription code itself
+
+Once publication and RLS are ruled out, look at the subscription config. Table name, schema, filter syntax — small mismatches here are common.
+
+- Table name matches exactly, including case
+- Schema is correct (`public`, unless you're using a custom one)
+- Filter syntax is right: `room_id=eq.abc123`, not `room_id = abc123`
+
+```js
+const channel = supabase
+  .channel('room-messages')
+  .on(
+    'postgres_changes',
+    {
+      event: 'UPDATE',
+      schema: 'public',
+      table: 'messages',
+      filter: `room_id=eq.${roomId}`,
+    },
+    (payload) => {
+      console.log('Got an update:', payload.new)
+    }
+  )
+  .subscribe((status) => {
+    console.log('Subscription status:', status)
+  })
+```
+
+Log the status callback. Don't assume `.subscribe()` worked.
+
+- `SUBSCRIBED` — connected
+- `CHANNEL_ERROR` — check the error payload
+- `CLOSED` — channel got shut down
+- `TIMED_OUT` — connection issue; see [Realtime connections giving `TIMED_OUT` errors](./realtime-connections-timed_out-status)
+
+A channel stuck at `CHANNEL_ERROR` is a different problem than one that connects fine but never fires. Figure out which one you're dealing with before going further.
+
+## Step 5: Stale or duplicate subscriptions
+
+This one is almost always a React/Next.js problem.
+
+A component re-renders, `roomId` changes, and the old channel doesn't get cleaned up. Now you've got two subscriptions running, or one listening against a stale parameter. It doesn't always look broken — sometimes it looks like duplicate events, or events for the wrong room.
+
+```js
+useEffect(() => {
+  const channel = supabase
+    .channel(`room:${roomId}`)
+    .on(
+      'postgres_changes',
+      { event: 'UPDATE', schema: 'public', table: 'messages', filter: `room_id=eq.${roomId}` },
+      (payload) => console.log(payload.new)
+    )
+    .subscribe()
+
+  return () => {
+    supabase.removeChannel(channel)
+  }
+}, [roomId])
+```
+
+That cleanup line is the part people skip. Without it, the old channel keeps running against the previous `roomId` in the background, and nothing in the UI tells you it's happening. See [Next.js 13/14 stale data when changing RLS or table data](./nextjs-1314-stale-data-when-changing-rls-or-table-data-85b8oQ) for an adjacent version of the same bug.
+
+## Step 6: Writing right after `SUBSCRIBED`
+
+There's a confirmed timing gap between the client reporting `SUBSCRIBED` and the backend's replication listener being ready to stream. A write made in that gap can get missed.
+
+This shows up most in automated tests, where subscribe and write happen back-to-back:
+
+```js
+// Risky — writing immediately after subscribing
+const channel = supabase.channel('test-channel').on(/* ... */).subscribe()
+await supabase.from('messages').insert({ text: 'hello' })
+```
+
+The reliable fix isn't a fixed delay — it's waiting for the backend to confirm the `postgres_changes` extension is listening, via the `system` message it emits:
+
+```js
+supabase
+  .channel('room1')
+  .on('system', '*', (payload) => {
+    if (payload.extension === 'postgres_changes' && payload.status === 'ok') {
+      console.log('changes are ready', payload) // safe to write now
+    }
+  })
+  .on('postgres_changes', { event: '*', schema: '*' }, (payload) => {
+    console.log('Change received!', payload)
+  })
+  .subscribe()
+```
+
+No need to `await` anything here — react to the message inside the handler (e.g. set a flag) before triggering the write. This `system` message isn't formally documented yet.
+
+If you can't wire this up right now, a short fixed delay after `SUBSCRIBED` is a weaker fallback:
+
+```js
+channel.subscribe(async (status) => {
+  if (status === 'SUBSCRIBED') {
+    await new Promise((resolve) => setTimeout(resolve, 1000))
+    await supabase.from('messages').insert({ text: 'hello' })
+  }
+})
+```
+
+## Step 7: Is Realtime enabled?
+
+Sometimes the answer is straightforward. Check:
+
+- **Project Settings → Realtime** — enabled at the project level?
+- **Database → Replication** — toggle on for this specific table?
+
+Check this again after a project's been paused and restarted — the replication slot can need to reconnect. If the project's under heavier load than usual, also check the Realtime "Concurrent Peak Connections" quota — hitting that limit can look a lot like a broken subscription.
+
+## Step 8: Read the Realtime logs
+
+Still stuck? **Logs → Realtime** in the dashboard. Look for connection drops, replication errors, rate limiting.
+
+For more detail than the default logs give you, see [Debug Realtime with Logger and Log Levels](./realtime-debugging-with-logger). If the connection seems to drop intermittently rather than failing outright, check [Realtime: Handling Silent Disconnections in Background Applications](./realtime-handling-silent-disconnections-in-backgrounded-applications-592794) and [Understanding and Monitoring Realtime Heartbeats](./realtime-heartbeat-messages).
+
+One thing to design around regardless: Realtime doesn't guarantee every message gets delivered. Network blips and reconnects can drop an event here and there. If a missed update matters, treat the Realtime event as a signal to re-fetch state — not as the only source of truth. Then a dropped event is an inconvenience, not a bug.
+
+## Still nothing?
+
+Rule out the network layer:
+
+- Corporate firewall or proxy blocking WebSocket connections
+- Outdated `supabase-js` version — check recent release notes
+
+Hopefully this guide is helpful to you in resolving these types of issues.
diff --git a/apps/docs/features/docs/Reference.ui.tsx b/apps/docs/features/docs/Reference.ui.tsx
index 2cac82a4c0c..c8a2ee5704b 100644
--- a/apps/docs/features/docs/Reference.ui.tsx
+++ b/apps/docs/features/docs/Reference.ui.tsx
@@ -381,6 +381,14 @@ interface ApiOperationRequestBodyDetailsInternalProps extends HTMLAttributes<HTM
   schema: ISchema
 }
 
+// Some specs have allOf/anyOf/oneOf as a single schema object instead of an
+// array. Wrap it so it still renders instead of crashing or disappearing.
+function asSchemaArray(value: unknown): Array<any> {
+  if (Array.isArray(value)) return value
+  if (value && typeof value === 'object') return [value]
+  return []
+}
+
 function ApiOperationRequestBodyDetailsInternal({
   schema,
   ...props
@@ -389,7 +397,7 @@ function ApiOperationRequestBodyDetailsInternal({
     return (
       <>
         <span className="font-mono text-sm font-medium text-foreground">All of the following:</span>
-        {schema.allOf.map((option, index) => (
+        {asSchemaArray(schema.allOf).map((option, index) => (
           <ApiSchemaParamSubdetails key={index} schema={option} />
         ))}
       </>
@@ -398,7 +406,7 @@ function ApiOperationRequestBodyDetailsInternal({
     return (
       <>
         <span className="font-mono text-sm font-medium text-foreground">Any of the following:</span>
-        {schema.anyOf.map((option, index) => (
+        {asSchemaArray(schema.anyOf).map((option, index) => (
           <ApiSchemaParamSubdetails key={index} schema={option} />
         ))}
       </>
@@ -407,7 +415,7 @@ function ApiOperationRequestBodyDetailsInternal({
     return (
       <>
         <span className="font-mono text-sm font-medium text-foreground">One of the following:</span>
-        {schema.oneOf.map((option, index) => (
+        {asSchemaArray(schema.oneOf).map((option, index) => (
           <ApiSchemaParamSubdetails key={index} schema={option} />
         ))}
       </>
@@ -431,10 +439,11 @@ function ApiOperationRequestBodyDetailsInternal({
     return (
       <>
         <span className="font-mono text-sm font-medium text-foreground">{`Array of ${displayName}`}</span>
-        {!(
-          'type' in schema.items &&
-          ['string', 'boolean', 'number', 'integer'].includes(schema.items.type)
-        ) && <ApiSchemaParamSubdetails className="mt-4" schema={schema.items} />}
+        {schema.items &&
+          !(
+            'type' in schema.items &&
+            ['string', 'boolean', 'number', 'integer'].includes(schema.items.type)
+          ) && <ApiSchemaParamSubdetails className="mt-4" schema={schema.items} />}
       </>
     )
   } else if (schema.type === 'object') {
@@ -469,13 +478,14 @@ export function ApiSchemaParamSubdetails({
       (schema.type === 'string' &&
         !('minLength' in schema || 'maxLength' in schema || 'pattern' in schema)) ||
       (schema.type === 'array' &&
+        schema.items &&
         'type' in schema.items &&
         ['boolean', 'number', 'integer', 'string', 'file'].includes(schema.items.type)))
   ) {
     return null
   }
 
-  const subContent =
+  const rawSubContent =
     'enum' in schema
       ? schema.enum
       : 'anyOf' in schema
@@ -492,6 +502,7 @@ export function ApiSchemaParamSubdetails({
                     value: schema[key],
                   }))
               : []
+  const subContent = asSchemaArray(rawSubContent)
 
   return (
     <Collapsible>
@@ -530,8 +541,24 @@ export function ApiSchemaParamSubdetails({
       </CollapsibleTrigger>
       <CollapsibleContent>
         {'type' in schema && schema.type === 'object' ? (
-          <div className={cn('border-b border-x border-fault', 'rounded-b-lg', 'p-5')}>
-            <ApiSchema schema={schema} />
+          <div className={cn('border-b border-x border-default', 'rounded-b-lg')}>
+            <div className="p-5 border-b border-default">
+              <ApiSchema schema={schema} />
+            </div>
+            <ApiOperationRequestBodyDetailsInternal schema={schema} className="px-5" />
+          </div>
+        ) : 'type' in schema &&
+          schema.type === 'array' &&
+          'items' in schema &&
+          schema.items &&
+          typeof schema.items === 'object' &&
+          'type' in schema.items &&
+          schema.items.type === 'object' ? (
+          <div className={cn('border-b border-x border-default', 'rounded-b-lg')}>
+            <div className="p-5 border-b border-default">
+              <ApiSchema schema={schema} />
+            </div>
+            <ApiOperationRequestBodyDetailsInternal schema={schema.items} className="px-5" />
           </div>
         ) : (
           <ul className={cn('border-b border-x border-default', 'rounded-b-lg')}>
diff --git a/apps/docs/features/ui/CodeBlock/CodeBlock.client.tsx b/apps/docs/features/ui/CodeBlock/CodeBlock.client.tsx
index 2db18ab15c4..4ec13d2478a 100644
--- a/apps/docs/features/ui/CodeBlock/CodeBlock.client.tsx
+++ b/apps/docs/features/ui/CodeBlock/CodeBlock.client.tsx
@@ -119,6 +119,8 @@ export function CodeCopyButton({ className, content }: { className?: string; con
               className
             )}
             aria-label="Copy code"
+            // Tooltip repeats the label; the description would read the name twice
+            aria-describedby={undefined}
           >
             {copied ? (
               <Check size={14} className="text-lighter" />
@@ -135,29 +137,33 @@ export function CodeCopyButton({ className, content }: { className?: string; con
 
 export function CodeBlockControls({ content }: { content: string }) {
   const [isWrapped, setIsWrapped] = useState(false)
+  // Empty until the first toggle, so nothing is announced on mount
+  const [wrapStatus, setWrapStatus] = useState('')
   const wrapperRef = useRef<HTMLDivElement>(null)
 
   const toggleWrap = useCallback(() => {
-    setIsWrapped((prev) => {
-      const newValue = !prev
-      // Find the parent code block and toggle the wrap data attribute
-      const codeBlock = wrapperRef.current?.closest('.shiki')
-      if (codeBlock) {
-        if (newValue) {
-          codeBlock.setAttribute('data-wrapped', 'true')
-        } else {
-          codeBlock.removeAttribute('data-wrapped')
-        }
+    const newValue = !isWrapped
+    setIsWrapped(newValue)
+    setWrapStatus(newValue ? 'Word wrap enabled' : 'Word wrap disabled')
+
+    const codeBlock = wrapperRef.current?.closest('.shiki')
+    if (codeBlock) {
+      if (newValue) {
+        codeBlock.setAttribute('data-wrapped', 'true')
+      } else {
+        codeBlock.removeAttribute('data-wrapped')
       }
-      return newValue
-    })
-  }, [])
+    }
+  }, [isWrapped])
 
   return (
     <div
       ref={wrapperRef}
-      className="opacity-0 flex group-hover:opacity-100 focus-within:opacity-100 absolute top-2 right-2 gap-1"
+      className="opacity-0 flex group-hover:opacity-100 group-focus-within:opacity-100 absolute top-2 right-2 gap-1"
     >
+      <span className="sr-only" aria-live="polite">
+        {wrapStatus}
+      </span>
       <Tooltip>
         <TooltipTrigger asChild>
           <button
@@ -165,6 +171,8 @@ export function CodeBlockControls({ content }: { content: string }) {
             onClick={toggleWrap}
             className={cn('cursor-pointer border rounded-md p-1', 'hover:bg-selection transition')}
             aria-label={isWrapped ? 'Disable word wrap' : 'Enable word wrap'}
+            // Tooltip repeats the label; the description would read the name twice
+            aria-describedby={undefined}
           >
             {isWrapped ? (
               <ArrowRightFromLine size={14} className="text-lighter" />
diff --git a/apps/docs/features/ui/CodeBlock/CodeBlock.tsx b/apps/docs/features/ui/CodeBlock/CodeBlock.tsx
index 6cfc7f5591d..12316948dc2 100644
--- a/apps/docs/features/ui/CodeBlock/CodeBlock.tsx
+++ b/apps/docs/features/ui/CodeBlock/CodeBlock.tsx
@@ -4,7 +4,7 @@ import { createTwoslasher, type ExtraFiles, type NodeHover } from 'twoslash'
 import { cn } from 'ui'
 
 import { AnnotatedSpan, CodeBlockControls } from './CodeBlock.client'
-import { getFontStyle } from './CodeBlock.utils'
+import { getCodeBlockLabel, getFontStyle } from './CodeBlock.utils'
 import theme from './supabase-2.json' with { type: 'json' }
 import denoTypes from './types/lib.deno.d.ts.include'
 
@@ -46,11 +46,7 @@ export async function CodeBlock({
       twoslashed = annotationsByLine(hoverNodes)
       code = editedCode
     } catch (_err) {
-      // Silently ignore, if imports aren't defined type compilation fails
-      // Uncomment lines below to debug in dev
-      // console.log('\n==========CODE==========\n')
-      // console.log(code)
-      // console.error(_err.recommendation)
+      // Type compilation fails when imports aren't defined
     }
   }
 
@@ -66,52 +62,64 @@ export async function CodeBlock({
         'group',
         'relative',
         'not-prose',
-        'w-full overflow-x-auto',
+        'w-full',
         'border border-default rounded-lg',
         'bg-200',
         'text-sm',
         className
       )}
-      role="group"
-      aria-roledescription="code block"
     >
+      <div
+        className={cn(
+          'code-scroll',
+          'w-full overflow-x-auto rounded-lg',
+          'focus-visible:outline-hidden focus-visible:ring-2 focus-visible:ring-ring'
+        )}
+        role="group"
+        aria-roledescription="code block"
+        aria-label={getCodeBlockLabel(lang, tokens.length)}
+        tabIndex={0}
+      >
+        <pre>
+          <code className={lineNumbers ? 'grid grid-cols-[auto_1fr]' : ''}>
+            {lineNumbers ? (
+              <>
+                {tokens.map((line, idx) => (
+                  <Fragment key={idx}>
+                    <div
+                      aria-hidden="true"
+                      className={cn(
+                        'select-none text-right text-muted bg-control px-2 min-h-5 leading-5',
+                        idx === 0 && 'pt-6',
+                        idx === tokens.length - 1 && 'pb-6'
+                      )}
+                    >
+                      {idx + 1}
+                    </div>
+                    <div
+                      className={cn(
+                        'code-content min-h-5 leading-5 pl-6 pr-6',
+                        idx === 0 && 'pt-6',
+                        idx === tokens.length - 1 && 'pb-6'
+                      )}
+                    >
+                      <CodeLine tokens={line} twoslash={twoslashed?.get(idx)} />
+                    </div>
+                  </Fragment>
+                ))}
+              </>
+            ) : (
+              <div className="code-content p-6">
+                {tokens.map((line, idx) => (
+                  <CodeLine key={idx} tokens={line} twoslash={twoslashed?.get(idx)} />
+                ))}
+              </div>
+            )}
+          </code>
+        </pre>
+      </div>
+      {/* After the code so the block is named before its controls, and outside the scroller so they stay pinned */}
       {!hideControls && <CodeBlockControls content={code.trim()} />}
-      <pre>
-        <code className={lineNumbers ? 'grid grid-cols-[auto_1fr]' : ''}>
-          {lineNumbers ? (
-            <>
-              {tokens.map((line, idx) => (
-                <Fragment key={idx}>
-                  <div
-                    className={cn(
-                      'select-none text-right text-muted bg-control px-2 min-h-5 leading-5',
-                      idx === 0 && 'pt-6',
-                      idx === tokens.length - 1 && 'pb-6'
-                    )}
-                  >
-                    {idx + 1}
-                  </div>
-                  <div
-                    className={cn(
-                      'code-content min-h-5 leading-5 pl-6 pr-6',
-                      idx === 0 && 'pt-6',
-                      idx === tokens.length - 1 && 'pb-6'
-                    )}
-                  >
-                    <CodeLine tokens={line} twoslash={twoslashed?.get(idx)} />
-                  </div>
-                </Fragment>
-              ))}
-            </>
-          ) : (
-            <div className="code-content p-6">
-              {tokens.map((line, idx) => (
-                <CodeLine key={idx} tokens={line} twoslash={twoslashed?.get(idx)} />
-              ))}
-            </div>
-          )}
-        </code>
-      </pre>
     </div>
   )
 }
diff --git a/apps/docs/features/ui/CodeBlock/CodeBlock.utils.ts b/apps/docs/features/ui/CodeBlock/CodeBlock.utils.ts
index 2202c2a5193..b3046183a38 100644
--- a/apps/docs/features/ui/CodeBlock/CodeBlock.utils.ts
+++ b/apps/docs/features/ui/CodeBlock/CodeBlock.utils.ts
@@ -1,8 +1,6 @@
 import { type CSSProperties } from 'react'
 
-/*
- * As defined in @shikijs/core/dist/chunk-tokens.d.mts
- */
+// As defined in @shikijs/core/dist/chunk-tokens.d.mts
 enum FontStyle {
   NotSet = -1,
   None = 0,
@@ -28,3 +26,26 @@ export function getFontStyle(styleFlags: number): CSSProperties {
 
   return style
 }
+
+// Fence aliases a screen reader would otherwise read letter by letter
+const LANGUAGE_LABELS: Record<string, string> = {
+  c: 'C',
+  html: 'HTML',
+  js: 'JavaScript',
+  json: 'JSON',
+  jsx: 'JavaScript',
+  py: 'Python',
+  sh: 'Shell',
+  shell: 'Shell',
+  sql: 'SQL',
+  toml: 'TOML',
+  ts: 'TypeScript',
+  tsx: 'TypeScript',
+  yaml: 'YAML',
+}
+
+export function getCodeBlockLabel(lang: string | null, lineCount: number): string {
+  const lines = `${lineCount} ${lineCount === 1 ? 'line' : 'lines'}`
+  if (!lang) return lines
+  return `${LANGUAGE_LABELS[lang] ?? lang}, ${lines}`
+}
diff --git a/apps/docs/public/humans.txt b/apps/docs/public/humans.txt
index 0f40c00761b..964214306f5 100644
--- a/apps/docs/public/humans.txt
+++ b/apps/docs/public/humans.txt
@@ -283,6 +283,7 @@ Shane E
 Shaun Newman
 Shardul Borhade
 Shreekar Shetty
+Simon Tomlinson
 Sreyas Udayavarman
 Stephanie Jackson (stejacks)
 Stephen Morgan
diff --git a/apps/docs/spec/api_v1_openapi.json b/apps/docs/spec/api_v1_openapi.json
index 01b1a6ff1cf..f2e5cd59c0b 100644
--- a/apps/docs/spec/api_v1_openapi.json
+++ b/apps/docs/spec/api_v1_openapi.json
@@ -468,7 +468,7 @@
         "summary": "List all projects",
         "tags": ["Projects"],
         "x-badges": [{ "name": "OAuth scope: projects:read", "position": "after" }],
-        "x-endpoint-owners": ["management-api"],
+        "x-endpoint-owners": ["control-plane"],
         "x-fga-permissions": [["projects_read"]],
         "x-oauth-scope": "projects:read"
       },
@@ -496,7 +496,7 @@
         "summary": "Create a project",
         "tags": ["Projects"],
         "x-badges": [{ "name": "OAuth scope: projects:write", "position": "after" }],
-        "x-endpoint-owners": ["management-api", "infra"],
+        "x-endpoint-owners": ["control-plane", "infra"],
         "x-fga-permissions": [["organization_projects_create"]],
         "x-oauth-scope": "projects:write"
       }
@@ -596,7 +596,7 @@
         "summary": "List all organizations",
         "tags": ["Organizations"],
         "x-badges": [{ "name": "OAuth scope: organizations:read", "position": "after" }],
-        "x-endpoint-owners": ["management-api"],
+        "x-endpoint-owners": ["control-plane"],
         "x-fga-permissions": [["organizations_read"]],
         "x-oauth-scope": "organizations:read"
       },
@@ -628,7 +628,7 @@
         "security": [{ "bearer": [] }],
         "summary": "Create an organization",
         "tags": ["Organizations"],
-        "x-endpoint-owners": ["management-api", "billing"],
+        "x-endpoint-owners": ["control-plane", "billing"],
         "x-fga-permissions": [["organizations_create"]]
       }
     },
@@ -725,7 +725,7 @@
         "responses": { "204": { "description": "" } },
         "summary": "[Beta] Authorize user through oauth",
         "tags": ["OAuth"],
-        "x-endpoint-owners": ["auth", "management-api"]
+        "x-endpoint-owners": ["auth", "control-plane"]
       }
     },
     "/v1/oauth/token": {
@@ -753,7 +753,7 @@
         },
         "summary": "[Beta] Exchange auth code for user's access and refresh token",
         "tags": ["OAuth"],
-        "x-endpoint-owners": ["auth", "management-api"]
+        "x-endpoint-owners": ["auth", "control-plane"]
       }
     },
     "/v1/oauth/revoke": {
@@ -771,7 +771,7 @@
         "responses": { "204": { "description": "" } },
         "summary": "[Beta] Revoke oauth app authorization and it's corresponding tokens",
         "tags": ["OAuth"],
-        "x-endpoint-owners": ["auth", "management-api"]
+        "x-endpoint-owners": ["auth", "control-plane"]
       }
     },
     "/v1/oauth/authorize/project-claim": {
@@ -853,7 +853,7 @@
         "security": [{ "bearer": [] }],
         "summary": "Authorize user through oauth and claim a project",
         "tags": ["OAuth"],
-        "x-endpoint-owners": ["management-api"],
+        "x-endpoint-owners": ["control-plane"],
         "x-fga-permissions": [["organization_admin_write", "project_admin_write"]]
       }
     },
@@ -910,7 +910,7 @@
         "summary": "Lists SQL snippets for the logged in user",
         "tags": ["Database"],
         "x-badges": [{ "name": "OAuth scope: database:read", "position": "after" }],
-        "x-endpoint-owners": ["management-api"],
+        "x-endpoint-owners": ["control-plane"],
         "x-fga-permissions": [["snippets_read"]],
         "x-oauth-scope": "database:read"
       }
@@ -947,7 +947,7 @@
         "summary": "Gets a specific SQL snippet",
         "tags": ["Database"],
         "x-badges": [{ "name": "OAuth scope: database:read", "position": "after" }],
-        "x-endpoint-owners": ["management-api"],
+        "x-endpoint-owners": ["control-plane"],
         "x-fga-permissions": [["snippets_read"]],
         "x-oauth-scope": "database:read"
       }
@@ -967,7 +967,7 @@
         "security": [{ "bearer": [] }],
         "summary": "Gets the user's profile",
         "tags": ["Profile"],
-        "x-endpoint-owners": ["management-api"]
+        "x-endpoint-owners": ["control-plane"]
       }
     },
     "/v1/projects/{ref}/actions": {
@@ -1256,7 +1256,7 @@
         "summary": "Get project api keys",
         "tags": ["Secrets"],
         "x-badges": [{ "name": "OAuth scope: secrets:read", "position": "after" }],
-        "x-endpoint-owners": ["auth", "management-api"],
+        "x-endpoint-owners": ["auth", "control-plane"],
         "x-fga-permissions": [["api_gateway_keys_read"]],
         "x-oauth-scope": "secrets:read"
       },
@@ -1305,7 +1305,7 @@
         "summary": "Creates a new API key for the project",
         "tags": ["Secrets"],
         "x-badges": [{ "name": "OAuth scope: secrets:write", "position": "after" }],
-        "x-endpoint-owners": ["auth", "management-api"],
+        "x-endpoint-owners": ["auth", "control-plane"],
         "x-fga-permissions": [["api_gateway_keys_write"]],
         "x-oauth-scope": "secrets:write"
       }
@@ -1345,7 +1345,7 @@
         "summary": "Check whether JWT based legacy (anon, service_role) API keys are enabled. This API endpoint will be removed in the future, check for HTTP 404 Not Found.",
         "tags": ["Secrets"],
         "x-badges": [{ "name": "OAuth scope: secrets:read", "position": "after" }],
-        "x-endpoint-owners": ["auth", "management-api"],
+        "x-endpoint-owners": ["auth", "control-plane"],
         "x-fga-permissions": [["api_gateway_keys_read"]],
         "x-oauth-scope": "secrets:read"
       },
@@ -1390,7 +1390,7 @@
         "summary": "Disable or re-enable JWT based legacy (anon, service_role) API keys. This API endpoint will be removed in the future, check for HTTP 404 Not Found.",
         "tags": ["Secrets"],
         "x-badges": [{ "name": "OAuth scope: secrets:write", "position": "after" }],
-        "x-endpoint-owners": ["auth", "management-api"],
+        "x-endpoint-owners": ["auth", "control-plane"],
         "x-fga-permissions": [["api_gateway_keys_write"]],
         "x-oauth-scope": "secrets:write"
       }
@@ -1452,7 +1452,7 @@
         "summary": "Updates an API key for the project",
         "tags": ["Secrets"],
         "x-badges": [{ "name": "OAuth scope: secrets:write", "position": "after" }],
-        "x-endpoint-owners": ["auth", "management-api"],
+        "x-endpoint-owners": ["auth", "control-plane"],
         "x-fga-permissions": [["api_gateway_keys_write"]],
         "x-oauth-scope": "secrets:write"
       },
@@ -1506,7 +1506,7 @@
         "summary": "Get API key",
         "tags": ["Secrets"],
         "x-badges": [{ "name": "OAuth scope: secrets:read", "position": "after" }],
-        "x-endpoint-owners": ["auth", "management-api"],
+        "x-endpoint-owners": ["auth", "control-plane"],
         "x-fga-permissions": [["api_gateway_keys_read"]],
         "x-oauth-scope": "secrets:read"
       },
@@ -1573,7 +1573,7 @@
         "summary": "Deletes an API key for the project",
         "tags": ["Secrets"],
         "x-badges": [{ "name": "OAuth scope: secrets:write", "position": "after" }],
-        "x-endpoint-owners": ["auth", "management-api"],
+        "x-endpoint-owners": ["auth", "control-plane"],
         "x-fga-permissions": [["api_gateway_keys_write"]],
         "x-oauth-scope": "secrets:write"
       }
@@ -1773,7 +1773,7 @@
         "summary": "[Beta] Gets project's custom hostname config",
         "tags": ["Domains"],
         "x-badges": [{ "name": "OAuth scope: domains:read", "position": "after" }],
-        "x-endpoint-owners": ["infra", "management-api"],
+        "x-endpoint-owners": ["infra", "control-plane"],
         "x-fga-permissions": [["custom_domain_read"]],
         "x-oauth-scope": "domains:read"
       },
@@ -1812,7 +1812,7 @@
         "summary": "[Beta] Deletes a project's custom hostname configuration",
         "tags": ["Domains"],
         "x-badges": [{ "name": "OAuth scope: domains:write", "position": "after" }],
-        "x-endpoint-owners": ["infra", "management-api"],
+        "x-endpoint-owners": ["infra", "control-plane"],
         "x-fga-permissions": [["custom_domain_write"]],
         "x-oauth-scope": "domains:write"
       }
@@ -1861,7 +1861,7 @@
         "summary": "[Beta] Updates project's custom hostname configuration",
         "tags": ["Domains"],
         "x-badges": [{ "name": "OAuth scope: domains:write", "position": "after" }],
-        "x-endpoint-owners": ["infra", "management-api"],
+        "x-endpoint-owners": ["infra", "control-plane"],
         "x-fga-permissions": [["custom_domain_write"]],
         "x-oauth-scope": "domains:write"
       }
@@ -1902,7 +1902,7 @@
         "summary": "[Beta] Attempts to verify the DNS configuration for project's custom hostname configuration",
         "tags": ["Domains"],
         "x-badges": [{ "name": "OAuth scope: domains:write", "position": "after" }],
-        "x-endpoint-owners": ["infra", "management-api"],
+        "x-endpoint-owners": ["infra", "control-plane"],
         "x-fga-permissions": [["custom_domain_write"]],
         "x-oauth-scope": "domains:write"
       }
@@ -1943,7 +1943,7 @@
         "summary": "[Beta] Activates a custom hostname for a project.",
         "tags": ["Domains"],
         "x-badges": [{ "name": "OAuth scope: domains:write", "position": "after" }],
-        "x-endpoint-owners": ["infra", "management-api"],
+        "x-endpoint-owners": ["infra", "control-plane"],
         "x-fga-permissions": [["custom_domain_write"]],
         "x-oauth-scope": "domains:write"
       }
@@ -2013,7 +2013,7 @@
         "summary": "[Beta] Get project's temporary access configuration.",
         "tags": ["Database"],
         "x-badges": [{ "name": "OAuth scope: database:read", "position": "after" }],
-        "x-endpoint-owners": ["security", "management-api"],
+        "x-endpoint-owners": ["security", "control-plane"],
         "x-fga-permissions": [["project_admin_read"]],
         "x-oauth-scope": "database:read"
       },
@@ -2089,7 +2089,7 @@
         "summary": "[Beta] Update project's temporary access configuration.",
         "tags": ["Database"],
         "x-badges": [{ "name": "OAuth scope: database:write", "position": "after" }],
-        "x-endpoint-owners": ["security", "management-api"],
+        "x-endpoint-owners": ["security", "control-plane"],
         "x-fga-permissions": [["project_admin_write"]],
         "x-oauth-scope": "database:write"
       }
@@ -2130,7 +2130,7 @@
         "summary": "[Beta] Gets project's network bans",
         "tags": ["Projects"],
         "x-badges": [{ "name": "OAuth scope: projects:read", "position": "after" }],
-        "x-endpoint-owners": ["management-api", "infra"],
+        "x-endpoint-owners": ["control-plane", "infra"],
         "x-fga-permissions": [["database_network_bans_read"]],
         "x-oauth-scope": "projects:read"
       }
@@ -2171,7 +2171,7 @@
         "summary": "[Beta] Gets project's network bans with additional information about which databases they affect",
         "tags": ["Projects"],
         "x-badges": [{ "name": "OAuth scope: projects:read", "position": "after" }],
-        "x-endpoint-owners": ["management-api", "infra"],
+        "x-endpoint-owners": ["control-plane", "infra"],
         "x-fga-permissions": [["database_network_bans_read"]],
         "x-oauth-scope": "projects:read"
       }
@@ -2213,7 +2213,7 @@
         "summary": "[Beta] Remove network bans.",
         "tags": ["Projects"],
         "x-badges": [{ "name": "OAuth scope: projects:write", "position": "after" }],
-        "x-endpoint-owners": ["management-api", "infra"],
+        "x-endpoint-owners": ["control-plane", "infra"],
         "x-fga-permissions": [["database_network_bans_write"]],
         "x-oauth-scope": "projects:write"
       }
@@ -2254,7 +2254,7 @@
         "summary": "[Beta] Gets project's network restrictions",
         "tags": ["Projects"],
         "x-badges": [{ "name": "OAuth scope: projects:read", "position": "after" }],
-        "x-endpoint-owners": ["infra", "management-api"],
+        "x-endpoint-owners": ["infra", "control-plane"],
         "x-fga-permissions": [["database_network_restrictions_read"]],
         "x-oauth-scope": "projects:read"
       },
@@ -2301,7 +2301,7 @@
         "summary": "[Alpha] Updates project's network restrictions by adding or removing CIDRs",
         "tags": ["Projects"],
         "x-badges": [{ "name": "OAuth scope: projects:write", "position": "after" }],
-        "x-endpoint-owners": ["infra", "management-api"],
+        "x-endpoint-owners": ["infra", "control-plane"],
         "x-fga-permissions": [["database_network_restrictions_write"]],
         "x-oauth-scope": "projects:write"
       }
@@ -2350,7 +2350,7 @@
         "summary": "[Beta] Updates project's network restrictions",
         "tags": ["Projects"],
         "x-badges": [{ "name": "OAuth scope: projects:write", "position": "after" }],
-        "x-endpoint-owners": ["infra", "management-api"],
+        "x-endpoint-owners": ["infra", "control-plane"],
         "x-fga-permissions": [["database_network_restrictions_write"]],
         "x-oauth-scope": "projects:write"
       }
@@ -2479,7 +2479,7 @@
         "summary": "Gets project's postgrest config",
         "tags": ["Rest"],
         "x-badges": [{ "name": "OAuth scope: rest:read", "position": "after" }],
-        "x-endpoint-owners": ["management-api", "infra"],
+        "x-endpoint-owners": ["control-plane", "infra"],
         "x-fga-permissions": [["data_api_config_read"]],
         "x-oauth-scope": "rest:read"
       },
@@ -2526,7 +2526,7 @@
         "summary": "Updates project's postgrest config",
         "tags": ["Rest"],
         "x-badges": [{ "name": "OAuth scope: rest:write", "position": "after" }],
-        "x-endpoint-owners": ["management-api", "infra"],
+        "x-endpoint-owners": ["control-plane", "infra"],
         "x-fga-permissions": [["data_api_config_write"]],
         "x-oauth-scope": "rest:write"
       }
@@ -2567,7 +2567,7 @@
         "summary": "Gets a specific project that belongs to the authenticated user",
         "tags": ["Projects"],
         "x-badges": [{ "name": "OAuth scope: projects:read", "position": "after" }],
-        "x-endpoint-owners": ["management-api"],
+        "x-endpoint-owners": ["control-plane"],
         "x-fga-permissions": [["project_admin_read"]],
         "x-oauth-scope": "projects:read"
       },
@@ -2605,7 +2605,7 @@
         "summary": "Deletes the given project",
         "tags": ["Projects"],
         "x-badges": [{ "name": "OAuth scope: projects:write", "position": "after" }],
-        "x-endpoint-owners": ["management-api", "infra", "dev-workflows"],
+        "x-endpoint-owners": ["control-plane", "infra", "dev-workflows"],
         "x-fga-permissions": [["project_admin_write"]],
         "x-oauth-scope": "projects:write"
       },
@@ -2650,7 +2650,7 @@
         "summary": "Updates the given project",
         "tags": ["Projects"],
         "x-badges": [{ "name": "OAuth scope: projects:write", "position": "after" }],
-        "x-endpoint-owners": ["management-api"],
+        "x-endpoint-owners": ["control-plane"],
         "x-fga-permissions": [["project_admin_write"]],
         "x-oauth-scope": "projects:write"
       }
@@ -2814,7 +2814,7 @@
         "summary": "[Beta] Get project's SSL enforcement configuration.",
         "tags": ["Database"],
         "x-badges": [{ "name": "OAuth scope: database:read", "position": "after" }],
-        "x-endpoint-owners": ["infra", "management-api"],
+        "x-endpoint-owners": ["infra", "control-plane"],
         "x-fga-permissions": [["database_ssl_config_read"]],
         "x-oauth-scope": "database:read"
       },
@@ -2861,7 +2861,7 @@
         "summary": "[Beta] Update project's SSL enforcement configuration.",
         "tags": ["Database"],
         "x-badges": [{ "name": "OAuth scope: database:write", "position": "after" }],
-        "x-endpoint-owners": ["infra", "management-api"],
+        "x-endpoint-owners": ["infra", "control-plane"],
         "x-fga-permissions": [["database_ssl_config_write"]],
         "x-oauth-scope": "database:write"
       }
@@ -2960,7 +2960,7 @@
           { "name": "OAuth scope: domains:read", "position": "after" },
           { "name": "Only available on Pro, Team, Enterprise", "position": "before" }
         ],
-        "x-endpoint-owners": ["infra", "management-api"],
+        "x-endpoint-owners": ["infra", "control-plane"],
         "x-fga-permissions": [["vanity_subdomain_read"]],
         "x-oauth-scope": "domains:read"
       },
@@ -2992,7 +2992,7 @@
         "summary": "[Beta] Deletes a project's vanity subdomain configuration",
         "tags": ["Domains"],
         "x-badges": [{ "name": "OAuth scope: domains:write", "position": "after" }],
-        "x-endpoint-owners": ["infra", "management-api"],
+        "x-endpoint-owners": ["infra", "control-plane"],
         "x-fga-permissions": [["vanity_subdomain_write"]],
         "x-oauth-scope": "domains:write"
       }
@@ -3049,7 +3049,7 @@
           { "name": "OAuth scope: domains:write", "position": "after" },
           { "name": "Only available on Pro, Team, Enterprise", "position": "before" }
         ],
-        "x-endpoint-owners": ["infra", "management-api"],
+        "x-endpoint-owners": ["infra", "control-plane"],
         "x-fga-permissions": [["vanity_subdomain_write"]],
         "x-oauth-scope": "domains:write"
       }
@@ -3106,7 +3106,7 @@
           { "name": "OAuth scope: domains:write", "position": "after" },
           { "name": "Only available on Pro, Team, Enterprise", "position": "before" }
         ],
-        "x-endpoint-owners": ["infra", "management-api"],
+        "x-endpoint-owners": ["infra", "control-plane"],
         "x-fga-permissions": [["vanity_subdomain_write"]],
         "x-oauth-scope": "domains:write"
       }
@@ -3153,7 +3153,7 @@
         "summary": "[Beta] Upgrades the project's Postgres version",
         "tags": ["Projects"],
         "x-badges": [{ "name": "OAuth scope: projects:write", "position": "after" }],
-        "x-endpoint-owners": ["management-api", "infra"],
+        "x-endpoint-owners": ["control-plane", "infra"],
         "x-fga-permissions": [["project_admin_write", "database_write"]],
         "x-oauth-scope": "projects:write"
       }
@@ -3194,7 +3194,7 @@
         "summary": "[Beta] Returns the project's eligibility for upgrades",
         "tags": ["Projects"],
         "x-badges": [{ "name": "OAuth scope: projects:read", "position": "after" }],
-        "x-endpoint-owners": ["management-api", "infra"],
+        "x-endpoint-owners": ["control-plane", "infra"],
         "x-fga-permissions": [["project_admin_read", "database_read"]],
         "x-oauth-scope": "projects:read"
       }
@@ -3241,7 +3241,7 @@
         "summary": "[Beta] Gets the latest status of the project's upgrade",
         "tags": ["Projects"],
         "x-badges": [{ "name": "OAuth scope: projects:read", "position": "after" }],
-        "x-endpoint-owners": ["management-api", "infra"],
+        "x-endpoint-owners": ["control-plane", "infra"],
         "x-fga-permissions": [["project_admin_read", "database_read"]],
         "x-oauth-scope": "projects:read"
       }
@@ -3282,7 +3282,7 @@
         "summary": "Returns project's readonly mode status",
         "tags": ["Database"],
         "x-badges": [{ "name": "OAuth scope: database:read", "position": "after" }],
-        "x-endpoint-owners": ["management-api", "infra", "support-tooling"],
+        "x-endpoint-owners": ["control-plane", "infra", "support-tooling"],
         "x-fga-permissions": [["database_readonly_config_read"]],
         "x-oauth-scope": "database:read"
       }
@@ -3316,7 +3316,7 @@
         "summary": "Disables project's readonly mode for the next 15 minutes",
         "tags": ["Database"],
         "x-badges": [{ "name": "OAuth scope: database:write", "position": "after" }],
-        "x-endpoint-owners": ["management-api", "infra", "support-tooling"],
+        "x-endpoint-owners": ["control-plane", "infra", "support-tooling"],
         "x-fga-permissions": [["database_readonly_config_write"]],
         "x-oauth-scope": "database:write"
       }
@@ -3365,7 +3365,7 @@
         "tags": ["Database"],
         "x-allowed-plans": ["Pro", "Team", "Enterprise"],
         "x-badges": [{ "name": "Only available on Pro, Team, Enterprise", "position": "before" }],
-        "x-endpoint-owners": ["management-api", "infra"],
+        "x-endpoint-owners": ["control-plane", "infra"],
         "x-fga-permissions": [["infra_read_replicas_write"]]
       }
     },
@@ -3405,7 +3405,7 @@
         "security": [{ "bearer": [] }],
         "summary": "[Beta] Remove a read replica",
         "tags": ["Database"],
-        "x-endpoint-owners": ["management-api", "infra"],
+        "x-endpoint-owners": ["control-plane", "infra"],
         "x-fga-permissions": [["infra_read_replicas_write"]]
       }
     },
@@ -3488,7 +3488,7 @@
         "summary": "Gets project's service health status",
         "tags": ["Projects"],
         "x-badges": [{ "name": "OAuth scope: projects:read", "position": "after" }],
-        "x-endpoint-owners": ["management-api", "infra"],
+        "x-endpoint-owners": ["control-plane", "infra"],
         "x-fga-permissions": [["project_admin_read"]],
         "x-oauth-scope": "projects:read"
       }
@@ -4111,7 +4111,7 @@
         "summary": "Pauses the given project",
         "tags": ["Projects"],
         "x-badges": [{ "name": "OAuth scope: projects:write", "position": "after" }],
-        "x-endpoint-owners": ["infra", "management-api"],
+        "x-endpoint-owners": ["infra", "control-plane"],
         "x-fga-permissions": [["project_admin_write"]],
         "x-oauth-scope": "projects:write"
       }
@@ -4144,7 +4144,7 @@
         "summary": "Restarts the given project",
         "tags": ["Projects"],
         "x-badges": [{ "name": "OAuth scope: projects:write", "position": "after" }],
-        "x-endpoint-owners": ["infra", "management-api"],
+        "x-endpoint-owners": ["infra", "control-plane"],
         "x-fga-permissions": [["project_admin_write"]],
         "x-oauth-scope": "projects:write"
       }
@@ -4186,7 +4186,7 @@
         "summary": "Lists available restore versions for the given project",
         "tags": ["Projects"],
         "x-badges": [{ "name": "OAuth scope: projects:read", "position": "after" }],
-        "x-endpoint-owners": ["management-api", "infra"],
+        "x-endpoint-owners": ["control-plane", "infra"],
         "x-fga-permissions": [["project_admin_read"]],
         "x-oauth-scope": "projects:read"
       },
@@ -4217,7 +4217,7 @@
         "summary": "Restores the given project",
         "tags": ["Projects"],
         "x-badges": [{ "name": "OAuth scope: projects:write", "position": "after" }],
-        "x-endpoint-owners": ["management-api", "infra"],
+        "x-endpoint-owners": ["control-plane", "infra"],
         "x-fga-permissions": [["project_admin_write"]],
         "x-oauth-scope": "projects:write"
       }
@@ -4250,7 +4250,7 @@
         "summary": "Cancels the given project restoration",
         "tags": ["Projects"],
         "x-badges": [{ "name": "OAuth scope: projects:write", "position": "after" }],
-        "x-endpoint-owners": ["management-api", "infra"],
+        "x-endpoint-owners": ["control-plane", "infra"],
         "x-fga-permissions": [["project_admin_write"]],
         "x-oauth-scope": "projects:write"
       }
@@ -4437,7 +4437,7 @@
         "security": [{ "bearer": [] }],
         "summary": "Gets project claim token",
         "tags": ["Projects"],
-        "x-endpoint-owners": ["management-api"],
+        "x-endpoint-owners": ["control-plane"],
         "x-fga-permissions": [["project_admin_read"]],
         "x-internal": true
       },
@@ -4474,7 +4474,7 @@
         "security": [{ "bearer": [] }],
         "summary": "Creates project claim token",
         "tags": ["Projects"],
-        "x-endpoint-owners": ["management-api"],
+        "x-endpoint-owners": ["control-plane"],
         "x-fga-permissions": [["organization_admin_write", "project_admin_write"]],
         "x-internal": true
       },
@@ -4504,7 +4504,7 @@
         "security": [{ "bearer": [] }],
         "summary": "Revokes project claim token",
         "tags": ["Projects"],
-        "x-endpoint-owners": ["management-api"],
+        "x-endpoint-owners": ["control-plane"],
         "x-fga-permissions": [["organization_admin_write", "project_admin_write"]],
         "x-internal": true
       }
@@ -4546,7 +4546,7 @@
         "summary": "Gets project performance advisors.",
         "tags": ["Advisors"],
         "x-badges": [{ "name": "OAuth scope: database:read", "position": "after" }],
-        "x-endpoint-owners": ["management-api"],
+        "x-endpoint-owners": ["control-plane"],
         "x-fga-permissions": [["advisors_read"]],
         "x-oauth-scope": "database:read"
       }
@@ -4594,7 +4594,7 @@
         "summary": "Gets project security advisors.",
         "tags": ["Advisors"],
         "x-badges": [{ "name": "OAuth scope: database:read", "position": "after" }],
-        "x-endpoint-owners": ["management-api"],
+        "x-endpoint-owners": ["control-plane"],
         "x-fga-permissions": [["advisors_read"]],
         "x-oauth-scope": "database:read"
       }
@@ -4602,7 +4602,7 @@
     "/v1/projects/{ref}/analytics/endpoints/logs.all": {
       "get": {
         "deprecated": true,
-        "description": "Executes a SQL query on the project's logs.\n\nEither the `iso_timestamp_start` and `iso_timestamp_end` parameters must be provided.\nIf both are not provided, only the last 1 minute of logs will be queried.\nThe timestamp range must be no more than 24 hours and is rounded to the nearest minute. If the range is more than 24 hours, a validation error will be thrown.\n\nNote: Unless the `sql` parameter is provided, only edge_logs will be queried. See the [log query docs](/docs/guides/telemetry/logs?queryGroups=product&product=postgres&queryGroups=source&source=edge_logs#querying-with-the-logs-explorer:~:text=logs%20from%20the-,Sources,-drop%2Ddown%3A) for all available sources.\n",
+        "description": "Executes a SQL query on the project's logs.\n\nEither the `iso_timestamp_start` and `iso_timestamp_end` parameters must be provided.\nIf both are not provided, only the last 1 minute of logs will be queried.\nThe timestamp range must be no more than 24 hours and is rounded to the nearest minute. If the range is more than 24 hours, a validation error will be thrown.\n\nNote: Unless the `sql` parameter is provided, only edge_logs will be queried. See the [log query docs](https://supabase.com/docs/guides/monitoring-and-debugging/logs#logs-explorer) for all available sources.\n",
         "operationId": "v1-get-project-logs-all",
         "parameters": [
           {
@@ -4622,7 +4622,7 @@
             "name": "sql",
             "required": false,
             "in": "query",
-            "description": "Custom SQL query to execute on the logs. See [querying logs](/docs/guides/telemetry/logs?queryGroups=product&product=postgres&queryGroups=source&source=edge_logs#querying-with-the-logs-explorer) for more details.",
+            "description": "Custom SQL query to execute on the logs. See [querying logs](https://supabase.com/docs/guides/monitoring-and-debugging/logs#querying-with-the-logs-explorer) for more details.",
             "schema": {
               "example": "select event_message from edge_logs limit 10",
               "type": "string"
@@ -4695,7 +4695,7 @@
             "name": "sql",
             "required": false,
             "in": "query",
-            "description": "Custom SQL query to execute on the logs. See [querying logs](/docs/guides/telemetry/logs?queryGroups=product&product=postgres&queryGroups=source&source=edge_logs#querying-with-the-logs-explorer) for more details.",
+            "description": "Custom SQL query to execute on the logs. See [querying logs](https://supabase.com/docs/guides/monitoring-and-debugging/logs#querying-with-the-logs-explorer) for more details.",
             "schema": {
               "example": "select event_message from edge_logs limit 10",
               "type": "string"
@@ -4913,6 +4913,9 @@
               "application/openmetrics-text": { "schema": { "type": "string" } }
             }
           },
+          "400": {
+            "description": "Project must be active and healthy, or metrics are not available for this project"
+          },
           "401": { "description": "Unauthorized" },
           "403": { "description": "Forbidden action" },
           "429": { "description": "Rate limit exceeded" },
@@ -5315,7 +5318,7 @@
         "summary": "[Beta] Run sql query",
         "tags": ["Database"],
         "x-badges": [{ "name": "OAuth scope: database:write", "position": "after" }],
-        "x-endpoint-owners": ["management-api"],
+        "x-endpoint-owners": ["control-plane"],
         "x-fga-permissions": [["database_read"], ["database_write"]],
         "x-oauth-scope": "database:write"
       }
@@ -5356,7 +5359,7 @@
         "summary": "[Beta] Run a sql query as supabase_read_only_user",
         "tags": ["Database"],
         "x-badges": [{ "name": "OAuth scope: database:read", "position": "after" }],
-        "x-endpoint-owners": ["management-api"],
+        "x-endpoint-owners": ["control-plane"],
         "x-fga-permissions": [["database_read"]],
         "x-oauth-scope": "database:read"
       }
@@ -5390,7 +5393,7 @@
         "summary": "[Beta] Enables Database Webhooks on the project",
         "tags": ["Database"],
         "x-badges": [{ "name": "OAuth scope: database:write", "position": "after" }],
-        "x-endpoint-owners": ["management-api", "infra"],
+        "x-endpoint-owners": ["control-plane", "infra"],
         "x-fga-permissions": [["database_webhooks_config_write"]],
         "x-oauth-scope": "database:write"
       }
@@ -5432,7 +5435,7 @@
         "summary": "Gets database metadata for the given project.",
         "tags": ["Database"],
         "x-badges": [{ "name": "OAuth scope: projects:read", "position": "after" }],
-        "x-endpoint-owners": ["management-api"],
+        "x-endpoint-owners": ["control-plane"],
         "x-fga-permissions": [["database_read"]],
         "x-oauth-scope": "projects:read"
       }
@@ -5481,7 +5484,7 @@
         "summary": "Updates the database password",
         "tags": ["Database"],
         "x-badges": [{ "name": "OAuth scope: database:write", "position": "after" }],
-        "x-endpoint-owners": ["management-api", "infra"],
+        "x-endpoint-owners": ["control-plane", "infra"],
         "x-fga-permissions": [["database_config_write"]],
         "x-oauth-scope": "database:write"
       }
@@ -5874,7 +5877,7 @@
         "summary": "Get PostgREST OpenAPI spec",
         "tags": ["Database"],
         "x-badges": [{ "name": "OAuth scope: database:read", "position": "after" }],
-        "x-endpoint-owners": ["management-api"],
+        "x-endpoint-owners": ["control-plane"],
         "x-fga-permissions": [["database_read"]],
         "x-oauth-scope": "database:read"
       }
@@ -6450,7 +6453,7 @@
         "security": [{ "bearer": [] }],
         "summary": "Get database disk attributes",
         "tags": ["Projects"],
-        "x-endpoint-owners": ["management-api", "infra"],
+        "x-endpoint-owners": ["control-plane", "infra"],
         "x-fga-permissions": [["infra_disk_config_read"]]
       },
       "post": {
@@ -6486,7 +6489,7 @@
         "security": [{ "bearer": [] }],
         "summary": "Modify database disk",
         "tags": ["Projects"],
-        "x-endpoint-owners": ["management-api", "infra"],
+        "x-endpoint-owners": ["control-plane", "infra"],
         "x-fga-permissions": [["infra_disk_config_write"]]
       }
     },
@@ -6525,7 +6528,7 @@
         "security": [{ "bearer": [] }],
         "summary": "Get disk utilization",
         "tags": ["Projects"],
-        "x-endpoint-owners": ["management-api", "infra"],
+        "x-endpoint-owners": ["control-plane", "infra"],
         "x-fga-permissions": [["infra_disk_config_read"]]
       }
     },
@@ -6564,7 +6567,7 @@
         "security": [{ "bearer": [] }],
         "summary": "Gets project disk autoscale config",
         "tags": ["Projects"],
-        "x-endpoint-owners": ["management-api", "infra"],
+        "x-endpoint-owners": ["control-plane", "infra"],
         "x-fga-permissions": [["infra_disk_config_read"]]
       }
     },
@@ -6680,7 +6683,7 @@
         "summary": "Get project's pgbouncer config",
         "tags": ["Database"],
         "x-badges": [{ "name": "OAuth scope: database:read", "position": "after" }],
-        "x-endpoint-owners": ["infra", "management-api"],
+        "x-endpoint-owners": ["infra", "control-plane"],
         "x-fga-permissions": [["database_read"]],
         "x-oauth-scope": "database:read"
       }
@@ -6812,7 +6815,7 @@
         "summary": "Gets project's Postgres config",
         "tags": ["Database"],
         "x-badges": [{ "name": "OAuth scope: database:read", "position": "after" }],
-        "x-endpoint-owners": ["infra", "management-api"],
+        "x-endpoint-owners": ["infra", "control-plane"],
         "x-fga-permissions": [["database_config_read"]],
         "x-oauth-scope": "database:read"
       },
@@ -6859,7 +6862,7 @@
         "summary": "Updates project's Postgres config",
         "tags": ["Database"],
         "x-badges": [{ "name": "OAuth scope: database:write", "position": "after" }],
-        "x-endpoint-owners": ["infra", "management-api"],
+        "x-endpoint-owners": ["infra", "control-plane"],
         "x-fga-permissions": [["database_config_write"]],
         "x-oauth-scope": "database:write"
       }
@@ -7658,7 +7661,7 @@
         "summary": "List members of an organization",
         "tags": ["Organizations"],
         "x-badges": [{ "name": "OAuth scope: organizations:read", "position": "after" }],
-        "x-endpoint-owners": ["management-api"],
+        "x-endpoint-owners": ["control-plane"],
         "x-fga-permissions": [["members_read"]],
         "x-oauth-scope": "organizations:read"
       }
@@ -7696,7 +7699,7 @@
         "summary": "Gets information about the organization",
         "tags": ["Organizations"],
         "x-badges": [{ "name": "OAuth scope: organizations:read", "position": "after" }],
-        "x-endpoint-owners": ["management-api"],
+        "x-endpoint-owners": ["control-plane"],
         "x-fga-permissions": [["organization_admin_read"]],
         "x-oauth-scope": "organizations:read"
       }
@@ -7739,7 +7742,7 @@
         "security": [{ "bearer": [] }],
         "summary": "Gets project details for the specified organization and claim token",
         "tags": ["Organizations"],
-        "x-endpoint-owners": ["management-api"],
+        "x-endpoint-owners": ["control-plane"],
         "x-fga-permissions": [["organization_admin_write"]],
         "x-internal": true
       },
@@ -7773,7 +7776,7 @@
         "security": [{ "bearer": [] }],
         "summary": "Claims project for the specified organization",
         "tags": ["Organizations"],
-        "x-endpoint-owners": ["management-api"],
+        "x-endpoint-owners": ["control-plane"],
         "x-fga-permissions": [["organization_admin_write"]],
         "x-internal": true
       }
@@ -7865,7 +7868,7 @@
         "summary": "Gets all projects for the given organization",
         "tags": ["Projects"],
         "x-badges": [{ "name": "OAuth scope: projects:read", "position": "after" }],
-        "x-endpoint-owners": ["management-api"],
+        "x-endpoint-owners": ["control-plane"],
         "x-fga-permissions": [["organization_projects_read"]],
         "x-oauth-scope": "projects:read"
       }
@@ -13106,6 +13109,13 @@
             "description": "Sets connection pool size for Realtime Authorization",
             "nullable": true
           },
+          "postgres_changes_pool": {
+            "type": "integer",
+            "minimum": 1,
+            "maximum": 100,
+            "description": "Sets connection pool size used to create Postgres Changes subscriptions",
+            "nullable": true
+          },
           "max_concurrent_users": {
             "type": "integer",
             "minimum": 1,
@@ -13165,6 +13175,7 @@
         "required": [
           "private_only",
           "connection_pool",
+          "postgres_changes_pool",
           "max_concurrent_users",
           "max_events_per_second",
           "max_bytes_per_second",
@@ -13189,6 +13200,12 @@
             "maximum": 100,
             "description": "Sets connection pool size for Realtime Authorization"
           },
+          "postgres_changes_pool": {
+            "type": "integer",
+            "minimum": 1,
+            "maximum": 100,
+            "description": "Sets connection pool size used to create Postgres Changes subscriptions"
+          },
           "max_concurrent_users": {
             "type": "integer",
             "minimum": 1,
@@ -13870,6 +13887,7 @@
                         "project_restore_after_expiry",
                         "assistant.advance_model",
                         "integrations.github_connections",
+                        "integrations.github_push_webhooks_limit",
                         "dedicated_pooler",
                         "observability.dashboard_advanced_metrics",
                         "api.members.invitations",
diff --git a/apps/docs/spec/api_v2_openapi.json b/apps/docs/spec/api_v2_openapi.json
index df7d06c6065..89fa22760c9 100644
--- a/apps/docs/spec/api_v2_openapi.json
+++ b/apps/docs/spec/api_v2_openapi.json
@@ -28,10 +28,30 @@
               }
             }
           },
-          "401": { "description": "Unauthorized" },
-          "403": { "description": "Forbidden action" },
-          "429": { "description": "Rate limit exceeded" },
-          "500": { "description": "Failed to fetch log drains" }
+          "401": {
+            "description": "Unauthorized",
+            "content": {
+              "application/json": { "schema": { "$ref": "#/components/schemas/ErrorResponseBody" } }
+            }
+          },
+          "403": {
+            "description": "Forbidden action",
+            "content": {
+              "application/json": { "schema": { "$ref": "#/components/schemas/ErrorResponseBody" } }
+            }
+          },
+          "429": {
+            "description": "Rate limit exceeded",
+            "content": {
+              "application/json": { "schema": { "$ref": "#/components/schemas/ErrorResponseBody" } }
+            }
+          },
+          "500": {
+            "description": "Failed to fetch log drains",
+            "content": {
+              "application/json": { "schema": { "$ref": "#/components/schemas/ErrorResponseBody" } }
+            }
+          }
         },
         "security": [{ "bearer": [] }],
         "summary": "List project log drains",
@@ -73,18 +93,36 @@
               "application/json": { "schema": { "$ref": "#/components/schemas/LogDrainResponse" } }
             }
           },
-          "401": { "description": "Unauthorized" },
+          "401": {
+            "description": "Unauthorized",
+            "content": {
+              "application/json": { "schema": { "$ref": "#/components/schemas/ErrorResponseBody" } }
+            }
+          },
           "402": {
             "description": "This feature requires the Pro, Team, or Enterprise organization plan.",
             "content": {
-              "application/json": {
-                "schema": { "$ref": "#/components/schemas/PlanGateErrorBodyV2" }
-              }
+              "application/json": { "schema": { "$ref": "#/components/schemas/ErrorResponseBody" } }
             }
           },
-          "403": { "description": "Forbidden action" },
-          "429": { "description": "Rate limit exceeded" },
-          "500": { "description": "Failed to create a log drain" }
+          "403": {
+            "description": "Forbidden action",
+            "content": {
+              "application/json": { "schema": { "$ref": "#/components/schemas/ErrorResponseBody" } }
+            }
+          },
+          "429": {
+            "description": "Rate limit exceeded",
+            "content": {
+              "application/json": { "schema": { "$ref": "#/components/schemas/ErrorResponseBody" } }
+            }
+          },
+          "500": {
+            "description": "Failed to create a log drain",
+            "content": {
+              "application/json": { "schema": { "$ref": "#/components/schemas/ErrorResponseBody" } }
+            }
+          }
         },
         "security": [{ "bearer": [] }],
         "summary": "Create a log drain for a project",
@@ -143,10 +181,30 @@
               "application/json": { "schema": { "$ref": "#/components/schemas/LogDrainResponse" } }
             }
           },
-          "401": { "description": "Unauthorized" },
-          "403": { "description": "Forbidden action" },
-          "429": { "description": "Rate limit exceeded" },
-          "500": { "description": "Failed to update log drain" }
+          "401": {
+            "description": "Unauthorized",
+            "content": {
+              "application/json": { "schema": { "$ref": "#/components/schemas/ErrorResponseBody" } }
+            }
+          },
+          "403": {
+            "description": "Forbidden action",
+            "content": {
+              "application/json": { "schema": { "$ref": "#/components/schemas/ErrorResponseBody" } }
+            }
+          },
+          "429": {
+            "description": "Rate limit exceeded",
+            "content": {
+              "application/json": { "schema": { "$ref": "#/components/schemas/ErrorResponseBody" } }
+            }
+          },
+          "500": {
+            "description": "Failed to update log drain",
+            "content": {
+              "application/json": { "schema": { "$ref": "#/components/schemas/ErrorResponseBody" } }
+            }
+          }
         },
         "security": [{ "bearer": [] }],
         "summary": "Update a project log drain",
@@ -186,10 +244,30 @@
         ],
         "responses": {
           "204": { "description": "" },
-          "401": { "description": "Unauthorized" },
-          "403": { "description": "Forbidden action" },
-          "429": { "description": "Rate limit exceeded" },
-          "500": { "description": "Failed to delete a log drain" }
+          "401": {
+            "description": "Unauthorized",
+            "content": {
+              "application/json": { "schema": { "$ref": "#/components/schemas/ErrorResponseBody" } }
+            }
+          },
+          "403": {
+            "description": "Forbidden action",
+            "content": {
+              "application/json": { "schema": { "$ref": "#/components/schemas/ErrorResponseBody" } }
+            }
+          },
+          "429": {
+            "description": "Rate limit exceeded",
+            "content": {
+              "application/json": { "schema": { "$ref": "#/components/schemas/ErrorResponseBody" } }
+            }
+          },
+          "500": {
+            "description": "Failed to delete a log drain",
+            "content": {
+              "application/json": { "schema": { "$ref": "#/components/schemas/ErrorResponseBody" } }
+            }
+          }
         },
         "security": [{ "bearer": [] }],
         "summary": "Delete a project log drain",
@@ -200,6 +278,71 @@
         "x-oauth-scope": "analytics_config:write"
       }
     },
+    "/v2/projects/{ref}/config": {
+      "get": {
+        "description": "Returns the project's database, pooler, Auth, Data API, Realtime and Storage configuration — the same configuration a branch inherits from its base project. Each is the effective config, so a setting the project has never overridden is reported at its platform default rather than as null. Auth secrets are returned as an HMAC of their value. `storage` is read live from the storage service; the rest come from this platform's own records.",
+        "operationId": "v2-get-project-config",
+        "parameters": [
+          {
+            "name": "ref",
+            "required": true,
+            "in": "path",
+            "description": "Project ref",
+            "schema": {
+              "minLength": 20,
+              "maxLength": 20,
+              "pattern": "^[a-z]+$",
+              "example": "abcdefghijklmnopqrst",
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "",
+            "content": {
+              "application/json": {
+                "schema": { "$ref": "#/components/schemas/V2ProjectConfigResponse" }
+              }
+            }
+          },
+          "401": {
+            "description": "Unauthorized",
+            "content": {
+              "application/json": { "schema": { "$ref": "#/components/schemas/ErrorResponseBody" } }
+            }
+          },
+          "403": {
+            "description": "Forbidden action",
+            "content": {
+              "application/json": { "schema": { "$ref": "#/components/schemas/ErrorResponseBody" } }
+            }
+          },
+          "429": {
+            "description": "Rate limit exceeded",
+            "content": {
+              "application/json": { "schema": { "$ref": "#/components/schemas/ErrorResponseBody" } }
+            }
+          }
+        },
+        "security": [{ "bearer": [] }],
+        "summary": "[Alpha] Get a project's service configuration",
+        "tags": ["Projects"],
+        "x-endpoint-owners": ["control-plane", "infra"],
+        "x-fga-permissions": [
+          [
+            "database_config_read",
+            "database_read",
+            "database_ssl_config_read",
+            "database_network_restrictions_read",
+            "auth_config_read",
+            "data_api_config_read",
+            "realtime_config_read",
+            "storage_config_read"
+          ]
+        ]
+      }
+    },
     "/v2/projects/{ref}/transfers/previews": {
       "post": {
         "operationId": "v2-preview-a-project-transfer",
@@ -235,14 +378,29 @@
               }
             }
           },
-          "401": { "description": "Unauthorized" },
-          "403": { "description": "Forbidden action" },
-          "429": { "description": "Rate limit exceeded" }
+          "401": {
+            "description": "Unauthorized",
+            "content": {
+              "application/json": { "schema": { "$ref": "#/components/schemas/ErrorResponseBody" } }
+            }
+          },
+          "403": {
+            "description": "Forbidden action",
+            "content": {
+              "application/json": { "schema": { "$ref": "#/components/schemas/ErrorResponseBody" } }
+            }
+          },
+          "429": {
+            "description": "Rate limit exceeded",
+            "content": {
+              "application/json": { "schema": { "$ref": "#/components/schemas/ErrorResponseBody" } }
+            }
+          }
         },
         "security": [{ "bearer": [] }],
         "summary": "Previews transferring a project to a different organizations, shows eligibility and impact",
         "tags": ["Projects"],
-        "x-endpoint-owners": ["management-api"],
+        "x-endpoint-owners": ["control-plane"],
         "x-fga-permissions": [["project_admin_read"]]
       }
     },
@@ -274,14 +432,29 @@
         },
         "responses": {
           "200": { "description": "" },
-          "401": { "description": "Unauthorized" },
-          "403": { "description": "Forbidden action" },
-          "429": { "description": "Rate limit exceeded" }
+          "401": {
+            "description": "Unauthorized",
+            "content": {
+              "application/json": { "schema": { "$ref": "#/components/schemas/ErrorResponseBody" } }
+            }
+          },
+          "403": {
+            "description": "Forbidden action",
+            "content": {
+              "application/json": { "schema": { "$ref": "#/components/schemas/ErrorResponseBody" } }
+            }
+          },
+          "429": {
+            "description": "Rate limit exceeded",
+            "content": {
+              "application/json": { "schema": { "$ref": "#/components/schemas/ErrorResponseBody" } }
+            }
+          }
         },
         "security": [{ "bearer": [] }],
         "summary": "Transfers a project to a different organization",
         "tags": ["Projects"],
-        "x-endpoint-owners": ["management-api"],
+        "x-endpoint-owners": ["control-plane"],
         "x-fga-permissions": [["organization_admin_write"]]
       }
     },
@@ -312,15 +485,35 @@
               }
             }
           },
-          "401": { "description": "Unauthorized" },
-          "403": { "description": "Forbidden action" },
-          "429": { "description": "Rate limit exceeded" },
-          "500": { "description": "Failed to retrieve AWS accounts for project" }
+          "401": {
+            "description": "Unauthorized",
+            "content": {
+              "application/json": { "schema": { "$ref": "#/components/schemas/ErrorResponseBody" } }
+            }
+          },
+          "403": {
+            "description": "Forbidden action",
+            "content": {
+              "application/json": { "schema": { "$ref": "#/components/schemas/ErrorResponseBody" } }
+            }
+          },
+          "429": {
+            "description": "Rate limit exceeded",
+            "content": {
+              "application/json": { "schema": { "$ref": "#/components/schemas/ErrorResponseBody" } }
+            }
+          },
+          "500": {
+            "description": "Failed to retrieve AWS accounts for project",
+            "content": {
+              "application/json": { "schema": { "$ref": "#/components/schemas/ErrorResponseBody" } }
+            }
+          }
         },
         "security": [{ "bearer": [] }],
         "summary": "List AWS accounts attached to the project PrivateLink share",
         "tags": ["Projects"],
-        "x-endpoint-owners": ["platform-networking", "management-api"],
+        "x-endpoint-owners": ["platform-networking", "control-plane"],
         "x-fga-permissions": [["project_admin_read"]]
       },
       "post": {
@@ -358,25 +551,43 @@
               }
             }
           },
-          "401": { "description": "Unauthorized" },
+          "401": {
+            "description": "Unauthorized",
+            "content": {
+              "application/json": { "schema": { "$ref": "#/components/schemas/ErrorResponseBody" } }
+            }
+          },
           "402": {
             "description": "This feature requires the Team, or Enterprise organization plan.",
             "content": {
-              "application/json": {
-                "schema": { "$ref": "#/components/schemas/PlanGateErrorBodyV2" }
-              }
+              "application/json": { "schema": { "$ref": "#/components/schemas/ErrorResponseBody" } }
             }
           },
-          "403": { "description": "Forbidden action" },
-          "429": { "description": "Rate limit exceeded" },
-          "500": { "description": "Failed to add AWS account to PrivateLink share" }
+          "403": {
+            "description": "Forbidden action",
+            "content": {
+              "application/json": { "schema": { "$ref": "#/components/schemas/ErrorResponseBody" } }
+            }
+          },
+          "429": {
+            "description": "Rate limit exceeded",
+            "content": {
+              "application/json": { "schema": { "$ref": "#/components/schemas/ErrorResponseBody" } }
+            }
+          },
+          "500": {
+            "description": "Failed to add AWS account to PrivateLink share",
+            "content": {
+              "application/json": { "schema": { "$ref": "#/components/schemas/ErrorResponseBody" } }
+            }
+          }
         },
         "security": [{ "bearer": [] }],
         "summary": "Add an AWS account to the project PrivateLink share",
         "tags": ["Projects"],
         "x-allowed-plans": ["Team", "Enterprise"],
         "x-badges": [{ "name": "Only available on Team, Enterprise", "position": "before" }],
-        "x-endpoint-owners": ["platform-networking", "management-api"],
+        "x-endpoint-owners": ["platform-networking", "control-plane"],
         "x-fga-permissions": [["project_admin_write"]]
       }
     },
@@ -408,15 +619,35 @@
         ],
         "responses": {
           "204": { "description": "" },
-          "401": { "description": "Unauthorized" },
-          "403": { "description": "Forbidden action" },
-          "429": { "description": "Rate limit exceeded" },
-          "500": { "description": "Failed to remove AWS account from PrivateLink share" }
+          "401": {
+            "description": "Unauthorized",
+            "content": {
+              "application/json": { "schema": { "$ref": "#/components/schemas/ErrorResponseBody" } }
+            }
+          },
+          "403": {
+            "description": "Forbidden action",
+            "content": {
+              "application/json": { "schema": { "$ref": "#/components/schemas/ErrorResponseBody" } }
+            }
+          },
+          "429": {
+            "description": "Rate limit exceeded",
+            "content": {
+              "application/json": { "schema": { "$ref": "#/components/schemas/ErrorResponseBody" } }
+            }
+          },
+          "500": {
+            "description": "Failed to remove AWS account from PrivateLink share",
+            "content": {
+              "application/json": { "schema": { "$ref": "#/components/schemas/ErrorResponseBody" } }
+            }
+          }
         },
         "security": [{ "bearer": [] }],
         "summary": "Remove an AWS account from the project PrivateLink share",
         "tags": ["Projects"],
-        "x-endpoint-owners": ["platform-networking", "management-api"],
+        "x-endpoint-owners": ["platform-networking", "control-plane"],
         "x-fga-permissions": [["project_admin_write"]]
       }
     },
@@ -455,18 +686,353 @@
         ],
         "responses": {
           "204": { "description": "" },
-          "401": { "description": "Unauthorized" },
-          "403": { "description": "Forbidden action" },
-          "429": { "description": "Rate limit exceeded" },
-          "500": { "description": "Failed to remove AWS account from PrivateLink share" }
+          "401": {
+            "description": "Unauthorized",
+            "content": {
+              "application/json": { "schema": { "$ref": "#/components/schemas/ErrorResponseBody" } }
+            }
+          },
+          "403": {
+            "description": "Forbidden action",
+            "content": {
+              "application/json": { "schema": { "$ref": "#/components/schemas/ErrorResponseBody" } }
+            }
+          },
+          "429": {
+            "description": "Rate limit exceeded",
+            "content": {
+              "application/json": { "schema": { "$ref": "#/components/schemas/ErrorResponseBody" } }
+            }
+          },
+          "500": {
+            "description": "Failed to remove AWS account from PrivateLink share",
+            "content": {
+              "application/json": { "schema": { "$ref": "#/components/schemas/ErrorResponseBody" } }
+            }
+          }
         },
         "security": [{ "bearer": [] }],
         "summary": "Remove an AWS account from a specific database PrivateLink share",
         "tags": ["Projects"],
-        "x-endpoint-owners": ["platform-networking", "management-api"],
+        "x-endpoint-owners": ["platform-networking", "control-plane"],
         "x-fga-permissions": [["project_admin_write"]]
       }
     },
+    "/v2/projects/{ref}/workers": {
+      "get": {
+        "description": "Returns all workers you've previously deployed to the specified project.",
+        "operationId": "v2-list-all-workers",
+        "parameters": [
+          {
+            "name": "ref",
+            "required": true,
+            "in": "path",
+            "description": "Project ref",
+            "schema": {
+              "minLength": 20,
+              "maxLength": 20,
+              "pattern": "^[a-z]+$",
+              "example": "abcdefghijklmnopqrst",
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "",
+            "content": {
+              "application/json": {
+                "schema": { "$ref": "#/components/schemas/V2ListWorkersResponse" }
+              }
+            }
+          },
+          "401": {
+            "description": "Unauthorized",
+            "content": {
+              "application/json": { "schema": { "$ref": "#/components/schemas/ErrorResponseBody" } }
+            }
+          },
+          "403": {
+            "description": "Forbidden action",
+            "content": {
+              "application/json": { "schema": { "$ref": "#/components/schemas/ErrorResponseBody" } }
+            }
+          },
+          "429": {
+            "description": "Rate limit exceeded",
+            "content": {
+              "application/json": { "schema": { "$ref": "#/components/schemas/ErrorResponseBody" } }
+            }
+          }
+        },
+        "security": [{ "bearer": [] }],
+        "summary": "[Alpha] List all workers",
+        "tags": ["Workers"],
+        "x-badges": [{ "name": "OAuth scope: edge_functions:read", "position": "after" }],
+        "x-endpoint-owners": ["functions"],
+        "x-fga-permissions": [["workers_read"]],
+        "x-oauth-scope": "edge_functions:read"
+      }
+    },
+    "/v2/projects/{ref}/workers/{name}": {
+      "get": {
+        "description": "Returns a worker along with its instance tally. Poll this after a deploy until `build_state` leaves `building`.",
+        "operationId": "v2-get-a-worker",
+        "parameters": [
+          {
+            "name": "ref",
+            "required": true,
+            "in": "path",
+            "description": "Project ref",
+            "schema": {
+              "minLength": 20,
+              "maxLength": 20,
+              "pattern": "^[a-z]+$",
+              "example": "abcdefghijklmnopqrst",
+              "type": "string"
+            }
+          },
+          {
+            "name": "name",
+            "required": true,
+            "in": "path",
+            "schema": {
+              "pattern": "^[a-z0-9]([a-z0-9-]{0,61}[a-z0-9])?$",
+              "example": "hello-world",
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "",
+            "content": {
+              "application/json": { "schema": { "$ref": "#/components/schemas/V2WorkerResponse" } }
+            }
+          },
+          "401": {
+            "description": "Unauthorized",
+            "content": {
+              "application/json": { "schema": { "$ref": "#/components/schemas/ErrorResponseBody" } }
+            }
+          },
+          "403": {
+            "description": "Forbidden action",
+            "content": {
+              "application/json": { "schema": { "$ref": "#/components/schemas/ErrorResponseBody" } }
+            }
+          },
+          "429": {
+            "description": "Rate limit exceeded",
+            "content": {
+              "application/json": { "schema": { "$ref": "#/components/schemas/ErrorResponseBody" } }
+            }
+          }
+        },
+        "security": [{ "bearer": [] }],
+        "summary": "[Alpha] Retrieve a worker",
+        "tags": ["Workers"],
+        "x-badges": [{ "name": "OAuth scope: edge_functions:read", "position": "after" }],
+        "x-endpoint-owners": ["functions"],
+        "x-fga-permissions": [["workers_read"]],
+        "x-oauth-scope": "edge_functions:read"
+      },
+      "delete": {
+        "description": "Tombstones the worker. Its instances and image are torn down asynchronously.",
+        "operationId": "v2-delete-a-worker",
+        "parameters": [
+          {
+            "name": "ref",
+            "required": true,
+            "in": "path",
+            "description": "Project ref",
+            "schema": {
+              "minLength": 20,
+              "maxLength": 20,
+              "pattern": "^[a-z]+$",
+              "example": "abcdefghijklmnopqrst",
+              "type": "string"
+            }
+          },
+          {
+            "name": "name",
+            "required": true,
+            "in": "path",
+            "schema": {
+              "pattern": "^[a-z0-9]([a-z0-9-]{0,61}[a-z0-9])?$",
+              "example": "hello-world",
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "204": { "description": "" },
+          "401": {
+            "description": "Unauthorized",
+            "content": {
+              "application/json": { "schema": { "$ref": "#/components/schemas/ErrorResponseBody" } }
+            }
+          },
+          "403": {
+            "description": "Forbidden action",
+            "content": {
+              "application/json": { "schema": { "$ref": "#/components/schemas/ErrorResponseBody" } }
+            }
+          },
+          "429": {
+            "description": "Rate limit exceeded",
+            "content": {
+              "application/json": { "schema": { "$ref": "#/components/schemas/ErrorResponseBody" } }
+            }
+          }
+        },
+        "security": [{ "bearer": [] }],
+        "summary": "[Alpha] Delete a worker",
+        "tags": ["Workers"],
+        "x-badges": [{ "name": "OAuth scope: edge_functions:write", "position": "after" }],
+        "x-endpoint-owners": ["functions"],
+        "x-fga-permissions": [["workers_write"]],
+        "x-oauth-scope": "edge_functions:write"
+      }
+    },
+    "/v2/projects/{ref}/workers/{name}/uploads": {
+      "post": {
+        "description": "PUT the `.tar.gz` build context to the returned `url` before `expires_at`, then deploy with the upload id as `context_upload_id`. The bytes go straight to storage — no management API request carries them.",
+        "operationId": "v2-create-worker-upload",
+        "parameters": [
+          {
+            "name": "ref",
+            "required": true,
+            "in": "path",
+            "description": "Project ref",
+            "schema": {
+              "minLength": 20,
+              "maxLength": 20,
+              "pattern": "^[a-z]+$",
+              "example": "abcdefghijklmnopqrst",
+              "type": "string"
+            }
+          },
+          {
+            "name": "name",
+            "required": true,
+            "in": "path",
+            "schema": {
+              "pattern": "^[a-z0-9]([a-z0-9-]{0,61}[a-z0-9])?$",
+              "example": "hello-world",
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "201": {
+            "description": "",
+            "content": {
+              "application/json": {
+                "schema": { "$ref": "#/components/schemas/V2WorkerUploadResponse" }
+              }
+            }
+          },
+          "401": {
+            "description": "Unauthorized",
+            "content": {
+              "application/json": { "schema": { "$ref": "#/components/schemas/ErrorResponseBody" } }
+            }
+          },
+          "403": {
+            "description": "Forbidden action",
+            "content": {
+              "application/json": { "schema": { "$ref": "#/components/schemas/ErrorResponseBody" } }
+            }
+          },
+          "429": {
+            "description": "Rate limit exceeded",
+            "content": {
+              "application/json": { "schema": { "$ref": "#/components/schemas/ErrorResponseBody" } }
+            }
+          }
+        },
+        "security": [{ "bearer": [] }],
+        "summary": "[Alpha] Mint a presigned slot for a build-context upload",
+        "tags": ["Workers"],
+        "x-badges": [{ "name": "OAuth scope: edge_functions:write", "position": "after" }],
+        "x-endpoint-owners": ["functions"],
+        "x-fga-permissions": [["workers_write"]],
+        "x-oauth-scope": "edge_functions:write"
+      }
+    },
+    "/v2/projects/{ref}/workers/{name}/deploy": {
+      "post": {
+        "description": "Creates the worker if it does not exist, building from a context staged through the uploads endpoint. The build runs asynchronously: this answers 202 and the worker reaches `build_state` `active` or `failed` later.",
+        "operationId": "v2-deploy-a-worker",
+        "parameters": [
+          {
+            "name": "ref",
+            "required": true,
+            "in": "path",
+            "description": "Project ref",
+            "schema": {
+              "minLength": 20,
+              "maxLength": 20,
+              "pattern": "^[a-z]+$",
+              "example": "abcdefghijklmnopqrst",
+              "type": "string"
+            }
+          },
+          {
+            "name": "name",
+            "required": true,
+            "in": "path",
+            "schema": {
+              "pattern": "^[a-z0-9]([a-z0-9-]{0,61}[a-z0-9])?$",
+              "example": "hello-world",
+              "type": "string"
+            }
+          }
+        ],
+        "requestBody": {
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": { "$ref": "#/components/schemas/V2DeployWorkerRequest" }
+            }
+          }
+        },
+        "responses": {
+          "202": {
+            "description": "",
+            "content": {
+              "application/json": { "schema": { "$ref": "#/components/schemas/V2WorkerResponse" } }
+            }
+          },
+          "401": {
+            "description": "Unauthorized",
+            "content": {
+              "application/json": { "schema": { "$ref": "#/components/schemas/ErrorResponseBody" } }
+            }
+          },
+          "403": {
+            "description": "Forbidden action",
+            "content": {
+              "application/json": { "schema": { "$ref": "#/components/schemas/ErrorResponseBody" } }
+            }
+          },
+          "429": {
+            "description": "Rate limit exceeded",
+            "content": {
+              "application/json": { "schema": { "$ref": "#/components/schemas/ErrorResponseBody" } }
+            }
+          }
+        },
+        "security": [{ "bearer": [] }],
+        "summary": "[Alpha] Deploy a worker",
+        "tags": ["Workers"],
+        "x-badges": [{ "name": "OAuth scope: edge_functions:write", "position": "after" }],
+        "x-endpoint-owners": ["functions"],
+        "x-fga-permissions": [["workers_write"]],
+        "x-oauth-scope": "edge_functions:write"
+      }
+    },
     "/v2/organizations/{slug}/members": {
       "get": {
         "description": "Returns a cursor-paginated list of organization members including their roles and project-scoped permissions.",
@@ -532,15 +1098,30 @@
               }
             }
           },
-          "401": { "description": "Unauthorized" },
-          "403": { "description": "Forbidden action" },
-          "429": { "description": "Rate limit exceeded" }
+          "401": {
+            "description": "Unauthorized",
+            "content": {
+              "application/json": { "schema": { "$ref": "#/components/schemas/ErrorResponseBody" } }
+            }
+          },
+          "403": {
+            "description": "Forbidden action",
+            "content": {
+              "application/json": { "schema": { "$ref": "#/components/schemas/ErrorResponseBody" } }
+            }
+          },
+          "429": {
+            "description": "Rate limit exceeded",
+            "content": {
+              "application/json": { "schema": { "$ref": "#/components/schemas/ErrorResponseBody" } }
+            }
+          }
         },
         "security": [{ "bearer": [] }],
         "summary": "List members of an organization",
         "tags": ["Organizations"],
         "x-badges": [{ "name": "OAuth scope: organizations:read", "position": "after" }],
-        "x-endpoint-owners": ["management-api"],
+        "x-endpoint-owners": ["control-plane"],
         "x-fga-permissions": [["members_read"]],
         "x-oauth-scope": "organizations:read"
       }
@@ -589,25 +1170,43 @@
               }
             }
           },
-          "401": { "description": "Unauthorized" },
+          "401": {
+            "description": "Unauthorized",
+            "content": {
+              "application/json": { "schema": { "$ref": "#/components/schemas/ErrorResponseBody" } }
+            }
+          },
           "402": {
             "description": "This feature requires the Enterprise organization plan.",
             "content": {
-              "application/json": {
-                "schema": { "$ref": "#/components/schemas/PlanGateErrorBodyV2" }
-              }
+              "application/json": { "schema": { "$ref": "#/components/schemas/ErrorResponseBody" } }
             }
           },
-          "403": { "description": "Forbidden action" },
-          "429": { "description": "Rate limit exceeded" },
-          "500": { "description": "Failed to assign organization member role" }
+          "403": {
+            "description": "Forbidden action",
+            "content": {
+              "application/json": { "schema": { "$ref": "#/components/schemas/ErrorResponseBody" } }
+            }
+          },
+          "429": {
+            "description": "Rate limit exceeded",
+            "content": {
+              "application/json": { "schema": { "$ref": "#/components/schemas/ErrorResponseBody" } }
+            }
+          },
+          "500": {
+            "description": "Failed to assign organization member role",
+            "content": {
+              "application/json": { "schema": { "$ref": "#/components/schemas/ErrorResponseBody" } }
+            }
+          }
         },
         "security": [{ "bearer": [] }],
         "summary": "Assign or change an organization member role",
         "tags": ["Organizations"],
         "x-allowed-plans": ["Enterprise"],
         "x-badges": [{ "name": "Only available on Enterprise", "position": "before" }],
-        "x-endpoint-owners": ["management-api"],
+        "x-endpoint-owners": ["control-plane"],
         "x-fga-permissions": [["organization_admin_write"]]
       }
     },
@@ -637,15 +1236,30 @@
               }
             }
           },
-          "401": { "description": "Unauthorized" },
-          "403": { "description": "Forbidden action" },
-          "429": { "description": "Rate limit exceeded" }
+          "401": {
+            "description": "Unauthorized",
+            "content": {
+              "application/json": { "schema": { "$ref": "#/components/schemas/ErrorResponseBody" } }
+            }
+          },
+          "403": {
+            "description": "Forbidden action",
+            "content": {
+              "application/json": { "schema": { "$ref": "#/components/schemas/ErrorResponseBody" } }
+            }
+          },
+          "429": {
+            "description": "Rate limit exceeded",
+            "content": {
+              "application/json": { "schema": { "$ref": "#/components/schemas/ErrorResponseBody" } }
+            }
+          }
         },
         "security": [{ "bearer": [] }],
         "summary": "List roles of an organization",
         "tags": ["Organizations"],
         "x-badges": [{ "name": "OAuth scope: organizations:read", "position": "after" }],
-        "x-endpoint-owners": ["management-api"],
+        "x-endpoint-owners": ["control-plane"],
         "x-fga-permissions": [["members_read"]],
         "x-oauth-scope": "organizations:read"
       }
@@ -684,17 +1298,30 @@
               }
             }
           },
-          "401": { "description": "Unauthorized" },
+          "401": {
+            "description": "Unauthorized",
+            "content": {
+              "application/json": { "schema": { "$ref": "#/components/schemas/ErrorResponseBody" } }
+            }
+          },
           "402": {
             "description": "This feature requires the Enterprise organization plan.",
             "content": {
-              "application/json": {
-                "schema": { "$ref": "#/components/schemas/PlanGateErrorBodyV2" }
-              }
+              "application/json": { "schema": { "$ref": "#/components/schemas/ErrorResponseBody" } }
             }
           },
-          "403": { "description": "Forbidden action" },
-          "429": { "description": "Rate limit exceeded" }
+          "403": {
+            "description": "Forbidden action",
+            "content": {
+              "application/json": { "schema": { "$ref": "#/components/schemas/ErrorResponseBody" } }
+            }
+          },
+          "429": {
+            "description": "Rate limit exceeded",
+            "content": {
+              "application/json": { "schema": { "$ref": "#/components/schemas/ErrorResponseBody" } }
+            }
+          }
         },
         "security": [{ "bearer": [] }],
         "summary": "Creates organization invitations",
@@ -704,7 +1331,7 @@
           { "name": "OAuth scope: organizations:write", "position": "after" },
           { "name": "Only available on Enterprise", "position": "before" }
         ],
-        "x-endpoint-owners": ["management-api"],
+        "x-endpoint-owners": ["control-plane"],
         "x-fga-permissions": [["members_write"]],
         "x-oauth-scope": "organizations:write"
       },
@@ -741,17 +1368,30 @@
               }
             }
           },
-          "401": { "description": "Unauthorized" },
+          "401": {
+            "description": "Unauthorized",
+            "content": {
+              "application/json": { "schema": { "$ref": "#/components/schemas/ErrorResponseBody" } }
+            }
+          },
           "402": {
             "description": "This feature requires the Enterprise organization plan.",
             "content": {
-              "application/json": {
-                "schema": { "$ref": "#/components/schemas/PlanGateErrorBodyV2" }
-              }
+              "application/json": { "schema": { "$ref": "#/components/schemas/ErrorResponseBody" } }
             }
           },
-          "403": { "description": "Forbidden action" },
-          "429": { "description": "Rate limit exceeded" }
+          "403": {
+            "description": "Forbidden action",
+            "content": {
+              "application/json": { "schema": { "$ref": "#/components/schemas/ErrorResponseBody" } }
+            }
+          },
+          "429": {
+            "description": "Rate limit exceeded",
+            "content": {
+              "application/json": { "schema": { "$ref": "#/components/schemas/ErrorResponseBody" } }
+            }
+          }
         },
         "security": [{ "bearer": [] }],
         "summary": "Deletes organization invitations by email",
@@ -761,7 +1401,7 @@
           { "name": "OAuth scope: organizations:write", "position": "after" },
           { "name": "Only available on Enterprise", "position": "before" }
         ],
-        "x-endpoint-owners": ["management-api"],
+        "x-endpoint-owners": ["control-plane"],
         "x-fga-permissions": [["members_write"]],
         "x-oauth-scope": "organizations:write"
       }
@@ -824,15 +1464,30 @@
               }
             }
           },
-          "401": { "description": "Unauthorized" },
-          "403": { "description": "Forbidden action" },
-          "429": { "description": "Rate limit exceeded" }
+          "401": {
+            "description": "Unauthorized",
+            "content": {
+              "application/json": { "schema": { "$ref": "#/components/schemas/ErrorResponseBody" } }
+            }
+          },
+          "403": {
+            "description": "Forbidden action",
+            "content": {
+              "application/json": { "schema": { "$ref": "#/components/schemas/ErrorResponseBody" } }
+            }
+          },
+          "429": {
+            "description": "Rate limit exceeded",
+            "content": {
+              "application/json": { "schema": { "$ref": "#/components/schemas/ErrorResponseBody" } }
+            }
+          }
         },
         "security": [{ "bearer": [] }],
         "summary": "List projects of an organization",
         "tags": ["Organizations"],
         "x-badges": [{ "name": "OAuth scope: projects:read", "position": "after" }],
-        "x-endpoint-owners": ["management-api"],
+        "x-endpoint-owners": ["control-plane"],
         "x-fga-permissions": [["organization_projects_read"]],
         "x-oauth-scope": "projects:read"
       }
@@ -910,22 +1565,37 @@
               }
             }
           },
-          "401": { "description": "Unauthorized" },
-          "403": { "description": "Forbidden action" },
-          "429": { "description": "Rate limit exceeded" }
+          "401": {
+            "description": "Unauthorized",
+            "content": {
+              "application/json": { "schema": { "$ref": "#/components/schemas/ErrorResponseBody" } }
+            }
+          },
+          "403": {
+            "description": "Forbidden action",
+            "content": {
+              "application/json": { "schema": { "$ref": "#/components/schemas/ErrorResponseBody" } }
+            }
+          },
+          "429": {
+            "description": "Rate limit exceeded",
+            "content": {
+              "application/json": { "schema": { "$ref": "#/components/schemas/ErrorResponseBody" } }
+            }
+          }
         },
         "security": [{ "bearer": [] }],
         "summary": "List GitHub connections of an organization",
         "tags": ["Organizations"],
         "x-badges": [{ "name": "OAuth scope: projects:read", "position": "after" }],
-        "x-endpoint-owners": ["management-api", "dev-workflows"],
+        "x-endpoint-owners": ["control-plane", "dev-workflows"],
         "x-fga-permissions": [["organization_projects_read"]],
         "x-oauth-scope": "projects:read"
       }
     },
     "/v2/projects/{ref}/webhooks/endpoints": {
       "get": {
-        "operationId": "allV2ProjectsByRefWebhooks",
+        "operationId": "v2-projects-ref-webhooks-endpoints-get",
         "parameters": [
           {
             "in": "path",
@@ -1604,7 +2274,7 @@
         "description": "List all Webhook endpoints based on a project's ref or an organization's slug."
       },
       "post": {
-        "operationId": "allV2ProjectsByRefWebhooks",
+        "operationId": "v2-projects-ref-webhooks-endpoints-post",
         "parameters": [
           {
             "in": "path",
@@ -2341,7 +3011,7 @@
         }
       },
       "delete": {
-        "operationId": "allV2ProjectsByRefWebhooks",
+        "operationId": "v2-projects-ref-webhooks-endpoints-delete",
         "parameters": [
           {
             "in": "path",
@@ -2984,7 +3654,7 @@
     },
     "/v2/projects/{ref}/webhooks/endpoints/{id}": {
       "get": {
-        "operationId": "allV2ProjectsByRefWebhooks",
+        "operationId": "v2-projects-ref-webhooks-endpoints-id-get",
         "parameters": [
           {
             "in": "path",
@@ -3693,7 +4363,7 @@
         "description": "Get details of a specific endpoint."
       },
       "patch": {
-        "operationId": "allV2ProjectsByRefWebhooks",
+        "operationId": "v2-projects-ref-webhooks-endpoints-id-patch",
         "parameters": [
           {
             "in": "path",
@@ -4502,7 +5172,7 @@
         }
       },
       "delete": {
-        "operationId": "allV2ProjectsByRefWebhooks",
+        "operationId": "v2-projects-ref-webhooks-endpoints-id-delete",
         "parameters": [
           {
             "in": "path",
@@ -5213,7 +5883,7 @@
     },
     "/v2/projects/{ref}/webhooks/endpoints/{id}/deliveries": {
       "get": {
-        "operationId": "allV2ProjectsByRefWebhooks",
+        "operationId": "v2-projects-ref-webhooks-endpoints-id-deliveries-get",
         "parameters": [
           {
             "in": "path",
@@ -5952,7 +6622,7 @@
     },
     "/v2/projects/{ref}/webhooks/endpoints/{id}/test": {
       "post": {
-        "operationId": "allV2ProjectsByRefWebhooks",
+        "operationId": "v2-projects-ref-webhooks-endpoints-id-test-post",
         "parameters": [
           {
             "in": "path",
@@ -6744,7 +7414,7 @@
     },
     "/v2/projects/{ref}/webhooks/deliveries/{id}": {
       "get": {
-        "operationId": "allV2ProjectsByRefWebhooks",
+        "operationId": "v2-projects-ref-webhooks-deliveries-id-get",
         "parameters": [
           {
             "in": "path",
@@ -7515,7 +8185,7 @@
     },
     "/v2/projects/{ref}/webhooks/deliveries/{id}/retry": {
       "post": {
-        "operationId": "allV2ProjectsByRefWebhooks",
+        "operationId": "v2-projects-ref-webhooks-deliveries-id-retry-post",
         "parameters": [
           {
             "in": "path",
@@ -8121,7 +8791,7 @@
     },
     "/v2/organizations/{slug}/webhooks/endpoints": {
       "get": {
-        "operationId": "allV2OrganizationsBySlugWebhooks",
+        "operationId": "v2-organizations-slug-webhooks-endpoints-get",
         "parameters": [
           {
             "in": "path",
@@ -8798,7 +9468,7 @@
         "description": "List all Webhook endpoints based on a project's ref or an organization's slug."
       },
       "post": {
-        "operationId": "allV2OrganizationsBySlugWebhooks",
+        "operationId": "v2-organizations-slug-webhooks-endpoints-post",
         "parameters": [
           {
             "in": "path",
@@ -9533,7 +10203,7 @@
         }
       },
       "delete": {
-        "operationId": "allV2OrganizationsBySlugWebhooks",
+        "operationId": "v2-organizations-slug-webhooks-endpoints-delete",
         "parameters": [
           {
             "in": "path",
@@ -10174,7 +10844,7 @@
     },
     "/v2/organizations/{slug}/webhooks/endpoints/{id}": {
       "get": {
-        "operationId": "allV2OrganizationsBySlugWebhooks",
+        "operationId": "v2-organizations-slug-webhooks-endpoints-id-get",
         "parameters": [
           {
             "in": "path",
@@ -10881,7 +11551,7 @@
         "description": "Get details of a specific endpoint."
       },
       "patch": {
-        "operationId": "allV2OrganizationsBySlugWebhooks",
+        "operationId": "v2-organizations-slug-webhooks-endpoints-id-patch",
         "parameters": [
           {
             "in": "path",
@@ -11688,7 +12358,7 @@
         }
       },
       "delete": {
-        "operationId": "allV2OrganizationsBySlugWebhooks",
+        "operationId": "v2-organizations-slug-webhooks-endpoints-id-delete",
         "parameters": [
           {
             "in": "path",
@@ -12397,7 +13067,7 @@
     },
     "/v2/organizations/{slug}/webhooks/endpoints/{id}/deliveries": {
       "get": {
-        "operationId": "allV2OrganizationsBySlugWebhooks",
+        "operationId": "v2-organizations-slug-webhooks-endpoints-id-deliveries-get",
         "parameters": [
           {
             "in": "path",
@@ -13134,7 +13804,7 @@
     },
     "/v2/organizations/{slug}/webhooks/endpoints/{id}/test": {
       "post": {
-        "operationId": "allV2OrganizationsBySlugWebhooks",
+        "operationId": "v2-organizations-slug-webhooks-endpoints-id-test-post",
         "parameters": [
           {
             "in": "path",
@@ -13924,7 +14594,7 @@
     },
     "/v2/organizations/{slug}/webhooks/deliveries/{id}": {
       "get": {
-        "operationId": "allV2OrganizationsBySlugWebhooks",
+        "operationId": "v2-organizations-slug-webhooks-deliveries-id-get",
         "parameters": [
           {
             "in": "path",
@@ -14693,7 +15363,7 @@
     },
     "/v2/organizations/{slug}/webhooks/deliveries/{id}/retry": {
       "post": {
-        "operationId": "allV2OrganizationsBySlugWebhooks",
+        "operationId": "v2-organizations-slug-webhooks-deliveries-id-retry-post",
         "parameters": [
           {
             "in": "path",
@@ -15447,6 +16117,44 @@
         },
         "required": ["data"]
       },
+      "ErrorResponseBodyAPIErrorObject": {
+        "type": "object",
+        "properties": {
+          "id": { "type": "string" },
+          "code": { "type": "string" },
+          "message": { "type": "string" },
+          "description": { "type": "string" },
+          "links": {
+            "type": "object",
+            "additionalProperties": {
+              "type": "object",
+              "properties": {
+                "href": { "type": "string" },
+                "rel": { "type": "string" },
+                "title": { "type": "string" },
+                "type": { "type": "string" },
+                "describedby": { "type": "string" },
+                "meta": { "type": "object", "additionalProperties": {} }
+              },
+              "required": ["href"]
+            }
+          },
+          "meta": { "type": "object", "additionalProperties": {} },
+          "issues": {
+            "type": "array",
+            "items": { "$ref": "#/components/schemas/ErrorResponseBodyAPIErrorObject" }
+          }
+        },
+        "required": ["code", "message"],
+        "ref": "APIErrorObject"
+      },
+      "ErrorResponseBody": {
+        "type": "object",
+        "properties": {
+          "error": { "$ref": "#/components/schemas/ErrorResponseBodyAPIErrorObject" }
+        },
+        "required": ["error"]
+      },
       "CreateLogDrainRequestOpenApi": {
         "type": "object",
         "properties": {
@@ -15712,27 +16420,6 @@
         },
         "required": ["data"]
       },
-      "PlanGateErrorBodyV2": {
-        "type": "object",
-        "properties": {
-          "error": {
-            "type": "object",
-            "properties": {
-              "code": {
-                "type": "string",
-                "description": "HTTP status-derived error code, e.g. \"payment_required\""
-              },
-              "message": {
-                "type": "string",
-                "description": "Human-readable explanation of the plan gate"
-              }
-            },
-            "required": ["code", "message"],
-            "description": "Plan-gate error object"
-          }
-        },
-        "required": ["error"]
-      },
       "UpdateLogDrainRequestOpenApi": {
         "type": "object",
         "properties": {
@@ -15865,6 +16552,437 @@
         },
         "required": ["data"]
       },
+      "V2ProjectConfigResponse": {
+        "type": "object",
+        "properties": {
+          "data": {
+            "type": "object",
+            "properties": {
+              "type": {
+                "type": "string",
+                "description": "Resource type.",
+                "enum": ["project_config"]
+              },
+              "id": { "type": "string", "description": "Project ref." },
+              "attributes": {
+                "type": "object",
+                "properties": {
+                  "database": {
+                    "type": "object",
+                    "properties": {
+                      "major_version": {
+                        "type": "integer",
+                        "minimum": -9007199254740991,
+                        "maximum": 9007199254740991,
+                        "description": "The major Postgres version the database runs. `17` covers both Postgres 17 and Oriole on 17, since Oriole is a storage engine rather than a version."
+                      },
+                      "ssl_enforced": {
+                        "type": "boolean",
+                        "description": "Whether the database rejects plaintext connections"
+                      },
+                      "network_restrictions": {
+                        "type": "object",
+                        "properties": {
+                          "entitlement": { "type": "string", "enum": ["disallowed", "allowed"] },
+                          "status": {
+                            "type": "string",
+                            "enum": ["stored", "applied"],
+                            "description": "Whether the allowlist below is applied to the project or only stored."
+                          },
+                          "allowed_cidrs": {
+                            "type": "array",
+                            "items": {
+                              "type": "object",
+                              "properties": {
+                                "address": { "type": "string" },
+                                "type": { "type": "string", "enum": ["v4", "v6"] }
+                              },
+                              "required": ["address", "type"]
+                            }
+                          },
+                          "updated_at": { "type": "string" },
+                          "applied_at": { "type": "string" }
+                        },
+                        "required": ["entitlement", "status", "allowed_cidrs"]
+                      },
+                      "postgres_settings": {
+                        "type": "object",
+                        "properties": {
+                          "effective_cache_size": { "type": "string" },
+                          "logical_decoding_work_mem": { "type": "string" },
+                          "log_autovacuum_min_duration": {
+                            "type": "string",
+                            "description": "Default unit: ms",
+                            "pattern": "^(-?[0-9]+(?:\\.[0-9]+)?)(us|ms|s|min|h|d)?$"
+                          },
+                          "log_checkpoints": { "type": "boolean" },
+                          "log_connections": { "type": "boolean" },
+                          "log_disconnections": { "type": "boolean" },
+                          "log_duration": { "type": "boolean" },
+                          "log_lock_waits": { "type": "boolean" },
+                          "log_recovery_conflict_waits": { "type": "boolean" },
+                          "log_replication_commands": { "type": "boolean" },
+                          "log_startup_progress_interval": {
+                            "type": "string",
+                            "description": "Default unit: ms",
+                            "pattern": "^(-?[0-9]+(?:\\.[0-9]+)?)(us|ms|s|min|h|d)?$"
+                          },
+                          "log_temp_files": { "type": "string" },
+                          "maintenance_work_mem": { "type": "string" },
+                          "track_activity_query_size": { "type": "string" },
+                          "max_connections": { "type": "integer", "minimum": 1, "maximum": 262143 },
+                          "max_locks_per_transaction": {
+                            "type": "integer",
+                            "minimum": 10,
+                            "maximum": 2147483640
+                          },
+                          "max_logical_replication_workers": {
+                            "type": "integer",
+                            "minimum": 0,
+                            "maximum": 262143
+                          },
+                          "max_parallel_maintenance_workers": {
+                            "type": "integer",
+                            "minimum": 0,
+                            "maximum": 1024
+                          },
+                          "max_parallel_workers": {
+                            "type": "integer",
+                            "minimum": 0,
+                            "maximum": 1024
+                          },
+                          "max_parallel_workers_per_gather": {
+                            "type": "integer",
+                            "minimum": 0,
+                            "maximum": 1024
+                          },
+                          "max_replication_slots": {
+                            "type": "integer",
+                            "minimum": -9007199254740991,
+                            "maximum": 9007199254740991
+                          },
+                          "max_slot_wal_keep_size": { "type": "string" },
+                          "max_standby_archive_delay": { "type": "string" },
+                          "max_standby_streaming_delay": { "type": "string" },
+                          "max_sync_workers_per_subscription": {
+                            "type": "integer",
+                            "minimum": 0,
+                            "maximum": 262143
+                          },
+                          "max_wal_size": { "type": "string" },
+                          "max_wal_senders": {
+                            "type": "integer",
+                            "minimum": -9007199254740991,
+                            "maximum": 9007199254740991
+                          },
+                          "max_worker_processes": {
+                            "type": "integer",
+                            "minimum": 0,
+                            "maximum": 262143
+                          },
+                          "session_replication_role": {
+                            "type": "string",
+                            "enum": ["origin", "replica", "local"]
+                          },
+                          "shared_buffers": { "type": "string" },
+                          "statement_timeout": {
+                            "type": "string",
+                            "description": "Default unit: ms",
+                            "pattern": "^(-?[0-9]+(?:\\.[0-9]+)?)(us|ms|s|min|h|d)?$"
+                          },
+                          "track_commit_timestamp": { "type": "boolean" },
+                          "wal_keep_size": { "type": "string" },
+                          "wal_sender_timeout": {
+                            "type": "string",
+                            "description": "Default unit: ms",
+                            "pattern": "^(-?[0-9]+(?:\\.[0-9]+)?)(us|ms|s|min|h|d)?$"
+                          },
+                          "work_mem": { "type": "string" },
+                          "checkpoint_timeout": {
+                            "type": "string",
+                            "description": "Default unit: s",
+                            "pattern": "^(-?[0-9]+(?:\\.[0-9]+)?)(us|ms|s|min|h|d)?$"
+                          },
+                          "hot_standby_feedback": { "type": "boolean" },
+                          "cron_log_statement": { "type": "boolean" }
+                        },
+                        "description": "Postgres parameter overrides. Empty when the project runs entirely on defaults."
+                      }
+                    },
+                    "required": [
+                      "major_version",
+                      "ssl_enforced",
+                      "network_restrictions",
+                      "postgres_settings"
+                    ]
+                  },
+                  "pooler": {
+                    "type": "object",
+                    "properties": {
+                      "pool_mode": {
+                        "type": "string",
+                        "enum": ["transaction", "session", "statement"]
+                      },
+                      "ignore_startup_parameters": { "type": "string" },
+                      "server_idle_timeout": {
+                        "type": "integer",
+                        "minimum": -9007199254740991,
+                        "maximum": 9007199254740991
+                      },
+                      "server_lifetime": {
+                        "type": "integer",
+                        "minimum": -9007199254740991,
+                        "maximum": 9007199254740991
+                      },
+                      "query_wait_timeout": {
+                        "type": "integer",
+                        "minimum": -9007199254740991,
+                        "maximum": 9007199254740991
+                      },
+                      "reserve_pool_size": {
+                        "type": "integer",
+                        "minimum": -9007199254740991,
+                        "maximum": 9007199254740991
+                      },
+                      "default_pool_size": {
+                        "type": "integer",
+                        "minimum": -9007199254740991,
+                        "maximum": 9007199254740991,
+                        "description": "Defaults to the pooler's size for the project's compute when not overridden."
+                      },
+                      "max_client_conn": {
+                        "type": "integer",
+                        "minimum": -9007199254740991,
+                        "maximum": 9007199254740991,
+                        "description": "Defaults to the pooler's size for the project's compute when not overridden."
+                      }
+                    },
+                    "required": [
+                      "pool_mode",
+                      "ignore_startup_parameters",
+                      "server_idle_timeout",
+                      "server_lifetime",
+                      "query_wait_timeout",
+                      "reserve_pool_size",
+                      "default_pool_size",
+                      "max_client_conn"
+                    ]
+                  },
+                  "auth": {
+                    "type": "object",
+                    "additionalProperties": {},
+                    "description": "Effective Auth config, keyed by lowercased GoTrue setting name and resolved through the `gotrue_config` view, so a setting the project has never overridden is reported at its platform default. Secrets are returned as an HMAC of their value, never in plaintext."
+                  },
+                  "api": {
+                    "type": "object",
+                    "properties": {
+                      "db_schema": {
+                        "type": "string",
+                        "description": "Schemas exposed through the Data API"
+                      },
+                      "db_extra_search_path": { "type": "string" },
+                      "max_rows": {
+                        "type": "integer",
+                        "minimum": -9007199254740991,
+                        "maximum": 9007199254740991
+                      },
+                      "db_pool_acquisition_timeout": {
+                        "type": "integer",
+                        "minimum": -9007199254740991,
+                        "maximum": 9007199254740991
+                      },
+                      "db_pool": {
+                        "type": "integer",
+                        "minimum": -9007199254740991,
+                        "maximum": 9007199254740991,
+                        "description": "If `null`, no pool size is written to the project's PostgREST config and PostgREST's own default applies. The platform does not pick a value here.",
+                        "nullable": true
+                      }
+                    },
+                    "required": [
+                      "db_schema",
+                      "db_extra_search_path",
+                      "max_rows",
+                      "db_pool_acquisition_timeout",
+                      "db_pool"
+                    ]
+                  },
+                  "realtime": {
+                    "type": "object",
+                    "properties": {
+                      "private_only": { "type": "boolean" },
+                      "max_concurrent_users": {
+                        "type": "integer",
+                        "minimum": -9007199254740991,
+                        "maximum": 9007199254740991
+                      },
+                      "max_events_per_second": {
+                        "type": "integer",
+                        "minimum": -9007199254740991,
+                        "maximum": 9007199254740991
+                      },
+                      "max_bytes_per_second": {
+                        "type": "integer",
+                        "minimum": -9007199254740991,
+                        "maximum": 9007199254740991
+                      },
+                      "max_channels_per_client": {
+                        "type": "integer",
+                        "minimum": -9007199254740991,
+                        "maximum": 9007199254740991
+                      },
+                      "max_joins_per_second": {
+                        "type": "integer",
+                        "minimum": -9007199254740991,
+                        "maximum": 9007199254740991
+                      },
+                      "max_presence_events_per_second": {
+                        "type": "integer",
+                        "minimum": -9007199254740991,
+                        "maximum": 9007199254740991
+                      },
+                      "max_payload_size_in_kb": {
+                        "type": "integer",
+                        "minimum": -9007199254740991,
+                        "maximum": 9007199254740991
+                      },
+                      "presence_enabled": { "type": "boolean" },
+                      "suspend": { "type": "boolean" },
+                      "connection_pool": {
+                        "type": "integer",
+                        "minimum": -9007199254740991,
+                        "maximum": 9007199254740991,
+                        "description": "Defaults to Realtime's pool size for the project's compute when not overridden."
+                      },
+                      "postgres_changes_pool": {
+                        "type": "integer",
+                        "minimum": -9007199254740991,
+                        "maximum": 9007199254740991,
+                        "description": "If `null`, no override is stored and Realtime applies its own default.",
+                        "nullable": true
+                      }
+                    },
+                    "required": [
+                      "private_only",
+                      "max_concurrent_users",
+                      "max_events_per_second",
+                      "max_bytes_per_second",
+                      "max_channels_per_client",
+                      "max_joins_per_second",
+                      "max_presence_events_per_second",
+                      "max_payload_size_in_kb",
+                      "presence_enabled",
+                      "suspend",
+                      "connection_pool",
+                      "postgres_changes_pool"
+                    ]
+                  },
+                  "storage": {
+                    "type": "object",
+                    "properties": {
+                      "file_size_limit": {
+                        "type": "integer",
+                        "minimum": -9007199254740991,
+                        "maximum": 9007199254740991,
+                        "format": "int64"
+                      },
+                      "features": {
+                        "type": "object",
+                        "properties": {
+                          "image_transformation": {
+                            "type": "object",
+                            "properties": { "enabled": { "type": "boolean" } },
+                            "required": ["enabled"]
+                          },
+                          "s3_protocol": {
+                            "type": "object",
+                            "properties": { "enabled": { "type": "boolean" } },
+                            "required": ["enabled"]
+                          },
+                          "purge_cache": {
+                            "type": "object",
+                            "properties": { "enabled": { "type": "boolean" } },
+                            "required": ["enabled"]
+                          },
+                          "iceberg_catalog": {
+                            "type": "object",
+                            "properties": {
+                              "enabled": { "type": "boolean" },
+                              "max_namespaces": {
+                                "type": "integer",
+                                "minimum": -9007199254740991,
+                                "maximum": 9007199254740991
+                              },
+                              "max_tables": {
+                                "type": "integer",
+                                "minimum": -9007199254740991,
+                                "maximum": 9007199254740991
+                              },
+                              "max_catalogs": {
+                                "type": "integer",
+                                "minimum": -9007199254740991,
+                                "maximum": 9007199254740991
+                              }
+                            },
+                            "required": ["enabled", "max_namespaces", "max_tables", "max_catalogs"]
+                          },
+                          "vector_buckets": {
+                            "type": "object",
+                            "properties": {
+                              "enabled": { "type": "boolean" },
+                              "max_buckets": {
+                                "type": "integer",
+                                "minimum": -9007199254740991,
+                                "maximum": 9007199254740991
+                              },
+                              "max_indexes": {
+                                "type": "integer",
+                                "minimum": -9007199254740991,
+                                "maximum": 9007199254740991
+                              }
+                            },
+                            "required": ["enabled", "max_buckets", "max_indexes"]
+                          }
+                        },
+                        "required": [
+                          "image_transformation",
+                          "s3_protocol",
+                          "purge_cache",
+                          "iceberg_catalog",
+                          "vector_buckets"
+                        ]
+                      },
+                      "capabilities": {
+                        "type": "object",
+                        "properties": {
+                          "list_v2": { "type": "boolean" },
+                          "iceberg_catalog": { "type": "boolean" }
+                        },
+                        "required": ["list_v2", "iceberg_catalog"]
+                      },
+                      "upstream_target": { "type": "string", "enum": ["main", "canary"] },
+                      "migration_version": { "type": "string" },
+                      "database_pool_mode": { "type": "string" }
+                    },
+                    "required": [
+                      "file_size_limit",
+                      "features",
+                      "capabilities",
+                      "upstream_target",
+                      "migration_version",
+                      "database_pool_mode"
+                    ],
+                    "description": "Read from the storage service's admin API rather than the middleware DB, so unlike the rest of this resource it reflects the tenant's live config."
+                  }
+                },
+                "required": ["database", "pooler", "auth", "api", "realtime", "storage"]
+              }
+            },
+            "required": ["type", "id", "attributes"]
+          }
+        },
+        "required": ["data"]
+      },
       "V2TransferProjectBody": {
         "type": "object",
         "properties": {
@@ -15999,6 +17117,18 @@
                     "database_identifier": {
                       "type": "string",
                       "description": "Identifier of the database this PrivateLink share targets - the project ref for the primary, or the read replica identifier."
+                    },
+                    "resource_access_manager_resource_config_id": {
+                      "description": "ID of the AWS VPC Lattice resource configuration backing this PrivateLink share.",
+                      "type": "string"
+                    },
+                    "resource_access_manager_resource_config_arn": {
+                      "description": "ARN of the AWS VPC Lattice resource configuration backing this PrivateLink share.",
+                      "type": "string"
+                    },
+                    "resource_access_manager_share_arn": {
+                      "description": "ARN of the AWS Resource Access Manager resource share for this association.",
+                      "type": "string"
                     }
                   },
                   "required": [
@@ -16108,6 +17238,18 @@
                   "database_identifier": {
                     "type": "string",
                     "description": "Identifier of the database this PrivateLink share targets - the project ref for the primary, or the read replica identifier."
+                  },
+                  "resource_access_manager_resource_config_id": {
+                    "description": "ID of the AWS VPC Lattice resource configuration backing this PrivateLink share.",
+                    "type": "string"
+                  },
+                  "resource_access_manager_resource_config_arn": {
+                    "description": "ARN of the AWS VPC Lattice resource configuration backing this PrivateLink share.",
+                    "type": "string"
+                  },
+                  "resource_access_manager_share_arn": {
+                    "description": "ARN of the AWS Resource Access Manager resource share for this association.",
+                    "type": "string"
                   }
                 },
                 "required": [
@@ -16124,6 +17266,230 @@
         },
         "required": ["data"]
       },
+      "V2ListWorkersResponse": {
+        "type": "object",
+        "properties": {
+          "data": {
+            "type": "array",
+            "items": {
+              "type": "object",
+              "properties": {
+                "type": {
+                  "type": "string",
+                  "description": "Resource type.",
+                  "enum": ["project_worker"]
+                },
+                "id": { "type": "string", "description": "Worker name.", "example": "hello-world" },
+                "attributes": {
+                  "type": "object",
+                  "properties": {
+                    "spec": {
+                      "type": "object",
+                      "properties": {
+                        "runtime": { "example": "node", "type": "string" },
+                        "size": { "type": "string", "example": "2gb-1vcpu" },
+                        "exposure": { "type": "string", "example": "public" },
+                        "instances": {
+                          "type": "integer",
+                          "minimum": -9007199254740991,
+                          "maximum": 9007199254740991,
+                          "example": 1
+                        }
+                      },
+                      "required": ["size", "exposure", "instances"]
+                    },
+                    "build_state": { "type": "string", "enum": ["building", "active", "failed"] },
+                    "secret_generation": { "type": "string" },
+                    "state_reason": { "type": "string" },
+                    "image_version": { "type": "string" },
+                    "deleting": { "type": "boolean" },
+                    "instances": {
+                      "type": "object",
+                      "properties": {
+                        "declared": {
+                          "type": "integer",
+                          "minimum": -9007199254740991,
+                          "maximum": 9007199254740991
+                        },
+                        "live": {
+                          "type": "integer",
+                          "minimum": -9007199254740991,
+                          "maximum": 9007199254740991
+                        },
+                        "ready": {
+                          "type": "integer",
+                          "minimum": -9007199254740991,
+                          "maximum": 9007199254740991
+                        },
+                        "stale": {
+                          "type": "integer",
+                          "minimum": -9007199254740991,
+                          "maximum": 9007199254740991
+                        }
+                      },
+                      "required": ["declared", "live", "ready", "stale"]
+                    },
+                    "instances_error": { "type": "string" }
+                  },
+                  "required": ["spec", "build_state", "secret_generation"]
+                }
+              },
+              "required": ["type", "id", "attributes"]
+            }
+          }
+        },
+        "required": ["data"]
+      },
+      "V2WorkerResponse": {
+        "type": "object",
+        "properties": {
+          "data": {
+            "type": "object",
+            "properties": {
+              "type": {
+                "type": "string",
+                "description": "Resource type.",
+                "enum": ["project_worker"]
+              },
+              "id": { "type": "string", "description": "Worker name.", "example": "hello-world" },
+              "attributes": {
+                "type": "object",
+                "properties": {
+                  "spec": {
+                    "type": "object",
+                    "properties": {
+                      "runtime": { "example": "node", "type": "string" },
+                      "size": { "type": "string", "example": "2gb-1vcpu" },
+                      "exposure": { "type": "string", "example": "public" },
+                      "instances": {
+                        "type": "integer",
+                        "minimum": -9007199254740991,
+                        "maximum": 9007199254740991,
+                        "example": 1
+                      }
+                    },
+                    "required": ["size", "exposure", "instances"]
+                  },
+                  "build_state": { "type": "string", "enum": ["building", "active", "failed"] },
+                  "secret_generation": { "type": "string" },
+                  "state_reason": { "type": "string" },
+                  "image_version": { "type": "string" },
+                  "deleting": { "type": "boolean" },
+                  "instances": {
+                    "type": "object",
+                    "properties": {
+                      "declared": {
+                        "type": "integer",
+                        "minimum": -9007199254740991,
+                        "maximum": 9007199254740991
+                      },
+                      "live": {
+                        "type": "integer",
+                        "minimum": -9007199254740991,
+                        "maximum": 9007199254740991
+                      },
+                      "ready": {
+                        "type": "integer",
+                        "minimum": -9007199254740991,
+                        "maximum": 9007199254740991
+                      },
+                      "stale": {
+                        "type": "integer",
+                        "minimum": -9007199254740991,
+                        "maximum": 9007199254740991
+                      }
+                    },
+                    "required": ["declared", "live", "ready", "stale"]
+                  },
+                  "instances_error": { "type": "string" }
+                },
+                "required": ["spec", "build_state", "secret_generation"]
+              }
+            },
+            "required": ["type", "id", "attributes"]
+          }
+        },
+        "required": ["data"]
+      },
+      "V2WorkerUploadResponse": {
+        "type": "object",
+        "properties": {
+          "data": {
+            "type": "object",
+            "properties": {
+              "type": {
+                "type": "string",
+                "description": "Resource type.",
+                "enum": ["project_worker_upload"]
+              },
+              "id": {
+                "type": "string",
+                "description": "Upload id to pass to the deploy endpoint as `context_upload_id`.",
+                "example": "cafe0000000000000000000000000000"
+              },
+              "attributes": {
+                "type": "object",
+                "properties": {
+                  "url": {
+                    "type": "string",
+                    "description": "Presigned destination for the `.tar.gz` build context."
+                  },
+                  "method": { "type": "string", "example": "PUT" },
+                  "expires_at": {
+                    "type": "string",
+                    "description": "When the slot stops accepting the upload."
+                  }
+                },
+                "required": ["url", "method", "expires_at"]
+              }
+            },
+            "required": ["type", "id", "attributes"]
+          }
+        },
+        "required": ["data"]
+      },
+      "V2DeployWorkerRequest": {
+        "type": "object",
+        "properties": {
+          "data": {
+            "type": "object",
+            "properties": {
+              "type": {
+                "type": "string",
+                "description": "Resource type.",
+                "enum": ["project_worker"]
+              },
+              "attributes": {
+                "type": "object",
+                "properties": {
+                  "spec": {
+                    "type": "object",
+                    "properties": {
+                      "runtime": { "example": "node", "type": "string" },
+                      "size": { "type": "string", "example": "2gb-1vcpu" },
+                      "exposure": { "type": "string", "example": "public" },
+                      "instances": {
+                        "type": "integer",
+                        "minimum": -9007199254740991,
+                        "maximum": 9007199254740991,
+                        "example": 1
+                      }
+                    },
+                    "required": ["size", "exposure", "instances"]
+                  },
+                  "context_upload_id": {
+                    "description": "Id of a build context staged through the uploads endpoint. Required unless `runtime` is set.",
+                    "type": "string"
+                  }
+                },
+                "required": ["spec"]
+              }
+            },
+            "required": ["type", "attributes"]
+          }
+        },
+        "required": ["data"]
+      },
       "V2ListMembersResponse": {
         "type": "object",
         "properties": {
@@ -16386,7 +17752,9 @@
                     "email": {
                       "type": "string",
                       "format": "email",
-                      "pattern": "^(?!\\.)(?!.*\\.\\.)([A-Za-z0-9_'+\\-\\.]*)[A-Za-z0-9_+-]@([A-Za-z0-9][A-Za-z0-9\\-]*\\.)+[A-Za-z]{2,}$"
+                      "pattern": "^(?!\\.)(?!.*\\.\\.)([A-Za-z0-9_'+\\-\\.]*)[A-Za-z0-9_+-]@([A-Za-z0-9][A-Za-z0-9\\-]*\\.)+[A-Za-z]{2,}$",
+                      "description": "Email address of the invitation receipient.",
+                      "example": "hello@example.com"
                     },
                     "role": {
                       "type": "string",
@@ -16396,6 +17764,7 @@
                     },
                     "projects": {
                       "description": "The projects to limit a user to. If omitted, user will have org-wide access with the provided role.",
+                      "examples": [{ "ref": "abcjuqabhgwjjutfvtpa" }],
                       "minItems": 1,
                       "type": "array",
                       "items": {
@@ -16477,7 +17846,9 @@
                         "email": {
                           "type": "string",
                           "format": "email",
-                          "pattern": "^(?!\\.)(?!.*\\.\\.)([A-Za-z0-9_'+\\-\\.]*)[A-Za-z0-9_+-]@([A-Za-z0-9][A-Za-z0-9\\-]*\\.)+[A-Za-z]{2,}$"
+                          "pattern": "^(?!\\.)(?!.*\\.\\.)([A-Za-z0-9_'+\\-\\.]*)[A-Za-z0-9_+-]@([A-Za-z0-9][A-Za-z0-9\\-]*\\.)+[A-Za-z]{2,}$",
+                          "description": "Email address of the invitation receipient.",
+                          "example": "hello@example.com"
                         }
                       },
                       "required": ["email"]
@@ -16505,7 +17876,9 @@
                     "email": {
                       "type": "string",
                       "format": "email",
-                      "pattern": "^(?!\\.)(?!.*\\.\\.)([A-Za-z0-9_'+\\-\\.]*)[A-Za-z0-9_+-]@([A-Za-z0-9][A-Za-z0-9\\-]*\\.)+[A-Za-z]{2,}$"
+                      "pattern": "^(?!\\.)(?!.*\\.\\.)([A-Za-z0-9_'+\\-\\.]*)[A-Za-z0-9_+-]@([A-Za-z0-9][A-Za-z0-9\\-]*\\.)+[A-Za-z]{2,}$",
+                      "description": "Email address of the invitation receipient.",
+                      "example": "hello@example.com"
                     }
                   },
                   "required": ["email"]
@@ -16538,7 +17911,9 @@
                     "email": {
                       "type": "string",
                       "format": "email",
-                      "pattern": "^(?!\\.)(?!.*\\.\\.)([A-Za-z0-9_'+\\-\\.]*)[A-Za-z0-9_+-]@([A-Za-z0-9][A-Za-z0-9\\-]*\\.)+[A-Za-z]{2,}$"
+                      "pattern": "^(?!\\.)(?!.*\\.\\.)([A-Za-z0-9_'+\\-\\.]*)[A-Za-z0-9_+-]@([A-Za-z0-9][A-Za-z0-9\\-]*\\.)+[A-Za-z]{2,}$",
+                      "description": "Email address of the invitation receipient.",
+                      "example": "hello@example.com"
                     }
                   },
                   "required": ["email"]
@@ -16569,7 +17944,9 @@
                     "email": {
                       "type": "string",
                       "format": "email",
-                      "pattern": "^(?!\\.)(?!.*\\.\\.)([A-Za-z0-9_'+\\-\\.]*)[A-Za-z0-9_+-]@([A-Za-z0-9][A-Za-z0-9\\-]*\\.)+[A-Za-z]{2,}$"
+                      "pattern": "^(?!\\.)(?!.*\\.\\.)([A-Za-z0-9_'+\\-\\.]*)[A-Za-z0-9_+-]@([A-Za-z0-9][A-Za-z0-9\\-]*\\.)+[A-Za-z]{2,}$",
+                      "description": "Email address of the invitation receipient.",
+                      "example": "hello@example.com"
                     }
                   },
                   "required": ["email"]
diff --git a/apps/docs/spec/common-api-sections.json b/apps/docs/spec/common-api-sections.json
index 9421f19a16b..8fbecc4a95c 100644
--- a/apps/docs/spec/common-api-sections.json
+++ b/apps/docs/spec/common-api-sections.json
@@ -732,6 +732,72 @@
       }
     ]
   },
+  {
+    "type": "category",
+    "title": "Organization webhooks",
+    "items": [
+      {
+        "id": "v2-organizations-slug-webhooks-deliveries-id-get",
+        "title": "Organizations slug webhooks deliveries id get",
+        "slug": "v2-organizations-slug-webhooks-deliveries-id-get",
+        "type": "operation"
+      },
+      {
+        "id": "v2-organizations-slug-webhooks-deliveries-id-retry-post",
+        "title": "Organizations slug webhooks deliveries id retry post",
+        "slug": "v2-organizations-slug-webhooks-deliveries-id-retry-post",
+        "type": "operation"
+      },
+      {
+        "id": "v2-organizations-slug-webhooks-endpoints-delete",
+        "title": "Organizations slug webhooks endpoints delete",
+        "slug": "v2-organizations-slug-webhooks-endpoints-delete",
+        "type": "operation"
+      },
+      {
+        "id": "v2-organizations-slug-webhooks-endpoints-get",
+        "title": "Organizations slug webhooks endpoints get",
+        "slug": "v2-organizations-slug-webhooks-endpoints-get",
+        "type": "operation"
+      },
+      {
+        "id": "v2-organizations-slug-webhooks-endpoints-id-delete",
+        "title": "Organizations slug webhooks endpoints id delete",
+        "slug": "v2-organizations-slug-webhooks-endpoints-id-delete",
+        "type": "operation"
+      },
+      {
+        "id": "v2-organizations-slug-webhooks-endpoints-id-deliveries-get",
+        "title": "Organizations slug webhooks endpoints id deliveries get",
+        "slug": "v2-organizations-slug-webhooks-endpoints-id-deliveries-get",
+        "type": "operation"
+      },
+      {
+        "id": "v2-organizations-slug-webhooks-endpoints-id-get",
+        "title": "Organizations slug webhooks endpoints id get",
+        "slug": "v2-organizations-slug-webhooks-endpoints-id-get",
+        "type": "operation"
+      },
+      {
+        "id": "v2-organizations-slug-webhooks-endpoints-id-patch",
+        "title": "Organizations slug webhooks endpoints id patch",
+        "slug": "v2-organizations-slug-webhooks-endpoints-id-patch",
+        "type": "operation"
+      },
+      {
+        "id": "v2-organizations-slug-webhooks-endpoints-id-test-post",
+        "title": "Organizations slug webhooks endpoints id test post",
+        "slug": "v2-organizations-slug-webhooks-endpoints-id-test-post",
+        "type": "operation"
+      },
+      {
+        "id": "v2-organizations-slug-webhooks-endpoints-post",
+        "title": "Organizations slug webhooks endpoints post",
+        "slug": "v2-organizations-slug-webhooks-endpoints-post",
+        "type": "operation"
+      }
+    ]
+  },
   {
     "type": "category",
     "title": "Organizations",
@@ -828,6 +894,72 @@
       }
     ]
   },
+  {
+    "type": "category",
+    "title": "Project webhooks",
+    "items": [
+      {
+        "id": "v2-projects-ref-webhooks-deliveries-id-get",
+        "title": "Projects ref webhooks deliveries id get",
+        "slug": "v2-projects-ref-webhooks-deliveries-id-get",
+        "type": "operation"
+      },
+      {
+        "id": "v2-projects-ref-webhooks-deliveries-id-retry-post",
+        "title": "Projects ref webhooks deliveries id retry post",
+        "slug": "v2-projects-ref-webhooks-deliveries-id-retry-post",
+        "type": "operation"
+      },
+      {
+        "id": "v2-projects-ref-webhooks-endpoints-delete",
+        "title": "Projects ref webhooks endpoints delete",
+        "slug": "v2-projects-ref-webhooks-endpoints-delete",
+        "type": "operation"
+      },
+      {
+        "id": "v2-projects-ref-webhooks-endpoints-get",
+        "title": "Projects ref webhooks endpoints get",
+        "slug": "v2-projects-ref-webhooks-endpoints-get",
+        "type": "operation"
+      },
+      {
+        "id": "v2-projects-ref-webhooks-endpoints-id-delete",
+        "title": "Projects ref webhooks endpoints id delete",
+        "slug": "v2-projects-ref-webhooks-endpoints-id-delete",
+        "type": "operation"
+      },
+      {
+        "id": "v2-projects-ref-webhooks-endpoints-id-deliveries-get",
+        "title": "Projects ref webhooks endpoints id deliveries get",
+        "slug": "v2-projects-ref-webhooks-endpoints-id-deliveries-get",
+        "type": "operation"
+      },
+      {
+        "id": "v2-projects-ref-webhooks-endpoints-id-get",
+        "title": "Projects ref webhooks endpoints id get",
+        "slug": "v2-projects-ref-webhooks-endpoints-id-get",
+        "type": "operation"
+      },
+      {
+        "id": "v2-projects-ref-webhooks-endpoints-id-patch",
+        "title": "Projects ref webhooks endpoints id patch",
+        "slug": "v2-projects-ref-webhooks-endpoints-id-patch",
+        "type": "operation"
+      },
+      {
+        "id": "v2-projects-ref-webhooks-endpoints-id-test-post",
+        "title": "Projects ref webhooks endpoints id test post",
+        "slug": "v2-projects-ref-webhooks-endpoints-id-test-post",
+        "type": "operation"
+      },
+      {
+        "id": "v2-projects-ref-webhooks-endpoints-post",
+        "title": "Projects ref webhooks endpoints post",
+        "slug": "v2-projects-ref-webhooks-endpoints-post",
+        "type": "operation"
+      }
+    ]
+  },
   {
     "type": "category",
     "title": "Projects",
@@ -922,6 +1054,12 @@
         "slug": "v1-get-project",
         "type": "operation"
       },
+      {
+        "id": "v2-get-project-config",
+        "title": "Get project config",
+        "slug": "v2-get-project-config",
+        "type": "operation"
+      },
       {
         "id": "v1-get-project-disk-autoscale-config",
         "title": "Get project disk autoscale config",
@@ -1169,5 +1307,41 @@
         "type": "operation"
       }
     ]
+  },
+  {
+    "type": "category",
+    "title": "Workers",
+    "items": [
+      {
+        "id": "v2-create-worker-upload",
+        "title": "Create worker upload",
+        "slug": "v2-create-worker-upload",
+        "type": "operation"
+      },
+      {
+        "id": "v2-delete-a-worker",
+        "title": "Delete a worker",
+        "slug": "v2-delete-a-worker",
+        "type": "operation"
+      },
+      {
+        "id": "v2-deploy-a-worker",
+        "title": "Deploy a worker",
+        "slug": "v2-deploy-a-worker",
+        "type": "operation"
+      },
+      {
+        "id": "v2-get-a-worker",
+        "title": "Get a worker",
+        "slug": "v2-get-a-worker",
+        "type": "operation"
+      },
+      {
+        "id": "v2-list-all-workers",
+        "title": "List all workers",
+        "slug": "v2-list-all-workers",
+        "type": "operation"
+      }
+    ]
   }
 ]
diff --git a/apps/docs/spec/transforms/api_v1_openapi_deparsed.json b/apps/docs/spec/transforms/api_v1_openapi_deparsed.json
index 15a255feb54..831388c88cf 100644
--- a/apps/docs/spec/transforms/api_v1_openapi_deparsed.json
+++ b/apps/docs/spec/transforms/api_v1_openapi_deparsed.json
@@ -685,7 +685,7 @@
             "position": "after"
           }
         ],
-        "x-endpoint-owners": ["management-api"],
+        "x-endpoint-owners": ["control-plane"],
         "x-fga-permissions": [["projects_read"]],
         "x-oauth-scope": "projects:read"
       },
@@ -736,7 +736,7 @@
             "position": "after"
           }
         ],
-        "x-endpoint-owners": ["management-api", "infra"],
+        "x-endpoint-owners": ["control-plane", "infra"],
         "x-fga-permissions": [["organization_projects_create"]],
         "x-oauth-scope": "projects:write"
       }
@@ -871,7 +871,7 @@
             "position": "after"
           }
         ],
-        "x-endpoint-owners": ["management-api"],
+        "x-endpoint-owners": ["control-plane"],
         "x-fga-permissions": [["organizations_read"]],
         "x-oauth-scope": "organizations:read"
       },
@@ -919,7 +919,7 @@
         ],
         "summary": "Create an organization",
         "tags": ["Organizations"],
-        "x-endpoint-owners": ["management-api", "billing"],
+        "x-endpoint-owners": ["control-plane", "billing"],
         "x-fga-permissions": [["organizations_create"]]
       }
     },
@@ -1041,7 +1041,7 @@
         },
         "summary": "[Beta] Authorize user through oauth",
         "tags": ["OAuth"],
-        "x-endpoint-owners": ["auth", "management-api"]
+        "x-endpoint-owners": ["auth", "control-plane"]
       }
     },
     "/v1/oauth/token": {
@@ -1073,7 +1073,7 @@
         },
         "summary": "[Beta] Exchange auth code for user's access and refresh token",
         "tags": ["OAuth"],
-        "x-endpoint-owners": ["auth", "management-api"]
+        "x-endpoint-owners": ["auth", "control-plane"]
       }
     },
     "/v1/oauth/revoke": {
@@ -1097,7 +1097,7 @@
         },
         "summary": "[Beta] Revoke oauth app authorization and it's corresponding tokens",
         "tags": ["OAuth"],
-        "x-endpoint-owners": ["auth", "management-api"]
+        "x-endpoint-owners": ["auth", "control-plane"]
       }
     },
     "/v1/oauth/authorize/project-claim": {
@@ -1207,7 +1207,7 @@
         ],
         "summary": "Authorize user through oauth and claim a project",
         "tags": ["OAuth"],
-        "x-endpoint-owners": ["management-api"],
+        "x-endpoint-owners": ["control-plane"],
         "x-fga-permissions": [["organization_admin_write", "project_admin_write"]]
       }
     },
@@ -1302,7 +1302,7 @@
             "position": "after"
           }
         ],
-        "x-endpoint-owners": ["management-api"],
+        "x-endpoint-owners": ["control-plane"],
         "x-fga-permissions": [["snippets_read"]],
         "x-oauth-scope": "database:read"
       }
@@ -1360,7 +1360,7 @@
             "position": "after"
           }
         ],
-        "x-endpoint-owners": ["management-api"],
+        "x-endpoint-owners": ["control-plane"],
         "x-fga-permissions": [["snippets_read"]],
         "x-oauth-scope": "database:read"
       }
@@ -1388,7 +1388,7 @@
         ],
         "summary": "Gets the user's profile",
         "tags": ["Profile"],
-        "x-endpoint-owners": ["management-api"]
+        "x-endpoint-owners": ["control-plane"]
       }
     },
     "/v1/projects/{ref}/actions": {
@@ -1821,7 +1821,7 @@
             "position": "after"
           }
         ],
-        "x-endpoint-owners": ["auth", "management-api"],
+        "x-endpoint-owners": ["auth", "control-plane"],
         "x-fga-permissions": [["api_gateway_keys_read"]],
         "x-oauth-scope": "secrets:read"
       },
@@ -1896,7 +1896,7 @@
             "position": "after"
           }
         ],
-        "x-endpoint-owners": ["auth", "management-api"],
+        "x-endpoint-owners": ["auth", "control-plane"],
         "x-fga-permissions": [["api_gateway_keys_write"]],
         "x-oauth-scope": "secrets:write"
       }
@@ -1953,7 +1953,7 @@
             "position": "after"
           }
         ],
-        "x-endpoint-owners": ["auth", "management-api"],
+        "x-endpoint-owners": ["auth", "control-plane"],
         "x-fga-permissions": [["api_gateway_keys_read"]],
         "x-oauth-scope": "secrets:read"
       },
@@ -2018,7 +2018,7 @@
             "position": "after"
           }
         ],
-        "x-endpoint-owners": ["auth", "management-api"],
+        "x-endpoint-owners": ["auth", "control-plane"],
         "x-fga-permissions": [["api_gateway_keys_write"]],
         "x-oauth-scope": "secrets:write"
       }
@@ -2106,7 +2106,7 @@
             "position": "after"
           }
         ],
-        "x-endpoint-owners": ["auth", "management-api"],
+        "x-endpoint-owners": ["auth", "control-plane"],
         "x-fga-permissions": [["api_gateway_keys_write"]],
         "x-oauth-scope": "secrets:write"
       },
@@ -2182,7 +2182,7 @@
             "position": "after"
           }
         ],
-        "x-endpoint-owners": ["auth", "management-api"],
+        "x-endpoint-owners": ["auth", "control-plane"],
         "x-fga-permissions": [["api_gateway_keys_read"]],
         "x-oauth-scope": "secrets:read"
       },
@@ -2277,7 +2277,7 @@
             "position": "after"
           }
         ],
-        "x-endpoint-owners": ["auth", "management-api"],
+        "x-endpoint-owners": ["auth", "control-plane"],
         "x-fga-permissions": [["api_gateway_keys_write"]],
         "x-oauth-scope": "secrets:write"
       }
@@ -2565,7 +2565,7 @@
             "position": "after"
           }
         ],
-        "x-endpoint-owners": ["infra", "management-api"],
+        "x-endpoint-owners": ["infra", "control-plane"],
         "x-fga-permissions": [["custom_domain_read"]],
         "x-oauth-scope": "domains:read"
       },
@@ -2625,7 +2625,7 @@
             "position": "after"
           }
         ],
-        "x-endpoint-owners": ["infra", "management-api"],
+        "x-endpoint-owners": ["infra", "control-plane"],
         "x-fga-permissions": [["custom_domain_write"]],
         "x-oauth-scope": "domains:write"
       }
@@ -2695,7 +2695,7 @@
             "position": "after"
           }
         ],
-        "x-endpoint-owners": ["infra", "management-api"],
+        "x-endpoint-owners": ["infra", "control-plane"],
         "x-fga-permissions": [["custom_domain_write"]],
         "x-oauth-scope": "domains:write"
       }
@@ -2755,7 +2755,7 @@
             "position": "after"
           }
         ],
-        "x-endpoint-owners": ["infra", "management-api"],
+        "x-endpoint-owners": ["infra", "control-plane"],
         "x-fga-permissions": [["custom_domain_write"]],
         "x-oauth-scope": "domains:write"
       }
@@ -2815,7 +2815,7 @@
             "position": "after"
           }
         ],
-        "x-endpoint-owners": ["infra", "management-api"],
+        "x-endpoint-owners": ["infra", "control-plane"],
         "x-fga-permissions": [["custom_domain_write"]],
         "x-oauth-scope": "domains:write"
       }
@@ -2910,7 +2910,7 @@
             "position": "after"
           }
         ],
-        "x-endpoint-owners": ["security", "management-api"],
+        "x-endpoint-owners": ["security", "control-plane"],
         "x-fga-permissions": [["project_admin_read"]],
         "x-oauth-scope": "database:read"
       },
@@ -3013,7 +3013,7 @@
             "position": "after"
           }
         ],
-        "x-endpoint-owners": ["security", "management-api"],
+        "x-endpoint-owners": ["security", "control-plane"],
         "x-fga-permissions": [["project_admin_write"]],
         "x-oauth-scope": "database:write"
       }
@@ -3073,7 +3073,7 @@
             "position": "after"
           }
         ],
-        "x-endpoint-owners": ["management-api", "infra"],
+        "x-endpoint-owners": ["control-plane", "infra"],
         "x-fga-permissions": [["database_network_bans_read"]],
         "x-oauth-scope": "projects:read"
       }
@@ -3133,7 +3133,7 @@
             "position": "after"
           }
         ],
-        "x-endpoint-owners": ["management-api", "infra"],
+        "x-endpoint-owners": ["control-plane", "infra"],
         "x-fga-permissions": [["database_network_bans_read"]],
         "x-oauth-scope": "projects:read"
       }
@@ -3196,7 +3196,7 @@
             "position": "after"
           }
         ],
-        "x-endpoint-owners": ["management-api", "infra"],
+        "x-endpoint-owners": ["control-plane", "infra"],
         "x-fga-permissions": [["database_network_bans_write"]],
         "x-oauth-scope": "projects:write"
       }
@@ -3256,7 +3256,7 @@
             "position": "after"
           }
         ],
-        "x-endpoint-owners": ["infra", "management-api"],
+        "x-endpoint-owners": ["infra", "control-plane"],
         "x-fga-permissions": [["database_network_restrictions_read"]],
         "x-oauth-scope": "projects:read"
       },
@@ -3324,7 +3324,7 @@
             "position": "after"
           }
         ],
-        "x-endpoint-owners": ["infra", "management-api"],
+        "x-endpoint-owners": ["infra", "control-plane"],
         "x-fga-permissions": [["database_network_restrictions_write"]],
         "x-oauth-scope": "projects:write"
       }
@@ -3394,7 +3394,7 @@
             "position": "after"
           }
         ],
-        "x-endpoint-owners": ["infra", "management-api"],
+        "x-endpoint-owners": ["infra", "control-plane"],
         "x-fga-permissions": [["database_network_restrictions_write"]],
         "x-oauth-scope": "projects:write"
       }
@@ -3582,7 +3582,7 @@
             "position": "after"
           }
         ],
-        "x-endpoint-owners": ["management-api", "infra"],
+        "x-endpoint-owners": ["control-plane", "infra"],
         "x-fga-permissions": [["data_api_config_read"]],
         "x-oauth-scope": "rest:read"
       },
@@ -3650,7 +3650,7 @@
             "position": "after"
           }
         ],
-        "x-endpoint-owners": ["management-api", "infra"],
+        "x-endpoint-owners": ["control-plane", "infra"],
         "x-fga-permissions": [["data_api_config_write"]],
         "x-oauth-scope": "rest:write"
       }
@@ -3710,7 +3710,7 @@
             "position": "after"
           }
         ],
-        "x-endpoint-owners": ["management-api"],
+        "x-endpoint-owners": ["control-plane"],
         "x-fga-permissions": [["project_admin_read"]],
         "x-oauth-scope": "projects:read"
       },
@@ -3765,7 +3765,7 @@
             "position": "after"
           }
         ],
-        "x-endpoint-owners": ["management-api", "infra", "dev-workflows"],
+        "x-endpoint-owners": ["control-plane", "infra", "dev-workflows"],
         "x-fga-permissions": [["project_admin_write"]],
         "x-oauth-scope": "projects:write"
       },
@@ -3833,7 +3833,7 @@
             "position": "after"
           }
         ],
-        "x-endpoint-owners": ["management-api"],
+        "x-endpoint-owners": ["control-plane"],
         "x-fga-permissions": [["project_admin_write"]],
         "x-oauth-scope": "projects:write"
       }
@@ -4081,7 +4081,7 @@
             "position": "after"
           }
         ],
-        "x-endpoint-owners": ["infra", "management-api"],
+        "x-endpoint-owners": ["infra", "control-plane"],
         "x-fga-permissions": [["database_ssl_config_read"]],
         "x-oauth-scope": "database:read"
       },
@@ -4149,7 +4149,7 @@
             "position": "after"
           }
         ],
-        "x-endpoint-owners": ["infra", "management-api"],
+        "x-endpoint-owners": ["infra", "control-plane"],
         "x-fga-permissions": [["database_ssl_config_write"]],
         "x-oauth-scope": "database:write"
       }
@@ -4295,7 +4295,7 @@
             "position": "before"
           }
         ],
-        "x-endpoint-owners": ["infra", "management-api"],
+        "x-endpoint-owners": ["infra", "control-plane"],
         "x-fga-permissions": [["vanity_subdomain_read"]],
         "x-oauth-scope": "domains:read"
       },
@@ -4346,7 +4346,7 @@
             "position": "after"
           }
         ],
-        "x-endpoint-owners": ["infra", "management-api"],
+        "x-endpoint-owners": ["infra", "control-plane"],
         "x-fga-permissions": [["vanity_subdomain_write"]],
         "x-oauth-scope": "domains:write"
       }
@@ -4431,7 +4431,7 @@
             "position": "before"
           }
         ],
-        "x-endpoint-owners": ["infra", "management-api"],
+        "x-endpoint-owners": ["infra", "control-plane"],
         "x-fga-permissions": [["vanity_subdomain_write"]],
         "x-oauth-scope": "domains:write"
       }
@@ -4516,7 +4516,7 @@
             "position": "before"
           }
         ],
-        "x-endpoint-owners": ["infra", "management-api"],
+        "x-endpoint-owners": ["infra", "control-plane"],
         "x-fga-permissions": [["vanity_subdomain_write"]],
         "x-oauth-scope": "domains:write"
       }
@@ -4586,7 +4586,7 @@
             "position": "after"
           }
         ],
-        "x-endpoint-owners": ["management-api", "infra"],
+        "x-endpoint-owners": ["control-plane", "infra"],
         "x-fga-permissions": [["project_admin_write", "database_write"]],
         "x-oauth-scope": "projects:write"
       }
@@ -4646,7 +4646,7 @@
             "position": "after"
           }
         ],
-        "x-endpoint-owners": ["management-api", "infra"],
+        "x-endpoint-owners": ["control-plane", "infra"],
         "x-fga-permissions": [["project_admin_read", "database_read"]],
         "x-oauth-scope": "projects:read"
       }
@@ -4715,7 +4715,7 @@
             "position": "after"
           }
         ],
-        "x-endpoint-owners": ["management-api", "infra"],
+        "x-endpoint-owners": ["control-plane", "infra"],
         "x-fga-permissions": [["project_admin_read", "database_read"]],
         "x-oauth-scope": "projects:read"
       }
@@ -4775,7 +4775,7 @@
             "position": "after"
           }
         ],
-        "x-endpoint-owners": ["management-api", "infra", "support-tooling"],
+        "x-endpoint-owners": ["control-plane", "infra", "support-tooling"],
         "x-fga-permissions": [["database_readonly_config_read"]],
         "x-oauth-scope": "database:read"
       }
@@ -4828,7 +4828,7 @@
             "position": "after"
           }
         ],
-        "x-endpoint-owners": ["management-api", "infra", "support-tooling"],
+        "x-endpoint-owners": ["control-plane", "infra", "support-tooling"],
         "x-fga-permissions": [["database_readonly_config_write"]],
         "x-oauth-scope": "database:write"
       }
@@ -4902,7 +4902,7 @@
             "position": "before"
           }
         ],
-        "x-endpoint-owners": ["management-api", "infra"],
+        "x-endpoint-owners": ["control-plane", "infra"],
         "x-fga-permissions": [["infra_read_replicas_write"]]
       }
     },
@@ -4958,7 +4958,7 @@
         ],
         "summary": "[Beta] Remove a read replica",
         "tags": ["Database"],
-        "x-endpoint-owners": ["management-api", "infra"],
+        "x-endpoint-owners": ["control-plane", "infra"],
         "x-fga-permissions": [["infra_read_replicas_write"]]
       }
     },
@@ -5065,7 +5065,7 @@
             "position": "after"
           }
         ],
-        "x-endpoint-owners": ["management-api", "infra"],
+        "x-endpoint-owners": ["control-plane", "infra"],
         "x-fga-permissions": [["project_admin_read"]],
         "x-oauth-scope": "projects:read"
       }
@@ -5939,7 +5939,7 @@
             "position": "after"
           }
         ],
-        "x-endpoint-owners": ["infra", "management-api"],
+        "x-endpoint-owners": ["infra", "control-plane"],
         "x-fga-permissions": [["project_admin_write"]],
         "x-oauth-scope": "projects:write"
       }
@@ -5989,7 +5989,7 @@
             "position": "after"
           }
         ],
-        "x-endpoint-owners": ["infra", "management-api"],
+        "x-endpoint-owners": ["infra", "control-plane"],
         "x-fga-permissions": [["project_admin_write"]],
         "x-oauth-scope": "projects:write"
       }
@@ -6046,7 +6046,7 @@
             "position": "after"
           }
         ],
-        "x-endpoint-owners": ["management-api", "infra"],
+        "x-endpoint-owners": ["control-plane", "infra"],
         "x-fga-permissions": [["project_admin_read"]],
         "x-oauth-scope": "projects:read"
       },
@@ -6094,7 +6094,7 @@
             "position": "after"
           }
         ],
-        "x-endpoint-owners": ["management-api", "infra"],
+        "x-endpoint-owners": ["control-plane", "infra"],
         "x-fga-permissions": [["project_admin_write"]],
         "x-oauth-scope": "projects:write"
       }
@@ -6144,7 +6144,7 @@
             "position": "after"
           }
         ],
-        "x-endpoint-owners": ["management-api", "infra"],
+        "x-endpoint-owners": ["control-plane", "infra"],
         "x-fga-permissions": [["project_admin_write"]],
         "x-oauth-scope": "projects:write"
       }
@@ -6396,7 +6396,7 @@
         ],
         "summary": "Gets project claim token",
         "tags": ["Projects"],
-        "x-endpoint-owners": ["management-api"],
+        "x-endpoint-owners": ["control-plane"],
         "x-fga-permissions": [["project_admin_read"]],
         "x-internal": true
       },
@@ -6445,7 +6445,7 @@
         ],
         "summary": "Creates project claim token",
         "tags": ["Projects"],
-        "x-endpoint-owners": ["management-api"],
+        "x-endpoint-owners": ["control-plane"],
         "x-fga-permissions": [["organization_admin_write", "project_admin_write"]],
         "x-internal": true
       },
@@ -6487,7 +6487,7 @@
         ],
         "summary": "Revokes project claim token",
         "tags": ["Projects"],
-        "x-endpoint-owners": ["management-api"],
+        "x-endpoint-owners": ["control-plane"],
         "x-fga-permissions": [["organization_admin_write", "project_admin_write"]],
         "x-internal": true
       }
@@ -6546,7 +6546,7 @@
             "position": "after"
           }
         ],
-        "x-endpoint-owners": ["management-api"],
+        "x-endpoint-owners": ["control-plane"],
         "x-fga-permissions": [["advisors_read"]],
         "x-oauth-scope": "database:read"
       }
@@ -6615,7 +6615,7 @@
             "position": "after"
           }
         ],
-        "x-endpoint-owners": ["management-api"],
+        "x-endpoint-owners": ["control-plane"],
         "x-fga-permissions": [["advisors_read"]],
         "x-oauth-scope": "database:read"
       }
@@ -6623,7 +6623,7 @@
     "/v1/projects/{ref}/analytics/endpoints/logs.all": {
       "get": {
         "deprecated": true,
-        "description": "Executes a SQL query on the project's logs.\n\nEither the `iso_timestamp_start` and `iso_timestamp_end` parameters must be provided.\nIf both are not provided, only the last 1 minute of logs will be queried.\nThe timestamp range must be no more than 24 hours and is rounded to the nearest minute. If the range is more than 24 hours, a validation error will be thrown.\n\nNote: Unless the `sql` parameter is provided, only edge_logs will be queried. See the [log query docs](/docs/guides/telemetry/logs?queryGroups=product&product=postgres&queryGroups=source&source=edge_logs#querying-with-the-logs-explorer:~:text=logs%20from%20the-,Sources,-drop%2Ddown%3A) for all available sources.\n",
+        "description": "Executes a SQL query on the project's logs.\n\nEither the `iso_timestamp_start` and `iso_timestamp_end` parameters must be provided.\nIf both are not provided, only the last 1 minute of logs will be queried.\nThe timestamp range must be no more than 24 hours and is rounded to the nearest minute. If the range is more than 24 hours, a validation error will be thrown.\n\nNote: Unless the `sql` parameter is provided, only edge_logs will be queried. See the [log query docs](https://supabase.com/docs/guides/monitoring-and-debugging/logs#logs-explorer) for all available sources.\n",
         "operationId": "v1-get-project-logs-all",
         "parameters": [
           {
@@ -6643,7 +6643,7 @@
             "name": "sql",
             "required": false,
             "in": "query",
-            "description": "Custom SQL query to execute on the logs. See [querying logs](/docs/guides/telemetry/logs?queryGroups=product&product=postgres&queryGroups=source&source=edge_logs#querying-with-the-logs-explorer) for more details.",
+            "description": "Custom SQL query to execute on the logs. See [querying logs](https://supabase.com/docs/guides/monitoring-and-debugging/logs#querying-with-the-logs-explorer) for more details.",
             "schema": {
               "example": "select event_message from edge_logs limit 10",
               "type": "string"
@@ -6737,7 +6737,7 @@
             "name": "sql",
             "required": false,
             "in": "query",
-            "description": "Custom SQL query to execute on the logs. See [querying logs](/docs/guides/telemetry/logs?queryGroups=product&product=postgres&queryGroups=source&source=edge_logs#querying-with-the-logs-explorer) for more details.",
+            "description": "Custom SQL query to execute on the logs. See [querying logs](https://supabase.com/docs/guides/monitoring-and-debugging/logs#querying-with-the-logs-explorer) for more details.",
             "schema": {
               "example": "select event_message from edge_logs limit 10",
               "type": "string"
@@ -7031,6 +7031,9 @@
               }
             }
           },
+          "400": {
+            "description": "Project must be active and healthy, or metrics are not available for this project"
+          },
           "401": {
             "description": "Unauthorized"
           },
@@ -7651,7 +7654,7 @@
             "position": "after"
           }
         ],
-        "x-endpoint-owners": ["management-api"],
+        "x-endpoint-owners": ["control-plane"],
         "x-fga-permissions": [["database_read"], ["database_write"]],
         "x-oauth-scope": "database:write"
       }
@@ -7715,7 +7718,7 @@
             "position": "after"
           }
         ],
-        "x-endpoint-owners": ["management-api"],
+        "x-endpoint-owners": ["control-plane"],
         "x-fga-permissions": [["database_read"]],
         "x-oauth-scope": "database:read"
       }
@@ -7768,7 +7771,7 @@
             "position": "after"
           }
         ],
-        "x-endpoint-owners": ["management-api", "infra"],
+        "x-endpoint-owners": ["control-plane", "infra"],
         "x-fga-permissions": [["database_webhooks_config_write"]],
         "x-oauth-scope": "database:write"
       }
@@ -7827,7 +7830,7 @@
             "position": "after"
           }
         ],
-        "x-endpoint-owners": ["management-api"],
+        "x-endpoint-owners": ["control-plane"],
         "x-fga-permissions": [["database_read"]],
         "x-oauth-scope": "projects:read"
       }
@@ -7897,7 +7900,7 @@
             "position": "after"
           }
         ],
-        "x-endpoint-owners": ["management-api", "infra"],
+        "x-endpoint-owners": ["control-plane", "infra"],
         "x-fga-permissions": [["database_config_write"]],
         "x-oauth-scope": "database:write"
       }
@@ -8448,7 +8451,7 @@
             "position": "after"
           }
         ],
-        "x-endpoint-owners": ["management-api"],
+        "x-endpoint-owners": ["control-plane"],
         "x-fga-permissions": [["database_read"]],
         "x-oauth-scope": "database:read"
       }
@@ -9294,7 +9297,7 @@
         ],
         "summary": "Get database disk attributes",
         "tags": ["Projects"],
-        "x-endpoint-owners": ["management-api", "infra"],
+        "x-endpoint-owners": ["control-plane", "infra"],
         "x-fga-permissions": [["infra_disk_config_read"]]
       },
       "post": {
@@ -9348,7 +9351,7 @@
         ],
         "summary": "Modify database disk",
         "tags": ["Projects"],
-        "x-endpoint-owners": ["management-api", "infra"],
+        "x-endpoint-owners": ["control-plane", "infra"],
         "x-fga-permissions": [["infra_disk_config_write"]]
       }
     },
@@ -9401,7 +9404,7 @@
         ],
         "summary": "Get disk utilization",
         "tags": ["Projects"],
-        "x-endpoint-owners": ["management-api", "infra"],
+        "x-endpoint-owners": ["control-plane", "infra"],
         "x-fga-permissions": [["infra_disk_config_read"]]
       }
     },
@@ -9454,7 +9457,7 @@
         ],
         "summary": "Gets project disk autoscale config",
         "tags": ["Projects"],
-        "x-endpoint-owners": ["management-api", "infra"],
+        "x-endpoint-owners": ["control-plane", "infra"],
         "x-fga-permissions": [["infra_disk_config_read"]]
       }
     },
@@ -9615,7 +9618,7 @@
             "position": "after"
           }
         ],
-        "x-endpoint-owners": ["infra", "management-api"],
+        "x-endpoint-owners": ["infra", "control-plane"],
         "x-fga-permissions": [["database_read"]],
         "x-oauth-scope": "database:read"
       }
@@ -9806,7 +9809,7 @@
             "position": "after"
           }
         ],
-        "x-endpoint-owners": ["infra", "management-api"],
+        "x-endpoint-owners": ["infra", "control-plane"],
         "x-fga-permissions": [["database_config_read"]],
         "x-oauth-scope": "database:read"
       },
@@ -9874,7 +9877,7 @@
             "position": "after"
           }
         ],
-        "x-endpoint-owners": ["infra", "management-api"],
+        "x-endpoint-owners": ["infra", "control-plane"],
         "x-fga-permissions": [["database_config_write"]],
         "x-oauth-scope": "database:write"
       }
@@ -11019,7 +11022,7 @@
             "position": "after"
           }
         ],
-        "x-endpoint-owners": ["management-api"],
+        "x-endpoint-owners": ["control-plane"],
         "x-fga-permissions": [["members_read"]],
         "x-oauth-scope": "organizations:read"
       }
@@ -11074,7 +11077,7 @@
             "position": "after"
           }
         ],
-        "x-endpoint-owners": ["management-api"],
+        "x-endpoint-owners": ["control-plane"],
         "x-fga-permissions": [["organization_admin_read"]],
         "x-oauth-scope": "organizations:read"
       }
@@ -11132,7 +11135,7 @@
         ],
         "summary": "Gets project details for the specified organization and claim token",
         "tags": ["Organizations"],
-        "x-endpoint-owners": ["management-api"],
+        "x-endpoint-owners": ["control-plane"],
         "x-fga-permissions": [["organization_admin_write"]],
         "x-internal": true
       },
@@ -11181,7 +11184,7 @@
         ],
         "summary": "Claims project for the specified organization",
         "tags": ["Organizations"],
-        "x-endpoint-owners": ["management-api"],
+        "x-endpoint-owners": ["control-plane"],
         "x-fga-permissions": [["organization_admin_write"]],
         "x-internal": true
       }
@@ -11298,7 +11301,7 @@
             "position": "after"
           }
         ],
-        "x-endpoint-owners": ["management-api"],
+        "x-endpoint-owners": ["control-plane"],
         "x-fga-permissions": [["organization_projects_read"]],
         "x-oauth-scope": "projects:read"
       }
@@ -19487,6 +19490,13 @@
             "description": "Sets connection pool size for Realtime Authorization",
             "nullable": true
           },
+          "postgres_changes_pool": {
+            "type": "integer",
+            "minimum": 1,
+            "maximum": 100,
+            "description": "Sets connection pool size used to create Postgres Changes subscriptions",
+            "nullable": true
+          },
           "max_concurrent_users": {
             "type": "integer",
             "minimum": 1,
@@ -19549,6 +19559,7 @@
         "required": [
           "private_only",
           "connection_pool",
+          "postgres_changes_pool",
           "max_concurrent_users",
           "max_events_per_second",
           "max_bytes_per_second",
@@ -19573,6 +19584,12 @@
             "maximum": 100,
             "description": "Sets connection pool size for Realtime Authorization"
           },
+          "postgres_changes_pool": {
+            "type": "integer",
+            "minimum": 1,
+            "maximum": 100,
+            "description": "Sets connection pool size used to create Postgres Changes subscriptions"
+          },
           "max_concurrent_users": {
             "type": "integer",
             "minimum": 1,
@@ -20536,6 +20553,7 @@
                         "project_restore_after_expiry",
                         "assistant.advance_model",
                         "integrations.github_connections",
+                        "integrations.github_push_webhooks_limit",
                         "dedicated_pooler",
                         "observability.dashboard_advanced_metrics",
                         "api.members.invitations",
diff --git a/apps/docs/spec/transforms/api_v2_openapi_deparsed.json b/apps/docs/spec/transforms/api_v2_openapi_deparsed.json
index c99d176c4b0..6a476ef664c 100644
--- a/apps/docs/spec/transforms/api_v2_openapi_deparsed.json
+++ b/apps/docs/spec/transforms/api_v2_openapi_deparsed.json
@@ -39,16 +39,44 @@
             }
           },
           "401": {
-            "description": "Unauthorized"
+            "description": "Unauthorized",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponseBody"
+                }
+              }
+            }
           },
           "403": {
-            "description": "Forbidden action"
+            "description": "Forbidden action",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponseBody"
+                }
+              }
+            }
           },
           "429": {
-            "description": "Rate limit exceeded"
+            "description": "Rate limit exceeded",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponseBody"
+                }
+              }
+            }
           },
           "500": {
-            "description": "Failed to fetch log drains"
+            "description": "Failed to fetch log drains",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponseBody"
+                }
+              }
+            }
           }
         },
         "security": [
@@ -107,26 +135,54 @@
             }
           },
           "401": {
-            "description": "Unauthorized"
+            "description": "Unauthorized",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponseBody"
+                }
+              }
+            }
           },
           "402": {
             "description": "This feature requires the Pro, Team, or Enterprise organization plan.",
             "content": {
               "application/json": {
                 "schema": {
-                  "$ref": "#/components/schemas/PlanGateErrorBodyV2"
+                  "$ref": "#/components/schemas/ErrorResponseBody"
                 }
               }
             }
           },
           "403": {
-            "description": "Forbidden action"
+            "description": "Forbidden action",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponseBody"
+                }
+              }
+            }
           },
           "429": {
-            "description": "Rate limit exceeded"
+            "description": "Rate limit exceeded",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponseBody"
+                }
+              }
+            }
           },
           "500": {
-            "description": "Failed to create a log drain"
+            "description": "Failed to create a log drain",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponseBody"
+                }
+              }
+            }
           }
         },
         "security": [
@@ -203,16 +259,44 @@
             }
           },
           "401": {
-            "description": "Unauthorized"
+            "description": "Unauthorized",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponseBody"
+                }
+              }
+            }
           },
           "403": {
-            "description": "Forbidden action"
+            "description": "Forbidden action",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponseBody"
+                }
+              }
+            }
           },
           "429": {
-            "description": "Rate limit exceeded"
+            "description": "Rate limit exceeded",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponseBody"
+                }
+              }
+            }
           },
           "500": {
-            "description": "Failed to update log drain"
+            "description": "Failed to update log drain",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponseBody"
+                }
+              }
+            }
           }
         },
         "security": [
@@ -265,16 +349,44 @@
             "description": ""
           },
           "401": {
-            "description": "Unauthorized"
+            "description": "Unauthorized",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponseBody"
+                }
+              }
+            }
           },
           "403": {
-            "description": "Forbidden action"
+            "description": "Forbidden action",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponseBody"
+                }
+              }
+            }
           },
           "429": {
-            "description": "Rate limit exceeded"
+            "description": "Rate limit exceeded",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponseBody"
+                }
+              }
+            }
           },
           "500": {
-            "description": "Failed to delete a log drain"
+            "description": "Failed to delete a log drain",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponseBody"
+                }
+              }
+            }
           }
         },
         "security": [
@@ -295,6 +407,89 @@
         "x-oauth-scope": "analytics_config:write"
       }
     },
+    "/v2/projects/{ref}/config": {
+      "get": {
+        "description": "Returns the project's database, pooler, Auth, Data API, Realtime and Storage configuration — the same configuration a branch inherits from its base project. Each is the effective config, so a setting the project has never overridden is reported at its platform default rather than as null. Auth secrets are returned as an HMAC of their value. `storage` is read live from the storage service; the rest come from this platform's own records.",
+        "operationId": "v2-get-project-config",
+        "parameters": [
+          {
+            "name": "ref",
+            "required": true,
+            "in": "path",
+            "description": "Project ref",
+            "schema": {
+              "minLength": 20,
+              "maxLength": 20,
+              "pattern": "^[a-z]+$",
+              "example": "abcdefghijklmnopqrst",
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/V2ProjectConfigResponse"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "Unauthorized",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponseBody"
+                }
+              }
+            }
+          },
+          "403": {
+            "description": "Forbidden action",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponseBody"
+                }
+              }
+            }
+          },
+          "429": {
+            "description": "Rate limit exceeded",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponseBody"
+                }
+              }
+            }
+          }
+        },
+        "security": [
+          {
+            "bearer": []
+          }
+        ],
+        "summary": "[Alpha] Get a project's service configuration",
+        "tags": ["Projects"],
+        "x-endpoint-owners": ["control-plane", "infra"],
+        "x-fga-permissions": [
+          [
+            "database_config_read",
+            "database_read",
+            "database_ssl_config_read",
+            "database_network_restrictions_read",
+            "auth_config_read",
+            "data_api_config_read",
+            "realtime_config_read",
+            "storage_config_read"
+          ]
+        ]
+      }
+    },
     "/v2/projects/{ref}/transfers/previews": {
       "post": {
         "operationId": "v2-preview-a-project-transfer",
@@ -335,13 +530,34 @@
             }
           },
           "401": {
-            "description": "Unauthorized"
+            "description": "Unauthorized",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponseBody"
+                }
+              }
+            }
           },
           "403": {
-            "description": "Forbidden action"
+            "description": "Forbidden action",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponseBody"
+                }
+              }
+            }
           },
           "429": {
-            "description": "Rate limit exceeded"
+            "description": "Rate limit exceeded",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponseBody"
+                }
+              }
+            }
           }
         },
         "security": [
@@ -351,7 +567,7 @@
         ],
         "summary": "Previews transferring a project to a different organizations, shows eligibility and impact",
         "tags": ["Projects"],
-        "x-endpoint-owners": ["management-api"],
+        "x-endpoint-owners": ["control-plane"],
         "x-fga-permissions": [["project_admin_read"]]
       }
     },
@@ -388,13 +604,34 @@
             "description": ""
           },
           "401": {
-            "description": "Unauthorized"
+            "description": "Unauthorized",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponseBody"
+                }
+              }
+            }
           },
           "403": {
-            "description": "Forbidden action"
+            "description": "Forbidden action",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponseBody"
+                }
+              }
+            }
           },
           "429": {
-            "description": "Rate limit exceeded"
+            "description": "Rate limit exceeded",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponseBody"
+                }
+              }
+            }
           }
         },
         "security": [
@@ -404,7 +641,7 @@
         ],
         "summary": "Transfers a project to a different organization",
         "tags": ["Projects"],
-        "x-endpoint-owners": ["management-api"],
+        "x-endpoint-owners": ["control-plane"],
         "x-fga-permissions": [["organization_admin_write"]]
       }
     },
@@ -438,16 +675,44 @@
             }
           },
           "401": {
-            "description": "Unauthorized"
+            "description": "Unauthorized",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponseBody"
+                }
+              }
+            }
           },
           "403": {
-            "description": "Forbidden action"
+            "description": "Forbidden action",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponseBody"
+                }
+              }
+            }
           },
           "429": {
-            "description": "Rate limit exceeded"
+            "description": "Rate limit exceeded",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponseBody"
+                }
+              }
+            }
           },
           "500": {
-            "description": "Failed to retrieve AWS accounts for project"
+            "description": "Failed to retrieve AWS accounts for project",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponseBody"
+                }
+              }
+            }
           }
         },
         "security": [
@@ -457,7 +722,7 @@
         ],
         "summary": "List AWS accounts attached to the project PrivateLink share",
         "tags": ["Projects"],
-        "x-endpoint-owners": ["platform-networking", "management-api"],
+        "x-endpoint-owners": ["platform-networking", "control-plane"],
         "x-fga-permissions": [["project_admin_read"]]
       },
       "post": {
@@ -500,26 +765,54 @@
             }
           },
           "401": {
-            "description": "Unauthorized"
+            "description": "Unauthorized",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponseBody"
+                }
+              }
+            }
           },
           "402": {
             "description": "This feature requires the Team, or Enterprise organization plan.",
             "content": {
               "application/json": {
                 "schema": {
-                  "$ref": "#/components/schemas/PlanGateErrorBodyV2"
+                  "$ref": "#/components/schemas/ErrorResponseBody"
                 }
               }
             }
           },
           "403": {
-            "description": "Forbidden action"
+            "description": "Forbidden action",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponseBody"
+                }
+              }
+            }
           },
           "429": {
-            "description": "Rate limit exceeded"
+            "description": "Rate limit exceeded",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponseBody"
+                }
+              }
+            }
           },
           "500": {
-            "description": "Failed to add AWS account to PrivateLink share"
+            "description": "Failed to add AWS account to PrivateLink share",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponseBody"
+                }
+              }
+            }
           }
         },
         "security": [
@@ -536,7 +829,7 @@
             "position": "before"
           }
         ],
-        "x-endpoint-owners": ["platform-networking", "management-api"],
+        "x-endpoint-owners": ["platform-networking", "control-plane"],
         "x-fga-permissions": [["project_admin_write"]]
       }
     },
@@ -573,16 +866,44 @@
             "description": ""
           },
           "401": {
-            "description": "Unauthorized"
+            "description": "Unauthorized",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponseBody"
+                }
+              }
+            }
           },
           "403": {
-            "description": "Forbidden action"
+            "description": "Forbidden action",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponseBody"
+                }
+              }
+            }
           },
           "429": {
-            "description": "Rate limit exceeded"
+            "description": "Rate limit exceeded",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponseBody"
+                }
+              }
+            }
           },
           "500": {
-            "description": "Failed to remove AWS account from PrivateLink share"
+            "description": "Failed to remove AWS account from PrivateLink share",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponseBody"
+                }
+              }
+            }
           }
         },
         "security": [
@@ -592,7 +913,7 @@
         ],
         "summary": "Remove an AWS account from the project PrivateLink share",
         "tags": ["Projects"],
-        "x-endpoint-owners": ["platform-networking", "management-api"],
+        "x-endpoint-owners": ["platform-networking", "control-plane"],
         "x-fga-permissions": [["project_admin_write"]]
       }
     },
@@ -638,16 +959,44 @@
             "description": ""
           },
           "401": {
-            "description": "Unauthorized"
+            "description": "Unauthorized",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponseBody"
+                }
+              }
+            }
           },
           "403": {
-            "description": "Forbidden action"
+            "description": "Forbidden action",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponseBody"
+                }
+              }
+            }
           },
           "429": {
-            "description": "Rate limit exceeded"
+            "description": "Rate limit exceeded",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponseBody"
+                }
+              }
+            }
           },
           "500": {
-            "description": "Failed to remove AWS account from PrivateLink share"
+            "description": "Failed to remove AWS account from PrivateLink share",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponseBody"
+                }
+              }
+            }
           }
         },
         "security": [
@@ -657,10 +1006,446 @@
         ],
         "summary": "Remove an AWS account from a specific database PrivateLink share",
         "tags": ["Projects"],
-        "x-endpoint-owners": ["platform-networking", "management-api"],
+        "x-endpoint-owners": ["platform-networking", "control-plane"],
         "x-fga-permissions": [["project_admin_write"]]
       }
     },
+    "/v2/projects/{ref}/workers": {
+      "get": {
+        "description": "Returns all workers you've previously deployed to the specified project.",
+        "operationId": "v2-list-all-workers",
+        "parameters": [
+          {
+            "name": "ref",
+            "required": true,
+            "in": "path",
+            "description": "Project ref",
+            "schema": {
+              "minLength": 20,
+              "maxLength": 20,
+              "pattern": "^[a-z]+$",
+              "example": "abcdefghijklmnopqrst",
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/V2ListWorkersResponse"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "Unauthorized",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponseBody"
+                }
+              }
+            }
+          },
+          "403": {
+            "description": "Forbidden action",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponseBody"
+                }
+              }
+            }
+          },
+          "429": {
+            "description": "Rate limit exceeded",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponseBody"
+                }
+              }
+            }
+          }
+        },
+        "security": [
+          {
+            "bearer": []
+          }
+        ],
+        "summary": "[Alpha] List all workers",
+        "tags": ["Workers"],
+        "x-badges": [
+          {
+            "name": "OAuth scope: edge_functions:read",
+            "position": "after"
+          }
+        ],
+        "x-endpoint-owners": ["functions"],
+        "x-fga-permissions": [["workers_read"]],
+        "x-oauth-scope": "edge_functions:read"
+      }
+    },
+    "/v2/projects/{ref}/workers/{name}": {
+      "get": {
+        "description": "Returns a worker along with its instance tally. Poll this after a deploy until `build_state` leaves `building`.",
+        "operationId": "v2-get-a-worker",
+        "parameters": [
+          {
+            "name": "ref",
+            "required": true,
+            "in": "path",
+            "description": "Project ref",
+            "schema": {
+              "minLength": 20,
+              "maxLength": 20,
+              "pattern": "^[a-z]+$",
+              "example": "abcdefghijklmnopqrst",
+              "type": "string"
+            }
+          },
+          {
+            "name": "name",
+            "required": true,
+            "in": "path",
+            "schema": {
+              "pattern": "^[a-z0-9]([a-z0-9-]{0,61}[a-z0-9])?$",
+              "example": "hello-world",
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/V2WorkerResponse"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "Unauthorized",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponseBody"
+                }
+              }
+            }
+          },
+          "403": {
+            "description": "Forbidden action",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponseBody"
+                }
+              }
+            }
+          },
+          "429": {
+            "description": "Rate limit exceeded",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponseBody"
+                }
+              }
+            }
+          }
+        },
+        "security": [
+          {
+            "bearer": []
+          }
+        ],
+        "summary": "[Alpha] Retrieve a worker",
+        "tags": ["Workers"],
+        "x-badges": [
+          {
+            "name": "OAuth scope: edge_functions:read",
+            "position": "after"
+          }
+        ],
+        "x-endpoint-owners": ["functions"],
+        "x-fga-permissions": [["workers_read"]],
+        "x-oauth-scope": "edge_functions:read"
+      },
+      "delete": {
+        "description": "Tombstones the worker. Its instances and image are torn down asynchronously.",
+        "operationId": "v2-delete-a-worker",
+        "parameters": [
+          {
+            "name": "ref",
+            "required": true,
+            "in": "path",
+            "description": "Project ref",
+            "schema": {
+              "minLength": 20,
+              "maxLength": 20,
+              "pattern": "^[a-z]+$",
+              "example": "abcdefghijklmnopqrst",
+              "type": "string"
+            }
+          },
+          {
+            "name": "name",
+            "required": true,
+            "in": "path",
+            "schema": {
+              "pattern": "^[a-z0-9]([a-z0-9-]{0,61}[a-z0-9])?$",
+              "example": "hello-world",
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "204": {
+            "description": ""
+          },
+          "401": {
+            "description": "Unauthorized",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponseBody"
+                }
+              }
+            }
+          },
+          "403": {
+            "description": "Forbidden action",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponseBody"
+                }
+              }
+            }
+          },
+          "429": {
+            "description": "Rate limit exceeded",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponseBody"
+                }
+              }
+            }
+          }
+        },
+        "security": [
+          {
+            "bearer": []
+          }
+        ],
+        "summary": "[Alpha] Delete a worker",
+        "tags": ["Workers"],
+        "x-badges": [
+          {
+            "name": "OAuth scope: edge_functions:write",
+            "position": "after"
+          }
+        ],
+        "x-endpoint-owners": ["functions"],
+        "x-fga-permissions": [["workers_write"]],
+        "x-oauth-scope": "edge_functions:write"
+      }
+    },
+    "/v2/projects/{ref}/workers/{name}/uploads": {
+      "post": {
+        "description": "PUT the `.tar.gz` build context to the returned `url` before `expires_at`, then deploy with the upload id as `context_upload_id`. The bytes go straight to storage — no management API request carries them.",
+        "operationId": "v2-create-worker-upload",
+        "parameters": [
+          {
+            "name": "ref",
+            "required": true,
+            "in": "path",
+            "description": "Project ref",
+            "schema": {
+              "minLength": 20,
+              "maxLength": 20,
+              "pattern": "^[a-z]+$",
+              "example": "abcdefghijklmnopqrst",
+              "type": "string"
+            }
+          },
+          {
+            "name": "name",
+            "required": true,
+            "in": "path",
+            "schema": {
+              "pattern": "^[a-z0-9]([a-z0-9-]{0,61}[a-z0-9])?$",
+              "example": "hello-world",
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "201": {
+            "description": "",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/V2WorkerUploadResponse"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "Unauthorized",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponseBody"
+                }
+              }
+            }
+          },
+          "403": {
+            "description": "Forbidden action",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponseBody"
+                }
+              }
+            }
+          },
+          "429": {
+            "description": "Rate limit exceeded",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponseBody"
+                }
+              }
+            }
+          }
+        },
+        "security": [
+          {
+            "bearer": []
+          }
+        ],
+        "summary": "[Alpha] Mint a presigned slot for a build-context upload",
+        "tags": ["Workers"],
+        "x-badges": [
+          {
+            "name": "OAuth scope: edge_functions:write",
+            "position": "after"
+          }
+        ],
+        "x-endpoint-owners": ["functions"],
+        "x-fga-permissions": [["workers_write"]],
+        "x-oauth-scope": "edge_functions:write"
+      }
+    },
+    "/v2/projects/{ref}/workers/{name}/deploy": {
+      "post": {
+        "description": "Creates the worker if it does not exist, building from a context staged through the uploads endpoint. The build runs asynchronously: this answers 202 and the worker reaches `build_state` `active` or `failed` later.",
+        "operationId": "v2-deploy-a-worker",
+        "parameters": [
+          {
+            "name": "ref",
+            "required": true,
+            "in": "path",
+            "description": "Project ref",
+            "schema": {
+              "minLength": 20,
+              "maxLength": 20,
+              "pattern": "^[a-z]+$",
+              "example": "abcdefghijklmnopqrst",
+              "type": "string"
+            }
+          },
+          {
+            "name": "name",
+            "required": true,
+            "in": "path",
+            "schema": {
+              "pattern": "^[a-z0-9]([a-z0-9-]{0,61}[a-z0-9])?$",
+              "example": "hello-world",
+              "type": "string"
+            }
+          }
+        ],
+        "requestBody": {
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/V2DeployWorkerRequest"
+              }
+            }
+          }
+        },
+        "responses": {
+          "202": {
+            "description": "",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/V2WorkerResponse"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "Unauthorized",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponseBody"
+                }
+              }
+            }
+          },
+          "403": {
+            "description": "Forbidden action",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponseBody"
+                }
+              }
+            }
+          },
+          "429": {
+            "description": "Rate limit exceeded",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponseBody"
+                }
+              }
+            }
+          }
+        },
+        "security": [
+          {
+            "bearer": []
+          }
+        ],
+        "summary": "[Alpha] Deploy a worker",
+        "tags": ["Workers"],
+        "x-badges": [
+          {
+            "name": "OAuth scope: edge_functions:write",
+            "position": "after"
+          }
+        ],
+        "x-endpoint-owners": ["functions"],
+        "x-fga-permissions": [["workers_write"]],
+        "x-oauth-scope": "edge_functions:write"
+      }
+    },
     "/v2/organizations/{slug}/members": {
       "get": {
         "description": "Returns a cursor-paginated list of organization members including their roles and project-scoped permissions.",
@@ -735,13 +1520,34 @@
             }
           },
           "401": {
-            "description": "Unauthorized"
+            "description": "Unauthorized",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponseBody"
+                }
+              }
+            }
           },
           "403": {
-            "description": "Forbidden action"
+            "description": "Forbidden action",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponseBody"
+                }
+              }
+            }
           },
           "429": {
-            "description": "Rate limit exceeded"
+            "description": "Rate limit exceeded",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponseBody"
+                }
+              }
+            }
           }
         },
         "security": [
@@ -757,7 +1563,7 @@
             "position": "after"
           }
         ],
-        "x-endpoint-owners": ["management-api"],
+        "x-endpoint-owners": ["control-plane"],
         "x-fga-permissions": [["members_read"]],
         "x-oauth-scope": "organizations:read"
       }
@@ -811,26 +1617,54 @@
             }
           },
           "401": {
-            "description": "Unauthorized"
+            "description": "Unauthorized",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponseBody"
+                }
+              }
+            }
           },
           "402": {
             "description": "This feature requires the Enterprise organization plan.",
             "content": {
               "application/json": {
                 "schema": {
-                  "$ref": "#/components/schemas/PlanGateErrorBodyV2"
+                  "$ref": "#/components/schemas/ErrorResponseBody"
                 }
               }
             }
           },
           "403": {
-            "description": "Forbidden action"
+            "description": "Forbidden action",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponseBody"
+                }
+              }
+            }
           },
           "429": {
-            "description": "Rate limit exceeded"
+            "description": "Rate limit exceeded",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponseBody"
+                }
+              }
+            }
           },
           "500": {
-            "description": "Failed to assign organization member role"
+            "description": "Failed to assign organization member role",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponseBody"
+                }
+              }
+            }
           }
         },
         "security": [
@@ -847,7 +1681,7 @@
             "position": "before"
           }
         ],
-        "x-endpoint-owners": ["management-api"],
+        "x-endpoint-owners": ["control-plane"],
         "x-fga-permissions": [["organization_admin_write"]]
       }
     },
@@ -880,13 +1714,34 @@
             }
           },
           "401": {
-            "description": "Unauthorized"
+            "description": "Unauthorized",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponseBody"
+                }
+              }
+            }
           },
           "403": {
-            "description": "Forbidden action"
+            "description": "Forbidden action",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponseBody"
+                }
+              }
+            }
           },
           "429": {
-            "description": "Rate limit exceeded"
+            "description": "Rate limit exceeded",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponseBody"
+                }
+              }
+            }
           }
         },
         "security": [
@@ -902,7 +1757,7 @@
             "position": "after"
           }
         ],
-        "x-endpoint-owners": ["management-api"],
+        "x-endpoint-owners": ["control-plane"],
         "x-fga-permissions": [["members_read"]],
         "x-oauth-scope": "organizations:read"
       }
@@ -946,23 +1801,44 @@
             }
           },
           "401": {
-            "description": "Unauthorized"
+            "description": "Unauthorized",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponseBody"
+                }
+              }
+            }
           },
           "402": {
             "description": "This feature requires the Enterprise organization plan.",
             "content": {
               "application/json": {
                 "schema": {
-                  "$ref": "#/components/schemas/PlanGateErrorBodyV2"
+                  "$ref": "#/components/schemas/ErrorResponseBody"
                 }
               }
             }
           },
           "403": {
-            "description": "Forbidden action"
+            "description": "Forbidden action",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponseBody"
+                }
+              }
+            }
           },
           "429": {
-            "description": "Rate limit exceeded"
+            "description": "Rate limit exceeded",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponseBody"
+                }
+              }
+            }
           }
         },
         "security": [
@@ -983,7 +1859,7 @@
             "position": "before"
           }
         ],
-        "x-endpoint-owners": ["management-api"],
+        "x-endpoint-owners": ["control-plane"],
         "x-fga-permissions": [["members_write"]],
         "x-oauth-scope": "organizations:write"
       },
@@ -1025,23 +1901,44 @@
             }
           },
           "401": {
-            "description": "Unauthorized"
+            "description": "Unauthorized",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponseBody"
+                }
+              }
+            }
           },
           "402": {
             "description": "This feature requires the Enterprise organization plan.",
             "content": {
               "application/json": {
                 "schema": {
-                  "$ref": "#/components/schemas/PlanGateErrorBodyV2"
+                  "$ref": "#/components/schemas/ErrorResponseBody"
                 }
               }
             }
           },
           "403": {
-            "description": "Forbidden action"
+            "description": "Forbidden action",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponseBody"
+                }
+              }
+            }
           },
           "429": {
-            "description": "Rate limit exceeded"
+            "description": "Rate limit exceeded",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponseBody"
+                }
+              }
+            }
           }
         },
         "security": [
@@ -1062,7 +1959,7 @@
             "position": "before"
           }
         ],
-        "x-endpoint-owners": ["management-api"],
+        "x-endpoint-owners": ["control-plane"],
         "x-fga-permissions": [["members_write"]],
         "x-oauth-scope": "organizations:write"
       }
@@ -1141,13 +2038,34 @@
             }
           },
           "401": {
-            "description": "Unauthorized"
+            "description": "Unauthorized",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponseBody"
+                }
+              }
+            }
           },
           "403": {
-            "description": "Forbidden action"
+            "description": "Forbidden action",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponseBody"
+                }
+              }
+            }
           },
           "429": {
-            "description": "Rate limit exceeded"
+            "description": "Rate limit exceeded",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponseBody"
+                }
+              }
+            }
           }
         },
         "security": [
@@ -1163,7 +2081,7 @@
             "position": "after"
           }
         ],
-        "x-endpoint-owners": ["management-api"],
+        "x-endpoint-owners": ["control-plane"],
         "x-fga-permissions": [["organization_projects_read"]],
         "x-oauth-scope": "projects:read"
       }
@@ -1248,13 +2166,34 @@
             }
           },
           "401": {
-            "description": "Unauthorized"
+            "description": "Unauthorized",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponseBody"
+                }
+              }
+            }
           },
           "403": {
-            "description": "Forbidden action"
+            "description": "Forbidden action",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponseBody"
+                }
+              }
+            }
           },
           "429": {
-            "description": "Rate limit exceeded"
+            "description": "Rate limit exceeded",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponseBody"
+                }
+              }
+            }
           }
         },
         "security": [
@@ -1270,14 +2209,14 @@
             "position": "after"
           }
         ],
-        "x-endpoint-owners": ["management-api", "dev-workflows"],
+        "x-endpoint-owners": ["control-plane", "dev-workflows"],
         "x-fga-permissions": [["organization_projects_read"]],
         "x-oauth-scope": "projects:read"
       }
     },
     "/v2/projects/{ref}/webhooks/endpoints": {
       "get": {
-        "operationId": "allV2ProjectsByRefWebhooks",
+        "operationId": "v2-projects-ref-webhooks-endpoints-get",
         "parameters": [
           {
             "in": "path",
@@ -2257,7 +3196,7 @@
         "description": "List all Webhook endpoints based on a project's ref or an organization's slug."
       },
       "post": {
-        "operationId": "allV2ProjectsByRefWebhooks",
+        "operationId": "v2-projects-ref-webhooks-endpoints-post",
         "parameters": [
           {
             "in": "path",
@@ -3283,7 +4222,7 @@
         }
       },
       "delete": {
-        "operationId": "allV2ProjectsByRefWebhooks",
+        "operationId": "v2-projects-ref-webhooks-endpoints-delete",
         "parameters": [
           {
             "in": "path",
@@ -4191,7 +5130,7 @@
     },
     "/v2/projects/{ref}/webhooks/endpoints/{id}": {
       "get": {
-        "operationId": "allV2ProjectsByRefWebhooks",
+        "operationId": "v2-projects-ref-webhooks-endpoints-id-get",
         "parameters": [
           {
             "in": "path",
@@ -5200,7 +6139,7 @@
         "description": "Get details of a specific endpoint."
       },
       "patch": {
-        "operationId": "allV2ProjectsByRefWebhooks",
+        "operationId": "v2-projects-ref-webhooks-endpoints-id-patch",
         "parameters": [
           {
             "in": "path",
@@ -6330,7 +7269,7 @@
         }
       },
       "delete": {
-        "operationId": "allV2ProjectsByRefWebhooks",
+        "operationId": "v2-projects-ref-webhooks-endpoints-id-delete",
         "parameters": [
           {
             "in": "path",
@@ -7341,7 +8280,7 @@
     },
     "/v2/projects/{ref}/webhooks/endpoints/{id}/deliveries": {
       "get": {
-        "operationId": "allV2ProjectsByRefWebhooks",
+        "operationId": "v2-projects-ref-webhooks-endpoints-id-deliveries-get",
         "parameters": [
           {
             "in": "path",
@@ -8406,7 +9345,7 @@
     },
     "/v2/projects/{ref}/webhooks/endpoints/{id}/test": {
       "post": {
-        "operationId": "allV2ProjectsByRefWebhooks",
+        "operationId": "v2-projects-ref-webhooks-endpoints-id-test-post",
         "parameters": [
           {
             "in": "path",
@@ -9526,7 +10465,7 @@
     },
     "/v2/projects/{ref}/webhooks/deliveries/{id}": {
       "get": {
-        "operationId": "allV2ProjectsByRefWebhooks",
+        "operationId": "v2-projects-ref-webhooks-deliveries-id-get",
         "parameters": [
           {
             "in": "path",
@@ -10593,7 +11532,7 @@
     },
     "/v2/projects/{ref}/webhooks/deliveries/{id}/retry": {
       "post": {
-        "operationId": "allV2ProjectsByRefWebhooks",
+        "operationId": "v2-projects-ref-webhooks-deliveries-id-retry-post",
         "parameters": [
           {
             "in": "path",
@@ -11483,7 +12422,7 @@
     },
     "/v2/organizations/{slug}/webhooks/endpoints": {
       "get": {
-        "operationId": "allV2OrganizationsBySlugWebhooks",
+        "operationId": "v2-organizations-slug-webhooks-endpoints-get",
         "parameters": [
           {
             "in": "path",
@@ -12461,7 +13400,7 @@
         "description": "List all Webhook endpoints based on a project's ref or an organization's slug."
       },
       "post": {
-        "operationId": "allV2OrganizationsBySlugWebhooks",
+        "operationId": "v2-organizations-slug-webhooks-endpoints-post",
         "parameters": [
           {
             "in": "path",
@@ -13485,7 +14424,7 @@
         }
       },
       "delete": {
-        "operationId": "allV2OrganizationsBySlugWebhooks",
+        "operationId": "v2-organizations-slug-webhooks-endpoints-delete",
         "parameters": [
           {
             "in": "path",
@@ -14391,7 +15330,7 @@
     },
     "/v2/organizations/{slug}/webhooks/endpoints/{id}": {
       "get": {
-        "operationId": "allV2OrganizationsBySlugWebhooks",
+        "operationId": "v2-organizations-slug-webhooks-endpoints-id-get",
         "parameters": [
           {
             "in": "path",
@@ -15398,7 +16337,7 @@
         "description": "Get details of a specific endpoint."
       },
       "patch": {
-        "operationId": "allV2OrganizationsBySlugWebhooks",
+        "operationId": "v2-organizations-slug-webhooks-endpoints-id-patch",
         "parameters": [
           {
             "in": "path",
@@ -16526,7 +17465,7 @@
         }
       },
       "delete": {
-        "operationId": "allV2OrganizationsBySlugWebhooks",
+        "operationId": "v2-organizations-slug-webhooks-endpoints-id-delete",
         "parameters": [
           {
             "in": "path",
@@ -17535,7 +18474,7 @@
     },
     "/v2/organizations/{slug}/webhooks/endpoints/{id}/deliveries": {
       "get": {
-        "operationId": "allV2OrganizationsBySlugWebhooks",
+        "operationId": "v2-organizations-slug-webhooks-endpoints-id-deliveries-get",
         "parameters": [
           {
             "in": "path",
@@ -18598,7 +19537,7 @@
     },
     "/v2/organizations/{slug}/webhooks/endpoints/{id}/test": {
       "post": {
-        "operationId": "allV2OrganizationsBySlugWebhooks",
+        "operationId": "v2-organizations-slug-webhooks-endpoints-id-test-post",
         "parameters": [
           {
             "in": "path",
@@ -19716,7 +20655,7 @@
     },
     "/v2/organizations/{slug}/webhooks/deliveries/{id}": {
       "get": {
-        "operationId": "allV2OrganizationsBySlugWebhooks",
+        "operationId": "v2-organizations-slug-webhooks-deliveries-id-get",
         "parameters": [
           {
             "in": "path",
@@ -20781,7 +21720,7 @@
     },
     "/v2/organizations/{slug}/webhooks/deliveries/{id}/retry": {
       "post": {
-        "operationId": "allV2OrganizationsBySlugWebhooks",
+        "operationId": "v2-organizations-slug-webhooks-deliveries-id-retry-post",
         "parameters": [
           {
             "in": "path",
@@ -21895,6 +22834,72 @@
         },
         "required": ["data"]
       },
+      "ErrorResponseBodyAPIErrorObject": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string"
+          },
+          "code": {
+            "type": "string"
+          },
+          "message": {
+            "type": "string"
+          },
+          "description": {
+            "type": "string"
+          },
+          "links": {
+            "type": "object",
+            "additionalProperties": {
+              "type": "object",
+              "properties": {
+                "href": {
+                  "type": "string"
+                },
+                "rel": {
+                  "type": "string"
+                },
+                "title": {
+                  "type": "string"
+                },
+                "type": {
+                  "type": "string"
+                },
+                "describedby": {
+                  "type": "string"
+                },
+                "meta": {
+                  "type": "object",
+                  "additionalProperties": {}
+                }
+              },
+              "required": ["href"]
+            }
+          },
+          "meta": {
+            "type": "object",
+            "additionalProperties": {}
+          },
+          "issues": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/ErrorResponseBodyAPIErrorObject"
+            }
+          }
+        },
+        "required": ["code", "message"],
+        "ref": "APIErrorObject"
+      },
+      "ErrorResponseBody": {
+        "type": "object",
+        "properties": {
+          "error": {
+            "$ref": "#/components/schemas/ErrorResponseBodyAPIErrorObject"
+          }
+        },
+        "required": ["error"]
+      },
       "CreateLogDrainRequestOpenApi": {
         "type": "object",
         "properties": {
@@ -22322,27 +23327,6 @@
         },
         "required": ["data"]
       },
-      "PlanGateErrorBodyV2": {
-        "type": "object",
-        "properties": {
-          "error": {
-            "type": "object",
-            "properties": {
-              "code": {
-                "type": "string",
-                "description": "HTTP status-derived error code, e.g. \"payment_required\""
-              },
-              "message": {
-                "type": "string",
-                "description": "Human-readable explanation of the plan gate"
-              }
-            },
-            "required": ["code", "message"],
-            "description": "Plan-gate error object"
-          }
-        },
-        "required": ["error"]
-      },
       "UpdateLogDrainRequestOpenApi": {
         "type": "object",
         "properties": {
@@ -22555,6 +23539,537 @@
         },
         "required": ["data"]
       },
+      "V2ProjectConfigResponse": {
+        "type": "object",
+        "properties": {
+          "data": {
+            "type": "object",
+            "properties": {
+              "type": {
+                "type": "string",
+                "description": "Resource type.",
+                "enum": ["project_config"]
+              },
+              "id": {
+                "type": "string",
+                "description": "Project ref."
+              },
+              "attributes": {
+                "type": "object",
+                "properties": {
+                  "database": {
+                    "type": "object",
+                    "properties": {
+                      "major_version": {
+                        "type": "integer",
+                        "minimum": -9007199254740991,
+                        "maximum": 9007199254740991,
+                        "description": "The major Postgres version the database runs. `17` covers both Postgres 17 and Oriole on 17, since Oriole is a storage engine rather than a version."
+                      },
+                      "ssl_enforced": {
+                        "type": "boolean",
+                        "description": "Whether the database rejects plaintext connections"
+                      },
+                      "network_restrictions": {
+                        "type": "object",
+                        "properties": {
+                          "entitlement": {
+                            "type": "string",
+                            "enum": ["disallowed", "allowed"]
+                          },
+                          "status": {
+                            "type": "string",
+                            "enum": ["stored", "applied"],
+                            "description": "Whether the allowlist below is applied to the project or only stored."
+                          },
+                          "allowed_cidrs": {
+                            "type": "array",
+                            "items": {
+                              "type": "object",
+                              "properties": {
+                                "address": {
+                                  "type": "string"
+                                },
+                                "type": {
+                                  "type": "string",
+                                  "enum": ["v4", "v6"]
+                                }
+                              },
+                              "required": ["address", "type"]
+                            }
+                          },
+                          "updated_at": {
+                            "type": "string"
+                          },
+                          "applied_at": {
+                            "type": "string"
+                          }
+                        },
+                        "required": ["entitlement", "status", "allowed_cidrs"]
+                      },
+                      "postgres_settings": {
+                        "type": "object",
+                        "properties": {
+                          "effective_cache_size": {
+                            "type": "string"
+                          },
+                          "logical_decoding_work_mem": {
+                            "type": "string"
+                          },
+                          "log_autovacuum_min_duration": {
+                            "type": "string",
+                            "description": "Default unit: ms",
+                            "pattern": "^(-?[0-9]+(?:\\.[0-9]+)?)(us|ms|s|min|h|d)?$"
+                          },
+                          "log_checkpoints": {
+                            "type": "boolean"
+                          },
+                          "log_connections": {
+                            "type": "boolean"
+                          },
+                          "log_disconnections": {
+                            "type": "boolean"
+                          },
+                          "log_duration": {
+                            "type": "boolean"
+                          },
+                          "log_lock_waits": {
+                            "type": "boolean"
+                          },
+                          "log_recovery_conflict_waits": {
+                            "type": "boolean"
+                          },
+                          "log_replication_commands": {
+                            "type": "boolean"
+                          },
+                          "log_startup_progress_interval": {
+                            "type": "string",
+                            "description": "Default unit: ms",
+                            "pattern": "^(-?[0-9]+(?:\\.[0-9]+)?)(us|ms|s|min|h|d)?$"
+                          },
+                          "log_temp_files": {
+                            "type": "string"
+                          },
+                          "maintenance_work_mem": {
+                            "type": "string"
+                          },
+                          "track_activity_query_size": {
+                            "type": "string"
+                          },
+                          "max_connections": {
+                            "type": "integer",
+                            "minimum": 1,
+                            "maximum": 262143
+                          },
+                          "max_locks_per_transaction": {
+                            "type": "integer",
+                            "minimum": 10,
+                            "maximum": 2147483640
+                          },
+                          "max_logical_replication_workers": {
+                            "type": "integer",
+                            "minimum": 0,
+                            "maximum": 262143
+                          },
+                          "max_parallel_maintenance_workers": {
+                            "type": "integer",
+                            "minimum": 0,
+                            "maximum": 1024
+                          },
+                          "max_parallel_workers": {
+                            "type": "integer",
+                            "minimum": 0,
+                            "maximum": 1024
+                          },
+                          "max_parallel_workers_per_gather": {
+                            "type": "integer",
+                            "minimum": 0,
+                            "maximum": 1024
+                          },
+                          "max_replication_slots": {
+                            "type": "integer",
+                            "minimum": -9007199254740991,
+                            "maximum": 9007199254740991
+                          },
+                          "max_slot_wal_keep_size": {
+                            "type": "string"
+                          },
+                          "max_standby_archive_delay": {
+                            "type": "string"
+                          },
+                          "max_standby_streaming_delay": {
+                            "type": "string"
+                          },
+                          "max_sync_workers_per_subscription": {
+                            "type": "integer",
+                            "minimum": 0,
+                            "maximum": 262143
+                          },
+                          "max_wal_size": {
+                            "type": "string"
+                          },
+                          "max_wal_senders": {
+                            "type": "integer",
+                            "minimum": -9007199254740991,
+                            "maximum": 9007199254740991
+                          },
+                          "max_worker_processes": {
+                            "type": "integer",
+                            "minimum": 0,
+                            "maximum": 262143
+                          },
+                          "session_replication_role": {
+                            "type": "string",
+                            "enum": ["origin", "replica", "local"]
+                          },
+                          "shared_buffers": {
+                            "type": "string"
+                          },
+                          "statement_timeout": {
+                            "type": "string",
+                            "description": "Default unit: ms",
+                            "pattern": "^(-?[0-9]+(?:\\.[0-9]+)?)(us|ms|s|min|h|d)?$"
+                          },
+                          "track_commit_timestamp": {
+                            "type": "boolean"
+                          },
+                          "wal_keep_size": {
+                            "type": "string"
+                          },
+                          "wal_sender_timeout": {
+                            "type": "string",
+                            "description": "Default unit: ms",
+                            "pattern": "^(-?[0-9]+(?:\\.[0-9]+)?)(us|ms|s|min|h|d)?$"
+                          },
+                          "work_mem": {
+                            "type": "string"
+                          },
+                          "checkpoint_timeout": {
+                            "type": "string",
+                            "description": "Default unit: s",
+                            "pattern": "^(-?[0-9]+(?:\\.[0-9]+)?)(us|ms|s|min|h|d)?$"
+                          },
+                          "hot_standby_feedback": {
+                            "type": "boolean"
+                          },
+                          "cron_log_statement": {
+                            "type": "boolean"
+                          }
+                        },
+                        "description": "Postgres parameter overrides. Empty when the project runs entirely on defaults."
+                      }
+                    },
+                    "required": [
+                      "major_version",
+                      "ssl_enforced",
+                      "network_restrictions",
+                      "postgres_settings"
+                    ]
+                  },
+                  "pooler": {
+                    "type": "object",
+                    "properties": {
+                      "pool_mode": {
+                        "type": "string",
+                        "enum": ["transaction", "session", "statement"]
+                      },
+                      "ignore_startup_parameters": {
+                        "type": "string"
+                      },
+                      "server_idle_timeout": {
+                        "type": "integer",
+                        "minimum": -9007199254740991,
+                        "maximum": 9007199254740991
+                      },
+                      "server_lifetime": {
+                        "type": "integer",
+                        "minimum": -9007199254740991,
+                        "maximum": 9007199254740991
+                      },
+                      "query_wait_timeout": {
+                        "type": "integer",
+                        "minimum": -9007199254740991,
+                        "maximum": 9007199254740991
+                      },
+                      "reserve_pool_size": {
+                        "type": "integer",
+                        "minimum": -9007199254740991,
+                        "maximum": 9007199254740991
+                      },
+                      "default_pool_size": {
+                        "type": "integer",
+                        "minimum": -9007199254740991,
+                        "maximum": 9007199254740991,
+                        "description": "Defaults to the pooler's size for the project's compute when not overridden."
+                      },
+                      "max_client_conn": {
+                        "type": "integer",
+                        "minimum": -9007199254740991,
+                        "maximum": 9007199254740991,
+                        "description": "Defaults to the pooler's size for the project's compute when not overridden."
+                      }
+                    },
+                    "required": [
+                      "pool_mode",
+                      "ignore_startup_parameters",
+                      "server_idle_timeout",
+                      "server_lifetime",
+                      "query_wait_timeout",
+                      "reserve_pool_size",
+                      "default_pool_size",
+                      "max_client_conn"
+                    ]
+                  },
+                  "auth": {
+                    "type": "object",
+                    "additionalProperties": {},
+                    "description": "Effective Auth config, keyed by lowercased GoTrue setting name and resolved through the `gotrue_config` view, so a setting the project has never overridden is reported at its platform default. Secrets are returned as an HMAC of their value, never in plaintext."
+                  },
+                  "api": {
+                    "type": "object",
+                    "properties": {
+                      "db_schema": {
+                        "type": "string",
+                        "description": "Schemas exposed through the Data API"
+                      },
+                      "db_extra_search_path": {
+                        "type": "string"
+                      },
+                      "max_rows": {
+                        "type": "integer",
+                        "minimum": -9007199254740991,
+                        "maximum": 9007199254740991
+                      },
+                      "db_pool_acquisition_timeout": {
+                        "type": "integer",
+                        "minimum": -9007199254740991,
+                        "maximum": 9007199254740991
+                      },
+                      "db_pool": {
+                        "type": "integer",
+                        "minimum": -9007199254740991,
+                        "maximum": 9007199254740991,
+                        "description": "If `null`, no pool size is written to the project's PostgREST config and PostgREST's own default applies. The platform does not pick a value here.",
+                        "nullable": true
+                      }
+                    },
+                    "required": [
+                      "db_schema",
+                      "db_extra_search_path",
+                      "max_rows",
+                      "db_pool_acquisition_timeout",
+                      "db_pool"
+                    ]
+                  },
+                  "realtime": {
+                    "type": "object",
+                    "properties": {
+                      "private_only": {
+                        "type": "boolean"
+                      },
+                      "max_concurrent_users": {
+                        "type": "integer",
+                        "minimum": -9007199254740991,
+                        "maximum": 9007199254740991
+                      },
+                      "max_events_per_second": {
+                        "type": "integer",
+                        "minimum": -9007199254740991,
+                        "maximum": 9007199254740991
+                      },
+                      "max_bytes_per_second": {
+                        "type": "integer",
+                        "minimum": -9007199254740991,
+                        "maximum": 9007199254740991
+                      },
+                      "max_channels_per_client": {
+                        "type": "integer",
+                        "minimum": -9007199254740991,
+                        "maximum": 9007199254740991
+                      },
+                      "max_joins_per_second": {
+                        "type": "integer",
+                        "minimum": -9007199254740991,
+                        "maximum": 9007199254740991
+                      },
+                      "max_presence_events_per_second": {
+                        "type": "integer",
+                        "minimum": -9007199254740991,
+                        "maximum": 9007199254740991
+                      },
+                      "max_payload_size_in_kb": {
+                        "type": "integer",
+                        "minimum": -9007199254740991,
+                        "maximum": 9007199254740991
+                      },
+                      "presence_enabled": {
+                        "type": "boolean"
+                      },
+                      "suspend": {
+                        "type": "boolean"
+                      },
+                      "connection_pool": {
+                        "type": "integer",
+                        "minimum": -9007199254740991,
+                        "maximum": 9007199254740991,
+                        "description": "Defaults to Realtime's pool size for the project's compute when not overridden."
+                      },
+                      "postgres_changes_pool": {
+                        "type": "integer",
+                        "minimum": -9007199254740991,
+                        "maximum": 9007199254740991,
+                        "description": "If `null`, no override is stored and Realtime applies its own default.",
+                        "nullable": true
+                      }
+                    },
+                    "required": [
+                      "private_only",
+                      "max_concurrent_users",
+                      "max_events_per_second",
+                      "max_bytes_per_second",
+                      "max_channels_per_client",
+                      "max_joins_per_second",
+                      "max_presence_events_per_second",
+                      "max_payload_size_in_kb",
+                      "presence_enabled",
+                      "suspend",
+                      "connection_pool",
+                      "postgres_changes_pool"
+                    ]
+                  },
+                  "storage": {
+                    "type": "object",
+                    "properties": {
+                      "file_size_limit": {
+                        "type": "integer",
+                        "minimum": -9007199254740991,
+                        "maximum": 9007199254740991,
+                        "format": "int64"
+                      },
+                      "features": {
+                        "type": "object",
+                        "properties": {
+                          "image_transformation": {
+                            "type": "object",
+                            "properties": {
+                              "enabled": {
+                                "type": "boolean"
+                              }
+                            },
+                            "required": ["enabled"]
+                          },
+                          "s3_protocol": {
+                            "type": "object",
+                            "properties": {
+                              "enabled": {
+                                "type": "boolean"
+                              }
+                            },
+                            "required": ["enabled"]
+                          },
+                          "purge_cache": {
+                            "type": "object",
+                            "properties": {
+                              "enabled": {
+                                "type": "boolean"
+                              }
+                            },
+                            "required": ["enabled"]
+                          },
+                          "iceberg_catalog": {
+                            "type": "object",
+                            "properties": {
+                              "enabled": {
+                                "type": "boolean"
+                              },
+                              "max_namespaces": {
+                                "type": "integer",
+                                "minimum": -9007199254740991,
+                                "maximum": 9007199254740991
+                              },
+                              "max_tables": {
+                                "type": "integer",
+                                "minimum": -9007199254740991,
+                                "maximum": 9007199254740991
+                              },
+                              "max_catalogs": {
+                                "type": "integer",
+                                "minimum": -9007199254740991,
+                                "maximum": 9007199254740991
+                              }
+                            },
+                            "required": ["enabled", "max_namespaces", "max_tables", "max_catalogs"]
+                          },
+                          "vector_buckets": {
+                            "type": "object",
+                            "properties": {
+                              "enabled": {
+                                "type": "boolean"
+                              },
+                              "max_buckets": {
+                                "type": "integer",
+                                "minimum": -9007199254740991,
+                                "maximum": 9007199254740991
+                              },
+                              "max_indexes": {
+                                "type": "integer",
+                                "minimum": -9007199254740991,
+                                "maximum": 9007199254740991
+                              }
+                            },
+                            "required": ["enabled", "max_buckets", "max_indexes"]
+                          }
+                        },
+                        "required": [
+                          "image_transformation",
+                          "s3_protocol",
+                          "purge_cache",
+                          "iceberg_catalog",
+                          "vector_buckets"
+                        ]
+                      },
+                      "capabilities": {
+                        "type": "object",
+                        "properties": {
+                          "list_v2": {
+                            "type": "boolean"
+                          },
+                          "iceberg_catalog": {
+                            "type": "boolean"
+                          }
+                        },
+                        "required": ["list_v2", "iceberg_catalog"]
+                      },
+                      "upstream_target": {
+                        "type": "string",
+                        "enum": ["main", "canary"]
+                      },
+                      "migration_version": {
+                        "type": "string"
+                      },
+                      "database_pool_mode": {
+                        "type": "string"
+                      }
+                    },
+                    "required": [
+                      "file_size_limit",
+                      "features",
+                      "capabilities",
+                      "upstream_target",
+                      "migration_version",
+                      "database_pool_mode"
+                    ],
+                    "description": "Read from the storage service's admin API rather than the middleware DB, so unlike the rest of this resource it reflects the tenant's live config."
+                  }
+                },
+                "required": ["database", "pooler", "auth", "api", "realtime", "storage"]
+              }
+            },
+            "required": ["type", "id", "attributes"]
+          }
+        },
+        "required": ["data"]
+      },
       "V2TransferProjectBody": {
         "type": "object",
         "properties": {
@@ -22709,6 +24224,18 @@
                     "database_identifier": {
                       "type": "string",
                       "description": "Identifier of the database this PrivateLink share targets - the project ref for the primary, or the read replica identifier."
+                    },
+                    "resource_access_manager_resource_config_id": {
+                      "description": "ID of the AWS VPC Lattice resource configuration backing this PrivateLink share.",
+                      "type": "string"
+                    },
+                    "resource_access_manager_resource_config_arn": {
+                      "description": "ARN of the AWS VPC Lattice resource configuration backing this PrivateLink share.",
+                      "type": "string"
+                    },
+                    "resource_access_manager_share_arn": {
+                      "description": "ARN of the AWS Resource Access Manager resource share for this association.",
+                      "type": "string"
                     }
                   },
                   "required": [
@@ -22820,6 +24347,18 @@
                   "database_identifier": {
                     "type": "string",
                     "description": "Identifier of the database this PrivateLink share targets - the project ref for the primary, or the read replica identifier."
+                  },
+                  "resource_access_manager_resource_config_id": {
+                    "description": "ID of the AWS VPC Lattice resource configuration backing this PrivateLink share.",
+                    "type": "string"
+                  },
+                  "resource_access_manager_resource_config_arn": {
+                    "description": "ARN of the AWS VPC Lattice resource configuration backing this PrivateLink share.",
+                    "type": "string"
+                  },
+                  "resource_access_manager_share_arn": {
+                    "description": "ARN of the AWS Resource Access Manager resource share for this association.",
+                    "type": "string"
                   }
                 },
                 "required": [
@@ -22836,6 +24375,294 @@
         },
         "required": ["data"]
       },
+      "V2ListWorkersResponse": {
+        "type": "object",
+        "properties": {
+          "data": {
+            "type": "array",
+            "items": {
+              "type": "object",
+              "properties": {
+                "type": {
+                  "type": "string",
+                  "description": "Resource type.",
+                  "enum": ["project_worker"]
+                },
+                "id": {
+                  "type": "string",
+                  "description": "Worker name.",
+                  "example": "hello-world"
+                },
+                "attributes": {
+                  "type": "object",
+                  "properties": {
+                    "spec": {
+                      "type": "object",
+                      "properties": {
+                        "runtime": {
+                          "example": "node",
+                          "type": "string"
+                        },
+                        "size": {
+                          "type": "string",
+                          "example": "2gb-1vcpu"
+                        },
+                        "exposure": {
+                          "type": "string",
+                          "example": "public"
+                        },
+                        "instances": {
+                          "type": "integer",
+                          "minimum": -9007199254740991,
+                          "maximum": 9007199254740991,
+                          "example": 1
+                        }
+                      },
+                      "required": ["size", "exposure", "instances"]
+                    },
+                    "build_state": {
+                      "type": "string",
+                      "enum": ["building", "active", "failed"]
+                    },
+                    "secret_generation": {
+                      "type": "string"
+                    },
+                    "state_reason": {
+                      "type": "string"
+                    },
+                    "image_version": {
+                      "type": "string"
+                    },
+                    "deleting": {
+                      "type": "boolean"
+                    },
+                    "instances": {
+                      "type": "object",
+                      "properties": {
+                        "declared": {
+                          "type": "integer",
+                          "minimum": -9007199254740991,
+                          "maximum": 9007199254740991
+                        },
+                        "live": {
+                          "type": "integer",
+                          "minimum": -9007199254740991,
+                          "maximum": 9007199254740991
+                        },
+                        "ready": {
+                          "type": "integer",
+                          "minimum": -9007199254740991,
+                          "maximum": 9007199254740991
+                        },
+                        "stale": {
+                          "type": "integer",
+                          "minimum": -9007199254740991,
+                          "maximum": 9007199254740991
+                        }
+                      },
+                      "required": ["declared", "live", "ready", "stale"]
+                    },
+                    "instances_error": {
+                      "type": "string"
+                    }
+                  },
+                  "required": ["spec", "build_state", "secret_generation"]
+                }
+              },
+              "required": ["type", "id", "attributes"]
+            }
+          }
+        },
+        "required": ["data"]
+      },
+      "V2WorkerResponse": {
+        "type": "object",
+        "properties": {
+          "data": {
+            "type": "object",
+            "properties": {
+              "type": {
+                "type": "string",
+                "description": "Resource type.",
+                "enum": ["project_worker"]
+              },
+              "id": {
+                "type": "string",
+                "description": "Worker name.",
+                "example": "hello-world"
+              },
+              "attributes": {
+                "type": "object",
+                "properties": {
+                  "spec": {
+                    "type": "object",
+                    "properties": {
+                      "runtime": {
+                        "example": "node",
+                        "type": "string"
+                      },
+                      "size": {
+                        "type": "string",
+                        "example": "2gb-1vcpu"
+                      },
+                      "exposure": {
+                        "type": "string",
+                        "example": "public"
+                      },
+                      "instances": {
+                        "type": "integer",
+                        "minimum": -9007199254740991,
+                        "maximum": 9007199254740991,
+                        "example": 1
+                      }
+                    },
+                    "required": ["size", "exposure", "instances"]
+                  },
+                  "build_state": {
+                    "type": "string",
+                    "enum": ["building", "active", "failed"]
+                  },
+                  "secret_generation": {
+                    "type": "string"
+                  },
+                  "state_reason": {
+                    "type": "string"
+                  },
+                  "image_version": {
+                    "type": "string"
+                  },
+                  "deleting": {
+                    "type": "boolean"
+                  },
+                  "instances": {
+                    "type": "object",
+                    "properties": {
+                      "declared": {
+                        "type": "integer",
+                        "minimum": -9007199254740991,
+                        "maximum": 9007199254740991
+                      },
+                      "live": {
+                        "type": "integer",
+                        "minimum": -9007199254740991,
+                        "maximum": 9007199254740991
+                      },
+                      "ready": {
+                        "type": "integer",
+                        "minimum": -9007199254740991,
+                        "maximum": 9007199254740991
+                      },
+                      "stale": {
+                        "type": "integer",
+                        "minimum": -9007199254740991,
+                        "maximum": 9007199254740991
+                      }
+                    },
+                    "required": ["declared", "live", "ready", "stale"]
+                  },
+                  "instances_error": {
+                    "type": "string"
+                  }
+                },
+                "required": ["spec", "build_state", "secret_generation"]
+              }
+            },
+            "required": ["type", "id", "attributes"]
+          }
+        },
+        "required": ["data"]
+      },
+      "V2WorkerUploadResponse": {
+        "type": "object",
+        "properties": {
+          "data": {
+            "type": "object",
+            "properties": {
+              "type": {
+                "type": "string",
+                "description": "Resource type.",
+                "enum": ["project_worker_upload"]
+              },
+              "id": {
+                "type": "string",
+                "description": "Upload id to pass to the deploy endpoint as `context_upload_id`.",
+                "example": "cafe0000000000000000000000000000"
+              },
+              "attributes": {
+                "type": "object",
+                "properties": {
+                  "url": {
+                    "type": "string",
+                    "description": "Presigned destination for the `.tar.gz` build context."
+                  },
+                  "method": {
+                    "type": "string",
+                    "example": "PUT"
+                  },
+                  "expires_at": {
+                    "type": "string",
+                    "description": "When the slot stops accepting the upload."
+                  }
+                },
+                "required": ["url", "method", "expires_at"]
+              }
+            },
+            "required": ["type", "id", "attributes"]
+          }
+        },
+        "required": ["data"]
+      },
+      "V2DeployWorkerRequest": {
+        "type": "object",
+        "properties": {
+          "data": {
+            "type": "object",
+            "properties": {
+              "type": {
+                "type": "string",
+                "description": "Resource type.",
+                "enum": ["project_worker"]
+              },
+              "attributes": {
+                "type": "object",
+                "properties": {
+                  "spec": {
+                    "type": "object",
+                    "properties": {
+                      "runtime": {
+                        "example": "node",
+                        "type": "string"
+                      },
+                      "size": {
+                        "type": "string",
+                        "example": "2gb-1vcpu"
+                      },
+                      "exposure": {
+                        "type": "string",
+                        "example": "public"
+                      },
+                      "instances": {
+                        "type": "integer",
+                        "minimum": -9007199254740991,
+                        "maximum": 9007199254740991,
+                        "example": 1
+                      }
+                    },
+                    "required": ["size", "exposure", "instances"]
+                  },
+                  "context_upload_id": {
+                    "description": "Id of a build context staged through the uploads endpoint. Required unless `runtime` is set.",
+                    "type": "string"
+                  }
+                },
+                "required": ["spec"]
+              }
+            },
+            "required": ["type", "attributes"]
+          }
+        },
+        "required": ["data"]
+      },
       "V2ListMembersResponse": {
         "type": "object",
         "properties": {
@@ -23109,7 +24936,9 @@
                     "email": {
                       "type": "string",
                       "format": "email",
-                      "pattern": "^(?!\\.)(?!.*\\.\\.)([A-Za-z0-9_'+\\-\\.]*)[A-Za-z0-9_+-]@([A-Za-z0-9][A-Za-z0-9\\-]*\\.)+[A-Za-z]{2,}$"
+                      "pattern": "^(?!\\.)(?!.*\\.\\.)([A-Za-z0-9_'+\\-\\.]*)[A-Za-z0-9_+-]@([A-Za-z0-9][A-Za-z0-9\\-]*\\.)+[A-Za-z]{2,}$",
+                      "description": "Email address of the invitation receipient.",
+                      "example": "hello@example.com"
                     },
                     "role": {
                       "type": "string",
@@ -23119,6 +24948,11 @@
                     },
                     "projects": {
                       "description": "The projects to limit a user to. If omitted, user will have org-wide access with the provided role.",
+                      "examples": [
+                        {
+                          "ref": "abcjuqabhgwjjutfvtpa"
+                        }
+                      ],
                       "minItems": 1,
                       "type": "array",
                       "items": {
@@ -23247,7 +25081,9 @@
                         "email": {
                           "type": "string",
                           "format": "email",
-                          "pattern": "^(?!\\.)(?!.*\\.\\.)([A-Za-z0-9_'+\\-\\.]*)[A-Za-z0-9_+-]@([A-Za-z0-9][A-Za-z0-9\\-]*\\.)+[A-Za-z]{2,}$"
+                          "pattern": "^(?!\\.)(?!.*\\.\\.)([A-Za-z0-9_'+\\-\\.]*)[A-Za-z0-9_+-]@([A-Za-z0-9][A-Za-z0-9\\-]*\\.)+[A-Za-z]{2,}$",
+                          "description": "Email address of the invitation receipient.",
+                          "example": "hello@example.com"
                         }
                       },
                       "required": ["email"]
@@ -23275,7 +25111,9 @@
                     "email": {
                       "type": "string",
                       "format": "email",
-                      "pattern": "^(?!\\.)(?!.*\\.\\.)([A-Za-z0-9_'+\\-\\.]*)[A-Za-z0-9_+-]@([A-Za-z0-9][A-Za-z0-9\\-]*\\.)+[A-Za-z]{2,}$"
+                      "pattern": "^(?!\\.)(?!.*\\.\\.)([A-Za-z0-9_'+\\-\\.]*)[A-Za-z0-9_+-]@([A-Za-z0-9][A-Za-z0-9\\-]*\\.)+[A-Za-z]{2,}$",
+                      "description": "Email address of the invitation receipient.",
+                      "example": "hello@example.com"
                     }
                   },
                   "required": ["email"]
@@ -23308,7 +25146,9 @@
                     "email": {
                       "type": "string",
                       "format": "email",
-                      "pattern": "^(?!\\.)(?!.*\\.\\.)([A-Za-z0-9_'+\\-\\.]*)[A-Za-z0-9_+-]@([A-Za-z0-9][A-Za-z0-9\\-]*\\.)+[A-Za-z]{2,}$"
+                      "pattern": "^(?!\\.)(?!.*\\.\\.)([A-Za-z0-9_'+\\-\\.]*)[A-Za-z0-9_+-]@([A-Za-z0-9][A-Za-z0-9\\-]*\\.)+[A-Za-z]{2,}$",
+                      "description": "Email address of the invitation receipient.",
+                      "example": "hello@example.com"
                     }
                   },
                   "required": ["email"]
@@ -23339,7 +25179,9 @@
                     "email": {
                       "type": "string",
                       "format": "email",
-                      "pattern": "^(?!\\.)(?!.*\\.\\.)([A-Za-z0-9_'+\\-\\.]*)[A-Za-z0-9_+-]@([A-Za-z0-9][A-Za-z0-9\\-]*\\.)+[A-Za-z]{2,}$"
+                      "pattern": "^(?!\\.)(?!.*\\.\\.)([A-Za-z0-9_'+\\-\\.]*)[A-Za-z0-9_+-]@([A-Za-z0-9][A-Za-z0-9\\-]*\\.)+[A-Za-z]{2,}$",
+                      "description": "Email address of the invitation receipient.",
+                      "example": "hello@example.com"
                     }
                   },
                   "required": ["email"]
diff --git a/apps/docs/styles/globals.css b/apps/docs/styles/globals.css
index 4064aaa2199..42266e52e40 100644
--- a/apps/docs/styles/globals.css
+++ b/apps/docs/styles/globals.css
@@ -452,7 +452,7 @@ th code {
 }
 
 /* Word wrap styles for code blocks */
-.shiki[data-wrapped='true'] {
+.shiki[data-wrapped='true'] .code-scroll {
   overflow-x: hidden !important;
 }
 
diff --git a/apps/studio/TANSTACK_MIGRATION.md b/apps/studio/TANSTACK_MIGRATION.md
index fb8ba8cc114..13644b1c7ea 100644
--- a/apps/studio/TANSTACK_MIGRATION.md
+++ b/apps/studio/TANSTACK_MIGRATION.md
@@ -231,6 +231,7 @@ These are the layout-only TanStack files. Most hold a single product layout comp
 ### Project shell — `/workers/*`
 
 - [x] A `routes/project/$ref/workers/index.tsx` ← `pages/project/[ref]/workers/index.tsx`
+- [x] A `routes/project/$ref/workers/$name.tsx` ← `pages/project/[ref]/workers/[name].tsx`
 
 ### Project shell — `/functions/*`
 
diff --git a/apps/studio/app/api/scoped-access-token-permissions/MCPToolScopeMappings.ts b/apps/studio/app/api/scoped-access-token-permissions/MCPToolScopeMappings.ts
deleted file mode 100644
index 7e2b8da4823..00000000000
--- a/apps/studio/app/api/scoped-access-token-permissions/MCPToolScopeMappings.ts
+++ /dev/null
@@ -1,204 +0,0 @@
-import { constants, permissions } from '@supabase/shared-types'
-
-import { McpMap } from '@/data/scoped-access-tokens/permission-scope-map-query'
-
-const { OAuthScope } = constants
-
-type OAuthScopeValue = (typeof OAuthScope)[keyof typeof OAuthScope]
-
-// Manually extracted from platform mcp controller code. Each tool maps to alternative OAuth-scope
-// groups with the same semantics as ScopeGroupAlternatives: a token can call the tool when it
-// holds ALL scopes of at least ONE group (OR between groups, AND within a group). Most tools
-// assert a single scope; execute_sql asserts database:read OR database:write depending on the
-// session's read_only mode (mcp.controller.ts), so it carries two alternatives.
-const MCPToolOAuthScopeMapping: Record<string, OAuthScopeValue[][]> = {
-  apply_migration: [[OAuthScope.DATABASE_WRITE]],
-  // Computes a local confirmation hash without calling the platform — no scope gates it.
-  confirm_cost: [[]],
-  create_branch: [[OAuthScope.ENVIRONMENT_WRITE]],
-  create_project: [[OAuthScope.PROJECTS_WRITE]],
-  delete_branch: [[OAuthScope.ENVIRONMENT_WRITE]],
-  deploy_edge_function: [[OAuthScope.EDGE_FUNCTIONS_WRITE]],
-  execute_sql: [[OAuthScope.DATABASE_READ], [OAuthScope.DATABASE_WRITE]],
-  generate_typescript_types: [[OAuthScope.DATABASE_READ]],
-  get_advisors: [[OAuthScope.DATABASE_READ]],
-  // Calls getOrganization + listProjects to price a project, so it needs both read scopes.
-  // (The type=branch path returns a constant with no platform call; gating on the project
-  // path's scopes fails closed for branch-only pricing, which is fine for advisory display.)
-  get_cost: [[OAuthScope.ORGANIZATIONS_READ, OAuthScope.PROJECTS_READ]],
-  get_edge_function: [[OAuthScope.EDGE_FUNCTIONS_READ]],
-  get_logs: [[OAuthScope.ANALYTICS_READ]],
-  get_organization: [[OAuthScope.ORGANIZATIONS_READ]],
-  get_project: [[OAuthScope.PROJECTS_READ]],
-  get_project_url: [[OAuthScope.PROJECTS_READ]],
-  get_publishable_keys: [[OAuthScope.SECRETS_READ]],
-  get_storage_config: [[OAuthScope.STORAGE_READ]],
-  list_branches: [[OAuthScope.ENVIRONMENT_READ]],
-  list_edge_functions: [[OAuthScope.EDGE_FUNCTIONS_READ]],
-  // Runs through executeSql with read_only forced true.
-  list_extensions: [[OAuthScope.DATABASE_READ]],
-  list_migrations: [[OAuthScope.DATABASE_READ]],
-  list_organizations: [[OAuthScope.ORGANIZATIONS_READ]],
-  list_projects: [[OAuthScope.PROJECTS_READ]],
-  list_storage_buckets: [[OAuthScope.STORAGE_READ]],
-  // Runs through executeSql with read_only forced true.
-  list_tables: [[OAuthScope.DATABASE_READ]],
-  merge_branch: [[OAuthScope.ENVIRONMENT_WRITE]],
-  pause_project: [[OAuthScope.PROJECTS_WRITE]],
-  rebase_branch: [[OAuthScope.ENVIRONMENT_WRITE]],
-  reset_branch: [[OAuthScope.ENVIRONMENT_WRITE]],
-  restore_project: [[OAuthScope.PROJECTS_WRITE]],
-  // Queries the public content API — no scope gates it.
-  search_docs: [[]],
-  update_storage_config: [[OAuthScope.STORAGE_WRITE]],
-}
-
-type ExtractIds<T> = {
-  [K in keyof T]: {
-    [P in keyof T[K]]: T[K][P] extends { id: infer I } ? I : never
-  }
-}
-const FGA_PERMISSIONS = Object.fromEntries(
-  Object.entries(permissions.FgaPermissions).map(([group, permissions]) => [
-    group,
-    Object.fromEntries(Object.entries(permissions).map(([key, { id }]) => [key, id])),
-  ])
-) as ExtractIds<typeof permissions.FgaPermissions>
-
-// Duplicated from platform (packages/api-core/src/lib/permissions/fga-permissions.ts)
-// Ideally, this could be exported from @supabase/shared-types
-export const legacyOauthScopeToFgaPermissionMap: Record<string, string[]> = {
-  'analytics:read': [
-    FGA_PERMISSIONS.PROJECT.ANALYTICS_LOGS_READ,
-    FGA_PERMISSIONS.PROJECT.ANALYTICS_USAGE_READ,
-  ],
-  'analytics:write': [],
-  'analytics_config:read': [FGA_PERMISSIONS.PROJECT.ANALYTICS_CONFIG_READ],
-  'analytics_config:write': [FGA_PERMISSIONS.PROJECT.ANALYTICS_CONFIG_WRITE],
-  'auth:read': [FGA_PERMISSIONS.PROJECT.AUTH_CONFIG_READ],
-  // Note(Hieu) Auth:write scope grants access to all auth config endpoints.
-  // However, one endpoint requires minimum administrator role, so this oauth scope must also include the FGA PROJECT.ADMIN_WRITE permission
-  'auth:write': [FGA_PERMISSIONS.PROJECT.ADMIN_WRITE, FGA_PERMISSIONS.PROJECT.AUTH_CONFIG_WRITE],
-  'database:read': [
-    FGA_PERMISSIONS.USER.SNIPPETS_READ,
-    FGA_PERMISSIONS.PROJECT.ADVISORS_READ,
-    FGA_PERMISSIONS.PROJECT.BACKUPS_READ,
-    FGA_PERMISSIONS.PROJECT.DATABASE_READ,
-    FGA_PERMISSIONS.PROJECT.DATABASE_CONFIG_READ,
-    FGA_PERMISSIONS.PROJECT.DATABASE_JIT_READ,
-    FGA_PERMISSIONS.PROJECT.DATABASE_MIGRATIONS_READ,
-    FGA_PERMISSIONS.PROJECT.DATABASE_POOLING_CONFIG_READ,
-    FGA_PERMISSIONS.PROJECT.DATABASE_READONLY_CONFIG_READ,
-    FGA_PERMISSIONS.PROJECT.DATABASE_SSL_CONFIG_READ,
-    FGA_PERMISSIONS.PROJECT.SNIPPETS_READ,
-  ],
-  'database:write': [
-    FGA_PERMISSIONS.PROJECT.ADMIN_WRITE,
-    FGA_PERMISSIONS.PROJECT.BACKUPS_WRITE,
-    // Note(Hieu): Include database read permission here to align with the project query endpoint.
-    // RLS and FGA guard this endpoint with database read first, then perform an additional check for write queries.
-    // The OAuth guard requires database write directly, which causes a discrepancy error if we don't include read here.
-    FGA_PERMISSIONS.PROJECT.DATABASE_READ,
-    FGA_PERMISSIONS.PROJECT.DATABASE_WRITE,
-    FGA_PERMISSIONS.PROJECT.DATABASE_CONFIG_WRITE,
-    FGA_PERMISSIONS.PROJECT.DATABASE_MIGRATIONS_WRITE,
-    FGA_PERMISSIONS.PROJECT.DATABASE_POOLING_CONFIG_WRITE,
-    FGA_PERMISSIONS.PROJECT.DATABASE_READONLY_CONFIG_WRITE,
-    FGA_PERMISSIONS.PROJECT.DATABASE_SSL_CONFIG_WRITE,
-    FGA_PERMISSIONS.PROJECT.DATABASE_WEBHOOKS_CONFIG_WRITE,
-  ],
-  'domains:read': [
-    FGA_PERMISSIONS.PROJECT.CUSTOM_DOMAIN_READ,
-    FGA_PERMISSIONS.PROJECT.VANITY_SUBDOMAIN_READ,
-  ],
-  'domains:write': [
-    FGA_PERMISSIONS.PROJECT.CUSTOM_DOMAIN_WRITE,
-    FGA_PERMISSIONS.PROJECT.VANITY_SUBDOMAIN_WRITE,
-  ],
-  'edge_functions:read': [FGA_PERMISSIONS.PROJECT.EDGE_FUNCTIONS_READ],
-  'edge_functions:write': [FGA_PERMISSIONS.PROJECT.EDGE_FUNCTIONS_WRITE],
-  'environment:read': [
-    FGA_PERMISSIONS.PROJECT.ACTION_RUNS_READ,
-    FGA_PERMISSIONS.PROJECT.BRANCHING_DEVELOPMENT_READ,
-    FGA_PERMISSIONS.PROJECT.BRANCHING_PRODUCTION_READ,
-  ],
-  'environment:write': [
-    FGA_PERMISSIONS.PROJECT.ACTION_RUNS_WRITE,
-    FGA_PERMISSIONS.PROJECT.BRANCHING_DEVELOPMENT_CREATE,
-    FGA_PERMISSIONS.PROJECT.BRANCHING_DEVELOPMENT_DELETE,
-    FGA_PERMISSIONS.PROJECT.BRANCHING_DEVELOPMENT_WRITE,
-    FGA_PERMISSIONS.PROJECT.BRANCHING_PRODUCTION_CREATE,
-    FGA_PERMISSIONS.PROJECT.BRANCHING_PRODUCTION_DELETE,
-    FGA_PERMISSIONS.PROJECT.BRANCHING_PRODUCTION_WRITE,
-  ],
-  'organizations:read': [
-    FGA_PERMISSIONS.USER.ORGANIZATIONS_READ,
-    FGA_PERMISSIONS.ORGANIZATION.ADMIN_READ,
-    FGA_PERMISSIONS.ORGANIZATION.MEMBERS_READ,
-  ],
-  'organizations:write': [],
-  'projects:read': [
-    FGA_PERMISSIONS.USER.PROJECTS_READ,
-    FGA_PERMISSIONS.ORGANIZATION.PROJECTS_READ,
-    FGA_PERMISSIONS.PROJECT.ADMIN_READ,
-    FGA_PERMISSIONS.PROJECT.DATABASE_NETWORK_BANS_READ,
-    FGA_PERMISSIONS.PROJECT.DATABASE_NETWORK_RESTRICTIONS_READ,
-  ],
-  'projects:write': [
-    FGA_PERMISSIONS.ORGANIZATION.ADMIN_WRITE,
-    FGA_PERMISSIONS.ORGANIZATION.PROJECTS_CREATE,
-    FGA_PERMISSIONS.PROJECT.ADMIN_WRITE,
-    FGA_PERMISSIONS.PROJECT.DATABASE_NETWORK_BANS_WRITE,
-    FGA_PERMISSIONS.PROJECT.DATABASE_NETWORK_RESTRICTIONS_WRITE,
-  ],
-  'rest:read': [FGA_PERMISSIONS.PROJECT.DATA_API_CONFIG_READ],
-  'rest:write': [FGA_PERMISSIONS.PROJECT.DATA_API_CONFIG_WRITE],
-  'secrets:read': [
-    FGA_PERMISSIONS.PROJECT.API_GATEWAY_KEYS_READ,
-    FGA_PERMISSIONS.PROJECT.AUTH_SIGNING_KEYS_READ,
-    FGA_PERMISSIONS.PROJECT.EDGE_FUNCTIONS_SECRETS_READ,
-  ],
-  'secrets:write': [
-    FGA_PERMISSIONS.PROJECT.API_GATEWAY_KEYS_WRITE,
-    FGA_PERMISSIONS.PROJECT.AUTH_SIGNING_KEYS_WRITE,
-    FGA_PERMISSIONS.PROJECT.EDGE_FUNCTIONS_SECRETS_WRITE,
-  ],
-  'storage:read': [
-    FGA_PERMISSIONS.PROJECT.STORAGE_READ,
-    FGA_PERMISSIONS.PROJECT.STORAGE_CONFIG_READ,
-  ],
-  'storage:write': [
-    FGA_PERMISSIONS.PROJECT.STORAGE_WRITE,
-    FGA_PERMISSIONS.PROJECT.STORAGE_CONFIG_WRITE,
-  ],
-}
-
-/*
- * Build a map of MCP tools/FGA permissions by expanding each OAuth-scope group to the FGA
- * permissions it implies:
- * {
- *    execute_sql: [["snippets_read", "database_read", ...], ["project_admin_write", ...]]
- * }
- * Groups are expanded independently, preserving the OR-of-AND structure. A group is an AND, so it
- * is kept only when every one of its scopes maps to at least one FGA permission — a partial
- * expansion would weaken the requirement (e.g. [ORGANIZATIONS_READ, PROJECTS_READ] shrinking to
- * projects_read alone). A group with any unmapped scope is dropped whole, so the tool stays gated
- * rather than becoming ungated; an explicitly empty group ([]) is the deliberate ungated marker
- * and is vacuously kept.
- * The code is duplicated from platform until we find a better way to share those mappings
- */
-export const expandOAuthScopeGroups = (
-  oAuthScopeGroups: string[][],
-  fgaPermissionMap: Record<string, string[]>
-): string[][] =>
-  oAuthScopeGroups
-    .filter((group) => group.every((oAuthScope) => (fgaPermissionMap[oAuthScope] ?? []).length > 0))
-    .map((group) => group.flatMap((oAuthScope) => fgaPermissionMap[oAuthScope] ?? []))
-
-export const MCPToolScopeMappings = Object.entries(MCPToolOAuthScopeMapping).reduce(
-  (acc, [mcpTool, oAuthScopeGroups]) => {
-    acc[mcpTool] = expandOAuthScopeGroups(oAuthScopeGroups, legacyOauthScopeToFgaPermissionMap)
-    return acc
-  },
-  {} as McpMap
-)
diff --git a/apps/studio/app/api/scoped-access-token-permissions/buildAPIPermissionScopeMap.test.ts b/apps/studio/app/api/scoped-access-token-permissions/buildAPIPermissionScopeMap.test.ts
index 65a5ee62fc1..d550f2b5683 100644
--- a/apps/studio/app/api/scoped-access-token-permissions/buildAPIPermissionScopeMap.test.ts
+++ b/apps/studio/app/api/scoped-access-token-permissions/buildAPIPermissionScopeMap.test.ts
@@ -6,7 +6,6 @@ import {
   buildAPIPermissionScopeMap,
   getScopesAndEndpointsForAPI,
 } from './buildAPIPermissionScopeMap'
-import { expandOAuthScopeGroups, MCPToolScopeMappings } from './MCPToolScopeMappings'
 import { type ScopeMap } from '@/data/scoped-access-tokens/permission-scope-map-query'
 import { mswServer } from '@/tests/lib/msw'
 
@@ -135,115 +134,24 @@ describe('addMCPToolsToScopes', () => {
   })
 })
 
-describe('MCPToolScopeMappings', () => {
-  // Platform gates execute_sql on database:read OR database:write depending on the MCP session's
-  // read_only mode (mcp.controller.ts), so the derived requirement must be two alternatives — a
-  // single conjunctive group would hide the tool from read-only tokens the platform accepts.
-  test('execute_sql derives the database:read bundle OR the database:write bundle', () => {
-    expect(MCPToolScopeMappings.execute_sql).toHaveLength(2)
-    const [readGroup, writeGroup] = MCPToolScopeMappings.execute_sql
-    expect(readGroup).toContain('database_read')
-    expect(readGroup).not.toContain('database_write')
-    expect(writeGroup).toContain('database_write')
-  })
-
-  test('single-scope tools derive a single conjunctive group', () => {
-    expect(MCPToolScopeMappings.apply_migration).toHaveLength(1)
-    expect(MCPToolScopeMappings.apply_migration[0]).toContain('database_write')
-  })
-
-  test('tools without a platform scope gate stay ungated ([[]]), not disabled ([])', () => {
-    expect(MCPToolScopeMappings.confirm_cost).toEqual([[]])
-    expect(MCPToolScopeMappings.search_docs).toEqual([[]])
-  })
-
-  // A group is an AND: expanding only its mapped scopes would weaken the requirement (e.g.
-  // [organizations:read, projects:read] shrinking to projects_read alone) and report the tool
-  // enabled for an incomplete grant.
-  test('a group with any unmapped scope is dropped whole, not partially expanded', () => {
-    const map = { 'projects:read': ['projects_read'] }
-
-    expect(expandOAuthScopeGroups([['organizations:read', 'projects:read']], map)).toEqual([])
-    // Other alternatives and the ungated marker survive the drop untouched.
-    expect(expandOAuthScopeGroups([['organizations:read'], ['projects:read'], []], map)).toEqual([
-      ['projects_read'],
-      [],
-    ])
-  })
-
-  // Guards the OAuth-scope -> legacy-map join: a scope key drifting out of the legacy map must
-  // not inject undefined into the payload (flatMap doesn't flatten it) or silently disable a
-  // gated tool by dropping all its groups.
-  test('every derived group is non-empty strings, and only the ungated tools lack scopes', () => {
-    const ungated = ['confirm_cost', 'search_docs']
-    for (const [tool, groups] of Object.entries(MCPToolScopeMappings)) {
-      expect(groups.length, `${tool} lost all its alternatives`).toBeGreaterThan(0)
-      for (const group of groups) {
-        if (!ungated.includes(tool))
-          expect(group.length, `${tool} has an empty group`).toBeGreaterThan(0)
-        for (const scope of group)
-          expect(typeof scope, `${tool} leaked a non-string scope`).toBe('string')
-      }
-    }
-  })
-
-  test('get_cost requires both organization and project read bundles together', () => {
-    expect(MCPToolScopeMappings.get_cost).toHaveLength(1)
-    expect(MCPToolScopeMappings.get_cost[0]).toEqual(
-      expect.arrayContaining(['organizations_read', 'projects_read'])
-    )
-  })
-
-  test('covers exactly the tool registry of the deployed MCP server', () => {
-    expect(Object.keys(MCPToolScopeMappings).sort()).toEqual([
-      'apply_migration',
-      'confirm_cost',
-      'create_branch',
-      'create_project',
-      'delete_branch',
-      'deploy_edge_function',
-      'execute_sql',
-      'generate_typescript_types',
-      'get_advisors',
-      'get_cost',
-      'get_edge_function',
-      'get_logs',
-      'get_organization',
-      'get_project',
-      'get_project_url',
-      'get_publishable_keys',
-      'get_storage_config',
-      'list_branches',
-      'list_edge_functions',
-      'list_extensions',
-      'list_migrations',
-      'list_organizations',
-      'list_projects',
-      'list_storage_buckets',
-      'list_tables',
-      'merge_branch',
-      'pause_project',
-      'rebase_branch',
-      'reset_branch',
-      'restore_project',
-      'search_docs',
-      'update_storage_config',
-    ])
-  })
-})
-
 describe('buildAPIPermissionScopeMap', () => {
   // vitestSetup starts mswServer with `onUnhandledRequest: 'error'` and resets handlers between
-  // tests, so mocking here keeps that guard instead of replacing global fetch.
-  const stubSpecs = (v1: Record<string, unknown>, v2: Record<string, unknown>) => {
+  // tests, so mocking here keeps that guard instead of replacing global fetch. All three live
+  // sources (v1 spec, v2 spec, the MCP tool-permissions endpoint) are stubbed.
+  const stubSources = (
+    v1: Record<string, unknown>,
+    v2: Record<string, unknown>,
+    mcpTools: Record<string, string[][]> = { execute_sql: [['database_read']] }
+  ) => {
     mswServer.use(
       http.get('*/api/v1-json', () => HttpResponse.json(v1)),
-      http.get('*/api/v2-json', () => HttpResponse.json(v2))
+      http.get('*/api/v2-json', () => HttpResponse.json(v2)),
+      http.get('*/platform/mcp-tools-permissions', () => HttpResponse.json(mcpTools))
     )
   }
 
   test('merges both specs, attaching each MCP tool to a shared scope exactly once', async () => {
-    stubSpecs(
+    stubSources(
       {
         paths: {
           '/v1/projects/{ref}/database/query': {
@@ -274,7 +182,7 @@ describe('buildAPIPermissionScopeMap', () => {
   // Path items may legally carry non-operation members; the specs are fetched live, so a benign
   // upstream swagger change must not start 500ing this route.
   test('tolerates path items with non-method OpenAPI members', async () => {
-    stubSpecs(
+    stubSources(
       {
         paths: {
           '/v1/projects/{ref}': {
@@ -293,15 +201,33 @@ describe('buildAPIPermissionScopeMap', () => {
     expect(Object.keys(map.endpoints)).toHaveLength(1)
   })
 
-  test('returns a copy of the tool mapping so callers cannot corrupt the module singleton', async () => {
-    stubSpecs({ paths: {} }, { paths: {} })
+  test('returns the MCP tool map fetched from the endpoint', async () => {
+    stubSources(
+      { paths: {} },
+      { paths: {} },
+      {
+        apply_migration: [['database_migrations_write']],
+        search_docs: [[]],
+      }
+    )
 
     const map = await buildAPIPermissionScopeMap()
-    expect(map.mcp_tools).toEqual(MCPToolScopeMappings)
-    expect(map.mcp_tools).not.toBe(MCPToolScopeMappings)
 
-    const before = structuredClone(MCPToolScopeMappings.execute_sql)
-    map.mcp_tools.execute_sql.push(['tampered'])
-    expect(MCPToolScopeMappings.execute_sql).toEqual(before)
+    expect(map.mcp_tools).toEqual({
+      apply_migration: [['database_migrations_write']],
+      search_docs: [[]],
+    })
+    // The gated tool is indexed under its permission; the ungated one is not.
+    expect(map.scopes.database_migrations_write.mcp_tools).toEqual(['apply_migration'])
+  })
+
+  test('throws when the MCP tool-permissions endpoint is unavailable', async () => {
+    mswServer.use(
+      http.get('*/api/v1-json', () => HttpResponse.json({ paths: {} })),
+      http.get('*/api/v2-json', () => HttpResponse.json({ paths: {} })),
+      http.get('*/platform/mcp-tools-permissions', () => new HttpResponse(null, { status: 503 }))
+    )
+
+    await expect(buildAPIPermissionScopeMap()).rejects.toThrow()
   })
 })
diff --git a/apps/studio/app/api/scoped-access-token-permissions/buildAPIPermissionScopeMap.ts b/apps/studio/app/api/scoped-access-token-permissions/buildAPIPermissionScopeMap.ts
index b6b568e6022..95655c5884e 100644
--- a/apps/studio/app/api/scoped-access-token-permissions/buildAPIPermissionScopeMap.ts
+++ b/apps/studio/app/api/scoped-access-token-permissions/buildAPIPermissionScopeMap.ts
@@ -1,9 +1,5 @@
-import { cloneDeep } from 'lodash'
 import z from 'zod'
 
-// We don't have an OpenAPI that describes mcp tools security requirements so
-// we have this hard coded file that must be updated when they change
-import { MCPToolScopeMappings } from './MCPToolScopeMappings'
 import {
   EndpointMap,
   McpMap,
@@ -13,32 +9,29 @@ import {
 import { InternalServerError } from '@/lib/api/apiHelpers'
 
 /*
- * Builds the permissions/endpoint mapping by fetching the OpenAPI specs for our v1 and v2 APIs.
- * The two specs are indexed together rather than merged afterwards: every v1 path starts with
- * `/v1/` and every v2 path with `/v2/`, so they can't collide, and one pass de-duplicates a
- * scope's endpoint list by construction.
- * @throws InternalServerError when it can't fetch the OpenAPI specs
+ * Builds the permissions/endpoint mapping from three live sources: the v1 and v2 OpenAPI specs
+ * (endpoint -> FGA via `x-fga-permissions`) and the mgmt-api MCP-tool-permissions endpoint
+ * (tool -> FGA). The MCP map is owned by Control Plane — it's projected from the same MCP_TOOL_AUTH
+ * descriptor that drives enforcement — so Studio fetches it exactly like the OpenAPI spec instead of
+ * hand-maintaining or importing a copy.
+ * @throws InternalServerError when it can't fetch the specs or the MCP map
  */
 export const buildAPIPermissionScopeMap = async (): Promise<PermissionScopeMap> => {
-  const [apiV1SpecsJSON, apiV2SpecsJSON] = await Promise.all([
+  const [apiV1SpecsJSON, apiV2SpecsJSON, mcpToolsJSON] = await Promise.all([
     fetchAPIPermissionScope('v1'),
     fetchAPIPermissionScope('v2'),
+    fetchMcpToolPermissions(),
   ])
   const apiV1Specs = API_SPECS_SCHEMA.parse(apiV1SpecsJSON)
   const apiV2Specs = API_SPECS_SCHEMA.parse(apiV2SpecsJSON)
+  const mcpTools = MCP_TOOLS_SCHEMA.parse(mcpToolsJSON)
 
   const { scopes, endpoints } = getScopesAndEndpointsForAPI({
     paths: { ...apiV1Specs.paths, ...apiV2Specs.paths },
   })
-  addMCPToolsToScopes(scopes, MCPToolScopeMappings)
+  addMCPToolsToScopes(scopes, mcpTools)
 
-  return {
-    scopes,
-    endpoints,
-    // Deep copy so a caller mutating the response can't corrupt the module-level mapping, which
-    // outlives every request in a long-running server.
-    mcp_tools: cloneDeep(MCPToolScopeMappings),
-  }
+  return { scopes, endpoints, mcp_tools: mcpTools }
 }
 
 // OPEN API specs look like this (only kept the parts we're interested in):
@@ -63,7 +56,7 @@ export const buildAPIPermissionScopeMap = async (): Promise<PermissionScopeMap>
 // KNOWN DIVERGENCE: annotations are trusted verbatim, and the one on
 // POST /v1/projects/{ref}/database/query overstates access — the spec publishes
 // `[[database_read], [database_write]]`, but the route's guard requires database_read outright and
-// the write group is doc-only (see the execute_sql entry in MCPToolScopeMappings.ts). A token
+// the write group is doc-only (the MCP endpoint reports execute_sql under database_read only). A token
 // granted only database_write is therefore shown this endpoint as callable when the guard would
 // reject it. Studio-created tokens can't hit this (write mode always grants the read scopes too),
 // so this stays a display inaccuracy for API-created tokens; the fix is correcting the annotation
@@ -147,6 +140,38 @@ const fetchAPIPermissionScope = async (version: 'v1' | 'v2') => {
   }
 }
 
+// The mgmt-api endpoint that projects the MCP_TOOL_AUTH descriptor (which also drives enforcement)
+// to tool -> FGA permission groups. Fetched like the OpenAPI spec above.
+const fetchMcpToolPermissions = async () => {
+  try {
+    const response = await fetch(`${NEXT_PUBLIC_API_DOMAIN}/platform/mcp-tools-permissions`, {
+      method: 'get',
+      headers: {
+        'Content-Type': 'application/json',
+      },
+    })
+    if (response.ok) {
+      return response.json()
+    }
+    const responseText = await response.text()
+
+    const retryAfter = response.headers.get('Retry-After') ?? undefined
+    throw new InternalServerError(`MCP tool permissions responded with ${response.status}`, {
+      status: response.status,
+      body: responseText,
+      ...(retryAfter !== undefined && { retryAfter }),
+    })
+  } catch (error: unknown) {
+    if (error instanceof InternalServerError) {
+      throw error
+    }
+
+    if (error instanceof Error) {
+      throw new InternalServerError(error.message)
+    }
+  }
+}
+
 // Simplified OPEN API specs schemas that only defines what we care about for scoped tokens
 
 const OPEN_API_PATH_METHOD_SCHEMA = z.object({
@@ -172,3 +197,6 @@ const OPEN_API_PATH_ITEM_SCHEMA = z.preprocess(
 const API_SPECS_SCHEMA = z.object({
   paths: z.record(z.string(), OPEN_API_PATH_ITEM_SCHEMA),
 })
+
+// tool name -> OR-of-AND FGA permission groups, as served by GET /platform/mcp-tools-permissions.
+const MCP_TOOLS_SCHEMA: z.ZodType<McpMap> = z.record(z.string(), z.array(z.array(z.string())))
diff --git a/apps/studio/components/interfaces/App/AppBannerWrapper.tsx b/apps/studio/components/interfaces/App/AppBannerWrapper.tsx
index a0e19ea5d92..2c05bd85b65 100644
--- a/apps/studio/components/interfaces/App/AppBannerWrapper.tsx
+++ b/apps/studio/components/interfaces/App/AppBannerWrapper.tsx
@@ -2,6 +2,10 @@ import { IS_PLATFORM, LOCAL_STORAGE_KEYS, useFlag } from 'common'
 import dayjs from 'dayjs'
 import { usePathname } from 'next/navigation'
 import { PropsWithChildren, useEffect, useRef, useState } from 'react'
+import {
+  SELECT_26_STUDIO_DISMISSAL_KEY,
+  useSelect26PromotionActive,
+} from 'ui-patterns/Banners/Select26Promotion'
 
 import { OrganizationResourceBanner } from '../Organization/HeaderBanner'
 import { isLogsOrObservabilityPath } from './AppBannerWrapper.utils'
@@ -9,6 +13,11 @@ import { ClockSkewBanner } from '@/components/layouts/AppLayout/ClockSkewBanner'
 import { NoticeBanner } from '@/components/layouts/AppLayout/NoticeBanner'
 import { StatusPageBanner } from '@/components/layouts/AppLayout/StatusPageBanner'
 import { BannerLogsAllDeprecation } from '@/components/ui/BannerStack/Banners/BannerLogsAllDeprecation'
+import { BannerSelect2026 } from '@/components/ui/BannerStack/Banners/BannerSelect2026'
+import {
+  SELECT_26_BANNER_PRIORITY,
+  shouldShowSelect26Banner,
+} from '@/components/ui/BannerStack/Banners/BannerSelect2026.utils'
 import { BannerTOSUpdate } from '@/components/ui/BannerStack/Banners/BannerTOSUpdate'
 import { BANNER_ID, useBannerStack } from '@/components/ui/BannerStack/BannerStackProvider'
 import { useLocalStorageQuery } from '@/hooks/misc/useLocalStorage'
@@ -36,6 +45,38 @@ export const AppBannerWrapper = ({ children }: PropsWithChildren<{}>) => {
     false
   )
 
+  const [isSelect26BannerDismissed, , { isSuccess: isSelect26DismissalLoaded }] =
+    useLocalStorageQuery(SELECT_26_STUDIO_DISMISSAL_KEY, false)
+  const isSelect26PromotionActive = useSelect26PromotionActive()
+
+  useEffect(() => {
+    if (!isSelect26DismissalLoaded) return
+
+    const shouldShow = shouldShowSelect26Banner({
+      isPlatform: IS_PLATFORM,
+      dismissalLoaded: isSelect26DismissalLoaded,
+      isActive: isSelect26PromotionActive,
+      isDismissed: isSelect26BannerDismissed,
+    })
+
+    if (shouldShow) {
+      addBanner({
+        id: BANNER_ID.SELECT_26,
+        isDismissed: false,
+        content: <BannerSelect2026 />,
+        priority: SELECT_26_BANNER_PRIORITY,
+      })
+    } else {
+      dismissBanner(BANNER_ID.SELECT_26)
+    }
+  }, [
+    isSelect26DismissalLoaded,
+    isSelect26PromotionActive,
+    isSelect26BannerDismissed,
+    addBanner,
+    dismissBanner,
+  ])
+
   useEffect(() => {
     if (Date.now() >= TOSUpdateExpiry.getTime()) return
 
diff --git a/apps/studio/components/interfaces/App/CommandMenu/ApiKeys.test.tsx b/apps/studio/components/interfaces/App/CommandMenu/ApiKeys.test.tsx
new file mode 100644
index 00000000000..409d8374608
--- /dev/null
+++ b/apps/studio/components/interfaces/App/CommandMenu/ApiKeys.test.tsx
@@ -0,0 +1,116 @@
+import { screen } from '@testing-library/react'
+import userEvent from '@testing-library/user-event'
+import type { components } from 'api-types'
+import { HttpResponse } from 'msw'
+import { Button } from 'ui'
+import { useCurrentPage, useSetPage } from 'ui-patterns/CommandMenu'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+
+import { useApiKeysCommands } from './ApiKeys'
+import { customRender } from '@/tests/lib/custom-render'
+import { addAPIMock } from '@/tests/lib/msw'
+
+type ApiKeyResponse = components['schemas']['ApiKeyResponse']
+
+const { mockUseAsyncCheckPermissions, mockUseHighAvailability, mockUseSelectedProjectQuery } =
+  vi.hoisted(() => ({
+    mockUseAsyncCheckPermissions: vi.fn(),
+    mockUseHighAvailability: vi.fn(),
+    mockUseSelectedProjectQuery: vi.fn(),
+  }))
+
+vi.mock('@/hooks/misc/useCheckPermissions', () => ({
+  useAsyncCheckPermissions: mockUseAsyncCheckPermissions,
+}))
+
+vi.mock('@/hooks/misc/useHighAvailability', () => ({
+  useHighAvailability: mockUseHighAvailability,
+}))
+
+vi.mock('@/hooks/misc/useSelectedProject', () => ({
+  useSelectedProjectQuery: mockUseSelectedProjectQuery,
+}))
+
+const API_KEYS: ApiKeyResponse[] = [
+  { api_key: 'anon-key', name: 'anon', type: 'legacy' },
+  { api_key: 'service-key', name: 'service_role', type: 'legacy' },
+  {
+    api_key: 'publishable-key',
+    hash: 'hash',
+    id: 'publishable-id',
+    inserted_at: '2025-02-16T22:24:42.115195Z',
+    name: 'default',
+    type: 'publishable',
+  },
+  {
+    api_key: 'secret-key',
+    hash: 'hash',
+    id: 'secret-id',
+    inserted_at: '2025-02-16T22:24:42.115195Z',
+    name: 'sb_secret',
+    type: 'secret',
+  },
+]
+
+/** Renders the API keys command page so its commands can be asserted on. */
+const CommandPageHarness = () => {
+  useApiKeysCommands()
+  const setPage = useSetPage()
+  const page = useCurrentPage()
+  const commands =
+    page && 'sections' in page ? page.sections.flatMap((section) => section.commands) : []
+
+  return (
+    <>
+      <Button onClick={() => setPage('API Keys')}>Open API keys page</Button>
+      <ul>
+        {commands.map((command) => (
+          <li key={command.id}>{command.name}</li>
+        ))}
+      </ul>
+    </>
+  )
+}
+
+async function renderCommandPage() {
+  customRender(<CommandPageHarness />)
+
+  await userEvent.click(screen.getByRole('button', { name: 'Open API keys page' }))
+}
+
+describe('useApiKeysCommands', () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+
+    mockUseAsyncCheckPermissions.mockReturnValue({ can: true })
+    mockUseSelectedProjectQuery.mockReturnValue({
+      data: { id: 1, ref: 'default', name: 'default' },
+    })
+    mockUseHighAvailability.mockReturnValue({ isHighAvailability: false, isPending: false })
+    addAPIMock({
+      method: 'get',
+      path: '/v1/projects/:ref/api-keys',
+      response: () => HttpResponse.json<ApiKeyResponse[]>(API_KEYS),
+    })
+  })
+
+  it('omits the legacy key commands on High Availability projects', async () => {
+    mockUseHighAvailability.mockReturnValue({ isHighAvailability: true, isPending: false })
+
+    await renderCommandPage()
+
+    expect(await screen.findByText('Copy publishable key')).toBeInTheDocument()
+    expect(screen.getByText('Copy secret key (sb_secret)')).toBeInTheDocument()
+    expect(screen.queryByText('Copy anonymous API key')).not.toBeInTheDocument()
+    expect(screen.queryByText('Copy service API key')).not.toBeInTheDocument()
+  })
+
+  it('includes the legacy key commands on other projects', async () => {
+    await renderCommandPage()
+
+    expect(await screen.findByText('Copy anonymous API key')).toBeInTheDocument()
+    expect(screen.getByText('Copy service API key')).toBeInTheDocument()
+    expect(screen.getByText('Copy publishable key')).toBeInTheDocument()
+    expect(screen.getByText('Copy secret key (sb_secret)')).toBeInTheDocument()
+  })
+})
diff --git a/apps/studio/components/interfaces/App/CommandMenu/ApiKeys.tsx b/apps/studio/components/interfaces/App/CommandMenu/ApiKeys.tsx
index d8ad22c0763..7788073e507 100644
--- a/apps/studio/components/interfaces/App/CommandMenu/ApiKeys.tsx
+++ b/apps/studio/components/interfaces/App/CommandMenu/ApiKeys.tsx
@@ -17,6 +17,7 @@ import { COMMAND_MENU_SECTIONS } from './CommandMenu.utils'
 import { orderCommandSectionsByPriority } from './ordering'
 import { useAPIKeys } from '@/data/api-keys/api-keys-query'
 import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { useHighAvailability } from '@/hooks/misc/useHighAvailability'
 import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'
 
 const API_KEYS_PAGE_NAME = 'API Keys'
@@ -30,15 +31,22 @@ export function useApiKeysCommands() {
   const ref = project?.ref || '_'
 
   const { can: canReadAPIKeys } = useAsyncCheckPermissions(PermissionAction.SECRETS_READ, '*')
+  const { isHighAvailability } = useHighAvailability()
 
   const { data: apiKeysData } = useAPIKeys(
     { projectRef: project?.ref, reveal: true },
     { enabled: canReadAPIKeys }
   )
   const commands = useMemo(() => {
-    const { anonKey, serviceKey, publishableKey, allSecretKeys } = canReadAPIKeys
-      ? (apiKeysData ?? {})
-      : {}
+    const {
+      anonKey: legacyAnonKey,
+      serviceKey: legacyServiceKey,
+      publishableKey,
+      allSecretKeys,
+    } = canReadAPIKeys ? (apiKeysData ?? {}) : {}
+
+    const anonKey = isHighAvailability ? undefined : legacyAnonKey
+    const serviceKey = isHighAvailability ? undefined : legacyServiceKey
 
     return [
       project &&
@@ -127,7 +135,7 @@ export function useApiKeysCommands() {
         icon: () => <Key />,
       },
     ].filter(Boolean) as ICommand[]
-  }, [canReadAPIKeys, apiKeysData, project, ref, resetCommandMenu, setIsOpen])
+  }, [canReadAPIKeys, apiKeysData, isHighAvailability, project, ref, resetCommandMenu, setIsOpen])
 
   useRegisterPage(
     API_KEYS_PAGE_NAME,
diff --git a/apps/studio/components/interfaces/App/FeaturePreview/ExplorerPreview.tsx b/apps/studio/components/interfaces/App/FeaturePreview/ExplorerPreview.tsx
new file mode 100644
index 00000000000..f64d5fef769
--- /dev/null
+++ b/apps/studio/components/interfaces/App/FeaturePreview/ExplorerPreview.tsx
@@ -0,0 +1,55 @@
+import { useParams } from 'common'
+import Image from 'next/image'
+
+import { useIsExplorerEnabled } from './FeaturePreviewContext'
+import { InlineLink } from '@/components/ui/InlineLink'
+import { BASE_PATH } from '@/lib/constants'
+
+export const ExplorerPreview = () => {
+  const { ref } = useParams()
+  const isExplorerEnabled = useIsExplorerEnabled()
+
+  return (
+    <div className="flex flex-col gap-y-4">
+      <p className="text-sm text-foreground-light">
+        The Explorer is a new unified workspace for querying your data and chatting with the
+        Assistant, and is an early preview of where we're heading with the SQL Editor.
+      </p>
+      <p className="text-sm text-foreground-light">
+        Notebooks are the first new feature of the Explorer — mix query cells and markdown notes in
+        a single document, so your queries and context stay together. Use them to write runbooks,
+        document incidents, build reusable reports, and more!
+      </p>
+
+      <Image
+        src={`${BASE_PATH}/img/previews/explorer-preview.png`}
+        width={1296}
+        height={900}
+        alt="explorer-preview"
+        className="rounded-sm border"
+      />
+
+      <div className="space-y-2">
+        <p className="text-sm">Enabling this preview will:</p>
+        <ul className="list-disc pl-6 text-sm text-foreground-light space-y-1">
+          <li>
+            Replace the existing SQL Editor with the new{' '}
+            <InlineLink
+              href={isExplorerEnabled ? `/project/${ref}/explorer` : `/project/${ref}/sql/new`}
+            >
+              Explorer
+            </InlineLink>
+            .
+            <ul className="list-disc pl-6 text-sm text-foreground-light">
+              <li>
+                We're looking to replace the SQL Editor with the Explorer in the long term, but for
+                now it lives alongside the SQL Editor, toggleable via this feature preview.
+              </li>
+            </ul>
+          </li>
+          <li>Enable managing of Notebooks through both the dashboard and the Assistant.</li>
+        </ul>
+      </div>
+    </div>
+  )
+}
diff --git a/apps/studio/components/interfaces/App/FeaturePreview/FeaturePreviewContext.tsx b/apps/studio/components/interfaces/App/FeaturePreview/FeaturePreviewContext.tsx
index 2eeb77a318f..739b178761e 100644
--- a/apps/studio/components/interfaces/App/FeaturePreview/FeaturePreviewContext.tsx
+++ b/apps/studio/components/interfaces/App/FeaturePreview/FeaturePreviewContext.tsx
@@ -165,6 +165,12 @@ export const useIsDatabaseConnectionsEnabled = () => {
   }
 }
 
+export const useIsExplorerEnabled = () => {
+  const { flags } = useFeaturePreviewContext()
+  const isExplorerEnabled = useFlag('explorer')
+  return isExplorerEnabled && flags[LOCAL_STORAGE_KEYS.UI_PREVIEW_EXPLORER]
+}
+
 export const useFeaturePreviewModal = () => {
   const featurePreviews = useFeaturePreviews()
   const [featurePreviewModal, setFeaturePreviewModal] = useQueryState('featurePreviewModal')
diff --git a/apps/studio/components/interfaces/App/FeaturePreview/FeaturePreviewModal.tsx b/apps/studio/components/interfaces/App/FeaturePreview/FeaturePreviewModal.tsx
index 24ad9662f92..606e6198125 100644
--- a/apps/studio/components/interfaces/App/FeaturePreview/FeaturePreviewModal.tsx
+++ b/apps/studio/components/interfaces/App/FeaturePreview/FeaturePreviewModal.tsx
@@ -34,6 +34,7 @@ import {
 import { AdvisorRulesPreview } from './AdvisorRulesPreview'
 import { CLSPreview } from './CLSPreview'
 import { DatabaseConnectionsPreview } from './DatabaseConnectionsPreview'
+import { ExplorerPreview } from './ExplorerPreview'
 import { useFeaturePreviewContext, useFeaturePreviewModal } from './FeaturePreviewContext'
 import { IntegrationsLayoutPreview } from './IntegrationsLayoutPreview'
 import { JitDbAccessPreview } from './JitDbAccessPreview'
@@ -59,6 +60,7 @@ const FEATURE_PREVIEW_KEY_TO_CONTENT: {
   [LOCAL_STORAGE_KEYS.UI_PREVIEW_SQL_EDITOR_MANUAL_SAVE]: <SqlEditorManualSavePreview />,
   [LOCAL_STORAGE_KEYS.UI_PREVIEW_MARKETPLACE]: <IntegrationsLayoutPreview />,
   [LOCAL_STORAGE_KEYS.UI_PREVIEW_DATABASE_CONNECTIONS]: <DatabaseConnectionsPreview />,
+  [LOCAL_STORAGE_KEYS.UI_PREVIEW_EXPLORER]: <ExplorerPreview />,
 }
 
 export const FeaturePreviewModal = () => {
@@ -148,12 +150,8 @@ export const FeaturePreviewModal = () => {
                           ? allFeaturePreviews.filter((x) => x.category === undefined)
                           : allFeaturePreviews.filter((x) => x.category === category)
                       return (
-                        <AccordionItem
-                          key={category}
-                          value={category}
-                          className="data-[state=open]:border-b-0"
-                        >
-                          <AccordionTrigger className="text-xs font-mono uppercase tracking-tight px-4 text-foreground-lighter py-2">
+                        <AccordionItem key={category} value={category}>
+                          <AccordionTrigger className="text-xs font-mono uppercase tracking-tight px-4 text-foreground-lighter py-2 bg-tertiary dark:bg-transparent">
                             {category}
                           </AccordionTrigger>
                           <AccordionContent className="[&>div]:pb-0">
@@ -318,8 +316,10 @@ const FeaturePreviewItem = ({
       key={feature.key}
       onClick={() => selectFeaturePreview(feature.key)}
       className={cn(
-        'w-full! flex-1 flex items-center justify-between p-4 border-b cursor-pointer bg transition',
-        selectedFeature?.key === feature.key ? 'bg-accent' : 'bg-card',
+        'w-full! flex-1 flex items-center justify-between p-4 cursor-pointer bg transition',
+        selectedFeature?.key === feature.key
+          ? 'bg-muted dark:bg-accent text-foreground'
+          : 'bg-card text-foreground-light',
         className
       )}
     >
diff --git a/apps/studio/components/interfaces/App/FeaturePreview/useFeaturePreviews.ts b/apps/studio/components/interfaces/App/FeaturePreview/useFeaturePreviews.ts
index 607337c5384..fb766a922ff 100644
--- a/apps/studio/components/interfaces/App/FeaturePreview/useFeaturePreviews.ts
+++ b/apps/studio/components/interfaces/App/FeaturePreview/useFeaturePreviews.ts
@@ -21,7 +21,7 @@ export type FeaturePreview = {
    */
   isForced?: boolean
   /** Optional category that the feature preview falls under, defaults to "Others" in the UI otherwise */
-  category?: 'observability' | 'database'
+  category?: 'observability' | 'database' | 'editors'
   /**
    * Where to send the user after enabling, to try the feature out. Omit if the
    * feature has no single destination (e.g. a global layout change).
@@ -35,11 +35,24 @@ export const useFeaturePreviews = (): FeaturePreview[] => {
   const jitDbAccessEnabled = useFlag('jitDbAccess')
   const isMarketplaceEnabled = useFlag('marketplaceIntegrations')
   const isDatabaseConnectionsEnabled = useFlag('topForPostgres')
+  const isExplorerEnabled = useFlag('explorer')
 
   const isSqlEditorManualSaveForced = useFlag('sqlEditorManualSaveForced')
 
   return useMemo(() => {
     const previews: FeaturePreview[] = [
+      {
+        key: LOCAL_STORAGE_KEYS.UI_PREVIEW_EXPLORER,
+        name: 'Explorer & Notebooks',
+        category: 'editors',
+        // [Joshen TODO] Update with proper URL once discussion is up
+        discussionsUrl: undefined,
+        enabled: isExplorerEnabled,
+        isNew: true,
+        isPlatformOnly: true,
+        isDefaultOptIn: false,
+        getRoute: (ref?: string) => `/project/${ref}/explorer`,
+      },
       {
         key: LOCAL_STORAGE_KEYS.UI_PREVIEW_UNIFIED_LOGS,
         name: 'Updated Logs interface',
@@ -114,6 +127,7 @@ export const useFeaturePreviews = (): FeaturePreview[] => {
       },
       {
         key: LOCAL_STORAGE_KEYS.UI_PREVIEW_SQL_EDITOR_MANUAL_SAVE,
+        category: 'editors',
         name: 'Disable snippet auto-saving',
         discussionsUrl: undefined,
         isNew: true,
@@ -146,5 +160,6 @@ export const useFeaturePreviews = (): FeaturePreview[] => {
     jitDbAccessEnabled,
     isMarketplaceEnabled,
     isDatabaseConnectionsEnabled,
+    isExplorerEnabled,
   ])
 }
diff --git a/apps/studio/components/interfaces/ConfigDrift/ConfigurationDriftPage.test.tsx b/apps/studio/components/interfaces/ConfigDrift/ConfigurationDriftPage.test.tsx
index 36c6f00a3ec..7fd9669319e 100644
--- a/apps/studio/components/interfaces/ConfigDrift/ConfigurationDriftPage.test.tsx
+++ b/apps/studio/components/interfaces/ConfigDrift/ConfigurationDriftPage.test.tsx
@@ -15,7 +15,7 @@ type ListGitHubConnectionsResponse = platformComponents['schemas']['ListGitHubCo
 type GetGitHubConnectionConfigResponse =
   platformComponents['schemas']['GetGitHubConnectionConfigResponse']
 type BranchResponse = apiV1Components['schemas']['BranchResponse']
-type V2ProjectConfigResponse = apiV2Components['schemas']['V2ProjectConfigResponse']
+type V2ProjectConfigResponse = apiV2Components['schemas']['V2ProjectConfigResponse_Output']
 
 const PROJECT_REF = 'default'
 const ORGANIZATION_ID = 1
@@ -120,6 +120,7 @@ function createProjectConfigResponse(auth: Record<string, unknown>): V2ProjectCo
         },
         auth,
         database: {
+          major_version: 17,
           network_restrictions: {
             allowed_cidrs: [],
             entitlement: 'disallowed',
diff --git a/apps/studio/components/interfaces/ConnectSheet/Connect.constants.ts b/apps/studio/components/interfaces/ConnectSheet/Connect.constants.ts
index 86071ccaef9..a588f3320dd 100644
--- a/apps/studio/components/interfaces/ConnectSheet/Connect.constants.ts
+++ b/apps/studio/components/interfaces/ConnectSheet/Connect.constants.ts
@@ -386,6 +386,8 @@ export const PGBOUNCER_ENABLED_BUT_NO_IPV4_ADDON_TEXT =
   'Purchase IPv4 add-on or use Shared Pooler if on a IPv4 network'
 export const IPV4_ADDON_TEXT = 'Connections are IPv4 proxied with IPv4 add-on'
 
+export const CONNECTION_SOURCE_LOAD_BALANCER = 'load-balancer'
+
 export type ConnectionStringMethod = 'direct' | 'transaction' | 'session'
 
 export const connectionStringMethodOptions: Record<
diff --git a/apps/studio/components/interfaces/ConnectSheet/ConnectConfigSection.tsx b/apps/studio/components/interfaces/ConnectSheet/ConnectConfigSection.tsx
index bb21ae25718..9f96b39af66 100644
--- a/apps/studio/components/interfaces/ConnectSheet/ConnectConfigSection.tsx
+++ b/apps/studio/components/interfaces/ConnectSheet/ConnectConfigSection.tsx
@@ -126,12 +126,14 @@ export function ConnectConfigSection({
                 layout="horizontal"
                 label={field.label}
                 description={field.description}
+                name={`connect-${field.id}`}
               >
                 <Select
                   value={String(value ?? '')}
                   onValueChange={(v) => onFieldChange(field.id, v)}
                 >
                   <SelectTrigger
+                    id={`connect-${field.id}`}
                     size="small"
                     className="[&>span:first-child]:flex [&>span:first-child]:items-center [&>span:first-child]:gap-x-2"
                   >
@@ -167,6 +169,7 @@ export function ConnectConfigSection({
                 layout="horizontal"
                 label={field.label}
                 description={field.description}
+                name={field.id}
                 className="[&>div>label>span]:break-keep! [&>div>label>span]:text-balance"
               >
                 <Switch
@@ -185,12 +188,14 @@ export function ConnectConfigSection({
                 layout="horizontal"
                 label={field.label}
                 description={field.description}
+                name={`connect-${field.id}`}
               >
                 <MultiSelector
                   values={Array.isArray(value) ? value : []}
                   onValuesChange={(v) => onFieldChange(field.id, v)}
                 >
                   <MultiSelectorTrigger
+                    id={`connect-${field.id}`}
                     className="w-full"
                     label="Select features"
                     badgeLimit="wrap"
diff --git a/apps/studio/components/interfaces/ConnectSheet/ConnectStepsSection.tsx b/apps/studio/components/interfaces/ConnectSheet/ConnectStepsSection.tsx
index 8daa1afee7e..3ebdce75e04 100644
--- a/apps/studio/components/interfaces/ConnectSheet/ConnectStepsSection.tsx
+++ b/apps/studio/components/interfaces/ConnectSheet/ConnectStepsSection.tsx
@@ -210,6 +210,7 @@ export function ConnectStepsSection({ steps, state, projectKeys }: ConnectStepsS
   const { ref } = useParams()
   const stepsContainerRef = useRef<HTMLDivElement | null>(null)
   const deploymentMode = useDeploymentMode()
+  const isHighAvailability = useIsHighAvailability()
   const connectionStringPooler = useConnectionStringPooler(deploymentMode)
 
   const { data: ipv4Addon } = useProjectAddonsQuery(
@@ -227,6 +228,7 @@ export function ConnectStepsSection({ steps, state, projectKeys }: ConnectStepsS
     connectionMethod: state.connectionMethod,
     useSharedPooler: state.useSharedPooler,
     hasIpv4Addon: !!ipv4Addon,
+    isHighAvailability,
   })
   const showSessionPoolerNotice = shouldShowSessionPoolerNotice({
     isPlatform: deploymentMode.isPlatform,
diff --git a/apps/studio/components/interfaces/ConnectSheet/ConnectStepsSection.utils.ts b/apps/studio/components/interfaces/ConnectSheet/ConnectStepsSection.utils.ts
index f24bd752559..bba878c92ec 100644
--- a/apps/studio/components/interfaces/ConnectSheet/ConnectStepsSection.utils.ts
+++ b/apps/studio/components/interfaces/ConnectSheet/ConnectStepsSection.utils.ts
@@ -28,14 +28,17 @@ export function shouldShowIpv4AddonNotice({
   connectionMethod,
   useSharedPooler,
   hasIpv4Addon,
+  isHighAvailability,
 }: {
   isPlatform: boolean
   mode: ConnectMode
   connectionMethod: FieldValue
   useSharedPooler: FieldValue
   hasIpv4Addon: boolean
+  isHighAvailability: boolean
 }): boolean {
-  if (!isPlatform || mode !== 'direct' || hasIpv4Addon) return false
+  // The IPv4 add-on does not apply to Multigres connections
+  if (!isPlatform || mode !== 'direct' || hasIpv4Addon || isHighAvailability) return false
   return connectionMethod === 'direct' || (connectionMethod === 'transaction' && !useSharedPooler)
 }
 
diff --git a/apps/studio/components/interfaces/ConnectSheet/ConnectionString.utils.ts b/apps/studio/components/interfaces/ConnectSheet/ConnectionString.utils.ts
index 8158af03229..5f61b16404c 100644
--- a/apps/studio/components/interfaces/ConnectSheet/ConnectionString.utils.ts
+++ b/apps/studio/components/interfaces/ConnectSheet/ConnectionString.utils.ts
@@ -108,6 +108,27 @@ export const buildJdbcString = (params: ConnectionParams) => {
   return `jdbc:postgresql://${params.host}:${params.port}/${params.database}?user=${params.user}&password=${PASSWORD_PLACEHOLDER}${extraParams}`
 }
 
+/**
+ * Ensures a connection string's query params carry `sslmode=require` without
+ * dropping params the URI already has (e.g. `options=reference%3D...` or
+ * `sslnegotiation=direct`).
+ */
+export const withRequiredSslmode = (search: string) => {
+  if (!search) return '?sslmode=require'
+  if (search.includes('sslmode=')) return search
+  return `${search}&sslmode=require`
+}
+
+export const buildDotnetConnectionString = (params: ConnectionParams) => {
+  // Multigres only accepts direct SSL negotiation; Npgsql (9+) spells it
+  // `SSL Negotiation=Direct` and throws on the parameter in older versions,
+  // so only emit it when the resolved URI carries the param.
+  const sslNegotiation = params.search.includes('sslnegotiation=direct')
+    ? ';SSL Negotiation=Direct'
+    : ''
+  return `Host=${params.host};Port=${params.port};Database=${params.database};Username=${params.user};Password=${PASSWORD_PLACEHOLDER};SSL Mode=Require;Trust Server Certificate=true${sslNegotiation}`
+}
+
 export const buildConnectionStringWithPassword = (
   connectionString: string,
   password: string
diff --git a/apps/studio/components/interfaces/ConnectSheet/DatabaseSettings.utils.ts b/apps/studio/components/interfaces/ConnectSheet/DatabaseSettings.utils.ts
index 4233c2479ee..8f6a2112822 100644
--- a/apps/studio/components/interfaces/ConnectSheet/DatabaseSettings.utils.ts
+++ b/apps/studio/components/interfaces/ConnectSheet/DatabaseSettings.utils.ts
@@ -17,6 +17,18 @@ export const appendHighAvailabilitySslParams = (uri: string) =>
     ? uri
     : appendConnectionStringParams(uri, HIGH_AVAILABILITY_SSL_PARAMS)
 
+/**
+ * The Multigres read-only load balancer listens on this port on the same host
+ * as the primary database.
+ */
+export const HIGH_AVAILABILITY_LOAD_BALANCER_PORT = 5433
+
+export const getHighAvailabilityLoadBalancerConnectionInfo = <
+  T extends { db_port: number | string },
+>(
+  connectionInfo: T
+): T => ({ ...connectionInfo, db_port: HIGH_AVAILABILITY_LOAD_BALANCER_PORT })
+
 type ConnectionStrings = {
   psql: string
   uri: string
diff --git a/apps/studio/components/interfaces/ConnectSheet/DirectConnectionExamples.tsx b/apps/studio/components/interfaces/ConnectSheet/DirectConnectionExamples.tsx
index 4f8ceb8b69e..32d61e39794 100644
--- a/apps/studio/components/interfaces/ConnectSheet/DirectConnectionExamples.tsx
+++ b/apps/studio/components/interfaces/ConnectSheet/DirectConnectionExamples.tsx
@@ -55,6 +55,10 @@ func main() {
   },
   dotnet: {
     installCommands: [
+      // SSL Negotiation=Direct in the generated connection string requires Npgsql 9.0+.
+      // Concrete version: quoting a floating version breaks on Windows cmd, and
+      // floating versions fail under Central Package Management (NU1011).
+      'dotnet add package Npgsql --version 9.0.5',
       'dotnet add package Microsoft.Extensions.Configuration.Json --version YOUR_DOTNET_VERSION',
     ],
   },
diff --git a/apps/studio/components/interfaces/ConnectSheet/__tests__/ConnectStepsSection.utils.test.ts b/apps/studio/components/interfaces/ConnectSheet/__tests__/ConnectStepsSection.utils.test.ts
index babff975249..7340051e2db 100644
--- a/apps/studio/components/interfaces/ConnectSheet/__tests__/ConnectStepsSection.utils.test.ts
+++ b/apps/studio/components/interfaces/ConnectSheet/__tests__/ConnectStepsSection.utils.test.ts
@@ -132,6 +132,7 @@ describe('shouldShowIpv4AddonNotice', () => {
     connectionMethod: 'direct',
     useSharedPooler: false,
     hasIpv4Addon: false,
+    isHighAvailability: false,
   }
 
   test('returns true for a direct connection with no IPv4 addon', () => {
@@ -169,6 +170,10 @@ describe('shouldShowIpv4AddonNotice', () => {
   test('returns false when self-hosted (not platform)', () => {
     expect(shouldShowIpv4AddonNotice({ ...BASE, isPlatform: false })).toBe(false)
   })
+
+  test('returns false for high-availability projects even with a direct connection and no addon', () => {
+    expect(shouldShowIpv4AddonNotice({ ...BASE, isHighAvailability: true })).toBe(false)
+  })
 })
 
 describe('shouldShowSessionPoolerNotice', () => {
diff --git a/apps/studio/components/interfaces/ConnectSheet/__tests__/ConnectionString.utils.test.ts b/apps/studio/components/interfaces/ConnectSheet/__tests__/ConnectionString.utils.test.ts
index 5a07d913ddf..613bf998d84 100644
--- a/apps/studio/components/interfaces/ConnectSheet/__tests__/ConnectionString.utils.test.ts
+++ b/apps/studio/components/interfaces/ConnectSheet/__tests__/ConnectionString.utils.test.ts
@@ -4,6 +4,7 @@ import {
   appendConnectionStringParams,
   buildConnectionParameters,
   buildConnectionStringWithPassword,
+  buildDotnetConnectionString,
   buildJdbcString,
   buildPsqlCommand,
   buildSafeConnectionString,
@@ -11,6 +12,7 @@ import {
   parseConnectionParams,
   PASSWORD_PLACEHOLDER,
   resolveConnectionString,
+  withRequiredSslmode,
 } from '../ConnectionString.utils'
 
 describe('parseConnectionParams', () => {
@@ -236,6 +238,52 @@ describe('buildJdbcString', () => {
   })
 })
 
+describe('withRequiredSslmode', () => {
+  test('returns ?sslmode=require for an empty search', () => {
+    expect(withRequiredSslmode('')).toBe('?sslmode=require')
+  })
+
+  test('leaves a search that already sets sslmode unchanged', () => {
+    expect(withRequiredSslmode('?sslmode=require&sslnegotiation=direct')).toBe(
+      '?sslmode=require&sslnegotiation=direct'
+    )
+  })
+
+  test('appends sslmode=require to existing params without it', () => {
+    expect(withRequiredSslmode('?options=reference%3Dproj')).toBe(
+      '?options=reference%3Dproj&sslmode=require'
+    )
+  })
+})
+
+describe('buildDotnetConnectionString', () => {
+  const params = {
+    host: 'db.proj.supabase.co',
+    port: '5432',
+    user: 'postgres',
+    database: 'postgres',
+    search: '',
+  }
+
+  test('builds the base Npgsql string without SSL negotiation', () => {
+    expect(buildDotnetConnectionString(params)).toBe(
+      `Host=db.proj.supabase.co;Port=5432;Database=postgres;Username=postgres;Password=${PASSWORD_PLACEHOLDER};SSL Mode=Require;Trust Server Certificate=true`
+    )
+  })
+
+  test('appends SSL Negotiation=Direct when the URI requires direct negotiation', () => {
+    expect(
+      buildDotnetConnectionString({
+        ...params,
+        port: '5433',
+        search: '?sslmode=require&sslnegotiation=direct',
+      })
+    ).toBe(
+      `Host=db.proj.supabase.co;Port=5433;Database=postgres;Username=postgres;Password=${PASSWORD_PLACEHOLDER};SSL Mode=Require;Trust Server Certificate=true;SSL Negotiation=Direct`
+    )
+  })
+})
+
 describe('buildConnectionParameters', () => {
   test('produces host/port/database/user rows in display order', () => {
     expect(
diff --git a/apps/studio/components/interfaces/ConnectSheet/__tests__/DatabaseSettings.utils.test.ts b/apps/studio/components/interfaces/ConnectSheet/__tests__/DatabaseSettings.utils.test.ts
index dcfb2b95deb..b710553ba70 100644
--- a/apps/studio/components/interfaces/ConnectSheet/__tests__/DatabaseSettings.utils.test.ts
+++ b/apps/studio/components/interfaces/ConnectSheet/__tests__/DatabaseSettings.utils.test.ts
@@ -3,8 +3,11 @@ import { describe, expect, test } from 'vitest'
 import {
   appendHighAvailabilitySslParams,
   buildConnectionStringPooler,
+  getConnectionStrings,
+  getHighAvailabilityLoadBalancerConnectionInfo,
   getSelfHostedDirectStrings,
   getSelfHostedPoolerStrings,
+  HIGH_AVAILABILITY_LOAD_BALANCER_PORT,
   HIGH_AVAILABILITY_SSL_PARAMS,
 } from '../DatabaseSettings.utils'
 import type { DeploymentMode } from '@/hooks/misc/useDeploymentMode'
@@ -239,3 +242,45 @@ describe('appendHighAvailabilitySslParams', () => {
     expect(appendHighAvailabilitySslParams('')).toBe('')
   })
 })
+
+describe('getHighAvailabilityLoadBalancerConnectionInfo', () => {
+  test('swaps the port for the load balancer port and preserves the other fields', () => {
+    const connectionInfo = {
+      db_user: 'postgres',
+      db_port: 5432,
+      db_host: 'db.proj.supabase.co',
+      db_name: 'postgres',
+    }
+
+    expect(getHighAvailabilityLoadBalancerConnectionInfo(connectionInfo)).toEqual({
+      db_user: 'postgres',
+      db_port: HIGH_AVAILABILITY_LOAD_BALANCER_PORT,
+      db_host: 'db.proj.supabase.co',
+      db_name: 'postgres',
+    })
+  })
+
+  test('builds a read-only load balancer connection string on port 5433 with SSL params', () => {
+    const loadBalancerInfo = getHighAvailabilityLoadBalancerConnectionInfo({
+      db_user: 'postgres',
+      db_port: 5432,
+      db_host: 'db.proj.supabase.co',
+      db_name: 'postgres',
+    })
+
+    const result = buildConnectionStringPooler({
+      deploymentMode: platform,
+      connectionInfo: loadBalancerInfo,
+      connectionStringsShared: getConnectionStrings({
+        connectionInfo: loadBalancerInfo,
+        metadata: { projectRef: 'proj' },
+      }),
+      ipv4Addon: false,
+      isHighAvailability: true,
+    })
+
+    expect(result.direct).toBe(
+      `postgresql://postgres:[YOUR-PASSWORD]@db.proj.supabase.co:5433/postgres?${HIGH_AVAILABILITY_SSL_PARAMS}`
+    )
+  })
+})
diff --git a/apps/studio/components/interfaces/ConnectSheet/__tests__/useConnectState.test.ts b/apps/studio/components/interfaces/ConnectSheet/__tests__/useConnectState.test.ts
index 8b6a5b21b67..02cda9fc3a1 100644
--- a/apps/studio/components/interfaces/ConnectSheet/__tests__/useConnectState.test.ts
+++ b/apps/studio/components/interfaces/ConnectSheet/__tests__/useConnectState.test.ts
@@ -7,8 +7,11 @@ vi.mock('common', () => ({
   useParams: () => ({ ref: 'test-ref' }),
 }))
 
+const readReplicasMock: {
+  data: Array<{ identifier: string; region: string; inserted_at: string }>
+} = { data: [] }
 vi.mock('@/data/read-replicas/replicas-query', () => ({
-  useReadReplicasQuery: () => ({ data: [] }),
+  useReadReplicasQuery: () => readReplicasMock,
 }))
 
 vi.mock('@/hooks/misc/useCheckEntitlements', () => ({
@@ -498,9 +501,67 @@ describe('useConnectState', () => {
   // ============================================================================
 
   describe('high availability projects', () => {
+    const PRIMARY_DATABASE = {
+      identifier: 'test-ref',
+      region: 'ap-southeast-1',
+      inserted_at: '2024-01-01T00:00:00Z',
+    }
+    const REPLICA_DATABASE = {
+      identifier: 'test-ref-rr-abcdefgh',
+      region: 'ap-southeast-1',
+      inserted_at: '2024-01-02T00:00:00Z',
+    }
+
     afterEach(async () => {
       const { useIsHighAvailability } = await import('@/hooks/misc/useSelectedProject')
       vi.mocked(useIsHighAvailability).mockReturnValue(false)
+      readReplicasMock.data = []
+    })
+
+    test('should offer only the primary and the load balancer as sources for HA projects', async () => {
+      const { useIsHighAvailability } = await import('@/hooks/misc/useSelectedProject')
+      vi.mocked(useIsHighAvailability).mockReturnValue(true)
+      readReplicasMock.data = [PRIMARY_DATABASE, REPLICA_DATABASE]
+
+      const { result } = renderHook(() => useConnectState({ mode: 'direct' }))
+
+      const options = result.current.getFieldOptions('connectionSource')
+      expect(options).toEqual([
+        { value: 'test-ref', label: 'Primary database' },
+        { value: 'load-balancer', label: 'Replica (read-only)' },
+      ])
+    })
+
+    test('should keep replicas as sources and omit the load balancer for non-HA projects', () => {
+      readReplicasMock.data = [PRIMARY_DATABASE, REPLICA_DATABASE]
+
+      const { result } = renderHook(() => useConnectState({ mode: 'direct' }))
+
+      const options = result.current.getFieldOptions('connectionSource')
+      expect(options.map((o) => o.value)).toEqual(['test-ref', 'test-ref-rr-abcdefgh'])
+      expect(options.some((o) => o.value === 'load-balancer')).toBe(false)
+    })
+
+    test('should coerce a replica connection source to the primary for HA projects', async () => {
+      const { useIsHighAvailability } = await import('@/hooks/misc/useSelectedProject')
+      vi.mocked(useIsHighAvailability).mockReturnValue(true)
+
+      const { result } = renderHook(() =>
+        useConnectState({ mode: 'direct', connectionSource: 'test-ref-rr-abcdefgh' })
+      )
+
+      expect(result.current.state.connectionSource).toBe('test-ref')
+    })
+
+    test('should preserve the load balancer as a valid connection source for HA projects', async () => {
+      const { useIsHighAvailability } = await import('@/hooks/misc/useSelectedProject')
+      vi.mocked(useIsHighAvailability).mockReturnValue(true)
+
+      const { result } = renderHook(() =>
+        useConnectState({ mode: 'direct', connectionSource: 'load-balancer' })
+      )
+
+      expect(result.current.state.connectionSource).toBe('load-balancer')
     })
 
     test('should hide connectionMethod field for HA projects', async () => {
diff --git a/apps/studio/components/interfaces/ConnectSheet/content/steps/direct-connection/content.tsx b/apps/studio/components/interfaces/ConnectSheet/content/steps/direct-connection/content.tsx
index b7ab7b99d61..3f519fe7969 100644
--- a/apps/studio/components/interfaces/ConnectSheet/content/steps/direct-connection/content.tsx
+++ b/apps/studio/components/interfaces/ConnectSheet/content/steps/direct-connection/content.tsx
@@ -1,19 +1,17 @@
-import { useParams } from 'common'
 import { Check, KeyRound } from 'lucide-react'
 import { useMemo, useState } from 'react'
+import { cn } from 'ui'
 import { CodeBlock } from 'ui-patterns/CodeBlock'
 import { GenericSkeletonLoader } from 'ui-patterns/ShimmeringLoader'
 
-import { buildConnectionStringPooler, getConnectionStrings } from '../../../DatabaseSettings.utils'
-import { getAddons } from '@/components/interfaces/Billing/Subscription/Subscription.utils'
 import {
+  CONNECTION_SOURCE_LOAD_BALANCER,
   DATABASE_CONNECTION_TYPES,
   type ConnectionStringMethod,
   type DatabaseConnectionType,
 } from '@/components/interfaces/ConnectSheet/Connect.constants'
 import type {
   ConnectionStringPooler,
-  DeploymentMode,
   StepContentProps,
 } from '@/components/interfaces/ConnectSheet/Connect.types'
 import { ConnectionParameters } from '@/components/interfaces/ConnectSheet/ConnectionParameters'
@@ -28,114 +26,14 @@ import {
   resolveConnectionString,
 } from '@/components/interfaces/ConnectSheet/ConnectionString.utils'
 import { PasswordEncodingNote } from '@/components/interfaces/ConnectSheet/PasswordEncodingNote'
+import { useConnectionStringDatabases } from '@/components/interfaces/ConnectSheet/useConnectionStringDatabases'
 import { ResetDbPasswordDialog } from '@/components/interfaces/Settings/Database/DatabaseSettings/ResetDbPasswordDialog'
 import { InlineLink } from '@/components/ui/InlineLink'
-import { usePgbouncerConfigQuery } from '@/data/database/pgbouncer-config-query'
-import { useSupavisorConfigurationQuery } from '@/data/database/supavisor-configuration-query'
-import { useReadReplicasQuery } from '@/data/read-replicas/replicas-query'
-import { useProjectAddonsQuery } from '@/data/subscriptions/project-addons-query'
 import { useCheckEntitlements } from '@/hooks/misc/useCheckEntitlements'
 import { useIsHighAvailability } from '@/hooks/misc/useSelectedProject'
 import { DOCS_URL } from '@/lib/constants'
-import { pluckObjectFields } from '@/lib/helpers'
 import { useTrack } from '@/lib/telemetry/track'
 
-/**
- * [Joshen] ConnectStepsSection does something similar but since only this page needs to consider connection strings
- * from all databases (including read replicas), am opting to separate the logic for retrieving connection strings here
- *
- * We can however, consider to shift this logic into ConnectStepsSection, such that we can consider read replicas for
- * the other tabs like "Framework" and "ORM" too. However, leaving them out for now and only updating "Direct"
- */
-const useConnectionStringDatabases = (deploymentMode: DeploymentMode) => {
-  const { ref: projectRef } = useParams()
-  const { hasAccess: allowPgBouncerSelection } = useCheckEntitlements('dedicated_pooler')
-  const isHighAvailability = useIsHighAvailability()
-
-  const { data: databases = [] } = useReadReplicasQuery({ projectRef })
-  // Multigres has no pooler, so the pooler config endpoints don't apply
-  const { data: pgbouncerConfig } = usePgbouncerConfigQuery(
-    { projectRef },
-    { enabled: !isHighAvailability }
-  )
-  const { data: supavisorConfig } = useSupavisorConfigurationQuery(
-    { projectRef },
-    { enabled: !isHighAvailability }
-  )
-  const { data: addons } = useProjectAddonsQuery({ projectRef })
-  const { ipv4: ipv4Addon } = getAddons(addons?.selected_addons ?? [])
-
-  // Memoized so the per-database pooler bag (consumed by resolveConnectionString
-  // downstream) keeps a stable identity across renders. Without this the inner
-  // pluckObjectFields/getConnectionStrings calls would mint fresh objects every
-  // render and ripple through the resolveConnectionString useMemo below.
-  return useMemo(() => {
-    const DB_FIELDS = ['db_host', 'db_name', 'db_port', 'db_user', 'inserted_at']
-    const emptyState = { db_user: '', db_host: '', db_port: '', db_name: '' }
-
-    return Object.fromEntries(
-      databases.map((db) => {
-        const connectionInfo = pluckObjectFields(db || emptyState, DB_FIELDS)
-        const poolingConfigurationShared = supavisorConfig?.find(
-          (x) => x.identifier === db.identifier
-        )
-        const poolingConfigurationDedicated = allowPgBouncerSelection ? pgbouncerConfig : undefined
-
-        const connectionStringsShared = getConnectionStrings({
-          connectionInfo,
-          poolingInfo: {
-            connectionString: poolingConfigurationShared?.connection_string ?? '',
-            db_host: poolingConfigurationShared?.db_host ?? '',
-            db_name: poolingConfigurationShared?.db_name ?? '',
-            db_port: poolingConfigurationShared?.db_port ?? 0,
-            db_user: poolingConfigurationShared?.db_user ?? '',
-          },
-          metadata: { projectRef: db.identifier },
-        })
-
-        const connectionStringsDedicated =
-          poolingConfigurationDedicated !== undefined
-            ? getConnectionStrings({
-                connectionInfo,
-                poolingInfo: {
-                  connectionString: poolingConfigurationDedicated.connection_string.replace(
-                    projectRef ?? '_',
-                    db.identifier
-                  ),
-                  db_host: poolingConfigurationDedicated.db_host,
-                  db_name: poolingConfigurationDedicated.db_name,
-                  db_port: poolingConfigurationDedicated.db_port,
-                  db_user: poolingConfigurationDedicated.db_user,
-                },
-                metadata: { projectRef: db.identifier },
-              })
-            : undefined
-
-        return [
-          db.identifier,
-          buildConnectionStringPooler({
-            deploymentMode,
-            connectionInfo,
-            connectionStringsShared,
-            connectionStringsDedicated,
-            ipv4Addon: !!ipv4Addon,
-            isHighAvailability,
-          }),
-        ]
-      })
-    )
-  }, [
-    databases,
-    pgbouncerConfig,
-    supavisorConfig,
-    allowPgBouncerSelection,
-    ipv4Addon,
-    projectRef,
-    deploymentMode,
-    isHighAvailability,
-  ])
-}
-
 const CONNECTION_METHOD_TO_TELEMETRY: Record<
   ConnectionStringMethod,
   'direct' | 'transaction_pooler' | 'session_pooler'
@@ -156,6 +54,8 @@ function DirectConnectionContent({ state, deploymentMode }: StepContentProps) {
   const [temporaryDatabasePassword, setTemporaryDatabasePassword] = useState('')
 
   const connectionSource = state.connectionSource
+  const isLoadBalancerSelected =
+    isHighAvailability && connectionSource === CONNECTION_SOURCE_LOAD_BALANCER
   const connectionType = (state.connectionType as DatabaseConnectionType) ?? 'uri'
   const connectionMethod = (state.connectionMethod as ConnectionStringMethod) ?? 'direct'
   const useSharedPooler = Boolean(state.useSharedPooler)
@@ -239,17 +139,19 @@ function DirectConnectionContent({ state, deploymentMode }: StepContentProps) {
   const showPasswordPlaceholder = connectionString.includes(PASSWORD_PLACEHOLDER)
   const showSelfHostedDirectNotice = deploymentMode.isSelfHosted && connectionMethod === 'direct'
   const showPoolerTitle = deploymentMode.isPlatform && !!poolerBadge && !isHighAvailability
+  const titleBadge = isLoadBalancerSelected ? 'Read-only' : poolerBadge
+  const showTitleBadge = isLoadBalancerSelected || showPoolerTitle
   const showResetInTitle =
     deploymentMode.isPlatform && showPasswordPlaceholder && !temporaryDatabasePassword
-  const showStringTitleRow = showPoolerTitle || showResetInTitle
+  const showStringTitleRow = showTitleBadge || showResetInTitle
 
   return (
     <div className="flex flex-col gap-3">
       <div className="overflow-hidden rounded-lg border bg-surface-75">
         {showStringTitleRow && (
           <div className="flex items-center justify-between gap-2 border-b bg-surface-100 py-2 pl-4 pr-2">
-            {showPoolerTitle ? (
-              <span className="text-xs text-foreground-light">{poolerBadge}</span>
+            {showTitleBadge ? (
+              <span className="text-xs text-foreground-light">{titleBadge}</span>
             ) : (
               <span />
             )}
@@ -282,6 +184,15 @@ function DirectConnectionContent({ state, deploymentMode }: StepContentProps) {
         )}
       </div>
       {showPasswordPlaceholder && <PasswordEncodingNote />}
+      {/* Persistent live region so screen readers announce the read-only state
+          when the load balancer is selected */}
+      <p
+        role="status"
+        className={cn('text-sm text-foreground-lighter', !isLoadBalancerSelected && 'sr-only')}
+      >
+        {isLoadBalancerSelected &&
+          'Replica connections are read-only. Connect to the primary database for writes.'}
+      </p>
       {showSelfHostedDirectNotice && (
         <p className="text-sm text-foreground-lighter">
           Manually{' '}
diff --git a/apps/studio/components/interfaces/ConnectSheet/content/steps/direct-files/content.tsx b/apps/studio/components/interfaces/ConnectSheet/content/steps/direct-files/content.tsx
index eaf3d943483..d6b97731e03 100644
--- a/apps/studio/components/interfaces/ConnectSheet/content/steps/direct-files/content.tsx
+++ b/apps/studio/components/interfaces/ConnectSheet/content/steps/direct-files/content.tsx
@@ -1,8 +1,10 @@
 import { useEffect, useMemo, useState } from 'react'
+import { cn } from 'ui'
 import { MultipleCodeBlock } from 'ui-patterns/MultipleCodeBlock'
 import { GenericSkeletonLoader } from 'ui-patterns/ShimmeringLoader'
 
 import {
+  CONNECTION_SOURCE_LOAD_BALANCER,
   type ConnectionStringMethod,
   type DatabaseConnectionType,
 } from '@/components/interfaces/ConnectSheet/Connect.constants'
@@ -10,12 +12,16 @@ import type { StepContentProps } from '@/components/interfaces/ConnectSheet/Conn
 import { ConnectionParameters } from '@/components/interfaces/ConnectSheet/ConnectionParameters'
 import {
   buildConnectionParameters,
+  buildDotnetConnectionString,
   buildSafeConnectionString,
   parseConnectionParams,
   PASSWORD_PLACEHOLDER,
   resolveConnectionString,
+  withRequiredSslmode,
 } from '@/components/interfaces/ConnectSheet/ConnectionString.utils'
 import { PasswordEncodingNote } from '@/components/interfaces/ConnectSheet/PasswordEncodingNote'
+import { useConnectionStringDatabases } from '@/components/interfaces/ConnectSheet/useConnectionStringDatabases'
+import { useIsHighAvailability } from '@/hooks/misc/useSelectedProject'
 
 type DirectFilesConfig = {
   files: {
@@ -28,11 +34,20 @@ type DirectFilesConfig = {
   passwordInUrl?: boolean
 }
 
-function DirectFilesContent({ state, connectionStringPooler }: StepContentProps) {
+function DirectFilesContent({ state, deploymentMode }: StepContentProps) {
+  const isHighAvailability = useIsHighAvailability()
+
+  const connectionSource = state.connectionSource
+  const isLoadBalancerSelected =
+    isHighAvailability && connectionSource === CONNECTION_SOURCE_LOAD_BALANCER
   const connectionType = (state.connectionType as DatabaseConnectionType) ?? 'uri'
   const connectionMethod = (state.connectionMethod as ConnectionStringMethod) ?? 'direct'
   const useSharedPooler = Boolean(state.useSharedPooler)
 
+  const connectionStrings = useConnectionStringDatabases(deploymentMode)
+  const connectionStringPooler =
+    connectionStrings[connectionSource as keyof typeof connectionStrings]
+
   const resolvedConnectionString = useMemo(
     () =>
       resolveConnectionString({
@@ -125,7 +140,7 @@ func main() {
               language: 'json',
               code: `{
   "ConnectionStrings": {
-    "DefaultConnection": "Host=${connectionParams.host};Database=${connectionParams.database};Username=${connectionParams.user};Password=${PASSWORD_PLACEHOLDER};SSL Mode=Require;Trust Server Certificate=true"
+    "DefaultConnection": "${buildDotnetConnectionString(connectionParams)}"
   }
 }`,
             },
@@ -180,7 +195,7 @@ PORT = os.getenv("port")
 DBNAME = os.getenv("dbname")
 
 # Construct the SQLAlchemy connection string
-DATABASE_URL = f"postgresql+psycopg2://{USER}:{PASSWORD}@{HOST}:{PORT}/{DBNAME}?sslmode=require"
+DATABASE_URL = f"postgresql+psycopg2://{USER}:{PASSWORD}@{HOST}:{PORT}/{DBNAME}${withRequiredSslmode(connectionParams.search)}"
 
 # Create the SQLAlchemy engine
 engine = create_engine(DATABASE_URL)
@@ -235,10 +250,37 @@ except Exception as e:
     return null
   }
 
+  const codeBlock = (
+    <MultipleCodeBlock
+      files={config.files}
+      value={activeFile}
+      onValueChange={setActiveFile}
+      className={isLoadBalancerSelected ? 'rounded-none border-0' : undefined}
+    />
+  )
+
   return (
     <div className="flex flex-col gap-3">
-      <MultipleCodeBlock files={config.files} value={activeFile} onValueChange={setActiveFile} />
+      {isLoadBalancerSelected ? (
+        <div className="overflow-hidden rounded-lg border">
+          <div className="flex items-center border-b bg-surface-100 py-2 pl-4 pr-2">
+            <span className="text-xs text-foreground-light">Read-only</span>
+          </div>
+          {codeBlock}
+        </div>
+      ) : (
+        codeBlock
+      )}
       {config.passwordInUrl && <PasswordEncodingNote />}
+      {/* Persistent live region so screen readers announce the read-only state
+          when the load balancer is selected */}
+      <p
+        role="status"
+        className={cn('text-sm text-foreground-lighter', !isLoadBalancerSelected && 'sr-only')}
+      >
+        {isLoadBalancerSelected &&
+          'Replica connections are read-only. Connect to the primary database for writes.'}
+      </p>
       <ConnectionParameters parameters={buildConnectionParameters(connectionParams)} />
     </div>
   )
diff --git a/apps/studio/components/interfaces/ConnectSheet/useConnectState.ts b/apps/studio/components/interfaces/ConnectSheet/useConnectState.ts
index 82dbe3966de..dd460d9fa48 100644
--- a/apps/studio/components/interfaces/ConnectSheet/useConnectState.ts
+++ b/apps/studio/components/interfaces/ConnectSheet/useConnectState.ts
@@ -3,6 +3,7 @@ import { useCallback, useMemo, useState } from 'react'
 import { MCP_CLIENTS } from 'ui-patterns/McpUrlBuilder'
 
 import {
+  CONNECTION_SOURCE_LOAD_BALANCER,
   connectionStringMethodOptions,
   DATABASE_CONNECTION_TYPES,
   FRAMEWORKS,
@@ -50,11 +51,15 @@ function getFieldOptionsFromSource({
   state,
   databases,
   deploymentMode,
+  isHighAvailability,
+  projectRef,
 }: {
   source: string
   state: ConnectState
   databases: Database[]
   deploymentMode: DeploymentMode
+  isHighAvailability: boolean
+  projectRef?: string
 }): FieldOption[] {
   switch (source) {
     case 'frameworks':
@@ -135,15 +140,23 @@ function getFieldOptionsFromSource({
       }))
     }
 
-    case 'connectionSources':
-      return databases.map((db) => {
+    case 'connectionSources': {
+      const options = databases.map((db) => {
         const region = formatDatabaseRegion(db?.region ?? '')
         const id = formatDatabaseID(db.identifier ?? '')
         const label = db.identifier.includes('-rr-')
-          ? `Read Replica (${region} - ${id})`
-          : 'Primary Database'
+          ? `Read replica (${region} - ${id})`
+          : 'Primary database'
         return { value: db.identifier, label }
       })
+      if (!isHighAvailability) return options
+      // Multigres replicas are only reachable through the read-only load
+      // balancer, so the sources are the primary and the load balancer.
+      return [
+        ...options.filter((option) => option.value === projectRef),
+        { value: CONNECTION_SOURCE_LOAD_BALANCER, label: 'Replica (read-only)' },
+      ]
+    }
 
     case 'connectionTypes':
       return DATABASE_CONNECTION_TYPES.map((t) => ({
@@ -185,11 +198,15 @@ function resolveFieldOptionsWithSource({
   state,
   databases,
   deploymentMode,
+  isHighAvailability,
+  projectRef,
 }: {
   field: ResolvedField
   state: ConnectState
   databases: Database[]
   deploymentMode: DeploymentMode
+  isHighAvailability: boolean
+  projectRef?: string
 }): FieldOption[] {
   // If already resolved (from conditional resolution)
   if (field.resolvedOptions.length > 0) {
@@ -204,6 +221,8 @@ function resolveFieldOptionsWithSource({
       state,
       databases,
       deploymentMode,
+      isHighAvailability,
+      projectRef,
     })
   }
 
@@ -361,12 +380,21 @@ export function useConnectState(initialState?: Partial<ConnectState>): UseConnec
 
   // Multigres has no pooler, so pooler-flavored selections restored from the
   // URL or localStorage (shared across projects) must never leak into an HA
-  // project — every consumer sees the direct connection method.
-  const resolvedState = useMemo(
-    () =>
-      isHighAvailability ? { ...state, connectionMethod: 'direct', useSharedPooler: false } : state,
-    [state, isHighAvailability]
-  )
+  // project — every consumer sees the direct connection method. Likewise a
+  // stale connection source (e.g. a replica identifier restored from the URL)
+  // falls back to the primary, since HA sources are only the primary and the
+  // load balancer.
+  const resolvedState = useMemo(() => {
+    if (!isHighAvailability) return state
+
+    const next: ConnectState = { ...state, connectionMethod: 'direct', useSharedPooler: false }
+    const hasValidSource =
+      state.connectionSource === undefined ||
+      state.connectionSource === projectRef ||
+      state.connectionSource === CONNECTION_SOURCE_LOAD_BALANCER
+    if (!hasValidSource) next.connectionSource = projectRef ?? '_'
+    return next
+  }, [state, isHighAvailability, projectRef])
 
   const activeFields = useMemo(() => {
     let fields = getActiveFields(connectSchema, resolvedState)
@@ -394,9 +422,11 @@ export function useConnectState(initialState?: Partial<ConnectState>): UseConnec
         state: resolvedState,
         databases,
         deploymentMode,
+        isHighAvailability,
+        projectRef,
       })
     },
-    [activeFields, resolvedState, databases, deploymentMode]
+    [activeFields, resolvedState, databases, deploymentMode, isHighAvailability, projectRef]
   )
 
   return {
diff --git a/apps/studio/components/interfaces/ConnectSheet/useConnectionStringDatabases.ts b/apps/studio/components/interfaces/ConnectSheet/useConnectionStringDatabases.ts
new file mode 100644
index 00000000000..5909a068144
--- /dev/null
+++ b/apps/studio/components/interfaces/ConnectSheet/useConnectionStringDatabases.ts
@@ -0,0 +1,137 @@
+import { useParams } from 'common'
+import { useMemo } from 'react'
+
+import { CONNECTION_SOURCE_LOAD_BALANCER } from './Connect.constants'
+import type { DeploymentMode } from './Connect.types'
+import {
+  buildConnectionStringPooler,
+  getConnectionStrings,
+  getHighAvailabilityLoadBalancerConnectionInfo,
+} from './DatabaseSettings.utils'
+import { getAddons } from '@/components/interfaces/Billing/Subscription/Subscription.utils'
+import { usePgbouncerConfigQuery } from '@/data/database/pgbouncer-config-query'
+import { useSupavisorConfigurationQuery } from '@/data/database/supavisor-configuration-query'
+import { useReadReplicasQuery } from '@/data/read-replicas/replicas-query'
+import { useProjectAddonsQuery } from '@/data/subscriptions/project-addons-query'
+import { useCheckEntitlements } from '@/hooks/misc/useCheckEntitlements'
+import { useIsHighAvailability } from '@/hooks/misc/useSelectedProject'
+import { pluckObjectFields } from '@/lib/helpers'
+
+/**
+ * [Joshen] ConnectStepsSection does something similar but since only this page needs to consider connection strings
+ * from all databases (including read replicas), am opting to separate the logic for retrieving connection strings here
+ *
+ * We can however, consider to shift this logic into ConnectStepsSection, such that we can consider read replicas for
+ * the other tabs like "Framework" and "ORM" too. However, leaving them out for now and only updating "Direct"
+ */
+export const useConnectionStringDatabases = (deploymentMode: DeploymentMode) => {
+  const { ref: projectRef } = useParams()
+  const { hasAccess: allowPgBouncerSelection } = useCheckEntitlements('dedicated_pooler')
+  const isHighAvailability = useIsHighAvailability()
+
+  const { data: databases = [] } = useReadReplicasQuery({ projectRef })
+  // Multigres has no pooler, so the pooler config endpoints don't apply
+  const { data: pgbouncerConfig } = usePgbouncerConfigQuery(
+    { projectRef },
+    { enabled: !isHighAvailability }
+  )
+  const { data: supavisorConfig } = useSupavisorConfigurationQuery(
+    { projectRef },
+    { enabled: !isHighAvailability }
+  )
+  const { data: addons } = useProjectAddonsQuery({ projectRef })
+  const { ipv4: ipv4Addon } = getAddons(addons?.selected_addons ?? [])
+
+  // Memoized so the per-database pooler bag (consumed by resolveConnectionString
+  // downstream) keeps a stable identity across renders. Without this the inner
+  // pluckObjectFields/getConnectionStrings calls would mint fresh objects every
+  // render and ripple through the resolveConnectionString useMemo below.
+  return useMemo(() => {
+    const DB_FIELDS = ['db_host', 'db_name', 'db_port', 'db_user', 'inserted_at']
+    const emptyState = { db_user: '', db_host: '', db_port: '', db_name: '' }
+
+    const connectionStringsByIdentifier = Object.fromEntries(
+      databases.map((db) => {
+        const connectionInfo = pluckObjectFields(db || emptyState, DB_FIELDS)
+        const poolingConfigurationShared = supavisorConfig?.find(
+          (x) => x.identifier === db.identifier
+        )
+        const poolingConfigurationDedicated = allowPgBouncerSelection ? pgbouncerConfig : undefined
+
+        const connectionStringsShared = getConnectionStrings({
+          connectionInfo,
+          poolingInfo: {
+            connectionString: poolingConfigurationShared?.connection_string ?? '',
+            db_host: poolingConfigurationShared?.db_host ?? '',
+            db_name: poolingConfigurationShared?.db_name ?? '',
+            db_port: poolingConfigurationShared?.db_port ?? 0,
+            db_user: poolingConfigurationShared?.db_user ?? '',
+          },
+          metadata: { projectRef: db.identifier },
+        })
+
+        const connectionStringsDedicated =
+          poolingConfigurationDedicated !== undefined
+            ? getConnectionStrings({
+                connectionInfo,
+                poolingInfo: {
+                  connectionString: poolingConfigurationDedicated.connection_string.replace(
+                    projectRef ?? '_',
+                    db.identifier
+                  ),
+                  db_host: poolingConfigurationDedicated.db_host,
+                  db_name: poolingConfigurationDedicated.db_name,
+                  db_port: poolingConfigurationDedicated.db_port,
+                  db_user: poolingConfigurationDedicated.db_user,
+                },
+                metadata: { projectRef: db.identifier },
+              })
+            : undefined
+
+        return [
+          db.identifier,
+          buildConnectionStringPooler({
+            deploymentMode,
+            connectionInfo,
+            connectionStringsShared,
+            connectionStringsDedicated,
+            ipv4Addon: !!ipv4Addon,
+            isHighAvailability,
+          }),
+        ]
+      })
+    )
+
+    // The Multigres load balancer is not a database row — it shares the
+    // primary's host on a dedicated read-only port.
+    const primaryDatabase = isHighAvailability
+      ? databases.find((db) => db.identifier === projectRef)
+      : undefined
+    if (primaryDatabase) {
+      const loadBalancerInfo = getHighAvailabilityLoadBalancerConnectionInfo(
+        pluckObjectFields(primaryDatabase, DB_FIELDS)
+      )
+      connectionStringsByIdentifier[CONNECTION_SOURCE_LOAD_BALANCER] = buildConnectionStringPooler({
+        deploymentMode,
+        connectionInfo: loadBalancerInfo,
+        connectionStringsShared: getConnectionStrings({
+          connectionInfo: loadBalancerInfo,
+          metadata: { projectRef },
+        }),
+        ipv4Addon: false,
+        isHighAvailability,
+      })
+    }
+
+    return connectionStringsByIdentifier
+  }, [
+    databases,
+    pgbouncerConfig,
+    supavisorConfig,
+    allowPgBouncerSelection,
+    ipv4Addon,
+    projectRef,
+    deploymentMode,
+    isHighAvailability,
+  ])
+}
diff --git a/apps/studio/components/interfaces/Database/Replication/DestinationPanel/DestinationForm/AdvancedSettings.tsx b/apps/studio/components/interfaces/Database/Replication/DestinationPanel/DestinationForm/AdvancedSettings.tsx
index d004564c635..877915b1e54 100644
--- a/apps/studio/components/interfaces/Database/Replication/DestinationPanel/DestinationForm/AdvancedSettings.tsx
+++ b/apps/studio/components/interfaces/Database/Replication/DestinationPanel/DestinationForm/AdvancedSettings.tsx
@@ -28,6 +28,11 @@ import {
 } from './DestinationForm.constants'
 import { type DestinationPanelSchemaType } from './DestinationForm.schema'
 
+const INVALIDATED_SLOT_BEHAVIOR_LABELS = {
+  error: 'Block startup',
+  recreate: 'Recreate slot',
+}
+
 export const AdvancedSettings = ({
   type,
   form,
@@ -153,16 +158,18 @@ export const AdvancedSettings = ({
                 >
                   <FormControl>
                     <Select value={field.value ?? 'error'} onValueChange={field.onChange}>
-                      <SelectTrigger className="capitalize">{field.value ?? 'error'}</SelectTrigger>
+                      <SelectTrigger>
+                        {INVALIDATED_SLOT_BEHAVIOR_LABELS[field.value ?? 'error']}
+                      </SelectTrigger>
                       <SelectContent>
                         <SelectItem value="error" className="[&>span]:top-2.5">
-                          <p>Error</p>
+                          <p>Block startup</p>
                           <p className="text-foreground-lighter">
                             Blocks startup for manual recovery.
                           </p>
                         </SelectItem>
                         <SelectItem value="recreate" className="[&>span]:top-2.5">
-                          <p>Recreate</p>
+                          <p>Recreate slot</p>
                           <p className="text-foreground-lighter">
                             Replaces destination tables and runs a new, billable initial sync.
                           </p>
@@ -222,7 +229,7 @@ export const AdvancedSettings = ({
                         </div>
                       }
                       layout="horizontal"
-                      description="How old query results can be while BigQuery applies ongoing changes."
+                      description="Set the maximum age of query results while BigQuery applies ongoing changes, or leave blank for the freshest results."
                     >
                       <FormControl>
                         <InputGroup>
@@ -233,7 +240,6 @@ export const AdvancedSettings = ({
                             step={1}
                             value={field.value ?? ''}
                             onChange={handleNumberChange(field)}
-                            placeholder="Default: None (Freshest results)"
                           />
                           <InputGroupAddon align="inline-end">
                             <InputGroupText>minutes</InputGroupText>
diff --git a/apps/studio/components/interfaces/Database/Replication/DestinationPanel/DestinationForm/AnalyticsBucket/AnalyticsBucket.utils.ts b/apps/studio/components/interfaces/Database/Replication/DestinationPanel/DestinationForm/AnalyticsBucket/AnalyticsBucket.utils.ts
index 3aeb5cd9060..d443262582e 100644
--- a/apps/studio/components/interfaces/Database/Replication/DestinationPanel/DestinationForm/AnalyticsBucket/AnalyticsBucket.utils.ts
+++ b/apps/studio/components/interfaces/Database/Replication/DestinationPanel/DestinationForm/AnalyticsBucket/AnalyticsBucket.utils.ts
@@ -21,9 +21,9 @@ type AnalyticsBucketValidationOptions = {
 
 // Fields that are always required regardless of the namespace / access key selections.
 const ANALYTICS_BUCKET_REQUIRED_FIELDS: AnalyticsBucketValidationIssue[] = [
-  { path: 'warehouseName', message: 'Bucket is required' },
-  { path: 's3Region', message: 'S3 region is required' },
-  { path: 's3AccessKeyId', message: 'S3 access key ID is required' },
+  { path: 'warehouseName', message: 'Bucket is required.' },
+  { path: 's3Region', message: 'S3 region is required.' },
+  { path: 's3AccessKeyId', message: 'S3 access key ID is required.' },
 ]
 
 export const getAnalyticsBucketValidationIssues = (
@@ -43,8 +43,8 @@ export const getAnalyticsBucketValidationIssues = (
   if (!hasValidNamespace) {
     issues.push(
       isCreatingNewNamespace
-        ? { path: 'newNamespaceName', message: 'Namespace name is required' }
-        : { path: 'namespace', message: 'Namespace is required' }
+        ? { path: 'newNamespaceName', message: 'Namespace name is required.' }
+        : { path: 'namespace', message: 'Namespace is required.' }
     )
   }
 
@@ -53,7 +53,7 @@ export const getAnalyticsBucketValidationIssues = (
     data.s3SecretAccessKey?.trim().length &&
     !data.s3AccessKeyId?.trim().length
   ) {
-    issues.push({ path: 's3AccessKeyId', message: 'S3 access key ID is required' })
+    issues.push({ path: 's3AccessKeyId', message: 'S3 access key ID is required.' })
   }
 
   const currentS3AccessKeyId = data.s3AccessKeyId?.trim()
@@ -69,7 +69,7 @@ export const getAnalyticsBucketValidationIssues = (
     (!options.secretsOptional || hasChangedStoredS3AccessKey) &&
     !data.s3SecretAccessKey?.trim().length
   ) {
-    issues.push({ path: 's3SecretAccessKey', message: 'S3 secret access key is required' })
+    issues.push({ path: 's3SecretAccessKey', message: 'S3 secret access key is required.' })
   }
 
   return issues
diff --git a/apps/studio/components/interfaces/Database/Replication/DestinationPanel/DestinationForm/BigQuery/BigQuery.schema.ts b/apps/studio/components/interfaces/Database/Replication/DestinationPanel/DestinationForm/BigQuery/BigQuery.schema.ts
index abd86b79faf..b6fa2279c49 100644
--- a/apps/studio/components/interfaces/Database/Replication/DestinationPanel/DestinationForm/BigQuery/BigQuery.schema.ts
+++ b/apps/studio/components/interfaces/Database/Replication/DestinationPanel/DestinationForm/BigQuery/BigQuery.schema.ts
@@ -7,11 +7,11 @@ export const BigQueryFormSchema = z.object({
   connectionPoolSize: z
     .number()
     .int()
-    .min(1, 'Connection pool size must be greater than 0')
+    .min(1, 'Connection pool size must be greater than 0.')
     .optional(),
   maxStalenessMins: z
     .number()
-    .int('Maximum staleness must be a whole number of minutes')
-    .min(0, 'Maximum staleness must be 0 or greater')
+    .int('Maximum staleness must be a whole number of minutes.')
+    .min(0, 'Maximum staleness must be 0 or greater.')
     .optional(),
 })
diff --git a/apps/studio/components/interfaces/Database/Replication/DestinationPanel/DestinationForm/BigQuery/BigQuery.utils.ts b/apps/studio/components/interfaces/Database/Replication/DestinationPanel/DestinationForm/BigQuery/BigQuery.utils.ts
index 7b9e1c25a36..423632f5c4f 100644
--- a/apps/studio/components/interfaces/Database/Replication/DestinationPanel/DestinationForm/BigQuery/BigQuery.utils.ts
+++ b/apps/studio/components/interfaces/Database/Replication/DestinationPanel/DestinationForm/BigQuery/BigQuery.utils.ts
@@ -7,18 +7,51 @@ export type BigQueryValidationIssue = {
   message: string
 }
 
-const BIGQUERY_REQUIRED_FIELDS: { path: BigQueryFieldPath; message: string }[] = [
-  { path: 'projectId', message: 'Project ID is required' },
-  { path: 'datasetId', message: 'Dataset ID is required' },
-  { path: 'serviceAccountKey', message: 'Service account key is required' },
+export const BIGQUERY_SERVICE_ACCOUNT_JSON_MESSAGE = 'Service account key must be valid JSON.'
+
+const BIGQUERY_REQUIRED_FIELDS: {
+  path: Exclude<BigQueryFieldPath, 'serviceAccountKey'>
+  message: string
+}[] = [
+  { path: 'projectId', message: 'Project ID is required.' },
+  { path: 'datasetId', message: 'Dataset ID is required.' },
 ]
 
+const isValidJsonString = (value: string) => {
+  try {
+    JSON.parse(value)
+    return true
+  } catch {
+    return false
+  }
+}
+
 export const getBigQueryValidationIssues = (
   data: Pick<DestinationPanelSchemaType, BigQueryFieldPath>,
-  options: { secretsOptional?: boolean } = {}
-): BigQueryValidationIssue[] =>
-  BIGQUERY_REQUIRED_FIELDS.filter(({ path }) => {
-    if (options.secretsOptional && path === 'serviceAccountKey') return false
+  options: { secretsOptional?: boolean; validateJson?: boolean } = {}
+): BigQueryValidationIssue[] => {
+  const { secretsOptional = false, validateJson = true } = options
+  const issues: BigQueryValidationIssue[] = BIGQUERY_REQUIRED_FIELDS.filter(
+    ({ path }) => !data[path]?.trim().length
+  ).map(({ path, message }) => ({ path, message }))
 
-    return !data[path]?.trim().length
-  })
+  const serviceAccountKey = data.serviceAccountKey?.trim() ?? ''
+
+  if (!serviceAccountKey) {
+    if (!secretsOptional) {
+      issues.push({ path: 'serviceAccountKey', message: 'Service account key is required.' })
+    }
+    return issues
+  }
+
+  // JSON shape is checked on submit only. Live onChange validation would fail on every
+  // keystroke while the user is still pasting or typing a key.
+  if (validateJson && !isValidJsonString(serviceAccountKey)) {
+    issues.push({
+      path: 'serviceAccountKey',
+      message: BIGQUERY_SERVICE_ACCOUNT_JSON_MESSAGE,
+    })
+  }
+
+  return issues
+}
diff --git a/apps/studio/components/interfaces/Database/Replication/DestinationPanel/DestinationForm/BigQuery/Fields.test.tsx b/apps/studio/components/interfaces/Database/Replication/DestinationPanel/DestinationForm/BigQuery/Fields.test.tsx
new file mode 100644
index 00000000000..6322f20270d
--- /dev/null
+++ b/apps/studio/components/interfaces/Database/Replication/DestinationPanel/DestinationForm/BigQuery/Fields.test.tsx
@@ -0,0 +1,90 @@
+import { fireEvent, screen, waitFor } from '@testing-library/react'
+import { useForm } from 'react-hook-form'
+import { Form } from 'ui'
+import { describe, expect, it, vi } from 'vitest'
+
+import type { DestinationPanelSchemaType } from '../DestinationForm.schema'
+import { BigQueryFields } from './Fields'
+import { customRender } from '@/tests/lib/custom-render'
+
+const TestForm = ({ serviceAccountKey = '' }: { serviceAccountKey?: string }) => {
+  const form = useForm<DestinationPanelSchemaType>({
+    defaultValues: { projectId: '', datasetId: '', serviceAccountKey },
+  })
+
+  return (
+    <Form {...form}>
+      <BigQueryFields form={form} editMode={false} />
+    </Form>
+  )
+}
+
+describe('BigQueryFields', () => {
+  it('imports a JSON file into an editable service account key field', async () => {
+    const { container } = customRender(<TestForm />)
+    const contents = '{"type":"service_account"}'
+    const file = new File([contents], 'service-account.json', { type: 'application/json' })
+    Object.defineProperty(file, 'text', { value: vi.fn().mockResolvedValue(contents) })
+
+    const fileInput = container.querySelector<HTMLInputElement>('input[type="file"]')
+    expect(fileInput).not.toBeNull()
+    fireEvent.change(fileInput!, { target: { files: [file] } })
+
+    const textarea = screen.getByPlaceholderText(
+      '{"type": "service_account", "project_id": "...", ...}'
+    )
+    await waitFor(() => expect(textarea).toHaveValue(contents))
+
+    fireEvent.change(textarea, { target: { value: `${contents}\n` } })
+    expect(textarea).toHaveValue(`${contents}\n`)
+    expect(textarea).toHaveClass('max-h-[calc(13lh+1rem)]')
+  })
+
+  it('imports a dropped JSON file into the service account key field', async () => {
+    customRender(<TestForm />)
+    const contents = '{"type":"service_account"}'
+    const file = new File([contents], 'service-account.json', { type: 'application/json' })
+    Object.defineProperty(file, 'text', { value: vi.fn().mockResolvedValue(contents) })
+
+    const textarea = screen.getByPlaceholderText(
+      '{"type": "service_account", "project_id": "...", ...}'
+    )
+    fireEvent.drop(textarea.closest('div')!, {
+      dataTransfer: { files: [file] },
+    })
+
+    await waitFor(() => expect(textarea).toHaveValue(contents))
+  })
+
+  it('rejects an oversized file without replacing the existing key', async () => {
+    const { container } = customRender(<TestForm serviceAccountKey="existing-key" />)
+    const file = new File(['x'.repeat(5001)], 'service-account.json', {
+      type: 'application/json',
+    })
+    const readFile = vi.fn()
+    Object.defineProperty(file, 'text', { value: readFile })
+
+    const fileInput = container.querySelector<HTMLInputElement>('input[type="file"]')
+    fireEvent.change(fileInput!, { target: { files: [file] } })
+
+    expect(
+      await screen.findByText('Service account key must be 5,000 characters or fewer.')
+    ).toBeInTheDocument()
+    expect(readFile).not.toHaveBeenCalled()
+    expect(screen.getByDisplayValue('existing-key')).toBeInTheDocument()
+  })
+
+  it('preserves the existing key when the selected file cannot be read', async () => {
+    const { container } = customRender(<TestForm serviceAccountKey="existing-key" />)
+    const file = new File(['{}'], 'service-account.json', { type: 'application/json' })
+    Object.defineProperty(file, 'text', {
+      value: vi.fn().mockRejectedValue(new Error('File read failed')),
+    })
+
+    const fileInput = container.querySelector<HTMLInputElement>('input[type="file"]')
+    fireEvent.change(fileInput!, { target: { files: [file] } })
+
+    expect(await screen.findByText('Could not read the selected JSON file.')).toBeInTheDocument()
+    expect(screen.getByDisplayValue('existing-key')).toBeInTheDocument()
+  })
+})
diff --git a/apps/studio/components/interfaces/Database/Replication/DestinationPanel/DestinationForm/BigQuery/Fields.tsx b/apps/studio/components/interfaces/Database/Replication/DestinationPanel/DestinationForm/BigQuery/Fields.tsx
index 9e7db5d75cf..bb4e4397d95 100644
--- a/apps/studio/components/interfaces/Database/Replication/DestinationPanel/DestinationForm/BigQuery/Fields.tsx
+++ b/apps/studio/components/interfaces/Database/Replication/DestinationPanel/DestinationForm/BigQuery/Fields.tsx
@@ -1,10 +1,54 @@
+import { Upload } from 'lucide-react'
+import { useRef, useState, type ChangeEvent, type DragEvent } from 'react'
 import type { UseFormReturn } from 'react-hook-form'
-import { FormControl, FormField, Input, TextArea } from 'ui'
+import { Button, cn, FormControl, FormField, Input, TextArea } from 'ui'
 import { FormItemLayout } from 'ui-patterns/form/FormItemLayout/FormItemLayout'
 
 import { STORED_SECRET_PLACEHOLDER } from '../DestinationForm.constants'
 import type { DestinationPanelSchemaType } from '../DestinationForm.schema'
 
+const MAX_SERVICE_ACCOUNT_KEY_LENGTH = 5000
+
+const readServiceAccountFile = async (
+  file: File,
+  form: UseFormReturn<DestinationPanelSchemaType>,
+  isCurrentRequest: () => boolean
+) => {
+  if (file.size > MAX_SERVICE_ACCOUNT_KEY_LENGTH) {
+    if (isCurrentRequest()) {
+      form.setError('serviceAccountKey', {
+        message: 'Service account key must be 5,000 characters or fewer.',
+      })
+    }
+    return
+  }
+
+  try {
+    const contents = await file.text()
+    if (!isCurrentRequest()) return
+
+    if (contents.length > MAX_SERVICE_ACCOUNT_KEY_LENGTH) {
+      form.setError('serviceAccountKey', {
+        message: 'Service account key must be 5,000 characters or fewer.',
+      })
+      return
+    }
+
+    form.setValue('serviceAccountKey', contents, {
+      shouldDirty: true,
+      shouldTouch: true,
+      shouldValidate: true,
+    })
+    form.clearErrors('serviceAccountKey')
+  } catch {
+    if (isCurrentRequest()) {
+      form.setError('serviceAccountKey', {
+        message: 'Could not read the selected JSON file.',
+      })
+    }
+  }
+}
+
 export const BigQueryFields = ({
   form,
   editMode,
@@ -12,6 +56,41 @@ export const BigQueryFields = ({
   form: UseFormReturn<DestinationPanelSchemaType>
   editMode: boolean
 }) => {
+  const serviceAccountFileInputRef = useRef<HTMLInputElement>(null)
+  const fileReadRequestIdRef = useRef(0)
+  const [isDraggingFile, setIsDraggingFile] = useState(false)
+
+  const handleServiceAccountFile = async (file: File | undefined) => {
+    if (!file) return
+    const requestId = ++fileReadRequestIdRef.current
+    await readServiceAccountFile(file, form, () => requestId === fileReadRequestIdRef.current)
+  }
+
+  const handleServiceAccountFileInputChange = async (event: ChangeEvent<HTMLInputElement>) => {
+    const file = event.target.files?.[0]
+    event.target.value = ''
+    await handleServiceAccountFile(file)
+  }
+
+  const handleDragOver = (event: DragEvent<HTMLDivElement>) => {
+    event.preventDefault()
+    event.stopPropagation()
+    setIsDraggingFile(true)
+  }
+
+  const handleDragLeave = (event: DragEvent<HTMLDivElement>) => {
+    event.preventDefault()
+    event.stopPropagation()
+    setIsDraggingFile(false)
+  }
+
+  const handleDrop = async (event: DragEvent<HTMLDivElement>) => {
+    event.preventDefault()
+    event.stopPropagation()
+    setIsDraggingFile(false)
+    await handleServiceAccountFile(event.dataTransfer.files?.[0])
+  }
+
   return (
     <div className="flex flex-col gap-y-6 p-5">
       <p className="text-sm font-medium text-foreground">BigQuery settings</p>
@@ -57,23 +136,58 @@ export const BigQueryFields = ({
               label="Service account key"
               description={
                 editMode
-                  ? 'Stored credentials are hidden. Enter new credentials to replace them.'
-                  : 'Service account credentials JSON for authenticating with BigQuery'
+                  ? 'Stored credentials are hidden. Paste or upload new credentials to replace them.'
+                  : 'Paste or upload your service account credentials JSON file for authenticating with BigQuery.'
               }
             >
-              <FormControl>
-                <TextArea
-                  {...field}
-                  rows={5}
-                  maxLength={5000}
-                  placeholder={
-                    editMode
-                      ? STORED_SECRET_PLACEHOLDER
-                      : '{"type": "service_account", "project_id": "...", ...}'
-                  }
-                  className="font-mono text-xs"
-                />
-              </FormControl>
+              <div
+                className="relative"
+                onDragOver={handleDragOver}
+                onDragLeave={handleDragLeave}
+                onDrop={handleDrop}
+              >
+                <div className={cn('space-y-2 transition-opacity', isDraggingFile && 'opacity-40')}>
+                  <FormControl>
+                    <TextArea
+                      {...field}
+                      onChange={(event) => {
+                        fileReadRequestIdRef.current += 1
+                        field.onChange(event)
+                      }}
+                      rows={5}
+                      maxLength={MAX_SERVICE_ACCOUNT_KEY_LENGTH}
+                      placeholder={
+                        editMode
+                          ? STORED_SECRET_PLACEHOLDER
+                          : '{"type": "service_account", "project_id": "...", ...}'
+                      }
+                      className="max-h-[calc(13lh+1rem)] font-mono text-xs"
+                    />
+                  </FormControl>
+                  <input
+                    ref={serviceAccountFileInputRef}
+                    type="file"
+                    accept="application/json,.json"
+                    className="hidden"
+                    onChange={handleServiceAccountFileInputChange}
+                  />
+                  <Button
+                    type="button"
+                    variant="default"
+                    size="tiny"
+                    icon={<Upload size={14} />}
+                    onClick={() => serviceAccountFileInputRef.current?.click()}
+                  >
+                    Upload JSON file
+                  </Button>
+                </div>
+                {isDraggingFile ? (
+                  <div
+                    aria-hidden="true"
+                    className="pointer-events-none absolute inset-0 rounded-md ring-2 ring-brand ring-offset-2 ring-offset-background"
+                  />
+                ) : null}
+              </div>
             </FormItemLayout>
           )}
         />
diff --git a/apps/studio/components/interfaces/Database/Replication/DestinationPanel/DestinationForm/ClickHouse/ClickHouse.utils.ts b/apps/studio/components/interfaces/Database/Replication/DestinationPanel/DestinationForm/ClickHouse/ClickHouse.utils.ts
index e36d47f4c18..ec3ba9a117f 100644
--- a/apps/studio/components/interfaces/Database/Replication/DestinationPanel/DestinationForm/ClickHouse/ClickHouse.utils.ts
+++ b/apps/studio/components/interfaces/Database/Replication/DestinationPanel/DestinationForm/ClickHouse/ClickHouse.utils.ts
@@ -64,26 +64,26 @@ export const getClickHouseValidationIssues = (
   const issues: ClickHouseValidationIssue[] = []
 
   if (!data.clickhouseUrl?.length) {
-    issues.push({ path: 'clickhouseUrl', message: 'URL is required' })
+    issues.push({ path: 'clickhouseUrl', message: 'URL is required.' })
   } else {
     let parsed: URL | undefined
 
     try {
       parsed = new URL(data.clickhouseUrl)
     } catch {
-      issues.push({ path: 'clickhouseUrl', message: 'ClickHouse URL must be a valid URL' })
+      issues.push({ path: 'clickhouseUrl', message: 'ClickHouse URL must be a valid URL.' })
     }
 
     if (parsed) {
       if (parsed.protocol !== 'https:') {
-        issues.push({ path: 'clickhouseUrl', message: 'ClickHouse URL must use https://' })
+        issues.push({ path: 'clickhouseUrl', message: 'ClickHouse URL must use HTTPS.' })
       } else {
         const host = parsed.hostname.replace(/^\[|\]$/g, '')
 
         if (isClickHouseHostInternal(host)) {
           issues.push({
             path: 'clickhouseUrl',
-            message: 'ClickHouse URL must not target an internal address',
+            message: 'ClickHouse URL must not target an internal address.',
           })
         }
       }
@@ -91,11 +91,11 @@ export const getClickHouseValidationIssues = (
   }
 
   if (!data.clickhouseUser?.length) {
-    issues.push({ path: 'clickhouseUser', message: 'User is required' })
+    issues.push({ path: 'clickhouseUser', message: 'User is required.' })
   }
 
   if (!data.clickhouseDatabase?.length) {
-    issues.push({ path: 'clickhouseDatabase', message: 'Database is required' })
+    issues.push({ path: 'clickhouseDatabase', message: 'Database is required.' })
   }
 
   return issues
diff --git a/apps/studio/components/interfaces/Database/Replication/DestinationPanel/DestinationForm/DestinationForm.schema.ts b/apps/studio/components/interfaces/Database/Replication/DestinationPanel/DestinationForm/DestinationForm.schema.ts
index 9bfdd084c6b..dd260642b0f 100644
--- a/apps/studio/components/interfaces/Database/Replication/DestinationPanel/DestinationForm/DestinationForm.schema.ts
+++ b/apps/studio/components/interfaces/Database/Replication/DestinationPanel/DestinationForm/DestinationForm.schema.ts
@@ -7,8 +7,8 @@ import { DuckLakeFormSchema } from './DuckLake/DuckLake.schema'
 import { SnowflakeFormSchema } from './Snowflake/Snowflake.schema'
 
 const CommonFormSchema = z.object({
-  name: z.string().min(1, 'Name is required'),
-  publicationName: z.string().min(1, 'Publication is required'),
+  name: z.string().min(1, 'Name is required.'),
+  publicationName: z.string().min(1, 'Publication is required.'),
   tableSyncCopyMode: z.enum([
     'include_all_tables',
     'skip_all_tables',
@@ -18,18 +18,18 @@ const CommonFormSchema = z.object({
   tableSyncCopyTableIds: z.array(z.string()),
   maxFillMs: z
     .number()
-    .int('Batch wait time must be a whole number of milliseconds')
-    .min(0, 'Batch wait time must be 0 or greater')
+    .int('Batch wait time must be a whole number of milliseconds.')
+    .min(0, 'Batch wait time must be 0 or greater.')
     .optional(),
   maxTableSyncWorkers: z
     .number()
-    .min(1, 'Max table sync workers must be greater than 0')
-    .int('Max table sync workers must be a whole number')
+    .min(1, 'Max table sync workers must be greater than 0.')
+    .int('Max table sync workers must be a whole number.')
     .optional(),
   maxCopyConnectionsPerTable: z
     .number()
     .int()
-    .min(1, 'Max copy connections per table must be greater than 0')
+    .min(1, 'Max copy connections per table must be greater than 0.')
     .optional(),
   invalidatedSlotBehavior: z.enum(['error', 'recreate']).optional(),
 })
diff --git a/apps/studio/components/interfaces/Database/Replication/DestinationPanel/DestinationForm/DestinationForm.utils.test.ts b/apps/studio/components/interfaces/Database/Replication/DestinationPanel/DestinationForm/DestinationForm.utils.test.ts
index 3c55a6a9de0..1e69cba9d97 100644
--- a/apps/studio/components/interfaces/Database/Replication/DestinationPanel/DestinationForm/DestinationForm.utils.test.ts
+++ b/apps/studio/components/interfaces/Database/Replication/DestinationPanel/DestinationForm/DestinationForm.utils.test.ts
@@ -306,12 +306,12 @@ describe('DestinationForm.utils DuckLake', () => {
     })
 
     expect(issues).toEqual([
-      { path: 'ducklakeCatalogUrl', message: 'Catalog URL is required' },
-      { path: 'ducklakeDataPath', message: 'Data path is required' },
-      { path: 'ducklakeS3AccessKeyId', message: 'S3 access key ID is required' },
-      { path: 'ducklakeS3SecretAccessKey', message: 'S3 secret access key is required' },
-      { path: 'ducklakeS3Region', message: 'S3 region is required' },
-      { path: 'ducklakeS3Endpoint', message: 'S3 endpoint is required' },
+      { path: 'ducklakeCatalogUrl', message: 'Catalog URL is required.' },
+      { path: 'ducklakeDataPath', message: 'Data path is required.' },
+      { path: 'ducklakeS3AccessKeyId', message: 'S3 access key ID is required.' },
+      { path: 'ducklakeS3SecretAccessKey', message: 'S3 secret access key is required.' },
+      { path: 'ducklakeS3Region', message: 'S3 region is required.' },
+      { path: 'ducklakeS3Endpoint', message: 'S3 endpoint is required.' },
     ])
   })
 
@@ -347,7 +347,7 @@ describe('DestinationForm.utils DuckLake', () => {
     )
 
     expect(issues).toEqual([
-      { path: 'ducklakeS3SecretAccessKey', message: 'S3 secret access key is required' },
+      { path: 'ducklakeS3SecretAccessKey', message: 'S3 secret access key is required.' },
     ])
   })
 
@@ -363,12 +363,12 @@ describe('DestinationForm.utils DuckLake', () => {
     })
 
     expect(issues).toEqual([
-      { path: 'ducklakeCatalogUrl', message: 'Catalog URL is required' },
-      { path: 'ducklakeDataPath', message: 'Data path is required' },
-      { path: 'ducklakeS3AccessKeyId', message: 'S3 access key ID is required' },
-      { path: 'ducklakeS3SecretAccessKey', message: 'S3 secret access key is required' },
-      { path: 'ducklakeS3Region', message: 'S3 region is required' },
-      { path: 'ducklakeS3Endpoint', message: 'S3 endpoint is required' },
+      { path: 'ducklakeCatalogUrl', message: 'Catalog URL is required.' },
+      { path: 'ducklakeDataPath', message: 'Data path is required.' },
+      { path: 'ducklakeS3AccessKeyId', message: 'S3 access key ID is required.' },
+      { path: 'ducklakeS3SecretAccessKey', message: 'S3 secret access key is required.' },
+      { path: 'ducklakeS3Region', message: 'S3 region is required.' },
+      { path: 'ducklakeS3Endpoint', message: 'S3 endpoint is required.' },
     ])
   })
 
@@ -386,19 +386,19 @@ describe('DestinationForm.utils DuckLake', () => {
     expect(issues).toEqual([
       {
         path: 'ducklakeCatalogUrl',
-        message: 'DuckLake catalog URL must be a PostgreSQL-compatible URL',
+        message: 'DuckLake catalog URL must be a PostgreSQL-compatible URL.',
       },
       {
         path: 'ducklakeDataPath',
-        message: 'DuckLake data path must start with s3:// and cannot contain file://',
+        message: 'DuckLake data path must start with s3:// and cannot contain file://.',
       },
       {
         path: 'ducklakeS3Endpoint',
-        message: 'S3 endpoint must not contain the protocol scheme',
+        message: 'S3 endpoint must not contain the protocol scheme.',
       },
       {
         path: 'ducklakeMetadataSchema',
-        message: 'DuckLake metadata schema must contain only letters, numbers, and underscores',
+        message: 'DuckLake metadata schema must contain only letters, numbers, and underscores.',
       },
     ])
   })
@@ -487,9 +487,9 @@ describe('DestinationForm.utils DuckLake (Use Supabase)', () => {
     })
 
     expect(issues).toEqual([
-      { path: 'ducklakeCatalogProjectRef', message: 'Catalog project is required' },
-      { path: 'ducklakeStorageProjectRef', message: 'Storage project is required' },
-      { path: 'ducklakeStorageBucket', message: 'Bucket is required' },
+      { path: 'ducklakeCatalogProjectRef', message: 'Catalog project is required.' },
+      { path: 'ducklakeStorageProjectRef', message: 'Storage project is required.' },
+      { path: 'ducklakeStorageBucket', message: 'Bucket is required.' },
     ])
   })
 
@@ -574,11 +574,11 @@ describe('DestinationForm.utils Snowflake', () => {
     })
 
     expect(issues).toEqual([
-      { path: 'snowflakeAccountId', message: 'Account ID is required' },
-      { path: 'snowflakeUser', message: 'User is required' },
-      { path: 'snowflakePrivateKey', message: 'Private key is required' },
-      { path: 'snowflakeDatabase', message: 'Database is required' },
-      { path: 'snowflakeSchema', message: 'Schema is required' },
+      { path: 'snowflakeAccountId', message: 'Account ID is required.' },
+      { path: 'snowflakeUser', message: 'User is required.' },
+      { path: 'snowflakePrivateKey', message: 'Private key is required.' },
+      { path: 'snowflakeDatabase', message: 'Database is required.' },
+      { path: 'snowflakeSchema', message: 'Schema is required.' },
     ])
   })
 
@@ -653,9 +653,9 @@ describe('DestinationForm.utils ClickHouse', () => {
     })
 
     expect(issues).toEqual([
-      { path: 'clickhouseUrl', message: 'URL is required' },
-      { path: 'clickhouseUser', message: 'User is required' },
-      { path: 'clickhouseDatabase', message: 'Database is required' },
+      { path: 'clickhouseUrl', message: 'URL is required.' },
+      { path: 'clickhouseUser', message: 'User is required.' },
+      { path: 'clickhouseDatabase', message: 'Database is required.' },
     ])
   })
 
@@ -666,7 +666,7 @@ describe('DestinationForm.utils ClickHouse', () => {
         clickhouseUser: 'default',
         clickhouseDatabase: 'analytics',
       })
-    ).toEqual([{ path: 'clickhouseUrl', message: 'ClickHouse URL must use https://' }])
+    ).toEqual([{ path: 'clickhouseUrl', message: 'ClickHouse URL must use HTTPS.' }])
 
     expect(
       getClickHouseValidationIssues({
@@ -675,7 +675,7 @@ describe('DestinationForm.utils ClickHouse', () => {
         clickhouseDatabase: 'analytics',
       })
     ).toEqual([
-      { path: 'clickhouseUrl', message: 'ClickHouse URL must not target an internal address' },
+      { path: 'clickhouseUrl', message: 'ClickHouse URL must not target an internal address.' },
     ])
   })
 
@@ -711,7 +711,7 @@ describe('DestinationForm.utils ClickHouse', () => {
         clickhouseDatabase: 'analytics',
       })
     ).toEqual([
-      { path: 'clickhouseUrl', message: 'ClickHouse URL must not target an internal address' },
+      { path: 'clickhouseUrl', message: 'ClickHouse URL must not target an internal address.' },
     ])
   })
 
@@ -739,9 +739,9 @@ describe('DestinationForm.utils BigQuery', () => {
     })
 
     expect(issues).toEqual([
-      { path: 'projectId', message: 'Project ID is required' },
-      { path: 'datasetId', message: 'Dataset ID is required' },
-      { path: 'serviceAccountKey', message: 'Service account key is required' },
+      { path: 'projectId', message: 'Project ID is required.' },
+      { path: 'datasetId', message: 'Dataset ID is required.' },
+      { path: 'serviceAccountKey', message: 'Service account key is required.' },
     ])
   })
 
@@ -753,9 +753,9 @@ describe('DestinationForm.utils BigQuery', () => {
     })
 
     expect(issues).toEqual([
-      { path: 'projectId', message: 'Project ID is required' },
-      { path: 'datasetId', message: 'Dataset ID is required' },
-      { path: 'serviceAccountKey', message: 'Service account key is required' },
+      { path: 'projectId', message: 'Project ID is required.' },
+      { path: 'datasetId', message: 'Dataset ID is required.' },
+      { path: 'serviceAccountKey', message: 'Service account key is required.' },
     ])
   })
 
@@ -769,6 +769,58 @@ describe('DestinationForm.utils BigQuery', () => {
     expect(issues).toEqual([])
   })
 
+  it('rejects invalid JSON in the service account key', () => {
+    const issues = getBigQueryValidationIssues({
+      projectId: 'my-project',
+      datasetId: 'my_dataset',
+      serviceAccountKey: '{ "type": "service_account" ',
+    })
+
+    expect(issues).toEqual([
+      { path: 'serviceAccountKey', message: 'Service account key must be valid JSON.' },
+    ])
+  })
+
+  it('skips JSON shape checks when validateJson is false', () => {
+    const issues = getBigQueryValidationIssues(
+      {
+        projectId: 'my-project',
+        datasetId: 'my_dataset',
+        serviceAccountKey: '{ "type": "service_account" ',
+      },
+      { validateJson: false }
+    )
+
+    expect(issues).toEqual([])
+  })
+
+  it('rejects non-JSON text in the service account key', () => {
+    const issues = getBigQueryValidationIssues({
+      projectId: 'my-project',
+      datasetId: 'my_dataset',
+      serviceAccountKey: 'not-json',
+    })
+
+    expect(issues).toEqual([
+      { path: 'serviceAccountKey', message: 'Service account key must be valid JSON.' },
+    ])
+  })
+
+  it('validates JSON when replacing credentials in edit mode', () => {
+    const issues = getBigQueryValidationIssues(
+      {
+        projectId: 'my-project',
+        datasetId: 'my_dataset',
+        serviceAccountKey: '{ invalid',
+      },
+      { secretsOptional: true }
+    )
+
+    expect(issues).toEqual([
+      { path: 'serviceAccountKey', message: 'Service account key must be valid JSON.' },
+    ])
+  })
+
   it('allows an omitted BigQuery service account key in edit mode', () => {
     const issues = getBigQueryValidationIssues(
       {
@@ -795,11 +847,11 @@ describe('DestinationForm.utils Analytics Bucket', () => {
     })
 
     expect(issues).toEqual([
-      { path: 'warehouseName', message: 'Bucket is required' },
-      { path: 's3Region', message: 'S3 region is required' },
-      { path: 's3AccessKeyId', message: 'S3 access key ID is required' },
-      { path: 'namespace', message: 'Namespace is required' },
-      { path: 's3SecretAccessKey', message: 'S3 secret access key is required' },
+      { path: 'warehouseName', message: 'Bucket is required.' },
+      { path: 's3Region', message: 'S3 region is required.' },
+      { path: 's3AccessKeyId', message: 'S3 access key ID is required.' },
+      { path: 'namespace', message: 'Namespace is required.' },
+      { path: 's3SecretAccessKey', message: 'S3 secret access key is required.' },
     ])
   })
 
@@ -814,11 +866,11 @@ describe('DestinationForm.utils Analytics Bucket', () => {
     })
 
     expect(issues).toEqual([
-      { path: 'warehouseName', message: 'Bucket is required' },
-      { path: 's3Region', message: 'S3 region is required' },
-      { path: 's3AccessKeyId', message: 'S3 access key ID is required' },
-      { path: 'namespace', message: 'Namespace is required' },
-      { path: 's3SecretAccessKey', message: 'S3 secret access key is required' },
+      { path: 'warehouseName', message: 'Bucket is required.' },
+      { path: 's3Region', message: 'S3 region is required.' },
+      { path: 's3AccessKeyId', message: 'S3 access key ID is required.' },
+      { path: 'namespace', message: 'Namespace is required.' },
+      { path: 's3SecretAccessKey', message: 'S3 secret access key is required.' },
     ])
   })
 
@@ -832,7 +884,7 @@ describe('DestinationForm.utils Analytics Bucket', () => {
       s3SecretAccessKey: 'secret',
     })
 
-    expect(issues).toEqual([{ path: 'newNamespaceName', message: 'Namespace name is required' }])
+    expect(issues).toEqual([{ path: 'newNamespaceName', message: 'Namespace name is required.' }])
   })
 
   it('skips the S3 secret when creating a new access key', () => {
@@ -894,7 +946,7 @@ describe('DestinationForm.utils Analytics Bucket', () => {
     )
 
     expect(issues).toEqual([
-      { path: 's3SecretAccessKey', message: 'S3 secret access key is required' },
+      { path: 's3SecretAccessKey', message: 'S3 secret access key is required.' },
     ])
   })
 
diff --git a/apps/studio/components/interfaces/Database/Replication/DestinationPanel/DestinationForm/DestinationForm.utils.ts b/apps/studio/components/interfaces/Database/Replication/DestinationPanel/DestinationForm/DestinationForm.utils.ts
index 3ddee07c982..d36e4287aab 100644
--- a/apps/studio/components/interfaces/Database/Replication/DestinationPanel/DestinationForm/DestinationForm.utils.ts
+++ b/apps/studio/components/interfaces/Database/Replication/DestinationPanel/DestinationForm/DestinationForm.utils.ts
@@ -172,7 +172,7 @@ export const buildTableSyncCopyConfig = ({
   if (mode === 'include_all_tables' || mode === 'skip_all_tables') return { type: mode }
 
   if (selectedTableIds.length === 0) {
-    throw new Error('Select at least one table for the initial sync')
+    throw new Error('Select at least one table for the initial sync.')
   }
 
   const tableIds = selectedTableIds.map(Number)
@@ -343,7 +343,7 @@ export const buildDestinationConfigForValidation = ({
   } else if (selectedType === 'ClickHouse') {
     return { clickHouse: buildClickHouseConfig(data) }
   } else {
-    throw new Error('Invalid destination type')
+    throw new Error('Invalid destination type.')
   }
 }
 
diff --git a/apps/studio/components/interfaces/Database/Replication/DestinationPanel/DestinationForm/DestinationNameInput.tsx b/apps/studio/components/interfaces/Database/Replication/DestinationPanel/DestinationForm/DestinationNameInput.tsx
index c04a4c1a2dc..af5789b8934 100644
--- a/apps/studio/components/interfaces/Database/Replication/DestinationPanel/DestinationForm/DestinationNameInput.tsx
+++ b/apps/studio/components/interfaces/Database/Replication/DestinationPanel/DestinationForm/DestinationNameInput.tsx
@@ -14,9 +14,21 @@ export const DestinationNameInput = ({ form }: DestinationNameInputProps) => {
       control={form.control}
       name="name"
       render={({ field }) => (
-        <FormItemLayout label="Name" layout="horizontal">
+        <FormItemLayout
+          label="Name"
+          layout="horizontal"
+          description="Used to identify this pipeline in Supabase."
+        >
           <FormControl>
-            <Input {...field} placeholder="My destination" />
+            <Input
+              {...field}
+              autoFocus
+              placeholder="My destination"
+              data-1p-ignore
+              data-lpignore="true"
+              data-form-type="other"
+              data-bwignore
+            />
           </FormControl>
         </FormItemLayout>
       )}
diff --git a/apps/studio/components/interfaces/Database/Replication/DestinationPanel/DestinationForm/DuckLake/DuckLake.schema.ts b/apps/studio/components/interfaces/Database/Replication/DestinationPanel/DestinationForm/DuckLake/DuckLake.schema.ts
index 37da7aec648..50a9ace4a91 100644
--- a/apps/studio/components/interfaces/Database/Replication/DestinationPanel/DestinationForm/DuckLake/DuckLake.schema.ts
+++ b/apps/studio/components/interfaces/Database/Replication/DestinationPanel/DestinationForm/DuckLake/DuckLake.schema.ts
@@ -14,8 +14,8 @@ export const DuckLakeFormSchema = z.object({
   ducklakePoolSize: z
     .number()
     .int()
-    .min(1, 'Pool size must be greater than 0')
-    .max(6, 'Pool size must be 6 or less')
+    .min(1, 'Pool size must be greater than 0.')
+    .max(6, 'Pool size must be 6 or less.')
     .optional(),
   ducklakeS3AccessKeyId: z.string().optional(),
   ducklakeS3SecretAccessKey: z.string().optional(),
diff --git a/apps/studio/components/interfaces/Database/Replication/DestinationPanel/DestinationForm/DuckLake/DuckLake.utils.ts b/apps/studio/components/interfaces/Database/Replication/DestinationPanel/DestinationForm/DuckLake/DuckLake.utils.ts
index 8f5080273e5..1d8c9b43c41 100644
--- a/apps/studio/components/interfaces/Database/Replication/DestinationPanel/DestinationForm/DuckLake/DuckLake.utils.ts
+++ b/apps/studio/components/interfaces/Database/Replication/DestinationPanel/DestinationForm/DuckLake/DuckLake.utils.ts
@@ -55,18 +55,18 @@ type DucklakeValidationData = Pick<
 // Required fields per mode. "Use Supabase" only needs project refs + a bucket; the catalog URL and
 // S3 credentials are resolved by the platform API.
 const DUCKLAKE_SUPABASE_REQUIRED_FIELDS: DucklakeValidationIssue[] = [
-  { path: 'ducklakeCatalogProjectRef', message: 'Catalog project is required' },
-  { path: 'ducklakeStorageProjectRef', message: 'Storage project is required' },
-  { path: 'ducklakeStorageBucket', message: 'Bucket is required' },
+  { path: 'ducklakeCatalogProjectRef', message: 'Catalog project is required.' },
+  { path: 'ducklakeStorageProjectRef', message: 'Storage project is required.' },
+  { path: 'ducklakeStorageBucket', message: 'Bucket is required.' },
 ]
 
 const DUCKLAKE_CUSTOM_REQUIRED_FIELDS: DucklakeValidationIssue[] = [
-  { path: 'ducklakeCatalogUrl', message: 'Catalog URL is required' },
-  { path: 'ducklakeDataPath', message: 'Data path is required' },
-  { path: 'ducklakeS3AccessKeyId', message: 'S3 access key ID is required' },
-  { path: 'ducklakeS3SecretAccessKey', message: 'S3 secret access key is required' },
-  { path: 'ducklakeS3Region', message: 'S3 region is required' },
-  { path: 'ducklakeS3Endpoint', message: 'S3 endpoint is required' },
+  { path: 'ducklakeCatalogUrl', message: 'Catalog URL is required.' },
+  { path: 'ducklakeDataPath', message: 'Data path is required.' },
+  { path: 'ducklakeS3AccessKeyId', message: 'S3 access key ID is required.' },
+  { path: 'ducklakeS3SecretAccessKey', message: 'S3 secret access key is required.' },
+  { path: 'ducklakeS3Region', message: 'S3 region is required.' },
+  { path: 'ducklakeS3Endpoint', message: 'S3 endpoint is required.' },
 ]
 
 const DUCKLAKE_CUSTOM_SECRET_FIELDS = new Set<DucklakeFieldPath>([
@@ -79,7 +79,7 @@ const DUCKLAKE_CUSTOM_SECRET_FIELDS = new Set<DucklakeFieldPath>([
 const METADATA_SCHEMA_PATTERN = /^[A-Za-z0-9_]+$/
 const METADATA_SCHEMA_ISSUE: DucklakeValidationIssue = {
   path: 'ducklakeMetadataSchema',
-  message: 'DuckLake metadata schema must contain only letters, numbers, and underscores',
+  message: 'DuckLake metadata schema must contain only letters, numbers, and underscores.',
 }
 
 const getMissingRequiredFieldIssues = (
@@ -113,7 +113,7 @@ export const getDucklakeValidationIssues = (
   ) {
     issues.push({
       path: 'ducklakeS3AccessKeyId',
-      message: 'S3 access key ID is required',
+      message: 'S3 access key ID is required.',
     })
   }
 
@@ -124,7 +124,7 @@ export const getDucklakeValidationIssues = (
   ) {
     issues.push({
       path: 'ducklakeS3SecretAccessKey',
-      message: 'S3 secret access key is required',
+      message: 'S3 secret access key is required.',
     })
   }
 
@@ -136,7 +136,7 @@ export const getDucklakeValidationIssues = (
   ) {
     issues.push({
       path: 'ducklakeCatalogUrl',
-      message: 'DuckLake catalog URL must be a PostgreSQL-compatible URL',
+      message: 'DuckLake catalog URL must be a PostgreSQL-compatible URL.',
     })
   }
 
@@ -146,7 +146,7 @@ export const getDucklakeValidationIssues = (
   ) {
     issues.push({
       path: 'ducklakeDataPath',
-      message: 'DuckLake data path must start with s3:// and cannot contain file://',
+      message: 'DuckLake data path must start with s3:// and cannot contain file://.',
     })
   }
 
@@ -157,7 +157,7 @@ export const getDucklakeValidationIssues = (
   ) {
     issues.push({
       path: 'ducklakeS3Endpoint',
-      message: 'S3 endpoint must not contain the protocol scheme',
+      message: 'S3 endpoint must not contain the protocol scheme.',
     })
   }
 
diff --git a/apps/studio/components/interfaces/Database/Replication/DestinationPanel/DestinationForm/DuckLake/Fields.tsx b/apps/studio/components/interfaces/Database/Replication/DestinationPanel/DestinationForm/DuckLake/Fields.tsx
index f9947ada7ad..7f29d23598c 100644
--- a/apps/studio/components/interfaces/Database/Replication/DestinationPanel/DestinationForm/DuckLake/Fields.tsx
+++ b/apps/studio/components/interfaces/Database/Replication/DestinationPanel/DestinationForm/DuckLake/Fields.tsx
@@ -154,7 +154,7 @@ const DuckLakeSupabaseFields = ({ form }: { form: UseFormReturn<DestinationPanel
     const name = newBucketName.trim()
     if (!name || !ducklakeStorageProjectRef) return
     if (name.includes('/')) {
-      return toast.error('Bucket name cannot contain "/"')
+      return toast.error('Bucket name cannot contain "/".')
     }
 
     createBucket({
diff --git a/apps/studio/components/interfaces/Database/Replication/DestinationPanel/DestinationForm/PipelineRegionField.test.tsx b/apps/studio/components/interfaces/Database/Replication/DestinationPanel/DestinationForm/PipelineRegionField.test.tsx
new file mode 100644
index 00000000000..0afb0d83473
--- /dev/null
+++ b/apps/studio/components/interfaces/Database/Replication/DestinationPanel/DestinationForm/PipelineRegionField.test.tsx
@@ -0,0 +1,36 @@
+import { screen } from '@testing-library/react'
+import { describe, expect, test } from 'vitest'
+
+import {
+  getPipelineRegionDescription,
+  PIPELINE_REGION,
+  PipelineRegionField,
+} from './PipelineRegionField'
+import { customRender } from '@/tests/lib/custom-render'
+
+describe('getPipelineRegionDescription', () => {
+  test('includes the fixed-region note and destination-specific hint', () => {
+    expect(getPipelineRegionDescription('BigQuery')).toBe(
+      'All pipelines run from this region. Choose a nearby BigQuery dataset where possible.'
+    )
+  })
+
+  test('falls back to a generic destination hint', () => {
+    expect(getPipelineRegionDescription()).toBe(
+      'All pipelines run from this region. Choose a nearby destination region where possible.'
+    )
+  })
+})
+
+describe('PipelineRegionField', () => {
+  test('shows the managed region as read-only information, not a combobox', () => {
+    customRender(<PipelineRegionField destinationType="BigQuery" />)
+
+    expect(screen.getByText('Pipeline region')).toBeInTheDocument()
+    expect(screen.getByText(PIPELINE_REGION.displayName)).toBeInTheDocument()
+    expect(screen.getByText(PIPELINE_REGION.code)).toBeInTheDocument()
+    expect(screen.getByText(/All pipelines run from this region/)).toBeInTheDocument()
+    expect(screen.getByText(/nearby BigQuery dataset/)).toBeInTheDocument()
+    expect(screen.queryByRole('combobox')).not.toBeInTheDocument()
+  })
+})
diff --git a/apps/studio/components/interfaces/Database/Replication/DestinationPanel/DestinationForm/PipelineRegionField.tsx b/apps/studio/components/interfaces/Database/Replication/DestinationPanel/DestinationForm/PipelineRegionField.tsx
new file mode 100644
index 00000000000..9cd0941cbf9
--- /dev/null
+++ b/apps/studio/components/interfaces/Database/Replication/DestinationPanel/DestinationForm/PipelineRegionField.tsx
@@ -0,0 +1,59 @@
+import { AWS_REGIONS } from 'shared-data'
+import { cn } from 'ui'
+import { FormItemLayout } from 'ui-patterns/form/FormItemLayout/FormItemLayout'
+
+import type { DestinationType } from '../DestinationPanel.types'
+import { RegionFlag } from '@/components/ui/RegionFlag'
+import { IS_STAGING_OR_LOCAL } from '@/lib/constants'
+
+// Pipelines always run from a single fixed region per environment, regardless of the source
+// project's region.
+export const PIPELINE_REGION = IS_STAGING_OR_LOCAL
+  ? AWS_REGIONS.SOUTHEAST_ASIA
+  : AWS_REGIONS.CENTRAL_EU
+
+const DESTINATION_REGION_HINT: Record<DestinationType, string> = {
+  BigQuery: 'Choose a nearby BigQuery dataset where possible.',
+  'Analytics Bucket': 'Keep this bucket in the same region where possible.',
+  DuckLake: 'Keep catalog and object storage close to this region where possible.',
+  Snowflake: 'Choose a nearby Snowflake account region where possible.',
+  ClickHouse: 'Choose a nearby ClickHouse cluster where possible.',
+}
+
+export const getPipelineRegionDescription = (destinationType?: DestinationType) => {
+  const destinationHint = destinationType
+    ? DESTINATION_REGION_HINT[destinationType]
+    : 'Choose a nearby destination region where possible.'
+
+  return `All pipelines run from this region. ${destinationHint}`
+}
+
+export const PipelineRegionField = ({
+  destinationType,
+  className,
+}: {
+  destinationType?: DestinationType
+  className?: string
+}) => {
+  return (
+    <FormItemLayout
+      isReactForm={false}
+      layout="horizontal"
+      label="Pipeline region"
+      description={getPipelineRegionDescription(destinationType)}
+    >
+      <div
+        className={cn(
+          'flex h-9 min-w-0 items-center gap-x-2 rounded-md border bg-surface-200 px-3 text-sm',
+          className
+        )}
+      >
+        <RegionFlag className="w-5 shrink-0" region={PIPELINE_REGION.code} />
+        <span className="min-w-0 truncate text-foreground">{PIPELINE_REGION.displayName}</span>
+        <span className="shrink-0 font-mono text-xs text-foreground-lighter">
+          {PIPELINE_REGION.code}
+        </span>
+      </div>
+    </FormItemLayout>
+  )
+}
diff --git a/apps/studio/components/interfaces/Database/Replication/DestinationPanel/DestinationForm/Snowflake/Snowflake.utils.ts b/apps/studio/components/interfaces/Database/Replication/DestinationPanel/DestinationForm/Snowflake/Snowflake.utils.ts
index fa270daba84..8a2a5f4d56c 100644
--- a/apps/studio/components/interfaces/Database/Replication/DestinationPanel/DestinationForm/Snowflake/Snowflake.utils.ts
+++ b/apps/studio/components/interfaces/Database/Replication/DestinationPanel/DestinationForm/Snowflake/Snowflake.utils.ts
@@ -23,11 +23,11 @@ export type SnowflakeValidationIssue = {
 }
 
 const SNOWFLAKE_REQUIRED_FIELDS: { path: SnowflakeFieldPath; message: string }[] = [
-  { path: 'snowflakeAccountId', message: 'Account ID is required' },
-  { path: 'snowflakeUser', message: 'User is required' },
-  { path: 'snowflakePrivateKey', message: 'Private key is required' },
-  { path: 'snowflakeDatabase', message: 'Database is required' },
-  { path: 'snowflakeSchema', message: 'Schema is required' },
+  { path: 'snowflakeAccountId', message: 'Account ID is required.' },
+  { path: 'snowflakeUser', message: 'User is required.' },
+  { path: 'snowflakePrivateKey', message: 'Private key is required.' },
+  { path: 'snowflakeDatabase', message: 'Database is required.' },
+  { path: 'snowflakeSchema', message: 'Schema is required.' },
 ]
 
 export const getSnowflakeValidationIssues = (
diff --git a/apps/studio/components/interfaces/Database/Replication/DestinationPanel/DestinationForm/index.test.tsx b/apps/studio/components/interfaces/Database/Replication/DestinationPanel/DestinationForm/index.test.tsx
index 675c129e84b..d6313a5772d 100644
--- a/apps/studio/components/interfaces/Database/Replication/DestinationPanel/DestinationForm/index.test.tsx
+++ b/apps/studio/components/interfaces/Database/Replication/DestinationPanel/DestinationForm/index.test.tsx
@@ -71,6 +71,7 @@ vi.mock('ui', () => ({
       {children}
     </button>
   ),
+  cn: (...args: unknown[]) => args.filter(Boolean).join(' '),
   DialogSectionSeparator: () => null,
   Form: ({ children }: PropsWithChildren) => children,
   Select: ({ children }: PropsWithChildren) => <div>{children}</div>,
diff --git a/apps/studio/components/interfaces/Database/Replication/DestinationPanel/DestinationForm/index.tsx b/apps/studio/components/interfaces/Database/Replication/DestinationPanel/DestinationForm/index.tsx
index 61670a6b66c..b4f8f25a13f 100644
--- a/apps/studio/components/interfaces/Database/Replication/DestinationPanel/DestinationForm/index.tsx
+++ b/apps/studio/components/interfaces/Database/Replication/DestinationPanel/DestinationForm/index.tsx
@@ -5,25 +5,9 @@ import { AnimatePresence, motion } from 'framer-motion'
 import { Loader2 } from 'lucide-react'
 import { RefObject, useEffect, useMemo, useRef, useState, type ReactNode } from 'react'
 import { useForm, useWatch } from 'react-hook-form'
-import { AWS_REGIONS } from 'shared-data'
 import { toast } from 'sonner'
-import {
-  Button,
-  DialogSectionSeparator,
-  Form,
-  Select,
-  SelectContent,
-  SelectItem,
-  SelectTrigger,
-  SelectValue,
-  SheetFooter,
-  SheetSection,
-  Tooltip,
-  TooltipContent,
-  TooltipTrigger,
-} from 'ui'
+import { Button, DialogSectionSeparator, Form, SheetFooter, SheetSection } from 'ui'
 import { Admonition } from 'ui-patterns/Admonition'
-import { FormItemLayout } from 'ui-patterns/form/FormItemLayout/FormItemLayout'
 import * as z from 'zod'
 
 import {
@@ -37,7 +21,10 @@ import { type DestinationType, type ExistingDestination } from '../DestinationPa
 import { AdvancedSettings } from './AdvancedSettings'
 import { getAnalyticsBucketValidationIssues } from './AnalyticsBucket/AnalyticsBucket.utils'
 import { AnalyticsBucketFields } from './AnalyticsBucket/Fields'
-import { getBigQueryValidationIssues } from './BigQuery/BigQuery.utils'
+import {
+  BIGQUERY_SERVICE_ACCOUNT_JSON_MESSAGE,
+  getBigQueryValidationIssues,
+} from './BigQuery/BigQuery.utils'
 import { BigQueryFields } from './BigQuery/Fields'
 import { getClickHouseValidationIssues } from './ClickHouse/ClickHouse.utils'
 import { ClickHouseFields } from './ClickHouse/Fields'
@@ -54,6 +41,7 @@ import { DuckLakeFields } from './DuckLake/Fields'
 import { NewPublicationPanel } from './NewPublicationPanel'
 import { NoDestinationsAvailable } from './NoDestinationsAvailable'
 import { PipelineCostDialog } from './PipelineCostDialog'
+import { PipelineRegionField } from './PipelineRegionField'
 import { PublicationSelection } from './PublicationSelection'
 import { SnowflakeFields } from './Snowflake/Fields'
 import { getSnowflakeValidationIssues } from './Snowflake/Snowflake.utils'
@@ -62,8 +50,6 @@ import { useDestinationForm } from './useDestinationForm'
 import { ValidationFailuresSection } from './ValidationFailuresSection'
 import { ValidationWarningsDialog } from './ValidationWarningsDialog'
 import { CreateAnalyticsBucketSheet } from '@/components/interfaces/Storage/AnalyticsBuckets/CreateAnalyticsBucketSheet'
-import { InlineLinkClassName } from '@/components/ui/InlineLink'
-import { RegionFlag } from '@/components/ui/RegionFlag'
 import { useAPIKeys } from '@/data/api-keys/api-keys-query'
 import { useProjectSettingsV2Query } from '@/data/config/project-settings-v2-query'
 import { useReplicationDestinationByIdQuery } from '@/data/replication/destination-by-id-query'
@@ -71,14 +57,9 @@ import { useReplicationPipelineByIdQuery } from '@/data/replication/pipeline-by-
 import { useReplicationPublicationsQuery } from '@/data/replication/publications-query'
 import { useReplicationSourceId } from '@/data/replication/sources-query'
 import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
-import { IS_STAGING_OR_LOCAL } from '@/lib/constants'
 
 const formId = 'destination-editor'
 
-// Pipelines always run out of a single fixed region per environment, regardless of the source
-// project's region.
-const PIPELINE_REGION = IS_STAGING_OR_LOCAL ? AWS_REGIONS.SOUTHEAST_ASIA : AWS_REGIONS.CENTRAL_EU
-
 interface DestinationFormProps {
   selectedType: DestinationType
   visible: boolean
@@ -232,11 +213,12 @@ export const DestinationForm = ({
         }
 
         if (selectedType === 'BigQuery') {
-          getBigQueryValidationIssues(data, { secretsOptional: editMode }).forEach(
-            ({ path, message }) => {
-              addRequiredFieldError(path, message)
-            }
-          )
+          getBigQueryValidationIssues(data, {
+            secretsOptional: editMode,
+            validateJson: false,
+          }).forEach(({ path, message }) => {
+            addRequiredFieldError(path, message)
+          })
         } else if (selectedType === 'Analytics Bucket') {
           getAnalyticsBucketValidationIssues(data, {
             secretsOptional: editMode,
@@ -342,6 +324,16 @@ export const DestinationForm = ({
       }),
     }
 
+    if (selectedType === 'BigQuery') {
+      const jsonIssue = getBigQueryValidationIssues(data, { secretsOptional: editMode }).find(
+        (issue) => issue.message === BIGQUERY_SERVICE_ACCOUNT_JSON_MESSAGE
+      )
+      if (jsonIssue) {
+        form.setError(jsonIssue.path, { message: jsonIssue.message })
+        return
+      }
+    }
+
     // Pipeline prerequisite validation models a new pipeline and cannot
     // account for resources already owned by an existing pipeline. Edits keep
     // the established direct-update flow after pruning stale table ids.
@@ -469,42 +461,7 @@ export const DestinationForm = ({
                       onSelectNewPublication={() => setPublicationPanelVisible(true)}
                     />
                     <TableCopySelection form={form} editMode={editMode} />
-                    <FormItemLayout
-                      isReactForm={false}
-                      layout="horizontal"
-                      label="Region"
-                      description={
-                        <span className="text-foreground-lighter">
-                          Pipelines run in{' '}
-                          <Tooltip>
-                            <TooltipTrigger className={InlineLinkClassName}>
-                              {PIPELINE_REGION.displayName}
-                            </TooltipTrigger>
-                            <TooltipContent side="bottom">{PIPELINE_REGION.code}</TooltipContent>
-                          </Tooltip>
-                          . In your destination provider, choose the closest available region.
-                        </span>
-                      }
-                    >
-                      <Select disabled value={PIPELINE_REGION.code}>
-                        <SelectTrigger>
-                          <SelectValue placeholder="Select a region" />
-                        </SelectTrigger>
-                        <SelectContent>
-                          <SelectItem value={PIPELINE_REGION.code}>
-                            <div className="flex gap-x-3 items-center">
-                              <RegionFlag className="w-5" region={PIPELINE_REGION.code} />
-                              <p className="flex items-center gap-x-2">
-                                <span>{PIPELINE_REGION.displayName}</span>
-                                <span className="text-xs text-foreground-lighter font-mono">
-                                  {PIPELINE_REGION.code}
-                                </span>
-                              </p>
-                            </div>
-                          </SelectItem>
-                        </SelectContent>
-                      </Select>
-                    </FormItemLayout>
+                    <PipelineRegionField destinationType={selectedType} />
                   </div>
                 </div>
 
diff --git a/apps/studio/components/interfaces/Database/Replication/DestinationPanel/DestinationForm/useDestinationForm.ts b/apps/studio/components/interfaces/Database/Replication/DestinationPanel/DestinationForm/useDestinationForm.ts
index b317f4e5f98..a89977494cc 100644
--- a/apps/studio/components/interfaces/Database/Replication/DestinationPanel/DestinationForm/useDestinationForm.ts
+++ b/apps/studio/components/interfaces/Database/Replication/DestinationPanel/DestinationForm/useDestinationForm.ts
@@ -85,7 +85,7 @@ export const useDestinationForm = ({ selectedType }: { selectedType: Destination
   // Helper function to handle namespace creation if needed
   const resolveNamespace = async (data: z.infer<typeof FormSchema>) => {
     if (data.namespace === CREATE_NEW_NAMESPACE) {
-      if (!data.newNamespaceName) throw new Error('New namespace name is required')
+      if (!data.newNamespaceName) throw new Error('New namespace name is required.')
 
       await createNamespace({
         projectRef,
@@ -224,7 +224,7 @@ export const useDestinationForm = ({ selectedType }: { selectedType: Destination
         resolveNamespace,
       })
 
-      if (!destinationConfig) throw new Error('Destination configuration is missing')
+      if (!destinationConfig) throw new Error('Destination configuration is missing.')
 
       const shouldSendBatch =
         !editMode || data.maxFillMs !== (existingBatch?.max_fill_ms ?? DEFAULT_MAX_FILL_MS)
diff --git a/apps/studio/components/interfaces/Database/Replication/DestinationPanel/DestinationTypeSelection.test.tsx b/apps/studio/components/interfaces/Database/Replication/DestinationPanel/DestinationTypeSelection.test.tsx
index 8b7d4dcb9d7..a84bf5b1ae4 100644
--- a/apps/studio/components/interfaces/Database/Replication/DestinationPanel/DestinationTypeSelection.test.tsx
+++ b/apps/studio/components/interfaces/Database/Replication/DestinationPanel/DestinationTypeSelection.test.tsx
@@ -76,10 +76,10 @@ describe('DestinationTypeSelection', () => {
     expect(await screen.findByText('Select a destination type')).toBeInTheDocument()
   })
 
-  test('renders the Pipelines group with BigQuery when the flag is enabled', async () => {
+  test('groups destinations by release stage', async () => {
     mockBigQueryEnabled.mockReturnValue(true)
-    mockIcebergEnabled.mockReturnValue(false)
-    mockDucklakeEnabled.mockReturnValue(false)
+    mockIcebergEnabled.mockReturnValue(true)
+    mockDucklakeEnabled.mockReturnValue(true)
     mockSnowflakeEnabled.mockReturnValue(false)
     mockClickHouseEnabled.mockReturnValue(false)
     addBackgroundMocks()
@@ -88,8 +88,13 @@ describe('DestinationTypeSelection', () => {
 
     fireEvent.click(await screen.findByRole('combobox'))
 
-    expect(await screen.findByText('Pipelines')).toBeInTheDocument()
+    expect(await screen.findByText('Public Alpha')).toBeInTheDocument()
+    expect(screen.getByText('Early Access')).toBeInTheDocument()
+    expect(screen.getByText('Deprecated')).toBeInTheDocument()
     expect(screen.getByText('BigQuery')).toBeInTheDocument()
+    expect(screen.getByText('DuckLake')).toBeInTheDocument()
+    expect(screen.getByText('Analytics Bucket')).toBeInTheDocument()
+    expect(screen.queryByText('Pipelines')).not.toBeInTheDocument()
   })
 
   test('hides destinations behind disabled feature flags', async () => {
diff --git a/apps/studio/components/interfaces/Database/Replication/DestinationPanel/DestinationTypeSelection.tsx b/apps/studio/components/interfaces/Database/Replication/DestinationPanel/DestinationTypeSelection.tsx
index fc042ed1de2..9c7c902b7b7 100644
--- a/apps/studio/components/interfaces/Database/Replication/DestinationPanel/DestinationTypeSelection.tsx
+++ b/apps/studio/components/interfaces/Database/Replication/DestinationPanel/DestinationTypeSelection.tsx
@@ -1,11 +1,11 @@
 import { parseAsInteger, parseAsStringEnum, useQueryState } from 'nuqs'
 import {
-  Badge,
   Select,
   SelectContent,
   SelectGroup,
   SelectItem,
   SelectLabel,
+  SelectSeparator,
   SelectTrigger,
 } from 'ui'
 import { FormItemLayout } from 'ui-patterns/form/FormItemLayout/FormItemLayout'
@@ -21,7 +21,6 @@ import {
 } from '../useIsETLPrivateAlpha'
 import { DestinationType } from './DestinationPanel.types'
 import { ReadReplicasMovedCallout } from './ReadReplicasMovedCallout'
-import { InlineLink } from '@/components/ui/InlineLink'
 
 interface DestinationTypeOption {
   value: DestinationType
@@ -31,13 +30,9 @@ interface DestinationTypeOption {
   enabled: boolean
 }
 
-const STAGE_BADGE_VARIANT: Record<
-  NonNullable<DestinationTypeOption['stage']>,
-  'warning' | 'destructive' | 'default'
-> = {
-  'Early Access': 'warning',
-  Deprecated: 'destructive',
-  'Public Alpha': 'default',
+interface DestinationTypeGroup {
+  label: NonNullable<DestinationTypeOption['stage']>
+  options: DestinationTypeOption[]
 }
 
 export const DestinationTypeSelection = () => {
@@ -73,67 +68,74 @@ export const DestinationTypeSelection = () => {
   const isOptionVisible = (value: DestinationType, hasAccess: boolean) =>
     editMode ? destinationType === value : hasAccess
 
-  const options: DestinationTypeOption[] = (
-    [
-      {
-        value: 'Analytics Bucket',
-        label: 'Analytics Bucket',
-        description: 'Write Apache Iceberg tables to Supabase Storage for analytics workflows',
-        stage: 'Deprecated',
-        enabled: isOptionVisible('Analytics Bucket', etlEnableIceberg),
-      },
-      {
-        value: 'BigQuery',
-        label: 'BigQuery',
-        description: "Replicate changes to Google Cloud's data warehouse for analytics and BI",
-        stage: 'Public Alpha',
-        enabled: isOptionVisible('BigQuery', etlEnableBigQuery),
-      },
-      {
-        value: 'DuckLake',
-        label: 'DuckLake',
-        description: 'Replicate changes to a DuckLake catalog backed by S3-compatible storage',
-        stage: 'Early Access',
-        enabled: isOptionVisible('DuckLake', etlEnableDucklake),
-      },
-      {
-        value: 'Snowflake',
-        label: 'Snowflake',
-        description:
-          'Replicate changes to Snowflake for warehouse analytics and downstream data workflows',
-        stage: 'Early Access',
-        enabled: isOptionVisible('Snowflake', etlEnableSnowflake),
-      },
-      {
-        value: 'ClickHouse',
-        label: 'ClickHouse',
-        description: 'Stream changes to a ClickHouse cluster for fast columnar analytics',
-        stage: 'Early Access',
-        enabled: isOptionVisible('ClickHouse', etlEnableClickHouse),
-      },
-    ] satisfies DestinationTypeOption[]
-  ).filter((option) => option.enabled)
+  const groups: DestinationTypeGroup[] = [
+    {
+      label: 'Public Alpha',
+      options: [
+        {
+          value: 'BigQuery',
+          label: 'BigQuery',
+          description: "Replicate changes to Google Cloud's data warehouse for analytics and BI",
+          stage: 'Public Alpha',
+          enabled: isOptionVisible('BigQuery', etlEnableBigQuery),
+        },
+      ],
+    },
+    {
+      label: 'Early Access',
+      options: [
+        {
+          value: 'DuckLake',
+          label: 'DuckLake',
+          description: 'Replicate changes to a DuckLake catalog backed by S3-compatible storage',
+          stage: 'Early Access',
+          enabled: isOptionVisible('DuckLake', etlEnableDucklake),
+        },
+        {
+          value: 'Snowflake',
+          label: 'Snowflake',
+          description:
+            'Replicate changes to Snowflake for warehouse analytics and downstream data workflows',
+          stage: 'Early Access',
+          enabled: isOptionVisible('Snowflake', etlEnableSnowflake),
+        },
+        {
+          value: 'ClickHouse',
+          label: 'ClickHouse',
+          description: 'Stream changes to a ClickHouse cluster for fast columnar analytics',
+          stage: 'Early Access',
+          enabled: isOptionVisible('ClickHouse', etlEnableClickHouse),
+        },
+      ],
+    },
+    {
+      label: 'Deprecated',
+      options: [
+        {
+          value: 'Analytics Bucket',
+          label: 'Analytics Bucket',
+          description: 'Write Apache Iceberg tables to Supabase Storage for analytics workflows',
+          stage: 'Deprecated',
+          enabled: isOptionVisible('Analytics Bucket', etlEnableIceberg),
+        },
+      ],
+    },
+  ]
+
+  const visibleGroups = groups
+    .map((group) => ({ ...group, options: group.options.filter((option) => option.enabled) }))
+    .filter((group) => group.options.length > 0)
+  const options = visibleGroups.flatMap((group) => group.options)
 
   const selectedOption = options.find((option) => option.value === destinationType)
 
-  const stageDescription =
-    selectedOption?.stage === 'Public Alpha' ? (
-      <>
-        In public alpha and may change.{' '}
-        <InlineLink href="https://github.com/orgs/supabase/discussions/39416">
-          Leave feedback
-        </InlineLink>
-      </>
-    ) : selectedOption?.stage === 'Early Access' ? (
-      <>
-        In early access and may change.{' '}
-        <InlineLink href="https://github.com/orgs/supabase/discussions/39416">
-          Leave feedback
-        </InlineLink>
-      </>
-    ) : selectedOption?.stage === 'Deprecated' ? (
-      'This destination type is deprecated.'
-    ) : null
+  const STAGE_DESCRIPTIONS: Record<NonNullable<DestinationTypeOption['stage']>, string> = {
+    'Public Alpha': 'In public alpha and may change.',
+    'Early Access': 'In early access and may change.',
+    Deprecated: 'This destination type is deprecated.',
+  }
+
+  const stageDescription = selectedOption?.stage ? STAGE_DESCRIPTIONS[selectedOption.stage] : null
 
   const typeDescription =
     !editMode || stageDescription ? (
@@ -166,24 +168,18 @@ export const DestinationTypeSelection = () => {
                   size={20}
                   className="shrink-0 text-foreground-light"
                 />
-                <div className="flex items-center gap-x-2">
-                  <span className="text-sm text-foreground">{selectedOption.label}</span>
-                  {selectedOption.stage && (
-                    <Badge variant={STAGE_BADGE_VARIANT[selectedOption.stage]}>
-                      {selectedOption.stage}
-                    </Badge>
-                  )}
-                </div>
+                <span className="text-sm text-foreground">{selectedOption.label}</span>
               </div>
             ) : (
               <span className="text-foreground-lighter">Select a destination type</span>
             )}
           </SelectTrigger>
           <SelectContent align="end">
-            {options.length > 0 && (
-              <SelectGroup>
-                <SelectLabel>Pipelines</SelectLabel>
-                {options.map((option) => (
+            {visibleGroups.map((group, index) => (
+              <SelectGroup key={group.label}>
+                {index > 0 && <SelectSeparator />}
+                <SelectLabel>{group.label}</SelectLabel>
+                {group.options.map((option) => (
                   <SelectItem key={option.value} value={option.value} className="py-2">
                     <div className="flex items-center gap-x-3">
                       <DestinationIcon
@@ -192,14 +188,7 @@ export const DestinationTypeSelection = () => {
                         className="shrink-0 text-foreground-light"
                       />
                       <div className="flex flex-col gap-y-0.5">
-                        <div className="flex items-center gap-x-2">
-                          <span className="text-foreground">{option.label}</span>
-                          {option.stage && (
-                            <Badge variant={STAGE_BADGE_VARIANT[option.stage]}>
-                              {option.stage}
-                            </Badge>
-                          )}
-                        </div>
+                        <span className="text-foreground">{option.label}</span>
                         <span className="text-xs text-foreground-lighter">
                           {option.description}
                         </span>
@@ -208,7 +197,7 @@ export const DestinationTypeSelection = () => {
                   </SelectItem>
                 ))}
               </SelectGroup>
-            )}
+            ))}
           </SelectContent>
         </Select>
       </FormItemLayout>
diff --git a/apps/studio/components/interfaces/Database/Replication/Destinations.tsx b/apps/studio/components/interfaces/Database/Replication/Destinations.tsx
index 7e95410cede..50155052125 100644
--- a/apps/studio/components/interfaces/Database/Replication/Destinations.tsx
+++ b/apps/studio/components/interfaces/Database/Replication/Destinations.tsx
@@ -1,6 +1,6 @@
 import { useQueryClient } from '@tanstack/react-query'
 import { useParams } from 'common'
-import { MoreVertical, Plus, Search, Workflow, X } from 'lucide-react'
+import { MessageSquare, MoreVertical, Plus, Search, Workflow, X } from 'lucide-react'
 import Link from 'next/link'
 import { parseAsStringEnum, useQueryState } from 'nuqs'
 import { useEffect, useMemo, useRef, useState } from 'react'
@@ -29,6 +29,7 @@ import { DestinationType } from './DestinationPanel/DestinationPanel.types'
 import { DestinationRow } from './DestinationRow'
 import { DisablePipelinesDialog } from './DisablePipelinesDialog'
 import { EnablePipelinesModal } from './EnablePipelinesCallout'
+import { PIPELINES_FEEDBACK_URL } from './Replication.constants'
 import {
   useIsETLBigQueryPrivateAlpha,
   useIsETLClickHousePrivateAlpha,
@@ -243,6 +244,11 @@ export const Destinations = () => {
             </DropdownMenuContent>
           </DropdownMenu>
 
+          <Button asChild variant="default" icon={<MessageSquare />}>
+            <a href={PIPELINES_FEEDBACK_URL} target="_blank" rel="noreferrer noopener">
+              Leave feedback
+            </a>
+          </Button>
           <DocsButton href={`${DOCS_URL}/guides/database/replication`} />
 
           <Shortcut
diff --git a/apps/studio/components/interfaces/Database/Replication/Replication.constants.ts b/apps/studio/components/interfaces/Database/Replication/Replication.constants.ts
index 3bcb22a7eca..356cc8db60c 100644
--- a/apps/studio/components/interfaces/Database/Replication/Replication.constants.ts
+++ b/apps/studio/components/interfaces/Database/Replication/Replication.constants.ts
@@ -8,3 +8,5 @@ export enum PipelineStatusName {
   STOPPING = 'stopping',
   UNKNOWN = 'unknown',
 }
+
+export const PIPELINES_FEEDBACK_URL = 'https://github.com/orgs/supabase/discussions/39416'
diff --git a/apps/studio/components/interfaces/Database/Replication/ReplicationDiagram/Edges.tsx b/apps/studio/components/interfaces/Database/Replication/ReplicationDiagram/Edges.tsx
index 7d05a6b9e60..7bfab5a8b1d 100644
--- a/apps/studio/components/interfaces/Database/Replication/ReplicationDiagram/Edges.tsx
+++ b/apps/studio/components/interfaces/Database/Replication/ReplicationDiagram/Edges.tsx
@@ -1,11 +1,14 @@
 import { BaseEdge, EdgeLabelRenderer, getSmoothStepPath, type EdgeProps } from '@xyflow/react'
-import { useParams } from 'common'
-import { ArrowRight, Loader2, Square, X, type LucideIcon } from 'lucide-react'
+import { useParams, useReducedMotion } from 'common'
 import { useMemo } from 'react'
-import { cn } from 'ui'
 
 import { getStatusName } from '../Pipeline.utils'
 import { STATUS_REFRESH_FREQUENCY_MS } from '../Replication.constants'
+import {
+  EdgeVisualChip,
+  getEdgeVisual,
+  type ReplicationState,
+} from '@/components/ui/ReactFlow/EdgeVisual'
 import { useReplicationPipelineStatusQuery } from '@/data/replication/pipeline-status-query'
 import { useReplicationPipelinesQuery } from '@/data/replication/pipelines-query'
 import {
@@ -19,67 +22,6 @@ type EdgeData = {
   shiftEdgeEnd: boolean
 }
 
-interface ReplicationState {
-  isComingUp: boolean
-  isReplicating: boolean
-  isFailed: boolean
-}
-
-interface EdgeVisual {
-  Icon: LucideIcon
-  // CSS color shared by the icon and the connecting line so they always match.
-  color: string
-  opacity: number
-  dashArray: string
-  shouldAnimate: boolean
-  shouldSpin?: boolean
-  isFilled?: boolean
-  strokeWidth?: number
-}
-
-// Picks the icon + line appearance for a replication state. Both the icon and the line are derived
-// here from the same state so they always stay in sync. We deliberately don't surface lag: the line
-// just communicates whether data is moving, stopped, starting, or broken.
-const getEdgeVisual = ({ isComingUp, isReplicating, isFailed }: ReplicationState): EdgeVisual => {
-  if (isFailed) {
-    return {
-      Icon: X,
-      color: 'hsl(var(--destructive-default))',
-      opacity: 1,
-      dashArray: '5 5',
-      shouldAnimate: false,
-      strokeWidth: 4,
-    }
-  }
-  if (isComingUp) {
-    return {
-      Icon: Loader2,
-      color: 'var(--foreground-light)',
-      opacity: 1,
-      dashArray: '5',
-      shouldAnimate: true,
-      shouldSpin: true,
-    }
-  }
-  if (isReplicating) {
-    return {
-      Icon: ArrowRight,
-      color: 'hsl(var(--brand-default))',
-      opacity: 1,
-      dashArray: '5',
-      shouldAnimate: true,
-    }
-  }
-  return {
-    Icon: Square,
-    color: 'var(--foreground-lighter)',
-    opacity: 0.5,
-    dashArray: '5 5',
-    shouldAnimate: false,
-    isFilled: true,
-  }
-}
-
 export const SmoothstepEdge = ({
   sourceX,
   sourceY,
@@ -92,6 +34,7 @@ export const SmoothstepEdge = ({
   data,
 }: EdgeProps) => {
   const { ref: projectRef = 'default' } = useParams()
+  const prefersReducedMotion = useReducedMotion()
   const { identifier, shiftEdgeEnd } = (data || {}) as EdgeData
 
   const { data: pipelinesData } = useReplicationPipelinesQuery({ projectRef })
@@ -126,16 +69,7 @@ export const SmoothstepEdge = ({
     targetPosition,
   })
 
-  const {
-    Icon,
-    color,
-    opacity,
-    dashArray,
-    shouldAnimate,
-    shouldSpin,
-    isFilled,
-    strokeWidth = 2,
-  } = getEdgeVisual(replicationState)
+  const visual = getEdgeVisual(replicationState)
 
   return (
     <>
@@ -144,11 +78,14 @@ export const SmoothstepEdge = ({
         markerEnd={markerEnd}
         style={{
           ...style,
-          stroke: color,
-          strokeWidth,
-          opacity,
-          strokeDasharray: dashArray,
-          animation: shouldAnimate ? 'dashdraw 0.5s linear infinite' : undefined,
+          stroke: visual.color,
+          strokeWidth: visual.strokeWidth,
+          opacity: visual.opacity,
+          strokeDasharray: visual.dashArray,
+          animation:
+            visual.shouldAnimate && !prefersReducedMotion
+              ? 'dashdraw 0.5s linear infinite'
+              : undefined,
         }}
       />
       <EdgeLabelRenderer>
@@ -160,18 +97,7 @@ export const SmoothstepEdge = ({
           }}
           className="nodrag nopan"
         >
-          <div
-            className={cn(
-              'w-6 h-6 rounded-full flex items-center justify-center border bg-surface-100'
-            )}
-            style={{ borderColor: color }}
-          >
-            <Icon
-              size={14}
-              className={cn(shouldSpin && 'animate-spin')}
-              style={{ color, fill: isFilled ? color : undefined }}
-            />
-          </div>
+          <EdgeVisualChip visual={visual} />
         </div>
       </EdgeLabelRenderer>
     </>
diff --git a/apps/studio/components/interfaces/DiskManagement/DiskManagementForm.sections.tsx b/apps/studio/components/interfaces/DiskManagement/DiskManagementForm.sections.tsx
index e2b51505797..690635bb508 100644
--- a/apps/studio/components/interfaces/DiskManagement/DiskManagementForm.sections.tsx
+++ b/apps/studio/components/interfaces/DiskManagement/DiskManagementForm.sections.tsx
@@ -150,6 +150,9 @@ export function DiskSection({
           <DocsButton href={`${DOCS_URL}/guides/platform/database-size`} />
         </PageSectionAside>
       </PageSectionMeta>
+
+      <HighAvailabilityDisabledSectionNotice title="Disk management is unavailable for High Availability projects" />
+
       <PageSectionContent ref={settingsRef} className="flex flex-col gap-4 scroll-mt-24">
         {isAws && <DiskSpaceBar form={form} />}
 
@@ -255,7 +258,7 @@ export function AdvancedSection({
       <PageSectionContent className="flex flex-col gap-4">
         <Card ref={autoscaleSettingsRef} className="scroll-mt-24">
           <CardContent className="flex flex-col gap-y-8">
-            <AutoScaleFields form={form} />
+            <AutoScaleFields form={form} disableInput={disableDiskInputs && disableDiskSizeInput} />
           </CardContent>
         </Card>
 
diff --git a/apps/studio/components/interfaces/DiskManagement/DiskManagementForm.tsx b/apps/studio/components/interfaces/DiskManagement/DiskManagementForm.tsx
index 98cae8cb731..0d9be46fa80 100644
--- a/apps/studio/components/interfaces/DiskManagement/DiskManagementForm.tsx
+++ b/apps/studio/components/interfaces/DiskManagement/DiskManagementForm.tsx
@@ -55,12 +55,12 @@ import { AddonVariantId } from '@/data/subscriptions/types'
 import { useResourceWarningsQuery } from '@/data/usage/resource-warnings-query'
 import { useCheckEntitlements } from '@/hooks/misc/useCheckEntitlements'
 import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
-import { useHighAvailability } from '@/hooks/misc/useHighAvailability'
 import { useSelectedOrganizationQuery } from '@/hooks/misc/useSelectedOrganization'
 import {
   useIsAwsCloudProvider,
   useIsAwsK8sCloudProvider,
   useIsAwsNimbusCloudProvider,
+  useIsHighAvailability,
   useSelectedProjectQuery,
 } from '@/hooks/misc/useSelectedProject'
 import { GB, PROJECT_STATUS } from '@/lib/constants'
@@ -102,7 +102,7 @@ export function DiskManagementForm({
   const isAws = useIsAwsCloudProvider()
   const isAwsK8s = useIsAwsK8sCloudProvider()
   const isAwsNimbus = useIsAwsNimbusCloudProvider()
-  const { isHighAvailability } = useHighAvailability()
+  const isHighAvailability = useIsHighAvailability()
 
   const { can: canUpdateDiskConfiguration, isSuccess: isPermissionsLoaded } =
     useAsyncCheckPermissions(PermissionAction.UPDATE, 'projects', {
@@ -209,9 +209,10 @@ export function DiskManagementForm({
   const usedPercentage = (usedSize / totalSize) * 100
 
   const disableIopsThroughputConfig =
-    modifiedComputeSize &&
-    !isSpendCapEnabled &&
-    RESTRICTED_COMPUTE_FOR_THROUGHPUT_ON_GP3.includes(modifiedComputeSize)
+    isHighAvailability ||
+    (modifiedComputeSize &&
+      !isSpendCapEnabled &&
+      RESTRICTED_COMPUTE_FOR_THROUGHPUT_ON_GP3.includes(modifiedComputeSize))
 
   const watchedTotalSize = useWatch({ control: form.control, name: 'totalSize' }) ?? 0
   const watchedStorageType = useWatch({ control: form.control, name: 'storageType' })
@@ -231,10 +232,11 @@ export function DiskManagementForm({
     isRequestingChanges ||
     isPlanUpgradeRequired ||
     isWithinCooldownWindow ||
+    isHighAvailability ||
     !canUpdateDiskConfiguration ||
     !isAws
 
-  const disableDiskInputs = disableDiskSizeInput || isSpendCapEnabled
+  const disableDiskInputs = disableDiskSizeInput || isSpendCapEnabled || isHighAvailability
 
   // Compute resizing is not supported for High Availability projects during Alpha
   const disableComputeInputs = isPlanUpgradeRequired || isHighAvailability
diff --git a/apps/studio/components/interfaces/DiskManagement/fields/AutoScaleFields.tsx b/apps/studio/components/interfaces/DiskManagement/fields/AutoScaleFields.tsx
index d5651c249df..d2d105de22c 100644
--- a/apps/studio/components/interfaces/DiskManagement/fields/AutoScaleFields.tsx
+++ b/apps/studio/components/interfaces/DiskManagement/fields/AutoScaleFields.tsx
@@ -17,9 +17,10 @@ import { useDiskAutoscaleCustomConfigQuery } from '@/data/config/disk-autoscale-
 
 type AutoScaleFieldProps = {
   form: UseFormReturn<DiskStorageSchemaType>
+  disableInput?: boolean
 }
 
-export const AutoScaleFields = ({ form }: AutoScaleFieldProps) => {
+export const AutoScaleFields = ({ form, disableInput = false }: AutoScaleFieldProps) => {
   const { ref: projectRef } = useParams()
   const {
     control,
@@ -76,7 +77,7 @@ export const AutoScaleFields = ({ form }: AutoScaleFieldProps) => {
                     id={field.name}
                     type="number"
                     value={field.value ?? undefined}
-                    disabled={isError}
+                    disabled={disableInput || isError}
                     onChange={(e) => {
                       setValue(
                         'growthPercent',
@@ -123,7 +124,7 @@ export const AutoScaleFields = ({ form }: AutoScaleFieldProps) => {
                     id={field.name}
                     type="number"
                     value={field.value ?? undefined}
-                    disabled={isError}
+                    disabled={disableInput || isError}
                     onChange={(e) => {
                       setValue(
                         'minIncrementGb',
@@ -165,7 +166,7 @@ export const AutoScaleFields = ({ form }: AutoScaleFieldProps) => {
                     id={field.name}
                     type="number"
                     value={field.value ?? undefined}
-                    disabled={isError}
+                    disabled={disableInput || isError}
                     onChange={(e) => {
                       setValue('maxSizeGb', e.target.value === '' ? null : e.target.valueAsNumber, {
                         shouldDirty: true,
diff --git a/apps/studio/components/interfaces/Explorer/ExplorerNotebookTab.tsx b/apps/studio/components/interfaces/Explorer/ExplorerNotebookTab.tsx
index b62220e86b7..d34f51cd77c 100644
--- a/apps/studio/components/interfaces/Explorer/ExplorerNotebookTab.tsx
+++ b/apps/studio/components/interfaces/Explorer/ExplorerNotebookTab.tsx
@@ -12,6 +12,7 @@ import {
   verticalListSortingStrategy,
 } from '@dnd-kit/sortable'
 import { acceptUntrustedSql } from '@supabase/pg-meta'
+import { useQueryClient } from '@tanstack/react-query'
 import { LOCAL_STORAGE_KEYS, useParams } from 'common'
 import {
   Check,
@@ -28,7 +29,7 @@ import {
   Trash,
 } from 'lucide-react'
 import { useRouter } from 'next/router'
-import { useRef, useState } from 'react'
+import { useEffect, useEffectEvent, useRef, useState } from 'react'
 import { toast } from 'sonner'
 import {
   AiIconAnimation,
@@ -59,7 +60,10 @@ import { type QueryEditorHandle } from './QueryEditor'
 import { createMarkdownCellSkeleton, createQueryCellSkeleton } from './utils'
 import { ButtonTooltip } from '@/components/ui/ButtonTooltip'
 import { useContentDeleteMutation } from '@/data/content/content-delete-mutation'
-import { hasDiscardableChanges } from '@/data/content/notebooks/notebook-cache'
+import {
+  evictNotebookFromCaches,
+  hasDiscardableChanges,
+} from '@/data/content/notebooks/notebook-cache'
 import {
   isQueryCell,
   WritableCell,
@@ -80,6 +84,7 @@ export const ExplorerNotebookTab = () => {
   const { id, ref } = useParams()
   const tabs = useTabsStateSnapshot()
   const snap = useNotebooksStateSnapshot()
+  const queryClient = useQueryClient()
   const { createChat, isCreating } = useCreateChat()
 
   const [isIntellisenseEnabled, setIsIntellisenseEnabled] = useLocalStorageQuery(
@@ -96,12 +101,14 @@ export const ExplorerNotebookTab = () => {
   const [isRunningNotebook, setIsRunningNotebook] = useState(false)
   const [isDeleteModalOpen, setIsDeleteModalOpen] = useState(false)
   const [isSaveBeforeAnalyzeOpen, setIsSaveBeforeAnalyzeOpen] = useState(false)
+  const [isSaveConflictOpen, setIsSaveConflictOpen] = useState(false)
   const [pendingMutationCells, setPendingMutationCells] = useState<
     { id: string; title: string }[] | null
   >(null)
   const [skipMutatingCells, setSkipMutatingCells] = useState(false)
   const queryCellRefs = useRef(new Map<string, QueryEditorHandle>())
   const savedContentRef = useRef<typeof content>(undefined)
+  const scrollContainerRef = useRef<HTMLDivElement>(null)
 
   const { mutate: updateNotebook, isPending: isUpdating } = useUpsertNotebookMutation({
     onSuccess: () => {
@@ -199,7 +206,7 @@ export const ExplorerNotebookTab = () => {
     runNotebook({ cellIdsToRun, force: true })
   }
 
-  const handleSaveNotebook = () => {
+  const persistNotebook = () => {
     const notebookId = currentNotebook?.notebook.id
     if (!ref || !notebookId || !name || !content) return
 
@@ -231,6 +238,10 @@ export const ExplorerNotebookTab = () => {
       }),
     }
 
+    if (snap.serverDivergedWhileDirty.get(notebookId) === 'deleted') {
+      writableContent.cells = writableContent.cells.map(({ _id: _, ...cell }) => cell)
+    }
+
     // [Joshen] For tracking if a notebook is updated while being saved, so that we do not
     // incorrectly show the saved toast if it's subsequently then saved once again while
     // the initial save is midflight
@@ -245,6 +256,32 @@ export const ExplorerNotebookTab = () => {
     })
   }
 
+  const handleSaveNotebook = () => {
+    const notebookId = currentNotebook?.notebook.id
+    if (notebookId && snap.serverDivergedWhileDirty.get(notebookId)) {
+      setIsSaveConflictOpen(true)
+      return
+    }
+
+    persistNotebook()
+  }
+
+  const handleSaveAnyway = () => {
+    setIsSaveConflictOpen(false)
+    persistNotebook()
+  }
+
+  const handleDiscardNotebookChanges = async () => {
+    if (!ref || !id) return
+
+    const wasDeletedOnServer = snap.serverDivergedWhileDirty.get(id) === 'deleted'
+    setIsSaveConflictOpen(false)
+    const evicted = await evictNotebookFromCaches({ queryClient, projectRef: ref, id })
+    if (wasDeletedOnServer && evicted) {
+      tabs.removeTab(createTabId('notebook', { id }))
+    }
+  }
+
   const handleAnalyze = () => {
     createChat({
       name: `Analyze ${name} notebook`,
@@ -286,6 +323,17 @@ export const ExplorerNotebookTab = () => {
     snap.insertCellAfter({ id: notebookId, cellId: lastCellId, cell })
   }
 
+  const scrollToBottomIfPending = useEffectEvent(() => {
+    if (!id || snap.pendingScrollToBottom !== id || !scrollContainerRef.current) return
+
+    scrollContainerRef.current.scrollTo({
+      top: scrollContainerRef.current.scrollHeight,
+    })
+    snap.clearPendingScrollToBottom()
+  })
+
+  useEffect(() => scrollToBottomIfPending(), [id, snap.pendingScrollToBottom, content])
+
   if (isNotFound) {
     return (
       <div className="p-4 h-full bg-surface-100">
@@ -318,18 +366,12 @@ export const ExplorerNotebookTab = () => {
           <ExplorerToolbarAction
             icon={<AiIconAnimation size={16} />}
             loading={isCreating}
+            disabled={cells.length === 0}
+            tooltip={cells.length === 0 ? 'Add a cell to the notebook to analyze it' : undefined}
             onClick={handleClickAnalyze}
           >
             Analyze
           </ExplorerToolbarAction>
-          <ExplorerToolbarAction
-            aria-label="Run notebook"
-            icon={<Play />}
-            tooltip="Run notebook"
-            loading={isRunningNotebook}
-            disabled={queryCellIds.length === 0}
-            onClick={handleRunNotebook}
-          />
           <ExplorerToolbarAction
             aria-label="Save changes"
             icon={<Save />}
@@ -361,10 +403,20 @@ export const ExplorerNotebookTab = () => {
               </DropdownMenuContent>
             </DropdownMenu>
           </ExplorerToolbarActions>
+          <ExplorerToolbarAction
+            aria-label="Run notebook"
+            icon={<Play />}
+            tooltip="Run notebook"
+            loading={isRunningNotebook}
+            disabled={queryCellIds.length === 0}
+            onClick={handleRunNotebook}
+          >
+            Run
+          </ExplorerToolbarAction>
         </ExplorerToolbarActions>
       </ExplorerToolbar>
 
-      <div className="w-full mx-auto flex-grow min-h-0 overflow-y-auto">
+      <div ref={scrollContainerRef} className="w-full mx-auto flex-grow min-h-0 overflow-y-auto">
         <div className="p-4 pb-10">
           {cells.length === 0 && (
             <EmptyStatePresentational
@@ -463,6 +515,25 @@ export const ExplorerNotebookTab = () => {
         </p>
       </ConfirmationModal>
 
+      <ConfirmationModal
+        size="small"
+        visible={isSaveConflictOpen}
+        title="Assistant changes detected"
+        additionalActionLabel="Discard changes"
+        confirmLabel={
+          id && snap.serverDivergedWhileDirty.get(id) === 'deleted' ? 'Recreate' : 'Save anyway'
+        }
+        onAdditionalAction={handleDiscardNotebookChanges}
+        onCancel={() => setIsSaveConflictOpen(false)}
+        onConfirm={handleSaveAnyway}
+      >
+        <p className="text-sm">
+          {id && snap.serverDivergedWhileDirty.get(id) === 'deleted'
+            ? 'An assistant deleted this notebook after your local changes. Saving will recreate it.'
+            : "An assistant updated this notebook after your local changes. Saving will overwrite the assistant's update."}
+        </p>
+      </ConfirmationModal>
+
       <ConfirmationModal
         size="small"
         visible={pendingMutationCells !== null}
diff --git a/apps/studio/components/interfaces/Explorer/ExplorerQueryTab.tsx b/apps/studio/components/interfaces/Explorer/ExplorerQueryTab.tsx
index 0acfebf9b16..8dec7a680b5 100644
--- a/apps/studio/components/interfaces/Explorer/ExplorerQueryTab.tsx
+++ b/apps/studio/components/interfaces/Explorer/ExplorerQueryTab.tsx
@@ -1,25 +1,69 @@
-import { useParams } from 'common'
-import { Loader2, SquareCode } from 'lucide-react'
+import { useDebounce } from '@uidotdev/usehooks'
+import { LOCAL_STORAGE_KEYS, useParams } from 'common'
+import { Check, Keyboard, Loader2, MoreVertical, Save, SquareCode } from 'lucide-react'
 import { useRouter } from 'next/router'
-import { useCallback, useContext, useEffect, useState } from 'react'
-import { Button } from 'ui'
+import { useCallback, useContext, useEffect, useMemo, useState } from 'react'
+import { toast } from 'sonner'
+import {
+  Button,
+  Command,
+  CommandGroup,
+  CommandInput,
+  CommandItem,
+  CommandList,
+  DropdownMenu,
+  DropdownMenuContent,
+  DropdownMenuItem,
+  DropdownMenuSub,
+  DropdownMenuSubContent,
+  DropdownMenuSubTrigger,
+  DropdownMenuTrigger,
+} from 'ui'
+import { ShimmeringLoader } from 'ui-patterns/ShimmeringLoader'
 
+import { ExplorerToolbarAction } from './ExplorerToolbar'
+import { useCreateNotebook } from './hooks'
 import { QueryEditor, type ExplorerQueryModel } from './QueryEditor'
 import { type QueryDisplay, type QueryResult } from './types'
+import { createQueryCellSkeleton } from './utils'
+import { getNotebook } from '@/data/content/notebooks/notebook-query'
+import { useNotebooksInfiniteQuery } from '@/data/content/notebooks/notebooks-infinite-query'
 import { toQuerySourceBinding } from '@/data/query-sources/query-source-registry'
+import { useLocalStorageQuery } from '@/hooks/misc/useLocalStorage'
 import { explorerQueryState, useExplorerQueryStateSnapshot } from '@/state/explorer-query'
+import { useNotebooksStateSnapshot } from '@/state/notebooks/notebooks-state'
 import { useControlledRoleImpersonationState } from '@/state/role-impersonation-state'
 import { createTabId, TabsStateContext } from '@/state/tabs'
 
 /** Query-tab lifecycle adapter around the shared QueryEditor. */
 export const ExplorerQueryTab = () => {
-  const { id, ref } = useParams()
   const router = useRouter()
+  const { id, ref } = useParams()
   const tabs = useContext(TabsStateContext)
   const querySnap = useExplorerQueryStateSnapshot()
 
+  const { createNotebook } = useCreateNotebook()
+  const notebooksSnap = useNotebooksStateSnapshot()
+
+  const [isIntellisenseEnabled, setIsIntellisenseEnabled] = useLocalStorageQuery(
+    LOCAL_STORAGE_KEYS.SQL_EDITOR_INTELLISENSE,
+    true
+  )
+
   const [restoredQueryKey, setRestoredQueryKey] = useState<string>()
   const [showQuery, setShowQuery] = useState(true)
+  const [search, setSearch] = useState('')
+  const debouncedSearch = useDebounce(search, 500)
+
+  const { data: notebooksData, isPending } = useNotebooksInfiniteQuery({
+    projectRef: ref,
+    limit: 100,
+    name: search.length === 0 ? search : debouncedSearch,
+  })
+  const notebooks = useMemo(() => {
+    const items = notebooksData?.pages.flatMap((page) => page.content) ?? []
+    return items
+  }, [notebooksData?.pages])
 
   const stateDraft = id ? querySnap.drafts[id] : undefined
   const draft = stateDraft?.projectRef === ref ? stateDraft : undefined
@@ -94,6 +138,32 @@ export const ExplorerQueryTab = () => {
     })
   }
 
+  const onAddToNewNotebook = () => {
+    createNotebook({
+      cells: [createQueryCellSkeleton({ title: draft.name, sql: draft.uncheckedSql })],
+    })
+  }
+
+  const onAddToExistingNotebook = async (notebookId: string) => {
+    if (!ref) return
+    try {
+      if (!notebooksSnap.notebooks[notebookId]?.notebook.content) {
+        const notebook = await getNotebook({ projectRef: ref, id: notebookId })
+        notebooksSnap.setNotebook({ projectRef: ref, notebook })
+      }
+
+      notebooksSnap.insertCellAfter({
+        id: notebookId,
+        cell: createQueryCellSkeleton({ title: draft.name, sql: draft.uncheckedSql }),
+      })
+      notebooksSnap.requestScrollToBottom(notebookId)
+
+      router.push(`/project/${ref}/explorer/notebook/${notebookId}`)
+    } catch (error) {
+      toast.error('Failed to add query to notebook')
+    }
+  }
+
   return (
     <QueryEditor
       id={id}
@@ -128,6 +198,75 @@ export const ExplorerQueryTab = () => {
         persistTab()
         explorerQueryState.setDisplay({ id, display })
       }}
+      toolbarActions={
+        <>
+          <DropdownMenu>
+            <DropdownMenuTrigger asChild>
+              <ExplorerToolbarAction icon={<Save />} tooltip="Save query" />
+            </DropdownMenuTrigger>
+            <DropdownMenuContent className="w-52" align="end">
+              <DropdownMenuSub>
+                <DropdownMenuSubTrigger>Add to existing notebook</DropdownMenuSubTrigger>
+                <DropdownMenuSubContent className="p-0">
+                  <Command shouldFilter={false}>
+                    <CommandInput
+                      autoFocus
+                      placeholder="Search notebooks..."
+                      className="text-xs"
+                      value={search}
+                      onValueChange={setSearch}
+                    />
+                    <CommandList>
+                      <CommandGroup>
+                        {isPending ? (
+                          <div className="flex flex-col p-1 gap-y-1">
+                            <ShimmeringLoader />
+                            <ShimmeringLoader className="w-3/4" />
+                          </div>
+                        ) : !notebooks?.length ? (
+                          <p className="text-xs text-center text-foreground-lighter py-3">
+                            No notebooks found
+                          </p>
+                        ) : null}
+                        {notebooks?.map((notebook) => (
+                          <CommandItem
+                            key={notebook.id}
+                            value={notebook.id}
+                            className="cursor-pointer"
+                            onSelect={() => onAddToExistingNotebook(notebook.id)}
+                          >
+                            {notebook.name}
+                          </CommandItem>
+                        ))}
+                      </CommandGroup>
+                    </CommandList>
+                  </Command>
+                </DropdownMenuSubContent>
+              </DropdownMenuSub>
+              <DropdownMenuItem onClick={onAddToNewNotebook}>
+                Create a new notebook
+              </DropdownMenuItem>
+            </DropdownMenuContent>
+          </DropdownMenu>
+          <DropdownMenu>
+            <DropdownMenuTrigger asChild>
+              <ExplorerToolbarAction icon={<MoreVertical />} />
+            </DropdownMenuTrigger>
+            <DropdownMenuContent>
+              <DropdownMenuItem
+                className="justify-between"
+                onClick={() => setIsIntellisenseEnabled(!isIntellisenseEnabled)}
+              >
+                <div className="flex items-center gap-x-2">
+                  <Keyboard size={14} />
+                  <span>Intellisense enabled</span>
+                </div>
+                {isIntellisenseEnabled && <Check className="text-brand" size={16} />}
+              </DropdownMenuItem>
+            </DropdownMenuContent>
+          </DropdownMenu>
+        </>
+      }
     />
   )
 }
diff --git a/apps/studio/components/interfaces/Explorer/QueryEditor/index.tsx b/apps/studio/components/interfaces/Explorer/QueryEditor/index.tsx
index ccafb2762fd..8974a780ee0 100644
--- a/apps/studio/components/interfaces/Explorer/QueryEditor/index.tsx
+++ b/apps/studio/components/interfaces/Explorer/QueryEditor/index.tsx
@@ -2,7 +2,7 @@ import { useMonaco } from '@monaco-editor/react'
 import { acceptUntrustedSql, untrustedSql, type UntrustedSqlFragment } from '@supabase/pg-meta'
 import { useFlag } from 'common'
 import { CodeSquare, Eye, EyeOff, Play } from 'lucide-react'
-import type { editor as monacoEditor } from 'monaco-editor'
+import type { editor as monacoEditor, Selection } from 'monaco-editor'
 import {
   forwardRef,
   useEffect,
@@ -46,6 +46,7 @@ import { useAddDefinitions } from '@/components/interfaces/SQLEditor/useAddDefin
 import { ResizableAIWidget } from '@/components/ui/AIEditor/ResizableAIWidget'
 import { getEditorSelectionParts, type EditorSelection } from '@/components/ui/AIEditor/utils'
 import { CodeEditor } from '@/components/ui/CodeEditor/CodeEditor'
+import { getEditorValueOrSelection } from '@/components/ui/CodeEditor/CodeEditor.utils'
 import { DiffEditor } from '@/components/ui/DiffEditor'
 import {
   type DatabaseSourceParameters,
@@ -195,6 +196,7 @@ export const QueryEditor = forwardRef<QueryEditorHandle, QueryEditorProps>(funct
   const [promptState, setPromptState] = useState<(EditorSelection & { isOpen: boolean }) | null>(
     null
   )
+  const [hasSelection, setHasSelection] = useState(false)
 
   const dialect = query._tag === 'logs' ? 'clickhouse' : 'postgres'
   const { requestCompletion, isCompletionLoading } = useQueryEditorAi({ dialect })
@@ -237,13 +239,6 @@ export const QueryEditor = forwardRef<QueryEditorHandle, QueryEditorProps>(funct
   const isExecuting = isExecutingSql || isExecutingLogs
   const isBusy = isLoadingProject || isResolvingDatabase || isExecuting
 
-  /**
-   * The user's run gesture, and therefore the promotion point for this query's SQL. The
-   * raw text comes straight off the editor, so it is (re)branded untrusted here — the
-   * editor boundary — and promoted in the same handler. Which pair of helpers applies is
-   * decided by `query._tag`, the same discriminant that picks the execution endpoint, so
-   * Postgres SQL cannot reach the analytics wire or vice versa.
-   */
   const handleRunQuery = async ({
     rawSql = sql,
     shouldForce = false,
@@ -371,13 +366,12 @@ export const QueryEditor = forwardRef<QueryEditorHandle, QueryEditorProps>(funct
   return (
     <>
       <Shell className={cn(variant === 'embedded' && 'mx-auto max-w-6xl', className)}>
-        <ExplorerToolbar>
+        <ExplorerToolbar className={cn(variant === 'viewport' && 'px-4')}>
           <ExplorerToolbarIcon>
             <CodeSquare size={14} />
           </ExplorerToolbarIcon>
           <ExplorerToolbarTitle onSaveTitle={onTitleChange}>{title}</ExplorerToolbarTitle>
           <ExplorerToolbarActions>
-            {toolbarActions}
             {onSourceChange && (
               <QuerySourceMenu
                 disabled={pendingProposal !== null}
@@ -391,6 +385,7 @@ export const QueryEditor = forwardRef<QueryEditorHandle, QueryEditorProps>(funct
                 roleImpersonationState={roleImpersonationState}
               />
             )}
+
             {display && onDisplayChange && (
               <DisplaySettingsButton
                 result={result}
@@ -406,16 +401,23 @@ export const QueryEditor = forwardRef<QueryEditorHandle, QueryEditorProps>(funct
               tooltip={showQuery ? 'Hide query' : 'Show query'}
               onClick={() => onShowQueryChange(!showQuery)}
             />
+
+            {toolbarActions}
+
             <ExplorerToolbarAction
-              loading={isExecuting}
               icon={<Play />}
-              tooltip="Run query"
+              loading={isExecuting}
+              tooltip={hasSelection ? 'Run selected query' : 'Run query'}
               disabled={
                 isBusy || pendingProposal !== null || isRunDisabled || sql.trim().length === 0
               }
-              onClick={() => handleRunQuery()}
+              onClick={() => {
+                const editorInstance = editorInstanceRef.current
+                const rawSql = editorInstance ? getEditorValueOrSelection(editorInstance) : sql
+                handleRunQuery({ rawSql })
+              }}
             >
-              Run
+              {hasSelection ? 'Run selected' : 'Run'}
             </ExplorerToolbarAction>
           </ExplorerToolbarActions>
         </ExplorerToolbar>
@@ -447,7 +449,10 @@ export const QueryEditor = forwardRef<QueryEditorHandle, QueryEditorProps>(funct
                 placeholderClassName="top-[13px]"
                 className={variant === 'embedded' ? 'h-44' : undefined}
                 actions={{
-                  runQuery: { enabled: !isRunDisabled, callback: handleRunQuery },
+                  runQuery: {
+                    enabled: !isRunDisabled,
+                    callback: (rawSql: string) => handleRunQuery({ rawSql }),
+                  },
                 }}
                 options={{
                   minimap: { enabled: false },
@@ -458,6 +463,23 @@ export const QueryEditor = forwardRef<QueryEditorHandle, QueryEditorProps>(funct
                   editor.onDidBlurEditorWidget(() => onSqlCommitRef.current?.(sqlRef.current))
                   editorInstanceRef.current = editor
 
+                  const updateHasSelection = (selection: Selection | null | undefined) => {
+                    const noSelection =
+                      !selection ||
+                      (selection.startLineNumber === selection.endLineNumber &&
+                        selection.startColumn === selection.endColumn)
+                    setHasSelection(!noSelection)
+                  }
+
+                  // A remount (e.g. toggling "Show query" off then on) creates a fresh
+                  // editor with no listener history, so `hasSelection` must be read from
+                  // this instance directly rather than left at whatever the previous
+                  // editor instance last reported.
+                  updateHasSelection(editor.getSelection())
+                  editor.onDidChangeCursorSelection(({ selection }) =>
+                    updateHasSelection(selection)
+                  )
+
                   editor.addAction({
                     id: 'generate-sql',
                     label: 'Generate SQL',
diff --git a/apps/studio/components/interfaces/Explorer/__tests__/ExplorerNotebookTab.assistant-cache-invalidation.test.tsx b/apps/studio/components/interfaces/Explorer/__tests__/ExplorerNotebookTab.assistant-cache-invalidation.test.tsx
index 497d111046f..c12a5f123d3 100644
--- a/apps/studio/components/interfaces/Explorer/__tests__/ExplorerNotebookTab.assistant-cache-invalidation.test.tsx
+++ b/apps/studio/components/interfaces/Explorer/__tests__/ExplorerNotebookTab.assistant-cache-invalidation.test.tsx
@@ -1,7 +1,8 @@
 import { QueryClient } from '@tanstack/react-query'
-import { screen } from '@testing-library/react'
+import { fireEvent, screen, waitFor } from '@testing-library/react'
+import userEvent from '@testing-library/user-event'
 import { HttpResponse } from 'msw'
-import { describe, expect, it, vi } from 'vitest'
+import { afterEach, describe, expect, it, vi } from 'vitest'
 
 import { ExplorerNotebookTab } from '../ExplorerNotebookTab'
 import type { components } from '@/data/api'
@@ -16,7 +17,7 @@ import {
 } from '@/lib/ai/test-fixtures'
 import { notebooksState } from '@/state/notebooks/notebooks-state'
 import type { Notebook } from '@/state/notebooks/types'
-import { createTabsState, TabsStateContext } from '@/state/tabs'
+import { createTabId, createTabsState, TabsStateContext } from '@/state/tabs'
 import { customRender } from '@/tests/lib/custom-render'
 import { addAPIMock, type APIErrorBody } from '@/tests/lib/msw'
 import { setupSqlEditorMocks } from '@/tests/lib/sql-editor-test-utils'
@@ -62,14 +63,18 @@ const seedNotebook = () => {
   notebooksState.setNotebook({ projectRef: PROJECT_REF, notebook })
 }
 
-const renderNotebookTab = (queryClient: QueryClient) =>
+const renderNotebookTab = (queryClient: QueryClient, tabsState = createTabsState(PROJECT_REF)) =>
   customRender(
-    <TabsStateContext.Provider value={createTabsState(PROJECT_REF)}>
+    <TabsStateContext.Provider value={tabsState}>
       <ExplorerNotebookTab />
     </TabsStateContext.Provider>,
     { queryClient }
   )
 
+afterEach(() => {
+  notebooksState.serverDivergedWhileDirty.clear()
+})
+
 describe('ExplorerNotebookTab — assistant cache invalidation', () => {
   it('refetches and renders the updated cells after an assistant update_notebook tool call completes', async () => {
     setupSqlEditorMocks()
@@ -205,4 +210,235 @@ describe('ExplorerNotebookTab — assistant cache invalidation', () => {
     expect(await screen.findByText('Notebook not found')).toBeInTheDocument()
     expect(screen.queryByText('Original content')).not.toBeInTheDocument()
   })
+
+  it('saves normally without a conflict dialog when the notebook has not diverged', async () => {
+    setupSqlEditorMocks()
+    seedNotebook()
+    const queryClient = new QueryClient()
+    let mutationCount = 0
+    addAPIMock({
+      method: 'put',
+      path: '/platform/projects/:ref/content',
+      response: () => {
+        mutationCount += 1
+        return HttpResponse.json({ id: NOTEBOOK_ID })
+      },
+    })
+
+    renderNotebookTab(queryClient)
+
+    await userEvent.click(await screen.findByRole('button', { name: 'Save changes' }))
+
+    await waitFor(() => expect(mutationCount).toBe(1))
+    expect(
+      screen.queryByRole('dialog', { name: 'Assistant changes detected' })
+    ).not.toBeInTheDocument()
+  })
+
+  it.each([
+    {
+      type: 'updated' as const,
+      description:
+        "An assistant updated this notebook after your local changes. Saving will overwrite the assistant's update.",
+      saveLabel: 'Save anyway',
+    },
+    {
+      type: 'deleted' as const,
+      description:
+        'An assistant deleted this notebook after your local changes. Saving will recreate it.',
+      saveLabel: 'Recreate',
+    },
+  ])('shows the $type conflict copy before saving', async ({ type, description, saveLabel }) => {
+    setupSqlEditorMocks()
+    seedNotebook()
+    notebooksState.updateCells({
+      id: NOTEBOOK_ID,
+      cells: notebooksState.notebooks[NOTEBOOK_ID]!.notebook.content!.cells,
+    })
+    notebooksState.markServerDivergence({ id: NOTEBOOK_ID, type })
+
+    renderNotebookTab(new QueryClient())
+
+    await userEvent.click(await screen.findByRole('button', { name: 'Save changes' }))
+
+    const dialog = await screen.findByRole('dialog', { name: 'Assistant changes detected' })
+    expect(dialog).toHaveTextContent(description)
+    expect(dialog).toHaveTextContent(saveLabel)
+    expect(dialog).toHaveTextContent('Discard changes')
+  })
+
+  it('saves exactly once and clears the conflict only after a successful save', async () => {
+    setupSqlEditorMocks()
+    seedNotebook()
+    notebooksState.updateCells({
+      id: NOTEBOOK_ID,
+      cells: notebooksState.notebooks[NOTEBOOK_ID]!.notebook.content!.cells,
+    })
+    notebooksState.markServerDivergence({ id: NOTEBOOK_ID, type: 'updated' })
+    const queryClient = new QueryClient()
+    let mutationCount = 0
+    let resolveSave: (() => void) | undefined
+    const savePromise = new Promise<void>((resolve) => {
+      resolveSave = resolve
+    })
+    addAPIMock({
+      method: 'put',
+      path: '/platform/projects/:ref/content',
+      response: async () => {
+        mutationCount += 1
+        await savePromise
+        return HttpResponse.json({ id: NOTEBOOK_ID })
+      },
+    })
+
+    renderNotebookTab(queryClient)
+
+    await userEvent.click(await screen.findByRole('button', { name: 'Save changes' }))
+    expect(notebooksState.serverDivergedWhileDirty.get(NOTEBOOK_ID)).toBe('updated')
+    await userEvent.click(await screen.findByRole('button', { name: 'Save anyway' }))
+
+    await waitFor(() => expect(mutationCount).toBe(1))
+    expect(notebooksState.serverDivergedWhileDirty.get(NOTEBOOK_ID)).toBe('updated')
+    resolveSave?.()
+    await waitFor(() =>
+      expect(notebooksState.serverDivergedWhileDirty.has(NOTEBOOK_ID)).toBe(false)
+    )
+  })
+
+  it('keeps the conflict marker when saving anyway fails', async () => {
+    setupSqlEditorMocks()
+    seedNotebook()
+    notebooksState.updateCells({
+      id: NOTEBOOK_ID,
+      cells: notebooksState.notebooks[NOTEBOOK_ID]!.notebook.content!.cells,
+    })
+    notebooksState.markServerDivergence({ id: NOTEBOOK_ID, type: 'updated' })
+    let mutationCount = 0
+    addAPIMock({
+      method: 'put',
+      path: '/platform/projects/:ref/content',
+      response: () => {
+        mutationCount += 1
+        return HttpResponse.json({ message: 'Save failed' }, { status: 500 })
+      },
+    })
+
+    renderNotebookTab(new QueryClient())
+
+    await userEvent.click(await screen.findByRole('button', { name: 'Save changes' }))
+    await userEvent.click(await screen.findByRole('button', { name: 'Save anyway' }))
+
+    await waitFor(() => expect(mutationCount).toBe(1))
+    expect(notebooksState.serverDivergedWhileDirty.get(NOTEBOOK_ID)).toBe('updated')
+  })
+
+  it('omits existing cell IDs when saving anyway recreates an assistant-deleted notebook', async () => {
+    setupSqlEditorMocks()
+    seedNotebook()
+    notebooksState.updateCells({
+      id: NOTEBOOK_ID,
+      cells: notebooksState.notebooks[NOTEBOOK_ID]!.notebook.content!.cells,
+    })
+    notebooksState.markServerDivergence({ id: NOTEBOOK_ID, type: 'deleted' })
+    let sentBody: Record<string, unknown> | undefined
+    addAPIMock({
+      method: 'put',
+      path: '/platform/projects/:ref/content',
+      response: async ({ request }) => {
+        sentBody = (await request.json()) as Record<string, unknown>
+        return HttpResponse.json({ id: NOTEBOOK_ID })
+      },
+    })
+
+    renderNotebookTab(new QueryClient())
+
+    await userEvent.click(await screen.findByRole('button', { name: 'Save changes' }))
+    await userEvent.click(await screen.findByRole('button', { name: 'Recreate' }))
+
+    await waitFor(() => expect(sentBody).toBeDefined())
+    const content = sentBody?.content as { cells: Array<Record<string, unknown>> }
+    content.cells.forEach((cell) => expect(cell).not.toHaveProperty('_id'))
+  })
+
+  it('discards local changes without mutating and evicts the conflicted notebook', async () => {
+    setupSqlEditorMocks()
+    seedNotebook()
+    notebooksState.updateCells({
+      id: NOTEBOOK_ID,
+      cells: notebooksState.notebooks[NOTEBOOK_ID]!.notebook.content!.cells,
+    })
+    notebooksState.markServerDivergence({ id: NOTEBOOK_ID, type: 'updated' })
+    const queryClient = new QueryClient()
+    queryClient.setQueryData(contentKeys.resource(PROJECT_REF, NOTEBOOK_ID), { id: NOTEBOOK_ID })
+    let mutationCount = 0
+    addAPIMock({
+      method: 'put',
+      path: '/platform/projects/:ref/content',
+      response: () => {
+        mutationCount += 1
+        return HttpResponse.json({ id: NOTEBOOK_ID })
+      },
+    })
+
+    renderNotebookTab(queryClient)
+
+    await userEvent.click(await screen.findByRole('button', { name: 'Save changes' }))
+    await userEvent.click(await screen.findByRole('button', { name: 'Discard changes' }))
+
+    await waitFor(() => expect(notebooksState.notebooks[NOTEBOOK_ID]).toBeUndefined())
+    expect(notebooksState.serverDivergedWhileDirty.has(NOTEBOOK_ID)).toBe(false)
+    expect(queryClient.getQueryData(contentKeys.resource(PROJECT_REF, NOTEBOOK_ID))).toBeUndefined()
+    expect(mutationCount).toBe(0)
+  })
+
+  it('closes the notebook tab when discarding edits after an assistant deletion', async () => {
+    setupSqlEditorMocks()
+    seedNotebook()
+    notebooksState.updateCells({
+      id: NOTEBOOK_ID,
+      cells: notebooksState.notebooks[NOTEBOOK_ID]!.notebook.content!.cells,
+    })
+    notebooksState.markServerDivergence({ id: NOTEBOOK_ID, type: 'deleted' })
+    const tabsState = createTabsState(PROJECT_REF)
+    const tabId = createTabId('notebook', { id: NOTEBOOK_ID })
+    tabsState.addTab({ id: tabId, type: 'notebook', metadata: { notebookId: NOTEBOOK_ID } })
+
+    renderNotebookTab(new QueryClient(), tabsState)
+
+    await userEvent.click(await screen.findByRole('button', { name: 'Save changes' }))
+    await userEvent.click(await screen.findByRole('button', { name: 'Discard changes' }))
+
+    await waitFor(() => expect(tabsState.tabsMap[tabId]).toBeUndefined())
+  })
+
+  it.each(['the close button', 'the backdrop'])(
+    'dismisses the conflict with %s without changing notebook state',
+    async (dismissal) => {
+      setupSqlEditorMocks()
+      seedNotebook()
+      notebooksState.updateCells({
+        id: NOTEBOOK_ID,
+        cells: notebooksState.notebooks[NOTEBOOK_ID]!.notebook.content!.cells,
+      })
+      notebooksState.markServerDivergence({ id: NOTEBOOK_ID, type: 'updated' })
+
+      renderNotebookTab(new QueryClient())
+
+      await userEvent.click(await screen.findByRole('button', { name: 'Save changes' }))
+      const dialog = await screen.findByRole('dialog', { name: 'Assistant changes detected' })
+      if (dismissal === 'the close button') {
+        await userEvent.click(screen.getByRole('button', { name: 'Close' }))
+      } else {
+        fireEvent.pointerDown(dialog.parentElement!, { button: 0, ctrlKey: false })
+      }
+
+      await waitFor(() =>
+        expect(
+          screen.queryByRole('dialog', { name: 'Assistant changes detected' })
+        ).not.toBeInTheDocument()
+      )
+      expect(notebooksState.notebooks[NOTEBOOK_ID]).toBeDefined()
+      expect(notebooksState.serverDivergedWhileDirty.get(NOTEBOOK_ID)).toBe('updated')
+    }
+  )
 })
diff --git a/apps/studio/components/interfaces/Explorer/__tests__/QueryTab.test.tsx b/apps/studio/components/interfaces/Explorer/__tests__/QueryTab.test.tsx
index 70224e3f4ff..a7ddb608be2 100644
--- a/apps/studio/components/interfaces/Explorer/__tests__/QueryTab.test.tsx
+++ b/apps/studio/components/interfaces/Explorer/__tests__/QueryTab.test.tsx
@@ -1,6 +1,7 @@
 import { act, screen, waitFor } from '@testing-library/react'
 import userEvent from '@testing-library/user-event'
 import { HttpResponse } from 'msw'
+import { useEffect, useRef } from 'react'
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 
 import { ExplorerQueryTab } from '../ExplorerQueryTab'
@@ -14,6 +15,8 @@ import { setupSqlEditorMocks } from '@/tests/lib/sql-editor-test-utils'
 const testContext = vi.hoisted(() => ({
   flags: { otelLegacyLogs: true } as Record<string, boolean>,
   params: { ref: 'default', id: 'query-test' } as { ref?: string; id?: string },
+  /** Simulated editor selection — the mocked CodeEditor's fake editor reads this. */
+  selectedText: undefined as string | undefined,
 }))
 
 vi.mock('common', async (importOriginal) => {
@@ -30,16 +33,51 @@ vi.mock('@/components/ui/CodeEditor/CodeEditor', () => ({
   CodeEditor: ({
     value,
     onInputChange,
+    onMount,
   }: {
     value: string
     onInputChange?: (value: string | undefined) => void
-  }) => (
-    <textarea
-      aria-label="SQL editor"
-      value={value}
-      onChange={(e) => onInputChange?.(e.target.value)}
-    />
-  ),
+    onMount?: (editor: any, monaco: any) => void
+  }) => {
+    // Kept fresh via a ref (rather than closed over) so the fake editor's
+    // `getValue` reflects edits made after mount, same as the real editor would.
+    const valueRef = useRef(value)
+    valueRef.current = value
+
+    useEffect(() => {
+      const hasSelection = testContext.selectedText !== undefined
+      // Matches this instance's selection at the moment it mounts — a fresh editor
+      // instance (e.g. after "Show query" remounts it) has no memory of a prior
+      // instance's selection, so this must be read fresh rather than carried over.
+      const selection = hasSelection
+        ? { startLineNumber: 1, endLineNumber: 2, startColumn: 1, endColumn: 5 }
+        : null
+
+      onMount?.(
+        {
+          getValue: () => valueRef.current,
+          getSelection: () => selection,
+          getModel: () => ({ getValueInRange: () => testContext.selectedText }),
+          onDidBlurEditorWidget: () => () => {},
+          // Intentionally never invoked here — the real editor only fires this on a
+          // subsequent user-driven selection change, not eagerly on mount. Tests that
+          // need to simulate a live selection change should call this directly.
+          onDidChangeCursorSelection: () => ({ dispose: () => {} }),
+          addAction: () => {},
+        },
+        { KeyMod: { CtrlCmd: 1, Shift: 2 }, KeyCode: { KeyK: 3, Enter: 4 } }
+      )
+      // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, [])
+
+    return (
+      <textarea
+        aria-label="SQL editor"
+        value={value}
+        onChange={(e) => onInputChange?.(e.target.value)}
+      />
+    )
+  },
 }))
 
 vi.mock('../QueryEditor/QuerySourceMenu', () => ({
@@ -132,6 +170,7 @@ beforeEach(() => {
   setupSqlEditorMocks()
   testContext.flags.otelLegacyLogs = true
   testContext.params = { ref: 'default', id: 'query-test' }
+  testContext.selectedText = undefined
   explorerQueryState.removeDraft({ id: 'query-test', projectRef: 'default' })
 })
 
@@ -389,4 +428,75 @@ describe('QueryTab execution', () => {
     expect(executedQueries[0]).toContain('create table foo (id int)')
     expect(executedQueries[0]).toContain('ALTER TABLE foo ENABLE ROW LEVEL SECURITY;')
   })
+
+  it('runs only the selected text, not the full editor content, when there is an active selection', async () => {
+    createDraft({ _tag: 'database' }, 'select 1;\nselect 2;')
+    testContext.selectedText = 'select 2;'
+
+    // Background prefetches (intellisense keywords/functions/schemas/table-columns, event
+    // triggers) hit this same generic pg-meta query endpoint, distinguished from an actual
+    // run by their non-empty `key` search param — an executed query's `key` is `''`.
+    const executedQueries: string[] = []
+    addAPIMock({
+      method: 'post',
+      path: '/platform/pg-meta/:ref/query',
+      response: async ({ request }) => {
+        const key = new URL(request.url).searchParams.get('key')
+        if (key !== '') return HttpResponse.json([])
+        const { query } = (await request.json()) as { query: string }
+        executedQueries.push(query)
+        return HttpResponse.json([])
+      },
+    })
+
+    renderQueryTab()
+    const runButton = await screen.findByRole('button', { name: 'Run selected' })
+    await waitFor(() => expect(runButton).toBeEnabled())
+    await userEvent.click(runButton)
+
+    await waitFor(() => expect(executedQueries).toHaveLength(1))
+    expect(executedQueries[0]).toContain('select 2')
+    expect(executedQueries[0]).not.toContain('select 1')
+  })
+
+  it('drops the stale "Run selected" state once the query panel is hidden and shown again', async () => {
+    createDraft({ _tag: 'database' }, 'select 1;\nselect 2;')
+    testContext.selectedText = 'select 2;'
+
+    const executedQueries: string[] = []
+    addAPIMock({
+      method: 'post',
+      path: '/platform/pg-meta/:ref/query',
+      response: async ({ request }) => {
+        const key = new URL(request.url).searchParams.get('key')
+        if (key !== '') return HttpResponse.json([])
+        const { query } = (await request.json()) as { query: string }
+        executedQueries.push(query)
+        return HttpResponse.json([])
+      },
+    })
+
+    renderQueryTab()
+    expect(await screen.findByRole('button', { name: 'Run selected' })).toBeInTheDocument()
+
+    // Hiding the query panel unmounts CodeEditor entirely. Simulate the selection being
+    // gone by the time it's shown again (a fresh editor instance has no selection yet).
+    const hideQueryButton = document.querySelector('.lucide-eye-off')?.closest('button')
+    expect(hideQueryButton).toBeInstanceOf(HTMLButtonElement)
+    await userEvent.click(hideQueryButton as HTMLButtonElement)
+    testContext.selectedText = undefined
+
+    const showQueryButton = document.querySelector('.lucide-eye')?.closest('button')
+    expect(showQueryButton).toBeInstanceOf(HTMLButtonElement)
+    await userEvent.click(showQueryButton as HTMLButtonElement)
+
+    const runButton = await screen.findByRole('button', { name: 'Run' })
+    expect(screen.queryByRole('button', { name: 'Run selected' })).not.toBeInTheDocument()
+
+    await userEvent.click(runButton)
+
+    await waitFor(() => expect(executedQueries).toHaveLength(1))
+    expect(executedQueries[0]).toContain('select 1')
+    expect(executedQueries[0]).toContain('select 2')
+  })
 })
diff --git a/apps/studio/components/interfaces/Integrations/GraphQL/GraphiQLTab.tsx b/apps/studio/components/interfaces/Integrations/GraphQL/GraphiQLTab.tsx
index b5a29d8f9e9..b40f791e27a 100644
--- a/apps/studio/components/interfaces/Integrations/GraphQL/GraphiQLTab.tsx
+++ b/apps/studio/components/interfaces/Integrations/GraphQL/GraphiQLTab.tsx
@@ -31,7 +31,7 @@ import { useGetImpersonatedRoleState } from '@/state/role-impersonation-state'
 const ROLE_IMPERSONATION_PLUGIN: GraphiQLPlugin = {
   title: 'Role Impersonation',
   icon: () => <IconUser />,
-  content: () => <RoleImpersonationSelector orientation="vertical" />,
+  content: () => <RoleImpersonationSelector />,
 }
 
 /**
diff --git a/apps/studio/components/interfaces/Integrations/Integration/IntegrationOverviewTab.test.tsx b/apps/studio/components/interfaces/Integrations/Integration/IntegrationOverviewTab.test.tsx
index 68dd6a4a79f..426e516a4d8 100644
--- a/apps/studio/components/interfaces/Integrations/Integration/IntegrationOverviewTab.test.tsx
+++ b/apps/studio/components/interfaces/Integrations/Integration/IntegrationOverviewTab.test.tsx
@@ -40,6 +40,7 @@ vi.mock('@/hooks/misc/useSelectedProject', () => ({
     data: { ref: 'default', connectionString: 'postgres://localhost' },
   }),
   useIsOrioleDb: () => false,
+  useIsHighAvailability: () => false,
 }))
 
 vi.mock('common', async (importOriginal) => {
diff --git a/apps/studio/components/interfaces/Integrations/Integration/IntegrationOverviewTabV2/InstallIntegrationSheet.test.tsx b/apps/studio/components/interfaces/Integrations/Integration/IntegrationOverviewTabV2/InstallIntegrationSheet.test.tsx
index 89f2bef940d..7fcde7fc422 100644
--- a/apps/studio/components/interfaces/Integrations/Integration/IntegrationOverviewTabV2/InstallIntegrationSheet.test.tsx
+++ b/apps/studio/components/interfaces/Integrations/Integration/IntegrationOverviewTabV2/InstallIntegrationSheet.test.tsx
@@ -15,6 +15,7 @@ vi.mock('@/hooks/misc/useSelectedProject', () => ({
   useSelectedProjectQuery: () => ({
     data: { ref: 'default', connectionString: 'postgres://localhost' },
   }),
+  useIsHighAvailability: () => false,
 }))
 
 vi.mock('@/hooks/useProtectedSchemas', () => ({
diff --git a/apps/studio/components/interfaces/Integrations/VercelGithub/ProjectLinkerComponents.tsx b/apps/studio/components/interfaces/Integrations/VercelGithub/ProjectLinkerComponents.tsx
index dcdf496453f..b26abf0755f 100644
--- a/apps/studio/components/interfaces/Integrations/VercelGithub/ProjectLinkerComponents.tsx
+++ b/apps/studio/components/interfaces/Integrations/VercelGithub/ProjectLinkerComponents.tsx
@@ -1,7 +1,6 @@
 import { useParams } from 'common'
 import { Check, ChevronDown, Plus, PlusIcon } from 'lucide-react'
 import Link from 'next/link'
-import { useRouter } from 'next/router'
 import { HTMLAttributes } from 'react'
 import {
   Badge,
@@ -20,6 +19,7 @@ import {
 } from 'ui'
 
 import { Project, type ForeignProject, type ProjectLinkerProps } from './VercelGithub.types'
+import { CommandItemLink } from '@/components/ui/CommandItemLink'
 import { OrganizationProjectSelector } from '@/components/ui/OrganizationProjectSelector'
 import { useIsFeatureEnabled } from '@/hooks/misc/useIsFeatureEnabled'
 import { useSelectedOrganizationQuery } from '@/hooks/misc/useSelectedOrganization'
@@ -161,7 +161,6 @@ export const SupabaseProjectSelector = ({
   setOpen: (val: boolean) => void
   setSelectedSupabaseProject: (project: Project) => void
 } & Pick<ProjectLinkerProps, 'slug' | 'variant' | 'defaultSupabaseProject'>) => {
-  const router = useRouter()
   const { data: selectedOrganization } = useSelectedOrganizationQuery()
   const projectCreationEnabled = useIsFeatureEnabled('projects:create')
 
@@ -226,23 +225,14 @@ export const SupabaseProjectSelector = ({
         return (
           projectCreationEnabled && (
             <CommandGroup>
-              <CommandItem
-                className="cursor-pointer w-full"
-                onSelect={() => {
-                  setOpen(false)
-                  router.push(`/new/${selectedOrganization?.slug}`)
-                }}
-                onClick={() => setOpen(false)}
+              <CommandItemLink
+                href={`/new/${selectedOrganization?.slug}`}
+                className="cursor-pointer w-full gap-2"
+                onSelect={() => setOpen(false)}
               >
-                <Link
-                  href={`/new/${selectedOrganization?.slug}`}
-                  className="w-full flex items-center gap-2"
-                  onClick={() => setOpen(false)}
-                >
-                  <Plus size={14} strokeWidth={1.5} />
-                  <p>Create a new project</p>
-                </Link>
-              </CommandItem>
+                <Plus size={14} strokeWidth={1.5} />
+                <p>Create a new project</p>
+              </CommandItemLink>
             </CommandGroup>
           )
         )
diff --git a/apps/studio/components/interfaces/ProjectCreation/RegionSelector.tsx b/apps/studio/components/interfaces/ProjectCreation/RegionSelector.tsx
index 03f5663a649..5e09ad47fee 100644
--- a/apps/studio/components/interfaces/ProjectCreation/RegionSelector.tsx
+++ b/apps/studio/components/interfaces/ProjectCreation/RegionSelector.tsx
@@ -251,11 +251,7 @@ export const RegionSelector = ({
                           <div className="flex items-center gap-x-3">
                             {isLoading && <Loader2 size={14} className="animate-spin" />}
                             {selectedRegion?.code && (
-                              <RegionFlag
-                                role="presentation"
-                                className="w-5"
-                                region={selectedRegion.code}
-                              />
+                              <RegionFlag className="w-5" region={selectedRegion.code} />
                             )}
                             <span className="text-foreground">{triggerLabel}</span>
                           </div>
diff --git a/apps/studio/components/interfaces/QuerySources/DatabaseParametersSubMenu.tsx b/apps/studio/components/interfaces/QuerySources/DatabaseParametersSubMenu.tsx
index 16490bf0156..16c7e3a09ba 100644
--- a/apps/studio/components/interfaces/QuerySources/DatabaseParametersSubMenu.tsx
+++ b/apps/studio/components/interfaces/QuerySources/DatabaseParametersSubMenu.tsx
@@ -1,4 +1,4 @@
-import { useParams } from 'common'
+import { IS_PLATFORM, useParams } from 'common'
 import { Check, Plus } from 'lucide-react'
 import Link from 'next/link'
 import {
@@ -13,6 +13,7 @@ import { getAddReadReplicaPath } from '@/components/interfaces/Settings/Infrastr
 import { useReadReplicasQuery } from '@/data/read-replicas/replicas-query'
 import { formatDatabaseID, formatDatabaseRegion } from '@/data/read-replicas/replicas.utils'
 import { useIsFeatureEnabled } from '@/hooks/misc/useIsFeatureEnabled'
+import { useIsHighAvailability } from '@/hooks/misc/useSelectedProject'
 
 /** The label a database row/summary shows: the primary, or a replica by region + id. */
 function databaseLabel(identifier: string, region: string, projectRef: string | undefined) {
@@ -28,6 +29,7 @@ export const DatabaseParametersSubMenu = ({
   onIdentifierChange: (identifier: string) => void
 }) => {
   const { ref: projectRef } = useParams()
+  const isHighAvailability = useIsHighAvailability()
   const { infrastructureReadReplicas } = useIsFeatureEnabled(['infrastructure:read_replicas'])
 
   const { data } = useReadReplicasQuery({ projectRef })
@@ -68,7 +70,7 @@ export const DatabaseParametersSubMenu = ({
             </DropdownMenuItem>
           )
         })}
-        {infrastructureReadReplicas && (
+        {IS_PLATFORM && infrastructureReadReplicas && !isHighAvailability && (
           <>
             <DropdownMenuSeparator />
             <DropdownMenuItem asChild className="gap-x-2">
diff --git a/apps/studio/components/interfaces/RoleImpersonationSelector/Icons.tsx b/apps/studio/components/interfaces/RoleImpersonationSelector/Icons.tsx
deleted file mode 100644
index 918edb085f8..00000000000
--- a/apps/studio/components/interfaces/RoleImpersonationSelector/Icons.tsx
+++ /dev/null
@@ -1,125 +0,0 @@
-import { useTheme } from 'next-themes'
-
-export interface IconProps {
-  isSelected?: boolean
-}
-
-export const ServiceRoleIcon = ({ isSelected = false }: IconProps) => {
-  const { resolvedTheme } = useTheme()
-
-  return (
-    <svg width="53" height="17" fill="none" xmlns="http://www.w3.org/2000/svg">
-      <g opacity={isSelected ? '1' : '.5'}>
-        <rect
-          x="37.161"
-          y=".53"
-          width="15"
-          height="15"
-          rx="5.5"
-          stroke={resolvedTheme === 'light' ? '#11181C' : '#EDEDED'}
-        />
-        <path d="M1 10.53h32.214" stroke="#33A7E9" strokeLinecap="round" strokeDasharray="2 2" />
-        <rect
-          x="15.964"
-          y=".53"
-          width="9"
-          height="15"
-          rx="4.5"
-          stroke={resolvedTheme === 'light' ? '#7E868C' : '#7E7E7E'}
-        />
-        <path d="M1 5.53h32.214" stroke="#33A7E9" strokeLinecap="round" strokeDasharray="2 2" />
-      </g>
-    </svg>
-  )
-}
-
-export const AnonIcon = ({ isSelected = false }: IconProps) => {
-  const { resolvedTheme } = useTheme()
-
-  return (
-    <svg width="53" height="17" fill="none" xmlns="http://www.w3.org/2000/svg">
-      <g opacity={isSelected ? '1' : '.5'}>
-        <path
-          d="M1 4.994a.5.5 0 0 0 0 1v-1Zm16.218 1h.5v-1h-.5v1ZM1 5.994h1.014v-1H1v1Zm3.04 0h2.028v-1H4.041v1Zm4.056 0h2.027v-1H8.096v1Zm4.054 0h2.027v-1H12.15v1Zm4.055 0h1.013v-1h-1.013v1Z"
-          fill={resolvedTheme === 'light' ? '#7E868C' : '#7E7E7E'}
-        />
-        <path
-          d="m15.92 12.56 9.04-9.04"
-          stroke={resolvedTheme === 'light' ? '#11181C' : '#EDEDED'}
-        />
-        <rect
-          x="15.964"
-          y=".494"
-          width="9"
-          height="15"
-          rx="4.5"
-          stroke={resolvedTheme === 'light' ? '#11181C' : '#EDEDED'}
-        />
-        <rect
-          x="37.161"
-          y=".744"
-          width="15"
-          height="15"
-          rx="5.5"
-          stroke={resolvedTheme === 'light' ? '#11181C' : '#EDEDED'}
-        />
-        <path d="M1 10.494h32.214" stroke="#33A7E9" strokeLinecap="round" strokeDasharray="2 2" />
-        <path
-          d="M15.96 7.562 22.568.956M19.049 14.885l5.957-5.958"
-          stroke={resolvedTheme === 'light' ? '#11181C' : '#EDEDED'}
-        />
-      </g>
-    </svg>
-  )
-}
-
-export const AuthenticatedIcon = ({ isSelected = false }: IconProps) => {
-  const { resolvedTheme } = useTheme()
-
-  return (
-    <svg width="68" height="17" fill="none" xmlns="http://www.w3.org/2000/svg">
-      <g opacity={isSelected ? '1' : '.5'}>
-        <path
-          d="M15.63 5.156a.5.5 0 1 0 0 1v-1Zm16.218 1h.5v-1h-.5v1Zm-16.218 0h1.013v-1H15.63v1Zm3.04 0h2.028v-1h-2.027v1Zm4.055 0h2.028v-1h-2.028v1Zm4.055 0h2.027v-1H26.78v1Zm4.055 0h1.013v-1h-1.013v1Z"
-          fill={resolvedTheme === 'light' ? '#7E868C' : '#7E7E7E'}
-        />
-        <path
-          d="m30.55 12.722 9.04-9.04"
-          stroke={resolvedTheme === 'light' ? '#11181C' : '#EDEDED'}
-        />
-        <rect
-          x="30.594"
-          y=".656"
-          width="9"
-          height="15"
-          rx="4.5"
-          stroke={resolvedTheme === 'light' ? '#11181C' : '#EDEDED'}
-        />
-        <rect
-          x="51.791"
-          y=".906"
-          width="15"
-          height="15"
-          rx="5.5"
-          stroke={resolvedTheme === 'light' ? '#11181C' : '#EDEDED'}
-        />
-        <path
-          d="M15.63 10.656h32.214"
-          stroke="#33A7E9"
-          strokeLinecap="round"
-          strokeDasharray="2 2"
-        />
-        <path
-          d="m30.59 7.724 6.607-6.606M33.679 15.047l5.957-5.958"
-          stroke={resolvedTheme === 'light' ? '#11181C' : '#EDEDED'}
-        />
-        <path
-          d="M12.666 14.281v-1.333A2.667 2.667 0 0 0 10 10.28H6a2.667 2.667 0 0 0-2.667 2.667v1.333M8 7.615A2.667 2.667 0 1 0 8 2.28a2.667 2.667 0 0 0 0 5.334Z"
-          stroke={resolvedTheme === 'light' ? '#11181C' : '#EDEDED'}
-          strokeLinecap="round"
-          strokeLinejoin="round"
-        />
-      </g>
-    </svg>
-  )
-}
diff --git a/apps/studio/components/interfaces/RoleImpersonationSelector/RoleImpersonationRadio.tsx b/apps/studio/components/interfaces/RoleImpersonationSelector/RoleImpersonationRadio.tsx
deleted file mode 100644
index 74f182e7dc6..00000000000
--- a/apps/studio/components/interfaces/RoleImpersonationSelector/RoleImpersonationRadio.tsx
+++ /dev/null
@@ -1,76 +0,0 @@
-import { Check, Minus } from 'lucide-react'
-import { cn } from 'ui'
-
-export interface RoleImpersonationRadioProps<T extends string> {
-  label?: string
-  description?: string
-  value: T
-  isSelected: boolean | 'partially'
-  onSelectedChange: (value: T) => void
-  icon?: React.ReactNode
-  fullWidth?: boolean
-}
-
-export function RoleImpersonationRadio<T extends string>({
-  label,
-  description,
-  value,
-  isSelected,
-  onSelectedChange,
-  icon,
-  fullWidth = false,
-}: RoleImpersonationRadioProps<T>) {
-  return (
-    <label
-      className={cn(
-        'border border-default rounded-md bg-surface-200 hover:bg-overlay-hover hover:border-control-hover px-4 py-3 cursor-pointer transition-colors',
-        fullWidth ? 'w-full' : 'w-44',
-        isSelected && 'border-control-hover hover:border-control-hover bg-surface-300'
-      )}
-      tabIndex={0}
-      onKeyDown={(e) => {
-        if (e.key === 'Enter' || e.key === ' ') {
-          onSelectedChange(value)
-        }
-      }}
-      htmlFor={`role-${value}`}
-    >
-      <div className="flex justify-between items-center mb-2">
-        {icon && <div>{icon}</div>}
-
-        {isSelected && (
-          <div className="flex items-center justify-center p-0.5 bg-foreground text-background rounded-full">
-            {typeof isSelected === 'boolean' && (
-              <Check size={12} strokeWidth="4" className="text-background" />
-            )}
-            {isSelected === 'partially' && (
-              <Minus size={12} strokeWidth="4" className="text-background" />
-            )}
-          </div>
-        )}
-      </div>
-
-      <input
-        id={`role-${value}`}
-        type="radio"
-        name="role"
-        value={value}
-        checked={Boolean(isSelected)}
-        onChange={(e) => {
-          onSelectedChange(e.target.value as T)
-        }}
-        className="invisible h-0 w-0 border-0"
-      />
-      <span
-        className={cn(
-          'text-sm text-foreground-light whitespace-nowrap select-none transition-colors',
-          isSelected && 'text-foreground'
-        )}
-      >
-        {label ?? value}
-      </span>
-
-      {description && <p className="text-foreground-lighter text-xs">{description}</p>}
-    </label>
-  )
-}
diff --git a/apps/studio/components/interfaces/RoleImpersonationSelector/RoleImpersonationSelector.utils.ts b/apps/studio/components/interfaces/RoleImpersonationSelector/RoleImpersonationSelector.utils.ts
new file mode 100644
index 00000000000..92b8c46f92e
--- /dev/null
+++ b/apps/studio/components/interfaces/RoleImpersonationSelector/RoleImpersonationSelector.utils.ts
@@ -0,0 +1,25 @@
+import type { ImpersonationRole, PostgrestRole } from '@/lib/role-impersonation'
+
+export function getSelectedRoleOption(role: ImpersonationRole | undefined): PostgrestRole {
+  if (role?.type === 'postgrest' && (role.role === 'anon' || role.role === 'authenticated')) {
+    return role.role
+  }
+
+  return 'service_role'
+}
+
+type RoleSelectionUpdate =
+  | { shouldSetRole: false }
+  | { shouldSetRole: true; role: ImpersonationRole | undefined }
+
+export function getRoleSelectionUpdate(value: PostgrestRole): RoleSelectionUpdate {
+  if (value === 'service_role') {
+    return { shouldSetRole: true, role: undefined }
+  }
+
+  if (value === 'anon') {
+    return { shouldSetRole: true, role: { type: 'postgrest', role: 'anon' } }
+  }
+
+  return { shouldSetRole: false }
+}
diff --git a/apps/studio/components/interfaces/RoleImpersonationSelector/UserImpersonationSelector.tsx b/apps/studio/components/interfaces/RoleImpersonationSelector/UserImpersonationSelector.tsx
index f649e93c9ae..b4ec509cb6c 100644
--- a/apps/studio/components/interfaces/RoleImpersonationSelector/UserImpersonationSelector.tsx
+++ b/apps/studio/components/interfaces/RoleImpersonationSelector/UserImpersonationSelector.tsx
@@ -1,62 +1,75 @@
 import { keepPreviousData } from '@tanstack/react-query'
 import { useDebounce } from '@uidotdev/usehooks'
-import { LOCAL_STORAGE_KEYS, useParams } from 'common'
-import { ChevronDown, User as IconUser, Loader2, Search, X } from 'lucide-react'
+import { ChevronsUpDown, User as IconUser, Loader2, X } from 'lucide-react'
 import { useMemo, useState } from 'react'
 import { toast } from 'sonner'
 import {
   Button,
   cn,
-  Collapsible,
-  CollapsibleContent,
-  CollapsibleTrigger,
-  DropdownMenuSeparator,
+  Command,
+  CommandEmpty,
+  CommandGroup,
+  CommandInput,
+  CommandItem,
+  CommandList,
   Input,
   InputGroup,
   InputGroupAddon,
   InputGroupButton,
   InputGroupInput,
-  ScrollArea,
-  Switch,
-  Tabs,
-  TabsContent,
-  TabsList,
-  TabsTrigger,
+  Popover,
+  PopoverContent,
+  PopoverTrigger,
+  ToggleGroup,
+  ToggleGroupItem,
 } from 'ui'
 import { FormItemLayout } from 'ui-patterns/form/FormItemLayout/FormItemLayout'
 import { InfoTooltip } from 'ui-patterns/info-tooltip'
 
-import { getAvatarUrl, getDisplayName } from '../Auth/Users/Users.utils'
+import { getDisplayName } from '../Auth/Users/Users.utils'
 import { AlertError } from '@/components/ui/AlertError'
 import { InlineLink } from '@/components/ui/InlineLink'
 import { User, useUsersInfiniteQuery } from '@/data/auth/users-infinite-query'
 import { useCustomAccessTokenHookDetails } from '@/hooks/misc/useCustomAccessTokenHookDetails'
-import { useLocalStorage } from '@/hooks/misc/useLocalStorage'
 import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'
 import { DOCS_URL } from '@/lib/constants'
-import { type RoleImpersonationController } from '@/state/role-impersonation-state'
+import type { RoleImpersonationController } from '@/state/role-impersonation-state'
 import type { ResponseError } from '@/types'
 
 type AuthenticatorAssuranceLevels = 'aal1' | 'aal2'
+type UserSource = 'user' | 'external'
 
-export const UserImpersonationSelector = ({ state }: { state: RoleImpersonationController }) => {
+type UserImpersonationSelectorProps = {
+  state: RoleImpersonationController
+  disabled?: boolean
+  onUserImpersonationCleared?: () => void
+}
+
+export const UserImpersonationSelector = ({
+  state,
+  disabled = false,
+  onUserImpersonationCleared,
+}: UserImpersonationSelectorProps) => {
   const [searchText, setSearchText] = useState('')
-  const [aal, setAal] = useState<AuthenticatorAssuranceLevels>('aal1')
+  const [aal, setAal] = useState<AuthenticatorAssuranceLevels>(() =>
+    state.role?.type === 'postgrest' && state.role.role === 'authenticated'
+      ? (state.role.aal ?? 'aal1')
+      : 'aal1'
+  )
   const [externalUserId, setExternalUserId] = useState('')
   const [additionalClaims, setAdditionalClaims] = useState('')
-
-  const { id: tableId } = useParams()
-  const [selectedTab, setSelectedTab] = useState<'user' | 'external'>('user')
-
-  const [previousSearches, setPreviousSearches] = useLocalStorage<User[]>(
-    LOCAL_STORAGE_KEYS.USER_IMPERSONATION_SELECTOR_PREVIOUS_SEARCHES(tableId!),
-    []
+  const [isUserComboboxOpen, setIsUserComboboxOpen] = useState(false)
+  const [selectedSource, setSelectedSource] = useState<UserSource>(() =>
+    state.role?.type === 'postgrest' &&
+    state.role.role === 'authenticated' &&
+    state.role.userType === 'external'
+      ? 'external'
+      : 'user'
   )
+  const [isImpersonateLoading, setIsImpersonateLoading] = useState(false)
 
   const debouncedSearchText = useDebounce(searchText, 300)
-
   const { data: project } = useSelectedProjectQuery()
-
   const {
     data,
     isSuccess,
@@ -71,10 +84,9 @@ export const UserImpersonationSelector = ({ state }: { state: RoleImpersonationC
       connectionString: project?.connectionString,
       keywords: debouncedSearchText.trim().toLocaleLowerCase(),
     },
-    {
-      placeholderData: keepPreviousData,
-    }
+    { placeholderData: keepPreviousData }
   )
+
   const users = useMemo(() => data?.pages.flatMap((page) => page.result) ?? [], [data?.pages])
   const isSearching = isPlaceholderData && isFetching
   const impersonatingUser =
@@ -82,29 +94,26 @@ export const UserImpersonationSelector = ({ state }: { state: RoleImpersonationC
     state.role.role === 'authenticated' &&
     state.role.userType === 'native' &&
     state.role.user
-
-  // Check if we're currently impersonating an external auth user (e.g. OAuth, SAML)
-  // This is used to show the correct UI state and impersonation details
-  const isExternalAuthImpersonating =
+      ? state.role.user
+      : undefined
+  const impersonatingExternalUser =
     state.role?.type === 'postgrest' &&
     state.role.role === 'authenticated' &&
     state.role.userType === 'external' &&
     state.role.externalAuth
-
+      ? state.role.externalAuth
+      : undefined
+  const displayName = impersonatingUser
+    ? getDisplayName(
+        impersonatingUser,
+        impersonatingUser.email ?? impersonatingUser.phone ?? impersonatingUser.id ?? 'Unknown'
+      )
+    : impersonatingExternalUser?.sub
+  const isUserSelected = Boolean(displayName)
   const customAccessTokenHookDetails = useCustomAccessTokenHookDetails(project?.ref)
 
-  const [isImpersonateLoading, setIsImpersonateLoading] = useState(false)
-
   async function impersonateUser(user: User) {
     setIsImpersonateLoading(true)
-    setPreviousSearches((prev) => {
-      // Remove if already present
-      const filtered = prev.filter((u) => u.id !== user.id)
-      // Add new user to the start of the list (last used first)
-      const updated = [user, ...filtered]
-      // Keep only the last 6
-      return updated.slice(0, 5)
-    })
 
     if (customAccessTokenHookDetails?.type === 'https') {
       toast.info(
@@ -125,459 +134,363 @@ export const UserImpersonationSelector = ({ state }: { state: RoleImpersonationC
       )
     } catch (error) {
       toast.error(`Failed to impersonate user: ${(error as ResponseError).message}`)
+    } finally {
+      setIsImpersonateLoading(false)
     }
-
-    setIsImpersonateLoading(false)
   }
 
-  // Impersonates an external auth user (e.g. OAuth, SAML) by setting the sub and any additional claims
-  // This allows testing RLS policies for external auth users without needing to set up the full OAuth/SAML flow
   async function impersonateExternalUser() {
     setIsImpersonateLoading(true)
 
     let parsedClaims = {}
     try {
       parsedClaims = additionalClaims ? JSON.parse(additionalClaims) : {}
-    } catch (e) {
+    } catch {
       toast.error('Invalid JSON in additional claims')
       setIsImpersonateLoading(false)
       return
     }
+
     try {
       await state.setRole(
         {
           type: 'postgrest',
           role: 'authenticated',
           userType: 'external',
-          externalAuth: {
-            sub: externalUserId,
-            additionalClaims: parsedClaims,
-          },
+          externalAuth: { sub: externalUserId, additionalClaims: parsedClaims },
           aal,
         },
         customAccessTokenHookDetails
       )
     } catch (error) {
       toast.error(`Failed to impersonate user: ${(error as ResponseError).message}`)
+    } finally {
+      setIsImpersonateLoading(false)
+    }
+  }
+
+  async function changeSelectedSource(value: UserSource) {
+    if (!isUserSelected) {
+      setSelectedSource(value)
+      return
     }
 
-    setIsImpersonateLoading(false)
+    try {
+      await state.setRole(undefined)
+      setSelectedSource(value)
+      onUserImpersonationCleared?.()
+    } catch (error) {
+      toast.error(`Failed to stop impersonating user: ${(error as ResponseError).message}`)
+    }
   }
 
-  function stopImpersonating() {
-    state.setRole(undefined)
-  }
+  async function changeAal(value: AuthenticatorAssuranceLevels) {
+    const previousAal = aal
+    setAal(value)
 
-  function toggleAalState() {
-    setAal((prev) => (prev === 'aal2' ? 'aal1' : 'aal2'))
-  }
+    if (
+      state.role?.type !== 'postgrest' ||
+      state.role.role !== 'authenticated' ||
+      !isUserSelected
+    ) {
+      return
+    }
 
-  const displayName = impersonatingUser
-    ? getDisplayName(
-        impersonatingUser,
-        impersonatingUser.email ?? impersonatingUser.phone ?? impersonatingUser.id ?? 'Unknown'
-      )
-    : isExternalAuthImpersonating
-      ? isExternalAuthImpersonating.sub
-      : undefined
-
-  // Clear all search history
-  function clearSearchHistory() {
-    setPreviousSearches([])
+    try {
+      await state.setRole({ ...state.role, aal: value }, customAccessTokenHookDetails)
+    } catch (error) {
+      setAal(previousAal)
+      toast.error(`Failed to update MFA assurance level: ${(error as ResponseError).message}`)
+    }
   }
 
   return (
-    <>
-      <div className="px-5 py-3">
-        <p className="text-foreground text-sm">
-          {displayName ? `Impersonating ${displayName}` : 'Impersonate a user'}
-        </p>
-        <p className="text-sm text-foreground-light mb-1">
-          {!impersonatingUser && !isExternalAuthImpersonating
-            ? "Select a user to respect your database's RLS policies for that particular user."
-            : "Results will respect your database's RLS policies for this user."}
-        </p>
-
-        {impersonatingUser && (
-          <UserImpersonatingRow
-            user={impersonatingUser}
-            onClick={stopImpersonating}
-            isImpersonating={true}
-            aal={aal}
-            isLoading={isImpersonateLoading}
-          />
-        )}
-        {isExternalAuthImpersonating && (
-          <ExternalAuthImpersonatingRow
-            sub={isExternalAuthImpersonating.sub}
-            onClick={stopImpersonating}
-            aal={aal}
-            isLoading={isImpersonateLoading}
-          />
-        )}
-
-        {!impersonatingUser && !isExternalAuthImpersonating && (
-          <Tabs value={selectedTab} onValueChange={(value: any) => setSelectedTab(value)}>
-            <TabsList className="gap-x-3">
-              <TabsTrigger value="user">Project user</TabsTrigger>
-              <TabsTrigger value="external" className="gap-x-1.5">
-                External user
-                <InfoTooltip side="bottom" className="flex flex-col gap-1 max-w-96">
-                  Test RLS policies with external auth providers like Clerk or Auth0 by providing a
-                  user ID and optional claims.
-                </InfoTooltip>
-              </TabsTrigger>
-            </TabsList>
-
-            <TabsContent value="user">
-              <div className="flex flex-col gap-y-2">
-                <InputGroup>
-                  <InputGroupInput
-                    size="tiny"
-                    className="pr-10 border-none"
-                    placeholder="Search by id, email, phone, or name..."
-                    onChange={(e) => setSearchText(e.target.value)}
-                    value={searchText}
-                  />
-                  <InputGroupAddon>
-                    {isSearching ? (
-                      <Loader2
-                        className="animate-spin text-foreground-lighter"
-                        size={16}
-                        strokeWidth={1.5}
-                      />
-                    ) : (
-                      <Search className="text-foreground-lighter" size={16} strokeWidth={1.5} />
-                    )}
-                  </InputGroupAddon>
-                  <InputGroupAddon align="inline-end">
-                    {searchText && (
-                      <InputGroupButton
-                        size="tiny"
-                        variant="text"
-                        onClick={() => setSearchText('')}
-                      >
-                        <span className="sr-only">Clear search</span>
-                        <X size={12} />
-                      </InputGroupButton>
-                    )}
-                  </InputGroupAddon>
-                </InputGroup>
-                {isLoading && (
-                  <div className="flex flex-col gap-2 items-center justify-center h-24">
-                    <Loader2 className="animate-spin" size={24} />
-                    <span className="text-foreground-light">Loading users...</span>
-                  </div>
-                )}
-
-                {isError && <AlertError error={error} subject="Failed to retrieve users" />}
-
-                {isSuccess &&
-                  (users.length > 0 ? (
-                    <div>
-                      <ul className="divide-y max-h-[150px] overflow-y-scroll" role="list">
-                        {users.map((user) => (
-                          <li key={user.id} role="listitem">
-                            <UserRow
-                              user={user}
-                              onClick={impersonateUser}
-                              isLoading={isImpersonateLoading}
-                            />
-                          </li>
-                        ))}
-                      </ul>
-                    </div>
-                  ) : (
-                    <div className="flex flex-col gap-2 items-center justify-center h-24">
-                      <p className="text-foreground-light text-xs" role="status">
-                        No users found
-                      </p>
-                    </div>
-                  ))}
-
-                <>
-                  {previousSearches.length > 0 && (
-                    <div>
-                      {previousSearches.length > 0 ? (
-                        <>
-                          <Collapsible className="relative">
-                            <CollapsibleTrigger className="group font-normal p-0 [&[data-state=open]>div>svg]:-rotate-180!">
-                              <div className="flex items-center gap-x-1 w-full">
-                                <p className="text-xs text-foreground-light group-hover:text-foreground transition">
-                                  Recents
-                                </p>
-                                <ChevronDown
-                                  className="transition-transform duration-200"
-                                  strokeWidth={1.5}
-                                  size={14}
-                                />
-                              </div>
-                            </CollapsibleTrigger>
-
-                            <CollapsibleContent className="mt-1 flex flex-col gap-y-4">
-                              <Button
-                                size="tiny"
-                                variant="text"
-                                className="absolute right-0 top-0 py-2 hover:bg-muted flex items-center text"
-                                onClick={clearSearchHistory}
-                              >
-                                <span className="flex items-center">Clear</span>
-                              </Button>
-                              <ScrollArea
-                                className={cn(previousSearches.length > 3 ? 'h-36' : 'h-auto')}
-                              >
-                                <ul className="grid gap-2 ">
-                                  {previousSearches.map((search) => (
-                                    <li key={search.id}>
-                                      <UserRow user={search} onClick={impersonateUser} />
-                                    </li>
-                                  ))}
-                                </ul>
-                              </ScrollArea>
-                            </CollapsibleContent>
-                          </Collapsible>
-                        </>
-                      ) : (
-                        <div className="p-4 text-center text-muted-foreground">
-                          No recent searches
-                        </div>
-                      )}
-                    </div>
-                  )}
-                </>
-              </div>
-            </TabsContent>
-
-            <TabsContent value="external">
-              <div className="flex flex-col gap-y-4">
-                <FormItemLayout
-                  layout="horizontal"
-                  label="External User ID"
-                  description="The user ID from your external auth provider"
-                  isReactForm={false}
-                >
-                  <Input
-                    size="small"
-                    placeholder="e.g. user_abc123"
-                    value={externalUserId}
-                    onChange={(e) => setExternalUserId(e.target.value)}
-                  />
-                </FormItemLayout>
-                <FormItemLayout
-                  layout="horizontal"
-                  label="Additional Claims (JSON)"
-                  description="Optional: Add custom claims like org_id or roles"
-                  isReactForm={false}
-                >
-                  <Input
-                    size="small"
-                    placeholder='e.g. {"app_metadata": {"org_id": "org_456"}}'
-                    value={additionalClaims}
-                    onChange={(e) => setAdditionalClaims(e.target.value)}
-                  />
-                </FormItemLayout>
-                <div className="flex items-center justify-end">
-                  <Button
-                    variant="default"
-                    disabled={!externalUserId}
-                    onClick={impersonateExternalUser}
-                  >
-                    Impersonate
-                  </Button>
-                </div>
-              </div>
-            </TabsContent>
-          </Tabs>
-        )}
-      </div>
-
-      {/* Check for both regular user and external auth impersonation since they use different data structures but both need to be handled for displaying impersonation UI */}
-      {!impersonatingUser && !isExternalAuthImpersonating ? (
-        <>
-          <DropdownMenuSeparator className="m-0" />
-          <div className="px-5 py-2 flex flex-col gap-2 relative">
-            <Collapsible>
-              <CollapsibleTrigger className="group font-normal p-0 [&[data-state=open]>div>svg]:-rotate-180!">
-                <div className="flex items-center gap-x-1 w-full">
-                  <p className="text-xs text-foreground-light group-hover:text-foreground transition">
-                    Advanced options
-                  </p>
-                  <ChevronDown
-                    className="transition-transform duration-200"
-                    strokeWidth={1.5}
-                    size={14}
-                  />
-                </div>
-              </CollapsibleTrigger>
-              <CollapsibleContent className="mt-1 flex flex-col gap-y-4">
-                <div className="flex flex-row items-center gap-x-4 text-sm text-foreground-light">
-                  <div className="flex items-center gap-x-1">
-                    <h3>MFA assurance level</h3>
-                    <InfoTooltip side="top" className="max-w-96">
-                      AAL1 verifies users via standard login methods, while AAL2 adds a second
-                      authentication factor. If you're not using MFA, you can leave this on AAL1.
-                      Learn more about MFA{' '}
-                      <InlineLink href={`${DOCS_URL}/guides/auth/auth-mfa`}>here</InlineLink>.
-                    </InfoTooltip>
-                  </div>
-
-                  <div className="flex flex-row items-center gap-x-2 text-xs font-bold">
-                    <p className={aal === 'aal1' ? undefined : 'text-foreground-lighter'}>AAL1</p>
-                    <Switch checked={aal === 'aal2'} onCheckedChange={toggleAalState} />
-                    <p className={aal === 'aal2' ? undefined : 'text-foreground-lighter'}>AAL2</p>
-                  </div>
-                </div>
-              </CollapsibleContent>
-            </Collapsible>
-          </div>
-        </>
-      ) : null}
-    </>
-  )
-}
-
-// Base interface for shared impersonation row props to reduce
-// duplication between user and external auth impersonation displays
-interface BaseImpersonatingRowProps {
-  onClick: () => void
-  aal: AuthenticatorAssuranceLevels
-  displayName: string
-  avatarUrl?: string
-  isImpersonating: boolean
-  isLoading?: boolean
-}
-
-const BaseImpersonatingRow = ({
-  onClick,
-  aal,
-  displayName,
-  avatarUrl,
-  isImpersonating = false,
-  isLoading = false,
-}: BaseImpersonatingRowProps) => {
-  return (
-    <div className="flex items-center gap-3 py-2 text-foreground">
-      <div className="flex items-center gap-4 bg-surface-200 pr-4 pl-0.5 py-0.5 border rounded-full max-w-l">
-        {avatarUrl ? (
-          <img className="rounded-full w-5 h-5" src={avatarUrl} alt={displayName} />
-        ) : (
-          <div className="rounded-full w-[21px] h-[21px] bg-surface-300 border border-strong flex items-center justify-center">
-            <IconUser size={12} strokeWidth={2} />
-          </div>
-        )}
-
-        <span className="text-sm truncate">
-          {displayName}{' '}
-          <span className="ml-2 text-foreground-lighter text-xs font-light">
-            {aal === 'aal2' ? 'AAL2' : 'AAL1'}
+    <fieldset
+      disabled={disabled}
+      aria-disabled={disabled}
+      className={cn(
+        'm-0 flex min-w-0 flex-col gap-y-2.5 border-0 p-0 transition-opacity',
+        disabled && 'opacity-40'
+      )}
+    >
+      <FormItemLayout
+        isReactForm={false}
+        layout="horizontal"
+        size="tiny"
+        label={
+          <span className="flex items-center gap-1">
+            Users
+            <InfoTooltip side="left" className="max-w-80">
+              Project users come from Supabase Auth. External users let you test RLS policies with
+              providers such as Clerk or Auth0.
+            </InfoTooltip>
           </span>
-        </span>
-      </div>
-
-      <Button variant="default" onClick={onClick} disabled={isLoading} loading={isLoading}>
-        {isImpersonating ? 'Stop' : 'Impersonate'}
-      </Button>
-    </div>
-  )
-}
-
-const UserImpersonatingRow = ({
-  user,
-  onClick,
-  isImpersonating = false,
-  isLoading = false,
-  aal,
-}: UserRowProps & { aal: AuthenticatorAssuranceLevels }) => {
-  const avatarUrl = getAvatarUrl(user)
-  const displayName =
-    getDisplayName(user, user.email ?? user.phone ?? user.id ?? 'Unknown') +
-    (user.is_anonymous ? ' (anonymous)' : '')
-
-  return (
-    <BaseImpersonatingRow
-      onClick={() => onClick(user)}
-      aal={aal}
-      displayName={displayName}
-      avatarUrl={avatarUrl}
-      isImpersonating={isImpersonating}
-      isLoading={isLoading}
-    />
-  )
-}
-
-interface ExternalAuthImpersonatingRowProps {
-  sub: string
-  onClick: () => void
-  aal: AuthenticatorAssuranceLevels
-  isLoading?: boolean
-}
-
-const ExternalAuthImpersonatingRow = ({
-  sub,
-  onClick,
-  aal,
-  isLoading = false,
-}: ExternalAuthImpersonatingRowProps) => {
-  return (
-    <BaseImpersonatingRow
-      onClick={onClick}
-      aal={aal}
-      displayName={sub}
-      isImpersonating={true}
-      isLoading={isLoading}
-    />
-  )
-}
-
-interface UserRowProps {
-  user: User
-  onClick: (user: User) => void
-  isImpersonating?: boolean
-  isLoading?: boolean
-}
-
-const UserRow = ({ user, onClick, isImpersonating = false, isLoading = false }: UserRowProps) => {
-  const avatarUrl = getAvatarUrl(user)
-  const emailOrPhone = user.email || user.phone
-  const displayName = getDisplayName(user, '')
-  const isAnonymous = user.is_anonymous
-  const showDisplayName = displayName && displayName !== emailOrPhone
-
-  return (
-    <div className="flex items-center justify-between py-1 text-foreground">
-      <div className="flex items-center gap-4">
-        {avatarUrl ? (
-          <img className="rounded-full w-5 h-5" src={avatarUrl} alt={displayName || emailOrPhone} />
-        ) : (
-          <div className="rounded-full w-[21px] h-[21px] bg-surface-300 border flex items-center justify-center text-foreground-lighter">
-            <IconUser size={12} strokeWidth={2} />
-          </div>
-        )}
-
-        <span className="text-sm flex items-center gap-4">
-          {emailOrPhone}
-          {showDisplayName && (
-            <>
-              <span className="text-foreground-lighter">
-                {displayName}
-                {isAnonymous ? ' (anonymous)' : ''}
-              </span>
-            </>
-          )}
-          <span className="text-foreground-light bg-surface-200 dark:bg-surface-400 rounded-md px-1 py-0.5 font-mono text-xs">
-            {user?.id?.slice(0, 8)}
-          </span>
-        </span>
-      </div>
-
-      <Button
-        variant="default"
-        onClick={() => onClick(user)}
-        disabled={isLoading}
-        loading={isLoading}
+        }
       >
-        {isImpersonating ? 'Stop' : 'Impersonate'}
-      </Button>
-    </div>
+        <ToggleGroup
+          type="single"
+          value={selectedSource}
+          onValueChange={(value) => {
+            if (value === 'user' || value === 'external') void changeSelectedSource(value)
+          }}
+          variant="default"
+          size="tiny"
+          aria-label="User source"
+          className="w-full"
+        >
+          <ToggleGroupItem value="user" className="w-full">
+            Project
+          </ToggleGroupItem>
+          <ToggleGroupItem value="external" className="w-full">
+            External
+          </ToggleGroupItem>
+        </ToggleGroup>
+      </FormItemLayout>
+
+      <FormItemLayout
+        id="run-as-user"
+        isReactForm={false}
+        layout="horizontal"
+        size="tiny"
+        label="User"
+      >
+        <ImpersonationControl
+          selectedSource={selectedSource}
+          displayName={displayName}
+          isImpersonateLoading={isImpersonateLoading}
+          stopImpersonating={async () => {
+            await state.setRole(undefined)
+            onUserImpersonationCleared?.()
+          }}
+          isUserComboboxOpen={isUserComboboxOpen}
+          setIsUserComboboxOpen={setIsUserComboboxOpen}
+          searchText={searchText}
+          setSearchText={setSearchText}
+          isLoading={isLoading}
+          isSearching={isSearching}
+          isError={isError}
+          error={error}
+          isSuccess={isSuccess}
+          users={users}
+          impersonateUser={impersonateUser}
+          externalUserId={externalUserId}
+          setExternalUserId={setExternalUserId}
+          impersonateExternalUser={impersonateExternalUser}
+        />
+      </FormItemLayout>
+
+      {selectedSource === 'external' && !isUserSelected && (
+        <FormItemLayout
+          id="run-as-user-claims"
+          isReactForm={false}
+          layout="horizontal"
+          size="tiny"
+          label="Claims"
+        >
+          <Input
+            id="run-as-user-claims"
+            size="tiny"
+            placeholder='e.g. {"app_metadata": {"org_id": "org_456"}}'
+            value={additionalClaims}
+            onChange={(event) => setAdditionalClaims(event.target.value)}
+          />
+        </FormItemLayout>
+      )}
+
+      <FormItemLayout
+        isReactForm={false}
+        layout="horizontal"
+        size="tiny"
+        label={
+          <span className="flex items-center gap-1">
+            MFA level
+            <InfoTooltip side="left" className="max-w-96">
+              AAL1 verifies users via standard login methods, while AAL2 adds a second
+              authentication factor. If you are not using MFA, leave this on AAL1. Learn more in the{' '}
+              <InlineLink href={`${DOCS_URL}/guides/auth/auth-mfa`}>MFA guide</InlineLink>.
+            </InfoTooltip>
+          </span>
+        }
+      >
+        <ToggleGroup
+          type="single"
+          value={aal}
+          onValueChange={(value) => {
+            if (value === 'aal1' || value === 'aal2') void changeAal(value)
+          }}
+          variant="default"
+          size="tiny"
+          aria-label="MFA assurance level"
+          className="w-full"
+        >
+          <ToggleGroupItem value="aal1" className="w-full">
+            AAL1
+          </ToggleGroupItem>
+          <ToggleGroupItem value="aal2" className="w-full">
+            AAL2
+          </ToggleGroupItem>
+        </ToggleGroup>
+      </FormItemLayout>
+    </fieldset>
+  )
+}
+
+type ImpersonationControlProps = {
+  selectedSource: UserSource
+  displayName?: string
+  isImpersonateLoading: boolean
+  stopImpersonating: () => void
+  isUserComboboxOpen: boolean
+  setIsUserComboboxOpen: (open: boolean) => void
+  searchText: string
+  setSearchText: (value: string) => void
+  isLoading: boolean
+  isSearching: boolean
+  isError: boolean
+  error: ResponseError | null
+  isSuccess: boolean
+  users: User[]
+  impersonateUser: (user: User) => Promise<void>
+  externalUserId: string
+  setExternalUserId: (value: string) => void
+  impersonateExternalUser: () => Promise<void>
+}
+
+const ImpersonationControl = ({
+  selectedSource,
+  displayName,
+  isImpersonateLoading,
+  stopImpersonating,
+  isUserComboboxOpen,
+  setIsUserComboboxOpen,
+  searchText,
+  setSearchText,
+  isLoading,
+  isSearching,
+  isError,
+  error,
+  isSuccess,
+  users,
+  impersonateUser,
+  externalUserId,
+  setExternalUserId,
+  impersonateExternalUser,
+}: ImpersonationControlProps) => {
+  if (displayName) {
+    return (
+      <div className="flex min-w-0 items-center gap-2">
+        <span className="min-w-0 flex-1 truncate text-xs">{displayName}</span>
+        <Button
+          type="button"
+          size="tiny"
+          variant="text"
+          className="px-1"
+          aria-label="Stop impersonating user"
+          icon={<X size={14} />}
+          onClick={stopImpersonating}
+          disabled={isImpersonateLoading}
+          loading={isImpersonateLoading}
+        />
+      </div>
+    )
+  }
+
+  if (selectedSource === 'external') {
+    return (
+      <InputGroup>
+        <InputGroupInput
+          id="run-as-user"
+          size="tiny"
+          placeholder="External user ID"
+          value={externalUserId}
+          onChange={(event) => setExternalUserId(event.target.value)}
+        />
+        <InputGroupAddon align="inline-end">
+          <InputGroupButton
+            type="button"
+            size="tiny"
+            variant="default"
+            disabled={!externalUserId}
+            onClick={impersonateExternalUser}
+          >
+            Apply
+          </InputGroupButton>
+        </InputGroupAddon>
+      </InputGroup>
+    )
+  }
+
+  return (
+    <Popover open={isUserComboboxOpen} onOpenChange={setIsUserComboboxOpen} modal={false}>
+      <PopoverTrigger asChild>
+        <Button
+          id="run-as-user"
+          type="button"
+          size="tiny"
+          variant="default"
+          role="combobox"
+          aria-label="Find user"
+          aria-expanded={isUserComboboxOpen}
+          className="w-full justify-between"
+          iconRight={<ChevronsUpDown className="shrink-0 text-foreground-muted" size={14} />}
+        >
+          Email, name, or ID
+        </Button>
+      </PopoverTrigger>
+      <PopoverContent className="p-0" side="bottom" align="start" sameWidthAsTrigger>
+        <Command shouldFilter={false}>
+          <CommandInput
+            placeholder="Email, name, or ID"
+            value={searchText}
+            onValueChange={setSearchText}
+          />
+          <CommandList className="max-h-52">
+            {(isLoading || isSearching) && (
+              <div className="flex items-center justify-center gap-2 px-3 py-2">
+                <Loader2 className="animate-spin" size={14} />
+                <span className="text-xs text-foreground-light">Loading users…</span>
+              </div>
+            )}
+
+            {isError && <AlertError error={error} subject="Failed to retrieve users" />}
+
+            {isSuccess && !isSearching && users.length === 0 && (
+              <CommandEmpty>No users found</CommandEmpty>
+            )}
+
+            {isSuccess && !isSearching && users.length > 0 && (
+              <CommandGroup>
+                {users.map((user) => {
+                  const emailOrPhone = user.email || user.phone
+                  const userDisplayName = getDisplayName(user, '')
+
+                  return (
+                    <CommandItem
+                      key={user.id}
+                      value={user.id}
+                      onSelect={() => {
+                        void impersonateUser(user)
+                        setIsUserComboboxOpen(false)
+                      }}
+                      className="gap-2"
+                    >
+                      <IconUser size={14} className="shrink-0 text-foreground-lighter" />
+                      <span className="min-w-0 flex-1 truncate">
+                        {emailOrPhone || userDisplayName || user.id}
+                      </span>
+                      {userDisplayName && userDisplayName !== emailOrPhone && (
+                        <span className="max-w-24 truncate text-foreground-lighter">
+                          {userDisplayName}
+                        </span>
+                      )}
+                    </CommandItem>
+                  )
+                })}
+              </CommandGroup>
+            )}
+          </CommandList>
+        </Command>
+      </PopoverContent>
+    </Popover>
   )
 }
diff --git a/apps/studio/components/interfaces/RoleImpersonationSelector/index.tsx b/apps/studio/components/interfaces/RoleImpersonationSelector/index.tsx
index 634648b3d15..6ea39c373c4 100644
--- a/apps/studio/components/interfaces/RoleImpersonationSelector/index.tsx
+++ b/apps/studio/components/interfaces/RoleImpersonationSelector/index.tsx
@@ -1,12 +1,8 @@
-import { useState } from 'react'
-import { Badge, Card, CardContent, CardHeader, CardTitle, cn } from 'ui'
+import { Check, Database, UserCheck, UserX } from 'lucide-react'
+import { Separator, ToggleGroup, ToggleGroupItem } from 'ui'
 
-import { AnonIcon, AuthenticatedIcon, ServiceRoleIcon } from './Icons'
-import { RoleImpersonationRadio } from './RoleImpersonationRadio'
 import { UserImpersonationSelector } from './UserImpersonationSelector'
-import { DocsButton } from '@/components/ui/DocsButton'
-import { DOCS_URL } from '@/lib/constants'
-import { PostgrestRole } from '@/lib/role-impersonation'
+import { useRoleImpersonationSelection } from './useRoleImpersonationSelection'
 import {
   useRoleImpersonationStateSnapshot,
   type RoleImpersonationController,
@@ -17,17 +13,13 @@ export interface RoleImpersonationSelectorProps {
   serviceRoleLabel?: string
   disallowAuthenticatedOption?: boolean
   title?: string
-  orientation?: 'horizontal' | 'vertical'
 }
 
 /**
- * Tightly coupled with the global role impersonation store
- * Use RoleImpersonationSelectorInterface to control the logic externally
+ * Tightly coupled with the global role impersonation store.
+ * Use RoleImpersonationSelectorInterface to control the logic externally.
  */
 export const RoleImpersonationSelector = (props: RoleImpersonationSelectorProps) => {
-  // valtio's Snapshot<> type is deep-readonly (incl. nested arrays), which isn't
-  // structurally assignable to RoleImpersonationController's plain array fields — same
-  // rationale as the cast in useGetImpersonatedRoleState.
   const state = useRoleImpersonationStateSnapshot() as unknown as RoleImpersonationController
 
   return <RoleImpersonationSelectorInterface {...props} state={state} />
@@ -37,143 +29,97 @@ type RoleImpersonationSelectorInterfaceProps = RoleImpersonationSelectorProps &
   state: RoleImpersonationController
 }
 
-export const RoleImpersonationSelectorInterface = ({
-  state,
-  orientation,
-  serviceRoleLabel = 'Postgres',
-  disallowAuthenticatedOption = false,
-  header = 'Impersonate a database role',
-}: RoleImpersonationSelectorInterfaceProps) => {
-  const isVertical = orientation === 'vertical'
+export const RoleImpersonationSelectorInterface = (
+  props: RoleImpersonationSelectorInterfaceProps
+) => {
+  const { state } = props
+  const serviceRoleLabel = props.serviceRoleLabel ?? 'Postgres'
+  const disallowAuthenticatedOption = props.disallowAuthenticatedOption ?? false
+  const { selectedOption, onSelectedChange, keepAuthenticatedSelected } =
+    useRoleImpersonationSelection(state)
 
-  const [selectedOption, setSelectedOption] = useState<PostgrestRole>(() =>
-    state.role?.type === 'postgrest' &&
-    (state.role.role === 'anon' || state.role.role === 'authenticated')
-      ? state.role.role
-      : 'service_role'
-  )
-
-  const isAuthenticatedOptionFullySelected = Boolean(
-    selectedOption === 'authenticated' &&
-    state.role?.type === 'postgrest' &&
-    state.role.role === 'authenticated' &&
-    (('user' in state.role && state.role.user) ||
-      ('externalAuth' in state.role && state.role.externalAuth)) // Check for either auth type
-  )
-
-  function onSelectedChange(value: PostgrestRole) {
-    if (value === 'service_role') {
-      // do not set a role for service role
-      // as the default role is the "service role"
-      state.setRole(undefined)
-    }
-
-    if (value === 'anon') {
-      state.setRole({
-        type: 'postgrest',
-        role: value,
-      })
-    }
-
-    setSelectedOption(value)
-  }
+  const roleSummary = {
+    service_role: 'Bypasses RLS and can return all rows.',
+    anon: 'Returns rows available to anonymous users.',
+    authenticated: 'Returns rows available to the selected user.',
+  }[selectedOption]
 
   return (
-    <Card className="border-none">
-      <CardHeader className="flex-row items-center justify-between py-3 space-y-0">
-        <CardTitle>{header}</CardTitle>
-        <DocsButton
-          href={`${DOCS_URL}/guides/database/postgres/row-level-security#authenticated-and-unauthenticated-roles`}
-        />
-      </CardHeader>
-      <CardContent className="flex flex-col gap-y-4">
-        <form
-          onSubmit={(e) => {
-            // don't allow form submission
-            e.preventDefault()
+    <div className="flex w-80 flex-col">
+      <form
+        className="p-3"
+        onSubmit={(event) => {
+          event.preventDefault()
+        }}
+      >
+        <ToggleGroup
+          type="single"
+          orientation="vertical"
+          value={selectedOption}
+          onValueChange={(value) => {
+            if (value === 'service_role' || value === 'anon' || value === 'authenticated') {
+              void onSelectedChange(value)
+            }
           }}
+          variant="default"
+          aria-label={props.header ?? props.title ?? 'Run query as role'}
+          className="w-full flex-col items-stretch gap-0.5"
         >
-          <fieldset className={cn('flex gap-3', isVertical && 'flex-col gap-2')}>
-            <RoleImpersonationRadio
-              value="service_role"
-              isSelected={selectedOption === 'service_role'}
-              onSelectedChange={onSelectedChange}
-              label={serviceRoleLabel}
-              description="Superuser"
-              icon={<ServiceRoleIcon isSelected={selectedOption === 'service_role'} />}
-              fullWidth={isVertical}
+          <ToggleGroupItem value="service_role" className="w-full justify-between text-left">
+            <span className="flex min-w-0 items-center gap-3">
+              <Database size={16} strokeWidth={1.5} className="shrink-0" />
+              <span className="flex min-w-0 flex-col items-start">
+                <span>{serviceRoleLabel}</span>
+                <span className="text-xs font-normal text-foreground-lighter">Superuser</span>
+              </span>
+            </span>
+            {selectedOption === 'service_role' && <Check size={14} />}
+          </ToggleGroupItem>
+
+          <ToggleGroupItem value="anon" className="w-full justify-between text-left">
+            <span className="flex min-w-0 items-center gap-3">
+              <UserX size={16} strokeWidth={1.5} className="shrink-0" />
+              <span className="flex min-w-0 flex-col items-start">
+                <span>Anonymous</span>
+                <span className="text-xs font-normal text-foreground-lighter">Not logged in</span>
+              </span>
+            </span>
+            {selectedOption === 'anon' && <Check size={14} />}
+          </ToggleGroupItem>
+
+          {!disallowAuthenticatedOption && (
+            <ToggleGroupItem value="authenticated" className="w-full justify-between text-left">
+              <span className="flex min-w-0 items-center gap-3">
+                <UserCheck size={16} strokeWidth={1.5} className="shrink-0" />
+                <span className="flex min-w-0 flex-col items-start">
+                  <span>Authenticated</span>
+                  <span className="text-xs font-normal text-foreground-lighter">
+                    Logged-in user
+                  </span>
+                </span>
+              </span>
+              {selectedOption === 'authenticated' && <Check size={14} />}
+            </ToggleGroupItem>
+          )}
+        </ToggleGroup>
+
+        {!disallowAuthenticatedOption && (
+          <>
+            <Separator className="my-2.5" />
+            <UserImpersonationSelector
+              state={state}
+              disabled={selectedOption !== 'authenticated'}
+              onUserImpersonationCleared={keepAuthenticatedSelected}
             />
-
-            <RoleImpersonationRadio
-              value="anon"
-              label="Anonymous"
-              isSelected={selectedOption === 'anon'}
-              onSelectedChange={onSelectedChange}
-              description="Not logged in"
-              icon={<AnonIcon isSelected={selectedOption === 'anon'} />}
-              fullWidth={isVertical}
-            />
-
-            {!disallowAuthenticatedOption && (
-              <RoleImpersonationRadio
-                value="authenticated"
-                label="Authenticated"
-                isSelected={
-                  selectedOption === 'authenticated' &&
-                  (isAuthenticatedOptionFullySelected || 'partially')
-                }
-                onSelectedChange={onSelectedChange}
-                description="Specific logged in user"
-                icon={<AuthenticatedIcon isSelected={selectedOption === 'authenticated'} />}
-                fullWidth={isVertical}
-              />
-            )}
-          </fieldset>
-        </form>
-
-        {selectedOption === 'service_role' && (
-          <div>
-            <p className="text-sm">
-              Full admin access
-              <Badge className="ml-2">Default</Badge>
-            </p>
-            <p className="text-foreground-light text-sm">
-              The <code className="text-code-inline">postgres</code> role, which bypasses all Row
-              Level Security (RLS) policies.
-            </p>
-          </div>
+          </>
         )}
-
-        {selectedOption === 'anon' && (
-          <div>
-            <p className="text-sm">For unauthenticated access</p>
-            <p className="text-foreground-light text-sm">
-              The <code className="text-code-inline">anon</code> role, which the API (PostgREST)
-              uses when a user is not logged in.
-              <br />
-              Row Level Security (RLS) policies apply.
-            </p>
-          </div>
-        )}
-
-        {selectedOption === 'authenticated' && (
-          <div>
-            <p className="text-sm">For authenticated access</p>
-            <p className="text-foreground-light text-sm">
-              The <code className="text-code-inline">authenticated</code> role, which the API
-              (PostgREST) uses when a user is logged in.
-              <br />
-              Row Level Security (RLS) policies apply.
-            </p>
-          </div>
-        )}
-      </CardContent>
-
-      {selectedOption === 'authenticated' && (
-        <CardContent className="p-0">
-          <UserImpersonationSelector state={state} />
-        </CardContent>
-      )}
-    </Card>
+      </form>
+      <Separator />
+      <footer className="px-3 py-2">
+        <p aria-live="polite" className="text-xs text-foreground-lighter">
+          {roleSummary}
+        </p>
+      </footer>
+    </div>
   )
 }
diff --git a/apps/studio/components/interfaces/RoleImpersonationSelector/useRoleImpersonationSelection.ts b/apps/studio/components/interfaces/RoleImpersonationSelector/useRoleImpersonationSelection.ts
new file mode 100644
index 00000000000..49f6dc3260e
--- /dev/null
+++ b/apps/studio/components/interfaces/RoleImpersonationSelector/useRoleImpersonationSelection.ts
@@ -0,0 +1,46 @@
+import { useEffect, useState } from 'react'
+import { toast } from 'sonner'
+
+import { getRoleSelectionUpdate, getSelectedRoleOption } from './RoleImpersonationSelector.utils'
+import type { PostgrestRole } from '@/lib/role-impersonation'
+import type { RoleImpersonationController } from '@/state/role-impersonation-state'
+import type { ResponseError } from '@/types'
+
+export const useRoleImpersonationSelection = (state: RoleImpersonationController) => {
+  const [isAuthenticatedPending, setIsAuthenticatedPending] = useState(false)
+
+  useEffect(() => {
+    if (
+      state.role?.type === 'postgrest' &&
+      state.role.role === 'authenticated' &&
+      isAuthenticatedPending
+    ) {
+      setIsAuthenticatedPending(false)
+    }
+  }, [isAuthenticatedPending, state.role])
+
+  const selectedOption = isAuthenticatedPending
+    ? 'authenticated'
+    : getSelectedRoleOption(state.role)
+
+  async function onSelectedChange(value: PostgrestRole) {
+    const update = getRoleSelectionUpdate(value)
+    if (!update.shouldSetRole) {
+      setIsAuthenticatedPending(true)
+      return
+    }
+
+    try {
+      await state.setRole(update.role)
+      setIsAuthenticatedPending(false)
+    } catch (error) {
+      toast.error(`Failed to impersonate user: ${(error as ResponseError).message}`)
+    }
+  }
+
+  function keepAuthenticatedSelected() {
+    setIsAuthenticatedPending(true)
+  }
+
+  return { selectedOption, onSelectedChange, keepAuthenticatedSelected }
+}
diff --git a/apps/studio/components/interfaces/SQLEditor/UtilityPanel/QuerySourceMenu/RunAsSubMenu.tsx b/apps/studio/components/interfaces/SQLEditor/UtilityPanel/QuerySourceMenu/RunAsSubMenu.tsx
index 1f2b714a315..99ebf6f3789 100644
--- a/apps/studio/components/interfaces/SQLEditor/UtilityPanel/QuerySourceMenu/RunAsSubMenu.tsx
+++ b/apps/studio/components/interfaces/SQLEditor/UtilityPanel/QuerySourceMenu/RunAsSubMenu.tsx
@@ -34,7 +34,6 @@ export const RunAsSubMenu = (props: RunAsSubMenuProps) => {
       dropdown's typeahead. */}
       <DropdownMenuSubContent className="w-80 p-0" onKeyDown={(e) => e.stopPropagation()}>
         <RoleImpersonationSelectorInterface
-          orientation="vertical"
           header="Run SQL query as a role"
           serviceRoleLabel={SERVICE_ROLE_LABEL}
           state={state}
diff --git a/apps/studio/components/interfaces/Settings/Database/ConnectionPooling/ConnectionPooling.test.tsx b/apps/studio/components/interfaces/Settings/Database/ConnectionPooling/ConnectionPooling.test.tsx
index 491aaf978fe..8a99bec0ec2 100644
--- a/apps/studio/components/interfaces/Settings/Database/ConnectionPooling/ConnectionPooling.test.tsx
+++ b/apps/studio/components/interfaces/Settings/Database/ConnectionPooling/ConnectionPooling.test.tsx
@@ -45,6 +45,7 @@ vi.mock('@/hooks/misc/useHighAvailability', () => ({
 
 vi.mock('@/hooks/misc/useSelectedProject', () => ({
   useSelectedProjectQuery: mockUseSelectedProjectQuery,
+  useIsHighAvailability: () => mockUseHighAvailability().isHighAvailability ?? false,
 }))
 
 vi.mock('@/data/database/max-connections-query', () => ({
diff --git a/apps/studio/components/interfaces/Settings/Database/DiskSizeConfiguration.tsx b/apps/studio/components/interfaces/Settings/Database/DiskSizeConfiguration.tsx
index 7cdcf23e888..515cf67241d 100644
--- a/apps/studio/components/interfaces/Settings/Database/DiskSizeConfiguration.tsx
+++ b/apps/studio/components/interfaces/Settings/Database/DiskSizeConfiguration.tsx
@@ -2,7 +2,7 @@ import { PermissionAction } from '@supabase/shared-types/out/constants'
 import { useParams } from 'common'
 import { ExternalLink, Info } from 'lucide-react'
 import Link from 'next/link'
-import { SetStateAction } from 'react'
+import { parseAsBoolean, useQueryState } from 'nuqs'
 import { toast } from 'sonner'
 import { Alert, AlertDescription, AlertTitle, Button, InfoIcon } from 'ui'
 import {
@@ -26,9 +26,9 @@ import { useIsFeatureEnabled } from '@/hooks/misc/useIsFeatureEnabled'
 import { useSelectedOrganizationQuery } from '@/hooks/misc/useSelectedOrganization'
 import {
   useIsAwsNimbusCloudProvider,
+  useIsHighAvailability,
   useSelectedProjectQuery,
 } from '@/hooks/misc/useSelectedProject'
-import { useUrlState } from '@/hooks/ui/useUrlState'
 import { DOCS_URL } from '@/lib/constants'
 import { formatBytes } from '@/lib/helpers'
 
@@ -42,14 +42,13 @@ export const DiskSizeConfiguration = ({ disabled = false }: DiskSizeConfiguratio
   const { data: organization } = useSelectedOrganizationQuery()
 
   const isAwsNimbus = useIsAwsNimbusCloudProvider()
+  const isHighAvailability = useIsHighAvailability()
   const { reportsAll } = useIsFeatureEnabled(['reports:all'])
 
-  const [{ show_increase_disk_size_modal }, setUrlParams] = useUrlState()
-  const showIncreaseDiskSizeModal = show_increase_disk_size_modal === 'true'
-  const setShowIncreaseDiskSizeModal = (value: SetStateAction<boolean>) => {
-    const show = typeof value === 'function' ? value(showIncreaseDiskSizeModal) : value
-    setUrlParams({ show_increase_disk_size_modal: show ? 'true' : undefined })
-  }
+  const [showIncreaseDiskSizeModal, setShowIncreaseDiskSizeModal] = useQueryState(
+    'show_increase_disk_size_modal',
+    parseAsBoolean.withDefault(false)
+  )
 
   const { can: canUpdateDiskSizeConfig } = useAsyncCheckPermissions(
     PermissionAction.UPDATE,
@@ -110,14 +109,16 @@ export const DiskSizeConfiguration = ({ disabled = false }: DiskSizeConfiguratio
                           <ButtonTooltip
                             variant="default"
                             className="w-min ml-auto"
-                            disabled={!canUpdateDiskSizeConfig || disabled}
+                            disabled={!canUpdateDiskSizeConfig || isHighAvailability || disabled}
                             onClick={() => setShowIncreaseDiskSizeModal(true)}
                             tooltip={{
                               content: {
                                 side: 'bottom',
                                 text: !canUpdateDiskSizeConfig
                                   ? 'You need additional permissions to increase the disk size'
-                                  : undefined,
+                                  : isHighAvailability
+                                    ? 'Disk size management is unavailable for High Availability projects'
+                                    : undefined,
                               },
                             }}
                           >
@@ -219,11 +220,13 @@ Read more about [disk management](${DOCS_URL}/guides/platform/database-size#disk
         </PageSectionContent>
       </PageSection>
 
-      <DiskSizeConfigurationModal
-        visible={showIncreaseDiskSizeModal}
-        loading={isUpdatingDiskSize}
-        hideModal={setShowIncreaseDiskSizeModal}
-      />
+      {!isHighAvailability && (
+        <DiskSizeConfigurationModal
+          visible={showIncreaseDiskSizeModal}
+          loading={isUpdatingDiskSize}
+          hideModal={setShowIncreaseDiskSizeModal}
+        />
+      )}
     </>
   )
 }
diff --git a/apps/studio/components/interfaces/Settings/Database/JitDatabaseAccess/JitDbAccess.utils.ts b/apps/studio/components/interfaces/Settings/Database/JitDatabaseAccess/JitDbAccess.utils.ts
index cfb6e1e2b43..4f54c12c627 100644
--- a/apps/studio/components/interfaces/Settings/Database/JitDatabaseAccess/JitDbAccess.utils.ts
+++ b/apps/studio/components/interfaces/Settings/Database/JitDatabaseAccess/JitDbAccess.utils.ts
@@ -257,7 +257,9 @@ export function mapJitMembersToUserRules(
   const memberMap = new Map((projectMembers ?? []).map((member) => [member.user_id, member]))
   const baseRoleIds = roleOptions.map((role) => role.id)
 
-  return (jitMembers ?? []).map((item) => {
+  return (jitMembers ?? []).flatMap((item) => {
+    if (!item.user_id) return []
+
     const mappedMember = memberMap.get(item.user_id)
     const assignedRoles: JitRoleGrantDraft[] = (item.user_roles ?? []).map((roleObj) => {
       const roleWithBranchRestriction = roleObj as typeof roleObj & { branches_only?: boolean }
@@ -294,14 +296,16 @@ export function mapJitMembersToUserRules(
     const email = mappedMember?.primary_email ?? item.user_id
     const name = mappedMember?.username ?? undefined
 
-    return {
-      id: item.user_id,
-      memberId: item.user_id,
-      email,
-      name,
-      grants: cloneGrants(grants),
-      status: computeStatusFromGrants(grants),
-    }
+    return [
+      {
+        id: item.user_id,
+        memberId: item.user_id,
+        email,
+        name,
+        grants: cloneGrants(grants),
+        status: computeStatusFromGrants(grants),
+      },
+    ]
   })
 }
 
diff --git a/apps/studio/components/interfaces/Settings/Infrastructure/InfrastructureConfiguration/ComputeMetricsFooter.tsx b/apps/studio/components/interfaces/Settings/Infrastructure/InfrastructureConfiguration/ComputeMetricsFooter.tsx
new file mode 100644
index 00000000000..4ca4b8d3b43
--- /dev/null
+++ b/apps/studio/components/interfaces/Settings/Infrastructure/InfrastructureConfiguration/ComputeMetricsFooter.tsx
@@ -0,0 +1,81 @@
+import { useParams } from 'common'
+import Link from 'next/link'
+import { Tooltip, TooltipContent, TooltipTrigger } from 'ui'
+
+import { metricColor } from './InstanceNode.utils'
+import { useComputeMetrics } from '@/hooks/analytics/useComputeMetrics'
+
+/**
+ * Compute metrics row at the bottom of a primary database node card, linking
+ * to the database report. Metrics are project-scoped, which reports the
+ * primary on both standard and High Availability projects.
+ */
+export const ComputeMetricsFooter = ({ showConnections = true }: { showConnections?: boolean }) => {
+  const { ref } = useParams()
+
+  const {
+    cpu,
+    disk,
+    memory,
+    connections,
+    isLoading: isMetricsLoading,
+    isError: isMetricsError,
+  } = useComputeMetrics({
+    projectRef: ref,
+  })
+
+  const observabilityUrl = `/project/${ref}/observability/database`
+
+  return (
+    <Tooltip>
+      <TooltipTrigger asChild>
+        <Link
+          href={observabilityUrl}
+          className="border-t px-3 py-2 hover:bg-surface-200 transition flex items-center gap-x-3 text-xs"
+        >
+          {/* Stable live region: announces loading/failure, never the polled values */}
+          <span role="status" className="sr-only">
+            {isMetricsLoading && 'Loading metrics'}
+            {!isMetricsLoading && isMetricsError && 'Metrics unavailable'}
+          </span>
+          {/* h-4 matches the text-xs line height so the card doesn't shift when metrics load */}
+          {isMetricsLoading && (
+            <div
+              aria-hidden="true"
+              className="h-4 w-44 rounded-sm bg-surface-300 motion-safe:animate-pulse"
+            />
+          )}
+          {!isMetricsLoading && isMetricsError && (
+            <span aria-hidden="true" className="text-foreground-lighter">
+              Metrics unavailable
+            </span>
+          )}
+          {!isMetricsLoading && !isMetricsError && (
+            <>
+              <span>
+                CPU <span className={metricColor(cpu)}>{cpu.toFixed(0)}%</span>
+              </span>
+              <span className="text-foreground-lighter">·</span>
+              <span>
+                Disk <span className={metricColor(disk)}>{disk.toFixed(0)}%</span>
+              </span>
+              <span className="text-foreground-lighter">·</span>
+              <span>
+                RAM <span className={metricColor(memory)}>{memory.toFixed(0)}%</span>
+              </span>
+              {showConnections && connections.max > 0 && (
+                <>
+                  <span className="text-foreground-lighter">·</span>
+                  <span className="text-foreground-light">
+                    {connections.peak}/{connections.max} conns
+                  </span>
+                </>
+              )}
+            </>
+          )}
+        </Link>
+      </TooltipTrigger>
+      <TooltipContent side="bottom">Go to Database Report</TooltipContent>
+    </Tooltip>
+  )
+}
diff --git a/apps/studio/components/interfaces/Settings/Infrastructure/InfrastructureConfiguration/DiagramFlow.tsx b/apps/studio/components/interfaces/Settings/Infrastructure/InfrastructureConfiguration/DiagramFlow.tsx
new file mode 100644
index 00000000000..4dd20536df8
--- /dev/null
+++ b/apps/studio/components/interfaces/Settings/Infrastructure/InfrastructureConfiguration/DiagramFlow.tsx
@@ -0,0 +1,132 @@
+import {
+  Background,
+  ColorMode,
+  Edge,
+  EdgeTypes,
+  Node,
+  NodeTypes,
+  ReactFlow,
+  useNodesInitialized,
+  useReactFlow,
+} from '@xyflow/react'
+import { useTheme } from 'next-themes'
+import { useEffect, useEffectEvent, useState } from 'react'
+
+import '@xyflow/react/dist/style.css'
+
+import { cn } from 'ui'
+
+import { getDagreGraphLayout } from './InstanceConfiguration.utils'
+import { timeout } from '@/lib/helpers'
+
+interface DiagramFlowProps {
+  nodes: Node[]
+  edges: Edge[]
+  nodeTypes: NodeTypes
+  edgeTypes: EdgeTypes
+  /** Prepends background group nodes (regions, shards) after the dagre layout runs */
+  addGroupNodes: (nodes: Node[], edges: Edge[]) => { nodes: Node[]; edges: Edge[] }
+  ranksep?: number
+}
+
+/**
+ * Shared React Flow canvas for the infrastructure diagrams, laid out with a
+ * two-pass measured dagre layout: the first pass uses fallback heights while
+ * the diagram is held invisible, then `useNodesInitialized` triggers a second
+ * pass that re-runs dagre with the real measured node heights before fading
+ * the diagram in. Must be rendered inside a `ReactFlowProvider`.
+ */
+export const DiagramFlow = ({
+  nodes,
+  edges,
+  nodeTypes,
+  edgeTypes,
+  addGroupNodes,
+  ranksep,
+}: DiagramFlowProps) => {
+  const reactFlow = useReactFlow()
+  const { resolvedTheme } = useTheme()
+  const nodesInitialized = useNodesInitialized()
+  const [hasMeasuredLayout, setHasMeasuredLayout] = useState(false)
+
+  const backgroundPatternColor =
+    resolvedTheme === 'dark' ? 'rgba(255, 255, 255, 0.3)' : 'rgba(0, 0, 0, 0.4)'
+
+  const setReactFlow = useEffectEvent(async ({ isMeasuredPass }: { isMeasuredPass: boolean }) => {
+    // Merge in React Flow's measured dimensions (if any) so dagre can use real
+    // heights instead of the first-paint fallbacks.
+    const measuredNodes = nodes.map((node) => {
+      const existing = reactFlow.getNode(node.id)
+      return existing?.measured ? { ...node, measured: existing.measured } : node
+    })
+    const graph = getDagreGraphLayout(measuredNodes, edges, { ranksep })
+    const { nodes: groupedNodes } = addGroupNodes(graph.nodes, graph.edges)
+    // Re-attach known measurements to the freshly created group nodes too —
+    // handing setNodes an unmeasured node resets the store's nodesInitialized
+    // flag, which would re-trigger the measured pass below on every re-measure
+    // and loop forever (each iteration re-running fitView, so the diagram
+    // snaps back to center and can't be panned).
+    const updatedNodes = groupedNodes.map((node) => {
+      if (node.measured !== undefined) return node
+      const existing = reactFlow.getNode(node.id)
+      return existing?.measured ? { ...node, measured: existing.measured } : node
+    })
+    reactFlow.setNodes(updatedNodes)
+    reactFlow.setEdges(graph.edges)
+
+    // [Joshen] Odd fix to ensure that react flow snaps back to center when adding nodes
+    await timeout(1)
+    reactFlow.fitView({ maxZoom: 0.9, minZoom: 0.9 })
+    if (isMeasuredPass) setHasMeasuredLayout(true)
+  })
+
+  // First pass: lay out using fallback heights for any not-yet-measured nodes.
+  // The diagram is kept invisible until the measured pass below has run, so the
+  // user never sees the fallback positions.
+  useEffect(() => {
+    if (nodes.length > 0) {
+      setReactFlow({ isMeasuredPass: false })
+    }
+  }, [nodes, edges])
+
+  // Second pass: once React Flow has measured the nodes, re-run the layout so
+  // dagre uses real heights. Only `nodesInitialized` going true should trigger
+  // this — the first-pass effect above handles node changes.
+  const runMeasuredLayout = useEffectEvent(() => {
+    if (nodesInitialized && nodes.length > 0) {
+      setReactFlow({ isMeasuredPass: true })
+    }
+  })
+  useEffect(() => {
+    runMeasuredLayout()
+  }, [nodesInitialized])
+
+  return (
+    <ReactFlow
+      // FIXME: https://github.com/xyflow/xyflow/issues/4876
+      colorMode={'' as unknown as ColorMode}
+      fitView
+      fitViewOptions={{ minZoom: 0.9, maxZoom: 0.9 }}
+      // Keep the diagram invisible (but laid out, so nodes can be measured)
+      // until the measured-height layout pass has run.
+      className={cn(
+        'instance-configuration transition-opacity duration-150',
+        hasMeasuredLayout ? 'opacity-100' : 'opacity-0'
+      )}
+      zoomOnPinch={false}
+      zoomOnScroll={false}
+      nodesDraggable={false}
+      nodesConnectable={false}
+      zoomOnDoubleClick={false}
+      edgesFocusable={false}
+      edgesReconnectable={false}
+      defaultNodes={[]}
+      defaultEdges={[]}
+      nodeTypes={nodeTypes}
+      edgeTypes={edgeTypes}
+      proOptions={{ hideAttribution: true }}
+    >
+      <Background color={backgroundPatternColor} />
+    </ReactFlow>
+  )
+}
diff --git a/apps/studio/components/interfaces/Settings/Infrastructure/InfrastructureConfiguration/HaInstanceConfiguration.tsx b/apps/studio/components/interfaces/Settings/Infrastructure/InfrastructureConfiguration/HaInstanceConfiguration.tsx
new file mode 100644
index 00000000000..0a5c0681998
--- /dev/null
+++ b/apps/studio/components/interfaces/Settings/Infrastructure/InfrastructureConfiguration/HaInstanceConfiguration.tsx
@@ -0,0 +1,113 @@
+import { useQuery } from '@tanstack/react-query'
+import { useParams } from 'common'
+import { Loader2 } from 'lucide-react'
+import { useMemo } from 'react'
+
+import { DiagramFlow } from './DiagramFlow'
+import { addShardNodes, generateHaNodesAndEdges } from './HaInstanceConfiguration.utils'
+import { HaPrimaryNode, HaReplicaNode, HaShardNode, MultigatewayNode } from './HaInstanceNode'
+import { buildHaTopology, selectTopologyPoolers } from './HaTopology.utils'
+import { HA_RANKSEP } from './InstanceConfiguration.constants'
+import { AlertError } from '@/components/ui/AlertError'
+import { HighAvailabilityDisabledEmptyState } from '@/components/ui/HighAvailability/HighAvailabilityDisabledEmptyState'
+import { haClusterGatewaysQueryOptions } from '@/data/ha-admin/ha-cluster-gateways-query'
+import { haClusterPoolersQueryOptions } from '@/data/ha-admin/ha-cluster-poolers-query'
+
+const nodeTypes = {
+  HA_GATEWAY: MultigatewayNode,
+  HA_PRIMARY: HaPrimaryNode,
+  HA_REPLICA: HaReplicaNode,
+  HA_SHARD: HaShardNode,
+}
+
+// The gateway and replication edges both use React Flow's built-in smoothstep.
+const edgeTypes = {}
+
+const POOLER_STATUS_REFRESH_MS = 30_000
+
+/**
+ * Cluster topology diagram for High Availability (Multigres) projects:
+ * gateway tier → shard group → primary + read replicas, driven by the
+ * read-only multiadmin `/ha-admin` passthrough.
+ */
+export const HaInstanceConfiguration = () => {
+  const { ref: projectRef } = useParams()
+
+  // Gateways poll on the same interval as poolers so the gateway count and
+  // gateway→primary edge track cluster changes while the page stays open.
+  const {
+    data: gatewaysData,
+    error: gatewaysError,
+    isPending: isPendingGateways,
+    isError: isErrorGateways,
+  } = useQuery({
+    ...haClusterGatewaysQueryOptions({ projectRef }),
+    refetchInterval: POOLER_STATUS_REFRESH_MS,
+  })
+
+  const {
+    data: poolers,
+    error: poolersError,
+    isPending: isPendingPoolers,
+    isError: isErrorPoolers,
+  } = useQuery({
+    ...haClusterPoolersQueryOptions({ projectRef }),
+    refetchInterval: POOLER_STATUS_REFRESH_MS,
+    select: selectTopologyPoolers,
+  })
+
+  const gateways = gatewaysData?.gateways
+
+  const { nodes, edges } = useMemo(
+    () =>
+      generateHaNodesAndEdges(
+        buildHaTopology({ gateways: gateways ?? [], poolers: poolers ?? [] })
+      ),
+    [gateways, poolers]
+  )
+
+  const isPending = isPendingGateways || isPendingPoolers
+  const isError = isErrorGateways || isErrorPoolers
+  const error = gatewaysError ?? poolersError
+
+  if (isPending) {
+    return (
+      <div role="status" className="h-full w-full flex items-center justify-center">
+        <span className="sr-only">Loading cluster topology...</span>
+        <Loader2 aria-hidden="true" className="motion-safe:animate-spin text-foreground-light" />
+      </div>
+    )
+  }
+
+  if (isError) {
+    return (
+      <div className="h-full w-full flex items-center justify-center px-28">
+        <AlertError error={error} subject="Failed to retrieve cluster topology" />
+      </div>
+    )
+  }
+
+  if ((poolers ?? []).length === 0) {
+    return (
+      <div className="h-full w-full flex items-center justify-center p-6">
+        <HighAvailabilityDisabledEmptyState
+          title="Cluster topology unavailable"
+          description="Topology data for this project is not available yet. Contact support if this persists."
+        />
+      </div>
+    )
+  }
+
+  return (
+    <div className="nowheel h-full w-full relative">
+      <DiagramFlow
+        nodes={nodes}
+        edges={edges}
+        nodeTypes={nodeTypes}
+        edgeTypes={edgeTypes}
+        addGroupNodes={addShardNodes}
+        ranksep={HA_RANKSEP}
+      />
+    </div>
+  )
+}
diff --git a/apps/studio/components/interfaces/Settings/Infrastructure/InfrastructureConfiguration/HaInstanceConfiguration.utils.test.ts b/apps/studio/components/interfaces/Settings/Infrastructure/InfrastructureConfiguration/HaInstanceConfiguration.utils.test.ts
new file mode 100644
index 00000000000..bb8dc47848d
--- /dev/null
+++ b/apps/studio/components/interfaces/Settings/Infrastructure/InfrastructureConfiguration/HaInstanceConfiguration.utils.test.ts
@@ -0,0 +1,32 @@
+import { describe, expect, it } from 'vitest'
+
+import { generateHaNodesAndEdges } from './HaInstanceConfiguration.utils'
+import { buildHaTopology } from './HaTopology.utils'
+
+describe('generateHaNodesAndEdges', () => {
+  it('gives every pooler a unique node id even when identities are omitted', () => {
+    const topology = buildHaTopology({
+      gateways: [],
+      poolers: [
+        {
+          id: { cell: 'cell-1', name: 'p-1' },
+          shardKey: { shard: '0' },
+          routingState: { role: 'ROUTING_ROLE_PRIMARY' },
+        },
+        { shardKey: { shard: '0' }, routingState: { role: 'ROUTING_ROLE_REPLICA' } },
+        { shardKey: { shard: '0' }, routingState: { role: 'ROUTING_ROLE_REPLICA' } },
+      ],
+    })
+
+    const { nodes, edges } = generateHaNodesAndEdges(topology)
+    const poolerNodeIds = nodes
+      .filter((node) => node.type === 'HA_PRIMARY' || node.type === 'HA_REPLICA')
+      .map((node) => node.id)
+
+    expect(poolerNodeIds).toHaveLength(3)
+    expect(new Set(poolerNodeIds).size).toBe(3)
+    // Each replica still gets its own edge from the primary.
+    expect(edges).toHaveLength(2)
+    expect(new Set(edges.map((edge) => edge.id)).size).toBe(2)
+  })
+})
diff --git a/apps/studio/components/interfaces/Settings/Infrastructure/InfrastructureConfiguration/HaInstanceConfiguration.utils.ts b/apps/studio/components/interfaces/Settings/Infrastructure/InfrastructureConfiguration/HaInstanceConfiguration.utils.ts
new file mode 100644
index 00000000000..8521ddea287
--- /dev/null
+++ b/apps/studio/components/interfaces/Settings/Infrastructure/InfrastructureConfiguration/HaInstanceConfiguration.utils.ts
@@ -0,0 +1,154 @@
+import { Edge, Node } from '@xyflow/react'
+import { groupBy } from 'lodash'
+
+import { getPoolerKey, hasPoolerIdentity, HaTopology } from './HaTopology.utils'
+import {
+  NODE_CARD_WIDTH,
+  SHARD_HEADER_HEIGHT,
+  SHARD_NODE_PADDING,
+} from './InstanceConfiguration.constants'
+import { getDagreNodeHeight } from './InstanceConfiguration.utils'
+
+export type MultigatewayNodeData = {
+  numGateways: number
+}
+
+export type HaPoolerNodeData = {
+  cell?: string
+  name?: string
+  shardId: string
+  shardName: string
+  // Only set on primary nodes; hides the unused top handle when no gateway exists.
+  hasGateway?: boolean
+}
+
+export type HaShardNodeData = {
+  name: string
+}
+
+// Records without a complete identity fall back to a positional id so two of
+// them never collide on the same React Flow node id (which would drop a card).
+const getPoolerNodeId = (pooler: Parameters<typeof getPoolerKey>[0], fallbackId: string) =>
+  hasPoolerIdentity(pooler) ? `pooler-${getPoolerKey(pooler)}` : `pooler-${fallbackId}`
+
+export const generateHaNodesAndEdges = (topology: HaTopology): { nodes: Node[]; edges: Edge[] } => {
+  const position = { x: 0, y: 0 }
+  const nodes: Node[] = []
+  const edges: Edge[] = []
+
+  // The alpha runs one multigateway per cell; the diagram collapses them into a
+  // single gateway node with a count rather than rendering one card per cell.
+  const hasGateway = topology.gateways.length > 0
+  if (hasGateway) {
+    nodes.push({
+      position,
+      id: 'multigateway',
+      type: 'HA_GATEWAY',
+      data: { numGateways: topology.gateways.length } satisfies MultigatewayNodeData,
+    })
+  }
+
+  topology.shards.forEach((shard) => {
+    let primaryId: string | undefined
+
+    if (shard.primary !== undefined) {
+      primaryId = getPoolerNodeId(shard.primary, `${shard.id}-primary`)
+      nodes.push({
+        position,
+        id: primaryId,
+        type: 'HA_PRIMARY',
+        data: {
+          cell: shard.primary.id?.cell,
+          name: shard.primary.id?.name,
+          shardId: shard.id,
+          shardName: shard.name,
+          hasGateway,
+        } satisfies HaPoolerNodeData,
+      })
+
+      if (hasGateway) {
+        edges.push({
+          id: `multigateway-${primaryId}`,
+          source: 'multigateway',
+          target: primaryId,
+          type: 'smoothstep',
+          className: 'cursor-default!',
+        })
+      }
+    }
+
+    shard.replicas.forEach((replica, replicaIndex) => {
+      const replicaId = getPoolerNodeId(replica, `${shard.id}-replica-${replicaIndex}`)
+      nodes.push({
+        position,
+        id: replicaId,
+        type: 'HA_REPLICA',
+        data: {
+          cell: replica.id?.cell,
+          name: replica.id?.name,
+          shardId: shard.id,
+          shardName: shard.name,
+        } satisfies HaPoolerNodeData,
+      })
+
+      if (primaryId !== undefined) {
+        edges.push({
+          id: `${primaryId}-${replicaId}`,
+          source: primaryId,
+          target: replicaId,
+          type: 'smoothstep',
+          animated: true,
+          className: 'cursor-default!',
+        })
+      }
+    })
+  })
+
+  return { nodes, edges }
+}
+
+const getNodeWidth = (node: Node) => node.measured?.width ?? NODE_CARD_WIDTH
+
+/**
+ * Prepends a background group node per shard wrapping its primary + replicas,
+ * using the same fake-subflow trick as `addRegionNodes` (dagre has no subflow
+ * support, so the box is sized from the laid-out children's bounding box).
+ */
+export const addShardNodes = (nodes: Node[], edges: Edge[]) => {
+  const shardNodes: Node[] = []
+  const poolerNodes = nodes.filter(
+    (node) => node.type === 'HA_PRIMARY' || node.type === 'HA_REPLICA'
+  ) as Node<HaPoolerNodeData>[]
+
+  const nodesByShard = groupBy(poolerNodes, (node) => node.data.shardId)
+  Object.entries(nodesByShard).forEach(([shardId, children]) => {
+    const minX = Math.min(...children.map((node) => node.position.x))
+    const maxX = Math.max(...children.map((node) => node.position.x + getNodeWidth(node)))
+    const minY = Math.min(...children.map((node) => node.position.y))
+    const maxY = Math.max(...children.map((node) => node.position.y + getDagreNodeHeight(node)))
+
+    shardNodes.push({
+      id: `shard-${shardId}`,
+      position: {
+        x: minX - SHARD_NODE_PADDING,
+        y: minY - SHARD_HEADER_HEIGHT - SHARD_NODE_PADDING,
+      },
+      // Explicit dimensions so React Flow renders the node immediately —
+      // without them a node stays `visibility: hidden` until a measurement
+      // pass that this post-layout background node never gets.
+      width: maxX - minX + SHARD_NODE_PADDING * 2,
+      height: maxY - minY + SHARD_HEADER_HEIGHT + SHARD_NODE_PADDING * 2,
+      // The box covers most of the canvas; making it non-interactive lets
+      // React Flow drop its pointer events so drag-to-pan passes through to
+      // the pane. The header pill re-enables pointer events for its tooltip.
+      selectable: false,
+      focusable: false,
+      type: 'HA_SHARD',
+      data: {
+        name: children[0].data.shardName,
+      } satisfies HaShardNodeData,
+    })
+  })
+
+  return { nodes: [...shardNodes, ...nodes], edges }
+}
diff --git a/apps/studio/components/interfaces/Settings/Infrastructure/InfrastructureConfiguration/HaInstanceNode.tsx b/apps/studio/components/interfaces/Settings/Infrastructure/InfrastructureConfiguration/HaInstanceNode.tsx
new file mode 100644
index 00000000000..7c439e4de59
--- /dev/null
+++ b/apps/studio/components/interfaces/Settings/Infrastructure/InfrastructureConfiguration/HaInstanceNode.tsx
@@ -0,0 +1,190 @@
+import { Handle, Node, NodeProps, Position } from '@xyflow/react'
+import { Database, DatabaseBackup, HelpCircle, Layers, Loader2, Network } from 'lucide-react'
+import { Badge, cn, Tooltip, TooltipContent, TooltipTrigger } from 'ui'
+
+import { ComputeMetricsFooter } from './ComputeMetricsFooter'
+import {
+  HaPoolerNodeData,
+  HaShardNodeData,
+  MultigatewayNodeData,
+} from './HaInstanceConfiguration.utils'
+import { HA_POOLER_STATUS_LABELS, HaPoolerStatus } from './HaTopology.utils'
+import { NODE_CARD_WIDTH } from './InstanceConfiguration.constants'
+import { useHaPoolerCard } from './useHaPooler'
+import { BASE_PATH } from '@/lib/constants'
+
+const STATUS_BADGE_VARIANTS: Record<HaPoolerStatus, 'success' | 'warning' | 'default'> = {
+  healthy: 'success',
+  coming_up: 'default',
+  going_down: 'default',
+  unhealthy: 'warning',
+}
+
+const PoolerStatusBadge = ({ status }: { status: HaPoolerStatus }) => (
+  <Badge variant={STATUS_BADGE_VARIANTS[status]}>{HA_POOLER_STATUS_LABELS[status]}</Badge>
+)
+
+const PoolerCardSubtitle = ({
+  availabilityZone,
+  computeSize,
+}: {
+  availabilityZone?: string
+  computeSize?: string
+}) => (
+  <p className="flex items-center gap-x-1 text-sm text-foreground-light">
+    {availabilityZone !== undefined && <span>{availabilityZone}</span>}
+    {availabilityZone !== undefined && !!computeSize && (
+      <span className="text-foreground-lighter">·</span>
+    )}
+    {!!computeSize && <span>{computeSize}</span>}
+  </p>
+)
+
+export const MultigatewayNode = ({ data }: NodeProps<Node<MultigatewayNodeData>>) => {
+  const { numGateways } = data
+
+  return (
+    <>
+      <div className="flex flex-col rounded-sm bg-surface-100 border border-default">
+        <div className="flex items-start p-3 gap-x-4" style={{ width: NODE_CARD_WIDTH }}>
+          <div className="flex gap-x-3">
+            <div className="min-w-8 h-8 bg-blue-600 border border-blue-800 rounded-md flex items-center justify-center">
+              <Network aria-hidden="true" size={16} />
+            </div>
+            <div className="flex flex-col gap-y-0.5">
+              <p className="text-sm">Multigateway</p>
+              <p className="flex items-center gap-x-1 text-sm text-foreground-light">
+                <span>Load balancer</span>
+                {numGateways > 1 && (
+                  <>
+                    <span className="text-foreground-lighter">·</span>
+                    <span>{numGateways} instances</span>
+                  </>
+                )}
+              </p>
+            </div>
+          </div>
+        </div>
+      </div>
+      <Handle type="source" position={Position.Bottom} style={{ background: 'transparent' }} />
+    </>
+  )
+}
+
+export const HaPrimaryNode = ({ data }: NodeProps<Node<HaPoolerNodeData>>) => {
+  // [Joshen] Just FYI Handles cannot be conditionally rendered
+  const { cell, name, hasGateway } = data
+  const { status, availabilityZone, computeSize, primaryRegion } = useHaPoolerCard({ cell, name })
+
+  return (
+    <>
+      <Handle
+        type="target"
+        position={Position.Top}
+        className={!hasGateway ? 'opacity-0' : ''}
+        style={{ background: 'transparent' }}
+      />
+      <div className="flex flex-col rounded-sm bg-surface-100 border border-default">
+        <div className="flex items-start justify-between p-3" style={{ width: NODE_CARD_WIDTH }}>
+          <div className="flex gap-x-3">
+            <div className="w-8 h-8 bg-brand-500 border border-brand-600 rounded-md flex items-center justify-center">
+              <Database aria-hidden="true" size={16} />
+            </div>
+            <div className="flex flex-col gap-y-0.5">
+              <div className="flex items-center gap-x-2">
+                <p className="text-sm">Primary Database</p>
+                {/* Stable live region so polled status changes are announced */}
+                <span role="status">
+                  {status !== undefined && <PoolerStatusBadge status={status} />}
+                </span>
+              </div>
+              {primaryRegion !== undefined && (
+                <p className="text-sm text-foreground-light">{primaryRegion.name}</p>
+              )}
+              <PoolerCardSubtitle availabilityZone={availabilityZone} computeSize={computeSize} />
+            </div>
+          </div>
+          {primaryRegion !== undefined && (
+            // Decorative — the visible text next to it already names the region
+            <img
+              alt=""
+              aria-hidden="true"
+              className="w-8 rounded-xs mt-0.5"
+              src={`${BASE_PATH}/img/regions/${primaryRegion.region}.svg`}
+            />
+          )}
+        </div>
+        {/* Whether connection metrics are meaningful through the multigateway
+            is unconfirmed, so they're left off for HA projects. */}
+        <ComputeMetricsFooter showConnections={false} />
+      </div>
+      <Handle type="source" position={Position.Bottom} style={{ background: 'transparent' }} />
+    </>
+  )
+}
+
+export const HaReplicaNode = ({ data }: NodeProps<Node<HaPoolerNodeData>>) => {
+  const { cell, name } = data
+  const { status, availabilityZone, computeSize } = useHaPoolerCard({ cell, name })
+
+  return (
+    <>
+      <Handle type="target" position={Position.Top} style={{ background: 'transparent' }} />
+      <div
+        className="flex items-start rounded-sm bg-surface-100 border border-default p-3"
+        style={{ width: NODE_CARD_WIDTH }}
+      >
+        <div className="flex gap-x-3">
+          <div
+            className={cn(
+              'w-8 h-8 border rounded-md flex items-center justify-center',
+              status === 'healthy'
+                ? 'bg-brand-400 border-brand-500'
+                : 'bg-surface-100 border-foreground/20'
+            )}
+          >
+            {status === 'coming_up' ? (
+              <Loader2 aria-hidden="true" className="motion-safe:animate-spin" size={16} />
+            ) : (
+              <DatabaseBackup aria-hidden="true" size={16} />
+            )}
+          </div>
+          <div className="flex flex-col gap-y-0.5">
+            <div className="flex items-center gap-x-2">
+              <p className="text-sm">Read Replica</p>
+              {/* Stable live region so polled status changes are announced */}
+              <span role="status">
+                {status !== undefined && <PoolerStatusBadge status={status} />}
+              </span>
+            </div>
+            <PoolerCardSubtitle availabilityZone={availabilityZone} computeSize={computeSize} />
+          </div>
+        </div>
+      </div>
+    </>
+  )
+}
+
+export const HaShardNode = ({ data }: NodeProps<Node<HaShardNodeData>>) => {
+  const { name } = data
+
+  return (
+    <div className="relative h-full w-full rounded-md border border-default bg-surface-100/25">
+      <div className="pointer-events-auto absolute top-3 left-3 flex items-center gap-x-2 rounded-full border border-default bg-surface-100 pl-3 pr-2 py-1">
+        <Layers aria-hidden="true" size={14} className="text-foreground-light" />
+        <p className="text-sm">{name}</p>
+        <Tooltip>
+          {/* Renders a button so the explanation is keyboard reachable */}
+          <TooltipTrigger className="flex items-center gap-x-1 text-sm text-foreground-light">
+            Automatic failover
+            <HelpCircle aria-hidden="true" size={14} />
+          </TooltipTrigger>
+          <TooltipContent side="bottom" className="max-w-72 text-center">
+            If the primary database fails, a replica in this shard is automatically promoted to take
+            its place.
+          </TooltipContent>
+        </Tooltip>
+      </div>
+    </div>
+  )
+}
diff --git a/apps/studio/components/interfaces/Settings/Infrastructure/InfrastructureConfiguration/HaTopology.utils.test.ts b/apps/studio/components/interfaces/Settings/Infrastructure/InfrastructureConfiguration/HaTopology.utils.test.ts
new file mode 100644
index 00000000000..6e8d77ba78d
--- /dev/null
+++ b/apps/studio/components/interfaces/Settings/Infrastructure/InfrastructureConfiguration/HaTopology.utils.test.ts
@@ -0,0 +1,292 @@
+import { describe, expect, it } from 'vitest'
+
+import {
+  buildHaTopology,
+  formatCellAsAvailabilityZone,
+  getPoolerStatus,
+  isPrimaryPooler,
+  selectTopologyPoolers,
+} from './HaTopology.utils'
+import type { Multipooler } from '@/data/ha-admin/ha-cluster-poolers-query'
+
+const primaryPooler = (overrides: Partial<Multipooler> = {}): Multipooler => ({
+  id: { cell: 'eu-central-1a', name: 'pooler-1' },
+  shardKey: { database: 'postgres', shard: '0' },
+  routingState: { role: 'ROUTING_ROLE_PRIMARY' },
+  ...overrides,
+})
+
+const replicaPooler = (overrides: Partial<Multipooler> = {}): Multipooler => ({
+  id: { cell: 'eu-central-1b', name: 'pooler-2' },
+  shardKey: { database: 'postgres', shard: '0' },
+  routingState: { role: 'ROUTING_ROLE_REPLICA' },
+  ...overrides,
+})
+
+describe('isPrimaryPooler', () => {
+  it('uses routingState.role as the authoritative signal', () => {
+    expect(isPrimaryPooler(primaryPooler())).toBe(true)
+    expect(isPrimaryPooler(replicaPooler())).toBe(false)
+  })
+
+  it('prefers routingState.role over the deprecated type field', () => {
+    expect(isPrimaryPooler(replicaPooler({ type: 'PRIMARY' }))).toBe(false)
+  })
+
+  it('falls back to the deprecated type field when routingState is omitted', () => {
+    expect(isPrimaryPooler({ type: 'PRIMARY' })).toBe(true)
+    expect(isPrimaryPooler({ type: 'REPLICA' })).toBe(false)
+  })
+
+  it('treats a pooler with every field omitted as a replica', () => {
+    expect(isPrimaryPooler({})).toBe(false)
+  })
+})
+
+describe('getPoolerStatus', () => {
+  it('treats a pooler with every field omitted as healthy (proto3 zero values mean SERVING)', () => {
+    expect(getPoolerStatus({})).toBe('healthy')
+  })
+
+  it('maps lifecycle states with or without the proto enum prefix', () => {
+    expect(getPoolerStatus({ lifecycleStatus: { status: 'STARTING' } })).toBe('coming_up')
+    expect(getPoolerStatus({ lifecycleStatus: { status: 'LIFECYCLE_STARTING' } })).toBe('coming_up')
+    expect(getPoolerStatus({ lifecycleStatus: { status: 'STOPPING' } })).toBe('going_down')
+    expect(getPoolerStatus({ lifecycleStatus: { status: 'SHUTDOWN' } })).toBe('unhealthy')
+    expect(getPoolerStatus({ lifecycleStatus: { status: 'QUARANTINED' } })).toBe('unhealthy')
+  })
+
+  it('falls back to serving status when the lifecycle is active', () => {
+    const active = { lifecycleStatus: { status: 'ACTIVE' } }
+    expect(getPoolerStatus({ ...active })).toBe('healthy')
+    expect(getPoolerStatus({ ...active, servingStatus: 'DRAINING' })).toBe('going_down')
+    expect(getPoolerStatus({ ...active, servingStatus: 'DISABLED' })).toBe('unhealthy')
+    expect(getPoolerStatus({ ...active, servingStatus: 'SERVING' })).toBe('healthy')
+  })
+
+  it('prioritizes a terminal lifecycle over the serving status', () => {
+    expect(
+      getPoolerStatus({ lifecycleStatus: { status: 'QUARANTINED' }, servingStatus: 'SERVING' })
+    ).toBe('unhealthy')
+  })
+})
+
+describe('formatCellAsAvailabilityZone', () => {
+  it('returns an AZ-shaped cell as is', () => {
+    expect(formatCellAsAvailabilityZone('eu-central-1a')).toBe('eu-central-1a')
+  })
+
+  it('extracts an AZ-shaped substring from a longer cell name', () => {
+    expect(formatCellAsAvailabilityZone('cell-eu-central-1a')).toBe('eu-central-1a')
+    expect(formatCellAsAvailabilityZone('ap-southeast-2c-0')).toBe('ap-southeast-2c')
+  })
+
+  it('falls back to the raw cell name when no AZ shape is found', () => {
+    expect(formatCellAsAvailabilityZone('cell-1')).toBe('cell-1')
+  })
+
+  it('returns undefined for an omitted cell', () => {
+    expect(formatCellAsAvailabilityZone(undefined)).toBeUndefined()
+    expect(formatCellAsAvailabilityZone('')).toBeUndefined()
+  })
+})
+
+describe('selectTopologyPoolers', () => {
+  it('projects poolers down to identity, shard, and routing role', () => {
+    const projected = selectTopologyPoolers({
+      poolers: [
+        {
+          id: { cell: 'cell-1', name: 'p-1' },
+          shardKey: { database: 'postgres', tableGroup: 'default', shard: '0-inf' },
+          type: 'PRIMARY',
+          hostname: 'some-host',
+          servingStatus: 'DRAINING',
+          lifecycleStatus: { status: 'LIFECYCLE_ACTIVE' },
+          routingState: {
+            role: 'ROUTING_ROLE_PRIMARY',
+            rule: { coordinatorTerm: '2', leaderSubterm: '1' },
+          },
+        },
+      ],
+    })
+
+    // Volatile fields (lifecycle, serving status, hostname) are dropped so the
+    // projection stays deep-equal across polls when the topology is unchanged.
+    // The routing rule is kept — it decides the primary during failover.
+    expect(projected).toEqual([
+      {
+        id: { cell: 'cell-1', name: 'p-1' },
+        shardKey: { database: 'postgres', tableGroup: 'default', shard: '0-inf' },
+        routingState: {
+          role: 'ROUTING_ROLE_PRIMARY',
+          rule: { coordinatorTerm: '2', leaderSubterm: '1' },
+        },
+        type: 'PRIMARY',
+      },
+    ])
+  })
+
+  it('preserves omitted fields as undefined and handles an empty response', () => {
+    expect(selectTopologyPoolers({})).toEqual([])
+    expect(selectTopologyPoolers({ poolers: [{}] })).toEqual([
+      { id: undefined, shardKey: undefined, routingState: undefined, type: undefined },
+    ])
+  })
+})
+
+describe('buildHaTopology', () => {
+  it('groups poolers into a shard with a primary and replicas', () => {
+    const primary = primaryPooler()
+    const replicaB = replicaPooler()
+    const replicaC = replicaPooler({ id: { cell: 'eu-central-1c', name: 'pooler-3' } })
+
+    const topology = buildHaTopology({
+      gateways: [{ id: { cell: 'eu-central-1a', name: 'gateway-1' } }],
+      poolers: [replicaC, primary, replicaB],
+    })
+
+    expect(topology.gateways).toHaveLength(1)
+    expect(topology.shards).toHaveLength(1)
+    expect(topology.shards[0].name).toBe('Shard 1')
+    expect(topology.shards[0].primary).toEqual(primary)
+    // Replicas are sorted by cell/name for a stable layout.
+    expect(topology.shards[0].replicas).toEqual([replicaB, replicaC])
+  })
+
+  it('splits poolers with different shard keys into separate shards', () => {
+    const topology = buildHaTopology({
+      gateways: [],
+      poolers: [
+        primaryPooler({ shardKey: { database: 'postgres', shard: '1' } }),
+        primaryPooler({
+          id: { cell: 'eu-central-1b', name: 'pooler-9' },
+          shardKey: { database: 'postgres', shard: '0' },
+        }),
+      ],
+    })
+
+    expect(topology.shards).toHaveLength(2)
+    expect(topology.shards.map((shard) => shard.name)).toEqual(['Shard 1', 'Shard 2'])
+    expect(topology.shards[0].primary?.shardKey?.shard).toBe('0')
+    expect(topology.shards[1].primary?.shardKey?.shard).toBe('1')
+  })
+
+  it('groups poolers with omitted shard keys into a single shard', () => {
+    const topology = buildHaTopology({
+      gateways: [],
+      poolers: [primaryPooler({ shardKey: undefined }), replicaPooler({ shardKey: undefined })],
+    })
+
+    expect(topology.shards).toHaveLength(1)
+    expect(topology.shards[0].replicas).toHaveLength(1)
+  })
+
+  it('keeps extra primaries as replicas instead of dropping them (tie keeps sort order)', () => {
+    const first = primaryPooler()
+    const second = primaryPooler({ id: { cell: 'eu-central-1b', name: 'pooler-2' } })
+
+    const topology = buildHaTopology({ gateways: [], poolers: [second, first] })
+
+    expect(topology.shards[0].primary).toEqual(first)
+    expect(topology.shards[0].replicas).toEqual([second])
+  })
+
+  it('elects the primary claimant with the highest coordinator term during failover', () => {
+    // '9' vs '10' also guards against lexicographic string comparison.
+    const outgoing = primaryPooler({
+      routingState: { role: 'ROUTING_ROLE_PRIMARY', rule: { coordinatorTerm: '9' } },
+    })
+    const incoming = primaryPooler({
+      id: { cell: 'eu-central-1b', name: 'pooler-2' },
+      routingState: { role: 'ROUTING_ROLE_PRIMARY', rule: { coordinatorTerm: '10' } },
+    })
+
+    const topology = buildHaTopology({ gateways: [], poolers: [outgoing, incoming] })
+
+    expect(topology.shards[0].primary).toEqual(incoming)
+    expect(topology.shards[0].replicas).toEqual([outgoing])
+  })
+
+  it('breaks coordinator-term ties on leader subterm', () => {
+    const lower = primaryPooler({
+      routingState: {
+        role: 'ROUTING_ROLE_PRIMARY',
+        rule: { coordinatorTerm: '2', leaderSubterm: '1' },
+      },
+    })
+    const higher = primaryPooler({
+      id: { cell: 'eu-central-1b', name: 'pooler-2' },
+      routingState: {
+        role: 'ROUTING_ROLE_PRIMARY',
+        rule: { coordinatorTerm: '2', leaderSubterm: '2' },
+      },
+    })
+
+    const topology = buildHaTopology({ gateways: [], poolers: [lower, higher] })
+
+    expect(topology.shards[0].primary).toEqual(higher)
+  })
+
+  it('prefers a claimant with a routing rule over one without (omitted terms are zero)', () => {
+    const withoutRule = primaryPooler()
+    const withRule = primaryPooler({
+      id: { cell: 'eu-central-1b', name: 'pooler-2' },
+      routingState: { role: 'ROUTING_ROLE_PRIMARY', rule: { coordinatorTerm: '1' } },
+    })
+
+    const topology = buildHaTopology({ gateways: [], poolers: [withoutRule, withRule] })
+
+    expect(topology.shards[0].primary).toEqual(withRule)
+    expect(topology.shards[0].replicas).toEqual([withoutRule])
+  })
+
+  it('handles a shard with no primary', () => {
+    const topology = buildHaTopology({ gateways: [], poolers: [replicaPooler()] })
+
+    expect(topology.shards[0].primary).toBeUndefined()
+    expect(topology.shards[0].replicas).toHaveLength(1)
+  })
+
+  it('dedupes repeated records by id (the passthrough returns one copy per cell)', () => {
+    const gateway = { id: { cell: 'cell-1', name: 'gw-1' } }
+    const primary = primaryPooler({
+      id: { cell: 'cell-1', name: 'p-1' },
+      lifecycleStatus: { status: 'LIFECYCLE_ACTIVE' },
+    })
+    const replica = replicaPooler({ id: { cell: 'cell-2', name: 'p-2' } })
+
+    const topology = buildHaTopology({
+      gateways: [gateway, gateway, gateway],
+      poolers: [primary, replica, primary, replica, primary, replica],
+    })
+
+    expect(topology.gateways).toEqual([gateway])
+    expect(topology.shards).toHaveLength(1)
+    // Duplicate copies of the primary must not be demoted to replicas.
+    expect(topology.shards[0].primary).toEqual(primary)
+    expect(topology.shards[0].replicas).toEqual([replica])
+  })
+
+  it('never dedupes records with omitted identity', () => {
+    const identityless = (overrides: Partial<Multipooler> = {}): Multipooler => ({
+      shardKey: { database: 'postgres', shard: '0' },
+      routingState: { role: 'ROUTING_ROLE_REPLICA' },
+      ...overrides,
+    })
+
+    const topology = buildHaTopology({
+      gateways: [{}, {}],
+      poolers: [primaryPooler(), identityless(), identityless()],
+    })
+
+    expect(topology.gateways).toHaveLength(2)
+    expect(topology.shards[0].replicas).toHaveLength(2)
+  })
+
+  it('returns an empty topology for empty responses', () => {
+    const topology = buildHaTopology({ gateways: [], poolers: [] })
+
+    expect(topology.gateways).toEqual([])
+    expect(topology.shards).toEqual([])
+  })
+})
diff --git a/apps/studio/components/interfaces/Settings/Infrastructure/InfrastructureConfiguration/HaTopology.utils.ts b/apps/studio/components/interfaces/Settings/Infrastructure/InfrastructureConfiguration/HaTopology.utils.ts
new file mode 100644
index 00000000000..8c1867d6105
--- /dev/null
+++ b/apps/studio/components/interfaces/Settings/Infrastructure/InfrastructureConfiguration/HaTopology.utils.ts
@@ -0,0 +1,199 @@
+import { groupBy, partition, uniqBy } from 'lodash'
+
+import type { Multigateway } from '@/data/ha-admin/ha-cluster-gateways-query'
+import type { HaClusterPoolersData, Multipooler } from '@/data/ha-admin/ha-cluster-poolers-query'
+
+/**
+ * Pure helpers mapping the multiadmin cluster state (gateways + poolers) onto
+ * the shapes the High Availability infrastructure diagram renders. Every field
+ * on the multiadmin responses is optional because proto3 JSON omits zero
+ * values — an absent field means "the default", not "missing data".
+ */
+
+export type HaPoolerStatus = 'healthy' | 'coming_up' | 'going_down' | 'unhealthy'
+
+export interface HaShard {
+  id: string
+  name: string
+  primary?: Multipooler
+  replicas: Multipooler[]
+}
+
+export interface HaTopology {
+  gateways: Multigateway[]
+  shards: HaShard[]
+}
+
+export const getPoolerKey = (pooler: Pick<Multipooler, 'id'>) =>
+  `${pooler.id?.cell ?? 'unknown'}-${pooler.id?.name ?? 'unknown'}`
+
+export const hasPoolerIdentity = (pooler: Pick<Multipooler, 'id'>) =>
+  pooler.id?.cell !== undefined && pooler.id?.name !== undefined
+
+/**
+ * `routingState.role` is the authoritative writable signal; the deprecated
+ * `type` field is derived and only used as a fallback when the routing state is
+ * missing. The role is omitted entirely when it is ROUTING_ROLE_UNKNOWN
+ * (proto3 zero value).
+ */
+export const isPrimaryPooler = (pooler: Multipooler) => {
+  const role = pooler.routingState?.role
+  if (role !== undefined) return role === 'ROUTING_ROLE_PRIMARY'
+  return pooler.type === 'PRIMARY'
+}
+
+/**
+ * Health as reported by the pooler's topology record — not a live probe: a
+ * pooler that crashes without publishing STOPPING/SHUTDOWN can leave an
+ * ACTIVE/SERVING record behind until the topology evicts it, and "healthy"
+ * says nothing about replication progress. Live signals (WAL receiver state,
+ * replay position) exist on `GET /poolers/{cell}/{name}/status` but require a
+ * per-pooler fanout.
+ */
+export const getPoolerStatus = (pooler: Multipooler): HaPoolerStatus => {
+  // Lifecycle values may arrive with or without the proto enum prefix.
+  const lifecycle = (pooler.lifecycleStatus?.status ?? '').replace(/^LIFECYCLE_/, '')
+
+  // The proto's two terminal states: QUARANTINED (gave up recovering, kept alive
+  // for forensics) and SHUTDOWN (durably down). There is no separate FAILED state.
+  if (lifecycle === 'QUARANTINED' || lifecycle === 'SHUTDOWN') return 'unhealthy'
+  if (lifecycle === 'STARTING') return 'coming_up'
+  if (lifecycle === 'STOPPING') return 'going_down'
+
+  // Lifecycle is ACTIVE or unknown: fall back to the serving status. An absent
+  // servingStatus means SERVING (proto3 zero value), i.e. the node is taking
+  // traffic, so the default reads as healthy.
+  if (pooler.servingStatus === 'DRAINING') return 'going_down'
+  if (pooler.servingStatus === 'DISABLED') return 'unhealthy'
+  return 'healthy'
+}
+
+// Labels are drawn from the read replica status vocabulary (`getStatusLabel` in
+// ReadReplicas.utils.ts) so both surfaces read the same way, but they are only a
+// subset of it. The read replica labels also cover 'Failed', 'Restarting',
+// 'Resizing' and 'Restoring', which have no one-to-one lifecycle equivalents;
+// the closest to 'Failed' is QUARANTINED, surfaced as 'Unhealthy' alongside
+// SHUTDOWN.
+export const HA_POOLER_STATUS_LABELS: Record<HaPoolerStatus, string> = {
+  healthy: 'Healthy',
+  coming_up: 'Coming up',
+  going_down: 'Going down',
+  unhealthy: 'Unhealthy',
+}
+
+const AWS_AZ_REGEX = /\b[a-z]{2}(?:-[a-z]+)+-\d[a-z]\b/
+
+/**
+ * Cells map 1:1 to availability zones in the alpha, but the exact cell naming
+ * format is unconfirmed — extract an AZ-shaped substring when there is one and
+ * fall back to the raw cell name otherwise.
+ */
+export const formatCellAsAvailabilityZone = (cell: string | undefined) => {
+  if (!cell) return undefined
+  return AWS_AZ_REGEX.exec(cell)?.[0] ?? cell
+}
+
+// Routing-rule terms are proto int64s, serialized as strings in JSON and
+// omitted when zero. Failover counts stay far below Number's safe range.
+const parseTerm = (value: string | undefined) => {
+  const parsed = Number(value ?? 0)
+  return Number.isFinite(parsed) ? parsed : 0
+}
+
+// Orders two primary claimants by routing rule: (coordinator term, leader
+// subterm), greatest wins.
+const compareRoutingRules = (a: Multipooler, b: Multipooler) => {
+  const ruleA = a.routingState?.rule
+  const ruleB = b.routingState?.rule
+  return (
+    parseTerm(ruleA?.coordinatorTerm) - parseTerm(ruleB?.coordinatorTerm) ||
+    parseTerm(ruleA?.leaderSubterm) - parseTerm(ruleB?.leaderSubterm)
+  )
+}
+
+export const buildHaTopology = ({
+  gateways,
+  poolers,
+}: {
+  gateways: Multigateway[]
+  poolers: Multipooler[]
+}): HaTopology => {
+  // The /ha-admin passthrough can return the same record multiple times (one
+  // copy per cell it fans out to), so both lists must be deduped by id —
+  // duplicate poolers would otherwise produce duplicate React Flow node ids,
+  // and extra copies of the primary would render as replicas. Records without
+  // a complete identity can't be told apart, so they are never deduped (keying
+  // by the record itself keeps each one unique).
+  const uniqueGateways = uniqBy(gateways, (gateway) =>
+    hasPoolerIdentity(gateway) ? getPoolerKey(gateway) : gateway
+  )
+  const uniquePoolers = uniqBy(poolers, (pooler) =>
+    hasPoolerIdentity(pooler) ? getPoolerKey(pooler) : pooler
+  )
+
+  const sortedPoolers = [...uniquePoolers].sort((a, b) =>
+    getPoolerKey(a).localeCompare(getPoolerKey(b))
+  )
+  const poolersByShard = groupBy(
+    sortedPoolers,
+    (pooler) =>
+      `${pooler.shardKey?.database ?? ''}/${pooler.shardKey?.tableGroup ?? ''}/${pooler.shardKey?.shard ?? ''}`
+  )
+
+  const shards = Object.entries(poolersByShard)
+    .sort(([a], [b]) => a.localeCompare(b))
+    .map(([id, shardPoolers], index) => {
+      const [primaries, replicas] = partition(shardPoolers, isPrimaryPooler)
+      // During a failover the outgoing and incoming primary can briefly both
+      // claim ROUTING_ROLE_PRIMARY — the highest routing rule wins, matching
+      // the multigateway's election. Losing claimants render as replicas
+      // rather than being dropped; ties keep the first in sorted order so the
+      // result stays deterministic.
+      const primary = primaries.reduce<Multipooler | undefined>(
+        (best, candidate) =>
+          best === undefined || compareRoutingRules(candidate, best) > 0 ? candidate : best,
+        undefined
+      )
+      return {
+        id,
+        name: `Shard ${index + 1}`,
+        primary,
+        replicas: [...primaries.filter((pooler) => pooler !== primary), ...replicas],
+      }
+    })
+
+  return { gateways: uniqueGateways, shards }
+}
+
+/**
+ * Query `select` projecting poolers down to the fields the topology depends on
+ * (identity, shard, routing role) — live status is self-fetched by the
+ * individual nodes and edges. React Query's structural sharing then keeps the
+ * result referentially stable across polls, so refetches only re-run
+ * layout/fitView when the topology actually changes (volatile fields like
+ * lifecycle timestamps would otherwise churn the data identity on every poll).
+ */
+const projectRoutingRule = (rule: NonNullable<Multipooler['routingState']>['rule']) =>
+  rule === undefined
+    ? undefined
+    : { coordinatorTerm: rule.coordinatorTerm, leaderSubterm: rule.leaderSubterm }
+
+const projectRoutingState = (routingState: Multipooler['routingState']) =>
+  routingState === undefined
+    ? undefined
+    : { role: routingState.role, rule: projectRoutingRule(routingState.rule) }
+
+export const selectTopologyPoolers = (data: HaClusterPoolersData): Multipooler[] =>
+  (data.poolers ?? []).map((pooler) => ({
+    id: pooler.id === undefined ? undefined : { cell: pooler.id.cell, name: pooler.id.name },
+    shardKey:
+      pooler.shardKey === undefined
+        ? undefined
+        : {
+            database: pooler.shardKey.database,
+            tableGroup: pooler.shardKey.tableGroup,
+            shard: pooler.shardKey.shard,
+          },
+    routingState: projectRoutingState(pooler.routingState),
+    type: pooler.type,
+  }))
diff --git a/apps/studio/components/interfaces/Settings/Infrastructure/InfrastructureConfiguration/InstanceConfiguration.constants.ts b/apps/studio/components/interfaces/Settings/Infrastructure/InfrastructureConfiguration/InstanceConfiguration.constants.ts
index 2d49e4739cc..7f8f2b2b6db 100644
--- a/apps/studio/components/interfaces/Settings/Infrastructure/InfrastructureConfiguration/InstanceConfiguration.constants.ts
+++ b/apps/studio/components/interfaces/Settings/Infrastructure/InfrastructureConfiguration/InstanceConfiguration.constants.ts
@@ -44,9 +44,22 @@ export type EdgeData = {
 export const NODE_WIDTH = 660
 export const NODE_SEP = 20
 
+// Rendered width of the node cards; dagre lays out with NODE_WIDTH / 2 so
+// cards get a little breathing room between columns.
+export const NODE_CARD_WIDTH = NODE_WIDTH / 2 - 10
+
 // The region wrapper is a static, non-measured sibling node with a fixed size.
 export const REGION_NODE_HEIGHT = 162
 
+// The shard wrapper is a static, non-measured background node sized around its
+// children, with room reserved above them for the group header pill.
+export const SHARD_NODE_PADDING = 16
+export const SHARD_HEADER_HEIGHT = 42
+
+// dagre rank separation for the High Availability layout — leaves room for the
+// shard group header between the gateway row and the primary row.
+export const HA_RANKSEP = 96
+
 // First-paint fallback heights for the dagre layout, only used before React
 // Flow has measured the real nodes. Subsequent layouts use node.measured.height.
 export const NODE_HEIGHT_FALLBACKS: Record<string, number> = {
@@ -54,6 +67,9 @@ export const NODE_HEIGHT_FALLBACKS: Record<string, number> = {
   PRIMARY: 140,
   READ_REPLICA: 140,
   REGION: REGION_NODE_HEIGHT,
+  HA_GATEWAY: 64,
+  HA_PRIMARY: 150,
+  HA_REPLICA: 90,
 }
 
 // [Joshen] Coordinates from https://github.com/tobilg/aws-edge-locations/blob/main/data/aws-edge-locations.json
diff --git a/apps/studio/components/interfaces/Settings/Infrastructure/InfrastructureConfiguration/InstanceConfiguration.tsx b/apps/studio/components/interfaces/Settings/Infrastructure/InfrastructureConfiguration/InstanceConfiguration.tsx
index c49a7416010..7b4b4732259 100644
--- a/apps/studio/components/interfaces/Settings/Infrastructure/InfrastructureConfiguration/InstanceConfiguration.tsx
+++ b/apps/studio/components/interfaces/Settings/Infrastructure/InfrastructureConfiguration/InstanceConfiguration.tsx
@@ -1,24 +1,14 @@
-import {
-  Background,
-  ColorMode,
-  Edge,
-  ReactFlow,
-  ReactFlowProvider,
-  useNodesInitialized,
-  useReactFlow,
-} from '@xyflow/react'
+import { Edge, ReactFlowProvider } from '@xyflow/react'
+import { useParams } from 'common'
 import { partition } from 'lodash'
 import { Globe2, Loader2, Network } from 'lucide-react'
-import { useTheme } from 'next-themes'
-import { useEffect, useEffectEvent, useMemo, useState } from 'react'
-
-import '@xyflow/react/dist/style.css'
-
-import { useParams } from 'common'
-import { Button, cn } from 'ui'
+import { useEffect, useMemo, useState } from 'react'
+import { Button } from 'ui'
 
+import { DiagramFlow } from './DiagramFlow'
 import { SmoothstepEdge } from './Edge'
-import { addRegionNodes, generateNodes, getDagreGraphLayout } from './InstanceConfiguration.utils'
+import { HaInstanceConfiguration } from './HaInstanceConfiguration'
+import { addRegionNodes, generateNodes } from './InstanceConfiguration.utils'
 import { LoadBalancerNode, PrimaryNode, RegionNode, ReplicaNode } from './InstanceNode'
 import MapView from './MapView'
 import { REPLICA_STATUS } from '@/components/interfaces/Settings/Infrastructure/ReadReplicas/ReadReplicas.constants'
@@ -29,13 +19,22 @@ import {
   ReplicaInitializationStatus,
   useReadReplicasStatusesQuery,
 } from '@/data/read-replicas/replicas-status-query'
+import { useHighAvailability } from '@/hooks/misc/useHighAvailability'
 import { useIsFeatureEnabled } from '@/hooks/misc/useIsFeatureEnabled'
 import { useIsAwsCloudProvider, useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'
-import { timeout } from '@/lib/helpers'
+
+const nodeTypes = {
+  PRIMARY: PrimaryNode,
+  READ_REPLICA: ReplicaNode,
+  REGION: RegionNode,
+  LOAD_BALANCER: LoadBalancerNode,
+}
+
+const edgeTypes = {
+  smoothstep: SmoothstepEdge,
+}
 
 const InstanceConfigurationUI = () => {
-  const reactFlow = useReactFlow()
-  const { resolvedTheme } = useTheme()
   const { ref: projectRef } = useParams()
   const { isPending: isLoadingProject } = useSelectedProjectQuery()
 
@@ -109,9 +108,6 @@ const InstanceConfigurationUI = () => {
     replicasStatuses,
   ])
 
-  const backgroundPatternColor =
-    resolvedTheme === 'dark' ? 'rgba(255, 255, 255, 0.3)' : 'rgba(0, 0, 0, 0.4)'
-
   const nodes = useMemo(
     () =>
       isSuccessReplicas && isSuccessLoadBalancers && primary !== undefined
@@ -135,7 +131,8 @@ const InstanceConfigurationUI = () => {
                     source: 'load-balancer',
                     target: primary.identifier,
                     type: 'smoothstep',
-                    animated: true,
+                    // Static: no data flows between the load balancer and the
+                    // database — the line only indicates a relation.
                     className: 'cursor-default!',
                   },
                 ]
@@ -160,76 +157,21 @@ const InstanceConfigurationUI = () => {
     [isSuccessLoadBalancers, isSuccessReplicas, loadBalancers, primary?.identifier, replicas]
   )
 
-  const nodeTypes = useMemo(
-    () => ({
-      PRIMARY: PrimaryNode,
-      READ_REPLICA: ReplicaNode,
-      REGION: RegionNode,
-      LOAD_BALANCER: LoadBalancerNode,
-    }),
-    []
-  )
-
-  const edgeTypes = useMemo(
-    () => ({
-      smoothstep: SmoothstepEdge,
-    }),
-    []
-  )
-
-  const nodesInitialized = useNodesInitialized()
-  const [hasMeasuredLayout, setHasMeasuredLayout] = useState(false)
-
-  const setReactFlow = async ({ measured }: { measured: boolean }) => {
-    // Merge in React Flow's measured dimensions (if any) so dagre can use real
-    // heights instead of the first-paint fallbacks.
-    const measuredNodes = nodes.map((node) => {
-      const existing = reactFlow.getNode(node.id)
-      return existing?.measured ? { ...node, measured: existing.measured } : node
-    })
-    const graph = getDagreGraphLayout(measuredNodes, edges)
-    const { nodes: updatedNodes } = addRegionNodes(graph.nodes, graph.edges)
-    reactFlow.setNodes(updatedNodes)
-    reactFlow.setEdges(graph.edges)
-
-    // [Joshen] Odd fix to ensure that react flow snaps back to center when adding nodes
-    await timeout(1)
-    reactFlow.fitView({ maxZoom: 0.9, minZoom: 0.9 })
-    if (measured) setHasMeasuredLayout(true)
-  }
-
-  // First pass: lay out using fallback heights for any not-yet-measured nodes.
-  // The diagram is kept invisible until the measured pass below has run, so the
-  // user never sees the fallback positions.
-  // [Joshen] Just FYI this block is oddly triggering whenever we refocus on the viewport
-  // even if I change the dependency array to just data. Not blocker, just an area to optimize
-  useEffect(() => {
-    if (isSuccessReplicas && isSuccessLoadBalancers && nodes.length > 0 && view === 'flow') {
-      setReactFlow({ measured: false })
-    }
-  }, [isSuccessReplicas, isSuccessLoadBalancers, nodes, edges, view])
-
-  // Second pass: once React Flow has measured the nodes, re-run the layout so
-  // dagre uses real heights. Only `nodesInitialized` going true should trigger
-  // this — the first-pass effect above handles node/view changes.
-  const runMeasuredLayout = useEffectEvent(() => {
-    if (nodesInitialized && nodes.length > 0 && view === 'flow') {
-      setReactFlow({ measured: true })
-    }
-  })
-  useEffect(() => {
-    runMeasuredLayout()
-  }, [nodesInitialized])
-
   return (
-    <div className={cn('nowheel h-full')}>
+    <div className="nowheel h-full">
       <div
         className={`h-full w-full relative ${
           isSuccessReplicas && !isLoadingProject ? '' : 'flex items-center justify-center px-28'
         }`}
       >
         {(isLoading || isLoadingProject) && (
-          <Loader2 className="animate-spin text-foreground-light" />
+          <div role="status">
+            <span className="sr-only">Loading infrastructure...</span>
+            <Loader2
+              aria-hidden="true"
+              className="motion-safe:animate-spin text-foreground-light"
+            />
+          </div>
         )}
         {isError && <AlertError error={error} subject="Failed to retrieve replicas" />}
         {isSuccessReplicas && !isLoadingProject && (
@@ -259,32 +201,13 @@ const InstanceConfigurationUI = () => {
               </div>
             )}
             {view === 'flow' ? (
-              <ReactFlow
-                // FIXME: https://github.com/xyflow/xyflow/issues/4876
-                colorMode={'' as unknown as ColorMode}
-                fitView
-                fitViewOptions={{ minZoom: 0.9, maxZoom: 0.9 }}
-                // Keep the diagram invisible (but laid out, so nodes can be
-                // measured) until the measured-height layout pass has run.
-                className={cn(
-                  'instance-configuration transition-opacity duration-150',
-                  hasMeasuredLayout ? 'opacity-100' : 'opacity-0'
-                )}
-                zoomOnPinch={false}
-                zoomOnScroll={false}
-                nodesDraggable={false}
-                nodesConnectable={false}
-                zoomOnDoubleClick={false}
-                edgesFocusable={false}
-                edgesReconnectable={false}
-                defaultNodes={[]}
-                defaultEdges={[]}
+              <DiagramFlow
+                nodes={nodes}
+                edges={edges}
                 nodeTypes={nodeTypes}
                 edgeTypes={edgeTypes}
-                proOptions={{ hideAttribution: true }}
-              >
-                <Background color={backgroundPatternColor} />
-              </ReactFlow>
+                addGroupNodes={addRegionNodes}
+              />
             ) : (
               <MapView />
             )}
@@ -296,9 +219,22 @@ const InstanceConfigurationUI = () => {
 }
 
 export const InstanceConfiguration = () => {
+  const { isHighAvailability, isPending } = useHighAvailability()
+
+  // Wait for the project record so an HA project never briefly mounts the
+  // standard diagram (and fires its queries) before swapping.
+  if (isPending) {
+    return (
+      <div role="status" className="h-full w-full flex items-center justify-center">
+        <span className="sr-only">Loading infrastructure...</span>
+        <Loader2 aria-hidden="true" className="motion-safe:animate-spin text-foreground-light" />
+      </div>
+    )
+  }
+
   return (
     <ReactFlowProvider>
-      <InstanceConfigurationUI />
+      {isHighAvailability ? <HaInstanceConfiguration /> : <InstanceConfigurationUI />}
     </ReactFlowProvider>
   )
 }
diff --git a/apps/studio/components/interfaces/Settings/Infrastructure/InfrastructureConfiguration/InstanceConfiguration.utils.test.ts b/apps/studio/components/interfaces/Settings/Infrastructure/InfrastructureConfiguration/InstanceConfiguration.utils.test.ts
new file mode 100644
index 00000000000..8a9f75fa4d3
--- /dev/null
+++ b/apps/studio/components/interfaces/Settings/Infrastructure/InfrastructureConfiguration/InstanceConfiguration.utils.test.ts
@@ -0,0 +1,28 @@
+import { Edge, Node } from '@xyflow/react'
+import { describe, expect, it } from 'vitest'
+
+import { NODE_HEIGHT_FALLBACKS } from './InstanceConfiguration.constants'
+import { getDagreGraphLayout } from './InstanceConfiguration.utils'
+
+const makeNodes = (): Node[] => [
+  { id: 'primary', position: { x: 0, y: 0 }, data: {}, type: 'PRIMARY' },
+  { id: 'replica', position: { x: 0, y: 0 }, data: {}, type: 'READ_REPLICA' },
+]
+
+const edges: Edge[] = [{ id: 'primary-replica', source: 'primary', target: 'replica' }]
+
+// Vertical gap between a node's bottom edge and the next rank's top edge.
+const getRankGap = (nodes: Node[]) =>
+  nodes[1].position.y - (nodes[0].position.y + NODE_HEIGHT_FALLBACKS.PRIMARY)
+
+describe('getDagreGraphLayout', () => {
+  it('separates ranks by the default ranksep', () => {
+    const { nodes } = getDagreGraphLayout(makeNodes(), edges)
+    expect(getRankGap(nodes)).toBe(60)
+  })
+
+  it('separates ranks by a custom ranksep', () => {
+    const { nodes } = getDagreGraphLayout(makeNodes(), edges, { ranksep: 96 })
+    expect(getRankGap(nodes)).toBe(96)
+  })
+})
diff --git a/apps/studio/components/interfaces/Settings/Infrastructure/InfrastructureConfiguration/InstanceConfiguration.utils.ts b/apps/studio/components/interfaces/Settings/Infrastructure/InfrastructureConfiguration/InstanceConfiguration.utils.ts
index 81e89e5ae2b..c4a2489f3db 100644
--- a/apps/studio/components/interfaces/Settings/Infrastructure/InfrastructureConfiguration/InstanceConfiguration.utils.ts
+++ b/apps/studio/components/interfaces/Settings/Infrastructure/InfrastructureConfiguration/InstanceConfiguration.utils.ts
@@ -114,15 +114,19 @@ export const generateNodes = ({
   ]
 }
 
-const getDagreNodeHeight = (node: Node) => {
+export const getDagreNodeHeight = (node: Node) => {
   if (node.measured?.height) return node.measured.height
   return NODE_HEIGHT_FALLBACKS[node.type ?? ''] ?? 100
 }
 
-export const getDagreGraphLayout = (nodes: Node[], edges: Edge[]) => {
+export const getDagreGraphLayout = (
+  nodes: Node[],
+  edges: Edge[],
+  { ranksep = 60 }: { ranksep?: number } = {}
+) => {
   const dagreGraph = new dagre.graphlib.Graph()
   dagreGraph.setDefaultEdgeLabel(() => ({}))
-  dagreGraph.setGraph({ rankdir: 'TB', ranksep: 60, nodesep: NODE_SEP })
+  dagreGraph.setGraph({ rankdir: 'TB', ranksep, nodesep: NODE_SEP })
 
   nodes.forEach((node) => {
     dagreGraph.setNode(node.id, {
diff --git a/apps/studio/components/interfaces/Settings/Infrastructure/InfrastructureConfiguration/InstanceNode.tsx b/apps/studio/components/interfaces/Settings/Infrastructure/InfrastructureConfiguration/InstanceNode.tsx
index 9689483c179..c0c634b2a7a 100644
--- a/apps/studio/components/interfaces/Settings/Infrastructure/InfrastructureConfiguration/InstanceNode.tsx
+++ b/apps/studio/components/interfaces/Settings/Infrastructure/InfrastructureConfiguration/InstanceNode.tsx
@@ -21,6 +21,7 @@ import {
 } from 'ui'
 import { TimestampInfo } from 'ui-patterns/TimestampInfo'
 
+import { ComputeMetricsFooter } from './ComputeMetricsFooter'
 import {
   ERROR_STATES,
   INIT_PROGRESS,
@@ -32,7 +33,6 @@ import {
   ReplicaNodeData,
 } from './InstanceConfiguration.constants'
 import { formatSeconds } from './InstanceConfiguration.utils'
-import { metricColor } from './InstanceNode.utils'
 import { getReadReplicaPath } from '@/components/interfaces/Settings/Infrastructure/Infrastructure.utils'
 import { REPLICA_STATUS } from '@/components/interfaces/Settings/Infrastructure/ReadReplicas/ReadReplicas.constants'
 import { RegionFlag } from '@/components/ui/RegionFlag'
@@ -43,7 +43,6 @@ import {
   useReadReplicasStatusesQuery,
 } from '@/data/read-replicas/replicas-status-query'
 import { formatDatabaseID } from '@/data/read-replicas/replicas.utils'
-import { useComputeMetrics } from '@/hooks/analytics/useComputeMetrics'
 import { useIsFeatureEnabled } from '@/hooks/misc/useIsFeatureEnabled'
 import { useDatabaseSelectorStateSnapshot } from '@/state/database-selector'
 
@@ -92,25 +91,11 @@ export const LoadBalancerNode = ({ data }: NodeProps<Node<LoadBalancerData>>) =>
 export const PrimaryNode = ({ data }: NodeProps<Node<PrimaryNodeData>>) => {
   // [Joshen] Just FYI Handles cannot be conditionally rendered
   const { region, computeSize, numReplicas, numRegions, hasLoadBalancer } = data
-  const { ref } = useParams()
 
   const { projectHomepageShowInstanceSize } = useIsFeatureEnabled([
     'project_homepage:show_instance_size',
   ])
 
-  const {
-    cpu,
-    disk,
-    memory,
-    connections,
-    isLoading: metricsLoading,
-    isError: metricsError,
-  } = useComputeMetrics({
-    projectRef: ref,
-  })
-
-  const observabilityUrl = `/project/${ref}/observability/database`
-
   return (
     <>
       <Handle
@@ -171,43 +156,7 @@ export const PrimaryNode = ({ data }: NodeProps<Node<PrimaryNodeData>>) => {
             </p>
           </div>
         )}
-        <Tooltip>
-          <TooltipTrigger asChild>
-            <Link
-              href={observabilityUrl}
-              className="border-t px-3 py-2 hover:bg-surface-200 transition flex items-center gap-x-3 text-xs"
-            >
-              {metricsLoading ? (
-                <div className="h-3 w-44 rounded-sm bg-surface-300 animate-pulse" />
-              ) : metricsError ? (
-                <span className="text-foreground-lighter">Metrics unavailable</span>
-              ) : (
-                <>
-                  <span>
-                    CPU <span className={metricColor(cpu)}>{cpu.toFixed(0)}%</span>
-                  </span>
-                  <span className="text-foreground-lighter">·</span>
-                  <span>
-                    Disk <span className={metricColor(disk)}>{disk.toFixed(0)}%</span>
-                  </span>
-                  <span className="text-foreground-lighter">·</span>
-                  <span>
-                    RAM <span className={metricColor(memory)}>{memory.toFixed(0)}%</span>
-                  </span>
-                  {connections.max > 0 && (
-                    <>
-                      <span className="text-foreground-lighter">·</span>
-                      <span className="text-foreground-light">
-                        {connections.peak}/{connections.max} conns
-                      </span>
-                    </>
-                  )}
-                </>
-              )}
-            </Link>
-          </TooltipTrigger>
-          <TooltipContent side="bottom">Go to Database Report</TooltipContent>
-        </Tooltip>
+        <ComputeMetricsFooter />
       </div>
       <Handle
         type="source"
@@ -413,7 +362,7 @@ export const ReplicaNode = ({ data }: NodeProps<Node<ReplicaNodeData>>) => {
               View connection string
             </DropdownMenuItem>
             <DropdownMenuSeparator />
-            <DropdownMenuItem className="gap-x-2">
+            <DropdownMenuItem className="gap-x-2" asChild>
               <Link href={getReadReplicaPath(ref, id)}>Manage replica</Link>
             </DropdownMenuItem>
           </DropdownMenuContent>
diff --git a/apps/studio/components/interfaces/Settings/Infrastructure/InfrastructureConfiguration/MapView.tsx b/apps/studio/components/interfaces/Settings/Infrastructure/InfrastructureConfiguration/MapView.tsx
index c6ea8d016cc..1a917efb210 100644
--- a/apps/studio/components/interfaces/Settings/Infrastructure/InfrastructureConfiguration/MapView.tsx
+++ b/apps/studio/components/interfaces/Settings/Infrastructure/InfrastructureConfiguration/MapView.tsx
@@ -295,7 +295,7 @@ const MapView = () => {
 
                             <DropdownMenuSeparator />
 
-                            <DropdownMenuItem className="gap-x-2">
+                            <DropdownMenuItem className="gap-x-2" asChild>
                               <Link href={getReadReplicaPath(ref, database.identifier)}>
                                 Manage replica
                               </Link>
diff --git a/apps/studio/components/interfaces/Settings/Infrastructure/InfrastructureConfiguration/useHaPooler.ts b/apps/studio/components/interfaces/Settings/Infrastructure/InfrastructureConfiguration/useHaPooler.ts
new file mode 100644
index 00000000000..af64b7301b8
--- /dev/null
+++ b/apps/studio/components/interfaces/Settings/Infrastructure/InfrastructureConfiguration/useHaPooler.ts
@@ -0,0 +1,45 @@
+import { useQuery } from '@tanstack/react-query'
+import { useParams } from 'common'
+
+import { formatCellAsAvailabilityZone, getPoolerStatus } from './HaTopology.utils'
+import { AVAILABLE_REPLICA_REGIONS } from './InstanceConfiguration.constants'
+import { haClusterPoolersQueryOptions } from '@/data/ha-admin/ha-cluster-poolers-query'
+import { usePrimaryDatabase } from '@/data/read-replicas/replicas-query'
+import { useIsFeatureEnabled } from '@/hooks/misc/useIsFeatureEnabled'
+
+/**
+ * Subscribes to a single pooler's live state from the shared poolers query, so
+ * each node/edge updates on its own without re-laying-out the whole diagram.
+ */
+export const useHaPooler = ({ cell, name }: { cell?: string; name?: string }) => {
+  const { ref: projectRef } = useParams()
+
+  return useQuery({
+    ...haClusterPoolersQueryOptions({ projectRef }),
+    select: (data) =>
+      (data.poolers ?? []).find((pooler) => pooler.id?.cell === cell && pooler.id?.name === name),
+  })
+}
+
+/**
+ * Everything a pooler node card displays. Region and compute size aren't in
+ * multiadmin — they come from the primary database row. HA locks compute to
+ * one project-level size, so the primary's size is correct for every node in
+ * the cluster.
+ */
+export const useHaPoolerCard = ({ cell, name }: { cell?: string; name?: string }) => {
+  const { ref: projectRef } = useParams()
+  const { projectHomepageShowInstanceSize } = useIsFeatureEnabled([
+    'project_homepage:show_instance_size',
+  ])
+
+  const { database: primary } = usePrimaryDatabase({ projectRef })
+  const { data: pooler } = useHaPooler({ cell, name })
+
+  return {
+    status: pooler !== undefined ? getPoolerStatus(pooler) : undefined,
+    availabilityZone: formatCellAsAvailabilityZone(cell),
+    computeSize: projectHomepageShowInstanceSize ? primary?.size : undefined,
+    primaryRegion: AVAILABLE_REPLICA_REGIONS.find((r) => primary?.region.includes(r.region)),
+  }
+}
diff --git a/apps/studio/components/interfaces/Settings/Infrastructure/ReadReplicas/AddReadReplicaDialog.tsx b/apps/studio/components/interfaces/Settings/Infrastructure/ReadReplicas/AddReadReplicaDialog.tsx
new file mode 100644
index 00000000000..3dc976d5c56
--- /dev/null
+++ b/apps/studio/components/interfaces/Settings/Infrastructure/ReadReplicas/AddReadReplicaDialog.tsx
@@ -0,0 +1,62 @@
+import { useRef } from 'react'
+import { Dialog, DialogContent, DialogHeader, DialogSectionSeparator, DialogTitle } from 'ui'
+
+import { ReadReplicaForm } from './ReadReplicaForm'
+import type { RecommendedComputeForReadReplicas } from './recommendCompute'
+
+interface AddReadReplicaDialogProps {
+  open: boolean
+  onOpenChange: (open: boolean) => void
+  onSuccess?: () => void
+  onRecommendCompute: (size: RecommendedComputeForReadReplicas) => void
+}
+
+export const AddReadReplicaDialog = ({
+  open,
+  onOpenChange,
+  onSuccess,
+  onRecommendCompute,
+}: AddReadReplicaDialogProps) => {
+  const pendingRecommendationRef = useRef<RecommendedComputeForReadReplicas | null>(null)
+
+  const onClose = () => {
+    onOpenChange(false)
+  }
+
+  const closeWithRecommendation = (size: RecommendedComputeForReadReplicas) => {
+    pendingRecommendationRef.current = size
+    onClose()
+  }
+
+  return (
+    <Dialog open={open} onOpenChange={onOpenChange}>
+      <DialogContent
+        size="small"
+        aria-describedby={undefined}
+        onCloseAutoFocus={(event) => {
+          const recommendation = pendingRecommendationRef.current
+          if (!recommendation) return
+
+          // The recommendation replaces the trigger as the close destination.
+          // Radix calls this after the close animation has completed.
+          event.preventDefault()
+          pendingRecommendationRef.current = null
+          onRecommendCompute(recommendation)
+        }}
+      >
+        <div className="flex min-h-0 flex-col" tabIndex={-1}>
+          <DialogHeader>
+            <DialogTitle>Add read replica</DialogTitle>
+          </DialogHeader>
+          <DialogSectionSeparator />
+
+          <ReadReplicaForm
+            onClose={onClose}
+            onSuccess={() => onSuccess?.()}
+            onRecommendCompute={closeWithRecommendation}
+          />
+        </div>
+      </DialogContent>
+    </Dialog>
+  )
+}
diff --git a/apps/studio/components/interfaces/Settings/Infrastructure/ReadReplicas/AddReadReplicaSheet.tsx b/apps/studio/components/interfaces/Settings/Infrastructure/ReadReplicas/AddReadReplicaSheet.tsx
deleted file mode 100644
index 2fbf15f6c4e..00000000000
--- a/apps/studio/components/interfaces/Settings/Infrastructure/ReadReplicas/AddReadReplicaSheet.tsx
+++ /dev/null
@@ -1,93 +0,0 @@
-import { parseAsBoolean, useQueryState } from 'nuqs'
-import { useRef } from 'react'
-import { Sheet, SheetContent, SheetDescription, SheetHeader, SheetTitle } from 'ui'
-
-import { ReadReplicaForm } from './ReadReplicaForm'
-import type { RecommendedComputeForReadReplicas } from './recommendCompute'
-import { DiscardChangesConfirmationDialog } from '@/components/ui-patterns/Dialogs/DiscardChangesConfirmationDialog'
-import { DocsButton } from '@/components/ui/DocsButton'
-import { useConfirmOnClose } from '@/hooks/ui/useConfirmOnClose'
-import { DOCS_URL } from '@/lib/constants'
-
-interface AddReadReplicaSheetProps {
-  onSuccess?: () => void
-  onRecommendCompute: (size: RecommendedComputeForReadReplicas) => void
-}
-
-export const AddReadReplicaSheet = ({
-  onSuccess,
-  onRecommendCompute,
-}: AddReadReplicaSheetProps) => {
-  const [visible, setVisible] = useQueryState(
-    'addReplica',
-    parseAsBoolean.withDefault(false).withOptions({
-      history: 'push',
-      clearOnDefault: true,
-      scroll: false,
-    })
-  )
-
-  const checkIsDirtyRef = useRef<() => boolean>(() => false)
-  const pendingRecommendationRef = useRef<RecommendedComputeForReadReplicas | null>(null)
-
-  const onClose = () => {
-    checkIsDirtyRef.current = () => false
-    setVisible(false)
-  }
-
-  const { confirmOnClose, handleOpenChange, modalProps } = useConfirmOnClose({
-    checkIsDirty: () => checkIsDirtyRef.current(),
-    onClose,
-  })
-
-  const closeWithRecommendation = (size: RecommendedComputeForReadReplicas) => {
-    pendingRecommendationRef.current = size
-    onClose()
-  }
-
-  return (
-    <>
-      <Sheet open={visible} onOpenChange={handleOpenChange}>
-        <SheetContent
-          size="lg"
-          showClose={false}
-          className="max-w-3xl"
-          onCloseAutoFocus={(event) => {
-            const recommendation = pendingRecommendationRef.current
-            if (!recommendation) return
-
-            // The recommendation replaces the trigger as the close destination.
-            // Radix calls this after the close animation has completed.
-            event.preventDefault()
-            pendingRecommendationRef.current = null
-            onRecommendCompute(recommendation)
-          }}
-        >
-          <div className="flex flex-col h-full min-h-0" tabIndex={-1}>
-            <SheetHeader className="flex items-center justify-between">
-              <div>
-                <SheetTitle>Add read replica</SheetTitle>
-                <SheetDescription>
-                  Deploy a read-only copy of the complete Postgres database.
-                </SheetDescription>
-              </div>
-              <DocsButton
-                href={`${DOCS_URL}/guides/platform/read-replicas`}
-                topic="read replica settings"
-              />
-            </SheetHeader>
-
-            <ReadReplicaForm
-              checkIsDirtyRef={checkIsDirtyRef}
-              onClose={onClose}
-              onCancel={confirmOnClose}
-              onSuccess={() => onSuccess?.()}
-              onRecommendCompute={closeWithRecommendation}
-            />
-          </div>
-        </SheetContent>
-      </Sheet>
-      <DiscardChangesConfirmationDialog {...modalProps} />
-    </>
-  )
-}
diff --git a/apps/studio/components/interfaces/Settings/Infrastructure/ReadReplicas/ReadReplicaForm/ReadReplicaEligibilityWarnings.tsx b/apps/studio/components/interfaces/Settings/Infrastructure/ReadReplicas/ReadReplicaForm/ReadReplicaEligibilityWarnings.tsx
index 043e37e1a8f..970c1dcd999 100644
--- a/apps/studio/components/interfaces/Settings/Infrastructure/ReadReplicas/ReadReplicaForm/ReadReplicaEligibilityWarnings.tsx
+++ b/apps/studio/components/interfaces/Settings/Infrastructure/ReadReplicas/ReadReplicaForm/ReadReplicaEligibilityWarnings.tsx
@@ -13,6 +13,7 @@ import {
 import { useCheckEligibilityDeployReplica } from './useCheckEligibilityDeployReplica'
 import { SupportLink } from '@/components/interfaces/Support/SupportLink'
 import { DocsButton } from '@/components/ui/DocsButton'
+import { InlineLink } from '@/components/ui/InlineLink'
 import { UpgradePlanButton } from '@/components/ui/UpgradePlanButton'
 import { useEnablePhysicalBackupsMutation } from '@/data/database/enable-physical-backups-mutation'
 import { useProjectDetailQuery } from '@/data/projects/project-detail-query'
@@ -22,10 +23,12 @@ import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'
 import { DOCS_URL } from '@/lib/constants'
 
 interface ReadReplicaEligibilityWarningsProps {
+  eligibility: ReturnType<typeof useCheckEligibilityDeployReplica>
   onRecommendCompute: (size: RecommendedComputeForReadReplicas) => void
 }
 
 export const ReadReplicaEligibilityWarnings = ({
+  eligibility,
   onRecommendCompute,
 }: ReadReplicaEligibilityWarningsProps) => {
   const { ref: projectRef } = useParams()
@@ -44,9 +47,10 @@ export const ReadReplicaEligibilityWarnings = ({
     isBelowSmallCompute,
     isWalgNotEnabled,
     isProWithSpendCapEnabled,
+    isHighAvailability,
     isReachedMaxReplicas,
     maxNumberOfReplicas,
-  } = useCheckEligibilityDeployReplica()
+  } = eligibility
 
   const { data: projectDetail, isSuccess: isProjectDetailSuccess } = useProjectDetailQuery(
     { ref: projectRef },
@@ -85,6 +89,20 @@ export const ReadReplicaEligibilityWarnings = ({
     )
   }
 
+  if (isHighAvailability) {
+    return (
+      <Admonition
+        type="warning"
+        title="Read replicas are unavailable for High Availability projects"
+      >
+        <p>
+          We're working to bring this feature to High Availability projects. Contact support if this
+          is blocking your work.
+        </p>
+      </Admonition>
+    )
+  }
+
   if (!isAWSProvider) {
     return (
       <Admonition
@@ -139,29 +157,36 @@ export const ReadReplicaEligibilityWarnings = ({
 
   if (isBelowSmallCompute) {
     return (
-      <Admonition type="warning" title="Project required to at least be on a Small compute">
-        <p>
-          This is to ensure that read replicas can keep up with the primary database’s activities.
-        </p>
-        <div className="flex items-center gap-x-2 mt-2">
-          {isFreePlan ? (
-            <UpgradePlanButton
-              variant="default"
-              plan="Pro"
-              addon="computeSize"
-              source="read-replicas"
-              featureProposition="deploy Read Replicas"
-            />
-          ) : (
-            <Button
-              variant="default"
-              onClick={() => onRecommendCompute(RECOMMENDED_COMPUTE_FOR_READ_REPLICAS.minimum)}
-            >
-              Change to Small compute
-            </Button>
-          )}
-          <DocsButton href={`${DOCS_URL}/guides/platform/read-replicas#prerequisites`} />
-        </div>
+      <Admonition
+        type="warning"
+        title="Small compute required"
+        description={
+          <p>
+            Read replicas require at least Small compute to keep up with the primary database.{' '}
+            <InlineLink href={`${DOCS_URL}/guides/platform/read-replicas#prerequisites`}>
+              Learn more
+            </InlineLink>
+          </p>
+        }
+      >
+        {isFreePlan ? (
+          <UpgradePlanButton
+            variant="default"
+            plan="Pro"
+            addon="computeSize"
+            source="read-replicas"
+            featureProposition="deploy Read Replicas"
+            className="mt-2"
+          />
+        ) : (
+          <Button
+            variant="default"
+            className="mt-2"
+            onClick={() => onRecommendCompute(RECOMMENDED_COMPUTE_FOR_READ_REPLICAS.minimum)}
+          >
+            Change compute
+          </Button>
+        )}
       </Admonition>
     )
   }
diff --git a/apps/studio/components/interfaces/Settings/Infrastructure/ReadReplicas/ReadReplicaForm/ReadReplicaPricingDialog.tsx b/apps/studio/components/interfaces/Settings/Infrastructure/ReadReplicas/ReadReplicaForm/ReadReplicaPricingDialog.tsx
index bfc10a6f656..564e244f84c 100644
--- a/apps/studio/components/interfaces/Settings/Infrastructure/ReadReplicas/ReadReplicaForm/ReadReplicaPricingDialog.tsx
+++ b/apps/studio/components/interfaces/Settings/Infrastructure/ReadReplicas/ReadReplicaForm/ReadReplicaPricingDialog.tsx
@@ -1,9 +1,8 @@
 import {
+  Button,
   Card,
-  cn,
   Dialog,
   DialogContent,
-  DialogFooter,
   DialogHeader,
   DialogSection,
   DialogSectionSeparator,
@@ -12,85 +11,102 @@ import {
   Table,
   TableBody,
   TableCell,
+  TableFooter,
   TableHead,
   TableHeader,
   TableRow,
 } from 'ui'
+import { Admonition } from 'ui-patterns/Admonition'
 
 import { useGetReplicaCost } from './useGetReplicaCost'
 import { TaxDisclaimer } from '@/components/interfaces/Billing/TaxDisclaimer'
-import { DocsButton } from '@/components/ui/DocsButton'
-import { InlineLinkClassName } from '@/components/ui/InlineLink'
 import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'
-import { DOCS_URL } from '@/lib/constants'
 
-export const ReadReplicaPricingDialog = () => {
+interface ReadReplicaPricingDialogProps {
+  replicaCost: ReturnType<typeof useGetReplicaCost>
+}
+
+export const ReadReplicaPricingDialog = ({ replicaCost }: ReadReplicaPricingDialogProps) => {
   const { data: project } = useSelectedProjectQuery()
-  const { totalCost, compute, disk, iops, throughput } = useGetReplicaCost()
+  const { isLoading, isError, retry, totalCost, compute, disk, iops, throughput } = replicaCost
 
-  const showNewDiskManagementUI = project?.cloud_provider === 'AWS'
+  const isNewDiskManagementUI = project?.cloud_provider === 'AWS'
+
+  let title = `Estimated additional cost of ${totalCost}/month`
+  if (isLoading) title = 'Estimated additional cost'
+  if (isError) title = 'Unable to estimate additional cost'
 
   return (
     <Dialog>
-      <p className="text-sm">
-        New replica will cost an additional <span translate="no">{totalCost}/month</span>.{' '}
-        <DialogTrigger asChild>
-          <button
-            type="button"
-            tabIndex={0}
-            className={cn(InlineLinkClassName, 'cursor-pointer text-foreground-light')}
-          >
-            Learn more
-          </button>
-        </DialogTrigger>
-      </p>
-      <DialogContent
-        size={showNewDiskManagementUI ? 'medium' : 'small'}
-        aria-describedby={undefined}
-      >
+      <Admonition
+        type={isError ? 'warning' : 'note'}
+        layout="responsive"
+        title={title}
+        description={
+          isError
+            ? 'We couldn’t load the required pricing data.'
+            : 'Based on your primary database configuration.'
+        }
+        className="mb-0 rounded-none border-x-0"
+        actions={
+          isError ? (
+            <Button
+              type="button"
+              variant="default"
+              size="tiny"
+              disabled={isLoading}
+              onClick={retry}
+            >
+              Retry
+            </Button>
+          ) : (
+            <DialogTrigger asChild>
+              <Button type="button" variant="default" size="tiny" disabled={isLoading}>
+                View breakdown
+              </Button>
+            </DialogTrigger>
+          )
+        }
+      />
+      <DialogContent size="medium" aria-describedby={undefined}>
         <DialogHeader>
-          <DialogTitle>Calculating costs for a new read replica</DialogTitle>
+          <DialogTitle>Read replica cost breakdown</DialogTitle>
         </DialogHeader>
         <DialogSectionSeparator />
         <DialogSection>
-          {showNewDiskManagementUI ? (
+          {isNewDiskManagementUI ? (
             <>
-              <p className="text-foreground-light text-sm mb-2">
-                Read replicas will match the compute size of your primary database and will include
-                25% more disk size than the primary database to accommodate WAL files.
+              <p className="mb-3 text-sm text-foreground-light">
+                The replica matches your primary compute and includes 25% additional disk capacity
+                for WAL files.
               </p>
-
-              <p className="text-foreground-light text-sm">
-                The additional cost for the replica breaks down to:
-              </p>
-
-              <Card className="mt-2">
+              <Card>
                 <Table>
                   <TableHeader>
                     <TableRow>
                       <TableHead className="w-[140px]">Item</TableHead>
                       <TableHead>Description</TableHead>
-                      <TableHead className="text-right">Cost (/month)</TableHead>
+                      <TableHead className="text-right">Monthly cost</TableHead>
                     </TableRow>
                   </TableHeader>
-                  <TableBody className="[&_td]:py-0 [&_tr]:h-[50px] [&_tr]:border-dotted">
+                  <TableBody>
                     <TableRow>
                       <TableCell>Compute size</TableCell>
-                      <TableCell>{compute.label}</TableCell>
+                      <TableCell className="text-foreground-lighter">{compute.label}</TableCell>
                       <TableCell className="text-right font-mono" translate="no">
                         {compute.cost}
                       </TableCell>
                     </TableRow>
                     <TableRow>
                       <TableCell>Disk size</TableCell>
-                      <TableCell>{disk.label}</TableCell>
+                      <TableCell className="text-foreground-lighter">{disk.label}</TableCell>
                       <TableCell className="text-right font-mono" translate="no">
                         {disk.cost}
                       </TableCell>
                     </TableRow>
                     <TableRow>
                       <TableCell>IOPS</TableCell>
-                      <TableCell>{iops.label}</TableCell>
+                      <TableCell className="text-foreground-lighter">{iops.label}</TableCell>
                       <TableCell className="text-right font-mono" translate="no">
                         {iops.cost}
                       </TableCell>
@@ -98,13 +114,25 @@ export const ReadReplicaPricingDialog = () => {
                     {disk.type === 'gp3' && (
                       <TableRow>
                         <TableCell>Throughput</TableCell>
-                        <TableCell>{throughput.label}</TableCell>
+                        <TableCell className="text-foreground-lighter">
+                          {throughput.label}
+                        </TableCell>
                         <TableCell className="text-right font-mono" translate="no">
                           {throughput.cost}
                         </TableCell>
                       </TableRow>
                     )}
                   </TableBody>
+                  <TableFooter>
+                    <TableRow>
+                      <TableCell colSpan={2} className="font-medium">
+                        Estimated total
+                      </TableCell>
+                      <TableCell className="text-right font-mono font-medium" translate="no">
+                        {totalCost}
+                      </TableCell>
+                    </TableRow>
+                  </TableFooter>
                 </Table>
               </Card>
             </>
@@ -119,12 +147,8 @@ export const ReadReplicaPricingDialog = () => {
               .
             </p>
           )}
-          <TaxDisclaimer className="mt-3" />
+          <TaxDisclaimer className="mt-3 text-sm text-foreground-light" />
         </DialogSection>
-
-        <DialogFooter>
-          <DocsButton href={`${DOCS_URL}/guides/platform/manage-your-usage/read-replicas`} />
-        </DialogFooter>
       </DialogContent>
     </Dialog>
   )
diff --git a/apps/studio/components/interfaces/Settings/Infrastructure/ReadReplicas/ReadReplicaForm/index.tsx b/apps/studio/components/interfaces/Settings/Infrastructure/ReadReplicas/ReadReplicaForm/index.tsx
index 87b114b7a63..7c0eb03f574 100644
--- a/apps/studio/components/interfaces/Settings/Infrastructure/ReadReplicas/ReadReplicaForm/index.tsx
+++ b/apps/studio/components/interfaces/Settings/Infrastructure/ReadReplicas/ReadReplicaForm/index.tsx
@@ -1,23 +1,23 @@
 import { useParams } from 'common'
-import { RefObject, useEffect, useState, type ReactNode } from 'react'
+import { useState, type ReactNode } from 'react'
 import { AWS_REGIONS, AWS_REGIONS_KEYS } from 'shared-data'
 import { toast } from 'sonner'
 import {
   Button,
-  InfoIcon,
+  DialogFooter,
+  DialogSection,
   Select,
   SelectContent,
   SelectItem,
   SelectTrigger,
   SelectValue,
-  SheetFooter,
-  SheetSection,
 } from 'ui'
 import { FormItemLayout } from 'ui-patterns/form/FormItemLayout/FormItemLayout'
 
 import { ReadReplicaEligibilityWarnings } from './ReadReplicaEligibilityWarnings'
 import { ReadReplicaPricingDialog } from './ReadReplicaPricingDialog'
 import { useCheckEligibilityDeployReplica } from './useCheckEligibilityDeployReplica'
+import { useGetReplicaCost } from './useGetReplicaCost'
 import { AVAILABLE_REPLICA_REGIONS } from '@/components/interfaces/Settings/Infrastructure/InfrastructureConfiguration/InstanceConfiguration.constants'
 import type { RecommendedComputeForReadReplicas } from '@/components/interfaces/Settings/Infrastructure/ReadReplicas/recommendCompute'
 import { RegionFlag } from '@/components/ui/RegionFlag'
@@ -27,40 +27,28 @@ import { AWS_REGIONS_DEFAULT } from '@/lib/constants'
 
 interface ReadReplicaFormProps {
   typeSelection?: ReactNode
-  checkIsDirtyRef?: RefObject<() => boolean>
   onSuccess: () => void
   onClose: () => void
-  onCancel?: () => void
   onRecommendCompute: (size: RecommendedComputeForReadReplicas) => void
 }
 
 export const ReadReplicaForm = ({
   typeSelection,
-  checkIsDirtyRef,
   onSuccess,
   onClose,
-  onCancel = onClose,
   onRecommendCompute,
 }: ReadReplicaFormProps) => {
   const { ref: projectRef } = useParams()
   const { data } = useReadReplicasQuery({ projectRef })
+  const eligibility = useCheckEligibilityDeployReplica()
+  const replicaCost = useGetReplicaCost()
 
   const [defaultRegion] = Object.entries(AWS_REGIONS).find(
     ([_, name]) => name === AWS_REGIONS_DEFAULT
   ) ?? ['SOUTHEAST_ASIA']
-  const { can: canDeployReplica } = useCheckEligibilityDeployReplica()
+  const { can: canDeployReplica } = eligibility
 
   const [selectedRegion, setSelectedRegion] = useState<string>(defaultRegion)
-  const isDirty = selectedRegion !== defaultRegion
-
-  useEffect(() => {
-    if (!checkIsDirtyRef) return
-
-    checkIsDirtyRef.current = () => isDirty
-    return () => {
-      checkIsDirtyRef.current = () => false
-    }
-  }, [checkIsDirtyRef, isDirty])
 
   const { mutate: setUpReplica, isPending: isSettingUp } = useReadReplicaSetUpMutation({
     onSuccess: () => {
@@ -77,6 +65,7 @@ export const ReadReplicaForm = ({
           ['SOUTHEAST_ASIA', 'CENTRAL_EU', 'EAST_US'].includes(x.key)
         )
       : AVAILABLE_REPLICA_REGIONS
+  const selectedRegionDetails = availableRegions.find((region) => region.key === selectedRegion)
 
   const onSubmit = async () => {
     if (!projectRef) return console.error('Project is required')
@@ -90,19 +79,21 @@ export const ReadReplicaForm = ({
 
   return (
     <>
-      <SheetSection className="grow overflow-auto px-0 py-0">
+      <DialogSection className="flex flex-col p-0!">
         {typeSelection}
-        {!canDeployReplica && (
-          <SheetSection>
-            <ReadReplicaEligibilityWarnings onRecommendCompute={onRecommendCompute} />
-          </SheetSection>
-        )}
         <FormItemLayout
           isReactForm={false}
-          layout="horizontal"
+          layout="vertical"
           className="p-5 [&>div]:gap-y-1 [&>div>span]:text-foreground-lighter"
           label="Region"
-          labelOptional="Select a region to deploy your replica in"
+          description={
+            canDeployReplica ? (
+              <span>
+                This replica will be deployed in{' '}
+                <span translate="no">{selectedRegionDetails?.region}</span>.
+              </span>
+            ) : undefined
+          }
         >
           <Select
             value={selectedRegion}
@@ -110,7 +101,14 @@ export const ReadReplicaForm = ({
             disabled={!canDeployReplica}
           >
             <SelectTrigger>
-              <SelectValue placeholder="Select a region" />
+              <SelectValue placeholder="Select a region">
+                <span className="flex min-w-0 items-center gap-x-2">
+                  {selectedRegionDetails !== undefined && (
+                    <RegionFlag className="w-5 shrink-0" region={selectedRegionDetails.region} />
+                  )}
+                  <span className="truncate">{selectedRegionDetails?.name}</span>
+                </span>
+              </SelectValue>
             </SelectTrigger>
             <SelectContent>
               {availableRegions.map((region) => (
@@ -129,22 +127,26 @@ export const ReadReplicaForm = ({
             </SelectContent>
           </Select>
         </FormItemLayout>
-      </SheetSection>
-      <SheetFooter className="justify-between! gap-x-6">
-        <div className="flex items-center gap-x-3">
-          <InfoIcon className="h-5 w-5" />
-          <ReadReplicaPricingDialog />
+      </DialogSection>
+      {canDeployReplica ? (
+        <ReadReplicaPricingDialog replicaCost={replicaCost} />
+      ) : (
+        <div className="[&>[role=alert]]:mb-0 [&>[role=alert]]:rounded-none [&>[role=alert]]:border-x-0">
+          <ReadReplicaEligibilityWarnings
+            eligibility={eligibility}
+            onRecommendCompute={onRecommendCompute}
+          />
         </div>
+      )}
 
-        <div className="flex items-center gap-x-2">
-          <Button disabled={isSettingUp} variant="default" onClick={onCancel}>
-            Cancel
-          </Button>
-          <Button disabled={!canDeployReplica} loading={isSettingUp} onClick={onSubmit}>
-            Deploy replica
-          </Button>
-        </div>
-      </SheetFooter>
+      <DialogFooter className="border-t-0">
+        <Button disabled={isSettingUp} variant="default" onClick={onClose}>
+          Cancel
+        </Button>
+        <Button disabled={!canDeployReplica} loading={isSettingUp} onClick={onSubmit}>
+          Add replica
+        </Button>
+      </DialogFooter>
     </>
   )
 }
diff --git a/apps/studio/components/interfaces/Settings/Infrastructure/ReadReplicas/ReadReplicaForm/useCheckEligibilityDeployReplica.ts b/apps/studio/components/interfaces/Settings/Infrastructure/ReadReplicas/ReadReplicaForm/useCheckEligibilityDeployReplica.ts
index 6e8e7311314..9ce814aacc8 100644
--- a/apps/studio/components/interfaces/Settings/Infrastructure/ReadReplicas/ReadReplicaForm/useCheckEligibilityDeployReplica.ts
+++ b/apps/studio/components/interfaces/Settings/Infrastructure/ReadReplicas/ReadReplicaForm/useCheckEligibilityDeployReplica.ts
@@ -9,7 +9,11 @@ import {
 import { useProjectAddonsQuery } from '@/data/subscriptions/project-addons-query'
 import { useCheckEntitlements } from '@/hooks/misc/useCheckEntitlements'
 import { useSelectedOrganizationQuery } from '@/hooks/misc/useSelectedOrganization'
-import { useIsAwsK8sCloudProvider, useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'
+import {
+  useIsAwsK8sCloudProvider,
+  useIsHighAvailability,
+  useSelectedProjectQuery,
+} from '@/hooks/misc/useSelectedProject'
 
 export const useCheckEligibilityDeployReplica = () => {
   const { ref: projectRef } = useParams()
@@ -21,6 +25,7 @@ export const useCheckEligibilityDeployReplica = () => {
   const isWalgEnabled = project?.is_physical_backups_enabled
   const isNotOnHigherPlan = !['team', 'enterprise', 'platform'].includes(org?.plan.id ?? '')
   const isProWithSpendCapEnabled = org?.plan.id === 'pro' && !org.usage_billing_enabled
+  const isHighAvailability = useIsHighAvailability()
 
   const { data: allOverdueInvoices } = useOverdueInvoicesQuery({
     enabled: isNotOnHigherPlan,
@@ -59,7 +64,8 @@ export const useCheckEligibilityDeployReplica = () => {
     !hasOverdueInvoices &&
     !isAwsK8s &&
     !isProWithSpendCapEnabled &&
-    !isBelowSmallCompute
+    !isBelowSmallCompute &&
+    !isHighAvailability
 
   return {
     can: canDeployReplica,
@@ -71,6 +77,7 @@ export const useCheckEligibilityDeployReplica = () => {
     isWalgNotEnabled: !isWalgEnabled,
     isProWithSpendCapEnabled,
     isReachedMaxReplicas,
+    isHighAvailability,
     maxNumberOfReplicas,
   }
 }
diff --git a/apps/studio/components/interfaces/Settings/Infrastructure/ReadReplicas/ReadReplicaForm/useGetReplicaCost.ts b/apps/studio/components/interfaces/Settings/Infrastructure/ReadReplicas/ReadReplicaForm/useGetReplicaCost.ts
index 610b3b7c72f..d3ef34c148a 100644
--- a/apps/studio/components/interfaces/Settings/Infrastructure/ReadReplicas/ReadReplicaForm/useGetReplicaCost.ts
+++ b/apps/studio/components/interfaces/Settings/Infrastructure/ReadReplicas/ReadReplicaForm/useGetReplicaCost.ts
@@ -14,8 +14,31 @@ import { formatCurrency } from '@/lib/helpers'
 
 export const useGetReplicaCost = () => {
   const { ref: projectRef } = useParams()
-  const { data: addons } = useProjectAddonsQuery({ projectRef })
-  const { data: diskConfiguration } = useDiskAttributesQuery({ projectRef })
+  const {
+    data: addons,
+    isError: isAddonsError,
+    isFetching: isAddonsFetching,
+    isPending: isAddonsPending,
+    refetch: refetchAddons,
+  } = useProjectAddonsQuery({ projectRef })
+  const {
+    data: diskConfiguration,
+    isError: isDiskConfigurationError,
+    isFetching: isDiskConfigurationFetching,
+    isPending: isDiskConfigurationPending,
+    refetch: refetchDiskConfiguration,
+  } = useDiskAttributesQuery({ projectRef })
+
+  const isLoading =
+    (addons === undefined && (isAddonsPending || isAddonsFetching)) ||
+    (diskConfiguration === undefined && (isDiskConfigurationPending || isDiskConfigurationFetching))
+  const isError =
+    (addons === undefined && isAddonsError) ||
+    (diskConfiguration === undefined && isDiskConfigurationError)
+
+  const retry = async () => {
+    await Promise.all([refetchAddons(), refetchDiskConfiguration()])
+  }
 
   const currentComputeAddon = addons?.selected_addons.find(
     (addon) => addon.type === 'compute_instance'
@@ -57,6 +80,9 @@ export const useGetReplicaCost = () => {
   )
 
   return {
+    isLoading,
+    isError,
+    retry,
     totalCost,
     compute: {
       label: selectedComputeMeta?.name,
diff --git a/apps/studio/components/interfaces/Settings/Infrastructure/ReadReplicas/ReadReplicasSection.tsx b/apps/studio/components/interfaces/Settings/Infrastructure/ReadReplicas/ReadReplicasSection.tsx
index c63e8f8d7c1..324e44439dc 100644
--- a/apps/studio/components/interfaces/Settings/Infrastructure/ReadReplicas/ReadReplicasSection.tsx
+++ b/apps/studio/components/interfaces/Settings/Infrastructure/ReadReplicas/ReadReplicasSection.tsx
@@ -16,14 +16,16 @@ import {
 } from 'ui-patterns/PageSection'
 import { GenericSkeletonLoader } from 'ui-patterns/ShimmeringLoader'
 
-import { AddReadReplicaSheet } from './AddReadReplicaSheet'
+import { AddReadReplicaDialog } from './AddReadReplicaDialog'
 import { ReadReplicaRow } from './ReadReplicaRow'
 import { REPLICA_STATUS } from './ReadReplicas.constants'
 import type { RecommendedComputeForReadReplicas } from './recommendCompute'
 import { AlertError } from '@/components/ui/AlertError'
 import { DocsButton } from '@/components/ui/DocsButton'
+import { HighAvailabilityDisabledSectionNotice } from '@/components/ui/HighAvailability/HighAvailabilityDisabledSectionNotice'
 import { useReadReplicasQuery } from '@/data/read-replicas/replicas-query'
 import { useIsFeatureEnabled } from '@/hooks/misc/useIsFeatureEnabled'
+import { useIsHighAvailability } from '@/hooks/misc/useSelectedProject'
 import { DOCS_URL } from '@/lib/constants'
 
 interface ReadReplicasSectionProps {
@@ -32,8 +34,10 @@ interface ReadReplicasSectionProps {
 
 export const ReadReplicasSection = ({ onRecommendCompute }: ReadReplicasSectionProps) => {
   const { ref: projectRef } = useParams()
+  const isHighAvailability = useIsHighAvailability()
+
   const { infrastructureReadReplicas } = useIsFeatureEnabled(['infrastructure:read_replicas'])
-  const [, setAddReplica] = useQueryState(
+  const [isAddReplicaOpen, setAddReplica] = useQueryState(
     'addReplica',
     parseAsBoolean.withDefault(false).withOptions({
       history: 'push',
@@ -87,19 +91,24 @@ export const ReadReplicasSection = ({ onRecommendCompute }: ReadReplicasSectionP
               Scale reads or serve queries closer to users.
             </PageSectionDescription>
           </PageSectionSummary>
+
           <PageSectionAside>
             <DocsButton href={`${DOCS_URL}/guides/platform/read-replicas`} />
-            <Button
-              type="button"
-              variant="primary"
-              icon={<Plus />}
-              onClick={() => setAddReplica(true)}
-            >
-              Add read replica
-            </Button>
+            {!isHighAvailability && (
+              <Button
+                type="button"
+                variant="primary"
+                icon={<Plus />}
+                onClick={() => setAddReplica(true)}
+              >
+                Add read replica
+              </Button>
+            )}
           </PageSectionAside>
         </PageSectionMeta>
 
+        <HighAvailabilityDisabledSectionNotice title="Read replicas are unavailable on High Availability projects" />
+
         <PageSectionContent className="flex flex-col gap-y-4">
           {isDatabasesError && (
             <AlertError error={databasesError} subject="Failed to retrieve read replicas" />
@@ -140,20 +149,24 @@ export const ReadReplicasSection = ({ onRecommendCompute }: ReadReplicasSectionP
               title="No read replicas"
               description="All reads and writes currently go to the primary."
             >
-              <Button
-                type="button"
-                variant="default"
-                icon={<Plus />}
-                onClick={() => setAddReplica(true)}
-              >
-                Add read replica
-              </Button>
+              {!isHighAvailability && (
+                <Button
+                  type="button"
+                  variant="default"
+                  icon={<Plus />}
+                  onClick={() => setAddReplica(true)}
+                >
+                  Add read replica
+                </Button>
+              )}
             </EmptyStatePresentational>
           )}
         </PageSectionContent>
       </PageSection>
 
-      <AddReadReplicaSheet
+      <AddReadReplicaDialog
+        open={isAddReplicaOpen}
+        onOpenChange={setAddReplica}
         onSuccess={() => setStatusRefetchInterval(5000)}
         onRecommendCompute={onRecommendCompute}
       />
diff --git a/apps/studio/components/interfaces/Settings/Logs/LogColumnRenderers/WorkersLogsColumnRender.tsx b/apps/studio/components/interfaces/Settings/Logs/LogColumnRenderers/WorkersLogsColumnRender.tsx
new file mode 100644
index 00000000000..1c9c897c016
--- /dev/null
+++ b/apps/studio/components/interfaces/Settings/Logs/LogColumnRenderers/WorkersLogsColumnRender.tsx
@@ -0,0 +1,22 @@
+import { Column } from 'react-data-grid'
+import { TimestampInfo } from 'ui-patterns/TimestampInfo'
+
+import type { LogData } from '../Logs.types'
+import { RowLayout, SeverityFormatter, TextFormatter } from '../LogsFormatters'
+
+export const WorkersLogsColumnRender: Column<LogData>[] = [
+  {
+    name: 'workers-logs-first-column',
+    key: 'workers-logs-first-column',
+    renderHeaderCell: () => null,
+    renderCell: (props) => (
+      <RowLayout>
+        <TimestampInfo utcTimestamp={props.row.timestamp!} />
+        {props.row.severity_text ? (
+          <SeverityFormatter value={props.row.severity_text as string} />
+        ) : null}
+        <TextFormatter className="w-full" value={props.row.event_message} />
+      </RowLayout>
+    ),
+  },
+]
diff --git a/apps/studio/components/interfaces/Settings/Logs/LogTable.tsx b/apps/studio/components/interfaces/Settings/Logs/LogTable.tsx
index f1e17d4ec9d..89f17a3f8de 100644
--- a/apps/studio/components/interfaces/Settings/Logs/LogTable.tsx
+++ b/apps/studio/components/interfaces/Settings/Logs/LogTable.tsx
@@ -69,6 +69,7 @@ interface Props {
   selectedLogError?: LogQueryError | ResponseError
   onSelectedLogChange?: (log: LogData | null) => void
   sqlQuery?: string
+  columnRenderers?: Column<LogData>[]
 }
 type LogMap = { [id: string]: LogData }
 
@@ -98,6 +99,7 @@ export const LogTable = ({
   selectedLogError,
   onSelectedLogChange,
   sqlQuery,
+  columnRenderers,
 }: Props) => {
   const { ref } = useParams()
   const { profile } = useProfile()
@@ -245,7 +247,9 @@ export const LogTable = ({
 
   let columns = DEFAULT_COLUMNS
 
-  if (!queryType) {
+  if (columnRenderers) {
+    columns = columnRenderers
+  } else if (!queryType) {
     columns
   } else {
     switch (queryType) {
@@ -616,7 +620,7 @@ export const LogTable = ({
                 'data-grid--logs-explorer': !queryType,
               })}
               rowHeight={40}
-              headerRowHeight={queryType ? 0 : 28}
+              headerRowHeight={queryType || columnRenderers ? 0 : 28}
               columns={columns}
               rowClass={(row: LogData) => {
                 const key = getRowKey(row)
diff --git a/apps/studio/components/interfaces/Sidebar.tsx b/apps/studio/components/interfaces/Sidebar.tsx
index 3a5ff661715..92ac2fb411f 100644
--- a/apps/studio/components/interfaces/Sidebar.tsx
+++ b/apps/studio/components/interfaces/Sidebar.tsx
@@ -33,8 +33,8 @@ import { Route } from '../ui/ui.types'
 import {
   generateProductRoutes,
   generateSettingsRoutes,
-  generateToolRoutes,
   useGenerateOtherRoutes,
+  useGenerateToolRoutes,
 } from '@/components/layouts/Navigation/NavigationBar/NavigationBar.utils'
 import { ProjectIndexPageLink } from '@/data/prefetchers/project.$ref'
 import { useHideSidebar } from '@/hooks/misc/useHideSidebar'
@@ -168,6 +168,7 @@ export function SideBarNavLink({
 } & ComponentPropsWithoutRef<typeof SidebarMenuButton>) {
   const router = useRouter()
   const { state: sidebarState } = useSidebar()
+
   const [sidebarBehaviour] = useLocalStorageQuery(
     LOCAL_STORAGE_KEYS.SIDEBAR_BEHAVIOR,
     DEFAULT_SIDEBAR_BEHAVIOR
@@ -223,6 +224,7 @@ export function SideBarNavLink({
           onTrigger={() => router.push(route.link!)}
           side="right"
           delayDuration={shortcutPopoverDelay}
+          label={route.key === 'explorer' ? 'Go to Explorer' : undefined}
         >
           {button}
         </Shortcut>
@@ -278,7 +280,7 @@ const ProjectLinks = () => {
   const authOverviewPageEnabled = useFlag('authOverviewPage')
   const workersEnabled = useFlag('workers')
 
-  const toolRoutes = generateToolRoutes(ref, project)
+  const toolRoutes = useGenerateToolRoutes()
   const productRoutes = generateProductRoutes(ref, project, {
     auth: authEnabled,
     edgeFunctions: edgeFunctionsEnabled,
diff --git a/apps/studio/components/interfaces/SignIn/SignInOptions.tsx b/apps/studio/components/interfaces/SignIn/SignInOptions.tsx
new file mode 100644
index 00000000000..b2898124ca3
--- /dev/null
+++ b/apps/studio/components/interfaces/SignIn/SignInOptions.tsx
@@ -0,0 +1,60 @@
+import { cn } from 'ui'
+
+import { SignInWithSSOButton } from './SignInSSOForm'
+import { SignInWithCustom } from './SignInWithCustom'
+import { SignInWithExternalProvider } from './SignInWithExternalProvider'
+import { useCustomContent } from '@/hooks/custom-content/useCustomContent'
+import { useIsFeatureEnabled } from '@/hooks/misc/useIsFeatureEnabled'
+import { type ExternalIdentityProviderConfig } from '@/lib/external-identity-providers'
+
+export const SignInOptions = ({
+  providers,
+  dividerBgClass = 'bg-studio',
+}: {
+  providers: ExternalIdentityProviderConfig[]
+  dividerBgClass?: string
+}) => {
+  const {
+    dashboardAuthSignInWithSso: signInWithSsoEnabled,
+    dashboardAuthSignInWithEmail: signInWithEmailEnabled,
+  } = useIsFeatureEnabled(['dashboard_auth:sign_in_with_sso', 'dashboard_auth:sign_in_with_email'])
+
+  const {
+    dashboardAuthCustomProvider: customProvider,
+    dashboardAuthCustomProviders: customProvidersNew,
+  } = useCustomContent(['dashboard_auth:custom_provider', 'dashboard_auth:custom_providers'])
+
+  // [Joshen] This is just for backward compatibility - singular customProvider needs to be deprecated subsequently
+  // Just need to remove customProvider and rename customProvidersNew to customProviders
+  const customProviders = customProvidersNew ?? (customProvider ? [customProvider] : [])
+
+  const showOrDivider =
+    (providers.length > 0 || signInWithSsoEnabled || customProviders.length > 0) &&
+    signInWithEmailEnabled
+
+  return (
+    <>
+      {Array.isArray(customProviders) &&
+        customProviders.map((providerName: string) => (
+          <SignInWithCustom key={providerName} providerName={providerName} />
+        ))}
+
+      {providers.map((provider) => (
+        <SignInWithExternalProvider key={provider.id} provider={provider} />
+      ))}
+
+      {signInWithSsoEnabled && <SignInWithSSOButton />}
+
+      {showOrDivider && (
+        <div className="relative">
+          <div className="absolute inset-0 flex items-center">
+            <div className="w-full border-t border-strong" />
+          </div>
+          <div className="relative flex justify-center text-sm">
+            <span className={cn('px-2 text-sm text-foreground', dividerBgClass)}>or</span>
+          </div>
+        </div>
+      )}
+    </>
+  )
+}
diff --git a/apps/studio/components/interfaces/SignIn/SignInSSOForm.tsx b/apps/studio/components/interfaces/SignIn/SignInSSOForm.tsx
index e27443d1363..4127113a7d4 100644
--- a/apps/studio/components/interfaces/SignIn/SignInSSOForm.tsx
+++ b/apps/studio/components/interfaces/SignIn/SignInSSOForm.tsx
@@ -1,6 +1,9 @@
 import HCaptcha from '@hcaptcha/react-hcaptcha'
 import { zodResolver } from '@hookform/resolvers/zod'
 import { useQueryClient } from '@tanstack/react-query'
+import { Lock } from 'lucide-react'
+import Link from 'next/link'
+import { useRouter } from 'next/router'
 import { useRef, useState } from 'react'
 import { useForm, type SubmitHandler } from 'react-hook-form'
 import { toast } from 'sonner'
@@ -8,6 +11,7 @@ import { Button, Form, FormControl, FormField, Input } from 'ui'
 import { FormItemLayout } from 'ui-patterns/form/FormItemLayout/FormItemLayout'
 import z from 'zod'
 
+import { LastSignInWrapper } from './LastSignInWrapper'
 import { useLastSignIn } from '@/hooks/misc/useLastSignIn'
 import { BASE_PATH } from '@/lib/constants'
 import { captureCriticalError } from '@/lib/error-reporting'
@@ -119,3 +123,15 @@ export const SignInSSOForm = () => {
     </Form>
   )
 }
+
+export const SignInWithSSOButton = () => {
+  const router = useRouter()
+
+  return (
+    <LastSignInWrapper type="sso">
+      <Button asChild block size="large" variant="outline" icon={<Lock />}>
+        <Link href={{ pathname: '/sign-in-sso', query: router.query }}>Continue with SSO</Link>
+      </Button>
+    </LastSignInWrapper>
+  )
+}
diff --git a/apps/studio/components/interfaces/SignIn/SignUpForm.tsx b/apps/studio/components/interfaces/SignIn/SignUpForm.tsx
index aa32fb110b0..14f36b063b6 100644
--- a/apps/studio/components/interfaces/SignIn/SignUpForm.tsx
+++ b/apps/studio/components/interfaces/SignIn/SignUpForm.tsx
@@ -1,23 +1,14 @@
 import HCaptcha from '@hcaptcha/react-hcaptcha'
 import { zodResolver } from '@hookform/resolvers/zod'
 import { motion } from 'framer-motion'
-import { CheckCircle, Eye, EyeOff } from 'lucide-react'
+import { Eye, EyeOff } from 'lucide-react'
 import { useRouter } from 'next/router'
 import { parseAsString, useQueryStates } from 'nuqs'
 import { useRef, useState } from 'react'
 import { SubmitHandler, useForm, useWatch } from 'react-hook-form'
 import { toast } from 'sonner'
-import {
-  Alert,
-  AlertDescription,
-  AlertTitle,
-  Button,
-  cn,
-  Form,
-  FormControl,
-  FormField,
-  Input,
-} from 'ui'
+import { Button, cn, Form, FormControl, FormField, Input } from 'ui'
+import { Admonition } from 'ui-patterns/Admonition'
 import { FormItemLayout } from 'ui-patterns/form/FormItemLayout/FormItemLayout'
 import z from 'zod'
 
@@ -52,7 +43,7 @@ const schema = z.object({
 
 const formId = 'sign-up-form'
 
-export const SignUpForm = () => {
+export const SignUpForm = ({ onSuccess }: { onSuccess?: () => void }) => {
   const captchaRef = useRef<HCaptcha>(null)
   const [showConditions, setShowConditions] = useState(false)
   const [isSubmitted, setIsSubmitted] = useState(false)
@@ -76,6 +67,7 @@ export const SignUpForm = () => {
     onSuccess: () => {
       toast.success(`Signed up successfully!`)
       setIsSubmitted(true)
+      onSuccess?.()
     },
     onError: (error) => {
       setCaptchaToken(null)
@@ -135,22 +127,22 @@ export const SignUpForm = () => {
           initial={{ opacity: 0 }}
           animate={{ opacity: 1 }}
           transition={{ duration: 0.5, delay: 0.3 }}
-          className="absolute top-0 w-full"
+          className="w-full"
         >
-          <Alert variant="default">
-            <CheckCircle />
-            <AlertTitle>Check your email to confirm</AlertTitle>
-            <AlertDescription className="text-xs">
-              You've successfully signed up. Please check your email to confirm your account before
-              signing in to the Supabase dashboard. The confirmation link expires in 10 minutes.
-            </AlertDescription>
-          </Alert>
+          <Admonition
+            type="success"
+            title="Check your email"
+            description="We sent you a link to finish signing up. It expires in 10 minutes."
+          />
         </motion.div>
       )}
       <div
+        inert={isSubmitted || undefined}
         className={cn(
-          'w-full py-1 transition-all duration-500',
-          isSubmitted ? 'max-h-[100px] opacity-0 pointer-events-none' : 'max-h-[1000px] opacity-100'
+          'w-full transition-all duration-500',
+          isSubmitted
+            ? 'max-h-0 overflow-hidden opacity-0 pointer-events-none py-0'
+            : 'max-h-[1000px] opacity-100'
         )}
       >
         <Form {...form}>
@@ -213,13 +205,16 @@ export const SignUpForm = () => {
               )}
             />
 
-            <div
-              className={`${
-                showConditions ? 'max-h-[500px]' : 'max-h-0'
-              } transition-all duration-400 overflow-y-hidden`}
-            >
-              <PasswordConditionsHelper password={password} />
-            </div>
+            {showConditions && (
+              <motion.div
+                initial={{ maxHeight: '0px' }}
+                animate={{ maxHeight: '500px' }}
+                transition={{ duration: 0.8, delay: 0 }}
+                className="overflow-y-hidden"
+              >
+                <PasswordConditionsHelper password={password} />
+              </motion.div>
+            )}
 
             <div className="self-center">
               <HCaptcha
diff --git a/apps/studio/components/interfaces/Workers/DeployWorkerDialog.tsx b/apps/studio/components/interfaces/Workers/DeployWorkerDialog.tsx
index 5c90e6a8f28..66e91a9e00b 100644
--- a/apps/studio/components/interfaces/Workers/DeployWorkerDialog.tsx
+++ b/apps/studio/components/interfaces/Workers/DeployWorkerDialog.tsx
@@ -1,67 +1,238 @@
+import { zodResolver } from '@hookform/resolvers/zod'
+import { useForm, useWatch } from 'react-hook-form'
 import {
+  Button,
   Dialog,
   DialogContent,
+  DialogFooter,
   DialogHeader,
   DialogSection,
   DialogSectionSeparator,
   DialogTitle,
+  Form,
+  FormControl,
+  FormField,
+  Input,
+  Select,
+  SelectContent,
+  SelectItem,
+  SelectTrigger,
+  SelectValue,
 } from 'ui'
+import { Admonition } from 'ui-patterns/Admonition'
+import { FormItemLayout } from 'ui-patterns/form/FormItemLayout/FormItemLayout'
+import * as z from 'zod'
 
-import { EXAMPLE_WORKER } from './workerSnippets'
+import { RuntimeBadge } from './RuntimeBadge'
+import { WORKER_DEPLOYABLE_RUNTIMES, WORKER_SIZES, WORKERS_REGION } from './Workers.constants'
+import type { WorkerAccess } from './Workers.types'
+import { formatSize, generateWorkerName } from './Workers.utils'
 import { WorkerSnippetTabs } from './WorkerSnippetTabs'
 
+const FORM_ID = 'deploy-worker-form'
+
+const DeployWorkerFormSchema = z.object({
+  name: z
+    .string()
+    .trim()
+    .min(1, 'Name is required')
+    .regex(/^[a-z0-9-]+$/, 'Lowercase letters, numbers, and hyphens only'),
+  runtime: z.enum(WORKER_DEPLOYABLE_RUNTIMES),
+  size: z.enum(WORKER_SIZES),
+  access: z.enum(['private', 'public']),
+  instances: z
+    .union([z.literal(''), z.coerce.number().int().gte(1).lte(10)])
+    .refine((value) => value !== '', 'Instances is required'),
+})
+
+type DeployWorkerFormValues = z.infer<typeof DeployWorkerFormSchema>
+
+const DEFAULT_VALUES: DeployWorkerFormValues = {
+  name: '',
+  runtime: 'deno',
+  size: WORKER_SIZES[0],
+  access: 'private',
+  instances: 1,
+}
+
+const ACCESS_OPTIONS: { value: WorkerAccess; label: string }[] = [
+  { value: 'private', label: 'Private' },
+  { value: 'public', label: 'Public' },
+]
+
 interface DeployWorkerDialogProps {
   open: boolean
   onOpenChange: (open: boolean) => void
 }
 
-const STEPS = [
-  {
-    title: 'Scaffold the worker',
-    description: 'Creates supabase/workers/<name>/ with an entrypoint for the runtime you pick.',
-  },
-  {
-    title: 'Configure it',
-    description: 'Runtime, size, access, and instance count live in supabase/config.toml.',
-  },
-  {
-    title: 'Push it',
-    description: 'Builds the image and schedules it on a microVM in US West.',
-  },
-]
+export const DeployWorkerDialog = ({ open, onOpenChange }: DeployWorkerDialogProps) => {
+  const form = useForm<DeployWorkerFormValues>({
+    mode: 'onBlur',
+    resolver: zodResolver(DeployWorkerFormSchema),
+    defaultValues: { ...DEFAULT_VALUES, name: generateWorkerName() },
+  })
 
-export const DeployWorkerDialog = ({ open, onOpenChange }: DeployWorkerDialogProps) => (
-  <Dialog open={open} onOpenChange={onOpenChange}>
-    <DialogContent size="large">
-      <DialogHeader>
-        <DialogTitle>Deploy a worker</DialogTitle>
-      </DialogHeader>
+  const [name, runtime, size, access, instances] = useWatch({
+    control: form.control,
+    name: ['name', 'runtime', 'size', 'access', 'instances'],
+  })
 
-      <DialogSection className="space-y-4">
-        <p className="text-sm text-foreground-light">
-          Workers are deployed with the Supabase CLI. This dashboard is read-only during the private
-          alpha.
-        </p>
-        <ol className="space-y-4">
-          {STEPS.map((step, index) => (
-            <li key={step.title} className="flex gap-3">
-              <span className="flex h-6 w-6 shrink-0 items-center justify-center rounded-full border border-strong text-xs text-foreground-light">
-                {index + 1}
-              </span>
-              <div className="space-y-0.5">
-                <p className="text-sm text-foreground">{step.title}</p>
-                <p className="text-sm text-foreground-lighter">{step.description}</p>
-              </div>
-            </li>
-          ))}
-        </ol>
-      </DialogSection>
+  return (
+    <Dialog open={open} onOpenChange={onOpenChange}>
+      <DialogContent size="large">
+        <DialogHeader>
+          <DialogTitle>Deploy a worker</DialogTitle>
+        </DialogHeader>
 
-      <DialogSectionSeparator />
+        <DialogSectionSeparator />
 
-      <DialogSection>
-        <WorkerSnippetTabs input={EXAMPLE_WORKER} tabs={['cli', 'config']} />
-      </DialogSection>
-    </DialogContent>
-  </Dialog>
-)
+        <Admonition
+          type="note"
+          title="This dashboard is read-only during the Private Alpha"
+          description={`Configure a worker below, then deploy it locally. Workers only deploy to ${WORKERS_REGION} during alpha.`}
+          className="border-x-0 border-y-0 rounded-none"
+        />
+
+        <DialogSectionSeparator />
+
+        <DialogSection>
+          <Form {...form}>
+            <form id={FORM_ID} className="flex flex-col gap-y-4">
+              <FormField
+                control={form.control}
+                name="name"
+                render={({ field }) => (
+                  <FormItemLayout name="name" label="Name">
+                    <FormControl>
+                      <Input {...field} placeholder="my-worker" />
+                    </FormControl>
+                  </FormItemLayout>
+                )}
+              />
+
+              <FormField
+                control={form.control}
+                name="runtime"
+                render={({ field }) => (
+                  <FormItemLayout name="runtime" label="Runtime">
+                    <Select value={field.value} onValueChange={field.onChange}>
+                      <FormControl>
+                        <SelectTrigger>
+                          <SelectValue />
+                        </SelectTrigger>
+                      </FormControl>
+                      <SelectContent>
+                        {WORKER_DEPLOYABLE_RUNTIMES.map((value) => (
+                          <SelectItem key={value} value={value}>
+                            <RuntimeBadge runtime={value} />
+                          </SelectItem>
+                        ))}
+                      </SelectContent>
+                    </Select>
+                  </FormItemLayout>
+                )}
+              />
+
+              <FormField
+                control={form.control}
+                name="size"
+                render={({ field }) => (
+                  <FormItemLayout
+                    name="size"
+                    label="Size"
+                    description="Fixed at deploy time and cannot be changed later"
+                  >
+                    <Select value={field.value} onValueChange={field.onChange}>
+                      <FormControl>
+                        <SelectTrigger>
+                          <SelectValue />
+                        </SelectTrigger>
+                      </FormControl>
+                      <SelectContent>
+                        {WORKER_SIZES.map((value) => (
+                          <SelectItem key={value} value={value}>
+                            {formatSize(value)}
+                          </SelectItem>
+                        ))}
+                      </SelectContent>
+                    </Select>
+                  </FormItemLayout>
+                )}
+              />
+
+              <FormField
+                control={form.control}
+                name="access"
+                render={({ field }) => (
+                  <FormItemLayout
+                    name="access"
+                    label="Access"
+                    description="Public workers accept requests with a publishable key"
+                  >
+                    <Select value={field.value} onValueChange={field.onChange}>
+                      <FormControl>
+                        <SelectTrigger>
+                          <SelectValue />
+                        </SelectTrigger>
+                      </FormControl>
+                      <SelectContent>
+                        {ACCESS_OPTIONS.map((option) => (
+                          <SelectItem key={option.value} value={option.value}>
+                            {option.label}
+                          </SelectItem>
+                        ))}
+                      </SelectContent>
+                    </Select>
+                  </FormItemLayout>
+                )}
+              />
+
+              <FormField
+                control={form.control}
+                name="instances"
+                render={({ field }) => (
+                  <FormItemLayout name="instances" label="Instances" description="1 to 10">
+                    <FormControl>
+                      <Input
+                        {...field}
+                        type="number"
+                        min={1}
+                        max={10}
+                        onChange={(e) =>
+                          field.onChange(
+                            Number.isNaN(e.target.valueAsNumber) ? '' : e.target.valueAsNumber
+                          )
+                        }
+                      />
+                    </FormControl>
+                  </FormItemLayout>
+                )}
+              />
+            </form>
+          </Form>
+        </DialogSection>
+
+        <DialogSectionSeparator />
+
+        <DialogSection>
+          <WorkerSnippetTabs
+            input={{
+              name: name ?? '',
+              runtime: runtime ?? DEFAULT_VALUES.runtime,
+              size: size ?? DEFAULT_VALUES.size,
+              access: access ?? DEFAULT_VALUES.access,
+              instances: typeof instances === 'number' ? instances : DEFAULT_VALUES.instances,
+            }}
+            tabs={['ai', 'cli', 'config']}
+          />
+        </DialogSection>
+
+        <DialogFooter>
+          <Button variant="default" onClick={() => onOpenChange(false)}>
+            Cancel
+          </Button>
+        </DialogFooter>
+      </DialogContent>
+    </Dialog>
+  )
+}
diff --git a/apps/studio/components/interfaces/Workers/WorkerDetail/WorkerDetail.tsx b/apps/studio/components/interfaces/Workers/WorkerDetail/WorkerDetail.tsx
new file mode 100644
index 00000000000..88e8de4d71b
--- /dev/null
+++ b/apps/studio/components/interfaces/Workers/WorkerDetail/WorkerDetail.tsx
@@ -0,0 +1,148 @@
+import { useQuery } from '@tanstack/react-query'
+import { useParams } from 'common'
+import { Container, Package } from 'lucide-react'
+import Link from 'next/link'
+import { parseAsStringEnum, useQueryState } from 'nuqs'
+import {
+  BreadcrumbItem,
+  BreadcrumbLink,
+  BreadcrumbList,
+  BreadcrumbPage,
+  BreadcrumbSeparator,
+  Button,
+  Card,
+  NavMenu,
+  NavMenuItem,
+} from 'ui'
+import { PageBreadcrumbs } from 'ui-patterns/PageBreadcrumbs'
+import {
+  PageHeader,
+  PageHeaderDescription,
+  PageHeaderIcon,
+  PageHeaderMeta,
+  PageHeaderSummary,
+  PageHeaderTitle,
+} from 'ui-patterns/PageHeader'
+import { PageNav } from 'ui-patterns/PageNav'
+import { GenericSkeletonLoader } from 'ui-patterns/ShimmeringLoader'
+
+import { RuntimeBadge } from '../RuntimeBadge'
+import { WorkerStatePill } from '../WorkerStatePill'
+import { WorkerLogsTab } from './WorkerLogsTab'
+import { WorkerOverviewTab } from './WorkerOverviewTab'
+import { AlertError } from '@/components/ui/AlertError'
+import type { WorkerLogStream } from '@/data/workers/worker-logs-query'
+import { workerQueryOptions } from '@/data/workers/worker-query'
+import { PRODUCT_NAME } from '@/lib/constants/workers'
+
+type WorkerTab = 'overview' | 'invocations' | 'logs' | 'activity'
+const WORKER_TABS: WorkerTab[] = ['overview', 'invocations', 'logs', 'activity']
+
+const TAB_LABEL: Record<WorkerTab, string> = {
+  overview: 'Overview',
+  invocations: 'Invocations',
+  logs: 'Logs',
+  activity: 'Activity',
+}
+
+const TAB_STREAM: Partial<Record<WorkerTab, WorkerLogStream>> = {
+  invocations: 'requests',
+  logs: 'output',
+  activity: 'builds',
+}
+
+export const WorkerDetail = () => {
+  const { ref: projectRef, name: workerName } = useParams()
+
+  const [tab, setTab] = useQueryState(
+    'tab',
+    parseAsStringEnum<WorkerTab>(WORKER_TABS)
+      .withDefault('overview')
+      .withOptions({ history: 'push' })
+  )
+
+  const {
+    data: worker,
+    error,
+    isPending,
+    isError,
+  } = useQuery(workerQueryOptions({ projectRef, name: workerName }))
+
+  if (!projectRef) return null
+  if (isPending) return <GenericSkeletonLoader className="p-6" />
+  if (isError) return <AlertError error={error} subject="Failed to retrieve worker" />
+
+  if (!worker) {
+    return (
+      <div className="flex flex-1 flex-col items-center justify-center gap-3 py-24 text-center">
+        <p className="text-sm text-foreground-light">
+          Worker "{workerName}" does not exist in this project
+        </p>
+        <Button asChild variant="default">
+          <Link href={`/project/${projectRef}/workers`}>Back to {PRODUCT_NAME}</Link>
+        </Button>
+      </div>
+    )
+  }
+
+  const stream = TAB_STREAM[tab]
+
+  return (
+    <div className="w-full min-h-full flex flex-col items-stretch">
+      <PageBreadcrumbs>
+        <BreadcrumbList>
+          <BreadcrumbItem>
+            <BreadcrumbLink asChild>
+              <Link href={`/project/${projectRef}/workers`}>{PRODUCT_NAME}</Link>
+            </BreadcrumbLink>
+          </BreadcrumbItem>
+          <BreadcrumbSeparator />
+          <BreadcrumbItem>
+            <BreadcrumbPage>{worker.name}</BreadcrumbPage>
+          </BreadcrumbItem>
+        </BreadcrumbList>
+      </PageBreadcrumbs>
+
+      <PageHeader className="py-4 [&>div]:px-4 [&>div]:xl:px-4">
+        <PageHeaderMeta className="px-0 xl:px-0">
+          <PageHeaderIcon>
+            <Card className="flex h-14 w-14 shrink-0 items-center justify-center">
+              <Container className="h-5 w-5" />
+            </Card>
+          </PageHeaderIcon>
+          <PageHeaderSummary>
+            <PageHeaderTitle>{worker.name}</PageHeaderTitle>
+            <PageHeaderDescription className="flex flex-row flex-wrap items-center gap-x-4 gap-y-1 text-sm">
+              <WorkerStatePill worker={worker} />
+              <RuntimeBadge runtime={worker.runtime} />
+              {worker.imageVersion !== undefined && (
+                <span className="flex items-center gap-2 text-foreground-light">
+                  <Package size={14} strokeWidth={1.5} className="text-foreground-lighter" />
+                  Image {worker.imageVersion}
+                </span>
+              )}
+            </PageHeaderDescription>
+          </PageHeaderSummary>
+        </PageHeaderMeta>
+      </PageHeader>
+      <PageNav>
+        <NavMenu>
+          {WORKER_TABS.map((item) => (
+            <NavMenuItem key={item} active={tab === item}>
+              <button type="button" tabIndex={0} onClick={() => setTab(item)}>
+                {TAB_LABEL[item]}
+              </button>
+            </NavMenuItem>
+          ))}
+        </NavMenu>
+      </PageNav>
+
+      {tab === 'overview' && <WorkerOverviewTab worker={worker} />}
+      {stream !== undefined && (
+        <div className="flex flex-1 flex-col min-h-0">
+          <WorkerLogsTab key={stream} workerName={worker.name} stream={stream} />
+        </div>
+      )}
+    </div>
+  )
+}
diff --git a/apps/studio/components/interfaces/Workers/WorkerDetail/WorkerLogsTab.tsx b/apps/studio/components/interfaces/Workers/WorkerDetail/WorkerLogsTab.tsx
new file mode 100644
index 00000000000..1056bd7295b
--- /dev/null
+++ b/apps/studio/components/interfaces/Workers/WorkerDetail/WorkerLogsTab.tsx
@@ -0,0 +1,92 @@
+import { useQuery } from '@tanstack/react-query'
+import { useParams } from 'common'
+import { RefreshCw } from 'lucide-react'
+import { useState } from 'react'
+import { Button } from 'ui'
+import { GenericSkeletonLoader } from 'ui-patterns/ShimmeringLoader'
+
+import { WorkerCommandLine } from '../WorkerCommandLine'
+import { WorkersLogsColumnRender } from '@/components/interfaces/Settings/Logs/LogColumnRenderers/WorkersLogsColumnRender'
+import type { LogData } from '@/components/interfaces/Settings/Logs/Logs.types'
+import { LogTable } from '@/components/interfaces/Settings/Logs/LogTable'
+import { AlertError } from '@/components/ui/AlertError'
+import {
+  WORKER_LOG_STREAM_LABEL,
+  workerLogsQueryOptions,
+  type WorkerLogStream,
+} from '@/data/workers/worker-logs-query'
+import { CLI_NAME } from '@/lib/constants/workers'
+
+interface WorkerLogsTabProps {
+  workerName: string
+  stream: WorkerLogStream
+}
+
+export const WorkerLogsTab = ({ workerName, stream }: WorkerLogsTabProps) => {
+  const { ref: projectRef } = useParams()
+  const [selectedLog, setSelectedLog] = useState<LogData | null>(null)
+
+  const {
+    data: logs,
+    error,
+    isPending,
+    isError,
+    isFetching,
+    refetch,
+  } = useQuery(workerLogsQueryOptions({ projectRef, name: workerName, stream }))
+
+  const label = WORKER_LOG_STREAM_LABEL[stream].toLowerCase()
+
+  return (
+    <div className="flex flex-1 flex-col min-h-0">
+      <div className="flex items-center justify-end border-b border-default px-4 py-2">
+        <Button
+          variant="default"
+          icon={<RefreshCw />}
+          loading={isFetching}
+          onClick={() => refetch()}
+        >
+          Refresh
+        </Button>
+      </div>
+
+      {isError && (
+        <div className="p-4">
+          <AlertError error={error} subject="Failed to retrieve worker logs" />
+        </div>
+      )}
+
+      {!isError && isPending && (
+        <div className="p-4">
+          <GenericSkeletonLoader />
+        </div>
+      )}
+
+      {!isError && !isPending && (
+        <div className="relative flex flex-1 flex-col grow overflow-auto">
+          <LogTable
+            projectRef={projectRef ?? ''}
+            columnRenderers={WorkersLogsColumnRender}
+            data={logs ?? []}
+            isLoading={isPending}
+            showHeader={false}
+            showHistogramToggle={false}
+            selectedLog={selectedLog ?? undefined}
+            onSelectedLogChange={(log) => setSelectedLog(log)}
+            EmptyState={
+              <div className="mx-auto max-w-md space-y-3 py-16 text-center">
+                <p className="text-sm text-foreground">No {label} in the last 24 hours</p>
+                <p className="text-sm text-foreground-lighter">
+                  Follow them from the Supabase CLI while you wait for traffic.
+                </p>
+                <div className="pt-1 text-left">
+                  <WorkerCommandLine command={`supabase ${CLI_NAME} logs ${workerName} --follow`} />
+                </div>
+              </div>
+            }
+          />
+        </div>
+      )}
+    </div>
+  )
+}
diff --git a/apps/studio/components/interfaces/Workers/WorkerDetail/WorkerOverviewTab.tsx b/apps/studio/components/interfaces/Workers/WorkerDetail/WorkerOverviewTab.tsx
new file mode 100644
index 00000000000..39ee28eb509
--- /dev/null
+++ b/apps/studio/components/interfaces/Workers/WorkerDetail/WorkerOverviewTab.tsx
@@ -0,0 +1,260 @@
+import { ReactNode } from 'react'
+import { Badge } from 'ui'
+import { Admonition } from 'ui-patterns/Admonition'
+import { InfoTooltip } from 'ui-patterns/info-tooltip'
+import { PageContainer } from 'ui-patterns/PageContainer'
+import {
+  PageSection,
+  PageSectionContent,
+  PageSectionDescription,
+  PageSectionMeta,
+  PageSectionSummary,
+  PageSectionTitle,
+} from 'ui-patterns/PageSection'
+
+import { RuntimeBadge } from '../RuntimeBadge'
+import { WorkerCommandLine } from '../WorkerCommandLine'
+import { LISTENING_PORT, WORKERS_REGION_LABEL } from '../Workers.constants'
+import type { Worker } from '../Workers.types'
+import { formatSize, getRuntimeMeta } from '../Workers.utils'
+import { buildWorkerCliCommands } from '../workerSnippets'
+import { WorkerSnippetTabs } from '../WorkerSnippetTabs'
+import { CLI_NAME } from '@/lib/constants/workers'
+
+interface WorkerOverviewTabProps {
+  worker: Worker
+}
+
+const InstanceCount = ({
+  label,
+  value,
+  tooltip,
+}: {
+  label: string
+  value: number
+  tooltip: ReactNode
+}) => (
+  <div className="flex flex-col gap-1 px-5 py-4">
+    <span className="flex items-center gap-1.5 text-sm text-foreground-light">
+      {label}
+      <InfoTooltip side="top" className="max-w-56">
+        {tooltip}
+      </InfoTooltip>
+    </span>
+    <span className="text-2xl tabular-nums text-foreground">{value}</span>
+  </div>
+)
+
+const SettingsRow = ({
+  label,
+  children,
+  isFirst,
+}: {
+  label: string
+  children: ReactNode
+  isFirst?: boolean
+}) => (
+  <div
+    className={`flex items-center justify-between px-4 py-3 ${
+      isFirst ? '' : 'border-t border-default'
+    }`}
+  >
+    <span className="text-sm text-foreground-light">{label}</span>
+    <span className="text-sm text-foreground">{children}</span>
+  </div>
+)
+
+export const WorkerOverviewTab = ({ worker }: WorkerOverviewTabProps) => {
+  const runtime = getRuntimeMeta(worker.runtime)
+  const commands = buildWorkerCliCommands(worker.name)
+
+  return (
+    <PageContainer size="small">
+      {worker.buildState === 'failed' && (
+        <PageSection>
+          <PageSectionContent>
+            <Admonition type="destructive" title="This worker failed to build">
+              <div className="space-y-3">
+                <p>{worker.stateReason ?? 'The build did not complete.'}</p>
+                <WorkerCommandLine
+                  comment="Redeploy after fixing the build"
+                  command={`supabase ${CLI_NAME} push ${worker.name}`}
+                />
+              </div>
+            </Admonition>
+          </PageSectionContent>
+        </PageSection>
+      )}
+
+      {worker.instancesError !== undefined && (
+        <PageSection>
+          <PageSectionContent>
+            <Admonition type="warning" title="Instances reported an error">
+              {worker.instancesError}
+            </Admonition>
+          </PageSectionContent>
+        </PageSection>
+      )}
+
+      <PageSection>
+        <PageSectionMeta>
+          <PageSectionSummary>
+            <PageSectionTitle>Instances</PageSectionTitle>
+          </PageSectionSummary>
+        </PageSectionMeta>
+        <PageSectionContent>
+          {worker.instances === undefined ? (
+            <p className="text-sm text-foreground-light">
+              No instances are running for this worker yet.
+            </p>
+          ) : (
+            <div className="space-y-3">
+              <p className="text-sm text-foreground-light">
+                <span className="tabular-nums text-foreground">{worker.instances.ready}</span> of{' '}
+                <span className="tabular-nums text-foreground">{worker.instances.declared}</span>{' '}
+                instances ready
+              </p>
+              <div className="grid grid-cols-2 divide-x divide-y rounded-md border border-default bg-surface-100 sm:grid-cols-4 sm:divide-y-0">
+                <InstanceCount
+                  label="Instances"
+                  value={worker.instances.declared}
+                  tooltip="The number of instances you configured for this worker."
+                />
+                <InstanceCount
+                  label="Live"
+                  value={worker.instances.live}
+                  tooltip="Instances currently running."
+                />
+                <InstanceCount
+                  label="Ready"
+                  value={worker.instances.ready}
+                  tooltip="Instances passing health checks and serving requests."
+                />
+                <InstanceCount
+                  label="Stale"
+                  value={worker.instances.stale}
+                  tooltip="Instances from a previous deployment, being replaced."
+                />
+              </div>
+            </div>
+          )}
+        </PageSectionContent>
+      </PageSection>
+
+      <PageSection>
+        <PageSectionMeta>
+          <PageSectionSummary>
+            <PageSectionTitle>Container</PageSectionTitle>
+            <PageSectionDescription>
+              The runtime image and entrypoint resolved for this worker.
+            </PageSectionDescription>
+          </PageSectionSummary>
+        </PageSectionMeta>
+        <PageSectionContent>
+          <div className="rounded-md border border-default bg-surface-100">
+            <SettingsRow label="Runtime" isFirst>
+              <RuntimeBadge runtime={worker.runtime} />
+            </SettingsRow>
+            {worker.imageVersion !== undefined && (
+              <SettingsRow label="Image version">
+                <span className="font-mono text-xs text-foreground-light">
+                  {worker.imageVersion}
+                </span>
+              </SettingsRow>
+            )}
+            {runtime !== undefined && (
+              <SettingsRow label="Base image">
+                <span className="font-mono text-xs text-foreground-light">{runtime.baseImage}</span>
+              </SettingsRow>
+            )}
+            {runtime !== undefined && (
+              <SettingsRow label="Entrypoint">
+                <span className="font-mono text-xs text-foreground-light">
+                  {runtime.entrypoint}
+                </span>
+              </SettingsRow>
+            )}
+            <SettingsRow label="Listening port">
+              <span className="font-mono text-xs text-foreground-light">
+                $PORT → {LISTENING_PORT}
+              </span>
+            </SettingsRow>
+          </div>
+        </PageSectionContent>
+      </PageSection>
+
+      <PageSection>
+        <PageSectionMeta>
+          <PageSectionSummary>
+            <PageSectionTitle>Resources</PageSectionTitle>
+          </PageSectionSummary>
+        </PageSectionMeta>
+        <PageSectionContent>
+          <div className="rounded-md border border-default bg-surface-100">
+            <SettingsRow label="Size" isFirst>
+              {formatSize(worker.size)}
+            </SettingsRow>
+            <SettingsRow label="Instances">{worker.declaredInstances}</SettingsRow>
+            <SettingsRow label="Access">
+              {worker.access === 'public' ? (
+                <Badge variant="success">Public</Badge>
+              ) : (
+                <Badge>Private</Badge>
+              )}
+            </SettingsRow>
+            <SettingsRow label="Region">
+              <span className="text-foreground-light">
+                {WORKERS_REGION_LABEL} <span className="text-foreground-lighter">(locked)</span>
+              </span>
+            </SettingsRow>
+          </div>
+        </PageSectionContent>
+      </PageSection>
+
+      <PageSection>
+        <PageSectionMeta>
+          <PageSectionSummary>
+            <PageSectionTitle>How to call</PageSectionTitle>
+            <PageSectionDescription>
+              Call the worker over its gateway URL. Pass your project API key as a bearer token.
+            </PageSectionDescription>
+          </PageSectionSummary>
+        </PageSectionMeta>
+        <PageSectionContent>
+          <WorkerSnippetTabs
+            input={{
+              name: worker.name,
+              runtime: worker.runtime,
+              size: worker.size,
+              access: worker.access,
+              instances: worker.declaredInstances,
+            }}
+            tabs={['cli', 'js', 'python']}
+          />
+        </PageSectionContent>
+      </PageSection>
+
+      <PageSection>
+        <PageSectionMeta>
+          <PageSectionSummary>
+            <PageSectionTitle>Develop locally</PageSectionTitle>
+            <PageSectionDescription>
+              Manage this worker from the Supabase CLI.
+            </PageSectionDescription>
+          </PageSectionSummary>
+        </PageSectionMeta>
+        <PageSectionContent>
+          <div className="space-y-4 rounded-md border border-default bg-surface-100 p-4">
+            {commands.map((command) => (
+              <WorkerCommandLine
+                key={command.command}
+                comment={command.comment}
+                command={command.command}
+              />
+            ))}
+          </div>
+        </PageSectionContent>
+      </PageSection>
+    </PageContainer>
+  )
+}
diff --git a/apps/studio/components/interfaces/Workers/WorkerSnippetTabs.tsx b/apps/studio/components/interfaces/Workers/WorkerSnippetTabs.tsx
index 151050e8fd4..08f181338de 100644
--- a/apps/studio/components/interfaces/Workers/WorkerSnippetTabs.tsx
+++ b/apps/studio/components/interfaces/Workers/WorkerSnippetTabs.tsx
@@ -1,4 +1,5 @@
 import { useParams } from 'common'
+import { FileCode, Sparkles, Terminal, type LucideIcon } from 'lucide-react'
 import { useState } from 'react'
 import { cn } from 'ui'
 
@@ -6,27 +7,31 @@ import { buildWorkerSnippets, type WorkerSnippetInput } from './workerSnippets'
 import CopyButton from '@/components/ui/CopyButton'
 import { useProjectSettingsV2Query } from '@/data/config/project-settings-v2-query'
 
-export type WorkerSnippetTab = 'config' | 'cli' | 'curl' | 'js' | 'python'
+export type WorkerSnippetTab = 'ai' | 'config' | 'cli' | 'js' | 'python'
 
 const TAB_LABEL: Record<WorkerSnippetTab, string> = {
+  ai: 'AI Prompt',
   config: 'config.toml',
   cli: 'CLI',
-  curl: 'cURL',
   js: 'JavaScript',
   python: 'Python',
 }
 
+const TAB_ICON: Record<WorkerSnippetTab, LucideIcon> = {
+  ai: Sparkles,
+  config: FileCode,
+  cli: Terminal,
+  js: FileCode,
+  python: FileCode,
+}
+
 interface WorkerSnippetTabsProps {
   input: Omit<WorkerSnippetInput, 'endpoint' | 'protocol'>
   tabs?: [WorkerSnippetTab, ...WorkerSnippetTab[]]
   className?: string
 }
 
-export const WorkerSnippetTabs = ({
-  input,
-  tabs = ['cli', 'curl'],
-  className,
-}: WorkerSnippetTabsProps) => {
+export const WorkerSnippetTabs = ({ input, tabs = ['cli'], className }: WorkerSnippetTabsProps) => {
   const { ref } = useParams()
   const [active, setActive] = useState<WorkerSnippetTab>(tabs[0])
 
@@ -37,9 +42,9 @@ export const WorkerSnippetTabs = ({
     protocol: settings?.app_config?.protocol,
   })
   const snippetByTab: Record<WorkerSnippetTab, string> = {
+    ai: snippets.aiPrompt,
     config: snippets.configToml,
     cli: snippets.cli,
-    curl: snippets.curl,
     js: snippets.javascript,
     python: snippets.python,
   }
@@ -49,22 +54,26 @@ export const WorkerSnippetTabs = ({
   return (
     <div className={cn('flex flex-col gap-y-2', className)}>
       <div className="flex items-center gap-x-4 border-b border-default">
-        {tabs.map((tab) => (
-          <button
-            key={tab}
-            type="button"
-            tabIndex={0}
-            onClick={() => setActive(tab)}
-            className={cn(
-              '-mb-px border-b px-0.5 py-1.5 text-sm transition-colors',
-              tab === activeTab
-                ? 'border-foreground text-foreground'
-                : 'border-transparent text-foreground-lighter hover:text-foreground-light'
-            )}
-          >
-            {TAB_LABEL[tab]}
-          </button>
-        ))}
+        {tabs.map((tab) => {
+          const Icon = TAB_ICON[tab]
+          return (
+            <button
+              key={tab}
+              type="button"
+              tabIndex={0}
+              onClick={() => setActive(tab)}
+              className={cn(
+                '-mb-px flex items-center gap-1.5 border-b px-0.5 py-1.5 text-sm transition-colors',
+                tab === activeTab
+                  ? 'border-foreground text-foreground'
+                  : 'border-transparent text-foreground-lighter hover:text-foreground-light'
+              )}
+            >
+              <Icon size={14} strokeWidth={1.5} />
+              {TAB_LABEL[tab]}
+            </button>
+          )
+        })}
       </div>
 
       <div className="relative rounded-md border border-default bg-surface-100">
@@ -75,9 +84,15 @@ export const WorkerSnippetTabs = ({
           aria-label="Copy snippet"
           className="absolute right-2 top-2 text-foreground-lighter hover:text-foreground"
         />
-        <pre className="overflow-x-auto p-3 pr-10 font-mono text-xs leading-relaxed text-foreground-light">
-          {value}
-        </pre>
+        {activeTab === 'ai' ? (
+          <p className="overflow-x-auto whitespace-pre-wrap p-3 pr-10 text-sm leading-relaxed text-foreground-light">
+            {value}
+          </p>
+        ) : (
+          <pre className="overflow-x-auto p-3 pr-10 font-mono text-xs leading-relaxed text-foreground-light">
+            {value}
+          </pre>
+        )}
       </div>
     </div>
   )
diff --git a/apps/studio/components/interfaces/Workers/Workers.constants.ts b/apps/studio/components/interfaces/Workers/Workers.constants.ts
index 7c3b911d0f1..f61b6e3e5a3 100644
--- a/apps/studio/components/interfaces/Workers/Workers.constants.ts
+++ b/apps/studio/components/interfaces/Workers/Workers.constants.ts
@@ -5,7 +5,62 @@ export const WORKERS_REGION = 'us-west-2'
 export const WORKERS_REGION_LABEL = 'US West (Oregon)'
 export const WORKERS_REGION_SHORT = 'US West'
 
-// Workers answer on the project's own domain, alongside /functions/v1.
+// Sizes are fixed at deploy time — matches the `size` values the API accepts.
+export const WORKER_SIZES = ['2gb-1vcpu', '4gb-2vcpu'] as const
+
+export const WORKER_NAME_WORDS = [
+  'swift',
+  'nimble',
+  'brisk',
+  'bold',
+  'sleek',
+  'vivid',
+  'lucid',
+  'crisp',
+  'keen',
+  'agile',
+  'fierce',
+  'bright',
+  'orchid',
+  'lotus',
+  'iris',
+  'dahlia',
+  'tulip',
+  'jasmine',
+  'magnolia',
+  'azalea',
+  'poppy',
+  'marigold',
+  'hibiscus',
+  'camellia',
+  'synergy',
+  'bloom',
+  'scalable',
+  'pivot',
+  'paradigm',
+  'holistic',
+  'leverage',
+  'stream',
+  'viral',
+  'turnkey',
+  'quantum',
+  'photon',
+  'nebula',
+  'comet',
+  'orbit',
+  'cosmos',
+  'meteor',
+  'pulsar',
+  'quasar',
+  'vector',
+  'cipher',
+  'nova',
+  'zenith',
+  'warp',
+  'rocket',
+  'stellar',
+] as const
+
 export const workerUrl = ({
   endpoint,
   protocol = 'https',
@@ -59,6 +114,8 @@ export const RUNTIMES: Record<string, RuntimeMeta> = {
   },
 }
 
+export const WORKER_DEPLOYABLE_RUNTIMES = ['node', 'deno', 'dockerfile'] as const
+
 interface WorkerStateMeta {
   label: string
   dotClassName: string
diff --git a/apps/studio/components/interfaces/Workers/Workers.types.ts b/apps/studio/components/interfaces/Workers/Workers.types.ts
index 16fa531860a..629f5d34df5 100644
--- a/apps/studio/components/interfaces/Workers/Workers.types.ts
+++ b/apps/studio/components/interfaces/Workers/Workers.types.ts
@@ -1,6 +1,6 @@
 import type { components } from 'api-types'
 
-type WorkerAttributes = components['schemas']['V2WorkerResponse']['data']['attributes']
+type WorkerAttributes = components['schemas']['V2WorkerResponse_Output']['data']['attributes']
 
 export type WorkerBuildState = WorkerAttributes['build_state']
 
diff --git a/apps/studio/components/interfaces/Workers/Workers.utils.test.ts b/apps/studio/components/interfaces/Workers/Workers.utils.test.ts
index 275f0763f5c..da791ba0349 100644
--- a/apps/studio/components/interfaces/Workers/Workers.utils.test.ts
+++ b/apps/studio/components/interfaces/Workers/Workers.utils.test.ts
@@ -1,12 +1,13 @@
 import { describe, expect, it } from 'vitest'
 
-import { getWorkerStateMeta, workerUrl } from './Workers.constants'
+import { getWorkerStateMeta, WORKER_NAME_WORDS, workerUrl } from './Workers.constants'
 import type { Worker } from './Workers.types'
 import {
   filterWorkers,
   formatResources,
   formatRuntime,
   formatSize,
+  generateWorkerName,
   getPage,
   isWorkersForbidden,
   isWorkersUnavailable,
@@ -163,6 +164,19 @@ describe('workerUrl', () => {
   })
 })
 
+describe('generateWorkerName', () => {
+  it('produces a name that already passes the CLI naming rules', () => {
+    const name = generateWorkerName()
+    expect(name).toMatch(/^worker-[a-z]+-\d{6}$/)
+    expect(WORKER_NAME_WORDS).toContain(name.split('-')[1])
+  })
+
+  it('varies across calls', () => {
+    const names = new Set(Array.from({ length: 20 }, () => generateWorkerName()))
+    expect(names.size).toBeGreaterThan(1)
+  })
+})
+
 describe('getWorkerStateMeta', () => {
   it('labels every build state', () => {
     expect(getWorkerStateMeta(worker({ name: 'a', buildState: 'building' })).label).toBe('Building')
diff --git a/apps/studio/components/interfaces/Workers/Workers.utils.ts b/apps/studio/components/interfaces/Workers/Workers.utils.ts
index d0f32d15edf..ddbcae1ee20 100644
--- a/apps/studio/components/interfaces/Workers/Workers.utils.ts
+++ b/apps/studio/components/interfaces/Workers/Workers.utils.ts
@@ -1,4 +1,4 @@
-import { RUNTIMES, type RuntimeMeta } from './Workers.constants'
+import { RUNTIMES, WORKER_NAME_WORDS, type RuntimeMeta } from './Workers.constants'
 import type { Worker, WorkerAccess, WorkerBuildState } from './Workers.types'
 import { ResponseError } from '@/types'
 
@@ -54,6 +54,13 @@ export const formatSize = (size: string): string => {
 export const formatResources = (worker: Worker): string =>
   `${formatSize(worker.size)} · ${worker.declaredInstances} inst`
 
+// Suggests a friendly, already-valid starting name so the deploy dialog isn't blank.
+export const generateWorkerName = (): string => {
+  const word = WORKER_NAME_WORDS[Math.floor(Math.random() * WORKER_NAME_WORDS.length)]
+  const number = Math.floor(Math.random() * 900000) + 100000
+  return `worker-${word}-${number}`
+}
+
 // A project outside the alpha allow-list gets a 404, not a 403.
 export const isWorkersUnavailable = (error: Error | null): boolean =>
   error instanceof ResponseError && error.code === 404
diff --git a/apps/studio/components/interfaces/Workers/workerSnippets.test.ts b/apps/studio/components/interfaces/Workers/workerSnippets.test.ts
index 283d93e8bd7..7070d5f014d 100644
--- a/apps/studio/components/interfaces/Workers/workerSnippets.test.ts
+++ b/apps/studio/components/interfaces/Workers/workerSnippets.test.ts
@@ -10,25 +10,21 @@ const input = (overrides: Partial<Parameters<typeof buildWorkerSnippets>[0]> = {
 })
 
 describe('buildWorkerSnippets', () => {
-  it('points every call snippet at the worker URL', () => {
-    const { curl, javascript, python } = buildWorkerSnippets(input({ name: 'embed' }))
+  it('points the invoke examples at the worker URL', () => {
+    const { javascript, python } = buildWorkerSnippets(input({ name: 'embed' }))
     const url = 'https://abcdefgh.supabase.co/workers/v1/embed'
 
-    expect(curl).toContain(`'${url}'`)
     expect(javascript).toContain(`'${url}'`)
     expect(python).toContain(`"${url}"`)
   })
 
-  it('leaves a placeholder URL until the project settings resolve', () => {
-    const { curl } = buildWorkerSnippets(input({ endpoint: undefined }))
-    expect(curl).toContain('[YOUR WORKER URL]')
+  it('leaves a placeholder invoke URL until the project settings resolve', () => {
+    const { javascript } = buildWorkerSnippets(input({ endpoint: undefined }))
+    expect(javascript).toContain('[YOUR WORKER URL]')
   })
 
-  it('asks for the anon key on a public worker and the service role key on a private one', () => {
-    expect(buildWorkerSnippets(input({ access: 'public' })).curl).toContain('[YOUR ANON KEY]')
-    expect(buildWorkerSnippets(input({ access: 'private' })).curl).toContain(
-      '[YOUR SERVICE ROLE KEY]'
-    )
+  it('asks for the anon key to invoke a public worker and the service role key for a private one', () => {
+    expect(buildWorkerSnippets(input({ access: 'public' })).javascript).toContain('[YOUR ANON KEY]')
     expect(buildWorkerSnippets(input({ access: 'private' })).javascript).toContain(
       '[YOUR SERVICE ROLE KEY]'
     )
diff --git a/apps/studio/components/interfaces/Workers/workerSnippets.ts b/apps/studio/components/interfaces/Workers/workerSnippets.ts
index cbcc6e2beb7..de89c173050 100644
--- a/apps/studio/components/interfaces/Workers/workerSnippets.ts
+++ b/apps/studio/components/interfaces/Workers/workerSnippets.ts
@@ -1,4 +1,4 @@
-import { WORKERS_REGION, workerUrl } from './Workers.constants'
+import { RUNTIMES, WORKERS_REGION, workerUrl } from './Workers.constants'
 import type { WorkerAccess } from './Workers.types'
 import { formatSize } from './Workers.utils'
 import { CLI_NAME } from '@/lib/constants/workers'
@@ -14,9 +14,9 @@ export interface WorkerSnippetInput {
 }
 
 export interface WorkerSnippets {
+  aiPrompt: string
   configToml: string
   cli: string
-  curl: string
   javascript: string
   python: string
 }
@@ -40,12 +40,13 @@ export function buildWorkerSnippets(input: WorkerSnippetInput): WorkerSnippets {
 
   const cli = [
     `supabase ${CLI_NAME} new ${name} --runtime ${runtime}`,
-    `supabase ${CLI_NAME} push ${name}`,
+    // size comes from config.toml — push has no flag for it. Same for access: the CLI
+    // doesn't have a route to a private worker yet, so this always deploys as public.
+    `supabase ${CLI_NAME} push ${name} --instances ${input.instances}`,
+    ...(input.access === 'private' ? [`# note: the CLI can only deploy public workers today`] : []),
   ].join('\n')
 
-  const configToml = [
-    `# supabase/config.toml`,
-    ``,
+  const configBlock = [
     `[${CLI_NAME}.${name}]`,
     `runtime   = "${runtime}"`,
     `size      = "${input.size}"    # ${formatSize(input.size)}`,
@@ -54,16 +55,26 @@ export function buildWorkerSnippets(input: WorkerSnippetInput): WorkerSnippets {
     `# region is locked to ${WORKERS_REGION} at alpha`,
   ].join('\n')
 
-  const authHeader =
-    input.access === 'public'
-      ? `  -H 'Authorization: Bearer [YOUR ANON KEY]' \\`
-      : `  -H 'Authorization: Bearer [YOUR SERVICE ROLE KEY]' \\`
+  const configToml = [`# supabase/config.toml`, ``, configBlock].join('\n')
 
-  const curl = [
-    `curl -L -X POST '${url}' \\`,
-    authHeader,
-    `  -H 'Content-Type: application/json' \\`,
-    `  --data '{"name":"world"}'`,
+  const runtimeMeta = RUNTIMES[runtime] ?? RUNTIMES.node
+  // The entrypoint metadata is "<run command> <filename>" — the filename is the last token.
+  const entrypointFile = runtimeMeta.entrypoint.split(' ').pop()
+
+  const aiPrompt = [
+    `Scaffold and deploy a Supabase Workers worker named "${name}" using the ${runtimeMeta.label} runtime:`,
+    ``,
+    `1. Create a supabase/${CLI_NAME}/${name}/ directory with a ${runtimeMeta.label} entrypoint (${entrypointFile}) that responds with "Hello, world!".`,
+    ``,
+    `2. Add this block to supabase/config.toml:`,
+    '```toml',
+    configBlock,
+    '```',
+    ``,
+    `3. Run \`supabase ${CLI_NAME} push ${name}\` to deploy it.`,
+    ...(input.access === 'private'
+      ? [``, `Note: the CLI can only deploy public workers today.`]
+      : []),
   ].join('\n')
 
   const keyPlaceholder = input.access === 'public' ? '[YOUR ANON KEY]' : '[YOUR SERVICE ROLE KEY]'
@@ -91,7 +102,7 @@ export function buildWorkerSnippets(input: WorkerSnippetInput): WorkerSnippets {
     `print(res.json())`,
   ].join('\n')
 
-  return { configToml, cli, curl, javascript, python }
+  return { aiPrompt, configToml, cli, javascript, python }
 }
 
 export interface WorkerCliCommand {
@@ -103,7 +114,6 @@ export function buildWorkerCliCommands(name: string): WorkerCliCommand[] {
   const slug = safeName(name)
   return [
     { comment: 'Recreate the source locally', command: `supabase ${CLI_NAME} pull ${slug}` },
-    { comment: 'Run it locally on a port', command: `supabase ${CLI_NAME} serve ${slug}` },
     { comment: 'Deploy a new version', command: `supabase ${CLI_NAME} push ${slug}` },
     { comment: 'Stream logs', command: `supabase ${CLI_NAME} logs ${slug} --follow` },
     { comment: 'Delete the worker', command: `supabase ${CLI_NAME} delete ${slug}` },
diff --git a/apps/studio/components/layouts/APIKeys/APIKeysLayout.test.tsx b/apps/studio/components/layouts/APIKeys/APIKeysLayout.test.tsx
new file mode 100644
index 00000000000..9dffd1d9b6d
--- /dev/null
+++ b/apps/studio/components/layouts/APIKeys/APIKeysLayout.test.tsx
@@ -0,0 +1,51 @@
+import { screen } from '@testing-library/react'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+
+import ApiKeysLayout from './APIKeysLayout'
+import { customRender } from '@/tests/lib/custom-render'
+
+const { mockUseHighAvailability } = vi.hoisted(() => ({
+  mockUseHighAvailability: vi.fn(),
+}))
+
+vi.mock('@/hooks/misc/useHighAvailability', () => ({
+  useHighAvailability: mockUseHighAvailability,
+}))
+
+const LEGACY_TAB = 'Legacy anon, service_role API keys'
+const NEW_TAB = 'Publishable and secret API keys'
+
+describe('ApiKeysLayout', () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+  })
+
+  it('hides the legacy keys tab on High Availability projects', () => {
+    mockUseHighAvailability.mockReturnValue({ isHighAvailability: true, isPending: false })
+
+    customRender(
+      <ApiKeysLayout>
+        <div>content</div>
+      </ApiKeysLayout>
+    )
+
+    expect(screen.getByText(NEW_TAB)).toBeInTheDocument()
+    expect(screen.queryByText(LEGACY_TAB)).not.toBeInTheDocument()
+  })
+
+  it('shows the legacy keys tab on other projects', () => {
+    mockUseHighAvailability.mockReturnValue({ isHighAvailability: false, isPending: false })
+
+    customRender(
+      <ApiKeysLayout>
+        <div>content</div>
+      </ApiKeysLayout>
+    )
+
+    expect(screen.getByText(NEW_TAB)).toBeInTheDocument()
+    expect(screen.getByRole('link', { name: LEGACY_TAB })).toHaveAttribute(
+      'href',
+      '/project/default/settings/api-keys/legacy'
+    )
+  })
+})
diff --git a/apps/studio/components/layouts/APIKeys/APIKeysLayout.tsx b/apps/studio/components/layouts/APIKeys/APIKeysLayout.tsx
index 2d396b6db25..1e5b382d023 100644
--- a/apps/studio/components/layouts/APIKeys/APIKeysLayout.tsx
+++ b/apps/studio/components/layouts/APIKeys/APIKeysLayout.tsx
@@ -4,10 +4,12 @@ import { PropsWithChildren } from 'react'
 import { PageLayout } from '@/components/layouts/PageLayout/PageLayout'
 import { ScaffoldContainer } from '@/components/layouts/Scaffold'
 import { DocsButton } from '@/components/ui/DocsButton'
+import { useHighAvailability } from '@/hooks/misc/useHighAvailability'
 import { DOCS_URL } from '@/lib/constants'
 
 const ApiKeysLayout = ({ children }: PropsWithChildren) => {
   const { ref: projectRef } = useParams()
+  const { isHighAvailability } = useHighAvailability()
 
   const navigationItems = [
     {
@@ -15,11 +17,15 @@ const ApiKeysLayout = ({ children }: PropsWithChildren) => {
       href: `/project/${projectRef}/settings/api-keys`,
       id: 'new-keys',
     },
-    {
-      label: 'Legacy anon, service_role API keys',
-      href: `/project/${projectRef}/settings/api-keys/legacy`,
-      id: 'legacy-keys',
-    },
+    ...(isHighAvailability
+      ? []
+      : [
+          {
+            label: 'Legacy anon, service_role API keys',
+            href: `/project/${projectRef}/settings/api-keys/legacy`,
+            id: 'legacy-keys',
+          },
+        ]),
   ]
 
   return (
diff --git a/apps/studio/components/layouts/AppLayout/BranchDropdownCommandContent.tsx b/apps/studio/components/layouts/AppLayout/BranchDropdownCommandContent.tsx
index 450be351cda..7fdd5b299ed 100644
--- a/apps/studio/components/layouts/AppLayout/BranchDropdownCommandContent.tsx
+++ b/apps/studio/components/layouts/AppLayout/BranchDropdownCommandContent.tsx
@@ -14,6 +14,7 @@ import {
 } from 'ui'
 
 import { BranchLink } from './BranchLink'
+import { CommandItemLink } from '@/components/ui/CommandItemLink'
 import type { Branch } from '@/data/branches/branches-query'
 import { useTrack } from '@/lib/telemetry/track'
 
@@ -149,48 +150,34 @@ export function BranchDropdownCommandContent({
               <p>Create branch</p>
             </div>
           </CommandItem>
-          <CommandItem
-            className="cursor-pointer w-full"
+          <CommandItemLink
+            href={`/project/${projectRef}/branches`}
+            className="cursor-pointer w-full gap-2"
             onSelect={() => {
               track('branch_selector_manage_clicked')
               onClose()
             }}
           >
-            <Link
-              href={`/project/${projectRef}/branches`}
-              className="w-full flex items-center gap-2"
-            >
-              <ListTree size={14} strokeWidth={1.5} />
-              <p>Manage branches</p>
-            </Link>
-          </CommandItem>
+            <ListTree size={14} strokeWidth={1.5} />
+            <p>Manage branches</p>
+          </CommandItemLink>
         </CommandGroup>
 
         <CommandSeparator />
 
         <CommandGroup>
-          <CommandItem
-            className="cursor-pointer w-full"
-            onSelect={() => {
-              onClose()
-              window?.open(BRANCHING_GITHUB_DISCUSSION_LINK, '_blank')?.focus()
-            }}
-            onClick={onClose}
+          <CommandItemLink
+            href={BRANCHING_GITHUB_DISCUSSION_LINK}
+            linkProps={{ target: '_blank', rel: 'noreferrer noopener' }}
+            className="cursor-pointer w-full gap-2"
+            onSelect={onClose}
           >
-            <a
-              target="_blank"
-              rel="noreferrer noopener"
-              href={BRANCHING_GITHUB_DISCUSSION_LINK}
-              onClick={onClose}
-              className="w-full flex gap-2"
-            >
-              <MessageCircle size={14} strokeWidth={1} className="mt-0.5" />
-              <div>
-                <p>Branching feedback</p>
-                <p className="text-lighter">Join GitHub Discussion</p>
-              </div>
-            </a>
-          </CommandItem>
+            <MessageCircle size={14} strokeWidth={1} className="mt-0.5" />
+            <div>
+              <p>Branching feedback</p>
+              <p className="text-lighter">Join GitHub Discussion</p>
+            </div>
+          </CommandItemLink>
         </CommandGroup>
       </CommandList>
     </Command>
diff --git a/apps/studio/components/layouts/AppLayout/BranchLink.tsx b/apps/studio/components/layouts/AppLayout/BranchLink.tsx
index aa65952f733..232de90dfc0 100644
--- a/apps/studio/components/layouts/AppLayout/BranchLink.tsx
+++ b/apps/studio/components/layouts/AppLayout/BranchLink.tsx
@@ -1,9 +1,8 @@
 import { Check, Shield } from 'lucide-react'
-import Link from 'next/link'
 import { useRouter } from 'next/router'
-import { CommandItem } from 'ui'
 
 import { sanitizeRoute } from './ProjectDropdown.utils'
+import { CommandItemLink } from '@/components/ui/CommandItemLink'
 import type { Branch } from '@/data/branches/branches-query'
 import { useTrack } from '@/lib/telemetry/track'
 
@@ -21,24 +20,23 @@ export function BranchLink({ branch, isSelected, onClose }: BranchLinkProps) {
     sanitizedRoute?.replace('[ref]', branch.project_ref) ?? `/project/${branch.project_ref}`
 
   return (
-    <Link passHref href={href}>
-      <CommandItem
-        value={branch.name.replaceAll('"', '')}
-        className="cursor-pointer w-full flex items-center justify-between text-sm md:text-xs p-2 md:py-1.5 md:px-2"
-        onSelect={() => {
-          track('branch_selector_branch_clicked', {
-            branchId: branch.id,
-            branchName: branch.name,
-          })
-          onClose()
-        }}
-      >
-        <p className="truncate w-60 flex items-center gap-1" title={branch.name}>
-          {branch.is_default && <Shield size={14} className="text-amber-900" />}
-          {branch.name}
-        </p>
-        {isSelected && <Check size={14} strokeWidth={1.5} />}
-      </CommandItem>
-    </Link>
+    <CommandItemLink
+      href={href}
+      value={branch.name.replaceAll('"', '')}
+      className="cursor-pointer w-full flex items-center justify-between text-sm md:text-xs p-2 md:py-1.5 md:px-2"
+      onSelect={() => {
+        track('branch_selector_branch_clicked', {
+          branchId: branch.id,
+          branchName: branch.name,
+        })
+        onClose()
+      }}
+    >
+      <p className="truncate w-60 flex items-center gap-1" title={branch.name}>
+        {branch.is_default && <Shield size={14} className="text-amber-900" />}
+        {branch.name}
+      </p>
+      {isSelected && <Check size={14} strokeWidth={1.5} />}
+    </CommandItemLink>
   )
 }
diff --git a/apps/studio/components/layouts/AppLayout/OrgCommandItem.tsx b/apps/studio/components/layouts/AppLayout/OrgCommandItem.tsx
index a4a0e712248..226e6612353 100644
--- a/apps/studio/components/layouts/AppLayout/OrgCommandItem.tsx
+++ b/apps/studio/components/layouts/AppLayout/OrgCommandItem.tsx
@@ -1,7 +1,7 @@
 import { Check } from 'lucide-react'
-import Link from 'next/link'
-import { cn, CommandItem } from 'ui'
+import { cn } from 'ui'
 
+import { CommandItemLink } from '@/components/ui/CommandItemLink'
 import PartnerIcon from '@/components/ui/PartnerIcon'
 import type { Organization } from '@/types'
 
@@ -25,25 +25,21 @@ export function OrgCommandItem({
   const href = hasRouteSlug ? routePathname.replace('[slug]', org.slug) : `/org/${org.slug}`
 
   return (
-    <CommandItem
+    <CommandItemLink
       key={org.slug}
+      href={href}
       value={`${org.name.replaceAll('"', '')} - ${org.slug}`}
-      className="cursor-pointer w-full"
-      onSelect={() => onClose()}
+      className={cn(
+        'cursor-pointer w-full flex items-center justify-between text-sm md:text-xs',
+        !compactPadding && 'p-0.5'
+      )}
+      onSelect={onClose}
     >
-      <Link
-        href={href}
-        className={cn(
-          'w-full flex items-center justify-between text-sm md:text-xs',
-          !compactPadding && 'p-0.5'
-        )}
-      >
-        <div className="flex items-center gap-2">
-          <span>{org.name}</span>
-          <PartnerIcon organization={org} />
-        </div>
-        {org.slug === selectedSlug && <Check size={16} />}
-      </Link>
-    </CommandItem>
+      <div className="flex items-center gap-2">
+        <span>{org.name}</span>
+        <PartnerIcon organization={org} />
+      </div>
+      {org.slug === selectedSlug && <Check size={16} />}
+    </CommandItemLink>
   )
 }
diff --git a/apps/studio/components/layouts/AppLayout/OrganizationDropdown.test.tsx b/apps/studio/components/layouts/AppLayout/OrganizationDropdown.test.tsx
index dbe0ed14b76..8a052481b2f 100644
--- a/apps/studio/components/layouts/AppLayout/OrganizationDropdown.test.tsx
+++ b/apps/studio/components/layouts/AppLayout/OrganizationDropdown.test.tsx
@@ -72,4 +72,16 @@ describe('OrganizationDropdown', () => {
     const selectedLink = screen.getByRole('link', { name: /org one/i })
     expect(within(selectedLink).queryByTestId('partner-icon')).toBeNull()
   })
+
+  it('renders organization command items as links', () => {
+    mockUseSelectedOrganizationQuery.mockReturnValue({
+      data: createMockOrganization({ slug: 'org-one', name: 'Org One' }),
+    })
+
+    render(<OrganizationDropdown embedded />)
+
+    const organizationLink = screen.getByRole('link', { name: /org two/i })
+    expect(within(organizationLink).getByRole('option')).toBeInTheDocument()
+    expect(organizationLink).toHaveAttribute('href', '/org/org-two')
+  })
 })
diff --git a/apps/studio/components/layouts/AppLayout/OrganizationDropdownCommandContent.tsx b/apps/studio/components/layouts/AppLayout/OrganizationDropdownCommandContent.tsx
index 3afda1fe77c..687112b551d 100644
--- a/apps/studio/components/layouts/AppLayout/OrganizationDropdownCommandContent.tsx
+++ b/apps/studio/components/layouts/AppLayout/OrganizationDropdownCommandContent.tsx
@@ -7,13 +7,13 @@ import {
   CommandEmpty,
   CommandGroup,
   CommandInput,
-  CommandItem,
   CommandList,
   CommandSeparator,
   ScrollArea,
 } from 'ui'
 
 import { OrgCommandItem } from './OrgCommandItem'
+import { CommandItemLink } from '@/components/ui/CommandItemLink'
 import type { Organization } from '@/types'
 
 export interface OrganizationDropdownCommandContentProps {
@@ -109,22 +109,26 @@ export function OrganizationDropdownCommandContent({
         </CommandGroup>
         <CommandSeparator />
         <CommandGroup>
-          <CommandItem className="cursor-pointer w-full" onSelect={() => onClose()}>
-            <Link href="/organizations" className="flex items-center gap-2 w-full">
-              All Organizations
-            </Link>
-          </CommandItem>
+          <CommandItemLink
+            href="/organizations"
+            className="cursor-pointer w-full gap-2"
+            onSelect={onClose}
+          >
+            All Organizations
+          </CommandItemLink>
         </CommandGroup>
         {organizationCreationEnabled && (
           <>
             <CommandSeparator />
             <CommandGroup>
-              <CommandItem className="cursor-pointer w-full" onSelect={() => onClose()}>
-                <Link href="/new" className="flex items-center gap-2 w-full">
-                  <Plus size={14} strokeWidth={1.5} />
-                  <p>New organization</p>
-                </Link>
-              </CommandItem>
+              <CommandItemLink
+                href="/new"
+                className="cursor-pointer w-full gap-2"
+                onSelect={onClose}
+              >
+                <Plus size={14} strokeWidth={1.5} />
+                <p>New organization</p>
+              </CommandItemLink>
             </CommandGroup>
           </>
         )}
diff --git a/apps/studio/components/layouts/AppLayout/ProjectDropdown.test.tsx b/apps/studio/components/layouts/AppLayout/ProjectDropdown.test.tsx
index 667e6ab3a20..8678e6e4602 100644
--- a/apps/studio/components/layouts/AppLayout/ProjectDropdown.test.tsx
+++ b/apps/studio/components/layouts/AppLayout/ProjectDropdown.test.tsx
@@ -1,15 +1,21 @@
 import { screen } from '@testing-library/react'
+import type { ComponentProps } from 'react'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 
 import { ProjectDropdown } from './ProjectDropdown'
+import type { OrganizationProjectSelector } from '@/components/ui/OrganizationProjectSelector'
 import { MANAGED_BY } from '@/lib/constants/infrastructure'
 import { createMockOrganization, render } from '@/tests/helpers'
 
-const { mockSelectedOrganization, mockSelectedProject, mockSelectorProject } = vi.hoisted(() => ({
-  mockSelectedOrganization: vi.fn(),
-  mockSelectedProject: vi.fn(),
-  mockSelectorProject: vi.fn(),
-}))
+type OrganizationProjectSelectorProps = ComponentProps<typeof OrganizationProjectSelector>
+
+const { mockSelectedOrganization, mockSelectedProject, mockSelectorProject, mockSelectorProps } =
+  vi.hoisted(() => ({
+    mockSelectedOrganization: vi.fn(),
+    mockSelectedProject: vi.fn(),
+    mockSelectorProject: vi.fn(),
+    mockSelectorProps: vi.fn(),
+  }))
 
 const mockPush = vi.hoisted(() => vi.fn())
 
@@ -54,12 +60,22 @@ vi.mock('@/hooks/misc/useIsFeatureEnabled', () => ({
 }))
 
 vi.mock('@/components/ui/OrganizationProjectSelector', () => ({
-  OrganizationProjectSelector: ({ renderRow, renderTrigger }: any) => (
-    <div>
-      <div data-testid="project-selector-trigger">{renderTrigger?.({})}</div>
-      <div data-testid="project-selector-row">{renderRow?.(mockSelectorProject())}</div>
-    </div>
-  ),
+  OrganizationProjectSelector: (props: OrganizationProjectSelectorProps) => {
+    mockSelectorProps(props)
+    return (
+      <div>
+        <div data-testid="project-selector-trigger">
+          {props.renderTrigger?.({
+            isLoading: false,
+            project: mockSelectorProject(),
+            listboxId: 'project-selector-listbox',
+            open: false,
+          })}
+        </div>
+        <div data-testid="project-selector-row">{props.renderRow?.(mockSelectorProject())}</div>
+      </div>
+    )
+  },
 }))
 
 vi.mock('@/components/ui/PartnerIcon', () => ({
@@ -166,4 +182,12 @@ describe('ProjectDropdown', () => {
       MANAGED_BY.VERCEL_MARKETPLACE
     )
   })
+
+  it('provides project command items with links that preserve the current route', () => {
+    render(<ProjectDropdown />)
+
+    const selectorProps = mockSelectorProps.mock.lastCall?.[0]
+    expect(selectorProps.getItemHref({ ref: 'proj_2' })).toBe('/project/proj_2/settings')
+    expect(selectorProps.onSelect).toBeUndefined()
+  })
 })
diff --git a/apps/studio/components/layouts/AppLayout/ProjectDropdown.tsx b/apps/studio/components/layouts/AppLayout/ProjectDropdown.tsx
index b5c6ec77c60..8f1a7890880 100644
--- a/apps/studio/components/layouts/AppLayout/ProjectDropdown.tsx
+++ b/apps/studio/components/layouts/AppLayout/ProjectDropdown.tsx
@@ -4,13 +4,14 @@ import Link from 'next/link'
 import { useRouter } from 'next/router'
 import type { ComponentProps } from 'react'
 import { useState } from 'react'
-import { Button, CommandGroup, CommandItem } from 'ui'
+import { Button, CommandGroup } from 'ui'
 import { ShimmeringLoader } from 'ui-patterns/ShimmeringLoader'
 
 import { AppLayoutDropdownTriggerButton } from './AppLayoutDropdown'
 import { sanitizeRoute } from './ProjectDropdown.utils'
 import { ProjectRowLink } from './ProjectRowLink'
 import { useEmbeddedCloseHandler } from './useEmbeddedCloseHandler'
+import { CommandItemLink } from '@/components/ui/CommandItemLink'
 import { OrganizationProjectSelector } from '@/components/ui/OrganizationProjectSelector'
 import PartnerIcon from '@/components/ui/PartnerIcon'
 import { getManagedByFromOrganizationPartner } from '@/data/organizations/managed-by-utils'
@@ -29,14 +30,12 @@ interface ProjectDropdownNewProjectActionsProps {
   organizationSlug: string | undefined
   embedded: boolean
   onClose: () => void
-  onNavigate: (href: string) => void
 }
 
 function ProjectDropdownNewProjectActions({
   organizationSlug,
   embedded,
   onClose,
-  onNavigate,
 }: ProjectDropdownNewProjectActionsProps) {
   const href = `/new/${organizationSlug}`
 
@@ -62,19 +61,10 @@ function ProjectDropdownNewProjectActions({
 
   return (
     <CommandGroup>
-      <CommandItem
-        className="cursor-pointer w-full"
-        onSelect={() => {
-          onClose()
-          onNavigate(href)
-        }}
-        onClick={onClose}
-      >
-        <Link href={href} onClick={onClose} className="w-full flex items-center gap-2">
-          <Plus size={14} strokeWidth={1.5} />
-          <p>New project</p>
-        </Link>
-      </CommandItem>
+      <CommandItemLink href={href} className="cursor-pointer w-full gap-2" onSelect={onClose}>
+        <Plus size={14} strokeWidth={1.5} />
+        <p>New project</p>
+      </CommandItemLink>
     </CommandGroup>
   )
 }
@@ -173,19 +163,12 @@ export const ProjectDropdown = ({
     open,
     setOpen: handleSetOpen,
     selectedRef: ref,
-    onSelect: (project: { ref: string }) => {
+    getItemHref: (project: { ref: string }) => {
       const sanitizedRoute = sanitizeRoute(router.route, router.query)
-      const href = sanitizedRoute?.replace('[ref]', project.ref) ?? `/project/${project.ref}`
-      close()
-      router.push(href)
+      return sanitizedRoute?.replace('[ref]', project.ref) ?? `/project/${project.ref}`
     },
     renderRow: (project: Pick<OrgProject, 'ref' | 'name' | 'status' | 'integration_source'>) => (
-      <ProjectRowLink
-        project={project}
-        selectedRef={ref}
-        route={router.route}
-        routerQueries={router.query}
-      />
+      <ProjectRowLink project={project} selectedRef={ref} />
     ),
     renderActions: (_setOpen: (value: boolean) => void, options?: { embedded?: boolean }) =>
       projectCreationEnabled ? (
@@ -193,7 +176,6 @@ export const ProjectDropdown = ({
           organizationSlug={selectedOrganization?.slug}
           embedded={options?.embedded ?? false}
           onClose={close}
-          onNavigate={(href) => router.push(href)}
         />
       ) : null,
   }
diff --git a/apps/studio/components/layouts/AppLayout/ProjectRowLink.tsx b/apps/studio/components/layouts/AppLayout/ProjectRowLink.tsx
index 67d0fee67aa..80112176202 100644
--- a/apps/studio/components/layouts/AppLayout/ProjectRowLink.tsx
+++ b/apps/studio/components/layouts/AppLayout/ProjectRowLink.tsx
@@ -1,9 +1,6 @@
-import { ParsedUrlQuery } from 'querystring'
 import { Check } from 'lucide-react'
-import Link from 'next/link'
 import { Badge, cn } from 'ui'
 
-import { sanitizeRoute } from './ProjectDropdown.utils'
 import PartnerIcon from '@/components/ui/PartnerIcon'
 import { getManagedByFromOrganizationPartner } from '@/data/organizations/managed-by-utils'
 
@@ -15,27 +12,15 @@ export interface ProjectRowLinkProps {
     integration_source?: string | null
   }
   selectedRef: string | undefined
-  route: string
-  routerQueries: ParsedUrlQuery
 }
 
-export function ProjectRowLink({
-  project,
-  selectedRef,
-  route,
-  routerQueries,
-}: ProjectRowLinkProps) {
-  const sanitizedRoute = sanitizeRoute(route, routerQueries)
-  const href = sanitizedRoute?.replace('[ref]', project.ref) ?? `/project/${project.ref}`
+export function ProjectRowLink({ project, selectedRef }: ProjectRowLinkProps) {
   const isSelected = project.ref === selectedRef
   const isPaused = project.status === 'INACTIVE'
   const managedBy = getManagedByFromOrganizationPartner(undefined, project.integration_source)
 
   return (
-    <Link
-      href={href}
-      className="w-full flex items-center justify-between p-0.5 md:p-0 text-sm md:text-xs"
-    >
+    <div className="w-full flex items-center justify-between p-0.5 md:p-0 text-sm md:text-xs">
       <span
         className={cn(
           'flex items-center gap-2 min-w-0',
@@ -47,6 +32,6 @@ export function ProjectRowLink({
         <PartnerIcon organization={{ managed_by: managedBy }} />
       </span>
       {isSelected && <Check size={16} />}
-    </Link>
+    </div>
   )
 }
diff --git a/apps/studio/components/layouts/EdgeFunctionsLayout/EdgeFunctionDetailsLayout.tsx b/apps/studio/components/layouts/EdgeFunctionsLayout/EdgeFunctionDetailsLayout.tsx
index ff75219096f..d57da33d9b1 100644
--- a/apps/studio/components/layouts/EdgeFunctionsLayout/EdgeFunctionDetailsLayout.tsx
+++ b/apps/studio/components/layouts/EdgeFunctionsLayout/EdgeFunctionDetailsLayout.tsx
@@ -26,10 +26,9 @@ import {
   Separator,
 } from 'ui'
 import { Input } from 'ui-patterns/DataInputs/Input'
+import { PageBreadcrumbs, PageBreadcrumbsActions } from 'ui-patterns/PageBreadcrumbs'
 import {
   PageHeader,
-  PageHeaderAside,
-  PageHeaderBreadcrumb,
   PageHeaderDescription,
   PageHeaderMeta,
   PageHeaderNavigationTabs,
@@ -273,9 +272,67 @@ const EdgeFunctionDetailsLayout = ({
   return (
     <EdgeFunctionsLayout title={title} browserTitle={browserTitle}>
       <div className="w-full min-h-full flex flex-col items-stretch">
-        <PageHeader size="full" className="sticky top-0 z-10 bg-surface-75">
+        <div className="sticky top-0 z-10">
           {breadcrumbItems.length > 0 && (
-            <PageHeaderBreadcrumb>
+            <PageBreadcrumbs
+              slotClassName="bg-sidebar"
+              actions={
+                <PageBreadcrumbsActions>
+                  <DocsButton href={`${DOCS_URL}/guides/functions`} />
+                  <Popover open={isDownloadOpen} onOpenChange={setIsDownloadOpen}>
+                    <ShortcutTooltip
+                      shortcutId={SHORTCUT_IDS.FUNCTION_DETAIL_OPEN_DOWNLOAD}
+                      side="bottom"
+                      open={isDownloadOpen ? false : undefined}
+                    >
+                      <PopoverTrigger asChild>
+                        <Button variant="default" icon={<Download />}>
+                          Download
+                        </Button>
+                      </PopoverTrigger>
+                    </ShortcutTooltip>
+                    <PopoverContent align="end" className="p-0">
+                      {IS_PLATFORM && (
+                        <>
+                          <div className="p-3 flex flex-col gap-y-2">
+                            <p className="text-xs text-foreground-light">Download via CLI</p>
+                            <Input
+                              copy
+                              showCopyOnHover
+                              readOnly
+                              containerClassName=""
+                              className="text-xs font-mono tracking-tighter"
+                              value={`supabase functions download ${functionSlug}`}
+                            />
+                          </div>
+                          <Separator className="bg-border-overlay!" />
+                        </>
+                      )}
+                      <div className="py-2 px-1">
+                        <Button
+                          variant="text"
+                          className="w-min hover:bg-transparent"
+                          icon={<FileArchive />}
+                          onClick={downloadFunction}
+                        >
+                          Download as ZIP
+                        </Button>
+                      </div>
+                    </PopoverContent>
+                  </Popover>
+                  {!!functionSlug && (
+                    <ShortcutTooltip
+                      shortcutId={SHORTCUT_IDS.FUNCTION_DETAIL_OPEN_TEST}
+                      side="bottom"
+                    >
+                      <Button variant="default" icon={<Send />} onClick={openTestSheet}>
+                        Test
+                      </Button>
+                    </ShortcutTooltip>
+                  )}
+                </PageBreadcrumbsActions>
+              }
+            >
               <BreadcrumbList>
                 {breadcrumbItems.map((item, index) => (
                   <React.Fragment key={item.label || `breadcrumb-${index}`}>
@@ -292,143 +349,91 @@ const EdgeFunctionDetailsLayout = ({
                   </React.Fragment>
                 ))}
               </BreadcrumbList>
-            </PageHeaderBreadcrumb>
+            </PageBreadcrumbs>
           )}
 
-          <PageHeaderMeta>
-            <PageHeaderSummary>
-              <PageHeaderTitle>{functionSlug ? name : 'Edge Functions'}</PageHeaderTitle>
-              <PageHeaderDescription className="flex flex-row flex-wrap items-center gap-x-4 gap-y-1 text-sm!">
-                <div className="flex items-center gap-x-2">
-                  <span className="flex items-center gap-2">{functionUrl}</span>
-                  <ShortcutTooltip shortcutId={SHORTCUT_IDS.FUNCTION_DETAIL_COPY_URL} side="bottom">
-                    <CopyButton iconOnly variant="text" text={functionUrl} />
-                  </ShortcutTooltip>
-                </div>
+          <PageHeader size="full" className="bg-surface-75">
+            <PageHeaderMeta>
+              <PageHeaderSummary>
+                <PageHeaderTitle>{functionSlug ? name : 'Edge Functions'}</PageHeaderTitle>
+                <PageHeaderDescription className="flex flex-row flex-wrap items-center gap-x-4 gap-y-1 text-sm!">
+                  <div className="flex items-center gap-x-2">
+                    <span className="flex items-center gap-2">{functionUrl}</span>
+                    <ShortcutTooltip
+                      shortcutId={SHORTCUT_IDS.FUNCTION_DETAIL_COPY_URL}
+                      side="bottom"
+                    >
+                      <CopyButton iconOnly variant="text" text={functionUrl} />
+                    </ShortcutTooltip>
+                  </div>
 
-                <HoverCard
-                  openDelay={250}
-                  closeDelay={100}
-                  open={isTimestampHoverCardOpen}
-                  onOpenChange={setIsTimestampHoverCardOpen}
-                >
-                  <HoverCardTrigger asChild>
-                    <button type="button" tabIndex={0} className="flex items-center gap-2 group">
-                      <Clock size={16} strokeWidth={1.5} className="text-foreground-lighter" />
-                      <span className="transition text-foreground-light group-hover:text-foreground underline decoration-dotted decoration-foreground-muted underline-offset-4">
-                        {updatedRelative ?? 'Deploy status unavailable'}
-                      </span>
-                    </button>
-                  </HoverCardTrigger>
-                  <HoverCardContent side="bottom" align="start" className="w-40 p-0">
-                    {createdRelative && (
-                      <div className="px-4 py-2 space-y-1">
-                        <h3 className="heading-meta text-foreground-light">Created</h3>
-                        {!!selectedFunction && (
-                          <TimestampInfo
-                            className="text-sm"
-                            label={createdRelative}
-                            utcTimestamp={selectedFunction.created_at}
-                          />
-                        )}
-                      </div>
-                    )}
-                    {updatedRelative && (
-                      <div className="px-4 py-2 space-y-1">
-                        <h3 className="heading-meta text-foreground-light">Last deployed</h3>
-                        {!!selectedFunction && (
-                          <TimestampInfo
-                            className="text-sm"
-                            label={updatedRelative}
-                            utcTimestamp={selectedFunction.updated_at}
-                          />
-                        )}
-                      </div>
-                    )}
-                    {selectedFunction?.version !== undefined && (
-                      <div className="px-4 py-2 space-y-1">
-                        <h3 className="heading-meta text-foreground-light">Deployments</h3>
-                        <p className="text-sm text-foreground">{selectedFunction.version}</p>
-                      </div>
-                    )}
-                  </HoverCardContent>
-                </HoverCard>
-              </PageHeaderDescription>
-            </PageHeaderSummary>
-
-            <PageHeaderAside>
-              <div className="flex items-center space-x-2">
-                <DocsButton href={`${DOCS_URL}/guides/functions`} />
-                <Popover open={isDownloadOpen} onOpenChange={setIsDownloadOpen}>
-                  <ShortcutTooltip
-                    shortcutId={SHORTCUT_IDS.FUNCTION_DETAIL_OPEN_DOWNLOAD}
-                    side="bottom"
-                    open={isDownloadOpen ? false : undefined}
+                  <HoverCard
+                    openDelay={250}
+                    closeDelay={100}
+                    open={isTimestampHoverCardOpen}
+                    onOpenChange={setIsTimestampHoverCardOpen}
                   >
-                    <PopoverTrigger asChild>
-                      <Button variant="default" icon={<Download />}>
-                        Download
-                      </Button>
-                    </PopoverTrigger>
-                  </ShortcutTooltip>
-                  <PopoverContent align="end" className="p-0">
-                    {IS_PLATFORM && (
-                      <>
-                        <div className="p-3 flex flex-col gap-y-2">
-                          <p className="text-xs text-foreground-light">Download via CLI</p>
-                          <Input
-                            copy
-                            showCopyOnHover
-                            readOnly
-                            containerClassName=""
-                            className="text-xs font-mono tracking-tighter"
-                            value={`supabase functions download ${functionSlug}`}
-                          />
+                    <HoverCardTrigger asChild>
+                      <button type="button" tabIndex={0} className="flex items-center gap-2 group">
+                        <Clock size={16} strokeWidth={1.5} className="text-foreground-lighter" />
+                        <span className="transition text-foreground-light group-hover:text-foreground underline decoration-dotted decoration-foreground-muted underline-offset-4">
+                          {updatedRelative ?? 'Deploy status unavailable'}
+                        </span>
+                      </button>
+                    </HoverCardTrigger>
+                    <HoverCardContent side="bottom" align="start" className="w-40 p-0">
+                      {createdRelative && (
+                        <div className="px-4 py-2 space-y-1">
+                          <h3 className="heading-meta text-foreground-light">Created</h3>
+                          {!!selectedFunction && (
+                            <TimestampInfo
+                              className="text-sm"
+                              label={createdRelative}
+                              utcTimestamp={selectedFunction.created_at}
+                            />
+                          )}
                         </div>
-                        <Separator className="bg-border-overlay!" />
-                      </>
-                    )}
-                    <div className="py-2 px-1">
-                      <Button
-                        variant="text"
-                        className="w-min hover:bg-transparent"
-                        icon={<FileArchive />}
-                        onClick={downloadFunction}
-                      >
-                        Download as ZIP
-                      </Button>
-                    </div>
-                  </PopoverContent>
-                </Popover>
-                {!!functionSlug && (
-                  <ShortcutTooltip
-                    shortcutId={SHORTCUT_IDS.FUNCTION_DETAIL_OPEN_TEST}
-                    side="bottom"
-                  >
-                    <Button variant="default" icon={<Send />} onClick={openTestSheet}>
-                      Test
-                    </Button>
-                  </ShortcutTooltip>
-                )}
-              </div>
-            </PageHeaderAside>
-          </PageHeaderMeta>
+                      )}
+                      {updatedRelative && (
+                        <div className="px-4 py-2 space-y-1">
+                          <h3 className="heading-meta text-foreground-light">Last deployed</h3>
+                          {!!selectedFunction && (
+                            <TimestampInfo
+                              className="text-sm"
+                              label={updatedRelative}
+                              utcTimestamp={selectedFunction.updated_at}
+                            />
+                          )}
+                        </div>
+                      )}
+                      {selectedFunction?.version !== undefined && (
+                        <div className="px-4 py-2 space-y-1">
+                          <h3 className="heading-meta text-foreground-light">Deployments</h3>
+                          <p className="text-sm text-foreground">{selectedFunction.version}</p>
+                        </div>
+                      )}
+                    </HoverCardContent>
+                  </HoverCard>
+                </PageHeaderDescription>
+              </PageHeaderSummary>
+            </PageHeaderMeta>
 
-          {navigationItems.length > 0 && (
-            <PageHeaderNavigationTabs>
-              <NavMenu>
-                {navigationItems.map((item) => {
-                  const isActive = router.asPath.split('?')[0] === item.href
-                  return (
-                    <NavMenuItem key={item.label} active={isActive}>
-                      <Link href={item.href}>{item.label}</Link>
-                    </NavMenuItem>
-                  )
-                })}
-              </NavMenu>
-            </PageHeaderNavigationTabs>
-          )}
-        </PageHeader>
+            {navigationItems.length > 0 && (
+              <PageHeaderNavigationTabs>
+                <NavMenu>
+                  {navigationItems.map((item) => {
+                    const isActive = router.asPath.split('?')[0] === item.href
+                    return (
+                      <NavMenuItem key={item.label} active={isActive}>
+                        <Link href={item.href}>{item.label}</Link>
+                      </NavMenuItem>
+                    )
+                  })}
+                </NavMenu>
+              </PageHeaderNavigationTabs>
+            )}
+          </PageHeader>
+        </div>
 
         {children}
         <EdgeFunctionTesterSheet visible={isOpen} onClose={() => setIsOpen(false)} />
diff --git a/apps/studio/components/layouts/Navigation/NavigationBar/NavigationBar.utils.test.tsx b/apps/studio/components/layouts/Navigation/NavigationBar/NavigationBar.utils.test.tsx
index 197c4ac5f5b..e7744288a85 100644
--- a/apps/studio/components/layouts/Navigation/NavigationBar/NavigationBar.utils.test.tsx
+++ b/apps/studio/components/layouts/Navigation/NavigationBar/NavigationBar.utils.test.tsx
@@ -1,10 +1,11 @@
-import { describe, expect, it } from 'vitest'
+import { renderHook } from '@testing-library/react'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
 
 import {
   generateOtherRoutes,
   generateProductRoutes,
   generateSettingsRoutes,
-  generateToolRoutes,
+  useGenerateToolRoutes,
 } from './NavigationBar.utils'
 import type { Project } from '@/data/projects/project-detail-query'
 
@@ -16,25 +17,55 @@ const inactiveProject = { status: 'INACTIVE' } as Project
 
 const keys = (routes: { key: string }[]) => routes.map((r) => r.key)
 
-describe('generateToolRoutes', () => {
+const mockUseParams = vi.fn()
+const mockUseSelectedProjectQuery = vi.fn()
+const mockUseIsExplorerEnabled = vi.fn()
+
+vi.mock('common', async (importOriginal) => ({
+  ...(await importOriginal<typeof import('common')>()),
+  useParams: () => mockUseParams(),
+}))
+
+vi.mock('@/hooks/misc/useSelectedProject', () => ({
+  useSelectedProjectQuery: () => mockUseSelectedProjectQuery(),
+}))
+
+vi.mock('@/components/interfaces/App/FeaturePreview/FeaturePreviewContext', () => ({
+  useIsExplorerEnabled: () => mockUseIsExplorerEnabled(),
+  useUnifiedLogsPreview: () => ({ isEnabled: false }),
+}))
+
+describe('useGenerateToolRoutes', () => {
+  beforeEach(() => {
+    mockUseParams.mockReturnValue({ ref: REF })
+    mockUseSelectedProjectQuery.mockReturnValue({ data: activeProject })
+    mockUseIsExplorerEnabled.mockReturnValue(false)
+  })
+
   it('always returns Table Editor and SQL Editor', () => {
-    const routes = generateToolRoutes(REF, activeProject)
-    expect(keys(routes)).toEqual(['editor', 'sql'])
+    const { result } = renderHook(() => useGenerateToolRoutes())
+    expect(keys(result.current)).toEqual(['editor', 'sql'])
   })
 
   it('marks routes as disabled when project is not active', () => {
-    const routes = generateToolRoutes(REF, inactiveProject)
-    expect(routes.every((r) => r.disabled)).toBe(true)
+    mockUseSelectedProjectQuery.mockReturnValue({ data: inactiveProject })
+
+    const { result } = renderHook(() => useGenerateToolRoutes())
+    expect(result.current.every((r) => r.disabled)).toBe(true)
   })
 
   it('points links to the building URL when project is building', () => {
-    const routes = generateToolRoutes(REF, buildingProject)
-    expect(routes.every((r) => r.link === `/project/${REF}`)).toBe(true)
+    mockUseSelectedProjectQuery.mockReturnValue({ data: buildingProject })
+
+    const { result } = renderHook(() => useGenerateToolRoutes())
+    expect(result.current.every((r) => r.link === `/project/${REF}`)).toBe(true)
   })
 
   it('returns links as false when ref is undefined', () => {
-    const routes = generateToolRoutes(undefined, activeProject)
-    expect(routes.every((r) => r.link === undefined)).toBe(true)
+    mockUseParams.mockReturnValue({ ref: undefined })
+
+    const { result } = renderHook(() => useGenerateToolRoutes())
+    expect(result.current.every((r) => r.link === undefined)).toBe(true)
   })
 })
 
diff --git a/apps/studio/components/layouts/Navigation/NavigationBar/NavigationBar.utils.tsx b/apps/studio/components/layouts/Navigation/NavigationBar/NavigationBar.utils.tsx
index fe5a74346a0..c319886c8f9 100644
--- a/apps/studio/components/layouts/Navigation/NavigationBar/NavigationBar.utils.tsx
+++ b/apps/studio/components/layouts/Navigation/NavigationBar/NavigationBar.utils.tsx
@@ -1,8 +1,20 @@
 import { useParams } from 'common'
-import { Auth, Database, EdgeFunctions, Realtime, SqlEditor, Storage, TableEditor } from 'icons'
-import { Blocks, Box, Lightbulb, List, Settings, Telescope } from 'lucide-react'
+import {
+  Auth,
+  Database,
+  EdgeFunctions,
+  Realtime,
+  SqlEditor,
+  Storage,
+  TableEditor,
+  Workers,
+} from 'icons'
+import { Blocks, Lightbulb, List, Settings, Telescope } from 'lucide-react'
 
-import { useUnifiedLogsPreview } from '@/components/interfaces/App/FeaturePreview/FeaturePreviewContext'
+import {
+  useIsExplorerEnabled,
+  useUnifiedLogsPreview,
+} from '@/components/interfaces/App/FeaturePreview/FeaturePreviewContext'
 import { ICON_SIZE, ICON_STROKE_WIDTH } from '@/components/interfaces/Sidebar'
 import type { Route } from '@/components/ui/ui.types'
 import { EditorIndexPageLink } from '@/data/prefetchers/project.$ref.editor'
@@ -45,8 +57,12 @@ function getRouteContext(ref?: string, project?: Project): RouteContext {
   }
 }
 
-export const generateToolRoutes = (ref?: string, project?: Project): Route[] => {
+export const useGenerateToolRoutes = (): Route[] => {
+  const { ref } = useParams()
+  const { data: project } = useSelectedProjectQuery()
+
   const { isProjectActive, isProjectBuilding, buildingUrl } = getRouteContext(ref, project)
+  const isExplorerEnabled = useIsExplorerEnabled()
 
   return [
     {
@@ -58,14 +74,27 @@ export const generateToolRoutes = (ref?: string, project?: Project): Route[] =>
       linkElement: <EditorIndexPageLink projectRef={ref} />,
       shortcutId: SHORTCUT_IDS.NAV_TABLE_EDITOR,
     },
-    {
-      key: 'sql',
-      label: 'SQL Editor',
-      disabled: !isProjectActive,
-      icon: <SqlEditor size={ICON_SIZE} strokeWidth={ICON_STROKE_WIDTH} />,
-      link: ref && (isProjectBuilding ? buildingUrl : `/project/${ref}/sql`),
-      shortcutId: SHORTCUT_IDS.NAV_SQL_EDITOR,
-    },
+    ...(isExplorerEnabled
+      ? [
+          {
+            key: 'explorer',
+            label: 'Explorer',
+            disabled: !isProjectActive,
+            icon: <SqlEditor size={ICON_SIZE} strokeWidth={ICON_STROKE_WIDTH} />,
+            link: ref && (isProjectBuilding ? buildingUrl : `/project/${ref}/explorer`),
+            shortcutId: SHORTCUT_IDS.NAV_SQL_EDITOR,
+          },
+        ]
+      : [
+          {
+            key: 'sql',
+            label: 'SQL Editor',
+            disabled: !isProjectActive,
+            icon: <SqlEditor size={ICON_SIZE} strokeWidth={ICON_STROKE_WIDTH} />,
+            link: ref && (isProjectBuilding ? buildingUrl : `/project/${ref}/sql`),
+            shortcutId: SHORTCUT_IDS.NAV_SQL_EDITOR,
+          },
+        ]),
   ]
 }
 
@@ -146,7 +175,7 @@ export const generateProductRoutes = (
             key: 'workers',
             label: PRODUCT_NAME,
             disabled: !isProjectActive,
-            icon: <Box size={ICON_SIZE} strokeWidth={ICON_STROKE_WIDTH} />,
+            icon: <Workers size={ICON_SIZE} strokeWidth={ICON_STROKE_WIDTH} />,
             link: ref && (isProjectBuilding ? buildingUrl : `/project/${ref}/workers`),
             isNew: true,
           },
diff --git a/apps/studio/components/layouts/Navigation/NavigationBar/OrgSelector.tsx b/apps/studio/components/layouts/Navigation/NavigationBar/OrgSelector.tsx
index fb9f3e09b72..dbff9bf38ed 100644
--- a/apps/studio/components/layouts/Navigation/NavigationBar/OrgSelector.tsx
+++ b/apps/studio/components/layouts/Navigation/NavigationBar/OrgSelector.tsx
@@ -1,6 +1,5 @@
 import { useBreakpoint, useParams } from 'common'
 import { Boxes, ChevronsUpDown, Plus } from 'lucide-react'
-import Link from 'next/link'
 import { useRouter } from 'next/router'
 import { useState } from 'react'
 import {
@@ -8,7 +7,6 @@ import {
   CommandEmpty,
   CommandGroup,
   CommandInput,
-  CommandItem,
   CommandList,
   CommandSeparator,
   Popover,
@@ -23,6 +21,7 @@ import { ShimmeringLoader } from 'ui-patterns/ShimmeringLoader'
 
 import { OrgSelectorSheet } from './OrgSelectorSheet'
 import { OrgCommandItem } from '@/components/layouts/AppLayout/OrgCommandItem'
+import { CommandItemLink } from '@/components/ui/CommandItemLink'
 import { useOrganizationsQuery } from '@/data/organizations/organizations-query'
 import { useOrgProjectsInfiniteQuery } from '@/data/projects/org-projects-infinite-query'
 import { useIsFeatureEnabled } from '@/hooks/misc/useIsFeatureEnabled'
@@ -129,36 +128,26 @@ export function OrgSelector() {
                 </CommandGroup>
                 <CommandSeparator />
                 <CommandGroup>
-                  <CommandItem
-                    className="cursor-pointer w-full"
-                    onSelect={() => {
-                      setOpen(false)
-                      router.push('/organizations')
-                    }}
-                    onClick={() => setOpen(false)}
+                  <CommandItemLink
+                    href="/organizations"
+                    className="cursor-pointer w-full gap-2"
+                    onSelect={() => setOpen(false)}
                   >
-                    <Link href="/organizations" className="flex items-center gap-2 w-full">
-                      <p>All Organizations</p>
-                    </Link>
-                  </CommandItem>
+                    <p>All Organizations</p>
+                  </CommandItemLink>
                 </CommandGroup>
                 {organizationCreationEnabled && (
                   <>
                     <CommandSeparator />
                     <CommandGroup>
-                      <CommandItem
-                        className="cursor-pointer w-full"
-                        onSelect={() => {
-                          setOpen(false)
-                          router.push('/new')
-                        }}
-                        onClick={() => setOpen(false)}
+                      <CommandItemLink
+                        href="/new"
+                        className="cursor-pointer w-full gap-2"
+                        onSelect={() => setOpen(false)}
                       >
-                        <Link href="/new" className="flex items-center gap-2 w-full">
-                          <Plus size={14} strokeWidth={1.5} />
-                          <p>New organization</p>
-                        </Link>
-                      </CommandItem>
+                        <Plus size={14} strokeWidth={1.5} />
+                        <p>New organization</p>
+                      </CommandItemLink>
                     </CommandGroup>
                   </>
                 )}
diff --git a/apps/studio/components/layouts/Navigation/ProductMenuBar.tsx b/apps/studio/components/layouts/Navigation/ProductMenuBar.tsx
index 53db489bf35..8c7f6070212 100644
--- a/apps/studio/components/layouts/Navigation/ProductMenuBar.tsx
+++ b/apps/studio/components/layouts/Navigation/ProductMenuBar.tsx
@@ -1,7 +1,5 @@
-import { useFlag, useParams } from 'common'
-import Link from 'next/link'
 import { PropsWithChildren, ReactNode } from 'react'
-import { Button, cn } from 'ui'
+import { cn } from 'ui'
 
 interface ProductMenuBarProps {
   title: string
@@ -15,11 +13,6 @@ export const ProductMenuBar = ({
   children,
   className,
 }: PropsWithChildren<ProductMenuBarProps>) => {
-  // [Joshen] Temporary entry point into explorer
-  const { ref } = useParams()
-  const isExplorerEnabled = useFlag('explorer')
-  const showExplorerCTA = isExplorerEnabled && title === 'SQL Editor'
-
   return (
     <div
       /**
@@ -36,11 +29,6 @@ export const ProductMenuBar = ({
           <h4 className="text-lg">{title}</h4>
           {titleBadge}
         </div>
-        {showExplorerCTA && (
-          <Button asChild variant="default">
-            <Link href={`/project/${ref}/explorer`}>Explorer</Link>
-          </Button>
-        )}
       </div>
       <div className={cn('grow overflow-y-auto', className)}>{children}</div>
     </div>
diff --git a/apps/studio/components/layouts/ObservabilityLayout/ObservabilityLayout.tsx b/apps/studio/components/layouts/ObservabilityLayout/ObservabilityLayout.tsx
index acdd6ac0b98..8283641f5df 100644
--- a/apps/studio/components/layouts/ObservabilityLayout/ObservabilityLayout.tsx
+++ b/apps/studio/components/layouts/ObservabilityLayout/ObservabilityLayout.tsx
@@ -56,7 +56,6 @@ const ObservabilityLayoutContent = ({
     })
   }, [
     addBanner,
-    dismissBanner,
     isInitialized,
     isDatabaseConnectionsBannerDismissed,
     previouslyToggled,
diff --git a/apps/studio/components/layouts/ProjectLayout/LayoutHeader/MobileMenuContent/MobileMenuContent.tsx b/apps/studio/components/layouts/ProjectLayout/LayoutHeader/MobileMenuContent/MobileMenuContent.tsx
index 89b81308333..30122bf5be7 100644
--- a/apps/studio/components/layouts/ProjectLayout/LayoutHeader/MobileMenuContent/MobileMenuContent.tsx
+++ b/apps/studio/components/layouts/ProjectLayout/LayoutHeader/MobileMenuContent/MobileMenuContent.tsx
@@ -16,8 +16,8 @@ import { ICON_SIZE, ICON_STROKE_WIDTH } from '@/components/interfaces/Sidebar'
 import {
   generateProductRoutes,
   generateSettingsRoutes,
-  generateToolRoutes,
   useGenerateOtherRoutes,
+  useGenerateToolRoutes,
 } from '@/components/layouts/Navigation/NavigationBar/NavigationBar.utils'
 import type { Route } from '@/components/ui/ui.types'
 import { useIsFeatureEnabled } from '@/hooks/misc/useIsFeatureEnabled'
@@ -64,7 +64,7 @@ export function MobileMenuContent({
   const authOverviewPageEnabled = useFlag('authOverviewPage')
   const workersEnabled = useFlag('workers')
 
-  const toolRoutes = useMemo(() => generateToolRoutes(ref, project), [ref, project])
+  const toolRoutes = useGenerateToolRoutes()
   const productRoutes = useMemo(
     () =>
       generateProductRoutes(ref, project, {
diff --git a/apps/studio/components/layouts/ProjectLayout/index.test.tsx b/apps/studio/components/layouts/ProjectLayout/index.test.tsx
index 6c7b2601677..13090a00efd 100644
--- a/apps/studio/components/layouts/ProjectLayout/index.test.tsx
+++ b/apps/studio/components/layouts/ProjectLayout/index.test.tsx
@@ -81,6 +81,7 @@ vi.mock('common', () => ({
       `project-integration-banner-dismissed-${ref}-${integrationSource}`,
   },
   isFeatureEnabled: () => false,
+  useFlag: () => false,
 }))
 
 vi.mock('framer-motion', () => ({
diff --git a/apps/studio/components/layouts/ProjectLayout/index.tsx b/apps/studio/components/layouts/ProjectLayout/index.tsx
index 98a01a4a618..d03fe84dd62 100644
--- a/apps/studio/components/layouts/ProjectLayout/index.tsx
+++ b/apps/studio/components/layouts/ProjectLayout/index.tsx
@@ -1,4 +1,4 @@
-import { IS_PLATFORM, LOCAL_STORAGE_KEYS, mergeRefs, useParams } from 'common'
+import { LOCAL_STORAGE_KEYS, mergeRefs, useFlag, useParams } from 'common'
 import { AnimatePresence, motion } from 'framer-motion'
 import { XIcon } from 'lucide-react'
 import Head from 'next/head'
@@ -23,10 +23,6 @@ import {
   useIsMobile,
   usePanelRef,
 } from 'ui'
-import {
-  SELECT_26_STUDIO_DISMISSAL_KEY,
-  useSelect26PromotionActive,
-} from 'ui-patterns/Banners/Select26Promotion'
 
 import { useEditorType } from '../editors/EditorsLayout.hooks'
 import { useMainScrollContainer, useSetMainScrollContainer } from '../MainScrollContainerContext'
@@ -46,12 +42,8 @@ import { UnhealthyState } from './UnhealthyState'
 import { UpgradingState } from './UpgradingState'
 import { CreateBranchModal } from '@/components/interfaces/BranchManagement/CreateBranchModal'
 import { ProjectAPIDocs } from '@/components/interfaces/ProjectAPIDocs/ProjectAPIDocs'
+import { BannerExplorer } from '@/components/ui/BannerStack/Banners/BannerExplorer'
 import { BannerFreeMicroUpgrade } from '@/components/ui/BannerStack/Banners/BannerFreeMicroUpgrade'
-import { BannerSelect2026 } from '@/components/ui/BannerStack/Banners/BannerSelect2026'
-import {
-  SELECT_26_BANNER_PRIORITY,
-  shouldShowSelect26Banner,
-} from '@/components/ui/BannerStack/Banners/BannerSelect2026.utils'
 import { BANNER_ID, useBannerStack } from '@/components/ui/BannerStack/BannerStackProvider'
 import { ButtonTooltip } from '@/components/ui/ButtonTooltip'
 import PartnerIcon from '@/components/ui/PartnerIcon'
@@ -161,13 +153,13 @@ export const ProjectLayout = forwardRef<HTMLDivElement, PropsWithChildren<Projec
       !!projectResourceWarnings?.disk_io_exhaustion
     const isNanoCompute = selectedProject?.infra_compute_size === 'nano'
     const showUpgradeBanner = isNanoCompute && isComputeNearExhaustion
+
+    const isExplorerEnabled = useFlag('explorer')
+
     const [isFreeMicroUpgradeBannerDismissed] = useLocalStorageQuery(
       LOCAL_STORAGE_KEYS.FREE_MICRO_UPGRADE_BANNER_DISMISSED(selectedProject?.ref ?? ''),
       false
     )
-    const [isSelect26BannerDismissed, , { isSuccess: isSelect26DismissalLoaded }] =
-      useLocalStorageQuery(SELECT_26_STUDIO_DISMISSAL_KEY, false)
-    const isSelect26PromotionActive = useSelect26PromotionActive()
     const [isProjectIntegrationBannerDismissed, setIsProjectIntegrationBannerDismissed] =
       useLocalStorageQuery(
         getProjectIntegrationBannerDismissKey({
@@ -176,6 +168,11 @@ export const ProjectLayout = forwardRef<HTMLDivElement, PropsWithChildren<Projec
         }),
         false
       )
+    const [isExplorerBannerDismissed, , { isSuccess: isLocalStorageReady }] = useLocalStorageQuery(
+      LOCAL_STORAGE_KEYS.EXPLORER_BANNER_DISMISSED,
+      false
+    )
+
     const { showSidebar } = useAppStateSnapshot()
     const { setContent: setMobileSheetContent, registerOpenMenu } = useMobileSheet()
 
@@ -246,36 +243,15 @@ export const ProjectLayout = forwardRef<HTMLDivElement, PropsWithChildren<Projec
     ])
 
     useEffect(() => {
-      // Wait until project + dismissal state are known so we do not call
-      // dismissBanner on every early render (it always schedules a setState).
-      if (!selectedProject?.ref || !isSelect26DismissalLoaded) return
+      if (!isExplorerEnabled || !isLocalStorageReady || isExplorerBannerDismissed) return
 
-      const shouldShow = shouldShowSelect26Banner({
-        isPlatform: IS_PLATFORM,
-        projectRef: selectedProject.ref,
-        dismissalLoaded: isSelect26DismissalLoaded,
-        isActive: isSelect26PromotionActive,
-        isDismissed: isSelect26BannerDismissed,
+      addBanner({
+        id: 'explorer-banner',
+        priority: 2,
+        isDismissed: false,
+        content: <BannerExplorer />,
       })
-
-      if (shouldShow) {
-        addBanner({
-          id: BANNER_ID.SELECT_26,
-          isDismissed: false,
-          content: <BannerSelect2026 />,
-          priority: SELECT_26_BANNER_PRIORITY,
-        })
-      } else {
-        dismissBanner(BANNER_ID.SELECT_26)
-      }
-    }, [
-      selectedProject?.ref,
-      isSelect26DismissalLoaded,
-      isSelect26PromotionActive,
-      isSelect26BannerDismissed,
-      addBanner,
-      dismissBanner,
-    ])
+    }, [addBanner, isExplorerEnabled, isExplorerBannerDismissed, isLocalStorageReady])
 
     useLayoutEffect(() => {
       const unregister = registerOpenMenu(() => {
diff --git a/apps/studio/components/ui/AIAssistantPanel/AssistantNotebookPreview.test.tsx b/apps/studio/components/ui/AIAssistantPanel/AssistantNotebookPreview.test.tsx
index e084e1b7ff2..a132189be66 100644
--- a/apps/studio/components/ui/AIAssistantPanel/AssistantNotebookPreview.test.tsx
+++ b/apps/studio/components/ui/AIAssistantPanel/AssistantNotebookPreview.test.tsx
@@ -1,11 +1,14 @@
 import { screen } from '@testing-library/react'
 import userEvent from '@testing-library/user-event'
+import { HttpResponse } from 'msw'
 import { describe, expect, it } from 'vitest'
 
 import { AssistantNotebookPreview } from './AssistantNotebookPreview'
+import type { components } from '@/data/api'
 import type { NotebookCellDiffEntry } from '@/data/content/notebooks/notebook-operations'
 import type { AgentCell, CellWire } from '@/data/content/notebooks/notebook-schema'
 import { customRender as render } from '@/tests/lib/custom-render'
+import { addAPIMock } from '@/tests/lib/msw'
 
 const wireMarkdownCell = (id: string, text: string): CellWire => ({
   _tag: 'markdown_cell',
@@ -64,22 +67,58 @@ describe('AssistantNotebookPreview', () => {
     expect(container.firstElementChild).toHaveClass('max-w-6xl')
   })
 
-  it('surfaces a metadata-only change on a replaced cell even when the sql is unchanged', () => {
+  it('surfaces a metadata-only database change after resolving the target', async () => {
+    addAPIMock({
+      method: 'get',
+      path: '/platform/projects/:ref/databases',
+      response: () =>
+        HttpResponse.json<components['schemas']['DatabaseDetailResponse'][]>([
+          {
+            identifier: 'default',
+            region: 'us-east-1',
+            status: 'ACTIVE_HEALTHY',
+            cloud_provider: 'AWS',
+            db_host: 'db.default.supabase.co',
+            db_name: 'postgres',
+            db_port: 5432,
+            db_user: 'postgres',
+            inserted_at: '2026-01-01T00:00:00.000Z',
+            restUrl: 'https://default.supabase.co/rest/v1',
+            size: 't4g.micro',
+          },
+          {
+            identifier: 'default-replica-3',
+            region: 'us-east-1',
+            status: 'ACTIVE_HEALTHY',
+            cloud_provider: 'AWS',
+            db_host: 'db.default-replica-3.supabase.co',
+            db_name: 'postgres',
+            db_port: 5432,
+            db_user: 'postgres',
+            inserted_at: '2026-01-01T00:00:00.000Z',
+            restUrl: 'https://default-replica-3.supabase.co/rest/v1',
+            size: 't4g.micro',
+          },
+        ]),
+    })
+
     const entries: NotebookCellDiffEntry[] = [
       {
         _tag: 'replaced',
-        before: wireDatabaseCell('cell-1', 'primary'),
-        after: agentDatabaseCell('replica-3'),
+        before: wireDatabaseCell('cell-1', 'default'),
+        after: agentDatabaseCell('default-replica-3'),
         operationIndex: 0,
       },
     ]
 
     render(<AssistantNotebookPreview entries={entries} mode="update" />)
 
-    expect(screen.getByText('Database: primary → Database: replica-3')).toBeInTheDocument()
+    expect(screen.getByText('Loading database…')).toBeInTheDocument()
+    const metadata = await screen.findByText('Database: Primary → Database: Replica')
+    expect(metadata).toBeInTheDocument()
     expect(
       screen.getByRole('button', { name: 'Replaced Query: Untitled query' })
-    ).toHaveTextContent('Database: primary → Database: replica-3')
+    ).toHaveTextContent('Database: Primary → Database: Replica')
   })
 
   it('hides entries past the limit behind a "Show N more" button', async () => {
diff --git a/apps/studio/components/ui/AIAssistantPanel/AssistantNotebookPreview.tsx b/apps/studio/components/ui/AIAssistantPanel/AssistantNotebookPreview.tsx
index 360a475fac6..4b273f3dd74 100644
--- a/apps/studio/components/ui/AIAssistantPanel/AssistantNotebookPreview.tsx
+++ b/apps/studio/components/ui/AIAssistantPanel/AssistantNotebookPreview.tsx
@@ -1,11 +1,14 @@
+import { useParams } from 'common'
 import { NotebookText } from 'lucide-react'
-import { useState } from 'react'
+import { useMemo, useState } from 'react'
 import { Button, cn } from 'ui'
 
 import {
   formatNotebookDiffSummary,
   getEntryKey,
+  notebookEntriesNeedDatabaseLookup,
   summarizeNotebookDiff,
+  type NotebookDatabaseContext,
 } from './AssistantNotebookPreview.utils'
 import { AssistantNotebookPreviewCell } from './AssistantNotebookPreviewCell'
 import {
@@ -16,6 +19,7 @@ import {
 } from '@/components/interfaces/Explorer/ExplorerToolbar'
 import type { QueryResult } from '@/components/interfaces/Explorer/types'
 import type { NotebookCellDiffEntry } from '@/data/content/notebooks/notebook-operations'
+import { useReadReplicasQuery } from '@/data/read-replicas/replicas-query'
 
 export interface AssistantNotebookPreviewProps {
   entries: NotebookCellDiffEntry[]
@@ -48,9 +52,28 @@ export const AssistantNotebookPreview = ({
   results,
   className,
 }: AssistantNotebookPreviewProps) => {
+  const { ref: projectRef } = useParams()
   const [isShowingAllEntries, setIsShowingAllEntries] = useState(false)
   const [expandedOverrides, setExpandedOverrides] = useState<Record<string, boolean>>({})
 
+  const needsDatabaseLookup = notebookEntriesNeedDatabaseLookup(entries, projectRef)
+  const {
+    data: databases,
+    isPending: isLoadingDatabases,
+    isError: isDatabaseError,
+  } = useReadReplicasQuery({ projectRef }, { enabled: needsDatabaseLookup })
+  const databasesByIdentifier = useMemo(
+    () => new Map((databases ?? []).map((database) => [database.identifier, database])),
+    [databases]
+  )
+  const databaseContext: NotebookDatabaseContext = !needsDatabaseLookup
+    ? { status: 'success', projectRef, databasesByIdentifier }
+    : isLoadingDatabases
+      ? { status: 'loading', projectRef }
+      : isDatabaseError
+        ? { status: 'error', projectRef }
+        : { status: 'success', projectRef, databasesByIdentifier }
+
   const summary = summarizeNotebookDiff(entries, mode)
   const visibleEntries = isShowingAllEntries ? entries : entries.slice(0, VISIBLE_ENTRY_LIMIT)
   const hiddenCount = entries.length - visibleEntries.length
@@ -91,6 +114,7 @@ export const AssistantNotebookPreview = ({
                     mode={mode}
                     result={results?.[key]}
                     isExpanded={isExpanded(entry)}
+                    databaseContext={databaseContext}
                     onExpandedChange={(open) =>
                       setExpandedOverrides((prev) => ({ ...prev, [key]: open }))
                     }
diff --git a/apps/studio/components/ui/AIAssistantPanel/AssistantNotebookPreview.utils.test.ts b/apps/studio/components/ui/AIAssistantPanel/AssistantNotebookPreview.utils.test.ts
index 9a7536d73bf..fe13a029f6f 100644
--- a/apps/studio/components/ui/AIAssistantPanel/AssistantNotebookPreview.utils.test.ts
+++ b/apps/studio/components/ui/AIAssistantPanel/AssistantNotebookPreview.utils.test.ts
@@ -5,10 +5,13 @@ import {
   formatNotebookDiffSummary,
   formatTimeRange,
   getCellLabel,
-  getCellMetadataLine,
+  getCellMetadata,
   getEntryKey,
-  getEntryMetadataLine,
+  getEntryMetadata,
+  notebookEntriesNeedDatabaseLookup,
+  resolveNotebookDatabaseTarget,
   summarizeNotebookDiff,
+  type NotebookDatabaseContext,
 } from './AssistantNotebookPreview.utils'
 import type { NotebookCellDiffEntry } from '@/data/content/notebooks/notebook-operations'
 import type { AgentCell, CellWire } from '@/data/content/notebooks/notebook-schema'
@@ -45,6 +48,14 @@ const agentDatabaseCell = (database_identifier?: string): AgentCell => ({
   database_identifier,
 })
 
+const successfulDatabaseContext = (
+  databases: Array<{ identifier: string; region: string }> = []
+): NotebookDatabaseContext => ({
+  status: 'success',
+  projectRef: 'project-1',
+  databasesByIdentifier: new Map(databases.map((database) => [database.identifier, database])),
+})
+
 describe('getEntryKey', () => {
   it('keys unchanged, removed, and moved entries off the cell id', () => {
     expect(getEntryKey({ _tag: 'unchanged', cell: wireMarkdownCell('cell-1') })).toBe('cell-1')
@@ -116,56 +127,200 @@ describe('formatTimeRange', () => {
   })
 })
 
-describe('getCellMetadataLine', () => {
-  it('returns null for markdown cells', () => {
-    expect(getCellMetadataLine(wireMarkdownCell('cell-1'))).toBeNull()
+describe('resolveNotebookDatabaseTarget', () => {
+  it('resolves an omitted identifier as primary without waiting for databases', () => {
+    expect(
+      resolveNotebookDatabaseTarget(undefined, { status: 'loading', projectRef: 'project-1' })
+    ).toEqual({ status: 'primary' })
   })
 
-  it('returns null for a database cell with no database_identifier', () => {
-    expect(getCellMetadataLine(wireDatabaseCell('cell-1'))).toBeNull()
+  it('resolves the project ref as primary without waiting for databases', () => {
+    expect(
+      resolveNotebookDatabaseTarget('project-1', {
+        status: 'loading',
+        projectRef: 'project-1',
+      })
+    ).toEqual({ status: 'primary' })
   })
 
-  it('labels a database cell with a database_identifier', () => {
-    expect(getCellMetadataLine(wireDatabaseCell('cell-1', 'Signups', 'replica-3'))).toBe(
-      'Database: replica-3'
-    )
+  it('still resolves the loaded database matching the project ref as primary', () => {
+    expect(
+      resolveNotebookDatabaseTarget(
+        'project-1',
+        successfulDatabaseContext([{ identifier: 'project-1', region: 'us-east-1' }])
+      )
+    ).toEqual({ status: 'primary' })
   })
 
-  it('labels a log cell with its formatted time range', () => {
-    expect(getCellMetadataLine(wireLogCell('cell-1'))).toBe('Time range: Last 7 days')
+  it('keeps another identifier loading until databases resolve', () => {
+    expect(
+      resolveNotebookDatabaseTarget('replica-3', {
+        status: 'loading',
+        projectRef: 'project-1',
+      })
+    ).toEqual({ status: 'loading' })
+  })
+
+  it('resolves a matching loaded database as a replica', () => {
+    expect(
+      resolveNotebookDatabaseTarget(
+        'replica-3',
+        successfulDatabaseContext([{ identifier: 'replica-3', region: 'us-east-1' }])
+      )
+    ).toEqual({ status: 'replica' })
+  })
+
+  it('does not call an identifier absent from the loaded database list a replica', () => {
+    expect(resolveNotebookDatabaseTarget('replica-3', successfulDatabaseContext())).toEqual({
+      status: 'unknown',
+    })
+  })
+
+  it('preserves database lookup errors', () => {
+    expect(
+      resolveNotebookDatabaseTarget('replica-3', {
+        status: 'error',
+        projectRef: 'project-1',
+      })
+    ).toEqual({ status: 'error' })
   })
 })
 
-describe('getEntryMetadataLine', () => {
+describe('notebookEntriesNeedDatabaseLookup', () => {
+  it('skips lookup for implicit and explicit primary cells', () => {
+    const entries: NotebookCellDiffEntry[] = [
+      { _tag: 'unchanged', cell: wireDatabaseCell('cell-1') },
+      { _tag: 'unchanged', cell: wireDatabaseCell('cell-2', undefined, 'project-1') },
+    ]
+
+    expect(notebookEntriesNeedDatabaseLookup(entries, 'project-1')).toBe(false)
+  })
+
+  it('requires lookup when either side of a replacement has another identifier', () => {
+    const entries: NotebookCellDiffEntry[] = [
+      {
+        _tag: 'replaced',
+        before: wireDatabaseCell('cell-1'),
+        after: agentDatabaseCell('replica-3'),
+        operationIndex: 0,
+      },
+    ]
+
+    expect(notebookEntriesNeedDatabaseLookup(entries, 'project-1')).toBe(true)
+  })
+})
+
+describe('getCellMetadata', () => {
+  it('hides metadata for markdown cells', () => {
+    expect(getCellMetadata(wireMarkdownCell('cell-1'), successfulDatabaseContext())).toEqual({
+      status: 'hidden',
+    })
+  })
+
+  it('labels an implicit primary database', () => {
+    expect(getCellMetadata(wireDatabaseCell('cell-1'), successfulDatabaseContext())).toEqual({
+      status: 'ready',
+      text: 'Database: Primary',
+    })
+  })
+
+  it('labels a resolved replica descriptively', () => {
+    expect(
+      getCellMetadata(
+        wireDatabaseCell('cell-1', 'Signups', 'replica-3'),
+        successfulDatabaseContext([{ identifier: 'replica-3', region: 'us-east-1' }])
+      )
+    ).toEqual({
+      status: 'ready',
+      text: 'Database: Replica',
+    })
+  })
+
+  it('returns a loading state rather than guessing another identifier is a replica', () => {
+    expect(
+      getCellMetadata(wireDatabaseCell('cell-1', 'Signups', 'replica-3'), {
+        status: 'loading',
+        projectRef: 'project-1',
+      })
+    ).toEqual({ status: 'loading' })
+  })
+
+  it('labels a missing loaded identifier as unknown', () => {
+    expect(
+      getCellMetadata(
+        wireDatabaseCell('cell-1', 'Signups', 'missing-database'),
+        successfulDatabaseContext()
+      )
+    ).toEqual({ status: 'ready', text: 'Database: Unknown' })
+  })
+
+  it('labels a log cell with its formatted time range', () => {
+    expect(getCellMetadata(wireLogCell('cell-1'), successfulDatabaseContext())).toEqual({
+      status: 'ready',
+      text: 'Time range: Last 7 days',
+    })
+  })
+})
+
+describe('getEntryMetadata', () => {
   it('uses the cell metadata for non-replaced entries', () => {
     expect(
-      getEntryMetadataLine({
-        _tag: 'unchanged',
-        cell: wireDatabaseCell('cell-1', 'Signups', 'replica-3'),
-      })
-    ).toBe('Database: replica-3')
+      getEntryMetadata(
+        {
+          _tag: 'unchanged',
+          cell: wireDatabaseCell('cell-1', 'Signups', 'replica-3'),
+        },
+        successfulDatabaseContext([{ identifier: 'replica-3', region: 'us-east-1' }])
+      )
+    ).toEqual({
+      status: 'ready',
+      text: 'Database: Replica',
+    })
   })
 
   it('returns a before → after pair when a replacement changes only metadata', () => {
     expect(
-      getEntryMetadataLine({
-        _tag: 'replaced',
-        before: wireDatabaseCell('cell-1', 'Signups', 'primary'),
-        after: agentDatabaseCell('replica-3'),
-        operationIndex: 0,
-      })
-    ).toBe('Database: primary → Database: replica-3')
+      getEntryMetadata(
+        {
+          _tag: 'replaced',
+          before: wireDatabaseCell('cell-1', 'Signups'),
+          after: agentDatabaseCell('replica-3'),
+          operationIndex: 0,
+        },
+        successfulDatabaseContext([{ identifier: 'replica-3', region: 'us-east-1' }])
+      )
+    ).toEqual({
+      status: 'ready',
+      text: 'Database: Primary → Database: Replica',
+    })
+  })
+
+  it('returns a loading state when either side still needs database data', () => {
+    expect(
+      getEntryMetadata(
+        {
+          _tag: 'replaced',
+          before: wireDatabaseCell('cell-1', 'Signups'),
+          after: agentDatabaseCell('replica-3'),
+          operationIndex: 0,
+        },
+        { status: 'loading', projectRef: 'project-1' }
+      )
+    ).toEqual({ status: 'loading' })
   })
 
   it('returns a single line when replacement metadata is unchanged', () => {
     expect(
-      getEntryMetadataLine({
-        _tag: 'replaced',
-        before: wireDatabaseCell('cell-1', 'Signups', 'primary'),
-        after: agentDatabaseCell('primary'),
-        operationIndex: 0,
-      })
-    ).toBe('Database: primary')
+      getEntryMetadata(
+        {
+          _tag: 'replaced',
+          before: wireDatabaseCell('cell-1', 'Signups'),
+          after: agentDatabaseCell(),
+          operationIndex: 0,
+        },
+        successfulDatabaseContext()
+      )
+    ).toEqual({ status: 'ready', text: 'Database: Primary' })
   })
 })
 
diff --git a/apps/studio/components/ui/AIAssistantPanel/AssistantNotebookPreview.utils.ts b/apps/studio/components/ui/AIAssistantPanel/AssistantNotebookPreview.utils.ts
index 97ba1141100..a8717269f6a 100644
--- a/apps/studio/components/ui/AIAssistantPanel/AssistantNotebookPreview.utils.ts
+++ b/apps/studio/components/ui/AIAssistantPanel/AssistantNotebookPreview.utils.ts
@@ -6,6 +6,27 @@ import type {
   OperationResultCell,
 } from '@/data/content/notebooks/notebook-operations'
 import type { TimeRange } from '@/data/content/notebooks/notebook-schema'
+import type { Database } from '@/data/read-replicas/replicas-query'
+
+type DatabaseDetails = Pick<Database, 'identifier'>
+
+export type NotebookDatabaseContext = { projectRef?: string } & (
+  | { status: 'loading' }
+  | { status: 'error' }
+  | { status: 'success'; databasesByIdentifier: ReadonlyMap<string, DatabaseDetails> }
+)
+
+export type NotebookDatabaseTarget =
+  | { status: 'primary' }
+  | { status: 'loading' }
+  | { status: 'replica' }
+  | { status: 'unknown' }
+  | { status: 'error' }
+
+export type NotebookCellMetadata =
+  | { status: 'hidden' }
+  | { status: 'loading' }
+  | { status: 'ready'; text: string }
 
 /** React key for a diff entry. Added/replaced cells have no `_id`, so they key off the operation. */
 export function getEntryKey(entry: NotebookCellDiffEntry): string {
@@ -20,6 +41,22 @@ export function getEntryKey(entry: NotebookCellDiffEntry): string {
   }
 }
 
+/** Whether any cell needs the database list before its target can be classified. */
+export function notebookEntriesNeedDatabaseLookup(
+  entries: NotebookCellDiffEntry[],
+  projectRef?: string
+): boolean {
+  return entries.some((entry) => {
+    const cells = entry._tag === 'replaced' ? [entry.before, entry.after] : [entry.cell]
+    return cells.some(
+      (cell) =>
+        cell._tag === 'database_cell' &&
+        cell.database_identifier !== undefined &&
+        cell.database_identifier !== projectRef
+    )
+  })
+}
+
 /** Human label for a collapsed/badge row. */
 export function getCellLabel(cell: OperationResultCell): string {
   switch (cell._tag) {
@@ -74,32 +111,77 @@ export function formatTimeRange(range: TimeRange): string {
   return `${format(range.start)} → ${format(range.end)}`
 }
 
-/**
- * Plain-text metadata line for a query cell (its source parameters, not its SQL) — `null`
- * when the cell has none. A `replace_cell` can change only this and leave `sql` identical,
- * so it's compared independently of the source text rather than folded into it.
- */
-export function getCellMetadataLine(cell: OperationResultCell): string | null {
+export function resolveNotebookDatabaseTarget(
+  identifier: string | undefined,
+  context: NotebookDatabaseContext
+): NotebookDatabaseTarget {
+  if (identifier === undefined || identifier === context.projectRef) return { status: 'primary' }
+  if (context.status === 'loading') return { status: 'loading' }
+  if (context.status === 'error') return { status: 'error' }
+
+  const database = context.databasesByIdentifier.get(identifier)
+  if (database === undefined) return { status: 'unknown' }
+  if (database.identifier === context.projectRef) return { status: 'primary' }
+
+  return { status: 'replica' }
+}
+
+function formatDatabaseTarget(target: Exclude<NotebookDatabaseTarget, { status: 'loading' }>) {
+  switch (target.status) {
+    case 'primary':
+      return 'Database: Primary'
+    case 'replica':
+      return 'Database: Replica'
+    case 'unknown':
+      return 'Database: Unknown'
+    case 'error':
+      return 'Database unavailable'
+  }
+}
+
+/** Metadata for a query cell's source parameters, kept separate from its SQL diff. */
+export function getCellMetadata(
+  cell: OperationResultCell,
+  databaseContext: NotebookDatabaseContext
+): NotebookCellMetadata {
   switch (cell._tag) {
     case 'markdown_cell':
-      return null
-    case 'database_cell':
-      return cell.database_identifier ? `Database: ${cell.database_identifier}` : null
+      return { status: 'hidden' }
+    case 'database_cell': {
+      const target = resolveNotebookDatabaseTarget(cell.database_identifier, databaseContext)
+      return target.status === 'loading'
+        ? { status: 'loading' }
+        : { status: 'ready', text: formatDatabaseTarget(target) }
+    }
     case 'log_cell':
-      return `Time range: ${formatTimeRange(cell.time_range)}`
+      return { status: 'ready', text: `Time range: ${formatTimeRange(cell.time_range)}` }
   }
 }
 
 /** Header metadata for a diff row, including a before → after pair on replacements. */
-export function getEntryMetadataLine(entry: NotebookCellDiffEntry): string | null {
+export function getEntryMetadata(
+  entry: NotebookCellDiffEntry,
+  databaseContext: NotebookDatabaseContext
+): NotebookCellMetadata {
   if (entry._tag !== 'replaced') {
-    return getCellMetadataLine(entry.cell)
+    return getCellMetadata(entry.cell, databaseContext)
   }
 
-  const beforeMetadata = getCellMetadataLine(entry.before)
-  const afterMetadata = getCellMetadataLine(entry.after)
-  if (beforeMetadata === afterMetadata) return afterMetadata
-  return `${beforeMetadata ?? 'No metadata'} → ${afterMetadata ?? 'No metadata'}`
+  const beforeMetadata = getCellMetadata(entry.before, databaseContext)
+  const afterMetadata = getCellMetadata(entry.after, databaseContext)
+  if (beforeMetadata.status === 'loading' || afterMetadata.status === 'loading') {
+    return { status: 'loading' }
+  }
+
+  const beforeText = beforeMetadata.status === 'ready' ? beforeMetadata.text : null
+  const afterText = afterMetadata.status === 'ready' ? afterMetadata.text : null
+  if (beforeText === null && afterText === null) return { status: 'hidden' }
+  if (beforeText === afterText) return { status: 'ready', text: afterText ?? 'No metadata' }
+
+  return {
+    status: 'ready',
+    text: `${beforeText ?? 'No metadata'} → ${afterText ?? 'No metadata'}`,
+  }
 }
 
 export type NotebookDiffSummary =
diff --git a/apps/studio/components/ui/AIAssistantPanel/AssistantNotebookPreviewCell.tsx b/apps/studio/components/ui/AIAssistantPanel/AssistantNotebookPreviewCell.tsx
index 174f72ff699..b2e20aef7d0 100644
--- a/apps/studio/components/ui/AIAssistantPanel/AssistantNotebookPreviewCell.tsx
+++ b/apps/studio/components/ui/AIAssistantPanel/AssistantNotebookPreviewCell.tsx
@@ -1,4 +1,4 @@
-import { ChevronRight, FileText, SquareCode } from 'lucide-react'
+import { ChevronRight, FileText, Loader2, SquareCode } from 'lucide-react'
 import {
   cn,
   Collapsible,
@@ -15,7 +15,8 @@ import {
   getCellLabel,
   getCellMonacoLanguage,
   getCellSourceText,
-  getEntryMetadataLine,
+  getEntryMetadata,
+  type NotebookDatabaseContext,
 } from './AssistantNotebookPreview.utils'
 import {
   ExplorerQueryFooter,
@@ -34,6 +35,7 @@ export interface AssistantNotebookPreviewCellProps {
   /** Create and run previews omit per-row change glyphs. */
   mode: 'create' | 'update' | 'run'
   result?: QueryResult
+  databaseContext: NotebookDatabaseContext
 }
 
 /**
@@ -62,12 +64,13 @@ export const AssistantNotebookPreviewCell = ({
   onExpandedChange,
   mode,
   result,
+  databaseContext,
 }: AssistantNotebookPreviewCellProps) => {
   const marker = CHANGE_MARKERS[entry._tag]
   const isRemoved = entry._tag === 'removed'
   const cell = getEntryCell(entry)
   const label = getCellLabel(cell)
-  const metadata = getEntryMetadataLine(entry)
+  const metadata = getEntryMetadata(entry, databaseContext)
 
   return (
     <Collapsible open={isExpanded} onOpenChange={onExpandedChange}>
@@ -89,11 +92,20 @@ export const AssistantNotebookPreviewCell = ({
         >
           {label}
         </span>
-        {metadata && (
+        {metadata.status !== 'hidden' ? (
           <span className="min-w-0 max-w-[45%] shrink truncate text-sm text-muted-foreground">
-            {metadata}
+            {metadata.status === 'loading' ? (
+              <span className="flex items-center gap-1.5">
+                <span className="animate-spin">
+                  <Loader2 aria-hidden size={12} />
+                </span>
+                Loading database…
+              </span>
+            ) : (
+              metadata.text
+            )}
           </span>
-        )}
+        ) : null}
       </CollapsibleTrigger>
       <CollapsibleContent>
         <div className="border-t">
diff --git a/apps/studio/components/ui/BannerStack/BannerStackProvider.tsx b/apps/studio/components/ui/BannerStack/BannerStackProvider.tsx
index 4c95ece2585..90413237e61 100644
--- a/apps/studio/components/ui/BannerStack/BannerStackProvider.tsx
+++ b/apps/studio/components/ui/BannerStack/BannerStackProvider.tsx
@@ -9,6 +9,7 @@ export const BANNER_ID = {
   TOS_UPDATE: 'tos-update-banner',
   LOGS_ALL_DEPRECATION: 'logs-all-deprecation-banner',
   SELECT_26: 'select-2026-banner',
+  EXPLORER: 'explorer-banner',
 } as const
 
 export type BannerId = (typeof BANNER_ID)[keyof typeof BANNER_ID]
diff --git a/apps/studio/components/ui/BannerStack/Banners/BannerExplorer.tsx b/apps/studio/components/ui/BannerStack/Banners/BannerExplorer.tsx
new file mode 100644
index 00000000000..78120cc7b39
--- /dev/null
+++ b/apps/studio/components/ui/BannerStack/Banners/BannerExplorer.tsx
@@ -0,0 +1,84 @@
+import { LOCAL_STORAGE_KEYS } from 'common'
+import { AnimatePresence, motion } from 'framer-motion'
+import { Badge, Button } from 'ui'
+
+import { BannerCard } from '../BannerCard'
+import { useBannerStack } from '../BannerStackProvider'
+import { useFeaturePreviewModal } from '@/components/interfaces/App/FeaturePreview/FeaturePreviewContext'
+import { useLocalStorageQuery } from '@/hooks/misc/useLocalStorage'
+import { useTrack } from '@/lib/telemetry/track'
+
+export const BannerExplorer = () => {
+  const track = useTrack()
+  const { dismissBanner } = useBannerStack()
+  const { selectFeaturePreview } = useFeaturePreviewModal()
+
+  const [, setIsDismissed] = useLocalStorageQuery(
+    LOCAL_STORAGE_KEYS.EXPLORER_BANNER_DISMISSED,
+    false
+  )
+
+  return (
+    <BannerCard
+      onDismiss={() => {
+        setIsDismissed(true)
+        dismissBanner('explorer-banner')
+        track('explorer_banner_dismiss_button_clicked')
+      }}
+    >
+      <div className="flex flex-col gap-y-4">
+        <div className="flex flex-col gap-y-2 items-start w-full">
+          <Badge variant="success" className="-ml-0.5 uppercase inline-flex items-center">
+            Preview
+          </Badge>
+          <AnimatePresence>
+            <div className="border h-27 w-full rounded-t-md mt-2 bg-surface-100 py-4 px-2 pb-0">
+              <motion.div
+                initial={{ opacity: 0, top: 10 }}
+                animate={{ opacity: 1, top: 0 }}
+                transition={{ delay: 0.5, duration: 0.2, ease: 'easeOut' }}
+                className="w-[90%] mx-auto"
+              >
+                <p className="text-[10px]">User growth</p>
+                <p className="text-[9px] text-foreground-lighter">
+                  Track how your user base is trending.
+                </p>
+              </motion.div>
+              <motion.div
+                initial={{ opacity: 0, top: 10 }}
+                animate={{ opacity: 1, top: 0 }}
+                transition={{ delay: 1, duration: 0.2, ease: 'easeOut' }}
+                className="w-full h-13.5 border border-b-0 mt-2 rounded-t bg-surface-200 overflow-hidden"
+              >
+                <div className="h-3 w-full border-b" />
+                <p className="px-2 py-1 text-[8px] font-mono tracking-tighter flex flex-col">
+                  <span className="text-code_block-1">select</span>
+                  <span className="pl-2">date_trunc('week', last_sign_in_at) as week,</span>
+                  <span className="pl-2">count(distinct id) as active_users</span>
+                </p>
+              </motion.div>
+            </div>
+          </AnimatePresence>
+        </div>
+        <div className="flex flex-col gap-y-1 mb-2">
+          <p className="text-sm font-medium">Explorer & Notebooks</p>
+          <p className="text-xs text-foreground-lighter text-balance">
+            New unified workspace for querying data and chatting with Assistant.
+          </p>
+        </div>
+        <div className="flex gap-2">
+          <Button
+            variant="default"
+            size="tiny"
+            onClick={() => {
+              selectFeaturePreview(LOCAL_STORAGE_KEYS.UI_PREVIEW_EXPLORER)
+              track('explorer_banner_cta_button_clicked')
+            }}
+          >
+            Enable Explorer
+          </Button>
+        </div>
+      </div>
+    </BannerCard>
+  )
+}
diff --git a/apps/studio/components/ui/BannerStack/Banners/BannerSelect2026.utils.test.ts b/apps/studio/components/ui/BannerStack/Banners/BannerSelect2026.utils.test.ts
index 5aa5507834c..8a10d313afc 100644
--- a/apps/studio/components/ui/BannerStack/Banners/BannerSelect2026.utils.test.ts
+++ b/apps/studio/components/ui/BannerStack/Banners/BannerSelect2026.utils.test.ts
@@ -4,20 +4,18 @@ import { SELECT_26_BANNER_PRIORITY, shouldShowSelect26Banner } from './BannerSel
 
 const visibleState = {
   isPlatform: true,
-  projectRef: 'project-ref',
   dismissalLoaded: true,
   isActive: true,
   isDismissed: false,
 }
 
 describe('shouldShowSelect26Banner', () => {
-  it('shows the promotion on hosted project pages', () => {
+  it('shows the promotion on hosted Studio', () => {
     expect(shouldShowSelect26Banner(visibleState)).toBe(true)
   })
 
   it.each([
     ['self-hosted Studio', { isPlatform: false }],
-    ['outside a project', { projectRef: undefined }],
     ['before dismissal state loads', { dismissalLoaded: false }],
     ['after campaign expiry', { isActive: false }],
     ['after dismissal', { isDismissed: true }],
diff --git a/apps/studio/components/ui/BannerStack/Banners/BannerSelect2026.utils.ts b/apps/studio/components/ui/BannerStack/Banners/BannerSelect2026.utils.ts
index 339d533ce04..7c37aa0e7ba 100644
--- a/apps/studio/components/ui/BannerStack/Banners/BannerSelect2026.utils.ts
+++ b/apps/studio/components/ui/BannerStack/Banners/BannerSelect2026.utils.ts
@@ -2,14 +2,12 @@ export const SELECT_26_BANNER_PRIORITY = -1
 
 export const shouldShowSelect26Banner = ({
   isPlatform,
-  projectRef,
   dismissalLoaded,
   isActive,
   isDismissed,
 }: {
   isPlatform: boolean
-  projectRef?: string
   dismissalLoaded: boolean
   isActive: boolean
   isDismissed: boolean
-}) => isPlatform && !!projectRef && dismissalLoaded && isActive && !isDismissed
+}) => isPlatform && dismissalLoaded && isActive && !isDismissed
diff --git a/apps/studio/components/ui/CodeEditor/CodeEditor.tsx b/apps/studio/components/ui/CodeEditor/CodeEditor.tsx
index ffd6e738af7..cf36124858a 100644
--- a/apps/studio/components/ui/CodeEditor/CodeEditor.tsx
+++ b/apps/studio/components/ui/CodeEditor/CodeEditor.tsx
@@ -6,7 +6,11 @@ import { RefObject, useEffect, useRef, useState } from 'react'
 import { cn } from 'ui'
 import { useSetCommandMenuOpen } from 'ui-patterns/CommandMenu'
 
-import { alignEditor, BASE_MONACO_EDITOR_OPTIONS } from './CodeEditor.utils'
+import {
+  alignEditor,
+  BASE_MONACO_EDITOR_OPTIONS,
+  getEditorValueOrSelection,
+} from './CodeEditor.utils'
 import { Markdown } from '@/components/interfaces/Markdown'
 import { useLatest } from '@/hooks/misc/useLatest'
 import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'
@@ -162,13 +166,8 @@ export const CodeEditor = ({
         contextMenuGroupId: 'operation',
         contextMenuOrder: 0,
         run: () => {
-          const selection = editorRef?.current?.getSelection()
-          if (!selection) return
-
-          const selectedValue = editorRef?.current?.getModel()?.getValueInRange(selection)
-          const editorValue = editorRef?.current?.getValue()
-
-          runQueryCallbackRef.current(selectedValue || editorValue)
+          if (!editorRef.current) return
+          runQueryCallbackRef.current(getEditorValueOrSelection(editorRef.current))
         },
       })
     }
diff --git a/apps/studio/components/ui/CodeEditor/CodeEditor.utils.test.ts b/apps/studio/components/ui/CodeEditor/CodeEditor.utils.test.ts
new file mode 100644
index 00000000000..0a032c5c044
--- /dev/null
+++ b/apps/studio/components/ui/CodeEditor/CodeEditor.utils.test.ts
@@ -0,0 +1,51 @@
+import type { editor } from 'monaco-editor'
+import { describe, expect, it } from 'vitest'
+
+import { getEditorValueOrSelection } from './CodeEditor.utils'
+
+const buildEditor = ({
+  value,
+  selectedValue,
+  hasSelection,
+}: {
+  value: string
+  selectedValue?: string
+  hasSelection: boolean
+}): editor.IStandaloneCodeEditor => {
+  return {
+    getValue: () => value,
+    getSelection: () => (hasSelection ? {} : null),
+    getModel: () => ({ getValueInRange: () => selectedValue }),
+  } as unknown as editor.IStandaloneCodeEditor
+}
+
+describe('getEditorValueOrSelection', () => {
+  it('returns the selected text when there is a non-empty selection', () => {
+    const editorInstance = buildEditor({
+      value: 'select * from a;\nselect * from b;',
+      selectedValue: 'select * from b;',
+      hasSelection: true,
+    })
+
+    expect(getEditorValueOrSelection(editorInstance)).toBe('select * from b;')
+  })
+
+  it('falls back to the full value when there is no selection', () => {
+    const editorInstance = buildEditor({
+      value: 'select * from a;',
+      hasSelection: false,
+    })
+
+    expect(getEditorValueOrSelection(editorInstance)).toBe('select * from a;')
+  })
+
+  it('falls back to the full value when the selection is collapsed (empty range)', () => {
+    const editorInstance = buildEditor({
+      value: 'select * from a;',
+      selectedValue: '',
+      hasSelection: true,
+    })
+
+    expect(getEditorValueOrSelection(editorInstance)).toBe('select * from a;')
+  })
+})
diff --git a/apps/studio/components/ui/CodeEditor/CodeEditor.utils.ts b/apps/studio/components/ui/CodeEditor/CodeEditor.utils.ts
index 8f3b0c5aab6..a64c6c0866b 100644
--- a/apps/studio/components/ui/CodeEditor/CodeEditor.utils.ts
+++ b/apps/studio/components/ui/CodeEditor/CodeEditor.utils.ts
@@ -28,3 +28,16 @@ export const alignEditor = (editor: editor.IStandaloneCodeEditor) => {
     })
   })
 }
+
+/**
+ * The text a "run" gesture should act on: the current selection if there is one
+ * (a collapsed cursor has an empty range, so `getValueInRange` returns `''` and
+ * this falls through), otherwise the full editor value.
+ */
+export const getEditorValueOrSelection = (
+  editor: editor.IStandaloneCodeEditor
+): string | undefined => {
+  const selection = editor.getSelection()
+  const selectedValue = selection ? editor.getModel()?.getValueInRange(selection) : undefined
+  return selectedValue || editor.getValue()
+}
diff --git a/apps/studio/components/ui/CommandItemLink.test.tsx b/apps/studio/components/ui/CommandItemLink.test.tsx
new file mode 100644
index 00000000000..e80190f0b9b
--- /dev/null
+++ b/apps/studio/components/ui/CommandItemLink.test.tsx
@@ -0,0 +1,36 @@
+import { screen, within } from '@testing-library/react'
+import { Command } from 'ui'
+import { describe, expect, it } from 'vitest'
+
+import { CommandItemLink } from './CommandItemLink'
+import { customRender } from '@/tests/lib/custom-render'
+
+describe('CommandItemLink', () => {
+  it('wraps the command item in a link', () => {
+    customRender(
+      <Command>
+        <CommandItemLink href="/destination">Destination</CommandItemLink>
+      </Command>
+    )
+
+    const link = screen.getByRole('link', { name: 'Destination' })
+    expect(within(link).getByRole('option')).toBeInTheDocument()
+    expect(link).toHaveAttribute('href', '/destination')
+  })
+
+  it('does not render disabled command items as links', () => {
+    customRender(
+      <Command>
+        <CommandItemLink href="/destination" disabled>
+          Destination
+        </CommandItemLink>
+      </Command>
+    )
+
+    expect(screen.queryByRole('link', { name: 'Destination' })).not.toBeInTheDocument()
+    expect(screen.getByRole('option', { name: 'Destination' })).toHaveAttribute(
+      'aria-disabled',
+      'true'
+    )
+  })
+})
diff --git a/apps/studio/components/ui/CommandItemLink.tsx b/apps/studio/components/ui/CommandItemLink.tsx
new file mode 100644
index 00000000000..fe36c91421e
--- /dev/null
+++ b/apps/studio/components/ui/CommandItemLink.tsx
@@ -0,0 +1,37 @@
+import Link from 'next/link'
+import type { ComponentProps, ReactNode } from 'react'
+import { cn, CommandItem } from 'ui'
+
+export interface CommandItemLinkProps extends Omit<ComponentProps<typeof CommandItem>, 'children'> {
+  href: ComponentProps<typeof Link>['href']
+  linkProps?: Omit<ComponentProps<typeof Link>, 'children' | 'href'>
+  children: ReactNode
+}
+
+/**
+ * A command item that navigates with native link behaviour.
+ *
+ * The link must wrap the command item. Nesting a link inside a command item can
+ * unmount the link when selection closes its menu before navigation completes.
+ */
+export function CommandItemLink({
+  href,
+  linkProps,
+  children,
+  disabled,
+  ...commandItemProps
+}: CommandItemLinkProps) {
+  const commandItem = (
+    <CommandItem disabled={disabled} {...commandItemProps}>
+      {children}
+    </CommandItem>
+  )
+
+  return disabled ? (
+    commandItem
+  ) : (
+    <Link {...linkProps} href={href} className={cn('block', linkProps?.className)}>
+      {commandItem}
+    </Link>
+  )
+}
diff --git a/apps/studio/components/ui/DatabaseSelector.tsx b/apps/studio/components/ui/DatabaseSelector.tsx
index 2a65d8b21f5..b31eac61d47 100644
--- a/apps/studio/components/ui/DatabaseSelector.tsx
+++ b/apps/studio/components/ui/DatabaseSelector.tsx
@@ -1,8 +1,6 @@
 import { useParams } from 'common'
 import { noop } from 'lodash'
 import { Check, ChevronDown, Loader2, Plus } from 'lucide-react'
-import Link from 'next/link'
-import { useRouter } from 'next/router'
 import { parseAsBoolean, useQueryState } from 'nuqs'
 import { useEffect, useState } from 'react'
 import {
@@ -28,9 +26,11 @@ import {
   getInfrastructurePath,
 } from '@/components/interfaces/Settings/Infrastructure/Infrastructure.utils'
 import { REPLICA_STATUS } from '@/components/interfaces/Settings/Infrastructure/ReadReplicas/ReadReplicas.constants'
+import { CommandItemLink } from '@/components/ui/CommandItemLink'
 import { useReadReplicasQuery } from '@/data/read-replicas/replicas-query'
 import { formatDatabaseID, formatDatabaseRegion } from '@/data/read-replicas/replicas.utils'
 import { useIsFeatureEnabled } from '@/hooks/misc/useIsFeatureEnabled'
+import { useIsHighAvailability } from '@/hooks/misc/useSelectedProject'
 import { IS_PLATFORM } from '@/lib/constants'
 import { useDatabaseSelectorStateSnapshot } from '@/state/database-selector'
 
@@ -55,8 +55,9 @@ export const DatabaseSelector = ({
   className,
   isForm = false,
 }: DatabaseSelectorProps) => {
-  const router = useRouter()
   const { ref: projectRef } = useParams()
+  const isHighAvailability = useIsHighAvailability()
+
   const [open, setOpen] = useState(false)
   const [, setShowConnect] = useQueryState('showConnect', parseAsBoolean.withDefault(false))
 
@@ -218,29 +219,19 @@ export const DatabaseSelector = ({
               </ScrollArea>
             </CommandGroup>
 
-            {IS_PLATFORM && infrastructureReadReplicas && (
+            {IS_PLATFORM && infrastructureReadReplicas && !isHighAvailability && (
               <CommandGroup className="border-t">
-                <CommandItem
-                  className="cursor-pointer w-full"
+                <CommandItemLink
+                  href={newReplicaURL}
+                  className="cursor-pointer w-full gap-2"
                   onSelect={() => {
                     setOpen(false)
-                    router.push(newReplicaURL)
+                    setShowConnect(false)
                   }}
-                  onClick={() => setOpen(false)}
                 >
-                  <Link
-                    href={newReplicaURL}
-                    onClick={async () => {
-                      setOpen(false)
-                      // [Joshen] This is used in the Connect UI which is available across all pages
-                      setShowConnect(false)
-                    }}
-                    className="w-full flex items-center gap-2"
-                  >
-                    <Plus size={14} strokeWidth={1.5} />
-                    <p>Create a new read replica</p>
-                  </Link>
-                </CommandItem>
+                  <Plus size={14} strokeWidth={1.5} />
+                  <p>Create a new read replica</p>
+                </CommandItemLink>
               </CommandGroup>
             )}
           </CommandList>
diff --git a/apps/studio/components/ui/FunctionSelector.tsx b/apps/studio/components/ui/FunctionSelector.tsx
index b0ed938c0a1..90c7410f181 100644
--- a/apps/studio/components/ui/FunctionSelector.tsx
+++ b/apps/studio/components/ui/FunctionSelector.tsx
@@ -1,8 +1,6 @@
 import { useParams } from 'common'
 import { uniqBy } from 'lodash'
 import { Check, ChevronsUpDown, Plus } from 'lucide-react'
-import Link from 'next/link'
-import { useRouter } from 'next/router'
 import { useState } from 'react'
 import {
   Alert,
@@ -22,6 +20,7 @@ import {
   ScrollArea,
 } from 'ui'
 
+import { CommandItemLink } from '@/components/ui/CommandItemLink'
 import {
   DatabaseFunctionsData,
   useDatabaseFunctionsQuery,
@@ -56,7 +55,6 @@ const FunctionSelector = ({
   filterFunction = () => true,
   noResultsLabel = <span>No functions found in this schema.</span>,
 }: FunctionSelectorProps) => {
-  const router = useRouter()
   const { ref } = useParams()
   const { data: project } = useSelectedProjectQuery()
   const [open, setOpen] = useState(false)
@@ -164,25 +162,14 @@ const FunctionSelector = ({
                 </CommandGroup>
                 <CommandSeparator />
                 <CommandGroup>
-                  <CommandItem
-                    className="cursor-pointer w-full"
-                    onSelect={() => {
-                      setOpen(false)
-                      router.push(`/project/${ref}/database/functions`)
-                    }}
-                    onClick={() => setOpen(false)}
+                  <CommandItemLink
+                    href={`/project/${ref}/database/functions`}
+                    className="cursor-pointer w-full gap-2"
+                    onSelect={() => setOpen(false)}
                   >
-                    <Link
-                      href={`/project/${ref}/database/functions`}
-                      onClick={() => {
-                        setOpen(false)
-                      }}
-                      className="w-full flex items-center gap-2"
-                    >
-                      <Plus size={14} strokeWidth={1.5} />
-                      <p>New function</p>
-                    </Link>
-                  </CommandItem>
+                    <Plus size={14} strokeWidth={1.5} />
+                    <p>New function</p>
+                  </CommandItemLink>
                 </CommandGroup>
               </CommandList>
             </Command>
diff --git a/apps/studio/components/ui/HighAvailability/HighAvailabilityDisabledSectionNotice.tsx b/apps/studio/components/ui/HighAvailability/HighAvailabilityDisabledSectionNotice.tsx
index 29e7c1f7eee..28a928bcd9c 100644
--- a/apps/studio/components/ui/HighAvailability/HighAvailabilityDisabledSectionNotice.tsx
+++ b/apps/studio/components/ui/HighAvailability/HighAvailabilityDisabledSectionNotice.tsx
@@ -1,7 +1,7 @@
 import type { ReactNode } from 'react'
 import { Admonition } from 'ui-patterns/Admonition'
 
-import { useHighAvailability } from '@/hooks/misc/useHighAvailability'
+import { useIsHighAvailability } from '@/hooks/misc/useSelectedProject'
 
 const DEFAULT_TITLE = 'This feature is unavailable on High Availability projects'
 const DEFAULT_DESCRIPTION =
@@ -16,7 +16,7 @@ export function HighAvailabilityDisabledSectionNotice({
   title = DEFAULT_TITLE,
   description = DEFAULT_DESCRIPTION,
 }: HighAvailabilityDisabledSectionNoticeProps) {
-  const { isHighAvailability } = useHighAvailability()
+  const isHighAvailability = useIsHighAvailability()
 
   if (!isHighAvailability) return null
 
diff --git a/apps/studio/components/ui/OrganizationProjectSelector.tsx b/apps/studio/components/ui/OrganizationProjectSelector.tsx
index 34873b2b48b..fb3028e4d2e 100644
--- a/apps/studio/components/ui/OrganizationProjectSelector.tsx
+++ b/apps/studio/components/ui/OrganizationProjectSelector.tsx
@@ -49,6 +49,7 @@ interface OrganizationProjectSelectorSelectorProps {
   }) => ReactNode
   renderActions?: (setOpen: (value: boolean) => void, options?: { embedded?: boolean }) => ReactNode
   onSelect?: (project: OrgProject) => void
+  getItemHref?: (project: OrgProject) => string
   onInitialLoad?: (projects: OrgProject[]) => void
   isOptionDisabled?: (project: OrgProject) => boolean
   fetchOnMount?: boolean
@@ -70,6 +71,7 @@ export const OrganizationProjectSelector = ({
   renderTrigger,
   renderActions,
   onSelect,
+  getItemHref,
   onInitialLoad,
   isOptionDisabled,
   fetchOnMount = false,
@@ -184,6 +186,7 @@ export const OrganizationProjectSelector = ({
           selectedRef={selectedRef ?? undefined}
           onSelect={onSelect}
           onClose={() => setOpen(false)}
+          getItemHref={getItemHref}
           renderRow={renderRow}
           checkPosition={checkPosition}
           isOptionDisabled={isOptionDisabled}
@@ -201,6 +204,7 @@ export const OrganizationProjectSelector = ({
             selectedRef={selectedRef ?? undefined}
             onSelect={onSelect}
             onClose={() => setOpen(false)}
+            href={getItemHref?.(project)}
             renderRow={renderRow}
             checkPosition={checkPosition}
             isOptionDisabled={isOptionDisabled}
diff --git a/apps/studio/components/ui/OrganizationProjectSelector/EmbeddedProjectList.tsx b/apps/studio/components/ui/OrganizationProjectSelector/EmbeddedProjectList.tsx
index 40c8bc891c7..84d4cdff804 100644
--- a/apps/studio/components/ui/OrganizationProjectSelector/EmbeddedProjectList.tsx
+++ b/apps/studio/components/ui/OrganizationProjectSelector/EmbeddedProjectList.tsx
@@ -9,6 +9,7 @@ export interface EmbeddedProjectListProps {
   selectedRef: string | undefined
   onSelect?: (project: OrgProject) => void
   onClose: () => void
+  getItemHref?: (project: OrgProject) => string
   renderRow?: (project: OrgProject) => ReactNode
   checkPosition?: 'right' | 'left'
   isOptionDisabled?: (project: OrgProject) => boolean
@@ -21,6 +22,7 @@ export function EmbeddedProjectList({
   selectedRef,
   onSelect,
   onClose,
+  getItemHref,
   renderRow,
   checkPosition,
   isOptionDisabled,
@@ -36,6 +38,7 @@ export function EmbeddedProjectList({
           selectedRef={selectedRef}
           onSelect={onSelect}
           onClose={onClose}
+          href={getItemHref?.(project)}
           renderRow={renderRow}
           checkPosition={checkPosition}
           isOptionDisabled={isOptionDisabled}
diff --git a/apps/studio/components/ui/OrganizationProjectSelector/ProjectCommandItem.test.tsx b/apps/studio/components/ui/OrganizationProjectSelector/ProjectCommandItem.test.tsx
new file mode 100644
index 00000000000..f581a67394c
--- /dev/null
+++ b/apps/studio/components/ui/OrganizationProjectSelector/ProjectCommandItem.test.tsx
@@ -0,0 +1,38 @@
+import { screen, within } from '@testing-library/react'
+import { Command } from 'ui'
+import { describe, expect, it, vi } from 'vitest'
+
+import { ProjectCommandItem } from './ProjectCommandItem'
+import type { OrgProject } from '@/data/projects/org-projects-infinite-query'
+import { render } from '@/tests/helpers'
+
+const project = {
+  cloud_provider: 'AWS',
+  databases: [],
+  inserted_at: '2026-08-26T00:00:00.000Z',
+  integration_source: null,
+  is_branch: false,
+  ref: 'project-ref',
+  name: 'Project name',
+  region: 'ap-southeast-2',
+  status: 'ACTIVE_HEALTHY',
+} satisfies OrgProject
+
+describe('ProjectCommandItem', () => {
+  it('wraps navigable command items in a link', () => {
+    render(
+      <Command>
+        <ProjectCommandItem
+          project={project}
+          selectedRef={undefined}
+          onClose={vi.fn()}
+          href="/project/project-ref"
+        />
+      </Command>
+    )
+
+    const projectLink = screen.getByRole('link', { name: 'Project name' })
+    expect(within(projectLink).getByRole('option')).toBeInTheDocument()
+    expect(projectLink).toHaveAttribute('href', '/project/project-ref')
+  })
+})
diff --git a/apps/studio/components/ui/OrganizationProjectSelector/ProjectCommandItem.tsx b/apps/studio/components/ui/OrganizationProjectSelector/ProjectCommandItem.tsx
index d9076d79936..a7c666b5be0 100644
--- a/apps/studio/components/ui/OrganizationProjectSelector/ProjectCommandItem.tsx
+++ b/apps/studio/components/ui/OrganizationProjectSelector/ProjectCommandItem.tsx
@@ -2,6 +2,7 @@ import { Check } from 'lucide-react'
 import { ReactNode } from 'react'
 import { cn, CommandItem } from 'ui'
 
+import { CommandItemLink } from '@/components/ui/CommandItemLink'
 import type { OrgProject } from '@/data/projects/org-projects-infinite-query'
 
 export interface ProjectCommandItemProps {
@@ -9,6 +10,7 @@ export interface ProjectCommandItemProps {
   selectedRef: string | undefined
   onSelect?: (project: OrgProject) => void
   onClose: () => void
+  href?: string
   renderRow?: (project: OrgProject) => ReactNode
   checkPosition?: 'right' | 'left'
   isOptionDisabled?: (project: OrgProject) => boolean
@@ -19,6 +21,7 @@ export function ProjectCommandItem({
   selectedRef,
   onSelect,
   onClose,
+  href,
   renderRow,
   checkPosition = 'right',
   isOptionDisabled,
@@ -30,14 +33,8 @@ export function ProjectCommandItem({
 
   const disabled = isOptionDisabled?.(project) ?? false
 
-  return (
-    <CommandItem
-      key={project.ref}
-      value={`${project.name.replaceAll('"', '')}-${project.ref}`}
-      className="cursor-pointer w-full"
-      onSelect={handleSelect}
-      disabled={disabled}
-    >
+  const content = (
+    <>
       {renderRow ? (
         renderRow(project)
       ) : (
@@ -53,6 +50,21 @@ export function ProjectCommandItem({
           {checkPosition === 'right' && project.ref === selectedRef && <Check size={16} />}
         </div>
       )}
-    </CommandItem>
+    </>
+  )
+
+  const commandItemProps = {
+    value: `${project.name.replaceAll('"', '')}-${project.ref}`,
+    className: 'cursor-pointer w-full',
+    onSelect: handleSelect,
+    disabled,
+  }
+
+  return href ? (
+    <CommandItemLink href={href} {...commandItemProps}>
+      {content}
+    </CommandItemLink>
+  ) : (
+    <CommandItem {...commandItemProps}>{content}</CommandItem>
   )
 }
diff --git a/apps/studio/components/ui/ReactFlow/EdgeVisual.tsx b/apps/studio/components/ui/ReactFlow/EdgeVisual.tsx
new file mode 100644
index 00000000000..88c56574656
--- /dev/null
+++ b/apps/studio/components/ui/ReactFlow/EdgeVisual.tsx
@@ -0,0 +1,88 @@
+import { ArrowRight, Loader2, Square, X, type LucideIcon } from 'lucide-react'
+import { cn } from 'ui'
+
+export interface ReplicationState {
+  isComingUp: boolean
+  isReplicating: boolean
+  isFailed: boolean
+}
+
+export interface EdgeVisual {
+  Icon: LucideIcon
+  // CSS color shared by the icon and the connecting line so they always match.
+  color: string
+  opacity: number
+  dashArray: string
+  strokeWidth: number
+  shouldAnimate: boolean
+  shouldSpin?: boolean
+  isFilled?: boolean
+}
+
+// Picks the icon + line appearance for a replication state. Both the icon and the line are derived
+// here from the same state so they always stay in sync. We deliberately don't surface lag: the line
+// just communicates whether data is moving, stopped, starting, or broken.
+export const getEdgeVisual = ({
+  isComingUp,
+  isReplicating,
+  isFailed,
+}: ReplicationState): EdgeVisual => {
+  if (isFailed) {
+    return {
+      Icon: X,
+      color: 'hsl(var(--destructive-default))',
+      opacity: 1,
+      dashArray: '5 5',
+      shouldAnimate: false,
+      strokeWidth: 4,
+    }
+  }
+  if (isComingUp) {
+    return {
+      Icon: Loader2,
+      color: 'var(--foreground-light)',
+      opacity: 1,
+      dashArray: '5',
+      strokeWidth: 2,
+      shouldAnimate: true,
+      shouldSpin: true,
+    }
+  }
+  if (isReplicating) {
+    return {
+      Icon: ArrowRight,
+      color: 'hsl(var(--brand-default))',
+      opacity: 1,
+      dashArray: '5',
+      strokeWidth: 2,
+      shouldAnimate: true,
+    }
+  }
+  return {
+    Icon: Square,
+    color: 'var(--foreground-lighter)',
+    opacity: 0.5,
+    dashArray: '5 5',
+    strokeWidth: 2,
+    shouldAnimate: false,
+    isFilled: true,
+  }
+}
+
+/** The round icon chip rendered mid-edge, bordered in the edge's color. */
+export const EdgeVisualChip = ({ visual }: { visual: EdgeVisual }) => {
+  const { Icon, color, shouldSpin, isFilled } = visual
+
+  return (
+    <div
+      className="w-6 h-6 rounded-full flex items-center justify-center border bg-surface-100"
+      style={{ borderColor: color }}
+    >
+      <Icon
+        size={14}
+        className={cn(shouldSpin && 'motion-safe:animate-spin')}
+        style={{ color, fill: isFilled ? color : undefined }}
+      />
+    </div>
+  )
+}
diff --git a/apps/studio/components/ui/RegionFlag.tsx b/apps/studio/components/ui/RegionFlag.tsx
index 9a4120a85d3..32750de114f 100644
--- a/apps/studio/components/ui/RegionFlag.tsx
+++ b/apps/studio/components/ui/RegionFlag.tsx
@@ -6,9 +6,16 @@ interface RegionFlagProps extends Omit<ImgHTMLAttributes<HTMLImageElement>, 'src
   region: string
 }
 
-export const RegionFlag = ({ alt = '', className, region, ...props }: RegionFlagProps) => (
+export const RegionFlag = ({
+  alt = '',
+  'aria-hidden': ariaHidden,
+  className,
+  region,
+  ...props
+}: RegionFlagProps) => (
   <img
     alt={alt}
+    aria-hidden={ariaHidden ?? alt === ''}
     className={`rounded-xs border border-foreground-muted/20 ${className ?? ''}`}
     src={`${BASE_PATH}/img/regions/${region}.svg`}
     {...props}
diff --git a/apps/studio/components/ui/SteppedFlow/SteppedFlow.test.tsx b/apps/studio/components/ui/SteppedFlow/SteppedFlow.test.tsx
new file mode 100644
index 00000000000..c0c65150a3d
--- /dev/null
+++ b/apps/studio/components/ui/SteppedFlow/SteppedFlow.test.tsx
@@ -0,0 +1,173 @@
+import { fireEvent, screen } from '@testing-library/react'
+import { describe, expect, test, vi } from 'vitest'
+
+import { SteppedFlow, SteppedFlowHeader } from './SteppedFlow'
+import { customRender } from '@/tests/lib/custom-render'
+
+const steps = [
+  { id: 'destination', label: 'Destination' },
+  { id: 'connection', label: 'Connection' },
+  { id: 'review', label: 'Review' },
+]
+
+describe('SteppedFlow', () => {
+  test('does not show Back on the first step', () => {
+    customRender(
+      <SteppedFlow steps={steps} currentStep="destination" onStepChange={vi.fn()}>
+        Step body
+      </SteppedFlow>
+    )
+
+    expect(screen.queryByRole('button', { name: 'Back' })).not.toBeInTheDocument()
+  })
+
+  test('shows Cancel on the first step when onCancel is provided', () => {
+    const onCancel = vi.fn()
+
+    customRender(
+      <SteppedFlow
+        steps={steps}
+        currentStep="destination"
+        onStepChange={vi.fn()}
+        onCancel={onCancel}
+      >
+        Step body
+      </SteppedFlow>
+    )
+
+    fireEvent.click(screen.getByRole('button', { name: 'Cancel' }))
+    expect(onCancel).toHaveBeenCalledOnce()
+  })
+
+  test('does not show Cancel after the first step', () => {
+    customRender(
+      <SteppedFlow steps={steps} currentStep="connection" onStepChange={vi.fn()} onCancel={vi.fn()}>
+        Step body
+      </SteppedFlow>
+    )
+
+    expect(screen.queryByRole('button', { name: 'Cancel' })).not.toBeInTheDocument()
+  })
+
+  test('shows Back after the first step', () => {
+    const onStepChange = vi.fn()
+
+    customRender(
+      <SteppedFlow steps={steps} currentStep="connection" onStepChange={onStepChange}>
+        Step body
+      </SteppedFlow>
+    )
+
+    fireEvent.click(screen.getByRole('button', { name: 'Back' }))
+    expect(onStepChange).toHaveBeenCalledWith('destination')
+  })
+
+  test('advances to the next step when onNext is omitted', () => {
+    const onStepChange = vi.fn()
+
+    customRender(
+      <SteppedFlow steps={steps} currentStep="destination" onStepChange={onStepChange}>
+        Step body
+      </SteppedFlow>
+    )
+
+    fireEvent.click(screen.getByRole('button', { name: 'Next' }))
+    expect(onStepChange).toHaveBeenCalledWith('connection')
+  })
+
+  test('shows the final action on the last step instead of Next', () => {
+    const onFinal = vi.fn()
+
+    customRender(
+      <SteppedFlow
+        steps={steps}
+        currentStep="review"
+        onStepChange={vi.fn()}
+        onNext={vi.fn()}
+        finalAction={{ label: 'Create and start pipeline', onClick: onFinal }}
+      >
+        Step body
+      </SteppedFlow>
+    )
+
+    expect(screen.queryByRole('button', { name: /Next/ })).not.toBeInTheDocument()
+    fireEvent.click(screen.getByRole('button', { name: 'Create and start pipeline' }))
+    expect(onFinal).toHaveBeenCalledOnce()
+  })
+
+  test('renders a step header heading', () => {
+    customRender(
+      <SteppedFlow steps={steps} currentStep="destination" onStepChange={vi.fn()}>
+        <SteppedFlowHeader title="Choose a destination" description="Where should data go?" />
+      </SteppedFlow>
+    )
+
+    expect(screen.getByRole('heading', { name: 'Choose a destination' })).toBeInTheDocument()
+    expect(screen.getByText('Where should data go?')).toBeInTheDocument()
+  })
+
+  test('renders optional header actions', () => {
+    customRender(
+      <SteppedFlow steps={steps} currentStep="connection" onStepChange={vi.fn()}>
+        <SteppedFlowHeader
+          title="Authorize the destination"
+          description="Name this pipeline."
+          actions={
+            <button type="button" tabIndex={0}>
+              Docs
+            </button>
+          }
+        />
+      </SteppedFlow>
+    )
+
+    expect(screen.getByRole('button', { name: 'Docs' })).toBeInTheDocument()
+  })
+
+  test('disables Back while navigation is locked', () => {
+    customRender(
+      <SteppedFlow
+        steps={steps}
+        currentStep="review"
+        onStepChange={vi.fn()}
+        navigationDisabled
+        finalAction={{ label: 'Create and start pipeline', loading: true }}
+      >
+        Step body
+      </SteppedFlow>
+    )
+
+    expect(screen.getByRole('button', { name: 'Back' })).toBeDisabled()
+  })
+
+  test('disables Next while navigation is locked', () => {
+    customRender(
+      <SteppedFlow
+        steps={steps}
+        currentStep="destination"
+        onStepChange={vi.fn()}
+        navigationDisabled
+      >
+        Step body
+      </SteppedFlow>
+    )
+
+    expect(screen.getByRole('button', { name: 'Next' })).toBeDisabled()
+  })
+
+  test('disables the final action while navigation is locked', () => {
+    customRender(
+      <SteppedFlow
+        steps={steps}
+        currentStep="review"
+        onStepChange={vi.fn()}
+        navigationDisabled
+        finalAction={{ label: 'Create and start pipeline' }}
+      >
+        Step body
+      </SteppedFlow>
+    )
+
+    expect(screen.getByRole('button', { name: 'Create and start pipeline' })).toBeDisabled()
+  })
+})
diff --git a/apps/studio/components/ui/SteppedFlow/SteppedFlow.tsx b/apps/studio/components/ui/SteppedFlow/SteppedFlow.tsx
new file mode 100644
index 00000000000..0d149df260c
--- /dev/null
+++ b/apps/studio/components/ui/SteppedFlow/SteppedFlow.tsx
@@ -0,0 +1,164 @@
+import { type ReactNode } from 'react'
+import { Button, Card, CardFooter, CardHeader, cn } from 'ui'
+
+export type SteppedFlowStep = {
+  id: string
+  label: string
+}
+
+export type SteppedFlowFinalAction = {
+  label: string
+  onClick?: () => void
+  loading?: boolean
+  disabled?: boolean
+  form?: string
+  type?: 'button' | 'submit'
+}
+
+export const SteppedFlowHeader = ({
+  title,
+  description,
+  actions,
+  children,
+}: {
+  title: string
+  description?: ReactNode
+  actions?: ReactNode
+  children?: ReactNode
+}) => {
+  return (
+    <CardHeader>
+      <header className="flex flex-col space-y-1">
+        <div className="flex items-start justify-between gap-4">
+          <div className="min-w-0 flex-1 space-y-1">
+            <h2 className="text-lg text-foreground">{title}</h2>
+            {description ? <p className="text-sm text-foreground-light">{description}</p> : null}
+          </div>
+          {actions ? <div className="shrink-0">{actions}</div> : null}
+        </div>
+        {children}
+      </header>
+    </CardHeader>
+  )
+}
+
+export interface SteppedFlowProps {
+  steps: SteppedFlowStep[]
+  currentStep: string
+  onStepChange: (stepId: string) => void
+  nextDisabled?: boolean
+  nextLabel?: string
+  onNext?: () => void
+  nextLoading?: boolean
+  navigationDisabled?: boolean
+  onCancel?: () => void
+  cancelLabel?: string
+  finalAction?: SteppedFlowFinalAction
+  children: ReactNode
+}
+
+export const SteppedFlow = ({
+  steps,
+  currentStep,
+  onStepChange,
+  nextDisabled = false,
+  nextLabel = 'Next',
+  onNext,
+  nextLoading = false,
+  navigationDisabled = false,
+  onCancel,
+  cancelLabel = 'Cancel',
+  finalAction,
+  children,
+}: SteppedFlowProps) => {
+  const currentIndex = Math.max(
+    0,
+    steps.findIndex((step) => step.id === currentStep)
+  )
+  const stepCount = steps.length
+  const isLastStep = stepCount > 0 && currentIndex === stepCount - 1
+  const isFirstStep = currentIndex === 0
+  const currentStepLabel = steps[currentIndex]?.label
+  const showCancel = isFirstStep && !!onCancel
+  const nextStepId = steps[currentIndex + 1]?.id
+
+  const handleNext = () => {
+    if (onNext) {
+      onNext()
+      return
+    }
+
+    if (nextStepId) {
+      onStepChange(nextStepId)
+    }
+  }
+
+  if (stepCount === 0) {
+    return null
+  }
+
+  return (
+    <div className="flex min-h-full flex-col">
+      <div className="mx-auto w-full max-w-[760px] flex-1 px-6 pt-8 pb-10">
+        <p className="mb-4 text-xs text-foreground-lighter" role="status">
+          Step {currentIndex + 1} of {stepCount}
+          {currentStepLabel ? ` · ${currentStepLabel}` : ''}
+        </p>
+        <Card
+          key={currentStep}
+          className="animate-in fade-in-0 duration-200 motion-reduce:animate-none"
+        >
+          {children}
+          <CardFooter
+            className={cn(currentIndex > 0 || showCancel ? 'justify-between' : 'justify-end')}
+          >
+            {currentIndex > 0 ? (
+              <Button
+                type="button"
+                variant="default"
+                disabled={navigationDisabled}
+                onClick={() => onStepChange(steps[currentIndex - 1].id)}
+              >
+                Back
+              </Button>
+            ) : null}
+            {currentIndex === 0 && showCancel ? (
+              <Button
+                type="button"
+                variant="default"
+                disabled={navigationDisabled}
+                onClick={onCancel}
+              >
+                {cancelLabel}
+              </Button>
+            ) : null}
+            <div className="flex items-center gap-2">
+              {isLastStep && finalAction ? (
+                <Button
+                  type={finalAction.type ?? (finalAction.form ? 'submit' : 'button')}
+                  form={finalAction.form}
+                  variant="primary"
+                  loading={finalAction.loading}
+                  disabled={navigationDisabled || finalAction.disabled}
+                  onClick={finalAction.onClick}
+                >
+                  {finalAction.label}
+                </Button>
+              ) : (
+                <Button
+                  type="button"
+                  variant="primary"
+                  disabled={navigationDisabled || nextDisabled || !nextStepId}
+                  loading={nextLoading}
+                  onClick={handleNext}
+                >
+                  {nextLabel}
+                </Button>
+              )}
+            </div>
+          </CardFooter>
+        </Card>
+      </div>
+    </div>
+  )
+}
diff --git a/apps/studio/data/api.d.ts b/apps/studio/data/api.d.ts
index f544d32d35f..aaf4b26af7d 100644
--- a/apps/studio/data/api.d.ts
+++ b/apps/studio/data/api.d.ts
@@ -1,4 +1,5 @@
 /**
  * Avoid importing this file and import the types directly from api-types
+ * @deprecated import from 'api-types' instead
  */
 export type * from 'api-types'
diff --git a/apps/studio/data/content/notebooks/notebook-cache.test.ts b/apps/studio/data/content/notebooks/notebook-cache.test.ts
index 875f5c23103..1fe4f86de62 100644
--- a/apps/studio/data/content/notebooks/notebook-cache.test.ts
+++ b/apps/studio/data/content/notebooks/notebook-cache.test.ts
@@ -54,7 +54,7 @@ describe('evictNotebookFromCaches', () => {
     expect(queryClient.getQueryData(contentKeys.resource(PROJECT_REF, NOTEBOOK_ID))).toBeUndefined()
   })
 
-  it('leaves an unsaved notebook and its cache entry untouched', async () => {
+  it('removes an unsaved notebook and its cache entry after its caller confirms discard', async () => {
     seedNotebook('new')
     const queryClient = new QueryClient()
     seedQueryData(queryClient)
@@ -65,14 +65,12 @@ describe('evictNotebookFromCaches', () => {
       id: NOTEBOOK_ID,
     })
 
-    expect(evicted).toBe(false)
-    expect(notebooksState.notebooks[NOTEBOOK_ID]).toBeDefined()
-    expect(queryClient.getQueryData(contentKeys.resource(PROJECT_REF, NOTEBOOK_ID))).toEqual({
-      id: NOTEBOOK_ID,
-    })
+    expect(evicted).toBe(true)
+    expect(notebooksState.notebooks[NOTEBOOK_ID]).toBeUndefined()
+    expect(queryClient.getQueryData(contentKeys.resource(PROJECT_REF, NOTEBOOK_ID))).toBeUndefined()
   })
 
-  it('no-ops for an id not present in the store', async () => {
+  it('drops a stale cache entry when the notebook is not present in the store', async () => {
     const queryClient = new QueryClient()
     seedQueryData(queryClient)
 
@@ -82,9 +80,7 @@ describe('evictNotebookFromCaches', () => {
       id: NOTEBOOK_ID,
     })
 
-    expect(evicted).toBe(false)
-    expect(queryClient.getQueryData(contentKeys.resource(PROJECT_REF, NOTEBOOK_ID))).toEqual({
-      id: NOTEBOOK_ID,
-    })
+    expect(evicted).toBe(true)
+    expect(queryClient.getQueryData(contentKeys.resource(PROJECT_REF, NOTEBOOK_ID))).toBeUndefined()
   })
 })
diff --git a/apps/studio/data/content/notebooks/notebook-cache.ts b/apps/studio/data/content/notebooks/notebook-cache.ts
index be8db93ff53..10ce4711450 100644
--- a/apps/studio/data/content/notebooks/notebook-cache.ts
+++ b/apps/studio/data/content/notebooks/notebook-cache.ts
@@ -23,8 +23,7 @@ export function hasDiscardableChanges(
 
 /**
  * Evicts a notebook from the React Query cache and the Valtio store together.
- * Applies to a persisted notebook (always safe to refetch) and to a dirty
- * unsaved notebook (safe once the caller has confirmed discarding it).
+ * Callers are responsible for confirming before discarding unsaved edits.
  *
  * Removes the query entry outright rather than invalidating it: a mounted
  * `useNotebookQuery` observer would otherwise read the stale cached value
@@ -32,10 +31,8 @@ export function hasDiscardableChanges(
  * merge guard would treat that stale merge as already-loaded and drop the
  * real update.
  *
- * @returns A boolean indicating whether the notebook was successfully evicted
- *          from the cache.
  */
-export async function evictNotebookFromCaches({
+export function evictNotebookFromCaches({
   queryClient,
   projectRef,
   id,
@@ -43,11 +40,7 @@ export async function evictNotebookFromCaches({
   queryClient: QueryClient
   projectRef: string
   id: string
-}): Promise<boolean> {
-  const stateNotebook = notebooksState.notebooks[id]
-  const canEvict = stateNotebook?.status === 'saved' || hasDiscardableChanges(stateNotebook)
-  if (!canEvict) return false
-
+}): boolean {
   notebooksState.removeNotebook({ id })
   queryClient.removeQueries({ queryKey: contentKeys.resource(projectRef, id) })
 
diff --git a/apps/studio/data/content/notebooks/notebook-operations.test.ts b/apps/studio/data/content/notebooks/notebook-operations.test.ts
index 77a5ba0a804..1194884333a 100644
--- a/apps/studio/data/content/notebooks/notebook-operations.test.ts
+++ b/apps/studio/data/content/notebooks/notebook-operations.test.ts
@@ -121,6 +121,41 @@ describe('applyNotebookOperations', () => {
     ])
   })
 
+  it('resets the insert offset for an anchor cell once it gets moved', () => {
+    // cell-1 gets an insert right after it, then cell-1 itself moves after cell-3. A later
+    // insert anchored on cell-1 must land right after its *new* position — the first insert
+    // stayed behind at cell-1's old spot, so it shouldn't count toward this offset anymore.
+    const notebook: NotebookWire = {
+      schema_version: 1,
+      cells: [
+        { _tag: 'markdown_cell', _id: 'cell-1', text: '1' },
+        { _tag: 'markdown_cell', _id: 'cell-2', text: '2' },
+        { _tag: 'markdown_cell', _id: 'cell-3', text: '3' },
+        { _tag: 'markdown_cell', _id: 'cell-4', text: '4' },
+      ],
+    }
+    const ops: NotebookOperation[] = [
+      {
+        _tag: 'insert_cell',
+        after_cell_id: 'cell-1',
+        cell: { _tag: 'markdown_cell', text: 'first' },
+      },
+      { _tag: 'move_cell', cell_id: 'cell-1', after_cell_id: 'cell-3' },
+      {
+        _tag: 'insert_cell',
+        after_cell_id: 'cell-1',
+        cell: { _tag: 'markdown_cell', text: 'second' },
+      },
+    ]
+
+    const result = applyNotebookOperations(notebook, ops)
+
+    expect(result.success).toBe(true)
+    if (!result.success) return
+    const texts = result.notebook.cells.map((cell) => ('text' in cell ? cell.text : undefined))
+    expect(texts).toEqual(['first', '2', '3', '1', 'second', '4'])
+  })
+
   it('resolves a move anchored on another moved cell using its new position', () => {
     // cell-1 moves after cell-3 first, landing at [cell-2, cell-3, cell-1]; cell-2 then moves
     // after cell-1's *new* position, giving [cell-3, cell-1, cell-2].
diff --git a/apps/studio/data/content/notebooks/notebook-operations.ts b/apps/studio/data/content/notebooks/notebook-operations.ts
index 60d2dcb27d2..2a2b0404de4 100644
--- a/apps/studio/data/content/notebooks/notebook-operations.ts
+++ b/apps/studio/data/content/notebooks/notebook-operations.ts
@@ -256,6 +256,9 @@ export function deriveNotebookDiff(
         }
 
         entries.splice(found.index, 1)
+        // Cells already inserted after this anchor stay behind at its old position, so a
+        // later insert anchored on it should start counting from its new position again.
+        insertedAfter.delete(operation.cell_id)
         const error = insertAfter(operation.after_cell_id, {
           _tag: 'moved',
           cell: found.cell,
diff --git a/apps/studio/data/ha-admin/get-ha-admin.ts b/apps/studio/data/ha-admin/get-ha-admin.ts
new file mode 100644
index 00000000000..53b205fcbd8
--- /dev/null
+++ b/apps/studio/data/ha-admin/get-ha-admin.ts
@@ -0,0 +1,41 @@
+import { z } from 'zod'
+
+import { get, handleError } from '@/data/fetchers'
+
+/**
+ * Read-only slices of the multiadmin API, surfaced through the mgmt-api
+ * `/ha-admin` GET passthrough. The passthrough is a catch-all proxy, so these
+ * paths aren't in Studio's generated OpenAPI types — each resource validates
+ * the response against its own zod schema instead.
+ *
+ * mgmt-api forwards `/ha-admin/v1/<x>` → `/multiadmin/v1/<x>`, which the
+ * project edge gateway rewrites to multiadmin's `/api/v1/<x>`.
+ */
+export async function getHaAdmin(
+  projectRef: string | undefined,
+  subPath: string,
+  signal?: AbortSignal
+): Promise<unknown> {
+  if (!projectRef) throw new Error('projectRef is required')
+
+  const { data, error } = await get(
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any -- off-schema passthrough path
+    `/platform/projects/${projectRef}/ha-admin/v1/${subPath}` as any,
+    { signal }
+  )
+
+  if (error) handleError(error)
+  return data
+}
+
+/**
+ * Validates a passthrough response, surfacing a readable error (which lands in
+ * the diagram's AlertError fallback) instead of a raw zod issue dump.
+ */
+export function parseHaAdminResponse<T extends z.ZodTypeAny>(schema: T, data: unknown): z.infer<T> {
+  const parsed = schema.safeParse(data)
+  if (!parsed.success) {
+    throw new Error('Received an unexpected response from the cluster admin API')
+  }
+  return parsed.data
+}
diff --git a/apps/studio/data/ha-admin/ha-cluster-gateways-query.ts b/apps/studio/data/ha-admin/ha-cluster-gateways-query.ts
new file mode 100644
index 00000000000..b8e8037b3aa
--- /dev/null
+++ b/apps/studio/data/ha-admin/ha-cluster-gateways-query.ts
@@ -0,0 +1,39 @@
+import { queryOptions } from '@tanstack/react-query'
+import { z } from 'zod'
+
+import { getHaAdmin, parseHaAdminResponse } from './get-ha-admin'
+import { haAdminKeys } from './keys'
+import { IS_PLATFORM } from '@/lib/constants'
+import type { ResponseError } from '@/types'
+
+export type HaClusterGatewaysVariables = { projectRef?: string }
+export type HaClusterGatewaysError = ResponseError
+
+// Every field is optional because proto3 JSON omits zero values.
+const multigatewaySchema = z.object({
+  id: z.object({ cell: z.string().optional(), name: z.string().optional() }).optional(),
+  hostname: z.string().optional(),
+})
+
+const haClusterGatewaysResponseSchema = z.object({
+  gateways: z.array(multigatewaySchema).optional(),
+})
+
+export type Multigateway = z.infer<typeof multigatewaySchema>
+
+async function getHaClusterGateways(
+  { projectRef }: HaClusterGatewaysVariables,
+  signal?: AbortSignal
+) {
+  const data = await getHaAdmin(projectRef, 'gateways', signal)
+  return parseHaAdminResponse(haClusterGatewaysResponseSchema, data)
+}
+
+export type HaClusterGatewaysData = Awaited<ReturnType<typeof getHaClusterGateways>>
+
+export const haClusterGatewaysQueryOptions = ({ projectRef }: HaClusterGatewaysVariables) =>
+  queryOptions({
+    queryKey: haAdminKeys.gateways(projectRef),
+    queryFn: ({ signal }) => getHaClusterGateways({ projectRef }, signal),
+    enabled: IS_PLATFORM && typeof projectRef !== 'undefined',
+  })
diff --git a/apps/studio/data/ha-admin/ha-cluster-poolers-query.ts b/apps/studio/data/ha-admin/ha-cluster-poolers-query.ts
new file mode 100644
index 00000000000..bc6a23c9d82
--- /dev/null
+++ b/apps/studio/data/ha-admin/ha-cluster-poolers-query.ts
@@ -0,0 +1,73 @@
+import { queryOptions } from '@tanstack/react-query'
+import { z } from 'zod'
+
+import { getHaAdmin, parseHaAdminResponse } from './get-ha-admin'
+import { haAdminKeys } from './keys'
+import { IS_PLATFORM } from '@/lib/constants'
+import type { ResponseError } from '@/types'
+
+export type HaClusterPoolersVariables = { projectRef?: string }
+export type HaClusterPoolersError = ResponseError
+
+// Hand-modelled subset of multiadmin's OpenAPI spec. Every field is optional
+// because proto3 JSON omits zero values, and enum-shaped fields stay plain
+// strings (expected values in comments) so new proto values degrade gracefully
+// instead of failing the whole parse.
+const multipoolerSchema = z.object({
+  id: z.object({ cell: z.string().optional(), name: z.string().optional() }).optional(),
+  shardKey: z
+    .object({
+      database: z.string().optional(),
+      tableGroup: z.string().optional(),
+      shard: z.string().optional(),
+    })
+    .optional(),
+  // 'UNKNOWN' | 'PRIMARY' | 'REPLICA' | 'DRAINED' — deprecated (derived, not
+  // authoritative), prefer `routingState.role`
+  type: z.string().optional(),
+  // 'SERVING' | 'DISABLED' | 'DRAINING'
+  servingStatus: z.string().optional(),
+  hostname: z.string().optional(),
+  // `PoolerLifecycleStatus` (multigres proto/clustermetadata.proto):
+  // 'STARTING' | 'ACTIVE' | 'STOPPING' | 'SHUTDOWN' | 'QUARANTINED', optionally
+  // prefixed with 'LIFECYCLE_'. 'LIFECYCLE_UNKNOWN' is the zero value, so it is
+  // omitted from JSON. There is no dedicated failure member — QUARANTINED is the
+  // terminal failure state (the pooler gave up recovering, e.g. a failed
+  // pg_rewind or backup restore, and is kept alive for forensics) and SHUTDOWN is
+  // "durably down". `getPoolerStatus` maps every member. An unrecognized value
+  // (a future enum member) falls through to the `servingStatus` check, and since
+  // SERVING is that enum's zero value it usually renders as Healthy until mapped.
+  lifecycleStatus: z.object({ status: z.string().optional() }).optional(),
+  routingState: z
+    .object({
+      role: z.string().optional(),
+      // proto int64s, serialized as strings in JSON
+      rule: z
+        .object({ coordinatorTerm: z.string().optional(), leaderSubterm: z.string().optional() })
+        .optional(),
+    })
+    .optional(),
+})
+
+const haClusterPoolersResponseSchema = z.object({
+  poolers: z.array(multipoolerSchema).optional(),
+})
+
+export type Multipooler = z.infer<typeof multipoolerSchema>
+
+async function getHaClusterPoolers(
+  { projectRef }: HaClusterPoolersVariables,
+  signal?: AbortSignal
+) {
+  const data = await getHaAdmin(projectRef, 'poolers', signal)
+  return parseHaAdminResponse(haClusterPoolersResponseSchema, data)
+}
+
+export type HaClusterPoolersData = Awaited<ReturnType<typeof getHaClusterPoolers>>
+
+export const haClusterPoolersQueryOptions = ({ projectRef }: HaClusterPoolersVariables) =>
+  queryOptions({
+    queryKey: haAdminKeys.poolers(projectRef),
+    queryFn: ({ signal }) => getHaClusterPoolers({ projectRef }, signal),
+    enabled: IS_PLATFORM && typeof projectRef !== 'undefined',
+  })
diff --git a/apps/studio/data/ha-admin/keys.ts b/apps/studio/data/ha-admin/keys.ts
new file mode 100644
index 00000000000..d07096e90a5
--- /dev/null
+++ b/apps/studio/data/ha-admin/keys.ts
@@ -0,0 +1,6 @@
+export const haAdminKeys = {
+  poolers: (projectRef: string | undefined) =>
+    ['projects', projectRef, 'ha-admin', 'poolers'] as const,
+  gateways: (projectRef: string | undefined) =>
+    ['projects', projectRef, 'ha-admin', 'gateways'] as const,
+}
diff --git a/apps/studio/data/organizations/organization-mappers.test.ts b/apps/studio/data/organizations/organization-mappers.test.ts
index 39afb494e18..6b334622c68 100644
--- a/apps/studio/data/organizations/organization-mappers.test.ts
+++ b/apps/studio/data/organizations/organization-mappers.test.ts
@@ -21,6 +21,7 @@ const baseOrganizationResponse = {
   organization_missing_tax_id: false,
   organization_requires_mfa: false,
   plan: { id: 'pro' as const, name: 'Pro' },
+  requires_indirect_tax_declaration: false,
   restriction_data: null,
   restriction_status: null,
   slug: 'toolshed',
@@ -38,6 +39,7 @@ const baseOrganizationSlugResponse = {
   name: 'Toolshed',
   opt_in_tags: [] as string[],
   plan: { id: 'pro' as const, name: 'Pro' },
+  requires_indirect_tax_declaration: false,
   restriction_data: null,
   restriction_status: null,
   slug: 'toolshed',
diff --git a/apps/studio/data/projects/project-detail-query.ts b/apps/studio/data/projects/project-detail-query.ts
index a7b8a58cde6..2bb05a43e69 100644
--- a/apps/studio/data/projects/project-detail-query.ts
+++ b/apps/studio/data/projects/project-detail-query.ts
@@ -43,7 +43,7 @@ export async function getProjectDetail(
    * To prevent odd side effects like pg-meta queries failing or the likes, we wake up the project proactively and wait for it
    * to be back online before returning the project details.
    */
-  if (data?.is_hibernating && !skipWake) {
+  if (data?.status === 'ACTIVE_HEALTHY' && data?.is_hibernating && !skipWake) {
     // In case project was scaled down, explicitly wake it up before continuing to return the project details
     const { error: errorWaking, data: wakeResponse } = await post('/platform/projects/{ref}/wake', {
       params: { path: { ref } },
diff --git a/apps/studio/data/sso/sso-config-create-mutation.ts b/apps/studio/data/sso/sso-config-create-mutation.ts
index 4ef7331c7dc..37063eae464 100644
--- a/apps/studio/data/sso/sso-config-create-mutation.ts
+++ b/apps/studio/data/sso/sso-config-create-mutation.ts
@@ -1,14 +1,17 @@
 import { useMutation, useQueryClient } from '@tanstack/react-query'
+import type { operations } from 'api-types'
 import { toast } from 'sonner'
 
 import { orgSSOKeys } from './keys'
-import type { components } from '@/data/api'
 import { handleError, post } from '@/data/fetchers'
 import type { ResponseError, UseCustomMutationOptions } from '@/types'
 
+type CreateSSOProviderBody =
+  operations['SSOProvidersController_createSSOProvider']['requestBody']['content']['application/json']
+
 export type SSOConfigCreateVariables = {
   slug: string
-  config: components['schemas']['CreateSSOProviderBody']
+  config: CreateSSOProviderBody
 }
 
 export async function createSSOConfig({ slug, config }: SSOConfigCreateVariables) {
diff --git a/apps/studio/data/sso/sso-config-update-mutation.ts b/apps/studio/data/sso/sso-config-update-mutation.ts
index 8244875a30e..85ec4ad0675 100644
--- a/apps/studio/data/sso/sso-config-update-mutation.ts
+++ b/apps/studio/data/sso/sso-config-update-mutation.ts
@@ -1,20 +1,23 @@
 import { useMutation, useQueryClient } from '@tanstack/react-query'
+import type { operations } from 'api-types'
 import { toast } from 'sonner'
 
 import { orgSSOKeys } from './keys'
-import type { components } from '@/data/api'
 import { handleError, put } from '@/data/fetchers'
 import type { ResponseError, UseCustomMutationOptions } from '@/types'
 
+type UpdateSSOProviderBody =
+  operations['SSOProvidersController_updateSSOProvider']['requestBody']['content']['application/json']
+
 export type SSOConfigUpdateVariables = {
   slug: string
-  config: Partial<components['schemas']['UpdateSSOProviderBody']>
+  config: Partial<UpdateSSOProviderBody>
 }
 
 export async function updateSSOConfig({ slug, config }: SSOConfigUpdateVariables) {
   const { data, error } = await put('/platform/organizations/{slug}/sso', {
     params: { path: { slug } },
-    body: config as components['schemas']['UpdateSSOProviderBody'],
+    body: config as UpdateSSOProviderBody,
   })
 
   if (error) handleError(error)
diff --git a/apps/studio/data/workers/keys.ts b/apps/studio/data/workers/keys.ts
index 2feecbc6431..9eedc104d21 100644
--- a/apps/studio/data/workers/keys.ts
+++ b/apps/studio/data/workers/keys.ts
@@ -2,4 +2,6 @@ export const workersKeys = {
   list: (projectRef: string | undefined) => ['projects', projectRef, 'workers'] as const,
   detail: (projectRef: string | undefined, name: string | undefined) =>
     ['projects', projectRef, 'worker', name, 'detail'] as const,
+  logs: (projectRef: string | undefined, name: string | undefined, stream: string) =>
+    ['projects', projectRef, 'worker', name, 'logs', stream] as const,
 }
diff --git a/apps/studio/data/workers/worker-logs-query.test.ts b/apps/studio/data/workers/worker-logs-query.test.ts
new file mode 100644
index 00000000000..2c909f8459d
--- /dev/null
+++ b/apps/studio/data/workers/worker-logs-query.test.ts
@@ -0,0 +1,51 @@
+import { describe, expect, it } from 'vitest'
+
+import { parseWorkerLogRows, workerLogsSql } from './worker-logs-query'
+
+describe('workerLogsSql', () => {
+  it('reads one worker stream, newest first', () => {
+    expect(workerLogsSql('embed', 'output')).toBe(
+      "select id, timestamp, severity_text as severity, event_message as message from logs where log_attributes['worker'] = 'embed' and log_attributes['source'] = 'worker_guest_logs' order by timestamp desc limit 100"
+    )
+  })
+
+  it('names the right stream for each tab', () => {
+    expect(workerLogsSql('embed', 'requests')).toContain("'worker_ingress_logs'")
+    expect(workerLogsSql('embed', 'builds')).toContain("'worker_api_logs'")
+  })
+
+  it('escapes a worker name rather than interpolating it raw', () => {
+    expect(workerLogsSql("embed' or '1'='1", 'output')).toContain(
+      "log_attributes['worker'] = 'embed'' or ''1''=''1'"
+    )
+  })
+})
+
+describe('parseWorkerLogRows', () => {
+  it('shapes rows for the logs table with a numeric timestamp', () => {
+    const [row] = parseWorkerLogRows([
+      { id: 'a', timestamp: '2026-08-24T10:00:00.000000', severity: 'ERROR', message: 'boom' },
+    ])
+    expect(row.id).toBe('a')
+    expect(row.event_message).toBe('boom')
+    expect(row.severity_text).toBe('ERROR')
+    expect(typeof row.timestamp).toBe('number')
+    expect(Number.isFinite(row.timestamp)).toBe(true)
+  })
+
+  it('falls back to empty strings for null severity and message', () => {
+    const [row] = parseWorkerLogRows([
+      { id: 'a', timestamp: '2026-08-24T10:00:00.000000', severity: null, message: null },
+    ])
+    expect(row.severity_text).toBe('')
+    expect(row.event_message).toBe('')
+  })
+
+  it('returns an empty array for a missing result', () => {
+    expect(parseWorkerLogRows(undefined)).toEqual([])
+  })
+
+  it('rejects a malformed row rather than passing bad data to the table', () => {
+    expect(() => parseWorkerLogRows([{ timestamp: '2026-08-24T10:00:00.000000' }])).toThrow()
+  })
+})
diff --git a/apps/studio/data/workers/worker-logs-query.ts b/apps/studio/data/workers/worker-logs-query.ts
new file mode 100644
index 00000000000..eb68cd8968c
--- /dev/null
+++ b/apps/studio/data/workers/worker-logs-query.ts
@@ -0,0 +1,89 @@
+import { queryOptions } from '@tanstack/react-query'
+import dayjs from 'dayjs'
+import { z } from 'zod'
+
+import { workersKeys } from './keys'
+import type { LogData } from '@/components/interfaces/Settings/Logs/Logs.types'
+import { otelTimestampToMicros } from '@/components/interfaces/Settings/Logs/Logs.utils.otel'
+import { executeAnalyticsSql } from '@/data/logs/execute-analytics-sql'
+import { logsAllEndpointUrl } from '@/data/logs/logs-endpoint'
+import { analyticsLiteral, safeSql } from '@/data/logs/safe-analytics-sql'
+import { IS_PLATFORM } from '@/lib/constants'
+
+export const WORKER_LOG_SOURCES = {
+  requests: 'worker_ingress_logs',
+  output: 'worker_guest_logs',
+  builds: 'worker_api_logs',
+} as const
+
+export type WorkerLogStream = keyof typeof WORKER_LOG_SOURCES
+
+export const WORKER_LOG_STREAM_LABEL: Record<WorkerLogStream, string> = {
+  requests: 'Invocations',
+  output: 'Logs',
+  builds: 'Activity',
+}
+
+// Both are read from `log_attributes` rather than the endpoint's own `source` column:
+// that column is derived from a mapping which does not currently classify worker rows.
+const WORKER_NAME_KEY = 'worker'
+const STREAM_KEY = 'source'
+
+const LOOKBACK_HOURS = 24
+const LOG_LIMIT = 100
+
+const workerLogRowSchema = z.object({
+  id: z.string(),
+  timestamp: z.union([z.string(), z.number()]),
+  severity: z.string().nullish(),
+  message: z.string().nullish(),
+})
+
+export type WorkerLogsVariables = {
+  projectRef?: string
+  name?: string
+  stream: WorkerLogStream
+}
+
+export const workerLogsSql = (name: string, stream: WorkerLogStream) =>
+  safeSql`select id, timestamp, severity_text as severity, event_message as message from logs where log_attributes[${analyticsLiteral(WORKER_NAME_KEY)}] = ${analyticsLiteral(name)} and log_attributes[${analyticsLiteral(STREAM_KEY)}] = ${analyticsLiteral(WORKER_LOG_SOURCES[stream])} order by timestamp desc limit ${analyticsLiteral(LOG_LIMIT)}`
+
+export const parseWorkerLogRows = (result: unknown): LogData[] =>
+  z
+    .array(workerLogRowSchema)
+    .parse(result ?? [])
+    .map((row) => ({
+      id: row.id,
+      timestamp: otelTimestampToMicros(row.timestamp),
+      event_message: row.message ?? '',
+      severity_text: row.severity ?? '',
+    }))
+
+async function getWorkerLogs(
+  { projectRef, name, stream }: WorkerLogsVariables,
+  signal?: AbortSignal
+): Promise<LogData[]> {
+  if (!projectRef) throw new Error('projectRef is required')
+  if (!name) throw new Error('name is required')
+
+  const end = dayjs()
+  const start = end.subtract(LOOKBACK_HOURS, 'hour')
+
+  const data = await executeAnalyticsSql({
+    projectRef,
+    endpoint: logsAllEndpointUrl(true),
+    sql: workerLogsSql(name, stream),
+    iso_timestamp_start: start.toISOString(),
+    iso_timestamp_end: end.toISOString(),
+    signal,
+  })
+
+  return parseWorkerLogRows(data?.result)
+}
+
+export const workerLogsQueryOptions = ({ projectRef, name, stream }: WorkerLogsVariables) =>
+  queryOptions({
+    queryKey: workersKeys.logs(projectRef, name, stream),
+    queryFn: ({ signal }) => getWorkerLogs({ projectRef, name, stream }, signal),
+    enabled: IS_PLATFORM && typeof projectRef !== 'undefined' && typeof name !== 'undefined',
+  })
diff --git a/apps/studio/hooks/misc/__tests__/useInboundBranding.test.ts b/apps/studio/hooks/misc/__tests__/useInboundBranding.test.ts
index fcf77f5fd54..d54755ce913 100644
--- a/apps/studio/hooks/misc/__tests__/useInboundBranding.test.ts
+++ b/apps/studio/hooks/misc/__tests__/useInboundBranding.test.ts
@@ -10,6 +10,14 @@ import { customRenderHook } from '@/tests/lib/custom-render'
 
 vi.mock('next/router', () => import('next-router-mock'))
 
+// The global mock in vitestSetup.ts stubs `useParams` to always return `{ ref: 'default' }`, which
+// doesn't reflect the `method`/`destination` query params this hook relies on — restore the real
+// implementation here so it reads them from the mocked router.
+vi.mock('common', async (importOriginal) => {
+  const actual = (await importOriginal()) as object
+  return { ...actual }
+})
+
 const mockEnabledProviders = vi.hoisted(() => vi.fn<() => ExternalIdentityProviderConfig[]>())
 
 vi.mock('../useEnabledIdentityProviders', () => ({
diff --git a/apps/studio/hooks/misc/useHighAvailability.ts b/apps/studio/hooks/misc/useHighAvailability.ts
index 90648f6b802..626a484e623 100644
--- a/apps/studio/hooks/misc/useHighAvailability.ts
+++ b/apps/studio/hooks/misc/useHighAvailability.ts
@@ -1,14 +1,13 @@
 import { useMemo } from 'react'
 
 import { MULTIGRES_SCHEMA_NAME, resolveHighAvailability } from './useHighAvailability.constants'
-import { useSelectedProjectQuery } from './useSelectedProject'
+import { useIsHighAvailability, useSelectedProjectQuery } from './useSelectedProject'
 
 export { MULTIGRES_SCHEMA_NAME, resolveHighAvailability }
 
 export function useHighAvailability() {
-  const { data: project, isPending } = useSelectedProjectQuery()
-
-  const isHighAvailability = resolveHighAvailability(project)
+  const isHighAvailability = useIsHighAvailability()
+  const { isPending } = useSelectedProjectQuery()
 
   return {
     isHighAvailability,
diff --git a/apps/studio/hooks/misc/useInboundBranding.ts b/apps/studio/hooks/misc/useInboundBranding.ts
index dd9b45df4e1..dcfdf97247a 100644
--- a/apps/studio/hooks/misc/useInboundBranding.ts
+++ b/apps/studio/hooks/misc/useInboundBranding.ts
@@ -1,4 +1,4 @@
-import { useRouter } from 'next/router'
+import { useParams } from 'common'
 import { useMemo } from 'react'
 
 import { useEnabledIdentityProviders } from './useEnabledIdentityProviders'
@@ -33,15 +33,9 @@ export type InboundBranding = {
  * screen.
  */
 export function useInboundBranding(flow: 'sign-in' | 'sign-up' = 'sign-in'): InboundBranding {
-  const router = useRouter()
   const enabledProviders = useEnabledIdentityProviders()
 
-  const destinationId =
-    router.isReady && typeof router.query.destination === 'string'
-      ? router.query.destination
-      : undefined
-  const focusId =
-    router.isReady && typeof router.query.method === 'string' ? router.query.method : undefined
+  const { destination: destinationId, method: focusId } = useParams()
 
   const focusProvider = useMemo(
     () =>
diff --git a/apps/studio/hooks/misc/useSelectedProject.ts b/apps/studio/hooks/misc/useSelectedProject.ts
index 27dd57a4b9a..4fd2d5fd894 100644
--- a/apps/studio/hooks/misc/useSelectedProject.ts
+++ b/apps/studio/hooks/misc/useSelectedProject.ts
@@ -54,6 +54,7 @@ export const useIsOrioleDbInAws = () => {
   return isOrioleDbInAws
 }
 
+// [Joshen TODO] There's a duplicate method `resolveHighAvailability` in `useHighAvailability.constants`
 export const useIsHighAvailability = () => {
   const { data: project } = useSelectedProjectQuery()
   return project?.high_availability ?? false
diff --git a/apps/studio/lib/ai/ai-details.test.ts b/apps/studio/lib/ai/ai-details.test.ts
index 56e4b61b3a2..343d36ea6eb 100644
--- a/apps/studio/lib/ai/ai-details.test.ts
+++ b/apps/studio/lib/ai/ai-details.test.ts
@@ -91,6 +91,7 @@ describe('getAIDetails', () => {
       hasAccessToAdvanceModel: false,
       hasHipaaAddon: false,
       orgId: 1,
+      orgSlug: ORG_SLUG,
       planId: 'pro',
       region: 'us-east-1',
       isSensitive: false,
@@ -189,6 +190,7 @@ describe('getAIDetails', () => {
       expect(result.aiOptInLevel).toBe('disabled')
       expect(result.hasAccessToAdvanceModel).toBe(false)
       expect(result.orgId).toBeUndefined()
+      expect(result.orgSlug).toBeUndefined()
       expect(result.planId).toBeUndefined()
     })
 
@@ -216,6 +218,7 @@ describe('getAIDetails', () => {
 
     expect(result.aiOptInLevel).toBe('disabled')
     expect(result.orgId).toBeUndefined()
+    expect(result.orgSlug).toBeUndefined()
   })
 
   it('falls back to the most restrictive posture when project detail is unavailable', async () => {
diff --git a/apps/studio/lib/ai/ai-details.ts b/apps/studio/lib/ai/ai-details.ts
index be61660368d..9a4fe56875c 100644
--- a/apps/studio/lib/ai/ai-details.ts
+++ b/apps/studio/lib/ai/ai-details.ts
@@ -11,6 +11,7 @@ export type AIDetails = {
   hasAccessToAdvanceModel: boolean
   hasHipaaAddon: boolean | undefined
   orgId: number | undefined
+  orgSlug: string | undefined
   planId: string | undefined
   region: string | undefined
   isSensitive: boolean | null | undefined
@@ -56,6 +57,7 @@ export const getAIDetails = async ({
       // Undefined rather than false so isTracingAllowed fails closed
       hasHipaaAddon: undefined,
       orgId: undefined,
+      orgSlug: undefined,
       planId: undefined,
       region,
       isSensitive,
@@ -72,6 +74,7 @@ export const getAIDetails = async ({
     hasAccessToAdvanceModel: advanceModelAccess.hasAccess,
     hasHipaaAddon,
     orgId: selectedOrg.id,
+    orgSlug: selectedOrg.slug,
     planId: selectedOrg.plan.id,
     region,
     isSensitive,
diff --git a/apps/studio/lib/ai/generate-assistant-response.ts b/apps/studio/lib/ai/generate-assistant-response.ts
index a46b4c6f89e..ccb02cc2866 100644
--- a/apps/studio/lib/ai/generate-assistant-response.ts
+++ b/apps/studio/lib/ai/generate-assistant-response.ts
@@ -39,6 +39,7 @@ export async function generateAssistantResponse({
   supportMode,
   userId,
   orgId,
+  orgSlug,
   planId,
   includesLogsSnippets,
   isExplorerEnabled,
@@ -60,6 +61,7 @@ export async function generateAssistantResponse({
   supportMode?: boolean
   userId?: string
   orgId?: number
+  orgSlug?: string
   planId?: string
   /** Whether any user message in the conversation attached a logs (ClickHouse) query. */
   includesLogsSnippets?: boolean
@@ -171,6 +173,7 @@ export async function generateAssistantResponse({
         aiOptInLevel,
         userId,
         orgId,
+        orgSlug,
         planId,
         requestedModel,
         gitBranch: process.env.VERCEL_GIT_COMMIT_REF,
diff --git a/apps/studio/lib/constants/workers.ts b/apps/studio/lib/constants/workers.ts
index 02e9fa1b0e1..887f13c712a 100644
--- a/apps/studio/lib/constants/workers.ts
+++ b/apps/studio/lib/constants/workers.ts
@@ -1,47 +1,2 @@
 export const PRODUCT_NAME = 'Workers'
 export const CLI_NAME = 'workers'
-
-export const WORKERS_CLI_DEPLOY = `supabase ${CLI_NAME} push`
-
-export const WORKERS_SKILL_MARKDOWN = `# Supabase ${PRODUCT_NAME} — agent skill
-
-Deploy and manage backend workers (microVMs) that run next to a Supabase project's Postgres.
-
-## Deploy from config.toml
-
-Add a block to \`supabase/config.toml\`:
-
-\`\`\`toml
-[${CLI_NAME}.embed]
-runtime   = "python"   # node | deno | bun | python | dockerfile
-size      = "2gb-1vcpu"   # 2gb-1vcpu | 4gb-2vcpu — fixed at deploy
-access    = "public"   # public | private
-instances = 1          # 1..10 per deploy; 100 cap per project
-secrets   = ["OPENAI_API_KEY"]   # names only — values live in the Secrets API
-\`\`\`
-
-Then run:
-
-\`\`\`bash
-supabase ${CLI_NAME} new embed --runtime python
-supabase ${CLI_NAME} push embed
-\`\`\`
-
-Config precedence: \`--flag\` > \`config.toml\` > interactive prompt > default.
-
-## Conventions
-
-- Workers under \`supabase/${CLI_NAME}/<name>/\` are auto-discovered; the folder name is the slug.
-- \`entrypoint\` is inferred from the runtime (node index.js, deno run main.ts, python main.py, Dockerfile CMD).
-- \`region\` is locked to us-west-2 at alpha — do not set it.
-- Sizes are fixed at deploy time. To change size, delete the worker and redeploy.
-
-## Manage
-
-- \`supabase ${CLI_NAME} list\`
-- \`supabase ${CLI_NAME} status <name>\`
-- \`supabase ${CLI_NAME} logs <name> --follow\`
-- \`supabase ${CLI_NAME} stop <name>\`   # scale to zero (reversible)
-- \`supabase ${CLI_NAME} start <name>\`
-- \`supabase ${CLI_NAME} delete <name>\`
-`
diff --git a/apps/studio/pages/api/ai/sql/generate-v4.ts b/apps/studio/pages/api/ai/sql/generate-v4.ts
index 1b056af7c64..bd16a812d6c 100644
--- a/apps/studio/pages/api/ai/sql/generate-v4.ts
+++ b/apps/studio/pages/api/ai/sql/generate-v4.ts
@@ -96,7 +96,7 @@ async function handlePost(req: NextApiRequest, res: NextApiResponse, claims?: Jw
     messages: rawMessages,
     projectRef,
     connectionString,
-    orgSlug,
+    orgSlug: rawOrgSlug,
     chatId,
     chatName,
     model: rawRequestedModel,
@@ -126,6 +126,7 @@ async function handlePost(req: NextApiRequest, res: NextApiResponse, claims?: Jw
   let projectIsSensitive: boolean | null | undefined
   let projectRegion: string | undefined
   let orgId: number | undefined
+  let orgSlug: string | undefined
   let planId: string | undefined
 
   if (!IS_PLATFORM) {
@@ -133,14 +134,15 @@ async function handlePost(req: NextApiRequest, res: NextApiResponse, claims?: Jw
     hasAccessToAdvanceModel = true
   }
 
-  if (IS_PLATFORM && orgSlug && authorization && projectRef) {
+  if (IS_PLATFORM && rawOrgSlug && authorization && projectRef) {
     try {
-      const aiDetails = await getAIDetails({ orgSlug, projectRef, authorization })
+      const aiDetails = await getAIDetails({ orgSlug: rawOrgSlug, projectRef, authorization })
 
       aiOptInLevel = aiDetails.aiOptInLevel
       hasAccessToAdvanceModel = aiDetails.hasAccessToAdvanceModel
       orgHasHipaaAddon = aiDetails.hasHipaaAddon
       orgId = aiDetails.orgId
+      orgSlug = aiDetails.orgSlug
       planId = aiDetails.planId
       projectIsSensitive = aiDetails.isSensitive
       projectRegion = aiDetails.region
@@ -234,6 +236,7 @@ async function handlePost(req: NextApiRequest, res: NextApiResponse, claims?: Jw
       supportMode,
       userId,
       orgId,
+      orgSlug,
       planId,
       includesLogsSnippets,
       isExplorerEnabled: explorerEnabled,
diff --git a/apps/studio/pages/project/[ref]/database/replication/index.tsx b/apps/studio/pages/project/[ref]/database/replication/index.tsx
index 296fcd4f3e2..e444bbad613 100644
--- a/apps/studio/pages/project/[ref]/database/replication/index.tsx
+++ b/apps/studio/pages/project/[ref]/database/replication/index.tsx
@@ -12,9 +12,9 @@ import { GenericSkeletonLoader } from 'ui-patterns/ShimmeringLoader'
 import { ReadReplicasMovedCallout } from '@/components/interfaces/Database/Replication/DestinationPanel/ReadReplicasMovedCallout'
 import { Destinations } from '@/components/interfaces/Database/Replication/Destinations'
 import { ReplicationDiagram } from '@/components/interfaces/Database/Replication/ReplicationDiagram'
+import { InstanceConfiguration } from '@/components/interfaces/Settings/Infrastructure/InfrastructureConfiguration/InstanceConfiguration'
 import DatabaseLayout from '@/components/layouts/DatabaseLayout/DatabaseLayout'
 import { DefaultLayout } from '@/components/layouts/DefaultLayout'
-import { HighAvailabilityDisabledEmptyState } from '@/components/ui/HighAvailability/HighAvailabilityDisabledEmptyState'
 import { UnknownInterface } from '@/components/ui/UnknownInterface'
 import { useHighAvailability } from '@/hooks/misc/useHighAvailability'
 import { useIsFeatureEnabled } from '@/hooks/misc/useIsFeatureEnabled'
@@ -33,12 +33,26 @@ const DatabaseReplicationPage: NextPageWithLayout = () => {
 
   if (isHighAvailability) {
     return (
-      <div className="flex h-full w-full items-center justify-center p-6">
-        <HighAvailabilityDisabledEmptyState
-          title="Replication unavailable on High Availability projects"
-          description="We're working to bring replication to High Availability projects. Contact support if this is blocking your work."
-        />
-      </div>
+      <>
+        <PageHeader size="large">
+          <PageHeaderMeta>
+            <PageHeaderSummary>
+              <PageHeaderTitle>Replication</PageHeaderTitle>
+              <PageHeaderDescription>High Availability cluster topology</PageHeaderDescription>
+            </PageHeaderSummary>
+          </PageHeaderMeta>
+        </PageHeader>
+
+        <PageContainer size="large">
+          <PageSection>
+            <PageSectionContent>
+              <div className="relative h-[500px] w-full overflow-hidden rounded-md border border-muted">
+                <InstanceConfiguration />
+              </div>
+            </PageSectionContent>
+          </PageSection>
+        </PageContainer>
+      </>
     )
   }
 
diff --git a/apps/studio/pages/project/[ref]/observability/database.tsx b/apps/studio/pages/project/[ref]/observability/database.tsx
index 86956d32ab5..20b18cedcd9 100644
--- a/apps/studio/pages/project/[ref]/observability/database.tsx
+++ b/apps/studio/pages/project/[ref]/observability/database.tsx
@@ -43,7 +43,7 @@ import { useCheckEntitlements } from '@/hooks/misc/useCheckEntitlements'
 import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
 import { useRefreshHandler, useReportDateRange } from '@/hooks/misc/useReportDateRange'
 import { useSelectedOrganizationQuery } from '@/hooks/misc/useSelectedOrganization'
-import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'
+import { useIsHighAvailability, useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'
 import { DOCS_URL } from '@/lib/constants'
 import { formatBytes } from '@/lib/helpers'
 import { useDatabaseSelectorStateSnapshot } from '@/state/database-selector'
@@ -74,6 +74,7 @@ const DatabaseUsage = () => {
   const { db, chart, ref } = useParams()
   const { data: project } = useSelectedProjectQuery()
   const { data: org } = useSelectedOrganizationQuery()
+  const isHighAvailability = useIsHighAvailability()
 
   const {
     selectedDateRange,
@@ -240,6 +241,7 @@ const DatabaseUsage = () => {
               side="bottom"
             >
               <Button
+                aria-label="Refresh report"
                 variant="default"
                 disabled={isRefreshing}
                 icon={<RefreshCw className={isRefreshing ? 'animate-spin' : ''} />}
@@ -369,21 +371,27 @@ const DatabaseUsage = () => {
                   </div>
 
                   <div className="ml-auto">
-                    {project?.cloud_provider === 'AWS' ? (
+                    {/* 
+                      [Joshen] TODO: Check if this check is still relevant
+                      The DiskSizeConfigurationModal is old and might be obsolete
+                     */}
+                    {project?.cloud_provider === 'AWS' && !isHighAvailability ? (
                       <Button asChild variant="default">
                         <Link href={getInfrastructurePath(ref)}>Increase disk size</Link>
                       </Button>
                     ) : (
                       <ButtonTooltip
                         variant="default"
-                        disabled={!canUpdateDiskSizeConfig}
+                        disabled={!canUpdateDiskSizeConfig || isHighAvailability}
                         onClick={() => setshowIncreaseDiskSizeModal(true)}
                         tooltip={{
                           content: {
                             side: 'bottom',
                             text: !canUpdateDiskSizeConfig
                               ? 'You need additional permissions to increase the disk size'
-                              : undefined,
+                              : isHighAvailability
+                                ? 'Disk size management is unavailable for High Availability projects'
+                                : undefined,
                           },
                         }}
                       >
@@ -432,32 +440,7 @@ const DatabaseUsage = () => {
               </div>
             )
           }}
-          append={() => (
-            <div className="px-6 pb-6">
-              <Alert variant="default" className="mt-4">
-                <AlertDescription>
-                  <div className="space-y-2">
-                    <p>
-                      New Supabase projects have a database size of ~40-60mb. This space includes
-                      pre-installed extensions, schemas, and default Postgres data. Additional
-                      database size is used when installing extensions, even if those extensions are
-                      inactive.
-                    </p>
-
-                    <Button asChild variant="default" icon={<ExternalLink />}>
-                      <Link
-                        href={`${DOCS_URL}/guides/platform/database-size#disk-space-usage`}
-                        target="_blank"
-                        rel="noreferrer"
-                      >
-                        Read about database size
-                      </Link>
-                    </Button>
-                  </div>
-                </AlertDescription>
-              </Alert>
-            </div>
-          )}
+          append={renderDatabaseSizeAdditionalInfo}
         />
         <DiskSizeConfigurationModal
           visible={showIncreaseDiskSizeModal}
@@ -471,3 +454,31 @@ const DatabaseUsage = () => {
     </>
   )
 }
+
+const renderDatabaseSizeAdditionalInfo = () => {
+  return (
+    <div className="px-6 pb-6">
+      <Alert variant="default" className="mt-4">
+        <AlertDescription>
+          <div className="space-y-2">
+            <p>
+              New Supabase projects have a database size of ~40-60mb. This space includes
+              pre-installed extensions, schemas, and default Postgres data. Additional database size
+              is used when installing extensions, even if those extensions are inactive.
+            </p>
+
+            <Button asChild variant="default" icon={<ExternalLink />}>
+              <Link
+                href={`${DOCS_URL}/guides/platform/database-size#disk-space-usage`}
+                target="_blank"
+                rel="noreferrer"
+              >
+                Read about database size
+              </Link>
+            </Button>
+          </div>
+        </AlertDescription>
+      </Alert>
+    </div>
+  )
+}
diff --git a/apps/studio/pages/project/[ref]/observability/edge-functions.tsx b/apps/studio/pages/project/[ref]/observability/edge-functions.tsx
index 01146174e41..ac4ba8c75ca 100644
--- a/apps/studio/pages/project/[ref]/observability/edge-functions.tsx
+++ b/apps/studio/pages/project/[ref]/observability/edge-functions.tsx
@@ -243,7 +243,7 @@ const EdgeFunctionsUsage = () => {
                   value: region.key,
                   label: (
                     <div className="flex items-center gap-x-2">
-                      <RegionFlag aria-hidden="true" className="w-4" region={region.key} />
+                      <RegionFlag className="w-4" region={region.key} />
                       <div className="flex flex-wrap gap-x-2 items-center">
                         <span className="text-foreground text-xs">{region.label}</span>
                         <span className="text-foreground-lighter text-xs">{region.key}</span>
diff --git a/apps/studio/pages/project/[ref]/settings/api-keys/legacy.tsx b/apps/studio/pages/project/[ref]/settings/api-keys/legacy.tsx
index 39fa57ec7e7..1f3292b93b2 100644
--- a/apps/studio/pages/project/[ref]/settings/api-keys/legacy.tsx
+++ b/apps/studio/pages/project/[ref]/settings/api-keys/legacy.tsx
@@ -3,11 +3,25 @@ import { IS_PLATFORM } from 'common'
 import ApiKeysLayout from '@/components/layouts/APIKeys/APIKeysLayout'
 import { DefaultLayout } from '@/components/layouts/DefaultLayout'
 import SettingsLayout from '@/components/layouts/ProjectSettingsLayout/SettingsLayout'
+import { HighAvailabilityDisabledEmptyState } from '@/components/ui/HighAvailability/HighAvailabilityDisabledEmptyState'
 import { DisplayApiSettings } from '@/components/ui/ProjectSettings/DisplayApiSettings'
 import { ToggleLegacyApiKeysPanel } from '@/components/ui/ProjectSettings/ToggleLegacyApiKeys'
+import { useHighAvailability } from '@/hooks/misc/useHighAvailability'
 import type { NextPageWithLayout } from '@/types'
 
 const ApiKeysLegacyPage: NextPageWithLayout = () => {
+  const { isHighAvailability } = useHighAvailability()
+
+  if (isHighAvailability) {
+    return (
+      <HighAvailabilityDisabledEmptyState
+        className="max-w-full"
+        title="Legacy API keys are unavailable on High Availability projects"
+        description="High Availability projects only support publishable and secret API keys."
+      />
+    )
+  }
+
   return (
     <>
       <DisplayApiSettings showTitle={false} showNotice={false} />
diff --git a/apps/studio/pages/project/[ref]/workers/[name].tsx b/apps/studio/pages/project/[ref]/workers/[name].tsx
new file mode 100644
index 00000000000..bb3eaf1f230
--- /dev/null
+++ b/apps/studio/pages/project/[ref]/workers/[name].tsx
@@ -0,0 +1,14 @@
+import { WorkerDetail } from '@/components/interfaces/Workers/WorkerDetail/WorkerDetail'
+import { DefaultLayout } from '@/components/layouts/DefaultLayout'
+import { WorkersLayout } from '@/components/layouts/WorkersLayout/WorkersLayout'
+import type { NextPageWithLayout } from '@/types'
+
+const WorkerDetailPage: NextPageWithLayout = () => <WorkerDetail />
+
+WorkerDetailPage.getLayout = (page) => (
+  <DefaultLayout>
+    <WorkersLayout title="Worker">{page}</WorkersLayout>
+  </DefaultLayout>
+)
+
+export default WorkerDetailPage
diff --git a/apps/studio/pages/project/[ref]/workers/index.tsx b/apps/studio/pages/project/[ref]/workers/index.tsx
index af939bb9209..73debf88890 100644
--- a/apps/studio/pages/project/[ref]/workers/index.tsx
+++ b/apps/studio/pages/project/[ref]/workers/index.tsx
@@ -70,7 +70,7 @@ const WorkersPage: NextPageWithLayout = () => {
               <Admonition
                 type="default"
                 title={`${PRODUCT_NAME} is not enabled for this project`}
-                description={`${PRODUCT_NAME} is in private alpha. Contact support to have this project added to the alpha.`}
+                description={`${PRODUCT_NAME} is in Private Alpha. Contact support to have this project added to the alpha.`}
               />
             )}
             {isMissingPermission && <NoPermission resourceText="view this project's workers" />}
diff --git a/apps/studio/pages/sign-in.tsx b/apps/studio/pages/sign-in.tsx
index c000ad453bd..b91c8f62a98 100644
--- a/apps/studio/pages/sign-in.tsx
+++ b/apps/studio/pages/sign-in.tsx
@@ -1,12 +1,10 @@
-import { Lock } from 'lucide-react'
 import Link from 'next/link'
 import { useRouter } from 'next/router'
 import { useEffect, useState } from 'react'
-import { Button, cn } from 'ui'
+import { Button } from 'ui'
 
-import { LastSignInWrapper } from '@/components/interfaces/SignIn/LastSignInWrapper'
 import { SignInForm } from '@/components/interfaces/SignIn/SignInForm'
-import { SignInWithCustom } from '@/components/interfaces/SignIn/SignInWithCustom'
+import { SignInOptions } from '@/components/interfaces/SignIn/SignInOptions'
 import { SignInWithExternalProvider } from '@/components/interfaces/SignIn/SignInWithExternalProvider'
 import { AuthenticationLayout } from '@/components/layouts/AuthenticationLayout'
 import { SignInLayout } from '@/components/layouts/SignInLayout/SignInLayout'
@@ -15,7 +13,6 @@ import { useEnabledIdentityProviders } from '@/hooks/misc/useEnabledIdentityProv
 import { useInboundBranding } from '@/hooks/misc/useInboundBranding'
 import { useIsFeatureEnabled } from '@/hooks/misc/useIsFeatureEnabled'
 import { IS_PLATFORM } from '@/lib/constants'
-import type { ExternalIdentityProviderConfig } from '@/lib/external-identity-providers'
 import { getSignUpReturnTo } from '@/lib/gotrue'
 import type { NextPageWithLayout } from '@/types'
 
@@ -45,47 +42,6 @@ const SignInPage: NextPageWithLayout = () => {
   const { focusProvider } = useInboundBranding('sign-in')
   const signInProviders = useEnabledIdentityProviders().filter((provider) => provider.showOnSignIn)
 
-  const renderAuthOptions = (
-    providers: ExternalIdentityProviderConfig[],
-    dividerBgClass = 'bg-studio'
-  ) => {
-    const showOrDivider =
-      (providers.length > 0 || signInWithSsoEnabled || customProviders.length > 0) &&
-      signInWithEmailEnabled
-
-    return (
-      <>
-        {Array.isArray(customProviders) &&
-          customProviders.map((providerName: string) => (
-            <SignInWithCustom key={providerName} providerName={providerName} />
-          ))}
-        {providers.map((provider) => (
-          <SignInWithExternalProvider key={provider.id} provider={provider} />
-        ))}
-        {signInWithSsoEnabled && (
-          <LastSignInWrapper type="sso">
-            <Button asChild block size="large" variant="outline" icon={<Lock />}>
-              <Link href={{ pathname: '/sign-in-sso', query: router.query }}>
-                Continue with SSO
-              </Link>
-            </Button>
-          </LastSignInWrapper>
-        )}
-        {showOrDivider && (
-          <div className="relative">
-            <div className="absolute inset-0 flex items-center">
-              <div className="w-full border-t border-strong" />
-            </div>
-            <div className="relative flex justify-center text-sm">
-              <span className={cn('px-2 text-sm text-foreground', dividerBgClass)}>or</span>
-            </div>
-          </div>
-        )}
-        {signInWithEmailEnabled && <SignInForm />}
-      </>
-    )
-  }
-
   useEffect(() => {
     if (!IS_PLATFORM) {
       // on selfhosted instance just redirect to projects page
@@ -106,9 +62,13 @@ const SignInPage: NextPageWithLayout = () => {
     return (
       <div className="flex flex-col gap-5">
         <SignInWithExternalProvider provider={focusProvider} />
+
         {hasOtherOptions &&
           (showOtherOptions ? (
-            renderAuthOptions(otherProviders, 'bg-surface-100')
+            <>
+              <SignInOptions providers={otherProviders} dividerBgClass="bg-surface-100" />
+              {signInWithEmailEnabled && <SignInForm />}
+            </>
           ) : (
             <Button
               block
@@ -126,7 +86,10 @@ const SignInPage: NextPageWithLayout = () => {
 
   return (
     <>
-      <div className="flex flex-col gap-5">{renderAuthOptions(signInProviders)}</div>
+      <div className="flex flex-col gap-5">
+        <SignInOptions providers={signInProviders} />
+        {signInWithEmailEnabled && <SignInForm />}
+      </div>
 
       {signUpEnabled && (
         <div className="self-center my-8 text-sm">
diff --git a/apps/studio/pages/sign-up.tsx b/apps/studio/pages/sign-up.tsx
index 382a78a36ac..c6d5d851e9e 100644
--- a/apps/studio/pages/sign-up.tsx
+++ b/apps/studio/pages/sign-up.tsx
@@ -2,6 +2,7 @@ import Link from 'next/link'
 import { useState } from 'react'
 import { Button, cn } from 'ui'
 
+import { SignInOptions } from '@/components/interfaces/SignIn/SignInOptions'
 import { SignInWithExternalProvider } from '@/components/interfaces/SignIn/SignInWithExternalProvider'
 import { SignUpForm } from '@/components/interfaces/SignIn/SignUpForm'
 import { SignInLayout } from '@/components/layouts/SignInLayout/SignInLayout'
@@ -9,11 +10,11 @@ import { UnknownInterface } from '@/components/ui/UnknownInterface'
 import { useEnabledIdentityProviders } from '@/hooks/misc/useEnabledIdentityProviders'
 import { useInboundBranding } from '@/hooks/misc/useInboundBranding'
 import { useIsFeatureEnabled } from '@/hooks/misc/useIsFeatureEnabled'
-import type { ExternalIdentityProviderConfig } from '@/lib/external-identity-providers'
 import type { NextPageWithLayout } from '@/types'
 
 const SignUpPage: NextPageWithLayout = () => {
   const [showOtherOptions, setShowOtherOptions] = useState(false)
+  const [isSubmitted, setIsSubmitted] = useState(false)
   const { dashboardAuthSignUp: signUpEnabled } = useIsFeatureEnabled(['dashboard_auth:sign_up'])
 
   const { focusProvider } = useInboundBranding('sign-up')
@@ -23,62 +24,41 @@ const SignUpPage: NextPageWithLayout = () => {
     return <UnknownInterface fullHeight={false} urlBack="/sign-in" />
   }
 
-  // The sign-up options we offer besides a focused provider: other external providers and the email
-  // form. Rendered both on the full screen and when the user expands "other options" from the
-  // focused screen. The "or" pill's background matches the surface behind it: the page
-  // (`bg-studio`) on the full screen, or the interstitial card (`bg-surface-100`) when revealed.
-  const renderAuthOptions = (
-    providers: ExternalIdentityProviderConfig[],
-    dividerBgClass = 'bg-studio'
-  ) => (
-    <>
-      {providers.map((provider) => (
-        <SignInWithExternalProvider key={provider.id} provider={provider} />
-      ))}
-
-      <div className="relative">
-        <div className="absolute inset-0 flex items-center">
-          <div className="w-full border-t border-strong" />
-        </div>
-        <div className="relative flex justify-center text-sm">
-          <span className={cn('px-2 text-sm text-foreground', dividerBgClass)}>or</span>
-        </div>
-      </div>
-
-      <SignUpForm />
-    </>
-  )
-
-  // Inbound link focused us on a single provider — lead with that one (SignInLayout renders the
-  // matching interstitial frame around it), but let the user reveal the rest of our options.
-  if (focusProvider) {
-    const otherProviders = signUpProviders.filter((provider) => provider.id !== focusProvider.id)
-
-    return (
-      <div className="flex flex-col gap-5">
-        <SignInWithExternalProvider provider={focusProvider} />
-        {showOtherOptions ? (
-          renderAuthOptions(otherProviders, 'bg-surface-100')
-        ) : (
-          <Button
-            block
-            variant="text"
-            size="large"
-            className="-mt-2 text-foreground-light"
-            onClick={() => setShowOtherOptions(true)}
-          >
-            Show other options
-          </Button>
-        )}
-      </div>
-    )
-  }
-
   return (
     <>
-      <div className="flex flex-col gap-5">{renderAuthOptions(signUpProviders)}</div>
+      {focusProvider ? (
+        <div className="flex flex-col gap-5">
+          {!isSubmitted && <SignInWithExternalProvider provider={focusProvider} />}
+          {showOtherOptions ? (
+            <>
+              {!isSubmitted && (
+                <SignInOptions
+                  providers={signUpProviders.filter((provider) => provider.id !== focusProvider.id)}
+                  dividerBgClass="bg-surface-100"
+                />
+              )}
+              <SignUpForm onSuccess={() => setIsSubmitted(true)} />
+            </>
+          ) : (
+            <Button
+              block
+              variant="text"
+              size="large"
+              className="-mt-2 text-foreground-light"
+              onClick={() => setShowOtherOptions(true)}
+            >
+              Show other options
+            </Button>
+          )}
+        </div>
+      ) : (
+        <div className="flex flex-col gap-5">
+          {!isSubmitted && <SignInOptions providers={signUpProviders} />}
+          <SignUpForm onSuccess={() => setIsSubmitted(true)} />
+        </div>
+      )}
 
-      <div className="my-8 self-center text-sm">
+      <div className={cn('self-center text-center text-sm mb-8', isSubmitted ? 'mt-2' : 'mt-8')}>
         <span className="text-foreground-light">Have an account?</span>{' '}
         <Link
           href="/sign-in"
diff --git a/apps/studio/public/img/previews/explorer-preview.png b/apps/studio/public/img/previews/explorer-preview.png
new file mode 100644
index 00000000000..227cd0909f5
Binary files /dev/null and b/apps/studio/public/img/previews/explorer-preview.png differ
diff --git a/apps/studio/routeTree.gen.ts b/apps/studio/routeTree.gen.ts
index 350cfbc6ccd..7be3871d460 100644
--- a/apps/studio/routeTree.gen.ts
+++ b/apps/studio/routeTree.gen.ts
@@ -100,6 +100,7 @@ import { Route as ApiPlatformProfileIndexRouteImport } from './routes/api/platfo
 import { Route as ApiPlatformOrganizationsIndexRouteImport } from './routes/api/platform/organizations/index'
 import { Route as AppOrgSlugIndexRouteImport } from './routes/_app/org/$slug/index'
 import { Route as AppAccountTokensIndexRouteImport } from './routes/_app/account/tokens/index'
+import { Route as ProjectRefWorkersNameRouteImport } from './routes/project/$ref/workers/$name'
 import { Route as ProjectRefStorageS3RouteImport } from './routes/project/$ref/storage/s3'
 import { Route as ProjectRefSqlTemplatesRouteImport } from './routes/project/$ref/sql/templates'
 import { Route as ProjectRefSqlExamplesRouteImport } from './routes/project/$ref/sql/examples'
@@ -793,6 +794,11 @@ const AppAccountTokensIndexRoute = AppAccountTokensIndexRouteImport.update({
   path: '/tokens/',
   getParentRoute: () => AppAccountRoute,
 } as any)
+const ProjectRefWorkersNameRoute = ProjectRefWorkersNameRouteImport.update({
+  id: '/$name',
+  path: '/$name',
+  getParentRoute: () => ProjectRefWorkersRoute,
+} as any)
 const ProjectRefStorageS3Route = ProjectRefStorageS3RouteImport.update({
   id: '/s3',
   path: '/s3',
@@ -2270,6 +2276,7 @@ export interface FileRoutesByFullPath {
   '/project/$ref/sql/examples': typeof ProjectRefSqlExamplesRoute
   '/project/$ref/sql/templates': typeof ProjectRefSqlTemplatesRoute
   '/project/$ref/storage/s3': typeof ProjectRefStorageS3Route
+  '/project/$ref/workers/$name': typeof ProjectRefWorkersNameRoute
   '/account/tokens/': typeof AppAccountTokensIndexRoute
   '/org/$slug/': typeof AppOrgSlugIndexRoute
   '/api/platform/organizations/': typeof ApiPlatformOrganizationsIndexRoute
@@ -2572,6 +2579,7 @@ export interface FileRoutesByTo {
   '/project/$ref/sql/examples': typeof ProjectRefSqlExamplesRoute
   '/project/$ref/sql/templates': typeof ProjectRefSqlTemplatesRoute
   '/project/$ref/storage/s3': typeof ProjectRefStorageS3Route
+  '/project/$ref/workers/$name': typeof ProjectRefWorkersNameRoute
   '/account/tokens': typeof AppAccountTokensIndexRoute
   '/org/$slug': typeof AppOrgSlugIndexRoute
   '/api/platform/organizations': typeof ApiPlatformOrganizationsIndexRoute
@@ -2891,6 +2899,7 @@ export interface FileRoutesById {
   '/project/$ref/sql/examples': typeof ProjectRefSqlExamplesRoute
   '/project/$ref/sql/templates': typeof ProjectRefSqlTemplatesRoute
   '/project/$ref/storage/s3': typeof ProjectRefStorageS3Route
+  '/project/$ref/workers/$name': typeof ProjectRefWorkersNameRoute
   '/_app/account/tokens/': typeof AppAccountTokensIndexRoute
   '/_app/org/$slug/': typeof AppOrgSlugIndexRoute
   '/api/platform/organizations/': typeof ApiPlatformOrganizationsIndexRoute
@@ -3209,6 +3218,7 @@ export interface FileRouteTypes {
     | '/project/$ref/sql/examples'
     | '/project/$ref/sql/templates'
     | '/project/$ref/storage/s3'
+    | '/project/$ref/workers/$name'
     | '/account/tokens/'
     | '/org/$slug/'
     | '/api/platform/organizations/'
@@ -3511,6 +3521,7 @@ export interface FileRouteTypes {
     | '/project/$ref/sql/examples'
     | '/project/$ref/sql/templates'
     | '/project/$ref/storage/s3'
+    | '/project/$ref/workers/$name'
     | '/account/tokens'
     | '/org/$slug'
     | '/api/platform/organizations'
@@ -3829,6 +3840,7 @@ export interface FileRouteTypes {
     | '/project/$ref/sql/examples'
     | '/project/$ref/sql/templates'
     | '/project/$ref/storage/s3'
+    | '/project/$ref/workers/$name'
     | '/_app/account/tokens/'
     | '/_app/org/$slug/'
     | '/api/platform/organizations/'
@@ -4732,6 +4744,13 @@ declare module '@tanstack/react-router' {
       preLoaderRoute: typeof AppAccountTokensIndexRouteImport
       parentRoute: typeof AppAccountRoute
     }
+    '/project/$ref/workers/$name': {
+      id: '/project/$ref/workers/$name'
+      path: '/$name'
+      fullPath: '/project/$ref/workers/$name'
+      preLoaderRoute: typeof ProjectRefWorkersNameRouteImport
+      parentRoute: typeof ProjectRefWorkersRoute
+    }
     '/project/$ref/storage/s3': {
       id: '/project/$ref/storage/s3'
       path: '/s3'
@@ -6928,10 +6947,12 @@ const ProjectRefStorageRouteWithChildren =
   ProjectRefStorageRoute._addFileChildren(ProjectRefStorageRouteChildren)
 
 interface ProjectRefWorkersRouteChildren {
+  ProjectRefWorkersNameRoute: typeof ProjectRefWorkersNameRoute
   ProjectRefWorkersIndexRoute: typeof ProjectRefWorkersIndexRoute
 }
 
 const ProjectRefWorkersRouteChildren: ProjectRefWorkersRouteChildren = {
+  ProjectRefWorkersNameRoute: ProjectRefWorkersNameRoute,
   ProjectRefWorkersIndexRoute: ProjectRefWorkersIndexRoute,
 }
 
diff --git a/apps/studio/routes/project/$ref/workers/$name.tsx b/apps/studio/routes/project/$ref/workers/$name.tsx
new file mode 100644
index 00000000000..a8c23bb553f
--- /dev/null
+++ b/apps/studio/routes/project/$ref/workers/$name.tsx
@@ -0,0 +1,14 @@
+import { createFileRoute } from '@tanstack/react-router'
+
+import WorkerDetailPage from '@/pages/project/[ref]/workers/[name]'
+
+export const Route = createFileRoute('/project/$ref/workers/$name')({
+  component: WorkerDetailRoute,
+  staticData: {
+    workersLayoutTitle: 'Worker',
+  },
+})
+
+function WorkerDetailRoute() {
+  return <WorkerDetailPage dehydratedState={undefined} />
+}
diff --git a/apps/studio/state/notebooks/notebooks-state.ts b/apps/studio/state/notebooks/notebooks-state.ts
index 486399fadb1..96a7b716151 100644
--- a/apps/studio/state/notebooks/notebooks-state.ts
+++ b/apps/studio/state/notebooks/notebooks-state.ts
@@ -25,6 +25,13 @@ export const notebooksState = proxy({
   cellLocalState: proxyMap<string, NotebookCellLocalState>([]),
   /** Session-only conflicts where an assistant changed the server while local edits remain. */
   serverDivergedWhileDirty: proxyMap<string, 'updated' | 'deleted'>([]),
+  /**
+   * Id of the notebook the tab should scroll to the bottom of once rendered —
+   * set by a surface that adds a cell to a notebook it's about to navigate to
+   * (e.g. "Add to existing notebook" from a query tab), so the newly added
+   * cell lands in view.
+   */
+  pendingScrollToBottom: undefined as string | undefined,
 
   /**
    * Load notebook into the Valtio store. No-ops if already present.
@@ -242,6 +249,14 @@ export const notebooksState = proxy({
   },
 
   addNeedsSaving: (id: string) => notebooksState.needsSaving.set(id, true),
+
+  requestScrollToBottom: (id: string) => {
+    notebooksState.pendingScrollToBottom = id
+  },
+
+  clearPendingScrollToBottom: () => {
+    notebooksState.pendingScrollToBottom = undefined
+  },
 })
 
 export const getNotebooksStateSnapshot = () => snapshot(notebooksState)
diff --git a/apps/studio/styles/reactflow.css b/apps/studio/styles/reactflow.css
index 62e1a494528..89eb05a4758 100644
--- a/apps/studio/styles/reactflow.css
+++ b/apps/studio/styles/reactflow.css
@@ -9,6 +9,12 @@
   }
 }
 
+@media (prefers-reduced-motion: reduce) {
+  .react-flow__edge.animated path {
+    animation: none;
+  }
+}
+
 .map-path {
   animation: dash 8s linear infinite;
 }
diff --git a/apps/studio/tests/components/Organization/TeamSettings/InviteMemberButton.network.test.tsx b/apps/studio/tests/components/Organization/TeamSettings/InviteMemberButton.network.test.tsx
index 1ab2641ffae..a934d3ced55 100644
--- a/apps/studio/tests/components/Organization/TeamSettings/InviteMemberButton.network.test.tsx
+++ b/apps/studio/tests/components/Organization/TeamSettings/InviteMemberButton.network.test.tsx
@@ -1,6 +1,6 @@
 import { fireEvent, screen, waitFor } from '@testing-library/react'
 import userEvent from '@testing-library/user-event'
-import { platformComponents as components } from 'api-types'
+import { platformComponents as components, operations } from 'api-types'
 import { HttpResponse } from 'msw'
 import { beforeEach, describe, expect, test, vi } from 'vitest'
 
@@ -15,7 +15,8 @@ type Member = components['schemas']['Member']
 type InvitationResponse = components['schemas']['InvitationResponse']
 type OrganizationRoleResponse = components['schemas']['OrganizationRoleResponse']
 type ListEntitlementsResponse = components['schemas']['ListEntitlementsResponse']
-type CreateInvitationResponse = components['schemas']['CreateInvitationResponse']
+type CreateInvitationResponse =
+  operations['InvitationsController_createInvitation']['responses']['201']['content']['application/json']
 type AccessControlPermission = components['schemas']['AccessControlPermission']
 
 const ORG_SLUG = 'test-org'
diff --git a/apps/studio/tests/components/SQLEditor/RoleImpersonationSelector.test.tsx b/apps/studio/tests/components/SQLEditor/RoleImpersonationSelector.test.tsx
new file mode 100644
index 00000000000..1ccca3ca6ab
--- /dev/null
+++ b/apps/studio/tests/components/SQLEditor/RoleImpersonationSelector.test.tsx
@@ -0,0 +1,133 @@
+import { screen } from '@testing-library/react'
+import userEvent from '@testing-library/user-event'
+import { toast } from 'sonner'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+
+import { RoleImpersonationSelectorInterface } from '@/components/interfaces/RoleImpersonationSelector'
+import type { ImpersonationRole } from '@/lib/role-impersonation'
+import type { RoleImpersonationController } from '@/state/role-impersonation-state'
+import { customRender } from '@/tests/lib/custom-render'
+
+vi.mock('sonner', () => ({ toast: { error: vi.fn() } }))
+
+vi.mock('@/components/interfaces/RoleImpersonationSelector/UserImpersonationSelector', () => ({
+  UserImpersonationSelector: ({ disabled }: { disabled?: boolean }) => (
+    <fieldset data-testid="user-settings" disabled={disabled}>
+      <button type="button" tabIndex={0}>
+        Project
+      </button>
+    </fieldset>
+  ),
+}))
+
+describe('RoleImpersonationSelectorInterface', () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+  })
+
+  it('enables user settings for authenticated queries and summarizes each role', async () => {
+    const user = userEvent.setup()
+    let currentRole: ImpersonationRole | undefined
+    const setRole = vi.fn(async (role: ImpersonationRole | undefined) => {
+      currentRole = role
+    })
+    const state: RoleImpersonationController = {
+      get role() {
+        return currentRole
+      },
+      claims: undefined,
+      setRole,
+    }
+
+    const { rerender } = customRender(<RoleImpersonationSelectorInterface state={state} />)
+
+    expect(screen.queryByText('Role')).not.toBeInTheDocument()
+    for (const option of screen.getAllByRole('radio')) {
+      expect(option).toHaveClass('w-full')
+      expect(option.querySelector('svg')).toBeInTheDocument()
+    }
+    expect(screen.getByRole('radio', { name: 'PostgresSuperuser' })).toBeChecked()
+    expect(screen.getByText('Bypasses RLS and can return all rows.')).toBeVisible()
+    expect(screen.getByTestId('user-settings')).toBeDisabled()
+
+    await user.click(screen.getByRole('radio', { name: 'AuthenticatedLogged-in user' }))
+
+    expect(screen.getByText('Returns rows available to the selected user.')).toBeVisible()
+    expect(screen.getByTestId('user-settings')).not.toBeDisabled()
+
+    await user.click(screen.getByRole('radio', { name: 'AnonymousNot logged in' }))
+    rerender(<RoleImpersonationSelectorInterface state={state} />)
+
+    expect(screen.getByText('Returns rows available to anonymous users.')).toBeVisible()
+    expect(setRole).toHaveBeenCalledWith({ type: 'postgrest', role: 'anon' })
+    expect(screen.getByTestId('user-settings')).toBeDisabled()
+
+    await user.click(screen.getByRole('radio', { name: 'PostgresSuperuser' }))
+    rerender(<RoleImpersonationSelectorInterface state={state} />)
+
+    expect(screen.getByText('Bypasses RLS and can return all rows.')).toBeVisible()
+    expect(setRole).toHaveBeenCalledWith(undefined)
+  })
+
+  it('follows externally cleared role state', () => {
+    let currentRole: ImpersonationRole | undefined = {
+      type: 'postgrest',
+      role: 'authenticated',
+      userType: 'native',
+    }
+    const state: RoleImpersonationController = {
+      get role() {
+        return currentRole
+      },
+      claims: undefined,
+      setRole: vi.fn(),
+    }
+
+    const { rerender } = customRender(<RoleImpersonationSelectorInterface state={state} />)
+
+    expect(screen.getByRole('radio', { name: 'AuthenticatedLogged-in user' })).toBeChecked()
+    expect(screen.getByTestId('user-settings')).not.toBeDisabled()
+
+    currentRole = undefined
+    rerender(<RoleImpersonationSelectorInterface state={state} />)
+
+    expect(screen.getByRole('radio', { name: 'PostgresSuperuser' })).toBeChecked()
+    expect(screen.getByTestId('user-settings')).toBeDisabled()
+  })
+
+  it('allows switching roles while impersonating a user', async () => {
+    const user = userEvent.setup()
+    const setRole = vi.fn().mockResolvedValue(undefined)
+    const state: RoleImpersonationController = {
+      role: {
+        type: 'postgrest',
+        role: 'authenticated',
+        userType: 'external',
+        externalAuth: { sub: 'external-user', additionalClaims: {} },
+      },
+      claims: undefined,
+      setRole,
+    }
+
+    customRender(<RoleImpersonationSelectorInterface state={state} />)
+
+    await user.click(screen.getByRole('radio', { name: 'AnonymousNot logged in' }))
+
+    expect(setRole).toHaveBeenCalledWith({ type: 'postgrest', role: 'anon' })
+  })
+
+  it('keeps the current selection and reports rejected role switches', async () => {
+    const user = userEvent.setup()
+    const state: RoleImpersonationController = {
+      role: undefined,
+      claims: undefined,
+      setRole: vi.fn().mockRejectedValue({ message: 'Role switch failed' }),
+    }
+
+    customRender(<RoleImpersonationSelectorInterface state={state} />)
+    await user.click(screen.getByRole('radio', { name: 'AnonymousNot logged in' }))
+
+    expect(screen.getByRole('radio', { name: 'PostgresSuperuser' })).toBeChecked()
+    expect(toast.error).toHaveBeenCalledWith('Failed to impersonate user: Role switch failed')
+  })
+})
diff --git a/apps/studio/tests/components/SQLEditor/RoleImpersonationSelector.utils.test.ts b/apps/studio/tests/components/SQLEditor/RoleImpersonationSelector.utils.test.ts
new file mode 100644
index 00000000000..ea2abda8b07
--- /dev/null
+++ b/apps/studio/tests/components/SQLEditor/RoleImpersonationSelector.utils.test.ts
@@ -0,0 +1,74 @@
+import { describe, expect, it } from 'vitest'
+
+import {
+  getRoleSelectionUpdate,
+  getSelectedRoleOption,
+} from '@/components/interfaces/RoleImpersonationSelector/RoleImpersonationSelector.utils'
+import type { ImpersonationRole, PostgrestRole } from '@/lib/role-impersonation'
+
+describe('getSelectedRoleOption', () => {
+  const cases: Array<{
+    name: string
+    role: ImpersonationRole | undefined
+    expected: PostgrestRole
+  }> = [
+    { name: 'defaults to Postgres when no role is set', role: undefined, expected: 'service_role' },
+    {
+      name: 'maps the service role to Postgres',
+      role: { type: 'postgrest', role: 'service_role' },
+      expected: 'service_role',
+    },
+    {
+      name: 'maps custom roles to Postgres',
+      role: { type: 'custom', role: 'reporter' },
+      expected: 'service_role',
+    },
+    {
+      name: 'preserves the anonymous role',
+      role: { type: 'postgrest', role: 'anon' },
+      expected: 'anon',
+    },
+    {
+      name: 'preserves native authenticated roles',
+      role: {
+        type: 'postgrest',
+        role: 'authenticated',
+        userType: 'native',
+      },
+      expected: 'authenticated',
+    },
+    {
+      name: 'preserves external authenticated roles',
+      role: {
+        type: 'postgrest',
+        role: 'authenticated',
+        userType: 'external',
+      },
+      expected: 'authenticated',
+    },
+  ]
+
+  it.each(cases)('$name', ({ role, expected }) => {
+    expect(getSelectedRoleOption(role)).toBe(expected)
+  })
+})
+
+describe('getRoleSelectionUpdate', () => {
+  it('clears role impersonation for Postgres', () => {
+    expect(getRoleSelectionUpdate('service_role')).toEqual({
+      shouldSetRole: true,
+      role: undefined,
+    })
+  })
+
+  it('sets the anonymous PostgREST role', () => {
+    expect(getRoleSelectionUpdate('anon')).toEqual({
+      shouldSetRole: true,
+      role: { type: 'postgrest', role: 'anon' },
+    })
+  })
+
+  it('waits for a user selection before setting the authenticated role', () => {
+    expect(getRoleSelectionUpdate('authenticated')).toEqual({ shouldSetRole: false })
+  })
+})
diff --git a/apps/studio/tests/components/SQLEditor/UserImpersonationSelector.test.tsx b/apps/studio/tests/components/SQLEditor/UserImpersonationSelector.test.tsx
new file mode 100644
index 00000000000..aad89d6383c
--- /dev/null
+++ b/apps/studio/tests/components/SQLEditor/UserImpersonationSelector.test.tsx
@@ -0,0 +1,151 @@
+import { screen } from '@testing-library/react'
+import userEvent from '@testing-library/user-event'
+import { mockAnimationsApi } from 'jsdom-testing-mocks'
+import { HttpResponse } from 'msw'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+
+import { UserImpersonationSelector } from '@/components/interfaces/RoleImpersonationSelector/UserImpersonationSelector'
+import type { AuthConfigResponse } from '@/data/auth/auth-config-query'
+import type { User } from '@/data/auth/users-infinite-query'
+import type { ProjectDetail } from '@/data/projects/project-detail-query'
+import type { RoleImpersonationController } from '@/state/role-impersonation-state'
+import { customRender } from '@/tests/lib/custom-render'
+import { addAPIMock } from '@/tests/lib/msw'
+
+mockAnimationsApi()
+
+const PROJECT: ProjectDetail = {
+  cloud_provider: 'AWS',
+  connectionString: 'postgresql://postgres@localhost:5432/postgres',
+  db_host: 'db.default.supabase.co',
+  high_availability: false,
+  id: 1,
+  inserted_at: '2026-01-01T00:00:00.000Z',
+  integration_source: null,
+  is_branch_enabled: false,
+  is_hibernating: false,
+  is_physical_backups_enabled: false,
+  name: 'Test project',
+  organization_id: 1,
+  ref: 'default',
+  region: 'us-east-1',
+  restUrl: 'https://default.supabase.co/rest/v1',
+  status: 'ACTIVE_HEALTHY',
+  subscription_id: 'subscription-1',
+  updated_at: '2026-01-01T00:00:00.000Z',
+}
+
+const AUTH_CONFIG_WITHOUT_CUSTOM_ACCESS_TOKEN_HOOK = {
+  HOOK_CUSTOM_ACCESS_TOKEN_ENABLED: false,
+  HOOK_CUSTOM_ACCESS_TOKEN_SECRETS: '',
+  HOOK_CUSTOM_ACCESS_TOKEN_URI: '',
+} as unknown as AuthConfigResponse
+
+describe('UserImpersonationSelector', () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+
+    addAPIMock({
+      method: 'get',
+      path: '/platform/projects/:ref',
+      response: PROJECT,
+    })
+    addAPIMock({
+      method: 'get',
+      path: '/platform/auth/:ref/config',
+      response: () =>
+        HttpResponse.json<AuthConfigResponse>(AUTH_CONFIG_WITHOUT_CUSTOM_ACCESS_TOKEN_HOOK),
+    })
+    addAPIMock({
+      method: 'post',
+      path: '/platform/pg-meta/:ref/query',
+      response: () => HttpResponse.json<User[]>([]),
+    })
+  })
+
+  it('shows the external claims example and MFA guidance in the shared layout', async () => {
+    const user = userEvent.setup()
+    const state: RoleImpersonationController = {
+      role: {
+        type: 'postgrest',
+        role: 'authenticated',
+        userType: 'native',
+      },
+      claims: undefined,
+      setRole: vi.fn(),
+    }
+
+    customRender(<UserImpersonationSelector state={state} />)
+    await user.click(screen.getByRole('radio', { name: 'External' }))
+
+    expect(
+      screen.getByPlaceholderText('e.g. {"app_metadata": {"org_id": "org_456"}}')
+    ).toBeVisible()
+    expect(screen.getByText('MFA level')).toBeVisible()
+    expect(screen.getByRole('button', { name: 'Users' })).toBeVisible()
+    expect(screen.getByRole('button', { name: 'MFA level' })).toBeVisible()
+  })
+
+  it('clears the selected user when switching user sources', async () => {
+    const user = userEvent.setup()
+    const onUserImpersonationCleared = vi.fn()
+    const state: RoleImpersonationController = {
+      role: {
+        type: 'postgrest',
+        role: 'authenticated',
+        userType: 'external',
+        externalAuth: { sub: 'external-user', additionalClaims: {} },
+        aal: 'aal2',
+      },
+      claims: undefined,
+      setRole: vi.fn().mockResolvedValue(undefined),
+    }
+
+    customRender(
+      <UserImpersonationSelector
+        state={state}
+        onUserImpersonationCleared={onUserImpersonationCleared}
+      />
+    )
+
+    expect(screen.getByRole('radio', { name: 'Project' })).toBeEnabled()
+    expect(screen.getByRole('radio', { name: 'External' })).toBeEnabled()
+    expect(screen.getByRole('button', { name: 'Stop impersonating user' })).toBeEnabled()
+
+    await user.click(screen.getByRole('radio', { name: 'Project' }))
+
+    expect(state.setRole).toHaveBeenCalledWith(undefined)
+    expect(onUserImpersonationCleared).toHaveBeenCalledOnce()
+  })
+
+  it('updates the active impersonation when switching MFA levels', async () => {
+    const user = userEvent.setup()
+    const state: RoleImpersonationController = {
+      role: {
+        type: 'postgrest',
+        role: 'authenticated',
+        userType: 'external',
+        externalAuth: { sub: 'external-user', additionalClaims: {} },
+        aal: 'aal2',
+      },
+      claims: undefined,
+      setRole: vi.fn().mockResolvedValue(undefined),
+    }
+
+    customRender(<UserImpersonationSelector state={state} />)
+
+    expect(screen.getByRole('radio', { name: 'AAL1' })).toBeEnabled()
+    expect(screen.getByRole('radio', { name: 'AAL2' })).toBeEnabled()
+    expect(screen.getByRole('radio', { name: 'AAL2' })).toBeChecked()
+
+    await user.click(screen.getByRole('radio', { name: 'AAL1' }))
+
+    expect(state.setRole).toHaveBeenCalledWith(
+      expect.objectContaining({
+        aal: 'aal1',
+        externalAuth: { sub: 'external-user', additionalClaims: {} },
+      }),
+      undefined
+    )
+  })
+})
diff --git a/apps/studio/tests/components/Settings/Infrastructure/AddReadReplicaDialog.test.tsx b/apps/studio/tests/components/Settings/Infrastructure/AddReadReplicaDialog.test.tsx
new file mode 100644
index 00000000000..aa14ac6d74d
--- /dev/null
+++ b/apps/studio/tests/components/Settings/Infrastructure/AddReadReplicaDialog.test.tsx
@@ -0,0 +1,99 @@
+import { screen, waitFor } from '@testing-library/react'
+import userEvent from '@testing-library/user-event'
+import { useState } from 'react'
+import { describe, expect, test, vi } from 'vitest'
+
+import { AddReadReplicaDialog } from '@/components/interfaces/Settings/Infrastructure/ReadReplicas/AddReadReplicaDialog'
+import { customRender } from '@/tests/lib/custom-render'
+
+const { mockReadReplicaForm } = vi.hoisted(() => ({ mockReadReplicaForm: vi.fn() }))
+
+vi.mock('@/components/interfaces/Settings/Infrastructure/ReadReplicas/ReadReplicaForm', () => ({
+  ReadReplicaForm: ({
+    onClose,
+    onRecommendCompute,
+  }: {
+    onClose: () => void
+    onRecommendCompute: (size: 'ci_small') => void
+  }) => {
+    mockReadReplicaForm()
+
+    return (
+      <>
+        <button type="button" tabIndex={0} onClick={() => onRecommendCompute('ci_small')}>
+          Change compute
+        </button>
+        <button type="button" tabIndex={0}>
+          Change region
+        </button>
+        <button type="button" tabIndex={0} onClick={onClose}>
+          Cancel
+        </button>
+      </>
+    )
+  },
+}))
+
+const renderDialog = (onRecommendCompute = vi.fn()) => {
+  const TestDialog = () => {
+    const [open, setOpen] = useState(true)
+
+    return (
+      <AddReadReplicaDialog
+        open={open}
+        onOpenChange={setOpen}
+        onRecommendCompute={onRecommendCompute}
+      />
+    )
+  }
+
+  return customRender(<TestDialog />)
+}
+
+describe('AddReadReplicaDialog', () => {
+  test('does not load form data while closed', () => {
+    customRender(
+      <AddReadReplicaDialog open={false} onOpenChange={vi.fn()} onRecommendCompute={vi.fn()} />
+    )
+
+    expect(mockReadReplicaForm).not.toHaveBeenCalled()
+  })
+
+  test('closes an unchanged dialog without confirmation', async () => {
+    const user = userEvent.setup()
+    renderDialog()
+
+    expect(screen.getByRole('dialog', { name: 'Add read replica' })).toBeInTheDocument()
+
+    await user.click(screen.getByRole('button', { name: 'Close' }))
+
+    await waitFor(() => {
+      expect(screen.queryByRole('dialog', { name: 'Add read replica' })).not.toBeInTheDocument()
+    })
+    expect(screen.queryByText('Unsaved changes')).not.toBeInTheDocument()
+  })
+
+  test('closes after a transient region selection without confirmation', async () => {
+    const user = userEvent.setup()
+    renderDialog()
+
+    await user.click(screen.getByRole('button', { name: 'Change region' }))
+    await user.click(screen.getByRole('button', { name: 'Cancel' }))
+
+    await waitFor(() => {
+      expect(screen.queryByRole('dialog', { name: 'Add read replica' })).not.toBeInTheDocument()
+    })
+    expect(screen.queryByText('Unsaved changes')).not.toBeInTheDocument()
+  })
+
+  test('hands the recommendation off after closing the dialog', async () => {
+    const user = userEvent.setup()
+    const onRecommendCompute = vi.fn()
+
+    renderDialog(onRecommendCompute)
+
+    await user.click(screen.getByRole('button', { name: 'Change compute' }))
+
+    await waitFor(() => expect(onRecommendCompute).toHaveBeenCalledWith('ci_small'))
+  })
+})
diff --git a/apps/studio/tests/components/Settings/Infrastructure/AddReadReplicaSheet.test.tsx b/apps/studio/tests/components/Settings/Infrastructure/AddReadReplicaSheet.test.tsx
deleted file mode 100644
index d441169f843..00000000000
--- a/apps/studio/tests/components/Settings/Infrastructure/AddReadReplicaSheet.test.tsx
+++ /dev/null
@@ -1,29 +0,0 @@
-import { screen, waitFor } from '@testing-library/react'
-import userEvent from '@testing-library/user-event'
-import { describe, expect, test, vi } from 'vitest'
-
-import { AddReadReplicaSheet } from '@/components/interfaces/Settings/Infrastructure/ReadReplicas/AddReadReplicaSheet'
-import { customRender } from '@/tests/lib/custom-render'
-
-vi.mock('@/components/interfaces/Settings/Infrastructure/ReadReplicas/ReadReplicaForm', () => ({
-  ReadReplicaForm: ({ onRecommendCompute }: { onRecommendCompute: (size: 'ci_small') => void }) => (
-    <button type="button" tabIndex={0} onClick={() => onRecommendCompute('ci_small')}>
-      Change to Small compute
-    </button>
-  ),
-}))
-
-describe('AddReadReplicaSheet', () => {
-  test('hands the recommendation off after closing the sheet', async () => {
-    const user = userEvent.setup()
-    const onRecommendCompute = vi.fn()
-
-    customRender(<AddReadReplicaSheet onRecommendCompute={onRecommendCompute} />, {
-      nuqs: { searchParams: { addReplica: 'true' } },
-    })
-
-    await user.click(screen.getByRole('button', { name: 'Change to Small compute' }))
-
-    await waitFor(() => expect(onRecommendCompute).toHaveBeenCalledWith('ci_small'))
-  })
-})
diff --git a/apps/studio/tests/components/Settings/Infrastructure/ReadReplicaEligibilityWarnings.test.tsx b/apps/studio/tests/components/Settings/Infrastructure/ReadReplicaEligibilityWarnings.test.tsx
index fe468736f15..cb125d3e4ef 100644
--- a/apps/studio/tests/components/Settings/Infrastructure/ReadReplicaEligibilityWarnings.test.tsx
+++ b/apps/studio/tests/components/Settings/Infrastructure/ReadReplicaEligibilityWarnings.test.tsx
@@ -3,13 +3,9 @@ import userEvent from '@testing-library/user-event'
 import { describe, expect, it, vi } from 'vitest'
 
 import { ReadReplicaEligibilityWarnings } from '@/components/interfaces/Settings/Infrastructure/ReadReplicas/ReadReplicaForm/ReadReplicaEligibilityWarnings'
-import { useCheckEligibilityDeployReplica } from '@/components/interfaces/Settings/Infrastructure/ReadReplicas/ReadReplicaForm/useCheckEligibilityDeployReplica'
 import { READ_REPLICAS_MAX_COUNT } from '@/data/read-replicas/replicas-query'
 import { customRender } from '@/tests/lib/custom-render'
 
-vi.mock(
-  '@/components/interfaces/Settings/Infrastructure/ReadReplicas/ReadReplicaForm/useCheckEligibilityDeployReplica'
-)
 vi.mock('@/data/projects/project-detail-query', () => ({
   useProjectDetailQuery: () => ({ data: undefined, isSuccess: false }),
 }))
@@ -33,6 +29,7 @@ const eligibility = (delta: Record<string, unknown>) => ({
   isWalgNotEnabled: false,
   isProWithSpendCapEnabled: false,
   isReachedMaxReplicas: false,
+  isHighAvailability: false,
   maxNumberOfReplicas: READ_REPLICAS_MAX_COUNT,
   ...delta,
 })
@@ -41,33 +38,36 @@ describe('ReadReplicaEligibilityWarnings – below small compute', () => {
   it('recommends Small compute when project is on pico, nano, or micro compute', async () => {
     const user = userEvent.setup()
     const onRecommendCompute = vi.fn()
-    vi.mocked(useCheckEligibilityDeployReplica).mockReturnValue(
-      eligibility({ isBelowSmallCompute: true })
+    const warningEligibility = eligibility({ isBelowSmallCompute: true })
+
+    customRender(
+      <ReadReplicaEligibilityWarnings
+        eligibility={warningEligibility}
+        onRecommendCompute={onRecommendCompute}
+      />
     )
 
-    customRender(<ReadReplicaEligibilityWarnings onRecommendCompute={onRecommendCompute} />)
-
+    expect(screen.getByText('Small compute required')).toBeInTheDocument()
     expect(
-      screen.getByText('Project required to at least be on a Small compute')
+      screen.getByText(/Read replicas require at least Small compute to keep up/)
     ).toBeInTheDocument()
-    expect(
-      screen.getByText(
-        'This is to ensure that read replicas can keep up with the primary database’s activities.'
-      )
-    ).toBeInTheDocument()
-    expect(screen.getByRole('button', { name: /change to small compute/i })).toBeInTheDocument()
-    await user.click(screen.getByRole('button', { name: /change to small compute/i }))
+    expect(screen.getByRole('link', { name: 'Learn more' })).toBeInTheDocument()
+    expect(screen.getByRole('button', { name: 'Change compute' })).toBeInTheDocument()
+    await user.click(screen.getByRole('button', { name: 'Change compute' }))
     expect(onRecommendCompute).toHaveBeenCalledWith('ci_small')
   })
 })
 
 describe('ReadReplicaEligibilityWarnings – max replicas reached', () => {
   it('shows upsell to upgrade compute when below the default cap (e.g. ci_small/medium/large → 4 replicas)', () => {
-    vi.mocked(useCheckEligibilityDeployReplica).mockReturnValue(
-      eligibility({ isReachedMaxReplicas: true, maxNumberOfReplicas: 4 })
-    )
+    const warningEligibility = eligibility({ isReachedMaxReplicas: true, maxNumberOfReplicas: 4 })
 
-    customRender(<ReadReplicaEligibilityWarnings onRecommendCompute={vi.fn()} />)
+    customRender(
+      <ReadReplicaEligibilityWarnings
+        eligibility={warningEligibility}
+        onRecommendCompute={vi.fn()}
+      />
+    )
 
     expect(
       screen.getByText('You can only deploy up to 4 read replicas at once')
@@ -77,11 +77,17 @@ describe('ReadReplicaEligibilityWarnings – max replicas reached', () => {
   })
 
   it('does NOT show the compute upsell when already at the default cap (XL+)', () => {
-    vi.mocked(useCheckEligibilityDeployReplica).mockReturnValue(
-      eligibility({ isReachedMaxReplicas: true, maxNumberOfReplicas: READ_REPLICAS_MAX_COUNT })
-    )
+    const warningEligibility = eligibility({
+      isReachedMaxReplicas: true,
+      maxNumberOfReplicas: READ_REPLICAS_MAX_COUNT,
+    })
 
-    customRender(<ReadReplicaEligibilityWarnings onRecommendCompute={vi.fn()} />)
+    customRender(
+      <ReadReplicaEligibilityWarnings
+        eligibility={warningEligibility}
+        onRecommendCompute={vi.fn()}
+      />
+    )
 
     expect(
       screen.getByText(`You can only deploy up to ${READ_REPLICAS_MAX_COUNT} read replicas at once`)
diff --git a/apps/studio/tests/components/Settings/Infrastructure/ReadReplicaPricingDialog.test.tsx b/apps/studio/tests/components/Settings/Infrastructure/ReadReplicaPricingDialog.test.tsx
new file mode 100644
index 00000000000..1387ddea447
--- /dev/null
+++ b/apps/studio/tests/components/Settings/Infrastructure/ReadReplicaPricingDialog.test.tsx
@@ -0,0 +1,65 @@
+import { screen } from '@testing-library/react'
+import userEvent from '@testing-library/user-event'
+import { describe, expect, test, vi } from 'vitest'
+
+import { ReadReplicaPricingDialog } from '@/components/interfaces/Settings/Infrastructure/ReadReplicas/ReadReplicaForm/ReadReplicaPricingDialog'
+import { customRender } from '@/tests/lib/custom-render'
+
+vi.mock('@/hooks/misc/useSelectedProject', () => ({
+  useSelectedProjectQuery: () => ({ data: { cloud_provider: 'AWS' } }),
+}))
+
+const replicaCost = {
+  isLoading: false,
+  isError: false,
+  retry: vi.fn(),
+  totalCost: '$85.94',
+  compute: { label: 'Small', cost: '$15.00', priceDescription: '$15/month' },
+  disk: { type: 'gp3', label: '125 GB (gp3)', cost: '$15.63' },
+  iops: { label: '3,000 IOPS', cost: '$30.00' },
+  throughput: { label: '125 MB/s', cost: '$25.31' },
+} as const
+
+describe('ReadReplicaPricingDialog', () => {
+  test('does not show a partial estimate while pricing data loads', () => {
+    customRender(<ReadReplicaPricingDialog replicaCost={{ ...replicaCost, isLoading: true }} />)
+
+    expect(screen.getByText('Estimated additional cost')).toBeInTheDocument()
+    expect(screen.queryByText(/Estimated additional cost of/)).not.toBeInTheDocument()
+    expect(screen.getByRole('button', { name: 'View breakdown' })).toBeDisabled()
+  })
+
+  test('shows the estimate once all pricing data is available', () => {
+    customRender(<ReadReplicaPricingDialog replicaCost={replicaCost} />)
+
+    expect(screen.getByText('Estimated additional cost of $85.94/month')).toBeInTheDocument()
+    expect(screen.getByRole('button', { name: 'View breakdown' })).toBeEnabled()
+  })
+
+  test('offers to retry when pricing data cannot be loaded', async () => {
+    const user = userEvent.setup()
+    const retry = vi.fn()
+
+    customRender(
+      <ReadReplicaPricingDialog replicaCost={{ ...replicaCost, isError: true, retry }} />
+    )
+
+    expect(screen.getByText('Unable to estimate additional cost')).toBeInTheDocument()
+    expect(screen.getByText('We couldn’t load the required pricing data.')).toBeInTheDocument()
+
+    await user.click(screen.getByRole('button', { name: 'Retry' }))
+
+    expect(retry).toHaveBeenCalledOnce()
+  })
+
+  test('keeps the error state stable while retrying', () => {
+    customRender(
+      <ReadReplicaPricingDialog replicaCost={{ ...replicaCost, isError: true, isLoading: true }} />
+    )
+
+    expect(screen.getByText('Unable to estimate additional cost')).toBeInTheDocument()
+    expect(screen.queryByText('Estimated additional cost')).not.toBeInTheDocument()
+    expect(screen.getByRole('button', { name: 'Retry' })).toBeDisabled()
+    expect(screen.queryByRole('button', { name: 'View breakdown' })).not.toBeInTheDocument()
+  })
+})
diff --git a/apps/studio/tests/components/Settings/Infrastructure/ReadReplicasSection.test.tsx b/apps/studio/tests/components/Settings/Infrastructure/ReadReplicasSection.test.tsx
index cf9a305968c..f8b1928b812 100644
--- a/apps/studio/tests/components/Settings/Infrastructure/ReadReplicasSection.test.tsx
+++ b/apps/studio/tests/components/Settings/Infrastructure/ReadReplicasSection.test.tsx
@@ -18,6 +18,10 @@ const { mockUseIsFeatureEnabled } = vi.hoisted(() => ({
 vi.mock('@/hooks/misc/useIsFeatureEnabled', () => ({
   useIsFeatureEnabled: mockUseIsFeatureEnabled,
 }))
+vi.mock(
+  '@/components/interfaces/Settings/Infrastructure/ReadReplicas/AddReadReplicaDialog',
+  () => ({ AddReadReplicaDialog: () => null })
+)
 
 const addReplicaListMocks = () => {
   addAPIMock({
diff --git a/apps/studio/tests/helpers.tsx b/apps/studio/tests/helpers.tsx
index 1cfb3d419ca..3a8a0dcae4c 100644
--- a/apps/studio/tests/helpers.tsx
+++ b/apps/studio/tests/helpers.tsx
@@ -65,6 +65,7 @@ export const createMockOrganization = (details: Partial<Organization>): Organiza
     organization_requires_mfa: false,
     opt_in_tags: [],
     restriction_status: null,
+    requires_indirect_tax_declaration: false,
     restriction_data: null,
     organization_missing_address: false,
     organization_missing_tax_id: false,
@@ -99,6 +100,7 @@ export const createMockOrganizationResponse = (
     organization_requires_mfa: false,
     opt_in_tags: [],
     restriction_status: null,
+    requires_indirect_tax_declaration: false,
     restriction_data: null,
     organization_missing_address: false,
     organization_missing_tax_id: false,
diff --git a/apps/studio/tests/lib/sql-editor-test-utils.tsx b/apps/studio/tests/lib/sql-editor-test-utils.tsx
index d2e30d49bab..22d0180eebc 100644
--- a/apps/studio/tests/lib/sql-editor-test-utils.tsx
+++ b/apps/studio/tests/lib/sql-editor-test-utils.tsx
@@ -228,6 +228,7 @@ export function setupSqlEditorMocks({
         organization_missing_tax_id: false,
         organization_requires_mfa: false,
         plan: { id: 'free', name: 'Free' },
+        requires_indirect_tax_declaration: false,
         restriction_data: null,
         restriction_status: null,
         stripe_customer_id: null,
diff --git a/apps/studio/tests/pages/project/[ref]/settings/api-keys/legacy.test.tsx b/apps/studio/tests/pages/project/[ref]/settings/api-keys/legacy.test.tsx
index cc6fa7683d8..620375fca73 100644
--- a/apps/studio/tests/pages/project/[ref]/settings/api-keys/legacy.test.tsx
+++ b/apps/studio/tests/pages/project/[ref]/settings/api-keys/legacy.test.tsx
@@ -1,11 +1,13 @@
-import { render, screen } from '@testing-library/react'
+import { screen } from '@testing-library/react'
 import type { ReactNode } from 'react'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 
 import ApiKeysLegacyPage from '@/pages/project/[ref]/settings/api-keys/legacy'
+import { customRender } from '@/tests/lib/custom-render'
 
-const { mockIsPlatform } = vi.hoisted(() => ({
+const { mockIsPlatform, mockUseHighAvailability } = vi.hoisted(() => ({
   mockIsPlatform: { value: true },
+  mockUseHighAvailability: vi.fn(),
 }))
 
 vi.mock('common', async () => {
@@ -41,13 +43,18 @@ vi.mock('@/components/ui/ProjectSettings/ToggleLegacyApiKeys', () => ({
   ToggleLegacyApiKeysPanel: () => <div>ToggleLegacyApiKeysPanel</div>,
 }))
 
+vi.mock('@/hooks/misc/useHighAvailability', () => ({
+  useHighAvailability: mockUseHighAvailability,
+}))
+
 describe('/project/[ref]/settings/api-keys/legacy', () => {
   beforeEach(() => {
     mockIsPlatform.value = true
+    mockUseHighAvailability.mockReturnValue({ isHighAvailability: false, isPending: false })
   })
 
   it('renders both legacy keys and the disable toggle on platform', () => {
-    render(<ApiKeysLegacyPage dehydratedState={{}} />)
+    customRender(<ApiKeysLegacyPage dehydratedState={{}} />)
 
     expect(screen.getByText('DisplayApiSettings')).toBeInTheDocument()
     expect(screen.getByText('ToggleLegacyApiKeysPanel')).toBeInTheDocument()
@@ -56,9 +63,21 @@ describe('/project/[ref]/settings/api-keys/legacy', () => {
   it('renders legacy keys but hides the disable toggle on self-hosted', () => {
     mockIsPlatform.value = false
 
-    render(<ApiKeysLegacyPage dehydratedState={{}} />)
+    customRender(<ApiKeysLegacyPage dehydratedState={{}} />)
 
     expect(screen.getByText('DisplayApiSettings')).toBeInTheDocument()
     expect(screen.queryByText('ToggleLegacyApiKeysPanel')).not.toBeInTheDocument()
   })
+
+  it('hides the legacy keys entirely on High Availability projects', () => {
+    mockUseHighAvailability.mockReturnValue({ isHighAvailability: true, isPending: false })
+
+    customRender(<ApiKeysLegacyPage dehydratedState={{}} />)
+
+    expect(
+      screen.getByText('Legacy API keys are unavailable on High Availability projects')
+    ).toBeInTheDocument()
+    expect(screen.queryByText('DisplayApiSettings')).not.toBeInTheDocument()
+    expect(screen.queryByText('ToggleLegacyApiKeysPanel')).not.toBeInTheDocument()
+  })
 })
diff --git a/apps/studio/tests/pages/project/[ref]/settings/infrastructure.test.tsx b/apps/studio/tests/pages/project/[ref]/settings/infrastructure.test.tsx
index babf74a4799..484e844616c 100644
--- a/apps/studio/tests/pages/project/[ref]/settings/infrastructure.test.tsx
+++ b/apps/studio/tests/pages/project/[ref]/settings/infrastructure.test.tsx
@@ -339,12 +339,12 @@ describe('/project/[ref]/settings/infrastructure', () => {
     })
   })
 
-  test('focuses the recommended compute option after closing the add replica sheet', async () => {
+  test('focuses the recommended compute option after closing the add replica dialog', async () => {
     const user = userEvent.setup()
     renderInfrastructurePage()
 
     await user.click(await screen.findByRole('button', { name: 'Add read replica' }))
-    await user.click(await screen.findByRole('button', { name: 'Change to Small compute' }))
+    await user.click(await screen.findByRole('button', { name: 'Change compute' }))
 
     const smallCompute = await screen.findByRole('radio', { name: /Small/ })
     await waitFor(() => expect(smallCompute).toHaveFocus())
diff --git a/apps/studio/tests/pages/project/[ref]/workers/index.test.tsx b/apps/studio/tests/pages/project/[ref]/workers/index.test.tsx
index 44bd63aae07..a30ff8ba80b 100644
--- a/apps/studio/tests/pages/project/[ref]/workers/index.test.tsx
+++ b/apps/studio/tests/pages/project/[ref]/workers/index.test.tsx
@@ -11,7 +11,7 @@ import { customRender } from '@/tests/lib/custom-render'
 import { addAPIMock, type APIErrorBody } from '@/tests/lib/msw'
 import { routerMock } from '@/tests/lib/route-mock'
 
-type ListWorkersResponse = components['schemas']['V2ListWorkersResponse']
+type ListWorkersResponse = components['schemas']['V2ListWorkersResponse_Output']
 type WorkerDatum = ListWorkersResponse['data'][number]
 
 // `tests/vitestSetup.ts` mocks `common`'s useParams to always answer with this ref, so the page
diff --git a/apps/studio/tests/pages/sign-up.test.tsx b/apps/studio/tests/pages/sign-up.test.tsx
new file mode 100644
index 00000000000..d305bae88f1
--- /dev/null
+++ b/apps/studio/tests/pages/sign-up.test.tsx
@@ -0,0 +1,101 @@
+import { screen } from '@testing-library/react'
+import userEvent from '@testing-library/user-event'
+import { useState } from 'react'
+import { Button } from 'ui'
+import { beforeEach, describe, expect, test, vi } from 'vitest'
+
+import {
+  CHATGPT_IDENTITY_PROVIDER,
+  GITHUB_IDENTITY_PROVIDER,
+  type ExternalIdentityProviderConfig,
+} from '@/lib/external-identity-providers'
+import SignUpPage from '@/pages/sign-up'
+import { customRender } from '@/tests/lib/custom-render'
+
+const mocks = vi.hoisted(() => ({
+  focusProvider: undefined as ExternalIdentityProviderConfig | undefined,
+}))
+
+vi.mock('@/components/interfaces/SignIn/SignInWithExternalProvider', () => ({
+  SignInWithExternalProvider: ({ provider }: { provider: ExternalIdentityProviderConfig }) => (
+    <Button>Continue with {provider.displayName}</Button>
+  ),
+}))
+
+vi.mock('@/components/interfaces/SignIn/SignUpForm', () => ({
+  SignUpForm: ({ onSuccess }: { onSuccess?: () => void }) => {
+    const [isSubmitted, setIsSubmitted] = useState(false)
+
+    return (
+      <>
+        <Button
+          onClick={() => {
+            setIsSubmitted(true)
+            onSuccess?.()
+          }}
+        >
+          Complete email sign-up
+        </Button>
+        {isSubmitted && <div>Check your email</div>}
+      </>
+    )
+  },
+}))
+
+vi.mock('@/hooks/misc/useEnabledIdentityProviders', () => ({
+  useEnabledIdentityProviders: () => [GITHUB_IDENTITY_PROVIDER, CHATGPT_IDENTITY_PROVIDER],
+}))
+
+vi.mock('@/hooks/misc/useInboundBranding', () => ({
+  useInboundBranding: () => ({ focusProvider: mocks.focusProvider }),
+}))
+
+vi.mock('@/hooks/misc/useIsFeatureEnabled', () => ({
+  useIsFeatureEnabled: () => ({
+    dashboardAuthSignUp: true,
+    dashboardAuthSignInWithSso: false,
+    dashboardAuthSignInWithEmail: true,
+  }),
+}))
+
+describe('SignUpPage', () => {
+  beforeEach(() => {
+    mocks.focusProvider = undefined
+  })
+
+  test('hides social sign-up options after email sign-up succeeds', async () => {
+    const user = userEvent.setup()
+    customRender(<SignUpPage dehydratedState={undefined} />)
+
+    expect(screen.getByRole('button', { name: 'Continue with GitHub' })).toBeInTheDocument()
+    expect(screen.getByRole('button', { name: 'Continue with ChatGPT' })).toBeInTheDocument()
+    expect(screen.getByText('or')).toBeInTheDocument()
+    expect(screen.queryByText('Check your email')).not.toBeInTheDocument()
+
+    await user.click(screen.getByRole('button', { name: 'Complete email sign-up' }))
+
+    expect(screen.queryByRole('button', { name: 'Continue with GitHub' })).not.toBeInTheDocument()
+    expect(screen.queryByRole('button', { name: 'Continue with ChatGPT' })).not.toBeInTheDocument()
+    expect(screen.queryByText('or')).not.toBeInTheDocument()
+    expect(screen.getByText('Check your email')).toBeInTheDocument()
+    expect(screen.getByRole('link', { name: 'Sign in' })).toHaveAttribute('href', '/sign-in')
+  })
+
+  test('hides the focused provider after email sign-up succeeds', async () => {
+    const user = userEvent.setup()
+    mocks.focusProvider = GITHUB_IDENTITY_PROVIDER
+    customRender(<SignUpPage dehydratedState={undefined} />)
+
+    expect(screen.getByRole('button', { name: 'Continue with GitHub' })).toBeInTheDocument()
+    expect(screen.queryByText('Check your email')).not.toBeInTheDocument()
+
+    await user.click(screen.getByRole('button', { name: 'Show other options' }))
+    await user.click(screen.getByRole('button', { name: 'Complete email sign-up' }))
+
+    expect(screen.queryByRole('button', { name: 'Continue with GitHub' })).not.toBeInTheDocument()
+    expect(screen.queryByRole('button', { name: 'Continue with ChatGPT' })).not.toBeInTheDocument()
+    expect(screen.queryByText('or')).not.toBeInTheDocument()
+    expect(screen.getByText('Check your email')).toBeInTheDocument()
+    expect(screen.getByRole('link', { name: 'Sign in' })).toHaveAttribute('href', '/sign-in')
+  })
+})
diff --git a/apps/www/_customers/lingodotdev.mdx b/apps/www/_customers/lingodotdev.mdx
new file mode 100644
index 00000000000..c6a94bb42e4
--- /dev/null
+++ b/apps/www/_customers/lingodotdev.mdx
@@ -0,0 +1,139 @@
+---
+name: Lingo.dev
+title: How Lingo.dev clears enterprise security reviews without a single database question
+description: Lingo.dev is the localization engineering platform behind retrieval augmented localization, translation APIs with a memory for glossary, brand voice, and quality. It has run on Supabase since day one.
+meta_description: Lingo.dev runs retrieval augmented localization on Supabase Database, Vector, Auth, and Storage, and has never had a database question raised in an enterprise security review.
+author: wendie_cheung
+author_title: Product Marketing
+logo: /images/customers/logos/on-light/lingo-dev.png
+logo_inverse: /images/customers/logos/on-dark/lingo-dev.png
+tags:
+  - supabase
+date: '2026-08-26'
+company_url: https://lingo.dev
+misc:
+  [
+    { label: 'Founded', text: 'Y Combinator F24, San Francisco' },
+    {
+      label: 'Use case',
+      text: 'Retrieval augmented localization: translation APIs with a memory for glossary, brand voice, and quality',
+    },
+    { label: 'Solutions', text: 'Database, Vector, Auth, Storage, Supabase MCP server' },
+  ]
+about: Lingo.dev is the localization engineering platform behind retrieval augmented localization, translation APIs with a memory for glossary, brand voice, and quality.
+# "healthcare" | "fintech" | "ecommerce" | "education" | "gaming" | "media" | "real-estate" | "saas" | "social" | "analytics" | "ai" | "developer-tools"
+industry: ['ai', 'developer-tools']
+# "startup" | "enterprise" | "indie_dev"
+company_size: 'startup'
+# "Asia" | "Europe" | "North America" | "South America" | "Africa" | "Oceania"
+region: 'North America'
+# "database" | "auth" | "storage" | "realtime" | "functions" | "vector"
+supabase_products: ['database', 'vector', 'auth', 'storage']
+---
+
+<Quote img="max-lingo.jpg" caption="Max Prilutskiy, Co-founder and CEO, Lingo.dev">
+  Buy the encapsulation, and spend your resources only on your own category. Supabase encapsulates
+  the database layer so completely that we get to spend every engineering hour on localization
+  engineering infrastructure, which is the only place our customers can tell the difference. Our
+  users put it in a way I can't improve on: Stripe for payments, Supabase for databases, Lingo.dev
+  for localization.
+</Quote>
+
+[Lingo.dev](https://lingo.dev) is the localization engineering platform behind retrieval augmented localization. Teams configure localization engines, translation APIs that hold the glossary, brand voice, and quality rules for a product, and every translation request pulls that context before it runs. Lingo.dev has run on Supabase since day one.
+
+Lingo.dev started as a hackathon project in late 2023. The first version translated strings and nothing else. Users asked for more almost immediately.
+
+<Quote img="max-lingo.jpg" caption="Max Prilutskiy, Co-founder and CEO, Lingo.dev">
+  We were getting so many feature requests that we had to stop and reconsider what the technology
+  actually was. What our users were describing wasn't a translation tool. It was a platform they
+  could engineer on.
+</Quote>
+
+Max built the company with co-founder Veronica Prilutskaya, moved it from Barcelona to San Francisco, took it through Y Combinator's F24 batch, and raised $4.2M to scale it.
+
+## The challenge
+
+Max and Veronica had built and sold a company before Lingo.dev. It ran on a non-relational document database, and the choice followed them for years.
+
+<Quote img="veronica-lingo.jpg" caption="Veronica Prilutskaya, Co-founder and CPO, Lingo.dev">
+  We had all this data and we couldn't touch it the way we wanted. You can do the basics, but every
+  serious question we wanted to ask of our own data ran into the limits of the store we picked on
+  day one. The workarounds we built were incompatible with how we want infrastructure to work.
+</Quote>
+
+## Why they chose Supabase
+
+When Max and Veronica started Lingo.dev, the database was not up for debate.
+
+<Quote img="veronica-lingo.jpg" caption="Veronica Prilutskaya, Co-founder and CPO, Lingo.dev">
+  We'd known Supabase since it launched. We'd tried it and knew: next company, this is what we build
+  on. It's relational, it's managed, and we never think about upgrading Postgres versions ourselves.
+  It was an obvious choice.
+</Quote>
+
+The decision predates everything else about the company, including its investors. Supabase CEO Paul Copplestone later joined as an investor in Lingo.dev. By then, Lingo.dev had already run on Supabase for its entire existence.
+
+The choice also shaped Lingo.dev's approach to compliance. Most startups treat SOC 2 as something to get once an enterprise deal demands it. Lingo.dev designed its security posture before writing its first line of code.
+
+<Quote img="max-lingo.jpg" caption="Max Prilutskiy, Co-founder and CEO, Lingo.dev">
+  SOC 2 isn't a growth milestone anymore. It's table stakes. If you don't have it, you aren't taken
+  seriously. GDPR, SOC 2 Type II, where data lives, which regions: the architecture was shaped
+  around those requirements from day one. As a localization infrastructure company, we treat
+  security seriously.
+</Quote>
+
+## How Lingo.dev runs on Supabase
+
+Everything business critical at Lingo.dev lives in Supabase, including customers' localization engine configurations, glossaries, brand voices, customer organizations, and the embeddings that power the platform. When a translation request reaches a localization engine, Lingo.dev breaks the source content into phrases, embeds them, and runs a similarity search against the context corpus's vector indices using pgvector on Supabase. That search retrieves the terms, voice, and rules that match, and injects them into the model's context before it generates a translation. This retrieval step is what makes a localization engine stateful, and it runs entirely on Postgres.
+
+<Quote img="veronica-lingo.jpg" caption="Veronica Prilutskaya, Co-founder and CPO, Lingo.dev">
+  pgvector played a real role in the decision, and it keeps earning it. We're happy with the
+  performance. Our retrieval augmented localization runs on Postgres, period.
+</Quote>
+
+Auth turned into an unexpected advantage. Because Lingo.dev's users are rows in the same Postgres database as the rest of the system, the team never had to sync an external identity provider or maintain a separate cache to keep user data consistent.
+
+<Quote img="max-lingo.jpg" caption="Max Prilutskiy, Co-founder and CEO, Lingo.dev">
+  If we ever had to leave Supabase, that's what I'd miss first: never having to be our own database
+  administrators.
+</Quote>
+
+That advantage showed up early. While the team was closing its first enterprise customer, the prospect asked for Google sign in. Lingo.dev only had password auth at the time.
+
+<Quote img="veronica-lingo.jpg" caption="Veronica Prilutskaya, Co-founder and CPO, Lingo.dev">
+  We were a bit nervous, and then we realized Google auth was already built into Supabase. It took a
+  couple of minutes to configure. We shipped it almost immediately, and the prospect was impressed
+  with how fast we moved.
+</Quote>
+
+Lingo.dev now uses the Supabase MCP server as part of its development workflow. The team's AI tooling works with the database directly.
+
+## Zero questions, every security review
+
+Lingo.dev's customers include Mistral AI, the Solana Foundation, and Veriff, an identity verification company whose infosec reviews rank among the toughest in software. None of those reviews has ever raised a question about the database.
+
+<Quote img="max-lingo.jpg" caption="Max Prilutskiy, Co-founder and CEO, Lingo.dev">
+  We've been through some heavy procurement and security reviews, including companies that verify
+  identity for a living. The database layer has never been a question. Not negotiated, not
+  remediated. No questions, every time.
+</Quote>
+
+Building a SOC 2 ready database layer in house would have meant an operational burden Lingo.dev's team could not justify at YC speed. Max estimates the choice has saved the company two or more engineering hires, since the data layer runs without a dedicated database administrator.
+
+<Quote img="max-lingo.jpg" caption="Max Prilutskiy, Co-founder and CEO, Lingo.dev">
+  Every time a fundamentally new technology appears, Supabase ships the integration the same week.
+  Almost nobody talks about this, and it might be the most underrated thing about them. A company
+  building on Supabase inherits that speed.
+</Quote>
+
+## The results
+
+- Zero database questions across every enterprise security review, including reviews from Mistral AI, the Solana Foundation, and Veriff
+- Zero database incidents since Lingo.dev started
+- 90 seconds from signup to a production database
+- At least two engineering hires avoided because the database runs itself
+- 25% of the Supabase platform in use, already worth the Team plan
+
+## What's next
+
+Lingo.dev plans to keep growing without growing headcount to match. Max says the team would rather invest in better tooling for the people already there than hire for every function Supabase already covers. Lingo.dev also uses its own product on itself: the company's websites, content, and communications are localized through Lingo.dev, on localization engines that run on Supabase.
diff --git a/apps/www/_go/events/postgres-summit-2026/contest-thank-you.tsx b/apps/www/_go/events/postgres-summit-2026/contest-thank-you.tsx
new file mode 100644
index 00000000000..f4493cc57e6
--- /dev/null
+++ b/apps/www/_go/events/postgres-summit-2026/contest-thank-you.tsx
@@ -0,0 +1,36 @@
+import type { GoPageInput } from 'marketing'
+import Link from 'next/link'
+import { Button } from 'ui'
+
+const page: GoPageInput = {
+  template: 'thank-you',
+  slug: 'postgres-summit-2026/contest/thank-you',
+  metadata: {
+    title: "You're entered | Supabase at Postgres Summit US 2026",
+    description: 'Thanks for entering the Supabase contest at Postgres Summit US 2026. Good luck!',
+  },
+  hero: {
+    title: 'Thanks for entering',
+    description:
+      "Your contest entry is confirmed. Make sure you've created a Supabase account and loaded data before the contest deadline. We'll reach out to the winner by email.",
+  },
+  sections: [
+    {
+      type: 'single-column',
+      title: 'Get started with Supabase',
+      description: "If you haven't already, create your account and start building.",
+      children: (
+        <div className="flex flex-col sm:flex-row items-center justify-center gap-4">
+          <Button asChild variant="default" size="small">
+            <Link href="https://supabase.com/dashboard">Go to dashboard</Link>
+          </Button>
+          <Button asChild variant="outline" size="small">
+            <Link href="https://supabase.com">Visit supabase.com</Link>
+          </Button>
+        </div>
+      ),
+    },
+  ],
+}
+
+export default page
diff --git a/apps/www/_go/events/postgres-summit-2026/contest.tsx b/apps/www/_go/events/postgres-summit-2026/contest.tsx
new file mode 100644
index 00000000000..ef5baea9c55
--- /dev/null
+++ b/apps/www/_go/events/postgres-summit-2026/contest.tsx
@@ -0,0 +1,160 @@
+import type { GoPageInput } from 'marketing'
+import Image from 'next/image'
+import Link from 'next/link'
+import { Button } from 'ui'
+
+const page: GoPageInput = {
+  template: 'lead-gen',
+  slug: 'postgres-summit-2026/contest',
+  metadata: {
+    title: 'Win a MacBook Neo | Supabase at Postgres Summit US 2026',
+    description:
+      'Thanks for connecting with us at Postgres Summit US 2026. Try Supabase — Postgres with everything you need. Enter for a chance to win a MacBook Neo.',
+  },
+  hero: {
+    title: 'Win a MacBook Neo',
+    subtitle: 'Supabase at Postgres Summit US 2026',
+    description:
+      'Thanks for connecting with us at Postgres Summit US 2026. Try Supabase — Postgres with everything you need. Enter for a chance to win a MacBook Neo.',
+    image: {
+      src: '/images/landing-pages/sxsw-2026/macbook-neo.png',
+      alt: 'MacBook Neo in four colors',
+      width: 500,
+      height: 333,
+    },
+    ctas: [
+      {
+        label: 'Get started',
+        href: '#how-to-enter',
+        variant: 'primary',
+      },
+    ],
+  },
+  sections: [
+    {
+      type: 'single-column',
+      title: 'Everything to know about Postgres Locks',
+      description: 'Conference Talk: Wednesday, September 30, 2026 4:00 PM EDT, Rossi Intermediate',
+      children: (
+        <div className="flex flex-col items-center gap-6">
+          <Image
+            src="/images/landing-pages/postgres-summit-NYC-2026/brian-brennglass.png"
+            alt="Brian Brennglass"
+            width={192}
+            height={192}
+            className="rounded-full object-cover aspect-square w-48 h-48"
+          />
+          <div className="flex flex-col items-center gap-0">
+            <p className="text-foreground-light font-medium">Brian Brennglass</p>
+            <p className="text-foreground-lighter text-sm">Supabase</p>
+          </div>
+          <Button asChild variant="default" size="medium">
+            <Link
+              href="https://postgresql.us/events/postgressummitus2026/schedule/session/2406-everything-to-know-about-postgres-locks/"
+              target="_blank"
+              rel="noopener noreferrer"
+            >
+              View session details
+            </Link>
+          </Button>
+        </div>
+      ),
+    },
+    {
+      type: 'single-column',
+      id: 'how-to-enter',
+      title: 'How to enter',
+      children: (
+        <div className="flex flex-col items-center gap-6">
+          <ol className="flex flex-col gap-4 text-foreground-light text-lg list-decimal list-inside">
+            <li>Create a Supabase account and note the email address you used</li>
+            <li>Load data into a Supabase database</li>
+            <li>Fill out the entry form below</li>
+            <li>
+              Complete these steps by the contest deadline, Monday October 12, 2026 at 12:00 PM PDT
+            </li>
+          </ol>
+          <Button asChild variant="default" size="medium">
+            <Link href="https://supabase.com/dashboard">Create your account</Link>
+          </Button>
+          <p className="text-xs text-foreground-lighter mt-4">
+            No purchase necessary. Void where prohibited.{' '}
+            <Link href="/go/contest-rules" className="underline">
+              Official rules
+            </Link>
+            .
+          </p>
+        </div>
+      ),
+    },
+    {
+      type: 'form',
+      id: 'enter-contest',
+      title: 'Enter the contest',
+      description: 'Fill out the form below to complete your entry.',
+      fields: [
+        {
+          type: 'text',
+          name: 'first_name',
+          label: 'First Name',
+          placeholder: 'First Name',
+          required: true,
+          half: true,
+        },
+        {
+          type: 'text',
+          name: 'last_name',
+          label: 'Last Name',
+          placeholder: 'Last Name',
+          required: true,
+          half: true,
+        },
+        {
+          type: 'email',
+          name: 'email_address',
+          label: 'Email',
+          placeholder: 'Email address',
+          required: true,
+        },
+        {
+          type: 'text',
+          name: 'company_name',
+          label: 'Company',
+          placeholder: 'Company name',
+          required: true,
+        },
+      ],
+      submitLabel: 'Enter contest',
+      successRedirect: '/go/postgres-summit-2026/contest/thank-you',
+      disclaimer:
+        'By submitting this form, I confirm that I have read and understood the [Privacy Policy](https://supabase.com/privacy) and the [Official Rules](/go/contest-rules).',
+      crm: {
+        hubspot: {
+          formGuid: '32a0223e-784e-43bb-bdba-5cb3e72f35bd',
+          fieldMap: {
+            first_name: 'firstname',
+            last_name: 'lastname',
+            email_address: 'email',
+            company_name: 'name',
+          },
+          consent:
+            'By submitting this form, I confirm that I have read and understood the Privacy Policy.',
+        },
+        customerio: {
+          event: 'event_attended',
+          profileMap: {
+            email_address: 'email',
+            first_name: 'first_name',
+            last_name: 'last_name',
+            company_name: 'company_name',
+          },
+          staticProperties: {
+            event_name: 'Postgres Summit US 2026',
+          },
+        },
+      },
+    },
+  ],
+}
+
+export default page
diff --git a/apps/www/_go/index.tsx b/apps/www/_go/index.tsx
index 91d6a643b41..5e587993f9a 100644
--- a/apps/www/_go/index.tsx
+++ b/apps/www/_go/index.tsx
@@ -8,6 +8,8 @@ import datadogDinner from './events/dash-2026/exec-dinner'
 import datadogContestThankYou from './events/dash-2026/exec-dinner-thank-you'
 import pgconfDev2026Contest from './events/pgconf-dev-2026/contest'
 import pgconfDev2026ContestThankYou from './events/pgconf-dev-2026/contest-thank-you'
+import postgresSummit2026Contest from './events/postgres-summit-2026/contest'
+import postgresSummit2026ContestThankYou from './events/postgres-summit-2026/contest-thank-you'
 import postgresconfContest from './events/postgresconf-sjc-2026/contest'
 import postgresconfContestThankYou from './events/postgresconf-sjc-2026/contest-thank-you'
 import selectPartnerDay from './events/select-2026/partner-day'
@@ -53,6 +55,8 @@ const pages: GoPageInput[] = [
   postgresconfContestThankYou, // remove after May 31, 2026
   pgconfDev2026Contest, // remove after May 31, 2026
   pgconfDev2026ContestThankYou, // remove after May 31, 2026
+  postgresSummit2026Contest, // remove after October 31, 2026
+  postgresSummit2026ContestThankYou, // remove after October 31, 2026
   datadogContest, // remove after June 30, 2026
   datadogContestThankYou, // remove after June 30, 2026
   datadogDinner, // remove after June 30, 2026
diff --git a/apps/www/app/(home)/_components/logos/PublicityLogos.test.ts b/apps/www/app/(home)/_components/logos/PublicityLogos.test.ts
new file mode 100644
index 00000000000..cd5996447f1
--- /dev/null
+++ b/apps/www/app/(home)/_components/logos/PublicityLogos.test.ts
@@ -0,0 +1,18 @@
+import { readFileSync } from 'node:fs'
+import { describe, expect, test } from 'vitest'
+
+const source = readFileSync(new URL('./PublicityLogos.tsx', import.meta.url), 'utf8')
+
+describe('PublicityLogos', () => {
+  test('uses unique IDs for inline SVG references', () => {
+    const ids = [...source.matchAll(/\bid="([^"]+)"/g)].map((match) => match[1])
+    const referencedIds = [...source.matchAll(/url\(#([^)]+)\)/g)].map((match) => match[1])
+
+    expect(new Set(ids).size).toBe(ids.length)
+    expect(referencedIds.length).toBeGreaterThan(0)
+
+    for (const referencedId of referencedIds) {
+      expect(ids).toContain(referencedId)
+    }
+  })
+})
diff --git a/apps/www/app/(home)/_components/logos/PublicityLogos.tsx b/apps/www/app/(home)/_components/logos/PublicityLogos.tsx
index 4b4ff63a191..d785261bce1 100644
--- a/apps/www/app/(home)/_components/logos/PublicityLogos.tsx
+++ b/apps/www/app/(home)/_components/logos/PublicityLogos.tsx
@@ -20,11 +20,16 @@ export function OnePasswordLogo(props: ComponentProps<'svg'>) {
 export function BetasharesLogo(props: ComponentProps<'svg'>) {
   return (
     <svg xmlns="http://www.w3.org/2000/svg" fill="currentColor" viewBox="0 0 149 60" {...props}>
-      <g fill="currentColor" fillRule="evenodd" clipPath="url(#a)" clipRule="evenodd">
+      <g
+        fill="currentColor"
+        fillRule="evenodd"
+        clipPath="url(#betashares-logo-clip)"
+        clipRule="evenodd"
+      >
         <path d="M36.341 30.003c0 7.091-5.748 12.84-12.84 12.84-7.09 0-12.84-5.749-12.84-12.84s5.75-12.84 12.84-12.84c7.092 0 12.84 5.749 12.84 12.84m-15.725-5.14a.085.085 0 0 0-.128.075v10.139a.086.086 0 0 0 .128.074l8.78-5.07a.086.086 0 0 0 0-.148zm1.532-.784c-.078 0-.107.105-.038.145h-.002l7.044 4.067c.07.04.146-.037.107-.105l-2.294-3.99a.23.23 0 0 0-.201-.117zM19.042 34.09c.04.07.146.042.146-.038v-8.103c0-.08-.105-.106-.146-.038l-2.284 3.973a.23.23 0 0 0 0 .233zm10.102-2.362c.07-.04.147.037.107.105l-.001.002-2.286 3.973a.23.23 0 0 1-.202.117h-4.597c-.08 0-.107-.105-.04-.145zm2.437-2.114a.78.78 0 0 1 0 .774l-3.706 6.446a.78.78 0 0 1-.674.39h-7.407a.78.78 0 0 1-.673-.39l-3.706-6.446a.78.78 0 0 1 0-.774l3.706-6.446a.78.78 0 0 1 .673-.39h7.407a.78.78 0 0 1 .674.39zM43.308 32.33c0-1.697 1.253-3.045 3.037-3.045s3.038 1.348 3.038 3.045-1.275 3.066-3.038 3.066c-1.764 0-3.038-1.37-3.038-3.066m3.568 5.17c2.89 0 4.865-2.288 4.865-5.17s-1.976-5.15-4.865-5.15c-1.402 0-2.782.634-3.505 1.758V22.95h-2.358v14.304h2.23v-1.758c.68 1.288 2.168 2.003 3.633 2.003zm7.97-6.336c.362-1.308 1.338-2.125 2.783-2.125s2.465.817 2.805 2.125zM57.8 37.56c2.082 0 3.91-.879 4.823-2.84v-.042c-.638.041-1.593-.389-1.976-.899l-.02.02c-.383 1.023-1.402 1.78-2.783 1.78-1.657 0-2.91-1.044-3.123-2.739h7.966c.382-3.085-1.657-5.722-5.036-5.722-2.996 0-5.163 2.33-5.163 5.21s2.21 5.232 5.312 5.232m5.388-8.112h1.38v7.806h2.381v-7.806h1.509v-2.044h-1.509v-3.148h-2.38v3.148h-1.381zm8.06 2.882c0-1.697 1.253-3.045 3.037-3.045s3.06 1.369 3.06 3.045-1.254 3.066-3.06 3.066-3.038-1.37-3.038-3.066m2.528 5.15c1.381 0 2.89-.675 3.569-1.942v1.716h2.294v-9.85h-2.294v1.716c-.68-1.266-2.188-1.941-3.569-1.941-2.91 0-4.887 2.288-4.887 5.15 0 2.86 1.976 5.149 4.887 5.149zm11.263.081c2.338 0 3.93-1.43 3.93-3.29s-1.487-2.677-3.059-2.984l-.957-.184c-.85-.184-1.487-.409-1.487-1.062 0-.572.552-1.103 1.424-1.103.956 0 1.7.47 1.932 1.471h.02c.404-.47 1.361-.838 1.997-.756l.021-.021c-.383-1.39-1.763-2.533-3.91-2.533-2.146 0-3.782 1.39-3.782 3.066 0 1.512 1.02 2.411 3.08 2.84l.999.204c.786.184 1.402.43 1.402 1.145 0 .717-.552 1.288-1.593 1.288-1.274 0-2.188-.817-2.358-1.84l-.021-.02c-.404.47-1.36.817-1.997.736l-.02.02c.382 1.84 2.082 3.025 4.376 3.025zm5.077-.307h2.359v-5.599c0-1.43 1.02-2.37 2.422-2.37 1.401 0 2.294.899 2.294 2.288v5.681h2.358v-6.518c0-2.084-1.657-3.576-3.846-3.576-1.296 0-2.57.572-3.228 1.736V22.95h-2.359zm12.922-4.924c0-1.697 1.253-3.045 3.037-3.045s3.06 1.369 3.06 3.045-1.253 3.066-3.06 3.066c-1.806 0-3.037-1.37-3.037-3.066m2.528 5.15c1.381 0 2.89-.675 3.569-1.942v1.716h2.294v-9.85h-2.294v1.716c-.679-1.266-2.188-1.941-3.569-1.941-2.91 0-4.887 2.288-4.887 5.15 0 2.86 1.976 5.149 4.887 5.149zm7.716-7.378v7.152h2.358v-4.372c0-1.716.531-3.31 2.252-3.31.51 0 .956.122 1.189.306h.021c.021-.633.574-1.553 1.126-1.9v-.041c-.383-.429-1.062-.694-1.976-.694-1.296 0-2.21.777-2.677 1.839v-1.676h-2.295v2.698zm8.647 1.062c.36-1.308 1.338-2.125 2.782-2.125 1.445 0 2.465.817 2.805 2.125zm2.953 6.396c2.082 0 3.909-.879 4.823-2.84v-.042c-.638.041-1.593-.389-1.976-.899l-.02.02c-.383 1.023-1.402 1.78-2.783 1.78-1.656 0-2.91-1.044-3.123-2.739h7.966c.382-3.085-1.657-5.722-5.036-5.722-2.996 0-5.162 2.33-5.162 5.21s2.209 5.232 5.311 5.232m9.863.001c2.337 0 3.93-1.43 3.93-3.29s-1.487-2.677-3.06-2.984l-.956-.184c-.85-.184-1.488-.409-1.488-1.062 0-.572.552-1.103 1.424-1.103.957 0 1.7.47 1.933 1.471h.02c.404-.47 1.36-.838 1.997-.756l.02-.021c-.382-1.39-1.763-2.533-3.909-2.533s-3.782 1.39-3.782 3.066c0 1.512 1.02 2.411 3.08 2.84l.998.204c.787.184 1.402.43 1.402 1.145 0 .717-.552 1.288-1.593 1.288-1.274 0-2.188-.817-2.358-1.84l-.021-.02c-.403.47-1.36.817-1.996.736l-.021.02c.383 1.84 2.082 3.025 4.377 3.025z" />
       </g>
       <defs>
-        <clipPath id="a">
+        <clipPath id="betashares-logo-clip">
           <path fill="#fff" d="M10.59 17.04h128.13v25.92H10.59z" />
         </clipPath>
       </defs>
@@ -85,7 +90,7 @@ export function BrthrsLogo(props: ComponentProps<'svg'>) {
 export function ChatbaseLogo(props: ComponentProps<'svg'>) {
   return (
     <svg xmlns="http://www.w3.org/2000/svg" fill="currentColor" viewBox="0 0 148 60" {...props}>
-      <g fill="currentColor" clipPath="url(#a)">
+      <g fill="currentColor" clipPath="url(#chatbase-logo-clip)">
         <path
           fillRule="evenodd"
           d="M17.702 16.5h13.385c3.905 0 7.071 3.105 7.071 6.936v13.128c0 3.83-3.166 6.936-7.071 6.936H17.702c-3.906 0-7.072-3.105-7.072-6.936V23.436c0-3.83 3.166-6.936 7.072-6.936m9.817 11.51h4.452q-.127-1.484-.718-2.633a6 6 0 0 0-1.563-1.935 6.8 6.8 0 0 0-2.257-1.205q-1.287-.411-2.818-.411-2.178 0-3.946.94-1.767.931-2.81 2.758-1.041 1.818-1.041 4.476 0 2.641 1.018 4.468 1.025 1.826 2.786 2.766 1.768.94 3.993.94 1.776 0 3.118-.536t2.249-1.414a6.7 6.7 0 0 0 1.413-1.927q.497-1.05.576-2.06l-4.451-.03q-.08.513-.308.924-.222.405-.576.692-.355.288-.837.443a3.7 3.7 0 0 1-1.09.147q-1.065 0-1.822-.49-.758-.496-1.16-1.475-.396-.987-.395-2.448 0-1.383.387-2.37.394-.987 1.152-1.515.766-.529 1.87-.529.631 0 1.129.18.497.17.845.496.354.32.552.762.205.443.253.987"
@@ -94,7 +99,7 @@ export function ChatbaseLogo(props: ComponentProps<'svg'>) {
         <path d="M59.893 27.327h-2.5a3.6 3.6 0 0 0-.537-1.364 3.9 3.9 0 0 0-.962-1 4.2 4.2 0 0 0-1.274-.62 5.1 5.1 0 0 0-1.482-.209q-1.418 0-2.54.69-1.113.69-1.763 2.022-.64 1.334-.64 3.255 0 1.935.64 3.27.65 1.332 1.771 2.014 1.123.681 2.524.682.777 0 1.474-.202.705-.21 1.274-.612.57-.403.962-.984.4-.588.552-1.348l2.5.008a6.3 6.3 0 0 1-.777 2.154 6 6 0 0 1-1.466 1.689 6.7 6.7 0 0 1-2.035 1.092 7.8 7.8 0 0 1-2.5.388q-2.13 0-3.798-.977-1.666-.984-2.628-2.812-.954-1.829-.954-4.363 0-2.541.962-4.362.96-1.829 2.628-2.805 1.667-.983 3.79-.983 1.306-.001 2.436.364 1.138.355 2.043 1.053a5.9 5.9 0 0 1 1.498 1.69q.593.99.801 2.27M63.705 30.968v7.067h-2.396V22.166h2.364v5.904h.152q.433-.96 1.322-1.526t2.324-.566q1.266 0 2.21.504a3.46 3.46 0 0 1 1.475 1.503q.53.992.53 2.48v7.57h-2.397v-7.291q0-1.31-.697-2.03-.697-.729-1.939-.729-.85 0-1.522.349a2.56 2.56 0 0 0-1.05 1.023q-.375.666-.376 1.611M77.11 38.298q-1.17 0-2.115-.418a3.53 3.53 0 0 1-1.499-1.232q-.544-.806-.544-1.976 0-1.007.4-1.658a2.9 2.9 0 0 1 1.082-1.03 5.8 5.8 0 0 1 1.522-.574q.842-.194 1.715-.294l1.795-.202q.69-.085 1.001-.27.313-.187.313-.605v-.054q0-1.015-.593-1.573-.585-.558-1.747-.558-1.21 0-1.907.519-.69.51-.953 1.139l-2.252-.496q.4-1.085 1.17-1.751a4.8 4.8 0 0 1 1.787-.976 7.2 7.2 0 0 1 2.123-.31 7.7 7.7 0 0 1 1.563.17q.832.163 1.554.605.729.441 1.194 1.262.465.814.465 2.116v7.903h-2.34v-1.627h-.096q-.232.45-.697.883-.465.435-1.194.72-.729.288-1.747.287m.521-1.86q.993 0 1.698-.379.714-.38 1.082-.992.377-.62.377-1.325v-1.534q-.129.124-.497.233a8 8 0 0 1-.825.178l-.906.132q-.44.054-.737.093-.697.084-1.274.286-.569.202-.913.581-.337.372-.337.992 0 .86.657 1.302.657.434 1.675.434M90.766 26.134v1.86h-6.722v-1.86zm-4.92-2.852h2.396V34.54q0 .675.208 1.015.21.333.537.458.337.116.73.116.288 0 .504-.04.216-.038.337-.061l.432 1.914a4 4 0 0 1-.593.155 5 5 0 0 1-.961.093 4.3 4.3 0 0 1-1.763-.326 3 3 0 0 1-1.322-1.053q-.505-.713-.505-1.79zM92.518 38.035V22.166h2.396v5.897h.144q.21-.372.601-.86.393-.489 1.09-.853.698-.372 1.843-.372 1.49 0 2.66.729 1.17.727 1.835 2.1.673 1.371.673 3.3 0 1.93-.665 3.309-.665 1.372-1.827 2.115-1.162.736-2.652.736-1.122 0-1.835-.364-.705-.365-1.106-.852a6.4 6.4 0 0 1-.617-.868h-.2v1.852zm2.348-5.951q0 1.255.377 2.2.376.946 1.09 1.48.713.527 1.746.527 1.074 0 1.795-.55.722-.558 1.089-1.51.377-.954.377-2.147 0-1.178-.368-2.115-.361-.938-1.09-1.48-.72-.543-1.803-.543-1.041 0-1.763.52-.713.519-1.081 1.449-.369.93-.369 2.169M108.678 38.298q-1.17 0-2.115-.418a3.54 3.54 0 0 1-1.499-1.232q-.544-.806-.544-1.976 0-1.007.4-1.658a2.9 2.9 0 0 1 1.082-1.03 5.8 5.8 0 0 1 1.522-.574q.842-.194 1.715-.294l1.795-.202q.689-.085 1.001-.27.313-.187.313-.605v-.054q0-1.015-.593-1.573-.585-.558-1.747-.558-1.21 0-1.907.519-.689.51-.953 1.139l-2.252-.496q.4-1.085 1.17-1.751a4.8 4.8 0 0 1 1.787-.976 7.2 7.2 0 0 1 2.123-.31q.737 0 1.563.17.833.163 1.554.605.729.441 1.194 1.262.464.814.465 2.116v7.903h-2.34v-1.627h-.096q-.233.45-.697.883-.465.435-1.194.72-.729.288-1.747.287m.521-1.86q.993 0 1.699-.379.713-.38 1.081-.992a2.5 2.5 0 0 0 .377-1.325v-1.534q-.129.124-.497.233-.36.1-.825.178l-.906.132q-.44.054-.737.093a6 6 0 0 0-1.274.286 2.2 2.2 0 0 0-.913.581q-.337.372-.337.992 0 .86.657 1.302.657.434 1.675.434M125.811 29.04l-2.171.371a2.5 2.5 0 0 0-.433-.767 2.14 2.14 0 0 0-.785-.596q-.498-.233-1.242-.233-1.018 0-1.699.442-.681.433-.681 1.123 0 .597.457.961t1.474.597l1.955.434q1.699.38 2.532 1.17.834.789.833 2.053 0 1.07-.641 1.906-.633.829-1.77 1.302-1.13.472-2.62.472-2.068 0-3.374-.852-1.306-.86-1.602-2.44l2.315-.342q.217.876.89 1.325.672.442 1.754.442 1.178 0 1.883-.473.706-.48.706-1.17a1.2 1.2 0 0 0-.433-.937q-.425-.38-1.306-.574l-2.084-.441q-1.722-.38-2.547-1.21-.818-.828-.818-2.099 0-1.053.609-1.844.609-.79 1.683-1.232 1.074-.45 2.46-.45 1.995 0 3.141.838a3.9 3.9 0 0 1 1.514 2.223M132.636 38.275q-1.82 0-3.133-.751a5.16 5.16 0 0 1-2.019-2.131q-.705-1.38-.705-3.231 0-1.83.705-3.223.713-1.395 1.987-2.178 1.282-.782 2.997-.782 1.041 0 2.019.333.977.333 1.754 1.046.778.712 1.226 1.852.45 1.13.449 2.75v.822h-9.783v-1.736h7.435q0-.915-.384-1.62a2.86 2.86 0 0 0-1.082-1.123q-.689-.41-1.618-.41-1.01 0-1.763.48a3.26 3.26 0 0 0-1.154 1.24 3.5 3.5 0 0 0-.401 1.65v1.356q0 1.193.433 2.03.441.837 1.226 1.278.785.434 1.835.434a4 4 0 0 0 1.242-.186q.561-.193.969-.573.41-.38.625-.937l2.268.395a3.94 3.94 0 0 1-.978 1.697q-.696.72-1.754 1.123-1.05.395-2.396.395" />
       </g>
       <defs>
-        <clipPath id="a">
+        <clipPath id="chatbase-logo-clip">
           <path fill="#fff" d="M10.63 16.5h127.286v27H10.63z" />
         </clipPath>
       </defs>
@@ -105,14 +110,14 @@ export function ChatbaseLogo(props: ComponentProps<'svg'>) {
 export function CoComLogo(props: ComponentProps<'svg'>) {
   return (
     <svg xmlns="http://www.w3.org/2000/svg" fill="currentColor" viewBox="0 0 92 60" {...props}>
-      <g clipPath="url(#a)">
+      <g clipPath="url(#cocom-logo-clip)">
         <path
           fill="currentColor"
           d="M81.632 29.3c0-5.052-2.43-10.113-6.03-13.59-3.068-2.967-7.152-5.09-11.425-5.534-3.876-.397-7.76 0-11.327 1.633a20 20 0 0 0-8.218 6.876 20.2 20.2 0 0 0-2.979 6.76c-.363 1.575-.476 3.24-.69 4.847-.092.673-.164 1.35-.31 2.011a10.74 10.74 0 0 1-6.701 7.713c-4.633 1.702-9.942-.266-12.528-4.422a10.702 10.702 0 0 1 7.495-16.233c1.298-.195 2.62-.15 3.902.135.789.174 1.556.436 2.287.782.098.047.524.32.593.283.069-.036.12-.225.152-.28l3.775-6.909.535-.978a20.9 20.9 0 0 0-16.248-1.345 20.18 20.18 0 0 0-12.593 12.763 19.866 19.866 0 0 0 10.306 24 21.8 21.8 0 0 0 8.178 2.036 20.03 20.03 0 0 0 15.113-5.796c.364-.364.727-.749 1.065-1.142 3.637 4.197 9.131 6.96 14.728 6.997 3.153.07 6.283-.55 9.17-1.819a20.26 20.26 0 0 0 8.048-6.581A19.95 19.95 0 0 0 81.632 29.3m-9.433 1.72a10.777 10.777 0 0 1-11.265 9.67 10.774 10.774 0 1 1 11.265-9.67"
         />
       </g>
       <defs>
-        <clipPath id="a">
+        <clipPath id="cocom-logo-clip">
           <path fill="#fff" d="M10.364 10h71.273v40H10.364z" />
         </clipPath>
       </defs>
@@ -211,14 +216,14 @@ export function GoodtapeLogo(props: ComponentProps<'svg'>) {
 export function GopuffLogo(props: ComponentProps<'svg'>) {
   return (
     <svg xmlns="http://www.w3.org/2000/svg" fill="currentColor" viewBox="0 0 95 60" {...props}>
-      <g clipPath="url(#a)">
+      <g clipPath="url(#gopuff-logo-clip)">
         <path
           fill="currentColor"
           d="M61.88 23.943v7.021c0 1.817-.595 2.898-1.994 2.898-1.391 0-1.994-1.08-1.994-2.898v-7.021h-3.968v7.288c0 3.817 2.383 5.393 5.956 5.393 2.95 0 5.955-1.576 5.955-5.393v-7.288zm-30.204-.28c-4.095 0-6.812 2.572-6.812 6.572 0 4.012 2.877 6.39 6.577 6.39 3.413 0 6.725-2.072 6.725-6.605 0-3.74-2.59-6.357-6.49-6.357m-.12 10.219c-1.694 0-2.604-1.602-2.604-3.732 0-1.843.723-3.732 2.616-3.732 1.794 0 2.516 1.889 2.516 3.719.007 2.24-.977 3.745-2.529 3.745M22.04 23.07c-1.332.886-1.68 2.24-1.68 2.24-.722-.885-2.214-1.589-3.96-1.589-2.918 0-5.97 2.534-5.97 6.533 0 3.55 2.577 6.279 5.97 6.279 1.404 0 2.355-.339 3.11-1.068v.267c0 2.254-1.431 3.263-3.312 3.263-1.84 0-3.138-.593-3.947-1.042l-.783 2.93c1.057.535 3.151 1.056 4.83 1.056 1.881 0 3.775-.352 5.16-1.518 1.445-1.237 1.94-3.198 1.94-5.575v-5.49c.027-1.903.723-3.238 1.58-4.182 0-.007-2.938-2.104-2.938-2.104M17.129 33.92c-1.693 0-2.604-1.602-2.604-3.732 0-1.843.723-3.732 2.617-3.732 1.78.013 2.502 1.889 2.502 3.719 0 2.24-.97 3.745-2.515 3.745m28.92-10.258c-4.25 0-6.565 2.742-6.565 6.8v11.203h3.962V35.53c.709.716 1.84 1.114 3.352 1.114 2.837 0 5.801-2.124 5.801-6.644 0-3.973-2.69-6.337-6.55-6.337m-.014 10.219c-1.693 0-2.603-1.602-2.603-3.732 0-1.843.723-3.732 2.617-3.732 1.793 0 2.516 1.889 2.516 3.719-.02 2.24-.984 3.745-2.53 3.745m38.382-12.584v-2.957c-.549-.156-1.231-.267-2.094-.267-1.158 0-2.53.326-3.527 1.238-1.13 1.029-1.606 2.677-1.606 4.149v.462h-4.095v-.625c-.06-2.996 2.951-2.124 3.299-2.013v-2.957c-.555-.156-1.238-.267-2.101-.267-1.158 0-2.53.326-3.526 1.238-1.131 1.029-1.606 2.67-1.606 4.149v.462h-1.693v2.846h1.693v9.588c0 2.631-1.88 2.254-2.717 2.124l-.422 2.846a5 5 0 0 0 1.693.312c1.794.014 3.065-.52 3.921-1.335 1.071-1.029 1.48-2.507 1.48-3.973l.026-9.555h4.062v9.588c.06 2.774-2.168 2.208-2.717 2.123l-.421 2.846a5 5 0 0 0 1.692.313c1.794.013 3.065-.521 3.922-1.335 1.07-1.03 1.472-2.508 1.472-3.973l.026-9.556h3.252v-2.826h-3.299v-.632c.04-3.029 2.938-2.11 3.286-2.013"
         />
       </g>
       <defs>
-        <clipPath id="a">
+        <clipPath id="gopuff-logo-clip">
           <path fill="#fff" d="M10.43 18.061h74v23.878h-74z" />
         </clipPath>
       </defs>
@@ -293,13 +298,13 @@ export function KikiLogo(props: ComponentProps<'svg'>) {
 export function LangchainLogo(props: ComponentProps<'svg'>) {
   return (
     <svg xmlns="http://www.w3.org/2000/svg" fill="currentColor" viewBox="0 0 164 60" {...props}>
-      <g fill="currentColor" clipPath="url(#a)">
+      <g fill="currentColor" clipPath="url(#langchain-logo-clip)">
         <path d="M47.027 24.422c-.634 0-1.23.245-1.676.691L43.55 26.91a2.36 2.36 0 0 0-.673 1.963c.064.53.297 1.007.673 1.381.26.259.546.423.894.537q.027.157.028.316c0 .477-.186.924-.522 1.259l-.11.11a3.9 3.9 0 0 1-1.558-.957c-.602-.6-1-1.358-1.15-2.19l-.02-.116-.092.074q-.093.075-.175.158l-1.802 1.797a2.363 2.363 0 0 0 1.676 4.034c.608 0 1.213-.23 1.675-.691l1.802-1.797a2.363 2.363 0 0 0 0-3.343 2.34 2.34 0 0 0-.872-.55 1.942 1.942 0 0 1 .552-1.705 4.1 4.1 0 0 1 1.59.99c.6.6.997 1.356 1.15 2.19l.02.116.092-.074q.092-.075.177-.16l1.801-1.796a2.362 2.362 0 0 0-1.676-4.034z" />
         <path d="M46.061 17.85H22.484C15.766 17.85 10.3 23.3 10.3 30s5.466 12.15 12.183 12.15h23.578c6.718 0 12.184-5.45 12.184-12.15S52.779 17.85 46.06 17.85M34.431 36.9c-.388.08-.825.094-1.122-.216-.11.252-.366.12-.563.087l-.052.146c-.656.044-1.148-.624-1.462-1.128-.62-.336-1.326-.54-1.961-.89-.037.578.09 1.294-.462 1.667-.028 1.112 1.686.132 1.843.96-.121.014-.257-.02-.354.074-.447.434-.96-.328-1.475-.013-.692.347-.762.632-1.618.703-.048-.071-.028-.119.012-.162.241-.28.258-.609.67-.728-.424-.067-.779.166-1.136.351-.464.19-.46-.428-1.174.033-.08-.065-.042-.123.004-.173.181-.22.42-.254.69-.241-1.325-.737-1.949.9-2.56.086-.185.048-.254.214-.37.33-.1-.109-.024-.242-.02-.37-.119-.056-.27-.083-.234-.274-.234-.079-.398.06-.572.191-.157-.121.106-.299.155-.425.14-.243.46-.05.621-.225.46-.261 1.103.163 1.63.091.405.051.907-.364.703-.779-.433-.552-.357-1.276-.366-1.936-.054-.386-.981-.877-1.25-1.292-.33-.374-.589-.808-.847-1.235-.932-1.8-.639-4.111-1.813-5.782-.531.293-1.223.154-1.681-.238-.248.224-.259.519-.278.83-.593-.59-.52-1.709-.045-2.367.194-.26.425-.474.683-.663.059-.042.078-.083.077-.149.47-2.104 3.669-1.699 4.68-.208.733.918.955 2.132 1.787 2.983 1.12 1.223 2.395 2.3 3.428 3.6.978 1.19 1.676 2.585 2.285 3.99.248.467.25 1.04.619 1.438.181.24 1.068.896.876 1.128.11.24.94.572.652.805m15.54-7.18-1.802 1.798a4.15 4.15 0 0 1-1.717 1.031l-.033.01-.012.032a4.1 4.1 0 0 1-.947 1.46l-1.802 1.797a4.14 4.14 0 0 1-2.944 1.215 4.15 4.15 0 0 1-2.945-7.089l1.802-1.796a4.1 4.1 0 0 1 1.714-1.028l.033-.01.012-.032c.21-.551.529-1.045.95-1.465l1.801-1.797a4.14 4.14 0 0 1 2.945-1.215c1.113 0 2.159.431 2.945 1.215a4.12 4.12 0 0 1 1.218 2.937c0 1.11-.432 2.154-1.218 2.936z" />
         <path d="M27.102 34.724c-.158.615-.21 1.661-1.011 1.692-.066.355.246.488.531.374.282-.129.416.102.51.332.436.063 1.079-.145 1.103-.659-.65-.373-.85-1.083-1.132-1.74zM69.532 24.219h-2.14v12.983h9.18v-2.068h-7.04zM87.331 37.202h2.14v-.023h.029l.004-.096c0-.027.008-.287-.031-.688v-4.832c0-1.818 1.325-2.645 2.557-2.645 1.325 0 1.97.714 1.97 2.183v6.1h2.14v-6.384c0-2.426-1.54-3.933-4.02-3.933-1.054 0-1.994.3-2.733.868l-.02-.69h-2.033v10.14zM104.851 27.807c-.744-.604-1.7-.923-2.779-.923-2.886 0-4.68 1.99-4.68 5.194s1.794 5.212 4.68 5.212c1.018 0 1.927-.277 2.642-.804-.061 1.572-1.046 2.505-2.659 2.505-1.358 0-2.125-.432-2.283-1.284l-.02-.106-2.08.635.02.085c.35 1.693 1.934 2.703 4.238 2.703 1.563 0 2.789-.425 3.645-1.265.863-.847 1.3-2.067 1.3-3.626v-9.07h-1.98l-.043.744zm-.134 4.36c0 1.935-.942 3.09-2.521 3.09-1.693 0-2.663-1.158-2.663-3.178s.971-3.161 2.663-3.161c1.541 0 2.506 1.15 2.521 3zM117.421 33.085c-.444 1.435-1.583 2.226-3.207 2.226-2.322 0-3.766-1.763-3.766-4.601s1.457-4.601 3.802-4.601c1.623 0 2.558.636 3.033 2.061l.222.667 2.021-.949-.189-.534c-.77-2.168-2.547-3.314-5.14-3.314-1.762 0-3.258.637-4.326 1.84-1.057 1.19-1.616 2.86-1.616 4.83 0 4.052 2.338 6.67 5.959 6.67 2.551 0 4.527-1.334 5.286-3.57l.193-.572-2.076-.79-.198.638zM125.414 26.884c-1.022 0-1.932.28-2.646.813v-4.723h-2.14v14.229h2.14v-5.639c0-1.83 1.325-2.663 2.558-2.663 1.324 0 1.969.715 1.969 2.184v6.119h2.141V30.8c0-2.378-1.578-3.914-4.021-3.914zM141.946 22.668c-.795 0-1.372.578-1.372 1.373 0 .794.577 1.372 1.372 1.372s1.372-.578 1.372-1.372-.577-1.373-1.372-1.373M149.568 26.884c-1.054 0-1.994.3-2.732.868l-.02-.69h-2.033v10.14h2.141v-5.639c0-1.818 1.325-2.645 2.557-2.645 1.325 0 1.969.714 1.969 2.183v6.1h2.141v-6.384c0-2.426-1.541-3.933-4.021-3.933zM142.986 27.062h-2.13v5.027a6 6 0 0 0-2.073-1.117v-.512c0-2.239-1.47-3.576-3.933-3.576-2 0-3.497.94-4.106 2.577l-.164.441 1.715 1.265.295-.767c.388-1.012 1.107-1.483 2.26-1.483 1.154 0 1.793.555 1.793 1.65v.056l-.208-.006c-2.291-.036-3.963.5-4.968 1.591-1.029 1.117-.939 2.37-.925 2.509l.009.096h.01c.16 1.562 1.524 2.565 3.507 2.565 1.092 0 2.101-.304 2.864-.86l.008.683h1.843v-3.172l-.04-.029c-.26-.19-.715-.437-1.398-.523a4 4 0 0 0-.608-.037h-.096v.292c0 .67-.77 1.614-2.485 1.614-1.266 0-1.455-.532-1.455-.85v-.032c.01-.142.07-.49.384-.815.4-.413 1.299-.896 3.315-.865 1.46.023 2.58.43 3.33 1.213.92.96 1.093 2.275 1.125 2.79v.415h2.129v-10.14zM81.797 26.84c-2 0-3.496.94-4.106 2.576l-.164.442 1.716 1.265.294-.767c.388-1.012 1.107-1.483 2.26-1.483 1.154 0 1.793.555 1.793 1.65v.256l-2.205.389c-2.584.457-3.894 1.562-3.894 3.282 0 1.721 1.383 2.884 3.523 2.884 1.093 0 2.101-.304 2.864-.86l.009.683h1.842v-6.74c0-2.24-1.47-3.577-3.932-3.577m1.793 5.945v.903c0 .671-.772 1.615-2.486 1.615-1.266 0-1.454-.532-1.454-.85 0-.282 0-.942 2.242-1.358z" />
       </g>
       <defs>
-        <clipPath id="a">
+        <clipPath id="langchain-logo-clip">
           <path fill="#fff" d="M10.3 17.76h143.291v24.48H10.3z" />
         </clipPath>
       </defs>
@@ -453,7 +458,7 @@ export function PikaLogo(props: ComponentProps<'svg'>) {
 export function PwcLogo(props: ComponentProps<'svg'>) {
   return (
     <svg xmlns="http://www.w3.org/2000/svg" fill="currentColor" viewBox="0 0 113 60" {...props}>
-      <g clipPath="url(#a)">
+      <g clipPath="url(#pwc-logo-clip)">
         <mask
           id="b"
           width="96"
@@ -486,7 +491,7 @@ export function PwcLogo(props: ComponentProps<'svg'>) {
         </g>
       </g>
       <defs>
-        <clipPath id="a">
+        <clipPath id="pwc-logo-clip">
           <path fill="#fff" d="M10.43 18.5h92v27h-92z" />
         </clipPath>
       </defs>
@@ -570,7 +575,7 @@ export function SubmagicLogo(props: ComponentProps<'svg'>) {
 export function TempoLogo(props: ComponentProps<'svg'>) {
   return (
     <svg xmlns="http://www.w3.org/2000/svg" fill="currentColor" viewBox="0 0 191 60" {...props}>
-      <g fill="currentColor" clipPath="url(#a)">
+      <g fill="currentColor" clipPath="url(#tempo-logo-clip)">
         <path
           fillRule="evenodd"
           d="M19.46 8.274a8.69 8.69 0 0 0-8.691 8.69v26.072c0 4.8 3.89 8.69 8.69 8.69h26.072c4.799 0 8.69-3.89 8.69-8.69V16.965c0-4.8-3.891-8.69-8.69-8.69zm24.084 12.932 1.987-2.793H19.459l1.987 2.793h9.543l-.021 22.422 1.419 1.863 1.418-1.863.021-22.422zM27.659 38.897l2.364 2.794V22.137H22.11l1.655 2.328h3.905zm7.093 2.794 2.355-2.794V24.465h4.12l1.655-2.328h-8.13z"
@@ -579,7 +584,7 @@ export function TempoLogo(props: ComponentProps<'svg'>) {
         <path d="M73.77 42.601v-21.52h-7.98V17.66h19.703v3.42h-7.981v21.521zM93.816 42.922c-5.63 0-9.3-4.133-9.3-9.478 0-5.416 3.706-9.513 9.264-9.513 5.38 0 8.765 4.24 8.765 9.085v1.675h-14.43c.463 3.492 2.815 5.024 5.7 5.024 2.922 0 4.811-1.782 5.381-3.385l2.744 1.46c-.784 2.032-3.278 5.132-8.124 5.132m-5.594-11.224H98.84c-.036-2.28-1.96-4.632-5.096-4.632-2.707 0-4.917 1.604-5.522 4.632M106.284 42.601v-18.35h3.563v2.316c.855-1.603 2.779-2.636 4.988-2.636 2.459 0 4.454 1.14 5.666 2.85.926-1.211 2.743-2.85 5.879-2.85 4.24 0 7.233 3.064 7.233 6.912v11.758h-3.563V31.698c0-2.743-1.746-4.418-4.133-4.418-2.459 0-4.205 1.817-4.205 4.418v10.903h-3.563V31.698c0-2.743-1.71-4.418-4.133-4.418-2.459 0-4.169 1.817-4.169 4.418v10.903zM137.879 50.76V24.251h3.563v2.352c1.176-1.568 3.385-2.672 6.129-2.672 4.988 0 8.943 3.563 8.943 9.513 0 5.523-3.884 9.478-8.943 9.478-2.744 0-5.06-1.176-6.129-2.744V50.76zm3.492-17.316c0 3.35 2.209 6.164 5.772 6.164s5.772-2.78 5.772-6.164c0-3.42-2.209-6.2-5.772-6.2s-5.772 2.815-5.772 6.2M169.036 42.922c-5.63 0-9.656-3.99-9.656-9.478s4.062-9.513 9.656-9.513 9.656 4.026 9.656 9.513c0 5.451-4.027 9.478-9.656 9.478m-6.057-9.478c0 3.634 2.672 6.2 6.057 6.2 3.42 0 6.057-2.566 6.057-6.2s-2.637-6.2-6.057-6.2-6.057 2.566-6.057 6.2" />
       </g>
       <defs>
-        <clipPath id="a">
+        <clipPath id="tempo-logo-clip">
           <path fill="#fff" d="M10.769 8.274h169.462v43.452H10.769z" />
         </clipPath>
       </defs>
@@ -601,11 +606,11 @@ export function UdioLogo(props: ComponentProps<'svg'>) {
 export function V0Logo(props: ComponentProps<'svg'>) {
   return (
     <svg xmlns="http://www.w3.org/2000/svg" fill="currentColor" viewBox="0 0 101 60" {...props}>
-      <g fill="currentColor" clipPath="url(#a)">
+      <g fill="currentColor" clipPath="url(#v0-logo-clip)">
         <path d="M57.015 10h19.054c7.726 0 13.99 6.263 13.99 13.99V42.16h-7.827V23.99a7 7 0 0 0-.022-.555L63.158 42.158q.096.003.193.003h18.882v7.391H63.35c-7.726 0-14.162-6.324-14.162-14.05V17.378h7.827v18.124q0 .523.08 1.032l19.472-19.135a6 6 0 0 0-.498-.02H57.015zM37.765 48.191 10.228 17.375h11.078l16.168 18.093V17.375h8.26V45.15c0 4.192-5.176 6.168-7.969 3.042" />
       </g>
       <defs>
-        <clipPath id="a">
+        <clipPath id="v0-logo-clip">
           <path fill="#fff" d="M10.228 10h80v40h-80z" />
         </clipPath>
       </defs>
diff --git a/apps/www/app/(home)/page.tsx b/apps/www/app/(home)/page.tsx
index 26e4afba594..8aa34bd438c 100644
--- a/apps/www/app/(home)/page.tsx
+++ b/apps/www/app/(home)/page.tsx
@@ -2,12 +2,28 @@ import type { Metadata } from 'next'
 
 import { FrameworksSection } from './_components/FrameworksSection'
 import { HomeContent } from './_components/HomeContent'
+import { organizationSchema, serializeJsonLd, websiteSchema } from '@/lib/json-ld'
 import { mdAlternates } from '@/lib/md-alternates'
 
 export const metadata: Metadata = {
-  alternates: mdAlternates('index'),
+  alternates: {
+    ...mdAlternates('index'),
+    canonical: 'https://supabase.com',
+  },
 }
 
 export default function HomePage() {
-  return <HomeContent frameworksSlot={<FrameworksSection />} />
+  return (
+    <>
+      <script
+        type="application/ld+json"
+        dangerouslySetInnerHTML={{ __html: serializeJsonLd(organizationSchema()) }}
+      />
+      <script
+        type="application/ld+json"
+        dangerouslySetInnerHTML={{ __html: serializeJsonLd(websiteSchema()) }}
+      />
+      <HomeContent frameworksSlot={<FrameworksSection />} />
+    </>
+  )
 }
diff --git a/apps/www/app/api-v2/md-404/[[...path]]/route.ts b/apps/www/app/api-v2/md-404/[[...path]]/route.ts
new file mode 100644
index 00000000000..4aa71ab7dd5
--- /dev/null
+++ b/apps/www/app/api-v2/md-404/[[...path]]/route.ts
@@ -0,0 +1,30 @@
+import { NextResponse } from 'next/server'
+
+const MARKDOWN_404_HEADERS = {
+  'Content-Type': 'text/markdown; charset=utf-8',
+  'X-Content-Type-Options': 'nosniff',
+  'Cache-Control': 'no-store',
+  Vary: 'Accept',
+}
+
+function buildMarkdown404Body(requestPath: string): string {
+  const safePath = requestPath.replace(/[^\x20-\x7E]/g, '').replaceAll('`', '')
+  return `# 404 Not Found
+
+\`${safePath}\` does not exist on supabase.com.
+
+Explore instead:
+
+- [Documentation](https://supabase.com/docs)
+- [Sitemap](https://supabase.com/sitemap.xml)
+- [llms.txt](https://supabase.com/llms.txt)
+`
+}
+
+export async function GET(_request: Request, { params }: { params: Promise<{ path?: string[] }> }) {
+  const { path } = await params
+  return new NextResponse(buildMarkdown404Body('/' + (path ?? []).join('/')), {
+    status: 404,
+    headers: MARKDOWN_404_HEADERS,
+  })
+}
diff --git a/apps/www/components/Error404.tsx b/apps/www/components/Error404.tsx
index f2e6e5c3a41..5032d9d7eda 100644
--- a/apps/www/components/Error404.tsx
+++ b/apps/www/components/Error404.tsx
@@ -30,17 +30,17 @@ const Error404 = () => {
             </div>
           </nav>
         </div>
-        <div className="absolute">
-          <h1
-            className={`text-foreground select-none text-[14rem] opacity-5 filter transition duration-200 sm:text-[18rem] lg:text-[28rem] ${
+        <div className="pointer-events-none absolute" aria-hidden="true">
+          <div
+            className={`text-foreground select-none text-[14rem] opacity-5 filter transition duration-200 motion-reduce:transition-none sm:text-[18rem] lg:text-[28rem] ${
               show404 ? 'blur-xs' : 'blur-none'
             }`}
           >
             404
-          </h1>
+          </div>
         </div>
         <div
-          className={`flex flex-col items-center justify-center space-y-6 transition ${
+          className={`flex flex-col items-center justify-center space-y-6 transition motion-reduce:transition-none ${
             show404 ? 'opacity-100' : 'opacity-0'
           }`}
         >
@@ -55,6 +55,19 @@ const Error404 = () => {
               <Link href="/">Head back</Link>
             </Button>
           </div>
+          <p className="text-foreground-lighter text-xs">
+            <a href="/docs" className="hover:text-foreground underline">
+              Documentation
+            </a>
+            {' · '}
+            <a href="/sitemap.xml" className="hover:text-foreground underline">
+              Sitemap
+            </a>
+            {' · '}
+            <a href="/llms.txt" className="hover:text-foreground underline">
+              llms.txt
+            </a>
+          </p>
         </div>
       </div>
     </DefaultLayout>
diff --git a/apps/www/components/Pricing/PricingComparisonTable.tsx b/apps/www/components/Pricing/PricingComparisonTable.tsx
index 515f662f9ea..b8b42e4d436 100644
--- a/apps/www/components/Pricing/PricingComparisonTable.tsx
+++ b/apps/www/components/Pricing/PricingComparisonTable.tsx
@@ -4,8 +4,9 @@ import { PricingTableRowDesktop, PricingTableRowMobile } from '~/components/Pric
 import Solutions from '~/data/MainProducts'
 import { Organization } from '~/data/organizations'
 import { useSendTelemetryEvent } from '~/lib/telemetry'
+import { useIsomorphicLayoutEffect } from 'common'
 import Link from 'next/link'
-import { useState } from 'react'
+import { useRef, useState } from 'react'
 import { plans } from 'shared-data/plans'
 import { pricing } from 'shared-data/pricing'
 import {
@@ -120,6 +121,23 @@ const PricingComparisonTable = ({
   const sendTelemetryEvent = useSendTelemetryEvent()
   const orgSlug = organizations?.[0]?.slug
 
+  const tableRef = useRef<HTMLTableElement>(null)
+  const theadRef = useRef<HTMLTableSectionElement>(null)
+
+  useIsomorphicLayoutEffect(() => {
+    const table = tableRef.current
+    const thead = theadRef.current
+    if (!table || !thead) return
+
+    const observer = new ResizeObserver(() => {
+      const theadTop = parseFloat(getComputedStyle(thead).top) || 0
+      const categoryTop = Math.floor(theadTop + thead.getBoundingClientRect().height)
+      table.style.setProperty('--pricing-category-top', `${categoryTop}px`)
+    })
+    observer.observe(thead)
+    return () => observer.disconnect()
+  }, [])
+
   return (
     <div
       id="compare-plans"
@@ -372,9 +390,9 @@ const PricingComparisonTable = ({
 
       {/* <!-- lg+ --> */}
       <div className="hidden lg:block">
-        <table className="h-px w-full table-fixed">
+        <table ref={tableRef} className="h-px w-full table-fixed">
           <caption className="sr-only">Pricing plan comparison</caption>
-          <thead className="bg-background sticky top-[62px] z-10">
+          <thead ref={theadRef} className="bg-background sticky top-[62px] z-10">
             <tr>
               <th
                 className="text-foreground w-1/3 px-6 pt-2 pb-2 text-left text-sm font-normal"
diff --git a/apps/www/components/Pricing/PricingTableRow.tsx b/apps/www/components/Pricing/PricingTableRow.tsx
index f9bd8626458..440d380edeb 100644
--- a/apps/www/components/Pricing/PricingTableRow.tsx
+++ b/apps/www/components/Pricing/PricingTableRow.tsx
@@ -166,8 +166,10 @@ export const PricingTableRowDesktop = (props: any) => {
         style={{ borderTop: 'none' }}
         id={`${props.sectionId}-desktop`}
       >
+        {/* 108px/84px are pre-hydration fallbacks only; after mount PricingComparisonTable
+            measures the sticky thead into --pricing-category-top and that value wins */}
         <th
-          className="bg-background text-foreground sticky top-[108px] xl:top-[84px] z-10 py-3 pl-6 text-left text-sm font-medium"
+          className="bg-background text-foreground sticky top-[var(--pricing-category-top,108px)] xl:top-[var(--pricing-category-top,84px)] z-10 py-3 pl-6 text-left text-sm font-medium"
           scope="colgroup"
         >
           <div className="flex items-center gap-4">
@@ -207,7 +209,7 @@ export const PricingTableRowDesktop = (props: any) => {
                   <td
                     key={i}
                     className={[
-                      `pl-6 pr-2 tier-${planName}`,
+                      `pl-6 pr-2 py-5 tier-${planName}`,
                       typeof planValue === 'boolean' ? 'text-center' : '',
                     ].join(' ')}
                   >
@@ -218,7 +220,7 @@ export const PricingTableRowDesktop = (props: any) => {
                         <IconPricingMinus plan={planValue} />
                       </div>
                     ) : (
-                      <div className="text-foreground text-xs flex flex-col justify-center">
+                      <div className="text-foreground text-xs flex flex-col justify-center gap-2">
                         <span className="flex items-center gap-2">
                           {tooltips?.[planName] && (
                             <InfoTooltip
diff --git a/apps/www/components/Regions/MapData.json b/apps/www/components/Regions/MapData.json
new file mode 100644
index 00000000000..c08a9a8e5f7
--- /dev/null
+++ b/apps/www/components/Regions/MapData.json
@@ -0,0 +1,10189 @@
+{
+  "type": "Topology",
+  "objects": {
+    "world": {
+      "type": "GeometryCollection",
+      "geometries": [
+        { "type": "Polygon", "arcs": [[0, 1, 2, 3, 4, 5]], "id": "AFG" },
+        { "type": "MultiPolygon", "arcs": [[[6, 7, 8, 9]], [[10, 11, 12]]], "id": "AGO" },
+        { "type": "Polygon", "arcs": [[13, 14, 15, 16, 17]], "id": "ALB" },
+        { "type": "Polygon", "arcs": [[18, 19, 20, 21, 22]], "id": "ARE" },
+        { "type": "MultiPolygon", "arcs": [[[23, 24]], [[25, 26, 27, 28, 29, 30]]], "id": "ARG" },
+        { "type": "Polygon", "arcs": [[31, 32, 33, 34, 35]], "id": "ARM" },
+        { "type": "Polygon", "arcs": [[36]], "id": "ATF" },
+        { "type": "MultiPolygon", "arcs": [[[37]], [[38]]], "id": "AUS" },
+        { "type": "Polygon", "arcs": [[39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49]], "id": "AUT" },
+        { "type": "MultiPolygon", "arcs": [[[50, -35]], [[51, 52, -33, 53, 54]]], "id": "AZE" },
+        { "type": "Polygon", "arcs": [[55, 56, 57, 58]], "id": "BDI" },
+        { "type": "Polygon", "arcs": [[59, 60, 61, 62, 63]], "id": "BEL" },
+        { "type": "Polygon", "arcs": [[64, 65, 66, 67, 68]], "id": "BEN" },
+        { "type": "Polygon", "arcs": [[69, 70, 71, -67, 72, 73]], "id": "BFA" },
+        { "type": "Polygon", "arcs": [[74, 75, 76]], "id": "BGD" },
+        { "type": "Polygon", "arcs": [[77, 78, 79, 80, 81, 82]], "id": "BGR" },
+        { "type": "MultiPolygon", "arcs": [[[83]], [[84]], [[85]]], "id": "BHS" },
+        { "type": "Polygon", "arcs": [[86, 87, 88, 89]], "id": "BIH" },
+        { "type": "Polygon", "arcs": [[90, 91, 92, 93, 94, 95, 96, 97]], "id": "BLR" },
+        { "type": "Polygon", "arcs": [[98, 99, 100]], "id": "BLZ" },
+        { "type": "Polygon", "arcs": [[101, 102, 103, 104, -31]], "id": "BOL" },
+        {
+          "type": "Polygon",
+          "arcs": [[-27, 105, -104, 106, 107, 108, 109, 110, 111, 112, 113]],
+          "id": "BRA"
+        },
+        { "type": "Polygon", "arcs": [[114, 115]], "id": "BRN" },
+        { "type": "Polygon", "arcs": [[116, 117]], "id": "BTN" },
+        { "type": "Polygon", "arcs": [[118, 119, 120, 121]], "id": "BWA" },
+        { "type": "Polygon", "arcs": [[122, 123, 124, 125, 126, 127, 128]], "id": "CAF" },
+        {
+          "type": "MultiPolygon",
+          "arcs": [
+            [[129]],
+            [[130]],
+            [[131]],
+            [[132]],
+            [[133]],
+            [[134]],
+            [[135]],
+            [[136]],
+            [[137]],
+            [[138]],
+            [[139, 140, 141, 142, 143, 144]],
+            [[145]],
+            [[146]],
+            [[147]],
+            [[148]],
+            [[149]],
+            [[150]],
+            [[151]],
+            [[152]],
+            [[153]],
+            [[154]],
+            [[155]],
+            [[156]],
+            [[157]],
+            [[158]],
+            [[159]],
+            [[160]],
+            [[161]],
+            [[162]],
+            [[163]]
+          ],
+          "id": "CAN"
+        },
+        { "type": "Polygon", "arcs": [[-47, 164, 165, 166, -43, 167, 168, 169]], "id": "CHE" },
+        { "type": "MultiPolygon", "arcs": [[[-24, 170]], [[-30, 171, 172, -102]]], "id": "CHL" },
+        {
+          "type": "MultiPolygon",
+          "arcs": [
+            [[173]],
+            [
+              [
+                174, 175, 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, -118, 188,
+                189, 190, 191, -4, 192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202
+              ]
+            ]
+          ],
+          "id": "CHN"
+        },
+        { "type": "Polygon", "arcs": [[203, 204, 205, 206, -70, 207]], "id": "CIV" },
+        {
+          "type": "Polygon",
+          "arcs": [[208, 209, 210, 211, 212, 213, 214, -129, 215]],
+          "id": "CMR"
+        },
+        {
+          "type": "Polygon",
+          "arcs": [[216, 217, 218, 219, -56, 220, 221, 222, -10, 223, -13, 224, -127, 225, 226]],
+          "id": "COD"
+        },
+        { "type": "Polygon", "arcs": [[-12, 227, 228, -216, -128, -225]], "id": "COG" },
+        { "type": "Polygon", "arcs": [[229, 230, 231, 232, 233, -108, 234]], "id": "COL" },
+        { "type": "Polygon", "arcs": [[235, 236, 237, 238]], "id": "CRI" },
+        { "type": "Polygon", "arcs": [[239]], "id": "CUB" },
+        { "type": "Polygon", "arcs": [[240]], "id": "CYP" },
+        { "type": "Polygon", "arcs": [[-49, 241, 242, 243]], "id": "CZE" },
+        {
+          "type": "Polygon",
+          "arcs": [[244, 245, -242, -48, -170, 246, 247, -61, 248, 249, 250]],
+          "id": "DEU"
+        },
+        { "type": "Polygon", "arcs": [[251, 252, 253, 254]], "id": "DJI" },
+        { "type": "MultiPolygon", "arcs": [[[255]], [[-251, 256]]], "id": "DNK" },
+        { "type": "MultiPolygon", "arcs": [[[257]]], "id": "GRL" },
+        { "type": "Polygon", "arcs": [[258, 259]], "id": "DOM" },
+        { "type": "Polygon", "arcs": [[260, 261, 262, 263, 264, 265, 266, 267]], "id": "DZA" },
+        { "type": "Polygon", "arcs": [[268, -230, 269]], "id": "ECU" },
+        { "type": "Polygon", "arcs": [[270, 271, 272]], "id": "EGY" },
+        { "type": "Polygon", "arcs": [[273, 274, 275, 276, 277, 278, 279, -255]], "id": "ERI" },
+        { "type": "Polygon", "arcs": [[280, 281, 282, 283]], "id": "ESP" },
+        { "type": "Polygon", "arcs": [[284, 285, 286, 287]], "id": "EST" },
+        {
+          "type": "Polygon",
+          "arcs": [[288, 289, -274, -254, 290, 291, 292, 293, 294, 295, 296, 297, -277]],
+          "id": "ETH"
+        },
+        { "type": "Polygon", "arcs": [[298, 299, 300, 301]], "id": "FIN" },
+        { "type": "MultiPolygon", "arcs": [[[302]], [[303]], [[304]]], "id": "FJI" },
+        {
+          "type": "MultiPolygon",
+          "arcs": [[[305]], [[306, -247, -169, 307, 308, -282, 309, -63]]],
+          "id": "FRA"
+        },
+        { "type": "Polygon", "arcs": [[310, 311, 312, -112]], "id": "GUF" },
+        { "type": "Polygon", "arcs": [[313, 314, -209, -229]], "id": "GAB" },
+        { "type": "MultiPolygon", "arcs": [[[315, 316]], [[317]]], "id": "GBR" },
+        { "type": "Polygon", "arcs": [[318, 319, 320, 321, 322, -54, -32, 323]], "id": "GEO" },
+        { "type": "Polygon", "arcs": [[324, -208, -74, 325]], "id": "GHA" },
+        { "type": "Polygon", "arcs": [[326, 327, 328, 329, 330, 331, -206]], "id": "GIN" },
+        { "type": "Polygon", "arcs": [[332, 333]], "id": "GMB" },
+        { "type": "Polygon", "arcs": [[334, 335, -330]], "id": "GNB" },
+        { "type": "Polygon", "arcs": [[336, -210, -315]], "id": "GNQ" },
+        { "type": "MultiPolygon", "arcs": [[[337]], [[338, -14, 339, -81, 340]]], "id": "GRC" },
+        { "type": "Polygon", "arcs": [[341, 342, -101, 343, 344, 345]], "id": "GTM" },
+        { "type": "Polygon", "arcs": [[346, 347, -110, 348]], "id": "GUY" },
+        { "type": "Polygon", "arcs": [[349, 350, -345, 351, 352]], "id": "HND" },
+        { "type": "Polygon", "arcs": [[353, 354, 355, -90, 356, 357, 358]], "id": "HRV" },
+        { "type": "Polygon", "arcs": [[-260, 359]], "id": "HTI" },
+        { "type": "Polygon", "arcs": [[-40, 360, 361, 362, 363, 364, -359, 365]], "id": "HUN" },
+        {
+          "type": "MultiPolygon",
+          "arcs": [
+            [[366]],
+            [[367, 368]],
+            [[369]],
+            [[370]],
+            [[371]],
+            [[372]],
+            [[373]],
+            [[374]],
+            [[375, 376]],
+            [[377]],
+            [[378]],
+            [[379, 380]],
+            [[381]]
+          ],
+          "id": "IDN"
+        },
+        {
+          "type": "Polygon",
+          "arcs": [[-191, 382, -189, -117, -188, 383, -77, 384, 385]],
+          "id": "IND"
+        },
+        { "type": "Polygon", "arcs": [[386, -316]], "id": "IRL" },
+        {
+          "type": "Polygon",
+          "arcs": [[387, -6, 388, 389, 390, 391, 392, -51, -34, -53, 393]],
+          "id": "IRN"
+        },
+        { "type": "Polygon", "arcs": [[-391, 394, 395, 396, 397, 398, 399, 400]], "id": "IRQ" },
+        { "type": "Polygon", "arcs": [[401]], "id": "ISL" },
+        { "type": "Polygon", "arcs": [[402, 403, 404, 405, 406, 407]], "id": "ISR" },
+        {
+          "type": "MultiPolygon",
+          "arcs": [[[408]], [[409]], [[410, 411, -308, -168, -42]]],
+          "id": "ITA"
+        },
+        { "type": "Polygon", "arcs": [[412]], "id": "JAM" },
+        { "type": "Polygon", "arcs": [[-403, 413, -398, 414, 415, -405, 416]], "id": "JOR" },
+        { "type": "MultiPolygon", "arcs": [[[417]], [[418]], [[419]]], "id": "JPN" },
+        {
+          "type": "Polygon",
+          "arcs": [[420, 421, 422, 423, 424, 425, 426, 427, 428, 429, 430, 431, 432, -195, 433]],
+          "id": "KAZ"
+        },
+        { "type": "Polygon", "arcs": [[434, 435, 436, 437, -295, 438]], "id": "KEN" },
+        { "type": "Polygon", "arcs": [[-434, -194, 439, 440]], "id": "KGZ" },
+        { "type": "Polygon", "arcs": [[441, 442, 443, 444]], "id": "KHM" },
+        { "type": "Polygon", "arcs": [[445, 446]], "id": "KOR" },
+        { "type": "Polygon", "arcs": [[447, 448, 449, 450, 451]], "id": "XXK" },
+        { "type": "Polygon", "arcs": [[452, 453, -396]], "id": "KWT" },
+        { "type": "Polygon", "arcs": [[454, 455, -186, 456, -443]], "id": "LAO" },
+        { "type": "Polygon", "arcs": [[-407, 457, 458]], "id": "LBN" },
+        { "type": "Polygon", "arcs": [[459, 460, -327, -205]], "id": "LBR" },
+        { "type": "Polygon", "arcs": [[461, -268, 462, 463, -272, 464, 465]], "id": "LBY" },
+        { "type": "Polygon", "arcs": [[466]], "id": "LKA" },
+        { "type": "Polygon", "arcs": [[467]], "id": "LSO" },
+        { "type": "Polygon", "arcs": [[468, 469, 470, -91, 471]], "id": "LTU" },
+        { "type": "Polygon", "arcs": [[-248, -307, -62]], "id": "LUX" },
+        { "type": "Polygon", "arcs": [[472, -288, 473, -92, -471]], "id": "LVA" },
+        { "type": "Polygon", "arcs": [[-265, 474, 475]], "id": "MAR" },
+        { "type": "Polygon", "arcs": [[476, 477]], "id": "MDA" },
+        { "type": "Polygon", "arcs": [[478]], "id": "MDG" },
+        { "type": "Polygon", "arcs": [[-99, -343, 479, 480, 481]], "id": "MEX" },
+        { "type": "Polygon", "arcs": [[-452, 482, -82, -340, 483]], "id": "MKD" },
+        { "type": "Polygon", "arcs": [[484, -262, 485, -71, -207, -332, 486]], "id": "MLI" },
+        { "type": "Polygon", "arcs": [[487, -75, -384, -187, -456, 488]], "id": "MMR" },
+        { "type": "Polygon", "arcs": [[489, -89, 490, -450, -16]], "id": "MNE" },
+        {
+          "type": "Polygon",
+          "arcs": [[491, 492, 493, 494, 495, 496, 497, 498, -197]],
+          "id": "MNG"
+        },
+        { "type": "Polygon", "arcs": [[499, 500, 501, 502, 503, 504, 505, 506, 507]], "id": "MOZ" },
+        { "type": "Polygon", "arcs": [[508, 509, 510, -263, -485]], "id": "MRT" },
+        { "type": "Polygon", "arcs": [[-508, 511, 512, 513]], "id": "MWI" },
+        {
+          "type": "MultiPolygon",
+          "arcs": [[[514, 515, 516, 517]], [[-380, 518, -116, 519]]],
+          "id": "MYS"
+        },
+        { "type": "Polygon", "arcs": [[520, -8, 521, -120, 522]], "id": "NAM" },
+        { "type": "Polygon", "arcs": [[523]], "id": "NCL" },
+        {
+          "type": "Polygon",
+          "arcs": [[-72, -486, -261, -462, 524, 525, 526, 527, 528, -213, 529, -68]],
+          "id": "NER"
+        },
+        { "type": "Polygon", "arcs": [[530, -69, -530, -212]], "id": "NGA" },
+        { "type": "Polygon", "arcs": [[531, -353, 532, -237]], "id": "NIC" },
+        { "type": "Polygon", "arcs": [[-249, -60, 533]], "id": "NLD" },
+        {
+          "type": "MultiPolygon",
+          "arcs": [[[-302, 534, 535]], [[536]], [[537]], [[538]]],
+          "id": "NOR"
+        },
+        { "type": "Polygon", "arcs": [[-383, -190]], "id": "NPL" },
+        { "type": "MultiPolygon", "arcs": [[[539]], [[540]]], "id": "NZL" },
+        { "type": "MultiPolygon", "arcs": [[[541, 542, -22, 543]], [[-20, 544]]], "id": "OMN" },
+        { "type": "Polygon", "arcs": [[-192, -386, 545, -389, -5]], "id": "PAK" },
+        { "type": "Polygon", "arcs": [[546, -239, 547, -232]], "id": "PAN" },
+        { "type": "Polygon", "arcs": [[-173, 548, -270, -235, -107, -103]], "id": "PER" },
+        {
+          "type": "MultiPolygon",
+          "arcs": [[[549]], [[550]], [[551]], [[552]], [[553]], [[554]], [[555]]],
+          "id": "PHL"
+        },
+        { "type": "MultiPolygon", "arcs": [[[556]], [[557]], [[-376, 558]], [[559]]], "id": "PNG" },
+        { "type": "Polygon", "arcs": [[-246, 560, 561, -472, -98, 562, 563, -243]], "id": "POL" },
+        { "type": "Polygon", "arcs": [[564]], "id": "PRI" },
+        { "type": "Polygon", "arcs": [[565, -447, 566, -183]], "id": "PRK" },
+        { "type": "Polygon", "arcs": [[-284, 567]], "id": "PRT" },
+        { "type": "Polygon", "arcs": [[-105, -106, -26]], "id": "PRY" },
+        { "type": "Polygon", "arcs": [[568, 569]], "id": "QAT" },
+        { "type": "Polygon", "arcs": [[570, -478, 571, 572, -78, 573, -363]], "id": "ROU" },
+        {
+          "type": "MultiPolygon",
+          "arcs": [
+            [[574]],
+            [[-562, 575, -469]],
+            [[576]],
+            [[577]],
+            [[578]],
+            [[579]],
+            [[580]],
+            [[581]],
+            [[582]],
+            [
+              [
+                -181, 583, 584, 585, -177, 586, -175, 587, -202, 588, -200, 589, -198, -499, 590,
+                591, -496, 592, -494, 593, -492, -196, -433, 594, -431, 595, 596, -428, 597, -426,
+                598, 599, 600, -55, 601, -322, 602, -320, 603, 604, 605, 606, 607, 608, 609, 610,
+                611, -95, 612, -93, -474, -287, 613, 614, -299, 615
+              ]
+            ],
+            [[616]],
+            [[617]],
+            [[618]]
+          ],
+          "id": "RUS"
+        },
+        { "type": "Polygon", "arcs": [[619, 620, -57, -220, 621]], "id": "RWA" },
+        { "type": "Polygon", "arcs": [[-475, -264, -511, 622]], "id": "ESH" },
+        {
+          "type": "Polygon",
+          "arcs": [[623, -415, -397, -454, 624, -570, 625, -23, -543, 626]],
+          "id": "SAU"
+        },
+        {
+          "type": "Polygon",
+          "arcs": [[627, 628, -124, 629, -465, -271, 630, -279, 631, -298, 632]],
+          "id": "SDN"
+        },
+        {
+          "type": "Polygon",
+          "arcs": [[633, -296, -438, 634, 635, -226, -126, 636, -628]],
+          "id": "SSD"
+        },
+        { "type": "Polygon", "arcs": [[637, -509, -487, -331, -336, 638, -334]], "id": "SEN" },
+        {
+          "type": "MultiPolygon",
+          "arcs": [[[639]], [[640]], [[641]], [[642]], [[643]]],
+          "id": "SLB"
+        },
+        { "type": "Polygon", "arcs": [[644, -328, -461]], "id": "SLE" },
+        { "type": "Polygon", "arcs": [[645, -346, -351]], "id": "SLV" },
+        { "type": "Polygon", "arcs": [[646, 647, -291, -253, 648, -439, -294]], "id": "SOM" },
+        {
+          "type": "Polygon",
+          "arcs": [[-83, -483, -451, -491, -88, 649, -355, 650, -364, -574]],
+          "id": "SRB"
+        },
+        { "type": "Polygon", "arcs": [[651, -312, 652, -111, -348]], "id": "SUR" },
+        { "type": "Polygon", "arcs": [[-564, 653, -361, -50, -244]], "id": "SVK" },
+        { "type": "Polygon", "arcs": [[-41, -366, -358, 654, -411]], "id": "SVN" },
+        { "type": "Polygon", "arcs": [[-535, -301, 655]], "id": "SWE" },
+        { "type": "Polygon", "arcs": [[656, -504]], "id": "SWZ" },
+        { "type": "Polygon", "arcs": [[-414, -408, -459, 657, 658, -399]], "id": "SYR" },
+        {
+          "type": "Polygon",
+          "arcs": [[-529, 659, -527, 660, -525, -466, -630, -123, -215, 661]],
+          "id": "TCD"
+        },
+        { "type": "Polygon", "arcs": [[662, -326, -73, -66]], "id": "TGO" },
+        { "type": "Polygon", "arcs": [[663, -518, 664, -489, -455, -442]], "id": "THA" },
+        { "type": "Polygon", "arcs": [[-440, -193, -3, 665]], "id": "TJK" },
+        { "type": "Polygon", "arcs": [[-388, 666, -422, 667, -1]], "id": "TKM" },
+        { "type": "Polygon", "arcs": [[668, -368]], "id": "TLS" },
+        { "type": "Polygon", "arcs": [[669]], "id": "TTO" },
+        { "type": "Polygon", "arcs": [[-267, 670, -463]], "id": "TUN" },
+        {
+          "type": "MultiPolygon",
+          "arcs": [[[-324, -36, -393, 671, -400, -659, 672]], [[-341, -80, 673]]],
+          "id": "TUR"
+        },
+        { "type": "Polygon", "arcs": [[674]], "id": "TWN" },
+        {
+          "type": "Polygon",
+          "arcs": [[-436, 675, 676, -500, 677, 678, 679, 680, -221, -59, 681, -620, 682]],
+          "id": "TZA"
+        },
+        {
+          "type": "Polygon",
+          "arcs": [[-622, -219, 683, -217, 684, -635, -437, -683]],
+          "id": "UGA"
+        },
+        {
+          "type": "Polygon",
+          "arcs": [
+            [
+              685, -611, 686, -609, 687, 688, 689, -605, 690, -572, -477, -571, -362, -654, -563,
+              -97
+            ]
+          ],
+          "id": "UKR"
+        },
+        { "type": "Polygon", "arcs": [[-114, 691, -28]], "id": "URY" },
+        {
+          "type": "MultiPolygon",
+          "arcs": [
+            [[692]],
+            [[693]],
+            [[694]],
+            [[695]],
+            [[696]],
+            [[697, -481, 698, -140]],
+            [[699]],
+            [[700]],
+            [[701]],
+            [[-144, 702, -142, 703]]
+          ],
+          "id": "USA"
+        },
+        { "type": "Polygon", "arcs": [[-668, -421, -441, -666, -2]], "id": "UZB" },
+        { "type": "Polygon", "arcs": [[704, -349, -109, -234]], "id": "VEN" },
+        { "type": "Polygon", "arcs": [[705, -444, -457, -185]], "id": "VNM" },
+        { "type": "MultiPolygon", "arcs": [[[706]], [[707]]], "id": "VUT" },
+        { "type": "Polygon", "arcs": [[-417, -404]], "id": "PSX" },
+        { "type": "Polygon", "arcs": [[708, -627, -542]], "id": "YEM" },
+        {
+          "type": "Polygon",
+          "arcs": [[-523, -119, 709, -505, -657, -503, 710], [-468]],
+          "id": "ZAF"
+        },
+        {
+          "type": "Polygon",
+          "arcs": [[-512, -507, 711, -121, -522, -7, -223, 712, -680]],
+          "id": "ZMB"
+        },
+        { "type": "Polygon", "arcs": [[-710, -122, -712, -506]], "id": "ZWE" },
+        {
+          "type": "MultiPolygon",
+          "arcs": [[[713]], [[714]], [[715]], [[716]], [[717]], [[718]], [[719]], [[720]]],
+          "id": "CPV"
+        },
+        { "type": "MultiPolygon", "arcs": [[[721]], [[722]], [[723]]], "id": "COM" },
+        { "type": "Polygon", "arcs": [[724]], "id": "MUS" },
+        { "type": "Polygon", "arcs": [[725]], "id": "SYC" },
+        { "type": "Polygon", "arcs": [[726]], "id": "BHR" },
+        { "type": "MultiPolygon", "arcs": [[[727]], [[728]]], "id": "MDV" },
+        { "type": "MultiPolygon", "arcs": [[[729]], [[730]]], "id": "MHL" },
+        {
+          "type": "MultiPolygon",
+          "arcs": [[[731]], [[732]], [[733]], [[734]], [[735]]],
+          "id": "FSM"
+        },
+        { "type": "Polygon", "arcs": [[736]], "id": "NRU" },
+        { "type": "Polygon", "arcs": [[737]], "id": "PLW" },
+        { "type": "MultiPolygon", "arcs": [[[738]], [[739]]], "id": "WSM" },
+        { "type": "Polygon", "arcs": [[515, 740]], "id": "SGP" },
+        { "type": "MultiPolygon", "arcs": [[[741]], [[742]], [[743]]], "id": "TON" },
+        {
+          "type": "MultiPolygon",
+          "arcs": [[[744]], [[745]], [[746]], [[747]], [[748]], [[749]], [[750]]],
+          "id": "TUV"
+        },
+        { "type": "MultiPolygon", "arcs": [[[751]], [[752]]], "id": "ATG" },
+        { "type": "Polygon", "arcs": [[753]], "id": "BRB" },
+        { "type": "Polygon", "arcs": [[754]], "id": "DMA" },
+        { "type": "Polygon", "arcs": [[755]], "id": "GRD" },
+        { "type": "MultiPolygon", "arcs": [[[756]], [[757]]], "id": "KNA" },
+        { "type": "Polygon", "arcs": [[758]], "id": "LCA" },
+        { "type": "Polygon", "arcs": [[759]], "id": "VCT" },
+        { "type": "Polygon", "arcs": [[760]], "id": "AND" },
+        { "type": "Polygon", "arcs": [[-45, 761, -166, 762]], "id": "LIE" },
+        { "type": "Polygon", "arcs": [[763]], "id": "MLT" },
+        { "type": "Polygon", "arcs": [[764]], "id": "MCO" },
+        { "type": "Polygon", "arcs": [[765]], "id": "SMR" },
+        { "type": "Polygon", "arcs": [[766]], "id": "KIR" },
+        { "type": "Polygon", "arcs": [[767]], "id": "STP" }
+      ]
+    }
+  },
+  "arcs": [
+    [
+      [61.2, 35.7],
+      [62.2, 35.3],
+      [63, 35.4],
+      [63.2, 35.9],
+      [64, 36],
+      [64.6, 36.3],
+      [64.8, 37.1],
+      [65.6, 37.3],
+      [65.8, 37.7],
+      [66.2, 37.4],
+      [66.5, 37.4]
+    ],
+    [
+      [66.5, 37.4],
+      [67.1, 37.4],
+      [67.8, 37.1]
+    ],
+    [
+      [67.8, 37.1],
+      [68.1, 37],
+      [68.9, 37.3],
+      [69.2, 37.2],
+      [69.5, 37.6],
+      [70.1, 37.6],
+      [70.3, 37.7],
+      [70.4, 38.1],
+      [70.8, 38.5],
+      [71.4, 38.3],
+      [71.2, 38],
+      [71.5, 37.9],
+      [71.5, 37.1],
+      [71.8, 36.7],
+      [72.2, 37],
+      [72.6, 37.1],
+      [73.3, 37.5],
+      [74, 37.4],
+      [75, 37.4]
+    ],
+    [
+      [75, 37.4],
+      [75.2, 37.1]
+    ],
+    [
+      [75.2, 37.1],
+      [74.6, 37],
+      [74.1, 36.8],
+      [72.9, 36.7],
+      [71.9, 36.5],
+      [71.3, 36.1],
+      [71.5, 35.7],
+      [71.6, 35.2],
+      [71.1, 34.7],
+      [71.2, 34.4],
+      [70.9, 34],
+      [69.9, 34],
+      [70.3, 33.4],
+      [69.7, 33.1],
+      [69.3, 32.5],
+      [69.3, 31.9],
+      [68.9, 31.6],
+      [68.6, 31.7],
+      [67.8, 31.6],
+      [67.7, 31.3],
+      [66.9, 31.3],
+      [66.4, 30.7],
+      [66.4, 29.9],
+      [65.1, 29.5],
+      [64.4, 29.6],
+      [64.2, 29.3],
+      [63.6, 29.5],
+      [62.6, 29.3],
+      [60.9, 29.8]
+    ],
+    [
+      [60.9, 29.8],
+      [61.8, 30.7],
+      [61.7, 31.4],
+      [60.9, 31.6],
+      [60.9, 32.2],
+      [60.5, 33],
+      [61, 33.5],
+      [60.5, 33.7],
+      [60.8, 34.4],
+      [61.2, 35.7]
+    ],
+    [
+      [23.9, -10.9],
+      [24, -11.2],
+      [23.9, -11.7],
+      [24.1, -12.2],
+      [23.9, -12.6],
+      [24, -12.9],
+      [21.9, -12.9],
+      [21.9, -16.1],
+      [22.6, -16.9],
+      [23.2, -17.5]
+    ],
+    [
+      [23.2, -17.5],
+      [21.4, -17.9],
+      [19, -17.8],
+      [18.3, -17.3],
+      [14.2, -17.3],
+      [14.1, -17.4],
+      [13.5, -17],
+      [12.8, -16.9],
+      [12.2, -17.1],
+      [11.7, -17.3]
+    ],
+    [
+      [11.7, -17.3],
+      [11.6, -16.7],
+      [11.8, -15.8],
+      [12.1, -14.9],
+      [12.2, -14.4],
+      [12.5, -13.5],
+      [12.7, -13.1],
+      [13.3, -12.5],
+      [13.6, -12],
+      [13.7, -11.3],
+      [13.7, -10.7],
+      [13.4, -10.4],
+      [13.1, -9.8],
+      [12.9, -9.2],
+      [12.9, -9],
+      [13.2, -8.6],
+      [12.9, -7.6],
+      [12.7, -6.9],
+      [12.2, -6.3],
+      [12.3, -6.1]
+    ],
+    [
+      [12.3, -6.1],
+      [12.7, -6],
+      [13, -6],
+      [13.4, -5.9],
+      [16.3, -5.9],
+      [16.6, -6.6],
+      [16.9, -7.2],
+      [17.1, -7.5],
+      [17.5, -8.1],
+      [18.1, -8],
+      [18.5, -7.8],
+      [19, -8],
+      [19.2, -7.7],
+      [19.4, -7.2],
+      [20, -7.1],
+      [20.1, -6.9],
+      [20.6, -6.9],
+      [20.5, -7.3],
+      [21.7, -7.3],
+      [21.8, -7.9],
+      [22, -8.3],
+      [21.8, -8.9],
+      [21.9, -9.5],
+      [22.2, -9.9],
+      [22.2, -11.1],
+      [22.4, -11],
+      [22.8, -11],
+      [23.5, -10.9],
+      [23.9, -10.9]
+    ],
+    [
+      [12.2, -5.8],
+      [11.9, -5]
+    ],
+    [
+      [11.9, -5],
+      [12.3, -4.6],
+      [12.6, -4.4],
+      [13, -4.8]
+    ],
+    [
+      [13, -4.8],
+      [12.6, -5],
+      [12.5, -5.2],
+      [12.4, -5.7],
+      [12.2, -5.8]
+    ],
+    [
+      [21, 40.8],
+      [21, 40.6],
+      [20.7, 40.4],
+      [20.6, 40.1],
+      [20.2, 39.6]
+    ],
+    [
+      [20.2, 39.6],
+      [20, 39.7],
+      [20, 39.9],
+      [19.4, 40.3],
+      [19.3, 40.7],
+      [19.4, 41.4],
+      [19.5, 41.7],
+      [19.4, 41.9],
+      [19.3, 42.2],
+      [19.7, 42.7]
+    ],
+    [
+      [19.7, 42.7],
+      [19.8, 42.5],
+      [20.1, 42.6]
+    ],
+    [
+      [20.1, 42.6],
+      [20.3, 42.3],
+      [20.5, 42.2]
+    ],
+    [
+      [20.5, 42.2],
+      [20.6, 41.9],
+      [20.5, 41.5],
+      [20.6, 41.1],
+      [21, 40.8]
+    ],
+    [
+      [51.6, 24.3],
+      [51.8, 24.3],
+      [51.8, 24],
+      [52.6, 24.2],
+      [53.4, 24.2],
+      [54, 24.1],
+      [54.7, 24.8],
+      [55.4, 25.4],
+      [56.1, 26.1]
+    ],
+    [
+      [56.1, 26.1],
+      [56.3, 25.7]
+    ],
+    [
+      [56.3, 25.7],
+      [56.4, 24.9]
+    ],
+    [
+      [56.4, 24.9],
+      [55.9, 24.9],
+      [55.8, 24.3],
+      [56, 24.1],
+      [55.5, 23.9],
+      [55.5, 23.5],
+      [55.2, 23.1],
+      [55.2, 22.7]
+    ],
+    [
+      [55.2, 22.7],
+      [55, 22.5],
+      [52, 23],
+      [51.6, 24],
+      [51.6, 24.3]
+    ],
+    [
+      [-67, -54.9],
+      [-67.6, -54.9],
+      [-68.6, -54.9],
+      [-68.6, -52.6]
+    ],
+    [
+      [-68.6, -52.6],
+      [-68.2, -53.1],
+      [-67.7, -53.8],
+      [-66.4, -54.4],
+      [-65, -54.7],
+      [-65.5, -55.2],
+      [-66.4, -55.2],
+      [-67, -54.9]
+    ],
+    [
+      [-62.7, -22.2],
+      [-60.8, -23.9],
+      [-60, -24],
+      [-58.8, -24.8],
+      [-57.8, -25.2],
+      [-57.6, -25.6],
+      [-58.6, -27.1],
+      [-57.6, -27.4],
+      [-56.5, -27.5],
+      [-55.7, -27.4],
+      [-54.8, -26.6],
+      [-54.6, -25.7]
+    ],
+    [
+      [-54.6, -25.7],
+      [-54.1, -25.5],
+      [-53.6, -26.1],
+      [-53.6, -26.9],
+      [-54.5, -27.5],
+      [-55.2, -27.9],
+      [-56.3, -28.8],
+      [-57.6, -30.2]
+    ],
+    [
+      [-57.6, -30.2],
+      [-57.9, -31],
+      [-58.1, -32],
+      [-58.1, -33],
+      [-58.3, -33.3],
+      [-58.4, -33.9]
+    ],
+    [
+      [-58.4, -33.9],
+      [-58.5, -34.4],
+      [-57.2, -35.3],
+      [-57.4, -36],
+      [-56.7, -36.4],
+      [-56.8, -36.9],
+      [-57.7, -38.2],
+      [-59.2, -38.7],
+      [-61.2, -38.9],
+      [-62.3, -38.8],
+      [-62.1, -39.4],
+      [-62.3, -40.2],
+      [-62.1, -40.7],
+      [-62.7, -41],
+      [-63.8, -41.2],
+      [-64.7, -40.8],
+      [-65.1, -41.1],
+      [-65, -42.1],
+      [-64.3, -42.4],
+      [-63.8, -42],
+      [-63.5, -42.6],
+      [-64.4, -42.9],
+      [-65.2, -43.5],
+      [-65.3, -44.5],
+      [-65.6, -45],
+      [-66.5, -45],
+      [-67.3, -45.5],
+      [-67.6, -46.3],
+      [-66.6, -47],
+      [-65.6, -47.2],
+      [-66, -48.1],
+      [-67.2, -48.7],
+      [-67.8, -49.9],
+      [-68.7, -50.3],
+      [-69.1, -50.7],
+      [-68.8, -51.8],
+      [-68.1, -52.3],
+      [-68.6, -52.3]
+    ],
+    [
+      [-68.6, -52.3],
+      [-69.5, -52.1],
+      [-71.9, -52],
+      [-72.3, -51.4],
+      [-72.3, -50.7],
+      [-73, -50.7],
+      [-73.3, -50.4],
+      [-73.4, -49.3],
+      [-72.6, -48.9],
+      [-72.3, -48.2],
+      [-72.4, -47.7],
+      [-71.9, -46.9],
+      [-71.5, -45.6],
+      [-71.7, -45],
+      [-71.2, -44.8],
+      [-71.3, -44.4],
+      [-71.8, -44.2],
+      [-71.5, -43.8],
+      [-71.9, -43.4],
+      [-72.1, -42.2],
+      [-71.7, -42],
+      [-71.9, -40.8],
+      [-71.7, -39.8],
+      [-71.4, -38.9],
+      [-70.8, -38.5],
+      [-71.1, -37.6],
+      [-71.1, -36.7],
+      [-70.4, -36],
+      [-70.4, -35.2],
+      [-69.8, -34.2],
+      [-69.8, -33.3],
+      [-70.1, -33.1],
+      [-70.5, -31.4],
+      [-69.9, -30.3],
+      [-70, -29.4],
+      [-69.7, -28.5],
+      [-69, -27.5],
+      [-68.3, -26.9],
+      [-68.6, -26.5],
+      [-68.4, -26.2],
+      [-68.4, -24.5],
+      [-67.3, -24],
+      [-67, -23],
+      [-67.1, -22.7]
+    ],
+    [
+      [-67.1, -22.7],
+      [-66.3, -21.8],
+      [-65, -22.1],
+      [-64.4, -22.8],
+      [-64, -22],
+      [-62.8, -22],
+      [-62.7, -22.2]
+    ],
+    [
+      [43.6, 41.1],
+      [45, 41.3]
+    ],
+    [
+      [45, 41.3],
+      [45.2, 41],
+      [45.6, 40.8],
+      [45.4, 40.6],
+      [45.9, 40.2],
+      [45.6, 39.9],
+      [46, 39.6],
+      [46.5, 39.5],
+      [46.5, 38.8]
+    ],
+    [
+      [46.5, 38.8],
+      [46.1, 38.7]
+    ],
+    [
+      [46.1, 38.7],
+      [45.7, 39.3],
+      [45.7, 39.5],
+      [45.3, 39.5],
+      [45, 39.7],
+      [44.8, 39.7]
+    ],
+    [
+      [44.8, 39.7],
+      [44.4, 40],
+      [43.7, 40.3],
+      [43.8, 40.7],
+      [43.6, 41.1]
+    ],
+    [
+      [68.9, -48.6],
+      [69.6, -48.9],
+      [70.5, -49.1],
+      [70.6, -49.2],
+      [70.3, -49.7],
+      [68.8, -49.8],
+      [68.7, -49.2],
+      [68.9, -48.8],
+      [68.9, -48.6]
+    ],
+    [
+      [145.4, -40.8],
+      [146.4, -41.1],
+      [146.9, -41],
+      [147.7, -40.8],
+      [148.3, -40.9],
+      [148.4, -42.1],
+      [148, -42.4],
+      [147.9, -43.2],
+      [147.6, -42.9],
+      [146.9, -43.6],
+      [146.7, -43.6],
+      [146.1, -43.5],
+      [145.4, -42.7],
+      [145.3, -42],
+      [144.7, -41.2],
+      [144.7, -40.7],
+      [145.4, -40.8]
+    ],
+    [
+      [143.6, -13.8],
+      [143.9, -14.5],
+      [144.6, -14.2],
+      [144.9, -14.6],
+      [145.4, -15],
+      [145.3, -15.4],
+      [145.5, -16.3],
+      [145.6, -16.8],
+      [145.9, -16.9],
+      [146.2, -17.8],
+      [146.1, -18.3],
+      [146.4, -19],
+      [147.5, -19.5],
+      [148.2, -20],
+      [148.9, -20.4],
+      [148.7, -20.6],
+      [149.3, -21.3],
+      [149.7, -22.3],
+      [150.1, -22.1],
+      [150.5, -22.6],
+      [150.7, -22.4],
+      [150.9, -23.5],
+      [151.6, -24.1],
+      [152.1, -24.5],
+      [152.9, -25.3],
+      [153.1, -26.1],
+      [153.2, -26.6],
+      [153.1, -27.3],
+      [153.6, -28.1],
+      [153.5, -29],
+      [153.3, -29.5],
+      [153.1, -30.3],
+      [153.1, -30.9],
+      [152.9, -31.6],
+      [152.5, -32.5],
+      [151.7, -33],
+      [151.3, -33.8],
+      [151, -34.3],
+      [150.7, -35.2],
+      [150.3, -35.7],
+      [150.1, -36.4],
+      [150, -37.1],
+      [150, -37.4],
+      [149.4, -37.8],
+      [148.3, -37.8],
+      [147.4, -38.2],
+      [146.9, -38.6],
+      [146.3, -39],
+      [145.5, -38.6],
+      [144.9, -38.4],
+      [145, -37.9],
+      [144.5, -38.1],
+      [143.6, -38.8],
+      [142.8, -38.5],
+      [142.2, -38.4],
+      [141.6, -38.3],
+      [140.6, -38],
+      [140, -37.4],
+      [139.8, -36.6],
+      [139.6, -36.1],
+      [139.1, -35.7],
+      [138.1, -35.6],
+      [138.5, -35.1],
+      [138.2, -34.4],
+      [137.7, -35.1],
+      [136.8, -35.3],
+      [137.4, -34.7],
+      [137.5, -34.1],
+      [137.9, -33.6],
+      [137.8, -32.9],
+      [137, -33.7],
+      [136.4, -34.1],
+      [136, -34.9],
+      [135.2, -34.5],
+      [135.2, -33.9],
+      [134.6, -33.2],
+      [134.1, -32.8],
+      [134.3, -32.6],
+      [133, -32],
+      [132.3, -32],
+      [131.3, -31.5],
+      [129.5, -31.6],
+      [128.2, -31.9],
+      [127.1, -32.3],
+      [126.2, -32.2],
+      [125.1, -32.7],
+      [124.2, -33],
+      [124, -33.5],
+      [123.7, -33.9],
+      [122.8, -33.9],
+      [122.2, -34],
+      [121.3, -33.8],
+      [120.6, -33.9],
+      [119.9, -34],
+      [119.3, -34.5],
+      [119, -34.5],
+      [118.5, -34.7],
+      [118, -35.1],
+      [117.3, -35],
+      [116.6, -35],
+      [115.6, -34.4],
+      [115, -34.2],
+      [115.1, -33.6],
+      [115.6, -33.5],
+      [115.7, -33.3],
+      [115.7, -32.9],
+      [115.8, -32.2],
+      [115.7, -31.6],
+      [115.2, -30.6],
+      [115, -30],
+      [115, -29.5],
+      [114.6, -28.8],
+      [114.6, -28.5],
+      [114.2, -28.1],
+      [114.1, -27.3],
+      [113.5, -26.5],
+      [113.3, -26.1],
+      [113.8, -26.5],
+      [113.4, -25.6],
+      [113.9, -25.9],
+      [114.2, -26.3],
+      [114.2, -25.8],
+      [113.7, -25],
+      [113.6, -24.7],
+      [113.4, -24.4],
+      [113.5, -23.8],
+      [113.7, -23.6],
+      [113.8, -23.1],
+      [113.7, -22.5],
+      [114.2, -21.8],
+      [114.2, -22.5],
+      [114.7, -21.8],
+      [115.5, -21.5],
+      [116, -21.1],
+      [116.7, -20.7],
+      [117.2, -20.6],
+      [117.4, -20.7],
+      [118.2, -20.4],
+      [118.8, -20.3],
+      [119, -20],
+      [119.3, -19.9],
+      [119.8, -20],
+      [120.9, -19.7],
+      [121.4, -19.2],
+      [121.7, -18.7],
+      [122.2, -18.2],
+      [122.3, -17.8],
+      [122.3, -17.2],
+      [123, -16.4],
+      [123.4, -17.3],
+      [123.9, -17.1],
+      [123.5, -16.6],
+      [123.8, -16.1],
+      [124.3, -16.3],
+      [124.4, -15.6],
+      [124.9, -15.1],
+      [125.2, -14.7],
+      [125.7, -14.5],
+      [125.7, -14.2],
+      [126.1, -14.3],
+      [126.1, -14.1],
+      [126.6, -13.9],
+      [127.1, -13.8],
+      [127.8, -14.3],
+      [128.4, -14.9],
+      [129, -14.9],
+      [129.6, -15],
+      [129.4, -14.4],
+      [129.9, -13.6],
+      [130.3, -13.4],
+      [130.2, -13.1],
+      [130.6, -12.5],
+      [131.2, -12.2],
+      [131.7, -12.3],
+      [132.6, -12.1],
+      [132.6, -11.6],
+      [131.8, -11.3],
+      [132.4, -11.1],
+      [133, -11.4],
+      [133.6, -11.8],
+      [134.4, -12],
+      [134.7, -11.9],
+      [135.3, -12.2],
+      [135.9, -12],
+      [136.3, -12],
+      [136.5, -11.9],
+      [137, -12.3],
+      [136.7, -12.9],
+      [136.3, -13.3],
+      [136, -13.3],
+      [136.1, -13.7],
+      [135.8, -14.2],
+      [135.4, -14.7],
+      [135.5, -15],
+      [136.3, -15.5],
+      [137.1, -15.9],
+      [137.6, -16.2],
+      [138.3, -16.8],
+      [138.6, -16.8],
+      [139.1, -17.1],
+      [139.3, -17.4],
+      [140.2, -17.7],
+      [140.9, -17.4],
+      [141.1, -16.8],
+      [141.3, -16.4],
+      [141.4, -15.8],
+      [141.7, -15],
+      [141.6, -14.6],
+      [141.6, -14.3],
+      [141.5, -13.7],
+      [141.7, -12.9],
+      [141.8, -12.7],
+      [141.7, -12.4],
+      [141.9, -11.9],
+      [142.1, -11.3],
+      [142.1, -11],
+      [142.5, -10.7],
+      [142.8, -11.2],
+      [142.9, -11.8],
+      [143.1, -11.9],
+      [143.2, -12.3],
+      [143.5, -12.8],
+      [143.6, -13.4],
+      [143.6, -13.8]
+    ],
+    [
+      [17, 48.1],
+      [16.9, 47.7],
+      [16.3, 47.7],
+      [16.5, 47.5],
+      [16.2, 46.9]
+    ],
+    [
+      [16.2, 46.9],
+      [16, 46.7],
+      [15.1, 46.7],
+      [14.6, 46.4],
+      [13.8, 46.5]
+    ],
+    [
+      [13.8, 46.5],
+      [12.4, 46.8],
+      [12.2, 47.1],
+      [11.2, 46.9],
+      [11.1, 46.8],
+      [10.4, 46.9]
+    ],
+    [
+      [10.4, 46.9],
+      [9.9, 46.9],
+      [9.9, 47]
+    ],
+    [
+      [9.9, 47],
+      [9.6, 47.1]
+    ],
+    [
+      [9.6, 47.1],
+      [9.6, 47.2],
+      [9.6, 47.2]
+    ],
+    [
+      [9.6, 47.2],
+      [9.5, 47.3],
+      [9.6, 47.4]
+    ],
+    [
+      [9.6, 47.4],
+      [9.6, 47.5]
+    ],
+    [
+      [9.6, 47.5],
+      [9.9, 47.6],
+      [10.4, 47.3],
+      [10.5, 47.6],
+      [11.4, 47.5],
+      [12.1, 47.7],
+      [12.6, 47.7],
+      [12.9, 47.5],
+      [13, 47.6],
+      [12.9, 48.3],
+      [13.2, 48.4],
+      [13.6, 48.9]
+    ],
+    [
+      [13.6, 48.9],
+      [14.3, 48.6],
+      [14.9, 49],
+      [15.3, 49],
+      [16, 48.7],
+      [16.5, 48.8],
+      [17, 48.6]
+    ],
+    [
+      [17, 48.6],
+      [16.9, 48.5],
+      [17, 48.1]
+    ],
+    [
+      [46.1, 38.7],
+      [45.5, 38.9],
+      [45, 39.3],
+      [44.8, 39.7]
+    ],
+    [
+      [48, 41.4],
+      [48.6, 41.8],
+      [49.1, 41.3],
+      [49.6, 40.6],
+      [50.1, 40.5],
+      [50.4, 40.3],
+      [49.6, 40.2],
+      [49.4, 39.4],
+      [49.2, 39.1],
+      [48.9, 38.8],
+      [48.9, 38.3]
+    ],
+    [
+      [48.9, 38.3],
+      [48.6, 38.3],
+      [48, 38.8],
+      [48.4, 39.3],
+      [48.1, 39.6],
+      [47.7, 39.5],
+      [46.5, 38.8]
+    ],
+    [
+      [45, 41.3],
+      [45.2, 41.4],
+      [46, 41.1],
+      [46.5, 41.1],
+      [46.6, 41.2],
+      [46.2, 41.7],
+      [46.4, 41.9]
+    ],
+    [
+      [46.4, 41.9],
+      [46.7, 41.8],
+      [47.4, 41.2],
+      [47.8, 41.2],
+      [48, 41.4]
+    ],
+    [
+      [29.3, -4.5],
+      [29.3, -3.3],
+      [29, -2.8]
+    ],
+    [
+      [29, -2.8],
+      [29.6, -2.9],
+      [29.9, -2.3],
+      [30.5, -2.4]
+    ],
+    [
+      [30.5, -2.4],
+      [30.5, -2.8],
+      [30.7, -3],
+      [30.8, -3.4],
+      [30.5, -3.6],
+      [30.1, -4.1],
+      [29.8, -4.4]
+    ],
+    [
+      [29.8, -4.4],
+      [29.3, -4.5]
+    ],
+    [
+      [4.1, 51.3],
+      [5, 51.5],
+      [5.6, 51],
+      [6.2, 50.8]
+    ],
+    [
+      [6.2, 50.8],
+      [6, 50.1]
+    ],
+    [
+      [6, 50.1],
+      [5.8, 50.1],
+      [5.7, 49.5]
+    ],
+    [
+      [5.7, 49.5],
+      [4.8, 50],
+      [4.3, 49.9],
+      [3.6, 50.4],
+      [3.1, 50.8],
+      [2.7, 50.8],
+      [2.5, 51.2]
+    ],
+    [
+      [2.5, 51.2],
+      [3.3, 51.4],
+      [4.1, 51.3]
+    ],
+    [
+      [2.7, 6.3],
+      [1.9, 6.1]
+    ],
+    [
+      [1.9, 6.1],
+      [1.6, 6.8],
+      [1.7, 9.1],
+      [1.5, 9.3],
+      [1.4, 9.8],
+      [1.1, 10.2],
+      [0.8, 10.5],
+      [0.9, 11]
+    ],
+    [
+      [0.9, 11],
+      [1.2, 11.1],
+      [1.5, 11.6],
+      [1.9, 11.6],
+      [2.2, 11.9]
+    ],
+    [
+      [2.2, 11.9],
+      [2.5, 12.2],
+      [2.9, 12.2],
+      [3.6, 11.7]
+    ],
+    [
+      [3.6, 11.7],
+      [3.6, 11.3],
+      [3.8, 10.7],
+      [3.6, 10.3],
+      [3.7, 10.1],
+      [3.2, 9.4],
+      [2.9, 9.1],
+      [2.7, 8.5],
+      [2.8, 7.9],
+      [2.7, 6.3]
+    ],
+    [
+      [-2.8, 9.6],
+      [-3.5, 9.9],
+      [-4, 9.9],
+      [-4.3, 9.6],
+      [-4.8, 9.8],
+      [-4.9, 10.2],
+      [-5.4, 10.4]
+    ],
+    [
+      [-5.4, 10.4],
+      [-5.5, 11],
+      [-5.2, 11.4],
+      [-5.2, 11.7],
+      [-4.4, 12.5],
+      [-4.3, 13.2],
+      [-4, 13.5],
+      [-3.5, 13.3],
+      [-3.1, 13.5],
+      [-3, 13.8],
+      [-2.2, 14.3],
+      [-2, 14.6],
+      [-1.1, 15],
+      [-0.5, 15.1],
+      [-0.3, 14.9],
+      [0.4, 14.9]
+    ],
+    [
+      [0.4, 14.9],
+      [0.3, 14.4],
+      [0.4, 14],
+      [1, 13.3],
+      [1, 12.9],
+      [2.2, 12.6],
+      [2.2, 11.9]
+    ],
+    [
+      [0.9, 11],
+      [0, 11]
+    ],
+    [
+      [0, 11],
+      [-0.4, 11.1],
+      [-0.8, 10.9],
+      [-1.2, 11],
+      [-2.9, 11],
+      [-3, 10.4],
+      [-2.8, 9.6]
+    ],
+    [
+      [92.7, 22],
+      [92.7, 21.3],
+      [92.3, 21.5],
+      [92.4, 20.7]
+    ],
+    [
+      [92.4, 20.7],
+      [92.1, 21.2],
+      [92, 21.7],
+      [91.8, 22.2],
+      [91.4, 22.8],
+      [90.5, 22.8],
+      [90.6, 22.4],
+      [90.3, 21.8],
+      [89.9, 22],
+      [89.7, 21.9],
+      [89.4, 22],
+      [89, 22.1]
+    ],
+    [
+      [89, 22.1],
+      [88.9, 22.9],
+      [88.5, 23.6],
+      [88.7, 24.2],
+      [88.1, 24.5],
+      [88.3, 24.9],
+      [88.9, 25.2],
+      [88.2, 25.8],
+      [88.6, 26.5],
+      [89.4, 26],
+      [89.8, 26],
+      [89.9, 25.3],
+      [90.9, 25.1],
+      [91.8, 25.2],
+      [92.4, 25],
+      [91.9, 24.1],
+      [91.5, 24.1],
+      [91.2, 23.5],
+      [91.7, 23],
+      [91.9, 23.6],
+      [92.2, 23.6],
+      [92.7, 22]
+    ],
+    [
+      [22.7, 44.2],
+      [22.9, 43.8],
+      [23.3, 43.9],
+      [24.1, 43.7],
+      [25.6, 43.7],
+      [26.1, 43.9],
+      [27.2, 44.2],
+      [28, 43.8],
+      [28.6, 43.7]
+    ],
+    [
+      [28.6, 43.7],
+      [28, 43.3],
+      [27.7, 42.6],
+      [28, 42]
+    ],
+    [
+      [28, 42],
+      [27.1, 42.1],
+      [26.1, 41.8]
+    ],
+    [
+      [26.1, 41.8],
+      [26.1, 41.3],
+      [25.2, 41.2],
+      [24.5, 41.6],
+      [23.7, 41.3],
+      [23, 41.3]
+    ],
+    [
+      [23, 41.3],
+      [22.9, 42],
+      [22.4, 42.3]
+    ],
+    [
+      [22.4, 42.3],
+      [22.6, 42.5],
+      [22.4, 42.6],
+      [22.6, 42.9],
+      [23, 43.2],
+      [22.5, 43.6],
+      [22.4, 44],
+      [22.7, 44.2]
+    ],
+    [
+      [-77.5, 23.8],
+      [-77.8, 23.7],
+      [-78, 24.3],
+      [-78.4, 24.6],
+      [-78.2, 25.2],
+      [-77.9, 25.2],
+      [-77.5, 24.3],
+      [-77.5, 23.8]
+    ],
+    [
+      [-77.8, 26.6],
+      [-78.9, 26.4],
+      [-79, 26.8],
+      [-78.5, 26.9],
+      [-77.8, 26.8],
+      [-77.8, 26.6]
+    ],
+    [
+      [-77, 26.6],
+      [-77.2, 25.9],
+      [-77.4, 26],
+      [-77.3, 26.5],
+      [-77.8, 26.9],
+      [-77.8, 27],
+      [-77, 26.6]
+    ],
+    [
+      [19, 44.9],
+      [19.4, 44.9]
+    ],
+    [
+      [19.4, 44.9],
+      [19.1, 44.4],
+      [19.6, 44],
+      [19.5, 43.6],
+      [19.2, 43.5]
+    ],
+    [
+      [19.2, 43.5],
+      [19, 43.4],
+      [18.7, 43.2],
+      [18.6, 42.7]
+    ],
+    [
+      [18.6, 42.7],
+      [17.7, 43],
+      [17.3, 43.5],
+      [16.9, 43.7],
+      [16.5, 44],
+      [16.2, 44.4],
+      [15.8, 44.8],
+      [16, 45.2],
+      [16.3, 45],
+      [16.5, 45.2],
+      [17, 45.2],
+      [17.9, 45.1],
+      [18.6, 45.1],
+      [19, 44.9]
+    ],
+    [
+      [23.5, 53.9],
+      [24.5, 53.9],
+      [25.5, 54.3],
+      [25.8, 54.9],
+      [26.6, 55.2],
+      [26.5, 55.6]
+    ],
+    [
+      [26.5, 55.6],
+      [27.1, 55.8],
+      [28.2, 56.2]
+    ],
+    [
+      [28.2, 56.2],
+      [29.2, 55.9],
+      [29.4, 55.7],
+      [29.9, 55.8],
+      [30.9, 55.6],
+      [31, 55.1],
+      [30.8, 54.8],
+      [31.4, 54.2],
+      [31.8, 54],
+      [31.7, 53.8],
+      [32.4, 53.6],
+      [32.7, 53.4],
+      [32.3, 53.1]
+    ],
+    [
+      [32.3, 53.1],
+      [31.5, 53.2],
+      [31.3, 53.1]
+    ],
+    [
+      [31.3, 53.1],
+      [31.5, 52.7]
+    ],
+    [
+      [31.5, 52.7],
+      [31.8, 52.1]
+    ],
+    [
+      [31.8, 52.1],
+      [30.9, 52],
+      [30.6, 51.8],
+      [30.6, 51.3],
+      [30.2, 51.4],
+      [29.3, 51.4],
+      [29, 51.6],
+      [28.6, 51.4],
+      [28.2, 51.6],
+      [27.5, 51.6],
+      [26.3, 51.8],
+      [25.3, 51.9],
+      [24.6, 51.9],
+      [24, 51.6],
+      [23.5, 51.6]
+    ],
+    [
+      [23.5, 51.6],
+      [23.5, 52],
+      [23.2, 52.5],
+      [23.8, 52.7],
+      [23.8, 53.1],
+      [23.5, 53.5],
+      [23.5, 53.9]
+    ],
+    [
+      [-89.1, 17.8],
+      [-89.1, 18],
+      [-89, 18],
+      [-88.8, 17.9],
+      [-88.5, 18.5],
+      [-88.3, 18.5]
+    ],
+    [
+      [-88.3, 18.5],
+      [-88.3, 18.4],
+      [-88.1, 18.4],
+      [-88.1, 18.1],
+      [-88.3, 17.6],
+      [-88.2, 17.5],
+      [-88.3, 17.1],
+      [-88.2, 17],
+      [-88.4, 16.5],
+      [-88.5, 16.3],
+      [-88.7, 16.2],
+      [-88.9, 15.9]
+    ],
+    [
+      [-88.9, 15.9],
+      [-89.2, 15.9],
+      [-89.1, 17],
+      [-89.1, 17.8]
+    ],
+    [
+      [-67.1, -22.7],
+      [-67.8, -22.9],
+      [-68.2, -21.5],
+      [-68.8, -20.4],
+      [-68.4, -19.4],
+      [-69, -19],
+      [-69.1, -18.3],
+      [-69.6, -17.6]
+    ],
+    [
+      [-69.6, -17.6],
+      [-69, -16.5],
+      [-69.4, -15.7],
+      [-69.2, -15.3],
+      [-69.3, -14.9],
+      [-68.9, -14.4],
+      [-68.9, -13.6],
+      [-68.9, -12.9],
+      [-68.7, -12.6],
+      [-69.5, -10.9]
+    ],
+    [
+      [-69.5, -10.9],
+      [-68.8, -11],
+      [-68.3, -11],
+      [-68, -10.7],
+      [-67.2, -10.3],
+      [-66.6, -9.9],
+      [-65.3, -9.8],
+      [-65.4, -10.5],
+      [-65.3, -10.9],
+      [-65.4, -11.6],
+      [-64.3, -12.5],
+      [-63.2, -12.6],
+      [-62.8, -13],
+      [-62.1, -13.2],
+      [-61.7, -13.5],
+      [-61.1, -13.5],
+      [-60.5, -13.8],
+      [-60.5, -14.3],
+      [-60.3, -14.6],
+      [-60.2, -15.1],
+      [-60.5, -15.1],
+      [-60.2, -16.3],
+      [-58.2, -16.3],
+      [-58.4, -16.9],
+      [-58.3, -17.3],
+      [-57.7, -17.5],
+      [-57.5, -18.2],
+      [-57.7, -19],
+      [-57.9, -19.4],
+      [-57.8, -20],
+      [-58.2, -20.2]
+    ],
+    [
+      [-58.2, -20.2],
+      [-58.2, -19.9],
+      [-59.1, -19.4],
+      [-60, -19.3],
+      [-61.8, -19.6],
+      [-62.3, -20.5],
+      [-62.3, -21],
+      [-62.7, -22.2]
+    ],
+    [
+      [-54.6, -25.7],
+      [-54.4, -25.2],
+      [-54.3, -24.6],
+      [-54.3, -24],
+      [-54.6, -23.8],
+      [-55, -24],
+      [-55.4, -24],
+      [-55.5, -23.6],
+      [-55.6, -22.7],
+      [-55.8, -22.4],
+      [-56.5, -22.1],
+      [-56.9, -22.3],
+      [-57.9, -22.1],
+      [-57.9, -20.7],
+      [-58.2, -20.2]
+    ],
+    [
+      [-69.5, -10.9],
+      [-70.1, -11.1],
+      [-70.5, -11],
+      [-70.5, -9.5],
+      [-71.3, -10.1],
+      [-72.2, -10],
+      [-72.6, -9.5],
+      [-73.2, -9.5],
+      [-73, -9],
+      [-73.6, -8.4],
+      [-74, -7.5],
+      [-73.7, -7.3],
+      [-73.7, -6.9],
+      [-73.1, -6.6],
+      [-73.2, -6.1],
+      [-73, -5.7],
+      [-72.9, -5.3],
+      [-71.7, -4.6],
+      [-70.9, -4.4],
+      [-70.8, -4.2],
+      [-69.9, -4.3]
+    ],
+    [
+      [-69.9, -4.3],
+      [-69.4, -1.6],
+      [-69.4, -1.1],
+      [-69.6, -0.5],
+      [-70, -0.2],
+      [-70, 0.5],
+      [-69.4, 0.7],
+      [-69.2, 0.6],
+      [-69.2, 1],
+      [-69.8, 1.1],
+      [-69.8, 1.7],
+      [-67.9, 1.7],
+      [-67.5, 2],
+      [-67.3, 1.7],
+      [-67.1, 1.1],
+      [-66.9, 1.3]
+    ],
+    [
+      [-66.9, 1.3],
+      [-66.3, 0.7],
+      [-65.5, 0.8],
+      [-65.3, 1.1],
+      [-64.6, 1.3],
+      [-64.2, 1.5],
+      [-64.1, 1.9],
+      [-63.4, 2.2],
+      [-63.4, 2.4],
+      [-64.3, 2.5],
+      [-64.4, 3.1],
+      [-64.4, 3.8],
+      [-64.8, 4.1],
+      [-64.6, 4.2],
+      [-63.9, 4],
+      [-63.1, 3.8],
+      [-62.8, 4],
+      [-62.1, 4.2],
+      [-61, 4.5],
+      [-60.6, 4.9],
+      [-60.7, 5.2]
+    ],
+    [
+      [-60.7, 5.2],
+      [-60.2, 5.2],
+      [-60, 5],
+      [-60.1, 4.6],
+      [-59.8, 4.4],
+      [-59.5, 4],
+      [-59.8, 3.6],
+      [-60, 2.8],
+      [-59.7, 2.3],
+      [-59.6, 1.8],
+      [-59, 1.3],
+      [-58.5, 1.3],
+      [-58.4, 1.5],
+      [-58.1, 1.5],
+      [-57.7, 1.7],
+      [-57.3, 2],
+      [-56.8, 1.9],
+      [-56.5, 1.9]
+    ],
+    [
+      [-56.5, 1.9],
+      [-56, 1.8],
+      [-55.9, 2],
+      [-56.1, 2.2],
+      [-56, 2.5],
+      [-55.6, 2.4],
+      [-55.1, 2.5],
+      [-54.5, 2.3]
+    ],
+    [
+      [-54.5, 2.3],
+      [-54.1, 2.1],
+      [-53.8, 2.4],
+      [-53.5, 2.3],
+      [-53.4, 2.1],
+      [-52.9, 2.1],
+      [-52.6, 2.5],
+      [-52.2, 3.2],
+      [-51.7, 4.2]
+    ],
+    [
+      [-51.7, 4.2],
+      [-51.3, 4.2],
+      [-51.1, 3.7],
+      [-50.5, 1.9],
+      [-50, 1.7],
+      [-49.9, 1.1],
+      [-50.7, 0.2],
+      [-50.4, -0.1],
+      [-48.6, -0.2],
+      [-48.6, -1.2],
+      [-47.8, -0.6],
+      [-46.6, -0.9],
+      [-44.9, -1.5],
+      [-44.4, -2.1],
+      [-44.6, -2.7],
+      [-43.4, -2.4],
+      [-41.5, -2.9],
+      [-40, -2.9],
+      [-38.5, -3.7],
+      [-37.2, -4.8],
+      [-36.4, -5.1],
+      [-35.6, -5.1],
+      [-35.2, -5.5],
+      [-34.9, -6.7],
+      [-34.7, -7.3],
+      [-35.1, -9],
+      [-35.6, -9.6],
+      [-37, -11],
+      [-37.7, -12.2],
+      [-38.4, -13],
+      [-38.7, -13.1],
+      [-38.9, -13.8],
+      [-38.9, -15.7],
+      [-39.2, -17.2],
+      [-39.3, -17.9],
+      [-39.6, -18.3],
+      [-39.8, -19.6],
+      [-40.8, -20.9],
+      [-40.9, -21.9],
+      [-41.7, -22.4],
+      [-42, -23],
+      [-43.1, -23],
+      [-44.6, -23.3],
+      [-45.3, -23.8],
+      [-46.5, -24.1],
+      [-47.6, -24.9],
+      [-48.5, -25.9],
+      [-48.6, -26.6],
+      [-48.5, -27.2],
+      [-48.7, -28.2],
+      [-48.9, -28.7],
+      [-49.6, -29.2],
+      [-50.7, -31],
+      [-51.6, -31.8],
+      [-52.3, -32.2],
+      [-52.7, -33.2],
+      [-53.4, -33.8]
+    ],
+    [
+      [-53.4, -33.8],
+      [-53.6, -33.2],
+      [-53.2, -32.7],
+      [-53.8, -32],
+      [-54.6, -31.5],
+      [-55.6, -30.8],
+      [-56, -30.9],
+      [-57, -30.1],
+      [-57.6, -30.2]
+    ],
+    [
+      [114.2, 4.5],
+      [114.6, 4.9],
+      [115.5, 5.5]
+    ],
+    [
+      [115.5, 5.5],
+      [115.4, 5],
+      [115.4, 4.3],
+      [114.9, 4.4],
+      [114.7, 4],
+      [114.2, 4.5]
+    ],
+    [
+      [91.7, 27.8],
+      [92.1, 27.5],
+      [92, 26.8],
+      [91.2, 26.8],
+      [90.4, 26.9],
+      [89.7, 26.7],
+      [88.8, 27.1],
+      [88.8, 27.3]
+    ],
+    [
+      [88.8, 27.3],
+      [89.5, 28],
+      [90, 28.3],
+      [90.7, 28.1],
+      [91.3, 28],
+      [91.7, 27.8]
+    ],
+    [
+      [29.4, -22.1],
+      [28, -22.8],
+      [27.1, -23.6],
+      [26.8, -24.2],
+      [26.5, -24.6],
+      [25.9, -24.7],
+      [25.8, -25.2],
+      [25.7, -25.5],
+      [25, -25.7],
+      [24.2, -25.7],
+      [23.7, -25.4],
+      [23.3, -25.3],
+      [22.8, -25.5],
+      [22.6, -26],
+      [22.1, -26.3],
+      [21.6, -26.7],
+      [20.9, -26.8],
+      [20.7, -26.5],
+      [20.8, -25.9],
+      [20.2, -24.9],
+      [19.9, -24.8]
+    ],
+    [
+      [19.9, -24.8],
+      [19.9, -21.8],
+      [20.9, -21.8],
+      [20.9, -18.2],
+      [21.7, -18.2],
+      [23.2, -17.9],
+      [23.6, -18.3],
+      [24.2, -17.9],
+      [24.5, -17.9],
+      [25.1, -17.7]
+    ],
+    [
+      [25.1, -17.7],
+      [25.3, -17.7]
+    ],
+    [
+      [25.3, -17.7],
+      [25.7, -18.5],
+      [25.9, -18.7],
+      [26.2, -19.3],
+      [27.3, -20.4],
+      [27.7, -20.5],
+      [27.7, -20.8],
+      [28, -21.5],
+      [28.8, -21.6],
+      [29.4, -22.1]
+    ],
+    [
+      [15.3, 7.4],
+      [16.1, 7.5],
+      [16.3, 7.8],
+      [16.5, 7.7],
+      [16.7, 7.5],
+      [18, 7.9],
+      [18.4, 8.3],
+      [18.9, 8.6],
+      [18.8, 9],
+      [19.1, 9.1],
+      [20.1, 9],
+      [21, 9.5],
+      [21.7, 10.6],
+      [22.2, 11],
+      [22.9, 11.1]
+    ],
+    [
+      [22.9, 11.1],
+      [23, 10.7],
+      [23.6, 10.1],
+      [23.6, 9.7],
+      [23.4, 9.3],
+      [23.5, 9],
+      [23.8, 8.7]
+    ],
+    [
+      [23.8, 8.7],
+      [24.6, 8.2]
+    ],
+    [
+      [24.6, 8.2],
+      [25.1, 7.8],
+      [25.1, 7.5],
+      [25.8, 7],
+      [26.2, 6.6],
+      [26.5, 6],
+      [27.2, 5.6],
+      [27.4, 5.2]
+    ],
+    [
+      [27.4, 5.2],
+      [27, 5.1],
+      [26.4, 5.2],
+      [25.7, 5.3],
+      [25.3, 5.2],
+      [25.1, 4.9],
+      [24.8, 4.9],
+      [24.4, 5.1],
+      [23.3, 4.6],
+      [22.8, 4.7],
+      [22.7, 4.6],
+      [22.4, 4],
+      [21.7, 4.2],
+      [20.9, 4.3],
+      [20.3, 4.7],
+      [19.5, 5],
+      [18.9, 4.7],
+      [18.5, 4.2],
+      [18.5, 3.5]
+    ],
+    [
+      [18.5, 3.5],
+      [17.8, 3.6],
+      [17.1, 3.7],
+      [16.5, 3.2],
+      [16, 2.3]
+    ],
+    [
+      [16, 2.3],
+      [15.9, 2.6],
+      [15.9, 3],
+      [15.4, 3.3],
+      [15, 3.9],
+      [15, 4.2],
+      [14.5, 4.7],
+      [14.6, 5],
+      [14.5, 5.5],
+      [14.5, 6.2],
+      [14.8, 6.4],
+      [15.3, 7.4]
+    ],
+    [
+      [-63.7, 46.6],
+      [-62.9, 46.4],
+      [-62, 46.4],
+      [-62.5, 46],
+      [-62.9, 46],
+      [-64.1, 46.4],
+      [-64.4, 46.7],
+      [-64, 47],
+      [-63.7, 46.6]
+    ],
+    [
+      [-61.8, 49.1],
+      [-62.3, 49.1],
+      [-63.6, 49.4],
+      [-64.5, 49.9],
+      [-64.2, 50],
+      [-62.9, 49.7],
+      [-61.8, 49.3],
+      [-61.8, 49.1]
+    ],
+    [
+      [-123.5, 48.5],
+      [-124, 48.4],
+      [-125.7, 48.8],
+      [-125.9, 49.2],
+      [-126.8, 49.5],
+      [-127, 49.8],
+      [-128.1, 50],
+      [-128.4, 50.5],
+      [-128.4, 50.8],
+      [-127.3, 50.6],
+      [-126.7, 50.4],
+      [-125.8, 50.3],
+      [-125.4, 50],
+      [-124.9, 49.5],
+      [-123.9, 49.1],
+      [-123.5, 48.5]
+    ],
+    [
+      [-56.1, 50.7],
+      [-56.8, 49.8],
+      [-56.1, 50.2],
+      [-55.5, 49.9],
+      [-55.8, 49.6],
+      [-54.9, 49.3],
+      [-54.5, 49.6],
+      [-53.5, 49.3],
+      [-53.8, 48.5],
+      [-53.1, 48.7],
+      [-53, 48.2],
+      [-52.6, 47.5],
+      [-53.1, 46.7],
+      [-53.5, 46.6],
+      [-54.2, 46.8],
+      [-54, 47.6],
+      [-54.2, 47.8],
+      [-55.4, 46.9],
+      [-56, 46.9],
+      [-55.3, 47.4],
+      [-56.2, 47.6],
+      [-57.3, 47.6],
+      [-59.3, 47.6],
+      [-59.4, 47.9],
+      [-58.8, 48.3],
+      [-59.2, 48.5],
+      [-58.4, 49.1],
+      [-57.4, 50.7],
+      [-56.7, 51.3],
+      [-55.9, 51.6],
+      [-55.4, 51.6],
+      [-55.6, 51.3],
+      [-56.1, 50.7]
+    ],
+    [
+      [-132.7, 54],
+      [-131.7, 54.1],
+      [-132, 53],
+      [-131.2, 52.2],
+      [-131.6, 52.2],
+      [-132.2, 52.6],
+      [-132.5, 53.1],
+      [-133, 53.4],
+      [-133.2, 53.9],
+      [-133.2, 54.2],
+      [-132.7, 54]
+    ],
+    [
+      [-79.3, 62.2],
+      [-79.7, 61.6],
+      [-80.1, 61.7],
+      [-80.4, 62],
+      [-80.3, 62.1],
+      [-79.9, 62.4],
+      [-79.5, 62.4],
+      [-79.3, 62.2]
+    ],
+    [
+      [-81.9, 62.7],
+      [-83.1, 62.2],
+      [-83.8, 62.2],
+      [-84, 62.5],
+      [-83.2, 62.9],
+      [-81.9, 62.9],
+      [-81.9, 62.7]
+    ],
+    [
+      [-85.2, 65.7],
+      [-85, 65.2],
+      [-84.5, 65.4],
+      [-83.9, 65.1],
+      [-82.8, 64.8],
+      [-81.6, 64.5],
+      [-81.5, 64],
+      [-80.8, 64.1],
+      [-80.1, 63.7],
+      [-81, 63.4],
+      [-82.5, 63.7],
+      [-83.1, 64.1],
+      [-84.1, 63.6],
+      [-85.5, 63.1],
+      [-85.9, 63.6],
+      [-87.2, 63.5],
+      [-86.3, 64],
+      [-86.2, 64.8],
+      [-85.9, 65.7],
+      [-85.2, 65.7]
+    ],
+    [
+      [-75.9, 67.2],
+      [-77, 67.1],
+      [-77.2, 67.6],
+      [-76.8, 68.2],
+      [-75.9, 68.3],
+      [-75.1, 68],
+      [-75.1, 67.6],
+      [-75.2, 67.4],
+      [-75.9, 67.2]
+    ],
+    [
+      [-95.6, 69.1],
+      [-96.3, 68.8],
+      [-97.6, 69.1],
+      [-98.4, 69],
+      [-99.8, 69.4],
+      [-98.9, 69.7],
+      [-98.2, 70.1],
+      [-97.2, 69.9],
+      [-96.6, 69.7],
+      [-96.3, 69.5],
+      [-95.6, 69.1]
+    ],
+    [
+      [-67.1, 45.1],
+      [-67.8, 45.7],
+      [-67.8, 47.1],
+      [-68.2, 47.4],
+      [-68.9, 47.2],
+      [-69.2, 47.5],
+      [-70, 46.7],
+      [-70.3, 45.9],
+      [-70.7, 45.5],
+      [-71.1, 45.3],
+      [-71.4, 45.3],
+      [-71.5, 45],
+      [-73.3, 45],
+      [-74.9, 45],
+      [-75.3, 44.8],
+      [-76.4, 44.1],
+      [-76.5, 44],
+      [-76.8, 43.6],
+      [-77.7, 43.6],
+      [-78.7, 43.6],
+      [-79.2, 43.5],
+      [-79, 43.3],
+      [-78.9, 43],
+      [-78.9, 42.9],
+      [-80.2, 42.4],
+      [-81.3, 42.2],
+      [-82.4, 41.7],
+      [-82.7, 41.7],
+      [-83, 41.8],
+      [-83.1, 42],
+      [-83.1, 42.1],
+      [-82.9, 42.4],
+      [-82.4, 43],
+      [-82.1, 43.6],
+      [-82.3, 44.4],
+      [-82.5, 45.4],
+      [-83.6, 45.8],
+      [-83.5, 46],
+      [-83.6, 46.1],
+      [-83.9, 46.1],
+      [-84.1, 46.3],
+      [-84.1, 46.5],
+      [-84.3, 46.4],
+      [-84.6, 46.4],
+      [-84.5, 46.5],
+      [-84.8, 46.6],
+      [-84.9, 46.9],
+      [-85.6, 47.2],
+      [-86.5, 47.6],
+      [-87.4, 47.9],
+      [-88.4, 48.3],
+      [-89.3, 48],
+      [-89.6, 48],
+      [-90.8, 48.3],
+      [-91.6, 48.1],
+      [-92.6, 48.5],
+      [-93.6, 48.6],
+      [-94.3, 48.7],
+      [-94.6, 48.8],
+      [-94.8, 49.4],
+      [-95.2, 49.4],
+      [-95.2, 49],
+      [-97.2, 49],
+      [-100.6, 49],
+      [-104, 49],
+      [-107, 49],
+      [-110, 49],
+      [-113, 49],
+      [-116, 49],
+      [-117, 49],
+      [-120, 49],
+      [-122.8, 49]
+    ],
+    [
+      [-122.8, 49],
+      [-123, 49],
+      [-124.9, 50],
+      [-125.6, 50.4],
+      [-127.4, 50.8],
+      [-128, 51.7],
+      [-127.8, 52.3],
+      [-129.1, 52.8],
+      [-129.3, 53.6],
+      [-130.5, 54.3],
+      [-130.5, 54.8],
+      [-130, 55.3],
+      [-130, 55.9]
+    ],
+    [
+      [-130, 55.9],
+      [-131.7, 56.6],
+      [-132.7, 57.7]
+    ],
+    [
+      [-132.7, 57.7],
+      [-133.4, 58.4],
+      [-134.3, 58.9]
+    ],
+    [
+      [-134.3, 58.9],
+      [-134.9, 59.3],
+      [-135.5, 59.8],
+      [-136.5, 59.5],
+      [-137.4, 58.9],
+      [-138.3, 59.6]
+    ],
+    [
+      [-138.3, 59.6],
+      [-139, 60],
+      [-140, 60.3],
+      [-141, 60.3],
+      [-141, 66],
+      [-141, 69.7],
+      [-139.1, 69.5],
+      [-137.5, 69],
+      [-136.5, 68.9],
+      [-135.6, 69.3],
+      [-134.4, 69.6],
+      [-132.9, 69.5],
+      [-131.4, 69.9],
+      [-129.8, 70.2],
+      [-129.1, 69.8],
+      [-128.4, 70],
+      [-128.1, 70.5],
+      [-127.4, 70.4],
+      [-125.8, 69.5],
+      [-124.4, 70.2],
+      [-124.3, 69.4],
+      [-123.1, 69.6],
+      [-122.7, 69.9],
+      [-121.5, 69.8],
+      [-119.9, 69.4],
+      [-117.6, 69],
+      [-116.2, 68.8],
+      [-115.2, 68.9],
+      [-113.9, 68.4],
+      [-115.3, 67.9],
+      [-113.5, 67.7],
+      [-110.8, 67.8],
+      [-109.9, 68],
+      [-108.9, 67.4],
+      [-107.8, 67.9],
+      [-108.8, 68.3],
+      [-108.2, 68.7],
+      [-106.9, 68.7],
+      [-106.1, 68.8],
+      [-105.3, 68.6],
+      [-104.3, 68],
+      [-103.2, 68.1],
+      [-101.4, 67.7],
+      [-99.9, 67.8],
+      [-98.4, 67.8],
+      [-98.6, 68.4],
+      [-97.7, 68.6],
+      [-96.1, 68.2],
+      [-96.1, 67.3],
+      [-95.5, 68.1],
+      [-94.7, 68.1],
+      [-94.2, 69.1],
+      [-95.3, 69.7],
+      [-96.5, 70.1],
+      [-96.4, 71.2],
+      [-95.2, 71.9],
+      [-93.9, 71.8],
+      [-92.9, 71.3],
+      [-91.5, 70.2],
+      [-92.4, 69.7],
+      [-90.5, 69.5],
+      [-90.5, 68.5],
+      [-89.2, 69.3],
+      [-88, 68.6],
+      [-88.3, 67.9],
+      [-87.3, 67.2],
+      [-86.3, 67.9],
+      [-85.6, 68.8],
+      [-85.5, 69.9],
+      [-84.1, 69.8],
+      [-82.6, 69.7],
+      [-81.3, 69.2],
+      [-81.2, 68.7],
+      [-82, 68.1],
+      [-81.3, 67.6],
+      [-81.4, 67.1],
+      [-83.3, 66.4],
+      [-84.7, 66.3],
+      [-85.8, 66.6],
+      [-86.1, 66.1],
+      [-87, 65.2],
+      [-87.3, 64.8],
+      [-88.5, 64.1],
+      [-89.9, 64],
+      [-90.7, 63.6],
+      [-90.8, 63],
+      [-91.9, 62.8],
+      [-93.2, 62],
+      [-94.2, 60.9],
+      [-94.6, 60.1],
+      [-94.7, 59],
+      [-93.2, 58.8],
+      [-92.8, 57.9],
+      [-92.3, 57.1],
+      [-90.9, 57.3],
+      [-89, 56.9],
+      [-88, 56.5],
+      [-87.3, 56],
+      [-86.1, 55.7],
+      [-85, 55.3],
+      [-83.4, 55.2],
+      [-82.3, 55.2],
+      [-82.4, 54.3],
+      [-82.1, 53.3],
+      [-81.4, 52.2],
+      [-79.9, 51.2],
+      [-79.1, 51.5],
+      [-78.6, 52.6],
+      [-79.1, 54.1],
+      [-79.8, 54.7],
+      [-78.2, 55.1],
+      [-77.1, 55.8],
+      [-76.5, 56.5],
+      [-76.6, 57.2],
+      [-77.3, 58.1],
+      [-78.5, 58.8],
+      [-77.3, 59.9],
+      [-77.8, 60.8],
+      [-78.1, 62.3],
+      [-77.4, 62.6],
+      [-75.7, 62.3],
+      [-74.7, 62.2],
+      [-73.8, 62.4],
+      [-72.9, 62.1],
+      [-71.7, 61.5],
+      [-71.4, 61.1],
+      [-69.6, 61.1],
+      [-69.6, 60.2],
+      [-69.3, 59],
+      [-68.4, 58.8],
+      [-67.6, 58.2],
+      [-66.2, 58.8],
+      [-65.2, 59.9],
+      [-64.6, 60.3],
+      [-63.8, 59.4],
+      [-62.5, 58.2],
+      [-61.4, 57],
+      [-61.8, 56.3],
+      [-60.5, 55.8],
+      [-59.6, 55.2],
+      [-58, 55],
+      [-57.3, 54.6],
+      [-56.9, 53.8],
+      [-56.2, 53.7],
+      [-55.8, 53.3],
+      [-55.7, 52.2],
+      [-56.4, 51.8],
+      [-57.1, 51.4],
+      [-58.8, 51.1],
+      [-60, 50.2],
+      [-61.7, 50.1],
+      [-63.9, 50.3],
+      [-65.4, 50.3],
+      [-66.4, 50.2],
+      [-67.2, 49.5],
+      [-68.5, 49.1],
+      [-69.9, 47.7],
+      [-71.1, 46.8],
+      [-70.3, 47],
+      [-68.6, 48.3],
+      [-66.5, 49.1],
+      [-65.1, 49.2],
+      [-64.2, 48.7],
+      [-65.1, 48.1],
+      [-64.8, 47],
+      [-64.5, 46.2],
+      [-63.2, 45.7],
+      [-61.5, 45.9],
+      [-60.5, 47],
+      [-60.4, 46.3],
+      [-59.8, 45.9],
+      [-61, 45.3],
+      [-63.2, 44.7],
+      [-64.2, 44.3],
+      [-65.4, 43.6],
+      [-66.1, 43.6],
+      [-66.2, 44.5],
+      [-64.4, 45.3],
+      [-66, 45.3],
+      [-67.1, 45.1]
+    ],
+    [
+      [-114.2, 73.1],
+      [-114.7, 72.7],
+      [-112.4, 73],
+      [-111, 72.5],
+      [-109.9, 73],
+      [-109, 72.6],
+      [-108.2, 71.7],
+      [-107.7, 72.1],
+      [-108.4, 73.1],
+      [-107.5, 73.2],
+      [-106.5, 73.1],
+      [-105.4, 72.7],
+      [-104.8, 71.7],
+      [-104.5, 71],
+      [-102.8, 70.5],
+      [-101, 70],
+      [-101.1, 69.6],
+      [-102.7, 69.5],
+      [-102.1, 69.1],
+      [-102.4, 68.8],
+      [-104.2, 68.9],
+      [-106, 69.2],
+      [-107.1, 69.1],
+      [-109, 68.8],
+      [-111.5, 68.6],
+      [-113.3, 68.5],
+      [-113.8, 69],
+      [-115.2, 69.3],
+      [-116.1, 69.2],
+      [-117.3, 70],
+      [-116.7, 70.1],
+      [-115.1, 70.2],
+      [-113.7, 70.2],
+      [-112.4, 70.4],
+      [-114.3, 70.6],
+      [-116.5, 70.5],
+      [-117.9, 70.5],
+      [-118.4, 70.9],
+      [-116.1, 71.3],
+      [-117.7, 71.3],
+      [-119.4, 71.6],
+      [-118.6, 72.3],
+      [-117.9, 72.7],
+      [-115.2, 73.3],
+      [-114.2, 73.1]
+    ],
+    [
+      [-104.5, 73.4],
+      [-105.4, 72.8],
+      [-106.9, 73.5],
+      [-106.6, 73.6],
+      [-105.3, 73.6],
+      [-104.5, 73.4]
+    ],
+    [
+      [-76.3, 73.1],
+      [-76.2, 72.8],
+      [-77.3, 72.9],
+      [-78.4, 72.9],
+      [-79.5, 72.7],
+      [-79.8, 72.8],
+      [-80.9, 73.3],
+      [-80.8, 73.7],
+      [-80.3, 73.8],
+      [-78.1, 73.7],
+      [-76.3, 73.1]
+    ],
+    [
+      [-86.6, 73.2],
+      [-85.8, 72.5],
+      [-84.8, 73.3],
+      [-82.3, 73.8],
+      [-80.6, 72.7],
+      [-80.7, 72.1],
+      [-78.8, 72.4],
+      [-77.8, 72.8],
+      [-75.6, 72.2],
+      [-74.2, 71.8],
+      [-74.1, 71.3],
+      [-72.2, 71.6],
+      [-71.2, 70.9],
+      [-68.8, 70.5],
+      [-67.9, 70.1],
+      [-67, 69.2],
+      [-68.8, 68.7],
+      [-66.4, 68.1],
+      [-64.9, 67.9],
+      [-63.4, 66.9],
+      [-61.8, 66.9],
+      [-62.2, 66.2],
+      [-63.9, 65],
+      [-65.1, 65.4],
+      [-66.7, 66.4],
+      [-68, 66.3],
+      [-68.1, 65.7],
+      [-67.1, 65.1],
+      [-65.7, 64.7],
+      [-65.3, 64.4],
+      [-64.7, 63.4],
+      [-65, 62.7],
+      [-66.3, 63],
+      [-68.8, 63.8],
+      [-67.4, 62.9],
+      [-66.3, 62.3],
+      [-66.2, 61.9],
+      [-68.9, 62.3],
+      [-71, 62.9],
+      [-72.2, 63.4],
+      [-71.9, 63.7],
+      [-73.4, 64.2],
+      [-74.8, 64.7],
+      [-74.8, 64.4],
+      [-77.7, 64.2],
+      [-78.6, 64.6],
+      [-77.9, 65.3],
+      [-76, 65.3],
+      [-74, 65.5],
+      [-74.3, 65.8],
+      [-73.9, 66.3],
+      [-72.6, 67.3],
+      [-72.9, 67.7],
+      [-73.3, 68.1],
+      [-74.8, 68.6],
+      [-76.9, 68.9],
+      [-76.2, 69.2],
+      [-77.3, 69.8],
+      [-78.2, 69.8],
+      [-79, 70.2],
+      [-79.5, 69.9],
+      [-81.3, 69.7],
+      [-84.9, 70],
+      [-87.1, 70.3],
+      [-88.7, 70.4],
+      [-89.5, 70.8],
+      [-88.5, 71.2],
+      [-89.9, 71.2],
+      [-90.2, 72.2],
+      [-89.4, 73.1],
+      [-88.4, 73.5],
+      [-85.8, 73.8],
+      [-86.6, 73.2]
+    ],
+    [
+      [-100.4, 73.8],
+      [-99.2, 73.6],
+      [-97.4, 73.8],
+      [-97.1, 73.5],
+      [-98, 73],
+      [-96.5, 72.6],
+      [-96.7, 71.7],
+      [-98.4, 71.3],
+      [-99.3, 71.4],
+      [-100, 71.7],
+      [-102.5, 72.5],
+      [-102.5, 72.8],
+      [-100.4, 72.7],
+      [-101.5, 73.4],
+      [-100.4, 73.8]
+    ],
+    [
+      [-93.2, 72.8],
+      [-94.3, 72],
+      [-95.4, 72.1],
+      [-96, 72.9],
+      [-96, 73.4],
+      [-95.5, 73.9],
+      [-94.5, 74.1],
+      [-92.4, 74.1],
+      [-90.5, 73.9],
+      [-92, 73],
+      [-93.2, 72.8]
+    ],
+    [
+      [-120.5, 71.4],
+      [-123.1, 70.9],
+      [-123.6, 71.3],
+      [-125.9, 71.9],
+      [-125.5, 72.3],
+      [-124.8, 73],
+      [-123.9, 73.7],
+      [-124.9, 74.3],
+      [-121.5, 74.5],
+      [-120.1, 74.2],
+      [-117.6, 74.2],
+      [-116.6, 73.9],
+      [-115.5, 73.5],
+      [-116.8, 73.2],
+      [-119.2, 72.5],
+      [-120.5, 71.8],
+      [-120.5, 71.4]
+    ],
+    [
+      [-93.6, 75],
+      [-94.2, 74.6],
+      [-95.6, 74.7],
+      [-96.8, 74.9],
+      [-96.3, 75.4],
+      [-94.8, 75.7],
+      [-94, 75.3],
+      [-93.6, 75]
+    ],
+    [
+      [-98.5, 76.7],
+      [-97.7, 76.3],
+      [-97.7, 75.7],
+      [-98.2, 75],
+      [-99.8, 74.9],
+      [-100.9, 75.1],
+      [-100.9, 75.6],
+      [-102.5, 75.6],
+      [-102.6, 76.3],
+      [-101.5, 76.3],
+      [-100, 76.7],
+      [-98.6, 76.6],
+      [-98.5, 76.7]
+    ],
+    [
+      [-108.2, 76.2],
+      [-107.8, 75.9],
+      [-106.9, 76],
+      [-105.9, 76],
+      [-105.7, 75.5],
+      [-106.3, 75],
+      [-109.7, 74.9],
+      [-112.2, 74.4],
+      [-113.7, 74.4],
+      [-113.9, 74.7],
+      [-111.8, 75.2],
+      [-116.3, 75],
+      [-117.7, 75.2],
+      [-116.3, 76.2],
+      [-115.4, 76.5],
+      [-112.6, 76.1],
+      [-110.8, 75.6],
+      [-109.1, 75.5],
+      [-110.5, 76.4],
+      [-109.6, 76.8],
+      [-108.5, 76.7],
+      [-108.2, 76.2]
+    ],
+    [
+      [-94.7, 77.1],
+      [-93.6, 76.8],
+      [-91.6, 76.8],
+      [-90.7, 76.5],
+      [-91, 76.1],
+      [-89.8, 75.9],
+      [-89.2, 75.6],
+      [-87.8, 75.6],
+      [-86.4, 75.5],
+      [-84.8, 75.7],
+      [-82.7, 75.8],
+      [-81.1, 75.7],
+      [-80.1, 75.3],
+      [-79.8, 74.9],
+      [-80.5, 74.7],
+      [-81.9, 74.4],
+      [-83.2, 74.6],
+      [-86.1, 74.4],
+      [-88.1, 74.4],
+      [-89.8, 74.5],
+      [-92.4, 74.8],
+      [-92.8, 75.4],
+      [-92.9, 75.9],
+      [-93.9, 76.3],
+      [-96, 76.4],
+      [-97.1, 76.8],
+      [-96.7, 77.2],
+      [-94.7, 77.1]
+    ],
+    [
+      [-116.2, 77.7],
+      [-116.3, 76.9],
+      [-117.1, 76.5],
+      [-118, 76.5],
+      [-119.9, 76.1],
+      [-121.5, 75.9],
+      [-122.8, 76.1],
+      [-121.2, 76.9],
+      [-119.1, 77.5],
+      [-117.6, 77.5],
+      [-116.2, 77.7]
+    ],
+    [
+      [-93.8, 77.5],
+      [-94.3, 77.5],
+      [-96.2, 77.6],
+      [-96.4, 77.8],
+      [-94.4, 77.8],
+      [-93.7, 77.6],
+      [-93.8, 77.5]
+    ],
+    [
+      [-110.2, 77.7],
+      [-112, 77.4],
+      [-113.5, 77.7],
+      [-112.7, 78.1],
+      [-111.3, 78.2],
+      [-109.8, 78],
+      [-110.2, 77.7]
+    ],
+    [
+      [-109.7, 78.6],
+      [-110.9, 78.4],
+      [-112.5, 78.4],
+      [-112.5, 78.6],
+      [-111.5, 78.9],
+      [-111, 78.8],
+      [-109.7, 78.6]
+    ],
+    [
+      [-95.8, 78.1],
+      [-97.3, 77.9],
+      [-98.1, 78.1],
+      [-98.5, 78.5],
+      [-98.6, 78.9],
+      [-97.3, 78.8],
+      [-96.7, 78.8],
+      [-95.6, 78.4],
+      [-95.8, 78.1]
+    ],
+    [
+      [-100.1, 78.3],
+      [-99.7, 77.9],
+      [-101.3, 78],
+      [-102.9, 78.3],
+      [-105.2, 78.4],
+      [-104.2, 78.7],
+      [-105.4, 78.9],
+      [-105.5, 79.3],
+      [-103.5, 79.2],
+      [-100.8, 78.8],
+      [-100.1, 78.3]
+    ],
+    [
+      [-87, 79.7],
+      [-85.8, 79.3],
+      [-87.2, 79],
+      [-89, 78.3],
+      [-90.8, 78.2],
+      [-92.9, 78.3],
+      [-93.9, 78.8],
+      [-93.9, 79.1],
+      [-93.1, 79.4],
+      [-95, 79.4],
+      [-96.1, 79.7],
+      [-96.7, 80.2],
+      [-96, 80.6],
+      [-95.3, 80.9],
+      [-94.3, 81],
+      [-94.7, 81.2],
+      [-92.4, 81.3],
+      [-91.1, 80.7],
+      [-89.4, 80.5],
+      [-87.8, 80.3],
+      [-87, 79.7]
+    ],
+    [
+      [-68.5, 83.1],
+      [-65.8, 83],
+      [-63.7, 82.9],
+      [-61.8, 82.6],
+      [-61.9, 82.4],
+      [-64.3, 81.9],
+      [-66.7, 81.7],
+      [-67.7, 81.5],
+      [-65.5, 81.5],
+      [-67.8, 80.9],
+      [-69.5, 80.6],
+      [-71.2, 79.8],
+      [-73.2, 79.6],
+      [-73.9, 79.4],
+      [-76.9, 79.3],
+      [-75.5, 79.2],
+      [-76.2, 79],
+      [-75.4, 78.5],
+      [-76.3, 78.2],
+      [-77.9, 77.9],
+      [-78.4, 77.5],
+      [-79.8, 77.2],
+      [-79.6, 77],
+      [-77.9, 77],
+      [-77.9, 76.8],
+      [-80.6, 76.2],
+      [-83.2, 76.5],
+      [-86.1, 76.3],
+      [-87.6, 76.4],
+      [-89.5, 76.5],
+      [-89.6, 77],
+      [-87.8, 77.2],
+      [-88.3, 77.9],
+      [-87.6, 78],
+      [-85, 77.5],
+      [-86.3, 78.2],
+      [-88, 78.4],
+      [-87.1, 78.8],
+      [-85.4, 79],
+      [-85.1, 79.4],
+      [-86.5, 79.7],
+      [-86.9, 80.3],
+      [-84.2, 80.2],
+      [-83.4, 80.1],
+      [-81.8, 80.5],
+      [-84.1, 80.6],
+      [-87.6, 80.5],
+      [-89.4, 80.9],
+      [-90.2, 81.3],
+      [-91.4, 81.6],
+      [-91.6, 81.9],
+      [-90.1, 82.1],
+      [-88.9, 82.1],
+      [-87, 82.3],
+      [-85.5, 82.7],
+      [-84.3, 82.6],
+      [-83.2, 82.3],
+      [-82.4, 82.9],
+      [-81.1, 83],
+      [-79.3, 83.1],
+      [-76.2, 83.2],
+      [-75.7, 83.1],
+      [-72.8, 83.2],
+      [-70.7, 83.2],
+      [-68.5, 83.1]
+    ],
+    [
+      [9.6, 47.4],
+      [9.5, 47.3],
+      [9.5, 47.2]
+    ],
+    [
+      [9.5, 47.2],
+      [9.5, 47.1],
+      [9.6, 47.1]
+    ],
+    [
+      [9.6, 47.1],
+      [9.9, 47]
+    ],
+    [
+      [10.4, 46.9],
+      [10.4, 46.5],
+      [9.9, 46.3],
+      [9.2, 46.4],
+      [9, 46],
+      [8.5, 46],
+      [8.3, 46.2],
+      [7.8, 45.8],
+      [7.3, 45.8],
+      [6.8, 46]
+    ],
+    [
+      [6.8, 46],
+      [6.5, 46.4],
+      [6, 46.3],
+      [6, 46.7],
+      [6.8, 47.3],
+      [6.7, 47.5],
+      [7.2, 47.5],
+      [7.5, 47.6]
+    ],
+    [
+      [7.5, 47.6],
+      [8.3, 47.6],
+      [8.5, 47.8],
+      [9.6, 47.5]
+    ],
+    [
+      [-67, -54.9],
+      [-67.3, -55.3],
+      [-68.1, -55.6],
+      [-68.6, -55.6],
+      [-69.2, -55.5],
+      [-70, -55.2],
+      [-71, -55],
+      [-72.3, -54.5],
+      [-73.3, -54],
+      [-74.7, -52.8],
+      [-73.8, -53],
+      [-72.4, -53.7],
+      [-71.1, -54.1],
+      [-70.6, -53.6],
+      [-70.3, -52.9],
+      [-69.3, -52.5],
+      [-68.6, -52.6]
+    ],
+    [
+      [-68.6, -52.3],
+      [-69.5, -52.3],
+      [-69.9, -52.5],
+      [-70.8, -52.9],
+      [-71, -53.8],
+      [-71.4, -53.9],
+      [-72.6, -53.5],
+      [-73.7, -52.8],
+      [-74.9, -52.3],
+      [-75.3, -51.6],
+      [-75, -51],
+      [-75.5, -50.4],
+      [-75.6, -48.7],
+      [-75.2, -47.7],
+      [-74.1, -46.9],
+      [-75.6, -46.6],
+      [-74.7, -45.8],
+      [-74.3, -44.1],
+      [-73.2, -44.4],
+      [-72.7, -42.4],
+      [-73.4, -42.1],
+      [-73.7, -43.4],
+      [-74.3, -43.2],
+      [-74, -41.8],
+      [-73.7, -39.9],
+      [-73.2, -39.3],
+      [-73.5, -38.3],
+      [-73.6, -37.2],
+      [-73.2, -37.1],
+      [-72.5, -35.5],
+      [-71.9, -33.9],
+      [-71.4, -32.4],
+      [-71.7, -30.9],
+      [-71.4, -30.1],
+      [-71.5, -28.9],
+      [-70.9, -27.6],
+      [-70.7, -25.7],
+      [-70.4, -23.6],
+      [-70.1, -21.4],
+      [-70.2, -19.8],
+      [-70.4, -18.3]
+    ],
+    [
+      [-70.4, -18.3],
+      [-69.9, -18.1],
+      [-69.6, -17.6]
+    ],
+    [
+      [110.3, 18.7],
+      [109.5, 18.2],
+      [108.7, 18.5],
+      [108.6, 19.4],
+      [109.1, 19.8],
+      [110.2, 20.1],
+      [110.8, 20.1],
+      [111, 19.7],
+      [110.6, 19.3],
+      [110.3, 18.7]
+    ],
+    [
+      [129.4, 49.4],
+      [130.6, 48.7]
+    ],
+    [
+      [130.6, 48.7],
+      [131, 47.8],
+      [132.5, 47.8],
+      [133.4, 48.2]
+    ],
+    [
+      [133.4, 48.2],
+      [135, 48.5]
+    ],
+    [
+      [135, 48.5],
+      [134.5, 47.6],
+      [134.1, 47.2],
+      [133.8, 46.1]
+    ],
+    [
+      [133.8, 46.1],
+      [133.1, 45.1],
+      [131.9, 45.3]
+    ],
+    [
+      [131.9, 45.3],
+      [131, 45],
+      [131.3, 44.1]
+    ],
+    [
+      [131.3, 44.1],
+      [131.1, 42.9],
+      [130.6, 42.9]
+    ],
+    [
+      [130.6, 42.9],
+      [130.6, 42.4]
+    ],
+    [
+      [130.6, 42.4],
+      [130, 43],
+      [129.6, 42.4],
+      [128.1, 42],
+      [128.2, 41.5],
+      [127.3, 41.5],
+      [126.9, 41.8],
+      [126.2, 41.1],
+      [125.1, 40.6],
+      [124.3, 39.9]
+    ],
+    [
+      [124.3, 39.9],
+      [122.9, 39.6],
+      [122.1, 39.2],
+      [121.1, 38.9],
+      [121.6, 39.4],
+      [121.4, 39.8],
+      [122.2, 40.4],
+      [121.6, 41],
+      [120.8, 40.6],
+      [119.6, 39.9],
+      [119, 39.3],
+      [118, 39.2],
+      [117.5, 38.7],
+      [118.1, 38.1],
+      [118.9, 37.9],
+      [118.9, 37.5],
+      [119.7, 37.2],
+      [120.8, 37.9],
+      [121.7, 37.5],
+      [122.4, 37.5],
+      [122.5, 36.9],
+      [121.1, 36.7],
+      [120.6, 36.1],
+      [119.7, 35.6],
+      [119.2, 34.9],
+      [120.2, 34.4],
+      [120.6, 33.4],
+      [121.2, 32.5],
+      [121.9, 31.7],
+      [121.9, 31],
+      [121.3, 30.7],
+      [121.5, 30.1],
+      [122.1, 29.8],
+      [121.9, 29],
+      [121.7, 28.2],
+      [121.1, 28.1],
+      [120.4, 27.1],
+      [119.6, 25.7],
+      [118.7, 24.6],
+      [117.3, 23.6],
+      [115.9, 22.8],
+      [114.8, 22.7],
+      [114.2, 22.2],
+      [113.8, 22.6],
+      [113.2, 22.1],
+      [111.8, 21.6],
+      [110.8, 21.4],
+      [110.4, 20.3],
+      [109.9, 20.3],
+      [109.6, 21],
+      [109.9, 21.4],
+      [108.5, 21.7],
+      [108.1, 21.6]
+    ],
+    [
+      [108.1, 21.6],
+      [107, 21.8],
+      [106.6, 22.2],
+      [106.7, 22.8],
+      [105.8, 23],
+      [105.3, 23.4],
+      [104.5, 22.8],
+      [103.5, 22.7],
+      [102.7, 22.7],
+      [102.2, 22.5]
+    ],
+    [
+      [102.2, 22.5],
+      [101.7, 22.3],
+      [101.8, 21.2],
+      [101.3, 21.2],
+      [101.2, 21.4]
+    ],
+    [
+      [101.2, 21.4],
+      [101.2, 21.9],
+      [100.4, 21.6],
+      [100, 21.7],
+      [99.2, 22.1],
+      [99.5, 23],
+      [98.9, 23.1],
+      [98.7, 24.1],
+      [97.6, 23.9],
+      [97.7, 25.1],
+      [98.7, 25.9],
+      [98.7, 26.7],
+      [98.7, 27.5],
+      [98.3, 27.8],
+      [97.9, 28.3],
+      [97.3, 28.3]
+    ],
+    [
+      [97.3, 28.3],
+      [96.3, 28.4],
+      [96.6, 28.8],
+      [96.1, 29.5],
+      [95.4, 29],
+      [94.6, 29.3],
+      [93.4, 28.6],
+      [92.5, 27.9],
+      [91.7, 27.8]
+    ],
+    [
+      [88.8, 27.3],
+      [88.7, 28.1],
+      [88.1, 27.9]
+    ],
+    [
+      [88.1, 27.9],
+      [87, 28],
+      [85.8, 28.2],
+      [85, 28.6],
+      [84.2, 28.8],
+      [83.9, 29.3],
+      [83.3, 29.5],
+      [82.3, 30.1],
+      [81.5, 30.4],
+      [81.1, 30.2]
+    ],
+    [
+      [81.1, 30.2],
+      [79.7, 30.9],
+      [78.7, 31.5],
+      [78.5, 32.6],
+      [79.2, 32.5],
+      [79.2, 33],
+      [78.8, 33.5],
+      [78.9, 34.3],
+      [77.8, 35.5]
+    ],
+    [
+      [77.8, 35.5],
+      [76.2, 35.9],
+      [75.9, 36.7],
+      [75.2, 37.1]
+    ],
+    [
+      [75, 37.4],
+      [74.8, 38],
+      [74.9, 38.4],
+      [74.3, 38.6],
+      [73.9, 38.5],
+      [73.7, 39.4]
+    ],
+    [
+      [73.7, 39.4],
+      [74, 39.7],
+      [73.8, 39.9],
+      [74.8, 40.4],
+      [75.5, 40.6],
+      [76.5, 40.4],
+      [76.9, 41.1],
+      [78.2, 41.2],
+      [78.5, 41.6],
+      [80.1, 42.1],
+      [80.3, 42.4]
+    ],
+    [
+      [80.3, 42.4],
+      [80.2, 42.9],
+      [80.9, 43.2],
+      [80, 44.9],
+      [82, 45.3],
+      [82.5, 45.5],
+      [83.2, 47.3],
+      [85.2, 47],
+      [85.7, 47.5],
+      [85.8, 48.5],
+      [86.6, 48.6],
+      [87.4, 49.2]
+    ],
+    [
+      [87.4, 49.2],
+      [87.8, 49.3]
+    ],
+    [
+      [87.8, 49.3],
+      [88, 48.6],
+      [88.9, 48.1],
+      [90.3, 47.7],
+      [91, 46.9],
+      [90.6, 45.7],
+      [91, 45.3],
+      [92.1, 45.1],
+      [93.5, 45],
+      [94.7, 44.4],
+      [95.3, 44.2],
+      [95.8, 43.3],
+      [96.4, 42.7],
+      [97.5, 42.8],
+      [99.5, 42.5],
+      [100.9, 42.7],
+      [101.8, 42.5],
+      [103.3, 41.9],
+      [104.5, 41.9],
+      [105, 41.6],
+      [106.1, 42.1],
+      [107.7, 42.5],
+      [109.2, 42.5],
+      [110.4, 42.9],
+      [111.1, 43.4],
+      [111.8, 43.7],
+      [111.7, 44.1],
+      [111.4, 44.5],
+      [111.9, 45.1],
+      [112.4, 45],
+      [113.5, 44.8],
+      [114.5, 45.3],
+      [116, 45.7],
+      [116.7, 46.4],
+      [117.4, 46.7],
+      [118.9, 46.8],
+      [119.7, 46.7],
+      [119.8, 47.1],
+      [118.9, 47.8],
+      [118.1, 48.1],
+      [117.3, 47.7],
+      [116.3, 47.9],
+      [115.7, 47.7],
+      [115.5, 48.1],
+      [116.2, 49.1],
+      [116.7, 49.9]
+    ],
+    [
+      [116.7, 49.9],
+      [117.9, 49.5],
+      [119.3, 50.1]
+    ],
+    [
+      [119.3, 50.1],
+      [119.3, 50.6],
+      [120.2, 51.6],
+      [120.7, 52],
+      [120.7, 52.5]
+    ],
+    [
+      [120.7, 52.5],
+      [120.2, 52.8],
+      [121, 53.3],
+      [122.3, 53.4]
+    ],
+    [
+      [122.3, 53.4],
+      [123.6, 53.5],
+      [125.1, 53.2]
+    ],
+    [
+      [125.1, 53.2],
+      [126, 52.8],
+      [126.6, 51.8],
+      [126.9, 51.4],
+      [127.3, 50.7]
+    ],
+    [
+      [127.3, 50.7],
+      [127.7, 49.8],
+      [129.4, 49.4]
+    ],
+    [
+      [-2.9, 5],
+      [-3.3, 5],
+      [-4, 5.2],
+      [-4.6, 5.2],
+      [-5.8, 5],
+      [-6.5, 4.7],
+      [-7.5, 4.3],
+      [-7.7, 4.4]
+    ],
+    [
+      [-7.7, 4.4],
+      [-7.6, 5.2],
+      [-7.5, 5.3],
+      [-7.6, 5.7],
+      [-8, 6.1],
+      [-8.3, 6.2],
+      [-8.6, 6.5],
+      [-8.4, 6.9],
+      [-8.5, 7.4],
+      [-8.4, 7.7]
+    ],
+    [
+      [-8.4, 7.7],
+      [-8.3, 7.7],
+      [-8.2, 8.1],
+      [-8.3, 8.3],
+      [-8.2, 8.5],
+      [-7.8, 8.6],
+      [-8.1, 9.4],
+      [-8.3, 9.8],
+      [-8.2, 10.1],
+      [-8, 10.2]
+    ],
+    [
+      [-8, 10.2],
+      [-7.9, 10.3],
+      [-7.6, 10.2],
+      [-6.8, 10.1],
+      [-6.7, 10.4],
+      [-6.5, 10.4],
+      [-6.2, 10.5],
+      [-6, 10.1],
+      [-5.8, 10.2],
+      [-5.4, 10.4]
+    ],
+    [
+      [-2.8, 9.6],
+      [-2.6, 8.2],
+      [-3, 7.4],
+      [-3.2, 6.3],
+      [-2.8, 5.4],
+      [-2.9, 5]
+    ],
+    [
+      [13.1, 2.3],
+      [13, 2.3],
+      [12.4, 2.2],
+      [11.8, 2.3],
+      [11.3, 2.3]
+    ],
+    [
+      [11.3, 2.3],
+      [9.7, 2.3]
+    ],
+    [
+      [9.7, 2.3],
+      [9.8, 3.1],
+      [9.4, 3.7],
+      [9, 3.9],
+      [8.7, 4.4],
+      [8.5, 4.5],
+      [8.5, 4.8]
+    ],
+    [
+      [8.5, 4.8],
+      [8.8, 5.5],
+      [9.2, 6.4],
+      [9.5, 6.5],
+      [10.1, 7],
+      [10.5, 7.1],
+      [11.1, 6.6],
+      [11.8, 7],
+      [11.8, 7.4],
+      [12.1, 7.8],
+      [12.2, 8.3],
+      [12.8, 8.7],
+      [13, 9.4],
+      [13.2, 9.6],
+      [13.3, 10.2],
+      [13.6, 10.8],
+      [14.4, 11.6],
+      [14.5, 11.9],
+      [14.6, 12.1],
+      [14.2, 12.5]
+    ],
+    [
+      [14.2, 12.5],
+      [14.2, 12.8],
+      [14.5, 12.9]
+    ],
+    [
+      [14.5, 12.9],
+      [14.9, 12.2],
+      [15, 11.6]
+    ],
+    [
+      [15, 11.6],
+      [14.9, 10.9],
+      [15.5, 10],
+      [14.9, 10],
+      [14.6, 9.9],
+      [14.2, 10],
+      [14, 9.6],
+      [14.5, 9],
+      [15, 8.8],
+      [15.1, 8.4],
+      [15.4, 7.7],
+      [15.3, 7.4]
+    ],
+    [
+      [16, 2.3],
+      [15.9, 1.7],
+      [15.2, 2],
+      [14.3, 2.2],
+      [13.1, 2.3]
+    ],
+    [
+      [31.2, 2.2],
+      [30.9, 1.9],
+      [30.5, 1.6],
+      [30.1, 1.1],
+      [29.9, 0.6]
+    ],
+    [
+      [29.9, 0.6],
+      [29.8, -0.2],
+      [29.6, -0.6]
+    ],
+    [
+      [29.6, -0.6],
+      [29.6, -1.3]
+    ],
+    [
+      [29.6, -1.3],
+      [29.3, -1.6],
+      [29.3, -2.2],
+      [29.1, -2.3],
+      [29, -2.8]
+    ],
+    [
+      [29.3, -4.5],
+      [29.5, -5.4],
+      [29.4, -5.9]
+    ],
+    [
+      [29.4, -5.9],
+      [29.6, -6.5],
+      [30.2, -7.1],
+      [30.7, -8.3]
+    ],
+    [
+      [30.7, -8.3],
+      [30.4, -8.2],
+      [29, -8.4],
+      [28.7, -8.5],
+      [28.5, -9.2],
+      [28.7, -9.6],
+      [28.5, -10.8],
+      [28.4, -11.8],
+      [28.6, -12],
+      [29.3, -12.4],
+      [29.6, -12.2],
+      [29.7, -13.3],
+      [28.9, -13.2],
+      [28.5, -12.7],
+      [28.2, -12.3],
+      [27.4, -12.1],
+      [27.2, -11.6],
+      [26.6, -11.9],
+      [25.8, -11.8],
+      [25.4, -11.3],
+      [24.8, -11.2],
+      [24.3, -11.3],
+      [24.3, -10.9],
+      [23.9, -10.9]
+    ],
+    [
+      [12.3, -6.1],
+      [12.2, -5.8]
+    ],
+    [
+      [13, -4.8],
+      [13.3, -4.9],
+      [13.6, -4.5],
+      [14.1, -4.5],
+      [14.2, -4.8],
+      [14.6, -5],
+      [15.2, -4.3],
+      [15.8, -3.9],
+      [16, -3.5],
+      [16, -2.7],
+      [16.4, -1.7],
+      [16.9, -1.2],
+      [17.5, -0.7],
+      [17.6, -0.4],
+      [17.7, -0.1],
+      [17.8, 0.3],
+      [17.8, 0.9],
+      [17.9, 1.7],
+      [18.1, 2.4],
+      [18.4, 2.9],
+      [18.5, 3.5]
+    ],
+    [
+      [27.4, 5.2],
+      [28, 4.4],
+      [28.4, 4.3],
+      [28.7, 4.5],
+      [29.2, 4.4],
+      [29.7, 4.6]
+    ],
+    [
+      [29.7, 4.6],
+      [30, 4.2],
+      [30.8, 3.5],
+      [30.8, 2.3],
+      [31.2, 2.2]
+    ],
+    [
+      [11.9, -5],
+      [11.1, -4]
+    ],
+    [
+      [11.1, -4],
+      [11.9, -3.4],
+      [11.5, -2.8],
+      [11.8, -2.5],
+      [12.5, -2.4],
+      [12.6, -1.9],
+      [13.1, -2.4],
+      [14, -2.5],
+      [14.3, -2],
+      [14.4, -1.3],
+      [14.3, -0.5],
+      [13.8, 0],
+      [14.3, 1.2],
+      [14, 1.4],
+      [13.3, 1.3],
+      [13, 1.8],
+      [13.1, 2.3]
+    ],
+    [
+      [-75.4, -0.1],
+      [-75.8, 0.1],
+      [-76.3, 0.4],
+      [-76.6, 0.3],
+      [-77.4, 0.4],
+      [-77.7, 0.8],
+      [-77.9, 0.8],
+      [-78.9, 1.4]
+    ],
+    [
+      [-78.9, 1.4],
+      [-79, 1.7],
+      [-78.6, 1.8],
+      [-78.7, 2.3],
+      [-78.4, 2.6],
+      [-77.9, 2.7],
+      [-77.5, 3.3],
+      [-77.1, 3.9],
+      [-77.5, 4.1],
+      [-77.3, 4.7],
+      [-77.5, 5.6],
+      [-77.3, 5.9],
+      [-77.5, 6.7],
+      [-77.9, 7.2]
+    ],
+    [
+      [-77.9, 7.2],
+      [-77.7, 7.7],
+      [-77.4, 7.6],
+      [-77.2, 7.9],
+      [-77.5, 8.5],
+      [-77.3, 8.7]
+    ],
+    [
+      [-77.3, 8.7],
+      [-76.8, 8.6],
+      [-76.1, 9.3],
+      [-75.7, 9.4],
+      [-75.7, 9.8],
+      [-75.5, 10.6],
+      [-74.9, 11.1],
+      [-74.3, 11.1],
+      [-74.2, 11.3],
+      [-73.4, 11.2],
+      [-72.6, 11.7],
+      [-72.2, 12],
+      [-71.7, 12.4],
+      [-71.4, 12.4],
+      [-71.1, 12.1],
+      [-71.3, 11.8]
+    ],
+    [
+      [-71.3, 11.8],
+      [-72, 11.6],
+      [-72.2, 11.1],
+      [-72.6, 10.8],
+      [-72.9, 10.5],
+      [-73, 9.7],
+      [-73.3, 9.2],
+      [-72.8, 9.1],
+      [-72.7, 8.6],
+      [-72.4, 8.4],
+      [-72.4, 8],
+      [-72.5, 7.6],
+      [-72.4, 7.4],
+      [-72.2, 7.3],
+      [-72, 7],
+      [-70.7, 7.1],
+      [-70.1, 7],
+      [-69.4, 6.1],
+      [-69, 6.2],
+      [-68.3, 6.2],
+      [-67.7, 6.3],
+      [-67.3, 6.1],
+      [-67.5, 5.6],
+      [-67.7, 5.2],
+      [-67.8, 4.5],
+      [-67.6, 3.8],
+      [-67.3, 3.5],
+      [-67.3, 3.3],
+      [-67.8, 2.8],
+      [-67.4, 2.6],
+      [-67.2, 2.3],
+      [-66.9, 1.3]
+    ],
+    [
+      [-69.9, -4.3],
+      [-70.4, -3.8],
+      [-70.7, -3.7],
+      [-70, -2.7],
+      [-70.8, -2.3],
+      [-71.4, -2.3],
+      [-71.8, -2.2],
+      [-72.3, -2.4],
+      [-73.1, -2.3],
+      [-73.7, -1.3],
+      [-74.1, -1],
+      [-74.4, -0.5],
+      [-75.1, -0.1],
+      [-75.4, -0.1]
+    ],
+    [
+      [-83, 8.2],
+      [-83.5, 8.5],
+      [-83.7, 8.7],
+      [-83.6, 8.8],
+      [-83.6, 9.1],
+      [-83.9, 9.3],
+      [-84.3, 9.5],
+      [-84.6, 9.6],
+      [-84.7, 9.9],
+      [-85, 10.1],
+      [-84.9, 9.8],
+      [-85.1, 9.6],
+      [-85.3, 9.8],
+      [-85.7, 9.9],
+      [-85.8, 10.1],
+      [-85.8, 10.4],
+      [-85.7, 10.8],
+      [-85.9, 10.9],
+      [-85.7, 11.1]
+    ],
+    [
+      [-85.7, 11.1],
+      [-85.6, 11.2],
+      [-84.9, 11],
+      [-84.7, 11.1],
+      [-84.4, 11],
+      [-84.2, 10.8],
+      [-83.9, 10.7],
+      [-83.7, 10.9]
+    ],
+    [
+      [-83.7, 10.9],
+      [-83.4, 10.4],
+      [-83, 10],
+      [-82.5, 9.6]
+    ],
+    [
+      [-82.5, 9.6],
+      [-82.9, 9.5],
+      [-82.9, 9.1],
+      [-82.7, 8.9],
+      [-82.9, 8.8],
+      [-82.8, 8.6],
+      [-82.9, 8.4],
+      [-83, 8.2]
+    ],
+    [
+      [-82.3, 23.2],
+      [-81.4, 23.1],
+      [-80.6, 23.1],
+      [-79.7, 22.8],
+      [-79.3, 22.4],
+      [-78.3, 22.5],
+      [-78, 22.3],
+      [-77.1, 21.7],
+      [-76.5, 21.2],
+      [-76.2, 21.2],
+      [-75.6, 21],
+      [-75.7, 20.7],
+      [-74.9, 20.7],
+      [-74.2, 20.3],
+      [-74.3, 20.1],
+      [-75, 19.9],
+      [-75.6, 19.9],
+      [-76.3, 20],
+      [-77.8, 19.9],
+      [-77.1, 20.4],
+      [-77.5, 20.7],
+      [-78.1, 20.7],
+      [-78.5, 21],
+      [-78.7, 21.6],
+      [-79.3, 21.6],
+      [-80.2, 21.8],
+      [-80.5, 22],
+      [-81.8, 22.2],
+      [-82.2, 22.4],
+      [-81.8, 22.6],
+      [-82.8, 22.7],
+      [-83.5, 22.2],
+      [-83.9, 22.2],
+      [-84, 21.9],
+      [-84.5, 21.8],
+      [-85, 21.9],
+      [-84.4, 22.2],
+      [-84.2, 22.6],
+      [-83.8, 22.8],
+      [-83.3, 23],
+      [-82.5, 23.1],
+      [-82.3, 23.2]
+    ],
+    [
+      [32.7, 35.1],
+      [32.8, 35.2],
+      [33, 35.4],
+      [33.7, 35.4],
+      [34.6, 35.7],
+      [33.9, 35.3],
+      [34, 35.1],
+      [34, 35],
+      [33, 34.6],
+      [32.5, 34.7],
+      [32.3, 35.1],
+      [32.7, 35.1]
+    ],
+    [
+      [13.6, 48.9],
+      [13, 49.3],
+      [12.5, 49.6],
+      [12.4, 50],
+      [12.2, 50.3],
+      [13, 50.5],
+      [13.3, 50.7],
+      [14.1, 50.9],
+      [14.3, 51.1],
+      [14.6, 51],
+      [15, 51.1]
+    ],
+    [
+      [15, 51.1],
+      [15.5, 50.8],
+      [16.2, 50.7],
+      [16.2, 50.4],
+      [16.7, 50.2],
+      [16.9, 50.5],
+      [17.6, 50.4],
+      [17.7, 50.1],
+      [18.4, 50],
+      [18.9, 49.5]
+    ],
+    [
+      [18.9, 49.5],
+      [18.6, 49.5],
+      [18.4, 49.3],
+      [18.2, 49.3],
+      [18.1, 49],
+      [17.9, 49],
+      [17.9, 48.9],
+      [17.6, 48.8],
+      [17.1, 48.8],
+      [17, 48.6]
+    ],
+    [
+      [9.9, 55],
+      [9.9, 54.6],
+      [11, 54.4],
+      [10.9, 54],
+      [12, 54.2],
+      [12.5, 54.5],
+      [13.7, 54.1],
+      [14.1, 53.8]
+    ],
+    [
+      [14.1, 53.8],
+      [14.4, 53.3],
+      [14.1, 53],
+      [14.4, 52.6],
+      [14.7, 52.1],
+      [14.6, 51.8],
+      [15, 51.1]
+    ],
+    [
+      [7.5, 47.6],
+      [7.6, 48.3],
+      [8.1, 49],
+      [6.7, 49.2],
+      [6.2, 49.5]
+    ],
+    [
+      [6.2, 49.5],
+      [6.2, 49.9],
+      [6, 50.1]
+    ],
+    [
+      [6.2, 50.8],
+      [6, 51.9],
+      [6.6, 51.9],
+      [6.8, 52.2],
+      [7.1, 53.1],
+      [6.9, 53.5]
+    ],
+    [
+      [6.9, 53.5],
+      [7.1, 53.7],
+      [7.9, 53.8],
+      [8.1, 53.5],
+      [8.8, 54],
+      [8.6, 54.4],
+      [8.5, 55]
+    ],
+    [
+      [8.5, 55],
+      [9.3, 54.8],
+      [9.9, 55]
+    ],
+    [
+      [43.1, 12.7],
+      [43.3, 12.4],
+      [43.3, 12],
+      [42.7, 11.7],
+      [43.2, 11.5]
+    ],
+    [
+      [43.2, 11.5],
+      [42.8, 10.9]
+    ],
+    [
+      [42.8, 10.9],
+      [42.6, 11.1],
+      [42.3, 11],
+      [41.8, 11.1],
+      [41.7, 11.4],
+      [41.7, 11.6],
+      [42, 12.1],
+      [42.4, 12.5]
+    ],
+    [
+      [42.4, 12.5],
+      [42.8, 12.5],
+      [43.1, 12.7]
+    ],
+    [
+      [12.7, 55.6],
+      [12.1, 54.8],
+      [11, 55.4],
+      [10.9, 55.8],
+      [12.4, 56.1],
+      [12.7, 55.6]
+    ],
+    [
+      [8.5, 55],
+      [8.1, 55.5],
+      [8.1, 56.5],
+      [8.3, 56.8],
+      [8.5, 57.1],
+      [9.4, 57.2],
+      [9.8, 57.5],
+      [10.6, 57.7],
+      [10.6, 57.2],
+      [10.3, 56.9],
+      [10.4, 56.6],
+      [10.9, 56.5],
+      [10.7, 56.1],
+      [10.4, 56.2],
+      [9.7, 55.5],
+      [9.9, 55]
+    ],
+    [
+      [-46.8, 82.6],
+      [-43.4, 83.2],
+      [-39.9, 83.2],
+      [-38.6, 83.6],
+      [-35.1, 83.7],
+      [-27.1, 83.5],
+      [-20.8, 82.7],
+      [-22.7, 82.3],
+      [-26.5, 82.3],
+      [-31.9, 82.2],
+      [-31.4, 82],
+      [-27.9, 82.1],
+      [-24.8, 81.8],
+      [-22.9, 82.1],
+      [-22.1, 81.7],
+      [-23.2, 81.2],
+      [-20.6, 81.5],
+      [-15.8, 81.9],
+      [-12.8, 81.7],
+      [-12.2, 81.3],
+      [-16.3, 80.6],
+      [-16.8, 80.4],
+      [-20, 80.2],
+      [-17.7, 80.1],
+      [-18.9, 79.4],
+      [-19.7, 78.8],
+      [-19.7, 77.6],
+      [-18.5, 77],
+      [-20, 76.9],
+      [-21.7, 76.6],
+      [-19.8, 76.1],
+      [-19.6, 75.3],
+      [-20.7, 75.2],
+      [-19.4, 74.3],
+      [-21.6, 74.2],
+      [-20.4, 73.8],
+      [-20.8, 73.5],
+      [-22.2, 73.3],
+      [-23.6, 73.3],
+      [-22.3, 72.6],
+      [-22.3, 72.2],
+      [-24.3, 72.6],
+      [-24.8, 72.3],
+      [-23.4, 72.1],
+      [-22.1, 71.5],
+      [-21.7, 70.7],
+      [-23.5, 70.5],
+      [-24.3, 70.9],
+      [-25.5, 71.4],
+      [-25.2, 70.8],
+      [-26.4, 70.2],
+      [-23.7, 70.2],
+      [-22.3, 70.1],
+      [-25, 69.3],
+      [-27.7, 68.5],
+      [-30.7, 68.1],
+      [-31.8, 68.1],
+      [-32.8, 67.7],
+      [-34.2, 66.7],
+      [-36.3, 66],
+      [-37, 65.9],
+      [-38.4, 65.7],
+      [-39.8, 65.5],
+      [-40.7, 64.8],
+      [-40.7, 64.1],
+      [-41.2, 63.5],
+      [-42.8, 62.7],
+      [-42.4, 61.9],
+      [-42.9, 61.1],
+      [-43.4, 60.1],
+      [-44.8, 60],
+      [-46.3, 60.9],
+      [-48.3, 60.9],
+      [-49.2, 61.4],
+      [-49.9, 62.4],
+      [-51.6, 63.6],
+      [-52.1, 64.3],
+      [-52.3, 65.2],
+      [-53.7, 66.1],
+      [-53.3, 66.8],
+      [-54, 67.2],
+      [-53, 68.4],
+      [-51.5, 68.7],
+      [-51.1, 69.2],
+      [-50.9, 69.9],
+      [-52, 69.6],
+      [-52.6, 69.4],
+      [-53.5, 69.3],
+      [-54.7, 69.6],
+      [-54.7, 70.3],
+      [-54.4, 70.8],
+      [-53.4, 70.8],
+      [-51.4, 70.6],
+      [-53.1, 71.2],
+      [-54, 71.6],
+      [-55, 71.4],
+      [-55.8, 71.7],
+      [-54.7, 72.6],
+      [-55.3, 73],
+      [-56.1, 73.7],
+      [-57.3, 74.7],
+      [-58.6, 75.1],
+      [-58.6, 75.5],
+      [-61.3, 76.1],
+      [-63.4, 76.2],
+      [-66.1, 76.1],
+      [-68.5, 76.1],
+      [-69.7, 76.4],
+      [-71.4, 77],
+      [-68.8, 77.3],
+      [-66.8, 77.4],
+      [-71, 77.6],
+      [-73.3, 78],
+      [-73.2, 78.4],
+      [-69.4, 78.9],
+      [-65.7, 79.4],
+      [-65.3, 79.8],
+      [-68, 80.1],
+      [-67.1, 80.5],
+      [-63.7, 81.2],
+      [-62.2, 81.3],
+      [-62.6, 81.8],
+      [-60.3, 82],
+      [-57.2, 82.2],
+      [-54.1, 82.2],
+      [-53, 81.9],
+      [-50.4, 82.4],
+      [-48, 82.1],
+      [-46.6, 82],
+      [-44.5, 81.7],
+      [-46.9, 82.2],
+      [-46.8, 82.6]
+    ],
+    [
+      [-71.7, 19.7],
+      [-71.6, 19.9],
+      [-70.8, 19.9],
+      [-70.2, 19.6],
+      [-69.9, 19.7],
+      [-69.8, 19.3],
+      [-69.2, 19.3],
+      [-69.2, 19],
+      [-68.8, 19],
+      [-68.3, 18.6],
+      [-68.7, 18.2],
+      [-69.2, 18.4],
+      [-69.6, 18.4],
+      [-69.9, 18.4],
+      [-70.1, 18.3],
+      [-70.5, 18.2],
+      [-70.7, 18.4],
+      [-71, 18.3],
+      [-71.4, 17.6],
+      [-71.7, 17.8],
+      [-71.7, 18]
+    ],
+    [
+      [-71.7, 18],
+      [-71.7, 18.3],
+      [-71.9, 18.6],
+      [-71.7, 18.8],
+      [-71.6, 19.2],
+      [-71.7, 19.7]
+    ],
+    [
+      [12, 23.5],
+      [8.6, 21.6],
+      [5.7, 19.6],
+      [4.3, 19.2]
+    ],
+    [
+      [4.3, 19.2],
+      [3.2, 19.1],
+      [3.2, 19.7],
+      [2.7, 19.9],
+      [2.1, 20.1],
+      [1.8, 20.6],
+      [-1.5, 22.8],
+      [-4.9, 25]
+    ],
+    [
+      [-4.9, 25],
+      [-8.7, 27.4]
+    ],
+    [
+      [-8.7, 27.4],
+      [-8.7, 27.6],
+      [-8.7, 27.6]
+    ],
+    [
+      [-8.7, 27.6],
+      [-8.7, 28.8],
+      [-7.1, 29.6],
+      [-6.1, 29.7],
+      [-5.2, 30],
+      [-4.9, 30.5],
+      [-3.7, 30.9],
+      [-3.6, 31.6],
+      [-3.1, 31.7],
+      [-2.6, 32.1],
+      [-1.3, 32.3],
+      [-1.1, 32.7],
+      [-1.4, 32.9],
+      [-1.7, 33.9],
+      [-1.8, 34.5],
+      [-2.2, 35.2]
+    ],
+    [
+      [-2.2, 35.2],
+      [-1.2, 35.7],
+      [-0.1, 35.9],
+      [0.5, 36.3],
+      [1.5, 36.6],
+      [3.2, 36.8],
+      [4.8, 36.9],
+      [5.3, 36.7],
+      [6.3, 37.1],
+      [7.3, 37.1],
+      [7.7, 36.9],
+      [8.4, 37]
+    ],
+    [
+      [8.4, 37],
+      [8.2, 36.4],
+      [8.4, 35.5],
+      [8.1, 34.7],
+      [7.5, 34.1],
+      [7.6, 33.3],
+      [8.4, 32.8],
+      [8.4, 32.5],
+      [9.1, 32.1],
+      [9.5, 30.3]
+    ],
+    [
+      [9.5, 30.3],
+      [9.8, 29.4],
+      [9.9, 29],
+      [9.7, 28.1],
+      [9.8, 27.7],
+      [9.6, 27.1],
+      [9.7, 26.5],
+      [9.3, 26.1],
+      [9.9, 25.4],
+      [10, 24.9],
+      [10.3, 24.4],
+      [10.8, 24.6],
+      [11.6, 24.1],
+      [12, 23.5]
+    ],
+    [
+      [-80.3, -3.4],
+      [-79.8, -2.7],
+      [-80, -2.2],
+      [-80.4, -2.7],
+      [-81, -2.2],
+      [-80.8, -2],
+      [-80.9, -1.1],
+      [-80.6, -0.9],
+      [-80.4, -0.3],
+      [-80, 0.4],
+      [-80.1, 0.8],
+      [-79.5, 1],
+      [-78.9, 1.4]
+    ],
+    [
+      [-75.4, -0.1],
+      [-75.2, -0.9],
+      [-75.5, -1.6],
+      [-76.6, -2.6],
+      [-77.8, -3],
+      [-78.4, -3.9],
+      [-78.6, -4.5],
+      [-79.2, -5],
+      [-79.6, -4.4],
+      [-80, -4.3],
+      [-80.4, -4.4],
+      [-80.5, -4.1],
+      [-80.2, -3.8],
+      [-80.3, -3.4]
+    ],
+    [
+      [36.9, 22],
+      [32.9, 22],
+      [29, 22],
+      [25, 22]
+    ],
+    [
+      [25, 22],
+      [25, 25.7],
+      [25, 29.2],
+      [24.7, 30],
+      [25, 30.7],
+      [24.8, 31.1],
+      [25.2, 31.6]
+    ],
+    [
+      [25.2, 31.6],
+      [26.5, 31.6],
+      [27.5, 31.3],
+      [28.5, 31],
+      [28.9, 30.9],
+      [29.7, 31.2],
+      [30.1, 31.5],
+      [31, 31.6],
+      [31.7, 31.4],
+      [32, 30.9],
+      [32.2, 31.3],
+      [33, 31],
+      [33.8, 31],
+      [34.3, 31.2],
+      [34.9, 29.5],
+      [34.6, 29.1],
+      [34.4, 28.3],
+      [34.2, 27.8],
+      [33.9, 27.7],
+      [33.6, 28],
+      [33.1, 28.4],
+      [32.4, 29.9],
+      [32.3, 29.8],
+      [32.7, 28.7],
+      [33.4, 27.7],
+      [34.1, 26.1],
+      [34.5, 25.6],
+      [34.8, 25],
+      [35.7, 23.9],
+      [35.5, 23.8],
+      [35.5, 23.1],
+      [36.7, 22.2],
+      [36.9, 22]
+    ],
+    [
+      [42.4, 12.5],
+      [42, 12.9],
+      [41.6, 13.5]
+    ],
+    [
+      [41.6, 13.5],
+      [41.2, 13.8],
+      [40.9, 14.1]
+    ],
+    [
+      [40.9, 14.1],
+      [40, 14.5],
+      [39.3, 14.5]
+    ],
+    [
+      [39.3, 14.5],
+      [39.1, 14.7],
+      [38.5, 14.5],
+      [37.9, 15],
+      [37.6, 14.2],
+      [36.4, 14.4]
+    ],
+    [
+      [36.4, 14.4],
+      [36.3, 14.8],
+      [36.8, 16.3],
+      [36.9, 17]
+    ],
+    [
+      [36.9, 17],
+      [37.2, 17.3],
+      [37.9, 17.4],
+      [38.4, 18]
+    ],
+    [
+      [38.4, 18],
+      [39, 16.8],
+      [39.3, 15.9],
+      [39.8, 15.4],
+      [41.2, 14.5],
+      [41.7, 13.9],
+      [42.3, 13.3],
+      [42.6, 13],
+      [43.1, 12.7]
+    ],
+    [
+      [-9, 41.9],
+      [-9, 42.6],
+      [-9.4, 43],
+      [-8, 43.8],
+      [-6.7, 43.6],
+      [-5.4, 43.6],
+      [-4.3, 43.4],
+      [-3.5, 43.5],
+      [-1.9, 43.4]
+    ],
+    [
+      [-1.9, 43.4],
+      [-1.5, 43],
+      [0.3, 42.6],
+      [0.7, 42.8],
+      [1.8, 42.3],
+      [3, 42.5]
+    ],
+    [
+      [3, 42.5],
+      [3, 41.9],
+      [2.1, 41.2],
+      [0.8, 41],
+      [0.7, 40.7],
+      [0.1, 40.1],
+      [-0.3, 39.3],
+      [0.1, 38.7],
+      [-0.5, 38.3],
+      [-0.7, 37.6],
+      [-1.4, 37.4],
+      [-2.1, 36.7],
+      [-3.4, 36.7],
+      [-4.4, 36.7],
+      [-5, 36.3],
+      [-5.4, 36],
+      [-5.9, 36],
+      [-6.2, 36.4],
+      [-6.5, 36.9],
+      [-7.4, 37.1]
+    ],
+    [
+      [-7.4, 37.1],
+      [-7.5, 37.4],
+      [-7.2, 37.8],
+      [-7, 38.1],
+      [-7.4, 38.4],
+      [-7.1, 39],
+      [-7.5, 39.6],
+      [-7.1, 39.7],
+      [-7, 40.2],
+      [-6.9, 40.3],
+      [-6.8, 41.1],
+      [-6.4, 41.4],
+      [-6.7, 41.9],
+      [-7.2, 41.9],
+      [-7.4, 41.8],
+      [-8, 41.8],
+      [-8.3, 42.3],
+      [-8.7, 42.1],
+      [-9, 41.9]
+    ],
+    [
+      [24.3, 57.8],
+      [24.4, 58.4],
+      [24.1, 58.3],
+      [23.4, 58.6],
+      [23.3, 59.2],
+      [24.6, 59.5],
+      [25.9, 59.6],
+      [27, 59.5],
+      [28, 59.5],
+      [28.1, 59.3]
+    ],
+    [
+      [28.1, 59.3],
+      [27.4, 58.7],
+      [27.7, 57.8]
+    ],
+    [
+      [27.7, 57.8],
+      [27.3, 57.5]
+    ],
+    [
+      [27.3, 57.5],
+      [26.5, 57.5],
+      [25.6, 57.9],
+      [25.2, 58],
+      [24.3, 57.8]
+    ],
+    [
+      [39.3, 14.5],
+      [40, 14.5],
+      [40.9, 14.1]
+    ],
+    [
+      [40.9, 14.1],
+      [41.2, 13.8],
+      [41.6, 13.5]
+    ],
+    [
+      [42.8, 10.9],
+      [42.6, 10.6],
+      [42.9, 10]
+    ],
+    [
+      [42.9, 10],
+      [43.3, 9.5],
+      [43.7, 9.2]
+    ],
+    [
+      [43.7, 9.2],
+      [47, 8],
+      [47.8, 8]
+    ],
+    [
+      [47.8, 8],
+      [45, 5],
+      [43.7, 5],
+      [42.8, 4.3],
+      [42.1, 4.2],
+      [41.9, 3.9]
+    ],
+    [
+      [41.9, 3.9],
+      [41.2, 3.9],
+      [40.8, 4.3],
+      [39.9, 3.8],
+      [39.6, 3.4],
+      [38.9, 3.5],
+      [38.7, 3.6],
+      [38.4, 3.6],
+      [38.1, 3.6],
+      [36.9, 4.5],
+      [36.2, 4.5],
+      [35.8, 4.8],
+      [35.8, 5.3],
+      [35.3, 5.5]
+    ],
+    [
+      [35.3, 5.5],
+      [34.7, 6.6],
+      [34.3, 6.8],
+      [34.1, 7.2],
+      [33.6, 7.7],
+      [33, 7.8],
+      [33.3, 8.4],
+      [33.8, 8.4],
+      [34, 8.7]
+    ],
+    [
+      [34, 8.7],
+      [34, 9.6]
+    ],
+    [
+      [34, 9.6],
+      [34.3, 10.6],
+      [34.7, 10.9],
+      [34.8, 11.3],
+      [35.3, 12.1],
+      [35.9, 12.6],
+      [36.3, 13.6],
+      [36.4, 14.4]
+    ],
+    [
+      [28.6, 69.1],
+      [28.5, 68.4],
+      [30, 67.7],
+      [29.1, 66.9],
+      [30.2, 65.8],
+      [29.5, 65],
+      [30.4, 64.2],
+      [30, 63.6],
+      [31.5, 62.9],
+      [31.1, 62.4],
+      [30.2, 61.8]
+    ],
+    [
+      [30.2, 61.8],
+      [28.1, 60.5],
+      [26.3, 60.4],
+      [24.5, 60.1],
+      [22.9, 59.9],
+      [22.3, 60.4],
+      [21.3, 60.7],
+      [21.5, 61.7],
+      [21.1, 62.6],
+      [21.5, 63.2],
+      [22.4, 63.8],
+      [24.7, 64.9],
+      [25.4, 65.1],
+      [25.3, 65.5],
+      [23.9, 66]
+    ],
+    [
+      [23.9, 66],
+      [23.6, 66.4],
+      [23.5, 67.9],
+      [22, 68.6],
+      [20.7, 69.1]
+    ],
+    [
+      [20.7, 69.1],
+      [21.2, 69.4],
+      [22.4, 68.8],
+      [23.7, 68.9],
+      [24.7, 68.7],
+      [25.7, 69.1],
+      [26.2, 69.8],
+      [27.7, 70.2],
+      [29, 69.8],
+      [28.6, 69.1]
+    ],
+    [
+      [178.4, -17.3],
+      [178.7, -17.6],
+      [178.6, -18.1],
+      [177.9, -18.3],
+      [177.4, -18.2],
+      [177.3, -17.7],
+      [177.7, -17.4],
+      [178.1, -17.5],
+      [178.4, -17.3]
+    ],
+    [
+      [179.4, -16.8],
+      [178.7, -17],
+      [178.6, -16.6],
+      [179.1, -16.4],
+      [179.4, -16.4],
+      [180, -16.1],
+      [180, -16.6],
+      [179.4, -16.8]
+    ],
+    [
+      [-179.9, -16.5],
+      [-180, -16.6],
+      [-180, -16.1],
+      [-179.8, -16],
+      [-179.9, -16.5]
+    ],
+    [
+      [9.6, 42.2],
+      [9.2, 41.4],
+      [8.8, 41.6],
+      [8.5, 42.3],
+      [8.8, 42.6],
+      [9.4, 43],
+      [9.6, 42.2]
+    ],
+    [
+      [5.7, 49.5],
+      [5.9, 49.4],
+      [6.2, 49.5]
+    ],
+    [
+      [6.8, 46],
+      [6.8, 45.7],
+      [7.1, 45.3],
+      [6.8, 45],
+      [7, 44.3],
+      [7.6, 44.1],
+      [7.4, 43.7]
+    ],
+    [
+      [7.4, 43.7],
+      [6.5, 43.1],
+      [4.6, 43.4],
+      [3.1, 43.1],
+      [3, 42.5]
+    ],
+    [
+      [-1.9, 43.4],
+      [-1.4, 44],
+      [-1.2, 46],
+      [-2.2, 47.1],
+      [-3, 47.6],
+      [-4.5, 48],
+      [-4.6, 48.7],
+      [-3.3, 48.9],
+      [-1.6, 48.6],
+      [-1.9, 49.8],
+      [-1, 49.4],
+      [1.3, 50.1],
+      [1.6, 51],
+      [2.5, 51.2]
+    ],
+    [
+      [-54.5, 2.3],
+      [-54.3, 2.7],
+      [-54.2, 3.2],
+      [-54, 3.6],
+      [-54.4, 4.2]
+    ],
+    [
+      [-54.4, 4.2],
+      [-54.5, 4.9],
+      [-54, 5.8]
+    ],
+    [
+      [-54, 5.8],
+      [-53.6, 5.7],
+      [-52.9, 5.4],
+      [-51.8, 4.6],
+      [-51.7, 4.2]
+    ],
+    [
+      [11.1, -4],
+      [10.1, -3],
+      [9.4, -2.1],
+      [8.8, -1.1],
+      [8.8, -0.8],
+      [9.1, -0.5],
+      [9.3, 0.3],
+      [9.5, 1]
+    ],
+    [
+      [9.5, 1],
+      [9.8, 1.1],
+      [11.3, 1.1],
+      [11.3, 2.3]
+    ],
+    [
+      [-6.2, 53.9],
+      [-6.9, 54.1],
+      [-7.6, 54.1],
+      [-7.4, 54.6],
+      [-7.6, 55.1]
+    ],
+    [
+      [-7.6, 55.1],
+      [-6.7, 55.2],
+      [-5.7, 54.6],
+      [-6.2, 53.9]
+    ],
+    [
+      [-3, 58.6],
+      [-4.1, 57.6],
+      [-3.1, 57.7],
+      [-2, 57.7],
+      [-2.2, 56.9],
+      [-3.1, 56],
+      [-2.1, 55.9],
+      [-2, 55.8],
+      [-1.1, 54.6],
+      [-0.4, 54.5],
+      [0.2, 53.3],
+      [0.5, 52.9],
+      [1.7, 52.7],
+      [1.6, 52.1],
+      [1.1, 51.8],
+      [1.5, 51.3],
+      [0.6, 50.8],
+      [-0.8, 50.8],
+      [-2.5, 50.5],
+      [-3, 50.7],
+      [-3.6, 50.2],
+      [-4.5, 50.3],
+      [-5.2, 50],
+      [-5.8, 50.2],
+      [-4.3, 51.2],
+      [-3.4, 51.4],
+      [-5, 51.6],
+      [-5.3, 52],
+      [-4.2, 52.3],
+      [-4.8, 52.8],
+      [-4.6, 53.5],
+      [-3.1, 53.4],
+      [-2.9, 54],
+      [-3.6, 54.6],
+      [-4.8, 54.8],
+      [-5.1, 55.1],
+      [-4.7, 55.5],
+      [-5, 55.8],
+      [-5.6, 55.3],
+      [-5.6, 56.3],
+      [-6.1, 56.8],
+      [-5.8, 57.8],
+      [-5, 58.6],
+      [-4.2, 58.6],
+      [-3, 58.6]
+    ],
+    [
+      [41.6, 41.5],
+      [41.7, 42],
+      [41.5, 42.7],
+      [40.9, 43],
+      [40.3, 43.1],
+      [40, 43.4]
+    ],
+    [
+      [40, 43.4],
+      [40.1, 43.6]
+    ],
+    [
+      [40.1, 43.6],
+      [40.9, 43.4],
+      [42.4, 43.2],
+      [43.8, 42.7],
+      [43.9, 42.6],
+      [44.5, 42.7]
+    ],
+    [
+      [44.5, 42.7],
+      [45.5, 42.5]
+    ],
+    [
+      [45.5, 42.5],
+      [45.8, 42.1],
+      [46.4, 41.9]
+    ],
+    [
+      [43.6, 41.1],
+      [42.6, 41.6],
+      [41.6, 41.5]
+    ],
+    [
+      [1.1, 5.9],
+      [-0.5, 5.3],
+      [-1.1, 5],
+      [-2, 4.7],
+      [-2.9, 5]
+    ],
+    [
+      [0, 11],
+      [0, 10.7],
+      [0.4, 10.2],
+      [0.4, 9.5],
+      [0.5, 8.7],
+      [0.7, 8.3],
+      [0.5, 7.4],
+      [0.6, 6.9],
+      [0.8, 6.3],
+      [1.1, 5.9]
+    ],
+    [
+      [-8.4, 7.7],
+      [-8.7, 7.7],
+      [-8.9, 7.3],
+      [-9.2, 7.3],
+      [-9.4, 7.5],
+      [-9.3, 7.9],
+      [-9.8, 8.5],
+      [-10, 8.4],
+      [-10.2, 8.4]
+    ],
+    [
+      [-10.2, 8.4],
+      [-10.5, 8.4],
+      [-10.5, 8.7],
+      [-10.6, 9],
+      [-10.6, 9.3],
+      [-10.8, 9.7],
+      [-11.1, 10.1],
+      [-11.9, 10.1],
+      [-12.1, 9.9],
+      [-12.4, 9.8],
+      [-12.6, 9.6],
+      [-12.7, 9.3],
+      [-13.2, 8.9]
+    ],
+    [
+      [-13.2, 8.9],
+      [-13.7, 9.5],
+      [-14.1, 9.9],
+      [-14.3, 10],
+      [-14.6, 10.2],
+      [-14.7, 10.7],
+      [-14.8, 10.9],
+      [-15.1, 11]
+    ],
+    [
+      [-15.1, 11],
+      [-14.7, 11.5],
+      [-14.4, 11.5],
+      [-14.1, 11.7],
+      [-13.9, 11.7],
+      [-13.7, 11.8],
+      [-13.8, 12.1],
+      [-13.7, 12.3],
+      [-13.7, 12.6]
+    ],
+    [
+      [-13.7, 12.6],
+      [-13.2, 12.6],
+      [-12.5, 12.3],
+      [-12.3, 12.4],
+      [-12.2, 12.5],
+      [-11.7, 12.4],
+      [-11.5, 12.4]
+    ],
+    [
+      [-11.5, 12.4],
+      [-11.5, 12.1],
+      [-11.3, 12.1],
+      [-11, 12.2],
+      [-10.9, 12.2],
+      [-10.6, 11.9],
+      [-10.2, 11.8],
+      [-9.9, 12.1],
+      [-9.6, 12.2],
+      [-9.3, 12.3],
+      [-9.1, 12.3],
+      [-8.9, 12.1],
+      [-8.8, 11.8],
+      [-8.4, 11.4],
+      [-8.6, 11.1],
+      [-8.6, 10.8],
+      [-8.4, 10.9],
+      [-8.3, 10.8],
+      [-8.3, 10.5],
+      [-8, 10.2]
+    ],
+    [
+      [-16.8, 13.2],
+      [-16.7, 13.6]
+    ],
+    [
+      [-16.7, 13.6],
+      [-15.6, 13.6],
+      [-15.4, 13.9],
+      [-15.1, 13.9],
+      [-14.7, 13.6],
+      [-14.4, 13.6],
+      [-14, 13.8],
+      [-13.8, 13.5],
+      [-14.3, 13.3],
+      [-14.7, 13.3],
+      [-15.1, 13.5],
+      [-15.5, 13.3],
+      [-15.7, 13.3],
+      [-15.9, 13.1],
+      [-16.8, 13.2]
+    ],
+    [
+      [-15.1, 11],
+      [-15.7, 11.5],
+      [-16.1, 11.5],
+      [-16.3, 11.8],
+      [-16.3, 12],
+      [-16.6, 12.2],
+      [-16.7, 12.4]
+    ],
+    [
+      [-16.7, 12.4],
+      [-16.1, 12.6],
+      [-15.8, 12.5],
+      [-15.5, 12.6],
+      [-13.7, 12.6]
+    ],
+    [
+      [9.5, 1],
+      [9.3, 1.2],
+      [9.7, 2.3]
+    ],
+    [
+      [23.7, 35.7],
+      [24.3, 35.4],
+      [25, 35.4],
+      [25.8, 35.4],
+      [25.8, 35.2],
+      [26.3, 35.3],
+      [26.2, 35],
+      [24.7, 34.9],
+      [24.7, 35.1],
+      [23.5, 35.3],
+      [23.7, 35.7]
+    ],
+    [
+      [26.1, 40.8],
+      [25.5, 40.9],
+      [24.9, 41],
+      [23.7, 40.7],
+      [24.4, 40.1],
+      [23.9, 40],
+      [23.3, 40],
+      [22.8, 40.5],
+      [22.6, 40.3],
+      [22.9, 39.7],
+      [23.4, 39.2],
+      [23, 39],
+      [23.5, 38.5],
+      [24, 38.2],
+      [24, 37.7],
+      [23.1, 37.9],
+      [23.4, 37.4],
+      [22.8, 37.3],
+      [23.2, 36.4],
+      [22.5, 36.4],
+      [21.7, 36.8],
+      [21.3, 37.6],
+      [21.1, 38.3],
+      [20.7, 38.8],
+      [20.2, 39.3],
+      [20.2, 39.6]
+    ],
+    [
+      [21, 40.8],
+      [21.7, 40.9],
+      [22.1, 41.2],
+      [22.6, 41.1],
+      [22.8, 41.3],
+      [23, 41.3]
+    ],
+    [
+      [26.1, 41.8],
+      [26.6, 41.6],
+      [26.3, 40.9],
+      [26.1, 40.8]
+    ],
+    [
+      [-90.1, 13.7],
+      [-90.6, 13.9],
+      [-91.2, 13.9],
+      [-91.7, 14.1],
+      [-92.2, 14.5]
+    ],
+    [
+      [-92.2, 14.5],
+      [-92.2, 14.8],
+      [-92.1, 15.1],
+      [-92.2, 15.3],
+      [-91.7, 16.1],
+      [-90.5, 16.1],
+      [-90.4, 16.4],
+      [-90.6, 16.5],
+      [-90.7, 16.7],
+      [-91.1, 16.9],
+      [-91.4, 17.3],
+      [-91, 17.3],
+      [-91, 17.8],
+      [-90.1, 17.8],
+      [-89.1, 17.8]
+    ],
+    [
+      [-88.9, 15.9],
+      [-88.6, 15.7],
+      [-88.5, 15.9],
+      [-88.2, 15.7]
+    ],
+    [
+      [-88.2, 15.7],
+      [-88.7, 15.4],
+      [-89.1, 15.1],
+      [-89.2, 14.9],
+      [-89.1, 14.7],
+      [-89.3, 14.4]
+    ],
+    [
+      [-89.3, 14.4],
+      [-89.6, 14.4],
+      [-89.5, 14.2],
+      [-89.7, 14.1],
+      [-90.1, 13.9],
+      [-90.1, 13.7]
+    ],
+    [
+      [-59.8, 8.4],
+      [-59.1, 8],
+      [-58.5, 7.4],
+      [-58.4, 6.8],
+      [-58.1, 6.8],
+      [-57.5, 6.3],
+      [-57.1, 6]
+    ],
+    [
+      [-57.1, 6],
+      [-57.3, 5.1],
+      [-57.9, 4.8],
+      [-57.9, 4.6],
+      [-58, 4.1],
+      [-57.6, 3.3],
+      [-57.3, 3.3],
+      [-57.1, 2.8],
+      [-56.5, 1.9]
+    ],
+    [
+      [-60.7, 5.2],
+      [-61.4, 6],
+      [-61.1, 6.2],
+      [-61.2, 6.7],
+      [-60.5, 6.9],
+      [-60.3, 7],
+      [-60.6, 7.4],
+      [-60.5, 7.8],
+      [-59.8, 8.4]
+    ],
+    [
+      [-87.3, 13],
+      [-87.5, 13.3],
+      [-87.8, 13.4]
+    ],
+    [
+      [-87.8, 13.4],
+      [-87.7, 13.8],
+      [-87.9, 13.9],
+      [-88.1, 14],
+      [-88.5, 13.9],
+      [-88.5, 14],
+      [-88.8, 14.1],
+      [-89.1, 14.3],
+      [-89.3, 14.4]
+    ],
+    [
+      [-88.2, 15.7],
+      [-88.1, 15.7],
+      [-87.9, 15.9],
+      [-87.6, 15.9],
+      [-87.5, 15.8],
+      [-87.4, 15.9],
+      [-86.9, 15.8],
+      [-86.4, 15.8],
+      [-86.1, 15.9],
+      [-86, 16],
+      [-85.7, 16],
+      [-85.4, 15.9],
+      [-85.2, 15.9],
+      [-85, 16],
+      [-84.5, 15.9],
+      [-84.4, 15.8],
+      [-84.1, 15.7],
+      [-83.8, 15.4],
+      [-83.4, 15.3],
+      [-83.1, 15]
+    ],
+    [
+      [-83.1, 15],
+      [-83.5, 15],
+      [-83.6, 14.9],
+      [-84, 14.8],
+      [-84.2, 14.8],
+      [-84.4, 14.6],
+      [-84.6, 14.7],
+      [-84.8, 14.8],
+      [-84.9, 14.8],
+      [-85, 14.6],
+      [-85.1, 14.6],
+      [-85.2, 14.4],
+      [-85.5, 14.1],
+      [-85.7, 14],
+      [-85.8, 13.8],
+      [-86.1, 14],
+      [-86.3, 13.8],
+      [-86.5, 13.8],
+      [-86.8, 13.8],
+      [-86.7, 13.3],
+      [-86.9, 13.3],
+      [-87, 13],
+      [-87.3, 13]
+    ],
+    [
+      [18.8, 45.9],
+      [19.1, 45.5]
+    ],
+    [
+      [19.1, 45.5],
+      [19.4, 45.2]
+    ],
+    [
+      [19.4, 45.2],
+      [19, 44.9]
+    ],
+    [
+      [18.6, 42.7],
+      [18.5, 42.5],
+      [17.5, 42.9],
+      [16.9, 43.2],
+      [16, 43.5],
+      [15.2, 44.2],
+      [15.4, 44.3],
+      [14.9, 44.7],
+      [14.9, 45.1],
+      [14.3, 45.2],
+      [14, 44.8],
+      [13.7, 45.1],
+      [13.7, 45.5],
+      [13.7, 45.5]
+    ],
+    [
+      [13.7, 45.5],
+      [14.4, 45.5],
+      [14.6, 45.6],
+      [14.9, 45.5],
+      [15.3, 45.5],
+      [15.3, 45.7],
+      [15.7, 45.8],
+      [15.8, 46.2],
+      [16.6, 46.5]
+    ],
+    [
+      [16.6, 46.5],
+      [16.9, 46.4],
+      [17.6, 46],
+      [18.5, 45.8],
+      [18.8, 45.9]
+    ],
+    [
+      [-71.7, 18],
+      [-72.4, 18.2],
+      [-72.8, 18.2],
+      [-73.4, 18.2],
+      [-73.9, 18],
+      [-74.5, 18.3],
+      [-74.4, 18.7],
+      [-73.4, 18.5],
+      [-72.7, 18.5],
+      [-72.3, 18.7],
+      [-72.8, 19.1],
+      [-72.8, 19.5],
+      [-73.4, 19.6],
+      [-73.2, 19.9],
+      [-72.6, 19.9],
+      [-71.7, 19.7]
+    ],
+    [
+      [17, 48.1],
+      [17.5, 47.9],
+      [17.9, 47.8],
+      [18.7, 47.9],
+      [18.8, 48.1],
+      [19.2, 48.1],
+      [19.7, 48.3],
+      [19.8, 48.2],
+      [20.2, 48.3],
+      [20.5, 48.6],
+      [20.8, 48.6],
+      [21.9, 48.3],
+      [22.1, 48.4]
+    ],
+    [
+      [22.1, 48.4],
+      [22.6, 48.2],
+      [22.7, 47.9]
+    ],
+    [
+      [22.7, 47.9],
+      [22.1, 47.7],
+      [21.6, 47],
+      [21, 46.3],
+      [20.2, 46.1]
+    ],
+    [
+      [20.2, 46.1],
+      [19.6, 46.2]
+    ],
+    [
+      [19.6, 46.2],
+      [18.8, 45.9]
+    ],
+    [
+      [16.6, 46.5],
+      [16.4, 46.8],
+      [16.2, 46.9]
+    ],
+    [
+      [120.7, -10.2],
+      [120.3, -10.3],
+      [119, -9.6],
+      [119.9, -9.4],
+      [120.4, -9.7],
+      [120.8, -10],
+      [120.7, -10.2]
+    ],
+    [
+      [125, -8.9],
+      [125.1, -9.1],
+      [125.1, -9.4]
+    ],
+    [
+      [125.1, -9.4],
+      [124.4, -10.1],
+      [123.6, -10.4],
+      [123.5, -10.2],
+      [123.6, -9.9],
+      [124, -9.3],
+      [125, -8.9]
+    ],
+    [
+      [117.9, -8.1],
+      [118.3, -8.4],
+      [118.9, -8.3],
+      [119.1, -8.7],
+      [118, -8.9],
+      [117.3, -9],
+      [116.7, -9],
+      [117.1, -8.5],
+      [117.6, -8.4],
+      [117.9, -8.1]
+    ],
+    [
+      [122.9, -8.1],
+      [122.8, -8.6],
+      [121.3, -8.9],
+      [119.9, -8.8],
+      [119.9, -8.4],
+      [120.7, -8.2],
+      [121.3, -8.5],
+      [122, -8.5],
+      [122.9, -8.1]
+    ],
+    [
+      [108.6, -6.8],
+      [110.5, -6.9],
+      [110.8, -6.5],
+      [112.6, -6.9],
+      [113, -7.6],
+      [114.5, -7.8],
+      [115.7, -8.4],
+      [114.6, -8.7],
+      [113.5, -8.3],
+      [112.6, -8.4],
+      [111.5, -8.3],
+      [110.6, -8.1],
+      [109.4, -7.7],
+      [108.7, -7.6],
+      [108.3, -7.8],
+      [106.5, -7.3],
+      [106.3, -6.9],
+      [105.4, -6.8],
+      [106.1, -5.9],
+      [107.3, -5.9],
+      [108.1, -6.3],
+      [108.5, -6.4],
+      [108.6, -6.8]
+    ],
+    [
+      [134.7, -6.2],
+      [134.2, -6.9],
+      [134.1, -6.1],
+      [134.3, -5.8],
+      [134.5, -5.4],
+      [134.7, -5.7],
+      [134.7, -6.2]
+    ],
+    [
+      [127.3, -3.5],
+      [126.9, -3.8],
+      [126.2, -3.6],
+      [126, -3.2],
+      [127, -3.1],
+      [127.3, -3.5]
+    ],
+    [
+      [130.5, -3.1],
+      [130.8, -3.9],
+      [130, -3.4],
+      [129.2, -3.4],
+      [128.6, -3.4],
+      [127.9, -3.4],
+      [128.1, -2.8],
+      [129.4, -2.8],
+      [130.5, -3.1]
+    ],
+    [
+      [141, -2.6],
+      [141, -5.9],
+      [141, -9.1]
+    ],
+    [
+      [141, -9.1],
+      [140.1, -8.3],
+      [139.1, -8.1],
+      [138.9, -8.4],
+      [137.6, -8.4],
+      [138, -7.6],
+      [138.7, -7.3],
+      [138.4, -6.2],
+      [137.9, -5.4],
+      [136, -4.5],
+      [135.2, -4.5],
+      [133.7, -3.5],
+      [133.4, -4],
+      [133, -4.1],
+      [132.8, -3.7],
+      [132.8, -3.3],
+      [132, -2.8],
+      [133.1, -2.5],
+      [133.8, -2.5],
+      [133.7, -2.2],
+      [132.2, -2.2],
+      [131.8, -1.6],
+      [130.9, -1.4],
+      [130.5, -0.9],
+      [131.9, -0.7],
+      [132.4, -0.4],
+      [134, -0.8],
+      [134.1, -1.1],
+      [134.4, -2.8],
+      [135.5, -3.4],
+      [136.3, -2.3],
+      [137.4, -1.7],
+      [138.3, -1.7],
+      [139.2, -2],
+      [139.9, -2.4],
+      [141, -2.6]
+    ],
+    [
+      [125.2, 1.4],
+      [124.4, 0.4],
+      [123.7, 0.2],
+      [122.7, 0.4],
+      [121.1, 0.4],
+      [120.2, 0.2],
+      [120, -0.5],
+      [120.9, -1.4],
+      [121.5, -1],
+      [123.3, -0.6],
+      [123.3, -1.1],
+      [122.8, -0.9],
+      [122.4, -1.5],
+      [121.5, -1.9],
+      [122.5, -3.2],
+      [122.3, -3.5],
+      [123.2, -4.7],
+      [123.2, -5.3],
+      [122.6, -5.6],
+      [122.2, -5.3],
+      [122.7, -4.5],
+      [121.7, -4.8],
+      [121.5, -4.6],
+      [121.6, -4.2],
+      [120.9, -3.6],
+      [121, -2.6],
+      [120.3, -2.9],
+      [120.4, -4.1],
+      [120.4, -5.5],
+      [119.8, -5.7],
+      [119.4, -5.4],
+      [119.7, -4.5],
+      [119.5, -3.5],
+      [119.1, -3.5],
+      [118.8, -2.8],
+      [119.2, -2.1],
+      [119.3, -1.3],
+      [119.8, 0.2],
+      [120, 0.6],
+      [120.9, 1.3],
+      [121.7, 1],
+      [122.9, 0.9],
+      [124.1, 0.9],
+      [125.1, 1.6],
+      [125.2, 1.4]
+    ],
+    [
+      [128.7, 1.1],
+      [128.6, 0.3],
+      [128.1, 0.4],
+      [128, -0.2],
+      [128.4, -0.8],
+      [128.1, -0.9],
+      [127.7, -0.3],
+      [127.4, 1],
+      [127.6, 1.8],
+      [127.9, 2.2],
+      [128, 1.6],
+      [128.6, 1.5],
+      [128.7, 1.1]
+    ],
+    [
+      [109.7, 2],
+      [109.8, 1.3],
+      [110.5, 0.8],
+      [111.2, 1],
+      [111.8, 0.9],
+      [112.4, 1.4],
+      [112.9, 1.5],
+      [113.8, 1.2],
+      [114.6, 1.4],
+      [115.1, 2.8],
+      [115.5, 3.2],
+      [115.9, 4.3],
+      [117, 4.3],
+      [117.9, 4.1]
+    ],
+    [
+      [117.9, 4.1],
+      [117.3, 3.2],
+      [118.1, 2.3],
+      [117.9, 1.8],
+      [119, 0.9],
+      [117.8, 0.8],
+      [117.5, 0.1],
+      [117.5, -0.8],
+      [116.6, -1.5],
+      [116.5, -2.5],
+      [116.2, -4],
+      [116, -3.7],
+      [114.9, -4.1],
+      [114.5, -3.5],
+      [113.8, -3.4],
+      [113.3, -3.1],
+      [112.1, -3.5],
+      [111.7, -3],
+      [111.1, -3],
+      [110.2, -2.9],
+      [110.1, -1.6],
+      [109.6, -1.3],
+      [109.1, -0.5],
+      [109, 0.4],
+      [109.1, 1.3],
+      [109.7, 2]
+    ],
+    [
+      [105.8, -5.8],
+      [104.7, -5.9],
+      [103.9, -5],
+      [102.6, -4.2],
+      [102.2, -3.6],
+      [101.4, -2.8],
+      [100.9, -2],
+      [100.1, -0.6],
+      [99.3, 0.2],
+      [99, 1],
+      [98.6, 1.8],
+      [97.7, 2.5],
+      [97.2, 3.3],
+      [96.4, 3.9],
+      [95.4, 5],
+      [95.3, 5.5],
+      [95.9, 5.4],
+      [97.5, 5.3],
+      [98.4, 4.3],
+      [99.1, 3.6],
+      [99.7, 3.2],
+      [100.6, 2.1],
+      [101.7, 2.1],
+      [102.5, 1.4],
+      [103.1, 0.6],
+      [103.8, 0.1],
+      [103.4, -0.7],
+      [104, -1.1],
+      [104.4, -1.1],
+      [104.5, -1.8],
+      [104.9, -2.3],
+      [105.6, -2.4],
+      [106.1, -3.1],
+      [105.9, -4.3],
+      [105.8, -5.8]
+    ],
+    [
+      [81.1, 30.2],
+      [80.5, 29.7],
+      [80.1, 28.8],
+      [81.1, 28.4],
+      [82, 27.9],
+      [83.3, 27.4],
+      [84.7, 27.2],
+      [85.3, 26.7],
+      [86, 26.6],
+      [87.2, 26.4],
+      [88.1, 26.4],
+      [88.2, 26.8],
+      [88, 27.5],
+      [88.1, 27.9]
+    ],
+    [
+      [97.3, 28.3],
+      [97.4, 27.9],
+      [97.1, 27.7],
+      [97.1, 27.1],
+      [96.4, 27.3],
+      [95.1, 26.6],
+      [95.2, 26],
+      [94.6, 25.2],
+      [94.6, 24.7],
+      [94.1, 23.9],
+      [93.3, 24.1],
+      [93.3, 23],
+      [93.1, 22.7],
+      [93.2, 22.3],
+      [92.7, 22]
+    ],
+    [
+      [89, 22.1],
+      [88.9, 21.7],
+      [88.2, 21.7],
+      [87, 21.5],
+      [87, 20.7],
+      [86.5, 20.2],
+      [85.1, 19.5],
+      [83.9, 18.3],
+      [83.2, 17.7],
+      [82.2, 17],
+      [82.2, 16.6],
+      [81.7, 16.3],
+      [80.8, 16],
+      [80.3, 15.9],
+      [80, 15.1],
+      [80.2, 13.8],
+      [80.3, 13],
+      [79.9, 12.1],
+      [79.9, 10.4],
+      [79.3, 10.3],
+      [78.9, 9.6],
+      [79.2, 9.2],
+      [78.3, 8.9],
+      [77.9, 8.3],
+      [77.5, 8],
+      [76.6, 8.9],
+      [76.1, 10.3],
+      [75.8, 11.3],
+      [75.4, 11.8],
+      [74.9, 12.7],
+      [74.6, 14],
+      [74.4, 14.6],
+      [73.5, 16],
+      [73.1, 17.9],
+      [72.8, 19.2],
+      [72.8, 20.4],
+      [72.6, 21.4],
+      [71.2, 20.8],
+      [70.5, 20.9],
+      [69.2, 22.1],
+      [69.6, 22.5],
+      [69.4, 22.8],
+      [68.2, 23.7]
+    ],
+    [
+      [68.2, 23.7],
+      [68.8, 24.4],
+      [71, 24.4],
+      [70.8, 25.2],
+      [70.3, 25.7],
+      [70.2, 26.5],
+      [69.5, 26.9],
+      [70.6, 28],
+      [71.8, 27.9],
+      [72.8, 29],
+      [73.5, 30],
+      [74.4, 31],
+      [74.4, 31.7],
+      [75.3, 32.3],
+      [74.5, 32.8],
+      [74.1, 33.4],
+      [73.8, 34.3],
+      [74.2, 34.8],
+      [75.8, 34.5],
+      [76.9, 34.7],
+      [77.8, 35.5]
+    ],
+    [
+      [-6.2, 53.9],
+      [-6, 53.2],
+      [-6.8, 52.3],
+      [-8.6, 51.7],
+      [-10, 51.8],
+      [-9.2, 52.9],
+      [-9.7, 53.9],
+      [-8.3, 54.7],
+      [-7.6, 55.1]
+    ],
+    [
+      [53.9, 37.2],
+      [54.8, 37.4],
+      [55.5, 38],
+      [56.2, 37.9],
+      [56.6, 38.1],
+      [57.3, 38],
+      [58.4, 37.5],
+      [59.2, 37.4],
+      [60.4, 36.5],
+      [61.1, 36.5],
+      [61.2, 35.7]
+    ],
+    [
+      [60.9, 29.8],
+      [61.4, 29.3],
+      [61.8, 28.7],
+      [62.7, 28.3],
+      [62.8, 27.4],
+      [63.2, 27.2],
+      [63.3, 26.8],
+      [61.9, 26.2],
+      [61.5, 25.1]
+    ],
+    [
+      [61.5, 25.1],
+      [59.6, 25.4],
+      [58.5, 25.6],
+      [57.4, 25.7],
+      [57, 27],
+      [56.5, 27.1],
+      [55.7, 27],
+      [54.7, 26.5],
+      [53.5, 26.8],
+      [52.5, 27.6],
+      [51.5, 27.9],
+      [50.9, 28.8],
+      [50.1, 30.2],
+      [49.6, 30],
+      [48.9, 30.3],
+      [48.6, 29.9]
+    ],
+    [
+      [48.6, 29.9],
+      [48, 30.5],
+      [48, 31],
+      [47.7, 31],
+      [47.9, 31.7],
+      [47.3, 32.5],
+      [46.1, 33],
+      [45.4, 34],
+      [45.7, 34.8],
+      [46.2, 35.1],
+      [46.1, 35.7],
+      [45.4, 36]
+    ],
+    [
+      [45.4, 36],
+      [44.8, 37.2],
+      [44.2, 38]
+    ],
+    [
+      [44.2, 38],
+      [44.4, 38.3],
+      [44.1, 39.4],
+      [44.8, 39.7]
+    ],
+    [
+      [48.9, 38.3],
+      [49.2, 37.6],
+      [50.2, 37.4],
+      [50.8, 36.9],
+      [52.3, 36.7],
+      [53.8, 37],
+      [53.9, 37.2]
+    ],
+    [
+      [48.6, 29.9],
+      [48, 30]
+    ],
+    [
+      [48, 30],
+      [47.3, 30.1],
+      [46.6, 29.1]
+    ],
+    [
+      [46.6, 29.1],
+      [44.7, 29.2],
+      [41.9, 31.2],
+      [40.4, 31.9],
+      [39.2, 32.2]
+    ],
+    [
+      [39.2, 32.2],
+      [38.8, 33.4]
+    ],
+    [
+      [38.8, 33.4],
+      [41, 34.4],
+      [41.4, 35.6],
+      [41.3, 36.4],
+      [41.8, 36.6],
+      [42.4, 37.2]
+    ],
+    [
+      [42.4, 37.2],
+      [42.8, 37.4],
+      [43.9, 37.3],
+      [44.3, 37],
+      [44.8, 37.2]
+    ],
+    [
+      [44.8, 37.2],
+      [45.4, 36]
+    ],
+    [
+      [-14.5, 66.5],
+      [-14.7, 65.8],
+      [-13.6, 65.1],
+      [-14.9, 64.4],
+      [-17.8, 63.7],
+      [-18.7, 63.5],
+      [-20, 63.6],
+      [-22.8, 64],
+      [-21.8, 64.4],
+      [-24, 64.9],
+      [-22.2, 65.1],
+      [-22.2, 65.4],
+      [-24.3, 65.6],
+      [-23.6, 66.3],
+      [-22.1, 66.4],
+      [-20.6, 65.7],
+      [-19.1, 66.3],
+      [-17.8, 66],
+      [-16.2, 66.5],
+      [-14.5, 66.5]
+    ],
+    [
+      [35.7, 32.7],
+      [35.6, 32.4]
+    ],
+    [
+      [35.6, 32.4],
+      [35.2, 32.5],
+      [35, 31.9],
+      [35.2, 31.8],
+      [35, 31.6],
+      [34.9, 31.4],
+      [35.4, 31.5]
+    ],
+    [
+      [35.4, 31.5],
+      [35.4, 31.1],
+      [34.9, 29.5]
+    ],
+    [
+      [34.9, 29.5],
+      [34.3, 31.2],
+      [34.6, 31.6],
+      [34.5, 31.6],
+      [34.8, 32.1],
+      [35, 32.8],
+      [35.1, 33.1],
+      [35.1, 33.1]
+    ],
+    [
+      [35.1, 33.1],
+      [35.5, 33.1],
+      [35.6, 33.3],
+      [35.8, 33.3]
+    ],
+    [
+      [35.8, 33.3],
+      [35.8, 32.9],
+      [35.7, 32.7],
+      [35.7, 32.7]
+    ],
+    [
+      [15.5, 38.2],
+      [15.2, 37.4],
+      [15.3, 37.1],
+      [15.1, 36.6],
+      [14.3, 37],
+      [13.8, 37.1],
+      [12.4, 37.6],
+      [12.6, 38.1],
+      [13.7, 38],
+      [14.8, 38.1],
+      [15.5, 38.2]
+    ],
+    [
+      [9.2, 41.2],
+      [9.8, 40.5],
+      [9.7, 39.2],
+      [9.2, 39.2],
+      [8.8, 38.9],
+      [8.4, 39.2],
+      [8.4, 40.4],
+      [8.2, 41],
+      [8.7, 40.9],
+      [9.2, 41.2]
+    ],
+    [
+      [13.8, 46.5],
+      [13.7, 46],
+      [13.9, 45.6]
+    ],
+    [
+      [13.9, 45.6],
+      [13.1, 45.7],
+      [12.3, 45.4],
+      [12.4, 44.9],
+      [12.3, 44.6],
+      [12.6, 44.1],
+      [13.5, 43.6],
+      [14, 42.8],
+      [15.1, 42],
+      [15.9, 42],
+      [16.2, 41.7],
+      [15.9, 41.5],
+      [16.8, 41.2],
+      [17.5, 40.9],
+      [18.4, 40.4],
+      [18.5, 40.2],
+      [18.3, 39.8],
+      [17.7, 40.3],
+      [16.9, 40.4],
+      [16.5, 39.8],
+      [17.2, 39.4],
+      [17.1, 38.9],
+      [16.6, 38.8],
+      [16.1, 38],
+      [15.7, 37.9],
+      [15.7, 38.2],
+      [15.9, 38.8],
+      [16.1, 39],
+      [15.7, 39.5],
+      [15.4, 40.1],
+      [15, 40.2],
+      [14.7, 40.6],
+      [14.1, 40.8],
+      [13.6, 41.2],
+      [12.9, 41.3],
+      [12.1, 41.7],
+      [11.2, 42.4],
+      [10.5, 42.9],
+      [10.2, 43.9],
+      [9.7, 44],
+      [8.9, 44.4],
+      [8.4, 44.2],
+      [7.9, 43.8],
+      [7.4, 43.7]
+    ],
+    [
+      [-77.6, 18.5],
+      [-76.9, 18.4],
+      [-76.4, 18.2],
+      [-76.2, 17.9],
+      [-76.9, 17.9],
+      [-77.2, 17.7],
+      [-77.8, 17.9],
+      [-78.3, 18.2],
+      [-78.2, 18.5],
+      [-77.8, 18.5],
+      [-77.6, 18.5]
+    ],
+    [
+      [35.7, 32.7],
+      [36.8, 32.3],
+      [38.8, 33.4]
+    ],
+    [
+      [39.2, 32.2],
+      [39, 32],
+      [37, 31.5],
+      [38, 30.5],
+      [37.7, 30.3],
+      [37.5, 30],
+      [36.7, 29.9],
+      [36.5, 29.5],
+      [36.1, 29.2],
+      [35, 29.4]
+    ],
+    [
+      [35, 29.4],
+      [34.9, 29.5]
+    ],
+    [
+      [35.4, 31.5],
+      [35.6, 31.8],
+      [35.6, 32.4]
+    ],
+    [
+      [134.6, 34.2],
+      [134.8, 33.8],
+      [134.2, 33.2],
+      [133.8, 33.5],
+      [133.3, 33.3],
+      [133, 32.7],
+      [132.4, 33],
+      [132.4, 33.5],
+      [132.9, 34.1],
+      [133.5, 33.9],
+      [133.9, 34.4],
+      [134.6, 34.2]
+    ],
+    [
+      [141, 37.1],
+      [140.6, 36.3],
+      [140.8, 35.8],
+      [140.3, 35.1],
+      [139, 34.7],
+      [137.2, 34.6],
+      [135.8, 33.5],
+      [135.1, 33.9],
+      [135.1, 34.6],
+      [133.3, 34.4],
+      [132.2, 33.9],
+      [131, 33.9],
+      [132, 33.2],
+      [131.3, 31.5],
+      [130.7, 31],
+      [130.2, 31.4],
+      [130.5, 32.3],
+      [129.8, 32.6],
+      [129.4, 33.3],
+      [130.4, 33.6],
+      [130.9, 34.2],
+      [131.9, 34.8],
+      [132.6, 35.4],
+      [134.6, 35.7],
+      [135.7, 35.5],
+      [136.7, 37.3],
+      [137.4, 36.8],
+      [138.9, 37.8],
+      [139.4, 38.2],
+      [140.1, 39.4],
+      [139.9, 40.6],
+      [140.3, 41.2],
+      [141.4, 41.4],
+      [141.9, 40],
+      [141.9, 39.2],
+      [141, 38.2],
+      [141, 37.1]
+    ],
+    [
+      [143.9, 44.2],
+      [144.6, 44],
+      [145.3, 44.4],
+      [145.5, 43.3],
+      [144.1, 43],
+      [143.2, 42],
+      [141.6, 42.7],
+      [141.1, 41.6],
+      [140, 41.6],
+      [139.8, 42.6],
+      [140.3, 43.3],
+      [141.4, 43.4],
+      [141.7, 44.8],
+      [142, 45.6],
+      [143.1, 44.5],
+      [143.9, 44.2]
+    ],
+    [
+      [71, 42.3],
+      [70.4, 42.1],
+      [69.1, 41.4],
+      [68.6, 40.7],
+      [68.3, 40.7],
+      [68, 41.1],
+      [66.7, 41.2],
+      [66.5, 42],
+      [66, 42],
+      [66.1, 43],
+      [64.9, 43.7],
+      [63.2, 43.7],
+      [62, 43.5],
+      [61.1, 44.4],
+      [60.2, 44.8],
+      [58.7, 45.5],
+      [58.5, 45.6],
+      [55.9, 45],
+      [56, 41.3]
+    ],
+    [
+      [56, 41.3],
+      [55.5, 41.3],
+      [54.8, 42],
+      [54.1, 42.3],
+      [52.9, 42.1],
+      [52.5, 41.8]
+    ],
+    [
+      [52.5, 41.8],
+      [52.5, 42],
+      [52.7, 42.4],
+      [52.5, 42.8],
+      [51.3, 43.1],
+      [50.9, 44],
+      [50.3, 44.3],
+      [50.3, 44.6],
+      [51.3, 44.5],
+      [51.3, 45.3],
+      [52.2, 45.4],
+      [53, 45.3],
+      [53.2, 46.2],
+      [53, 46.9],
+      [52, 46.8],
+      [51.2, 47.1],
+      [50, 46.6],
+      [49.1, 46.4]
+    ],
+    [
+      [49.1, 46.4],
+      [48.6, 46.6],
+      [48.7, 47.1]
+    ],
+    [
+      [48.7, 47.1],
+      [48.1, 47.7],
+      [47.3, 47.7],
+      [46.5, 48.4]
+    ],
+    [
+      [46.5, 48.4],
+      [47, 49.2],
+      [46.8, 49.4],
+      [47.6, 50.5],
+      [48.6, 49.9],
+      [48.7, 50.6],
+      [50.8, 51.7],
+      [52.3, 51.7],
+      [54.5, 51]
+    ],
+    [
+      [54.5, 51],
+      [55.7, 50.6],
+      [56.8, 51],
+      [58.4, 51.1],
+      [59.6, 50.6]
+    ],
+    [
+      [59.6, 50.6],
+      [59.9, 50.8],
+      [61.3, 50.8],
+      [61.6, 51.3],
+      [60, 52],
+      [60.9, 52.5],
+      [60.7, 52.7],
+      [61.7, 53],
+      [61, 53.7]
+    ],
+    [
+      [61, 53.7],
+      [61.4, 54],
+      [65.2, 54.4]
+    ],
+    [
+      [65.2, 54.4],
+      [65.7, 54.6],
+      [68.2, 55]
+    ],
+    [
+      [68.2, 55],
+      [69.1, 55.4],
+      [70.9, 55.2],
+      [71.2, 54.1],
+      [72.2, 54.4],
+      [73.5, 54],
+      [73.4, 53.5]
+    ],
+    [
+      [73.4, 53.5],
+      [74.4, 53.6],
+      [76.9, 54.5]
+    ],
+    [
+      [76.9, 54.5],
+      [76.5, 54.2],
+      [77.8, 53.4],
+      [80, 50.9],
+      [80.6, 51.4],
+      [82, 50.8],
+      [83.4, 51.1],
+      [83.9, 50.9],
+      [84.4, 50.3],
+      [85.1, 50.1],
+      [85.5, 49.7],
+      [86.8, 49.8],
+      [87.4, 49.2]
+    ],
+    [
+      [80.3, 42.4],
+      [79.6, 42.5],
+      [79.1, 42.9],
+      [77.7, 43],
+      [76, 43],
+      [75.6, 42.9],
+      [74.2, 43.3],
+      [73.7, 43.1],
+      [73.5, 42.5],
+      [71.8, 42.9],
+      [71.2, 42.7],
+      [71, 42.3]
+    ],
+    [
+      [41.6, -1.7],
+      [40.9, -2.1],
+      [40.6, -2.5],
+      [40.3, -2.6],
+      [40.1, -3.3],
+      [39.8, -3.7],
+      [39.6, -4.3],
+      [39.2, -4.7]
+    ],
+    [
+      [39.2, -4.7],
+      [37.8, -3.7],
+      [37.7, -3.1],
+      [34.1, -1.1],
+      [33.9, -0.9]
+    ],
+    [
+      [33.9, -0.9],
+      [33.9, 0.1],
+      [34.2, 0.5],
+      [34.7, 1.2],
+      [35, 1.9],
+      [34.6, 3.1],
+      [34.5, 3.6],
+      [34, 4.3]
+    ],
+    [
+      [34, 4.3],
+      [34.6, 4.9],
+      [35.3, 5.5]
+    ],
+    [
+      [41.9, 3.9],
+      [41, 2.8],
+      [41, -0.9],
+      [41.6, -1.7]
+    ],
+    [
+      [73.7, 39.4],
+      [71.8, 39.3],
+      [70.6, 39.6],
+      [69.5, 39.5],
+      [69.6, 40.1],
+      [70.7, 39.9],
+      [71, 40.2]
+    ],
+    [
+      [71, 40.2],
+      [71.8, 40.2],
+      [73.1, 40.9],
+      [71.9, 41.4],
+      [71.2, 41.1],
+      [70.4, 41.5],
+      [71.3, 42.2],
+      [71, 42.3]
+    ],
+    [
+      [102.6, 12.2],
+      [102.4, 13.4],
+      [103, 14.2],
+      [104.3, 14.4],
+      [105.2, 14.3]
+    ],
+    [
+      [105.2, 14.3],
+      [106, 13.9],
+      [106.5, 14.6],
+      [107.4, 14.2]
+    ],
+    [
+      [107.4, 14.2],
+      [107.6, 13.5],
+      [107.5, 12.3],
+      [105.8, 11.6],
+      [106.3, 11],
+      [105.2, 10.9],
+      [104.3, 10.5]
+    ],
+    [
+      [104.3, 10.5],
+      [103.5, 10.6],
+      [103.1, 11.2],
+      [102.6, 12.2]
+    ],
+    [
+      [128.4, 38.6],
+      [129.2, 37.4],
+      [129.5, 36.8],
+      [129.5, 35.6],
+      [129.1, 35.1],
+      [128.2, 34.9],
+      [127.4, 34.5],
+      [126.5, 34.4],
+      [126.4, 34.9],
+      [126.6, 35.7],
+      [126.1, 36.7],
+      [126.9, 36.9],
+      [126.2, 37.8]
+    ],
+    [
+      [126.2, 37.8],
+      [126.7, 37.8],
+      [127.1, 38.3],
+      [127.8, 38.3],
+      [128.2, 38.4],
+      [128.4, 38.6]
+    ],
+    [
+      [20.6, 41.9],
+      [20.5, 42.2]
+    ],
+    [
+      [20.5, 42.2],
+      [20.3, 42.3],
+      [20.1, 42.6]
+    ],
+    [
+      [20.1, 42.6],
+      [20.3, 42.8]
+    ],
+    [
+      [20.3, 42.8],
+      [20.5, 42.9],
+      [20.6, 43.2],
+      [20.8, 43.3],
+      [21, 43.1],
+      [21.1, 43.1],
+      [21.3, 42.9],
+      [21.4, 42.9],
+      [21.6, 42.7],
+      [21.8, 42.7],
+      [21.7, 42.4],
+      [21.5, 42.3],
+      [21.6, 42.3]
+    ],
+    [
+      [21.6, 42.3],
+      [21.4, 42.2],
+      [20.8, 42.1],
+      [20.7, 41.9],
+      [20.6, 41.9]
+    ],
+    [
+      [48, 30],
+      [48.2, 29.5],
+      [48.1, 29.3],
+      [48.4, 28.6]
+    ],
+    [
+      [48.4, 28.6],
+      [47.7, 28.5],
+      [47.5, 29],
+      [46.6, 29.1]
+    ],
+    [
+      [105.2, 14.3],
+      [105.5, 14.7],
+      [105.6, 15.6],
+      [104.8, 16.4],
+      [104.7, 17.4],
+      [104, 18.2],
+      [103.2, 18.3],
+      [103, 18],
+      [102.4, 17.9],
+      [102.1, 18.1],
+      [101.1, 17.5],
+      [101, 18.4],
+      [101.3, 19.5],
+      [100.6, 19.5],
+      [100.6, 20.1],
+      [100.1, 20.4]
+    ],
+    [
+      [100.1, 20.4],
+      [100.3, 20.8],
+      [101.2, 21.4]
+    ],
+    [
+      [102.2, 22.5],
+      [102.8, 21.7],
+      [103.2, 20.8],
+      [104.4, 20.8],
+      [104.8, 19.9],
+      [104.2, 19.6],
+      [103.9, 19.3],
+      [105.1, 18.7],
+      [105.9, 17.5],
+      [106.6, 16.6],
+      [107.3, 15.9],
+      [107.6, 15.2],
+      [107.4, 14.2]
+    ],
+    [
+      [35.1, 33.1],
+      [35.5, 33.9],
+      [36, 34.6],
+      [36, 34.6]
+    ],
+    [
+      [36, 34.6],
+      [36.5, 34.6],
+      [36.6, 34.2],
+      [36.1, 33.8],
+      [35.8, 33.3]
+    ],
+    [
+      [-7.7, 4.4],
+      [-8, 4.4],
+      [-9, 4.8],
+      [-9.9, 5.6],
+      [-10.8, 6.1],
+      [-11.4, 6.8]
+    ],
+    [
+      [-11.4, 6.8],
+      [-11.2, 7.1],
+      [-11.1, 7.4],
+      [-10.7, 7.9],
+      [-10.2, 8.4]
+    ],
+    [
+      [14.9, 22.9],
+      [14.1, 22.5],
+      [13.6, 23],
+      [12, 23.5]
+    ],
+    [
+      [9.5, 30.3],
+      [10, 30.5],
+      [10.1, 31],
+      [10, 31.4],
+      [10.6, 31.8],
+      [10.9, 32.1],
+      [11.4, 32.4],
+      [11.5, 33.1]
+    ],
+    [
+      [11.5, 33.1],
+      [12.7, 32.8],
+      [13.1, 32.9],
+      [13.9, 32.7],
+      [15.3, 32.3],
+      [15.7, 31.4],
+      [16.6, 31.2],
+      [18, 30.8],
+      [19.1, 30.3],
+      [19.6, 30.5],
+      [20.1, 31],
+      [19.8, 31.8],
+      [20.1, 32.2],
+      [20.9, 32.7],
+      [21.5, 32.8],
+      [22.9, 32.6],
+      [23.2, 32.2],
+      [23.6, 32.2],
+      [23.9, 32],
+      [24.9, 31.9],
+      [25.2, 31.6]
+    ],
+    [
+      [25, 22],
+      [25, 20],
+      [23.9, 20],
+      [23.8, 19.6]
+    ],
+    [
+      [23.8, 19.6],
+      [19.9, 21.5],
+      [15.9, 23.4],
+      [14.9, 22.9]
+    ],
+    [
+      [81.8, 7.5],
+      [81.6, 6.5],
+      [81.2, 6.2],
+      [80.4, 6],
+      [79.9, 6.8],
+      [79.7, 8.2],
+      [80.2, 9.8],
+      [80.8, 9.3],
+      [81.3, 8.6],
+      [81.8, 7.5]
+    ],
+    [
+      [29, -29],
+      [29.3, -29.3],
+      [29, -29.7],
+      [28.9, -30.1],
+      [28.3, -30.2],
+      [28.1, -30.5],
+      [27.8, -30.6],
+      [27, -29.9],
+      [27.5, -29.2],
+      [28.1, -28.8],
+      [28.5, -28.6],
+      [29, -29]
+    ],
+    [
+      [22.7, 54.3],
+      [22.7, 54.6],
+      [22.8, 54.9],
+      [22.3, 55],
+      [21.3, 55.2]
+    ],
+    [
+      [21.3, 55.2],
+      [21.1, 56]
+    ],
+    [
+      [21.1, 56],
+      [22.2, 56.3],
+      [23.9, 56.3],
+      [24.9, 56.4],
+      [25, 56.2],
+      [25.5, 56.1],
+      [26.5, 55.6]
+    ],
+    [
+      [23.5, 53.9],
+      [23.2, 54.2],
+      [22.7, 54.3]
+    ],
+    [
+      [21.1, 56],
+      [21.1, 56.8],
+      [21.6, 57.4],
+      [22.5, 57.8],
+      [23.3, 57],
+      [24.1, 57],
+      [24.3, 57.8]
+    ],
+    [
+      [27.3, 57.5],
+      [27.8, 57.2],
+      [27.9, 56.8],
+      [28.2, 56.2]
+    ],
+    [
+      [-8.7, 27.6],
+      [-13.1, 27.6]
+    ],
+    [
+      [-13.1, 27.6],
+      [-12.4, 28.2],
+      [-10.9, 28.8],
+      [-10.4, 29.1],
+      [-9.6, 29.9],
+      [-9.8, 31.2],
+      [-9.4, 32],
+      [-9.3, 32.6],
+      [-8.7, 33.2],
+      [-7.6, 33.7],
+      [-6.9, 34.1],
+      [-6.2, 35.2],
+      [-5.9, 35.8],
+      [-5.2, 35.8],
+      [-4.6, 35.3],
+      [-3.6, 35.4],
+      [-2.6, 35.2],
+      [-2.2, 35.2]
+    ],
+    [
+      [26.6, 48.2],
+      [26.9, 48.4],
+      [27.5, 48.5],
+      [28.3, 48.2],
+      [28.7, 48.1],
+      [29.1, 47.9],
+      [29.1, 47.5],
+      [29.4, 47.4],
+      [29.6, 46.9],
+      [29.9, 46.7],
+      [29.8, 46.5],
+      [30, 46.4],
+      [29.8, 46.4],
+      [29.2, 46.4],
+      [29.1, 46.5],
+      [28.9, 46.4],
+      [28.9, 46.3],
+      [28.7, 45.9],
+      [28.5, 45.6],
+      [28.2, 45.5]
+    ],
+    [
+      [28.2, 45.5],
+      [28.1, 45.9],
+      [28.2, 46.4],
+      [28.1, 46.8],
+      [27.6, 47.4],
+      [27.2, 47.8],
+      [26.9, 48.1],
+      [26.6, 48.2]
+    ],
+    [
+      [49.5, -12.5],
+      [49.8, -12.9],
+      [50.1, -13.6],
+      [50.2, -14.8],
+      [50.5, -15.2],
+      [50.4, -15.7],
+      [50.2, -16],
+      [49.9, -15.4],
+      [49.7, -15.7],
+      [49.9, -16.4],
+      [49.8, -16.9],
+      [49.5, -17.1],
+      [49.4, -17.9],
+      [49, -19.1],
+      [48.6, -20.5],
+      [47.9, -22.4],
+      [47.6, -23.8],
+      [47.1, -24.9],
+      [46.3, -25.2],
+      [45.4, -25.6],
+      [44.8, -25.3],
+      [44, -25],
+      [43.8, -24.5],
+      [43.7, -23.6],
+      [43.4, -22.8],
+      [43.3, -22.1],
+      [43.4, -21.3],
+      [43.9, -21.2],
+      [43.9, -20.8],
+      [44.4, -20.1],
+      [44.5, -19.4],
+      [44.2, -19],
+      [44, -18.3],
+      [44, -17.4],
+      [44.3, -16.8],
+      [44.5, -16.2],
+      [44.9, -16.2],
+      [45.5, -16],
+      [45.9, -15.8],
+      [46.3, -15.8],
+      [46.9, -15.2],
+      [47.7, -14.6],
+      [48, -14.1],
+      [47.9, -13.7],
+      [48.3, -13.8],
+      [48.9, -13.1],
+      [48.9, -12.5],
+      [49.2, -12],
+      [49.5, -12.5]
+    ],
+    [
+      [-92.2, 14.5],
+      [-93.4, 15.6],
+      [-93.9, 15.9],
+      [-94.7, 16.2],
+      [-95.2, 16.1],
+      [-96, 15.8],
+      [-96.6, 15.7],
+      [-97.3, 15.9],
+      [-98, 16.1],
+      [-98.9, 16.6],
+      [-99.7, 16.7],
+      [-100.8, 17.2],
+      [-101.7, 17.7],
+      [-101.9, 17.9],
+      [-102.5, 18],
+      [-103.5, 18.3],
+      [-103.9, 18.8],
+      [-105, 19.3],
+      [-105.5, 20],
+      [-105.7, 20.4],
+      [-105.4, 20.5],
+      [-105.5, 20.8],
+      [-105.3, 21.1],
+      [-105.3, 21.4],
+      [-105.6, 21.9],
+      [-105.7, 22.3],
+      [-106, 22.8],
+      [-106.9, 23.8],
+      [-107.9, 24.6],
+      [-108.4, 25.2],
+      [-109.3, 25.6],
+      [-109.4, 25.8],
+      [-109.3, 26.4],
+      [-109.8, 26.7],
+      [-110.4, 27.2],
+      [-110.6, 27.9],
+      [-111.2, 27.9],
+      [-111.8, 28.5],
+      [-112.2, 29],
+      [-112.3, 29.3],
+      [-112.8, 30],
+      [-113.2, 30.8],
+      [-113.1, 31.2],
+      [-113.9, 31.6],
+      [-114.2, 31.5],
+      [-114.8, 31.8],
+      [-114.9, 31.4],
+      [-114.8, 30.9],
+      [-114.7, 30.2],
+      [-114.3, 29.8],
+      [-113.6, 29.1],
+      [-113.4, 28.8],
+      [-113.3, 28.8],
+      [-113.1, 28.4],
+      [-113, 28.4],
+      [-112.8, 27.8],
+      [-112.5, 27.5],
+      [-112.2, 27.2],
+      [-111.6, 26.7],
+      [-111.3, 25.7],
+      [-111, 25.3],
+      [-110.7, 24.8],
+      [-110.7, 24.3],
+      [-110.2, 24.3],
+      [-109.8, 23.8],
+      [-109.4, 23.4],
+      [-109.4, 23.2],
+      [-109.8, 22.8],
+      [-110, 22.8],
+      [-110.3, 23.4],
+      [-110.9, 24],
+      [-111.7, 24.5],
+      [-112.2, 24.7],
+      [-112.1, 25.5],
+      [-112.3, 26],
+      [-112.8, 26.3],
+      [-113.5, 26.8],
+      [-113.6, 26.6],
+      [-113.8, 26.9],
+      [-114.5, 27.1],
+      [-115.1, 27.7],
+      [-115, 27.8],
+      [-114.6, 27.7],
+      [-114.2, 28.1],
+      [-114.2, 28.6],
+      [-114.9, 29.3],
+      [-115.5, 29.6],
+      [-115.9, 30.2],
+      [-116.3, 30.8],
+      [-116.7, 31.6],
+      [-117.1, 32.5]
+    ],
+    [
+      [-117.1, 32.5],
+      [-116, 32.6],
+      [-114.7, 32.7],
+      [-114.8, 32.5],
+      [-113.3, 32],
+      [-111, 31.3],
+      [-109, 31.3],
+      [-108.2, 31.3],
+      [-108.2, 31.8],
+      [-106.5, 31.8],
+      [-106.1, 31.4],
+      [-105.6, 31.1],
+      [-105, 30.6],
+      [-104.7, 30.1],
+      [-104.5, 29.6],
+      [-103.9, 29.3],
+      [-103.1, 29],
+      [-102.5, 29.8],
+      [-101.7, 29.8],
+      [-101, 29.4],
+      [-100.5, 28.7],
+      [-100.1, 28.1],
+      [-99.5, 27.5],
+      [-99.3, 26.8],
+      [-99, 26.4],
+      [-98.2, 26.1],
+      [-97.5, 25.8]
+    ],
+    [
+      [-97.5, 25.8],
+      [-97.1, 25.9],
+      [-97.5, 25],
+      [-97.7, 24.3],
+      [-97.8, 22.9],
+      [-97.9, 22.4],
+      [-97.7, 21.9],
+      [-97.4, 21.4],
+      [-97.2, 20.6],
+      [-96.5, 19.9],
+      [-96.3, 19.3],
+      [-95.9, 18.8],
+      [-94.8, 18.6],
+      [-94.4, 18.1],
+      [-93.5, 18.4],
+      [-92.8, 18.5],
+      [-92, 18.7],
+      [-91.4, 18.9],
+      [-90.8, 19.3],
+      [-90.5, 19.9],
+      [-90.4, 20.7],
+      [-90.3, 21],
+      [-89.6, 21.3],
+      [-88.5, 21.5],
+      [-87.7, 21.5],
+      [-87, 21.5],
+      [-86.8, 21.3],
+      [-86.8, 20.9],
+      [-87.4, 20.3],
+      [-87.6, 19.7],
+      [-87.4, 19.5],
+      [-87.6, 19],
+      [-87.8, 18.3],
+      [-88.1, 18.5],
+      [-88.3, 18.5]
+    ],
+    [
+      [21.6, 42.3],
+      [21.9, 42.3],
+      [22.4, 42.3]
+    ],
+    [
+      [21, 40.8],
+      [20.6, 41.1],
+      [20.5, 41.5],
+      [20.6, 41.9]
+    ],
+    [
+      [-12.2, 14.6],
+      [-11.8, 14.8],
+      [-11.7, 15.4],
+      [-11.3, 15.4],
+      [-10.6, 15.1],
+      [-10.1, 15.3],
+      [-9.7, 15.3],
+      [-9.5, 15.5],
+      [-5.5, 15.5],
+      [-5.3, 16.2],
+      [-5.5, 16.3],
+      [-6, 20.6],
+      [-6.4, 25],
+      [-4.9, 25]
+    ],
+    [
+      [4.3, 19.2],
+      [4.3, 16.9],
+      [3.7, 16.2],
+      [3.6, 15.6],
+      [2.8, 15.4],
+      [1.4, 15.3],
+      [1, 15],
+      [0.4, 14.9]
+    ],
+    [
+      [-11.5, 12.4],
+      [-11.5, 12.8],
+      [-11.5, 13.1],
+      [-11.9, 13.4],
+      [-12.1, 14],
+      [-12.2, 14.6]
+    ],
+    [
+      [98.6, 9.9],
+      [98.5, 10.7],
+      [98.8, 11.4],
+      [98.4, 12],
+      [98.5, 13.1],
+      [98.1, 13.6],
+      [97.8, 14.8],
+      [97.6, 16.1],
+      [97.2, 16.9],
+      [96.5, 16.4],
+      [95.4, 15.7],
+      [94.8, 15.8],
+      [94.2, 16],
+      [94.5, 17.3],
+      [94.3, 18.2],
+      [93.5, 19.4],
+      [93.7, 19.7],
+      [93.1, 19.9],
+      [92.4, 20.7]
+    ],
+    [
+      [100.1, 20.4],
+      [99.5, 20.2],
+      [99, 19.8],
+      [98.3, 19.7],
+      [97.8, 18.6],
+      [97.4, 18.5],
+      [97.9, 17.6],
+      [98.5, 16.8],
+      [98.9, 16.2],
+      [98.5, 15.3],
+      [98.2, 15.1],
+      [98.4, 14.6],
+      [99.1, 13.8],
+      [99.2, 13.3],
+      [99.2, 12.8],
+      [99.6, 11.9],
+      [99, 11],
+      [98.6, 9.9]
+    ],
+    [
+      [19.7, 42.7],
+      [19.3, 42.2],
+      [19.4, 41.9],
+      [19.2, 42],
+      [18.9, 42.3],
+      [18.5, 42.5],
+      [18.6, 42.7]
+    ],
+    [
+      [19.2, 43.5],
+      [19.5, 43.4],
+      [19.6, 43.2],
+      [20, 43.1],
+      [20.3, 42.9],
+      [20.3, 42.8]
+    ],
+    [
+      [87.8, 49.3],
+      [88.8, 49.5],
+      [90.7, 50.3],
+      [92.2, 50.8]
+    ],
+    [
+      [92.2, 50.8],
+      [93.1, 50.5],
+      [94.2, 50.5]
+    ],
+    [
+      [94.2, 50.5],
+      [94.8, 50]
+    ],
+    [
+      [94.8, 50],
+      [95.8, 50],
+      [97.3, 49.7],
+      [98.2, 50.4]
+    ],
+    [
+      [98.2, 50.4],
+      [97.8, 51],
+      [98.9, 52.1],
+      [100, 51.6],
+      [100.9, 51.5]
+    ],
+    [
+      [100.9, 51.5],
+      [102.1, 51.3],
+      [102.3, 50.5],
+      [103.7, 50.1]
+    ],
+    [
+      [103.7, 50.1],
+      [104.6, 50.3],
+      [105.9, 50.4]
+    ],
+    [
+      [105.9, 50.4],
+      [106.9, 50.3],
+      [107.9, 49.8],
+      [108.5, 49.3],
+      [109.4, 49.3],
+      [110.7, 49.1],
+      [111.6, 49.4],
+      [112.9, 49.5],
+      [114.4, 50.3],
+      [115, 50.1],
+      [115.5, 49.8],
+      [116.7, 49.9]
+    ],
+    [
+      [34.6, -11.5],
+      [35.3, -11.4],
+      [36.5, -11.7],
+      [36.8, -11.6]
+    ],
+    [
+      [36.8, -11.6],
+      [37.5, -11.6],
+      [37.8, -11.3],
+      [38.4, -11.3]
+    ],
+    [
+      [38.4, -11.3],
+      [39.5, -10.9],
+      [40.3, -10.3],
+      [40.5, -10.8],
+      [40.4, -11.8],
+      [40.6, -12.6],
+      [40.6, -14.2],
+      [40.8, -14.7],
+      [40.5, -15.4],
+      [40.1, -16.1],
+      [39.5, -16.7],
+      [38.5, -17.1],
+      [37.4, -17.6],
+      [36.3, -18.7],
+      [35.9, -18.8],
+      [35.2, -19.5],
+      [34.8, -19.8],
+      [34.7, -20.5],
+      [35.2, -21.2],
+      [35.4, -21.8],
+      [35.4, -22.1],
+      [35.6, -22.1],
+      [35.5, -23.1],
+      [35.4, -23.5],
+      [35.6, -23.7],
+      [35.5, -24.1],
+      [35, -24.5],
+      [34.2, -24.8],
+      [33, -25.4],
+      [32.6, -25.7],
+      [32.7, -26.1],
+      [32.9, -26.2],
+      [32.8, -26.7]
+    ],
+    [
+      [32.8, -26.7],
+      [32.1, -26.7]
+    ],
+    [
+      [32.1, -26.7],
+      [32, -26.3],
+      [31.8, -25.8]
+    ],
+    [
+      [31.8, -25.8],
+      [31.8, -25.5],
+      [31.9, -24.4],
+      [31.7, -23.7],
+      [31.2, -22.2]
+    ],
+    [
+      [31.2, -22.2],
+      [32.2, -21.1],
+      [32.5, -20.4],
+      [32.7, -20.3],
+      [32.8, -19.7],
+      [32.6, -19.4],
+      [32.7, -18.7],
+      [32.9, -18],
+      [32.9, -16.7],
+      [32.3, -16.4],
+      [31.9, -16.3],
+      [31.6, -16.1],
+      [31.2, -15.9],
+      [30.3, -15.9],
+      [30.3, -15.5]
+    ],
+    [
+      [30.3, -15.5],
+      [30.2, -14.8],
+      [33.2, -14]
+    ],
+    [
+      [33.2, -14],
+      [33.8, -14.4],
+      [34.1, -14.4],
+      [34.5, -14.6],
+      [34.5, -15],
+      [34.3, -15.5],
+      [34.4, -16.2],
+      [35, -16.8],
+      [35.3, -16.1],
+      [35.8, -15.9],
+      [35.7, -14.6],
+      [35.3, -13.9],
+      [34.9, -13.6],
+      [34.6, -13.6],
+      [34.3, -12.3],
+      [34.6, -11.5]
+    ],
+    [
+      [-12.2, 14.6],
+      [-12.8, 15.3],
+      [-13.4, 16],
+      [-14.1, 16.3],
+      [-14.6, 16.6],
+      [-15.1, 16.6],
+      [-15.6, 16.4],
+      [-16.1, 16.5],
+      [-16.5, 16.1]
+    ],
+    [
+      [-16.5, 16.1],
+      [-16.5, 16.7],
+      [-16.3, 17.2],
+      [-16.1, 18.1],
+      [-16.3, 19.1],
+      [-16.4, 19.6],
+      [-16.3, 20.1],
+      [-16.5, 20.6],
+      [-17.1, 21]
+    ],
+    [
+      [-17.1, 21],
+      [-16.8, 21.3],
+      [-12.9, 21.3],
+      [-13.1, 22.8],
+      [-12.9, 23.3],
+      [-11.9, 23.4],
+      [-12, 25.9],
+      [-8.7, 25.9],
+      [-8.7, 27.4]
+    ],
+    [
+      [33.2, -14],
+      [32.7, -13.7],
+      [33, -12.8],
+      [33.3, -12.4],
+      [33.1, -11.6],
+      [33.3, -10.8],
+      [33.5, -10.5],
+      [33.2, -9.7],
+      [32.8, -9.2]
+    ],
+    [
+      [32.8, -9.2],
+      [33.7, -9.4],
+      [33.9, -9.7]
+    ],
+    [
+      [33.9, -9.7],
+      [34.3, -10.2],
+      [34.6, -11.5]
+    ],
+    [
+      [102.1, 6.2],
+      [102.4, 6.1],
+      [103, 5.5],
+      [103.4, 4.9],
+      [103.4, 4.2],
+      [103.3, 3.7],
+      [103.4, 3.4],
+      [103.5, 2.8],
+      [103.9, 2.5],
+      [104.3, 1.6],
+      [104.3, 1.4],
+      [104.1, 1.3]
+    ],
+    [
+      [104.1, 1.3],
+      [103.7, 1.1],
+      [103.6, 1.2]
+    ],
+    [
+      [103.6, 1.2],
+      [102.6, 2],
+      [101.4, 2.8],
+      [101.3, 3.3],
+      [100.7, 3.9],
+      [100.6, 4.8],
+      [100.2, 5.3],
+      [100.3, 6],
+      [100.1, 6.5]
+    ],
+    [
+      [100.1, 6.5],
+      [100.3, 6.6],
+      [101.1, 6.2],
+      [101.2, 5.7],
+      [101.8, 5.8],
+      [102.1, 6.2]
+    ],
+    [
+      [109.7, 2],
+      [110.4, 1.7],
+      [111.2, 1.9],
+      [111.4, 2.7],
+      [111.8, 2.9],
+      [113, 3.1],
+      [113.7, 3.9],
+      [114.2, 4.5]
+    ],
+    [
+      [115.5, 5.5],
+      [116.2, 6.1],
+      [116.7, 6.9],
+      [117.1, 6.9],
+      [117.6, 6.4],
+      [117.7, 6],
+      [118.4, 5.7],
+      [119.2, 5.4],
+      [119.1, 5],
+      [118.4, 5],
+      [118.6, 4.5],
+      [117.9, 4.1]
+    ],
+    [
+      [16.3, -28.6],
+      [15.6, -27.8],
+      [15.2, -27.1],
+      [15, -26.1],
+      [14.7, -25.4],
+      [14.4, -23.8],
+      [14.4, -22.7],
+      [14.3, -22.1],
+      [13.9, -21.7],
+      [13.4, -20.9],
+      [12.8, -19.7],
+      [12.6, -19],
+      [11.8, -18.1],
+      [11.7, -17.3]
+    ],
+    [
+      [23.2, -17.5],
+      [24, -17.3],
+      [24.7, -17.3],
+      [25.1, -17.6],
+      [25.1, -17.7]
+    ],
+    [
+      [19.9, -24.8],
+      [19.9, -28.5],
+      [19, -29],
+      [18.5, -29],
+      [17.8, -28.9],
+      [17.4, -28.8],
+      [17.2, -28.4],
+      [16.8, -28.1],
+      [16.3, -28.6]
+    ],
+    [
+      [165.8, -21.1],
+      [166.6, -21.7],
+      [167.1, -22.2],
+      [166.7, -22.4],
+      [166.2, -22.1],
+      [165.5, -21.7],
+      [164.8, -21.1],
+      [164.2, -20.4],
+      [164, -20.1],
+      [164.5, -20.1],
+      [165, -20.5],
+      [165.5, -20.8],
+      [165.8, -21.1]
+    ],
+    [
+      [14.9, 22.9],
+      [15.1, 21.3]
+    ],
+    [
+      [15.1, 21.3],
+      [15.5, 21.1],
+      [15.5, 20.7]
+    ],
+    [
+      [15.5, 20.7],
+      [15.9, 20.4],
+      [15.7, 20],
+      [15.3, 17.9],
+      [15.3, 16.6]
+    ],
+    [
+      [15.3, 16.6],
+      [14, 15.7],
+      [13.5, 14.4]
+    ],
+    [
+      [13.5, 14.4],
+      [14, 14],
+      [14, 13.4],
+      [14.6, 13.3],
+      [14.5, 12.9]
+    ],
+    [
+      [14.2, 12.5],
+      [14, 12.5],
+      [13.3, 13.6],
+      [13.1, 13.6],
+      [12.3, 13],
+      [11.5, 13.3],
+      [11, 13.4],
+      [10.7, 13.3],
+      [10.1, 13.3],
+      [9.5, 12.9],
+      [9, 12.8],
+      [7.8, 13.3],
+      [7.3, 13.1],
+      [6.8, 13.1],
+      [6.5, 13.5],
+      [5.4, 13.9],
+      [4.4, 13.8],
+      [4.1, 13.5],
+      [4, 13],
+      [3.7, 12.6],
+      [3.6, 11.7]
+    ],
+    [
+      [8.5, 4.8],
+      [7.5, 4.4],
+      [7.1, 4.5],
+      [6.7, 4.2],
+      [5.9, 4.3],
+      [5.4, 4.9],
+      [5, 5.6],
+      [4.3, 6.3],
+      [3.6, 6.3],
+      [2.7, 6.3]
+    ],
+    [
+      [-85.7, 11.1],
+      [-86.1, 11.4],
+      [-86.5, 11.8],
+      [-86.7, 12.1],
+      [-87.2, 12.5],
+      [-87.7, 12.9],
+      [-87.6, 13.1],
+      [-87.4, 12.9],
+      [-87.3, 13]
+    ],
+    [
+      [-83.1, 15],
+      [-83.2, 14.9],
+      [-83.3, 14.7],
+      [-83.2, 14.3],
+      [-83.4, 14],
+      [-83.5, 13.6],
+      [-83.5, 13.1],
+      [-83.5, 12.9],
+      [-83.5, 12.4],
+      [-83.6, 12.3],
+      [-83.7, 11.9],
+      [-83.6, 11.6],
+      [-83.9, 11.4],
+      [-83.8, 11.1],
+      [-83.7, 10.9]
+    ],
+    [
+      [4.1, 51.3],
+      [3.3, 51.4],
+      [3.8, 51.6],
+      [4.7, 53.1],
+      [6.1, 53.5],
+      [6.9, 53.5]
+    ],
+    [
+      [20.7, 69.1],
+      [20, 69.1],
+      [19.9, 68.4],
+      [18, 68.6],
+      [17.7, 68],
+      [16.8, 68],
+      [16.1, 67.3],
+      [15.1, 66.2],
+      [13.6, 64.8],
+      [13.9, 64.5],
+      [13.6, 64.1],
+      [12.6, 64.1],
+      [11.9, 63.1],
+      [12, 61.8],
+      [12.6, 61.3],
+      [12.3, 60.1],
+      [11.5, 59.4],
+      [11, 58.9]
+    ],
+    [
+      [11, 58.9],
+      [10.4, 59.5],
+      [8.4, 58.3],
+      [7.1, 58.1],
+      [5.7, 58.6],
+      [5.3, 59.7],
+      [5, 62],
+      [5.9, 62.6],
+      [8.6, 63.5],
+      [10.5, 64.5],
+      [12.4, 65.9],
+      [14.8, 67.8],
+      [16.4, 68.6],
+      [19.2, 69.8],
+      [21.4, 70.3],
+      [23, 70.2],
+      [24.6, 71],
+      [26.4, 71],
+      [28.2, 71.2],
+      [31.3, 70.5],
+      [30, 70.2],
+      [31.1, 69.6],
+      [29.4, 69.2],
+      [28.6, 69.1]
+    ],
+    [
+      [24.7, 77.9],
+      [22.5, 77.4],
+      [20.7, 77.7],
+      [21.4, 77.9],
+      [20.8, 78.3],
+      [22.9, 78.5],
+      [23.3, 78.1],
+      [24.7, 77.9]
+    ],
+    [
+      [18.3, 79.7],
+      [21.5, 79],
+      [19, 78.6],
+      [18.5, 77.8],
+      [17.6, 77.6],
+      [17.1, 76.8],
+      [15.9, 76.8],
+      [13.8, 77.4],
+      [14.7, 77.7],
+      [13.2, 78],
+      [11.2, 78.9],
+      [10.4, 79.7],
+      [13.2, 80],
+      [13.7, 79.7],
+      [15.1, 79.7],
+      [15.5, 80],
+      [17, 80.1],
+      [18.3, 79.7]
+    ],
+    [
+      [25.5, 80.4],
+      [27.4, 80.1],
+      [25.9, 79.5],
+      [23, 79.4],
+      [20.1, 79.6],
+      [19.9, 79.8],
+      [18.5, 79.9],
+      [17.4, 80.3],
+      [20.5, 80.6],
+      [21.9, 80.4],
+      [22.9, 80.7],
+      [25.5, 80.4]
+    ],
+    [
+      [173, -40.9],
+      [173.3, -41.3],
+      [174, -40.9],
+      [174.3, -41.3],
+      [174.3, -41.8],
+      [173.9, -42.2],
+      [173.2, -43],
+      [172.7, -43.4],
+      [173.1, -43.8],
+      [172.3, -43.9],
+      [171.5, -44.2],
+      [171.2, -44.9],
+      [170.6, -45.9],
+      [169.8, -46.4],
+      [169.3, -46.6],
+      [168.4, -46.6],
+      [167.8, -46.3],
+      [166.7, -46.2],
+      [166.5, -45.8],
+      [167.1, -45.1],
+      [168.3, -44.1],
+      [169, -43.9],
+      [169.7, -43.6],
+      [170.5, -43],
+      [171.1, -42.5],
+      [171.6, -41.8],
+      [172, -41.5],
+      [172.1, -41],
+      [172.8, -40.5],
+      [173, -40.9]
+    ],
+    [
+      [174.6, -36.2],
+      [175.3, -37.2],
+      [175.4, -36.5],
+      [175.8, -36.8],
+      [176, -37.6],
+      [176.8, -37.9],
+      [177.4, -38],
+      [178, -37.6],
+      [178.5, -37.7],
+      [178.3, -38.6],
+      [178, -39.2],
+      [177.2, -39.1],
+      [176.9, -39.4],
+      [177, -39.9],
+      [176.9, -40.1],
+      [176.5, -40.6],
+      [176, -41.3],
+      [175.2, -41.7],
+      [175.1, -41.4],
+      [174.7, -41.3],
+      [175.2, -40.5],
+      [174.9, -39.9],
+      [173.8, -39.5],
+      [173.9, -39.1],
+      [174.6, -38.8],
+      [174.7, -38],
+      [174.7, -37.4],
+      [174.3, -36.7],
+      [174.3, -36.5],
+      [173.8, -36.1],
+      [173.1, -35.2],
+      [172.6, -34.5],
+      [173, -34.4],
+      [173.6, -35],
+      [174.3, -35.3],
+      [174.6, -36.2]
+    ],
+    [
+      [53.1, 16.7],
+      [52.8, 17.4],
+      [52, 19]
+    ],
+    [
+      [52, 19],
+      [55, 20],
+      [55.7, 22],
+      [55.2, 22.7]
+    ],
+    [
+      [56.4, 24.9],
+      [56.9, 24.2],
+      [57.4, 23.9],
+      [58.1, 23.8],
+      [58.7, 23.6],
+      [59.2, 23],
+      [59.5, 22.7],
+      [59.8, 22.5],
+      [59.8, 22.3],
+      [59.4, 21.7],
+      [59.3, 21.4],
+      [58.9, 21.1],
+      [58.5, 20.4],
+      [58, 20.5],
+      [57.8, 20.2],
+      [57.7, 19.7],
+      [57.8, 19.1],
+      [57.7, 18.9],
+      [57.2, 19],
+      [56.6, 18.6],
+      [56.5, 18.1],
+      [56.3, 17.9],
+      [55.7, 17.9],
+      [55.3, 17.6],
+      [55.3, 17.2],
+      [54.8, 17],
+      [54.2, 17],
+      [53.6, 16.7],
+      [53.1, 16.7]
+    ],
+    [
+      [56.1, 26.1],
+      [56.4, 26.4],
+      [56.5, 26.3],
+      [56.4, 25.9],
+      [56.3, 25.7]
+    ],
+    [
+      [68.2, 23.7],
+      [67.4, 23.9],
+      [67.2, 24.7],
+      [66.4, 25.4],
+      [64.5, 25.2],
+      [62.9, 25.2],
+      [61.5, 25.1]
+    ],
+    [
+      [-77.9, 7.2],
+      [-78.2, 7.5],
+      [-78.4, 8.1],
+      [-78.2, 8.3],
+      [-78.4, 8.4],
+      [-78.6, 8.7],
+      [-79.1, 9],
+      [-79.6, 8.9],
+      [-79.8, 8.6],
+      [-80.2, 8.3],
+      [-80.4, 8.3],
+      [-80.5, 8.1],
+      [-80, 7.6],
+      [-80.3, 7.4],
+      [-80.4, 7.3],
+      [-80.9, 7.2],
+      [-81.1, 7.8],
+      [-81.2, 7.7],
+      [-81.5, 7.7],
+      [-81.7, 8.1],
+      [-82.1, 8.2],
+      [-82.4, 8.3],
+      [-82.8, 8.3],
+      [-82.8, 8.1],
+      [-83, 8.2]
+    ],
+    [
+      [-82.5, 9.6],
+      [-82.2, 9.2],
+      [-82.2, 9],
+      [-81.8, 9],
+      [-81.7, 9],
+      [-81.4, 8.8],
+      [-80.9, 8.9],
+      [-80.5, 9.1],
+      [-79.9, 9.3],
+      [-79.6, 9.6],
+      [-79, 9.6],
+      [-79.1, 9.5],
+      [-78.5, 9.4],
+      [-78.1, 9.3],
+      [-77.7, 9],
+      [-77.3, 8.7]
+    ],
+    [
+      [-70.4, -18.3],
+      [-71.4, -17.8],
+      [-71.5, -17.4],
+      [-73.4, -16.4],
+      [-75.2, -15.3],
+      [-76, -14.6],
+      [-76.4, -13.8],
+      [-76.3, -13.5],
+      [-77.1, -12.2],
+      [-78.1, -10.4],
+      [-79, -8.4],
+      [-79.4, -7.9],
+      [-79.8, -7.2],
+      [-80.5, -6.5],
+      [-81.2, -6.1],
+      [-80.9, -5.7],
+      [-81.4, -4.7],
+      [-81.1, -4],
+      [-80.3, -3.4]
+    ],
+    [
+      [126.4, 8.4],
+      [126.5, 7.8],
+      [126.5, 7.2],
+      [126.2, 6.3],
+      [125.8, 7.3],
+      [125.4, 6.8],
+      [125.7, 6.1],
+      [125.4, 5.6],
+      [124.2, 6.2],
+      [123.9, 6.9],
+      [124.2, 7.4],
+      [123.6, 7.8],
+      [123.3, 7.4],
+      [122.8, 7.5],
+      [122.1, 6.9],
+      [121.9, 7.2],
+      [122.3, 8],
+      [122.9, 8.3],
+      [123.5, 8.7],
+      [123.8, 8.2],
+      [124.6, 8.5],
+      [124.8, 9],
+      [125.5, 9],
+      [125.4, 9.8],
+      [126.2, 9.3],
+      [126.3, 8.8],
+      [126.4, 8.4]
+    ],
+    [
+      [124, 10.3],
+      [123.6, 10],
+      [123.3, 9.3],
+      [123, 9],
+      [122.4, 9.7],
+      [122.6, 10],
+      [122.8, 10.3],
+      [123, 10.9],
+      [123.5, 10.9],
+      [123.3, 10.3],
+      [124.1, 11.2],
+      [124, 10.3]
+    ],
+    [
+      [118.5, 9.3],
+      [117.2, 8.4],
+      [117.7, 9.1],
+      [118.4, 9.7],
+      [119, 10.4],
+      [119.5, 11.4],
+      [119.7, 10.6],
+      [119, 10],
+      [118.5, 9.3]
+    ],
+    [
+      [121.9, 11.9],
+      [122.5, 11.6],
+      [123.1, 11.6],
+      [123.1, 11.2],
+      [122.6, 10.7],
+      [122, 10.4],
+      [122, 10.9],
+      [122, 11.4],
+      [121.9, 11.9]
+    ],
+    [
+      [125.5, 12.2],
+      [125.8, 11.1],
+      [125, 11.3],
+      [125, 11],
+      [125.3, 10.4],
+      [124.8, 10.1],
+      [124.8, 10.8],
+      [124.5, 10.9],
+      [124.3, 11.5],
+      [124.9, 11.4],
+      [124.9, 11.8],
+      [124.3, 12.6],
+      [125.2, 12.5],
+      [125.5, 12.2]
+    ],
+    [
+      [121.5, 13.1],
+      [121.3, 12.2],
+      [120.8, 12.7],
+      [120.3, 13.5],
+      [121.2, 13.4],
+      [121.5, 13.1]
+    ],
+    [
+      [121.3, 18.5],
+      [121.9, 18.2],
+      [122.3, 18.5],
+      [122.3, 18.2],
+      [122.2, 17.8],
+      [122.5, 17.1],
+      [122.3, 16.3],
+      [121.7, 15.9],
+      [121.5, 15.1],
+      [121.7, 14.3],
+      [122.3, 14.2],
+      [122.7, 14.3],
+      [124, 13.8],
+      [123.9, 13.2],
+      [124.2, 13],
+      [124.1, 12.5],
+      [123.3, 13],
+      [122.9, 13.6],
+      [122.7, 13.2],
+      [122, 13.8],
+      [121.1, 13.6],
+      [120.6, 13.9],
+      [120.7, 14.3],
+      [121, 14.5],
+      [120.7, 14.8],
+      [120.6, 14.4],
+      [120.1, 15],
+      [119.9, 15.4],
+      [119.9, 16.4],
+      [120.3, 16],
+      [120.4, 17.6],
+      [120.7, 18.5],
+      [121.3, 18.5]
+    ],
+    [
+      [155.9, -6.8],
+      [155.6, -6.9],
+      [155.2, -6.5],
+      [154.7, -5.9],
+      [154.5, -5.1],
+      [154.7, -5],
+      [154.8, -5.3],
+      [155.1, -5.6],
+      [155.6, -6.2],
+      [156, -6.5],
+      [155.9, -6.8]
+    ],
+    [
+      [152, -5.5],
+      [151.5, -5.6],
+      [151.3, -5.8],
+      [150.8, -6.1],
+      [150.2, -6.3],
+      [149.7, -6.3],
+      [148.9, -6],
+      [148.3, -5.7],
+      [148.4, -5.4],
+      [149.3, -5.6],
+      [149.9, -5.5],
+      [150, -5],
+      [150.1, -5],
+      [150.2, -5.5],
+      [150.8, -5.5],
+      [151.1, -5.1],
+      [151.7, -4.8],
+      [151.5, -4.2],
+      [152.1, -4.1],
+      [152.3, -4.3],
+      [152.3, -4.9],
+      [152, -5.5]
+    ],
+    [
+      [141, -2.6],
+      [142.7, -3.3],
+      [144.6, -3.9],
+      [145.3, -4.4],
+      [145.8, -4.9],
+      [146, -5.5],
+      [147.7, -6.1],
+      [147.9, -6.6],
+      [147, -6.7],
+      [147.2, -7.4],
+      [148.1, -8],
+      [148.7, -9.1],
+      [149.3, -9.1],
+      [149.3, -9.5],
+      [150, -9.7],
+      [149.7, -9.9],
+      [150.8, -10.3],
+      [150.7, -10.6],
+      [150, -10.6],
+      [149.8, -10.4],
+      [148.9, -10.3],
+      [147.9, -10.1],
+      [147.1, -9.5],
+      [146.6, -8.9],
+      [146.1, -8.1],
+      [144.7, -7.6],
+      [143.9, -7.9],
+      [143.3, -8.2],
+      [143.4, -9],
+      [142.6, -9.3],
+      [142.1, -9.2],
+      [141, -9.1]
+    ],
+    [
+      [153.1, -4.5],
+      [152.8, -4.8],
+      [152.6, -4.2],
+      [152.4, -3.8],
+      [152, -3.5],
+      [151.4, -3],
+      [150.7, -2.7],
+      [150.9, -2.5],
+      [151.5, -2.8],
+      [151.8, -3],
+      [152.2, -3.2],
+      [152.6, -3.7],
+      [153, -4],
+      [153.1, -4.5]
+    ],
+    [
+      [14.1, 53.8],
+      [14.8, 54.1],
+      [16.4, 54.5],
+      [17.6, 54.9],
+      [18.6, 54.7],
+      [18.7, 54.4],
+      [19.7, 54.4]
+    ],
+    [
+      [19.7, 54.4],
+      [20.9, 54.3],
+      [22.7, 54.3]
+    ],
+    [
+      [23.5, 51.6],
+      [24, 50.7],
+      [23.9, 50.4],
+      [23.4, 50.3],
+      [22.5, 49.5],
+      [22.8, 49],
+      [22.6, 49.1]
+    ],
+    [
+      [22.6, 49.1],
+      [21.6, 49.5],
+      [20.9, 49.3],
+      [20.4, 49.4],
+      [19.8, 49.2],
+      [19.3, 49.6],
+      [18.9, 49.4],
+      [18.9, 49.5]
+    ],
+    [
+      [-66.3, 18.5],
+      [-65.8, 18.4],
+      [-65.6, 18.2],
+      [-65.8, 18],
+      [-66.6, 18],
+      [-67.2, 18],
+      [-67.2, 18.4],
+      [-67.1, 18.5],
+      [-66.3, 18.5]
+    ],
+    [
+      [130.6, 42.4],
+      [130.8, 42.2],
+      [130.4, 42.3],
+      [130, 41.9],
+      [129.7, 41.6],
+      [129.7, 40.9],
+      [129.2, 40.7],
+      [129, 40.5],
+      [128.6, 40.2],
+      [128, 40],
+      [127.5, 39.8],
+      [127.5, 39.3],
+      [127.4, 39.2],
+      [127.8, 39.1],
+      [128.4, 38.6]
+    ],
+    [
+      [126.2, 37.8],
+      [125.7, 37.9],
+      [125.6, 37.8],
+      [125.3, 37.7],
+      [125.2, 37.9],
+      [125, 38],
+      [124.7, 38.1],
+      [125, 38.6],
+      [125.2, 38.7],
+      [125.1, 38.9],
+      [125.4, 39.4],
+      [125.3, 39.6],
+      [124.7, 39.7],
+      [124.3, 39.9]
+    ],
+    [
+      [-7.4, 37.1],
+      [-7.9, 36.8],
+      [-8.4, 37],
+      [-8.9, 36.9],
+      [-8.7, 37.7],
+      [-8.8, 38.3],
+      [-9.3, 38.4],
+      [-9.5, 38.7],
+      [-9.4, 39.4],
+      [-9, 39.8],
+      [-9, 40.2],
+      [-8.8, 40.8],
+      [-8.8, 41.2],
+      [-9, 41.5],
+      [-9, 41.9]
+    ],
+    [
+      [50.8, 24.8],
+      [50.7, 25.5],
+      [51, 26],
+      [51.3, 26.1],
+      [51.6, 25.8],
+      [51.6, 25.2],
+      [51.4, 24.6]
+    ],
+    [
+      [51.4, 24.6],
+      [51.1, 24.6],
+      [50.8, 24.8]
+    ],
+    [
+      [22.7, 47.9],
+      [23.1, 48.1],
+      [23.8, 48],
+      [24.4, 48],
+      [24.9, 47.7],
+      [25.2, 47.9],
+      [26, 48],
+      [26.2, 48.2],
+      [26.6, 48.2]
+    ],
+    [
+      [28.2, 45.5],
+      [28.7, 45.3],
+      [29.2, 45.5],
+      [29.6, 45.3]
+    ],
+    [
+      [29.6, 45.3],
+      [29.6, 45],
+      [29.1, 44.8],
+      [28.8, 44.9],
+      [28.6, 43.7]
+    ],
+    [
+      [22.7, 44.2],
+      [22.5, 44.4],
+      [22.7, 44.6],
+      [22.5, 44.7],
+      [22.2, 44.5],
+      [21.6, 44.8],
+      [21.5, 45.2],
+      [20.9, 45.4],
+      [20.8, 45.7],
+      [20.2, 46.1]
+    ],
+    [
+      [143.7, 50.8],
+      [144.7, 49],
+      [143.2, 49.3],
+      [142.6, 47.9],
+      [143.5, 46.8],
+      [143.5, 46.1],
+      [142.8, 46.7],
+      [142.1, 46],
+      [141.9, 46.8],
+      [142, 47.8],
+      [141.9, 48.9],
+      [142.1, 49.6],
+      [142.2, 51],
+      [141.6, 51.9],
+      [141.7, 53.3],
+      [142.6, 53.8],
+      [142.2, 54.2],
+      [142.7, 54.4],
+      [142.9, 53.7],
+      [143.3, 52.7],
+      [143.2, 51.8],
+      [143.7, 50.8]
+    ],
+    [
+      [19.7, 54.4],
+      [19.9, 54.9],
+      [21.3, 55.2]
+    ],
+    [
+      [-175, 66.6],
+      [-174.3, 66.3],
+      [-174.6, 67.1],
+      [-171.9, 66.9],
+      [-169.9, 66],
+      [-170.9, 65.5],
+      [-172.5, 65.4],
+      [-172.5, 64.5],
+      [-173, 64.3],
+      [-173.9, 64.3],
+      [-174.6, 64.6],
+      [-176, 64.9],
+      [-176.2, 65.4],
+      [-177.2, 65.5],
+      [-178.4, 65.4],
+      [-178.9, 65.7],
+      [-178.7, 66.1],
+      [-179.9, 65.9],
+      [-179.4, 65.4],
+      [-180, 65],
+      [-180, 69],
+      [-177.5, 68.2],
+      [-174.9, 67.2],
+      [-175, 66.6]
+    ],
+    [
+      [180, 70.8],
+      [178.9, 70.8],
+      [178.7, 71.1],
+      [180, 71.5],
+      [180, 70.8]
+    ],
+    [
+      [-178.7, 70.9],
+      [-180, 70.8],
+      [-180, 71.5],
+      [-179.9, 71.6],
+      [-179, 71.6],
+      [-177.6, 71.3],
+      [-177.7, 71.1],
+      [-178.7, 70.9]
+    ],
+    [
+      [143.6, 73.2],
+      [142.1, 73.2],
+      [140, 73.3],
+      [139.9, 73.4],
+      [140.8, 73.8],
+      [142.1, 73.9],
+      [143.5, 73.5],
+      [143.6, 73.2]
+    ],
+    [
+      [150.7, 75.1],
+      [149.6, 74.7],
+      [148, 74.8],
+      [146.1, 75.2],
+      [146.4, 75.5],
+      [148.2, 75.4],
+      [150.7, 75.1]
+    ],
+    [
+      [145.1, 75.6],
+      [144.3, 74.8],
+      [140.6, 74.9],
+      [139, 74.6],
+      [137, 75.3],
+      [137.5, 76],
+      [138.8, 76.1],
+      [141.5, 76.1],
+      [145.1, 75.6]
+    ],
+    [
+      [57.5, 70.7],
+      [56.9, 70.6],
+      [53.7, 70.8],
+      [53.4, 71.2],
+      [51.6, 71.5],
+      [51.5, 72],
+      [52.5, 72.2],
+      [52.4, 72.8],
+      [54.4, 73.6],
+      [53.5, 73.8],
+      [55.9, 74.6],
+      [55.6, 75.1],
+      [57.9, 75.6],
+      [61.2, 76.3],
+      [64.5, 76.4],
+      [66.2, 76.8],
+      [68.2, 76.9],
+      [68.9, 76.5],
+      [68.2, 76.2],
+      [64.6, 75.7],
+      [61.6, 75.3],
+      [58.5, 74.3],
+      [57, 73.3],
+      [55.4, 72.4],
+      [55.6, 71.5],
+      [57.5, 70.7]
+    ],
+    [
+      [131.3, 44.1],
+      [131, 45],
+      [131.9, 45.3]
+    ],
+    [
+      [131.9, 45.3],
+      [133.1, 45.1],
+      [133.8, 46.1]
+    ],
+    [
+      [133.8, 46.1],
+      [134.1, 47.2],
+      [134.5, 47.6],
+      [135, 48.5]
+    ],
+    [
+      [133.4, 48.2],
+      [132.5, 47.8],
+      [131, 47.8],
+      [130.6, 48.7]
+    ],
+    [
+      [129.4, 49.4],
+      [127.7, 49.8],
+      [127.3, 50.7]
+    ],
+    [
+      [125.1, 53.2],
+      [123.6, 53.5],
+      [122.3, 53.4]
+    ],
+    [
+      [120.7, 52.5],
+      [120.7, 52],
+      [120.2, 51.6],
+      [119.3, 50.6],
+      [119.3, 50.1]
+    ],
+    [
+      [105.9, 50.4],
+      [104.6, 50.3],
+      [103.7, 50.1]
+    ],
+    [
+      [103.7, 50.1],
+      [102.3, 50.5],
+      [102.1, 51.3],
+      [100.9, 51.5]
+    ],
+    [
+      [98.2, 50.4],
+      [97.3, 49.7],
+      [95.8, 50],
+      [94.8, 50]
+    ],
+    [
+      [94.2, 50.5],
+      [93.1, 50.5],
+      [92.2, 50.8]
+    ],
+    [
+      [76.9, 54.5],
+      [74.4, 53.6],
+      [73.4, 53.5]
+    ],
+    [
+      [68.2, 55],
+      [65.7, 54.6],
+      [65.2, 54.4]
+    ],
+    [
+      [65.2, 54.4],
+      [61.4, 54],
+      [61, 53.7]
+    ],
+    [
+      [59.6, 50.6],
+      [58.4, 51.1],
+      [56.8, 51],
+      [55.7, 50.6],
+      [54.5, 51]
+    ],
+    [
+      [46.5, 48.4],
+      [47.3, 47.7],
+      [48.1, 47.7],
+      [48.7, 47.1]
+    ],
+    [
+      [48.7, 47.1],
+      [48.6, 46.6],
+      [49.1, 46.4]
+    ],
+    [
+      [49.1, 46.4],
+      [48.7, 45.8],
+      [47.7, 45.6],
+      [46.7, 44.6],
+      [47.6, 43.7],
+      [47.5, 43],
+      [48.6, 41.8],
+      [48, 41.4]
+    ],
+    [
+      [46.4, 41.9],
+      [45.8, 42.1],
+      [45.5, 42.5]
+    ],
+    [
+      [44.5, 42.7],
+      [43.9, 42.6],
+      [43.8, 42.7],
+      [42.4, 43.2],
+      [40.9, 43.4],
+      [40.1, 43.6]
+    ],
+    [
+      [40, 43.4],
+      [38.7, 44.3],
+      [37.5, 44.7],
+      [36.7, 45.2],
+      [37.4, 45.4],
+      [38.2, 46.2],
+      [37.7, 46.6],
+      [39.2, 47],
+      [39.1, 47.3],
+      [38.2, 47.1]
+    ],
+    [
+      [38.2, 47.1],
+      [38.3, 47.6]
+    ],
+    [
+      [38.3, 47.6],
+      [38.8, 47.8],
+      [39.7, 47.9]
+    ],
+    [
+      [39.7, 47.9],
+      [39.9, 48.2],
+      [39.7, 48.8],
+      [40.1, 49.3]
+    ],
+    [
+      [40.1, 49.3],
+      [40.1, 49.6],
+      [38.6, 49.9]
+    ],
+    [
+      [38.6, 49.9],
+      [38, 49.9],
+      [37.4, 50.4],
+      [36.6, 50.2],
+      [35.4, 50.6]
+    ],
+    [
+      [35.4, 50.6],
+      [35.4, 50.8],
+      [35, 51.2]
+    ],
+    [
+      [35, 51.2],
+      [34.2, 51.3],
+      [34.1, 51.6],
+      [34.4, 51.8],
+      [33.8, 52.3],
+      [32.7, 52.2],
+      [32.4, 52.3]
+    ],
+    [
+      [32.4, 52.3],
+      [32.2, 52.1],
+      [31.8, 52.1],
+      [31.5, 52.7]
+    ],
+    [
+      [31.3, 53.1],
+      [31.5, 53.2],
+      [32.3, 53.1]
+    ],
+    [
+      [27.7, 57.8],
+      [27.4, 58.7],
+      [28.1, 59.3]
+    ],
+    [
+      [28.1, 59.3],
+      [28, 59.5],
+      [29.1, 60],
+      [28.1, 60.5],
+      [30.2, 61.8]
+    ],
+    [
+      [28.6, 69.1],
+      [29.4, 69.2],
+      [31.1, 69.6],
+      [32.1, 69.9],
+      [33.8, 69.3],
+      [36.5, 69.1],
+      [40.3, 67.9],
+      [41.1, 67.5],
+      [41.1, 66.8],
+      [40, 66.3],
+      [38.4, 66],
+      [33.9, 66.8],
+      [33.2, 66.6],
+      [34.8, 65.9],
+      [34.9, 65.4],
+      [34.9, 64.4],
+      [36.2, 64.1],
+      [37, 63.9],
+      [37.1, 64.3],
+      [36.5, 64.8],
+      [37.2, 65.1],
+      [39.6, 64.5],
+      [40.4, 64.8],
+      [39.8, 65.5],
+      [42.1, 66.5],
+      [43, 66.4],
+      [44, 66.1],
+      [44.5, 66.8],
+      [43.7, 67.4],
+      [44.2, 68],
+      [43.5, 68.6],
+      [46.3, 68.3],
+      [46.8, 67.7],
+      [45.6, 67.6],
+      [45.6, 67],
+      [46.4, 66.7],
+      [47.9, 66.9],
+      [48.1, 67.5],
+      [50.2, 68],
+      [53.7, 68.9],
+      [54.5, 68.8],
+      [53.5, 68.2],
+      [54.7, 68.1],
+      [55.4, 68.4],
+      [57.3, 68.5],
+      [58.8, 68.9],
+      [59.9, 68.3],
+      [61.1, 68.9],
+      [60, 69.5],
+      [60.6, 69.9],
+      [63.5, 69.6],
+      [64.9, 69.2],
+      [68.5, 68.1],
+      [69.2, 68.6],
+      [68.2, 69.1],
+      [68.1, 69.4],
+      [66.9, 69.5],
+      [67.3, 69.9],
+      [66.7, 70.7],
+      [66.7, 71],
+      [68.5, 71.9],
+      [69.2, 72.8],
+      [69.9, 73],
+      [72.6, 72.8],
+      [72.8, 72.2],
+      [71.9, 71.4],
+      [72.5, 71.1],
+      [72.8, 70.4],
+      [72.6, 69],
+      [73.7, 68.4],
+      [73.2, 67.7],
+      [71.3, 66.3],
+      [72.4, 66.2],
+      [72.8, 66.5],
+      [73.9, 66.8],
+      [74.2, 67.3],
+      [75.1, 67.8],
+      [74.5, 68.3],
+      [74.9, 69],
+      [73.8, 69.1],
+      [73.6, 69.6],
+      [74.4, 70.6],
+      [73.1, 71.5],
+      [74.9, 72.1],
+      [74.7, 72.8],
+      [75.2, 72.9],
+      [75.7, 72.3],
+      [75.3, 71.3],
+      [76.4, 71.2],
+      [75.9, 71.9],
+      [77.6, 72.3],
+      [79.7, 72.3],
+      [81.5, 71.8],
+      [80.6, 72.6],
+      [80.5, 73.7],
+      [82.3, 73.9],
+      [84.7, 73.8],
+      [86.8, 73.9],
+      [86, 74.5],
+      [87.2, 75.1],
+      [88.3, 75.1],
+      [90.3, 75.6],
+      [92.9, 75.8],
+      [93.2, 76.1],
+      [95.9, 76.1],
+      [96.7, 75.9],
+      [98.9, 76.5],
+      [100.8, 76.4],
+      [101, 76.9],
+      [102, 77.3],
+      [104.4, 77.7],
+      [106.1, 77.4],
+      [104.7, 77.1],
+      [107, 77],
+      [107.2, 76.5],
+      [108.2, 76.7],
+      [111.1, 76.7],
+      [113.3, 76.2],
+      [114.1, 75.9],
+      [113.9, 75.3],
+      [112.8, 75],
+      [110.2, 74.5],
+      [109.4, 74.2],
+      [110.6, 74],
+      [112.1, 73.8],
+      [113, 74],
+      [113.5, 73.3],
+      [114, 73.6],
+      [115.6, 73.8],
+      [118.8, 73.6],
+      [119, 73.1],
+      [123.2, 73],
+      [123.3, 73.7],
+      [125.4, 73.6],
+      [127, 73.6],
+      [128.6, 73],
+      [129.1, 72.4],
+      [128.5, 72],
+      [129.7, 71.2],
+      [131.3, 70.8],
+      [132.3, 71.8],
+      [133.9, 71.4],
+      [135.6, 71.7],
+      [137.5, 71.4],
+      [138.2, 71.6],
+      [139.9, 71.5],
+      [139.2, 72.4],
+      [140.5, 72.9],
+      [149.5, 72.2],
+      [150.4, 71.6],
+      [153, 70.8],
+      [157, 71],
+      [159, 70.9],
+      [159.8, 70.5],
+      [159.7, 69.7],
+      [160.9, 69.4],
+      [162.3, 69.6],
+      [164.1, 69.7],
+      [165.9, 69.5],
+      [167.8, 69.6],
+      [169.6, 68.7],
+      [170.8, 69],
+      [170, 69.7],
+      [170.5, 70.1],
+      [173.6, 69.8],
+      [175.7, 69.9],
+      [178.6, 69.4],
+      [180, 69],
+      [180, 65],
+      [178.7, 64.5],
+      [177.4, 64.6],
+      [178.3, 64.1],
+      [178.9, 63.3],
+      [179.4, 63],
+      [179.5, 62.6],
+      [179.2, 62.3],
+      [177.4, 62.5],
+      [174.6, 61.8],
+      [173.7, 61.7],
+      [172.2, 61],
+      [170.7, 60.3],
+      [170.3, 59.9],
+      [168.9, 60.6],
+      [166.3, 59.8],
+      [165.8, 60.2],
+      [164.9, 59.7],
+      [163.5, 59.9],
+      [163.2, 59.2],
+      [162, 58.2],
+      [162.1, 57.8],
+      [163.2, 57.6],
+      [163.1, 56.2],
+      [162.1, 56.1],
+      [161.7, 55.3],
+      [162.1, 54.9],
+      [160.4, 54.3],
+      [160, 53.2],
+      [158.5, 53],
+      [158.2, 51.9],
+      [156.8, 51],
+      [156.4, 51.7],
+      [156, 53.2],
+      [155.4, 55.4],
+      [155.9, 56.8],
+      [156.8, 57.4],
+      [156.8, 57.8],
+      [158.4, 58.1],
+      [160.2, 59.3],
+      [161.9, 60.3],
+      [163.7, 61.1],
+      [164.5, 62.6],
+      [163.3, 62.5],
+      [162.7, 61.6],
+      [160.1, 60.5],
+      [159.3, 61.8],
+      [156.7, 61.4],
+      [154.2, 59.8],
+      [155, 59.1],
+      [152.8, 58.9],
+      [151.3, 58.8],
+      [151.3, 59.5],
+      [149.8, 59.7],
+      [148.5, 59.2],
+      [145.5, 59.3],
+      [142.2, 59],
+      [139, 57.1],
+      [135.1, 54.7],
+      [136.7, 54.6],
+      [137.2, 54],
+      [138.2, 53.8],
+      [138.8, 54.3],
+      [139.9, 54.2],
+      [141.4, 53.1],
+      [141.4, 52.2],
+      [140.6, 51.2],
+      [140.5, 50.1],
+      [140.1, 48.5],
+      [138.6, 47],
+      [138.2, 46.3],
+      [136.9, 45.1],
+      [135.5, 44],
+      [134.9, 43.4],
+      [133.5, 42.8],
+      [132.9, 42.8],
+      [132.3, 43.3],
+      [130.9, 42.6],
+      [130.8, 42.2],
+      [130.6, 42.4],
+      [130.6, 42.9]
+    ],
+    [
+      [105.1, 78.3],
+      [99.4, 77.9],
+      [101.3, 79.2],
+      [102.1, 79.4],
+      [102.8, 79.3],
+      [105.4, 78.7],
+      [105.1, 78.3]
+    ],
+    [
+      [51.1, 80.6],
+      [49.8, 80.4],
+      [48.9, 80.3],
+      [48.8, 80.2],
+      [47.6, 80],
+      [46.5, 80.3],
+      [47.1, 80.6],
+      [44.9, 80.6],
+      [46.8, 80.8],
+      [48.3, 80.8],
+      [48.5, 80.5],
+      [49.1, 80.8],
+      [50, 80.9],
+      [51.5, 80.7],
+      [51.1, 80.6]
+    ],
+    [
+      [99.9, 78.9],
+      [97.8, 78.8],
+      [95, 79],
+      [93.3, 79.4],
+      [92.6, 80.1],
+      [91.2, 80.3],
+      [93.8, 81],
+      [95.9, 81.3],
+      [97.9, 80.8],
+      [100.2, 79.8],
+      [99.9, 78.9]
+    ],
+    [
+      [30.4, -1.1],
+      [30.8, -1.7],
+      [30.8, -2.3]
+    ],
+    [
+      [30.8, -2.3],
+      [30.5, -2.4]
+    ],
+    [
+      [29.6, -1.3],
+      [29.8, -1.4],
+      [30.4, -1.1]
+    ],
+    [
+      [-17.1, 21],
+      [-17, 21.4],
+      [-17, 21.9],
+      [-16.6, 22.2],
+      [-16.3, 22.7],
+      [-16.3, 23],
+      [-16, 23.7],
+      [-15.4, 24.4],
+      [-15.1, 24.5],
+      [-14.8, 25.1],
+      [-14.8, 25.6],
+      [-14.4, 26.3],
+      [-13.8, 26.6],
+      [-13.4, 27.2],
+      [-13.3, 27.4],
+      [-13.1, 27.6]
+    ],
+    [
+      [42.8, 16.4],
+      [42.7, 16.8],
+      [42.4, 17.1],
+      [42.3, 17.5],
+      [41.8, 17.8],
+      [41.2, 18.7],
+      [40.9, 19.5],
+      [40.3, 20.2],
+      [39.8, 20.3],
+      [39.1, 21.3],
+      [39, 22],
+      [39.1, 22.6],
+      [38.5, 23.7],
+      [38, 24.1],
+      [37.5, 24.3],
+      [37.2, 24.9],
+      [37.2, 25.1],
+      [36.9, 25.6],
+      [36.6, 25.8],
+      [36.3, 26.6],
+      [35.6, 27.4],
+      [35.1, 28.1],
+      [34.6, 28.1],
+      [34.8, 28.6],
+      [34.8, 29],
+      [35, 29.4]
+    ],
+    [
+      [48.4, 28.6],
+      [48.8, 27.7],
+      [49.3, 27.5],
+      [49.5, 27.1],
+      [50.2, 26.7],
+      [50.2, 26.3],
+      [50.1, 25.9],
+      [50.2, 25.6],
+      [50.5, 25.3],
+      [50.7, 25],
+      [50.8, 24.8]
+    ],
+    [
+      [51.4, 24.6],
+      [51.6, 24.3]
+    ],
+    [
+      [52, 19],
+      [49.1, 18.6],
+      [48.2, 18.2],
+      [47.5, 17.1],
+      [47, 17],
+      [46.8, 17.3],
+      [46.4, 17.2],
+      [45.4, 17.3],
+      [45.2, 17.4],
+      [44.1, 17.4],
+      [43.8, 17.3],
+      [43.4, 17.6],
+      [43.1, 17.1],
+      [43.2, 16.7],
+      [42.8, 16.4]
+    ],
+    [
+      [34, 9.5],
+      [33.8, 9.5],
+      [33.8, 10],
+      [33.7, 10.3],
+      [33.2, 10.7],
+      [33.1, 11.4],
+      [33.2, 12.2],
+      [32.7, 12.3],
+      [32.7, 12],
+      [32.1, 12],
+      [32.3, 11.7],
+      [32.4, 11.1],
+      [31.9, 10.5],
+      [31.4, 9.8],
+      [30.8, 9.7],
+      [30, 10.3],
+      [29.6, 10.1],
+      [29.5, 9.8],
+      [29, 9.6],
+      [29, 9.4],
+      [28, 9.4],
+      [27.8, 9.6],
+      [27.1, 9.6],
+      [26.8, 9.5],
+      [26.5, 9.6],
+      [26, 10.1],
+      [25.8, 10.4],
+      [25.1, 10.3],
+      [24.8, 9.8],
+      [24.5, 8.9],
+      [24.2, 8.7],
+      [23.9, 8.6]
+    ],
+    [
+      [23.9, 8.6],
+      [23.8, 8.7]
+    ],
+    [
+      [22.9, 11.1],
+      [22.9, 11.4],
+      [22.5, 11.7],
+      [22.5, 12.3],
+      [22.3, 12.7],
+      [21.9, 12.6],
+      [22, 13],
+      [22.3, 13.4],
+      [22.2, 13.8],
+      [22.5, 14.1],
+      [22.3, 14.3],
+      [22.6, 14.9],
+      [23, 15.7],
+      [23.9, 15.6],
+      [23.8, 19.6]
+    ],
+    [
+      [36.9, 22],
+      [37.2, 21],
+      [37, 20.8],
+      [37.1, 19.8],
+      [37.5, 18.6],
+      [37.9, 18.4],
+      [38.4, 18]
+    ],
+    [
+      [36.9, 17],
+      [36.8, 16.3],
+      [36.3, 14.8],
+      [36.4, 14.4]
+    ],
+    [
+      [34, 9.6],
+      [34, 9.5]
+    ],
+    [
+      [34, 9.5],
+      [34, 8.7]
+    ],
+    [
+      [34, 4.3],
+      [33.4, 3.8],
+      [32.7, 3.8],
+      [31.9, 3.6],
+      [31.3, 3.8],
+      [30.8, 3.5]
+    ],
+    [
+      [30.8, 3.5],
+      [30, 4.2],
+      [29.7, 4.6]
+    ],
+    [
+      [24.6, 8.2],
+      [23.9, 8.6]
+    ],
+    [
+      [-16.7, 13.6],
+      [-17.1, 14.4],
+      [-17.6, 14.7],
+      [-17.2, 14.9],
+      [-16.7, 15.6],
+      [-16.5, 16.1]
+    ],
+    [
+      [-16.7, 12.4],
+      [-16.8, 13.2]
+    ],
+    [
+      [162.1, -10.5],
+      [162.4, -10.8],
+      [161.7, -10.8],
+      [161.3, -10.2],
+      [161.9, -10.4],
+      [162.1, -10.5]
+    ],
+    [
+      [160.9, -9.9],
+      [160.5, -9.9],
+      [159.9, -9.8],
+      [159.6, -9.6],
+      [159.7, -9.2],
+      [160.4, -9.4],
+      [160.7, -9.6],
+      [160.9, -9.9]
+    ],
+    [
+      [161.7, -9.6],
+      [161.5, -9.8],
+      [160.8, -8.9],
+      [160.6, -8.3],
+      [160.9, -8.3],
+      [161.3, -9.1],
+      [161.7, -9.6]
+    ],
+    [
+      [159.9, -8.3],
+      [159.9, -8.5],
+      [159.1, -8.1],
+      [158.6, -7.7],
+      [158.2, -7.4],
+      [158.4, -7.3],
+      [158.8, -7.6],
+      [159.6, -8],
+      [159.9, -8.3]
+    ],
+    [
+      [157.5, -7.3],
+      [157.3, -7.4],
+      [156.9, -7.2],
+      [156.5, -6.8],
+      [156.5, -6.6],
+      [157.1, -7],
+      [157.5, -7.3]
+    ],
+    [
+      [-11.4, 6.8],
+      [-11.7, 6.9],
+      [-12.4, 7.3],
+      [-12.9, 7.8],
+      [-13.1, 8.2],
+      [-13.2, 8.9]
+    ],
+    [
+      [-87.8, 13.4],
+      [-87.9, 13.2],
+      [-88.5, 13.2],
+      [-88.8, 13.3],
+      [-89.3, 13.5],
+      [-89.8, 13.5],
+      [-90.1, 13.7]
+    ],
+    [
+      [47.8, 8],
+      [47, 8],
+      [43.7, 9.2]
+    ],
+    [
+      [43.7, 9.2],
+      [43.3, 9.5],
+      [42.9, 10]
+    ],
+    [
+      [43.2, 11.5],
+      [43.5, 11.3],
+      [43.7, 10.9],
+      [44.1, 10.5],
+      [44.6, 10.4],
+      [45.6, 10.7],
+      [46.7, 10.8],
+      [47.5, 11.1],
+      [48, 11.2],
+      [48.4, 11.4],
+      [49, 11.4],
+      [48.9, 11.4],
+      [49, 11.4],
+      [49.3, 11.4],
+      [49.7, 11.6],
+      [50.3, 11.7],
+      [50.7, 12],
+      [51.1, 12],
+      [51.1, 11.8],
+      [51, 11.2],
+      [51.1, 10.6],
+      [50.8, 10.3],
+      [50.6, 9.2],
+      [50.1, 8.1],
+      [49.5, 6.8],
+      [48.6, 5.3],
+      [47.7, 4.2],
+      [46.6, 2.9],
+      [45.6, 2.1],
+      [44.1, 1.1],
+      [43.1, 0.3],
+      [42, -0.9],
+      [41.8, -1.4],
+      [41.6, -1.7]
+    ],
+    [
+      [19.4, 44.9],
+      [19, 44.9],
+      [19.4, 45.2]
+    ],
+    [
+      [19.1, 45.5],
+      [18.8, 45.9],
+      [19.6, 46.2]
+    ],
+    [
+      [-57.1, 6],
+      [-55.9, 5.8],
+      [-55.8, 6],
+      [-55, 6],
+      [-54, 5.8]
+    ],
+    [
+      [-54.4, 4.2],
+      [-54, 3.6],
+      [-54.2, 3.2],
+      [-54.3, 2.7],
+      [-54.5, 2.3]
+    ],
+    [
+      [22.6, 49.1],
+      [22.3, 48.8],
+      [22.1, 48.4]
+    ],
+    [
+      [13.7, 45.5],
+      [13.9, 45.6]
+    ],
+    [
+      [23.9, 66],
+      [22.2, 65.7],
+      [21.2, 65],
+      [21.4, 64.4],
+      [19.8, 63.6],
+      [17.9, 62.8],
+      [17.1, 61.3],
+      [17.8, 60.6],
+      [18.8, 60.1],
+      [17.9, 59],
+      [16.8, 58.7],
+      [16.5, 57],
+      [15.9, 56.1],
+      [14.7, 56.2],
+      [14.1, 55.4],
+      [12.9, 55.4],
+      [12.6, 56.3],
+      [11.8, 57.4],
+      [11, 58.9]
+    ],
+    [
+      [32.1, -26.7],
+      [31.9, -27.2],
+      [31.3, -27.3],
+      [30.7, -26.7],
+      [30.7, -26.4],
+      [31, -26],
+      [31, -25.7],
+      [31.3, -25.7],
+      [31.8, -25.8]
+    ],
+    [
+      [36, 34.6],
+      [35.9, 35.4],
+      [36.2, 35.8]
+    ],
+    [
+      [36.2, 35.8],
+      [36.4, 36],
+      [36.7, 36.3],
+      [36.7, 36.8],
+      [37.1, 36.6],
+      [38.2, 36.9],
+      [38.7, 36.7],
+      [39.5, 36.7],
+      [40.7, 37.1],
+      [41.2, 37.1],
+      [42.4, 37.2]
+    ],
+    [
+      [13.5, 14.4],
+      [14, 15.7],
+      [15.3, 16.6]
+    ],
+    [
+      [15.5, 20.7],
+      [15.5, 21.1],
+      [15.1, 21.3]
+    ],
+    [
+      [15, 11.6],
+      [14.9, 12.2],
+      [14.5, 12.9]
+    ],
+    [
+      [1.9, 6.1],
+      [1.1, 5.9]
+    ],
+    [
+      [102.6, 12.2],
+      [101.7, 12.7],
+      [100.8, 12.6],
+      [101, 13.4],
+      [100.1, 13.4],
+      [100, 12.3],
+      [99.5, 10.9],
+      [99.2, 10],
+      [99.2, 9.2],
+      [99.9, 9.2],
+      [100.3, 8.3],
+      [100.5, 7.4],
+      [101, 6.9],
+      [101.6, 6.7],
+      [102.1, 6.2]
+    ],
+    [
+      [100.1, 6.5],
+      [99.7, 6.9],
+      [99.5, 7.3],
+      [99, 7.9],
+      [98.5, 8.4],
+      [98.3, 7.8],
+      [98.2, 8.4],
+      [98.3, 9],
+      [98.6, 9.9]
+    ],
+    [
+      [67.8, 37.1],
+      [68.4, 38.2],
+      [68.2, 38.9],
+      [67.4, 39.1],
+      [67.7, 39.6],
+      [68.5, 39.5],
+      [69, 40.1],
+      [69.3, 40.7],
+      [70.7, 41],
+      [70.5, 40.5],
+      [70.6, 40.2],
+      [71, 40.2]
+    ],
+    [
+      [53.9, 37.2],
+      [53.7, 37.9],
+      [53.9, 39],
+      [53.1, 39.3],
+      [53.4, 40],
+      [52.7, 40],
+      [52.9, 40.9],
+      [53.9, 40.6],
+      [54.7, 41],
+      [54, 41.6],
+      [53.7, 42.1],
+      [52.9, 41.9],
+      [52.8, 41.1],
+      [52.5, 41.8]
+    ],
+    [
+      [56, 41.3],
+      [57.1, 41.3],
+      [56.9, 41.8],
+      [57.8, 42.2],
+      [58.6, 42.8],
+      [60, 42.2],
+      [60.1, 41.4],
+      [60.5, 41.2],
+      [61.6, 41.3],
+      [61.9, 41.1],
+      [62.4, 40.1],
+      [63.5, 39.4],
+      [64.2, 38.9],
+      [65.2, 38.4],
+      [66.6, 38],
+      [66.5, 37.4]
+    ],
+    [
+      [125, -8.9],
+      [125.1, -8.7],
+      [126, -8.4],
+      [126.6, -8.4],
+      [127, -8.3],
+      [127.3, -8.4],
+      [127, -8.7],
+      [125.9, -9.1],
+      [125.1, -9.4]
+    ],
+    [
+      [-61.7, 10.8],
+      [-61.1, 10.9],
+      [-60.9, 10.9],
+      [-60.9, 10.1],
+      [-61.8, 10],
+      [-61.9, 10.1],
+      [-61.7, 10.4],
+      [-61.7, 10.8]
+    ],
+    [
+      [8.4, 37],
+      [9.5, 37.4],
+      [10.2, 37.2],
+      [10.2, 36.7],
+      [11, 37.1],
+      [11.1, 36.9],
+      [10.6, 36.4],
+      [10.6, 36],
+      [10.9, 35.7],
+      [10.8, 34.8],
+      [10.2, 34.3],
+      [10.3, 33.8],
+      [10.9, 33.8],
+      [11.1, 33.3],
+      [11.5, 33.1]
+    ],
+    [
+      [44.2, 38],
+      [44.8, 37.2]
+    ],
+    [
+      [36.2, 35.8],
+      [35.8, 36.3],
+      [36.2, 36.7],
+      [35.6, 36.6],
+      [34.7, 36.8],
+      [34, 36.2],
+      [32.5, 36.1],
+      [31.7, 36.6],
+      [30.6, 36.7],
+      [30.4, 36.3],
+      [29.7, 36.1],
+      [28.7, 36.7],
+      [27.6, 36.7],
+      [27.1, 37.7],
+      [26.3, 38.2],
+      [26.8, 39],
+      [26.2, 39.5],
+      [27.3, 40.4],
+      [28.8, 40.5],
+      [29.2, 41.2],
+      [31.2, 41.1],
+      [32.4, 41.7],
+      [33.5, 42],
+      [35.2, 42],
+      [36.9, 41.3],
+      [38.4, 41],
+      [39.5, 41.1],
+      [40.4, 41],
+      [41.6, 41.5]
+    ],
+    [
+      [28, 42],
+      [28.1, 41.6],
+      [29, 41.3],
+      [28.8, 41.1],
+      [27.6, 41],
+      [27.2, 40.7],
+      [26.4, 40.2],
+      [26, 40.6],
+      [26.1, 40.8]
+    ],
+    [
+      [121.8, 24.4],
+      [121.2, 22.8],
+      [120.8, 22],
+      [120.2, 22.8],
+      [120.1, 23.6],
+      [120.7, 24.5],
+      [121.5, 25.3],
+      [122, 25],
+      [121.8, 24.4]
+    ],
+    [
+      [39.2, -4.7],
+      [38.7, -5.9],
+      [38.8, -6.5],
+      [39.4, -6.8],
+      [39.5, -7.1],
+      [39.2, -7.7],
+      [39.3, -8],
+      [39.2, -8.5],
+      [39.5, -9.1],
+      [40, -10.1],
+      [40.3, -10.3],
+      [39.5, -10.9],
+      [38.4, -11.3]
+    ],
+    [
+      [38.4, -11.3],
+      [37.8, -11.3],
+      [37.5, -11.6],
+      [36.8, -11.6]
+    ],
+    [
+      [34.6, -11.5],
+      [34.3, -10.2],
+      [33.9, -9.7]
+    ],
+    [
+      [33.9, -9.7],
+      [33.7, -9.4],
+      [32.8, -9.2]
+    ],
+    [
+      [32.8, -9.2],
+      [32.2, -8.9],
+      [31.6, -8.8],
+      [31.2, -8.6]
+    ],
+    [
+      [31.2, -8.6],
+      [30.7, -8.3],
+      [30.2, -7.1],
+      [29.6, -6.5],
+      [29.4, -5.9]
+    ],
+    [
+      [29.8, -4.4],
+      [30.1, -4.1],
+      [30.5, -3.6],
+      [30.8, -3.4],
+      [30.7, -3],
+      [30.5, -2.8],
+      [30.5, -2.4],
+      [30.8, -2.3]
+    ],
+    [
+      [30.4, -1.1],
+      [30.8, -1],
+      [31.9, -1],
+      [33.9, -0.9]
+    ],
+    [
+      [29.6, -0.6],
+      [29.8, -0.2],
+      [29.9, 0.6]
+    ],
+    [
+      [31.2, 2.2],
+      [30.8, 2.3],
+      [30.8, 3.5]
+    ],
+    [
+      [31.8, 52.1],
+      [32.2, 52.1],
+      [32.4, 52.3]
+    ],
+    [
+      [35, 51.2],
+      [35.4, 50.8],
+      [35.4, 50.6]
+    ],
+    [
+      [38.6, 49.9],
+      [40.1, 49.6],
+      [40.1, 49.3]
+    ],
+    [
+      [40.1, 49.3],
+      [39.7, 48.8],
+      [39.9, 48.2],
+      [39.7, 47.9]
+    ],
+    [
+      [39.7, 47.9],
+      [38.8, 47.8],
+      [38.3, 47.6]
+    ],
+    [
+      [38.2, 47.1],
+      [37.4, 47],
+      [36.8, 46.7],
+      [35.8, 46.7],
+      [35, 46.3],
+      [35, 45.7],
+      [35.5, 45.4],
+      [36.5, 45.5],
+      [36.3, 45.1],
+      [35.2, 44.9],
+      [33.9, 44.4],
+      [33.3, 44.6],
+      [33.6, 45],
+      [32.5, 45.3],
+      [32.6, 45.5],
+      [33.6, 45.9],
+      [33.3, 46.1],
+      [31.7, 46.3],
+      [31.7, 46.7],
+      [30.8, 46.6],
+      [30.4, 46],
+      [29.6, 45.3]
+    ],
+    [
+      [-53.4, -33.8],
+      [-53.8, -34.4],
+      [-54.9, -34.9],
+      [-55.7, -34.7],
+      [-56.2, -34.9],
+      [-57.1, -34.4],
+      [-57.8, -34.5],
+      [-58.4, -33.9]
+    ],
+    [
+      [-155.5, 19.1],
+      [-155.7, 18.9],
+      [-155.9, 19.1],
+      [-155.9, 19.3],
+      [-156.1, 19.7],
+      [-156, 19.8],
+      [-155.8, 20],
+      [-155.9, 20.2],
+      [-155.9, 20.3],
+      [-155.8, 20.3],
+      [-155.4, 20.1],
+      [-155.2, 20],
+      [-155.1, 19.9],
+      [-154.8, 19.5],
+      [-155.2, 19.2],
+      [-155.5, 19.1]
+    ],
+    [
+      [-156.1, 20.6],
+      [-156.4, 20.6],
+      [-156.6, 20.8],
+      [-156.7, 20.9],
+      [-156.6, 21],
+      [-156.3, 20.9],
+      [-156, 20.8],
+      [-156.1, 20.6]
+    ],
+    [
+      [-156.8, 21.2],
+      [-156.8, 21.1],
+      [-157.3, 21.1],
+      [-157.2, 21.2],
+      [-156.8, 21.2]
+    ],
+    [
+      [-157.6, 21.3],
+      [-157.7, 21.3],
+      [-157.8, 21.3],
+      [-158.1, 21.3],
+      [-158.2, 21.5],
+      [-158.3, 21.6],
+      [-158, 21.7],
+      [-157.9, 21.7],
+      [-157.6, 21.3]
+    ],
+    [
+      [-159.3, 22],
+      [-159.5, 21.9],
+      [-159.8, 22.1],
+      [-159.7, 22.1],
+      [-159.6, 22.2],
+      [-159.4, 22.2],
+      [-159.3, 22]
+    ],
+    [
+      [-67.1, 45.1],
+      [-67, 44.8],
+      [-68, 44.3],
+      [-69.1, 44],
+      [-70.1, 43.7],
+      [-70.6, 43.1],
+      [-70.8, 42.9],
+      [-70.8, 42.3],
+      [-70.5, 41.8],
+      [-70.1, 41.8],
+      [-70.2, 42.2],
+      [-69.9, 41.9],
+      [-70, 41.6],
+      [-70.6, 41.5],
+      [-71.1, 41.5],
+      [-71.9, 41.3],
+      [-72.3, 41.3],
+      [-72.9, 41.2],
+      [-73.7, 40.9],
+      [-72.2, 41.1],
+      [-71.9, 40.9],
+      [-73.3, 40.6],
+      [-74, 40.6],
+      [-73.9, 40.8],
+      [-74.3, 40.5],
+      [-74, 40.4],
+      [-74.2, 39.7],
+      [-74.9, 38.9],
+      [-75, 39.2],
+      [-75.2, 39.3],
+      [-75.5, 39.5],
+      [-75.3, 39],
+      [-75.1, 38.8],
+      [-75.1, 38.4],
+      [-75.4, 38],
+      [-75.9, 37.2],
+      [-76, 37.3],
+      [-75.7, 37.9],
+      [-76.2, 38.3],
+      [-76.3, 39.2],
+      [-76.5, 38.7],
+      [-76.3, 38.1],
+      [-77, 38.2],
+      [-76.3, 37.9],
+      [-76.3, 37],
+      [-76, 36.9],
+      [-75.9, 36.6],
+      [-75.7, 35.6],
+      [-76.4, 34.8],
+      [-77.4, 34.5],
+      [-78, 33.9],
+      [-78.5, 33.9],
+      [-79.1, 33.5],
+      [-79.2, 33.2],
+      [-80.3, 32.5],
+      [-80.9, 32],
+      [-81.3, 31.4],
+      [-81.5, 30.7],
+      [-81.3, 30],
+      [-81, 29.2],
+      [-80.5, 28.5],
+      [-80.5, 28],
+      [-80.1, 26.9],
+      [-80.1, 26.2],
+      [-80.1, 25.8],
+      [-80.4, 25.2],
+      [-80.7, 25.1],
+      [-81.2, 25.2],
+      [-81.3, 25.6],
+      [-81.7, 25.9],
+      [-82.2, 26.7],
+      [-82.7, 27.5],
+      [-82.9, 27.9],
+      [-82.6, 28.6],
+      [-82.9, 29.1],
+      [-83.7, 29.9],
+      [-84.1, 30.1],
+      [-85.1, 29.6],
+      [-85.3, 29.7],
+      [-85.8, 30.2],
+      [-86.4, 30.4],
+      [-87.5, 30.3],
+      [-88.4, 30.4],
+      [-89.2, 30.3],
+      [-89.6, 30.2],
+      [-89.4, 29.9],
+      [-89.4, 29.5],
+      [-89.2, 29.3],
+      [-89.4, 29.2],
+      [-89.8, 29.3],
+      [-90.1, 29.1],
+      [-90.9, 29.2],
+      [-91.6, 29.7],
+      [-92.5, 29.6],
+      [-93.2, 29.8],
+      [-93.8, 29.7],
+      [-94.7, 29.5],
+      [-95.6, 28.7],
+      [-96.6, 28.3],
+      [-97.1, 27.8],
+      [-97.4, 27.4],
+      [-97.4, 26.7],
+      [-97.3, 26.2],
+      [-97.1, 25.9],
+      [-97.5, 25.8]
+    ],
+    [
+      [-117.1, 32.5],
+      [-117.3, 33.1],
+      [-117.9, 33.6],
+      [-118.4, 33.7],
+      [-118.5, 34],
+      [-119.1, 34.1],
+      [-119.4, 34.4],
+      [-120.4, 34.5],
+      [-120.6, 34.6],
+      [-120.7, 35.2],
+      [-121.7, 36.2],
+      [-122.5, 37.6],
+      [-122.5, 37.8],
+      [-122.9, 38.1],
+      [-123.7, 39],
+      [-123.9, 39.8],
+      [-124.4, 40.3],
+      [-124.2, 41.1],
+      [-124.2, 42],
+      [-124.5, 42.8],
+      [-124.1, 43.7],
+      [-124, 44.6],
+      [-123.9, 45.5],
+      [-124.1, 46.9],
+      [-124.4, 47.7],
+      [-124.7, 48.2],
+      [-124.6, 48.4],
+      [-123.1, 48],
+      [-122.6, 47.1],
+      [-122.3, 47.4],
+      [-122.5, 48.2],
+      [-122.8, 49]
+    ],
+    [
+      [-153, 57.1],
+      [-154, 56.7],
+      [-154.5, 57],
+      [-154.7, 57.5],
+      [-153.8, 57.8],
+      [-153.2, 58],
+      [-152.6, 57.9],
+      [-152.1, 57.6],
+      [-153, 57.1]
+    ],
+    [
+      [-165.6, 59.9],
+      [-166.2, 59.8],
+      [-166.8, 59.9],
+      [-167.5, 60.2],
+      [-166.5, 60.4],
+      [-165.7, 60.3],
+      [-165.6, 59.9]
+    ],
+    [
+      [-171.7, 63.8],
+      [-171.1, 63.6],
+      [-170.5, 63.7],
+      [-169.7, 63.4],
+      [-168.7, 63.3],
+      [-168.8, 63.2],
+      [-169.5, 63],
+      [-170.3, 63.2],
+      [-170.7, 63.4],
+      [-171.5, 63.3],
+      [-171.8, 63.4],
+      [-171.7, 63.8]
+    ],
+    [
+      [-134.3, 58.9],
+      [-133.4, 58.4],
+      [-132.7, 57.7]
+    ],
+    [
+      [-130, 55.9],
+      [-130, 55.3],
+      [-130.5, 54.8],
+      [-131.1, 55.2],
+      [-132, 55.5],
+      [-132.2, 56.4],
+      [-133.5, 57.2],
+      [-134.1, 58.1],
+      [-135, 58.2],
+      [-136.6, 58.2],
+      [-137.8, 58.5],
+      [-139.9, 59.5],
+      [-140.8, 59.7],
+      [-142.6, 60.1],
+      [-144, 60],
+      [-145.9, 60.5],
+      [-147.1, 60.9],
+      [-148.2, 60.7],
+      [-148, 60],
+      [-148.6, 59.9],
+      [-149.7, 59.7],
+      [-150.6, 59.4],
+      [-151.7, 59.2],
+      [-151.9, 59.7],
+      [-151.4, 60.7],
+      [-150.3, 61],
+      [-150.6, 61.3],
+      [-151.9, 60.7],
+      [-152.6, 60.1],
+      [-154, 59.4],
+      [-153.3, 58.9],
+      [-154.2, 58.2],
+      [-155.3, 57.7],
+      [-156.3, 57.4],
+      [-156.6, 57],
+      [-158.1, 56.5],
+      [-158.4, 56],
+      [-159.6, 55.6],
+      [-160.3, 55.6],
+      [-161.2, 55.4],
+      [-162.2, 55],
+      [-163.1, 54.7],
+      [-164.8, 54.4],
+      [-164.9, 54.6],
+      [-163.8, 55],
+      [-162.9, 55.4],
+      [-161.8, 55.9],
+      [-160.6, 56],
+      [-160.1, 56.4],
+      [-158.7, 57],
+      [-158.5, 57.2],
+      [-157.7, 57.6],
+      [-157.5, 58.3],
+      [-157, 58.9],
+      [-158.2, 58.6],
+      [-158.5, 58.8],
+      [-159.1, 58.4],
+      [-159.7, 58.9],
+      [-160, 58.6],
+      [-160.4, 59.1],
+      [-161.4, 58.7],
+      [-162, 58.7],
+      [-162, 59.3],
+      [-161.9, 59.6],
+      [-162.5, 60],
+      [-163.8, 59.8],
+      [-164.7, 60.3],
+      [-165.3, 60.5],
+      [-165.3, 61.1],
+      [-166.1, 61.5],
+      [-165.7, 62.1],
+      [-164.9, 62.6],
+      [-164.6, 63.2],
+      [-163.7, 63.2],
+      [-163.1, 63.1],
+      [-162.3, 63.5],
+      [-161.5, 63.5],
+      [-160.8, 63.8],
+      [-161, 64.2],
+      [-161.5, 64.4],
+      [-160.8, 64.8],
+      [-161.4, 64.8],
+      [-162.4, 64.6],
+      [-162.8, 64.3],
+      [-163.5, 64.6],
+      [-165, 64.5],
+      [-166.4, 64.7],
+      [-166.8, 65.1],
+      [-168.1, 65.7],
+      [-166.7, 66.1],
+      [-164.5, 66.6],
+      [-163.6, 66.6],
+      [-163.8, 66.1],
+      [-161.7, 66.1],
+      [-162.5, 66.7],
+      [-163.7, 67.1],
+      [-164.4, 67.6],
+      [-165.4, 68],
+      [-166.8, 68.4],
+      [-166.2, 68.9],
+      [-164.4, 68.9],
+      [-163.2, 69.4],
+      [-162.9, 69.9],
+      [-161.9, 70.3],
+      [-160.9, 70.5],
+      [-159, 70.9],
+      [-158.1, 70.8],
+      [-156.6, 71.4],
+      [-155.1, 71.2],
+      [-154.3, 70.7],
+      [-153.9, 70.9],
+      [-152.2, 70.8],
+      [-152.3, 70.6],
+      [-150.7, 70.4],
+      [-149.7, 70.5],
+      [-147.6, 70.2],
+      [-145.7, 70.1],
+      [-144.9, 70],
+      [-143.6, 70.2],
+      [-142.1, 69.9],
+      [-141, 69.7],
+      [-141, 66],
+      [-141, 60.3],
+      [-140, 60.3],
+      [-139, 60],
+      [-138.3, 59.6]
+    ],
+    [
+      [-71.3, 11.8],
+      [-71.4, 11.5],
+      [-71.9, 11.4],
+      [-71.6, 11],
+      [-71.6, 10.5],
+      [-72.1, 9.9],
+      [-71.7, 9.1],
+      [-71.3, 9.1],
+      [-71, 9.9],
+      [-71.3, 10.2],
+      [-71.4, 11],
+      [-70.2, 11.4],
+      [-70.3, 11.9],
+      [-69.9, 12.2],
+      [-69.6, 11.5],
+      [-68.9, 11.4],
+      [-68.2, 10.9],
+      [-68.2, 10.6],
+      [-67.3, 10.6],
+      [-66.2, 10.7],
+      [-65.7, 10.2],
+      [-64.9, 10.1],
+      [-64.3, 10.4],
+      [-64.3, 10.6],
+      [-63.1, 10.7],
+      [-61.9, 10.7],
+      [-62.7, 10.4],
+      [-62.4, 10],
+      [-61.6, 9.9],
+      [-60.8, 9.4],
+      [-60.7, 8.6],
+      [-60.1, 8.6],
+      [-59.8, 8.4]
+    ],
+    [
+      [108.1, 21.6],
+      [106.7, 20.7],
+      [105.9, 19.8],
+      [105.7, 19.1],
+      [106.4, 18],
+      [107.4, 16.7],
+      [108.3, 16.1],
+      [108.9, 15.3],
+      [109.3, 13.4],
+      [109.2, 11.7],
+      [108.4, 11],
+      [107.2, 10.4],
+      [106.4, 9.5],
+      [105.2, 8.6],
+      [104.8, 9.2],
+      [105.1, 9.9],
+      [104.3, 10.5]
+    ],
+    [
+      [167.8, -16.5],
+      [167.5, -16.6],
+      [167.2, -16.2],
+      [167.2, -15.9],
+      [167.8, -16.5]
+    ],
+    [
+      [167.1, -14.9],
+      [167.3, -15.7],
+      [167, -15.6],
+      [166.8, -15.7],
+      [166.7, -15.4],
+      [166.6, -14.6],
+      [167.1, -14.9]
+    ],
+    [
+      [53.1, 16.7],
+      [52.4, 16.4],
+      [52.2, 15.9],
+      [52.2, 15.6],
+      [51.2, 15.2],
+      [49.6, 14.7],
+      [48.7, 14],
+      [48.2, 14],
+      [47.9, 14],
+      [47.4, 13.6],
+      [46.7, 13.4],
+      [45.9, 13.4],
+      [45.6, 13.3],
+      [45.4, 13],
+      [45.1, 13],
+      [45, 12.7],
+      [44.5, 12.7],
+      [44.2, 12.6],
+      [43.5, 12.6],
+      [43.2, 13.2],
+      [43.3, 13.8],
+      [43.1, 14.1],
+      [42.9, 14.8],
+      [42.6, 15.2],
+      [42.8, 15.3],
+      [42.7, 15.7],
+      [42.8, 15.9],
+      [42.8, 16.4]
+    ],
+    [
+      [29.4, -22.1],
+      [29.8, -22.1],
+      [30.3, -22.3],
+      [30.7, -22.1],
+      [31.2, -22.2]
+    ],
+    [
+      [32.8, -26.7],
+      [32.6, -27.5],
+      [32.5, -28.3],
+      [32.2, -28.7],
+      [31.5, -29.3],
+      [31.3, -29.4],
+      [30.9, -29.9],
+      [30.6, -30.4],
+      [30.1, -31.1],
+      [28.9, -32.2],
+      [28.2, -32.8],
+      [27.5, -33.2],
+      [26.4, -33.6],
+      [25.9, -33.7],
+      [25.8, -33.9],
+      [25.2, -33.8],
+      [24.7, -34],
+      [23.6, -33.8],
+      [23, -33.9],
+      [22.6, -33.9],
+      [21.5, -34.3],
+      [20.7, -34.4],
+      [20.1, -34.8],
+      [19.6, -34.8],
+      [19.2, -34.5],
+      [18.9, -34.4],
+      [18.4, -34],
+      [18.4, -34.1],
+      [18.2, -33.9],
+      [18.3, -33.3],
+      [17.9, -32.6],
+      [18.3, -32.4],
+      [18.2, -31.7],
+      [17.6, -30.7],
+      [17.1, -29.9],
+      [16.3, -28.6]
+    ],
+    [
+      [30.3, -15.5],
+      [29.5, -15.6],
+      [29, -16],
+      [28.8, -16.4],
+      [28.5, -16.5],
+      [27.6, -17.3],
+      [27, -17.9],
+      [26.7, -18],
+      [26.4, -17.8],
+      [25.3, -17.7]
+    ],
+    [
+      [30.7, -8.3],
+      [31.2, -8.6]
+    ],
+    [
+      [-24.3, 14.9],
+      [-24.4, 14.8],
+      [-24.5, 14.8],
+      [-24.5, 14.9],
+      [-24.5, 15],
+      [-24.4, 15],
+      [-24.3, 14.9],
+      [-24.3, 14.9]
+    ],
+    [
+      [-23.2, 15.1],
+      [-23.3, 15.2],
+      [-23.3, 15.3],
+      [-23.2, 15.3],
+      [-23.1, 15.3],
+      [-23.1, 15.2],
+      [-23.2, 15.1]
+    ],
+    [
+      [-23.5, 15],
+      [-23.5, 14.9],
+      [-23.7, 14.9],
+      [-23.8, 15.1],
+      [-23.8, 15.2],
+      [-23.8, 15.3],
+      [-23.7, 15.3],
+      [-23.6, 15.1],
+      [-23.5, 15]
+    ],
+    [
+      [-22.9, 16.2],
+      [-22.8, 16.2],
+      [-22.7, 16.2],
+      [-22.7, 16.1],
+      [-22.7, 16],
+      [-22.8, 16],
+      [-22.9, 16],
+      [-23, 16],
+      [-22.9, 16.1],
+      [-22.9, 16.2]
+    ],
+    [
+      [-24.1, 16.6],
+      [-24.2, 16.6],
+      [-24.3, 16.6],
+      [-24.4, 16.5],
+      [-24.4, 16.6],
+      [-24.4, 16.7],
+      [-24.3, 16.6],
+      [-24.1, 16.6]
+    ],
+    [
+      [-22.9, 16.7],
+      [-22.9, 16.6],
+      [-23, 16.7],
+      [-23, 16.8],
+      [-22.9, 16.8],
+      [-22.9, 16.7]
+    ],
+    [
+      [-24.9, 16.8],
+      [-25, 16.8],
+      [-25.1, 16.8],
+      [-25.1, 16.9],
+      [-25, 16.9],
+      [-24.9, 16.8],
+      [-24.9, 16.8]
+    ],
+    [
+      [-25.2, 16.9],
+      [-25.3, 16.9],
+      [-25.3, 17],
+      [-25.4, 17.1],
+      [-25.1, 17.2],
+      [-25, 17.2],
+      [-25, 17.1],
+      [-25, 17],
+      [-25.2, 16.9]
+    ],
+    [
+      [43.8, -12.3],
+      [43.7, -12.4],
+      [43.6, -12.3],
+      [43.6, -12.2],
+      [43.7, -12.3],
+      [43.8, -12.3]
+    ],
+    [
+      [44.5, -12.1],
+      [44.5, -12.2],
+      [44.5, -12.3],
+      [44.5, -12.4],
+      [44.5, -12.3],
+      [44.4, -12.2],
+      [44.2, -12.2],
+      [44.3, -12.2],
+      [44.4, -12.2],
+      [44.4, -12.1],
+      [44.5, -12.1]
+    ],
+    [
+      [43.4, -11.9],
+      [43.3, -11.8],
+      [43.2, -11.8],
+      [43.2, -11.4],
+      [43.3, -11.4],
+      [43.4, -11.4],
+      [43.4, -11.6],
+      [43.4, -11.8],
+      [43.5, -11.9],
+      [43.4, -11.9]
+    ],
+    [
+      [57.6, -20.5],
+      [57.5, -20.5],
+      [57.4, -20.5],
+      [57.3, -20.5],
+      [57.3, -20.4],
+      [57.3, -20.3],
+      [57.4, -20.2],
+      [57.5, -20.1],
+      [57.6, -20],
+      [57.7, -20.1],
+      [57.8, -20.2],
+      [57.8, -20.3],
+      [57.7, -20.4],
+      [57.6, -20.5]
+    ],
+    [
+      [55.5, -4.7],
+      [55.5, -4.8],
+      [55.5, -4.7],
+      [55.4, -4.7],
+      [55.4, -4.6],
+      [55.5, -4.7]
+    ],
+    [
+      [50.6, 25.9],
+      [50.6, 25.8],
+      [50.5, 25.8],
+      [50.5, 26],
+      [50.5, 26.1],
+      [50.4, 26.2],
+      [50.5, 26.2],
+      [50.6, 26.2],
+      [50.5, 26.2],
+      [50.6, 26.1],
+      [50.6, 25.9]
+    ],
+    [
+      [73.4, 3.2],
+      [73.4, 3.3],
+      [73.4, 3.2],
+      [73.4, 3.2]
+    ],
+    [
+      [73.5, 4.2],
+      [73.5, 4.2]
+    ],
+    [
+      [169.6, 5.8],
+      [169.6, 5.9],
+      [169.7, 5.9],
+      [169.6, 5.8]
+    ],
+    [
+      [171.1, 7.1],
+      [171.2, 7.1],
+      [171.4, 7.1],
+      [171.3, 7.1],
+      [171.2, 7.1],
+      [171.1, 7.1],
+      [171.1, 7.1]
+    ],
+    [
+      [163, 5.3],
+      [162.9, 5.3],
+      [163, 5.3]
+    ],
+    [
+      [158.3, 6.8],
+      [158.2, 6.8],
+      [158.2, 6.9],
+      [158.1, 6.9],
+      [158.2, 7],
+      [158.3, 7],
+      [158.3, 6.9],
+      [158.3, 6.8],
+      [158.3, 6.8]
+    ],
+    [
+      [151.6, 7.3],
+      [151.6, 7.4],
+      [151.6, 7.3]
+    ],
+    [
+      [151.9, 7.4],
+      [151.9, 7.5],
+      [151.9, 7.4]
+    ],
+    [
+      [138.1, 9.5],
+      [138.1, 9.6],
+      [138.2, 9.6],
+      [138.2, 9.5],
+      [138.1, 9.5]
+    ],
+    [
+      [166.9, -0.5],
+      [167, -0.5],
+      [166.9, -0.5],
+      [166.9, -0.5]
+    ],
+    [
+      [134.6, 7.4],
+      [134.5, 7.4],
+      [134.5, 7.5],
+      [134.5, 7.6],
+      [134.6, 7.6],
+      [134.6, 7.5],
+      [134.6, 7.4],
+      [134.6, 7.4]
+    ],
+    [
+      [-171.5, -14.1],
+      [-171.8, -14.1],
+      [-171.9, -14],
+      [-172, -13.9],
+      [-172.1, -13.9],
+      [-172, -13.8],
+      [-171.9, -13.8],
+      [-171.6, -13.9],
+      [-171.6, -14],
+      [-171.5, -14],
+      [-171.5, -14.1]
+    ],
+    [
+      [-172.4, -13.5],
+      [-172.2, -13.6],
+      [-172.2, -13.7],
+      [-172.3, -13.8],
+      [-172.5, -13.8],
+      [-172.8, -13.6],
+      [-172.8, -13.5],
+      [-172.7, -13.5],
+      [-172.5, -13.5],
+      [-172.4, -13.5]
+    ],
+    [
+      [103.6, 1.2],
+      [103.7, 1.4],
+      [103.7, 1.5],
+      [103.9, 1.5],
+      [104, 1.4],
+      [104.1, 1.4],
+      [104.1, 1.3]
+    ],
+    [
+      [-174.9, -21.3],
+      [-174.9, -21.5],
+      [-175, -21.4],
+      [-175, -21.3],
+      [-174.9, -21.3]
+    ],
+    [
+      [-175.2, -21.2],
+      [-175.1, -21.1],
+      [-175.1, -21.2],
+      [-175.2, -21.3],
+      [-175.2, -21.2],
+      [-175.4, -21.2],
+      [-175.3, -21.1],
+      [-175.2, -21.1],
+      [-175.2, -21.2]
+    ],
+    [
+      [-174, -18.6],
+      [-174, -18.7],
+      [-174.1, -18.6],
+      [-174, -18.6],
+      [-173.9, -18.6],
+      [-174, -18.6]
+    ],
+    [
+      [178.3, -8],
+      [178.4, -7.9],
+      [178.5, -8],
+      [178.4, -8.1],
+      [178.3, -8]
+    ],
+    [
+      [178.7, -7.5],
+      [178.7, -7.5]
+    ],
+    [
+      [179.1, -8.4],
+      [179.2, -8.4],
+      [179.2, -8.5],
+      [179.1, -8.6],
+      [179, -8.5],
+      [179.1, -8.4],
+      [179.1, -8.4]
+    ],
+    [
+      [179.9, -9.3],
+      [179.9, -9.4],
+      [179.8, -9.4],
+      [179.8, -9.3],
+      [179.9, -9.3]
+    ],
+    [
+      [177, -12.5],
+      [177.2, -12.5],
+      [177, -12.5],
+      [177, -12.5]
+    ],
+    [
+      [177.2, -7.2],
+      [177.1, -7.2],
+      [177.2, -7.2],
+      [177.2, -7.2]
+    ],
+    [
+      [176.1, -5.6],
+      [176.1, -5.7],
+      [176.2, -5.7],
+      [176.1, -5.7],
+      [176, -5.6],
+      [176.1, -5.6]
+    ],
+    [
+      [-61.7, 17],
+      [-61.8, 17],
+      [-61.9, 17],
+      [-61.9, 17.1],
+      [-61.8, 17.2],
+      [-61.7, 17.1],
+      [-61.7, 17]
+    ],
+    [
+      [-61.8, 17.6],
+      [-61.8, 17.5],
+      [-61.9, 17.6],
+      [-61.9, 17.7],
+      [-61.8, 17.7],
+      [-61.8, 17.6]
+    ],
+    [
+      [-59.5, 13.1],
+      [-59.6, 13.1],
+      [-59.7, 13.2],
+      [-59.7, 13.3],
+      [-59.6, 13.3],
+      [-59.5, 13.2],
+      [-59.5, 13.1]
+    ],
+    [
+      [-61.3, 15.3],
+      [-61.4, 15.2],
+      [-61.4, 15.4],
+      [-61.5, 15.5],
+      [-61.5, 15.6],
+      [-61.3, 15.6],
+      [-61.3, 15.5],
+      [-61.3, 15.4],
+      [-61.3, 15.3]
+    ],
+    [
+      [-61.7, 12],
+      [-61.8, 12],
+      [-61.8, 12.1],
+      [-61.7, 12.2],
+      [-61.6, 12.2],
+      [-61.7, 12.1],
+      [-61.7, 12]
+    ],
+    [
+      [-62.6, 17.1],
+      [-62.6, 17.2],
+      [-62.6, 17.1]
+    ],
+    [
+      [-62.7, 17.2],
+      [-62.7, 17.3],
+      [-62.8, 17.3],
+      [-62.8, 17.4],
+      [-62.7, 17.4],
+      [-62.7, 17.3],
+      [-62.7, 17.2]
+    ],
+    [
+      [-60.9, 13.8],
+      [-61, 13.7],
+      [-61.1, 13.8],
+      [-61.1, 13.9],
+      [-61, 14],
+      [-61, 14.1],
+      [-60.9, 14.1],
+      [-60.9, 14],
+      [-60.9, 13.8]
+    ],
+    [
+      [-61.2, 13.2],
+      [-61.2, 13.1],
+      [-61.3, 13.2],
+      [-61.3, 13.3],
+      [-61.2, 13.3],
+      [-61.2, 13.4],
+      [-61.1, 13.4],
+      [-61.1, 13.2],
+      [-61.2, 13.2]
+    ],
+    [
+      [1.4, 42.6],
+      [1.5, 42.6],
+      [1.6, 42.6],
+      [1.7, 42.6],
+      [1.7, 42.5],
+      [1.5, 42.4],
+      [1.4, 42.4],
+      [1.4, 42.5],
+      [1.4, 42.6]
+    ],
+    [
+      [9.6, 47.1],
+      [9.6, 47.1]
+    ],
+    [
+      [9.5, 47.2],
+      [9.5, 47.3],
+      [9.6, 47.2]
+    ],
+    [
+      [14.6, 35.8],
+      [14.5, 35.8],
+      [14.4, 35.8],
+      [14.4, 35.9],
+      [14.4, 36],
+      [14.5, 35.9],
+      [14.6, 35.8]
+    ],
+    [
+      [7.4, 43.7],
+      [7.4, 43.8],
+      [7.4, 43.7]
+    ],
+    [
+      [12.4, 43.9],
+      [12.4, 44],
+      [12.5, 44],
+      [12.5, 43.9],
+      [12.4, 43.9],
+      [12.4, 43.9]
+    ],
+    [
+      [-157.4, 2],
+      [-157.3, 2],
+      [-157.3, 1.9],
+      [-157.3, 1.8],
+      [-157.2, 1.8],
+      [-157.2, 1.7],
+      [-157.3, 1.7],
+      [-157.3, 1.8],
+      [-157.4, 1.8],
+      [-157.5, 1.8],
+      [-157.5, 1.9],
+      [-157.6, 1.9],
+      [-157.5, 1.9],
+      [-157.4, 1.9],
+      [-157.4, 1.8],
+      [-157.4, 1.9],
+      [-157.5, 1.9],
+      [-157.4, 1.9],
+      [-157.3, 1.9],
+      [-157.4, 2],
+      [-157.5, 2],
+      [-157.4, 2]
+    ],
+    [
+      [6.7, 0.4],
+      [6.8, 0.3],
+      [6.7, 0.1],
+      [6.5, 0],
+      [6.5, 0.2],
+      [6.5, 0.3],
+      [6.7, 0.4]
+    ]
+  ],
+  "bbox": [-180, -55.61183, 180, 83.64513]
+}
diff --git a/apps/www/components/Regions/RegionTooltip.tsx b/apps/www/components/Regions/RegionTooltip.tsx
new file mode 100644
index 00000000000..8390b96c9a2
--- /dev/null
+++ b/apps/www/components/Regions/RegionTooltip.tsx
@@ -0,0 +1,33 @@
+'use client'
+
+import { X } from 'lucide-react'
+import { Button } from 'ui'
+
+import type { RegionDetails } from './Regions.constants'
+
+interface Props {
+  region: RegionDetails
+  isSelected: boolean
+  onClear: () => void
+}
+
+export const RegionTooltip = ({ region, isSelected, onClear }: Props) => (
+  <div className="flex items-center gap-1.5 rounded-md border bg-surface-100/95 px-1.5 py-1 shadow-xs backdrop-blur-sm">
+    {/* Flags are SVGs, which next/image can't serve while dangerouslyAllowSVG is off */}
+    <img alt="" className="w-3.5 shrink-0 rounded-xs" src={`/images/regions/${region.code}.svg`} />
+    <div className="flex min-w-0 flex-col leading-tight">
+      <span className="truncate text-[11px] text-foreground">{region.displayName}</span>
+      <span className="truncate font-mono text-[10px] text-foreground-lighter">{region.code}</span>
+    </div>
+    {isSelected && (
+      <Button
+        variant="text"
+        size="tiny"
+        icon={<X size={12} />}
+        onClick={onClear}
+        aria-label="Clear selected region"
+        className="pointer-events-auto ml-0.5 h-4 w-4 p-0"
+      />
+    )}
+  </div>
+)
diff --git a/apps/www/components/Regions/Regions.constants.ts b/apps/www/components/Regions/Regions.constants.ts
new file mode 100644
index 00000000000..6e59d0b5771
--- /dev/null
+++ b/apps/www/components/Regions/Regions.constants.ts
@@ -0,0 +1,148 @@
+import type { AWS_REGIONS_KEYS } from 'shared-data'
+import { AWS_REGIONS } from 'shared-data'
+
+export const REGION_GROUPS = ['Americas', 'Europe', 'Asia Pacific'] as const
+
+export type RegionGroup = (typeof REGION_GROUPS)[number]
+
+export interface RegionDetails {
+  key: AWS_REGIONS_KEYS
+  code: string
+  displayName: string
+  group: RegionGroup
+  /** Legal jurisdiction, for the European regions only */
+  jurisdiction?: string
+}
+
+export interface MappedRegion extends RegionDetails {
+  /** [longitude, latitude] */
+  coordinates: [number, number]
+}
+
+// [longitude, latitude], from https://github.com/tobilg/aws-edge-locations — the same
+// source the infrastructure map in the dashboard uses
+const REGION_COORDINATES: Partial<Record<AWS_REGIONS_KEYS, [number, number]>> = {
+  SOUTHEAST_ASIA: [103.8, 1.37],
+  NORTHEAST_ASIA: [139.42, 35.41],
+  NORTHEAST_ASIA_2: [126.98, 37.56],
+  CENTRAL_CANADA: [-73.6, 45.5],
+  WEST_US: [-121.96, 37.35],
+  WEST_US_2: [-122.67, 45.51],
+  EAST_US: [-78.45, 38.13],
+  EAST_US_2: [-83, 39.96],
+  WEST_EU: [-8, 53],
+  WEST_EU_2: [-0.1, 51],
+  WEST_EU_3: [2.35, 48.86],
+  CENTRAL_EU: [8, 50],
+  CENTRAL_EU_2: [8.54, 47.45],
+  NORTH_EU: [17.91, 59.65],
+  SOUTH_ASIA: [72.88, 19.08],
+  OCEANIA: [151.2, -33.86],
+  SOUTH_AMERICA: [-46.38, -23.34],
+}
+
+const REGION_JURISDICTIONS: Record<string, string> = {
+  'eu-central-1': 'EU',
+  'eu-central-2': 'CH',
+  'eu-north-1': 'EU',
+  'eu-west-1': 'EU',
+  'eu-west-2': 'UK',
+  'eu-west-3': 'EU',
+}
+
+const groupForCode = (code: string): RegionGroup => {
+  if (code.startsWith('eu-')) return 'Europe'
+  if (code.startsWith('ap-')) return 'Asia Pacific'
+  return 'Americas'
+}
+
+export const REGIONS: RegionDetails[] = (Object.keys(AWS_REGIONS) as AWS_REGIONS_KEYS[]).map(
+  (key) => ({
+    key,
+    code: AWS_REGIONS[key].code,
+    displayName: AWS_REGIONS[key].displayName,
+    group: groupForCode(AWS_REGIONS[key].code),
+    jurisdiction: REGION_JURISDICTIONS[AWS_REGIONS[key].code],
+  })
+)
+
+export const REGION_COUNT = REGIONS.length
+
+/** Valid values for the `region` query param */
+export const REGION_CODES = REGIONS.map((region) => region.code)
+
+export const GROUPED_REGIONS = REGION_GROUPS.map((group) => ({
+  group,
+  regions: REGIONS.filter((region) => region.group === group),
+}))
+
+/** Regions we have coordinates for, i.e. the ones the map can plot */
+export const MAPPED_REGIONS: MappedRegion[] = REGIONS.flatMap((region) => {
+  const coordinates = REGION_COORDINATES[region.key]
+  return coordinates === undefined ? [] : [{ ...region, coordinates }]
+})
+
+export const RESIDENCY_ROWS: {
+  component: string
+  status: 'In region' | 'Your choice' | 'Global'
+  detail: string
+}[] = [
+  {
+    component: 'Primary Postgres database',
+    status: 'In region',
+    detail: 'Stays in the region you picked.',
+  },
+  {
+    component: 'Auth service',
+    status: 'In region',
+    detail: 'Stays in the region you picked.',
+  },
+  {
+    component: 'Storage objects at origin',
+    status: 'In region',
+    detail: 'Stays in the region you picked.',
+  },
+  {
+    component: 'Read replicas',
+    status: 'Your choice',
+    detail: 'You choose the region. It can sit outside the EU.',
+  },
+  {
+    component: 'Edge Functions',
+    status: 'Global',
+    detail: 'Runs at the edge nearest the caller.',
+  },
+  {
+    component: 'Edge Functions with regional invocation',
+    status: 'Your choice',
+    detail: 'You can pin execution to a region. Not available in Ohio or Stockholm.',
+  },
+  {
+    component: 'Storage CDN cache',
+    status: 'Global',
+    detail: 'Cached on Cloudflare, globally.',
+  },
+]
+
+export const DOCUMENTS = [
+  {
+    href: '/legal/dpa',
+    label: 'Data Processing Agreement',
+    description: 'The contract that covers how we process your data.',
+  },
+  {
+    href: 'https://supabase.com/docs/guides/security/gdpr-compliance',
+    label: 'GDPR guide',
+    description: 'What GDPR compliance takes on Supabase.',
+  },
+  {
+    href: '/legal/customer-resources/subprocessor-list',
+    label: 'Sub-processor list',
+    description: 'Every vendor that can touch customer data.',
+  },
+  {
+    href: '/security',
+    label: 'Security',
+    description: 'Certifications, controls, and reporting a vulnerability.',
+  },
+]
diff --git a/apps/www/components/Regions/RegionsExplorer.tsx b/apps/www/components/Regions/RegionsExplorer.tsx
new file mode 100644
index 00000000000..f0142e9ebc9
--- /dev/null
+++ b/apps/www/components/Regions/RegionsExplorer.tsx
@@ -0,0 +1,52 @@
+'use client'
+
+import dynamic from 'next/dynamic'
+import { parseAsStringLiteral, useQueryState } from 'nuqs'
+import { NuqsAdapter } from 'nuqs/adapters/next/pages'
+import { useState } from 'react'
+
+import { REGION_CODES } from './Regions.constants'
+import { RegionsList } from './RegionsList'
+
+const RegionsMap = dynamic(() => import('./RegionsMap').then((mod) => mod.RegionsMap), {
+  ssr: false,
+  loading: () => null,
+})
+
+// Unknown values are dropped, so `?region=nonsense` renders as no selection
+const regionParser = parseAsStringLiteral(REGION_CODES).withOptions({ history: 'push' })
+
+const RegionsExplorerContent = () => {
+  const [selectedRegionCode, setSelectedRegionCode] = useQueryState('region', regionParser)
+  const [hoveredRegionCode, setHoveredRegionCode] = useState<string>()
+
+  const handleRegionSelect = (code: string) =>
+    setSelectedRegionCode(code === selectedRegionCode ? null : code)
+
+  return (
+    <div className="flex flex-col gap-8 lg:gap-12">
+      {/* Matches the map's viewBox ratio, so the map fills the container instead of letterboxing */}
+      <div className="relative aspect-800/349 w-full overflow-hidden rounded-lg border bg-alternative">
+        <RegionsMap
+          selectedRegionCode={selectedRegionCode}
+          hoveredRegionCode={hoveredRegionCode}
+          onRegionHover={setHoveredRegionCode}
+          onRegionSelect={handleRegionSelect}
+          onRegionClear={() => setSelectedRegionCode(null)}
+        />
+      </div>
+      <RegionsList
+        selectedRegionCode={selectedRegionCode}
+        hoveredRegionCode={hoveredRegionCode}
+        onRegionHover={setHoveredRegionCode}
+        onRegionSelect={handleRegionSelect}
+      />
+    </div>
+  )
+}
+
+export const RegionsExplorer = () => (
+  <NuqsAdapter>
+    <RegionsExplorerContent />
+  </NuqsAdapter>
+)
diff --git a/apps/www/components/Regions/RegionsList.tsx b/apps/www/components/Regions/RegionsList.tsx
new file mode 100644
index 00000000000..5489614a574
--- /dev/null
+++ b/apps/www/components/Regions/RegionsList.tsx
@@ -0,0 +1,75 @@
+'use client'
+
+import { Badge, cn } from 'ui'
+
+import { GROUPED_REGIONS } from './Regions.constants'
+
+interface Props {
+  selectedRegionCode: string | null
+  hoveredRegionCode?: string
+  onRegionHover: (code?: string) => void
+  onRegionSelect: (code: string) => void
+}
+
+export const RegionsList = ({
+  selectedRegionCode,
+  hoveredRegionCode,
+  onRegionHover,
+  onRegionSelect,
+}: Props) => (
+  <div className="grid grid-cols-1 gap-8 md:grid-cols-3 lg:gap-12">
+    {GROUPED_REGIONS.map(({ group, regions }) => (
+      <div key={group} className="flex flex-col gap-3">
+        <h3 className="font-mono text-xs uppercase tracking-widest text-foreground-muted">
+          {group}
+        </h3>
+        <ul className="flex flex-col divide-y divide-border-muted border-t border-border-muted">
+          {regions.map((region) => {
+            const isSelected = region.code === selectedRegionCode
+
+            return (
+              <li key={region.code}>
+                <button
+                  type="button"
+                  tabIndex={0}
+                  aria-pressed={isSelected}
+                  onClick={() => onRegionSelect(region.code)}
+                  onMouseEnter={() => onRegionHover(region.code)}
+                  onMouseLeave={() => onRegionHover(undefined)}
+                  onFocus={() => onRegionHover(region.code)}
+                  onBlur={() => onRegionHover(undefined)}
+                  className={cn(
+                    // Bleeds the hover background 8px each side so row content stays aligned with the heading
+                    '-mx-2 flex w-[calc(100%+1rem)] items-center gap-3 rounded-sm px-2 py-2.5 text-left transition-colors',
+                    'hover:bg-surface-100 focus-visible:ring-2 focus-visible:ring-foreground-lighter focus-visible:outline-none',
+                    isSelected && 'bg-surface-100',
+                    !isSelected && region.code === hoveredRegionCode && 'bg-surface-100'
+                  )}
+                >
+                  {/* Flags are SVGs, which next/image can't serve while dangerouslyAllowSVG is off */}
+                  <img
+                    alt=""
+                    className="w-4 shrink-0 rounded-xs"
+                    src={`/images/regions/${region.code}.svg`}
+                  />
+                  <span
+                    className={cn(
+                      'text-xs',
+                      isSelected ? 'text-foreground' : 'text-foreground-light'
+                    )}
+                  >
+                    {region.displayName}
+                  </span>
+                  {region.jurisdiction && <Badge>{region.jurisdiction}</Badge>}
+                  <code className="ml-auto shrink-0 font-mono text-xs text-foreground-lighter">
+                    {region.code}
+                  </code>
+                </button>
+              </li>
+            )
+          })}
+        </ul>
+      </div>
+    ))}
+  </div>
+)
diff --git a/apps/www/components/Regions/RegionsMap.tsx b/apps/www/components/Regions/RegionsMap.tsx
new file mode 100644
index 00000000000..d5315544cd3
--- /dev/null
+++ b/apps/www/components/Regions/RegionsMap.tsx
@@ -0,0 +1,159 @@
+'use client'
+
+import { geoEqualEarth } from 'd3-geo'
+import { ComposableMap, Geographies, Geography, Marker, ZoomableGroup } from 'react-simple-maps'
+import { cn } from 'ui'
+
+import GeographyData from './MapData.json'
+import { MAPPED_REGIONS } from './Regions.constants'
+import { RegionTooltip } from './RegionTooltip'
+
+/**
+ * The viewport is sized and framed so the land mass fills it edge to edge — the map is
+ * letterboxed inside its container otherwise. At scale 155 the world (Antarctica is not in
+ * MapData.json) projects to 828.3 x 361.5, so MAP_ZOOM shrinks it onto MAP_WIDTH and
+ * MAP_CENTER is the coordinate at the middle of that bounding box.
+ */
+const MAP_SCALE = 155
+const MAP_WIDTH = 800
+const MAP_HEIGHT = 349
+const MAP_ZOOM = 0.9658
+const MAP_CENTER: [number, number] = [1.08, 6.9]
+
+const projection = geoEqualEarth()
+  .scale(MAP_SCALE)
+  .translate([MAP_WIDTH / 2, MAP_HEIGHT / 2])
+const [centerX, centerY] = projection(MAP_CENTER) ?? [MAP_WIDTH / 2, MAP_HEIGHT / 2]
+
+/**
+ * Where each marker sits as a percentage of the container, mirroring what ZoomableGroup does to
+ * the SVG: `translate(width / 2 - centre * zoom) scale(zoom)`. The tooltip is positioned with
+ * these because anything rendered inside the SVG scales with the viewBox — text ends up at half
+ * size on a phone and twice that on a desktop.
+ */
+const REGION_POSITIONS = new Map(
+  MAPPED_REGIONS.map((region) => {
+    const [x, y] = projection(region.coordinates) ?? [centerX, centerY]
+
+    return [
+      region.code,
+      {
+        left: ((MAP_WIDTH / 2 + (x - centerX) * MAP_ZOOM) / MAP_WIDTH) * 100,
+        top: ((MAP_HEIGHT / 2 + (y - centerY) * MAP_ZOOM) / MAP_HEIGHT) * 100,
+      },
+    ]
+  })
+)
+
+interface Props {
+  selectedRegionCode: string | null
+  hoveredRegionCode?: string
+  onRegionHover: (code?: string) => void
+  onRegionSelect: (code: string) => void
+  onRegionClear: () => void
+}
+
+export const RegionsMap = ({
+  selectedRegionCode,
+  hoveredRegionCode,
+  onRegionHover,
+  onRegionSelect,
+  onRegionClear,
+}: Props) => {
+  // Hovering previews a region, so it wins over the selection
+  const shownRegionCode = hoveredRegionCode ?? selectedRegionCode
+  const shownRegion = MAPPED_REGIONS.find((region) => region.code === shownRegionCode)
+  const shownPosition = shownRegion ? REGION_POSITIONS.get(shownRegion.code) : undefined
+  // Markers in the right half of the map get their tooltip on the left, so it can't run off
+  const isTooltipOnLeft = (shownPosition?.left ?? 0) > 50
+
+  return (
+    <>
+      <ComposableMap
+        width={MAP_WIDTH}
+        height={MAP_HEIGHT}
+        projectionConfig={{ scale: MAP_SCALE }}
+        className="absolute inset-0 h-full w-full"
+      >
+        <ZoomableGroup
+          center={MAP_CENTER}
+          zoom={MAP_ZOOM}
+          minZoom={MAP_ZOOM}
+          maxZoom={MAP_ZOOM}
+          // The map is a static illustration: no panning, no zooming
+          filterZoomEvent={() => false}
+        >
+          <Geographies geography={GeographyData}>
+            {({ geographies }) =>
+              geographies.map((geo) => (
+                <Geography
+                  key={geo.rsmKey}
+                  geography={geo}
+                  strokeWidth={0.3}
+                  pointerEvents="none"
+                  className="fill-foreground-muted/10 stroke-border-strong dark:fill-background-surface-300 dark:stroke-border-strong"
+                />
+              ))
+            }
+          </Geographies>
+
+          {MAPPED_REGIONS.map((region) => {
+            const isSelected = region.code === selectedRegionCode
+            const isHighlighted = isSelected || region.code === hoveredRegionCode
+
+            return (
+              <Marker
+                key={region.key}
+                coordinates={region.coordinates}
+                onMouseEnter={() => onRegionHover(region.code)}
+                onMouseLeave={() => onRegionHover(undefined)}
+                onClick={() => onRegionSelect(region.code)}
+              >
+                {isSelected && <circle r={4} className="animate-ping fill-brand" />}
+                <circle
+                  r={isHighlighted ? 4 : 3.5}
+                  strokeWidth={1}
+                  className={cn(
+                    'cursor-pointer transition-colors',
+                    isSelected
+                      ? 'fill-brand-500 stroke-brand-600'
+                      : isHighlighted
+                        ? 'fill-brand stroke-brand-600'
+                        : 'fill-brand-600 stroke-brand-400'
+                  )}
+                />
+              </Marker>
+            )
+          })}
+        </ZoomableGroup>
+      </ComposableMap>
+
+      {shownRegion && shownPosition && (
+        <div
+          className="pointer-events-none absolute z-10 -translate-y-1/2"
+          style={{
+            // Anchored to the free side of the marker, capped at the space there is on that side
+            // so a tooltip never runs past the edge, and kept a half-height clear of the top and
+            // bottom edges
+            ...(isTooltipOnLeft
+              ? {
+                  right: `calc(${100 - shownPosition.left}% + 0.625rem)`,
+                  maxWidth: `calc(${shownPosition.left}% - 1rem)`,
+                }
+              : {
+                  left: `calc(${shownPosition.left}% + 0.625rem)`,
+                  maxWidth: `calc(${100 - shownPosition.left}% - 1rem)`,
+                }),
+            top: `clamp(1.125rem, ${shownPosition.top}%, calc(100% - 1.125rem))`,
+          }}
+        >
+          <RegionTooltip
+            region={shownRegion}
+            isSelected={shownRegion.code === selectedRegionCode}
+            onClear={onRegionClear}
+          />
+        </div>
+      )}
+    </>
+  )
+}
diff --git a/apps/www/data/CustomerStories.ts b/apps/www/data/CustomerStories.ts
index 9ea5d3981f6..69be3a6483f 100644
--- a/apps/www/data/CustomerStories.ts
+++ b/apps/www/data/CustomerStories.ts
@@ -18,6 +18,18 @@ export type CustomerStoryType = {
 }
 
 export const data: CustomerStoryType[] = [
+  {
+    type: 'Customer Story',
+    title: 'How Lingo.dev clears enterprise security reviews without a single database question',
+    description:
+      'Lingo.dev is the localization engineering platform behind retrieval augmented localization: translation APIs with a memory for glossary, brand voice, and quality. It has run on Supabase since day one.',
+    organization: 'Lingo.dev',
+    imgUrl: 'images/customers/logos/on-light/lingo-dev.png',
+    logo: '/images/customers/logos/on-light/lingo-dev.png',
+    logo_inverse: '/images/customers/logos/on-dark/lingo-dev.png',
+    url: '/customers/lingodotdev',
+    ctaText: 'View story',
+  },
   {
     type: 'Customer Story',
     title: 'How QA.tech built enterprise-ready AI testing agents on Supabase',
diff --git a/apps/www/data/Footer.ts b/apps/www/data/Footer.ts
index a14a12bed43..c08d4961de1 100644
--- a/apps/www/data/Footer.ts
+++ b/apps/www/data/Footer.ts
@@ -104,6 +104,10 @@ const footerData = [
         text: 'Security & Compliance',
         url: '/security',
       },
+      {
+        text: 'Regions',
+        url: '/regions',
+      },
       {
         text: 'SOC2',
         url: '/security',
diff --git a/apps/www/lib/redirects.js b/apps/www/lib/redirects.js
index 5a7e091eb1a..723f5daf436 100644
--- a/apps/www/lib/redirects.js
+++ b/apps/www/lib/redirects.js
@@ -2283,6 +2283,11 @@ module.exports = [
     source: '/customers/mendableai',
     destination: '/customers/firecrawl',
   },
+  {
+    permanent: true,
+    source: '/customers/lingo-dev',
+    destination: '/customers/lingodotdev',
+  },
 
   {
     permanent: true,
diff --git a/apps/www/lib/rewrites.js b/apps/www/lib/rewrites.js
index 281cc30bc86..fbd4339024d 100644
--- a/apps/www/lib/rewrites.js
+++ b/apps/www/lib/rewrites.js
@@ -75,6 +75,10 @@ const rewrites = [
     source: '/.well-known/security.txt',
     destination: `${process.env.NEXT_PUBLIC_DOCS_URL}/.well-known/security.txt`,
   },
+  {
+    source: '/openapi.json',
+    destination: 'https://api.supabase.com/api/v1-json',
+  },
   { source: '/feed.xml', destination: `/rss.xml` },
 ]
 
diff --git a/apps/www/md-alternates.test.ts b/apps/www/md-alternates.test.ts
index 1f1fdde175b..d610d636063 100644
--- a/apps/www/md-alternates.test.ts
+++ b/apps/www/md-alternates.test.ts
@@ -65,9 +65,10 @@ describe('markdown alternate drift', () => {
       const appPagePath = appPages.get(slug)
       if (appPagePath) {
         const source = await fs.readFile(appPagePath, 'utf-8')
+        const wiringShapes = [`alternates: mdAlternates('${slug}')`, `...mdAlternates('${slug}')`]
         expect(
-          source.includes(`alternates: mdAlternates('${slug}')`),
-          `${path.relative(process.cwd(), appPagePath)} must contain "alternates: mdAlternates('${slug}')" in its metadata export`
+          wiringShapes.some((shape) => source.includes(shape)),
+          `${path.relative(process.cwd(), appPagePath)} must wire mdAlternates('${slug}') into its metadata export, either as "alternates: mdAlternates('${slug}')" or spread into a wider alternates object as "...mdAlternates('${slug}')"`
         ).toBe(true)
       } else {
         expect(
diff --git a/apps/www/next.config.mjs b/apps/www/next.config.mjs
index 9286c3c07af..0f4d2489277 100644
--- a/apps/www/next.config.mjs
+++ b/apps/www/next.config.mjs
@@ -80,7 +80,7 @@ const nextConfig = {
    */
   outputFileTracingIncludes: {
     '/llms.txt': ['../docs/content/guides/*'],
-    '/llms-full.txt': ['../docs/public/markdown/guides/**/*.md' ],
+    '/llms-full.txt': ['../docs/public/markdown/guides/**/*.md'],
   },
   reactStrictMode: true,
   images: {
@@ -194,7 +194,20 @@ const nextConfig = {
     ]
   },
   async rewrites() {
-    return rewrites
+    return {
+      afterFiles: rewrites,
+      fallback: [
+        {
+          source: '/:path(.*\\.md)',
+          destination: '/api-v2/md-404/:path',
+        },
+        {
+          source: '/:path*',
+          has: [{ type: 'header', key: 'accept', value: '.*text/(markdown|\\*).*' }],
+          destination: '/api-v2/md-404/:path*',
+        },
+      ],
+    }
   },
   async redirects() {
     // For /docs/guides/ redirects, auto-generate .md variants so renamed/deleted pages
diff --git a/apps/www/next.config.test.ts b/apps/www/next.config.test.ts
index e88f7141ece..083c7a260d5 100644
--- a/apps/www/next.config.test.ts
+++ b/apps/www/next.config.test.ts
@@ -27,10 +27,11 @@ describe('next.config.mjs', () => {
 
   it('routes the library and permanently redirects the legacy UI URLs', async () => {
     const { default: config } = (await import('./next.config.mjs')) as { default: NextConfig }
-    const rewrites = (await config.rewrites?.()) || []
+    const rewrites = await config.rewrites?.()
+    const afterFiles = (rewrites && 'afterFiles' in rewrites && rewrites.afterFiles) || []
     const redirects = (await config.redirects?.()) || []
 
-    expect(rewrites).toEqual(
+    expect(afterFiles).toEqual(
       expect.arrayContaining([
         expect.objectContaining({ source: '/library' }),
         expect.objectContaining({ source: '/library/:path*' }),
@@ -61,6 +62,33 @@ describe('next.config.mjs', () => {
     ).toBeLessThan(redirects.findIndex((redirect) => redirect.source === '/ui/:path*'))
   })
 
+  it('routes unmatched markdown-negotiated paths to the md-404 handler via fallback rewrites', async () => {
+    const { default: config } = (await import('./next.config.mjs')) as { default: NextConfig }
+    const rewrites = await config.rewrites?.()
+    const fallback = (rewrites && 'fallback' in rewrites && rewrites.fallback) || []
+
+    const mdSuffixRule = fallback.find((rule) => rule.destination === '/api-v2/md-404/:path')
+    const acceptRule = fallback.find((rule) => rule.destination === '/api-v2/md-404/:path*')
+
+    expect(mdSuffixRule).toBeDefined()
+    expect(acceptRule?.has).toEqual([
+      { type: 'header', key: 'accept', value: '.*text/(markdown|\\*).*' },
+    ])
+
+    expect(getPathMatch(mdSuffixRule!.source)('/definitely-not-a-page.md')).toBeTruthy()
+    expect(getPathMatch(mdSuffixRule!.source)('/nested/definitely/not-a-page.md')).toBeTruthy()
+    expect(getPathMatch(mdSuffixRule!.source)('/definitely-not-a-page')).toBe(false)
+    expect(getPathMatch(acceptRule!.source)('/definitely-not-a-page')).toBeTruthy()
+
+    const acceptHeaderRegex = new RegExp(`^${acceptRule!.has![0].value}$`)
+    expect(acceptHeaderRegex.test('text/markdown')).toBe(true)
+    expect(acceptHeaderRegex.test('text/html, text/markdown;q=0.9')).toBe(true)
+    expect(acceptHeaderRegex.test('text/*')).toBe(true)
+    expect(
+      acceptHeaderRegex.test('text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8')
+    ).toBe(false)
+  })
+
   it('permanently redirects the legacy root markdown aliases to /index.md', async () => {
     const { default: config } = (await import('./next.config.mjs')) as { default: NextConfig }
     const redirects = (await config.redirects?.()) || []
diff --git a/apps/www/package.json b/apps/www/package.json
index c67c4195a47..2dbec8f9552 100644
--- a/apps/www/package.json
+++ b/apps/www/package.json
@@ -49,6 +49,7 @@
     "common": "workspace:*",
     "common-tags": "^1.8.2",
     "config": "workspace:*",
+    "d3-geo": "^3.1.1",
     "dayjs": "^1.11.12",
     "dev-tools": "workspace:*",
     "eslint-config-supabase": "workspace:*",
@@ -81,6 +82,7 @@
     "react-countdown": "^2.3.5",
     "react-dom": "catalog:",
     "react-markdown": "^10.1.0",
+    "react-simple-maps": "4.0.0-beta.6",
     "react-syntax-highlighter": "^15.6.6",
     "react-transition-group": "^4.4.1",
     "react-use": "^17.4.0",
@@ -105,12 +107,14 @@
     "@types/animejs": "^3.1.12",
     "@types/classnames": "^2.3.1",
     "@types/common-tags": "^1.8.4",
+    "@types/d3-geo": "^3.1.0",
     "@types/mdast": "^4.0.4",
     "@types/mdx-js__react": "^1.5.6",
     "@types/parse-numeric-range": "^0.0.1",
     "@types/react": "catalog:",
     "@types/react-copy-to-clipboard": "^5.0.4",
     "@types/react-dom": "catalog:",
+    "@types/react-simple-maps": "^3.0.1",
     "@types/react-syntax-highlighter": "^15.5.13",
     "@types/three": "^0.169.0",
     "api-types": "workspace:*",
diff --git a/apps/www/pages/careers.tsx b/apps/www/pages/careers.tsx
index d46651d9bfb..c3aac86b559 100644
--- a/apps/www/pages/careers.tsx
+++ b/apps/www/pages/careers.tsx
@@ -485,11 +485,11 @@ const JobItem = ({ job }: { job: JobItemProps }) => {
       <h4 className="text-base min-w-[240px] lg:min-w-[316px] grow sm:truncate mr-6">
         {job.title}
       </h4>
-      <div className="flex justify-between justify-[normal] pt-2 md:pt-0 lg:w-1/3 items-center">
-        <div className="flex items-center gap-4">
+      <div className="flex justify-between justify-[normal] pt-2 md:pt-0 items-center">
+        <div className="flex items-center gap-4 min-w-0">
           <Badge>
-            <GlobeAltIcon className="w-3 h-3" />
-            <span>{job.location}</span>
+            <GlobeAltIcon className="w-3 h-3 shrink-0" />
+            <span className="truncate">{job.location}</span>
           </Badge>
           <span className="hidden md:block">{job.employment}</span>
         </div>
diff --git a/apps/www/pages/regions.tsx b/apps/www/pages/regions.tsx
new file mode 100644
index 00000000000..c47dfdc9f59
--- /dev/null
+++ b/apps/www/pages/regions.tsx
@@ -0,0 +1,144 @@
+import CTABanner from '~/components/CTABanner'
+import DefaultLayout from '~/components/Layouts/Default'
+import SectionContainer from '~/components/Layouts/SectionContainer'
+import SectionHeading from '~/components/Layouts/SectionHeading'
+import { DOCUMENTS, REGION_COUNT, RESIDENCY_ROWS } from '~/components/Regions/Regions.constants'
+import { RegionsExplorer } from '~/components/Regions/RegionsExplorer'
+import ProductHeaderCentered from '~/components/Sections/ProductHeaderCentered'
+import { ArrowUpRight, FileText } from 'lucide-react'
+import { NextSeo } from 'next-seo'
+import Link from 'next/link'
+import { useRouter } from 'next/router'
+import { Badge } from 'ui'
+import { Admonition } from 'ui-patterns/Admonition'
+
+const RESIDENCY_BADGE_VARIANTS = {
+  'In region': 'success',
+  'Your choice': 'default',
+  Global: 'warning',
+} as const
+
+const RegionsPage = () => {
+  const router = useRouter()
+  const meta_title = 'Regions | Supabase'
+  const meta_description = `Host your project in any of ${REGION_COUNT} AWS regions. Postgres, Auth, and Storage objects stay in the region you choose.`
+
+  return (
+    <>
+      <NextSeo
+        title={meta_title}
+        description={meta_description}
+        openGraph={{
+          title: meta_title,
+          description: meta_description,
+          url: `https://supabase.com${router.pathname}`,
+          images: [
+            {
+              url: 'https://supabase.com/images/og/supabase-og.png',
+            },
+          ],
+        }}
+      />
+      <DefaultLayout>
+        <SectionContainer className="pb-0! md:pb-0! lg:pb-0!">
+          <ProductHeaderCentered
+            title="Available Regions"
+            h1={
+              <>
+                {REGION_COUNT} regions.
+                <br /> Pick the one you need.
+              </>
+            }
+            subheader="Your Postgres database, Auth service, and Storage objects stay in the region you choose."
+            cta={{ label: 'Start your project', link: 'https://supabase.com/dashboard/sign-up' }}
+            secondaryCta={{ label: 'Read the DPA', link: '/legal/dpa' }}
+          />
+        </SectionContainer>
+
+        <SectionContainer className="flex flex-col gap-8 lg:gap-12">
+          <RegionsExplorer />
+        </SectionContainer>
+
+        <SectionContainer className="pt-0! flex flex-col gap-8 lg:gap-12">
+          <div className="flex flex-col gap-8">
+            <SectionHeading
+              title="What stays in your region"
+              description="How region choice affects your data residency."
+            />
+            <div className="border-t border-muted">
+              {RESIDENCY_ROWS.map((row) => (
+                <div
+                  key={row.component}
+                  className="grid grid-cols-1 items-baseline gap-2 border-b border-muted py-4 md:grid-cols-[1.5fr_7rem_2fr] md:gap-6"
+                >
+                  <span className="text-sm text-foreground">{row.component}</span>
+                  <div className="flex items-baseline gap-3 md:contents">
+                    <Badge
+                      variant={RESIDENCY_BADGE_VARIANTS[row.status]}
+                      className="shrink-0 justify-self-start"
+                    >
+                      {row.status}
+                    </Badge>
+                    <span className="text-sm text-foreground-light">{row.detail}</span>
+                  </div>
+                </div>
+              ))}
+            </div>
+          </div>
+
+          <Admonition type="caution" title="If you need the EU">
+            <p>Choose a specific region: Frankfurt, Ireland, or Paris.</p>
+            <p>
+              London or Zurich both have GDPR-adequacy regimes, but neither is an EU member state.
+            </p>
+          </Admonition>
+        </SectionContainer>
+
+        <SectionContainer className="pt-0! flex flex-col gap-8 lg:gap-12">
+          <SectionHeading
+            title="Documents"
+            description="Additional information about Supabase regions."
+          />
+          <div className="grid grid-cols-1 gap-px overflow-hidden rounded-lg border bg-border sm:grid-cols-2">
+            {DOCUMENTS.map((doc) => {
+              const isExternal = doc.href.startsWith('http')
+
+              return (
+                <Link
+                  key={doc.href}
+                  href={doc.href}
+                  className="group flex items-start gap-3 bg-background p-6 transition-colors hover:bg-surface-100"
+                >
+                  <FileText size={16} className="mt-0.5 shrink-0 text-foreground-muted" />
+                  <div className="flex flex-col gap-1">
+                    <span className="flex items-center gap-1 text-sm text-foreground">
+                      {doc.label}
+                      {isExternal && (
+                        <ArrowUpRight
+                          size={14}
+                          className="text-foreground-muted transition-transform group-hover:translate-x-0.5 group-hover:-translate-y-0.5"
+                        />
+                      )}
+                    </span>
+                    <span className="text-sm text-foreground-lighter">{doc.description}</span>
+                  </div>
+                </Link>
+              )
+            })}
+          </div>
+          <p className="text-sm text-foreground-light">
+            Need the database in your own cloud?{' '}
+            <Link href="/go/byoc-early-access" className="text-brand-link hover:underline">
+              Ask about early access to BYOC
+            </Link>
+            .
+          </p>
+        </SectionContainer>
+
+        <CTABanner />
+      </DefaultLayout>
+    </>
+  )
+}
+
+export default RegionsPage
diff --git a/apps/www/pages/security.mdx b/apps/www/pages/security.mdx
index 1908c5f8e63..fc88d4079a5 100644
--- a/apps/www/pages/security.mdx
+++ b/apps/www/pages/security.mdx
@@ -134,7 +134,7 @@ Sensitive information like access tokens and keys are encrypted at the applicati
 
 When you create a project in an AWS region, your Postgres database, Auth service, and Storage objects are hosted in that region. Supabase offers regions across the US, EU, and Asia Pacific.
 
-See the full list of [available regions](/docs/guides/platform/regions).
+See the full list of [available regions](/regions).
 
 </Section>
 
diff --git a/apps/www/public/.well-known/agent-skills/index.json b/apps/www/public/.well-known/agent-skills/index.json
index bf7b26d644d..b475df7e752 100644
--- a/apps/www/public/.well-known/agent-skills/index.json
+++ b/apps/www/public/.well-known/agent-skills/index.json
@@ -4,16 +4,16 @@
     {
       "name": "supabase",
       "type": "archive",
-      "description": "Use when doing ANY task involving Supabase. Triggers: Supabase products (Database, Auth, Edge Functions, Realtime, Storage, Vectors, Cron, Queues); client libraries and SSR integrations (supabase-js, @supabase/ssr) in Next.js, React, SvelteKit, Astro, Remix; auth issues (login, logout, sessions, JWT, cookies, getSession, getUser, getClaims, RLS); Supabase CLI or MCP server; schema changes, migrations, declarative schemas, security audits, Postgres extensions (pg_graphql, pg_cron, pg_vector).",
-      "url": "https://github.com/supabase/agent-skills/releases/download/v0.1.6/supabase.tar.gz",
-      "digest": "sha256:35dac7224b4c9594d6db63f197120ea4168581196edd741164c925aaeab6ec83"
+      "description": "Use when doing ANY task involving Supabase. Triggers: Supabase products (Database, Auth, Edge Functions, Realtime, Storage, Vectors, Cron, Queues); client libraries and SSR integrations (supabase-js, @supabase/ssr) in Next.js, React, SvelteKit, Astro, Remix; auth issues (login, logout, sessions, JWT, cookies, getSession, getUser, getClaims, RLS); Supabase CLI or MCP server; schema changes, migrations, declarative schemas, security audits, Postgres extensions (pg_graphql, pg_cron, pg_vector); debugging and troubleshooting errors or unexpected behavior on Supabase projects (HTTP errors, Postgres errors, RLS surprises, permission denied, schema cache issues, timeouts, Edge Function crashes, Realtime drops, Storage failures) and reading or querying logs (Logs Explorer, ClickHouse).",
+      "url": "https://github.com/supabase/agent-skills/releases/download/v0.1.8/supabase.tar.gz",
+      "digest": "sha256:d90b81c17612ee62372e47f628cc20056ab1a3cb1711780511cefc41113b86ad"
     },
     {
       "name": "supabase-postgres-best-practices",
       "type": "archive",
-      "description": "Postgres performance optimization and best practices from Supabase. Use this skill when writing, reviewing, or optimizing Postgres queries, schema designs, or database configurations.",
-      "url": "https://github.com/supabase/agent-skills/releases/download/v0.1.6/supabase-postgres-best-practices.tar.gz",
-      "digest": "sha256:57a5315af73864add7bc42eaa3d5c9f309c767d50185583165e6ecd1abd30404"
+      "description": "Postgres best practices maintained by Supabase, for Postgres running anywhere. Load this skill BEFORE writing or changing anything that lives in a Postgres database: creating or altering tables and columns (including choosing column types), schema design, migrations and declarative schema files, RLS policies and the tests that verify them, indexes, triggers, database functions, queues and scheduled jobs (pg_cron, pgmq), vector/semantic search (pgvector), and restoring dumps (pg_restore) or importing data. Also load it when diagnosing slow queries, high CPU, timeouts, EXPLAIN plans, connection exhaustion, locking, bloat, or rows visible to the wrong user or tenant. This is not just a performance guide — schema, migration, security, and SQL authoring tasks need these rules too, even for a one-column change or a single query.",
+      "url": "https://github.com/supabase/agent-skills/releases/download/v0.1.8/supabase-postgres-best-practices.tar.gz",
+      "digest": "sha256:b7fc538bc4319134b295f2e8c01f9b1ccca7e63e4666f11b81de8b7f944cf187"
     }
   ]
 }
diff --git a/apps/www/public/images/blog/avatars/max-lingo.jpg b/apps/www/public/images/blog/avatars/max-lingo.jpg
new file mode 100644
index 00000000000..ca483eeeacc
Binary files /dev/null and b/apps/www/public/images/blog/avatars/max-lingo.jpg differ
diff --git a/apps/www/public/images/blog/avatars/veronica-lingo.jpg b/apps/www/public/images/blog/avatars/veronica-lingo.jpg
new file mode 100644
index 00000000000..96b30e20ffc
Binary files /dev/null and b/apps/www/public/images/blog/avatars/veronica-lingo.jpg differ
diff --git a/apps/www/public/images/customers/logos/on-dark/lingo-dev.png b/apps/www/public/images/customers/logos/on-dark/lingo-dev.png
new file mode 100644
index 00000000000..2de91dae3cf
Binary files /dev/null and b/apps/www/public/images/customers/logos/on-dark/lingo-dev.png differ
diff --git a/apps/www/public/images/customers/logos/on-light/lingo-dev.png b/apps/www/public/images/customers/logos/on-light/lingo-dev.png
new file mode 100644
index 00000000000..fde5884cddb
Binary files /dev/null and b/apps/www/public/images/customers/logos/on-light/lingo-dev.png differ
diff --git a/apps/www/public/images/landing-pages/postgres-summit-NYC-2026/brian-brennglass.png b/apps/www/public/images/landing-pages/postgres-summit-NYC-2026/brian-brennglass.png
new file mode 100644
index 00000000000..ba19256432f
Binary files /dev/null and b/apps/www/public/images/landing-pages/postgres-summit-NYC-2026/brian-brennglass.png differ
diff --git a/apps/www/public/images/regions/ap-northeast-1.svg b/apps/www/public/images/regions/ap-northeast-1.svg
new file mode 100644
index 00000000000..a0a67911590
--- /dev/null
+++ b/apps/www/public/images/regions/ap-northeast-1.svg
@@ -0,0 +1,11 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="flag-icons-jp" viewBox="0 0 640 480">
+  <defs>
+    <clipPath id="jp-a">
+      <path fill-opacity=".7" d="M-88 32h640v480H-88z"/>
+    </clipPath>
+  </defs>
+  <g fill-rule="evenodd" stroke-width="1pt" clip-path="url(#jp-a)" transform="translate(88 -32)">
+    <path fill="#fff" d="M-128 32h720v480h-720z"/>
+    <circle cx="523.1" cy="344.1" r="194.9" fill="#d30000" transform="translate(-168.4 8.6) scale(.76554)"/>
+  </g>
+</svg>
diff --git a/apps/www/public/images/regions/ap-northeast-2.svg b/apps/www/public/images/regions/ap-northeast-2.svg
new file mode 100644
index 00000000000..cd1aa611acf
--- /dev/null
+++ b/apps/www/public/images/regions/ap-northeast-2.svg
@@ -0,0 +1,24 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" id="flag-icons-kr" viewBox="0 0 640 480">
+  <defs id="defs87">
+    <clipPath id="kr-a">
+      <path id="path84" fill-opacity=".7" d="M-95.8-.4h682.7v512H-95.8z"/>
+    </clipPath>
+  </defs>
+  <g id="g119" fill-rule="evenodd" clip-path="url(#kr-a)" transform="translate(89.8 .4) scale(.9375)">
+    <path id="path526" fill="#fff" d="M-95.8-.4H587v512H-95.8Z" style="stroke-width:10.0567"/>
+    <g id="g540" transform="scale(10.66667) rotate(-56.3 33.9 -9.5)">
+      <g id="b2">
+        <path id="b" d="M-6-26H6v2H-6Zm0 3H6v2H-6Zm0 3H6v2H-6Z"/>
+        <use xlink:href="#b" id="use529" width="100%" height="100%" x="0" y="44"/>
+      </g>
+      <path id="path532" stroke="#fff" d="M0 17v10"/>
+      <path id="path534" fill="#cd2e3a" d="M0-12a12 12 0 0 1 0 24Z"/>
+      <path id="path536" fill="#0047a0" d="M0-12a12 12 0 0 0 0 24A6 6 0 0 0 0 0Z"/>
+      <circle id="circle538" cx="0" cy="-6" r="6" fill="#cd2e3a"/>
+    </g>
+    <g id="g546" transform="scale(-10.66667) rotate(56.3 10.9 -33.5)">
+      <use xlink:href="#b2" id="use542" width="100%" height="100%" x="0" y="0"/>
+      <path id="path544" stroke="#fff" d="M0-23.5v3M0 17v3.5m0 3v3"/>
+    </g>
+  </g>
+</svg>
diff --git a/apps/www/public/images/regions/ap-south-1.svg b/apps/www/public/images/regions/ap-south-1.svg
new file mode 100644
index 00000000000..53c29b3a967
--- /dev/null
+++ b/apps/www/public/images/regions/ap-south-1.svg
@@ -0,0 +1,25 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" id="flag-icons-in" viewBox="0 0 640 480">
+  <path fill="#f93" d="M0 0h640v160H0z"/>
+  <path fill="#fff" d="M0 160h640v160H0z"/>
+  <path fill="#128807" d="M0 320h640v160H0z"/>
+  <g transform="matrix(3.2 0 0 3.2 320 240)">
+    <circle r="20" fill="#008"/>
+    <circle r="17.5" fill="#fff"/>
+    <circle r="3.5" fill="#008"/>
+    <g id="d">
+      <g id="c">
+        <g id="b">
+          <g id="a" fill="#008">
+            <circle r=".9" transform="rotate(7.5 -8.8 133.5)"/>
+            <path d="M0 17.5.6 7 0 2l-.6 5L0 17.5z"/>
+          </g>
+          <use xlink:href="#a" width="100%" height="100%" transform="rotate(15)"/>
+        </g>
+        <use xlink:href="#b" width="100%" height="100%" transform="rotate(30)"/>
+      </g>
+      <use xlink:href="#c" width="100%" height="100%" transform="rotate(60)"/>
+    </g>
+    <use xlink:href="#d" width="100%" height="100%" transform="rotate(120)"/>
+    <use xlink:href="#d" width="100%" height="100%" transform="rotate(-120)"/>
+  </g>
+</svg>
diff --git a/apps/www/public/images/regions/ap-southeast-1.svg b/apps/www/public/images/regions/ap-southeast-1.svg
new file mode 100644
index 00000000000..c4dd4ac9ebe
--- /dev/null
+++ b/apps/www/public/images/regions/ap-southeast-1.svg
@@ -0,0 +1,13 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="flag-icons-sg" viewBox="0 0 640 480">
+  <defs>
+    <clipPath id="sg-a">
+      <path fill-opacity=".7" d="M0 0h640v480H0z"/>
+    </clipPath>
+  </defs>
+  <g fill-rule="evenodd" clip-path="url(#sg-a)">
+    <path fill="#fff" d="M-20 0h720v480H-20z"/>
+    <path fill="#df0000" d="M-20 0h720v240H-20z"/>
+    <path fill="#fff" d="M146 40.2a84.4 84.4 0 0 0 .8 165.2 86 86 0 0 1-106.6-59 86 86 0 0 1 59-106c16-4.6 30.8-4.7 46.9-.2z"/>
+    <path fill="#fff" d="m133 110 4.9 15-13-9.2-12.8 9.4 4.7-15.2-12.8-9.3 15.9-.2 5-15 5 15h15.8zm17.5 52 5 15.1-13-9.2-12.9 9.3 4.8-15.1-12.8-9.4 15.9-.1 4.9-15.1 5 15h16zm58.5-.4 4.9 15.2-13-9.3-12.8 9.3 4.7-15.1-12.8-9.3 15.9-.2 5-15 5 15h15.8zm17.4-51.6 4.9 15.1-13-9.2-12.8 9.3 4.8-15.1-12.9-9.4 16-.1 4.8-15.1 5 15h16zm-46.3-34.3 5 15.2-13-9.3-12.9 9.4 4.8-15.2-12.8-9.4 15.8-.1 5-15.1 5 15h16z"/>
+  </g>
+</svg>
diff --git a/apps/www/public/images/regions/ap-southeast-2.svg b/apps/www/public/images/regions/ap-southeast-2.svg
new file mode 100644
index 00000000000..aa33c9382dd
--- /dev/null
+++ b/apps/www/public/images/regions/ap-southeast-2.svg
@@ -0,0 +1,9 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="flag-icons-au" viewBox="0 0 640 480">
+  <path id="path617" fill="#006" stroke-width="1.3" d="M0 0h640v480H0z"/>
+  <path id="path625" fill="#fff" fill-rule="evenodd" stroke-width="1.3" d="m299.8 392.5-43.7 3.8 6 43.4L232 408l-30.1 31.7 6-43.4-43.7-3.8 37.7-22.3-24.3-36.5 41 15.5 13.4-41.7 13.5 41.7 41-15.5-24.3 36.5m224.4 62.3L476 416.7l17.8 6.7 5.8-18.1 5.8 18.1 17.8-6.7-10.5 15.8 16.4 9.7-19 1.7 2.6 18.9-13-13.9-13.2 13.9 2.6-18.9-19-1.6m16.4-291.9L476 134.6l17.8 6.7 5.8-18.1 5.8 18.1 17.8-6.7-10.5 15.8 16.4 9.8-19 1.6 2.6 18.9-13-13.8-13.2 13.7 2.6-18.8-19-1.6M380.8 265l-10.5-15.8 17.8 6.7 5.8-18.1 5.9 18.1 17.8-6.7L407 265l16.4 9.7-19 1.7 2.7 18.9-13.2-13.9-13 13.9 2.5-18.9-19-1.6m216.3-38L570 221l17.8 6.7 5.8-18.1 5.9 18.1 17.8-6.7-10.5 15.8 16.3 9.7-19 1.7 2.6 18.8-13-13.8-13.2 13.8 2.6-18.8-19-1.7M542 320l-10.3 6.5 2.9-11.9-9.3-7.8 12.1-1 4.6-11.2 4.7 11.3 12.1.9-9.3 7.8 2.9 11.9"/>
+  <path id="path969" fill="#006" stroke-width=".5" d="M0 0h320v240H0z"/>
+  <path id="path971" fill="#fff" stroke-width=".5" d="m37.5 0 122 90.5L281 0h39v31l-120 89.5 120 89V240h-40l-120-89.5L40.5 240H0v-30l119.5-89L0 32V0z"/>
+  <path id="path973" fill="#c8102e" stroke-width=".5" d="M212 140.5 320 220v20l-135.5-99.5zm-92 10 3 17.5-96 72H0zM320 0v1.5l-124.5 94 1-22L295 0zM0 0l119.5 88h-30L0 21z"/>
+  <path id="path975" fill="#fff" stroke-width=".5" d="M120.5 0v240h80V0zM0 80v80h320V80z"/>
+  <path id="path977" fill="#c8102e" stroke-width=".5" d="M0 96.5v48h320v-48zM136.5 0v240h48V0z"/>
+</svg>
diff --git a/apps/www/public/images/regions/ca-central-1.svg b/apps/www/public/images/regions/ca-central-1.svg
new file mode 100644
index 00000000000..496f1a1dac4
--- /dev/null
+++ b/apps/www/public/images/regions/ca-central-1.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="flag-icons-ca" viewBox="0 0 640 480">
+  <path fill="#fff" d="M81.1 0h362.3v512H81.1z" transform="translate(74.1) scale(.9375)"/>
+  <path fill="#d52b1e" d="M-100 0H81.1v512H-100zm543.4 0h181.1v512h-181zm-308 247.4-14.2 4.8 65.5 57.5c5 14.7-1.7 19-6 26.8l71-9L250 399l14.8-.4-3.3-71 71.2 8.5c-4.4-9.3-8.3-14.2-4.3-29l65.4-54.5-11.4-4.2c-9.4-7.2 4-34.7 6-52.1 0 0-38.1 13.1-40.6 6.2l-9.8-18.7-34.7 38.2c-3.8.9-5.4-.6-6.3-3.8l16-79.8-25.4 14.3c-2.1 1-4.2.2-5.6-2.3l-24.5-49-25.2 50.9c-1.9 1.8-3.8 2-5.4.8l-24.2-13.6 14.6 79.1c-1.2 3.2-4 4-7.2 2.3l-33.3-37.7c-4.3 7-7.2 18.3-13 20.9-5.7 2.4-25-4.8-37.9-7.6 4.4 15.9 18.2 42.3 9.5 51z" transform="translate(74.1) scale(.9375)"/>
+</svg>
diff --git a/apps/www/public/images/regions/eu-central-1.svg b/apps/www/public/images/regions/eu-central-1.svg
new file mode 100644
index 00000000000..b08334b62e2
--- /dev/null
+++ b/apps/www/public/images/regions/eu-central-1.svg
@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="flag-icons-de" viewBox="0 0 640 480">
+  <path fill="#ffce00" d="M0 320h640v160H0z"/>
+  <path d="M0 0h640v160H0z"/>
+  <path fill="#d00" d="M0 160h640v160H0z"/>
+</svg>
diff --git a/apps/www/public/images/regions/eu-central-2.svg b/apps/www/public/images/regions/eu-central-2.svg
new file mode 100644
index 00000000000..65be7b4fa7a
--- /dev/null
+++ b/apps/www/public/images/regions/eu-central-2.svg
@@ -0,0 +1,9 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="flag-icons-ch" viewBox="0 0 640 480">
+  <g fill-rule="evenodd" stroke-width="1pt">
+    <path fill="red" d="M0 0h640v480H0z"/>
+    <g fill="#fff">
+      <path d="M170 195h300v90H170z"/>
+      <path d="M275 90h90v300h-90z"/>
+    </g>
+  </g>
+</svg>
\ No newline at end of file
diff --git a/apps/www/public/images/regions/eu-north-1.svg b/apps/www/public/images/regions/eu-north-1.svg
new file mode 100644
index 00000000000..5d82e9f5f82
--- /dev/null
+++ b/apps/www/public/images/regions/eu-north-1.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="flag-icons-se" viewBox="0 0 640 480">
+  <path fill="#005293" d="M0 0h640v480H0z"/>
+  <path fill="#fecb00" d="M176 0v192H0v96h176v192h96V288h368v-96H272V0z"/>
+</svg>
\ No newline at end of file
diff --git a/apps/www/public/images/regions/eu-west-1.svg b/apps/www/public/images/regions/eu-west-1.svg
new file mode 100644
index 00000000000..049be14de14
--- /dev/null
+++ b/apps/www/public/images/regions/eu-west-1.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="flag-icons-ie" viewBox="0 0 640 480">
+  <g fill-rule="evenodd" stroke-width="1pt">
+    <path fill="#fff" d="M0 0h640v480H0z"/>
+    <path fill="#009A49" d="M0 0h213.3v480H0z"/>
+    <path fill="#FF7900" d="M426.7 0H640v480H426.7z"/>
+  </g>
+</svg>
diff --git a/apps/www/public/images/regions/eu-west-2.svg b/apps/www/public/images/regions/eu-west-2.svg
new file mode 100644
index 00000000000..dbac25eae4c
--- /dev/null
+++ b/apps/www/public/images/regions/eu-west-2.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="flag-icons-gb" viewBox="0 0 640 480">
+  <path fill="#012169" d="M0 0h640v480H0z"/>
+  <path fill="#FFF" d="m75 0 244 181L562 0h78v62L400 241l240 178v61h-80L320 301 81 480H0v-60l239-178L0 64V0h75z"/>
+  <path fill="#C8102E" d="m424 281 216 159v40L369 281h55zm-184 20 6 35L54 480H0l240-179zM640 0v3L391 191l2-44L590 0h50zM0 0l239 176h-60L0 42V0z"/>
+  <path fill="#FFF" d="M241 0v480h160V0H241zM0 160v160h640V160H0z"/>
+  <path fill="#C8102E" d="M0 193v96h640v-96H0zM273 0v480h96V0h-96z"/>
+</svg>
diff --git a/apps/www/public/images/regions/eu-west-3.svg b/apps/www/public/images/regions/eu-west-3.svg
new file mode 100644
index 00000000000..deb14284ba4
--- /dev/null
+++ b/apps/www/public/images/regions/eu-west-3.svg
@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="flag-icons-fr" viewBox="0 0 640 480">
+  <path fill="#fff" d="M0 0h640v480H0z"/>
+  <path fill="#000091" d="M0 0h213.3v480H0z"/>
+  <path fill="#e1000f" d="M426.7 0H640v480H426.7z"/>
+</svg>
\ No newline at end of file
diff --git a/apps/www/public/images/regions/sa-east-1.svg b/apps/www/public/images/regions/sa-east-1.svg
new file mode 100644
index 00000000000..354a7013f3c
--- /dev/null
+++ b/apps/www/public/images/regions/sa-east-1.svg
@@ -0,0 +1,45 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="flag-icons-br" viewBox="0 0 640 480">
+  <g stroke-width="1pt">
+    <path fill="#229e45" fill-rule="evenodd" d="M0 0h640v480H0z"/>
+    <path fill="#f8e509" fill-rule="evenodd" d="m321.4 436 301.5-195.7L319.6 44 17.1 240.7 321.4 436z"/>
+    <path fill="#2b49a3" fill-rule="evenodd" d="M452.8 240c0 70.3-57.1 127.3-127.6 127.3A127.4 127.4 0 1 1 452.8 240z"/>
+    <path fill="#ffffef" fill-rule="evenodd" d="m283.3 316.3-4-2.3-4 2 .9-4.5-3.2-3.4 4.5-.5 2.2-4 1.9 4.2 4.4.8-3.3 3m86 26.3-3.9-2.3-4 2 .8-4.5-3.1-3.3 4.5-.5 2.1-4.1 2 4.2 4.4.8-3.4 3.1m-36.2-30-3.4-2-3.5 1.8.8-3.9-2.8-2.9 4-.4 1.8-3.6 1.6 3.7 3.9.7-3 2.7m87-8.5-3.4-2-3.5 1.8.8-3.9-2.7-2.8 3.9-.4 1.8-3.5 1.6 3.6 3.8.7-2.9 2.6m-87.3-22-4-2.2-4 2 .8-4.6-3.1-3.3 4.5-.5 2.1-4.1 2 4.2 4.4.8-3.4 3.2m-104.6-35-4-2.2-4 2 1-4.6-3.3-3.3 4.6-.5 2-4.1 2 4.2 4.4.8-3.3 3.1m13.3 57.2-4-2.3-4 2 .9-4.5-3.2-3.3 4.5-.6 2.1-4 2 4.2 4.4.8-3.3 3.1m132-67.3-3.6-2-3.6 1.8.8-4-2.8-3 4-.5 1.9-3.6 1.7 3.8 4 .7-3 2.7m-6.7 38.3-2.7-1.6-2.9 1.4.6-3.2-2.2-2.3 3.2-.4 1.5-2.8 1.3 3 3 .5-2.2 2.2m-142.2 50.4-2.7-1.5-2.7 1.3.6-3-2.1-2.2 3-.4 1.4-2.7 1.3 2.8 3 .6-2.3 2M419 299.8l-2.2-1.1-2.2 1 .5-2.3-1.7-1.6 2.4-.3 1.2-2 1 2 2.5.5-1.9 1.5"/>
+    <path fill="#ffffef" fill-rule="evenodd" d="m219.3 287.6-2.7-1.5-2.7 1.3.6-3-2.1-2.2 3-.4 1.4-2.7 1.3 2.8 3 .6-2.3 2"/>
+    <path fill="#ffffef" fill-rule="evenodd" d="m219.3 287.6-2.7-1.5-2.7 1.3.6-3-2.1-2.2 3-.4 1.4-2.7 1.3 2.8 3 .6-2.3 2m42.3 3-2.6-1.4-2.7 1.3.6-3-2.1-2.2 3-.4 1.4-2.7 1.3 2.8 3 .5-2.3 2.1m-4.8 17-2.6-1.5-2.7 1.4.6-3-2.1-2.3 3-.4 1.4-2.7 1.3 2.8 3 .6-2.3 2m87.4-22.2-2.6-1.6-2.8 1.4.6-3-2-2.3 3-.3 1.4-2.7 1.2 2.8 3 .5-2.2 2.1m-25.1 3-2.7-1.5-2.7 1.4.6-3-2-2.3 3-.3 1.4-2.8 1.2 2.9 3 .5-2.2 2.1m-68.8-5.8-1.7-1-1.7.8.4-1.9-1.3-1.4 1.9-.2.8-1.7.8 1.8 1.9.3-1.4 1.3m167.8 45.4-2.6-1.5-2.7 1.4.6-3-2.1-2.3 3-.4 1.4-2.7 1.3 2.8 3 .6-2.3 2m-20.8 6-2.2-1.4-2.3 1.2.5-2.6-1.7-1.8 2.5-.3 1.2-2.3 1 2.4 2.5.4-1.9 1.8m10.4 2.3-2-1.2-2.1 1 .4-2.3-1.6-1.7 2.3-.3 1.1-2 1 2 2.3.5-1.7 1.6m29.1-22.8-2-1-2 1 .5-2.3-1.6-1.7 2.3-.3 1-2 1 2.1 2.1.4-1.6 1.6m-38.8 41.8-2.5-1.4-2.7 1.2.6-2.8-2-2 3-.3 1.3-2.5 1.2 2.6 3 .5-2.3 1.9m.6 14.2-2.4-1.4-2.4 1.3.6-2.8-1.9-2 2.7-.4 1.2-2.5 1.1 2.6 2.7.5-2 2m-19-23.1-1.9-1.2-2 1 .4-2.2-1.5-1.7 2.2-.2 1-2 1 2 2.2.4-1.6 1.6m-17.8 2.3-2-1.2-2 1 .5-2.2-1.6-1.7 2.3-.2 1-2 1 2 2.1.4-1.6 1.6m-30.4-24.6-2-1.1-2 1 .5-2.3-1.6-1.6 2.2-.3 1-2 1 2 2.2.5-1.6 1.5m3.7 57-1.6-.9-1.8.9.4-2-1.3-1.4 1.9-.2.9-1.7.8 1.8 1.9.3-1.4 1.3m-46.2-86.6-4-2.3-4 2 .9-4.5-3.2-3.3 4.5-.6 2.2-4 1.9 4.2 4.4.8-3.3 3.1"/>
+    <path fill="#fff" fill-rule="evenodd" d="M444.4 285.8a124.6 124.6 0 0 0 5.8-19.8c-67.8-59.5-143.3-90-238.7-83.7a124.5 124.5 0 0 0-8.5 20.9c113-10.8 196 39.2 241.4 82.6z"/>
+    <path fill="#309e3a" d="m414 252.4 2.3 1.3a3.4 3.4 0 0 0-.3 2.2 3 3 0 0 0 1.4 1.7c.7.5 1.4.8 2 .7.6 0 1-.3 1.3-.7a1.3 1.3 0 0 0 .2-.9 2.3 2.3 0 0 0-.5-1c-.2-.3-.7-1-1.5-1.8a7.7 7.7 0 0 1-1.8-3 3.7 3.7 0 0 1 2-4.4 3.8 3.8 0 0 1 2.3-.2 7 7 0 0 1 2.6 1.2c1.4 1 2.3 2 2.6 3.2a4.1 4.1 0 0 1-.6 3.3l-2.4-1.5c.3-.6.4-1.2.2-1.7-.1-.5-.5-1-1.2-1.4a3.2 3.2 0 0 0-1.8-.7 1 1 0 0 0-.9.5c-.2.3-.2.6-.1 1s.6 1.2 1.6 2.2c1 1 1.6 1.9 2 2.5a3.9 3.9 0 0 1-.3 4.2 4.1 4.1 0 0 1-1.9 1.5 4 4 0 0 1-2.4.3c-.9-.2-1.8-.6-2.8-1.3-1.5-1-2.4-2.1-2.7-3.3a5.4 5.4 0 0 1 .6-4zm-11.6-7.6 2.5 1.3a3.4 3.4 0 0 0-.2 2.2 3 3 0 0 0 1.4 1.6c.8.5 1.4.7 2 .6.6 0 1-.3 1.3-.8a1.3 1.3 0 0 0 .2-.8c0-.3-.2-.7-.5-1a34.6 34.6 0 0 0-1.6-1.8c-1.1-1.1-1.8-2-2-2.8a3.7 3.7 0 0 1 .4-3.1 3.6 3.6 0 0 1 1.6-1.4 3.8 3.8 0 0 1 2.2-.3 7 7 0 0 1 2.6 1c1.5 1 2.4 2 2.7 3.1a4.1 4.1 0 0 1-.4 3.4l-2.5-1.4c.3-.7.4-1.2.2-1.7s-.6-1-1.3-1.4a3.2 3.2 0 0 0-1.9-.6 1 1 0 0 0-.8.5c-.2.3-.2.6-.1 1s.7 1.2 1.7 2.2c1 1 1.7 1.8 2 2.4a3.9 3.9 0 0 1 0 4.2 4.2 4.2 0 0 1-1.8 1.6 4 4 0 0 1-2.4.3 8 8 0 0 1-2.9-1.1 6 6 0 0 1-2.8-3.2 5.4 5.4 0 0 1 .4-4zm-14.2-3.8 7.3-12 8.8 5.5-1.2 2-6.4-4-1.6 2.7 6 3.7-1.3 2-6-3.7-2 3.3 6.7 4-1.2 2-9-5.5zm-20.7-17 1.1-2 5.4 2.7-2.5 5c-.8.2-1.8.3-3 .2a9.4 9.4 0 0 1-3.3-1 7.7 7.7 0 0 1-3-2.6 6 6 0 0 1-1-3.5 8.6 8.6 0 0 1 1-3.7 8 8 0 0 1 2.6-3 6.2 6.2 0 0 1 3.6-1.1c1 0 2 .3 3.2 1 1.6.7 2.6 1.7 3.1 2.8a5 5 0 0 1 .3 3.5l-2.7-.8a3 3 0 0 0-.2-2c-.3-.6-.8-1-1.6-1.4a3.8 3.8 0 0 0-3.1-.3c-1 .3-1.9 1.2-2.6 2.6-.7 1.4-1 2.7-.7 3.8a3.7 3.7 0 0 0 2 2.4c.5.3 1.1.5 1.7.5a6 6 0 0 0 1.8 0l.8-1.6-2.9-1.5zm-90.2-22.3 2-14 4.2.7 1.1 9.8 3.9-9 4.2.6-2 13.8-2.7-.4 1.7-10.9-4.4 10.5-2.7-.4-1.1-11.3-1.6 11-2.6-.4zm-14.1-1.7 1.3-14 10.3 1-.2 2.4-7.5-.7-.3 3 7 .7-.3 2.4-7-.7-.3 3.8 7.8.7-.2 2.4-10.6-1z"/>
+    <g stroke-opacity=".5">
+      <path fill="#309e3a" d="M216.5 191.3c0-1.5.3-2.6.7-3.6a6.7 6.7 0 0 1 1.4-1.9 5.4 5.4 0 0 1 1.8-1.2c1-.3 2-.5 3-.5 2.1 0 3.7.8 5 2a7.4 7.4 0 0 1 1.6 5.5c0 2.2-.7 4-2 5.3a6.5 6.5 0 0 1-5 1.7 6.6 6.6 0 0 1-4.8-2 7.3 7.3 0 0 1-1.7-5.3z"/>
+      <path fill="#f7ffff" d="M219.4 191.3c0 1.5.3 2.7 1 3.6.7.8 1.6 1.3 2.8 1.3a3.5 3.5 0 0 0 2.8-1.1c.7-.8 1-2 1.1-3.7 0-1.6-.2-2.8-1-3.6a3.5 3.5 0 0 0-2.7-1.3 3.6 3.6 0 0 0-2.8 1.2c-.8.8-1.1 2-1.2 3.6z"/>
+    </g>
+    <g stroke-opacity=".5">
+      <path fill="#309e3a" d="m233 198.5.2-14h6c1.5 0 2.5.2 3.2.5.7.2 1.2.7 1.6 1.3s.6 1.4.6 2.3a3.8 3.8 0 0 1-1 2.6 4.5 4.5 0 0 1-2.7 1.2l1.5 1.2c.4.4.9 1.2 1.5 2.3l1.7 2.8h-3.4l-2-3.2-1.4-2a2.1 2.1 0 0 0-.9-.6 5 5 0 0 0-1.4-.2h-.6v5.8H233z"/>
+      <path fill="#fff" d="M236 190.5h2c1.4 0 2.3 0 2.6-.2.3 0 .6-.3.8-.5s.3-.7.3-1c0-.6-.1-1-.4-1.2-.2-.3-.6-.5-1-.6h-2l-2.3-.1v3.5z"/>
+    </g>
+    <g stroke-opacity=".5">
+      <path fill="#309e3a" d="m249 185.2 5.2.3c1.1 0 2 .1 2.6.3a4.7 4.7 0 0 1 2 1.4 6 6 0 0 1 1.2 2.4c.3.9.4 2 .3 3.3a9.3 9.3 0 0 1-.5 3c-.4 1-1 1.8-1.7 2.4a5 5 0 0 1-2 1c-.6.2-1.5.2-2.5.2l-5.3-.3.7-14z"/>
+      <path fill="#fff" d="m251.7 187.7-.5 9.3h3.8c.5 0 .9-.2 1.2-.5.3-.3.6-.7.8-1.3.2-.6.4-1.5.4-2.6l-.1-2.5a3.2 3.2 0 0 0-.8-1.4 2.7 2.7 0 0 0-1.2-.7 13 13 0 0 0-2.3-.3h-1.3z"/>
+    </g>
+    <g stroke-opacity=".5">
+      <path fill="#309e3a" d="m317.6 210.2 3.3-13.6 4.4 1 3.2 1c.7.4 1.3 1 1.6 1.9.4.8.4 1.7.2 2.8-.2.8-.5 1.5-1 2a3.9 3.9 0 0 1-3 1.4c-.7 0-1.7-.2-3-.5l-1.7-.5-1.2 5.2-2.8-.7z"/>
+      <path fill="#fff" d="m323 199.6-.8 3.8 1.5.4c1 .2 1.8.4 2.2.3a1.9 1.9 0 0 0 1.6-1.5c0-.5 0-.9-.2-1.3a2 2 0 0 0-1-.9l-1.9-.5-1.3-.3z"/>
+    </g>
+    <g stroke-opacity=".5">
+      <path fill="#309e3a" d="m330.6 214.1 4.7-13.2 5.5 2c1.5.5 2.4 1 3 1.4.5.5.9 1 1 1.8s.2 1.5 0 2.3c-.4 1-1 1.7-1.8 2.2-.8.4-1.8.5-3 .3.4.5.8 1 1 1.6l.8 2.7.6 3.1-3.1-1.1-1-3.6a19.5 19.5 0 0 0-.7-2.4 2.1 2.1 0 0 0-.6-.8c-.2-.3-.6-.5-1.3-.7l-.5-.2-2 5.6-2.6-1z"/>
+      <path fill="#fff" d="m336 207.4 1.9.7c1.3.5 2.1.7 2.5.7.3 0 .6 0 .9-.3.3-.2.5-.5.6-.9.2-.4.2-.8 0-1.2a1.7 1.7 0 0 0-.8-.9l-2-.7-2-.7-1.2 3.3z"/>
+    </g>
+    <g stroke-opacity=".5">
+      <path fill="#309e3a" d="M347 213.6a9 9 0 0 1 1.7-3.2 6.6 6.6 0 0 1 1.8-1.5 6 6 0 0 1 2-.7c1 0 2 0 3.1.4a6.5 6.5 0 0 1 4.2 3.3c.8 1.6.8 3.5.2 5.7a7.4 7.4 0 0 1-3.4 4.5c-1.5.9-3.3 1-5.2.4a6.6 6.6 0 0 1-4.2-3.3 7.3 7.3 0 0 1-.2-5.6z"/>
+      <path fill="#fff" d="M349.8 214.4c-.4 1.5-.5 2.8 0 3.8s1.2 1.6 2.3 2c1 .3 2 .2 3-.4 1-.5 1.6-1.6 2.1-3.2.5-1.5.5-2.7 0-3.7a3.5 3.5 0 0 0-2.2-2 3.6 3.6 0 0 0-3 .3c-1 .6-1.7 1.6-2.2 3.2z"/>
+    </g>
+    <g stroke-opacity=".5">
+      <path fill="#309e3a" d="m374.3 233.1 6.4-12.4 5.3 2.7a10 10 0 0 1 2.7 1.9c.5.5.8 1.1.8 1.9s0 1.5-.4 2.2a3.8 3.8 0 0 1-2 2c-1 .2-2 .2-3.1-.2.4.6.6 1.2.8 1.7.2.6.3 1.5.4 2.8l.2 3.2-3-1.5-.4-3.7a20 20 0 0 0-.3-2.5 2 2 0 0 0-.5-1l-1.2-.7-.5-.3-2.7 5.2-2.5-1.3z"/>
+      <path fill="#fff" d="m380.5 227.2 1.9 1c1.2.6 2 1 2.3 1 .3 0 .7 0 1-.2.3-.1.5-.4.7-.8.2-.4.3-.8.2-1.2a2 2 0 0 0-.7-1 23.7 23.7 0 0 0-1.8-1l-2-1-1.6 3.2z"/>
+    </g>
+    <g stroke-opacity=".5">
+      <path fill="#309e3a" d="M426.1 258.7a8.9 8.9 0 0 1 2.5-2.6 6.6 6.6 0 0 1 2.2-.9 5.5 5.5 0 0 1 2.2 0c1 .2 1.9.6 2.8 1.2a6.6 6.6 0 0 1 3 4.4c.3 1.7-.2 3.6-1.4 5.5a7.3 7.3 0 0 1-4.5 3.3 6.5 6.5 0 0 1-5.2-1.1 6.6 6.6 0 0 1-3-4.4c-.3-1.8.2-3.6 1.4-5.4z"/>
+      <path fill="#fff" d="M428.6 260.3c-1 1.3-1.3 2.5-1.1 3.6a3.6 3.6 0 0 0 1.6 2.5c1 .7 2 .9 3 .6 1-.3 2-1 2.9-2.4.9-1.4 1.3-2.6 1.1-3.6-.1-1-.7-1.9-1.6-2.6s-2-.8-3-.5c-1 .2-2 1-3 2.4z"/>
+    </g>
+    <path fill="#309e3a" d="m301.8 204.5 2.3-9.8 7.2 1.7-.3 1.6-5.3-1.2-.5 2.2 4.9 1.1-.4 1.7-4.9-1.2-.6 2.7 5.5 1.3-.4 1.6-7.5-1.7z"/>
+  </g>
+</svg>
diff --git a/apps/www/public/images/regions/us-east-1.svg b/apps/www/public/images/regions/us-east-1.svg
new file mode 100644
index 00000000000..3189d8e2dc3
--- /dev/null
+++ b/apps/www/public/images/regions/us-east-1.svg
@@ -0,0 +1,10 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="flag-icons-us" viewBox="0 0 640 480">
+  <g fill-rule="evenodd">
+    <g stroke-width="1pt">
+      <path fill="#bd3d44" d="M0 0h972.8v39.4H0zm0 78.8h972.8v39.4H0zm0 78.7h972.8V197H0zm0 78.8h972.8v39.4H0zm0 78.8h972.8v39.4H0zm0 78.7h972.8v39.4H0zm0 78.8h972.8V512H0z" transform="scale(.9375)"/>
+      <path fill="#fff" d="M0 39.4h972.8v39.4H0zm0 78.8h972.8v39.3H0zm0 78.7h972.8v39.4H0zm0 78.8h972.8v39.4H0zm0 78.8h972.8v39.4H0zm0 78.7h972.8v39.4H0z" transform="scale(.9375)"/>
+    </g>
+    <path fill="#192f5d" d="M0 0h389.1v275.7H0z" transform="scale(.9375)"/>
+    <path fill="#fff" d="M32.4 11.8 36 22.7h11.4l-9.2 6.7 3.5 11-9.3-6.8-9.2 6.7 3.5-10.9-9.3-6.7H29zm64.9 0 3.5 10.9h11.5l-9.3 6.7 3.5 11-9.2-6.8-9.3 6.7 3.5-10.9-9.2-6.7h11.4zm64.8 0 3.6 10.9H177l-9.2 6.7 3.5 11-9.3-6.8-9.2 6.7 3.5-10.9-9.3-6.7h11.5zm64.9 0 3.5 10.9H242l-9.3 6.7 3.6 11-9.3-6.8-9.3 6.7 3.6-10.9-9.3-6.7h11.4zm64.8 0 3.6 10.9h11.4l-9.2 6.7 3.5 11-9.3-6.8-9.2 6.7 3.5-10.9-9.2-6.7h11.4zm64.9 0 3.5 10.9h11.5l-9.3 6.7 3.6 11-9.3-6.8-9.3 6.7 3.6-10.9-9.3-6.7h11.5zM64.9 39.4l3.5 10.9h11.5L70.6 57 74 67.9l-9-6.7-9.3 6.7L59 57l-9-6.7h11.4zm64.8 0 3.6 10.9h11.4l-9.3 6.7 3.6 10.9-9.3-6.7-9.3 6.7L124 57l-9.3-6.7h11.5zm64.9 0 3.5 10.9h11.5l-9.3 6.7 3.5 10.9-9.2-6.7-9.3 6.7 3.5-10.9-9.2-6.7H191zm64.8 0 3.6 10.9h11.4l-9.3 6.7 3.6 10.9-9.3-6.7-9.2 6.7 3.5-10.9-9.3-6.7H256zm64.9 0 3.5 10.9h11.5L330 57l3.5 10.9-9.2-6.7-9.3 6.7 3.5-10.9-9.2-6.7h11.4zM32.4 66.9 36 78h11.4l-9.2 6.7 3.5 10.9-9.3-6.8-9.2 6.8 3.5-11-9.3-6.7H29zm64.9 0 3.5 11h11.5l-9.3 6.7 3.5 10.9-9.2-6.8-9.3 6.8 3.5-11-9.2-6.7h11.4zm64.8 0 3.6 11H177l-9.2 6.7 3.5 10.9-9.3-6.8-9.2 6.8 3.5-11-9.3-6.7h11.5zm64.9 0 3.5 11H242l-9.3 6.7 3.6 10.9-9.3-6.8-9.3 6.8 3.6-11-9.3-6.7h11.4zm64.8 0 3.6 11h11.4l-9.2 6.7 3.5 10.9-9.3-6.8-9.2 6.8 3.5-11-9.2-6.7h11.4zm64.9 0 3.5 11h11.5l-9.3 6.7 3.6 10.9-9.3-6.8-9.3 6.8 3.6-11-9.3-6.7h11.5zM64.9 94.5l3.5 10.9h11.5l-9.3 6.7 3.5 11-9.2-6.8-9.3 6.7 3.5-10.9-9.2-6.7h11.4zm64.8 0 3.6 10.9h11.4l-9.3 6.7 3.6 11-9.3-6.8-9.3 6.7 3.6-10.9-9.3-6.7h11.5zm64.9 0 3.5 10.9h11.5l-9.3 6.7 3.5 11-9.2-6.8-9.3 6.7 3.5-10.9-9.2-6.7H191zm64.8 0 3.6 10.9h11.4l-9.2 6.7 3.5 11-9.3-6.8-9.2 6.7 3.5-10.9-9.3-6.7H256zm64.9 0 3.5 10.9h11.5l-9.3 6.7 3.5 11-9.2-6.8-9.3 6.7 3.5-10.9-9.2-6.7h11.4zM32.4 122.1 36 133h11.4l-9.2 6.7 3.5 11-9.3-6.8-9.2 6.7 3.5-10.9-9.3-6.7H29zm64.9 0 3.5 10.9h11.5l-9.3 6.7 3.5 10.9-9.2-6.7-9.3 6.7 3.5-10.9-9.2-6.7h11.4zm64.8 0 3.6 10.9H177l-9.2 6.7 3.5 11-9.3-6.8-9.2 6.7 3.5-10.9-9.3-6.7h11.5zm64.9 0 3.5 10.9H242l-9.3 6.7 3.6 11-9.3-6.8-9.3 6.7 3.6-10.9-9.3-6.7h11.4zm64.8 0 3.6 10.9h11.4l-9.2 6.7 3.5 11-9.3-6.8-9.2 6.7 3.5-10.9-9.2-6.7h11.4zm64.9 0 3.5 10.9h11.5l-9.3 6.7 3.6 11-9.3-6.8-9.3 6.7 3.6-10.9-9.3-6.7h11.5zM64.9 149.7l3.5 10.9h11.5l-9.3 6.7 3.5 10.9-9.2-6.8-9.3 6.8 3.5-11-9.2-6.7h11.4zm64.8 0 3.6 10.9h11.4l-9.3 6.7 3.6 10.9-9.3-6.8-9.3 6.8 3.6-11-9.3-6.7h11.5zm64.9 0 3.5 10.9h11.5l-9.3 6.7 3.5 10.9-9.2-6.8-9.3 6.8 3.5-11-9.2-6.7H191zm64.8 0 3.6 10.9h11.4l-9.2 6.7 3.5 10.9-9.3-6.8-9.2 6.8 3.5-11-9.3-6.7H256zm64.9 0 3.5 10.9h11.5l-9.3 6.7 3.5 10.9-9.2-6.8-9.3 6.8 3.5-11-9.2-6.7h11.4zM32.4 177.2l3.6 11h11.4l-9.2 6.7 3.5 10.8-9.3-6.7-9.2 6.7 3.5-10.9-9.3-6.7H29zm64.9 0 3.5 11h11.5l-9.3 6.7 3.6 10.8-9.3-6.7-9.3 6.7 3.6-10.9-9.3-6.7h11.4zm64.8 0 3.6 11H177l-9.2 6.7 3.5 10.8-9.3-6.7-9.2 6.7 3.5-10.9-9.3-6.7h11.5zm64.9 0 3.5 11H242l-9.3 6.7 3.6 10.8-9.3-6.7-9.3 6.7 3.6-10.9-9.3-6.7h11.4zm64.8 0 3.6 11h11.4l-9.2 6.7 3.5 10.8-9.3-6.7-9.2 6.7 3.5-10.9-9.2-6.7h11.4zm64.9 0 3.5 11h11.5l-9.3 6.7 3.6 10.8-9.3-6.7-9.3 6.7 3.6-10.9-9.3-6.7h11.5zM64.9 204.8l3.5 10.9h11.5l-9.3 6.7 3.5 11-9.2-6.8-9.3 6.7 3.5-10.9-9.2-6.7h11.4zm64.8 0 3.6 10.9h11.4l-9.3 6.7 3.6 11-9.3-6.8-9.3 6.7 3.6-10.9-9.3-6.7h11.5zm64.9 0 3.5 10.9h11.5l-9.3 6.7 3.5 11-9.2-6.8-9.3 6.7 3.5-10.9-9.2-6.7H191zm64.8 0 3.6 10.9h11.4l-9.2 6.7 3.5 11-9.3-6.8-9.2 6.7 3.5-10.9-9.3-6.7H256zm64.9 0 3.5 10.9h11.5l-9.3 6.7 3.5 11-9.2-6.8-9.3 6.7 3.5-10.9-9.2-6.7h11.4zM32.4 232.4l3.6 10.9h11.4l-9.2 6.7 3.5 10.9-9.3-6.7-9.2 6.7 3.5-11-9.3-6.7H29zm64.9 0 3.5 10.9h11.5L103 250l3.6 10.9-9.3-6.7-9.3 6.7 3.6-11-9.3-6.7h11.4zm64.8 0 3.6 10.9H177l-9 6.7 3.5 10.9-9.3-6.7-9.2 6.7 3.5-11-9.3-6.7h11.5zm64.9 0 3.5 10.9H242l-9.3 6.7 3.6 10.9-9.3-6.7-9.3 6.7 3.6-11-9.3-6.7h11.4zm64.8 0 3.6 10.9h11.4l-9.2 6.7 3.5 10.9-9.3-6.7-9.2 6.7 3.5-11-9.2-6.7h11.4zm64.9 0 3.5 10.9h11.5l-9.3 6.7 3.6 10.9-9.3-6.7-9.3 6.7 3.6-11-9.3-6.7h11.5z" transform="scale(.9375)"/>
+  </g>
+</svg>
diff --git a/apps/www/public/images/regions/us-east-2.svg b/apps/www/public/images/regions/us-east-2.svg
new file mode 100644
index 00000000000..3189d8e2dc3
--- /dev/null
+++ b/apps/www/public/images/regions/us-east-2.svg
@@ -0,0 +1,10 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="flag-icons-us" viewBox="0 0 640 480">
+  <g fill-rule="evenodd">
+    <g stroke-width="1pt">
+      <path fill="#bd3d44" d="M0 0h972.8v39.4H0zm0 78.8h972.8v39.4H0zm0 78.7h972.8V197H0zm0 78.8h972.8v39.4H0zm0 78.8h972.8v39.4H0zm0 78.7h972.8v39.4H0zm0 78.8h972.8V512H0z" transform="scale(.9375)"/>
+      <path fill="#fff" d="M0 39.4h972.8v39.4H0zm0 78.8h972.8v39.3H0zm0 78.7h972.8v39.4H0zm0 78.8h972.8v39.4H0zm0 78.8h972.8v39.4H0zm0 78.7h972.8v39.4H0z" transform="scale(.9375)"/>
+    </g>
+    <path fill="#192f5d" d="M0 0h389.1v275.7H0z" transform="scale(.9375)"/>
+    <path fill="#fff" d="M32.4 11.8 36 22.7h11.4l-9.2 6.7 3.5 11-9.3-6.8-9.2 6.7 3.5-10.9-9.3-6.7H29zm64.9 0 3.5 10.9h11.5l-9.3 6.7 3.5 11-9.2-6.8-9.3 6.7 3.5-10.9-9.2-6.7h11.4zm64.8 0 3.6 10.9H177l-9.2 6.7 3.5 11-9.3-6.8-9.2 6.7 3.5-10.9-9.3-6.7h11.5zm64.9 0 3.5 10.9H242l-9.3 6.7 3.6 11-9.3-6.8-9.3 6.7 3.6-10.9-9.3-6.7h11.4zm64.8 0 3.6 10.9h11.4l-9.2 6.7 3.5 11-9.3-6.8-9.2 6.7 3.5-10.9-9.2-6.7h11.4zm64.9 0 3.5 10.9h11.5l-9.3 6.7 3.6 11-9.3-6.8-9.3 6.7 3.6-10.9-9.3-6.7h11.5zM64.9 39.4l3.5 10.9h11.5L70.6 57 74 67.9l-9-6.7-9.3 6.7L59 57l-9-6.7h11.4zm64.8 0 3.6 10.9h11.4l-9.3 6.7 3.6 10.9-9.3-6.7-9.3 6.7L124 57l-9.3-6.7h11.5zm64.9 0 3.5 10.9h11.5l-9.3 6.7 3.5 10.9-9.2-6.7-9.3 6.7 3.5-10.9-9.2-6.7H191zm64.8 0 3.6 10.9h11.4l-9.3 6.7 3.6 10.9-9.3-6.7-9.2 6.7 3.5-10.9-9.3-6.7H256zm64.9 0 3.5 10.9h11.5L330 57l3.5 10.9-9.2-6.7-9.3 6.7 3.5-10.9-9.2-6.7h11.4zM32.4 66.9 36 78h11.4l-9.2 6.7 3.5 10.9-9.3-6.8-9.2 6.8 3.5-11-9.3-6.7H29zm64.9 0 3.5 11h11.5l-9.3 6.7 3.5 10.9-9.2-6.8-9.3 6.8 3.5-11-9.2-6.7h11.4zm64.8 0 3.6 11H177l-9.2 6.7 3.5 10.9-9.3-6.8-9.2 6.8 3.5-11-9.3-6.7h11.5zm64.9 0 3.5 11H242l-9.3 6.7 3.6 10.9-9.3-6.8-9.3 6.8 3.6-11-9.3-6.7h11.4zm64.8 0 3.6 11h11.4l-9.2 6.7 3.5 10.9-9.3-6.8-9.2 6.8 3.5-11-9.2-6.7h11.4zm64.9 0 3.5 11h11.5l-9.3 6.7 3.6 10.9-9.3-6.8-9.3 6.8 3.6-11-9.3-6.7h11.5zM64.9 94.5l3.5 10.9h11.5l-9.3 6.7 3.5 11-9.2-6.8-9.3 6.7 3.5-10.9-9.2-6.7h11.4zm64.8 0 3.6 10.9h11.4l-9.3 6.7 3.6 11-9.3-6.8-9.3 6.7 3.6-10.9-9.3-6.7h11.5zm64.9 0 3.5 10.9h11.5l-9.3 6.7 3.5 11-9.2-6.8-9.3 6.7 3.5-10.9-9.2-6.7H191zm64.8 0 3.6 10.9h11.4l-9.2 6.7 3.5 11-9.3-6.8-9.2 6.7 3.5-10.9-9.3-6.7H256zm64.9 0 3.5 10.9h11.5l-9.3 6.7 3.5 11-9.2-6.8-9.3 6.7 3.5-10.9-9.2-6.7h11.4zM32.4 122.1 36 133h11.4l-9.2 6.7 3.5 11-9.3-6.8-9.2 6.7 3.5-10.9-9.3-6.7H29zm64.9 0 3.5 10.9h11.5l-9.3 6.7 3.5 10.9-9.2-6.7-9.3 6.7 3.5-10.9-9.2-6.7h11.4zm64.8 0 3.6 10.9H177l-9.2 6.7 3.5 11-9.3-6.8-9.2 6.7 3.5-10.9-9.3-6.7h11.5zm64.9 0 3.5 10.9H242l-9.3 6.7 3.6 11-9.3-6.8-9.3 6.7 3.6-10.9-9.3-6.7h11.4zm64.8 0 3.6 10.9h11.4l-9.2 6.7 3.5 11-9.3-6.8-9.2 6.7 3.5-10.9-9.2-6.7h11.4zm64.9 0 3.5 10.9h11.5l-9.3 6.7 3.6 11-9.3-6.8-9.3 6.7 3.6-10.9-9.3-6.7h11.5zM64.9 149.7l3.5 10.9h11.5l-9.3 6.7 3.5 10.9-9.2-6.8-9.3 6.8 3.5-11-9.2-6.7h11.4zm64.8 0 3.6 10.9h11.4l-9.3 6.7 3.6 10.9-9.3-6.8-9.3 6.8 3.6-11-9.3-6.7h11.5zm64.9 0 3.5 10.9h11.5l-9.3 6.7 3.5 10.9-9.2-6.8-9.3 6.8 3.5-11-9.2-6.7H191zm64.8 0 3.6 10.9h11.4l-9.2 6.7 3.5 10.9-9.3-6.8-9.2 6.8 3.5-11-9.3-6.7H256zm64.9 0 3.5 10.9h11.5l-9.3 6.7 3.5 10.9-9.2-6.8-9.3 6.8 3.5-11-9.2-6.7h11.4zM32.4 177.2l3.6 11h11.4l-9.2 6.7 3.5 10.8-9.3-6.7-9.2 6.7 3.5-10.9-9.3-6.7H29zm64.9 0 3.5 11h11.5l-9.3 6.7 3.6 10.8-9.3-6.7-9.3 6.7 3.6-10.9-9.3-6.7h11.4zm64.8 0 3.6 11H177l-9.2 6.7 3.5 10.8-9.3-6.7-9.2 6.7 3.5-10.9-9.3-6.7h11.5zm64.9 0 3.5 11H242l-9.3 6.7 3.6 10.8-9.3-6.7-9.3 6.7 3.6-10.9-9.3-6.7h11.4zm64.8 0 3.6 11h11.4l-9.2 6.7 3.5 10.8-9.3-6.7-9.2 6.7 3.5-10.9-9.2-6.7h11.4zm64.9 0 3.5 11h11.5l-9.3 6.7 3.6 10.8-9.3-6.7-9.3 6.7 3.6-10.9-9.3-6.7h11.5zM64.9 204.8l3.5 10.9h11.5l-9.3 6.7 3.5 11-9.2-6.8-9.3 6.7 3.5-10.9-9.2-6.7h11.4zm64.8 0 3.6 10.9h11.4l-9.3 6.7 3.6 11-9.3-6.8-9.3 6.7 3.6-10.9-9.3-6.7h11.5zm64.9 0 3.5 10.9h11.5l-9.3 6.7 3.5 11-9.2-6.8-9.3 6.7 3.5-10.9-9.2-6.7H191zm64.8 0 3.6 10.9h11.4l-9.2 6.7 3.5 11-9.3-6.8-9.2 6.7 3.5-10.9-9.3-6.7H256zm64.9 0 3.5 10.9h11.5l-9.3 6.7 3.5 11-9.2-6.8-9.3 6.7 3.5-10.9-9.2-6.7h11.4zM32.4 232.4l3.6 10.9h11.4l-9.2 6.7 3.5 10.9-9.3-6.7-9.2 6.7 3.5-11-9.3-6.7H29zm64.9 0 3.5 10.9h11.5L103 250l3.6 10.9-9.3-6.7-9.3 6.7 3.6-11-9.3-6.7h11.4zm64.8 0 3.6 10.9H177l-9 6.7 3.5 10.9-9.3-6.7-9.2 6.7 3.5-11-9.3-6.7h11.5zm64.9 0 3.5 10.9H242l-9.3 6.7 3.6 10.9-9.3-6.7-9.3 6.7 3.6-11-9.3-6.7h11.4zm64.8 0 3.6 10.9h11.4l-9.2 6.7 3.5 10.9-9.3-6.7-9.2 6.7 3.5-11-9.2-6.7h11.4zm64.9 0 3.5 10.9h11.5l-9.3 6.7 3.6 10.9-9.3-6.7-9.3 6.7 3.6-11-9.3-6.7h11.5z" transform="scale(.9375)"/>
+  </g>
+</svg>
diff --git a/apps/www/public/images/regions/us-west-1.svg b/apps/www/public/images/regions/us-west-1.svg
new file mode 100644
index 00000000000..3189d8e2dc3
--- /dev/null
+++ b/apps/www/public/images/regions/us-west-1.svg
@@ -0,0 +1,10 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="flag-icons-us" viewBox="0 0 640 480">
+  <g fill-rule="evenodd">
+    <g stroke-width="1pt">
+      <path fill="#bd3d44" d="M0 0h972.8v39.4H0zm0 78.8h972.8v39.4H0zm0 78.7h972.8V197H0zm0 78.8h972.8v39.4H0zm0 78.8h972.8v39.4H0zm0 78.7h972.8v39.4H0zm0 78.8h972.8V512H0z" transform="scale(.9375)"/>
+      <path fill="#fff" d="M0 39.4h972.8v39.4H0zm0 78.8h972.8v39.3H0zm0 78.7h972.8v39.4H0zm0 78.8h972.8v39.4H0zm0 78.8h972.8v39.4H0zm0 78.7h972.8v39.4H0z" transform="scale(.9375)"/>
+    </g>
+    <path fill="#192f5d" d="M0 0h389.1v275.7H0z" transform="scale(.9375)"/>
+    <path fill="#fff" d="M32.4 11.8 36 22.7h11.4l-9.2 6.7 3.5 11-9.3-6.8-9.2 6.7 3.5-10.9-9.3-6.7H29zm64.9 0 3.5 10.9h11.5l-9.3 6.7 3.5 11-9.2-6.8-9.3 6.7 3.5-10.9-9.2-6.7h11.4zm64.8 0 3.6 10.9H177l-9.2 6.7 3.5 11-9.3-6.8-9.2 6.7 3.5-10.9-9.3-6.7h11.5zm64.9 0 3.5 10.9H242l-9.3 6.7 3.6 11-9.3-6.8-9.3 6.7 3.6-10.9-9.3-6.7h11.4zm64.8 0 3.6 10.9h11.4l-9.2 6.7 3.5 11-9.3-6.8-9.2 6.7 3.5-10.9-9.2-6.7h11.4zm64.9 0 3.5 10.9h11.5l-9.3 6.7 3.6 11-9.3-6.8-9.3 6.7 3.6-10.9-9.3-6.7h11.5zM64.9 39.4l3.5 10.9h11.5L70.6 57 74 67.9l-9-6.7-9.3 6.7L59 57l-9-6.7h11.4zm64.8 0 3.6 10.9h11.4l-9.3 6.7 3.6 10.9-9.3-6.7-9.3 6.7L124 57l-9.3-6.7h11.5zm64.9 0 3.5 10.9h11.5l-9.3 6.7 3.5 10.9-9.2-6.7-9.3 6.7 3.5-10.9-9.2-6.7H191zm64.8 0 3.6 10.9h11.4l-9.3 6.7 3.6 10.9-9.3-6.7-9.2 6.7 3.5-10.9-9.3-6.7H256zm64.9 0 3.5 10.9h11.5L330 57l3.5 10.9-9.2-6.7-9.3 6.7 3.5-10.9-9.2-6.7h11.4zM32.4 66.9 36 78h11.4l-9.2 6.7 3.5 10.9-9.3-6.8-9.2 6.8 3.5-11-9.3-6.7H29zm64.9 0 3.5 11h11.5l-9.3 6.7 3.5 10.9-9.2-6.8-9.3 6.8 3.5-11-9.2-6.7h11.4zm64.8 0 3.6 11H177l-9.2 6.7 3.5 10.9-9.3-6.8-9.2 6.8 3.5-11-9.3-6.7h11.5zm64.9 0 3.5 11H242l-9.3 6.7 3.6 10.9-9.3-6.8-9.3 6.8 3.6-11-9.3-6.7h11.4zm64.8 0 3.6 11h11.4l-9.2 6.7 3.5 10.9-9.3-6.8-9.2 6.8 3.5-11-9.2-6.7h11.4zm64.9 0 3.5 11h11.5l-9.3 6.7 3.6 10.9-9.3-6.8-9.3 6.8 3.6-11-9.3-6.7h11.5zM64.9 94.5l3.5 10.9h11.5l-9.3 6.7 3.5 11-9.2-6.8-9.3 6.7 3.5-10.9-9.2-6.7h11.4zm64.8 0 3.6 10.9h11.4l-9.3 6.7 3.6 11-9.3-6.8-9.3 6.7 3.6-10.9-9.3-6.7h11.5zm64.9 0 3.5 10.9h11.5l-9.3 6.7 3.5 11-9.2-6.8-9.3 6.7 3.5-10.9-9.2-6.7H191zm64.8 0 3.6 10.9h11.4l-9.2 6.7 3.5 11-9.3-6.8-9.2 6.7 3.5-10.9-9.3-6.7H256zm64.9 0 3.5 10.9h11.5l-9.3 6.7 3.5 11-9.2-6.8-9.3 6.7 3.5-10.9-9.2-6.7h11.4zM32.4 122.1 36 133h11.4l-9.2 6.7 3.5 11-9.3-6.8-9.2 6.7 3.5-10.9-9.3-6.7H29zm64.9 0 3.5 10.9h11.5l-9.3 6.7 3.5 10.9-9.2-6.7-9.3 6.7 3.5-10.9-9.2-6.7h11.4zm64.8 0 3.6 10.9H177l-9.2 6.7 3.5 11-9.3-6.8-9.2 6.7 3.5-10.9-9.3-6.7h11.5zm64.9 0 3.5 10.9H242l-9.3 6.7 3.6 11-9.3-6.8-9.3 6.7 3.6-10.9-9.3-6.7h11.4zm64.8 0 3.6 10.9h11.4l-9.2 6.7 3.5 11-9.3-6.8-9.2 6.7 3.5-10.9-9.2-6.7h11.4zm64.9 0 3.5 10.9h11.5l-9.3 6.7 3.6 11-9.3-6.8-9.3 6.7 3.6-10.9-9.3-6.7h11.5zM64.9 149.7l3.5 10.9h11.5l-9.3 6.7 3.5 10.9-9.2-6.8-9.3 6.8 3.5-11-9.2-6.7h11.4zm64.8 0 3.6 10.9h11.4l-9.3 6.7 3.6 10.9-9.3-6.8-9.3 6.8 3.6-11-9.3-6.7h11.5zm64.9 0 3.5 10.9h11.5l-9.3 6.7 3.5 10.9-9.2-6.8-9.3 6.8 3.5-11-9.2-6.7H191zm64.8 0 3.6 10.9h11.4l-9.2 6.7 3.5 10.9-9.3-6.8-9.2 6.8 3.5-11-9.3-6.7H256zm64.9 0 3.5 10.9h11.5l-9.3 6.7 3.5 10.9-9.2-6.8-9.3 6.8 3.5-11-9.2-6.7h11.4zM32.4 177.2l3.6 11h11.4l-9.2 6.7 3.5 10.8-9.3-6.7-9.2 6.7 3.5-10.9-9.3-6.7H29zm64.9 0 3.5 11h11.5l-9.3 6.7 3.6 10.8-9.3-6.7-9.3 6.7 3.6-10.9-9.3-6.7h11.4zm64.8 0 3.6 11H177l-9.2 6.7 3.5 10.8-9.3-6.7-9.2 6.7 3.5-10.9-9.3-6.7h11.5zm64.9 0 3.5 11H242l-9.3 6.7 3.6 10.8-9.3-6.7-9.3 6.7 3.6-10.9-9.3-6.7h11.4zm64.8 0 3.6 11h11.4l-9.2 6.7 3.5 10.8-9.3-6.7-9.2 6.7 3.5-10.9-9.2-6.7h11.4zm64.9 0 3.5 11h11.5l-9.3 6.7 3.6 10.8-9.3-6.7-9.3 6.7 3.6-10.9-9.3-6.7h11.5zM64.9 204.8l3.5 10.9h11.5l-9.3 6.7 3.5 11-9.2-6.8-9.3 6.7 3.5-10.9-9.2-6.7h11.4zm64.8 0 3.6 10.9h11.4l-9.3 6.7 3.6 11-9.3-6.8-9.3 6.7 3.6-10.9-9.3-6.7h11.5zm64.9 0 3.5 10.9h11.5l-9.3 6.7 3.5 11-9.2-6.8-9.3 6.7 3.5-10.9-9.2-6.7H191zm64.8 0 3.6 10.9h11.4l-9.2 6.7 3.5 11-9.3-6.8-9.2 6.7 3.5-10.9-9.3-6.7H256zm64.9 0 3.5 10.9h11.5l-9.3 6.7 3.5 11-9.2-6.8-9.3 6.7 3.5-10.9-9.2-6.7h11.4zM32.4 232.4l3.6 10.9h11.4l-9.2 6.7 3.5 10.9-9.3-6.7-9.2 6.7 3.5-11-9.3-6.7H29zm64.9 0 3.5 10.9h11.5L103 250l3.6 10.9-9.3-6.7-9.3 6.7 3.6-11-9.3-6.7h11.4zm64.8 0 3.6 10.9H177l-9 6.7 3.5 10.9-9.3-6.7-9.2 6.7 3.5-11-9.3-6.7h11.5zm64.9 0 3.5 10.9H242l-9.3 6.7 3.6 10.9-9.3-6.7-9.3 6.7 3.6-11-9.3-6.7h11.4zm64.8 0 3.6 10.9h11.4l-9.2 6.7 3.5 10.9-9.3-6.7-9.2 6.7 3.5-11-9.2-6.7h11.4zm64.9 0 3.5 10.9h11.5l-9.3 6.7 3.6 10.9-9.3-6.7-9.3 6.7 3.6-11-9.3-6.7h11.5z" transform="scale(.9375)"/>
+  </g>
+</svg>
diff --git a/apps/www/public/images/regions/us-west-2.svg b/apps/www/public/images/regions/us-west-2.svg
new file mode 100644
index 00000000000..3189d8e2dc3
--- /dev/null
+++ b/apps/www/public/images/regions/us-west-2.svg
@@ -0,0 +1,10 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="flag-icons-us" viewBox="0 0 640 480">
+  <g fill-rule="evenodd">
+    <g stroke-width="1pt">
+      <path fill="#bd3d44" d="M0 0h972.8v39.4H0zm0 78.8h972.8v39.4H0zm0 78.7h972.8V197H0zm0 78.8h972.8v39.4H0zm0 78.8h972.8v39.4H0zm0 78.7h972.8v39.4H0zm0 78.8h972.8V512H0z" transform="scale(.9375)"/>
+      <path fill="#fff" d="M0 39.4h972.8v39.4H0zm0 78.8h972.8v39.3H0zm0 78.7h972.8v39.4H0zm0 78.8h972.8v39.4H0zm0 78.8h972.8v39.4H0zm0 78.7h972.8v39.4H0z" transform="scale(.9375)"/>
+    </g>
+    <path fill="#192f5d" d="M0 0h389.1v275.7H0z" transform="scale(.9375)"/>
+    <path fill="#fff" d="M32.4 11.8 36 22.7h11.4l-9.2 6.7 3.5 11-9.3-6.8-9.2 6.7 3.5-10.9-9.3-6.7H29zm64.9 0 3.5 10.9h11.5l-9.3 6.7 3.5 11-9.2-6.8-9.3 6.7 3.5-10.9-9.2-6.7h11.4zm64.8 0 3.6 10.9H177l-9.2 6.7 3.5 11-9.3-6.8-9.2 6.7 3.5-10.9-9.3-6.7h11.5zm64.9 0 3.5 10.9H242l-9.3 6.7 3.6 11-9.3-6.8-9.3 6.7 3.6-10.9-9.3-6.7h11.4zm64.8 0 3.6 10.9h11.4l-9.2 6.7 3.5 11-9.3-6.8-9.2 6.7 3.5-10.9-9.2-6.7h11.4zm64.9 0 3.5 10.9h11.5l-9.3 6.7 3.6 11-9.3-6.8-9.3 6.7 3.6-10.9-9.3-6.7h11.5zM64.9 39.4l3.5 10.9h11.5L70.6 57 74 67.9l-9-6.7-9.3 6.7L59 57l-9-6.7h11.4zm64.8 0 3.6 10.9h11.4l-9.3 6.7 3.6 10.9-9.3-6.7-9.3 6.7L124 57l-9.3-6.7h11.5zm64.9 0 3.5 10.9h11.5l-9.3 6.7 3.5 10.9-9.2-6.7-9.3 6.7 3.5-10.9-9.2-6.7H191zm64.8 0 3.6 10.9h11.4l-9.3 6.7 3.6 10.9-9.3-6.7-9.2 6.7 3.5-10.9-9.3-6.7H256zm64.9 0 3.5 10.9h11.5L330 57l3.5 10.9-9.2-6.7-9.3 6.7 3.5-10.9-9.2-6.7h11.4zM32.4 66.9 36 78h11.4l-9.2 6.7 3.5 10.9-9.3-6.8-9.2 6.8 3.5-11-9.3-6.7H29zm64.9 0 3.5 11h11.5l-9.3 6.7 3.5 10.9-9.2-6.8-9.3 6.8 3.5-11-9.2-6.7h11.4zm64.8 0 3.6 11H177l-9.2 6.7 3.5 10.9-9.3-6.8-9.2 6.8 3.5-11-9.3-6.7h11.5zm64.9 0 3.5 11H242l-9.3 6.7 3.6 10.9-9.3-6.8-9.3 6.8 3.6-11-9.3-6.7h11.4zm64.8 0 3.6 11h11.4l-9.2 6.7 3.5 10.9-9.3-6.8-9.2 6.8 3.5-11-9.2-6.7h11.4zm64.9 0 3.5 11h11.5l-9.3 6.7 3.6 10.9-9.3-6.8-9.3 6.8 3.6-11-9.3-6.7h11.5zM64.9 94.5l3.5 10.9h11.5l-9.3 6.7 3.5 11-9.2-6.8-9.3 6.7 3.5-10.9-9.2-6.7h11.4zm64.8 0 3.6 10.9h11.4l-9.3 6.7 3.6 11-9.3-6.8-9.3 6.7 3.6-10.9-9.3-6.7h11.5zm64.9 0 3.5 10.9h11.5l-9.3 6.7 3.5 11-9.2-6.8-9.3 6.7 3.5-10.9-9.2-6.7H191zm64.8 0 3.6 10.9h11.4l-9.2 6.7 3.5 11-9.3-6.8-9.2 6.7 3.5-10.9-9.3-6.7H256zm64.9 0 3.5 10.9h11.5l-9.3 6.7 3.5 11-9.2-6.8-9.3 6.7 3.5-10.9-9.2-6.7h11.4zM32.4 122.1 36 133h11.4l-9.2 6.7 3.5 11-9.3-6.8-9.2 6.7 3.5-10.9-9.3-6.7H29zm64.9 0 3.5 10.9h11.5l-9.3 6.7 3.5 10.9-9.2-6.7-9.3 6.7 3.5-10.9-9.2-6.7h11.4zm64.8 0 3.6 10.9H177l-9.2 6.7 3.5 11-9.3-6.8-9.2 6.7 3.5-10.9-9.3-6.7h11.5zm64.9 0 3.5 10.9H242l-9.3 6.7 3.6 11-9.3-6.8-9.3 6.7 3.6-10.9-9.3-6.7h11.4zm64.8 0 3.6 10.9h11.4l-9.2 6.7 3.5 11-9.3-6.8-9.2 6.7 3.5-10.9-9.2-6.7h11.4zm64.9 0 3.5 10.9h11.5l-9.3 6.7 3.6 11-9.3-6.8-9.3 6.7 3.6-10.9-9.3-6.7h11.5zM64.9 149.7l3.5 10.9h11.5l-9.3 6.7 3.5 10.9-9.2-6.8-9.3 6.8 3.5-11-9.2-6.7h11.4zm64.8 0 3.6 10.9h11.4l-9.3 6.7 3.6 10.9-9.3-6.8-9.3 6.8 3.6-11-9.3-6.7h11.5zm64.9 0 3.5 10.9h11.5l-9.3 6.7 3.5 10.9-9.2-6.8-9.3 6.8 3.5-11-9.2-6.7H191zm64.8 0 3.6 10.9h11.4l-9.2 6.7 3.5 10.9-9.3-6.8-9.2 6.8 3.5-11-9.3-6.7H256zm64.9 0 3.5 10.9h11.5l-9.3 6.7 3.5 10.9-9.2-6.8-9.3 6.8 3.5-11-9.2-6.7h11.4zM32.4 177.2l3.6 11h11.4l-9.2 6.7 3.5 10.8-9.3-6.7-9.2 6.7 3.5-10.9-9.3-6.7H29zm64.9 0 3.5 11h11.5l-9.3 6.7 3.6 10.8-9.3-6.7-9.3 6.7 3.6-10.9-9.3-6.7h11.4zm64.8 0 3.6 11H177l-9.2 6.7 3.5 10.8-9.3-6.7-9.2 6.7 3.5-10.9-9.3-6.7h11.5zm64.9 0 3.5 11H242l-9.3 6.7 3.6 10.8-9.3-6.7-9.3 6.7 3.6-10.9-9.3-6.7h11.4zm64.8 0 3.6 11h11.4l-9.2 6.7 3.5 10.8-9.3-6.7-9.2 6.7 3.5-10.9-9.2-6.7h11.4zm64.9 0 3.5 11h11.5l-9.3 6.7 3.6 10.8-9.3-6.7-9.3 6.7 3.6-10.9-9.3-6.7h11.5zM64.9 204.8l3.5 10.9h11.5l-9.3 6.7 3.5 11-9.2-6.8-9.3 6.7 3.5-10.9-9.2-6.7h11.4zm64.8 0 3.6 10.9h11.4l-9.3 6.7 3.6 11-9.3-6.8-9.3 6.7 3.6-10.9-9.3-6.7h11.5zm64.9 0 3.5 10.9h11.5l-9.3 6.7 3.5 11-9.2-6.8-9.3 6.7 3.5-10.9-9.2-6.7H191zm64.8 0 3.6 10.9h11.4l-9.2 6.7 3.5 11-9.3-6.8-9.2 6.7 3.5-10.9-9.3-6.7H256zm64.9 0 3.5 10.9h11.5l-9.3 6.7 3.5 11-9.2-6.8-9.3 6.7 3.5-10.9-9.2-6.7h11.4zM32.4 232.4l3.6 10.9h11.4l-9.2 6.7 3.5 10.9-9.3-6.7-9.2 6.7 3.5-11-9.3-6.7H29zm64.9 0 3.5 10.9h11.5L103 250l3.6 10.9-9.3-6.7-9.3 6.7 3.6-11-9.3-6.7h11.4zm64.8 0 3.6 10.9H177l-9 6.7 3.5 10.9-9.3-6.7-9.2 6.7 3.5-11-9.3-6.7h11.5zm64.9 0 3.5 10.9H242l-9.3 6.7 3.6 10.9-9.3-6.7-9.3 6.7 3.6-11-9.3-6.7h11.4zm64.8 0 3.6 10.9h11.4l-9.2 6.7 3.5 10.9-9.3-6.7-9.2 6.7 3.5-11-9.2-6.7h11.4zm64.9 0 3.5 10.9h11.5l-9.3 6.7 3.6 10.9-9.3-6.7-9.3 6.7 3.6-11-9.3-6.7h11.5z" transform="scale(.9375)"/>
+  </g>
+</svg>
diff --git a/docker/volumes/functions/main/index.ts b/docker/volumes/functions/main/index.ts
index 8d00102c0ec..fee63d44e75 100644
--- a/docker/volumes/functions/main/index.ts
+++ b/docker/volumes/functions/main/index.ts
@@ -151,7 +151,10 @@ Deno.serve(async (req: Request) => {
   // Using a common Import Map for all functions 
   // to use a scope 'deno.json' it must be dinamically resolved base on the 'service_name'
   const importMapPath = `/home/deno/functions/deno.jsonc`
-  const envVarsObj = Deno.env.toObject()
+  // SUPABASE_FUNCTION_SLUG is listed after the container env snapshot so
+  // nothing in it can shadow the value, and it is per-request because only this
+  // worker knows which function the request resolved to.
+  const envVarsObj = { ...Deno.env.toObject(), SUPABASE_FUNCTION_SLUG: service_name }
   const envVars = Object.keys(envVarsObj).map((k) => [k, envVarsObj[k]])
 
   try {
diff --git a/packages/api-types/types/api-v1.d.ts b/packages/api-types/types/api-v1.d.ts
index 8b38b0ed71c..b7d26dcb49d 100644
--- a/packages/api-types/types/api-v1.d.ts
+++ b/packages/api-types/types/api-v1.d.ts
@@ -566,7 +566,7 @@ export interface paths {
      *     If both are not provided, only the last 1 minute of logs will be queried.
      *     The timestamp range must be no more than 24 hours and is rounded to the nearest minute. If the range is more than 24 hours, a validation error will be thrown.
      *
-     *     Note: Unless the `sql` parameter is provided, only edge_logs will be queried. See the [log query docs](/docs/guides/telemetry/logs?queryGroups=product&product=postgres&queryGroups=source&source=edge_logs#querying-with-the-logs-explorer:~:text=logs%20from%20the-,Sources,-drop%2Ddown%3A) for all available sources.
+     *     Note: Unless the `sql` parameter is provided, only edge_logs will be queried. See the [log query docs](https://supabase.com/docs/guides/monitoring-and-debugging/logs#logs-explorer) for all available sources.
      *
      */
     get: operations['v1-get-project-logs-all']
@@ -3348,28 +3348,52 @@ export interface components {
       }
     }
     JitListAccessResponse: {
-      items: {
-        expires_at: null
-        invite_id: null
-        primary_email: string | null
-        /** Format: uuid */
-        user_id: string
-        user_roles: {
-          allowed_networks?: {
-            allowed_cidrs?: {
-              /** Format: cidrv4 */
-              cidr: string
-            }[]
-            allowed_cidrs_v6?: {
-              /** Format: cidrv6 */
-              cidr: string
+      items: (
+        | {
+            expires_at: null
+            invite_id: null
+            primary_email: string | null
+            /** Format: uuid */
+            user_id: string
+            user_roles: {
+              allowed_networks?: {
+                allowed_cidrs?: {
+                  /** Format: cidrv4 */
+                  cidr: string
+                }[]
+                allowed_cidrs_v6?: {
+                  /** Format: cidrv6 */
+                  cidr: string
+                }[]
+              }
+              branches_only?: boolean
+              expires_at?: number
+              role: string
             }[]
           }
-          branches_only?: boolean
-          expires_at?: number
-          role: string
-        }[]
-      }[]
+        | {
+            expires_at: string
+            /** Format: uuid */
+            invite_id: string
+            primary_email: string
+            user_id: null
+            user_roles: {
+              allowed_networks?: {
+                allowed_cidrs?: {
+                  /** Format: cidrv4 */
+                  cidr: string
+                }[]
+                allowed_cidrs_v6?: {
+                  /** Format: cidrv6 */
+                  cidr: string
+                }[]
+              }
+              branches_only?: boolean
+              expires_at?: number
+              role: string
+            }[]
+          }
+      )[]
     }
     LegacyApiKeysResponse: {
       enabled: boolean
@@ -5374,9 +5398,9 @@ export interface components {
       username: string
     }
     V1ProjectAdvisorsResponse: {
-      lints: {
+      lints: ({
         cache_key: string
-        categories: ('PERFORMANCE' | 'SECURITY')[]
+        categories: ('PERFORMANCE' | 'SECURITY' | 'HEALTH')[]
         description: string
         detail: string
         /** @enum {string} */
@@ -5390,7 +5414,18 @@ export interface components {
           name?: string
           schema?: string
           /** @enum {string} */
-          type?: 'table' | 'view' | 'auth' | 'function' | 'extension' | 'compliance'
+          type?:
+            | 'table'
+            | 'view'
+            | 'materialized view'
+            | 'foreign table'
+            | 'auth'
+            | 'function'
+            | 'extension'
+            | 'compliance'
+            | 'health'
+        } & {
+          [key: string]: unknown
         }
         /** @enum {string} */
         name:
@@ -5414,6 +5449,7 @@ export interface components {
           | 'auth_otp_long_expiry'
           | 'auth_otp_short_length'
           | 'ssl_not_enforced'
+          | 'log_connections_not_enabled'
           | 'network_restrictions_not_set'
           | 'password_requirements_min_length'
           | 'pitr_not_enabled'
@@ -5423,9 +5459,22 @@ export interface components {
           | 'leaked_service_key'
           | 'no_backup_admin'
           | 'vulnerable_postgres_version'
+          | 'db_not_reachable'
+          | 'db_connection_failing'
+          | 'db_connection_limit_reached'
+          | 'instance_telemetry_lost'
+          | 'instance_db_down'
+          | 'instance_alert_firing'
+          | 'log_service_error_rate_high'
+          | 'project_not_active'
+          | 'advisor_check_unavailable'
+        /** Format: date-time */
+        observed_at?: string
         remediation: string
         title: string
-      }[]
+      } & {
+        [key: string]: unknown
+      })[]
     }
     V1ProjectRefResponse: {
       id: number
@@ -7102,7 +7151,7 @@ export interface operations {
       query?: {
         iso_timestamp_end?: string
         iso_timestamp_start?: string
-        /** @description Custom SQL query to execute on the logs. See [querying logs](/docs/guides/telemetry/logs?queryGroups=product&product=postgres&queryGroups=source&source=edge_logs#querying-with-the-logs-explorer) for more details. */
+        /** @description Custom SQL query to execute on the logs. See [querying logs](https://supabase.com/docs/guides/monitoring-and-debugging/logs#querying-with-the-logs-explorer) for more details. */
         sql?: string
       }
       header?: never
@@ -7157,7 +7206,7 @@ export interface operations {
       query?: {
         iso_timestamp_end?: string
         iso_timestamp_start?: string
-        /** @description Custom SQL query to execute on the logs. See [querying logs](/docs/guides/telemetry/logs?queryGroups=product&product=postgres&queryGroups=source&source=edge_logs#querying-with-the-logs-explorer) for more details. */
+        /** @description Custom SQL query to execute on the logs. See [querying logs](https://supabase.com/docs/guides/monitoring-and-debugging/logs#querying-with-the-logs-explorer) for more details. */
         sql?: string
       }
       header?: never
diff --git a/packages/api-types/types/api-v2.d.ts b/packages/api-types/types/api-v2.d.ts
index bedf058b8a4..7fc9ee5023c 100644
--- a/packages/api-types/types/api-v2.d.ts
+++ b/packages/api-types/types/api-v2.d.ts
@@ -316,6 +316,23 @@ export interface paths {
     patch?: never
     trace?: never
   }
+  '/v2/projects/{ref}/advisors/run': {
+    parameters: {
+      query?: never
+      header?: never
+      path?: never
+      cookie?: never
+    }
+    get?: never
+    put?: never
+    /** Runs the project advisors with the given names */
+    post: operations['v2-run-project-advisors']
+    delete?: never
+    options?: never
+    head?: never
+    patch?: never
+    trace?: never
+  }
   '/v2/projects/{ref}/analytics/log-drains': {
     parameters: {
       query?: never
@@ -748,14 +765,6 @@ export interface components {
             | 'otlp'
             | 'syslog'
           config:
-            | {
-                hostname?: string
-                password?: string | null
-                port?: number | null
-                schema?: string
-                url?: string | null
-                username?: string | null
-              }
             | {
                 gzip?: boolean
                 headers?: {
@@ -765,10 +774,6 @@ export interface components {
                 http?: 'http1' | 'http2'
                 url?: string
               }
-            | {
-                dataset_id?: string
-                project_id?: string
-              }
             | {
                 api_key?: string
                 region?: string
@@ -800,8 +805,33 @@ export interface components {
                 /** @default false */
                 tls?: boolean
               }
+            | {
+                access_key_id?: string
+                batch_timeout?: number
+                s3_bucket?: string
+                secret_access_key?: string
+                storage_region?: string
+              }
+            | {
+                password?: string
+                region?: string
+                username?: string
+              }
+            | {
+                endpoint?: string
+                /** @default true */
+                gzip?: boolean
+                /** @default {} */
+                headers?: {
+                  [key: string]: string
+                }
+                /** @default http/protobuf */
+                protocol?: string
+              }
           description?: string
           name: string
+        } & {
+          [key: string]: unknown
         }
         /**
          * @description Resource type.
@@ -835,7 +865,7 @@ export interface components {
         [key: string]: unknown
       }
     }
-    ListLogDrainsResponse: {
+    ListLogDrainsResponse_Output: {
       data: {
         attributes: {
           /** @enum {string} */
@@ -853,14 +883,6 @@ export interface components {
             | 'otlp'
             | 'syslog'
           config:
-            | {
-                hostname?: string
-                password?: string | null
-                port?: number | null
-                schema?: string
-                url?: string | null
-                username?: string | null
-              }
             | {
                 gzip?: boolean
                 headers?: {
@@ -870,10 +892,6 @@ export interface components {
                 http?: 'http1' | 'http2'
                 url?: string
               }
-            | {
-                dataset_id?: string
-                project_id?: string
-              }
             | {
                 api_key?: string
                 region?: string
@@ -905,6 +923,29 @@ export interface components {
                 /** @default false */
                 tls?: boolean
               }
+            | {
+                access_key_id?: string
+                batch_timeout?: number
+                s3_bucket?: string
+                secret_access_key?: string
+                storage_region?: string
+              }
+            | {
+                password?: string
+                region?: string
+                username?: string
+              }
+            | {
+                endpoint?: string
+                /** @default true */
+                gzip?: boolean
+                /** @default {} */
+                headers?: {
+                  [key: string]: string
+                }
+                /** @default http/protobuf */
+                protocol?: string
+              }
           description?: string
           name: string
         }
@@ -916,7 +957,7 @@ export interface components {
         type: 'log_drain'
       }[]
     }
-    LogDrainResponse: {
+    LogDrainResponse_Output: {
       data: {
         attributes: {
           /** @enum {string} */
@@ -934,14 +975,6 @@ export interface components {
             | 'otlp'
             | 'syslog'
           config:
-            | {
-                hostname?: string
-                password?: string | null
-                port?: number | null
-                schema?: string
-                url?: string | null
-                username?: string | null
-              }
             | {
                 gzip?: boolean
                 headers?: {
@@ -951,10 +984,6 @@ export interface components {
                 http?: 'http1' | 'http2'
                 url?: string
               }
-            | {
-                dataset_id?: string
-                project_id?: string
-              }
             | {
                 api_key?: string
                 region?: string
@@ -986,6 +1015,29 @@ export interface components {
                 /** @default false */
                 tls?: boolean
               }
+            | {
+                access_key_id?: string
+                batch_timeout?: number
+                s3_bucket?: string
+                secret_access_key?: string
+                storage_region?: string
+              }
+            | {
+                password?: string
+                region?: string
+                username?: string
+              }
+            | {
+                endpoint?: string
+                /** @default true */
+                gzip?: boolean
+                /** @default {} */
+                headers?: {
+                  [key: string]: string
+                }
+                /** @default http/protobuf */
+                protocol?: string
+              }
           description?: string
           name: string
         }
@@ -997,7 +1049,7 @@ export interface components {
         type: 'log_drain'
       }
     }
-    OrganizationMemberRoleResponse: {
+    OrganizationMemberRoleResponse_Output: {
       data: {
         attributes: {
           /**
@@ -1041,14 +1093,6 @@ export interface components {
             | 'otlp'
             | 'syslog'
           config?:
-            | {
-                hostname?: string
-                password?: string | null
-                port?: number | null
-                schema?: string
-                url?: string | null
-                username?: string | null
-              }
             | {
                 gzip?: boolean
                 headers?: {
@@ -1058,10 +1102,6 @@ export interface components {
                 http?: 'http1' | 'http2'
                 url?: string
               }
-            | {
-                dataset_id?: string
-                project_id?: string
-              }
             | {
                 api_key?: string
                 region?: string
@@ -1093,8 +1133,33 @@ export interface components {
                 /** @default false */
                 tls?: boolean
               }
+            | {
+                access_key_id?: string
+                batch_timeout?: number
+                s3_bucket?: string
+                secret_access_key?: string
+                storage_region?: string
+              }
+            | {
+                password?: string
+                region?: string
+                username?: string
+              }
+            | {
+                endpoint?: string
+                /** @default true */
+                gzip?: boolean
+                /** @default {} */
+                headers?: {
+                  [key: string]: string
+                }
+                /** @default http/protobuf */
+                protocol?: string
+              }
           description?: string
           name?: string
+        } & {
+          [key: string]: unknown
         }
         /**
          * @description Resource type.
@@ -1131,7 +1196,11 @@ export interface components {
     V2CreateInvitationsRequest: {
       data: {
         attributes: {
-          /** Format: email */
+          /**
+           * Format: email
+           * @description Email address of the invitation receipient.
+           * @example hello@example.com
+           */
           email: string
           /** @description The projects to limit a user to. If omitted, user will have org-wide access with the provided role. */
           projects?: {
@@ -1156,10 +1225,14 @@ export interface components {
         type: 'organization_invitation'
       }[]
     }
-    V2CreateInvitationsResponse: {
+    V2CreateInvitationsResponse_Output: {
       data: {
         attributes: {
-          /** Format: email */
+          /**
+           * Format: email
+           * @description Email address of the invitation receipient.
+           * @example hello@example.com
+           */
           email: string
         }
         /**
@@ -1190,7 +1263,11 @@ export interface components {
           }
           message: string
           meta: {
-            /** Format: email */
+            /**
+             * Format: email
+             * @description Email address of the invitation receipient.
+             * @example hello@example.com
+             */
             email: string
           }
         }[]
@@ -1232,7 +1309,11 @@ export interface components {
     V2DeleteInvitationsRequest: {
       data: {
         attributes: {
-          /** Format: email */
+          /**
+           * Format: email
+           * @description Email address of the invitation receipient.
+           * @example hello@example.com
+           */
           email: string
         }
         /**
@@ -1242,10 +1323,14 @@ export interface components {
         type: 'organization_invitation'
       }[]
     }
-    V2DeleteInvitationsResponse: {
+    V2DeleteInvitationsResponse_Output: {
       data: {
         attributes: {
-          /** Format: email */
+          /**
+           * Format: email
+           * @description Email address of the invitation receipient.
+           * @example hello@example.com
+           */
           email: string
         }
         /**
@@ -1278,7 +1363,7 @@ export interface components {
         type: 'project_worker'
       }
     }
-    V2ListGitHubConnectionsResponse: {
+    V2ListGitHubConnectionsResponse_Output: {
       data: {
         attributes: {
           /** @description Maximum number of preview branches */
@@ -1351,7 +1436,7 @@ export interface components {
         prev: string | null
       }
     }
-    V2ListMembersResponse: {
+    V2ListMembersResponse_Output: {
       data: {
         attributes: {
           /** @description Member's avatar URL */
@@ -1414,7 +1499,7 @@ export interface components {
         prev: string | null
       }
     }
-    V2ListPrivateLinkAssociationsResponse: {
+    V2ListPrivateLinkAssociationsResponse_Output: {
       data: {
         attributes: {
           /** @description Human-readable name for the AWS account. */
@@ -1466,7 +1551,7 @@ export interface components {
         type: 'private_link_association'
       }[]
     }
-    V2ListProjectsResponse: {
+    V2ListProjectsResponse_Output: {
       data: {
         attributes: {
           /** @description Cloud provider hosting the project */
@@ -1581,7 +1666,7 @@ export interface components {
         prev: string | null
       }
     }
-    V2ListRolesResponse: {
+    V2ListRolesResponse_Output: {
       data: {
         attributes: {
           /**
@@ -1597,7 +1682,7 @@ export interface components {
         type: 'organization_role'
       }[]
     }
-    V2ListWorkersResponse: {
+    V2ListWorkersResponse_Output: {
       data: {
         attributes: {
           /** @enum {string} */
@@ -1636,7 +1721,7 @@ export interface components {
         type: 'project_worker'
       }[]
     }
-    V2PreviewProjectTransferResponse: {
+    V2PreviewProjectTransferResponse_Output: {
       data: {
         attributes: {
           errors: {
@@ -1660,7 +1745,7 @@ export interface components {
         type: 'project_transfer_result'
       }
     }
-    V2PrivateLinkAssociationResponse: {
+    V2PrivateLinkAssociationResponse_Output: {
       data: {
         attributes: {
           /** @description Human-readable name for the AWS account. */
@@ -1712,7 +1797,91 @@ export interface components {
         type: 'private_link_association'
       }
     }
-    V2ProjectConfigResponse: {
+    V2ProjectAdvisorsResponse_Output: {
+      data: {
+        attributes: {
+          lints: {
+            cache_key: string
+            categories: ('PERFORMANCE' | 'SECURITY' | 'HEALTH')[]
+            description: string
+            detail: string
+            /** @enum {string} */
+            facing: 'EXTERNAL'
+            /** @enum {string} */
+            level: 'ERROR' | 'WARN' | 'INFO'
+            metadata?: {
+              entity?: string
+              fkey_columns?: number[]
+              fkey_name?: string
+              name?: string
+              schema?: string
+              /** @enum {string} */
+              type?:
+                | 'table'
+                | 'view'
+                | 'materialized view'
+                | 'foreign table'
+                | 'auth'
+                | 'function'
+                | 'extension'
+                | 'compliance'
+                | 'health'
+            }
+            /** @enum {string} */
+            name:
+              | 'unindexed_foreign_keys'
+              | 'auth_users_exposed'
+              | 'auth_rls_initplan'
+              | 'no_primary_key'
+              | 'unused_index'
+              | 'multiple_permissive_policies'
+              | 'policy_exists_rls_disabled'
+              | 'rls_enabled_no_policy'
+              | 'duplicate_index'
+              | 'security_definer_view'
+              | 'function_search_path_mutable'
+              | 'rls_disabled_in_public'
+              | 'extension_in_public'
+              | 'rls_references_user_metadata'
+              | 'materialized_view_in_api'
+              | 'foreign_table_in_api'
+              | 'unsupported_reg_types'
+              | 'auth_otp_long_expiry'
+              | 'auth_otp_short_length'
+              | 'ssl_not_enforced'
+              | 'log_connections_not_enabled'
+              | 'network_restrictions_not_set'
+              | 'password_requirements_min_length'
+              | 'pitr_not_enabled'
+              | 'auth_leaked_password_protection'
+              | 'auth_insufficient_mfa_options'
+              | 'auth_password_policy_missing'
+              | 'leaked_service_key'
+              | 'no_backup_admin'
+              | 'vulnerable_postgres_version'
+              | 'db_not_reachable'
+              | 'db_connection_failing'
+              | 'db_connection_limit_reached'
+              | 'instance_telemetry_lost'
+              | 'instance_db_down'
+              | 'instance_alert_firing'
+              | 'log_service_error_rate_high'
+              | 'project_not_active'
+              | 'advisor_check_unavailable'
+            /** Format: date-time */
+            observed_at?: string
+            remediation: string
+            title: string
+          }[]
+        }
+        /**
+         * @description Resource type.
+         * @enum {string}
+         */
+        type: 'project_advisors'
+      }
+    }
+    V2ProjectConfigResponse_Output: {
       data: {
         attributes: {
           api: {
@@ -1729,6 +1898,8 @@ export interface components {
             [key: string]: unknown
           }
           database: {
+            /** @description The major Postgres version the database runs. `17` covers both Postgres 17 and Oriole on 17, since Oriole is a storage engine rather than a version. */
+            major_version: number
             network_restrictions: {
               allowed_cidrs: {
                 address: string
@@ -1869,6 +2040,60 @@ export interface components {
         type: 'project_config'
       }
     }
+    V2RunProjectAdvisorsBody: {
+      data: {
+        attributes: {
+          lints: {
+            /** @enum {string} */
+            name:
+              | 'unindexed_foreign_keys'
+              | 'auth_users_exposed'
+              | 'auth_rls_initplan'
+              | 'no_primary_key'
+              | 'unused_index'
+              | 'multiple_permissive_policies'
+              | 'policy_exists_rls_disabled'
+              | 'rls_enabled_no_policy'
+              | 'duplicate_index'
+              | 'security_definer_view'
+              | 'function_search_path_mutable'
+              | 'rls_disabled_in_public'
+              | 'extension_in_public'
+              | 'rls_references_user_metadata'
+              | 'materialized_view_in_api'
+              | 'foreign_table_in_api'
+              | 'unsupported_reg_types'
+              | 'auth_otp_long_expiry'
+              | 'auth_otp_short_length'
+              | 'ssl_not_enforced'
+              | 'log_connections_not_enabled'
+              | 'network_restrictions_not_set'
+              | 'password_requirements_min_length'
+              | 'pitr_not_enabled'
+              | 'auth_leaked_password_protection'
+              | 'auth_insufficient_mfa_options'
+              | 'auth_password_policy_missing'
+              | 'leaked_service_key'
+              | 'no_backup_admin'
+              | 'vulnerable_postgres_version'
+              | 'db_not_reachable'
+              | 'db_connection_failing'
+              | 'db_connection_limit_reached'
+              | 'instance_telemetry_lost'
+              | 'instance_db_down'
+              | 'instance_alert_firing'
+              | 'log_service_error_rate_high'
+          }[]
+        }
+        /**
+         * @description Resource type.
+         * @enum {string}
+         */
+        type: 'project_advisors'
+      } & {
+        [key: string]: unknown
+      }
+    }
     V2TransferProjectBody: {
       data: {
         attributes: {
@@ -1881,7 +2106,7 @@ export interface components {
         type: 'project_transfer_input'
       }
     }
-    V2WorkerResponse: {
+    V2WorkerResponse_Output: {
       data: {
         attributes: {
           /** @enum {string} */
@@ -1920,7 +2145,7 @@ export interface components {
         type: 'project_worker'
       }
     }
-    V2WorkerUploadResponse: {
+    V2WorkerUploadResponse_Output: {
       data: {
         attributes: {
           /** @description When the slot stops accepting the upload. */
@@ -2308,7 +2533,7 @@ export interface operations {
           [name: string]: unknown
         }
         content: {
-          'application/json': components['schemas']['V2ListGitHubConnectionsResponse']
+          'application/json': components['schemas']['V2ListGitHubConnectionsResponse_Output']
         }
       }
       /** @description Unauthorized */
@@ -2370,7 +2595,7 @@ export interface operations {
           [name: string]: unknown
         }
         content: {
-          'application/json': components['schemas']['V2ListMembersResponse']
+          'application/json': components['schemas']['V2ListMembersResponse_Output']
         }
       }
       /** @description Unauthorized */
@@ -2424,7 +2649,7 @@ export interface operations {
           [name: string]: unknown
         }
         content: {
-          'application/json': components['schemas']['OrganizationMemberRoleResponse']
+          'application/json': components['schemas']['OrganizationMemberRoleResponse_Output']
         }
       }
       /** @description Unauthorized */
@@ -2495,7 +2720,7 @@ export interface operations {
           [name: string]: unknown
         }
         content: {
-          'application/json': components['schemas']['V2CreateInvitationsResponse']
+          'application/json': components['schemas']['V2CreateInvitationsResponse_Output']
         }
       }
       /** @description Unauthorized */
@@ -2557,7 +2782,7 @@ export interface operations {
           [name: string]: unknown
         }
         content: {
-          'application/json': components['schemas']['V2DeleteInvitationsResponse']
+          'application/json': components['schemas']['V2DeleteInvitationsResponse_Output']
         }
       }
       /** @description Unauthorized */
@@ -2625,7 +2850,7 @@ export interface operations {
           [name: string]: unknown
         }
         content: {
-          'application/json': components['schemas']['V2ListProjectsResponse']
+          'application/json': components['schemas']['V2ListProjectsResponse_Output']
         }
       }
       /** @description Unauthorized */
@@ -2674,7 +2899,7 @@ export interface operations {
           [name: string]: unknown
         }
         content: {
-          'application/json': components['schemas']['V2ListRolesResponse']
+          'application/json': components['schemas']['V2ListRolesResponse_Output']
         }
       }
       /** @description Unauthorized */
@@ -2743,8 +2968,6 @@ export interface operations {
                      */
                     organization_slug: string
                     project_ref: string | null
-                  } & {
-                    [key: string]: unknown
                   }
                   /**
                    * Format: date-time
@@ -6930,6 +7153,59 @@ export interface operations {
       }
     }
   }
+  'v2-run-project-advisors': {
+    parameters: {
+      query?: never
+      header?: never
+      path: {
+        /** @description Project ref */
+        ref: string
+      }
+      cookie?: never
+    }
+    requestBody: {
+      content: {
+        'application/json': components['schemas']['V2RunProjectAdvisorsBody']
+      }
+    }
+    responses: {
+      200: {
+        headers: {
+          [name: string]: unknown
+        }
+        content: {
+          'application/json': components['schemas']['V2ProjectAdvisorsResponse_Output']
+        }
+      }
+      /** @description Unauthorized */
+      401: {
+        headers: {
+          [name: string]: unknown
+        }
+        content: {
+          'application/json': components['schemas']['ErrorResponseBody']
+        }
+      }
+      /** @description Forbidden action */
+      403: {
+        headers: {
+          [name: string]: unknown
+        }
+        content: {
+          'application/json': components['schemas']['ErrorResponseBody']
+        }
+      }
+      /** @description Rate limit exceeded */
+      429: {
+        headers: {
+          [name: string]: unknown
+        }
+        content: {
+          'application/json': components['schemas']['ErrorResponseBody']
+        }
+      }
+    }
+  }
   'v2-list-log-drains': {
     parameters: {
       query?: never
@@ -6947,7 +7223,7 @@ export interface operations {
           [name: string]: unknown
         }
         content: {
-          'application/json': components['schemas']['ListLogDrainsResponse']
+          'application/json': components['schemas']['ListLogDrainsResponse_Output']
         }
       }
       /** @description Unauthorized */
@@ -7009,7 +7285,7 @@ export interface operations {
           [name: string]: unknown
         }
         content: {
-          'application/json': components['schemas']['LogDrainResponse']
+          'application/json': components['schemas']['LogDrainResponse_Output']
         }
       }
       /** @description Unauthorized */
@@ -7082,7 +7358,7 @@ export interface operations {
           [name: string]: unknown
         }
         content: {
-          'application/json': components['schemas']['LogDrainResponse']
+          'application/json': components['schemas']['LogDrainResponse_Output']
         }
       }
       /** @description Unauthorized */
@@ -7198,7 +7474,7 @@ export interface operations {
           [name: string]: unknown
         }
         content: {
-          'application/json': components['schemas']['V2ProjectConfigResponse']
+          'application/json': components['schemas']['V2ProjectConfigResponse_Output']
         }
       }
       /** @description Unauthorized */
@@ -7247,7 +7523,7 @@ export interface operations {
           [name: string]: unknown
         }
         content: {
-          'application/json': components['schemas']['V2ListPrivateLinkAssociationsResponse']
+          'application/json': components['schemas']['V2ListPrivateLinkAssociationsResponse_Output']
         }
       }
       /** @description Unauthorized */
@@ -7309,7 +7585,7 @@ export interface operations {
           [name: string]: unknown
         }
         content: {
-          'application/json': components['schemas']['V2PrivateLinkAssociationResponse']
+          'application/json': components['schemas']['V2PrivateLinkAssociationResponse_Output']
         }
       }
       /** @description Unauthorized */
@@ -7549,7 +7825,7 @@ export interface operations {
           [name: string]: unknown
         }
         content: {
-          'application/json': components['schemas']['V2PreviewProjectTransferResponse']
+          'application/json': components['schemas']['V2PreviewProjectTransferResponse_Output']
         }
       }
       /** @description Unauthorized */
@@ -7618,8 +7894,6 @@ export interface operations {
                      */
                     organization_slug: string
                     project_ref: string | null
-                  } & {
-                    [key: string]: unknown
                   }
                   /**
                    * Format: date-time
@@ -11822,7 +12096,7 @@ export interface operations {
           [name: string]: unknown
         }
         content: {
-          'application/json': components['schemas']['V2ListWorkersResponse']
+          'application/json': components['schemas']['V2ListWorkersResponse_Output']
         }
       }
       /** @description Unauthorized */
@@ -11872,7 +12146,7 @@ export interface operations {
           [name: string]: unknown
         }
         content: {
-          'application/json': components['schemas']['V2WorkerResponse']
+          'application/json': components['schemas']['V2WorkerResponse_Output']
         }
       }
       /** @description Unauthorized */
@@ -11974,7 +12248,7 @@ export interface operations {
           [name: string]: unknown
         }
         content: {
-          'application/json': components['schemas']['V2WorkerResponse']
+          'application/json': components['schemas']['V2WorkerResponse_Output']
         }
       }
       /** @description Unauthorized */
@@ -12024,7 +12298,7 @@ export interface operations {
           [name: string]: unknown
         }
         content: {
-          'application/json': components['schemas']['V2WorkerUploadResponse']
+          'application/json': components['schemas']['V2WorkerUploadResponse_Output']
         }
       }
       /** @description Unauthorized */
diff --git a/packages/api-types/types/platform.d.ts b/packages/api-types/types/platform.d.ts
index ed2eb431fbb..6baf4030898 100644
--- a/packages/api-types/types/platform.d.ts
+++ b/packages/api-types/types/platform.d.ts
@@ -900,6 +900,26 @@ export interface paths {
     patch?: never
     trace?: never
   }
+  '/platform/mcp-tools-permissions': {
+    parameters: {
+      query?: never
+      header?: never
+      path?: never
+      cookie?: never
+    }
+    /**
+     * MCP tool → FGA permission map
+     * @description Returns each MCP tool and the FGA permission groups that gate it, as OR-of-AND alternatives (the token needs every permission of at least one group). Used by the dashboard to show what a scoped token can do.
+     */
+    get: operations['get-mcp-tools-permissions']
+    put?: never
+    post?: never
+    delete?: never
+    options?: never
+    head?: never
+    patch?: never
+    trace?: never
+  }
   '/platform/notifications': {
     parameters: {
       query?: never
@@ -1512,43 +1532,6 @@ export interface paths {
     patch?: never
     trace?: never
   }
-  '/platform/organizations/{slug}/documents/dpa': {
-    parameters: {
-      query?: never
-      header?: never
-      path?: never
-      cookie?: never
-    }
-    get?: never
-    put?: never
-    /** Create DPA document using PandaDoc */
-    post: operations['OrgDocumentsController_createDpaDocument']
-    delete?: never
-    options?: never
-    head?: never
-    patch?: never
-    trace?: never
-  }
-  '/platform/organizations/{slug}/documents/dpa-signed': {
-    parameters: {
-      query?: never
-      header?: never
-      path?: never
-      cookie?: never
-    }
-    /**
-     * Check if organization has signed any version of the DPA
-     * @description Results are cached per organization for up to 24 hours. Signed status may not reflect immediately after a document is completed.
-     */
-    get: operations['OrgDocumentsController_getDpaSignedStatus']
-    put?: never
-    post?: never
-    delete?: never
-    options?: never
-    head?: never
-    patch?: never
-    trace?: never
-  }
   '/platform/organizations/{slug}/documents/iso27001-certificate': {
     parameters: {
       query?: never
@@ -5241,6 +5224,14 @@ export interface components {
           oauth_app_name?: string
           /** @description Organization whose grant was used. Only present when token_type=oauth */
           organization_id?: string
+          /** @description Marketplace partner that authenticated the request. Only present when token_type=partner */
+          partner?: string
+          /** @description The partner's own integration-installation id. Only present when token_type=partner and the integration is already installed. Distinct from installation_id, which is a Supabase platform-app installation */
+          partner_installation_id?: string
+          /** @description Email of the partner user who triggered the action. Only present when token_type=partner and the partner acted on behalf of one of its users */
+          partner_user_email?: string
+          /** @description Opaque user identifier in the partner's namespace. Only present when token_type=partner and the partner acted on behalf of one of its users */
+          partner_user_id?: string
           /** @description GoTrue login session. Only present when token_type=jwt */
           session_id?: string
           /** @description Access token alias, as shown in the dashboard. Only present when token_type=v0, token_type=v1 or token_type=scoped_pat */
@@ -5293,6 +5284,10 @@ export interface components {
       /** @enum {boolean} */
       clear_tax_id?: true
       dry_run?: boolean
+      /** Format: email */
+      email?: string
+      /** @enum {string} */
+      indirect_tax_registration_declaration?: 'yes' | 'no'
       tax_id?: {
         country: string
         type: string
@@ -5484,14 +5479,6 @@ export interface components {
     }
     CreateBackendParamsOpenapi: {
       config:
-        | {
-            hostname?: string
-            password?: string | null
-            port?: number | null
-            schema?: string
-            url?: string | null
-            username?: string | null
-          }
         | {
             gzip?: boolean
             headers?: {
@@ -5501,10 +5488,6 @@ export interface components {
             http?: 'http1' | 'http2'
             url?: string
           }
-        | {
-            dataset_id?: string
-            project_id?: string
-          }
         | {
             api_key?: string
             region?: string
@@ -5536,6 +5519,29 @@ export interface components {
             /** @default false */
             tls?: boolean
           }
+        | {
+            access_key_id?: string
+            batch_timeout?: number
+            s3_bucket?: string
+            secret_access_key?: string
+            storage_region?: string
+          }
+        | {
+            password?: string
+            region?: string
+            username?: string
+          }
+        | {
+            endpoint?: string
+            /** @default true */
+            gzip?: boolean
+            /** @default {} */
+            headers?: {
+              [key: string]: string
+            }
+            /** @default http/protobuf */
+            protocol?: string
+          }
       description?: string
       name: string
       /** @enum {string} */
@@ -5593,17 +5599,6 @@ export interface components {
        */
       id: number
     }
-    CreateDpaDocumentRequest: {
-      /** Format: email */
-      recipient_email: string
-    }
-    CreateDpaDocumentResponse: {
-      date_created: string
-      document_id: string
-      download_url?: string
-      name: string
-      status: string
-    }
     CreateGitHubAuthorizationBody: {
       code: string
     }
@@ -5627,19 +5622,33 @@ export interface components {
       workdir: string
     }
     CreateInvitationBody: {
-      emails: string[]
+      data?: {
+        attributes: {
+          /** Format: email */
+          email: string
+          /** @description The projects to limit a user to. If omitted, user will have org-wide access with the provided role. */
+          projects?: {
+            /**
+             * @description Project ref
+             * @example abcjuqabhgwjjutfvtpa
+             */
+            ref: string
+          }[]
+          require_sso?: boolean
+          /**
+           * @description Role name to assign. Must be on a Team or Enterprise plan to use the read-only role.
+           * @example developer
+           * @enum {string}
+           */
+          role?: 'owner' | 'administrator' | 'developer' | 'read-only'
+          role_id?: number
+        }
+      }[]
+      emails?: string[]
       require_sso?: boolean
-      role_id: number
+      role_id?: number
       role_scoped_projects?: string[]
     }
-    CreateInvitationResponse: {
-      failed: {
-        /** Format: email */
-        email: string
-        error: string
-      }[]
-      succeeded: string[]
-    } | null
     CreateNamespaceBody: {
       namespace: string
     }
@@ -6207,6 +6216,79 @@ export interface components {
               project_id: string
               /** @description BigQuery service account key */
               service_account_key: string
+              /** @description Per-table partitioning and clustering, applied only when the physical table is created or recreated */
+              table_options?: {
+                tables?: {
+                  cluster_by?: string[]
+                  partition_by?:
+                    | (
+                        | {
+                            /**
+                             * @description Source column name
+                             * @example created_at
+                             */
+                            column: string
+                            /**
+                             * @description Partition granularity
+                             * @example day
+                             * @enum {string}
+                             */
+                            granularity?: 'hour' | 'day' | 'month' | 'year'
+                            /**
+                             * @description Partition by a replicated `DATE`, `TIMESTAMP`, or `DATETIME` column
+                             * @enum {string}
+                             */
+                            kind: 'time_column'
+                          }
+                        | {
+                            /**
+                             * @description Source column name
+                             * @example created_at
+                             */
+                            column: string
+                            /**
+                             * @description Exclusive end of the last partition range
+                             * @example 100
+                             */
+                            end: number
+                            /**
+                             * @description Width of each partition range
+                             * @example 10
+                             */
+                            interval: number
+                            /**
+                             * @description Partition by ranges of a replicated integer column
+                             * @enum {string}
+                             */
+                            kind: 'integer_range'
+                            /**
+                             * @description Inclusive start of the first partition range
+                             * @example 0
+                             */
+                            start: number
+                          }
+                        | {
+                            /**
+                             * @description Partition granularity
+                             * @example day
+                             * @enum {string}
+                             */
+                            granularity?: 'hour' | 'day' | 'month' | 'year'
+                            /**
+                             * @description Partition by the time at which BigQuery ingests each row
+                             * @enum {string}
+                             */
+                            kind: 'ingestion_time'
+                          }
+                      )
+                    | null
+                  /**
+                   * @description Source PostgreSQL table OID, stable across renames for the relation lifetime
+                   * @example 16384
+                   */
+                  table_id: number
+                }[]
+              }
             }
           }
         | {
@@ -6519,6 +6601,79 @@ export interface components {
               project_id: string
               /** @description BigQuery service account key */
               service_account_key: string
+              /** @description Per-table partitioning and clustering, applied only when the physical table is created or recreated */
+              table_options?: {
+                tables?: {
+                  cluster_by?: string[]
+                  partition_by?:
+                    | (
+                        | {
+                            /**
+                             * @description Source column name
+                             * @example created_at
+                             */
+                            column: string
+                            /**
+                             * @description Partition granularity
+                             * @example day
+                             * @enum {string}
+                             */
+                            granularity?: 'hour' | 'day' | 'month' | 'year'
+                            /**
+                             * @description Partition by a replicated `DATE`, `TIMESTAMP`, or `DATETIME` column
+                             * @enum {string}
+                             */
+                            kind: 'time_column'
+                          }
+                        | {
+                            /**
+                             * @description Source column name
+                             * @example created_at
+                             */
+                            column: string
+                            /**
+                             * @description Exclusive end of the last partition range
+                             * @example 100
+                             */
+                            end: number
+                            /**
+                             * @description Width of each partition range
+                             * @example 10
+                             */
+                            interval: number
+                            /**
+                             * @description Partition by ranges of a replicated integer column
+                             * @enum {string}
+                             */
+                            kind: 'integer_range'
+                            /**
+                             * @description Inclusive start of the first partition range
+                             * @example 0
+                             */
+                            start: number
+                          }
+                        | {
+                            /**
+                             * @description Partition granularity
+                             * @example day
+                             * @enum {string}
+                             */
+                            granularity?: 'hour' | 'day' | 'month' | 'year'
+                            /**
+                             * @description Partition by the time at which BigQuery ingests each row
+                             * @enum {string}
+                             */
+                            kind: 'ingestion_time'
+                          }
+                      )
+                    | null
+                  /**
+                   * @description Source PostgreSQL table OID, stable across renames for the relation lifetime
+                   * @example 16384
+                   */
+                  table_id: number
+                }[]
+              }
             }
           }
         | {
@@ -7167,40 +7322,6 @@ export interface components {
       /** @description Source ID */
       id: number
     }
-    CreateSSOProviderBody:
-      | {
-          /** @default [] */
-          domains?: string[]
-          email_mapping: string[]
-          enabled: boolean
-          first_name_mapping?: string[]
-          /** Format: uri */
-          idjag_issuer_url?: string | null
-          join_org_on_signup_enabled: boolean
-          /** @enum {string} */
-          join_org_on_signup_role?: 'Administrator' | 'Developer' | 'Owner' | 'Read-only'
-          last_name_mapping?: string[]
-          metadata_xml_file: string
-          /** Format: uri */
-          metadata_xml_url?: string
-          user_name_mapping?: string[]
-        }
-      | {
-          /** @default [] */
-          domains?: string[]
-          email_mapping: string[]
-          enabled: boolean
-          first_name_mapping?: string[]
-          /** Format: uri */
-          idjag_issuer_url?: string | null
-          join_org_on_signup_enabled: boolean
-          /** @enum {string} */
-          join_org_on_signup_role?: 'Administrator' | 'Developer' | 'Owner' | 'Read-only'
-          last_name_mapping?: string[]
-          metadata_xml_file?: string
-          metadata_xml_url: string
-          user_name_mapping?: string[]
-        }
     CreateStorageAnalyticsBucketBody: {
       bucketName: string
     }
@@ -7564,11 +7685,6 @@ export interface components {
       }
       timestamp: string
     }
-    DocumentSignedStatusResponse: {
-      /** Format: date-time */
-      checked_at: string
-      signed: boolean
-    }
     DownloadableBackupsResponse: {
       backups: {
         id: number
@@ -7810,9 +7926,9 @@ export interface components {
           | 'DELETING'
       }[]
     }
-    GetProjectLintsResponse: {
+    GetProjectLintsResponse: ({
       cache_key: string
-      categories: ('PERFORMANCE' | 'SECURITY')[]
+      categories: ('PERFORMANCE' | 'SECURITY' | 'HEALTH')[]
       description: string
       detail: string
       /** @enum {string} */
@@ -7826,7 +7942,18 @@ export interface components {
         name?: string
         schema?: string
         /** @enum {string} */
-        type?: 'table' | 'view' | 'auth' | 'function' | 'extension' | 'compliance'
+        type?:
+          | 'table'
+          | 'view'
+          | 'materialized view'
+          | 'foreign table'
+          | 'auth'
+          | 'function'
+          | 'extension'
+          | 'compliance'
+          | 'health'
+      } & {
+        [key: string]: unknown
       }
       /** @enum {string} */
       name:
@@ -7850,6 +7977,7 @@ export interface components {
         | 'auth_otp_long_expiry'
         | 'auth_otp_short_length'
         | 'ssl_not_enforced'
+        | 'log_connections_not_enabled'
         | 'network_restrictions_not_set'
         | 'password_requirements_min_length'
         | 'pitr_not_enabled'
@@ -7859,9 +7987,22 @@ export interface components {
         | 'leaked_service_key'
         | 'no_backup_admin'
         | 'vulnerable_postgres_version'
+        | 'db_not_reachable'
+        | 'db_connection_failing'
+        | 'db_connection_limit_reached'
+        | 'instance_telemetry_lost'
+        | 'instance_db_down'
+        | 'instance_alert_firing'
+        | 'log_service_error_rate_high'
+        | 'project_not_active'
+        | 'advisor_check_unavailable'
+      /** Format: date-time */
+      observed_at?: string
       remediation: string
       title: string
-    }[]
+    } & {
+      [key: string]: unknown
+    })[]
     GetProjectLogsBody: {
       iso_timestamp_end?: string
       iso_timestamp_start?: string
@@ -8548,14 +8689,6 @@ export interface components {
     }
     LFBackend: {
       config:
-        | {
-            hostname?: string
-            password?: string | null
-            port?: number | null
-            schema?: string
-            url?: string | null
-            username?: string | null
-          }
         | {
             gzip?: boolean
             headers?: {
@@ -8565,10 +8698,6 @@ export interface components {
             http?: 'http1' | 'http2'
             url?: string
           }
-        | {
-            dataset_id?: string
-            project_id?: string
-          }
         | {
             api_key?: string
             region?: string
@@ -8600,6 +8729,29 @@ export interface components {
             /** @default false */
             tls?: boolean
           }
+        | {
+            access_key_id?: string
+            batch_timeout?: number
+            s3_bucket?: string
+            secret_access_key?: string
+            storage_region?: string
+          }
+        | {
+            password?: string
+            region?: string
+            username?: string
+          }
+        | {
+            endpoint?: string
+            /** @default true */
+            gzip?: boolean
+            /** @default {} */
+            headers?: {
+              [key: string]: string
+            }
+            /** @default http/protobuf */
+            protocol?: string
+          }
       description?: string
       readonly id: number
       readonly metadata: {
@@ -9134,6 +9286,7 @@ export interface components {
         id: 'free' | 'pro' | 'team' | 'enterprise' | 'platform'
         name: string
       }
+      requires_indirect_tax_declaration: boolean
       restriction_data: {
         [key: string]: string
       } | null
@@ -10390,6 +10543,79 @@ export interface components {
                * @example my-gcp-project
                */
               project_id: string
+              /** @description Per-table partitioning and clustering, applied only when the physical table is created or recreated */
+              table_options?: {
+                tables?: {
+                  cluster_by?: string[]
+                  partition_by?:
+                    | (
+                        | {
+                            /**
+                             * @description Source column name
+                             * @example created_at
+                             */
+                            column: string
+                            /**
+                             * @description Partition granularity
+                             * @example day
+                             * @enum {string}
+                             */
+                            granularity?: 'hour' | 'day' | 'month' | 'year'
+                            /**
+                             * @description Partition by a replicated `DATE`, `TIMESTAMP`, or `DATETIME` column
+                             * @enum {string}
+                             */
+                            kind: 'time_column'
+                          }
+                        | {
+                            /**
+                             * @description Source column name
+                             * @example created_at
+                             */
+                            column: string
+                            /**
+                             * @description Exclusive end of the last partition range
+                             * @example 100
+                             */
+                            end: number
+                            /**
+                             * @description Width of each partition range
+                             * @example 10
+                             */
+                            interval: number
+                            /**
+                             * @description Partition by ranges of a replicated integer column
+                             * @enum {string}
+                             */
+                            kind: 'integer_range'
+                            /**
+                             * @description Inclusive start of the first partition range
+                             * @example 0
+                             */
+                            start: number
+                          }
+                        | {
+                            /**
+                             * @description Partition granularity
+                             * @example day
+                             * @enum {string}
+                             */
+                            granularity?: 'hour' | 'day' | 'month' | 'year'
+                            /**
+                             * @description Partition by the time at which BigQuery ingests each row
+                             * @enum {string}
+                             */
+                            kind: 'ingestion_time'
+                          }
+                      )
+                    | null
+                  /**
+                   * @description Source PostgreSQL table OID, stable across renames for the relation lifetime
+                   * @example 16384
+                   */
+                  table_id: number
+                }[]
+              }
             }
           }
         | {
@@ -10579,6 +10805,79 @@ export interface components {
                  * @example my-gcp-project
                  */
                 project_id: string
+                /** @description Per-table partitioning and clustering, applied only when the physical table is created or recreated */
+                table_options?: {
+                  tables?: {
+                    cluster_by?: string[]
+                    partition_by?:
+                      | (
+                          | {
+                              /**
+                               * @description Source column name
+                               * @example created_at
+                               */
+                              column: string
+                              /**
+                               * @description Partition granularity
+                               * @example day
+                               * @enum {string}
+                               */
+                              granularity?: 'hour' | 'day' | 'month' | 'year'
+                              /**
+                               * @description Partition by a replicated `DATE`, `TIMESTAMP`, or `DATETIME` column
+                               * @enum {string}
+                               */
+                              kind: 'time_column'
+                            }
+                          | {
+                              /**
+                               * @description Source column name
+                               * @example created_at
+                               */
+                              column: string
+                              /**
+                               * @description Exclusive end of the last partition range
+                               * @example 100
+                               */
+                              end: number
+                              /**
+                               * @description Width of each partition range
+                               * @example 10
+                               */
+                              interval: number
+                              /**
+                               * @description Partition by ranges of a replicated integer column
+                               * @enum {string}
+                               */
+                              kind: 'integer_range'
+                              /**
+                               * @description Inclusive start of the first partition range
+                               * @example 0
+                               */
+                              start: number
+                            }
+                          | {
+                              /**
+                               * @description Partition granularity
+                               * @example day
+                               * @enum {string}
+                               */
+                              granularity?: 'hour' | 'day' | 'month' | 'year'
+                              /**
+                               * @description Partition by the time at which BigQuery ingests each row
+                               * @enum {string}
+                               */
+                              kind: 'ingestion_time'
+                            }
+                        )
+                      | null
+                    /**
+                     * @description Source PostgreSQL table OID, stable across renames for the relation lifetime
+                     * @example 16384
+                     */
+                    table_id: number
+                  }[]
+                }
               }
             }
           | {
@@ -12010,14 +12309,6 @@ export interface components {
     }
     UpdateBackendParamsOpenapi: {
       config?:
-        | {
-            hostname?: string
-            password?: string | null
-            port?: number | null
-            schema?: string
-            url?: string | null
-            username?: string | null
-          }
         | {
             gzip?: boolean
             headers?: {
@@ -12027,10 +12318,6 @@ export interface components {
             http?: 'http1' | 'http2'
             url?: string
           }
-        | {
-            dataset_id?: string
-            project_id?: string
-          }
         | {
             api_key?: string
             region?: string
@@ -12062,6 +12349,29 @@ export interface components {
             /** @default false */
             tls?: boolean
           }
+        | {
+            access_key_id?: string
+            batch_timeout?: number
+            s3_bucket?: string
+            secret_access_key?: string
+            storage_region?: string
+          }
+        | {
+            password?: string
+            region?: string
+            username?: string
+          }
+        | {
+            endpoint?: string
+            /** @default true */
+            gzip?: boolean
+            /** @default {} */
+            headers?: {
+              [key: string]: string
+            }
+            /** @default http/protobuf */
+            protocol?: string
+          }
       description?: string
       name?: string
       /** @enum {string} */
@@ -12677,6 +12987,79 @@ export interface components {
               project_id?: string | null
               /** @description BigQuery service account key */
               service_account_key?: string | null
+              /** @description Per-table partitioning and clustering, applied only when the physical table is created or recreated */
+              table_options?: {
+                tables?: {
+                  cluster_by?: string[]
+                  partition_by?:
+                    | (
+                        | {
+                            /**
+                             * @description Source column name
+                             * @example created_at
+                             */
+                            column: string
+                            /**
+                             * @description Partition granularity
+                             * @example day
+                             * @enum {string}
+                             */
+                            granularity?: 'hour' | 'day' | 'month' | 'year'
+                            /**
+                             * @description Partition by a replicated `DATE`, `TIMESTAMP`, or `DATETIME` column
+                             * @enum {string}
+                             */
+                            kind: 'time_column'
+                          }
+                        | {
+                            /**
+                             * @description Source column name
+                             * @example created_at
+                             */
+                            column: string
+                            /**
+                             * @description Exclusive end of the last partition range
+                             * @example 100
+                             */
+                            end: number
+                            /**
+                             * @description Width of each partition range
+                             * @example 10
+                             */
+                            interval: number
+                            /**
+                             * @description Partition by ranges of a replicated integer column
+                             * @enum {string}
+                             */
+                            kind: 'integer_range'
+                            /**
+                             * @description Inclusive start of the first partition range
+                             * @example 0
+                             */
+                            start: number
+                          }
+                        | {
+                            /**
+                             * @description Partition granularity
+                             * @example day
+                             * @enum {string}
+                             */
+                            granularity?: 'hour' | 'day' | 'month' | 'year'
+                            /**
+                             * @description Partition by the time at which BigQuery ingests each row
+                             * @enum {string}
+                             */
+                            kind: 'ingestion_time'
+                          }
+                      )
+                    | null
+                  /**
+                   * @description Source PostgreSQL table OID, stable across renames for the relation lifetime
+                   * @example 16384
+                   */
+                  table_id: number
+                }[]
+              } | null
             }
           }
         | {
@@ -12985,6 +13368,79 @@ export interface components {
               project_id?: string | null
               /** @description BigQuery service account key */
               service_account_key?: string | null
+              /** @description Per-table partitioning and clustering, applied only when the physical table is created or recreated */
+              table_options?: {
+                tables?: {
+                  cluster_by?: string[]
+                  partition_by?:
+                    | (
+                        | {
+                            /**
+                             * @description Source column name
+                             * @example created_at
+                             */
+                            column: string
+                            /**
+                             * @description Partition granularity
+                             * @example day
+                             * @enum {string}
+                             */
+                            granularity?: 'hour' | 'day' | 'month' | 'year'
+                            /**
+                             * @description Partition by a replicated `DATE`, `TIMESTAMP`, or `DATETIME` column
+                             * @enum {string}
+                             */
+                            kind: 'time_column'
+                          }
+                        | {
+                            /**
+                             * @description Source column name
+                             * @example created_at
+                             */
+                            column: string
+                            /**
+                             * @description Exclusive end of the last partition range
+                             * @example 100
+                             */
+                            end: number
+                            /**
+                             * @description Width of each partition range
+                             * @example 10
+                             */
+                            interval: number
+                            /**
+                             * @description Partition by ranges of a replicated integer column
+                             * @enum {string}
+                             */
+                            kind: 'integer_range'
+                            /**
+                             * @description Inclusive start of the first partition range
+                             * @example 0
+                             */
+                            start: number
+                          }
+                        | {
+                            /**
+                             * @description Partition granularity
+                             * @example day
+                             * @enum {string}
+                             */
+                            granularity?: 'hour' | 'day' | 'month' | 'year'
+                            /**
+                             * @description Partition by the time at which BigQuery ingests each row
+                             * @enum {string}
+                             */
+                            kind: 'ingestion_time'
+                          }
+                      )
+                    | null
+                  /**
+                   * @description Source PostgreSQL table OID, stable across renames for the relation lifetime
+                   * @example 16384
+                   */
+                  table_id: number
+                }[]
+              } | null
             }
           }
         | {
@@ -13528,40 +13984,6 @@ export interface components {
     UpdateSecretsResponse: {
       message: string
     }
-    UpdateSSOProviderBody:
-      | {
-          /** @default [] */
-          domains?: string[]
-          email_mapping: string[]
-          enabled: boolean
-          first_name_mapping?: string[]
-          /** Format: uri */
-          idjag_issuer_url?: string | null
-          join_org_on_signup_enabled: boolean
-          /** @enum {string} */
-          join_org_on_signup_role?: 'Administrator' | 'Developer' | 'Owner' | 'Read-only'
-          last_name_mapping?: string[]
-          metadata_xml_file: string
-          /** Format: uri */
-          metadata_xml_url?: string
-          user_name_mapping?: string[]
-        }
-      | {
-          /** @default [] */
-          domains?: string[]
-          email_mapping: string[]
-          enabled: boolean
-          first_name_mapping?: string[]
-          /** Format: uri */
-          idjag_issuer_url?: string | null
-          join_org_on_signup_enabled: boolean
-          /** @enum {string} */
-          join_org_on_signup_role?: 'Administrator' | 'Developer' | 'Owner' | 'Read-only'
-          last_name_mapping?: string[]
-          metadata_xml_file?: string
-          metadata_xml_url: string
-          user_name_mapping?: string[]
-        }
     UpdateStorageBucketBody: {
       allowed_mime_types?: string[] | null
       file_size_limit?: number | null
@@ -13708,6 +14130,7 @@ export interface components {
                     x_column: string
                     y_series: string[]
                   }
+                  database_identifier?: string
                   row_limit: number
                   sql: string
                   title?: string
@@ -13802,6 +14225,14 @@ export interface components {
           oauth_app_name?: string
           /** @description Organization whose grant was used. Only present when token_type=oauth */
           organization_id?: string
+          /** @description Marketplace partner that authenticated the request. Only present when token_type=partner */
+          partner?: string
+          /** @description The partner's own integration-installation id. Only present when token_type=partner and the integration is already installed. Distinct from installation_id, which is a Supabase platform-app installation */
+          partner_installation_id?: string
+          /** @description Email of the partner user who triggered the action. Only present when token_type=partner and the partner acted on behalf of one of its users */
+          partner_user_email?: string
+          /** @description Opaque user identifier in the partner's namespace. Only present when token_type=partner and the partner acted on behalf of one of its users */
+          partner_user_id?: string
           /** @description GoTrue login session. Only present when token_type=jwt */
           session_id?: string
           /** @description Access token alias, as shown in the dashboard. Only present when token_type=v0, token_type=v1 or token_type=scoped_pat */
@@ -13931,6 +14362,79 @@ export interface components {
               project_id: string
               /** @description BigQuery service account key */
               service_account_key: string
+              /** @description Per-table partitioning and clustering, applied only when the physical table is created or recreated */
+              table_options?: {
+                tables?: {
+                  cluster_by?: string[]
+                  partition_by?:
+                    | (
+                        | {
+                            /**
+                             * @description Source column name
+                             * @example created_at
+                             */
+                            column: string
+                            /**
+                             * @description Partition granularity
+                             * @example day
+                             * @enum {string}
+                             */
+                            granularity?: 'hour' | 'day' | 'month' | 'year'
+                            /**
+                             * @description Partition by a replicated `DATE`, `TIMESTAMP`, or `DATETIME` column
+                             * @enum {string}
+                             */
+                            kind: 'time_column'
+                          }
+                        | {
+                            /**
+                             * @description Source column name
+                             * @example created_at
+                             */
+                            column: string
+                            /**
+                             * @description Exclusive end of the last partition range
+                             * @example 100
+                             */
+                            end: number
+                            /**
+                             * @description Width of each partition range
+                             * @example 10
+                             */
+                            interval: number
+                            /**
+                             * @description Partition by ranges of a replicated integer column
+                             * @enum {string}
+                             */
+                            kind: 'integer_range'
+                            /**
+                             * @description Inclusive start of the first partition range
+                             * @example 0
+                             */
+                            start: number
+                          }
+                        | {
+                            /**
+                             * @description Partition granularity
+                             * @example day
+                             * @enum {string}
+                             */
+                            granularity?: 'hour' | 'day' | 'month' | 'year'
+                            /**
+                             * @description Partition by the time at which BigQuery ingests each row
+                             * @enum {string}
+                             */
+                            kind: 'ingestion_time'
+                          }
+                      )
+                    | null
+                  /**
+                   * @description Source PostgreSQL table OID, stable across renames for the relation lifetime
+                   * @example 16384
+                   */
+                  table_id: number
+                }[]
+              }
             }
           }
         | {
@@ -17322,6 +17826,28 @@ export interface operations {
       }
     }
   }
+  'get-mcp-tools-permissions': {
+    parameters: {
+      query?: never
+      header?: never
+      path?: never
+      cookie?: never
+    }
+    requestBody?: never
+    responses: {
+      /** @description Map of MCP tool name to its FGA permission groups (OR-of-AND). */
+      200: {
+        headers: {
+          [name: string]: unknown
+        }
+        content: {
+          'application/json': {
+            [key: string]: string[][]
+          }
+        }
+      }
+    }
+  }
   NotificationsController_getNotifications: {
     parameters: {
       query?: {
@@ -17537,6 +18063,7 @@ export interface operations {
                   id: 'free' | 'pro' | 'team' | 'enterprise' | 'platform'
                   name: string
                 }
+                requires_indirect_tax_declaration: boolean
                 restriction_data: {
                   [key: string]: string
                 } | null
@@ -19761,96 +20288,6 @@ export interface operations {
       }
     }
   }
-  OrgDocumentsController_createDpaDocument: {
-    parameters: {
-      query?: never
-      header?: never
-      path: {
-        /** @description Organization slug */
-        slug: string
-      }
-      cookie?: never
-    }
-    requestBody: {
-      content: {
-        'application/json': components['schemas']['CreateDpaDocumentRequest']
-      }
-    }
-    responses: {
-      201: {
-        headers: {
-          [name: string]: unknown
-        }
-        content: {
-          'application/json': components['schemas']['CreateDpaDocumentResponse']
-        }
-      }
-      /** @description Unauthorized */
-      401: {
-        headers: {
-          [name: string]: unknown
-        }
-        content?: never
-      }
-      /** @description Forbidden action */
-      403: {
-        headers: {
-          [name: string]: unknown
-        }
-        content?: never
-      }
-      /** @description Rate limit exceeded */
-      429: {
-        headers: {
-          [name: string]: unknown
-        }
-        content?: never
-      }
-    }
-  }
-  OrgDocumentsController_getDpaSignedStatus: {
-    parameters: {
-      query?: never
-      header?: never
-      path: {
-        /** @description Organization slug */
-        slug: string
-      }
-      cookie?: never
-    }
-    requestBody?: never
-    responses: {
-      200: {
-        headers: {
-          [name: string]: unknown
-        }
-        content: {
-          'application/json': components['schemas']['DocumentSignedStatusResponse']
-        }
-      }
-      /** @description Unauthorized */
-      401: {
-        headers: {
-          [name: string]: unknown
-        }
-        content?: never
-      }
-      /** @description Forbidden action */
-      403: {
-        headers: {
-          [name: string]: unknown
-        }
-        content?: never
-      }
-      /** @description Rate limit exceeded */
-      429: {
-        headers: {
-          [name: string]: unknown
-        }
-        content?: never
-      }
-    }
-  }
   OrgDocumentsController_getIso27001CertificateUrl: {
     parameters: {
       query?: never
@@ -21500,7 +21937,38 @@ export interface operations {
     }
     requestBody: {
       content: {
-        'application/json': components['schemas']['UpdateSSOProviderBody']
+        'application/json':
+          | {
+              /** @default [] */
+              domains: string[]
+              email_mapping: string[]
+              enabled: boolean
+              first_name_mapping?: string[]
+              idjag_issuer_url?: string | null
+              join_org_on_signup_enabled: boolean
+              /** @enum {string} */
+              join_org_on_signup_role?: 'Administrator' | 'Developer' | 'Owner' | 'Read-only'
+              last_name_mapping?: string[]
+              metadata_xml_file: string
+              /** Format: uri */
+              metadata_xml_url?: string
+              user_name_mapping?: string[]
+            }
+          | {
+              /** @default [] */
+              domains: string[]
+              email_mapping: string[]
+              enabled: boolean
+              first_name_mapping?: string[]
+              idjag_issuer_url?: string | null
+              join_org_on_signup_enabled: boolean
+              /** @enum {string} */
+              join_org_on_signup_role?: 'Administrator' | 'Developer' | 'Owner' | 'Read-only'
+              last_name_mapping?: string[]
+              metadata_xml_file?: string
+              metadata_xml_url: string
+              user_name_mapping?: string[]
+            }
       }
     }
     responses: {
@@ -21578,7 +22046,38 @@ export interface operations {
     }
     requestBody: {
       content: {
-        'application/json': components['schemas']['CreateSSOProviderBody']
+        'application/json':
+          | {
+              /** @default [] */
+              domains: string[]
+              email_mapping: string[]
+              enabled: boolean
+              first_name_mapping?: string[]
+              idjag_issuer_url?: string | null
+              join_org_on_signup_enabled: boolean
+              /** @enum {string} */
+              join_org_on_signup_role?: 'Administrator' | 'Developer' | 'Owner' | 'Read-only'
+              last_name_mapping?: string[]
+              metadata_xml_file: string
+              /** Format: uri */
+              metadata_xml_url?: string
+              user_name_mapping?: string[]
+            }
+          | {
+              /** @default [] */
+              domains: string[]
+              email_mapping: string[]
+              enabled: boolean
+              first_name_mapping?: string[]
+              idjag_issuer_url?: string | null
+              join_org_on_signup_enabled: boolean
+              /** @enum {string} */
+              join_org_on_signup_role?: 'Administrator' | 'Developer' | 'Owner' | 'Read-only'
+              last_name_mapping?: string[]
+              metadata_xml_file?: string
+              metadata_xml_url: string
+              user_name_mapping?: string[]
+            }
       }
     }
     responses: {
@@ -21922,6 +22421,7 @@ export interface operations {
                   id: 'free' | 'pro' | 'team' | 'enterprise' | 'platform'
                   name: string
                 }
+                requires_indirect_tax_declaration: boolean
                 restriction_data: {
                   [key: string]: string
                 } | null
diff --git a/packages/common/constants/local-storage.ts b/packages/common/constants/local-storage.ts
index d159268e6df..374cdc1d794 100644
--- a/packages/common/constants/local-storage.ts
+++ b/packages/common/constants/local-storage.ts
@@ -28,6 +28,7 @@ export const LOCAL_STORAGE_KEYS = {
   UI_PREVIEW_SQL_EDITOR_MANUAL_SAVE: 'supabase-ui-sql-editor-manual-save',
   UI_PREVIEW_MARKETPLACE: 'supabase-ui-marketplace',
   UI_PREVIEW_DATABASE_CONNECTIONS: 'preview-database-connections',
+  UI_PREVIEW_EXPLORER: 'preview-explorer',
 
   AI_ASSISTANT_MCP_OPT_IN: 'ai-assistant-mcp-opt-in',
 
@@ -115,6 +116,7 @@ export const LOCAL_STORAGE_KEYS = {
     `organization-marketplace-banner-dismissed-${orgSlug}-${managedBy}`,
   PROJECT_INTEGRATION_BANNER_DISMISSED: (ref: string, integrationSource: string) =>
     `project-integration-banner-dismissed-${ref}-${integrationSource}`,
+  EXPLORER_BANNER_DISMISSED: `explorer-banner-dismissed`,
 
   TABLE_EDITOR_QUEUE_OPERATIONS_BANNER_DISMISSED: (ref: string) =>
     `table-editor-queue-operations-banner-dismissed-${ref}`,
diff --git a/packages/common/telemetry-constants.ts b/packages/common/telemetry-constants.ts
index 335d13f4df5..bafb97da937 100644
--- a/packages/common/telemetry-constants.ts
+++ b/packages/common/telemetry-constants.ts
@@ -10,6 +10,7 @@
  *
  * @module telemetry-frontend
  */
+import type { components } from 'api-types'
 
 export type TelemetryGroups = {
   project: string
@@ -1530,6 +1531,28 @@ export interface DatabaseConnectionsBannerCtaButtonClickedEvent {
   groups: TelemetryGroups
 }
 
+/**
+ * User clicked the dismiss button on the Explorer feature preview banner in studio project pages.
+ *
+ * @group Events
+ * @source studio
+ */
+export interface ExplorerBannerDismissButtonClickedEvent {
+  action: 'explorer_banner_dismiss_button_clicked'
+  groups: TelemetryGroups
+}
+
+/**
+ * User clicked the CTA button on the Explorer feature preview banner in studio project pages.
+ *
+ * @group Events
+ * @source studio
+ */
+export interface ExplorerBannerCtaButtonClickedEvent {
+  action: 'explorer_banner_cta_button_clicked'
+  groups: TelemetryGroups
+}
+
 /**
  * User clicked a metric card PID in the Overview panel of the Database Connections observability page, selecting it in the activity table below.
  *
@@ -2899,7 +2922,8 @@ export interface AuditLogDrainRemovedEvent {
   groups: Omit<TelemetryGroups, 'project'>
 }
 
-type AdvisorCategory = 'PERFORMANCE' | 'SECURITY'
+type AdvisorCategory =
+  components['schemas']['GetProjectLintsResponse'][number]['categories'][number]
 type AdvisorLevel = 'ERROR' | 'WARN' | 'INFO'
 
 /**
@@ -3810,6 +3834,8 @@ export type TelemetryEvent =
   | DatabaseConnectionsBlockerViewClickedEvent
   | DatabaseConnectionsBannerDismissButtonClickedEvent
   | DatabaseConnectionsBannerCtaButtonClickedEvent
+  | ExplorerBannerDismissButtonClickedEvent
+  | ExplorerBannerCtaButtonClickedEvent
   | SessionTerminateButtonClickedEvent
   | SessionTerminateSubmittedEvent
   | QueryCancelButtonClickedEvent
diff --git a/packages/icons/__registry__/index.tsx b/packages/icons/__registry__/index.tsx
index 6c75467e9ee..1f178867161 100644
--- a/packages/icons/__registry__/index.tsx
+++ b/packages/icons/__registry__/index.tsx
@@ -363,5 +363,15 @@ export const Index: Record<string, any> = [
   import: "import { VectorBucket } from 'icons'",
   svg: "<svg width=\"24\" height=\"24\" viewBox=\"0 0 24 24\" fill=\"none\" stroke=\"currentColor\" stroke-width=\"1.5\" stroke-linecap=\"round\" stroke-linejoin=\"round\" xmlns=\"http://www.w3.org/2000/svg\">\n<path d=\"M19.9999 20C20.5303 20 21.039 19.7893 21.4141 19.4142C21.7892 19.0391 21.9999 18.5304 21.9999 18V8C21.9999 7.46957 21.7892 6.96086 21.4141 6.58579C21.039 6.21071 20.5303 6 19.9999 6H12.0999C11.7654 6.00328 11.4354 5.92261 11.1402 5.76538C10.8449 5.60815 10.5938 5.37938 10.4099 5.1L9.59988 3.9C9.41777 3.62347 9.16985 3.39648 8.87838 3.2394C8.5869 3.08231 8.26099 3.00005 7.92988 3H3.99988C3.46944 3 2.96074 3.21071 2.58566 3.58579C2.21059 3.96086 1.99988 4.46957 1.99988 5V18C1.99988 18.5304 2.21059 19.0391 2.58566 19.4142C2.96074 19.7893 3.46944 20 3.99988 20H19.9999Z\"/>\n<path d=\"M11.7833 15.2197V19.5M11.7833 15.2197L16.8327 12.2868M11.7833 15.2197L6.73425 12.2869M6.73425 12.2869V15.7965M6.73425 12.2869V12.2568L9.75885 10.5M16.8328 15.8272V12.2568L13.8083 10.5\"/>\n</svg>\n",
   jsx: "import { VectorBucket } from \"icons\"\n  <VectorBucket/>\n  "
+},
+{
+  name: "workers",
+  componentName: "Workers",
+  deprecated: false,
+  raw: "import createSupabaseIcon from '../createSupabaseIcon';\n\n/**\n * @component @name Workers\n * @description Supabase SVG icon component, renders SVG Element with children.\n *\n * @preview ![img](data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMjQiIGhlaWdodD0iMjMiIHZpZXdCb3g9IjAgMCAyNCAyMyIgZmlsbD0ibm9uZSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiBzdHJva2U9IiMwMDAiIHN0eWxlPSJiYWNrZ3JvdW5kLWNvbG9yOiAjZmZmOyBib3JkZXItcmFkaXVzOiAycHgiIHN0cm9rZS13aWR0aD0iMS41Ij48cGF0aCBkPSJNNy41NTU1NiA4LjcwMDQ5TDEyIDExLjUwMTFNMTIgMTEuNTAxMUwxNi40NDQ0IDguNzAwNDlNMTIgMTEuNTAxMUwxMiAxNi40MDFNMjIgMTUuNzAwOVY3LjI5OTE0QzIxLjk5OTYgNi45MzA4IDIxLjg5NjcgNi41NjkwNCAyMS43MDE3IDYuMjUwMTRDMjEuNTA2NyA1LjkzMTI1IDIxLjIyNjQgNS42NjY0MyAyMC44ODg5IDUuNDgyMjdMMTMuMTExMSAxLjI4MTRDMTIuNzczMyAxLjA5NzA1IDEyLjM5MDEgMSAxMiAxQzExLjYwOTkgMSAxMS4yMjY3IDEuMDk3MDUgMTAuODg4OSAxLjI4MTRMMy4xMTExMSA1LjQ4MjI3QzIuNzczNjMgNS42NjY0MyAyLjQ5MzMxIDUuOTMxMjUgMi4yOTgyOSA2LjI1MDE0QzIuMTAzMjcgNi41NjkwNCAyLjAwMDQgNi45MzA4IDIgNy4yOTkxNFYxNS43MDA5QzIuMDAwNCAxNi4wNjkyIDIuMTAzMjcgMTYuNDMxIDIuMjk4MjkgMTYuNzQ5OUMyLjQ5MzMxIDE3LjA2ODggMi43NzM2MyAxNy4zMzM2IDMuMTExMTEgMTcuNTE3N0wxMC44ODg5IDIxLjcxODZDMTEuMjI2NyAyMS45MDI5IDExLjYwOTkgMjIgMTIgMjJDMTIuMzkwMSAyMiAxMi43NzMzIDIxLjkwMjkgMTMuMTExMSAyMS43MTg2TDIwLjg4ODkgMTcuNTE3N0MyMS4yMjY0IDE3LjMzMzYgMjEuNTA2NyAxNy4wNjg4IDIxLjcwMTcgMTYuNzQ5OUMyMS44OTY3IDE2LjQzMSAyMS45OTk2IDE2LjA2OTIgMjIgMTUuNzAwOVpNMTcuOTI1OSAxMy43NDJWOS4yNjAxNUMxNy45MjU3IDkuMDYzNjYgMTcuODY0NyA4Ljg3MDY4IDE3Ljc0OTIgOC43MDA1N0MxNy42MzM2IDguNTMwNDYgMTcuNDY3NSA4LjM4OTE5IDE3LjI2NzUgOC4yOTA5NUwxMi42NTg0IDYuMDUwMDNDMTIuNDU4MiA1Ljk1MTY5IDEyLjIzMTIgNS44OTk5MiAxMiA1Ljg5OTkyQzExLjc2ODggNS44OTk5MiAxMS41NDE4IDUuOTUxNjkgMTEuMzQxNiA2LjA1MDAzTDYuNzMyNTEgOC4yOTA5NUM2LjUzMjUyIDguMzg5MTkgNi4zNjY0MSA4LjUzMDQ2IDYuMjUwODQgOC43MDA1N0M2LjEzNTI3IDguODcwNjggNi4wNzQzMSA5LjA2MzY2IDYuMDc0MDcgOS4yNjAxNVYxMy43NDJDNi4wNzQzMSAxMy45Mzg1IDYuMTM1MjcgMTQuMTMxNSA2LjI1MDg0IDE0LjMwMTZDNi4zNjY0MSAxNC40NzE3IDYuNTMyNTIgMTQuNjEyOSA2LjczMjUxIDE0LjcxMTJMMTEuMzQxNiAxNi45NTIxQzExLjU0MTggMTcuMDUwNCAxMS43Njg4IDE3LjEwMjIgMTIgMTcuMTAyMkMxMi4yMzEyIDE3LjEwMjIgMTIuNDU4MiAxNy4wNTA0IDEyLjY1ODQgMTYuOTUyMUwxNy4yNjc1IDE0LjcxMTJDMTcuNDY3NSAxNC42MTI5IDE3LjYzMzYgMTQuNDcxNyAxNy43NDkyIDE0LjMwMTZDMTcuODY0NyAxNC4xMzE1IDE3LjkyNTcgMTMuOTM4NSAxNy45MjU5IDEzLjc0MloiLz4KPC9zdmc+Cg==)\n *\n * @param {Object} props - Supabase icons props and any valid SVG attribute\n * @returns {JSX.Element} JSX Element\n *\n */\nconst Workers = createSupabaseIcon(\n  'Workers',\n  [\n    [\n      'path',\n      {\n        d: 'M7.55556 8.70049L12 11.5011M12 11.5011L16.4444 8.70049M12 11.5011L12 16.401M22 15.7009V7.29914C21.9996 6.9308 21.8967 6.56904 21.7017 6.25014C21.5067 5.93125 21.2264 5.66643 20.8889 5.48227L13.1111 1.2814C12.7733 1.09705 12.3901 1 12 1C11.6099 1 11.2267 1.09705 10.8889 1.2814L3.11111 5.48227C2.77363 5.66643 2.49331 5.93125 2.29829 6.25014C2.10327 6.56904 2.0004 6.9308 2 7.29914V15.7009C2.0004 16.0692 2.10327 16.431 2.29829 16.7499C2.49331 17.0688 2.77363 17.3336 3.11111 17.5177L10.8889 21.7186C11.2267 21.9029 11.6099 22 12 22C12.3901 22 12.7733 21.9029 13.1111 21.7186L20.8889 17.5177C21.2264 17.3336 21.5067 17.0688 21.7017 16.7499C21.8967 16.431 21.9996 16.0692 22 15.7009ZM17.9259 13.742V9.26015C17.9257 9.06366 17.8647 8.87068 17.7492 8.70057C17.6336 8.53046 17.4675 8.38919 17.2675 8.29095L12.6584 6.05003C12.4582 5.95169 12.2312 5.89992 12 5.89992C11.7688 5.89992 11.5418 5.95169 11.3416 6.05003L6.73251 8.29095C6.53252 8.38919 6.36641 8.53046 6.25084 8.70057C6.13527 8.87068 6.07431 9.06366 6.07407 9.26015V13.742C6.07431 13.9385 6.13527 14.1315 6.25084 14.3016C6.36641 14.4717 6.53252 14.6129 6.73251 14.7112L11.3416 16.9521C11.5418 17.0504 11.7688 17.1022 12 17.1022C12.2312 17.1022 12.4582 17.0504 12.6584 16.9521L17.2675 14.7112C17.4675 14.6129 17.6336 14.4717 17.7492 14.3016C17.8647 14.1315 17.9257 13.9385 17.9259 13.742Z',\n        key: '1cro8t',\n      },\n    ],\n  ],\n  { fill: 'none', stroke: 'currentColor', strokeWidth: '1.5' },\n);\n\nexport default Workers;\n",
+  component: React.lazy(() => import('icons/src/icons/workers')),
+  import: "import { Workers } from 'icons'",
+  svg: "<svg width=\"24\" height=\"23\" viewBox=\"0 0 24 23\" fill=\"none\" xmlns=\"http://www.w3.org/2000/svg\" stroke=\"currentColor\" stroke-width=\"1.5\">\n<path d=\"M7.55556 8.70049L12 11.5011M12 11.5011L16.4444 8.70049M12 11.5011L12 16.401M22 15.7009V7.29914C21.9996 6.9308 21.8967 6.56904 21.7017 6.25014C21.5067 5.93125 21.2264 5.66643 20.8889 5.48227L13.1111 1.2814C12.7733 1.09705 12.3901 1 12 1C11.6099 1 11.2267 1.09705 10.8889 1.2814L3.11111 5.48227C2.77363 5.66643 2.49331 5.93125 2.29829 6.25014C2.10327 6.56904 2.0004 6.9308 2 7.29914V15.7009C2.0004 16.0692 2.10327 16.431 2.29829 16.7499C2.49331 17.0688 2.77363 17.3336 3.11111 17.5177L10.8889 21.7186C11.2267 21.9029 11.6099 22 12 22C12.3901 22 12.7733 21.9029 13.1111 21.7186L20.8889 17.5177C21.2264 17.3336 21.5067 17.0688 21.7017 16.7499C21.8967 16.431 21.9996 16.0692 22 15.7009ZM17.9259 13.742V9.26015C17.9257 9.06366 17.8647 8.87068 17.7492 8.70057C17.6336 8.53046 17.4675 8.38919 17.2675 8.29095L12.6584 6.05003C12.4582 5.95169 12.2312 5.89992 12 5.89992C11.7688 5.89992 11.5418 5.95169 11.3416 6.05003L6.73251 8.29095C6.53252 8.38919 6.36641 8.53046 6.25084 8.70057C6.13527 8.87068 6.07431 9.06366 6.07407 9.26015V13.742C6.07431 13.9385 6.13527 14.1315 6.25084 14.3016C6.36641 14.4717 6.53252 14.6129 6.73251 14.7112L11.3416 16.9521C11.5418 17.0504 11.7688 17.1022 12 17.1022C12.2312 17.1022 12.4582 17.0504 12.6584 16.9521L17.2675 14.7112C17.4675 14.6129 17.6336 14.4717 17.7492 14.3016C17.8647 14.1315 17.9257 13.9385 17.9259 13.742Z\"/>\n</svg>\n",
+  jsx: "import { Workers } from \"icons\"\n  <Workers/>\n  "
 }
 ]
\ No newline at end of file
diff --git a/packages/icons/src/icons/index.ts b/packages/icons/src/icons/index.ts
index 4348e1c6508..13c2d0172f6 100644
--- a/packages/icons/src/icons/index.ts
+++ b/packages/icons/src/icons/index.ts
@@ -34,4 +34,5 @@ export { default as Storage } from './storage';
 export { default as TableEditor } from './table-editor';
 export { default as User } from './user';
 export { default as VectorBucket } from './vector-bucket';
+export { default as Workers } from './workers';
 
diff --git a/packages/icons/src/icons/workers.ts b/packages/icons/src/icons/workers.ts
new file mode 100644
index 00000000000..4e5d2fc529e
--- /dev/null
+++ b/packages/icons/src/icons/workers.ts
@@ -0,0 +1,27 @@
+import createSupabaseIcon from '../createSupabaseIcon';
+
+/**
+ * @component @name Workers
+ * @description Supabase SVG icon component, renders SVG Element with children.
+ *
+ * @preview ![img](data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMjQiIGhlaWdodD0iMjMiIHZpZXdCb3g9IjAgMCAyNCAyMyIgZmlsbD0ibm9uZSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiBzdHJva2U9IiMwMDAiIHN0eWxlPSJiYWNrZ3JvdW5kLWNvbG9yOiAjZmZmOyBib3JkZXItcmFkaXVzOiAycHgiIHN0cm9rZS13aWR0aD0iMS41Ij48cGF0aCBkPSJNNy41NTU1NiA4LjcwMDQ5TDEyIDExLjUwMTFNMTIgMTEuNTAxMUwxNi40NDQ0IDguNzAwNDlNMTIgMTEuNTAxMUwxMiAxNi40MDFNMjIgMTUuNzAwOVY3LjI5OTE0QzIxLjk5OTYgNi45MzA4IDIxLjg5NjcgNi41NjkwNCAyMS43MDE3IDYuMjUwMTRDMjEuNTA2NyA1LjkzMTI1IDIxLjIyNjQgNS42NjY0MyAyMC44ODg5IDUuNDgyMjdMMTMuMTExMSAxLjI4MTRDMTIuNzczMyAxLjA5NzA1IDEyLjM5MDEgMSAxMiAxQzExLjYwOTkgMSAxMS4yMjY3IDEuMDk3MDUgMTAuODg4OSAxLjI4MTRMMy4xMTExMSA1LjQ4MjI3QzIuNzczNjMgNS42NjY0MyAyLjQ5MzMxIDUuOTMxMjUgMi4yOTgyOSA2LjI1MDE0QzIuMTAzMjcgNi41NjkwNCAyLjAwMDQgNi45MzA4IDIgNy4yOTkxNFYxNS43MDA5QzIuMDAwNCAxNi4wNjkyIDIuMTAzMjcgMTYuNDMxIDIuMjk4MjkgMTYuNzQ5OUMyLjQ5MzMxIDE3LjA2ODggMi43NzM2MyAxNy4zMzM2IDMuMTExMTEgMTcuNTE3N0wxMC44ODg5IDIxLjcxODZDMTEuMjI2NyAyMS45MDI5IDExLjYwOTkgMjIgMTIgMjJDMTIuMzkwMSAyMiAxMi43NzMzIDIxLjkwMjkgMTMuMTExMSAyMS43MTg2TDIwLjg4ODkgMTcuNTE3N0MyMS4yMjY0IDE3LjMzMzYgMjEuNTA2NyAxNy4wNjg4IDIxLjcwMTcgMTYuNzQ5OUMyMS44OTY3IDE2LjQzMSAyMS45OTk2IDE2LjA2OTIgMjIgMTUuNzAwOVpNMTcuOTI1OSAxMy43NDJWOS4yNjAxNUMxNy45MjU3IDkuMDYzNjYgMTcuODY0NyA4Ljg3MDY4IDE3Ljc0OTIgOC43MDA1N0MxNy42MzM2IDguNTMwNDYgMTcuNDY3NSA4LjM4OTE5IDE3LjI2NzUgOC4yOTA5NUwxMi42NTg0IDYuMDUwMDNDMTIuNDU4MiA1Ljk1MTY5IDEyLjIzMTIgNS44OTk5MiAxMiA1Ljg5OTkyQzExLjc2ODggNS44OTk5MiAxMS41NDE4IDUuOTUxNjkgMTEuMzQxNiA2LjA1MDAzTDYuNzMyNTEgOC4yOTA5NUM2LjUzMjUyIDguMzg5MTkgNi4zNjY0MSA4LjUzMDQ2IDYuMjUwODQgOC43MDA1N0M2LjEzNTI3IDguODcwNjggNi4wNzQzMSA5LjA2MzY2IDYuMDc0MDcgOS4yNjAxNVYxMy43NDJDNi4wNzQzMSAxMy45Mzg1IDYuMTM1MjcgMTQuMTMxNSA2LjI1MDg0IDE0LjMwMTZDNi4zNjY0MSAxNC40NzE3IDYuNTMyNTIgMTQuNjEyOSA2LjczMjUxIDE0LjcxMTJMMTEuMzQxNiAxNi45NTIxQzExLjU0MTggMTcuMDUwNCAxMS43Njg4IDE3LjEwMjIgMTIgMTcuMTAyMkMxMi4yMzEyIDE3LjEwMjIgMTIuNDU4MiAxNy4wNTA0IDEyLjY1ODQgMTYuOTUyMUwxNy4yNjc1IDE0LjcxMTJDMTcuNDY3NSAxNC42MTI5IDE3LjYzMzYgMTQuNDcxNyAxNy43NDkyIDE0LjMwMTZDMTcuODY0NyAxNC4xMzE1IDE3LjkyNTcgMTMuOTM4NSAxNy45MjU5IDEzLjc0MloiLz4KPC9zdmc+Cg==)
+ *
+ * @param {Object} props - Supabase icons props and any valid SVG attribute
+ * @returns {JSX.Element} JSX Element
+ *
+ */
+const Workers = createSupabaseIcon(
+  'Workers',
+  [
+    [
+      'path',
+      {
+        d: 'M7.55556 8.70049L12 11.5011M12 11.5011L16.4444 8.70049M12 11.5011L12 16.401M22 15.7009V7.29914C21.9996 6.9308 21.8967 6.56904 21.7017 6.25014C21.5067 5.93125 21.2264 5.66643 20.8889 5.48227L13.1111 1.2814C12.7733 1.09705 12.3901 1 12 1C11.6099 1 11.2267 1.09705 10.8889 1.2814L3.11111 5.48227C2.77363 5.66643 2.49331 5.93125 2.29829 6.25014C2.10327 6.56904 2.0004 6.9308 2 7.29914V15.7009C2.0004 16.0692 2.10327 16.431 2.29829 16.7499C2.49331 17.0688 2.77363 17.3336 3.11111 17.5177L10.8889 21.7186C11.2267 21.9029 11.6099 22 12 22C12.3901 22 12.7733 21.9029 13.1111 21.7186L20.8889 17.5177C21.2264 17.3336 21.5067 17.0688 21.7017 16.7499C21.8967 16.431 21.9996 16.0692 22 15.7009ZM17.9259 13.742V9.26015C17.9257 9.06366 17.8647 8.87068 17.7492 8.70057C17.6336 8.53046 17.4675 8.38919 17.2675 8.29095L12.6584 6.05003C12.4582 5.95169 12.2312 5.89992 12 5.89992C11.7688 5.89992 11.5418 5.95169 11.3416 6.05003L6.73251 8.29095C6.53252 8.38919 6.36641 8.53046 6.25084 8.70057C6.13527 8.87068 6.07431 9.06366 6.07407 9.26015V13.742C6.07431 13.9385 6.13527 14.1315 6.25084 14.3016C6.36641 14.4717 6.53252 14.6129 6.73251 14.7112L11.3416 16.9521C11.5418 17.0504 11.7688 17.1022 12 17.1022C12.2312 17.1022 12.4582 17.0504 12.6584 16.9521L17.2675 14.7112C17.4675 14.6129 17.6336 14.4717 17.7492 14.3016C17.8647 14.1315 17.9257 13.9385 17.9259 13.742Z',
+        key: '1cro8t',
+      },
+    ],
+  ],
+  { fill: 'none', stroke: 'currentColor', strokeWidth: '1.5' },
+);
+
+export default Workers;
diff --git a/packages/icons/src/raw-icons/workers.svg b/packages/icons/src/raw-icons/workers.svg
new file mode 100644
index 00000000000..f185e4918ef
--- /dev/null
+++ b/packages/icons/src/raw-icons/workers.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="23" viewBox="0 0 24 23" fill="none" xmlns="http://www.w3.org/2000/svg" stroke="currentColor" stroke-width="1.5">
+<path d="M7.55556 8.70049L12 11.5011M12 11.5011L16.4444 8.70049M12 11.5011L12 16.401M22 15.7009V7.29914C21.9996 6.9308 21.8967 6.56904 21.7017 6.25014C21.5067 5.93125 21.2264 5.66643 20.8889 5.48227L13.1111 1.2814C12.7733 1.09705 12.3901 1 12 1C11.6099 1 11.2267 1.09705 10.8889 1.2814L3.11111 5.48227C2.77363 5.66643 2.49331 5.93125 2.29829 6.25014C2.10327 6.56904 2.0004 6.9308 2 7.29914V15.7009C2.0004 16.0692 2.10327 16.431 2.29829 16.7499C2.49331 17.0688 2.77363 17.3336 3.11111 17.5177L10.8889 21.7186C11.2267 21.9029 11.6099 22 12 22C12.3901 22 12.7733 21.9029 13.1111 21.7186L20.8889 17.5177C21.2264 17.3336 21.5067 17.0688 21.7017 16.7499C21.8967 16.431 21.9996 16.0692 22 15.7009ZM17.9259 13.742V9.26015C17.9257 9.06366 17.8647 8.87068 17.7492 8.70057C17.6336 8.53046 17.4675 8.38919 17.2675 8.29095L12.6584 6.05003C12.4582 5.95169 12.2312 5.89992 12 5.89992C11.7688 5.89992 11.5418 5.95169 11.3416 6.05003L6.73251 8.29095C6.53252 8.38919 6.36641 8.53046 6.25084 8.70057C6.13527 8.87068 6.07431 9.06366 6.07407 9.26015V13.742C6.07431 13.9385 6.13527 14.1315 6.25084 14.3016C6.36641 14.4717 6.53252 14.6129 6.73251 14.7112L11.3416 16.9521C11.5418 17.0504 11.7688 17.1022 12 17.1022C12.2312 17.1022 12.4582 17.0504 12.6584 16.9521L17.2675 14.7112C17.4675 14.6129 17.6336 14.4717 17.7492 14.3016C17.8647 14.1315 17.9257 13.9385 17.9259 13.742Z"/>
+</svg>
diff --git a/packages/shared-data/plans.ts b/packages/shared-data/plans.ts
index 76ef6e1239f..bc2f7cfd893 100644
--- a/packages/shared-data/plans.ts
+++ b/packages/shared-data/plans.ts
@@ -99,7 +99,7 @@ export const plans: PricingInformation[] = [
     features: [
       'Designated Support manager',
       'Uptime SLAs',
-      'BYO Cloud supported',
+      'Supports AWS PrivateLink',
       '24×7×365 premium enterprise support',
       'Private Slack channel',
       'Custom Security Questionnaires',
diff --git a/packages/shared-data/pricing.ts b/packages/shared-data/pricing.ts
index 30dc6695f9c..532a5df56a9 100644
--- a/packages/shared-data/pricing.ts
+++ b/packages/shared-data/pricing.ts
@@ -70,7 +70,6 @@ export type FeatureKey =
   | 'realtime.maxMessageSize'
   | 'dashboard.teamMembers'
   | 'security.platformAuditLogs'
-  | 'security.byoc'
   | 'security.logRetention'
   | 'security.logDrain'
   | 'security.metricsEndpoint'
@@ -572,17 +571,6 @@ export const pricing: Pricing = {
     title: 'Platform Security and Compliance',
     icon: 'M9 12.75L11.25 15 15 9.75m-3-7.036A11.959 11.959 0 013.598 6 11.99 11.99 0 003 9.749c0 5.592 3.824 10.29 9 11.623 5.176-1.332 9-6.03 9-11.622 0-1.31-.21-2.571-.598-3.751h-.152c-3.196 0-6.1-1.248-8.25-3.285z',
     features: [
-      {
-        key: 'security.byoc',
-        title: 'BYO cloud',
-        plans: {
-          free: false,
-          pro: false,
-          team: false,
-          enterprise: true,
-        },
-        usage_based: false,
-      },
       {
         key: 'security.logRetention',
         title: 'Log retention (API & Database)',
diff --git a/packages/ui-patterns/src/Banners/Select26Banner.tsx b/packages/ui-patterns/src/Banners/Select26Banner.tsx
index 4095031ef65..9d52a16040e 100644
--- a/packages/ui-patterns/src/Banners/Select26Banner.tsx
+++ b/packages/ui-patterns/src/Banners/Select26Banner.tsx
@@ -5,17 +5,26 @@ import Link from 'next/link'
 
 import { SELECT_26_CTA, SELECT_26_TITLE, SELECT_26_URL, Select26Field } from './Select26Promotion'
 
+/** Three visible rows; top/bottom reach further inward than the middle row. */
+const WWW_FIELD_BASE_COLS = 24
+const WWW_FIELD_ROW_WIDTHS = [26, 24, 28]
+
 export const Select26Banner = () => (
   <div className="relative isolate flex min-h-14 w-full items-center overflow-hidden border-b border-[#00482f]/15 bg-[#f8f3ef] px-4 py-2.5 pr-12 text-base font-medium text-[#001a10] dark:border-white/10 dark:bg-[#0b0e0d] dark:text-[#f8f3ef] sm:px-6 sm:pr-14">
     <Select26Field
-      cols={24}
-      rows={7}
-      className="absolute left-0 top-1/2 -z-10 hidden -translate-y-1/2 text-sm opacity-80 dark:opacity-70 sm:grid md:text-base xl:text-[0.95rem]"
+      cols={WWW_FIELD_BASE_COLS}
+      rows={WWW_FIELD_ROW_WIDTHS.length}
+      rowWidths={WWW_FIELD_ROW_WIDTHS}
+      rowAlign="start"
+      className="absolute left-0 top-1/2 -z-10 !hidden -translate-y-1/2 text-sm opacity-80 dark:opacity-70 sm:!flex md:text-base xl:text-[0.95rem]"
     />
     <Select26Field
-      cols={24}
-      rows={7}
-      className="absolute right-0 top-1/2 -z-10 grid -translate-y-1/2 -scale-x-100 text-sm opacity-80 dark:opacity-70 md:text-base xl:text-[0.95rem]"
+      cols={WWW_FIELD_BASE_COLS}
+      rows={WWW_FIELD_ROW_WIDTHS.length}
+      rowWidths={WWW_FIELD_ROW_WIDTHS}
+      rowAlign="end"
+      mirror
+      className="absolute right-0 top-1/2 -z-10 -translate-y-1/2 text-sm opacity-80 dark:opacity-70 md:text-base xl:text-[0.95rem]"
     />
     <div className="relative z-10 ml-0 mr-auto flex w-fit max-w-full flex-wrap items-center justify-start gap-x-2 gap-y-1.5 rounded-md bg-[#f8f3ef] px-2.5 py-1 sm:mx-auto sm:flex-nowrap sm:justify-center sm:gap-x-2.5 sm:px-3.5 dark:bg-[#0b0e0d]">
       <p className="text-left leading-5 sm:text-center">
diff --git a/packages/ui-patterns/src/Banners/Select26Promotion.module.css b/packages/ui-patterns/src/Banners/Select26Promotion.module.css
index 044c810bf98..cf2a7a846f8 100644
--- a/packages/ui-patterns/src/Banners/Select26Promotion.module.css
+++ b/packages/ui-patterns/src/Banners/Select26Promotion.module.css
@@ -7,6 +7,7 @@
 }
 
 .field {
+  width: max-content;
   font-family: 'Departure Mono Superbase', ui-monospace, monospace;
   font-weight: 400;
   letter-spacing: 0;
@@ -30,6 +31,24 @@
   --select26-b4: #ffffff;
 }
 
+.row {
+  display: grid;
+  width: fit-content;
+  flex-shrink: 0;
+}
+
+.fieldAlignStart {
+  display: flex;
+  flex-direction: column;
+  align-items: flex-start;
+}
+
+.fieldAlignEnd {
+  display: flex;
+  flex-direction: column;
+  align-items: flex-end;
+}
+
 .cell {
   display: grid;
   place-items: center;
diff --git a/packages/ui-patterns/src/Banners/Select26Promotion.tsx b/packages/ui-patterns/src/Banners/Select26Promotion.tsx
index d398b2c35c0..6e3ed2a5e74 100644
--- a/packages/ui-patterns/src/Banners/Select26Promotion.tsx
+++ b/packages/ui-patterns/src/Banners/Select26Promotion.tsx
@@ -67,7 +67,14 @@ type FieldCell = {
   weight: number
 }
 
-const cellAt = (x: number, y: number, cols: number, rows: number, timeMs: number): FieldCell => {
+const cellAt = (
+  x: number,
+  y: number,
+  cols: number,
+  rows: number,
+  timeMs: number,
+  mirror = false
+): FieldCell => {
   const cx = (cols - 1) / 2
   const cy = (rows - 1) / 2
   const nx = x - cx
@@ -77,7 +84,8 @@ const cellAt = (x: number, y: number, cols: number, rows: number, timeMs: number
 
   const step = Math.floor(timeMs / BRACKET_STEP_MS + y * 1.7 + Math.abs(nx) * 0.8)
   const idx = positiveModulo(step, OPEN_BRACKETS.length)
-  const ch = x <= cx ? OPEN_BRACKETS[idx] : CLOSE_BRACKETS[idx]
+  const onLeft = mirror ? x > cx : x <= cx
+  const ch = onLeft ? OPEN_BRACKETS[idx] : CLOSE_BRACKETS[idx]
 
   const hue = positiveModulo(angle - sweep, Math.PI * 2) / (Math.PI * 2)
   const band = Math.min(4, Math.floor(hue * 5))
@@ -95,6 +103,12 @@ const cellAt = (x: number, y: number, cols: number, rows: number, timeMs: number
 type Select26FieldProps = HTMLAttributes<HTMLDivElement> & {
   cols?: number
   rows?: number
+  /** Per-row column counts; defaults to `cols` for every row. */
+  rowWidths?: number[]
+  /** Which edge shorter rows hug when widths vary. */
+  rowAlign?: 'start' | 'end'
+  /** Mirror bracket glyphs (for right-hand fields; prefer over CSS scale-x). */
+  mirror?: boolean
 }
 
 /**
@@ -102,11 +116,25 @@ type Select26FieldProps = HTMLAttributes<HTMLDivElement> & {
  * radar beam falloff. Stepped updates mirror the Select glyph-engine without
  * shipping its canvas runtime.
  */
-export const Select26Field = ({ cols = 10, rows = 6, className, ...props }: Select26FieldProps) => {
+export const Select26Field = ({
+  cols = 10,
+  rows = 6,
+  rowWidths,
+  rowAlign = 'start',
+  mirror = false,
+  className,
+  ...props
+}: Select26FieldProps) => {
   const rootRef = useRef<HTMLDivElement>(null)
   const [timeMs, setTimeMs] = useState(0)
   const [isVisible, setIsVisible] = useState(true)
 
+  const widths = useMemo(() => {
+    if (rowWidths) return rowWidths
+    return Array.from({ length: rows }, () => cols)
+  }, [rowWidths, rows, cols])
+  const fieldRows = widths.length
+
   useEffect(() => {
     const node = rootRef.current
     if (!node || typeof IntersectionObserver === 'undefined') return
@@ -142,34 +170,53 @@ export const Select26Field = ({ cols = 10, rows = 6, className, ...props }: Sele
     return () => cancelAnimationFrame(raf)
   }, [isVisible])
 
-  const cells = useMemo(() => {
-    const next: FieldCell[] = []
-    for (let y = 0; y < rows; y++) {
-      for (let x = 0; x < cols; x++) {
-        next.push(cellAt(x, y, cols, rows, timeMs))
+  const cellsByRow = useMemo(() => {
+    return widths.map((rowCols, y) => {
+      const rowCells: FieldCell[] = []
+      for (let x = 0; x < rowCols; x++) {
+        rowCells.push(cellAt(x, y, rowCols, fieldRows, timeMs, mirror))
       }
-    }
-    return next
-  }, [cols, rows, timeMs])
+      return rowCells
+    })
+  }, [widths, fieldRows, timeMs, mirror])
 
   return (
     <div
       ref={rootRef}
       aria-hidden
-      className={cn(styles.field, 'grid', className)}
-      style={{ gridTemplateColumns: `repeat(${cols}, calc(22 / 34 * 1em))` }}
+      className={cn(
+        styles.field,
+        rowAlign === 'end' ? styles.fieldAlignEnd : styles.fieldAlignStart,
+        className
+      )}
       {...props}
     >
-      {cells.map((cell, index) => (
-        <span
-          key={index}
-          className={styles.cell}
-          data-band={cell.band}
-          style={{ opacity: cell.weight }}
-        >
-          {cell.ch}
-        </span>
-      ))}
+      {cellsByRow.map((rowCells, y) => {
+        const rowCols = widths[y]
+        const cellWidth = 'calc(22 / 34 * 1em)'
+
+        return (
+          <div
+            key={y}
+            className={styles.row}
+            style={{
+              gridTemplateColumns: `repeat(${rowCols}, ${cellWidth})`,
+              width: `calc(${rowCols} * 22 / 34 * 1em)`,
+            }}
+          >
+            {rowCells.map((cell, index) => (
+              <span
+                key={index}
+                className={styles.cell}
+                data-band={cell.band}
+                style={{ opacity: cell.weight }}
+              >
+                {cell.ch}
+              </span>
+            ))}
+          </div>
+        )
+      })}
     </div>
   )
 }
diff --git a/packages/ui-patterns/src/Dialogs/ConfirmationModal.test.tsx b/packages/ui-patterns/src/Dialogs/ConfirmationModal.test.tsx
new file mode 100644
index 00000000000..cf87dba142a
--- /dev/null
+++ b/packages/ui-patterns/src/Dialogs/ConfirmationModal.test.tsx
@@ -0,0 +1,48 @@
+import { fireEvent, render, screen } from '@testing-library/react'
+import userEvent from '@testing-library/user-event'
+import { describe, expect, it, vi } from 'vitest'
+
+import { ConfirmationModal } from './ConfirmationModal'
+
+describe('ConfirmationModal', () => {
+  it('keeps an additional footer action separate from dismissal', async () => {
+    const onCancel = vi.fn()
+    const onAdditionalAction = vi.fn()
+
+    render(
+      <ConfirmationModal
+        visible
+        title="Assistant changes detected"
+        additionalActionLabel="Discard changes"
+        onCancel={onCancel}
+        onAdditionalAction={onAdditionalAction}
+        onConfirm={vi.fn()}
+      />
+    )
+
+    await userEvent.click(screen.getByRole('button', { name: 'Discard changes' }))
+
+    expect(onAdditionalAction).toHaveBeenCalledOnce()
+    expect(onCancel).not.toHaveBeenCalled()
+  })
+
+  it('does not dismiss while loading', async () => {
+    const onCancel = vi.fn()
+
+    render(
+      <ConfirmationModal
+        visible
+        loading
+        title="Saving notebook"
+        onCancel={onCancel}
+        onConfirm={vi.fn()}
+      />
+    )
+
+    const dialog = screen.getByRole('dialog', { name: 'Saving notebook' })
+    await userEvent.click(screen.getByRole('button', { name: 'Close' }))
+    fireEvent.pointerDown(dialog.parentElement!, { button: 0, ctrlKey: false })
+
+    expect(onCancel).not.toHaveBeenCalled()
+  })
+})
diff --git a/packages/ui-patterns/src/Dialogs/ConfirmationModal.tsx b/packages/ui-patterns/src/Dialogs/ConfirmationModal.tsx
index 5b70b94d8c0..89460076fbd 100644
--- a/packages/ui-patterns/src/Dialogs/ConfirmationModal.tsx
+++ b/packages/ui-patterns/src/Dialogs/ConfirmationModal.tsx
@@ -27,8 +27,12 @@ export interface ConfirmationModalProps {
   confirmLabel?: string
   confirmLabelLoading?: string
   cancelLabel?: string
+  /** Overrides the first footer action label when `onAdditionalAction` is provided. */
+  additionalActionLabel?: string
   onConfirm: () => void
   onCancel: () => void
+  /** Overrides the first footer action while `onCancel` continues to handle dismissal. */
+  onAdditionalAction?: () => void
   disabled?: boolean
   variant?: React.ComponentProps<typeof Alert>['variant']
   alert?: {
@@ -51,8 +55,10 @@ export const ConfirmationModal = forwardRef<
       visible,
       onCancel,
       onConfirm,
+      onAdditionalAction,
       loading: loading_,
       cancelLabel = 'Cancel',
+      additionalActionLabel,
       confirmLabel = 'Submit',
       confirmLabelLoading,
       alert = undefined,
@@ -75,6 +81,10 @@ export const ConfirmationModal = forwardRef<
       if (loading_ === undefined) setLoading(true)
     }
 
+    const preventDismissWhileLoading = (event: Event) => {
+      if (loading) event.preventDefault()
+    }
+
     useEffect(() => {
       if (visible && loading_ === undefined) {
         setLoading(false)
@@ -92,10 +102,8 @@ export const ConfirmationModal = forwardRef<
       <Dialog
         open={visible}
         {...props}
-        onOpenChange={() => {
-          if (visible) {
-            onCancel()
-          }
+        onOpenChange={(open) => {
+          if (!open && visible && !loading) onCancel()
         }}
       >
         <DialogContent
@@ -103,6 +111,8 @@ export const ConfirmationModal = forwardRef<
           ref={ref}
           className="p-0 gap-0 pb-5 block!"
           size={size}
+          onPointerDownOutside={preventDismissWhileLoading}
+          onEscapeKeyDown={preventDismissWhileLoading}
         >
           <DialogHeader className={cn('border-b')} padding={'small'}>
             <DialogTitle>{title}</DialogTitle>
@@ -131,9 +141,9 @@ export const ConfirmationModal = forwardRef<
               block
               variant="default"
               disabled={loading}
-              onClick={() => onCancel()}
+              onClick={() => (onAdditionalAction ?? onCancel)()}
             >
-              {cancelLabel}
+              {additionalActionLabel ?? cancelLabel}
             </Button>
 
             <Button
diff --git a/packages/ui-patterns/src/MultipleCodeBlock/index.tsx b/packages/ui-patterns/src/MultipleCodeBlock/index.tsx
index 76030116265..901be3a7f86 100644
--- a/packages/ui-patterns/src/MultipleCodeBlock/index.tsx
+++ b/packages/ui-patterns/src/MultipleCodeBlock/index.tsx
@@ -1,5 +1,5 @@
 import { useEffect, useState } from 'react'
-import { Tabs, TabsContent, TabsList, TabsTrigger } from 'ui'
+import { cn, Tabs, TabsContent, TabsList, TabsTrigger } from 'ui'
 import { CodeBlock, type CodeBlockLang } from 'ui-patterns/CodeBlock'
 
 interface MultipleCodeBlockFile {
@@ -12,6 +12,7 @@ interface MultipleCodeBlockProps {
   files: MultipleCodeBlockFile[]
   value?: string
   onValueChange?: (value: string) => void
+  className?: string
 }
 
 const languageAliases: Record<string, CodeBlockLang> = {
@@ -91,7 +92,12 @@ const resolveLanguage = (language: string | undefined, name: string): CodeBlockL
   return inferLanguageFromName(name) ?? 'js'
 }
 
-export const MultipleCodeBlock = ({ files, value, onValueChange }: MultipleCodeBlockProps) => {
+export const MultipleCodeBlock = ({
+  files,
+  value,
+  onValueChange,
+  className,
+}: MultipleCodeBlockProps) => {
   if (!files?.length) {
     return null
   }
@@ -128,7 +134,7 @@ export const MultipleCodeBlock = ({ files, value, onValueChange }: MultipleCodeB
     <Tabs
       value={activeValue}
       onValueChange={handleValueChange}
-      className="border rounded-lg gap-0 space-y-0 overflow-hidden"
+      className={cn('border rounded-lg gap-0 space-y-0 overflow-hidden', className)}
     >
       <TabsList className="bg-surface-75 px-5 gap-5 overflow-x-auto border-0 border-b">
         {files.map((file) => (
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index b918bae7d9c..28efcc5ad83 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -92,7 +92,7 @@ catalogs:
       version: 2.3.2
     vite:
       specifier: ^8.0.16
-      version: 8.0.16
+      version: 8.2.1
     vite-tsconfig-paths:
       specifier: ^6.1.1
       version: 6.1.1
@@ -376,7 +376,7 @@ importers:
         version: 8.1.0(@octokit/core@7.0.6)
       '@sentry/nextjs':
         specifier: 'catalog:'
-        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.21(@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))
+        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.21(@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.2.1(@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.112.4(@opentelemetry/api@1.9.1)
@@ -593,7 +593,7 @@ importers:
         version: 7.29.7(supports-color@8.1.1)
       '@graphiql/toolkit':
         specifier: ^0.9.1
-        version: 0.9.1(@types/node@22.13.14)(graphql-ws@6.0.4(graphql@16.11.0)(ws@8.21.0))(graphql@16.11.0)
+        version: 0.9.1(@types/node@22.13.14)(graphql-ws@6.0.4(graphql@16.11.0)(ws@8.21.3))(graphql@16.11.0)
       '@graphql-codegen/cli':
         specifier: 5.0.5
         version: 5.0.5(@parcel/watcher@2.5.6)(@types/node@22.13.14)(encoding@0.1.13)(graphql-sock@1.0.1(graphql@16.11.0))(graphql@16.11.0)(supports-color@8.1.1)(typescript@6.0.2)
@@ -674,7 +674,7 @@ importers:
         version: 13.2.2
       graphiql:
         specifier: ^4.0.2
-        version: 4.0.2(@codemirror/language@6.11.0)(@emotion/is-prop-valid@1.4.0)(@types/node@22.13.14)(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(graphql-ws@6.0.4(graphql@16.11.0)(ws@8.21.0))(graphql@16.11.0)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
+        version: 4.0.2(@codemirror/language@6.11.0)(@emotion/is-prop-valid@1.4.0)(@types/node@22.13.14)(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(graphql-ws@6.0.4(graphql@16.11.0)(ws@8.21.3))(graphql@16.11.0)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
       npm-run-all:
         specifier: ^4.1.5
         version: 4.1.5
@@ -722,13 +722,13 @@ importers:
         version: 5.1.3
       vite:
         specifier: 'catalog:'
-        version: 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)
+        version: 8.2.1(@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)
       vite-tsconfig-paths:
         specifier: 'catalog:'
-        version: 6.1.1(supports-color@8.1.1)(typescript@6.0.2)(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))
+        version: 6.1.1(supports-color@8.1.1)(typescript@6.0.2)(vite@8.2.1(@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))
       vitest:
         specifier: 'catalog:'
-        version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@22.13.14)(@vitest/coverage-v8@4.1.4)(@vitest/ui@4.1.4)(jsdom@28.1.0(@noble/hashes@1.8.0)(supports-color@8.1.1))(msw@2.11.3(@types/node@22.13.14)(typescript@6.0.2))(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))
+        version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@22.13.14)(@vitest/coverage-v8@4.1.4)(@vitest/ui@4.1.4)(jsdom@28.1.0(@noble/hashes@1.8.0)(supports-color@8.1.1))(msw@2.11.3(@types/node@22.13.14)(typescript@6.0.2))(vite@8.2.1(@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))
 
   apps/learn:
     dependencies:
@@ -825,7 +825,7 @@ importers:
     dependencies:
       '@react-router/fs-routes':
         specifier: ^7.17.0
-        version: 7.17.0(@react-router/dev@7.17.0(@react-router/serve@7.17.0(react-router@7.18.2(react-dom@19.2.6(react@19.2.6))(react@19.2.6))(supports-color@8.1.1)(typescript@6.0.2))(@types/node@22.13.14)(babel-plugin-macros@3.1.0)(jiti@2.7.0)(lightningcss@1.33.0)(react-router@7.18.2(react-dom@19.2.6(react@19.2.6))(react@19.2.6))(sass@1.77.4)(supports-color@8.1.1)(terser@5.39.0)(tsx@4.22.4)(typescript@6.0.2)(vite@7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.32.0)(sass@1.77.4)(terser@5.39.0)(tsx@4.22.4)(yaml@2.9.0))(yaml@2.9.0))(typescript@6.0.2)
+        version: 7.17.0(@react-router/dev@7.17.0(@react-router/serve@7.17.0(react-router@7.18.2(react-dom@19.2.6(react@19.2.6))(react@19.2.6))(supports-color@8.1.1)(typescript@6.0.2))(@types/node@22.13.14)(babel-plugin-macros@3.1.0)(jiti@2.7.0)(lightningcss@1.33.0)(react-router@7.18.2(react-dom@19.2.6(react@19.2.6))(react@19.2.6))(sass@1.77.4)(supports-color@8.1.1)(terser@5.39.0)(tsx@4.22.4)(typescript@6.0.2)(vite@7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.33.0)(sass@1.77.4)(terser@5.39.0)(tsx@4.22.4)(yaml@2.9.0))(yaml@2.9.0))(typescript@6.0.2)
       '@react-router/node':
         specifier: ^7.17.0
         version: 7.17.0(react-router@7.18.2(react-dom@19.2.6(react@19.2.6))(react@19.2.6))(typescript@6.0.2)
@@ -853,10 +853,10 @@ importers:
     devDependencies:
       '@react-router/dev':
         specifier: ^7.17.0
-        version: 7.17.0(@react-router/serve@7.17.0(react-router@7.18.2(react-dom@19.2.6(react@19.2.6))(react@19.2.6))(supports-color@8.1.1)(typescript@6.0.2))(@types/node@22.13.14)(babel-plugin-macros@3.1.0)(jiti@2.7.0)(lightningcss@1.33.0)(react-router@7.18.2(react-dom@19.2.6(react@19.2.6))(react@19.2.6))(sass@1.77.4)(supports-color@8.1.1)(terser@5.39.0)(tsx@4.22.4)(typescript@6.0.2)(vite@7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.32.0)(sass@1.77.4)(terser@5.39.0)(tsx@4.22.4)(yaml@2.9.0))(yaml@2.9.0)
+        version: 7.17.0(@react-router/serve@7.17.0(react-router@7.18.2(react-dom@19.2.6(react@19.2.6))(react@19.2.6))(supports-color@8.1.1)(typescript@6.0.2))(@types/node@22.13.14)(babel-plugin-macros@3.1.0)(jiti@2.7.0)(lightningcss@1.33.0)(react-router@7.18.2(react-dom@19.2.6(react@19.2.6))(react@19.2.6))(sass@1.77.4)(supports-color@8.1.1)(terser@5.39.0)(tsx@4.22.4)(typescript@6.0.2)(vite@7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.33.0)(sass@1.77.4)(terser@5.39.0)(tsx@4.22.4)(yaml@2.9.0))(yaml@2.9.0)
       '@tailwindcss/vite':
         specifier: 4.2.4
-        version: 4.2.4(vite@7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.32.0)(sass@1.77.4)(terser@5.39.0)(tsx@4.22.4)(yaml@2.9.0))
+        version: 4.2.4(vite@7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.33.0)(sass@1.77.4)(terser@5.39.0)(tsx@4.22.4)(yaml@2.9.0))
       '@types/node':
         specifier: ^22
         version: 22.13.14
@@ -877,10 +877,10 @@ importers:
         version: link:../../packages/tsconfig
       vite:
         specifier: ^7.3.2
-        version: 7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.32.0)(sass@1.77.4)(terser@5.39.0)(tsx@4.22.4)(yaml@2.9.0)
+        version: 7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.33.0)(sass@1.77.4)(terser@5.39.0)(tsx@4.22.4)(yaml@2.9.0)
       vite-tsconfig-paths:
         specifier: 'catalog:'
-        version: 6.1.1(supports-color@8.1.1)(typescript@6.0.2)(vite@7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.32.0)(sass@1.77.4)(terser@5.39.0)(tsx@4.22.4)(yaml@2.9.0))
+        version: 6.1.1(supports-color@8.1.1)(typescript@6.0.2)(vite@7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.33.0)(sass@1.77.4)(terser@5.39.0)(tsx@4.22.4)(yaml@2.9.0))
 
   apps/studio:
     dependencies:
@@ -961,13 +961,13 @@ importers:
         version: 1.1.1(@types/react@19.2.14)(react@19.2.6)
       '@sentry/nextjs':
         specifier: 'catalog:'
-        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@16.2.11(@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))
+        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@16.2.11(@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.2.1(@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))
       '@sentry/react':
         specifier: ^10.27.0
         version: 10.59.0(react@19.2.6)
       '@sentry/tanstackstart-react':
         specifier: 'catalog:'
-        version: 10.59.0(encoding@0.1.13)(react@19.2.6)(rollup@4.60.3)(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))
+        version: 10.59.0(encoding@0.1.13)(react@19.2.6)(rollup@4.60.3)(supports-color@8.1.1)(vite@8.2.1(@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))
       '@smithy/property-provider':
         specifier: ^4.0.4
         version: 4.0.4
@@ -1024,7 +1024,7 @@ importers:
         version: 1.167.1(@tanstack/query-core@5.101.2)(@tanstack/react-query@5.83.0(react@19.2.6))(@tanstack/react-router@1.170.10(react-dom@19.2.6(react@19.2.6))(react@19.2.6))(@tanstack/router-core@1.171.8)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
       '@tanstack/react-start':
         specifier: 'catalog:'
-        version: 1.168.18(esbuild@0.28.1)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)(rolldown@1.2.3)(rollup@4.60.3)(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))
+        version: 1.168.18(esbuild@0.28.1)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)(rolldown@1.2.3)(rollup@4.60.3)(supports-color@8.1.1)(vite@8.2.1(@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))
       '@tanstack/react-table':
         specifier: 'catalog:'
         version: 8.21.3(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
@@ -1277,10 +1277,10 @@ importers:
         version: 2.3.5
       '@tailwindcss/vite':
         specifier: 4.2.4
-        version: 4.2.4(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))
+        version: 4.2.4(vite@8.2.1(@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))
       '@tanstack/devtools-vite':
         specifier: ^0.6.0
-        version: 0.6.1(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))
+        version: 0.6.1(supports-color@8.1.1)(vite@8.2.1(@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))
       '@testing-library/dom':
         specifier: ^10.0.0
         version: 10.4.1
@@ -1343,7 +1343,7 @@ importers:
         version: 0.2.1
       '@vitejs/plugin-react':
         specifier: 'catalog:'
-        version: 6.0.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))
+        version: 6.0.1(vite@8.2.1(@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))
       '@vitest/coverage-v8':
         specifier: 'catalog:'
         version: 4.1.4(vitest@4.1.4)
@@ -1415,13 +1415,13 @@ importers:
         version: 6.0.2
       vite:
         specifier: 'catalog:'
-        version: 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)
+        version: 8.2.1(@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)
       vite-tsconfig-paths:
         specifier: 'catalog:'
-        version: 6.1.1(supports-color@8.1.1)(typescript@6.0.2)(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))
+        version: 6.1.1(supports-color@8.1.1)(typescript@6.0.2)(vite@8.2.1(@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))
       vitest:
         specifier: 'catalog:'
-        version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@22.13.14)(@vitest/coverage-v8@4.1.4)(@vitest/ui@4.1.4)(jsdom@28.1.0(@noble/hashes@1.8.0)(supports-color@8.1.1))(msw@2.11.3(@types/node@22.13.14)(typescript@6.0.2))(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))
+        version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@22.13.14)(@vitest/coverage-v8@4.1.4)(@vitest/ui@4.1.4)(jsdom@28.1.0(@noble/hashes@1.8.0)(supports-color@8.1.1))(msw@2.11.3(@types/node@22.13.14)(typescript@6.0.2))(vite@8.2.1(@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))
 
   apps/ui-library:
     dependencies:
@@ -1433,7 +1433,7 @@ importers:
         version: 4.8.0-rc.3(monaco-editor@0.52.2)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
       '@react-router/fs-routes':
         specifier: ^7.4.0
-        version: 7.4.0(@react-router/dev@7.13.2(@react-router/serve@7.17.0(react-router@7.18.2(react-dom@19.2.6(react@19.2.6))(react@19.2.6))(supports-color@8.1.1)(typescript@6.0.2))(@types/node@22.13.14)(babel-plugin-macros@3.1.0)(jiti@2.7.0)(lightningcss@1.33.0)(react-router@7.18.2(react-dom@19.2.6(react@19.2.6))(react@19.2.6))(sass@1.77.4)(supports-color@8.1.1)(terser@5.39.0)(tsx@4.22.4)(typescript@6.0.2)(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))(yaml@2.9.0))(typescript@6.0.2)
+        version: 7.4.0(@react-router/dev@7.13.2(@react-router/serve@7.17.0(react-router@7.18.2(react-dom@19.2.6(react@19.2.6))(react@19.2.6))(supports-color@8.1.1)(typescript@6.0.2))(@types/node@22.13.14)(babel-plugin-macros@3.1.0)(jiti@2.7.0)(lightningcss@1.33.0)(react-router@7.18.2(react-dom@19.2.6(react@19.2.6))(react@19.2.6))(sass@1.77.4)(supports-color@8.1.1)(terser@5.39.0)(tsx@4.22.4)(typescript@6.0.2)(vite@8.2.1(@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))(yaml@2.9.0))(typescript@6.0.2)
       '@supabase-labs/y-supabase':
         specifier: 0.1.0
         version: 0.1.0(@opentelemetry/api@1.9.1)
@@ -1578,7 +1578,7 @@ importers:
         version: 7.29.7(supports-color@8.1.1)
       '@react-router/dev':
         specifier: ^7.9.0
-        version: 7.13.2(@react-router/serve@7.17.0(react-router@7.18.2(react-dom@19.2.6(react@19.2.6))(react@19.2.6))(supports-color@8.1.1)(typescript@6.0.2))(@types/node@22.13.14)(babel-plugin-macros@3.1.0)(jiti@2.7.0)(lightningcss@1.33.0)(react-router@7.18.2(react-dom@19.2.6(react@19.2.6))(react@19.2.6))(sass@1.77.4)(supports-color@8.1.1)(terser@5.39.0)(tsx@4.22.4)(typescript@6.0.2)(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))(yaml@2.9.0)
+        version: 7.13.2(@react-router/serve@7.17.0(react-router@7.18.2(react-dom@19.2.6(react@19.2.6))(react@19.2.6))(supports-color@8.1.1)(typescript@6.0.2))(@types/node@22.13.14)(babel-plugin-macros@3.1.0)(jiti@2.7.0)(lightningcss@1.33.0)(react-router@7.18.2(react-dom@19.2.6(react@19.2.6))(react@19.2.6))(sass@1.77.4)(supports-color@8.1.1)(terser@5.39.0)(tsx@4.22.4)(typescript@6.0.2)(vite@8.2.1(@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))(yaml@2.9.0)
       '@shikijs/compat':
         specifier: ^1.1.7
         version: 1.6.0
@@ -1593,7 +1593,7 @@ importers:
         version: 1.170.10(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
       '@tanstack/react-start':
         specifier: 'catalog:'
-        version: 1.168.18(esbuild@0.28.1)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)(rolldown@1.2.3)(rollup@4.60.3)(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))
+        version: 1.168.18(esbuild@0.28.1)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)(rolldown@1.2.3)(rollup@4.60.3)(supports-color@8.1.1)(vite@8.2.1(@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))
       '@types/common-tags':
         specifier: ^1.8.4
         version: 1.8.4
@@ -1677,7 +1677,7 @@ importers:
         version: 6.0.2
       vite:
         specifier: 'catalog:'
-        version: 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)
+        version: 8.2.1(@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)
 
   apps/www:
     dependencies:
@@ -1765,6 +1765,9 @@ importers:
       config:
         specifier: workspace:*
         version: link:../../packages/config
+      d3-geo:
+        specifier: ^3.1.1
+        version: 3.1.1
       dayjs:
         specifier: ^1.11.12
         version: 1.11.13
@@ -1861,6 +1864,9 @@ importers:
       react-markdown:
         specifier: ^10.1.0
         version: 10.1.0(@types/react@19.2.14)(react@19.2.6)(supports-color@8.1.1)
+      react-simple-maps:
+        specifier: 4.0.0-beta.6
+        version: 4.0.0-beta.6(prop-types@15.8.1)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
       react-syntax-highlighter:
         specifier: ^15.6.6
         version: 15.6.6(react@19.2.6)
@@ -1928,6 +1934,9 @@ importers:
       '@types/common-tags':
         specifier: ^1.8.4
         version: 1.8.4
+      '@types/d3-geo':
+        specifier: ^3.1.0
+        version: 3.1.0
       '@types/mdast':
         specifier: ^4.0.4
         version: 4.0.4
@@ -1946,6 +1955,9 @@ importers:
       '@types/react-dom':
         specifier: 'catalog:'
         version: 19.2.3(@types/react@19.2.14)
+      '@types/react-simple-maps':
+        specifier: ^3.0.1
+        version: 3.0.4
       '@types/react-syntax-highlighter':
         specifier: ^15.5.13
         version: 15.5.13
@@ -2020,7 +2032,7 @@ importers:
         version: 0.562.0(vue@3.5.35(typescript@6.0.2))
       nuxt:
         specifier: ^4.4.6
-        version: 4.5.2(@babel/plugin-syntax-jsx@7.27.1(@babel/core@7.29.7(supports-color@8.1.1)))(@babel/plugin-syntax-typescript@7.29.7(@babel/core@7.29.7(supports-color@8.1.1)))(@electric-sql/pglite@0.4.5)(@oxc-project/types@0.143.0)(@parcel/watcher@2.5.6)(@types/node@22.13.14)(@vue/compiler-sfc@3.5.41)(aws4fetch@1.0.20)(cac@6.7.14)(commander@14.0.1)(db0@0.3.4(@electric-sql/pglite@0.4.5))(encoding@0.1.13)(esbuild@0.28.1)(eslint@9.37.0(jiti@2.7.0)(supports-color@8.1.1))(ioredis@5.10.1(supports-color@8.1.1))(lightningcss@1.33.0)(magicast@0.5.4)(rolldown@1.2.3)(rollup-plugin-visualizer@7.0.1(rolldown@1.2.3)(rollup@4.60.3))(rollup@4.60.3)(sass@1.77.4)(supports-color@8.1.1)(terser@5.39.0)(tsx@4.22.4)(typescript@6.0.2)(vite@7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.32.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))(yaml@2.9.0)
+        version: 4.5.2(@babel/plugin-syntax-jsx@7.27.1(@babel/core@7.29.7(supports-color@8.1.1)))(@babel/plugin-syntax-typescript@7.29.7(@babel/core@7.29.7(supports-color@8.1.1)))(@electric-sql/pglite@0.4.5)(@oxc-project/types@0.143.0)(@parcel/watcher@2.5.6)(@types/node@22.13.14)(@vue/compiler-sfc@3.5.41)(aws4fetch@1.0.20)(cac@6.7.14)(commander@14.0.1)(db0@0.3.4(@electric-sql/pglite@0.4.5))(encoding@0.1.13)(esbuild@0.28.1)(eslint@9.37.0(jiti@2.7.0)(supports-color@8.1.1))(ioredis@5.10.1(supports-color@8.1.1))(lightningcss@1.33.0)(magicast@0.5.4)(rolldown@1.2.3)(rollup-plugin-visualizer@7.0.1(rolldown@1.2.3)(rollup@4.60.3))(rollup@4.60.3)(sass@1.77.4)(supports-color@8.1.1)(terser@5.39.0)(tsx@4.22.4)(typescript@6.0.2)(vite@7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.33.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))(yaml@2.9.0)
       tailwind-merge:
         specifier: ^3.5.0
         version: 3.5.0
@@ -2045,7 +2057,7 @@ importers:
         version: 6.0.2
       vite:
         specifier: ^7.3.2
-        version: 7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.32.0)(sass@1.77.4)(terser@5.39.0)(tsx@4.22.4)(yaml@2.9.0)
+        version: 7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.33.0)(sass@1.77.4)(terser@5.39.0)(tsx@4.22.4)(yaml@2.9.0)
 
   e2e/docs:
     dependencies:
@@ -2200,10 +2212,10 @@ importers:
         version: 6.0.2
       vite:
         specifier: 'catalog:'
-        version: 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)
+        version: 8.2.1(@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)
       vitest:
         specifier: 'catalog:'
-        version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@22.13.14)(@vitest/coverage-v8@4.1.4)(@vitest/ui@4.1.4)(jsdom@28.1.0(@noble/hashes@1.8.0)(supports-color@8.1.1))(msw@2.11.3(@types/node@22.13.14)(typescript@6.0.2))(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))
+        version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@22.13.14)(@vitest/coverage-v8@4.1.4)(@vitest/ui@4.1.4)(jsdom@28.1.0(@noble/hashes@1.8.0)(supports-color@8.1.1))(msw@2.11.3(@types/node@22.13.14)(typescript@6.0.2))(vite@8.2.1(@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))
 
   packages/api-types:
     devDependencies:
@@ -2539,10 +2551,10 @@ importers:
         version: 6.0.2
       vite:
         specifier: 'catalog:'
-        version: 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)
+        version: 8.2.1(@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)
       vitest:
         specifier: 'catalog:'
-        version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@22.13.14)(@vitest/coverage-v8@4.1.4)(@vitest/ui@4.1.4)(jsdom@28.1.0(@noble/hashes@1.8.0)(supports-color@8.1.1))(msw@2.11.3(@types/node@22.13.14)(typescript@6.0.2))(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))
+        version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@22.13.14)(@vitest/coverage-v8@4.1.4)(@vitest/ui@4.1.4)(jsdom@28.1.0(@noble/hashes@1.8.0)(supports-color@8.1.1))(msw@2.11.3(@types/node@22.13.14)(typescript@6.0.2))(vite@8.2.1(@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))
 
   packages/shared-data:
     dependencies:
@@ -2684,10 +2696,10 @@ importers:
         version: 6.0.2
       vite:
         specifier: 'catalog:'
-        version: 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)
+        version: 8.2.1(@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)
       vitest:
         specifier: 'catalog:'
-        version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@22.13.14)(@vitest/coverage-v8@4.1.4)(@vitest/ui@4.1.4)(jsdom@28.1.0(@noble/hashes@1.8.0)(supports-color@8.1.1))(msw@2.11.3(@types/node@22.13.14)(typescript@6.0.2))(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))
+        version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@22.13.14)(@vitest/coverage-v8@4.1.4)(@vitest/ui@4.1.4)(jsdom@28.1.0(@noble/hashes@1.8.0)(supports-color@8.1.1))(msw@2.11.3(@types/node@22.13.14)(typescript@6.0.2))(vite@8.2.1(@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))
 
   packages/ui-patterns:
     dependencies:
@@ -2910,10 +2922,10 @@ importers:
         version: 6.0.3
       vite:
         specifier: 'catalog:'
-        version: 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)
+        version: 8.2.1(@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)
       vitest:
         specifier: 'catalog:'
-        version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@22.13.14)(@vitest/coverage-v8@4.1.4)(@vitest/ui@4.1.4)(jsdom@28.1.0(@noble/hashes@1.8.0)(supports-color@8.1.1))(msw@2.11.3(@types/node@22.13.14)(typescript@6.0.2))(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))
+        version: 4.1.4(@opentelemetry/api@1.9.1)(@types/node@22.13.14)(@vitest/coverage-v8@4.1.4)(@vitest/ui@4.1.4)(jsdom@28.1.0(@noble/hashes@1.8.0)(supports-color@8.1.1))(msw@2.11.3(@types/node@22.13.14)(typescript@6.0.2))(vite@8.2.1(@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))
 
 packages:
 
@@ -3730,18 +3742,12 @@ packages:
   '@electric-sql/pglite@0.4.5':
     resolution: {integrity: sha512-aGG2zGEyZzGWKy8P+9ZoNUV0jxt1+hgbeTf+bVAYyxVZZLXg3/9aFlfLxb08AYZVAfAkQlQIysmWjhc5hwDG8g==}
 
-  '@emnapi/core@1.10.0':
-    resolution: {integrity: sha512-yq6OkJ4p82CAfPl0u9mQebQHKPJkY7WrIuk205cTYnYe+k2Z8YBh11FrbRG/H6ihirqcacOgl2BIO8oyMQLeXw==}
-
   '@emnapi/runtime@0.43.1':
     resolution: {integrity: sha512-Q5sMc4Z4gsD4tlmlyFu+MpNAwpR7Gv2errDhVJ+SOhNjWcx8UTqy+hswb8L31RfC8jBvDgcnT87l3xI2w08rAg==}
 
   '@emnapi/runtime@1.10.0':
     resolution: {integrity: sha512-ewvYlk86xUoGI0zQRNq/mC+16R1QeDlKQy21Ki3oSYXNgLb45GV1P6A0M+/s6nyCuNDqe5VpaY84BzXGwVbwFA==}
 
-  '@emnapi/wasi-threads@1.2.1':
-    resolution: {integrity: sha512-uTII7OYF+/Mes/MrcIOYp5yOtSMLBWSIoLPpcgwipoiKbli6k322tcoFsxoIIxPDqW01SQGAgko4EzZi2BNv2w==}
-
   '@emotion/is-prop-valid@1.4.0':
     resolution: {integrity: sha512-QgD4fyscGcbbKwJmqNvUMSE02OsHUa+lAWKdEUIJKgqe5IwRSKd7+KhibEWdaKwgjLj0DRSHA9biAIqGBk05lw==}
 
@@ -4864,12 +4870,6 @@ packages:
     resolution: {integrity: sha512-3fkKj25kEjsfObL6IlKPAlHYPq/oYwUkkQ03zsTTiDjD7vg/RxjdiLeCydqtxHZP0JgsXL3D/X5oAkMGzuUp/Q==}
     engines: {node: '>=12'}
 
-  '@napi-rs/wasm-runtime@1.1.4':
-    resolution: {integrity: sha512-3NQNNgA1YSlJb/kMH1ildASP9HW7/7kYnRI2szWJaofaS1hWmbGI4H+d3+22aGzXXN9IJ+n+GiFVcGipJP18ow==}
-    peerDependencies:
-      '@emnapi/core': ^1.7.1
-      '@emnapi/runtime': ^1.7.1
-
   '@next/bundle-analyzer@15.3.1':
     resolution: {integrity: sha512-NqUZrjVruGbdQaPE3OSEXP+ZuULqumeHVTuU9pOX1V0/9BWY9FOck3jgQGFdBtG41nOYuO8+CoHKDQAVIPQJrw==}
 
@@ -5518,9 +5518,6 @@ packages:
     resolution: {integrity: sha512-/UhIkaZgPutTFmQ7RnIJGgDXZmtEJ7Dvi86xNTFWcnRxVRNk/aotsqDJYeEvDP+FSMB2SdW+pQzNMcWP0rwuNA==}
     engines: {node: '>=14'}
 
-  '@oxc-project/types@0.133.0':
-    resolution: {integrity: sha512-KzkdCd6Uxqnf6l3HOw1xfatAlUURA0g14cvBYFyJ5SaNOQbOUvBr9PKArcPcrNIeRsBdgcUzOGrhKveVpvOIGA==}
-
   '@oxc-project/types@0.143.0':
     resolution: {integrity: sha512-u6JZdLBTLotrNC9Vd6vPssINdzcCzleKAH6EJKImQb7GtYvX5keN2dxkoK44stCc4tffE6QQRtZTXVSzsLUlWA==}
 
@@ -6555,73 +6552,36 @@ packages:
     resolution: {integrity: sha512-C7c51Nn4yTxXFKvgh2txJFNweaVcfUPQxwEUFw4aWsCmfiBDJsTSwviIF8EcwjQ6k8bPyMWCl1vw4BdxE569Cg==}
     engines: {node: '>= 10'}
 
-  '@rolldown/binding-android-arm64@1.0.3':
-    resolution: {integrity: sha512-454rs7jHngixp/NMxd5srYD57OnzSlZ/eFTETjORQHLwJG1lRtmNOJcBerZlfu4GjKqeq8aCCIQrMdHyhI51Hw==}
-    engines: {node: ^20.19.0 || >=22.12.0}
-    cpu: [arm64]
-    os: [android]
-
   '@rolldown/binding-android-arm64@1.2.3':
     resolution: {integrity: sha512-zrJtHDcaZJ1Fp7xf4hNl+7seH9Cn/N5TwLYkhgXREtBwAd/jaqW3uqeHxpDugJLVICWg4eW44kOQEGJ1r6jCGw==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm64]
     os: [android]
 
-  '@rolldown/binding-darwin-arm64@1.0.3':
-    resolution: {integrity: sha512-PcAhP+ynjURNyy8SKGl5DQP94aGuB/7JrXJb/t7P+hanXvQVMWzUvRRhBAcg/lNRadBhoUPqSoP4xw5tR/KBEA==}
-    engines: {node: ^20.19.0 || >=22.12.0}
-    cpu: [arm64]
-    os: [darwin]
-
   '@rolldown/binding-darwin-arm64@1.2.3':
     resolution: {integrity: sha512-ieIiibVCp0tX7TLu2cafoNPv8wJyYi01ekXpbf8q2j7F4rGAhhXb/eQh7ge9DRBY78GwmRQtvjZDux7EDbA8kA==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm64]
     os: [darwin]
 
-  '@rolldown/binding-darwin-x64@1.0.3':
-    resolution: {integrity: sha512-9YpfeUvSE2RS7wysJ81uOZkXJz7f7Q55H2Gvp3VEw/EsahqDtrphrZ0EwDLK5vvKOzaCrBsjF8JmnMLcUt78Gg==}
-    engines: {node: ^20.19.0 || >=22.12.0}
-    cpu: [x64]
-    os: [darwin]
-
   '@rolldown/binding-darwin-x64@1.2.3':
     resolution: {integrity: sha512-Zh9tCon19eDXJoihx0rqKhMUlMYqzwj3aPsSuHmI4RWZh62dWUL+DJN4C5YQya5TcQBJU/Fe8+rY0jhXTQITqA==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [x64]
     os: [darwin]
 
-  '@rolldown/binding-freebsd-x64@1.0.3':
-    resolution: {integrity: sha512-yB1IlAsSNHncV6SCTL27/MVGR5htvQsoGxIv5KMGXALp+Ll1wYsn+x98M9MW7qa+NdSbvrrY7ANI4wLJ0n1e6g==}
-    engines: {node: ^20.19.0 || >=22.12.0}
-    cpu: [x64]
-    os: [freebsd]
-
   '@rolldown/binding-freebsd-x64@1.2.3':
     resolution: {integrity: sha512-nGbJWewA1wrXXZiQhjAT5rhibGfns5ZNkDVqxsO6zJ3f3YvpoDNNmGMSbbhLuXKjNScaBJVOAboztAWVespQMg==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [x64]
     os: [freebsd]
 
-  '@rolldown/binding-linux-arm-gnueabihf@1.0.3':
-    resolution: {integrity: sha512-Yi30IVAAfLUCy2MseFjbB1jAMDl1VMCAas5StnYp8da9+CKvMd2H2cbEjWcw5NPaPqzvYkVIaF1nNUG+b7u/sw==}
-    engines: {node: ^20.19.0 || >=22.12.0}
-    cpu: [arm]
-    os: [linux]
-
   '@rolldown/binding-linux-arm-gnueabihf@1.2.3':
     resolution: {integrity: sha512-QNniJr5Kml0kDEB98jiDOJjXNroxIIi0IXIbdYzY26Xt1pVbeP62+KnoIZLwirOymX/0jDk/2gI/bNUv7A7OIw==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm]
     os: [linux]
 
-  '@rolldown/binding-linux-arm64-gnu@1.0.3':
-    resolution: {integrity: sha512-jsO7R8To+AdlYgUmN5sHSCZbfhtMBkO0WUx8iORQnPcMMdgr7qM2DQmMwgabs3GhNztdmoKkMKQFHD6DTMCIQw==}
-    engines: {node: ^20.19.0 || >=22.12.0}
-    cpu: [arm64]
-    os: [linux]
-    libc: [glibc]
-
   '@rolldown/binding-linux-arm64-gnu@1.2.3':
     resolution: {integrity: sha512-TkqEAcmmvH3I/q4114NB4RVt6241Dao48pF45uLcFGrwAaIn0iITgTAKP/dLjbN0R4buJjGb91+UHSoFmpgIWw==}
     engines: {node: ^20.19.0 || >=22.12.0}
@@ -6629,13 +6589,6 @@ packages:
     os: [linux]
     libc: [glibc]
 
-  '@rolldown/binding-linux-arm64-musl@1.0.3':
-    resolution: {integrity: sha512-VWkUHwWriDciit80wleYwKILoR/KMvxh/IdwS/paX+ZgpuRpCrKLUdadJbc0NpBEiyhpYawsJ73j9aCvOH+f7Q==}
-    engines: {node: ^20.19.0 || >=22.12.0}
-    cpu: [arm64]
-    os: [linux]
-    libc: [musl]
-
   '@rolldown/binding-linux-arm64-musl@1.2.3':
     resolution: {integrity: sha512-NHqjnxpsndf4MPymxteFAWHHfkTL8HjWh1KB7z23ofZ6QO2euONuxDXjat69dKZRALnGypg8k8SsK8vZJoXv1Q==}
     engines: {node: ^20.19.0 || >=22.12.0}
@@ -6643,13 +6596,6 @@ packages:
     os: [linux]
     libc: [musl]
 
-  '@rolldown/binding-linux-ppc64-gnu@1.0.3':
-    resolution: {integrity: sha512-5f1laC0SlIR0yDbFCd8acUhvJIag6N3zC5P7oUPN6wX0aOma+uKJ0wBDH5aq7I1PVI2ttTlhJwzwRIBnLiSGEg==}
-    engines: {node: ^20.19.0 || >=22.12.0}
-    cpu: [ppc64]
-    os: [linux]
-    libc: [glibc]
-
   '@rolldown/binding-linux-ppc64-gnu@1.2.3':
     resolution: {integrity: sha512-6tbrbwfz5GB9DQ4Jwo6hy9v+vR31xZlvzZ6n5Xut6Hhx5PvrA9q/HsK8KMaYQp063iqZGXwNvZtYNLD7EM/x0w==}
     engines: {node: ^20.19.0 || >=22.12.0}
@@ -6657,13 +6603,6 @@ packages:
     os: [linux]
     libc: [glibc]
 
-  '@rolldown/binding-linux-s390x-gnu@1.0.3':
-    resolution: {integrity: sha512-Iq4ko0r4XsgbrF/LunNgHtAGLRRVE2kXonAXQ/MV0mC6jQpMOhW1SvtZja2EhC/kd05++bP78dsqBeIQyYJ6Yg==}
-    engines: {node: ^20.19.0 || >=22.12.0}
-    cpu: [s390x]
-    os: [linux]
-    libc: [glibc]
-
   '@rolldown/binding-linux-s390x-gnu@1.2.3':
     resolution: {integrity: sha512-oyuXxXmoZHjXC917IAPFAAv4wWAa0cM9afk8nx1+9/jNNOX1uPf8yDA6p7G0RypOfw/X0PQt5IfoquY1um+zSg==}
     engines: {node: ^20.19.0 || >=22.12.0}
@@ -6671,13 +6610,6 @@ packages:
     os: [linux]
     libc: [glibc]
 
-  '@rolldown/binding-linux-x64-gnu@1.0.3':
-    resolution: {integrity: sha512-B8m6tD5+/N5FeNQFbKlLA/2yVq9ycQP1SeedyEYYKWBNR3ZQbkvIUcNnDNM03lO1l5F2roiiFJGgvoLLyZXtSg==}
-    engines: {node: ^20.19.0 || >=22.12.0}
-    cpu: [x64]
-    os: [linux]
-    libc: [glibc]
-
   '@rolldown/binding-linux-x64-gnu@1.2.3':
     resolution: {integrity: sha512-TytMwF2KVGqP2tgd0I1OY0PAv78dZRAYcF5ssDzjM34SUXCED3uXvSd5+lHoC0bTD6eEdFz7LdQNCO1y0oVk9w==}
     engines: {node: ^20.19.0 || >=22.12.0}
@@ -6685,13 +6617,6 @@ packages:
     os: [linux]
     libc: [glibc]
 
-  '@rolldown/binding-linux-x64-musl@1.0.3':
-    resolution: {integrity: sha512-pSdpdUJHkuCxun9LE7jvgUB9qsRgaiyNNCX7m/AvHTcq67AiT/Yhoxvw5zPfhrM8k/BfP8ce/hMOpthKDpEUow==}
-    engines: {node: ^20.19.0 || >=22.12.0}
-    cpu: [x64]
-    os: [linux]
-    libc: [musl]
-
   '@rolldown/binding-linux-x64-musl@1.2.3':
     resolution: {integrity: sha512-/E9m3qstrJFVPoULV25mVQblSNExY2+kBsYe4sy0Tn0yOOgJ8wZbZt3KnRbF/XeU2Gl1STKUQnDNTqhIE5MD4A==}
     engines: {node: ^20.19.0 || >=22.12.0}
@@ -6699,41 +6624,18 @@ packages:
     os: [linux]
     libc: [musl]
 
-  '@rolldown/binding-openharmony-arm64@1.0.3':
-    resolution: {integrity: sha512-OXXS3RKJgX2uLwM+gYyuH5omcH8fL1LJs96pZGgtetVCahON57+d4SJHzTgZiOjxgGkSnpXpOsWuPDGAKAigEg==}
-    engines: {node: ^20.19.0 || >=22.12.0}
-    cpu: [arm64]
-    os: [openharmony]
-
   '@rolldown/binding-openharmony-arm64@1.2.3':
     resolution: {integrity: sha512-Kr0OcsoQI816i6HOl3vFHpd1K0eZyh76zgfj4c1nTyaTsd5r2Mj1lwM4R90y/qaCfmTn9eHy0SKwi98eitRxug==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm64]
     os: [openharmony]
 
-  '@rolldown/binding-wasm32-wasi@1.0.3':
-    resolution: {integrity: sha512-JTtb8BWFynicNSoPrehsCzBtOKjZ6jhMiPFEmOiuXg1Fl8dn2KHQob+GuPSGR0dryQa1PQJbzjF3dqO/whhjLg==}
-    engines: {node: ^20.19.0 || >=22.12.0}
-    cpu: [wasm32]
-
-  '@rolldown/binding-win32-arm64-msvc@1.0.3':
-    resolution: {integrity: sha512-gEdFFEN70A/jxb2svrWsN3aDL7OUtmvlOy+6fa2jxG8K0wQ1ZbdeLGnidov6Yu5/733dI5ySfzFlQ/cb0bSz1g==}
-    engines: {node: ^20.19.0 || >=22.12.0}
-    cpu: [arm64]
-    os: [win32]
-
   '@rolldown/binding-win32-arm64-msvc@1.2.3':
     resolution: {integrity: sha512-hOtMwTqnME+/gJcH/PCZ0wn0zPUjiWOgkHpxbSJpfGKMezHltx1S7/k1SitzVa7Ww2cqrDDaFbZEhcJZO8o+Jw==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm64]
     os: [win32]
 
-  '@rolldown/binding-win32-x64-msvc@1.0.3':
-    resolution: {integrity: sha512-eXB7CHuaQdqmJcc3koCNtNPmT/bj2gc999kUFgBxG8Ac0NdgXc4rkCHhqrgrhN3zddvvvrgzj1e90SuSfmyIXA==}
-    engines: {node: ^20.19.0 || >=22.12.0}
-    cpu: [x64]
-    os: [win32]
-
   '@rolldown/binding-win32-x64-msvc@1.2.3':
     resolution: {integrity: sha512-ekcqMMkI2PlhYnfzQnB/cEdYUVVJViWvoUyLrbzgDoi3Snfc1mVBwdnc306ufA5ejy8JSPjT2RlW1nQSjW7efg==}
     engines: {node: ^20.19.0 || >=22.12.0}
@@ -8200,9 +8102,6 @@ packages:
   '@tweenjs/tween.js@23.1.3':
     resolution: {integrity: sha512-vJmvvwFxYuGnF2axRtPYocag6Clbb5YS7kLL+SO/TeVFzHqDIWrNKYtcsPMibjDx9O+bu+psAy9NKfWklassUA==}
 
-  '@tybys/wasm-util@0.10.1':
-    resolution: {integrity: sha512-9tTaPJLSiejZKx+Bmog4uSubteqTvFrVrURwkmHixBo0G4seD0zUxp98E1DzUBJxLQ3NPwXrGKDiVjwx/DpPsg==}
-
   '@types/acorn@4.0.6':
     resolution: {integrity: sha512-veQTnWP+1D/xbxVrPC3zHnCZRjSrKfhbMUlEA43iMZLu7EsnTtkJklIuwrCPbOi8YkvDQAiW05VQQFvvz9oieQ==}
 
@@ -15793,11 +15692,6 @@ packages:
       rolldown:
         optional: true
 
-  rolldown@1.0.3:
-    resolution: {integrity: sha512-i00lAJ2ks1BYr7rjNjKC7BcqAS7nVfiT3QX1SI5aY+AFHblCmaUf9OE9dbdzDvW6dJxbi2ZCZiy9v3CcwOiX3g==}
-    engines: {node: ^20.19.0 || >=22.12.0}
-    hasBin: true
-
   rolldown@1.2.3:
     resolution: {integrity: sha512-rn9wpmxplLf7NLNyCk9FyWh3FM43DbY8jOzCdEPzH7uflhTftRbCEpqi6Ly2osgoU8OwObtmavMbWLaWy4LX7A==}
     engines: {node: ^20.19.0 || >=22.12.0}
@@ -16260,11 +16154,6 @@ packages:
   sql-parser-cst@0.38.2:
     resolution: {integrity: sha512-4SR3cZYMxG4gsmvZQSQYYzzfk20OnbpsnwOVbU6Fw39ORLPpIHCMqoX5li0dz+ZWyF5HeR+mSgbgayKhN4JR9w==}
 
-  srvx@0.11.16:
-    resolution: {integrity: sha512-bp07zRuycfTY43IjAvvTFnmnJi8ikW0VFiHwOhhYcVW/L4xQ1XY4PAd4Nuum1rsA17C39zL7x+CDhrn5AL32Rw==}
-    engines: {node: '>=20.16.0'}
-    hasBin: true
-
   srvx@0.11.22:
     resolution: {integrity: sha512-LqZxxBDMKuMAZzFzJnDCkFOrs9MZQZr0LvHiO/SuSZVdQaXD7xQ5UWTUxheJrQPve1qk9MG2B/yttUvJxw8egQ==}
     engines: {node: '>=20.16.0'}
@@ -16313,9 +16202,6 @@ packages:
     resolution: {integrity: sha512-DvEy55V3DB7uknRo+4iOGT5fP1slR8wQohVdknigZPMpMstaKJQWhwiYBACJE3Ul2pTnATihhBYnRhZQHGBiRw==}
     engines: {node: '>= 0.8'}
 
-  std-env@4.1.0:
-    resolution: {integrity: sha512-Rq7ybcX2RuC55r9oaPVEW7/xu3tj8u4GeBYHBWCychFtzMIr86A7e3PPEBPT37sHStKX3+TiX/Fr/ACmJLVlLQ==}
-
   std-env@4.2.0:
     resolution: {integrity: sha512-oCUKSupKTHX53EyjDtuZQ64pjLJ6yYCtpmEw0goYxtjG9KpbRe8KAsl2tBUGU9DyMcJ0RwJ8GqJAFzMXcXW1Rw==}
 
@@ -17506,49 +17392,6 @@ packages:
       yaml:
         optional: true
 
-  vite@8.0.16:
-    resolution: {integrity: sha512-h9bXPmJichP5fLmVQo3PyaGSDE2n3aPuomeAlVRm0JLmt4rY6zmPKd59HYI4LNW8oTK7tlTsuC7l/m7awx9Jcw==}
-    engines: {node: ^20.19.0 || >=22.12.0}
-    hasBin: true
-    peerDependencies:
-      '@types/node': ^20.19.0 || >=22.12.0
-      '@vitejs/devtools': ^0.1.18
-      esbuild: ^0.28.1
-      jiti: '>=1.21.0'
-      less: ^4.0.0
-      sass: ^1.70.0
-      sass-embedded: ^1.70.0
-      stylus: '>=0.54.8'
-      sugarss: ^5.0.0
-      terser: ^5.16.0
-      tsx: ^4.8.1
-      yaml: ^2.4.2
-    peerDependenciesMeta:
-      '@types/node':
-        optional: true
-      '@vitejs/devtools':
-        optional: true
-      esbuild:
-        optional: true
-      jiti:
-        optional: true
-      less:
-        optional: true
-      sass:
-        optional: true
-      sass-embedded:
-        optional: true
-      stylus:
-        optional: true
-      sugarss:
-        optional: true
-      terser:
-        optional: true
-      tsx:
-        optional: true
-      yaml:
-        optional: true
-
   vite@8.2.1:
     resolution: {integrity: sha512-EU/eS7BH3XROHh2YnBefjM6DBKA6ZeMZEYQbj7NLWg5wHYlhB8B/Mayd5XsgWq+NFYccDOTemRpdETWR6Ka/lw==}
     engines: {node: ^20.19.0 || >=22.12.0}
@@ -18373,17 +18216,17 @@ snapshots:
     dependencies:
       '@aws-sdk/types': 3.973.8
       '@aws-sdk/xml-builder': 3.972.22
-      '@smithy/core': 3.23.17
+      '@smithy/core': 3.31.1
       '@smithy/node-config-provider': 4.3.14
       '@smithy/property-provider': 4.2.14
       '@smithy/protocol-http': 5.3.14
       '@smithy/signature-v4': 5.3.14
       '@smithy/smithy-client': 4.12.13
-      '@smithy/types': 4.14.1
+      '@smithy/types': 4.16.1
       '@smithy/util-base64': 4.3.2
       '@smithy/util-middleware': 4.2.14
       '@smithy/util-retry': 4.3.8
-      '@smithy/util-utf8': 4.2.2
+      '@smithy/util-utf8': 4.4.16
       tslib: 2.8.1
 
   '@aws-sdk/credential-provider-cognito-identity@3.972.31':
@@ -18649,7 +18492,7 @@ snapshots:
 
   '@aws-sdk/types@3.973.8':
     dependencies:
-      '@smithy/types': 4.14.1
+      '@smithy/types': 4.16.1
       tslib: 2.8.1
 
   '@aws-sdk/util-arn-parser@3.972.3':
@@ -18687,7 +18530,7 @@ snapshots:
   '@aws-sdk/xml-builder@3.972.22':
     dependencies:
       '@nodable/entities': 2.1.0
-      '@smithy/types': 4.14.1
+      '@smithy/types': 4.16.1
       fast-xml-parser: 5.7.2
       tslib: 2.8.1
 
@@ -18824,7 +18667,7 @@ snapshots:
   '@babel/helper-module-imports@7.29.7(supports-color@8.1.1)':
     dependencies:
       '@babel/traverse': 7.29.7(supports-color@8.1.1)
-      '@babel/types': 7.29.7
+      '@babel/types': 7.29.8
     transitivePeerDependencies:
       - supports-color
 
@@ -19392,17 +19235,17 @@ snapshots:
       picomatch: 4.0.5
       which: 4.0.0
 
-  '@dxup/nuxt@0.5.6(esbuild@0.28.1)(magicast@0.5.4)(rolldown@1.2.3)(rollup@4.60.3)(vite@7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.32.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))':
+  '@dxup/nuxt@0.5.6(esbuild@0.28.1)(magicast@0.5.4)(rolldown@1.2.3)(rollup@4.60.3)(vite@7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.33.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))':
     dependencies:
       '@dxup/unimport': 0.1.2
-      '@nuxt/kit': 4.5.2(magic-string@1.1.0)(magicast@0.5.4)(rolldown@1.2.3)(unplugin@3.3.0(esbuild@0.28.1)(rolldown@1.2.3)(rollup@4.60.3)(vite@7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.32.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)))
+      '@nuxt/kit': 4.5.2(magic-string@1.1.0)(magicast@0.5.4)(rolldown@1.2.3)(unplugin@3.3.0(esbuild@0.28.1)(rolldown@1.2.3)(rollup@4.60.3)(vite@7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.33.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)))
       '@vue/compiler-dom': 3.5.41
       chokidar: 5.0.0
       knitwork: 1.3.0
       magic-string: 1.1.0
       pathe: 2.0.3
       tinyglobby: 0.2.17
-      unplugin: 3.3.0(esbuild@0.28.1)(rolldown@1.2.3)(rollup@4.60.3)(vite@7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.32.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))
+      unplugin: 3.3.0(esbuild@0.28.1)(rolldown@1.2.3)(rollup@4.60.3)(vite@7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.33.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))
     transitivePeerDependencies:
       - '@farmfe/core'
       - '@rspack/core'
@@ -19453,12 +19296,6 @@ snapshots:
   '@electric-sql/pglite@0.4.5':
     optional: true
 
-  '@emnapi/core@1.10.0':
-    dependencies:
-      '@emnapi/wasi-threads': 1.2.1
-      tslib: 2.8.1
-    optional: true
-
   '@emnapi/runtime@0.43.1':
     dependencies:
       tslib: 2.8.1
@@ -19468,11 +19305,6 @@ snapshots:
       tslib: 2.8.1
     optional: true
 
-  '@emnapi/wasi-threads@1.2.1':
-    dependencies:
-      tslib: 2.8.1
-    optional: true
-
   '@emotion/is-prop-valid@1.4.0':
     dependencies:
       '@emotion/memoize': 0.9.0
@@ -19684,9 +19516,9 @@ snapshots:
 
   '@floating-ui/utils@0.2.9': {}
 
-  '@graphiql/plugin-doc-explorer@0.0.1(@codemirror/language@6.11.0)(@emotion/is-prop-valid@1.4.0)(@types/node@22.13.14)(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(graphql-ws@6.0.4(graphql@16.11.0)(ws@8.21.0))(graphql@16.11.0)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)':
+  '@graphiql/plugin-doc-explorer@0.0.1(@codemirror/language@6.11.0)(@emotion/is-prop-valid@1.4.0)(@types/node@22.13.14)(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(graphql-ws@6.0.4(graphql@16.11.0)(ws@8.21.3))(graphql@16.11.0)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)':
     dependencies:
-      '@graphiql/react': 0.32.0(@codemirror/language@6.11.0)(@emotion/is-prop-valid@1.4.0)(@types/node@22.13.14)(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(graphql-ws@6.0.4(graphql@16.11.0)(ws@8.21.0))(graphql@16.11.0)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
+      '@graphiql/react': 0.32.0(@codemirror/language@6.11.0)(@emotion/is-prop-valid@1.4.0)(@types/node@22.13.14)(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(graphql-ws@6.0.4(graphql@16.11.0)(ws@8.21.3))(graphql@16.11.0)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
       '@headlessui/react': 2.2.2(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
       graphql: 16.11.0
       react: 19.2.6
@@ -19714,10 +19546,10 @@ snapshots:
       - immer
       - use-sync-external-store
 
-  '@graphiql/plugin-history@0.0.2(@codemirror/language@6.11.0)(@emotion/is-prop-valid@1.4.0)(@types/node@22.13.14)(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(graphql-ws@6.0.4(graphql@16.11.0)(ws@8.21.0))(graphql@16.11.0)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)':
+  '@graphiql/plugin-history@0.0.2(@codemirror/language@6.11.0)(@emotion/is-prop-valid@1.4.0)(@types/node@22.13.14)(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(graphql-ws@6.0.4(graphql@16.11.0)(ws@8.21.3))(graphql@16.11.0)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)':
     dependencies:
-      '@graphiql/react': 0.32.0(@codemirror/language@6.11.0)(@emotion/is-prop-valid@1.4.0)(@types/node@22.13.14)(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(graphql-ws@6.0.4(graphql@16.11.0)(ws@8.21.0))(graphql@16.11.0)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
-      '@graphiql/toolkit': 0.11.3(@types/node@22.13.14)(graphql-ws@6.0.4(graphql@16.11.0)(ws@8.21.0))(graphql@16.11.0)
+      '@graphiql/react': 0.32.0(@codemirror/language@6.11.0)(@emotion/is-prop-valid@1.4.0)(@types/node@22.13.14)(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(graphql-ws@6.0.4(graphql@16.11.0)(ws@8.21.3))(graphql@16.11.0)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
+      '@graphiql/toolkit': 0.11.3(@types/node@22.13.14)(graphql-ws@6.0.4(graphql@16.11.0)(ws@8.21.3))(graphql@16.11.0)
       react: 19.2.6
       react-compiler-runtime: 19.1.0-rc.1(react@19.2.6)
       react-dom: 19.2.6(react@19.2.6)
@@ -19746,9 +19578,9 @@ snapshots:
       - immer
       - use-sync-external-store
 
-  '@graphiql/react@0.32.0(@codemirror/language@6.11.0)(@emotion/is-prop-valid@1.4.0)(@types/node@22.13.14)(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(graphql-ws@6.0.4(graphql@16.11.0)(ws@8.21.0))(graphql@16.11.0)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)':
+  '@graphiql/react@0.32.0(@codemirror/language@6.11.0)(@emotion/is-prop-valid@1.4.0)(@types/node@22.13.14)(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(graphql-ws@6.0.4(graphql@16.11.0)(ws@8.21.3))(graphql@16.11.0)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)':
     dependencies:
-      '@graphiql/toolkit': 0.11.3(@types/node@22.13.14)(graphql-ws@6.0.4(graphql@16.11.0)(ws@8.21.0))(graphql@16.11.0)
+      '@graphiql/toolkit': 0.11.3(@types/node@22.13.14)(graphql-ws@6.0.4(graphql@16.11.0)(ws@8.21.3))(graphql@16.11.0)
       '@radix-ui/react-dialog': 1.1.15(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
       '@radix-ui/react-dropdown-menu': 2.1.16(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
       '@radix-ui/react-tooltip': 1.2.8(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
@@ -19816,23 +19648,23 @@ snapshots:
     transitivePeerDependencies:
       - '@types/node'
 
-  '@graphiql/toolkit@0.11.3(@types/node@22.13.14)(graphql-ws@6.0.4(graphql@16.11.0)(ws@8.21.0))(graphql@16.11.0)':
+  '@graphiql/toolkit@0.11.3(@types/node@22.13.14)(graphql-ws@6.0.4(graphql@16.11.0)(ws@8.21.3))(graphql@16.11.0)':
     dependencies:
       '@n1ru4l/push-pull-async-iterable-iterator': 3.2.0
       graphql: 16.11.0
       meros: 1.3.0(@types/node@22.13.14)
     optionalDependencies:
-      graphql-ws: 6.0.4(graphql@16.11.0)(ws@8.21.0)
+      graphql-ws: 6.0.4(graphql@16.11.0)(ws@8.21.3)
     transitivePeerDependencies:
       - '@types/node'
 
-  '@graphiql/toolkit@0.9.1(@types/node@22.13.14)(graphql-ws@6.0.4(graphql@16.11.0)(ws@8.21.0))(graphql@16.11.0)':
+  '@graphiql/toolkit@0.9.1(@types/node@22.13.14)(graphql-ws@6.0.4(graphql@16.11.0)(ws@8.21.3))(graphql@16.11.0)':
     dependencies:
       '@n1ru4l/push-pull-async-iterable-iterator': 3.2.0
       graphql: 16.11.0
       meros: 1.3.0(@types/node@22.13.14)
     optionalDependencies:
-      graphql-ws: 6.0.4(graphql@16.11.0)(ws@8.21.0)
+      graphql-ws: 6.0.4(graphql@16.11.0)(ws@8.21.3)
     transitivePeerDependencies:
       - '@types/node'
 
@@ -20159,10 +19991,10 @@ snapshots:
   '@graphql-tools/graphql-tag-pluck@8.3.19(graphql@16.11.0)(supports-color@8.1.1)':
     dependencies:
       '@babel/core': 7.29.7(supports-color@8.1.1)
-      '@babel/parser': 7.29.7
+      '@babel/parser': 7.29.8
       '@babel/plugin-syntax-import-assertions': 7.26.0(@babel/core@7.29.7(supports-color@8.1.1))
       '@babel/traverse': 7.29.7(supports-color@8.1.1)
-      '@babel/types': 7.29.7
+      '@babel/types': 7.29.8
       '@graphql-tools/utils': 10.8.6(graphql@16.11.0)
       graphql: 16.11.0
       tslib: 2.8.1
@@ -20862,13 +20694,6 @@ snapshots:
 
   '@n1ru4l/push-pull-async-iterable-iterator@3.2.0': {}
 
-  '@napi-rs/wasm-runtime@1.1.4(@emnapi/core@1.10.0)(@emnapi/runtime@1.10.0)':
-    dependencies:
-      '@emnapi/core': 1.10.0
-      '@emnapi/runtime': 1.10.0
-      '@tybys/wasm-util': 0.10.1
-    optional: true
-
   '@next/bundle-analyzer@15.3.1':
     dependencies:
       webpack-bundle-analyzer: 4.10.1
@@ -21085,11 +20910,11 @@ snapshots:
 
   '@nuxt/devalue@2.0.2': {}
 
-  '@nuxt/devtools-kit@3.4.1(magic-string@1.1.0)(magicast@0.5.4)(rolldown@1.2.3)(unplugin@3.3.0(esbuild@0.28.1)(rolldown@1.2.3)(rollup@4.60.3)(vite@7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.32.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)))(vite@7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.32.0)(sass@1.77.4)(terser@5.39.0)(tsx@4.22.4)(yaml@2.9.0))':
+  '@nuxt/devtools-kit@3.4.1(magic-string@1.1.0)(magicast@0.5.4)(rolldown@1.2.3)(unplugin@3.3.0(esbuild@0.28.1)(rolldown@1.2.3)(rollup@4.60.3)(vite@7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.33.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)))(vite@7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.33.0)(sass@1.77.4)(terser@5.39.0)(tsx@4.22.4)(yaml@2.9.0))':
     dependencies:
-      '@nuxt/kit': 4.5.2(magic-string@1.1.0)(magicast@0.5.4)(rolldown@1.2.3)(unplugin@3.3.0(esbuild@0.28.1)(rolldown@1.2.3)(rollup@4.60.3)(vite@7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.32.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)))
+      '@nuxt/kit': 4.5.2(magic-string@1.1.0)(magicast@0.5.4)(rolldown@1.2.3)(unplugin@3.3.0(esbuild@0.28.1)(rolldown@1.2.3)(rollup@4.60.3)(vite@7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.33.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)))
       execa: 8.0.1
-      vite: 7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.32.0)(sass@1.77.4)(terser@5.39.0)(tsx@4.22.4)(yaml@2.9.0)
+      vite: 7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.33.0)(sass@1.77.4)(terser@5.39.0)(tsx@4.22.4)(yaml@2.9.0)
     transitivePeerDependencies:
       - magic-string
       - magicast
@@ -21108,11 +20933,11 @@ snapshots:
       pkg-types: 2.3.1
       semver: 7.8.5
 
-  '@nuxt/devtools@3.4.1(aws4fetch@1.0.20)(db0@0.3.4(@electric-sql/pglite@0.4.5))(ioredis@5.10.1(supports-color@8.1.1))(magic-string@1.1.0)(rolldown@1.2.3)(supports-color@8.1.1)(unplugin@3.3.0(esbuild@0.28.1)(rolldown@1.2.3)(rollup@4.60.3)(vite@7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.32.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)))(vite@7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.32.0)(sass@1.77.4)(terser@5.39.0)(tsx@4.22.4)(yaml@2.9.0))(vue@3.5.41(typescript@6.0.2))':
+  '@nuxt/devtools@3.4.1(aws4fetch@1.0.20)(db0@0.3.4(@electric-sql/pglite@0.4.5))(ioredis@5.10.1(supports-color@8.1.1))(magic-string@1.1.0)(rolldown@1.2.3)(supports-color@8.1.1)(unplugin@3.3.0(esbuild@0.28.1)(rolldown@1.2.3)(rollup@4.60.3)(vite@7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.33.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)))(vite@7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.33.0)(sass@1.77.4)(terser@5.39.0)(tsx@4.22.4)(yaml@2.9.0))(vue@3.5.41(typescript@6.0.2))':
     dependencies:
-      '@nuxt/devtools-kit': 3.4.1(magic-string@1.1.0)(magicast@0.5.4)(rolldown@1.2.3)(unplugin@3.3.0(esbuild@0.28.1)(rolldown@1.2.3)(rollup@4.60.3)(vite@7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.32.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)))(vite@7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.32.0)(sass@1.77.4)(terser@5.39.0)(tsx@4.22.4)(yaml@2.9.0))
+      '@nuxt/devtools-kit': 3.4.1(magic-string@1.1.0)(magicast@0.5.4)(rolldown@1.2.3)(unplugin@3.3.0(esbuild@0.28.1)(rolldown@1.2.3)(rollup@4.60.3)(vite@7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.33.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)))(vite@7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.33.0)(sass@1.77.4)(terser@5.39.0)(tsx@4.22.4)(yaml@2.9.0))
       '@nuxt/devtools-wizard': 3.4.1
-      '@nuxt/kit': 4.5.2(magic-string@1.1.0)(magicast@0.5.4)(rolldown@1.2.3)(unplugin@3.3.0(esbuild@0.28.1)(rolldown@1.2.3)(rollup@4.60.3)(vite@7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.32.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)))
+      '@nuxt/kit': 4.5.2(magic-string@1.1.0)(magicast@0.5.4)(rolldown@1.2.3)(unplugin@3.3.0(esbuild@0.28.1)(rolldown@1.2.3)(rollup@4.60.3)(vite@7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.33.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)))
       '@vue/devtools-core': 8.2.1(vue@3.5.41(typescript@6.0.2))
       '@vue/devtools-kit': 8.2.1
       birpc: 4.0.0
@@ -21139,9 +20964,9 @@ snapshots:
       structured-clone-es: 2.0.1
       tinyglobby: 0.2.17
       unstorage: 1.17.5(aws4fetch@1.0.20)(db0@0.3.4(@electric-sql/pglite@0.4.5))(ioredis@5.10.1(supports-color@8.1.1))
-      vite: 7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.32.0)(sass@1.77.4)(terser@5.39.0)(tsx@4.22.4)(yaml@2.9.0)
-      vite-plugin-inspect: 11.4.1(@nuxt/kit@4.5.2(magic-string@1.1.0)(magicast@0.5.4)(rolldown@1.2.3)(unplugin@3.3.0(esbuild@0.28.1)(rolldown@1.2.3)(rollup@4.60.3)(vite@7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.32.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))))(vite@7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.32.0)(sass@1.77.4)(terser@5.39.0)(tsx@4.22.4)(yaml@2.9.0))
-      vite-plugin-vue-tracer: 1.4.0(vite@7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.32.0)(sass@1.77.4)(terser@5.39.0)(tsx@4.22.4)(yaml@2.9.0))(vue@3.5.41(typescript@6.0.2))
+      vite: 7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.33.0)(sass@1.77.4)(terser@5.39.0)(tsx@4.22.4)(yaml@2.9.0)
+      vite-plugin-inspect: 11.4.1(@nuxt/kit@4.5.2(magic-string@1.1.0)(magicast@0.5.4)(rolldown@1.2.3)(unplugin@3.3.0(esbuild@0.28.1)(rolldown@1.2.3)(rollup@4.60.3)(vite@7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.33.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))))(vite@7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.33.0)(sass@1.77.4)(terser@5.39.0)(tsx@4.22.4)(yaml@2.9.0))
+      vite-plugin-vue-tracer: 1.4.0(vite@7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.33.0)(sass@1.77.4)(terser@5.39.0)(tsx@4.22.4)(yaml@2.9.0))(vue@3.5.41(typescript@6.0.2))
       which: 6.0.1
       ws: 8.21.3
     transitivePeerDependencies:
@@ -21173,7 +20998,7 @@ snapshots:
       - utf-8-validate
       - vue
 
-  '@nuxt/kit@4.5.2(magic-string@1.1.0)(magicast@0.5.4)(rolldown@1.2.3)(unplugin@3.3.0(esbuild@0.28.1)(rolldown@1.2.3)(rollup@4.60.3)(vite@7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.32.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)))':
+  '@nuxt/kit@4.5.2(magic-string@1.1.0)(magicast@0.5.4)(rolldown@1.2.3)(unplugin@3.3.0(esbuild@0.28.1)(rolldown@1.2.3)(rollup@4.60.3)(vite@7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.33.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)))':
     dependencies:
       c12: 3.3.4(magicast@0.5.4)
       consola: 3.4.2
@@ -21193,7 +21018,7 @@ snapshots:
       scule: 1.3.0
       tinyglobby: 0.2.17
       ufo: 1.6.4
-      unctx: 3.0.0(magic-string@1.1.0)(rolldown@1.2.3)(unplugin@3.3.0(esbuild@0.28.1)(rolldown@1.2.3)(rollup@4.60.3)(vite@7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.32.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)))
+      unctx: 3.0.0(magic-string@1.1.0)(rolldown@1.2.3)(unplugin@3.3.0(esbuild@0.28.1)(rolldown@1.2.3)(rollup@4.60.3)(vite@7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.33.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)))
       untyped: 2.0.0
       verkit: 0.3.2
     transitivePeerDependencies:
@@ -21203,11 +21028,11 @@ snapshots:
       - rolldown
       - unplugin
 
-  '@nuxt/nitro-server@4.5.2(ff67b45d5ae9f6bbc0f843f9bd4ede9d)':
+  '@nuxt/nitro-server@4.5.2(26269109a69fb55e1a4595a777c80e3e)':
     dependencies:
       '@nuxt/devalue': 2.0.2
-      '@nuxt/kit': 4.5.2(magic-string@1.1.0)(magicast@0.5.4)(rolldown@1.2.3)(unplugin@3.3.0(esbuild@0.28.1)(rolldown@1.2.3)(rollup@4.60.3)(vite@7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.32.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)))
-      '@unhead/vue': 3.3.1(@oxc-project/types@0.143.0)(esbuild@0.28.1)(lightningcss@1.33.0)(rolldown@1.2.3)(rollup@4.60.3)(vite@7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.32.0)(sass@1.77.4)(terser@5.39.0)(tsx@4.22.4)(yaml@2.9.0))(vue@3.5.41(typescript@6.0.2))(webpack@5.105.4(esbuild@0.28.1))
+      '@nuxt/kit': 4.5.2(magic-string@1.1.0)(magicast@0.5.4)(rolldown@1.2.3)(unplugin@3.3.0(esbuild@0.28.1)(rolldown@1.2.3)(rollup@4.60.3)(vite@7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.33.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)))
+      '@unhead/vue': 3.3.1(@oxc-project/types@0.143.0)(esbuild@0.28.1)(lightningcss@1.33.0)(rolldown@1.2.3)(rollup@4.60.3)(vite@7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.33.0)(sass@1.77.4)(terser@5.39.0)(tsx@4.22.4)(yaml@2.9.0))(vue@3.5.41(typescript@6.0.2))(webpack@5.105.4(esbuild@0.28.1))
       '@vue/shared': 3.5.41
       consola: 3.4.2
       defu: 6.1.7
@@ -21217,19 +21042,19 @@ snapshots:
       escape-string-regexp: 5.0.0
       exsolve: 1.1.1
       h3: 1.15.11
-      impound: 1.1.6(esbuild@0.28.1)(rolldown@1.2.3)(rollup@4.60.3)(vite@7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.32.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))
+      impound: 1.1.6(esbuild@0.28.1)(rolldown@1.2.3)(rollup@4.60.3)(vite@7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.33.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))
       klona: 2.0.6
       mocked-exports: 0.1.1
-      nitropack: 2.13.4(@electric-sql/pglite@0.4.5)(aws4fetch@1.0.20)(encoding@0.1.13)(rolldown@1.2.3)(supports-color@8.1.1)(vite@7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.32.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))
+      nitropack: 2.13.4(@electric-sql/pglite@0.4.5)(aws4fetch@1.0.20)(encoding@0.1.13)(rolldown@1.2.3)(supports-color@8.1.1)(vite@7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.33.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))
       nostics: 1.2.0
-      nuxt: 4.5.2(@babel/plugin-syntax-jsx@7.27.1(@babel/core@7.29.7(supports-color@8.1.1)))(@babel/plugin-syntax-typescript@7.29.7(@babel/core@7.29.7(supports-color@8.1.1)))(@electric-sql/pglite@0.4.5)(@oxc-project/types@0.143.0)(@parcel/watcher@2.5.6)(@types/node@22.13.14)(@vue/compiler-sfc@3.5.41)(aws4fetch@1.0.20)(cac@6.7.14)(commander@14.0.1)(db0@0.3.4(@electric-sql/pglite@0.4.5))(encoding@0.1.13)(esbuild@0.28.1)(eslint@9.37.0(jiti@2.7.0)(supports-color@8.1.1))(ioredis@5.10.1(supports-color@8.1.1))(lightningcss@1.33.0)(magicast@0.5.4)(rolldown@1.2.3)(rollup-plugin-visualizer@7.0.1(rolldown@1.2.3)(rollup@4.60.3))(rollup@4.60.3)(sass@1.77.4)(supports-color@8.1.1)(terser@5.39.0)(tsx@4.22.4)(typescript@6.0.2)(vite@7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.32.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))(yaml@2.9.0)
+      nuxt: 4.5.2(@babel/plugin-syntax-jsx@7.27.1(@babel/core@7.29.7(supports-color@8.1.1)))(@babel/plugin-syntax-typescript@7.29.7(@babel/core@7.29.7(supports-color@8.1.1)))(@electric-sql/pglite@0.4.5)(@oxc-project/types@0.143.0)(@parcel/watcher@2.5.6)(@types/node@22.13.14)(@vue/compiler-sfc@3.5.41)(aws4fetch@1.0.20)(cac@6.7.14)(commander@14.0.1)(db0@0.3.4(@electric-sql/pglite@0.4.5))(encoding@0.1.13)(esbuild@0.28.1)(eslint@9.37.0(jiti@2.7.0)(supports-color@8.1.1))(ioredis@5.10.1(supports-color@8.1.1))(lightningcss@1.33.0)(magicast@0.5.4)(rolldown@1.2.3)(rollup-plugin-visualizer@7.0.1(rolldown@1.2.3)(rollup@4.60.3))(rollup@4.60.3)(sass@1.77.4)(supports-color@8.1.1)(terser@5.39.0)(tsx@4.22.4)(typescript@6.0.2)(vite@7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.33.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))(yaml@2.9.0)
       nypm: 0.6.9
       ohash: 2.0.11
       pathe: 2.0.3
       rou3: 0.9.1
       std-env: 4.2.0
       ufo: 1.6.4
-      unctx: 3.0.0(magic-string@1.1.0)(rolldown@1.2.3)(unplugin@3.3.0(esbuild@0.28.1)(rolldown@1.2.3)(rollup@4.60.3)(vite@7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.32.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)))
+      unctx: 3.0.0(magic-string@1.1.0)(rolldown@1.2.3)(unplugin@3.3.0(esbuild@0.28.1)(rolldown@1.2.3)(rollup@4.60.3)(vite@7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.33.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)))
       unstorage: 1.17.5(aws4fetch@1.0.20)(db0@0.3.4(@electric-sql/pglite@0.4.5))(ioredis@5.10.1(supports-color@8.1.1))
       vue: 3.5.41(typescript@6.0.2)
       vue-bundle-renderer: 2.3.2
@@ -21293,18 +21118,18 @@ snapshots:
       pkg-types: 2.3.1
       std-env: 4.2.0
 
-  '@nuxt/telemetry@2.8.0(@nuxt/kit@4.5.2(magic-string@1.1.0)(magicast@0.5.4)(rolldown@1.2.3)(unplugin@3.3.0(esbuild@0.28.1)(rolldown@1.2.3)(rollup@4.60.3)(vite@7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.32.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))))':
+  '@nuxt/telemetry@2.8.0(@nuxt/kit@4.5.2(magic-string@1.1.0)(magicast@0.5.4)(rolldown@1.2.3)(unplugin@3.3.0(esbuild@0.28.1)(rolldown@1.2.3)(rollup@4.60.3)(vite@7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.33.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))))':
     dependencies:
-      '@nuxt/kit': 4.5.2(magic-string@1.1.0)(magicast@0.5.4)(rolldown@1.2.3)(unplugin@3.3.0(esbuild@0.28.1)(rolldown@1.2.3)(rollup@4.60.3)(vite@7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.32.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)))
+      '@nuxt/kit': 4.5.2(magic-string@1.1.0)(magicast@0.5.4)(rolldown@1.2.3)(unplugin@3.3.0(esbuild@0.28.1)(rolldown@1.2.3)(rollup@4.60.3)(vite@7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.33.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)))
       citty: 0.2.2
       consola: 3.4.2
       ofetch: 2.0.0-alpha.3
       rc9: 3.0.1
       std-env: 4.2.0
 
-  '@nuxt/vite-builder@4.5.2(1f7e029249cc3641719ea2b489bbea0e)':
+  '@nuxt/vite-builder@4.5.2(018b0ba76a28adfcb150e969816b1660)':
     dependencies:
-      '@nuxt/kit': 4.5.2(magic-string@1.1.0)(magicast@0.5.4)(rolldown@1.2.3)(unplugin@3.3.0(esbuild@0.28.1)(rolldown@1.2.3)(rollup@4.60.3)(vite@7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.32.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)))
+      '@nuxt/kit': 4.5.2(magic-string@1.1.0)(magicast@0.5.4)(rolldown@1.2.3)(unplugin@3.3.0(esbuild@0.28.1)(rolldown@1.2.3)(rollup@4.60.3)(vite@7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.33.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)))
       '@vitejs/plugin-vue': 6.0.8(vite@8.2.1(@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))(vue@3.5.41(typescript@6.0.2))
       '@vitejs/plugin-vue-jsx': 5.1.6(supports-color@8.1.1)(vite@8.2.1(@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))(vue@3.5.41(typescript@6.0.2))
       autoprefixer: 10.5.4(postcss@8.5.22)
@@ -21320,7 +21145,7 @@ snapshots:
       knitwork: 1.3.0
       mlly: 1.8.2
       mocked-exports: 0.1.1
-      nuxt: 4.5.2(@babel/plugin-syntax-jsx@7.27.1(@babel/core@7.29.7(supports-color@8.1.1)))(@babel/plugin-syntax-typescript@7.29.7(@babel/core@7.29.7(supports-color@8.1.1)))(@electric-sql/pglite@0.4.5)(@oxc-project/types@0.143.0)(@parcel/watcher@2.5.6)(@types/node@22.13.14)(@vue/compiler-sfc@3.5.41)(aws4fetch@1.0.20)(cac@6.7.14)(commander@14.0.1)(db0@0.3.4(@electric-sql/pglite@0.4.5))(encoding@0.1.13)(esbuild@0.28.1)(eslint@9.37.0(jiti@2.7.0)(supports-color@8.1.1))(ioredis@5.10.1(supports-color@8.1.1))(lightningcss@1.33.0)(magicast@0.5.4)(rolldown@1.2.3)(rollup-plugin-visualizer@7.0.1(rolldown@1.2.3)(rollup@4.60.3))(rollup@4.60.3)(sass@1.77.4)(supports-color@8.1.1)(terser@5.39.0)(tsx@4.22.4)(typescript@6.0.2)(vite@7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.32.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))(yaml@2.9.0)
+      nuxt: 4.5.2(@babel/plugin-syntax-jsx@7.27.1(@babel/core@7.29.7(supports-color@8.1.1)))(@babel/plugin-syntax-typescript@7.29.7(@babel/core@7.29.7(supports-color@8.1.1)))(@electric-sql/pglite@0.4.5)(@oxc-project/types@0.143.0)(@parcel/watcher@2.5.6)(@types/node@22.13.14)(@vue/compiler-sfc@3.5.41)(aws4fetch@1.0.20)(cac@6.7.14)(commander@14.0.1)(db0@0.3.4(@electric-sql/pglite@0.4.5))(encoding@0.1.13)(esbuild@0.28.1)(eslint@9.37.0(jiti@2.7.0)(supports-color@8.1.1))(ioredis@5.10.1(supports-color@8.1.1))(lightningcss@1.33.0)(magicast@0.5.4)(rolldown@1.2.3)(rollup-plugin-visualizer@7.0.1(rolldown@1.2.3)(rollup@4.60.3))(rollup@4.60.3)(sass@1.77.4)(supports-color@8.1.1)(terser@5.39.0)(tsx@4.22.4)(typescript@6.0.2)(vite@7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.33.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))(yaml@2.9.0)
       nypm: 0.6.9
       pathe: 2.0.3
       pkg-types: 2.3.1
@@ -21707,7 +21532,7 @@ snapshots:
       '@opentelemetry/propagator-b3': 1.24.1(@opentelemetry/api@1.9.1)
       '@opentelemetry/propagator-jaeger': 1.24.1(@opentelemetry/api@1.9.1)
       '@opentelemetry/sdk-trace-base': 1.24.1(@opentelemetry/api@1.9.1)
-      semver: 7.8.1
+      semver: 7.8.5
 
   '@opentelemetry/semantic-conventions@1.24.1': {}
 
@@ -21717,8 +21542,6 @@ snapshots:
 
   '@opentelemetry/semantic-conventions@1.41.1': {}
 
-  '@oxc-project/types@0.133.0': {}
-
   '@oxc-project/types@0.143.0': {}
 
   '@parcel/watcher-android-arm64@2.5.6':
@@ -22637,7 +22460,7 @@ snapshots:
     dependencies:
       react: 19.2.6
 
-  '@react-router/dev@7.13.2(@react-router/serve@7.17.0(react-router@7.18.2(react-dom@19.2.6(react@19.2.6))(react@19.2.6))(supports-color@8.1.1)(typescript@6.0.2))(@types/node@22.13.14)(babel-plugin-macros@3.1.0)(jiti@2.7.0)(lightningcss@1.33.0)(react-router@7.18.2(react-dom@19.2.6(react@19.2.6))(react@19.2.6))(sass@1.77.4)(supports-color@8.1.1)(terser@5.39.0)(tsx@4.22.4)(typescript@6.0.2)(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))(yaml@2.9.0)':
+  '@react-router/dev@7.13.2(@react-router/serve@7.17.0(react-router@7.18.2(react-dom@19.2.6(react@19.2.6))(react@19.2.6))(supports-color@8.1.1)(typescript@6.0.2))(@types/node@22.13.14)(babel-plugin-macros@3.1.0)(jiti@2.7.0)(lightningcss@1.33.0)(react-router@7.18.2(react-dom@19.2.6(react@19.2.6))(react@19.2.6))(sass@1.77.4)(supports-color@8.1.1)(terser@5.39.0)(tsx@4.22.4)(typescript@6.0.2)(vite@8.2.1(@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))(yaml@2.9.0)':
     dependencies:
       '@babel/core': 7.29.7(supports-color@8.1.1)
       '@babel/generator': 7.29.0
@@ -22667,7 +22490,7 @@ snapshots:
       semver: 7.7.4
       tinyglobby: 0.2.15
       valibot: 1.4.2(typescript@6.0.2)
-      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)
+      vite: 8.2.1(@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)
       vite-node: 3.2.4(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.33.0)(sass@1.77.4)(supports-color@8.1.1)(terser@5.39.0)(tsx@4.22.4)(yaml@2.9.0)
     optionalDependencies:
       '@react-router/serve': 7.17.0(react-router@7.18.2(react-dom@19.2.6(react@19.2.6))(react@19.2.6))(supports-color@8.1.1)(typescript@6.0.2)
@@ -22687,7 +22510,7 @@ snapshots:
       - tsx
       - yaml
 
-  '@react-router/dev@7.17.0(@react-router/serve@7.17.0(react-router@7.18.2(react-dom@19.2.6(react@19.2.6))(react@19.2.6))(supports-color@8.1.1)(typescript@6.0.2))(@types/node@22.13.14)(babel-plugin-macros@3.1.0)(jiti@2.7.0)(lightningcss@1.33.0)(react-router@7.18.2(react-dom@19.2.6(react@19.2.6))(react@19.2.6))(sass@1.77.4)(supports-color@8.1.1)(terser@5.39.0)(tsx@4.22.4)(typescript@6.0.2)(vite@7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.32.0)(sass@1.77.4)(terser@5.39.0)(tsx@4.22.4)(yaml@2.9.0))(yaml@2.9.0)':
+  '@react-router/dev@7.17.0(@react-router/serve@7.17.0(react-router@7.18.2(react-dom@19.2.6(react@19.2.6))(react@19.2.6))(supports-color@8.1.1)(typescript@6.0.2))(@types/node@22.13.14)(babel-plugin-macros@3.1.0)(jiti@2.7.0)(lightningcss@1.33.0)(react-router@7.18.2(react-dom@19.2.6(react@19.2.6))(react@19.2.6))(sass@1.77.4)(supports-color@8.1.1)(terser@5.39.0)(tsx@4.22.4)(typescript@6.0.2)(vite@7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.33.0)(sass@1.77.4)(terser@5.39.0)(tsx@4.22.4)(yaml@2.9.0))(yaml@2.9.0)':
     dependencies:
       '@babel/core': 7.29.7(supports-color@8.1.1)
       '@babel/generator': 7.29.0
@@ -22717,7 +22540,7 @@ snapshots:
       semver: 7.8.1
       tinyglobby: 0.2.16
       valibot: 1.4.2(typescript@6.0.2)
-      vite: 7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.32.0)(sass@1.77.4)(terser@5.39.0)(tsx@4.22.4)(yaml@2.9.0)
+      vite: 7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.33.0)(sass@1.77.4)(terser@5.39.0)(tsx@4.22.4)(yaml@2.9.0)
       vite-node: 3.2.4(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.33.0)(sass@1.77.4)(supports-color@8.1.1)(terser@5.39.0)(tsx@4.22.4)(yaml@2.9.0)
     optionalDependencies:
       '@react-router/serve': 7.17.0(react-router@7.18.2(react-dom@19.2.6(react@19.2.6))(react@19.2.6))(supports-color@8.1.1)(typescript@6.0.2)
@@ -22745,16 +22568,16 @@ snapshots:
     optionalDependencies:
       typescript: 6.0.2
 
-  '@react-router/fs-routes@7.17.0(@react-router/dev@7.17.0(@react-router/serve@7.17.0(react-router@7.18.2(react-dom@19.2.6(react@19.2.6))(react@19.2.6))(supports-color@8.1.1)(typescript@6.0.2))(@types/node@22.13.14)(babel-plugin-macros@3.1.0)(jiti@2.7.0)(lightningcss@1.33.0)(react-router@7.18.2(react-dom@19.2.6(react@19.2.6))(react@19.2.6))(sass@1.77.4)(supports-color@8.1.1)(terser@5.39.0)(tsx@4.22.4)(typescript@6.0.2)(vite@7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.32.0)(sass@1.77.4)(terser@5.39.0)(tsx@4.22.4)(yaml@2.9.0))(yaml@2.9.0))(typescript@6.0.2)':
+  '@react-router/fs-routes@7.17.0(@react-router/dev@7.17.0(@react-router/serve@7.17.0(react-router@7.18.2(react-dom@19.2.6(react@19.2.6))(react@19.2.6))(supports-color@8.1.1)(typescript@6.0.2))(@types/node@22.13.14)(babel-plugin-macros@3.1.0)(jiti@2.7.0)(lightningcss@1.33.0)(react-router@7.18.2(react-dom@19.2.6(react@19.2.6))(react@19.2.6))(sass@1.77.4)(supports-color@8.1.1)(terser@5.39.0)(tsx@4.22.4)(typescript@6.0.2)(vite@7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.33.0)(sass@1.77.4)(terser@5.39.0)(tsx@4.22.4)(yaml@2.9.0))(yaml@2.9.0))(typescript@6.0.2)':
     dependencies:
-      '@react-router/dev': 7.17.0(@react-router/serve@7.17.0(react-router@7.18.2(react-dom@19.2.6(react@19.2.6))(react@19.2.6))(supports-color@8.1.1)(typescript@6.0.2))(@types/node@22.13.14)(babel-plugin-macros@3.1.0)(jiti@2.7.0)(lightningcss@1.33.0)(react-router@7.18.2(react-dom@19.2.6(react@19.2.6))(react@19.2.6))(sass@1.77.4)(supports-color@8.1.1)(terser@5.39.0)(tsx@4.22.4)(typescript@6.0.2)(vite@7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.32.0)(sass@1.77.4)(terser@5.39.0)(tsx@4.22.4)(yaml@2.9.0))(yaml@2.9.0)
+      '@react-router/dev': 7.17.0(@react-router/serve@7.17.0(react-router@7.18.2(react-dom@19.2.6(react@19.2.6))(react@19.2.6))(supports-color@8.1.1)(typescript@6.0.2))(@types/node@22.13.14)(babel-plugin-macros@3.1.0)(jiti@2.7.0)(lightningcss@1.33.0)(react-router@7.18.2(react-dom@19.2.6(react@19.2.6))(react@19.2.6))(sass@1.77.4)(supports-color@8.1.1)(terser@5.39.0)(tsx@4.22.4)(typescript@6.0.2)(vite@7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.33.0)(sass@1.77.4)(terser@5.39.0)(tsx@4.22.4)(yaml@2.9.0))(yaml@2.9.0)
       minimatch: 9.0.7
     optionalDependencies:
       typescript: 6.0.2
 
-  '@react-router/fs-routes@7.4.0(@react-router/dev@7.13.2(@react-router/serve@7.17.0(react-router@7.18.2(react-dom@19.2.6(react@19.2.6))(react@19.2.6))(supports-color@8.1.1)(typescript@6.0.2))(@types/node@22.13.14)(babel-plugin-macros@3.1.0)(jiti@2.7.0)(lightningcss@1.33.0)(react-router@7.18.2(react-dom@19.2.6(react@19.2.6))(react@19.2.6))(sass@1.77.4)(supports-color@8.1.1)(terser@5.39.0)(tsx@4.22.4)(typescript@6.0.2)(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))(yaml@2.9.0))(typescript@6.0.2)':
+  '@react-router/fs-routes@7.4.0(@react-router/dev@7.13.2(@react-router/serve@7.17.0(react-router@7.18.2(react-dom@19.2.6(react@19.2.6))(react@19.2.6))(supports-color@8.1.1)(typescript@6.0.2))(@types/node@22.13.14)(babel-plugin-macros@3.1.0)(jiti@2.7.0)(lightningcss@1.33.0)(react-router@7.18.2(react-dom@19.2.6(react@19.2.6))(react@19.2.6))(sass@1.77.4)(supports-color@8.1.1)(terser@5.39.0)(tsx@4.22.4)(typescript@6.0.2)(vite@8.2.1(@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))(yaml@2.9.0))(typescript@6.0.2)':
     dependencies:
-      '@react-router/dev': 7.13.2(@react-router/serve@7.17.0(react-router@7.18.2(react-dom@19.2.6(react@19.2.6))(react@19.2.6))(supports-color@8.1.1)(typescript@6.0.2))(@types/node@22.13.14)(babel-plugin-macros@3.1.0)(jiti@2.7.0)(lightningcss@1.33.0)(react-router@7.18.2(react-dom@19.2.6(react@19.2.6))(react@19.2.6))(sass@1.77.4)(supports-color@8.1.1)(terser@5.39.0)(tsx@4.22.4)(typescript@6.0.2)(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))(yaml@2.9.0)
+      '@react-router/dev': 7.13.2(@react-router/serve@7.17.0(react-router@7.18.2(react-dom@19.2.6(react@19.2.6))(react@19.2.6))(supports-color@8.1.1)(typescript@6.0.2))(@types/node@22.13.14)(babel-plugin-macros@3.1.0)(jiti@2.7.0)(lightningcss@1.33.0)(react-router@7.18.2(react-dom@19.2.6(react@19.2.6))(react@19.2.6))(sass@1.77.4)(supports-color@8.1.1)(terser@5.39.0)(tsx@4.22.4)(typescript@6.0.2)(vite@8.2.1(@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))(yaml@2.9.0)
       minimatch: 9.0.7
     optionalDependencies:
       typescript: 6.0.2
@@ -22834,94 +22657,45 @@ snapshots:
 
   '@resvg/resvg-wasm@2.4.0': {}
 
-  '@rolldown/binding-android-arm64@1.0.3':
-    optional: true
-
   '@rolldown/binding-android-arm64@1.2.3':
     optional: true
 
-  '@rolldown/binding-darwin-arm64@1.0.3':
-    optional: true
-
   '@rolldown/binding-darwin-arm64@1.2.3':
     optional: true
 
-  '@rolldown/binding-darwin-x64@1.0.3':
-    optional: true
-
   '@rolldown/binding-darwin-x64@1.2.3':
     optional: true
 
-  '@rolldown/binding-freebsd-x64@1.0.3':
-    optional: true
-
   '@rolldown/binding-freebsd-x64@1.2.3':
     optional: true
 
-  '@rolldown/binding-linux-arm-gnueabihf@1.0.3':
-    optional: true
-
   '@rolldown/binding-linux-arm-gnueabihf@1.2.3':
     optional: true
 
-  '@rolldown/binding-linux-arm64-gnu@1.0.3':
-    optional: true
-
   '@rolldown/binding-linux-arm64-gnu@1.2.3':
     optional: true
 
-  '@rolldown/binding-linux-arm64-musl@1.0.3':
-    optional: true
-
   '@rolldown/binding-linux-arm64-musl@1.2.3':
     optional: true
 
-  '@rolldown/binding-linux-ppc64-gnu@1.0.3':
-    optional: true
-
   '@rolldown/binding-linux-ppc64-gnu@1.2.3':
     optional: true
 
-  '@rolldown/binding-linux-s390x-gnu@1.0.3':
-    optional: true
-
   '@rolldown/binding-linux-s390x-gnu@1.2.3':
     optional: true
 
-  '@rolldown/binding-linux-x64-gnu@1.0.3':
-    optional: true
-
   '@rolldown/binding-linux-x64-gnu@1.2.3':
     optional: true
 
-  '@rolldown/binding-linux-x64-musl@1.0.3':
-    optional: true
-
   '@rolldown/binding-linux-x64-musl@1.2.3':
     optional: true
 
-  '@rolldown/binding-openharmony-arm64@1.0.3':
-    optional: true
-
   '@rolldown/binding-openharmony-arm64@1.2.3':
     optional: true
 
-  '@rolldown/binding-wasm32-wasi@1.0.3':
-    dependencies:
-      '@emnapi/core': 1.10.0
-      '@emnapi/runtime': 1.10.0
-      '@napi-rs/wasm-runtime': 1.1.4(@emnapi/core@1.10.0)(@emnapi/runtime@1.10.0)
-    optional: true
-
-  '@rolldown/binding-win32-arm64-msvc@1.0.3':
-    optional: true
-
   '@rolldown/binding-win32-arm64-msvc@1.2.3':
     optional: true
 
-  '@rolldown/binding-win32-x64-msvc@1.0.3':
-    optional: true
-
   '@rolldown/binding-win32-x64-msvc@1.2.3':
     optional: true
 
@@ -23162,32 +22936,6 @@ snapshots:
     dependencies:
       '@sentry/core': 10.59.0
 
-  '@sentry/nextjs@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.21(@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))':
-    dependencies:
-      '@opentelemetry/api': 1.9.1
-      '@rollup/plugin-commonjs': 28.0.1(rollup@4.60.3)
-      '@sentry/browser-utils': 10.59.0
-      '@sentry/bundler-plugin-core': 5.3.0(encoding@0.1.13)(supports-color@8.1.1)
-      '@sentry/conventions': 0.12.0
-      '@sentry/core': 10.59.0
-      '@sentry/node': 10.59.0(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))
-      '@sentry/opentelemetry': 10.59.0(@opentelemetry/api@1.9.1)(@opentelemetry/core@2.8.0(@opentelemetry/api@1.9.1))(@opentelemetry/sdk-trace-base@2.8.0(@opentelemetry/api@1.9.1))
-      '@sentry/react': 10.59.0(react@19.2.6)
-      '@sentry/vercel-edge': 10.59.0
-      '@sentry/webpack-plugin': 5.3.0(encoding@0.1.13)(supports-color@8.1.1)(webpack@5.105.4(esbuild@0.28.1))
-      next: 15.5.21(@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)
-      rollup: 4.60.3
-      stacktrace-parser: 0.1.11
-    transitivePeerDependencies:
-      - '@opentelemetry/core'
-      - '@opentelemetry/exporter-trace-otlp-http'
-      - '@opentelemetry/sdk-trace-base'
-      - encoding
-      - react
-      - supports-color
-      - vite
-      - webpack
-
   '@sentry/nextjs@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.21(@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.2.1(@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))':
     dependencies:
       '@opentelemetry/api': 1.9.1
@@ -23214,7 +22962,7 @@ snapshots:
       - vite
       - webpack
 
-  '@sentry/nextjs@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@16.2.11(@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))':
+  '@sentry/nextjs@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@16.2.11(@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.2.1(@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))':
     dependencies:
       '@opentelemetry/api': 1.9.1
       '@rollup/plugin-commonjs': 28.0.1(rollup@4.60.3)
@@ -23222,7 +22970,7 @@ snapshots:
       '@sentry/bundler-plugin-core': 5.3.0(encoding@0.1.13)(supports-color@8.1.1)
       '@sentry/conventions': 0.12.0
       '@sentry/core': 10.59.0
-      '@sentry/node': 10.59.0(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))
+      '@sentry/node': 10.59.0(supports-color@8.1.1)(vite@8.2.1(@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))
       '@sentry/opentelemetry': 10.59.0(@opentelemetry/api@1.9.1)(@opentelemetry/core@2.8.0(@opentelemetry/api@1.9.1))(@opentelemetry/sdk-trace-base@2.8.0(@opentelemetry/api@1.9.1))
       '@sentry/react': 10.59.0(react@19.2.6)
       '@sentry/vercel-edge': 10.59.0
@@ -23252,23 +23000,6 @@ snapshots:
       '@opentelemetry/instrumentation': 0.214.0(@opentelemetry/api@1.9.1)(supports-color@8.1.1)
       '@opentelemetry/sdk-trace-base': 2.8.0(@opentelemetry/api@1.9.1)
 
-  '@sentry/node@10.59.0(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))':
-    dependencies:
-      '@opentelemetry/api': 1.9.1
-      '@opentelemetry/core': 2.8.0(@opentelemetry/api@1.9.1)
-      '@opentelemetry/instrumentation': 0.214.0(@opentelemetry/api@1.9.1)(supports-color@8.1.1)
-      '@opentelemetry/sdk-trace-base': 2.8.0(@opentelemetry/api@1.9.1)
-      '@opentelemetry/semantic-conventions': 1.41.1
-      '@sentry/core': 10.59.0
-      '@sentry/node-core': 10.59.0(@opentelemetry/api@1.9.1)(@opentelemetry/core@2.8.0(@opentelemetry/api@1.9.1))(@opentelemetry/instrumentation@0.214.0(@opentelemetry/api@1.9.1)(supports-color@8.1.1))(@opentelemetry/sdk-trace-base@2.8.0(@opentelemetry/api@1.9.1))
-      '@sentry/opentelemetry': 10.59.0(@opentelemetry/api@1.9.1)(@opentelemetry/core@2.8.0(@opentelemetry/api@1.9.1))(@opentelemetry/sdk-trace-base@2.8.0(@opentelemetry/api@1.9.1))
-      '@sentry/server-utils': 10.59.0(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))
-      import-in-the-middle: 3.1.0
-    transitivePeerDependencies:
-      - '@opentelemetry/exporter-trace-otlp-http'
-      - supports-color
-      - vite
-
   '@sentry/node@10.59.0(supports-color@8.1.1)(vite@8.2.1(@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))':
     dependencies:
       '@opentelemetry/api': 1.9.1
@@ -23320,19 +23051,6 @@ snapshots:
       - encoding
       - supports-color
 
-  '@sentry/server-utils@10.59.0(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))':
-    dependencies:
-      '@apm-js-collab/code-transformer': 0.15.0
-      '@apm-js-collab/code-transformer-bundler-plugins': 0.5.0
-      '@apm-js-collab/tracing-hooks': 0.10.0(supports-color@8.1.1)
-      '@sentry/conventions': 0.12.0
-      '@sentry/core': 10.59.0
-      magic-string: 0.30.21
-    optionalDependencies:
-      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)
-    transitivePeerDependencies:
-      - supports-color
-
   '@sentry/server-utils@10.59.0(supports-color@8.1.1)(vite@8.2.1(@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))':
     dependencies:
       '@apm-js-collab/code-transformer': 0.15.0
@@ -23346,13 +23064,13 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@sentry/tanstackstart-react@10.59.0(encoding@0.1.13)(react@19.2.6)(rollup@4.60.3)(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))':
+  '@sentry/tanstackstart-react@10.59.0(encoding@0.1.13)(react@19.2.6)(rollup@4.60.3)(supports-color@8.1.1)(vite@8.2.1(@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))':
     dependencies:
       '@opentelemetry/api': 1.9.1
       '@sentry/browser-utils': 10.59.0
       '@sentry/conventions': 0.12.0
       '@sentry/core': 10.59.0
-      '@sentry/node': 10.59.0(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))
+      '@sentry/node': 10.59.0(supports-color@8.1.1)(vite@8.2.1(@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))
       '@sentry/react': 10.59.0(react@19.2.6)
       '@sentry/vite-plugin': 5.3.0(encoding@0.1.13)(rollup@4.60.3)(supports-color@8.1.1)
     transitivePeerDependencies:
@@ -23692,11 +23410,11 @@ snapshots:
     dependencies:
       '@smithy/is-array-buffer': 4.2.2
       '@smithy/protocol-http': 5.3.14
-      '@smithy/types': 4.14.1
+      '@smithy/types': 4.16.1
       '@smithy/util-hex-encoding': 4.2.2
       '@smithy/util-middleware': 4.2.14
       '@smithy/util-uri-escape': 4.2.2
-      '@smithy/util-utf8': 4.2.2
+      '@smithy/util-utf8': 4.4.16
       tslib: 2.8.1
 
   '@smithy/smithy-client@4.12.13':
@@ -24177,19 +23895,19 @@ snapshots:
       postcss-selector-parser: 6.0.10
       tailwindcss: 4.2.4
 
-  '@tailwindcss/vite@4.2.4(vite@7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.32.0)(sass@1.77.4)(terser@5.39.0)(tsx@4.22.4)(yaml@2.9.0))':
+  '@tailwindcss/vite@4.2.4(vite@7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.33.0)(sass@1.77.4)(terser@5.39.0)(tsx@4.22.4)(yaml@2.9.0))':
     dependencies:
       '@tailwindcss/node': 4.2.4
       '@tailwindcss/oxide': 4.2.4
       tailwindcss: 4.2.4
-      vite: 7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.32.0)(sass@1.77.4)(terser@5.39.0)(tsx@4.22.4)(yaml@2.9.0)
+      vite: 7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.33.0)(sass@1.77.4)(terser@5.39.0)(tsx@4.22.4)(yaml@2.9.0)
 
-  '@tailwindcss/vite@4.2.4(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))':
+  '@tailwindcss/vite@4.2.4(vite@8.2.1(@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))':
     dependencies:
       '@tailwindcss/node': 4.2.4
       '@tailwindcss/oxide': 4.2.4
       tailwindcss: 4.2.4
-      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)
+      vite: 8.2.1(@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)
 
   '@tanstack/devtools-client@0.0.6':
     dependencies:
@@ -24224,7 +23942,7 @@ snapshots:
     transitivePeerDependencies:
       - csstype
 
-  '@tanstack/devtools-vite@0.6.1(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))':
+  '@tanstack/devtools-vite@0.6.1(supports-color@8.1.1)(vite@8.2.1(@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))':
     dependencies:
       '@babel/core': 7.29.7(supports-color@8.1.1)
       '@babel/generator': 7.29.7
@@ -24236,7 +23954,7 @@ snapshots:
       chalk: 5.6.2
       launch-editor: 2.14.1
       picomatch: 4.0.4
-      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)
+      vite: 8.2.1(@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)
     transitivePeerDependencies:
       - bufferutil
       - supports-color
@@ -24348,7 +24066,7 @@ snapshots:
       react: 19.2.6
       react-dom: 19.2.6(react@19.2.6)
 
-  '@tanstack/react-start-rsc@0.1.17(esbuild@0.28.1)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)(rolldown@1.2.3)(rollup@4.60.3)(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))':
+  '@tanstack/react-start-rsc@0.1.17(esbuild@0.28.1)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)(rolldown@1.2.3)(rollup@4.60.3)(supports-color@8.1.1)(vite@8.2.1(@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))':
     dependencies:
       '@tanstack/react-router': 1.170.10(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
       '@tanstack/react-start-server': 1.167.13(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
@@ -24356,7 +24074,7 @@ snapshots:
       '@tanstack/router-utils': 1.162.1(supports-color@8.1.1)
       '@tanstack/start-client-core': 1.170.6
       '@tanstack/start-fn-stubs': 1.162.0
-      '@tanstack/start-plugin-core': 1.171.10(@tanstack/react-router@1.170.10(react-dom@19.2.6(react@19.2.6))(react@19.2.6))(esbuild@0.28.1)(rolldown@1.2.3)(rollup@4.60.3)(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))
+      '@tanstack/start-plugin-core': 1.171.10(@tanstack/react-router@1.170.10(react-dom@19.2.6(react@19.2.6))(react@19.2.6))(esbuild@0.28.1)(rolldown@1.2.3)(rollup@4.60.3)(supports-color@8.1.1)(vite@8.2.1(@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))
       '@tanstack/start-server-core': 1.169.8
       '@tanstack/start-storage-context': 1.167.10
       pathe: 2.0.3
@@ -24388,21 +24106,21 @@ snapshots:
     transitivePeerDependencies:
       - crossws
 
-  '@tanstack/react-start@1.168.18(esbuild@0.28.1)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)(rolldown@1.2.3)(rollup@4.60.3)(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))':
+  '@tanstack/react-start@1.168.18(esbuild@0.28.1)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)(rolldown@1.2.3)(rollup@4.60.3)(supports-color@8.1.1)(vite@8.2.1(@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))':
     dependencies:
       '@tanstack/react-router': 1.170.10(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
       '@tanstack/react-start-client': 1.168.7(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
-      '@tanstack/react-start-rsc': 0.1.17(esbuild@0.28.1)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)(rolldown@1.2.3)(rollup@4.60.3)(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))
+      '@tanstack/react-start-rsc': 0.1.17(esbuild@0.28.1)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)(rolldown@1.2.3)(rollup@4.60.3)(supports-color@8.1.1)(vite@8.2.1(@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))
       '@tanstack/react-start-server': 1.167.13(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
       '@tanstack/router-utils': 1.162.1(supports-color@8.1.1)
       '@tanstack/start-client-core': 1.170.6
-      '@tanstack/start-plugin-core': 1.171.10(@tanstack/react-router@1.170.10(react-dom@19.2.6(react@19.2.6))(react@19.2.6))(esbuild@0.28.1)(rolldown@1.2.3)(rollup@4.60.3)(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))
+      '@tanstack/start-plugin-core': 1.171.10(@tanstack/react-router@1.170.10(react-dom@19.2.6(react@19.2.6))(react@19.2.6))(esbuild@0.28.1)(rolldown@1.2.3)(rollup@4.60.3)(supports-color@8.1.1)(vite@8.2.1(@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))
       '@tanstack/start-server-core': 1.169.8
       pathe: 2.0.3
       react: 19.2.6
       react-dom: 19.2.6(react@19.2.6)
     optionalDependencies:
-      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)
+      vite: 8.2.1(@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)
     transitivePeerDependencies:
       - '@farmfe/core'
       - '@rspack/core'
@@ -24460,7 +24178,7 @@ snapshots:
 
   '@tanstack/router-generator@1.167.12(supports-color@8.1.1)':
     dependencies:
-      '@babel/types': 7.29.7
+      '@babel/types': 7.29.8
       '@tanstack/router-core': 1.171.8
       '@tanstack/router-utils': 1.162.1(supports-color@8.1.1)
       '@tanstack/virtual-file-routes': 1.162.0
@@ -24471,24 +24189,24 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@tanstack/router-plugin@1.168.13(@tanstack/react-router@1.170.10(react-dom@19.2.6(react@19.2.6))(react@19.2.6))(esbuild@0.28.1)(rolldown@1.2.3)(rollup@4.60.3)(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))':
+  '@tanstack/router-plugin@1.168.13(@tanstack/react-router@1.170.10(react-dom@19.2.6(react@19.2.6))(react@19.2.6))(esbuild@0.28.1)(rolldown@1.2.3)(rollup@4.60.3)(supports-color@8.1.1)(vite@8.2.1(@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))':
     dependencies:
       '@babel/core': 7.29.7(supports-color@8.1.1)
       '@babel/plugin-syntax-jsx': 7.27.1(@babel/core@7.29.7(supports-color@8.1.1))
-      '@babel/plugin-syntax-typescript': 7.28.6(@babel/core@7.29.7(supports-color@8.1.1))
+      '@babel/plugin-syntax-typescript': 7.29.7(@babel/core@7.29.7(supports-color@8.1.1))
       '@babel/template': 7.29.7
       '@babel/traverse': 7.29.7(supports-color@8.1.1)
-      '@babel/types': 7.29.7
+      '@babel/types': 7.29.8
       '@tanstack/router-core': 1.171.8
       '@tanstack/router-generator': 1.167.12(supports-color@8.1.1)
       '@tanstack/router-utils': 1.162.1(supports-color@8.1.1)
       '@tanstack/virtual-file-routes': 1.162.0
       chokidar: 5.0.0
-      unplugin: 3.3.0(esbuild@0.28.1)(rolldown@1.2.3)(rollup@4.60.3)(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))
+      unplugin: 3.3.0(esbuild@0.28.1)(rolldown@1.2.3)(rollup@4.60.3)(vite@8.2.1(@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))
       zod: 4.4.3
     optionalDependencies:
       '@tanstack/react-router': 1.170.10(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
-      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)
+      vite: 8.2.1(@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)
     transitivePeerDependencies:
       - '@farmfe/core'
@@ -24509,11 +24227,11 @@ snapshots:
     dependencies:
       '@babel/core': 7.29.7(supports-color@8.1.1)
       '@babel/generator': 7.29.7
-      '@babel/parser': 7.29.7
-      '@babel/types': 7.29.7
-      ansis: 4.1.0
+      '@babel/parser': 7.29.8
+      '@babel/types': 7.29.8
+      ansis: 4.3.1
       babel-dead-code-elimination: 1.0.12(supports-color@8.1.1)
-      diff: 8.0.3
+      diff: 8.0.4
       pathe: 2.0.3
       tinyglobby: 0.2.17
     transitivePeerDependencies:
@@ -24524,36 +24242,36 @@ snapshots:
       '@tanstack/router-core': 1.171.8
       '@tanstack/start-fn-stubs': 1.162.0
       '@tanstack/start-storage-context': 1.167.10
-      seroval: 1.5.4
+      seroval: 1.6.2
 
   '@tanstack/start-fn-stubs@1.162.0': {}
 
-  '@tanstack/start-plugin-core@1.171.10(@tanstack/react-router@1.170.10(react-dom@19.2.6(react@19.2.6))(react@19.2.6))(esbuild@0.28.1)(rolldown@1.2.3)(rollup@4.60.3)(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))':
+  '@tanstack/start-plugin-core@1.171.10(@tanstack/react-router@1.170.10(react-dom@19.2.6(react@19.2.6))(react@19.2.6))(esbuild@0.28.1)(rolldown@1.2.3)(rollup@4.60.3)(supports-color@8.1.1)(vite@8.2.1(@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))':
     dependencies:
       '@babel/code-frame': 7.27.1
       '@babel/core': 7.29.7(supports-color@8.1.1)
-      '@babel/types': 7.29.7
+      '@babel/types': 7.29.8
       '@rolldown/pluginutils': 1.0.1
       '@tanstack/router-core': 1.171.8
       '@tanstack/router-generator': 1.167.12(supports-color@8.1.1)
-      '@tanstack/router-plugin': 1.168.13(@tanstack/react-router@1.170.10(react-dom@19.2.6(react@19.2.6))(react@19.2.6))(esbuild@0.28.1)(rolldown@1.2.3)(rollup@4.60.3)(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))
+      '@tanstack/router-plugin': 1.168.13(@tanstack/react-router@1.170.10(react-dom@19.2.6(react@19.2.6))(react@19.2.6))(esbuild@0.28.1)(rolldown@1.2.3)(rollup@4.60.3)(supports-color@8.1.1)(vite@8.2.1(@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))
       '@tanstack/router-utils': 1.162.1(supports-color@8.1.1)
       '@tanstack/start-client-core': 1.170.6
       '@tanstack/start-server-core': 1.169.8
       exsolve: 1.1.1
-      lightningcss: 1.32.0
+      lightningcss: 1.33.0
       pathe: 2.0.3
       picomatch: 4.0.5
-      seroval: 1.5.4
+      seroval: 1.6.2
       source-map: 0.7.6
-      srvx: 0.11.16
+      srvx: 0.11.22
       tinyglobby: 0.2.17
       ufo: 1.6.4
-      vitefu: 1.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))
+      vitefu: 1.1.1(vite@8.2.1(@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))
       xmlbuilder2: 4.0.3
       zod: 4.4.3
     optionalDependencies:
-      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)
+      vite: 8.2.1(@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)
     transitivePeerDependencies:
       - '@farmfe/core'
       - '@rspack/core'
@@ -24576,7 +24294,7 @@ snapshots:
       '@tanstack/start-storage-context': 1.167.10
       fetchdts: 0.1.7
       h3-v2: h3@2.0.1-rc.20
-      seroval: 1.5.4
+      seroval: 1.6.2
     transitivePeerDependencies:
       - crossws
 
@@ -24662,11 +24380,6 @@ snapshots:
 
   '@tweenjs/tween.js@23.1.3': {}
 
-  '@tybys/wasm-util@0.10.1':
-    dependencies:
-      tslib: 2.8.1
-    optional: true
-
   '@types/acorn@4.0.6':
     dependencies:
       '@types/estree': 1.0.5
@@ -25153,7 +24866,7 @@ snapshots:
       '@typescript-eslint/visitor-keys': 8.65.0
       debug: 4.4.3(supports-color@8.1.1)
       minimatch: 10.2.3
-      semver: 7.8.1
+      semver: 7.8.5
       tinyglobby: 0.2.17
       ts-api-utils: 2.5.0(typescript@6.0.2)
       typescript: 6.0.2
@@ -25266,17 +24979,17 @@ snapshots:
 
   '@ungap/structured-clone@1.2.0': {}
 
-  '@unhead/bundler@3.3.1(@oxc-project/types@0.143.0)(esbuild@0.28.1)(lightningcss@1.33.0)(rolldown@1.2.3)(rollup@4.60.3)(unhead@3.3.1(esbuild@0.28.1)(rolldown@1.2.3)(rollup@4.60.3)(vite@7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.32.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)))(vite@7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.32.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))':
+  '@unhead/bundler@3.3.1(@oxc-project/types@0.143.0)(esbuild@0.28.1)(lightningcss@1.33.0)(rolldown@1.2.3)(rollup@4.60.3)(unhead@3.3.1(esbuild@0.28.1)(rolldown@1.2.3)(rollup@4.60.3)(vite@7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.33.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)))(vite@7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.33.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))':
     dependencies:
       magic-string: 1.1.0
       oxc-walker: 1.1.1(@oxc-project/types@0.143.0)(rolldown@1.2.3)
-      unhead: 3.3.1(esbuild@0.28.1)(rolldown@1.2.3)(rollup@4.60.3)(vite@7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.32.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))
-      unplugin: 3.3.0(esbuild@0.28.1)(rolldown@1.2.3)(rollup@4.60.3)(vite@7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.32.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))
+      unhead: 3.3.1(esbuild@0.28.1)(rolldown@1.2.3)(rollup@4.60.3)(vite@7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.33.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))
+      unplugin: 3.3.0(esbuild@0.28.1)(rolldown@1.2.3)(rollup@4.60.3)(vite@7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.33.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))
     optionalDependencies:
       esbuild: 0.28.1
       lightningcss: 1.33.0
       rolldown: 1.2.3
-      vite: 7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.32.0)(sass@1.77.4)(terser@5.39.0)(tsx@4.22.4)(yaml@2.9.0)
+      vite: 7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.33.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)
     transitivePeerDependencies:
       - '@farmfe/core'
@@ -25286,15 +24999,15 @@ snapshots:
       - rollup
       - unloader
 
-  '@unhead/vue@3.3.1(@oxc-project/types@0.143.0)(esbuild@0.28.1)(lightningcss@1.33.0)(rolldown@1.2.3)(rollup@4.60.3)(vite@7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.32.0)(sass@1.77.4)(terser@5.39.0)(tsx@4.22.4)(yaml@2.9.0))(vue@3.5.41(typescript@6.0.2))(webpack@5.105.4(esbuild@0.28.1))':
+  '@unhead/vue@3.3.1(@oxc-project/types@0.143.0)(esbuild@0.28.1)(lightningcss@1.33.0)(rolldown@1.2.3)(rollup@4.60.3)(vite@7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.33.0)(sass@1.77.4)(terser@5.39.0)(tsx@4.22.4)(yaml@2.9.0))(vue@3.5.41(typescript@6.0.2))(webpack@5.105.4(esbuild@0.28.1))':
     dependencies:
-      '@unhead/bundler': 3.3.1(@oxc-project/types@0.143.0)(esbuild@0.28.1)(lightningcss@1.33.0)(rolldown@1.2.3)(rollup@4.60.3)(unhead@3.3.1(esbuild@0.28.1)(rolldown@1.2.3)(rollup@4.60.3)(vite@7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.32.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)))(vite@7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.32.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))
+      '@unhead/bundler': 3.3.1(@oxc-project/types@0.143.0)(esbuild@0.28.1)(lightningcss@1.33.0)(rolldown@1.2.3)(rollup@4.60.3)(unhead@3.3.1(esbuild@0.28.1)(rolldown@1.2.3)(rollup@4.60.3)(vite@7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.33.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)))(vite@7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.33.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))
       hookable: 6.1.1
-      unhead: 3.3.1(esbuild@0.28.1)(rolldown@1.2.3)(rollup@4.60.3)(vite@7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.32.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))
-      unplugin: 3.3.0(esbuild@0.28.1)(rolldown@1.2.3)(rollup@4.60.3)(vite@7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.32.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))
+      unhead: 3.3.1(esbuild@0.28.1)(rolldown@1.2.3)(rollup@4.60.3)(vite@7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.33.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))
+      unplugin: 3.3.0(esbuild@0.28.1)(rolldown@1.2.3)(rollup@4.60.3)(vite@7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.33.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))
       vue: 3.5.41(typescript@6.0.2)
     optionalDependencies:
-      vite: 7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.32.0)(sass@1.77.4)(terser@5.39.0)(tsx@4.22.4)(yaml@2.9.0)
+      vite: 7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.33.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)
     transitivePeerDependencies:
       - '@farmfe/core'
@@ -25373,10 +25086,10 @@ snapshots:
     optionalDependencies:
       ajv: 6.14.0
 
-  '@vitejs/plugin-react@6.0.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))':
+  '@vitejs/plugin-react@6.0.1(vite@8.2.1(@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))':
     dependencies:
       '@rolldown/pluginutils': 1.0.0-rc.7
-      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)
+      vite: 8.2.1(@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)
 
   '@vitejs/plugin-vue-jsx@5.1.6(supports-color@8.1.1)(vite@8.2.1(@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))(vue@3.5.41(typescript@6.0.2))':
     dependencies:
@@ -25419,15 +25132,6 @@ snapshots:
       chai: 6.2.2
       tinyrainbow: 3.1.0
 
-  '@vitest/mocker@4.1.4(msw@2.11.3(@types/node@22.13.14)(typescript@6.0.2))(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))':
-    dependencies:
-      '@vitest/spy': 4.1.4
-      estree-walker: 3.0.3
-      magic-string: 0.30.21
-    optionalDependencies:
-      msw: 2.11.3(@types/node@22.13.14)(typescript@6.0.2)
-      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)
-
   '@vitest/mocker@4.1.4(msw@2.11.3(@types/node@22.13.14)(typescript@6.0.2))(vite@8.2.1(@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))':
     dependencies:
       '@vitest/spy': 4.1.4
@@ -25513,7 +25217,7 @@ snapshots:
 
   '@vue/compiler-core@3.5.35':
     dependencies:
-      '@babel/parser': 7.29.7
+      '@babel/parser': 7.29.8
       '@vue/shared': 3.5.35
       entities: 7.0.1
       estree-walker: 2.0.2
@@ -28868,11 +28572,11 @@ snapshots:
 
   graceful-fs@4.2.11: {}
 
-  graphiql@4.0.2(@codemirror/language@6.11.0)(@emotion/is-prop-valid@1.4.0)(@types/node@22.13.14)(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(graphql-ws@6.0.4(graphql@16.11.0)(ws@8.21.0))(graphql@16.11.0)(react-dom@19.2.6(react@19.2.6))(react@19.2.6):
+  graphiql@4.0.2(@codemirror/language@6.11.0)(@emotion/is-prop-valid@1.4.0)(@types/node@22.13.14)(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(graphql-ws@6.0.4(graphql@16.11.0)(ws@8.21.3))(graphql@16.11.0)(react-dom@19.2.6(react@19.2.6))(react@19.2.6):
     dependencies:
-      '@graphiql/plugin-doc-explorer': 0.0.1(@codemirror/language@6.11.0)(@emotion/is-prop-valid@1.4.0)(@types/node@22.13.14)(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(graphql-ws@6.0.4(graphql@16.11.0)(ws@8.21.0))(graphql@16.11.0)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
-      '@graphiql/plugin-history': 0.0.2(@codemirror/language@6.11.0)(@emotion/is-prop-valid@1.4.0)(@types/node@22.13.14)(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(graphql-ws@6.0.4(graphql@16.11.0)(ws@8.21.0))(graphql@16.11.0)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
-      '@graphiql/react': 0.32.0(@codemirror/language@6.11.0)(@emotion/is-prop-valid@1.4.0)(@types/node@22.13.14)(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(graphql-ws@6.0.4(graphql@16.11.0)(ws@8.21.0))(graphql@16.11.0)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
+      '@graphiql/plugin-doc-explorer': 0.0.1(@codemirror/language@6.11.0)(@emotion/is-prop-valid@1.4.0)(@types/node@22.13.14)(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(graphql-ws@6.0.4(graphql@16.11.0)(ws@8.21.3))(graphql@16.11.0)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
+      '@graphiql/plugin-history': 0.0.2(@codemirror/language@6.11.0)(@emotion/is-prop-valid@1.4.0)(@types/node@22.13.14)(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(graphql-ws@6.0.4(graphql@16.11.0)(ws@8.21.3))(graphql@16.11.0)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
+      '@graphiql/react': 0.32.0(@codemirror/language@6.11.0)(@emotion/is-prop-valid@1.4.0)(@types/node@22.13.14)(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(graphql-ws@6.0.4(graphql@16.11.0)(ws@8.21.3))(graphql@16.11.0)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
       graphql: 16.11.0
       react: 19.2.6
       react-compiler-runtime: 19.1.0-rc.1(react@19.2.6)
@@ -28971,6 +28675,13 @@ snapshots:
     optionalDependencies:
       ws: 8.21.0
 
+  graphql-ws@6.0.4(graphql@16.11.0)(ws@8.21.3):
+    dependencies:
+      graphql: 16.11.0
+    optionalDependencies:
+      ws: 8.21.3
+    optional: true
+
   graphql@16.11.0: {}
 
   gray-matter@2.1.1:
@@ -29415,12 +29126,12 @@ snapshots:
       cjs-module-lexer: 2.2.0
       module-details-from-path: 1.0.4
 
-  impound@1.1.6(esbuild@0.28.1)(rolldown@1.2.3)(rollup@4.60.3)(vite@7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.32.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)):
+  impound@1.1.6(esbuild@0.28.1)(rolldown@1.2.3)(rollup@4.60.3)(vite@7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.33.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)):
     dependencies:
       '@jridgewell/trace-mapping': 0.3.31
       es-module-lexer: 2.1.0
       pathe: 2.0.3
-      unplugin: 3.3.0(esbuild@0.28.1)(rolldown@1.2.3)(rollup@4.60.3)(vite@7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.32.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))
+      unplugin: 3.3.0(esbuild@0.28.1)(rolldown@1.2.3)(rollup@4.60.3)(vite@7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.33.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))
       unplugin-utils: 0.3.2
     transitivePeerDependencies:
       - '@farmfe/core'
@@ -31780,8 +31491,8 @@ snapshots:
     dependencies:
       '@next/env': 16.2.11
       '@swc/helpers': 0.5.15
-      baseline-browser-mapping: 2.10.29
-      caniuse-lite: 1.0.30001792
+      baseline-browser-mapping: 2.11.13
+      caniuse-lite: 1.0.30001809
       postcss: 8.5.22
       react: 19.2.6
       react-dom: 19.2.6(react@19.2.6)
@@ -31805,7 +31516,7 @@ snapshots:
 
   nice-try@1.0.5: {}
 
-  nitropack@2.13.4(@electric-sql/pglite@0.4.5)(aws4fetch@1.0.20)(encoding@0.1.13)(rolldown@1.2.3)(supports-color@8.1.1)(vite@7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.32.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)):
+  nitropack@2.13.4(@electric-sql/pglite@0.4.5)(aws4fetch@1.0.20)(encoding@0.1.13)(rolldown@1.2.3)(supports-color@8.1.1)(vite@7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.33.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)):
     dependencies:
       '@cloudflare/kv-asset-handler': 0.4.2
       '@rollup/plugin-alias': 6.0.0(rollup@4.60.3)
@@ -31870,7 +31581,7 @@ snapshots:
       uncrypto: 0.1.3
       unctx: 2.5.0
       unenv: 2.0.0-rc.24
-      unimport: 6.4.0(esbuild@0.28.1)(rolldown@1.2.3)(rollup@4.60.3)(vite@7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.32.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))
+      unimport: 6.4.0(esbuild@0.28.1)(rolldown@1.2.3)(rollup@4.60.3)(vite@7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.33.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))
       unplugin-utils: 0.3.2
       unstorage: 1.17.5(aws4fetch@1.0.20)(db0@0.3.4(@electric-sql/pglite@0.4.5))(ioredis@5.10.1(supports-color@8.1.1))
       untyped: 2.0.0
@@ -32082,17 +31793,17 @@ snapshots:
       next: 15.5.21(@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-router: 7.18.2(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
 
-  nuxt@4.5.2(@babel/plugin-syntax-jsx@7.27.1(@babel/core@7.29.7(supports-color@8.1.1)))(@babel/plugin-syntax-typescript@7.29.7(@babel/core@7.29.7(supports-color@8.1.1)))(@electric-sql/pglite@0.4.5)(@oxc-project/types@0.143.0)(@parcel/watcher@2.5.6)(@types/node@22.13.14)(@vue/compiler-sfc@3.5.41)(aws4fetch@1.0.20)(cac@6.7.14)(commander@14.0.1)(db0@0.3.4(@electric-sql/pglite@0.4.5))(encoding@0.1.13)(esbuild@0.28.1)(eslint@9.37.0(jiti@2.7.0)(supports-color@8.1.1))(ioredis@5.10.1(supports-color@8.1.1))(lightningcss@1.33.0)(magicast@0.5.4)(rolldown@1.2.3)(rollup-plugin-visualizer@7.0.1(rolldown@1.2.3)(rollup@4.60.3))(rollup@4.60.3)(sass@1.77.4)(supports-color@8.1.1)(terser@5.39.0)(tsx@4.22.4)(typescript@6.0.2)(vite@7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.32.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))(yaml@2.9.0):
+  nuxt@4.5.2(@babel/plugin-syntax-jsx@7.27.1(@babel/core@7.29.7(supports-color@8.1.1)))(@babel/plugin-syntax-typescript@7.29.7(@babel/core@7.29.7(supports-color@8.1.1)))(@electric-sql/pglite@0.4.5)(@oxc-project/types@0.143.0)(@parcel/watcher@2.5.6)(@types/node@22.13.14)(@vue/compiler-sfc@3.5.41)(aws4fetch@1.0.20)(cac@6.7.14)(commander@14.0.1)(db0@0.3.4(@electric-sql/pglite@0.4.5))(encoding@0.1.13)(esbuild@0.28.1)(eslint@9.37.0(jiti@2.7.0)(supports-color@8.1.1))(ioredis@5.10.1(supports-color@8.1.1))(lightningcss@1.33.0)(magicast@0.5.4)(rolldown@1.2.3)(rollup-plugin-visualizer@7.0.1(rolldown@1.2.3)(rollup@4.60.3))(rollup@4.60.3)(sass@1.77.4)(supports-color@8.1.1)(terser@5.39.0)(tsx@4.22.4)(typescript@6.0.2)(vite@7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.33.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))(yaml@2.9.0):
     dependencies:
-      '@dxup/nuxt': 0.5.6(esbuild@0.28.1)(magicast@0.5.4)(rolldown@1.2.3)(rollup@4.60.3)(vite@7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.32.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))
+      '@dxup/nuxt': 0.5.6(esbuild@0.28.1)(magicast@0.5.4)(rolldown@1.2.3)(rollup@4.60.3)(vite@7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.33.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))
       '@nuxt/cli': 3.37.0(@nuxt/schema@4.5.2)(cac@6.7.14)(commander@14.0.1)(magicast@0.5.4)(supports-color@8.1.1)
-      '@nuxt/devtools': 3.4.1(aws4fetch@1.0.20)(db0@0.3.4(@electric-sql/pglite@0.4.5))(ioredis@5.10.1(supports-color@8.1.1))(magic-string@1.1.0)(rolldown@1.2.3)(supports-color@8.1.1)(unplugin@3.3.0(esbuild@0.28.1)(rolldown@1.2.3)(rollup@4.60.3)(vite@7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.32.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)))(vite@7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.32.0)(sass@1.77.4)(terser@5.39.0)(tsx@4.22.4)(yaml@2.9.0))(vue@3.5.41(typescript@6.0.2))
-      '@nuxt/kit': 4.5.2(magic-string@1.1.0)(magicast@0.5.4)(rolldown@1.2.3)(unplugin@3.3.0(esbuild@0.28.1)(rolldown@1.2.3)(rollup@4.60.3)(vite@7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.32.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)))
-      '@nuxt/nitro-server': 4.5.2(ff67b45d5ae9f6bbc0f843f9bd4ede9d)
+      '@nuxt/devtools': 3.4.1(aws4fetch@1.0.20)(db0@0.3.4(@electric-sql/pglite@0.4.5))(ioredis@5.10.1(supports-color@8.1.1))(magic-string@1.1.0)(rolldown@1.2.3)(supports-color@8.1.1)(unplugin@3.3.0(esbuild@0.28.1)(rolldown@1.2.3)(rollup@4.60.3)(vite@7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.33.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)))(vite@7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.33.0)(sass@1.77.4)(terser@5.39.0)(tsx@4.22.4)(yaml@2.9.0))(vue@3.5.41(typescript@6.0.2))
+      '@nuxt/kit': 4.5.2(magic-string@1.1.0)(magicast@0.5.4)(rolldown@1.2.3)(unplugin@3.3.0(esbuild@0.28.1)(rolldown@1.2.3)(rollup@4.60.3)(vite@7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.33.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)))
+      '@nuxt/nitro-server': 4.5.2(26269109a69fb55e1a4595a777c80e3e)
       '@nuxt/schema': 4.5.2
-      '@nuxt/telemetry': 2.8.0(@nuxt/kit@4.5.2(magic-string@1.1.0)(magicast@0.5.4)(rolldown@1.2.3)(unplugin@3.3.0(esbuild@0.28.1)(rolldown@1.2.3)(rollup@4.60.3)(vite@7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.32.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))))
-      '@nuxt/vite-builder': 4.5.2(1f7e029249cc3641719ea2b489bbea0e)
-      '@unhead/vue': 3.3.1(@oxc-project/types@0.143.0)(esbuild@0.28.1)(lightningcss@1.33.0)(rolldown@1.2.3)(rollup@4.60.3)(vite@7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.32.0)(sass@1.77.4)(terser@5.39.0)(tsx@4.22.4)(yaml@2.9.0))(vue@3.5.41(typescript@6.0.2))(webpack@5.105.4(esbuild@0.28.1))
+      '@nuxt/telemetry': 2.8.0(@nuxt/kit@4.5.2(magic-string@1.1.0)(magicast@0.5.4)(rolldown@1.2.3)(unplugin@3.3.0(esbuild@0.28.1)(rolldown@1.2.3)(rollup@4.60.3)(vite@7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.33.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))))
+      '@nuxt/vite-builder': 4.5.2(018b0ba76a28adfcb150e969816b1660)
+      '@unhead/vue': 3.3.1(@oxc-project/types@0.143.0)(esbuild@0.28.1)(lightningcss@1.33.0)(rolldown@1.2.3)(rollup@4.60.3)(vite@7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.33.0)(sass@1.77.4)(terser@5.39.0)(tsx@4.22.4)(yaml@2.9.0))(vue@3.5.41(typescript@6.0.2))(webpack@5.105.4(esbuild@0.28.1))
       '@vue/shared': 3.5.41
       chokidar: 5.0.0
       compatx: 0.2.0
@@ -32106,7 +31817,7 @@ snapshots:
       fnv1a-64: 0.1.2
       hookable: 6.1.1
       ignore: 7.0.6
-      impound: 1.1.6(esbuild@0.28.1)(rolldown@1.2.3)(rollup@4.60.3)(vite@7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.32.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))
+      impound: 1.1.6(esbuild@0.28.1)(rolldown@1.2.3)(rollup@4.60.3)(vite@7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.33.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))
       jiti: 2.7.0
       klona: 2.0.6
       knitwork: 1.3.0
@@ -32133,17 +31844,17 @@ snapshots:
       ufo: 1.6.4
       ultrahtml: 1.7.0
       uncrypto: 0.1.3
-      unctx: 3.0.0(magic-string@1.1.0)(rolldown@1.2.3)(unplugin@3.3.0(esbuild@0.28.1)(rolldown@1.2.3)(rollup@4.60.3)(vite@7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.32.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)))
+      unctx: 3.0.0(magic-string@1.1.0)(rolldown@1.2.3)(unplugin@3.3.0(esbuild@0.28.1)(rolldown@1.2.3)(rollup@4.60.3)(vite@7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.33.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)))
       undici: 8.10.0
-      unhead: 3.3.1(esbuild@0.28.1)(rolldown@1.2.3)(rollup@4.60.3)(vite@7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.32.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))
-      unimport: 6.4.0(esbuild@0.28.1)(rolldown@1.2.3)(rollup@4.60.3)(vite@7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.32.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))
-      unplugin: 3.3.0(esbuild@0.28.1)(rolldown@1.2.3)(rollup@4.60.3)(vite@7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.32.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))
+      unhead: 3.3.1(esbuild@0.28.1)(rolldown@1.2.3)(rollup@4.60.3)(vite@7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.33.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))
+      unimport: 6.4.0(esbuild@0.28.1)(rolldown@1.2.3)(rollup@4.60.3)(vite@7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.33.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))
+      unplugin: 3.3.0(esbuild@0.28.1)(rolldown@1.2.3)(rollup@4.60.3)(vite@7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.33.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))
       unrouting: 0.2.2
       untyped: 2.0.0
       verkit: 0.3.2
       vue: 3.5.41(typescript@6.0.2)
       vue-component-type-helpers: 3.3.9
-      vue-router: 5.2.0(@vue/compiler-sfc@3.5.41)(esbuild@0.28.1)(rolldown@1.2.3)(rollup@4.60.3)(vite@7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.32.0)(sass@1.77.4)(terser@5.39.0)(tsx@4.22.4)(yaml@2.9.0))(vue@3.5.41(typescript@6.0.2))(webpack@5.105.4(esbuild@0.28.1))
+      vue-router: 5.2.0(@vue/compiler-sfc@3.5.41)(esbuild@0.28.1)(rolldown@1.2.3)(rollup@4.60.3)(vite@7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.33.0)(sass@1.77.4)(terser@5.39.0)(tsx@4.22.4)(yaml@2.9.0))(vue@3.5.41(typescript@6.0.2))(webpack@5.105.4(esbuild@0.28.1))
     optionalDependencies:
       '@parcel/watcher': 2.5.6
       '@types/node': 22.13.14
@@ -33859,27 +33570,6 @@ snapshots:
     optionalDependencies:
       rolldown: 1.2.3
 
-  rolldown@1.0.3:
-    dependencies:
-      '@oxc-project/types': 0.133.0
-      '@rolldown/pluginutils': 1.0.1
-    optionalDependencies:
-      '@rolldown/binding-android-arm64': 1.0.3
-      '@rolldown/binding-darwin-arm64': 1.0.3
-      '@rolldown/binding-darwin-x64': 1.0.3
-      '@rolldown/binding-freebsd-x64': 1.0.3
-      '@rolldown/binding-linux-arm-gnueabihf': 1.0.3
-      '@rolldown/binding-linux-arm64-gnu': 1.0.3
-      '@rolldown/binding-linux-arm64-musl': 1.0.3
-      '@rolldown/binding-linux-ppc64-gnu': 1.0.3
-      '@rolldown/binding-linux-s390x-gnu': 1.0.3
-      '@rolldown/binding-linux-x64-gnu': 1.0.3
-      '@rolldown/binding-linux-x64-musl': 1.0.3
-      '@rolldown/binding-openharmony-arm64': 1.0.3
-      '@rolldown/binding-wasm32-wasi': 1.0.3
-      '@rolldown/binding-win32-arm64-msvc': 1.0.3
-      '@rolldown/binding-win32-x64-msvc': 1.0.3
-
   rolldown@1.2.3:
     dependencies:
       '@oxc-project/types': 0.143.0
@@ -34252,7 +33942,7 @@ snapshots:
     dependencies:
       '@img/colour': 1.0.0
       detect-libc: 2.1.2
-      semver: 7.8.1
+      semver: 7.8.5
     optionalDependencies:
       '@img/sharp-darwin-arm64': 0.34.5
       '@img/sharp-darwin-x64': 0.34.5
@@ -34515,8 +34205,6 @@ snapshots:
 
   sql-parser-cst@0.38.2: {}
 
-  srvx@0.11.16: {}
-
   srvx@0.11.22: {}
 
   sse.js@2.2.0: {}
@@ -34563,8 +34251,6 @@ snapshots:
 
   statuses@2.0.2: {}
 
-  std-env@4.1.0: {}
-
   std-env@4.2.0: {}
 
   stdin-discarder@0.2.2: {}
@@ -35226,11 +34912,11 @@ snapshots:
       magic-string: 0.30.21
       unplugin: 2.3.11
 
-  unctx@3.0.0(magic-string@1.1.0)(rolldown@1.2.3)(unplugin@3.3.0(esbuild@0.28.1)(rolldown@1.2.3)(rollup@4.60.3)(vite@7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.32.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))):
+  unctx@3.0.0(magic-string@1.1.0)(rolldown@1.2.3)(unplugin@3.3.0(esbuild@0.28.1)(rolldown@1.2.3)(rollup@4.60.3)(vite@7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.33.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))):
     optionalDependencies:
       magic-string: 1.1.0
       rolldown: 1.2.3
-      unplugin: 3.3.0(esbuild@0.28.1)(rolldown@1.2.3)(rollup@4.60.3)(vite@7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.32.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))
+      unplugin: 3.3.0(esbuild@0.28.1)(rolldown@1.2.3)(rollup@4.60.3)(vite@7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.33.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))
 
   undici-types@5.26.5: {}
 
@@ -35244,12 +34930,12 @@ snapshots:
     dependencies:
       pathe: 2.0.3
 
-  unhead@3.3.1(esbuild@0.28.1)(rolldown@1.2.3)(rollup@4.60.3)(vite@7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.32.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)):
+  unhead@3.3.1(esbuild@0.28.1)(rolldown@1.2.3)(rollup@4.60.3)(vite@7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.33.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)):
     dependencies:
       hookable: 6.1.1
-      unplugin: 3.3.0(esbuild@0.28.1)(rolldown@1.2.3)(rollup@4.60.3)(vite@7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.32.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))
+      unplugin: 3.3.0(esbuild@0.28.1)(rolldown@1.2.3)(rollup@4.60.3)(vite@7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.33.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))
     optionalDependencies:
-      vite: 7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.32.0)(sass@1.77.4)(terser@5.39.0)(tsx@4.22.4)(yaml@2.9.0)
+      vite: 7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.33.0)(sass@1.77.4)(terser@5.39.0)(tsx@4.22.4)(yaml@2.9.0)
     transitivePeerDependencies:
       - '@farmfe/core'
       - '@rspack/core'
@@ -35296,7 +34982,7 @@ snapshots:
       trough: 2.1.0
       vfile: 6.0.3
 
-  unimport@6.4.0(esbuild@0.28.1)(rolldown@1.2.3)(rollup@4.60.3)(vite@7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.32.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)):
+  unimport@6.4.0(esbuild@0.28.1)(rolldown@1.2.3)(rollup@4.60.3)(vite@7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.33.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)):
     dependencies:
       acorn: 8.18.0
       escape-string-regexp: 5.0.0
@@ -35310,7 +34996,7 @@ snapshots:
       scule: 1.3.0
       strip-literal: 4.0.0
       tinyglobby: 0.2.17
-      unplugin: 3.3.0(esbuild@0.28.1)(rolldown@1.2.3)(rollup@4.60.3)(vite@7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.32.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))
+      unplugin: 3.3.0(esbuild@0.28.1)(rolldown@1.2.3)(rollup@4.60.3)(vite@7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.33.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))
       unplugin-utils: 0.3.2
     optionalDependencies:
       rolldown: 1.2.3
@@ -35457,7 +35143,7 @@ snapshots:
       picomatch: 4.0.5
       webpack-virtual-modules: 0.6.2
 
-  unplugin@3.3.0(esbuild@0.28.1)(rolldown@1.2.3)(rollup@4.60.3)(vite@7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.32.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)):
+  unplugin@3.3.0(esbuild@0.28.1)(rolldown@1.2.3)(rollup@4.60.3)(vite@7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.33.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)):
     dependencies:
       '@jridgewell/remapping': 2.3.5
       picomatch: 4.0.5
@@ -35466,10 +35152,10 @@ snapshots:
       esbuild: 0.28.1
       rolldown: 1.2.3
       rollup: 4.60.3
-      vite: 7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.32.0)(sass@1.77.4)(terser@5.39.0)(tsx@4.22.4)(yaml@2.9.0)
+      vite: 7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.33.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)
 
-  unplugin@3.3.0(esbuild@0.28.1)(rolldown@1.2.3)(rollup@4.60.3)(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)):
+  unplugin@3.3.0(esbuild@0.28.1)(rolldown@1.2.3)(rollup@4.60.3)(vite@8.2.1(@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)):
     dependencies:
       '@jridgewell/remapping': 2.3.5
       picomatch: 4.0.5
@@ -35478,7 +35164,7 @@ snapshots:
       esbuild: 0.28.1
       rolldown: 1.2.3
       rollup: 4.60.3
-      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)
+      vite: 8.2.1(@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)
 
   unrouting@0.2.2:
@@ -35709,15 +35395,15 @@ snapshots:
       d3-time: 3.1.0
       d3-timer: 3.0.1
 
-  vite-dev-rpc@2.0.0(vite@7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.32.0)(sass@1.77.4)(terser@5.39.0)(tsx@4.22.4)(yaml@2.9.0)):
+  vite-dev-rpc@2.0.0(vite@7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.33.0)(sass@1.77.4)(terser@5.39.0)(tsx@4.22.4)(yaml@2.9.0)):
     dependencies:
       birpc: 4.0.0
-      vite: 7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.32.0)(sass@1.77.4)(terser@5.39.0)(tsx@4.22.4)(yaml@2.9.0)
-      vite-hot-client: 2.2.0(vite@7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.32.0)(sass@1.77.4)(terser@5.39.0)(tsx@4.22.4)(yaml@2.9.0))
+      vite: 7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.33.0)(sass@1.77.4)(terser@5.39.0)(tsx@4.22.4)(yaml@2.9.0)
+      vite-hot-client: 2.2.0(vite@7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.33.0)(sass@1.77.4)(terser@5.39.0)(tsx@4.22.4)(yaml@2.9.0))
 
-  vite-hot-client@2.2.0(vite@7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.32.0)(sass@1.77.4)(terser@5.39.0)(tsx@4.22.4)(yaml@2.9.0)):
+  vite-hot-client@2.2.0(vite@7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.33.0)(sass@1.77.4)(terser@5.39.0)(tsx@4.22.4)(yaml@2.9.0)):
     dependencies:
-      vite: 7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.32.0)(sass@1.77.4)(terser@5.39.0)(tsx@4.22.4)(yaml@2.9.0)
+      vite: 7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.33.0)(sass@1.77.4)(terser@5.39.0)(tsx@4.22.4)(yaml@2.9.0)
 
   vite-node@3.2.4(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.33.0)(sass@1.77.4)(supports-color@8.1.1)(terser@5.39.0)(tsx@4.22.4)(yaml@2.9.0):
     dependencies:
@@ -35775,7 +35461,7 @@ snapshots:
       eslint: 9.37.0(jiti@2.7.0)(supports-color@8.1.1)
       typescript: 6.0.2
 
-  vite-plugin-inspect@11.4.1(@nuxt/kit@4.5.2(magic-string@1.1.0)(magicast@0.5.4)(rolldown@1.2.3)(unplugin@3.3.0(esbuild@0.28.1)(rolldown@1.2.3)(rollup@4.60.3)(vite@7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.32.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))))(vite@7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.32.0)(sass@1.77.4)(terser@5.39.0)(tsx@4.22.4)(yaml@2.9.0)):
+  vite-plugin-inspect@11.4.1(@nuxt/kit@4.5.2(magic-string@1.1.0)(magicast@0.5.4)(rolldown@1.2.3)(unplugin@3.3.0(esbuild@0.28.1)(rolldown@1.2.3)(rollup@4.60.3)(vite@7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.33.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))))(vite@7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.33.0)(sass@1.77.4)(terser@5.39.0)(tsx@4.22.4)(yaml@2.9.0)):
     dependencies:
       ansis: 4.3.1
       error-stack-parser-es: 1.0.5
@@ -35785,37 +35471,27 @@ snapshots:
       perfect-debounce: 2.1.0
       sirv: 3.0.2
       unplugin-utils: 0.3.2
-      vite: 7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.32.0)(sass@1.77.4)(terser@5.39.0)(tsx@4.22.4)(yaml@2.9.0)
-      vite-dev-rpc: 2.0.0(vite@7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.32.0)(sass@1.77.4)(terser@5.39.0)(tsx@4.22.4)(yaml@2.9.0))
+      vite: 7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.33.0)(sass@1.77.4)(terser@5.39.0)(tsx@4.22.4)(yaml@2.9.0)
+      vite-dev-rpc: 2.0.0(vite@7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.33.0)(sass@1.77.4)(terser@5.39.0)(tsx@4.22.4)(yaml@2.9.0))
     optionalDependencies:
-      '@nuxt/kit': 4.5.2(magic-string@1.1.0)(magicast@0.5.4)(rolldown@1.2.3)(unplugin@3.3.0(esbuild@0.28.1)(rolldown@1.2.3)(rollup@4.60.3)(vite@7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.32.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)))
+      '@nuxt/kit': 4.5.2(magic-string@1.1.0)(magicast@0.5.4)(rolldown@1.2.3)(unplugin@3.3.0(esbuild@0.28.1)(rolldown@1.2.3)(rollup@4.60.3)(vite@7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.33.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)))
 
-  vite-plugin-vue-tracer@1.4.0(vite@7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.32.0)(sass@1.77.4)(terser@5.39.0)(tsx@4.22.4)(yaml@2.9.0))(vue@3.5.41(typescript@6.0.2)):
+  vite-plugin-vue-tracer@1.4.0(vite@7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.33.0)(sass@1.77.4)(terser@5.39.0)(tsx@4.22.4)(yaml@2.9.0))(vue@3.5.41(typescript@6.0.2)):
     dependencies:
       estree-walker: 3.0.3
       exsolve: 1.1.1
       magic-string: 0.30.21
       pathe: 2.0.3
       source-map-js: 1.2.1
-      vite: 7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.32.0)(sass@1.77.4)(terser@5.39.0)(tsx@4.22.4)(yaml@2.9.0)
+      vite: 7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.33.0)(sass@1.77.4)(terser@5.39.0)(tsx@4.22.4)(yaml@2.9.0)
       vue: 3.5.41(typescript@6.0.2)
 
-  vite-tsconfig-paths@6.1.1(supports-color@8.1.1)(typescript@6.0.2)(vite@7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.32.0)(sass@1.77.4)(terser@5.39.0)(tsx@4.22.4)(yaml@2.9.0)):
+  vite-tsconfig-paths@6.1.1(supports-color@8.1.1)(typescript@6.0.2)(vite@7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.33.0)(sass@1.77.4)(terser@5.39.0)(tsx@4.22.4)(yaml@2.9.0)):
     dependencies:
       debug: 4.4.3(supports-color@8.1.1)
       globrex: 0.1.2
       tsconfck: 3.0.3(typescript@6.0.2)
-      vite: 7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.32.0)(sass@1.77.4)(terser@5.39.0)(tsx@4.22.4)(yaml@2.9.0)
-    transitivePeerDependencies:
-      - supports-color
-      - typescript
-
-  vite-tsconfig-paths@6.1.1(supports-color@8.1.1)(typescript@6.0.2)(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)):
-    dependencies:
-      debug: 4.4.3(supports-color@8.1.1)
-      globrex: 0.1.2
-      tsconfck: 3.0.3(typescript@6.0.2)
-      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)
+      vite: 7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.33.0)(sass@1.77.4)(terser@5.39.0)(tsx@4.22.4)(yaml@2.9.0)
     transitivePeerDependencies:
       - supports-color
       - typescript
@@ -35830,24 +35506,6 @@ snapshots:
       - supports-color
       - typescript
 
-  vite@7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.32.0)(sass@1.77.4)(terser@5.39.0)(tsx@4.22.4)(yaml@2.9.0):
-    dependencies:
-      esbuild: 0.28.1
-      fdir: 6.5.0(picomatch@4.0.4)
-      picomatch: 4.0.4
-      postcss: 8.5.22
-      rollup: 4.60.3
-      tinyglobby: 0.2.17
-    optionalDependencies:
-      '@types/node': 22.13.14
-      fsevents: 2.3.3
-      jiti: 2.7.0
-      lightningcss: 1.32.0
-      sass: 1.77.4
-      terser: 5.39.0
-      tsx: 4.22.4
-      yaml: 2.9.0
-
   vite@7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.33.0)(sass@1.77.4)(terser@5.39.0)(tsx@4.22.4)(yaml@2.9.0):
     dependencies:
       esbuild: 0.28.1
@@ -35866,23 +35524,6 @@ snapshots:
       tsx: 4.22.4
       yaml: 2.9.0
 
-  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):
-    dependencies:
-      lightningcss: 1.32.0
-      picomatch: 4.0.4
-      postcss: 8.5.22
-      rolldown: 1.0.3
-      tinyglobby: 0.2.17
-    optionalDependencies:
-      '@types/node': 22.13.14
-      esbuild: 0.28.1
-      fsevents: 2.3.3
-      jiti: 2.7.0
-      sass: 1.77.4
-      terser: 5.39.0
-      tsx: 4.22.4
-      yaml: 2.9.0
-
   vite@8.2.1(@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):
     dependencies:
       lightningcss: 1.33.0
@@ -35900,40 +35541,9 @@ snapshots:
       tsx: 4.22.4
       yaml: 2.9.0
 
-  vitefu@1.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)):
+  vitefu@1.1.1(vite@8.2.1(@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)):
     optionalDependencies:
-      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)
-
-  vitest@4.1.4(@opentelemetry/api@1.9.1)(@types/node@22.13.14)(@vitest/coverage-v8@4.1.4)(@vitest/ui@4.1.4)(jsdom@28.1.0(@noble/hashes@1.8.0)(supports-color@8.1.1))(msw@2.11.3(@types/node@22.13.14)(typescript@6.0.2))(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)):
-    dependencies:
-      '@vitest/expect': 4.1.4
-      '@vitest/mocker': 4.1.4(msw@2.11.3(@types/node@22.13.14)(typescript@6.0.2))(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))
-      '@vitest/pretty-format': 4.1.4
-      '@vitest/runner': 4.1.4
-      '@vitest/snapshot': 4.1.4
-      '@vitest/spy': 4.1.4
-      '@vitest/utils': 4.1.4
-      es-module-lexer: 2.1.0
-      expect-type: 1.3.0
-      magic-string: 0.30.21
-      obug: 2.1.1
-      pathe: 2.0.3
-      picomatch: 4.0.4
-      std-env: 4.1.0
-      tinybench: 2.9.0
-      tinyexec: 1.2.4
-      tinyglobby: 0.2.17
-      tinyrainbow: 3.1.0
-      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)
-      why-is-node-running: 2.3.0
-    optionalDependencies:
-      '@opentelemetry/api': 1.9.1
-      '@types/node': 22.13.14
-      '@vitest/coverage-v8': 4.1.4(vitest@4.1.4)
-      '@vitest/ui': 4.1.4(vitest@4.1.4)
-      jsdom: 28.1.0(@noble/hashes@1.8.0)(supports-color@8.1.1)
-    transitivePeerDependencies:
-      - msw
+      vite: 8.2.1(@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)
 
   vitest@4.1.4(@opentelemetry/api@1.9.1)(@types/node@22.13.14)(@vitest/coverage-v8@4.1.4)(@vitest/ui@4.1.4)(jsdom@28.1.0(@noble/hashes@1.8.0)(supports-color@8.1.1))(msw@2.11.3(@types/node@22.13.14)(typescript@6.0.2))(vite@8.2.1(@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)):
     dependencies:
@@ -35949,8 +35559,8 @@ snapshots:
       magic-string: 0.30.21
       obug: 2.1.1
       pathe: 2.0.3
-      picomatch: 4.0.4
-      std-env: 4.1.0
+      picomatch: 4.0.5
+      std-env: 4.2.0
       tinybench: 2.9.0
       tinyexec: 1.2.4
       tinyglobby: 0.2.17
@@ -35981,7 +35591,7 @@ snapshots:
       '@vue/devtools-api': 6.6.4
       vue: 3.5.35(typescript@6.0.2)
 
-  vue-router@5.2.0(@vue/compiler-sfc@3.5.41)(esbuild@0.28.1)(rolldown@1.2.3)(rollup@4.60.3)(vite@7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.32.0)(sass@1.77.4)(terser@5.39.0)(tsx@4.22.4)(yaml@2.9.0))(vue@3.5.41(typescript@6.0.2))(webpack@5.105.4(esbuild@0.28.1)):
+  vue-router@5.2.0(@vue/compiler-sfc@3.5.41)(esbuild@0.28.1)(rolldown@1.2.3)(rollup@4.60.3)(vite@7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.33.0)(sass@1.77.4)(terser@5.39.0)(tsx@4.22.4)(yaml@2.9.0))(vue@3.5.41(typescript@6.0.2))(webpack@5.105.4(esbuild@0.28.1)):
     dependencies:
       '@babel/generator': 8.0.0
       '@vue-macros/common': 3.1.4(vue@3.5.41(typescript@6.0.2))
@@ -35998,13 +35608,13 @@ snapshots:
       picomatch: 4.0.5
       scule: 1.3.0
       tinyglobby: 0.2.17
-      unplugin: 3.3.0(esbuild@0.28.1)(rolldown@1.2.3)(rollup@4.60.3)(vite@7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.32.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))
+      unplugin: 3.3.0(esbuild@0.28.1)(rolldown@1.2.3)(rollup@4.60.3)(vite@7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.33.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))
       unplugin-utils: 0.3.2
       vue: 3.5.41(typescript@6.0.2)
       yaml: 2.9.0
     optionalDependencies:
       '@vue/compiler-sfc': 3.5.41
-      vite: 7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.32.0)(sass@1.77.4)(terser@5.39.0)(tsx@4.22.4)(yaml@2.9.0)
+      vite: 7.3.5(@types/node@22.13.14)(jiti@2.7.0)(lightningcss@1.33.0)(sass@1.77.4)(terser@5.39.0)(tsx@4.22.4)(yaml@2.9.0)
     transitivePeerDependencies:
       - '@farmfe/core'
       - '@rspack/core'