diff --git a/apps/docs/public/humans.txt b/apps/docs/public/humans.txt
index 99aaeebe6e1f4..4366f56b139a2 100644
--- a/apps/docs/public/humans.txt
+++ b/apps/docs/public/humans.txt
@@ -98,6 +98,7 @@ Emmett Folger
 Erfi Anugrah
 Eric Kharitonashvili
 Etienne Stalmans
+Evan Cummack
 Eyal Ehrlich
 Fabrizio Fenoglio
 Fady A
diff --git a/apps/studio/components/interfaces/Account/AccessTokens/Scoped/TokenCapabilities/EndpointRow.tsx b/apps/studio/components/interfaces/Account/AccessTokens/Scoped/TokenCapabilities/EndpointRow.tsx
index bec181ee5175d..ccaf55a485292 100644
--- a/apps/studio/components/interfaces/Account/AccessTokens/Scoped/TokenCapabilities/EndpointRow.tsx
+++ b/apps/studio/components/interfaces/Account/AccessTokens/Scoped/TokenCapabilities/EndpointRow.tsx
@@ -13,9 +13,6 @@ interface EndpointRowProps {
   methodColumnWidth: string
 }
 
-/** Pan slowly enough to read while revealing (~70px/s), but never snap for short distances. */
-const panDurationMs = (distance: number) => Math.max(300, Math.round(distance * 14))
-
 /**
  * One copyable endpoint. The muted prefix span shrinks with an end-ellipsis while the
  * distinguishing segment stays fixed-width — visually equivalent to truncating the full path in
@@ -33,23 +30,12 @@ export const EndpointRow = ({
   const { prefix, distinguishing } = splitEndpointPath(path, sharedPrefix)
 
   const pathContainerRef = useRef<HTMLSpanElement>(null)
-  const [panDistance, setPanDistance] = useState(0)
-  const [isRevealed, setIsRevealed] = useState(false)
   const [isCopied, setIsCopied] = useState(false)
   const copiedTimerRef = useRef<ReturnType<typeof setTimeout> | undefined>(undefined)
   const [showCopiedIcon, setShowCopiedIcon] = useState(false)
 
   useEffect(() => () => clearTimeout(copiedTimerRef.current), [])
 
-  // Measured when the reveal starts, not on mount: rows live inside accordion content that mounts
-  // collapsed, so resting measurements are taken before the row has its real width.
-  const handleRevealStart = () => {
-    const container = pathContainerRef.current
-    if (container) setPanDistance(Math.max(0, container.scrollWidth - container.clientWidth))
-    setIsRevealed(true)
-  }
-  const handleRevealEnd = () => setIsRevealed(false)
-
   const handleCopy = () => {
     copyToClipboard(path, () => {
       setIsCopied(true)
@@ -64,10 +50,6 @@ export const EndpointRow = ({
       type="button"
       tabIndex={0}
       onClick={handleCopy}
-      onMouseEnter={handleRevealStart}
-      onMouseLeave={handleRevealEnd}
-      onFocus={handleRevealStart}
-      onBlur={handleRevealEnd}
       aria-label={`Copy ${method} ${path}`}
       className="group flex w-full items-center gap-2 py-1.5 text-left"
     >
@@ -80,27 +62,35 @@ export const EndpointRow = ({
       <span
         ref={pathContainerRef}
         className={cn(
-          'flex min-w-0 flex-1 overflow-hidden whitespace-nowrap font-mono text-xs',
-          // The fade only paints over text that reaches the container's right edge, so short rows
-          // are unaffected; dropped while panning so the revealed tail stays readable.
-          !isRevealed && '[mask-image:linear-gradient(to_right,black_calc(100%-2rem),transparent)]'
+          'block inline-full overflow-hidden',
+          // group allows to have the hover effect on children (see below)
+          'group',
+          // container to allow hover effect size computations
+          '@container',
+          '[mask-image:linear-gradient(to_right,black_calc(100%-2rem),transparent)]'
         )}
       >
         <span
-          className="flex min-w-0 transition-transform ease-linear motion-reduce:transition-none"
-          style={{
-            transform:
-              isRevealed && panDistance > 0 ? `translateX(-${panDistance}px)` : 'translateX(0)',
-            // Pausing before panning lets a quick mouse pass leave the row untouched; the pan
-            // back starts immediately and faster, so the row settles as soon as it's left.
-            transitionDuration: isRevealed ? `${panDurationMs(panDistance)}ms` : '200ms',
-            transitionDelay: isRevealed ? '400ms' : '0ms',
-          }}
-        >
-          {prefix !== '' && (
-            <span className="overflow-hidden text-ellipsis text-foreground-lighter">{prefix}</span>
+          className={cn(
+            'font-mono text-xs',
+            // This is necessary for the reveal on hover animation
+            'block inline-[max-content] whitespace-nowrap text-nowrap',
+            'transition-transform ease-linear motion-reduce:transition-none duration-1000 delay-400',
+            // This ensure no GPU jump when non-scrolling items are hovered
+            'translate-0',
+            // If the content (102% to have a small right margin) exceeds the container size (100cqi), the calc result will be a negative number
+            // This ensures small items don't translate
+            'group-hover:translate-x-[min(0px,calc(100cqi-102%))]'
           )}
-          <span className="shrink-0 text-foreground">{distinguishing}</span>
+        >
+          <span>
+            {prefix !== '' && (
+              <span className="overflow-hidden text-ellipsis text-foreground-lighter">
+                {prefix}
+              </span>
+            )}
+            <span className="shrink-0 text-foreground">{distinguishing}</span>
+          </span>
         </span>
       </span>
       <span className="shrink-0 pl-2">
diff --git a/apps/studio/components/interfaces/App/AppBannerWrapper.tsx b/apps/studio/components/interfaces/App/AppBannerWrapper.tsx
index 832f2769a756d..dbb1d6cef9601 100644
--- a/apps/studio/components/interfaces/App/AppBannerWrapper.tsx
+++ b/apps/studio/components/interfaces/App/AppBannerWrapper.tsx
@@ -30,7 +30,7 @@ export const AppBannerWrapper = ({ children }: PropsWithChildren<{}>) => {
         id: 'tos-update-banner',
         isDismissed: false,
         content: <BannerTOSUpdate />,
-        priority: 2,
+        priority: 0,
       })
     } else {
       dismissBanner('tos-update-banner')
diff --git a/apps/studio/components/interfaces/App/FeaturePreview/FeaturePreviewContext.tsx b/apps/studio/components/interfaces/App/FeaturePreview/FeaturePreviewContext.tsx
index 03691172a714d..2eeb77a318fc3 100644
--- a/apps/studio/components/interfaces/App/FeaturePreview/FeaturePreviewContext.tsx
+++ b/apps/studio/components/interfaces/App/FeaturePreview/FeaturePreviewContext.tsx
@@ -98,15 +98,13 @@ export const useIsColumnLevelPrivilegesEnabled = () => {
 }
 
 export const useUnifiedLogsPreview = () => {
-  const unifiedLogsDefaultOptIn = useFlag('unifiedLogsDefaultOptIn')
   const { flags, isInitialized, onUpdateFlag } = useFeaturePreviewContext()
 
   const isLoading = !isInitialized
   const isEnabled = IS_PLATFORM && flags[LOCAL_STORAGE_KEYS.UI_PREVIEW_UNIFIED_LOGS]
 
   const hasToggledPreview = !!safeLocalStorage.getItem(LOCAL_STORAGE_KEYS.UI_PREVIEW_UNIFIED_LOGS)
-  const isDefaultOptIn =
-    IS_PLATFORM && isInitialized && unifiedLogsDefaultOptIn && !hasToggledPreview
+  const isDefaultOptIn = IS_PLATFORM && !hasToggledPreview
 
   const enable = () => onUpdateFlag(LOCAL_STORAGE_KEYS.UI_PREVIEW_UNIFIED_LOGS, true)
   const disable = () => onUpdateFlag(LOCAL_STORAGE_KEYS.UI_PREVIEW_UNIFIED_LOGS, false)
diff --git a/apps/studio/components/interfaces/App/FeaturePreview/useFeaturePreviews.ts b/apps/studio/components/interfaces/App/FeaturePreview/useFeaturePreviews.ts
index a30be45c94144..607337c5384a3 100644
--- a/apps/studio/components/interfaces/App/FeaturePreview/useFeaturePreviews.ts
+++ b/apps/studio/components/interfaces/App/FeaturePreview/useFeaturePreviews.ts
@@ -36,7 +36,6 @@ export const useFeaturePreviews = (): FeaturePreview[] => {
   const isMarketplaceEnabled = useFlag('marketplaceIntegrations')
   const isDatabaseConnectionsEnabled = useFlag('topForPostgres')
 
-  const unifiedLogsDefaultOptIn = useFlag('unifiedLogsDefaultOptIn')
   const isSqlEditorManualSaveForced = useFlag('sqlEditorManualSaveForced')
 
   return useMemo(() => {
@@ -49,7 +48,7 @@ export const useFeaturePreviews = (): FeaturePreview[] => {
         enabled: true,
         isNew: true,
         isPlatformOnly: true,
-        isDefaultOptIn: unifiedLogsDefaultOptIn,
+        isDefaultOptIn: true,
         getRoute: (ref?: string) => `/project/${ref}/logs`,
       },
       {
@@ -142,7 +141,6 @@ export const useFeaturePreviews = (): FeaturePreview[] => {
 
     return previews.sort((a, b) => Number(b.isNew) - Number(a.isNew))
   }, [
-    unifiedLogsDefaultOptIn,
     isSqlEditorManualSaveForced,
     isPlatformWebhooksEnabled,
     jitDbAccessEnabled,
diff --git a/apps/studio/components/interfaces/Explorer/QueryEditor/DisplaySettingsButton.tsx b/apps/studio/components/interfaces/Explorer/QueryEditor/DisplaySettingsButton.tsx
index b8eb3785b0e6b..e093b3c2ddcac 100644
--- a/apps/studio/components/interfaces/Explorer/QueryEditor/DisplaySettingsButton.tsx
+++ b/apps/studio/components/interfaces/Explorer/QueryEditor/DisplaySettingsButton.tsx
@@ -18,11 +18,18 @@ import {
   TooltipTrigger,
 } from 'ui'
 import { FormItemLayout } from 'ui-patterns/form/FormItemLayout/FormItemLayout'
+import {
+  MultiSelector,
+  MultiSelectorContent,
+  MultiSelectorItem,
+  MultiSelectorList,
+  MultiSelectorTrigger,
+} from 'ui-patterns/multi-select'
 
 import { ExplorerToolbarAction } from '../ExplorerToolbar'
 import { type QueryDisplay, type QueryResult } from '../types'
 import { checkHasNonPositiveValues } from '@/components/ui/QueryBlock/QueryBlock.utils'
-import { type ChartConfig } from '@/data/content/notebooks/notebook-schema'
+import { MAX_CHART_Y_COLUMNS, type ChartConfig } from '@/data/content/notebooks/notebook-schema'
 
 interface DisplaySettingsButtonProps {
   display: QueryDisplay
@@ -32,9 +39,11 @@ interface DisplaySettingsButtonProps {
   onChange: (display: QueryDisplay) => void
 }
 
-// [Joshen] TODO support multiple y axis charts
-// [Joshen] TODO onUpdateChartConfig can likely be shifted into the notebook-state
-// so this component doesn't need to know about other cells
+const getLogScaleDisabledReason = (y_columns: string[]) => {
+  if (y_columns.length === 0) return 'Select a column for the Y axis first'
+  if (y_columns.length > 1) return 'Only available with a single Y axis column'
+  return 'Data contains zero or negative values'
+}
 
 export const DisplaySettingsButton = ({
   display,
@@ -58,8 +67,9 @@ export const DisplaySettingsButton = ({
     [result, y_columns]
   )
 
+  // Logarithmic scale only applies to a single series.
   const canToggleLogScale = useMemo(() => {
-    if (y_columns.length === 0 || !result || (result.rows ?? []).length === 0) return false
+    if (y_columns.length !== 1 || !result || (result.rows ?? []).length === 0) return false
     return !hasNonPositiveValues
   }, [hasNonPositiveValues, result, y_columns.length])
 
@@ -87,17 +97,17 @@ export const DisplaySettingsButton = ({
   })
 
   useEffect(() => {
-    if (hasNonPositiveValues && scale === 'log') {
+    if (scale === 'log' && (hasNonPositiveValues || y_columns.length > 1)) {
       resetToLinearScale()
     }
-  }, [hasNonPositiveValues, scale])
+  }, [hasNonPositiveValues, scale, y_columns.length])
 
   return (
     <Popover>
       <PopoverTrigger asChild>
         <ExplorerToolbarAction disabled={disabled} icon={<Settings2 />} tooltip="Result settings" />
       </PopoverTrigger>
-      <PopoverContent side="bottom" className="flex flex-col gap-y-3 p-0 py-3 mr-8">
+      <PopoverContent side="bottom" className="flex flex-col gap-y-3 p-0 py-3 mr-8 w-80">
         <div className="flex flex-col gap-y-3 px-3">
           <p className="text-xs tracking-tighter uppercase font-mono text-foreground-lighter">
             Result display settings
@@ -147,12 +157,17 @@ export const DisplaySettingsButton = ({
             </FormItemLayout>
 
             <div className="px-3 flex flex-col gap-y-2">
-              <FormItemLayout isReactForm={false} layout="flex-row-reverse" label="X axis">
+              <FormItemLayout
+                isReactForm={false}
+                layout="flex-row-reverse"
+                label="X axis"
+                className="[&>div:first-child]:xl:w-3/5"
+              >
                 <Select
                   value={x_column}
                   onValueChange={(x_column) => onUpdateChartConfig({ x_column })}
                 >
-                  <SelectTrigger className="w-32">
+                  <SelectTrigger className="w-full">
                     <SelectValue placeholder="Select a column" />
                   </SelectTrigger>
                   <SelectContent>
@@ -165,32 +180,59 @@ export const DisplaySettingsButton = ({
                 </Select>
               </FormItemLayout>
 
-              <FormItemLayout isReactForm={false} layout="flex-row-reverse" label="Y Axis">
-                <Select
-                  value={y_columns?.[0]}
-                  onValueChange={(y_column) => onUpdateChartConfig({ y_columns: [y_column] })}
+              <FormItemLayout
+                isReactForm={false}
+                layout="flex-row-reverse"
+                label="Y Axis"
+                className="[&>div:first-child]:xl:w-3/5"
+              >
+                <MultiSelector
+                  values={y_columns}
+                  onValuesChange={(values) => {
+                    if (values.length > MAX_CHART_Y_COLUMNS) return
+                    onUpdateChartConfig({ y_columns: values })
+                  }}
+                  className="w-full"
                 >
-                  <SelectTrigger className="w-32">
-                    <SelectValue placeholder="Select a column" />
-                  </SelectTrigger>
-                  <SelectContent>
-                    {columns.map((x) => (
-                      <SelectItem key={x} value={x}>
-                        {x}
-                      </SelectItem>
-                    ))}
-                  </SelectContent>
-                </Select>
+                  <MultiSelectorTrigger
+                    mode="inline-combobox"
+                    label={`Select up to ${MAX_CHART_Y_COLUMNS} columns`}
+                    deletableBadge
+                    badgeLimit="wrap"
+                    showIcon={false}
+                    className="min-w-32!"
+                  />
+                  <MultiSelectorContent>
+                    <MultiSelectorList>
+                      {columns.map((x) => (
+                        <MultiSelectorItem
+                          key={x}
+                          value={x}
+                          disabled={
+                            y_columns.length >= MAX_CHART_Y_COLUMNS && !y_columns.includes(x)
+                          }
+                        >
+                          {x}
+                        </MultiSelectorItem>
+                      ))}
+                    </MultiSelectorList>
+                  </MultiSelectorContent>
+                </MultiSelector>
               </FormItemLayout>
 
-              <FormItemLayout isReactForm={false} layout="flex-row-reverse" label="Scale">
+              <FormItemLayout
+                isReactForm={false}
+                layout="flex-row-reverse"
+                label="Scale"
+                className="[&>div:first-child]:xl:w-3/5"
+              >
                 <Select
                   value={scale}
                   onValueChange={(scale) =>
                     onUpdateChartConfig({ scale: scale as 'log' | 'linear' })
                   }
                 >
-                  <SelectTrigger className="w-32">
+                  <SelectTrigger className="w-full">
                     <SelectValue placeholder="Select a column" />
                   </SelectTrigger>
                   <SelectContent>
@@ -207,9 +249,7 @@ export const DisplaySettingsButton = ({
                       </TooltipTrigger>
                       {!canToggleLogScale && (
                         <TooltipContent side="left">
-                          {y_columns.length === 0
-                            ? 'Select a column for the Y axis first'
-                            : 'Data contains zero or negative values'}
+                          {getLogScaleDisabledReason(y_columns)}
                         </TooltipContent>
                       )}
                     </Tooltip>
diff --git a/apps/studio/components/interfaces/Explorer/QueryEditor/QueryResultChart.tsx b/apps/studio/components/interfaces/Explorer/QueryEditor/QueryResultChart.tsx
index 7028ca3116815..55c13a34c31a6 100644
--- a/apps/studio/components/interfaces/Explorer/QueryEditor/QueryResultChart.tsx
+++ b/apps/studio/components/interfaces/Explorer/QueryEditor/QueryResultChart.tsx
@@ -1,4 +1,5 @@
 import { useMemo } from 'react'
+import { type ChartConfig as ChartSeriesConfig } from 'ui'
 import { Chart, ChartBar, ChartCard, ChartContent, ChartLine } from 'ui-patterns/Chart'
 
 import { type QueryResult } from '../types'
@@ -11,8 +12,11 @@ interface QueryResultChartProps {
   result?: QueryResult
 }
 
-// [Joshen] Will need to implement log scale - refer to QueryBlock.tsx `effectiveLogScale`
-// [Joshen] Will also need to implement error handling where appropriate (e.g if query errors)
+const Y_COLUMN_COLORS = [
+  'hsl(var(--brand-default))',
+  'hsl(var(--chart-blue))',
+  'hsl(var(--chart-3))',
+]
 
 const toChartValue = (value: unknown): string | number => {
   if (typeof value === 'number' || typeof value === 'string') return value
@@ -24,17 +28,32 @@ export const QueryResultChart = ({ chart, result }: QueryResultChartProps) => {
   const { type, x_column, y_columns = [], cumulative, show_labels, scale } = chart ?? {}
 
   const hasConfig = !!x_column && y_columns.length > 0
+  // Logarithmic scale only makes sense for a single series — DisplaySettingsButton
+  // resets `scale` to linear once a second Y column is added
+  const effectiveScale = y_columns.length > 1 ? 'linear' : scale
+
+  const chartConfig: ChartSeriesConfig = useMemo(
+    () =>
+      y_columns.reduce((acc, key, index) => {
+        acc[key] = { label: key, color: Y_COLUMN_COLORS[index] }
+        return acc
+      }, {} as ChartSeriesConfig),
+    [y_columns]
+  )
+
   const chartRows = useMemo(() => {
     const xKey = x_column ?? ''
-    const yKey = y_columns[0] ?? ''
-    return (result?.rows ?? []).map((row) => ({
-      [xKey]: toChartValue(row[xKey]),
-      [yKey]: toChartValue(row[yKey]),
-    }))
+    return (result?.rows ?? []).map((row) => {
+      const chartRow: Record<string, string | number> = { [xKey]: toChartValue(row[xKey]) }
+      y_columns.forEach((yKey) => {
+        chartRow[yKey] = toChartValue(row[yKey])
+      })
+      return chartRow
+    })
   }, [result, x_column, y_columns])
 
   const cumulativeResults = useMemo(
-    () => getCumulativeResults({ rows: chartRows }, { yKey: y_columns[0] ?? '' }),
+    () => getCumulativeResults({ rows: chartRows }, { yKey: y_columns }),
     [chartRows, y_columns]
   )
   const resultToRender = cumulative ? cumulativeResults : chartRows
@@ -71,13 +90,15 @@ export const QueryResultChart = ({ chart, result }: QueryResultChartProps) => {
                 isFullHeight
                 xKey={x_column}
                 dataKey={y_columns[0]}
+                dataKeys={y_columns}
+                config={chartConfig}
                 showXAxis={show_labels}
                 showYAxis={show_labels}
                 data={resultToRender}
                 YAxisProps={{
-                  scale: scale === 'log' ? 'log' : 'auto',
-                  domain: scale === 'log' ? [1, 'auto'] : undefined,
-                  tickFormatter: scale === 'log' ? formatLogTick : undefined,
+                  scale: effectiveScale === 'log' ? 'log' : 'auto',
+                  domain: effectiveScale === 'log' ? [1, 'auto'] : undefined,
+                  tickFormatter: effectiveScale === 'log' ? formatLogTick : undefined,
                 }}
               />
             )}
@@ -86,13 +107,15 @@ export const QueryResultChart = ({ chart, result }: QueryResultChartProps) => {
                 isFullHeight
                 xKey={x_column}
                 dataKey={y_columns[0]}
+                dataKeys={y_columns}
+                config={chartConfig}
                 showXAxis={show_labels}
                 showYAxis={show_labels}
                 data={resultToRender}
                 YAxisProps={{
-                  scale: scale === 'log' ? 'log' : 'auto',
-                  domain: scale === 'log' ? [1, 'auto'] : undefined,
-                  tickFormatter: scale === 'log' ? formatLogTick : undefined,
+                  scale: effectiveScale === 'log' ? 'log' : 'auto',
+                  domain: effectiveScale === 'log' ? [1, 'auto'] : undefined,
+                  tickFormatter: effectiveScale === 'log' ? formatLogTick : undefined,
                 }}
               />
             )}
diff --git a/apps/studio/components/interfaces/Explorer/QueryEditor/QuerySourceMenu.tsx b/apps/studio/components/interfaces/Explorer/QueryEditor/QuerySourceMenu.tsx
index 450df7cec6f2c..61f6ffb8b6adc 100644
--- a/apps/studio/components/interfaces/Explorer/QueryEditor/QuerySourceMenu.tsx
+++ b/apps/studio/components/interfaces/Explorer/QueryEditor/QuerySourceMenu.tsx
@@ -26,6 +26,7 @@ import {
 import { type RoleImpersonationController } from '@/state/role-impersonation-state'
 
 export type QuerySourceMenuProps = {
+  disabled?: boolean
   rowLimit?: number
   onRowLimitChange?: (val: number) => void
   roleImpersonationState?: RoleImpersonationController
@@ -43,6 +44,7 @@ export type QuerySourceMenuProps = {
  * has SQL to preserve or discard and a fresh draft does not.
  */
 export const QuerySourceMenu = ({
+  disabled = false,
   rowLimit = 100,
   onRowLimitChange,
   roleImpersonationState,
@@ -74,6 +76,7 @@ export const QuerySourceMenu = ({
       <DropdownMenu>
         <DropdownMenuTrigger asChild>
           <Button
+            disabled={disabled}
             variant="text"
             size="tiny"
             aria-label={`Query source: ${QUERY_SOURCE_LABELS[source._tag]}`}
diff --git a/apps/studio/components/interfaces/Explorer/QueryEditor/index.tsx b/apps/studio/components/interfaces/Explorer/QueryEditor/index.tsx
index 29b970fa242be..150df0f12d36c 100644
--- a/apps/studio/components/interfaces/Explorer/QueryEditor/index.tsx
+++ b/apps/studio/components/interfaces/Explorer/QueryEditor/index.tsx
@@ -2,7 +2,7 @@ import { acceptUntrustedSql, untrustedSql, type UntrustedSqlFragment } from '@su
 import { useFlag } from 'common'
 import { CodeSquare, Eye, EyeOff, Play } from 'lucide-react'
 import { forwardRef, useImperativeHandle, useState, type ReactNode } from 'react'
-import { cn } from 'ui'
+import { Button, cn } from 'ui'
 
 import { resolveLogTimeRange } from '../../QuerySources/LogTimeRange.utils'
 import {
@@ -25,6 +25,7 @@ import { QueryResultRenderer } from './QueryResultRenderer'
 import { QuerySourceMenu } from './QuerySourceMenu'
 import { LegacyLogsRewriteBanner } from '@/components/interfaces/Settings/Logs/LegacyLogsRewriteBanner'
 import { CodeEditor } from '@/components/ui/CodeEditor/CodeEditor'
+import { DiffEditor } from '@/components/ui/DiffEditor'
 import {
   type DatabaseSourceParameters,
   type LogsSourceParameters,
@@ -44,6 +45,7 @@ import {
 import { useReadReplicasQuery } from '@/data/read-replicas/replicas-query'
 import { useExecuteSqlMutation } from '@/data/sql/execute-sql-mutation'
 import { applyAutoLimit } from '@/data/sql/utils'
+import { type LegacyLogsRewriteProposal } from '@/hooks/analytics/useLegacyLogsRewrite'
 import { useLatest } from '@/hooks/misc/useLatest'
 import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'
 import { wrapWithRoleImpersonation } from '@/lib/role-impersonation'
@@ -129,6 +131,7 @@ export const QueryEditor = forwardRef<QueryEditorHandle, QueryEditorProps>(funct
   const databaseIdentifier = query._tag === 'database' ? query.database_identifier : undefined
 
   const [showQuery, setShowQuery] = useState(true)
+  const [rewriteProposal, setRewriteProposal] = useState<LegacyLogsRewriteProposal | null>(null)
 
   const { data: databases, isPending: isLoadingDatabases } = useReadReplicasQuery(
     { projectRef: project?.ref },
@@ -163,7 +166,7 @@ export const QueryEditor = forwardRef<QueryEditorHandle, QueryEditorProps>(funct
    * Postgres SQL cannot reach the analytics wire or vice versa.
    */
   const handleRunQuery = async (rawSql: string = sql) => {
-    if (!project || isBusy || rawSql.trim().length === 0) return
+    if (!project || isBusy || rewriteProposal || rawSql.trim().length === 0) return
 
     onSqlCommit?.(rawSql)
 
@@ -208,6 +211,17 @@ export const QueryEditor = forwardRef<QueryEditorHandle, QueryEditorProps>(funct
     }).catch(() => {})
   }
 
+  const acceptRewrite = () => {
+    if (!rewriteProposal) return
+    if (sql === rewriteProposal.original) {
+      onSqlChange(rewriteProposal.modified)
+      onSqlCommit?.(rewriteProposal.modified)
+    }
+    setRewriteProposal(null)
+  }
+
+  const discardRewrite = () => setRewriteProposal(null)
+
   useImperativeHandle(ref, () => ({ run: () => handleRunQuery() }))
 
   const Shell = variant === 'viewport' ? ExplorerQueryViewport : ExplorerQuery
@@ -223,8 +237,12 @@ export const QueryEditor = forwardRef<QueryEditorHandle, QueryEditorProps>(funct
           {toolbarActions}
           {onSourceChange && (
             <QuerySourceMenu
+              disabled={rewriteProposal !== null}
               source={toQuerySourceBinding(query)}
-              onSourceChange={onSourceChange}
+              onSourceChange={(source) => {
+                setRewriteProposal(null)
+                onSourceChange(source)
+              }}
               rowLimit={rowLimit}
               onRowLimitChange={onRowLimitChange}
               roleImpersonationState={roleImpersonationState}
@@ -241,6 +259,7 @@ export const QueryEditor = forwardRef<QueryEditorHandle, QueryEditorProps>(funct
           )}
           <ExplorerToolbarAction
             icon={showQuery ? <EyeOff /> : <Eye />}
+            disabled={rewriteProposal !== null}
             tooltip={showQuery ? 'Hide query' : 'Show query'}
             onClick={() => setShowQuery((value) => !value)}
           />
@@ -248,7 +267,9 @@ export const QueryEditor = forwardRef<QueryEditorHandle, QueryEditorProps>(funct
             loading={isExecuting || isLoadingProject}
             icon={<Play />}
             tooltip="Run query"
-            disabled={isLoadingProject || isExecuting || sql.trim().length === 0}
+            disabled={
+              isLoadingProject || isExecuting || rewriteProposal !== null || sql.trim().length === 0
+            }
             onClick={() => handleRunQuery()}
           >
             Run
@@ -262,10 +283,8 @@ export const QueryEditor = forwardRef<QueryEditorHandle, QueryEditorProps>(funct
             isLogsSource={query._tag === 'logs'}
             sql={sql}
             readSql={() => sqlRef.current}
-            onProposal={({ modified }) => {
-              onSqlChange(modified)
-              onSqlCommit?.(modified)
-            }}
+            onProposal={setRewriteProposal}
+            hidden={rewriteProposal !== null}
           />
           <ExplorerQueryEditor
             className={cn('relative', variant === 'viewport' ? 'h-[45%] min-h-48' : undefined)}
@@ -284,6 +303,30 @@ export const QueryEditor = forwardRef<QueryEditorHandle, QueryEditorProps>(funct
                 editor.onDidBlurEditorWidget(() => onSqlCommitRef.current?.(sqlRef.current))
               }}
             />
+            {rewriteProposal && (
+              <div className="absolute inset-0 z-10 flex flex-col bg-studio">
+                <div className="flex items-center justify-between gap-2 border-b bg-surface-100 px-3 py-2">
+                  <span className="text-xs text-foreground-light">
+                    Review the ClickHouse SQL rewrite before accepting it
+                  </span>
+                  <div className="flex items-center gap-2">
+                    <Button variant="default" size="tiny" onClick={discardRewrite}>
+                      Discard
+                    </Button>
+                    <Button variant="primary" size="tiny" onClick={acceptRewrite}>
+                      Accept
+                    </Button>
+                  </div>
+                </div>
+                <div className="min-h-0 flex-1">
+                  <DiffEditor
+                    language="pgsql"
+                    original={rewriteProposal.original}
+                    modified={rewriteProposal.modified}
+                  />
+                </div>
+              </div>
+            )}
           </ExplorerQueryEditor>
         </>
       )}
diff --git a/apps/studio/components/interfaces/Observability/DatabaseConnections/ActivityRow.tsx b/apps/studio/components/interfaces/Observability/DatabaseConnections/ActivityRow.tsx
index 8f40dd2a16545..829290f74a2ef 100644
--- a/apps/studio/components/interfaces/Observability/DatabaseConnections/ActivityRow.tsx
+++ b/apps/studio/components/interfaces/Observability/DatabaseConnections/ActivityRow.tsx
@@ -149,11 +149,12 @@ export const ActivityRow = ({
         activity.state === 'idle in transaction (aborted)') &&
         durationSeconds >= WARN_DURATION_IDLE_TXN))
 
-  const onCancelQuery = async () => {
+  const onCancelQuery = async (origin: 'dropdown_menu' | 'terminate_dialog') => {
     const isBlocking = (data ?? []).some((x) => x.blocked_by.includes(activity.pid))
     track('query_cancel_button_clicked', {
       activityState: activity.state,
       isBlocking,
+      origin,
     })
 
     const toastId = toast.loading(`Cancelling query (ID: ${activity.pid})`)
@@ -445,7 +446,7 @@ export const ActivityRow = ({
                 disabled={
                   activity.state !== 'active' || superuserRoles?.includes(activity.role_name)
                 }
-                onClick={onCancelQuery}
+                onClick={() => onCancelQuery('dropdown_menu')}
                 tooltip={{
                   content: {
                     side: 'left',
@@ -503,7 +504,10 @@ export const ActivityRow = ({
             <AlertDialogCancel>Back</AlertDialogCancel>
             <div className="flex items-center gap-x-2">
               {activity.state === 'active' && (
-                <AlertDialogAction variant="default" onClick={onCancelQuery}>
+                <AlertDialogAction
+                  variant="default"
+                  onClick={() => onCancelQuery('terminate_dialog')}
+                >
                   Cancel query
                 </AlertDialogAction>
               )}
diff --git a/apps/studio/components/interfaces/Realtime/RealtimeSettings.tsx b/apps/studio/components/interfaces/Realtime/RealtimeSettings.tsx
index 52e2a3adb1330..13963a9f4a1f0 100644
--- a/apps/studio/components/interfaces/Realtime/RealtimeSettings.tsx
+++ b/apps/studio/components/interfaces/Realtime/RealtimeSettings.tsx
@@ -23,6 +23,7 @@ import {
 import { Admonition } from 'ui-patterns/Admonition'
 import ConfirmationModal from 'ui-patterns/Dialogs/ConfirmationModal'
 import { FormItemLayout } from 'ui-patterns/form/FormItemLayout/FormItemLayout'
+import { GenericSkeletonLoader } from 'ui-patterns/ShimmeringLoader'
 import * as z from 'zod'
 
 import { AlertError } from '@/components/ui/AlertError'
@@ -35,12 +36,20 @@ import {
   REALTIME_DEFAULT_CONFIG,
   useRealtimeConfigurationQuery,
 } from '@/data/realtime/realtime-config-query'
+import { useCheckEntitlements } from '@/hooks/misc/useCheckEntitlements'
 import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
 import { useSelectedOrganizationQuery } from '@/hooks/misc/useSelectedOrganization'
 import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'
 
 const formId = 'realtime-configuration-form'
 
+const REALTIME_SOFT_LIMITS = {
+  max_concurrent_users: 50_000,
+  max_events_per_second: 50_000,
+  max_presence_events_per_second: 5_000,
+  max_payload_size_in_kb: 3_000,
+}
+
 export const RealtimeSettings = () => {
   const { ref: projectRef } = useParams()
   const { data: project } = useSelectedProjectQuery()
@@ -56,7 +65,7 @@ export const RealtimeSettings = () => {
     projectRef: project?.ref,
     connectionString: project?.connectionString,
   })
-  const { data, error, isError } = useRealtimeConfigurationQuery({
+  const { data, error, isError, isPending } = useRealtimeConfigurationQuery({
     projectRef,
   })
 
@@ -66,6 +75,45 @@ export const RealtimeSettings = () => {
     schemas: ['realtime'],
   })
 
+  // Per-plan realtime ceilings come from the org's entitlements (plan + any overrides).
+  // The effective limit is the lower of the entitlement and the soft cap, so an unlimited
+  // plan is still bounded and self-hosted / loading falls back to the soft cap.
+  const { getEntitlementMax: getMaxConcurrentUsers, isSuccess: isSuccessMaxConcurrentUsers } =
+    useCheckEntitlements('realtime.max_concurrent_users')
+  const { getEntitlementMax: getMaxEventsPerSecond, isSuccess: isSuccessMaxEventsPerSecond } =
+    useCheckEntitlements('realtime.max_events_per_second')
+  const {
+    getEntitlementMax: getMaxPresenceEventsPerSecond,
+    isSuccess: isSuccessMaxPresenceEventsPerSecond,
+  } = useCheckEntitlements('realtime.max_presence_events_per_second')
+  const { getEntitlementMax: getMaxPayloadSizeInKb, isSuccess: isSuccessMaxPayloadSizeInKb } =
+    useCheckEntitlements('realtime.max_payload_size_in_kb')
+
+  const isRealtimeEntitlementsLoaded =
+    isSuccessMaxConcurrentUsers &&
+    isSuccessMaxEventsPerSecond &&
+    isSuccessMaxPresenceEventsPerSecond &&
+    isSuccessMaxPayloadSizeInKb
+
+  const isLoading = isPending || !isRealtimeEntitlementsLoaded
+
+  const maxConcurrentUsersLimit = Math.min(
+    getMaxConcurrentUsers() ?? Infinity,
+    REALTIME_SOFT_LIMITS.max_concurrent_users
+  )
+  const maxEventsPerSecondLimit = Math.min(
+    getMaxEventsPerSecond() ?? Infinity,
+    REALTIME_SOFT_LIMITS.max_events_per_second
+  )
+  const maxPresenceEventsPerSecondLimit = Math.min(
+    getMaxPresenceEventsPerSecond() ?? Infinity,
+    REALTIME_SOFT_LIMITS.max_presence_events_per_second
+  )
+  const maxPayloadSizeInKbLimit = Math.min(
+    getMaxPayloadSizeInKb() ?? Infinity,
+    REALTIME_SOFT_LIMITS.max_payload_size_in_kb
+  )
+
   const isFreePlan = organization?.plan.id === 'free'
   const isUsageBillingEnabled = organization?.usage_billing_enabled
   const isRealtimeDisabled = data?.suspend ?? REALTIME_DEFAULT_CONFIG.suspend
@@ -93,10 +141,38 @@ export const RealtimeSettings = () => {
         .min(1)
         .max(maxConn?.maxConnections ?? 100)
         .optional(),
-      max_concurrent_users: z.coerce.number().min(1).max(50000).optional(),
-      max_events_per_second: z.coerce.number().min(1).max(50000).optional(),
-      max_presence_events_per_second: z.coerce.number().min(1).max(5000).optional(),
-      max_payload_size_in_kb: z.coerce.number().min(1).max(10000).optional(),
+      max_concurrent_users: z.coerce
+        .number()
+        .min(1)
+        .max(
+          maxConcurrentUsersLimit,
+          `Cannot exceed ${maxConcurrentUsersLimit.toLocaleString()} concurrent clients`
+        )
+        .optional(),
+      max_events_per_second: z.coerce
+        .number()
+        .min(1)
+        .max(
+          maxEventsPerSecondLimit,
+          `Cannot exceed ${maxEventsPerSecondLimit.toLocaleString()} events per second`
+        )
+        .optional(),
+      max_presence_events_per_second: z.coerce
+        .number()
+        .min(1)
+        .max(
+          maxPresenceEventsPerSecondLimit,
+          `Cannot exceed ${maxPresenceEventsPerSecondLimit.toLocaleString()} presence events per second`
+        )
+        .optional(),
+      max_payload_size_in_kb: z.coerce
+        .number()
+        .min(1)
+        .max(
+          maxPayloadSizeInKbLimit,
+          `Cannot exceed ${maxPayloadSizeInKbLimit.toLocaleString()} KB`
+        )
+        .optional(),
       // [Joshen] These fields are temporarily hidden from the UI
       // max_bytes_per_second: z.coerce.number().min(1).max(10000000).optional(),
       // max_channels_per_client: z.coerce.number().min(1).max(10000).optional(),
@@ -110,10 +186,34 @@ export const RealtimeSettings = () => {
         .number()
         .min(1)
         .max(maxConn?.maxConnections ?? 100),
-      max_concurrent_users: z.coerce.number().min(1).max(50000),
-      max_events_per_second: z.coerce.number().min(1).max(50000),
-      max_presence_events_per_second: z.coerce.number().min(1).max(5000),
-      max_payload_size_in_kb: z.coerce.number().min(1).max(10000),
+      max_concurrent_users: z.coerce
+        .number()
+        .min(1)
+        .max(
+          maxConcurrentUsersLimit,
+          `Cannot exceed ${maxConcurrentUsersLimit.toLocaleString()} concurrent clients`
+        ),
+      max_events_per_second: z.coerce
+        .number()
+        .min(1)
+        .max(
+          maxEventsPerSecondLimit,
+          `Cannot exceed ${maxEventsPerSecondLimit.toLocaleString()} events per second`
+        ),
+      max_presence_events_per_second: z.coerce
+        .number()
+        .min(1)
+        .max(
+          maxPresenceEventsPerSecondLimit,
+          `Cannot exceed ${maxPresenceEventsPerSecondLimit.toLocaleString()} presence events per second`
+        ),
+      max_payload_size_in_kb: z.coerce
+        .number()
+        .min(1)
+        .max(
+          maxPayloadSizeInKbLimit,
+          `Cannot exceed ${maxPayloadSizeInKbLimit.toLocaleString()} KB`
+        ),
       // [Joshen] These fields are temporarily hidden from the UI
       // max_bytes_per_second: z.coerce.number().min(1).max(10000000),
       // max_channels_per_client: z.coerce.number().min(1).max(10000),
@@ -123,16 +223,32 @@ export const RealtimeSettings = () => {
     }),
   ])
 
+  const configValues = data ?? REALTIME_DEFAULT_CONFIG
+  const sharedFormValues = {
+    connection_pool: configValues.connection_pool ?? REALTIME_DEFAULT_CONFIG.connection_pool,
+    max_concurrent_users:
+      configValues.max_concurrent_users ?? REALTIME_DEFAULT_CONFIG.max_concurrent_users,
+    max_events_per_second:
+      configValues.max_events_per_second ?? REALTIME_DEFAULT_CONFIG.max_events_per_second,
+    max_presence_events_per_second:
+      configValues.max_presence_events_per_second ??
+      REALTIME_DEFAULT_CONFIG.max_presence_events_per_second,
+    max_payload_size_in_kb:
+      configValues.max_payload_size_in_kb ?? REALTIME_DEFAULT_CONFIG.max_payload_size_in_kb,
+    allow_public: !(configValues.private_only ?? REALTIME_DEFAULT_CONFIG.private_only),
+  }
+  const formValues: z.infer<typeof FormSchema> = {
+    suspend: configValues.suspend ?? REALTIME_DEFAULT_CONFIG.suspend,
+    ...sharedFormValues,
+  }
+
   const form = useForm<z.infer<typeof FormSchema>>({
     resolver: zodResolver(FormSchema),
     defaultValues: {
       ...REALTIME_DEFAULT_CONFIG,
       allow_public: !REALTIME_DEFAULT_CONFIG.private_only,
     },
-    values: {
-      ...(data ?? REALTIME_DEFAULT_CONFIG),
-      allow_public: !(data?.private_only ?? REALTIME_DEFAULT_CONFIG.private_only),
-    } as any,
+    values: formValues,
   })
 
   const [allow_public, suspend] = useWatch({
@@ -145,11 +261,13 @@ export const RealtimeSettings = () => {
 
   const onSubmit: SubmitHandler<z.infer<typeof FormSchema>> = (_data) => {
     if (!projectRef) return console.error('Project ref is required')
+    if (!isRealtimeEntitlementsLoaded) return
     setIsConfirmNextModalOpen(true)
   }
 
   const onConfirmSave = () => {
     if (!projectRef) return console.error('Project ref is required')
+    if (!isRealtimeEntitlementsLoaded) return
     const values = form.getValues()
 
     // [Joshen] Casting to `Number` here as the values are being set as string when edited in the form
@@ -184,6 +302,16 @@ export const RealtimeSettings = () => {
     })
   }
 
+  if (isLoading) {
+    return (
+      <Card>
+        <CardContent>
+          <GenericSkeletonLoader />
+        </CardContent>
+      </Card>
+    )
+  }
+
   return (
     <>
       <Form {...form}>
@@ -207,6 +335,7 @@ export const RealtimeSettings = () => {
                         <FormControl>
                           <Switch
                             id="suspend"
+                            aria-label="Toggle enabling of realtime service"
                             checked={!field.value}
                             onCheckedChange={(checked) => field.onChange(!checked)}
                             disabled={!canUpdateConfig}
@@ -221,30 +350,25 @@ export const RealtimeSettings = () => {
                   <Admonition
                     showIcon={false}
                     type={isDisablingRealtime || isEnablingRealtime ? 'warning' : 'default'}
-                  >
-                    <div className="flex items-center gap-x-2">
-                      <div>
-                        <h5 className="text-foreground mb-1">
-                          {isDisablingRealtime
-                            ? 'Realtime service will be disabled'
-                            : isEnablingRealtime
-                              ? 'Realtime service will be re-enabled'
-                              : isRealtimeDisabled
-                                ? 'Realtime service is disabled'
-                                : null}
-                        </h5>
-                        <p className="text-foreground-light">
-                          {isDisablingRealtime
-                            ? 'Clients will no longer be able to connect to your project’s realtime service once saved'
-                            : isEnablingRealtime
-                              ? "Clients will be able to connect to your project's realtime service again once saved"
-                              : isRealtimeDisabled
-                                ? 'You will need to enable it to continue using Realtime'
-                                : null}
-                        </p>
-                      </div>
-                    </div>
-                  </Admonition>
+                    title={
+                      isDisablingRealtime
+                        ? 'Realtime service will be disabled'
+                        : isEnablingRealtime
+                          ? 'Realtime service will be re-enabled'
+                          : isRealtimeDisabled
+                            ? 'Realtime service is disabled'
+                            : ''
+                    }
+                    description={
+                      isDisablingRealtime
+                        ? 'Clients will no longer be able to connect to your project’s realtime service once saved'
+                        : isEnablingRealtime
+                          ? "Clients will be able to connect to your project's realtime service again once saved"
+                          : isRealtimeDisabled
+                            ? 'You will need to enable it to continue using Realtime'
+                            : null
+                    }
+                  />
                 )}
               </CardContent>
 
@@ -265,6 +389,7 @@ export const RealtimeSettings = () => {
                             <FormControl>
                               <Switch
                                 id="allow_public"
+                                aria-label="Toggle allow public access"
                                 checked={field.value}
                                 onCheckedChange={field.onChange}
                                 disabled={!canUpdateConfig}
@@ -278,25 +403,23 @@ export const RealtimeSettings = () => {
                             !isRealtimeDisabled && (
                               <Admonition
                                 showIcon={false}
+                                className="mt-2"
                                 type="warning"
                                 title="No Realtime RLS policies found"
                                 description={
-                                  <>
-                                    <p className="prose max-w-full text-sm">
-                                      Private mode is {isSettingToPrivate ? 'being ' : ''}
-                                      enabled, but no RLS policies exists on the{' '}
-                                      <code className="text-code-inline">
-                                        realtime.messages
-                                      </code>{' '}
-                                      table. No messages will be received by users.
-                                    </p>
-
-                                    <Button asChild variant="default" className="mt-2">
-                                      <Link href={`/project/${projectRef}/realtime/policies`}>
-                                        Create policy
-                                      </Link>
-                                    </Button>
-                                  </>
+                                  <p className="prose max-w-full text-sm">
+                                    Private mode is {isSettingToPrivate ? 'being ' : ''}
+                                    enabled, but no RLS policies exist on the{' '}
+                                    <code className="text-code-inline">realtime.messages</code>{' '}
+                                    table. No messages will be received by users.
+                                  </p>
+                                }
+                                actions={
+                                  <Button asChild variant="default">
+                                    <Link href={`/project/${projectRef}/realtime/policies`}>
+                                      Create policy
+                                    </Link>
+                                  </Button>
                                 }
                               />
                             )}
@@ -555,7 +678,7 @@ export const RealtimeSettings = () => {
                 </div>
                 <div className="flex items-center gap-x-2">
                   {form.formState.isDirty && (
-                    <Button variant="default" onClick={() => form.reset(data as any)}>
+                    <Button variant="default" onClick={() => form.reset(formValues)}>
                       Cancel
                     </Button>
                   )}
@@ -563,7 +686,12 @@ export const RealtimeSettings = () => {
                     variant="primary"
                     type="submit"
                     form={formId}
-                    disabled={!canUpdateConfig || isUpdatingConfig || !form.formState.isDirty}
+                    disabled={
+                      !canUpdateConfig ||
+                      isUpdatingConfig ||
+                      !form.formState.isDirty ||
+                      !isRealtimeEntitlementsLoaded
+                    }
                     loading={isUpdatingConfig}
                   >
                     Save changes
diff --git a/apps/studio/components/layouts/ExplorerLayout/ExplorerLayout.tsx b/apps/studio/components/layouts/ExplorerLayout/ExplorerLayout.tsx
index ce1fc5158f33d..75ed7b5d2bb21 100644
--- a/apps/studio/components/layouts/ExplorerLayout/ExplorerLayout.tsx
+++ b/apps/studio/components/layouts/ExplorerLayout/ExplorerLayout.tsx
@@ -37,9 +37,12 @@ export interface ExplorerLayoutProps extends ComponentProps<typeof ProjectLayout
 
 export const ExplorerLayout = ({ browserTitle, children, title }: ExplorerLayoutProps) => {
   const [section, setSection] = useState<ExplorerResourceType>()
+  const tabs = useTabsStateSnapshot()
 
-  // [Joshen] Temporary, to hook up with tabs store
-  const activeTabLabel = 'Active Tab Label'
+  const activeTab = tabs.activeTab ? tabs.tabsMap[tabs.activeTab] : undefined
+  const isActiveExplorerTab =
+    activeTab !== undefined && editorEntityTypes.explorer.includes(activeTab.type)
+  const activeTabLabel = isActiveExplorerTab ? activeTab.label || 'Untitled' : 'Explorer'
 
   const mergedBrowserTitle = {
     ...browserTitle,
diff --git a/apps/studio/components/layouts/ProjectLayout/index.test.tsx b/apps/studio/components/layouts/ProjectLayout/index.test.tsx
index d7bd6257232f2..e02dcd5f7ddaa 100644
--- a/apps/studio/components/layouts/ProjectLayout/index.test.tsx
+++ b/apps/studio/components/layouts/ProjectLayout/index.test.tsx
@@ -79,7 +79,6 @@ vi.mock('common', () => ({
       `free-micro-upgrade-banner-dismissed-${ref}`,
     PROJECT_INTEGRATION_BANNER_DISMISSED: (ref: string, integrationSource: string) =>
       `project-integration-banner-dismissed-${ref}-${integrationSource}`,
-    UNIFIED_LOGS_BANNER_DISMISSED: 'unified-logs-banner-dismissed',
   },
   isFeatureEnabled: () => false,
 }))
@@ -177,7 +176,6 @@ vi.mock('@/hooks/misc/useLocalStorage', () => ({
 vi.mock('@/components/ui/BannerStack/BannerStackProvider', () => ({
   BANNER_ID: {
     FREE_MICRO_UPGRADE: 'free-micro-upgrade-banner',
-    UNIFIED_LOGS: 'unified-logs-banner',
   },
   useBannerStack: () => ({
     addBanner: mockAddBanner,
@@ -190,19 +188,6 @@ vi.mock('@/components/ui/BannerStack/Banners/BannerFreeMicroUpgrade', () => ({
   BannerFreeMicroUpgrade: () => null,
 }))
 
-vi.mock('@/components/ui/BannerStack/Banners/BannerUnifiedLogs', () => ({
-  BannerUnifiedLogs: () => null,
-}))
-
-vi.mock('@/components/interfaces/App/FeaturePreview/FeaturePreviewContext', () => ({
-  useUnifiedLogsPreview: () => ({
-    isEnabled: false,
-    isLoading: false,
-    enable: () => {},
-    disable: () => {},
-  }),
-}))
-
 vi.mock('@/data/usage/resource-warnings-query', () => ({
   useResourceWarningsQuery: () => ({ data: mockResourceWarningsState.current }),
 }))
diff --git a/apps/studio/components/layouts/ProjectLayout/index.tsx b/apps/studio/components/layouts/ProjectLayout/index.tsx
index d9d487962d34f..85a04b89b605a 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, useParams } from 'common'
 import { AnimatePresence, motion } from 'framer-motion'
 import { XIcon } from 'lucide-react'
 import Head from 'next/head'
@@ -43,7 +43,6 @@ import { UpgradingState } from './UpgradingState'
 import { CreateBranchModal } from '@/components/interfaces/BranchManagement/CreateBranchModal'
 import { ProjectAPIDocs } from '@/components/interfaces/ProjectAPIDocs/ProjectAPIDocs'
 import { BannerFreeMicroUpgrade } from '@/components/ui/BannerStack/Banners/BannerFreeMicroUpgrade'
-import { BannerUnifiedLogs } from '@/components/ui/BannerStack/Banners/BannerUnifiedLogs'
 import { BANNER_ID, useBannerStack } from '@/components/ui/BannerStack/BannerStackProvider'
 import { ButtonTooltip } from '@/components/ui/ButtonTooltip'
 import PartnerIcon from '@/components/ui/PartnerIcon'
@@ -155,10 +154,6 @@ export const ProjectLayout = forwardRef<HTMLDivElement, PropsWithChildren<Projec
       LOCAL_STORAGE_KEYS.FREE_MICRO_UPGRADE_BANNER_DISMISSED(selectedProject?.ref ?? ''),
       false
     )
-    const [isUnifiedLogsBannerDismissed] = useLocalStorageQuery(
-      LOCAL_STORAGE_KEYS.UNIFIED_LOGS_BANNER_DISMISSED,
-      false
-    )
     const [isProjectIntegrationBannerDismissed, setIsProjectIntegrationBannerDismissed] =
       useLocalStorageQuery(
         getProjectIntegrationBannerDismissKey({
@@ -236,20 +231,6 @@ export const ProjectLayout = forwardRef<HTMLDivElement, PropsWithChildren<Projec
       dismissBanner,
     ])
 
-    useEffect(() => {
-      if (!selectedProject?.ref) return
-      if (IS_PLATFORM && !isUnifiedLogsBannerDismissed) {
-        addBanner({
-          id: BANNER_ID.UNIFIED_LOGS,
-          isDismissed: false,
-          content: <BannerUnifiedLogs />,
-          priority: 1,
-        })
-      } else {
-        dismissBanner(BANNER_ID.UNIFIED_LOGS)
-      }
-    }, [selectedProject?.ref, isUnifiedLogsBannerDismissed, addBanner, dismissBanner])
-
     useLayoutEffect(() => {
       const unregister = registerOpenMenu(() => {
         setMobileSheetContent(
diff --git a/apps/studio/components/ui/BannerStack/BannerStackProvider.tsx b/apps/studio/components/ui/BannerStack/BannerStackProvider.tsx
index 5049cd000e0aa..60615a560789a 100644
--- a/apps/studio/components/ui/BannerStack/BannerStackProvider.tsx
+++ b/apps/studio/components/ui/BannerStack/BannerStackProvider.tsx
@@ -7,7 +7,6 @@ export const BANNER_ID = {
   RLS_EVENT_TRIGGER: 'rls-event-trigger-banner',
   FREE_MICRO_UPGRADE: 'free-micro-upgrade-banner',
   TOS_UPDATE: 'tos-update-banner',
-  UNIFIED_LOGS: 'unified-logs-banner',
 } as const
 
 export type BannerId = (typeof BANNER_ID)[keyof typeof BANNER_ID]
diff --git a/apps/studio/components/ui/BannerStack/Banners/BannerUnifiedLogs.tsx b/apps/studio/components/ui/BannerStack/Banners/BannerUnifiedLogs.tsx
deleted file mode 100644
index 9d417dfcebc1e..0000000000000
--- a/apps/studio/components/ui/BannerStack/Banners/BannerUnifiedLogs.tsx
+++ /dev/null
@@ -1,173 +0,0 @@
-import { LOCAL_STORAGE_KEYS } from 'common'
-import { useParams } from 'common/hooks'
-import dayjs from 'dayjs'
-import { AnimatePresence, motion } from 'framer-motion'
-import Link from 'next/link'
-import { useEffect, useRef, useState } from 'react'
-import { Badge, Button, cn } from 'ui'
-
-import { BannerCard } from '../BannerCard'
-import { useBannerStack } from '../BannerStackProvider'
-import {
-  useFeaturePreviewModal,
-  useUnifiedLogsPreview,
-} from '@/components/interfaces/App/FeaturePreview/FeaturePreviewContext'
-import { useLocalStorageQuery } from '@/hooks/misc/useLocalStorage'
-import { useTrack } from '@/lib/telemetry/track'
-
-// Number of rows visible in the carousel viewport. We keep one extra row in
-// state so the row sliding out of view has something to animate towards.
-const VISIBLE_ROWS = 3
-const ROW_HEIGHT = 28
-const TICK_MS = 3000
-
-const SAMPLES = [200, 200, 201, 200, 304, 400, 200, 500] as const
-
-interface LogEntry {
-  id: number
-  timestamp: string
-  status: number
-}
-
-const makeEntry = (id: number, offsetSeconds = 0): LogEntry => ({
-  id,
-  timestamp: dayjs().subtract(offsetSeconds, 'second').format('DD MMM YY HH:mm:ss'),
-  status: SAMPLES[id % SAMPLES.length],
-})
-
-const LogRow = ({ entry }: { entry: LogEntry }) => {
-  const isDestructive = entry.status >= 500
-  const isWarning = entry.status >= 400 && entry.status < 500
-  return (
-    <div
-      className="flex items-center gap-x-3 font-mono text-xs whitespace-nowrap text-foreground-light"
-      style={{ height: ROW_HEIGHT }}
-    >
-      <span
-        className={cn(
-          'size-1.5 shrink-0 rounded-full bg-foreground-muted',
-          isWarning && 'bg-warning',
-          isDestructive && 'bg-destructive'
-        )}
-      />
-      <span
-        className={cn(
-          'tabular-nums',
-          isWarning && 'text-warning',
-          isDestructive && 'text-destructive'
-        )}
-      >
-        {entry.timestamp}
-      </span>
-      <span
-        className={cn(
-          'tabular-nums',
-          isWarning && 'text-warning',
-          isDestructive && 'text-destructive'
-        )}
-      >
-        {entry.status}
-      </span>
-    </div>
-  )
-}
-
-const UnifiedLogsCarousel = () => {
-  const counter = useRef(VISIBLE_ROWS)
-  const [logs, setLogs] = useState<LogEntry[]>(() =>
-    Array.from({ length: VISIBLE_ROWS + 1 }, (_, i) => makeEntry(VISIBLE_ROWS - i, i))
-  )
-
-  useEffect(() => {
-    const interval = setInterval(() => {
-      counter.current += 1
-      const next = makeEntry(counter.current)
-      setLogs((prev) => [next, ...prev].slice(0, VISIBLE_ROWS + 1))
-    }, TICK_MS)
-    return () => clearInterval(interval)
-  }, [])
-
-  return (
-    <div className="relative w-full overflow-hidden" style={{ height: ROW_HEIGHT * VISIBLE_ROWS }}>
-      <AnimatePresence initial={false}>
-        {logs.map((entry, index) => (
-          <motion.div
-            key={entry.id}
-            layout
-            initial={{ opacity: 0 }}
-            animate={{ opacity: Math.max(1 - index * 0.4, 0) }}
-            exit={{ opacity: 0 }}
-          >
-            <LogRow entry={entry} />
-          </motion.div>
-        ))}
-      </AnimatePresence>
-    </div>
-  )
-}
-
-export const BannerUnifiedLogs = () => {
-  const { ref } = useParams()
-  const track = useTrack()
-  const { dismissBanner } = useBannerStack()
-  const { isEnabled } = useUnifiedLogsPreview()
-  const { selectFeaturePreview } = useFeaturePreviewModal()
-  const [, setIsDismissed] = useLocalStorageQuery(
-    LOCAL_STORAGE_KEYS.UNIFIED_LOGS_BANNER_DISMISSED,
-    false
-  )
-
-  return (
-    <BannerCard
-      onDismiss={() => {
-        setIsDismissed(true)
-        dismissBanner('unified-logs-banner')
-        track('unified_logs_banner_dismiss_button_clicked')
-      }}
-    >
-      <div className="flex flex-col gap-y-4">
-        <div className="flex flex-col gap-y-2 items-start">
-          <Badge variant="success" className="-ml-0.5 uppercase inline-flex items-center">
-            Beta
-          </Badge>
-          <div className="-mx-6 w-[calc(100%+3rem)] bg-linear-to-t from-background to-transparent px-6 py-2 border-b">
-            <UnifiedLogsCarousel />
-          </div>
-        </div>
-        <div className="flex flex-col gap-y-1 mb-2">
-          <p className="text-sm font-medium">Unified Logs is here</p>
-          <p className="text-xs text-foreground-lighter text-balance">
-            Search and correlate logs across all of your services from a single place.
-          </p>
-        </div>
-        <div className="flex gap-2">
-          {isEnabled ? (
-            <Button variant="default" size="tiny" asChild>
-              <Link
-                href={`/project/${ref}/logs`}
-                onClick={() => {
-                  track('unified_logs_banner_cta_button_clicked', { is_enabled: true })
-                  setIsDismissed(true)
-                  dismissBanner('unified-logs-banner')
-                }}
-              >
-                Explore Unified Logs
-              </Link>
-            </Button>
-          ) : (
-            <Button
-              variant="default"
-              size="tiny"
-              onClick={() => {
-                track('unified_logs_banner_cta_button_clicked', { is_enabled: false })
-                selectFeaturePreview(LOCAL_STORAGE_KEYS.UI_PREVIEW_UNIFIED_LOGS)
-              }}
-            >
-              Enable Unified Logs
-            </Button>
-          )}
-        </div>
-      </div>
-    </BannerCard>
-  )
-}
diff --git a/apps/studio/components/ui/QueryBlock/QueryBlock.utils.ts b/apps/studio/components/ui/QueryBlock/QueryBlock.utils.ts
index 19fec3bbd9506..25a25f2212cdf 100644
--- a/apps/studio/components/ui/QueryBlock/QueryBlock.utils.ts
+++ b/apps/studio/components/ui/QueryBlock/QueryBlock.utils.ts
@@ -49,21 +49,23 @@ export const formatLogTick = (value: number): string => {
 
 export const getCumulativeResults = (
   results: { rows: readonly any[] },
-  config: { yKey: string }
+  config: { yKey: string | string[] }
 ) => {
   if (!results?.rows?.length) {
     return []
   }
 
+  const yKeys = Array.isArray(config.yKey) ? config.yKey : [config.yKey]
+
   const cumulativeResults = results.rows.reduce((acc, row) => {
     const prev = acc[acc.length - 1] || {}
-    // Coerce to Number before adding: Postgres returns `bigint`, `numeric`,
-    // `money` and `count(*)` columns as strings, so a bare `+` would
-    // concatenate (e.g. "10" + "20" -> "1020") instead of summing.
-    const next = {
-      ...row,
-      [config.yKey]: (Number(prev[config.yKey]) || 0) + (Number(row[config.yKey]) || 0),
-    }
+    const next = { ...row }
+    yKeys.forEach((yKey) => {
+      // Coerce to Number before adding: Postgres returns `bigint`, `numeric`,
+      // `money` and `count(*)` columns as strings, so a bare `+` would
+      // concatenate (e.g. "10" + "20" -> "1020") instead of summing.
+      next[yKey] = (Number(prev[yKey]) || 0) + (Number(row[yKey]) || 0)
+    })
     return [...acc, next]
   }, [])
 
diff --git a/apps/studio/data/content/notebooks/notebook-schema.ts b/apps/studio/data/content/notebooks/notebook-schema.ts
index 8a1e1332ed609..65c2539cfc5a0 100644
--- a/apps/studio/data/content/notebooks/notebook-schema.ts
+++ b/apps/studio/data/content/notebooks/notebook-schema.ts
@@ -14,10 +14,12 @@ const isoDateTimeSchema = z.string().transform((raw, ctx) => {
   return parsed
 })
 
+export const MAX_CHART_Y_COLUMNS = 3
+
 const chartConfigSchema = z.object({
   type: z.enum(['bar', 'line']),
   x_column: z.string(),
-  y_columns: z.array(z.string()),
+  y_columns: z.array(z.string()).max(MAX_CHART_Y_COLUMNS),
   cumulative: z.boolean(),
   scale: z.enum(['linear', 'log']).default('linear'),
   show_labels: z.boolean(),
diff --git a/apps/studio/pages/project/[ref]/observability/connections.tsx b/apps/studio/pages/project/[ref]/observability/connections.tsx
index 10cc40a4cafe4..ad85042cac95f 100644
--- a/apps/studio/pages/project/[ref]/observability/connections.tsx
+++ b/apps/studio/pages/project/[ref]/observability/connections.tsx
@@ -40,6 +40,7 @@ export const DatabaseConnections: NextPageWithLayout = () => {
   const [now, setNow] = useState(() => dayjs.utc())
 
   useShortcut(SHORTCUT_IDS.DATA_TABLE_TOGGLE_LIVE, handleToggleLive, {
+    enabled: isDatabaseConnectionsEnabled,
     registerInCommandMenu: false,
   })
 
diff --git a/apps/studio/tests/components/ui/QueryBlock/QueryBlock.utils.test.ts b/apps/studio/tests/components/ui/QueryBlock/QueryBlock.utils.test.ts
index a5af0a97f5480..a2d5ceb372d9a 100644
--- a/apps/studio/tests/components/ui/QueryBlock/QueryBlock.utils.test.ts
+++ b/apps/studio/tests/components/ui/QueryBlock/QueryBlock.utils.test.ts
@@ -109,6 +109,22 @@ describe('getCumulativeResults', () => {
     ])
   })
 
+  it('accumulates each key independently when yKey is an array', () => {
+    const results = {
+      rows: [
+        { x: 'a', y1: 10, y2: 1 },
+        { x: 'b', y1: 20, y2: 2 },
+        { x: 'c', y1: 5, y2: 3 },
+      ],
+    }
+    const output = getCumulativeResults(results, { yKey: ['y1', 'y2'] })
+    expect(output).toEqual([
+      { x: 'a', y1: 10, y2: 1 },
+      { x: 'b', y1: 30, y2: 3 },
+      { x: 'c', y1: 35, y2: 6 },
+    ])
+  })
+
   it('preserves other keys on each row', () => {
     const results = {
       rows: [
diff --git a/e2e/studio/features/wrappers.spec.ts b/e2e/studio/features/wrappers.spec.ts
index bfe7d73fd1023..49d098fb9a84c 100644
--- a/e2e/studio/features/wrappers.spec.ts
+++ b/e2e/studio/features/wrappers.spec.ts
@@ -18,7 +18,7 @@ testRunner('Stripe', () => {
 
           create extension if not exists wrappers
             schema extensions
-            version '0.5.7'
+            version '0.6.2'
             cascade;
         `)
       },
@@ -59,7 +59,7 @@ testRunner('Stripe', () => {
 
           create extension if not exists wrappers
             schema extensions
-            version '0.5.7'
+            version '0.6.2'
             cascade;
         `)
       },
@@ -102,7 +102,7 @@ testRunner('S3 Wrapper', () => {
 
           create extension if not exists wrappers
             schema extensions
-            version '0.5.7'
+            version '0.6.2'
             cascade;
         `)
       },
diff --git a/e2e/studio/supabase/config.toml b/e2e/studio/supabase/config.toml
index 2eeac96eadd6a..524c17b04e959 100644
--- a/e2e/studio/supabase/config.toml
+++ b/e2e/studio/supabase/config.toml
@@ -16,6 +16,8 @@ extra_search_path = ["public", "extensions"]
 # The maximum number of rows returned from a view, table, or function. Limits payload size
 # for accidental or malicious requests.
 max_rows = 1000
+# backward-compatible, to automatically expose newly created tables to PostgREST
+auto_expose_new_tables = true
 
 [api.tls]
 # Enable HTTPS endpoints locally using a self-signed certificate.
diff --git a/package.json b/package.json
index 35774f9083a30..3fb61124c179d 100644
--- a/package.json
+++ b/package.json
@@ -60,7 +60,7 @@
     "prettier": "^3.8.0",
     "prettier-plugin-sql-cst": "^0.18.0",
     "rimraf": "^6.0.0",
-    "supabase": "^2.76.10",
+    "supabase": "^2.114.0",
     "supports-color": "^8.0.0",
     "tailwindcss": "catalog:",
     "tsx": "catalog:",
diff --git a/packages/common/telemetry-constants.ts b/packages/common/telemetry-constants.ts
index 7e97c3d26ef36..9596095bcaa8d 100644
--- a/packages/common/telemetry-constants.ts
+++ b/packages/common/telemetry-constants.ts
@@ -1605,7 +1605,8 @@ export interface SessionTerminateSubmittedEvent {
 }
 
 /**
- * User clicked the Cancel query menu item for a database session in the Database Connections activity table.
+ * User clicked Cancel query for a database session in the Database Connections activity table,
+ * either from the row's dropdown menu or from the terminate session confirmation dialog.
  *
  * @group Events
  * @source studio
@@ -1619,6 +1620,10 @@ export interface QueryCancelButtonClickedEvent {
      * Whether the session whose query is being cancelled was itself blocking one or more other sessions.
      */
     isBlocking: boolean
+    /**
+     * Which surface the cancel was triggered from.
+     */
+    origin: 'dropdown_menu' | 'terminate_dialog'
   }
   groups: TelemetryGroups
 }
diff --git a/packages/ui-patterns/src/Chart/charts/chart-bar.tsx b/packages/ui-patterns/src/Chart/charts/chart-bar.tsx
index e81034adabb74..7367ca8efb865 100644
--- a/packages/ui-patterns/src/Chart/charts/chart-bar.tsx
+++ b/packages/ui-patterns/src/Chart/charts/chart-bar.tsx
@@ -51,6 +51,7 @@ export interface ChartBarProps {
   data: ChartBarTick[]
   xKey?: string
   dataKey: string
+  dataKeys?: string[]
   config?: ChartConfig
   onBarClick?: (datum: ChartBarTick, tooltipData?: CategoricalChartState) => void
   DateTimeFormat?: string
@@ -80,6 +81,7 @@ export const ChartBar = ({
   data,
   xKey = 'timestamp',
   dataKey,
+  dataKeys,
   config,
   onBarClick,
   DateTimeFormat = 'MMM D, YYYY, hh:mma',
@@ -104,11 +106,15 @@ export const ChartBar = ({
     return null
   }
 
-  const chartConfig: ChartConfig = config || {
-    [dataKey]: {
-      label: dataKey,
-    },
-  }
+  const keysToRender = dataKeys || [dataKey]
+  const isMultiSeries = keysToRender.length > 1
+
+  const chartConfig: ChartConfig =
+    config ||
+    keysToRender.reduce((acc, key) => {
+      acc[key] = { label: key }
+      return acc
+    }, {} as ChartConfig)
 
   const showHighlightActions =
     showHighlightArea &&
@@ -225,15 +231,29 @@ export const ChartBar = ({
               fillOpacity={0.2}
             />
           )}
-          <Bar dataKey={dataKey} fill={color} maxBarSize={24}>
-            {data?.map((_entry: ChartBarTick, index: number) => (
-              <Cell
-                className="cursor-pointer transition-colors"
-                key={`bar-${index}`}
-                fill={focusDataIndex === index || focusDataIndex === null ? color : hoverColor}
-              />
-            ))}
-          </Bar>
+          {isMultiSeries ? (
+            keysToRender.map((key) => {
+              const keyConfig = chartConfig[key]
+              const barColor =
+                keyConfig?.color ||
+                (keyConfig?.theme
+                  ? isDarkMode
+                    ? keyConfig.theme.dark
+                    : keyConfig.theme.light
+                  : color)
+              return <Bar key={key} dataKey={key} fill={barColor} maxBarSize={24} />
+            })
+          ) : (
+            <Bar dataKey={dataKey} fill={color} maxBarSize={24}>
+              {data?.map((_entry: ChartBarTick, index: number) => (
+                <Cell
+                  className="cursor-pointer transition-colors"
+                  key={`bar-${index}`}
+                  fill={focusDataIndex === index || focusDataIndex === null ? color : hoverColor}
+                />
+              ))}
+            </Bar>
+          )}
         </RechartBarChart>
       </ChartContainer>
 
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 4f261aae08405..305d81153a8a9 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -123,7 +123,6 @@ overrides:
   postcss: ^8.5.18
   qs: ^6.15.2
   refractor>prismjs: ^1.30.0
-  supabase>tar: ^7.5.21
   tmp: ^0.2.7
   vite>esbuild: ^0.28.1
   webpack: ^5.104.1
@@ -165,8 +164,8 @@ importers:
         specifier: ^6.0.0
         version: 6.0.1
       supabase:
-        specifier: ^2.76.10
-        version: 2.76.14(supports-color@8.1.1)
+        specifier: ^2.114.0
+        version: 2.114.0
       supports-color:
         specifier: ^8.0.0
         version: 8.1.1
@@ -594,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.3))(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.0))(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)
@@ -675,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.3))(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.0))(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
@@ -3665,6 +3664,12 @@ packages:
     peerDependencies:
       '@noble/ciphers': ^1.0.0
 
+  '@ecies/ciphers@0.2.6':
+    resolution: {integrity: sha512-patgsRPKGkhhoBjETV4XxD0En4ui5fbX0hzayqI3M8tvNMGUoUvmyYAIWwlxBc1KX5cturfqByYdj5bYGRpN9g==}
+    engines: {bun: '>=1', deno: '>=2.7.10', node: '>=16'}
+    peerDependencies:
+      '@noble/ciphers': ^1.0.0
+
   '@edge-runtime/cookies@5.0.2':
     resolution: {integrity: sha512-Sd8LcWpZk/SWEeKGE8LT6gMm5MGfX/wm+GPnh1eBEtCpya3vYqn37wYknwAHw92ONoyyREl1hJwxV/Qx2DWNOg==}
     engines: {node: '>=16'}
@@ -7461,6 +7466,50 @@ packages:
     resolution: {integrity: sha512-NA0rsgAlWZPvbhw8aUdmgfpHVgUAcd8zK5ov43l++o1bLIPXZhRiAlRobhwF5AatQuovpqxsMH50F4oyyV4XZw==}
     engines: {node: '>=22.0.0'}
 
+  '@supabase/cli-darwin-arm64@2.114.0':
+    resolution: {integrity: sha512-zdZA+hf8W2sMDQkWWJKYcgOS6AAMsc8oMTaspfYrga41paUqSvuXZ4uAhBaNm3DiNeJmQ0ddb9EaLo0lPxaQpw==}
+    cpu: [arm64]
+    os: [darwin]
+
+  '@supabase/cli-darwin-x64@2.114.0':
+    resolution: {integrity: sha512-r89Go+y0IyBS+8pHsBZcs9s1W7xB8IL60k97INn0EYgPlE99Bgy7aZF+FQd+c1e3RAXLPS4/Znf7fheXKuNCtg==}
+    cpu: [x64]
+    os: [darwin]
+
+  '@supabase/cli-linux-arm64-musl@2.114.0':
+    resolution: {integrity: sha512-G5/97+h2CXzoK95jNlWY8CyOt+Zm0k3A9/d1r/jDYoB/y1P5cQmK1TYPPfI+ErWYQeoiQ6okfftAAg8bZEGqcA==}
+    cpu: [arm64]
+    os: [linux]
+    libc: [musl]
+
+  '@supabase/cli-linux-arm64@2.114.0':
+    resolution: {integrity: sha512-vYFAP+gI6BOcwjZ+Zs9kpqtUt3KTE5kL56H65CTCdwRBJ/fXU+vCW3WvhLyFmKmJ8sDzjCvMcHwuhjKPbTmM7A==}
+    cpu: [arm64]
+    os: [linux]
+    libc: [glibc]
+
+  '@supabase/cli-linux-x64-musl@2.114.0':
+    resolution: {integrity: sha512-87e8MzkKZryXOsmMSbrS4b4jX95uPohS/AplJb2QWwTzLuOXZ+G60e0NR9tkuYYc7TIrDAHhFxcGaQweRIERug==}
+    cpu: [x64]
+    os: [linux]
+    libc: [musl]
+
+  '@supabase/cli-linux-x64@2.114.0':
+    resolution: {integrity: sha512-MKgeafQEWYVKCtJgOgGJo1SqiKI4dd5eN460FbLOg01j1sYh7zGqhHk8WxF3enc4WeFQpVMpv147UyrOueHheg==}
+    cpu: [x64]
+    os: [linux]
+    libc: [glibc]
+
+  '@supabase/cli-windows-arm64@2.114.0':
+    resolution: {integrity: sha512-nhF/H5tPs0YsuKcdX5gGV6Ku7pFpSobXubt0y3rHfmR4itG6hhGE2We1hCyc7it0ozlDsA2NxOb1m9YlmY38+A==}
+    cpu: [arm64]
+    os: [win32]
+
+  '@supabase/cli-windows-x64@2.114.0':
+    resolution: {integrity: sha512-JtdgR9HvhgUxyd+GMpTECHCSFbAFP67/FJIWybYOVt5Qh6g4rqlLSWmT5zWFCQBSBw0dSw7xf2V3YB1+HESmiA==}
+    cpu: [x64]
+    os: [win32]
+
   '@supabase/functions-js@2.112.3':
     resolution: {integrity: sha512-gfv481mTOVWtZIJgXupxZpni2V2UWPf6jeF/jOK7HdMHdH+mt6sU0sHHwf0POsPip8ltlulu9OUHgwVzl5ddRw==}
     engines: {node: '>=22.0.0'}
@@ -9497,10 +9546,6 @@ packages:
   big.js@5.2.2:
     resolution: {integrity: sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==}
 
-  bin-links@6.0.0:
-    resolution: {integrity: sha512-X4CiKlcV2GjnCMwnKAfbVWpHa++65th9TuzAEYtZoATiOE2DQKhSp4CJlyLoTqdhBKlXjpXjCTYPNNFS33Fi6w==}
-    engines: {node: ^20.17.0 || >=22.9.0}
-
   binary-extensions@2.2.0:
     resolution: {integrity: sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==}
     engines: {node: '>=8'}
@@ -9849,10 +9894,6 @@ packages:
     resolution: {integrity: sha512-RMr0FhtfXemyinomL4hrWcYJxmX6deFdCxpJzhDttxgO1+bcCnkk+9drydLVDmAMG7NE6aN/fl4F7ucU/90gAA==}
     engines: {node: '>=0.10.0'}
 
-  cmd-shim@8.0.0:
-    resolution: {integrity: sha512-Jk/BK6NCapZ58BKUxlSI+ouKRbjH1NLZCgJkYoab+vEHUY3f6OzpNBN9u7HFSv9J6TRDGs4PLOHezoKGaFRSCA==}
-    engines: {node: ^20.17.0 || >=22.9.0}
-
   cmdk@1.1.1:
     resolution: {integrity: sha512-Vsv7kFaXm+ptHDMZ7izaRsP70GgrW9NBNGswt9OZaVBLlE0SNpDq8eu/VGXyF9r7M0azK3Wy7OlYXsuyYLFzHg==}
     peerDependencies:
@@ -10713,6 +10754,10 @@ packages:
     resolution: {integrity: sha512-r6kEJXDKecVOCj2nLMuXK/FCPeurW33+3JRpfXVbjLja3XUYFfD9I/JBreH6sUyzcm3G/YQboBjMla6poKeSdA==}
     engines: {bun: '>=1', deno: '>=2', node: '>=16'}
 
+  eciesjs@0.5.0:
+    resolution: {integrity: sha512-s0J9SEVYAEPg7J63GFMApLYzPH9VNIQIyC6s15JpnqVc0TqcKWdbgFlnAweEBRyMmko2dcs2sfC83Hj4J43tuA==}
+    engines: {bun: '>=1', deno: '>=2.7.10', node: '>=16'}
+
   ee-first@1.1.1:
     resolution: {integrity: sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==}
 
@@ -12691,6 +12736,9 @@ packages:
   jose@6.1.3:
     resolution: {integrity: sha512-0TpaTfihd4QMNwrz/ob2Bp7X04yuxJkjRGi4aKmOqwhov54i6u79oCv7T+C7lo70MKH6BesI3vscD1yb/yzKXQ==}
 
+  jose@6.2.9:
+    resolution: {integrity: sha512-XrchZOFZUl/T3vTwRe8XK+cJrGtMF4th1ARnDfwbBXFKThGhlsxEE4Zu03AD/bjJSt/9jT/mxrOCkJWOg77aPA==}
+
   jotai@2.8.1:
     resolution: {integrity: sha512-Gmk5Y3yJL/vN5S0rQ6AaWpXH5Q+HBGHThMHXfylVzXGVuO8YxPRtZf8Y9XYvl+h7ZMQXoHNdFi37vNsJFsiszQ==}
     engines: {node: '>=12.20.0'}
@@ -12820,6 +12868,7 @@ packages:
 
   jsrsasign@11.1.1:
     resolution: {integrity: sha512-6w95OOXH8DNeGxakqLndBEqqwQ6A70zGaky1oxfg8WVLWOnghTfJsc5Tknx+Z88MHSb1bGLcqQHImOF8Lk22XA==}
+    deprecated: This package is no longer maintained.
 
   jsx-ast-utils@3.3.5:
     resolution: {integrity: sha512-ZZow9HBI5O6EPgSJLUb8n2NKgmVWTwCvHGwFuJlMjvLFqlGG6pjirPhtdsseaLZjSibD8eegzmYpUZwoIlj2cQ==}
@@ -14179,10 +14228,6 @@ packages:
   nostics@1.2.0:
     resolution: {integrity: sha512-FGqEfhQjrvo1lL8KFifdTQiNwwQHJxC1jtYE1Rc54qF/jxONUNL+kC9gS1krX8Q65PgrQ5fCqH/I4NhWBvdSqg==}
 
-  npm-normalize-package-bin@5.0.0:
-    resolution: {integrity: sha512-CJi3OS4JLsNMmr2u07OJlhcrPxCeOeP/4xq67aWNai6TNWWbTrlNDgl8NcFKVlcBKp18GPj+EzbNIgrBfZhsag==}
-    engines: {node: ^20.17.0 || >=22.9.0}
-
   npm-run-all@4.1.5:
     resolution: {integrity: sha512-Oo82gJDAVcaMdi3nuoKFavkIHBRVqQ1qvMb+9LHk/cF4P6B2m8aP04hGf7oL6wZ9BuGwX1onlLhpuoofSyoQDQ==}
     engines: {node: '>= 4'}
@@ -15052,10 +15097,6 @@ packages:
     resolution: {integrity: sha512-g8+OnU/L2v+wyiVK+D5fA34J7EH8jZ8DDlvwhRCMxmMj7UCBvxiO1mGeN+36JXIKF4zevU4kRBd8lVgG9vLelA==}
     engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0}
 
-  proc-log@6.0.0:
-    resolution: {integrity: sha512-KG/XsTDN901PNfPfAMmj6N/Ywg9tM+bHK8pAz+27fS4N4Pcr+4zoYBOcGSBu6ceXYNPxkLpa4ohtfxV1XcLAfA==}
-    engines: {node: ^20.17.0 || >=22.9.0}
-
   process-nextick-args@2.0.1:
     resolution: {integrity: sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==}
 
@@ -15406,10 +15447,6 @@ packages:
     resolution: {integrity: sha512-sfWGGfavi0xr8Pg0sVsyHMAOziVYKgPLNrS7ig+ivMNb3wbCBw3KxtflsGBAwD3gYQlE/AEZsTLgToRrSCjb0Q==}
     engines: {node: '>=0.10.0'}
 
-  read-cmd-shim@6.0.0:
-    resolution: {integrity: sha512-1zM5HuOfagXCBWMN83fuFI/x+T/UhZ7k+KIzhrHXcQoeX5+7gmaDYjELQHmmzIodumBHeByBJT4QYS7ufAgs7A==}
-    engines: {node: ^20.17.0 || >=22.9.0}
-
   read-pkg@3.0.0:
     resolution: {integrity: sha512-BLq/cCO9two+lBgiTYNqD6GdtK8s4NpaWrl6/rCO9w0TUS8oJl7cmToOZfRYllKTISY6nt1U7jQ53brmKqY6BA==}
     engines: {node: '>=4'}
@@ -16424,9 +16461,8 @@ packages:
     resolution: {integrity: sha512-CWGAczaNXTUDExaxi+hUEPqlPtCiZ4r3a74NXOx7+Sf+P75foCuX/aXL9MztosWwRnZZAI8VGUXpdNe6K3xTtA==}
     engines: {node: '>=18.0.0'}
 
-  supabase@2.76.14:
-    resolution: {integrity: sha512-2XmYs8+A4WXd+w/OND9u9qbSTnGdLCuddnii01H1LkmgwcZ9krXwxElE+YYmzhsEKCUHv5wVjAf5HTUwQ4PnVA==}
-    engines: {npm: '>=8'}
+  supabase@2.114.0:
+    resolution: {integrity: sha512-JtCR+eDgVs2YtmZl5THdkaTeXex80lax+3V2SXRSuj280SWJPTIKxMLc82iDKjZlqXnt9zrGnJkrWb7DwHGPhQ==}
     hasBin: true
 
   supports-color@10.0.0:
@@ -17768,10 +17804,6 @@ packages:
   wrappy@1.0.2:
     resolution: {integrity: sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==}
 
-  write-file-atomic@7.0.0:
-    resolution: {integrity: sha512-YnlPC6JqnZl6aO4uRc+dx5PHguiR9S6WeoLtpxNT9wIG+BDya7ZNE1q7KOjVgaA73hKhKLpVPgJ5QA9THQ5BRg==}
-    engines: {node: ^20.17.0 || >=22.9.0}
-
   ws@7.5.11:
     resolution: {integrity: sha512-zS54Oen9bITtp7kp2XM3AydrCIq1D+HwJOuH+c+e4LfpL/lotP5osijd+UoMnxwAam1GN8R4KtLAyIrIcBNpiA==}
     engines: {node: '>=8.3.0'}
@@ -18429,7 +18461,7 @@ snapshots:
       '@aws-sdk/types': 3.973.8
       '@smithy/property-provider': 4.2.14
       '@smithy/shared-ini-file-loader': 4.4.9
-      '@smithy/types': 4.14.1
+      '@smithy/types': 4.16.1
       tslib: 2.8.1
     transitivePeerDependencies:
       - aws-crt
@@ -18485,16 +18517,16 @@ snapshots:
       '@aws-sdk/core': 3.974.8
       '@aws-sdk/types': 3.973.8
       '@aws-sdk/util-arn-parser': 3.972.3
-      '@smithy/core': 3.23.17
+      '@smithy/core': 3.31.1
       '@smithy/node-config-provider': 4.3.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-config-provider': 4.2.2
       '@smithy/util-middleware': 4.2.14
       '@smithy/util-stream': 4.5.25
-      '@smithy/util-utf8': 4.2.2
+      '@smithy/util-utf8': 4.4.16
       tslib: 2.8.1
 
   '@aws-sdk/middleware-user-agent@3.972.38':
@@ -18524,7 +18556,7 @@ snapshots:
       '@aws-sdk/util-user-agent-browser': 3.972.10
       '@aws-sdk/util-user-agent-node': 3.973.24
       '@smithy/config-resolver': 4.4.17
-      '@smithy/core': 3.23.17
+      '@smithy/core': 3.31.1
       '@smithy/fetch-http-handler': 5.3.17
       '@smithy/hash-node': 4.2.14
       '@smithy/invalid-dependency': 4.2.14
@@ -18537,7 +18569,7 @@ snapshots:
       '@smithy/node-http-handler': 4.6.1
       '@smithy/protocol-http': 5.3.14
       '@smithy/smithy-client': 4.12.13
-      '@smithy/types': 4.14.1
+      '@smithy/types': 4.16.1
       '@smithy/url-parser': 4.2.14
       '@smithy/util-base64': 4.3.2
       '@smithy/util-body-length-browser': 4.2.2
@@ -18547,7 +18579,7 @@ snapshots:
       '@smithy/util-endpoints': 3.4.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
     transitivePeerDependencies:
       - aws-crt
@@ -18566,7 +18598,7 @@ snapshots:
       '@aws-sdk/types': 3.973.8
       '@smithy/protocol-http': 5.3.14
       '@smithy/signature-v4': 5.3.14
-      '@smithy/types': 4.14.1
+      '@smithy/types': 4.16.1
       tslib: 2.8.1
 
   '@aws-sdk/token-providers@3.1041.0':
@@ -19356,6 +19388,10 @@ snapshots:
     dependencies:
       '@noble/ciphers': 1.3.0
 
+  '@ecies/ciphers@0.2.6(@noble/ciphers@1.3.0)':
+    dependencies:
+      '@noble/ciphers': 1.3.0
+
   '@edge-runtime/cookies@5.0.2': {}
 
   '@effect-ts/core@0.60.5':
@@ -19614,9 +19650,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.3))(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.0))(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.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.0))(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
@@ -19644,10 +19680,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.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.0))(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.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)
+      '@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)
       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)
@@ -19676,9 +19712,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.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.0))(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.3))(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.0))(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)
@@ -19746,23 +19782,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.3))(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.0))(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.3)
+      graphql-ws: 6.0.4(graphql@16.11.0)(ws@8.21.0)
     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.3))(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.0))(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.3)
+      graphql-ws: 6.0.4(graphql@16.11.0)(ws@8.21.0)
     transitivePeerDependencies:
       - '@types/node'
 
@@ -23581,7 +23617,7 @@ snapshots:
 
   '@smithy/property-provider@4.2.14':
     dependencies:
-      '@smithy/types': 4.14.1
+      '@smithy/types': 4.16.1
       tslib: 2.8.1
 
   '@smithy/protocol-http@5.3.14':
@@ -23606,7 +23642,7 @@ snapshots:
 
   '@smithy/shared-ini-file-loader@4.4.9':
     dependencies:
-      '@smithy/types': 4.14.1
+      '@smithy/types': 4.16.1
       tslib: 2.8.1
 
   '@smithy/signature-v4@5.3.14':
@@ -23833,6 +23869,30 @@ snapshots:
     dependencies:
       tslib: 2.8.1
 
+  '@supabase/cli-darwin-arm64@2.114.0':
+    optional: true
+
+  '@supabase/cli-darwin-x64@2.114.0':
+    optional: true
+
+  '@supabase/cli-linux-arm64-musl@2.114.0':
+    optional: true
+
+  '@supabase/cli-linux-arm64@2.114.0':
+    optional: true
+
+  '@supabase/cli-linux-x64-musl@2.114.0':
+    optional: true
+
+  '@supabase/cli-linux-x64@2.114.0':
+    optional: true
+
+  '@supabase/cli-windows-arm64@2.114.0':
+    optional: true
+
+  '@supabase/cli-windows-x64@2.114.0':
+    optional: true
+
   '@supabase/functions-js@2.112.3':
     dependencies:
       tslib: 2.8.1
@@ -26151,14 +26211,6 @@ snapshots:
 
   big.js@5.2.2: {}
 
-  bin-links@6.0.0:
-    dependencies:
-      cmd-shim: 8.0.0
-      npm-normalize-package-bin: 5.0.0
-      proc-log: 6.0.0
-      read-cmd-shim: 6.0.0
-      write-file-atomic: 7.0.0
-
   binary-extensions@2.2.0: {}
 
   binary-search@1.3.6: {}
@@ -26600,8 +26652,6 @@ snapshots:
 
   cluster-key-slot@1.1.2: {}
 
-  cmd-shim@8.0.0: {}
-
   cmdk@1.1.1(@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):
     dependencies:
       '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.14)(react@19.2.6)
@@ -27471,6 +27521,13 @@ snapshots:
       '@noble/curves': 1.9.7
       '@noble/hashes': 1.8.0
 
+  eciesjs@0.5.0:
+    dependencies:
+      '@ecies/ciphers': 0.2.6(@noble/ciphers@1.3.0)
+      '@noble/ciphers': 1.3.0
+      '@noble/curves': 1.9.7
+      '@noble/hashes': 1.8.0
+
   ee-first@1.1.1: {}
 
   ejs@3.1.10:
@@ -28778,11 +28835,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.3))(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.0))(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.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)
+      '@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)
       graphql: 16.11.0
       react: 19.2.6
       react-compiler-runtime: 19.1.0-rc.1(react@19.2.6)
@@ -28881,13 +28938,6 @@ 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:
@@ -29765,6 +29815,8 @@ snapshots:
 
   jose@6.1.3: {}
 
+  jose@6.2.9: {}
+
   jotai@2.8.1(@types/react@19.2.14)(react@19.2.6):
     optionalDependencies:
       '@types/react': 19.2.14
@@ -31930,8 +31982,6 @@ snapshots:
 
   nostics@1.2.0: {}
 
-  npm-normalize-package-bin@5.0.0: {}
-
   npm-run-all@4.1.5:
     dependencies:
       ansi-styles: 3.2.1
@@ -32891,8 +32941,6 @@ snapshots:
 
   proc-log@4.2.0: {}
 
-  proc-log@6.0.0: {}
-
   process-nextick-args@2.0.1: {}
 
   process@0.11.10: {}
@@ -33333,8 +33381,6 @@ snapshots:
 
   react@19.2.6: {}
 
-  read-cmd-shim@6.0.0: {}
-
   read-pkg@3.0.0:
     dependencies:
       load-json-file: 4.0.0
@@ -34702,14 +34748,19 @@ snapshots:
       - debug
       - supports-color
 
-  supabase@2.76.14(supports-color@8.1.1):
+  supabase@2.114.0:
     dependencies:
-      bin-links: 6.0.0
-      https-proxy-agent: 7.0.6(supports-color@8.1.1)
-      node-fetch: 3.3.2
-      tar: 7.5.21
-    transitivePeerDependencies:
-      - supports-color
+      eciesjs: 0.5.0
+      jose: 6.2.9
+    optionalDependencies:
+      '@supabase/cli-darwin-arm64': 2.114.0
+      '@supabase/cli-darwin-x64': 2.114.0
+      '@supabase/cli-linux-arm64': 2.114.0
+      '@supabase/cli-linux-arm64-musl': 2.114.0
+      '@supabase/cli-linux-x64': 2.114.0
+      '@supabase/cli-linux-x64-musl': 2.114.0
+      '@supabase/cli-windows-arm64': 2.114.0
+      '@supabase/cli-windows-x64': 2.114.0
 
   supports-color@10.0.0: {}
 
@@ -36175,11 +36226,6 @@ snapshots:
 
   wrappy@1.0.2: {}
 
-  write-file-atomic@7.0.0:
-    dependencies:
-      imurmurhash: 0.1.4
-      signal-exit: 4.1.0
-
   ws@7.5.11: {}
 
   ws@8.21.0: {}
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
index 8d678248a5607..6bf4113c0aacf 100644
--- a/pnpm-workspace.yaml
+++ b/pnpm-workspace.yaml
@@ -114,7 +114,6 @@ overrides:
   postcss: 'catalog:'
   qs: ^6.15.2
   refractor>prismjs: ^1.30.0
-  supabase>tar: ^7.5.21
   tmp: ^0.2.7
   vite>esbuild: ^0.28.1
   webpack: ^5.104.1