diff --git a/apps/studio/components/interfaces/Account/Preferences/HotkeySettings.tsx b/apps/studio/components/interfaces/Account/Preferences/HotkeySettings.tsx
index 851df04e4c0d3..4d92c83a137c0 100644
--- a/apps/studio/components/interfaces/Account/Preferences/HotkeySettings.tsx
+++ b/apps/studio/components/interfaces/Account/Preferences/HotkeySettings.tsx
@@ -1,4 +1,5 @@
 import { LOCAL_STORAGE_KEYS } from 'common'
+import { SIDEBAR_KEYS } from 'components/layouts/ProjectLayout/LayoutSidebar/LayoutSidebarProvider'
 import Panel from 'components/ui/Panel'
 import { useLocalStorageQuery } from 'hooks/misc/useLocalStorage'
 import { KeyboardShortcut, Toggle } from 'ui'
@@ -13,7 +14,7 @@ export const HotkeySettings = () => {
     true
   )
   const [aiAssistantEnabled, setAiAssistantEnabled] = useLocalStorageQuery(
-    LOCAL_STORAGE_KEYS.HOTKEY_AI_ASSISTANT,
+    LOCAL_STORAGE_KEYS.HOTKEY_SIDEBAR(SIDEBAR_KEYS.AI_ASSISTANT),
     true
   )
 
diff --git a/apps/studio/components/interfaces/Auth/Overview/OverviewLearnMore.tsx b/apps/studio/components/interfaces/Auth/Overview/OverviewLearnMore.tsx
index 8678bc08b49aa..0732dbec74243 100644
--- a/apps/studio/components/interfaces/Auth/Overview/OverviewLearnMore.tsx
+++ b/apps/studio/components/interfaces/Auth/Overview/OverviewLearnMore.tsx
@@ -6,6 +6,8 @@ import { Logs } from 'icons'
 import { BASE_PATH } from 'lib/constants'
 import { useParams } from 'common'
 import { useAiAssistantStateSnapshot } from 'state/ai-assistant-state'
+import { SIDEBAR_KEYS } from 'components/layouts/ProjectLayout/LayoutSidebar/LayoutSidebarProvider'
+import { useSidebarManagerSnapshot } from 'state/sidebar-manager-state'
 import { useTheme } from 'next-themes'
 import { useEffect, useState } from 'react'
 
@@ -13,6 +15,7 @@ export const OverviewLearnMore = () => {
   const [isMounted, setIsMounted] = useState(false)
   const { ref } = useParams()
   const aiSnap = useAiAssistantStateSnapshot()
+  const { openSidebar } = useSidebarManagerSnapshot()
   const { theme, resolvedTheme } = useTheme()
 
   useEffect(() => {
@@ -48,9 +51,9 @@ export const OverviewLearnMore = () => {
         {
           label: 'Ask Assistant',
           onClick: () => {
+            openSidebar(SIDEBAR_KEYS.AI_ASSISTANT)
             aiSnap.newChat({
               name: 'Auth Help',
-              open: true,
               initialInput:
                 'Look at my logs related to Supabase Auth and help me debug the recent errors.',
               suggestions: {
diff --git a/apps/studio/components/interfaces/Auth/Policies/PolicyTableRow/PolicyRow.tsx b/apps/studio/components/interfaces/Auth/Policies/PolicyTableRow/PolicyRow.tsx
index 9f97fe8dc93a6..c938d273cd164 100644
--- a/apps/studio/components/interfaces/Auth/Policies/PolicyTableRow/PolicyRow.tsx
+++ b/apps/studio/components/interfaces/Auth/Policies/PolicyTableRow/PolicyRow.tsx
@@ -8,6 +8,8 @@ import { useAuthConfigQuery } from 'data/auth/auth-config-query'
 import { useAsyncCheckPermissions } from 'hooks/misc/useCheckPermissions'
 import { useSelectedProjectQuery } from 'hooks/misc/useSelectedProject'
 import { useAiAssistantStateSnapshot } from 'state/ai-assistant-state'
+import { SIDEBAR_KEYS } from 'components/layouts/ProjectLayout/LayoutSidebar/LayoutSidebarProvider'
+import { useSidebarManagerSnapshot } from 'state/sidebar-manager-state'
 import {
   Button,
   DropdownMenu,
@@ -37,6 +39,7 @@ export const PolicyRow = ({
   onSelectDeletePolicy = noop,
 }: PolicyRowProps) => {
   const aiSnap = useAiAssistantStateSnapshot()
+  const { openSidebar } = useSidebarManagerSnapshot()
   const { can: canUpdatePolicies } = useAsyncCheckPermissions(
     PermissionAction.TENANT_SQL_ADMIN_WRITE,
     'policies'
@@ -119,9 +122,9 @@ export const PolicyRow = ({
                 className="space-x-2"
                 onClick={() => {
                   const sql = generatePolicyUpdateSQL(policy)
+                  openSidebar(SIDEBAR_KEYS.AI_ASSISTANT)
                   aiSnap.newChat({
                     name: `Update policy ${policy.name}`,
-                    open: true,
                     sqlSnippets: [sql],
                     initialInput: `Update the policy with name \"${policy.name}\" in the ${policy.schema} schema on the ${policy.table} table. It should...`,
                     suggestions: {
diff --git a/apps/studio/components/interfaces/Auth/Policies/PolicyTableRow/PolicyTableRowHeader.tsx b/apps/studio/components/interfaces/Auth/Policies/PolicyTableRow/PolicyTableRowHeader.tsx
index 40953561bd3a6..3fd18c5cf4604 100644
--- a/apps/studio/components/interfaces/Auth/Policies/PolicyTableRow/PolicyTableRowHeader.tsx
+++ b/apps/studio/components/interfaces/Auth/Policies/PolicyTableRow/PolicyTableRowHeader.tsx
@@ -9,6 +9,8 @@ import { useAsyncCheckPermissions } from 'hooks/misc/useCheckPermissions'
 import { useAiAssistantStateSnapshot } from 'state/ai-assistant-state'
 import { AiIconAnimation, Badge, CardTitle } from 'ui'
 import type { PolicyTable } from './PolicyTableRow.types'
+import { SIDEBAR_KEYS } from 'components/layouts/ProjectLayout/LayoutSidebar/LayoutSidebarProvider'
+import { useSidebarManagerSnapshot } from 'state/sidebar-manager-state'
 
 interface PolicyTableRowHeaderProps {
   table: PolicyTable
@@ -25,6 +27,7 @@ export const PolicyTableRowHeader = ({
 }: PolicyTableRowHeaderProps) => {
   const { ref } = useParams()
   const aiSnap = useAiAssistantStateSnapshot()
+  const { openSidebar } = useSidebarManagerSnapshot()
 
   const { can: canCreatePolicies } = useAsyncCheckPermissions(
     PermissionAction.TENANT_SQL_ADMIN_WRITE,
@@ -101,9 +104,9 @@ export const PolicyTableRowHeader = ({
               type="default"
               className="px-1"
               onClick={() => {
+                openSidebar(SIDEBAR_KEYS.AI_ASSISTANT)
                 aiSnap.newChat({
                   name: 'Create new policy',
-                  open: true,
                   initialInput: `Create and name a new policy for the ${table.schema} schema on the ${table.name} table that ...`,
                 })
               }}
diff --git a/apps/studio/components/interfaces/BranchManagement/ReviewWithAI.tsx b/apps/studio/components/interfaces/BranchManagement/ReviewWithAI.tsx
index fe63f11d8ddad..1d2204ad7adc6 100644
--- a/apps/studio/components/interfaces/BranchManagement/ReviewWithAI.tsx
+++ b/apps/studio/components/interfaces/BranchManagement/ReviewWithAI.tsx
@@ -6,6 +6,8 @@ import { useSendEventMutation } from 'data/telemetry/send-event-mutation'
 import { useSelectedOrganizationQuery } from 'hooks/misc/useSelectedOrganization'
 import { tablesToSQL } from 'lib/helpers'
 import { useAiAssistantStateSnapshot } from 'state/ai-assistant-state'
+import { SIDEBAR_KEYS } from 'components/layouts/ProjectLayout/LayoutSidebar/LayoutSidebarProvider'
+import { useSidebarManagerSnapshot } from 'state/sidebar-manager-state'
 import { AiIconAnimation } from 'ui'
 
 interface ReviewWithAIProps {
@@ -24,6 +26,7 @@ export const ReviewWithAI = ({
   disabled = false,
 }: ReviewWithAIProps) => {
   const aiSnap = useAiAssistantStateSnapshot()
+  const { openSidebar } = useSidebarManagerSnapshot()
   const { data: selectedOrg } = useSelectedOrganizationQuery()
   const { mutate: sendEvent } = useSendEventMutation()
 
@@ -75,9 +78,9 @@ export const ReviewWithAI = ({
       })
     }
 
+    openSidebar(SIDEBAR_KEYS.AI_ASSISTANT)
     aiSnap.newChat({
       name: `Review merge: ${currentBranch.name} → ${mainBranch.name}`,
-      open: true,
       sqlSnippets: sqlSnippets.length > 0 ? sqlSnippets : undefined,
       initialInput: `I want to run the attached database changes on my production database branch as part of a branch merge from "${currentBranch.name}" into "${mainBranch.name || 'main'}". I've included the current production database schema as extra context. Please analyze the proposed schema changes and provide concise feedback on their impact on the production schema including any migration concerns and potential conflicts.`,
       suggestions: {
diff --git a/apps/studio/components/interfaces/Database/Functions/FunctionsList/FunctionList.tsx b/apps/studio/components/interfaces/Database/Functions/FunctionsList/FunctionList.tsx
index 8832787fa6563..1f0953c369d22 100644
--- a/apps/studio/components/interfaces/Database/Functions/FunctionsList/FunctionList.tsx
+++ b/apps/studio/components/interfaces/Database/Functions/FunctionsList/FunctionList.tsx
@@ -5,10 +5,12 @@ import Link from 'next/link'
 import { useRouter } from 'next/router'
 
 import { ButtonTooltip } from 'components/ui/ButtonTooltip'
+import { SIDEBAR_KEYS } from 'components/layouts/ProjectLayout/LayoutSidebar/LayoutSidebarProvider'
 import { useDatabaseFunctionsQuery } from 'data/database-functions/database-functions-query'
 import { useAsyncCheckPermissions } from 'hooks/misc/useCheckPermissions'
 import { useSelectedProjectQuery } from 'hooks/misc/useSelectedProject'
 import { useAiAssistantStateSnapshot } from 'state/ai-assistant-state'
+import { useSidebarManagerSnapshot } from 'state/sidebar-manager-state'
 import {
   Button,
   DropdownMenu,
@@ -44,6 +46,7 @@ const FunctionList = ({
   const router = useRouter()
   const { data: selectedProject } = useSelectedProjectQuery()
   const aiSnap = useAiAssistantStateSnapshot()
+  const { openSidebar } = useSidebarManagerSnapshot()
 
   const { data: functions } = useDatabaseFunctionsQuery({
     projectRef: selectedProject?.ref,
@@ -168,9 +171,9 @@ const FunctionList = ({
                         <DropdownMenuItem
                           className="space-x-2"
                           onClick={() => {
+                            openSidebar(SIDEBAR_KEYS.AI_ASSISTANT)
                             aiSnap.newChat({
                               name: `Update function ${x.name}`,
-                              open: true,
                               initialInput: 'Update this function to do...',
                               suggestions: {
                                 title:
diff --git a/apps/studio/components/interfaces/Database/Functions/FunctionsList/FunctionsList.tsx b/apps/studio/components/interfaces/Database/Functions/FunctionsList/FunctionsList.tsx
index 7dbaaaae4bdc6..d504ba1bc1a55 100644
--- a/apps/studio/components/interfaces/Database/Functions/FunctionsList/FunctionsList.tsx
+++ b/apps/studio/components/interfaces/Database/Functions/FunctionsList/FunctionsList.tsx
@@ -11,6 +11,7 @@ import AlertError from 'components/ui/AlertError'
 import { ButtonTooltip } from 'components/ui/ButtonTooltip'
 import SchemaSelector from 'components/ui/SchemaSelector'
 import { GenericSkeletonLoader } from 'components/ui/ShimmeringLoader'
+import { SIDEBAR_KEYS } from 'components/layouts/ProjectLayout/LayoutSidebar/LayoutSidebarProvider'
 import { useDatabaseFunctionsQuery } from 'data/database-functions/database-functions-query'
 import { useSchemasQuery } from 'data/database/schemas-query'
 import { useAsyncCheckPermissions } from 'hooks/misc/useCheckPermissions'
@@ -18,6 +19,7 @@ import { useQuerySchemaState } from 'hooks/misc/useSchemaQueryState'
 import { useSelectedProjectQuery } from 'hooks/misc/useSelectedProject'
 import { useIsProtectedSchema } from 'hooks/useProtectedSchemas'
 import { useAiAssistantStateSnapshot } from 'state/ai-assistant-state'
+import { useSidebarManagerSnapshot } from 'state/sidebar-manager-state'
 import {
   AiIconAnimation,
   Card,
@@ -52,6 +54,7 @@ const FunctionsList = ({
   const { search } = useParams()
   const { data: project } = useSelectedProjectQuery()
   const aiSnap = useAiAssistantStateSnapshot()
+  const { openSidebar } = useSidebarManagerSnapshot()
   const { selectedSchema, setSelectedSchema } = useQuerySchemaState()
 
   const filterString = search ?? ''
@@ -200,13 +203,13 @@ const FunctionsList = ({
                     disabled={!canCreateFunctions}
                     className="px-1 pointer-events-auto"
                     icon={<AiIconAnimation size={16} />}
-                    onClick={() =>
+                    onClick={() => {
+                      openSidebar(SIDEBAR_KEYS.AI_ASSISTANT)
                       aiSnap.newChat({
                         name: 'Create new function',
-                        open: true,
                         initialInput: `Create a new function for the schema ${selectedSchema} that does ...`,
                       })
-                    }
+                    }}
                     tooltip={{
                       content: {
                         side: 'bottom',
diff --git a/apps/studio/components/interfaces/Database/Privileges/Privileges.utils.ts b/apps/studio/components/interfaces/Database/Privileges/Privileges.utils.ts
index 1cad017ce329c..0ffcd7b57633a 100644
--- a/apps/studio/components/interfaces/Database/Privileges/Privileges.utils.ts
+++ b/apps/studio/components/interfaces/Database/Privileges/Privileges.utils.ts
@@ -300,14 +300,14 @@ export function useApplyPrivilegeOperations(callback?: () => void) {
         .map((op) => ({
           column_id: String(op.id),
           grantee: op.grantee,
-          privilege_type: op.privilege_type as ColumnPrivilegesRevoke[number]['privilege_type'],
+          privilege_type: op.privilege_type as ColumnPrivilegesRevoke['privilege_type'],
         }))
       const revokeColumnOperations = columnOperations
         .filter((op) => op.type === 'revoke')
         .map((op) => ({
           column_id: String(op.id),
           grantee: op.grantee,
-          privilege_type: op.privilege_type as ColumnPrivilegesRevoke[number]['privilege_type'],
+          privilege_type: op.privilege_type as ColumnPrivilegesRevoke['privilege_type'],
         }))
 
       // annoyingly these can't be run all at once
diff --git a/apps/studio/components/interfaces/Database/Triggers/TriggersList/TriggerList.tsx b/apps/studio/components/interfaces/Database/Triggers/TriggersList/TriggerList.tsx
index 2690209c90437..0374a3758ee49 100644
--- a/apps/studio/components/interfaces/Database/Triggers/TriggersList/TriggerList.tsx
+++ b/apps/studio/components/interfaces/Database/Triggers/TriggersList/TriggerList.tsx
@@ -3,10 +3,12 @@ import { includes, sortBy } from 'lodash'
 import { Check, Copy, Edit, Edit2, MoreVertical, Trash, X } from 'lucide-react'
 
 import { ButtonTooltip } from 'components/ui/ButtonTooltip'
+import { SIDEBAR_KEYS } from 'components/layouts/ProjectLayout/LayoutSidebar/LayoutSidebarProvider'
 import { useDatabaseTriggersQuery } from 'data/database-triggers/database-triggers-query'
 import { useAsyncCheckPermissions } from 'hooks/misc/useCheckPermissions'
 import { useSelectedProjectQuery } from 'hooks/misc/useSelectedProject'
 import { useAiAssistantStateSnapshot } from 'state/ai-assistant-state'
+import { useSidebarManagerSnapshot } from 'state/sidebar-manager-state'
 import {
   Badge,
   Button,
@@ -43,6 +45,7 @@ const TriggerList = ({
 }: TriggerListProps) => {
   const { data: project } = useSelectedProjectQuery()
   const aiSnap = useAiAssistantStateSnapshot()
+  const { openSidebar } = useSidebarManagerSnapshot()
 
   const { data: triggers } = useDatabaseTriggersQuery({
     projectRef: project?.ref,
@@ -171,9 +174,9 @@ const TriggerList = ({
                         className="space-x-2"
                         onClick={() => {
                           const sql = generateTriggerCreateSQL(x)
+                          openSidebar(SIDEBAR_KEYS.AI_ASSISTANT)
                           aiSnap.newChat({
                             name: `Update trigger ${X.name}`,
-                            open: true,
                             initialInput: `Update this trigger which exists on the ${x.schema}.${x.table} table to...`,
                             suggestions: {
                               title:
diff --git a/apps/studio/components/interfaces/Database/Triggers/TriggersList/TriggersList.tsx b/apps/studio/components/interfaces/Database/Triggers/TriggersList/TriggersList.tsx
index 1f5d10fe750a9..5f662b3e54c15 100644
--- a/apps/studio/components/interfaces/Database/Triggers/TriggersList/TriggersList.tsx
+++ b/apps/studio/components/interfaces/Database/Triggers/TriggersList/TriggersList.tsx
@@ -10,6 +10,7 @@ import AlertError from 'components/ui/AlertError'
 import { ButtonTooltip } from 'components/ui/ButtonTooltip'
 import SchemaSelector from 'components/ui/SchemaSelector'
 import { GenericSkeletonLoader } from 'components/ui/ShimmeringLoader'
+import { SIDEBAR_KEYS } from 'components/layouts/ProjectLayout/LayoutSidebar/LayoutSidebarProvider'
 import { useDatabaseTriggersQuery } from 'data/database-triggers/database-triggers-query'
 import { useTablesQuery } from 'data/tables/tables-query'
 import { useAsyncCheckPermissions } from 'hooks/misc/useCheckPermissions'
@@ -17,6 +18,7 @@ import { useQuerySchemaState } from 'hooks/misc/useSchemaQueryState'
 import { useSelectedProjectQuery } from 'hooks/misc/useSelectedProject'
 import { useIsProtectedSchema, useProtectedSchemas } from 'hooks/useProtectedSchemas'
 import { useAiAssistantStateSnapshot } from 'state/ai-assistant-state'
+import { useSidebarManagerSnapshot } from 'state/sidebar-manager-state'
 import {
   AiIconAnimation,
   Button,
@@ -49,6 +51,7 @@ const TriggersList = ({
 }: TriggersListProps) => {
   const { data: project } = useSelectedProjectQuery()
   const aiSnap = useAiAssistantStateSnapshot()
+  const { openSidebar } = useSidebarManagerSnapshot()
   const { selectedSchema, setSelectedSchema } = useQuerySchemaState()
 
   const [filterString, setFilterString] = useQueryState(
@@ -138,10 +141,10 @@ const TriggersList = ({
                 disabled={!hasTables || !canCreateTriggers}
                 className="px-1 pointer-events-auto"
                 icon={<AiIconAnimation size={16} />}
-                onClick={() =>
+                onClick={() => {
+                  openSidebar(SIDEBAR_KEYS.AI_ASSISTANT)
                   aiSnap.newChat({
                     name: 'Create new trigger',
-                    open: true,
                     initialInput: `Create a new trigger for the schema ${selectedSchema} that does ...`,
                     suggestions: {
                       title:
@@ -162,7 +165,7 @@ const TriggersList = ({
                       ],
                     },
                   })
-                }
+                }}
                 tooltip={{
                   content: {
                     side: 'bottom',
diff --git a/apps/studio/components/interfaces/EdgeFunctions/DeployEdgeFunctionButton.tsx b/apps/studio/components/interfaces/EdgeFunctions/DeployEdgeFunctionButton.tsx
index 9412f8ae03553..d591e1cb74d50 100644
--- a/apps/studio/components/interfaces/EdgeFunctions/DeployEdgeFunctionButton.tsx
+++ b/apps/studio/components/interfaces/EdgeFunctions/DeployEdgeFunctionButton.tsx
@@ -19,13 +19,15 @@ import {
   DropdownMenuItem,
   DropdownMenuTrigger,
 } from 'ui'
+import { SIDEBAR_KEYS } from 'components/layouts/ProjectLayout/LayoutSidebar/LayoutSidebarProvider'
+import { useSidebarManagerSnapshot } from 'state/sidebar-manager-state'
 
 export const DeployEdgeFunctionButton = () => {
   const router = useRouter()
   const { ref } = useParams()
   const { data: org } = useSelectedOrganizationQuery()
   const snap = useAiAssistantStateSnapshot()
-
+  const { openSidebar } = useSidebarManagerSnapshot()
   const { mutate: sendEvent } = useSendEventMutation()
 
   return (
@@ -85,9 +87,9 @@ export const DeployEdgeFunctionButton = () => {
         <DropdownMenuItem
           className="gap-4"
           onSelect={() => {
+            openSidebar(SIDEBAR_KEYS.AI_ASSISTANT)
             snap.newChat({
               name: 'Create new edge function',
-              open: true,
               initialInput: `Create a new edge function that ...`,
               suggestions: {
                 title:
diff --git a/apps/studio/components/interfaces/Functions/FunctionsEmptyState.tsx b/apps/studio/components/interfaces/Functions/FunctionsEmptyState.tsx
index a89cd1c85a0e4..fd8422567276f 100644
--- a/apps/studio/components/interfaces/Functions/FunctionsEmptyState.tsx
+++ b/apps/studio/components/interfaces/Functions/FunctionsEmptyState.tsx
@@ -8,11 +8,13 @@ import { ScaffoldSectionTitle } from 'components/layouts/Scaffold'
 import { DocsButton } from 'components/ui/DocsButton'
 import { ResourceItem } from 'components/ui/Resource/ResourceItem'
 import { ResourceList } from 'components/ui/Resource/ResourceList'
+import { SIDEBAR_KEYS } from 'components/layouts/ProjectLayout/LayoutSidebar/LayoutSidebarProvider'
 import { useSendEventMutation } from 'data/telemetry/send-event-mutation'
 import { useIsFeatureEnabled } from 'hooks/misc/useIsFeatureEnabled'
 import { useSelectedOrganizationQuery } from 'hooks/misc/useSelectedOrganization'
 import { DOCS_URL } from 'lib/constants'
 import { useAiAssistantStateSnapshot } from 'state/ai-assistant-state'
+import { useSidebarManagerSnapshot } from 'state/sidebar-manager-state'
 import {
   AiIconAnimation,
   Button,
@@ -38,6 +40,7 @@ export const FunctionsEmptyState = () => {
   const { ref } = useParams()
   const router = useRouter()
   const aiSnap = useAiAssistantStateSnapshot()
+  const { openSidebar } = useSidebarManagerSnapshot()
 
   const { mutate: sendEvent } = useSendEventMutation()
   const { data: org } = useSelectedOrganizationQuery()
@@ -95,9 +98,9 @@ export const FunctionsEmptyState = () => {
             <Button
               type="default"
               onClick={() => {
+                openSidebar(SIDEBAR_KEYS.AI_ASSISTANT)
                 aiSnap.newChat({
                   name: 'Create new edge function',
-                  open: true,
                   initialInput: 'Create a new edge function that ...',
                   suggestions: {
                     title:
diff --git a/apps/studio/components/interfaces/Home/AdvisorWidget.tsx b/apps/studio/components/interfaces/Home/AdvisorWidget.tsx
index 102ebdd4229e2..9a7555a3249b2 100644
--- a/apps/studio/components/interfaces/Home/AdvisorWidget.tsx
+++ b/apps/studio/components/interfaces/Home/AdvisorWidget.tsx
@@ -27,6 +27,8 @@ import {
   TabsTrigger_Shadcn_ as TabsTrigger,
 } from 'ui'
 import ShimmeringLoader from 'ui-patterns/ShimmeringLoader'
+import { SIDEBAR_KEYS } from 'components/layouts/ProjectLayout/LayoutSidebar/LayoutSidebarProvider'
+import { useSidebarManagerSnapshot } from 'state/sidebar-manager-state'
 
 interface SlowQuery {
   rolname: string
@@ -45,6 +47,7 @@ export const AdvisorWidget = () => {
     }
   )
   const snap = useAiAssistantStateSnapshot()
+  const { openSidebar } = useSidebarManagerSnapshot()
 
   const securityLints = useMemo(
     () => (lints ?? []).filter((lint: Lint) => lint.categories.includes('SECURITY')),
@@ -147,9 +150,9 @@ export const AdvisorWidget = () => {
                       onClick={(e) => {
                         e.stopPropagation()
                         e.preventDefault()
+                        openSidebar(SIDEBAR_KEYS.AI_ASSISTANT)
                         snap.newChat({
                           name: 'Summarize lint',
-                          open: true,
                           initialInput: `Summarize the issue and suggest fixes for the following lint item:
   Title: ${lintInfoMap.find((item) => item.name === lint.name)?.title ?? lint.title}
   Entity: ${(lint.metadata && (lint.metadata.entity || (lint.metadata.schema && lint.metadata.name && `${lint.metadata.schema}.${lint.metadata.name}`))) ?? 'N/A'}
diff --git a/apps/studio/components/interfaces/HomeNew/AdvisorSection.tsx b/apps/studio/components/interfaces/HomeNew/AdvisorSection.tsx
index d5d302a7cdcd7..492e484a6618c 100644
--- a/apps/studio/components/interfaces/HomeNew/AdvisorSection.tsx
+++ b/apps/studio/components/interfaces/HomeNew/AdvisorSection.tsx
@@ -9,11 +9,13 @@ import {
   LintCategoryBadge,
   lintInfoMap,
 } from 'components/interfaces/Linter/Linter.utils'
+import { SIDEBAR_KEYS } from 'components/layouts/ProjectLayout/LayoutSidebar/LayoutSidebarProvider'
 import { ButtonTooltip } from 'components/ui/ButtonTooltip'
 import { Lint, useProjectLintsQuery } from 'data/lint/lint-query'
 import { useSendEventMutation } from 'data/telemetry/send-event-mutation'
 import { useSelectedOrganizationQuery } from 'hooks/misc/useSelectedOrganization'
 import { useAiAssistantStateSnapshot } from 'state/ai-assistant-state'
+import { useSidebarManagerSnapshot } from 'state/sidebar-manager-state'
 import {
   AiIconAnimation,
   Button,
@@ -43,6 +45,7 @@ export const AdvisorSection = ({ showEmptyState = false }: { showEmptyState?: bo
   const snap = useAiAssistantStateSnapshot()
   const { mutate: sendEvent } = useSendEventMutation()
   const { data: organization } = useSelectedOrganizationQuery()
+  const { openSidebar } = useSidebarManagerSnapshot()
 
   const [selectedLint, setSelectedLint] = useState<Lint | null>(null)
 
@@ -64,7 +67,7 @@ export const AdvisorSection = ({ showEmptyState = false }: { showEmptyState?: bo
   }, [totalErrors])
 
   const handleAskAssistant = useCallback(() => {
-    snap.toggleAssistant()
+    openSidebar(SIDEBAR_KEYS.AI_ASSISTANT)
     if (projectRef && organization?.slug) {
       sendEvent({
         action: 'home_advisor_ask_assistant_clicked',
@@ -77,7 +80,7 @@ export const AdvisorSection = ({ showEmptyState = false }: { showEmptyState?: bo
         },
       })
     }
-  }, [snap, sendEvent, projectRef, organization, totalErrors])
+  }, [sendEvent, openSidebar, projectRef, organization, totalErrors])
 
   const handleCardClick = useCallback(
     (lint: Lint) => {
@@ -150,9 +153,9 @@ export const AdvisorSection = ({ showEmptyState = false }: { showEmptyState?: bo
                       onClick={(e) => {
                         e.stopPropagation()
                         e.preventDefault()
+                        openSidebar(SIDEBAR_KEYS.AI_ASSISTANT)
                         snap.newChat({
                           name: 'Summarize lint',
-                          open: true,
                           initialInput: createLintSummaryPrompt(lint),
                         })
                         if (projectRef && organization?.slug) {
diff --git a/apps/studio/components/interfaces/HomeNew/GettingStarted/GettingStartedSection.tsx b/apps/studio/components/interfaces/HomeNew/GettingStarted/GettingStartedSection.tsx
index 165faed1418da..cd220809d3f41 100644
--- a/apps/studio/components/interfaces/HomeNew/GettingStarted/GettingStartedSection.tsx
+++ b/apps/studio/components/interfaces/HomeNew/GettingStarted/GettingStartedSection.tsx
@@ -4,11 +4,13 @@ import { useCallback, useMemo, useState } from 'react'
 
 import { useParams } from 'common'
 import { FRAMEWORKS } from 'components/interfaces/Connect/Connect.constants'
+import { SIDEBAR_KEYS } from 'components/layouts/ProjectLayout/LayoutSidebar/LayoutSidebarProvider'
 import { useSendEventMutation } from 'data/telemetry/send-event-mutation'
 import { useSelectedOrganizationQuery } from 'hooks/misc/useSelectedOrganization'
 import { useSelectedProjectQuery } from 'hooks/misc/useSelectedProject'
 import { BASE_PATH } from 'lib/constants'
 import { useAiAssistantStateSnapshot } from 'state/ai-assistant-state'
+import { useSidebarManagerSnapshot } from 'state/sidebar-manager-state'
 import { Button, Card, CardContent, ToggleGroup, ToggleGroupItem } from 'ui'
 import { FrameworkSelector } from './FrameworkSelector'
 import { GettingStarted } from './GettingStarted'
@@ -36,6 +38,7 @@ export function GettingStartedSection({ value, onChange }: GettingStartedSection
   const { data: organization } = useSelectedOrganizationQuery()
   const { mutate: sendEvent } = useSendEventMutation()
   const aiSnap = useAiAssistantStateSnapshot()
+  const { openSidebar } = useSidebarManagerSnapshot()
 
   const [selectedFramework, setSelectedFramework] = useState<string>(DEFAULT_FRAMEWORK_KEY)
   const workflow: 'no-code' | 'code' | null = value === 'code' || value === 'no-code' ? value : null
@@ -44,8 +47,11 @@ export function GettingStartedSection({ value, onChange }: GettingStartedSection
   const statuses = useGettingStartedProgress()
 
   const openAiChat = useCallback(
-    (name: string, initialInput: string) => aiSnap.newChat({ name, open: true, initialInput }),
-    [aiSnap]
+    (name: string, initialInput: string) => {
+      openSidebar(SIDEBAR_KEYS.AI_ASSISTANT)
+      aiSnap.newChat({ name, initialInput })
+    },
+    [aiSnap, openSidebar]
   )
 
   const connectPresetLinks = useMemo(() => {
diff --git a/apps/studio/components/interfaces/Linter/LintDetail.tsx b/apps/studio/components/interfaces/Linter/LintDetail.tsx
index d27463cf257bf..f5c04d4d80644 100644
--- a/apps/studio/components/interfaces/Linter/LintDetail.tsx
+++ b/apps/studio/components/interfaces/Linter/LintDetail.tsx
@@ -8,6 +8,8 @@ import { ExternalLink } from 'lucide-react'
 import { useAiAssistantStateSnapshot } from 'state/ai-assistant-state'
 import { AiIconAnimation, Button } from 'ui'
 import { EntityTypeIcon, LintCTA, LintEntity } from './Linter.utils'
+import { SIDEBAR_KEYS } from 'components/layouts/ProjectLayout/LayoutSidebar/LayoutSidebarProvider'
+import { useSidebarManagerSnapshot } from 'state/sidebar-manager-state'
 
 interface LintDetailProps {
   lint: Lint
@@ -17,6 +19,7 @@ interface LintDetailProps {
 
 const LintDetail = ({ lint, projectRef, onAskAssistant }: LintDetailProps) => {
   const snap = useAiAssistantStateSnapshot()
+  const { openSidebar } = useSidebarManagerSnapshot()
 
   return (
     <div>
@@ -41,9 +44,9 @@ const LintDetail = ({ lint, projectRef, onAskAssistant }: LintDetailProps) => {
           icon={<AiIconAnimation className="scale-75 w-3 h-3" />}
           onClick={() => {
             onAskAssistant?.()
+            openSidebar(SIDEBAR_KEYS.AI_ASSISTANT)
             snap.newChat({
               name: 'Summarize lint',
-              open: true,
               initialInput: createLintSummaryPrompt(lint),
             })
           }}
diff --git a/apps/studio/components/interfaces/LogDrains/LogDrainDestinationSheetForm.tsx b/apps/studio/components/interfaces/LogDrains/LogDrainDestinationSheetForm.tsx
index 6596c8610701e..ee4be200f4431 100644
--- a/apps/studio/components/interfaces/LogDrains/LogDrainDestinationSheetForm.tsx
+++ b/apps/studio/components/interfaces/LogDrains/LogDrainDestinationSheetForm.tsx
@@ -55,6 +55,14 @@ const formUnion = z.discriminatedUnion('type', [
     api_key: z.string().min(1, { message: 'API key is required' }),
     region: z.string().min(1, { message: 'Region is required' }),
   }),
+  z.object({
+    type: z.literal('loki'),
+    url: z.string().min(1, { message: 'Loki URL is required' }),
+    headers: z.record(z.string(), z.string()),
+    username: z.string().optional(),
+    password: z.string().optional(),
+  }),
+  // [Joshen] To fix API types, not supported in the UI
   z.object({
     type: z.literal('elastic'),
   }),
@@ -65,11 +73,13 @@ const formUnion = z.discriminatedUnion('type', [
     type: z.literal('bigquery'),
   }),
   z.object({
-    type: z.literal('loki'),
-    url: z.string().min(1, { message: 'Loki URL is required' }),
-    headers: z.record(z.string(), z.string()),
-    username: z.string().optional(),
-    password: z.string().optional(),
+    type: z.literal('clickhouse'),
+  }),
+  z.object({
+    type: z.literal('s3'),
+  }),
+  z.object({
+    type: z.literal('sentry'),
   }),
 ])
 
diff --git a/apps/studio/components/interfaces/LogDrains/LogDrains.constants.tsx b/apps/studio/components/interfaces/LogDrains/LogDrains.constants.tsx
index 813a795db473a..bb4308170bd62 100644
--- a/apps/studio/components/interfaces/LogDrains/LogDrains.constants.tsx
+++ b/apps/studio/components/interfaces/LogDrains/LogDrains.constants.tsx
@@ -1,5 +1,6 @@
-import { BracesIcon } from 'lucide-react'
+import { components } from 'api-types'
 import { Datadog, Grafana } from 'icons'
+import { BracesIcon } from 'lucide-react'
 
 const iconProps = {
   height: 24,
@@ -31,11 +32,13 @@ export const LOG_DRAIN_TYPES = [
 
 export const LOG_DRAIN_SOURCE_VALUES = LOG_DRAIN_TYPES.map((source) => source.value)
 
-export type LogDrainType =
-  | (typeof LOG_DRAIN_TYPES)[number]['value']
-  | 'postgres'
-  | 'bigquery'
-  | 'elastic'
+// export type LogDrainType =
+//   | (typeof LOG_DRAIN_TYPES)[number]['value']
+//   | 'postgres'
+//   | 'bigquery'
+//   | 'elastic'
+
+export type LogDrainType = components['schemas']['LFBackend']['type']
 
 export const DATADOG_REGIONS = [
   {
diff --git a/apps/studio/components/interfaces/Realtime/Inspector/EmptyRealtime.tsx b/apps/studio/components/interfaces/Realtime/Inspector/EmptyRealtime.tsx
index 8bed6a1596cf6..9a8019083d3ce 100644
--- a/apps/studio/components/interfaces/Realtime/Inspector/EmptyRealtime.tsx
+++ b/apps/studio/components/interfaces/Realtime/Inspector/EmptyRealtime.tsx
@@ -2,17 +2,20 @@ import { AiIconAnimation, Button, Card, cn } from 'ui'
 import Link from 'next/link'
 import { AnimatedCursors } from './AnimatedCursors'
 import { useAiAssistantStateSnapshot } from 'state/ai-assistant-state'
+import { SIDEBAR_KEYS } from 'components/layouts/ProjectLayout/LayoutSidebar/LayoutSidebarProvider'
+import { useSidebarManagerSnapshot } from 'state/sidebar-manager-state'
 
 /**
  * Acts as a container component for the entire log display
  */
 export const EmptyRealtime = ({ projectRef }: { projectRef: string }) => {
   const aiSnap = useAiAssistantStateSnapshot()
+  const { openSidebar } = useSidebarManagerSnapshot()
 
   const handleCreateTriggerWithAssistant = () => {
+    openSidebar(SIDEBAR_KEYS.AI_ASSISTANT)
     aiSnap.newChat({
       name: `Realtime`,
-      open: true,
       initialInput: `Help me set up a realtime experience for my project`,
     })
   }
diff --git a/apps/studio/components/interfaces/Reports/ReportPadding.tsx b/apps/studio/components/interfaces/Reports/ReportPadding.tsx
index 1f0261bd60a56..a002a9846af96 100644
--- a/apps/studio/components/interfaces/Reports/ReportPadding.tsx
+++ b/apps/studio/components/interfaces/Reports/ReportPadding.tsx
@@ -1,19 +1,15 @@
 import { PropsWithChildren } from 'react'
 
-import { useAiAssistantStateSnapshot } from 'state/ai-assistant-state'
 import { cn } from 'ui'
 
 /**
  * Standardized padding and width layout for non-custom reports
  */
 const ReportPadding = ({ children }: PropsWithChildren<{}>) => {
-  const snap = useAiAssistantStateSnapshot()
-
   return (
     <div
       className={cn(
-        'flex flex-col flex-grow gap-4 px-5 py-6 mx-auto 1xl:px-28 lg:px-16 2xl:px-32 w-full',
-        snap.open ? 'xl:px-6' : 'xl:px-22'
+        'flex flex-col flex-grow gap-4 px-5 py-6 mx-auto 1xl:px-28 lg:px-16 2xl:px-32 w-full @lg:px-6 @xl:px-22'
       )}
     >
       {children}
diff --git a/apps/studio/components/interfaces/SQLEditor/MonacoEditor.tsx b/apps/studio/components/interfaces/SQLEditor/MonacoEditor.tsx
index 9d7c268d8275f..bedc4df9f4a29 100644
--- a/apps/studio/components/interfaces/SQLEditor/MonacoEditor.tsx
+++ b/apps/studio/components/interfaces/SQLEditor/MonacoEditor.tsx
@@ -4,10 +4,12 @@ import { MutableRefObject, useEffect, useRef, useState } from 'react'
 
 import { useDebounce } from '@uidotdev/usehooks'
 import { LOCAL_STORAGE_KEYS, useParams } from 'common'
+import { SIDEBAR_KEYS } from 'components/layouts/ProjectLayout/LayoutSidebar/LayoutSidebarProvider'
 import { useLocalStorageQuery } from 'hooks/misc/useLocalStorage'
 import { useSelectedProjectQuery } from 'hooks/misc/useSelectedProject'
 import { useProfile } from 'lib/profile'
 import { useAiAssistantStateSnapshot } from 'state/ai-assistant-state'
+import { useSidebarManagerSnapshot } from 'state/sidebar-manager-state'
 import { useSqlEditorV2StateSnapshot } from 'state/sql-editor-v2'
 import { useTabsStateSnapshot } from 'state/tabs'
 import { cn } from 'ui'
@@ -55,6 +57,7 @@ const MonacoEditor = ({
   const snapV2 = useSqlEditorV2StateSnapshot()
   const tabsSnap = useTabsStateSnapshot()
   const aiSnap = useAiAssistantStateSnapshot()
+  const { openSidebar } = useSidebarManagerSnapshot()
 
   const [intellisenseEnabled] = useLocalStorageQuery(
     LOCAL_STORAGE_KEYS.SQL_EDITOR_INTELLISENSE,
@@ -112,9 +115,9 @@ const MonacoEditor = ({
         const selectedValue = (editorRef?.current as any)
           .getModel()
           .getValueInRange((editorRef?.current as any)?.getSelection())
+        openSidebar(SIDEBAR_KEYS.AI_ASSISTANT)
         aiSnap.newChat({
           name: 'Explain code section',
-          open: true,
           sqlSnippets: [selectedValue],
           initialInput: 'Can you explain this section to me in more detail?',
         })
diff --git a/apps/studio/components/interfaces/SQLEditor/SQLEditor.tsx b/apps/studio/components/interfaces/SQLEditor/SQLEditor.tsx
index 58b820518666c..8614d72f2fa2a 100644
--- a/apps/studio/components/interfaces/SQLEditor/SQLEditor.tsx
+++ b/apps/studio/components/interfaces/SQLEditor/SQLEditor.tsx
@@ -8,6 +8,7 @@ import { toast } from 'sonner'
 
 import { LOCAL_STORAGE_KEYS, useParams } from 'common'
 import ResizableAIWidget from 'components/ui/AIEditor/ResizableAIWidget'
+import { SIDEBAR_KEYS } from 'components/layouts/ProjectLayout/LayoutSidebar/LayoutSidebarProvider'
 import { GridFooter } from 'components/ui/GridFooter'
 import { useSqlTitleGenerateMutation } from 'data/ai/sql-title-mutation'
 import { useEntityDefinitionsQuery } from 'data/database/entity-definitions-query'
@@ -28,6 +29,7 @@ import { useProfile } from 'lib/profile'
 import { wrapWithRoleImpersonation } from 'lib/role-impersonation'
 import { useAiAssistantStateSnapshot } from 'state/ai-assistant-state'
 import { useDatabaseSelectorStateSnapshot } from 'state/database-selector'
+import { useSidebarManagerSnapshot } from 'state/sidebar-manager-state'
 import {
   isRoleImpersonationEnabled,
   useGetImpersonatedRoleState,
@@ -86,6 +88,7 @@ export const SQLEditor = () => {
   const queryClient = useQueryClient()
   const tabs = useTabsStateSnapshot()
   const aiSnap = useAiAssistantStateSnapshot()
+  const { openSidebar } = useSidebarManagerSnapshot()
   const snapV2 = useSqlEditorV2StateSnapshot()
   const getImpersonatedRoleState = useGetImpersonatedRoleState()
   const databaseSelectorState = useDatabaseSelectorStateSnapshot()
@@ -380,9 +383,9 @@ export const SQLEditor = () => {
     try {
       const snippet = snapV2.snippets[id]
       const result = snapV2.results[id]?.[0]
+      openSidebar(SIDEBAR_KEYS.AI_ASSISTANT)
       aiSnap.newChat({
         name: 'Debug SQL snippet',
-        open: true,
         sqlSnippets: [
           (snippet.snippet.content?.sql ?? '').replace(sqlAiDisclaimerComment, '').trim(),
         ],
diff --git a/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/ColumnEditor/ColumnEditor.utils.ts b/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/ColumnEditor/ColumnEditor.utils.ts
index c767ee78a2c09..896f97e8ed5a7 100644
--- a/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/ColumnEditor/ColumnEditor.utils.ts
+++ b/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/ColumnEditor/ColumnEditor.utils.ts
@@ -4,15 +4,15 @@ import type { Dictionary } from 'types'
 
 import { FOREIGN_KEY_CASCADE_ACTION } from 'data/database/database-query-constants'
 import type { ForeignKeyConstraint } from 'data/database/foreign-key-constraints-query'
+import type { RetrievedTableColumn, RetrieveTableResult } from 'data/tables/table-retrieve-query'
 import { uuidv4 } from 'lib/helpers'
+import { toast } from 'sonner'
 import {
   ColumnField,
   CreateColumnPayload,
   ExtendedPostgresRelationship,
   UpdateColumnPayload,
 } from '../SidePanelEditor.types'
-import type { RetrievedTableColumn, RetrieveTableResult } from 'data/tables/table-retrieve-query'
-import { toast } from 'sonner'
 
 const isSQLExpression = (input: string) => {
   if (['CURRENT_DATE'].includes(input)) return true
@@ -136,10 +136,10 @@ export const generateUpdateColumnPayload = (
     payload.name = name
   }
   if (!isEqual(originalColumn.comment?.trim(), comment)) {
-    payload.comment = comment || null
+    payload.comment = comment
   }
   if (!isEqual(originalColumn.check?.trim(), check)) {
-    payload.check = check || null
+    payload.check = check
   }
 
   if (!isEqual(originalColumn.format, type)) {
diff --git a/apps/studio/components/layouts/AccountLayout/WithSidebar.tsx b/apps/studio/components/layouts/AccountLayout/WithSidebar.tsx
index b70d439f9f5e2..303fa13e9d2fb 100644
--- a/apps/studio/components/layouts/AccountLayout/WithSidebar.tsx
+++ b/apps/studio/components/layouts/AccountLayout/WithSidebar.tsx
@@ -1,10 +1,10 @@
 import { ArrowLeft } from 'lucide-react'
 import Link from 'next/link'
 import { PropsWithChildren, ReactNode } from 'react'
+import { useAppStateSnapshot } from 'state/app-state'
 import { cn, Menu } from 'ui'
 import MobileSheetNav from 'ui-patterns/MobileSheetNav/MobileSheetNav'
 import type { SidebarSection } from './AccountLayout.types'
-import { useAppStateSnapshot } from 'state/app-state'
 
 interface WithSidebarProps {
   title: string
@@ -49,7 +49,7 @@ export const WithSidebar = ({
       )}
       <div className="flex flex-1 flex-col">
         <div className="flex-1 flex-grow overflow-y-auto">
-          <div className="mx-auto max-w-7xl w-full px-6 lg:px-14 xl:px-28 2xl:px-32 py-16">
+          <div className="mx-auto max-w-7xl w-full md:px-6 lg:px-14 xl:px-28 2xl:px-32 py-16">
             {children}
           </div>
         </div>
diff --git a/apps/studio/components/layouts/AppLayout/AssistantButton.tsx b/apps/studio/components/layouts/AppLayout/AssistantButton.tsx
index afe8bcba9fd8c..d9e8b835dd9fb 100644
--- a/apps/studio/components/layouts/AppLayout/AssistantButton.tsx
+++ b/apps/studio/components/layouts/AppLayout/AssistantButton.tsx
@@ -3,11 +3,13 @@ import { ButtonTooltip } from 'components/ui/ButtonTooltip'
 import { useLocalStorageQuery } from 'hooks/misc/useLocalStorage'
 import { useAiAssistantStateSnapshot } from 'state/ai-assistant-state'
 import { AiIconAnimation, KeyboardShortcut } from 'ui'
+import { SIDEBAR_KEYS } from '../ProjectLayout/LayoutSidebar/LayoutSidebarProvider'
+import { useSidebarManagerSnapshot } from 'state/sidebar-manager-state'
 
 export const AssistantButton = () => {
-  const snap = useAiAssistantStateSnapshot()
+  const { toggleSidebar } = useSidebarManagerSnapshot()
   const [isAIAssistantHotkeyEnabled] = useLocalStorageQuery<boolean>(
-    LOCAL_STORAGE_KEYS.HOTKEY_AI_ASSISTANT,
+    LOCAL_STORAGE_KEYS.HOTKEY_SIDEBAR(SIDEBAR_KEYS.AI_ASSISTANT),
     true
   )
 
@@ -18,7 +20,7 @@ export const AssistantButton = () => {
       id="assistant-trigger"
       className="rounded-none w-[32px] h-[30px] flex items-center justify-center p-0 hover:bg-brand-400"
       onClick={() => {
-        snap.toggleAssistant()
+        toggleSidebar(SIDEBAR_KEYS.AI_ASSISTANT)
       }}
       tooltip={{
         content: {
diff --git a/apps/studio/components/layouts/DefaultLayout.tsx b/apps/studio/components/layouts/DefaultLayout.tsx
index 99a094feedc11..56fa5a9ba8b7e 100644
--- a/apps/studio/components/layouts/DefaultLayout.tsx
+++ b/apps/studio/components/layouts/DefaultLayout.tsx
@@ -15,6 +15,7 @@ import { ProjectContextProvider } from './ProjectLayout/ProjectContext'
 
 export interface DefaultLayoutProps {
   headerTitle?: string
+  hideMobileMenu?: boolean
 }
 
 /**
@@ -27,7 +28,11 @@ export interface DefaultLayoutProps {
  * - Mobile navigation bar
  * - First level side navigation bar (e.g For navigating to Table Editor, SQL Editor, Database page, etc)
  */
-const DefaultLayout = ({ children, headerTitle }: PropsWithChildren<DefaultLayoutProps>) => {
+const DefaultLayout = ({
+  children,
+  headerTitle,
+  hideMobileMenu,
+}: PropsWithChildren<DefaultLayoutProps>) => {
   const { ref } = useParams()
   const router = useRouter()
   const appSnap = useAppStateSnapshot()
@@ -55,7 +60,7 @@ const DefaultLayout = ({ children, headerTitle }: PropsWithChildren<DefaultLayou
             {/* Top Banner */}
             <AppBannerWrapper />
             <div className="flex-shrink-0">
-              <MobileNavigationBar />
+              <MobileNavigationBar hideMobileMenu={hideMobileMenu} />
               <LayoutHeader
                 showProductMenu={showProductMenu}
                 headerTitle={headerTitle}
diff --git a/apps/studio/components/layouts/ProjectLayout/LayoutHeader/HelpPopover.tsx b/apps/studio/components/layouts/ProjectLayout/LayoutHeader/HelpPopover.tsx
index cf226207bb275..87a65ed455e4a 100644
--- a/apps/studio/components/layouts/ProjectLayout/LayoutHeader/HelpPopover.tsx
+++ b/apps/studio/components/layouts/ProjectLayout/LayoutHeader/HelpPopover.tsx
@@ -20,12 +20,15 @@ import {
   PopoverTrigger_Shadcn_,
   Popover_Shadcn_,
 } from 'ui'
+import { SIDEBAR_KEYS } from '../LayoutSidebar/LayoutSidebarProvider'
+import { useSidebarManagerSnapshot } from 'state/sidebar-manager-state'
 
 export const HelpPopover = () => {
   const router = useRouter()
   const { data: project } = useSelectedProjectQuery()
   const { data: org } = useSelectedOrganizationQuery()
   const snap = useAiAssistantStateSnapshot()
+  const { openSidebar } = useSidebarManagerSnapshot()
 
   const { mutate: sendEvent } = useSendEventMutation()
 
@@ -69,9 +72,9 @@ export const HelpPopover = () => {
                 size="tiny"
                 icon={<AiIconAnimation allowHoverEffect size={14} />}
                 onClick={() => {
+                  openSidebar(SIDEBAR_KEYS.AI_ASSISTANT)
                   snap.newChat({
                     name: 'Support',
-                    open: true,
                     initialInput: `I need help with my project`,
                     suggestions: {
                       title:
diff --git a/apps/studio/components/layouts/ProjectLayout/LayoutSidebar/LayoutSidebarProvider.tsx b/apps/studio/components/layouts/ProjectLayout/LayoutSidebar/LayoutSidebarProvider.tsx
new file mode 100644
index 0000000000000..6ae847d36c1c9
--- /dev/null
+++ b/apps/studio/components/layouts/ProjectLayout/LayoutSidebar/LayoutSidebarProvider.tsx
@@ -0,0 +1,27 @@
+import { useRouter } from 'next/router'
+import { PropsWithChildren, useEffect } from 'react'
+import { useRegisterSidebar, useSidebarManagerSnapshot } from 'state/sidebar-manager-state'
+import { AIAssistant } from 'components/ui/AIAssistantPanel/AIAssistant'
+
+export const SIDEBAR_KEYS = {
+  AI_ASSISTANT: 'ai-assistant',
+} as const
+
+export const LayoutSidebarProvider = ({ children }: PropsWithChildren) => {
+  useRegisterSidebar(SIDEBAR_KEYS.AI_ASSISTANT, () => <AIAssistant />, {}, 'i')
+
+  const router = useRouter()
+  const { openSidebar } = useSidebarManagerSnapshot()
+
+  // Handle sidebar URL parameter
+  useEffect(() => {
+    if (!router.isReady) return
+
+    const sidebarParam = router.query.sidebar
+    if (typeof sidebarParam === 'string') {
+      openSidebar(sidebarParam)
+    }
+  }, [router.isReady, router.query.sidebar, openSidebar])
+
+  return <>{children}</>
+}
diff --git a/apps/studio/components/layouts/ProjectLayout/LayoutSidebar/index.test.tsx b/apps/studio/components/layouts/ProjectLayout/LayoutSidebar/index.test.tsx
new file mode 100644
index 0000000000000..1c5cef6bb6059
--- /dev/null
+++ b/apps/studio/components/layouts/ProjectLayout/LayoutSidebar/index.test.tsx
@@ -0,0 +1,72 @@
+import { act, screen, waitFor } from '@testing-library/react'
+import { describe, expect, it, beforeEach, afterEach, vi } from 'vitest'
+
+import { LayoutSidebar } from './index'
+import { LayoutSidebarProvider, SIDEBAR_KEYS } from './LayoutSidebarProvider'
+import { sidebarManagerState } from 'state/sidebar-manager-state'
+import { render } from 'tests/helpers'
+import { routerMock } from 'tests/lib/route-mock'
+import { ResizablePanel, ResizablePanelGroup } from 'ui'
+
+vi.mock('components/ui/AIAssistantPanel/AIAssistant', () => ({
+  AIAssistant: () => <div data-testid="ai-assistant-sidebar">AI Assistant</div>,
+}))
+
+const resetSidebarManagerState = () => {
+  Object.keys(sidebarManagerState.sidebars).forEach((id) => {
+    sidebarManagerState.unregisterSidebar(id)
+  })
+  sidebarManagerState.closeActive()
+}
+
+describe('LayoutSidebar', () => {
+  beforeEach(() => {
+    routerMock.setCurrentUrl('/projects/default')
+  })
+
+  afterEach(() => {
+    resetSidebarManagerState()
+    localStorage.clear()
+    vi.clearAllMocks()
+  })
+
+  const renderSidebar = () =>
+    render(
+      <ResizablePanelGroup direction="horizontal">
+        <ResizablePanel>
+          <div />
+        </ResizablePanel>
+        <LayoutSidebarProvider>
+          <LayoutSidebar />
+        </LayoutSidebarProvider>
+      </ResizablePanelGroup>
+    )
+
+  it('does not render when there is no active sidebar', () => {
+    renderSidebar()
+
+    expect(screen.queryByTestId('ai-assistant-sidebar')).toBeNull()
+  })
+
+  it('renders the active sidebar content when toggled on', async () => {
+    renderSidebar()
+
+    await waitFor(() => {
+      expect(sidebarManagerState.sidebars[SIDEBAR_KEYS.AI_ASSISTANT]).toBeDefined()
+    })
+
+    act(() => {
+      sidebarManagerState.toggleSidebar(SIDEBAR_KEYS.AI_ASSISTANT)
+    })
+
+    expect(await screen.findByTestId('ai-assistant-sidebar')).toBeInTheDocument()
+  })
+
+  it('auto-opens when sidebar query param matches a registered sidebar', async () => {
+    routerMock.setCurrentUrl(`/?sidebar=${SIDEBAR_KEYS.AI_ASSISTANT}`)
+
+    renderSidebar()
+
+    await screen.findByTestId('ai-assistant-sidebar')
+  })
+})
diff --git a/apps/studio/components/layouts/ProjectLayout/LayoutSidebar/index.tsx b/apps/studio/components/layouts/ProjectLayout/LayoutSidebar/index.tsx
new file mode 100644
index 0000000000000..7d613b538bea4
--- /dev/null
+++ b/apps/studio/components/layouts/ProjectLayout/LayoutSidebar/index.tsx
@@ -0,0 +1,32 @@
+import { Fragment } from 'react'
+import { useSidebarManagerSnapshot } from 'state/sidebar-manager-state'
+import { ResizableHandle, ResizablePanel, cn } from 'ui'
+
+export const LayoutSidebar = () => {
+  const { activeSidebar } = useSidebarManagerSnapshot()
+
+  if (!activeSidebar?.component) {
+    return null
+  }
+
+  return (
+    <Fragment>
+      <ResizableHandle withHandle />
+      <ResizablePanel
+        id="panel-side"
+        key={activeSidebar.id}
+        defaultSize={30}
+        minSize={30}
+        maxSize={50}
+        className={cn(
+          'border-l bg fixed z-40 right-0 top-0 bottom-0',
+          'w-screen h-[100dvh]',
+          'md:absolute md:h-auto md:w-3/4',
+          'xl:relative xl:border-l-0'
+        )}
+      >
+        {activeSidebar.component()}
+      </ResizablePanel>
+    </Fragment>
+  )
+}
diff --git a/apps/studio/components/layouts/ProjectLayout/NavigationBar/MobileNavigationBar.tsx b/apps/studio/components/layouts/ProjectLayout/NavigationBar/MobileNavigationBar.tsx
index 8891e53c65cef..04b87035fd372 100644
--- a/apps/studio/components/layouts/ProjectLayout/NavigationBar/MobileNavigationBar.tsx
+++ b/apps/studio/components/layouts/ProjectLayout/NavigationBar/MobileNavigationBar.tsx
@@ -6,14 +6,14 @@ import { useState } from 'react'
 import { useParams } from 'common'
 import { SidebarContent } from 'components/interfaces/Sidebar'
 import { IS_PLATFORM } from 'lib/constants'
-import { buttonVariants, cn } from 'ui'
+import { Button, cn } from 'ui'
 import { CommandMenuTrigger } from 'ui-patterns'
 import MobileSheetNav from 'ui-patterns/MobileSheetNav/MobileSheetNav'
 
 export const ICON_SIZE = 20
 export const ICON_STROKE_WIDTH = 1.5
 
-const MobileNavigationBar = () => {
+const MobileNavigationBar = ({ hideMobileMenu }: { hideMobileMenu?: boolean }) => {
   const router = useRouter()
   const [isSheetOpen, setIsSheetOpen] = useState(false)
   const { ref: projectRef } = useParams()
@@ -57,16 +57,15 @@ const MobileNavigationBar = () => {
               </div>
             </button>
           </CommandMenuTrigger>
-          <button
-            title="Menu dropdown button"
-            className={cn(
-              buttonVariants({ type: 'default' }),
-              'flex lg:hidden border-default bg-surface-100/75 text-foreground-light rounded-md min-w-[30px] w-[30px] h-[30px] data-[state=open]:bg-overlay-hover/30'
-            )}
-            onClick={() => setIsSheetOpen(true)}
-          >
-            <Menu size={18} strokeWidth={1} />
-          </button>
+          {!hideMobileMenu && (
+            <Button
+              title="Menu dropdown button"
+              type="default"
+              className="flex lg:hidden border-default bg-surface-100/75 text-foreground-light rounded-md min-w-[30px] w-[30px] h-[30px] data-[state=open]:bg-overlay-hover/30"
+              icon={<Menu />}
+              onClick={() => setIsSheetOpen(true)}
+            />
+          )}
         </div>
       </nav>
       <MobileSheetNav open={isSheetOpen} onOpenChange={setIsSheetOpen} data-state="expanded">
diff --git a/apps/studio/components/layouts/ProjectLayout/ProjectLayout.tsx b/apps/studio/components/layouts/ProjectLayout/ProjectLayout.tsx
index 98b53f5f2f232..68d6e88b3597b 100644
--- a/apps/studio/components/layouts/ProjectLayout/ProjectLayout.tsx
+++ b/apps/studio/components/layouts/ProjectLayout/ProjectLayout.tsx
@@ -2,21 +2,16 @@ import { AnimatePresence, motion } from 'framer-motion'
 import Head from 'next/head'
 import { useRouter } from 'next/router'
 import { forwardRef, Fragment, PropsWithChildren, ReactNode, useEffect, useState } from 'react'
-
-import { LOCAL_STORAGE_KEYS, useParams, useFlag } from 'common'
+import { useParams, useFlag } from 'common'
 import { CreateBranchModal } from 'components/interfaces/BranchManagement/CreateBranchModal'
 import ProjectAPIDocs from 'components/interfaces/ProjectAPIDocs/ProjectAPIDocs'
-import { AIAssistant } from 'components/ui/AIAssistantPanel/AIAssistant'
 import { Loading } from 'components/ui/Loading'
 import { ResourceExhaustionWarningBanner } from 'components/ui/ResourceExhaustionWarningBanner/ResourceExhaustionWarningBanner'
 import { useCustomContent } from 'hooks/custom-content/useCustomContent'
-import { useLocalStorageQuery } from 'hooks/misc/useLocalStorage'
 import { useSelectedOrganizationQuery } from 'hooks/misc/useSelectedOrganization'
 import { useSelectedProjectQuery } from 'hooks/misc/useSelectedProject'
 import { withAuth } from 'hooks/misc/withAuth'
-import { useHotKey } from 'hooks/ui/useHotKey'
 import { PROJECT_STATUS } from 'lib/constants'
-import { useAiAssistantStateSnapshot } from 'state/ai-assistant-state'
 import { useAppStateSnapshot } from 'state/app-state'
 import { useDatabaseSelectorStateSnapshot } from 'state/database-selector'
 import { cn, ResizableHandle, ResizablePanel, ResizablePanelGroup } from 'ui'
@@ -34,6 +29,8 @@ import RestartingState from './RestartingState'
 import { RestoreFailedState } from './RestoreFailedState'
 import RestoringState from './RestoringState'
 import { UpgradingState } from './UpgradingState'
+import { LayoutSidebar } from './LayoutSidebar'
+import { LayoutSidebarProvider } from './LayoutSidebar/LayoutSidebarProvider'
 
 // [Joshen] This is temporary while we unblock users from managing their project
 // if their project is not responding well for any reason. Eventually needs a bit of an overhaul
@@ -93,19 +90,10 @@ export const ProjectLayout = forwardRef<HTMLDivElement, PropsWithChildren<Projec
     const { data: selectedOrganization } = useSelectedOrganizationQuery()
     const { data: selectedProject } = useSelectedProjectQuery()
     const { mobileMenuOpen, showSidebar, setMobileMenuOpen } = useAppStateSnapshot()
-    const aiSnap = useAiAssistantStateSnapshot()
-    const [isAiAssistantHotkeyEnabled] = useLocalStorageQuery<boolean>(
-      LOCAL_STORAGE_KEYS.HOTKEY_AI_ASSISTANT,
-      true
-    )
 
     const { appTitle } = useCustomContent(['app:title'])
     const titleSuffix = appTitle || 'Supabase'
 
-    useHotKey(() => aiSnap.toggleAssistant(), 'i', [aiSnap], {
-      enabled: isAiAssistantHotkeyEnabled,
-    })
-
     const editor = useEditorType()
     const forceShowProductMenu = editor === undefined
     const sideBarIsOpen = forceShowProductMenu || showSidebar
@@ -227,25 +215,9 @@ export const ProjectLayout = forwardRef<HTMLDivElement, PropsWithChildren<Projec
                     )}
                   </main>
                 </ResizablePanel>
-                {isClient && aiSnap.open && (
-                  <>
-                    <ResizableHandle withHandle />
-                    <ResizablePanel
-                      id="panel-assistant"
-                      defaultSize={30}
-                      minSize={30}
-                      maxSize={50}
-                      className={cn(
-                        'border-l bg fixed z-40 right-0 top-0 bottom-0',
-                        'w-screen h-[100dvh]',
-                        'md:absolute md:h-auto md:w-3/4',
-                        'xl:relative xl:border-l-0'
-                      )}
-                    >
-                      <AIAssistant className="w-full h-[100dvh] md:h-full max-h-[100dvh]" />
-                    </ResizablePanel>
-                  </>
-                )}
+                <LayoutSidebarProvider>
+                  <LayoutSidebar />
+                </LayoutSidebarProvider>
               </ResizablePanelGroup>
             </ResizablePanel>
           </ResizablePanelGroup>
diff --git a/apps/studio/components/layouts/Tabs/NewTab.tsx b/apps/studio/components/layouts/Tabs/NewTab.tsx
index 99dbe052b96db..5ccaa92bf1043 100644
--- a/apps/studio/components/layouts/Tabs/NewTab.tsx
+++ b/apps/studio/components/layouts/Tabs/NewTab.tsx
@@ -23,6 +23,7 @@ import { useProfile } from 'lib/profile'
 import { AssistantMessageType, useAiAssistantStateSnapshot } from 'state/ai-assistant-state'
 import { useSqlEditorV2StateSnapshot } from 'state/sql-editor-v2'
 import { useTableEditorStateSnapshot } from 'state/table-editor'
+import { useSidebarManagerSnapshot } from 'state/sidebar-manager-state'
 import { createTabId, useTabsStateSnapshot } from 'state/tabs'
 import {
   AiIconAnimation,
@@ -37,6 +38,7 @@ import {
 import { useEditorType } from '../editors/EditorsLayout.hooks'
 import { ActionCard } from './ActionCard'
 import { RecentItems } from './RecentItems'
+import { SIDEBAR_KEYS } from '../ProjectLayout/LayoutSidebar/LayoutSidebarProvider'
 
 const NEW_PROJECT_THRESHOLD_DAYS = 7
 const TABLE_QUICKSTART_FLAG = 'tableQuickstart'
@@ -59,7 +61,7 @@ export function NewTab() {
   const snapV2 = useSqlEditorV2StateSnapshot()
   const tabs = useTabsStateSnapshot()
   const aiSnap = useAiAssistantStateSnapshot()
-
+  const { openSidebar } = useSidebarManagerSnapshot()
   const [isCreatingChat, setIsCreatingChat] = useState(false)
   const [templates] = partition(SQL_TEMPLATES, { type: 'template' })
   const [quickstarts] = partition(SQL_TEMPLATES, { type: 'quickstart' })
@@ -103,9 +105,9 @@ export function NewTab() {
     setIsCreatingChat(true)
 
     try {
+      openSidebar(SIDEBAR_KEYS.AI_ASSISTANT)
       const chatId = aiSnap.newChat({
         name: 'Create a database table',
-        open: true,
       })
 
       if (!chatId) {
diff --git a/apps/studio/components/ui/AIAssistantPanel/AIAssistant.tsx b/apps/studio/components/ui/AIAssistantPanel/AIAssistant.tsx
index 4678cf0a7af9b..e0eb19df63ce5 100644
--- a/apps/studio/components/ui/AIAssistantPanel/AIAssistant.tsx
+++ b/apps/studio/components/ui/AIAssistantPanel/AIAssistant.tsx
@@ -24,6 +24,8 @@ import { BASE_PATH, IS_PLATFORM } from 'lib/constants'
 import uuidv4 from 'lib/uuid'
 import type { AssistantModel } from 'state/ai-assistant-state'
 import { useAiAssistantStateSnapshot } from 'state/ai-assistant-state'
+import { useSidebarManagerSnapshot } from 'state/sidebar-manager-state'
+import { SIDEBAR_KEYS } from 'components/layouts/ProjectLayout/LayoutSidebar/LayoutSidebarProvider'
 import { useSqlEditorV2StateSnapshot } from 'state/sql-editor-v2'
 import { Button, cn, KeyboardShortcut } from 'ui'
 import { Admonition } from 'ui-patterns'
@@ -59,6 +61,7 @@ export const AIAssistant = ({ className }: AIAssistantProps) => {
   const disablePrompts = useFlag('disableAssistantPrompts')
   const { snippets } = useSqlEditorV2StateSnapshot()
   const snap = useAiAssistantStateSnapshot()
+  const { closeSidebar, isSidebarOpen } = useSidebarManagerSnapshot()
 
   const isPaidPlan = selectedOrganization?.plan?.id !== 'free'
 
@@ -432,11 +435,11 @@ export const AIAssistant = ({ className }: AIAssistantProps) => {
   }, [snap.initialInput])
 
   useEffect(() => {
-    if (snap.open && isInSQLEditor && !!snippetContent) {
+    if (isSidebarOpen(SIDEBAR_KEYS.AI_ASSISTANT) && isInSQLEditor && !!snippetContent) {
       snap.setSqlSnippets([{ label: 'Current Query', content: snippetContent }])
     }
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [snap.open, isInSQLEditor, snippetContent])
+  }, [isSidebarOpen, isInSQLEditor, snippetContent])
 
   return (
     <ErrorBoundary
@@ -457,11 +460,11 @@ export const AIAssistant = ({ className }: AIAssistantProps) => {
         },
       ]}
     >
-      <div className={cn('flex flex-col h-full', className)}>
+      <div className={cn('flex flex-col h-full w-full md:h-full max-h-[100dvh]', className)}>
         <AIAssistantHeader
           isChatLoading={isChatLoading}
           onNewChat={snap.newChat}
-          onCloseAssistant={snap.closeAssistant}
+          onCloseAssistant={() => closeSidebar(SIDEBAR_KEYS.AI_ASSISTANT)}
           showMetadataWarning={showMetadataWarning}
           updatedOptInSinceMCP={updatedOptInSinceMCP}
           isHipaaProjectDisallowed={isHipaaProjectDisallowed as boolean}
diff --git a/apps/studio/components/ui/QueryBlock/EditQueryButton.tsx b/apps/studio/components/ui/QueryBlock/EditQueryButton.tsx
index 60585ed66620d..3637ef1edf7c6 100644
--- a/apps/studio/components/ui/QueryBlock/EditQueryButton.tsx
+++ b/apps/studio/components/ui/QueryBlock/EditQueryButton.tsx
@@ -20,6 +20,8 @@ import {
   TooltipContent,
 } from 'ui'
 import { ButtonTooltip } from '../ButtonTooltip'
+import { SIDEBAR_KEYS } from 'components/layouts/ProjectLayout/LayoutSidebar/LayoutSidebarProvider'
+import { useSidebarManagerSnapshot } from 'state/sidebar-manager-state'
 
 interface EditQueryButtonProps {
   id?: string
@@ -41,7 +43,7 @@ export const EditQueryButton = ({
   const { newQuery } = useNewQuery()
 
   const sqlEditorSnap = useSqlEditorV2StateSnapshot()
-  const snap = useAiAssistantStateSnapshot()
+  const { closeSidebar } = useSidebarManagerSnapshot()
 
   const isInSQLEditor = router.pathname.includes('/sql')
   const isInNewSnippet = router.pathname.endsWith('/sql')
@@ -79,7 +81,7 @@ export const EditQueryButton = ({
           // This component needs to be updated to work with local EditorPanel state
           // For now, fall back to creating a new query
           if (sql) newQuery(sql, title)
-          snap.closeAssistant()
+          closeSidebar(SIDEBAR_KEYS.AI_ASSISTANT)
         } else {
           if (sql) newQuery(sql, title)
         }
diff --git a/apps/studio/data/database-columns/database-column-create-mutation.ts b/apps/studio/data/database-columns/database-column-create-mutation.ts
index 38f57e0addc36..19ee9b2ab7dc6 100644
--- a/apps/studio/data/database-columns/database-column-create-mutation.ts
+++ b/apps/studio/data/database-columns/database-column-create-mutation.ts
@@ -2,13 +2,23 @@ import pgMeta from '@supabase/pg-meta'
 import { useMutation, UseMutationOptions } from '@tanstack/react-query'
 import { toast } from 'sonner'
 
-import type { components } from 'data/api'
 import { executeSql } from 'data/sql/execute-sql-query'
 import type { ResponseError } from 'types'
 
-export type CreateColumnBody = Omit<components['schemas']['CreateColumnBody'], 'tableId'> & {
+export type CreateColumnBody = {
   schema: string
   table: string
+  name: string
+  type: string
+  check?: string
+  comment?: string
+  defaultValue?: any
+  defaultValueFormat?: 'expression' | 'literal'
+  identityGeneration?: 'BY DEFAULT' | 'ALWAYS'
+  isIdentity?: boolean
+  isNullable?: boolean
+  isPrimaryKey?: boolean
+  isUnique?: boolean
 }
 
 export type DatabaseColumnCreateVariables = {
diff --git a/apps/studio/data/database-columns/database-column-update-mutation.ts b/apps/studio/data/database-columns/database-column-update-mutation.ts
index 419f25cb3724d..8958473ed600f 100644
--- a/apps/studio/data/database-columns/database-column-update-mutation.ts
+++ b/apps/studio/data/database-columns/database-column-update-mutation.ts
@@ -3,16 +3,14 @@ import { PGColumn } from '@supabase/pg-meta/src/pg-meta-columns'
 import { useMutation, UseMutationOptions } from '@tanstack/react-query'
 import { toast } from 'sonner'
 
-import type { components } from 'data/api'
 import { executeSql } from 'data/sql/execute-sql-query'
 import type { ResponseError } from 'types'
+import { CreateColumnBody } from './database-column-create-mutation'
 
-export type UpdateColumnBody = Omit<
-  components['schemas']['UpdateColumnBody'],
-  'check' | 'comment'
+export type UpdateColumnBody = Partial<
+  Omit<CreateColumnBody, 'schema' | 'table' | 'isPrimaryKey'>
 > & {
-  check?: string | null
-  comment?: string | null
+  dropDefault?: boolean
 }
 
 export type DatabaseColumnUpdateVariables = {
diff --git a/apps/studio/data/database-policies/database-policy-create-mutation.ts b/apps/studio/data/database-policies/database-policy-create-mutation.ts
index b218c4a32dc30..386abe32cb103 100644
--- a/apps/studio/data/database-policies/database-policy-create-mutation.ts
+++ b/apps/studio/data/database-policies/database-policy-create-mutation.ts
@@ -2,12 +2,20 @@ import pgMeta from '@supabase/pg-meta'
 import { useMutation, UseMutationOptions, useQueryClient } from '@tanstack/react-query'
 import { toast } from 'sonner'
 
-import type { components } from 'data/api'
 import { executeSql } from 'data/sql/execute-sql-query'
 import type { ResponseError } from 'types'
 import { databasePoliciesKeys } from './keys'
 
-type CreatePolicyBody = components['schemas']['CreatePolicyBody']
+type CreatePolicyBody = {
+  name: string
+  table: string
+  schema?: string
+  definition?: string
+  check?: string
+  action?: 'PERMISSIVE' | 'RESTRICTIVE'
+  command?: 'SELECT' | 'INSERT' | 'UPDATE' | 'DELETE' | 'ALL'
+  roles?: string[]
+}
 
 export type DatabasePolicyCreateVariables = {
   projectRef: string
diff --git a/apps/studio/data/fetchers.ts b/apps/studio/data/fetchers.ts
index f0ca332c3b5e0..6b2969b8217fe 100644
--- a/apps/studio/data/fetchers.ts
+++ b/apps/studio/data/fetchers.ts
@@ -105,10 +105,15 @@ client.use(
 
         // add code field to body
         body.code = response.status
+
         body.requestId = request.headers.get('X-Request-Id')
+
         const retryAfterHeader = response.headers.get('Retry-After')
         body.retryAfter = retryAfterHeader ? parseInt(retryAfterHeader) : undefined
 
+        const requestUrl = new URL(request.url)
+        body.requestPathname = requestUrl.pathname
+
         return new Response(JSON.stringify(body), {
           headers: response.headers,
           status: response.status,
@@ -156,9 +161,13 @@ export const handleError = (error: unknown, options: HandleErrorOptions = {}): n
       'requestId' in error && typeof error.requestId === 'string' ? error.requestId : undefined
     const retryAfter =
       'retryAfter' in error && typeof error.retryAfter === 'number' ? error.retryAfter : undefined
+    const requestPathname =
+      'requestPathname' in error && typeof error.requestPathname === 'string'
+        ? error.requestPathname
+        : undefined
 
     if (errorMessage) {
-      throw new ResponseError(errorMessage, errorCode, requestId, retryAfter)
+      throw new ResponseError(errorMessage, errorCode, requestId, retryAfter, requestPathname)
     }
   }
 
diff --git a/apps/studio/data/privileges/column-privileges-grant-mutation.ts b/apps/studio/data/privileges/column-privileges-grant-mutation.ts
index 6452d45b52bb8..346fb3cd917d4 100644
--- a/apps/studio/data/privileges/column-privileges-grant-mutation.ts
+++ b/apps/studio/data/privileges/column-privileges-grant-mutation.ts
@@ -1,17 +1,21 @@
+import pgMeta from '@supabase/pg-meta'
 import { useMutation, UseMutationOptions, useQueryClient } from '@tanstack/react-query'
+import { executeSql } from 'data/sql/execute-sql-query'
 import { toast } from 'sonner'
-import type { components } from 'data/api'
 import type { ResponseError } from 'types'
 import { privilegeKeys } from './keys'
-import pgMeta from '@supabase/pg-meta'
-import { executeSql } from 'data/sql/execute-sql-query'
 
-export type ColumnPrivilegesGrant = components['schemas']['GrantColumnPrivilegesBody']
+export type ColumnPrivilegesGrant = {
+  column_id: string
+  grantee: string
+  privilege_type: 'ALL' | 'SELECT' | 'INSERT' | 'UPDATE' | 'REFERENCES'
+  is_grantable?: boolean
+}
 
 export type ColumnPrivilegesGrantVariables = {
   projectRef: string
   connectionString?: string | null
-  grants: ColumnPrivilegesGrant
+  grants: ColumnPrivilegesGrant[]
 }
 
 export async function grantColumnPrivileges({
diff --git a/apps/studio/data/privileges/column-privileges-revoke-mutation.ts b/apps/studio/data/privileges/column-privileges-revoke-mutation.ts
index 5aa6a10c76193..7e15e29b4cfab 100644
--- a/apps/studio/data/privileges/column-privileges-revoke-mutation.ts
+++ b/apps/studio/data/privileges/column-privileges-revoke-mutation.ts
@@ -1,17 +1,20 @@
+import pgMeta from '@supabase/pg-meta'
 import { useMutation, UseMutationOptions, useQueryClient } from '@tanstack/react-query'
+import { executeSql } from 'data/sql/execute-sql-query'
 import { toast } from 'sonner'
-import type { components } from 'data/api'
 import type { ResponseError } from 'types'
-import pgMeta from '@supabase/pg-meta'
-import { executeSql } from 'data/sql/execute-sql-query'
 import { privilegeKeys } from './keys'
 
-export type ColumnPrivilegesRevoke = components['schemas']['RevokeColumnPrivilegesBody']
+export type ColumnPrivilegesRevoke = {
+  column_id: string
+  grantee: string
+  privilege_type: 'ALL' | 'SELECT' | 'INSERT' | 'UPDATE' | 'REFERENCES'
+}
 
 export type ColumnPrivilegesRevokeVariables = {
   projectRef: string
   connectionString?: string | null
-  revokes: ColumnPrivilegesRevoke
+  revokes: ColumnPrivilegesRevoke[]
 }
 
 export async function revokeColumnPrivileges({
diff --git a/apps/studio/data/query-client.ts b/apps/studio/data/query-client.ts
index e2535c3bf5e3e..bec055c21ee32 100644
--- a/apps/studio/data/query-client.ts
+++ b/apps/studio/data/query-client.ts
@@ -1,6 +1,8 @@
 import { QueryClient, onlineManager } from '@tanstack/react-query'
-import { IS_PLATFORM } from 'lib/constants'
+import { match } from 'path-to-regexp'
 import { useState } from 'react'
+
+import { IS_PLATFORM } from 'lib/constants'
 import { ResponseError } from 'types'
 
 // When running locally we don't need the internet
@@ -9,6 +11,13 @@ if (!IS_PLATFORM) {
   onlineManager.setOnline(true)
 }
 
+const SKIP_RETRY_PATHNAME_MATCHERS = [
+  '/platform/projects/:ref/run-lints',
+  '/platform/organizations/:slug/usage',
+  '/platform/pg-meta/:ref/query',
+  '/v1/projects/:ref/analytics/endpoints/logs.all',
+].map((pathname) => match(pathname))
+
 let queryClient: QueryClient | undefined
 
 export function getQueryClient() {
@@ -31,6 +40,14 @@ export function getQueryClient() {
               return false
             }
 
+            if (
+              error instanceof ResponseError &&
+              error.requestPathname &&
+              SKIP_RETRY_PATHNAME_MATCHERS.some((matchFn) => matchFn(error.requestPathname!))
+            ) {
+              return false
+            }
+
             if (failureCount < 3) {
               return true
             }
diff --git a/apps/studio/data/tables/table-create-mutation.ts b/apps/studio/data/tables/table-create-mutation.ts
index b894811cd1db5..195dd850f384d 100644
--- a/apps/studio/data/tables/table-create-mutation.ts
+++ b/apps/studio/data/tables/table-create-mutation.ts
@@ -2,12 +2,15 @@ import pgMeta from '@supabase/pg-meta'
 import { useMutation, UseMutationOptions, useQueryClient } from '@tanstack/react-query'
 import { toast } from 'sonner'
 
-import type { components } from 'data/api'
 import { executeSql } from 'data/sql/execute-sql-query'
 import type { ResponseError } from 'types'
 import { tableKeys } from './keys'
 
-export type CreateTableBody = components['schemas']['CreateTableBody']
+export type CreateTableBody = {
+  name: string
+  schema?: string
+  comment?: string
+}
 
 export type TableCreateVariables = {
   projectRef: string
diff --git a/apps/studio/data/tables/table-update-mutation.ts b/apps/studio/data/tables/table-update-mutation.ts
index b62e56a79a4c2..f872454f084af 100644
--- a/apps/studio/data/tables/table-update-mutation.ts
+++ b/apps/studio/data/tables/table-update-mutation.ts
@@ -2,14 +2,20 @@ import pgMeta from '@supabase/pg-meta'
 import { useMutation, UseMutationOptions, useQueryClient } from '@tanstack/react-query'
 import { toast } from 'sonner'
 
-import type { components } from 'data/api'
-import { executeSql } from 'data/sql/execute-sql-query'
 import { lintKeys } from 'data/lint/keys'
+import { executeSql } from 'data/sql/execute-sql-query'
 import { tableEditorKeys } from 'data/table-editor/keys'
 import type { ResponseError } from 'types'
 import { tableKeys } from './keys'
+import { CreateTableBody } from './table-create-mutation'
 
-export type UpdateTableBody = components['schemas']['UpdateTableBody']
+export type UpdateTableBody = Partial<CreateTableBody> & {
+  id?: number
+  rls_enabled?: boolean
+  rls_forced?: boolean
+  replica_identity?: 'DEFAULT' | 'INDEX' | 'FULL' | 'NOTHING'
+  replica_identity_index?: string
+}
 
 export type TableUpdateVariables = {
   projectRef: string
diff --git a/apps/studio/pages/account/audit.tsx b/apps/studio/pages/account/audit.tsx
index 3343a22a8afb9..f3387dcf9aa37 100644
--- a/apps/studio/pages/account/audit.tsx
+++ b/apps/studio/pages/account/audit.tsx
@@ -27,7 +27,7 @@ const Audit: NextPageWithLayout = () => {
 
 Audit.getLayout = (page) => (
   <AppLayout>
-    <DefaultLayout headerTitle="Account">
+    <DefaultLayout hideMobileMenu headerTitle="Account">
       <OrganizationLayout>
         <AccountLayout title="Audit Logs">{page}</AccountLayout>
       </OrganizationLayout>
diff --git a/apps/studio/pages/account/me.tsx b/apps/studio/pages/account/me.tsx
index 7f84e1127f791..d41b1b1b1e7eb 100644
--- a/apps/studio/pages/account/me.tsx
+++ b/apps/studio/pages/account/me.tsx
@@ -2,9 +2,9 @@ import { AccountConnections } from 'components/interfaces/Account/Preferences/Ac
 import { AccountDeletion } from 'components/interfaces/Account/Preferences/AccountDeletion'
 import { AccountIdentities } from 'components/interfaces/Account/Preferences/AccountIdentities'
 import { AnalyticsSettings } from 'components/interfaces/Account/Preferences/AnalyticsSettings'
+import { HotkeySettings } from 'components/interfaces/Account/Preferences/HotkeySettings'
 import { ProfileInformation } from 'components/interfaces/Account/Preferences/ProfileInformation'
 import { ThemeSettings } from 'components/interfaces/Account/Preferences/ThemeSettings'
-import { HotkeySettings } from 'components/interfaces/Account/Preferences/HotkeySettings'
 import AccountLayout from 'components/layouts/AccountLayout/AccountLayout'
 import AppLayout from 'components/layouts/AppLayout/AppLayout'
 import DefaultLayout from 'components/layouts/DefaultLayout'
@@ -27,7 +27,7 @@ const User: NextPageWithLayout = () => {
 
 User.getLayout = (page) => (
   <AppLayout>
-    <DefaultLayout headerTitle="Account">
+    <DefaultLayout hideMobileMenu headerTitle="Account">
       <OrganizationLayout>
         <AccountLayout title="Account Settings">{page}</AccountLayout>
       </OrganizationLayout>
diff --git a/apps/studio/pages/account/security.tsx b/apps/studio/pages/account/security.tsx
index 40309cf089efd..462e603ded9d7 100644
--- a/apps/studio/pages/account/security.tsx
+++ b/apps/studio/pages/account/security.tsx
@@ -81,7 +81,7 @@ const Security: NextPageWithLayout = () => {
 
 Security.getLayout = (page) => (
   <AppLayout>
-    <DefaultLayout headerTitle="Account">
+    <DefaultLayout hideMobileMenu headerTitle="Account">
       <OrganizationLayout>
         <AccountLayout title="Security">{page}</AccountLayout>
       </OrganizationLayout>
diff --git a/apps/studio/pages/account/tokens.tsx b/apps/studio/pages/account/tokens.tsx
index b03c749d4b1ec..58863bc5b9c10 100644
--- a/apps/studio/pages/account/tokens.tsx
+++ b/apps/studio/pages/account/tokens.tsx
@@ -72,7 +72,7 @@ const UserAccessTokens: NextPageWithLayout = () => {
 
 UserAccessTokens.getLayout = (page) => (
   <AppLayout>
-    <DefaultLayout headerTitle="Account">
+    <DefaultLayout hideMobileMenu headerTitle="Account">
       <OrganizationLayout>
         <AccountLayout title="Access Tokens">{page}</AccountLayout>
       </OrganizationLayout>
diff --git a/apps/studio/pages/organizations.tsx b/apps/studio/pages/organizations.tsx
index cf4b2bf6bf22c..b09de93df1612 100644
--- a/apps/studio/pages/organizations.tsx
+++ b/apps/studio/pages/organizations.tsx
@@ -114,8 +114,8 @@ const OrganizationsPage: NextPageWithLayout = () => {
 
 OrganizationsPage.getLayout = (page) => (
   <AppLayout>
-    <DefaultLayout headerTitle="Organizations">
-      <PageLayout title="Your Organizations" className="max-w-[1200px] px-6 mx-auto">
+    <DefaultLayout hideMobileMenu headerTitle="Organizations">
+      <PageLayout title="Your Organizations" className="max-w-[1200px] lg:px-6 mx-auto">
         {page}
       </PageLayout>
     </DefaultLayout>
diff --git a/apps/studio/pages/project/[ref]/functions/new.tsx b/apps/studio/pages/project/[ref]/functions/new.tsx
index c8fa03fb8d027..b813c3babb6be 100644
--- a/apps/studio/pages/project/[ref]/functions/new.tsx
+++ b/apps/studio/pages/project/[ref]/functions/new.tsx
@@ -42,6 +42,8 @@ import {
   TooltipContent,
   TooltipTrigger,
 } from 'ui'
+import { SIDEBAR_KEYS } from 'components/layouts/ProjectLayout/LayoutSidebar/LayoutSidebarProvider'
+import { useSidebarManagerSnapshot } from 'state/sidebar-manager-state'
 
 // Array of adjectives and nouns for random function name generation
 const ADJECTIVES = [
@@ -104,6 +106,7 @@ const NewFunctionPage = () => {
   const snap = useAiAssistantStateSnapshot()
   const { mutate: sendEvent } = useSendEventMutation()
   const showStripeExample = useIsFeatureEnabled('edge_functions:show_stripe_example')
+  const { openSidebar } = useSidebarManagerSnapshot()
 
   const [files, setFiles] = useState<
     { id: number; name: string; content: string; selected?: boolean }[]
@@ -167,9 +170,9 @@ const NewFunctionPage = () => {
 
   const handleChat = () => {
     const selectedFile = files.find((f) => f.selected) ?? files[0]
+    openSidebar(SIDEBAR_KEYS.AI_ASSISTANT)
     snap.newChat({
       name: 'Explain edge function',
-      open: true,
       sqlSnippets: [selectedFile.content],
       initialInput: 'Help me understand and improve this edge function...',
       suggestions: {
diff --git a/apps/studio/state/ai-assistant-state.tsx b/apps/studio/state/ai-assistant-state.tsx
index 70b855b3a1d1d..4dd0ff8810845 100644
--- a/apps/studio/state/ai-assistant-state.tsx
+++ b/apps/studio/state/ai-assistant-state.tsx
@@ -28,7 +28,6 @@ type ChatSession = {
 }
 
 type AiAssistantData = {
-  open: boolean
   initialInput: string
   sqlSnippets?: SqlSnippet[]
   suggestions?: SuggestionsType
@@ -41,14 +40,12 @@ type AiAssistantData = {
 // Data structure stored in IndexedDB
 type StoredAiAssistantState = {
   projectRef: string
-  open: boolean
   activeChatId?: string
   chats: Record<string, ChatSession>
   model?: AssistantModel
 }
 
 const INITIAL_AI_ASSISTANT: AiAssistantData = {
-  open: false,
   initialInput: '',
   sqlSnippets: undefined,
   suggestions: undefined,
@@ -167,7 +164,6 @@ async function tryMigrateFromLocalStorage(
     if (parsedFromLocalStorage && typeof parsedFromLocalStorage.chats === 'object') {
       migratedState = {
         projectRef: projectRef,
-        open: parsedFromLocalStorage.open ?? false,
         activeChatId: parsedFromLocalStorage.activeChatId,
         chats: parsedFromLocalStorage.chats,
         model: parsedFromLocalStorage.model ?? INITIAL_AI_ASSISTANT.model,
@@ -199,15 +195,6 @@ async function tryMigrateFromLocalStorage(
 
 // Helper function to ensure an active chat exists or initialize a new one
 function ensureActiveChatOrInitialize(state: AiAssistantState) {
-  // Check URL param again to override loaded 'open' state if present
-  if (typeof window !== 'undefined') {
-    const urlParams = new URLSearchParams(window.location.search)
-    const aiAssistantPanelOpenParam = urlParams.get('aiAssistantPanelOpen')
-    if (aiAssistantPanelOpenParam !== null) {
-      state.open = aiAssistantPanelOpenParam === 'true'
-    }
-  }
-
   // Ensure an active chat exists after loading/migration
   if (!state.activeChatId || !state.chats[state.activeChatId]) {
     const chatIds = Object.keys(state.chats)
@@ -228,15 +215,6 @@ export const createAiAssistantState = (): AiAssistantState => {
   // Initialize with defaults, loading happens asynchronously in the provider
   const initialState = { ...INITIAL_AI_ASSISTANT }
 
-  // Check URL params for initial 'open' state, overriding any loaded state later if present
-  if (typeof window !== 'undefined') {
-    const urlParams = new URLSearchParams(window.location.search)
-    const aiAssistantPanelOpenParam = urlParams.get('aiAssistantPanelOpen')
-    if (aiAssistantPanelOpenParam !== null) {
-      initialState.open = aiAssistantPanelOpenParam === 'true'
-    }
-  }
-
   const state: AiAssistantState = proxy({
     ...initialState, // Spread initial values directly
 
@@ -244,19 +222,6 @@ export const createAiAssistantState = (): AiAssistantState => {
       Object.assign(state, INITIAL_AI_ASSISTANT)
     },
 
-    // Panel visibility
-    openAssistant: () => {
-      state.open = true
-    },
-
-    closeAssistant: () => {
-      state.open = false
-    },
-
-    toggleAssistant: () => {
-      state.open = !state.open
-    },
-
     setModel: (model: AssistantModel) => {
       state.model = model
     },
@@ -268,7 +233,7 @@ export const createAiAssistantState = (): AiAssistantState => {
 
     newChat: (
       options?: { name?: string } & Partial<
-        Pick<AiAssistantData, 'open' | 'initialInput' | 'sqlSnippets' | 'suggestions' | 'tables'>
+        Pick<AiAssistantData, 'initialInput' | 'sqlSnippets' | 'suggestions' | 'tables'>
       >
     ) => {
       const chatId = uuidv4()
@@ -287,7 +252,6 @@ export const createAiAssistantState = (): AiAssistantState => {
       state.activeChatId = chatId
 
       // Update non-chat related state based on options, falling back to current state, then initial
-      state.open = options?.open ?? state.open
       state.initialInput = options?.initialInput ?? INITIAL_AI_ASSISTANT.initialInput
       state.sqlSnippets = options?.sqlSnippets ?? INITIAL_AI_ASSISTANT.sqlSnippets
       state.suggestions = options?.suggestions ?? INITIAL_AI_ASSISTANT.suggestions
@@ -399,25 +363,15 @@ export const createAiAssistantState = (): AiAssistantState => {
 
     // --- New function to load persisted state ---
     loadPersistedState: (persistedState: StoredAiAssistantState) => {
-      state.open = persistedState.open
       state.chats = persistedState.chats
       state.activeChatId = persistedState.activeChatId
       state.model = persistedState.model ?? INITIAL_AI_ASSISTANT.model
 
-      // Check URL param again to override loaded 'open' state if present
-      if (typeof window !== 'undefined') {
-        const urlParams = new URLSearchParams(window.location.search)
-        const aiAssistantPanelOpenParam = urlParams.get('aiAssistantPanelOpen')
-        if (aiAssistantPanelOpenParam !== null) {
-          state.open = aiAssistantPanelOpenParam === 'true'
-        }
-      }
-
       // Ensure an active chat exists after loading
       if (!state.activeChat) {
         const chatIds = Object.keys(state.chats)
         if (chatIds.length > 0) {
-          // Maybe select the most recently updated? For now, first.
+          // Select the most recently updated chat
           state.activeChatId = chatIds.sort(
             (a, b) =>
               (state.chats[b].updatedAt?.getTime() || 0) -
@@ -440,14 +394,11 @@ export const createAiAssistantState = (): AiAssistantState => {
 
 export type AiAssistantState = AiAssistantData & {
   resetAiAssistantPanel: () => void
-  openAssistant: () => void
-  closeAssistant: () => void
-  toggleAssistant: () => void
   activeChat: ChatSession | undefined
   setModel: (model: AssistantModel) => void
   newChat: (
     options?: { name?: string } & Partial<
-      Pick<AiAssistantData, 'open' | 'initialInput' | 'sqlSnippets' | 'suggestions' | 'tables'>
+      Pick<AiAssistantData, 'initialInput' | 'sqlSnippets' | 'suggestions' | 'tables'>
     >
   ) => string
   selectChat: (id: string) => void
@@ -522,7 +473,6 @@ export const AiAssistantStateContextProvider = ({ children }: PropsWithChildren)
         // Prepare state for IndexedDB
         const stateToSave: StoredAiAssistantState = {
           projectRef: project?.ref,
-          open: snap.open,
           activeChatId: snap.activeChatId,
           model: snap.model,
           chats: snap.chats
diff --git a/apps/studio/state/sidebar-manager-state.tsx b/apps/studio/state/sidebar-manager-state.tsx
new file mode 100644
index 0000000000000..bb455845ec491
--- /dev/null
+++ b/apps/studio/state/sidebar-manager-state.tsx
@@ -0,0 +1,179 @@
+import { LOCAL_STORAGE_KEYS } from 'common/constants'
+import { useLocalStorageQuery } from 'hooks/misc/useLocalStorage'
+import { ReactNode, useEffect } from 'react'
+import { proxy, snapshot, useSnapshot } from 'valtio'
+
+type SidebarHandlers = {
+  onOpen?: () => void
+  onClose?: () => void
+}
+
+type ManagedSidebar = SidebarHandlers & {
+  id: string
+  component: () => ReactNode | undefined
+}
+
+type SidebarManagerData = {
+  sidebars: Partial<Record<string, ManagedSidebar>>
+  activeSidebar: ManagedSidebar | undefined
+}
+
+type SidebarManagerState = SidebarManagerData & {
+  registerSidebar: (
+    id: string,
+    component: () => ReactNode | undefined,
+    handlers?: SidebarHandlers
+  ) => void
+  unregisterSidebar: (id: string) => void
+  openSidebar: (id: string) => void
+  toggleSidebar: (id: string) => void
+  closeSidebar: (id: string) => void
+  isSidebarOpen: (id: string) => boolean
+  closeActive: () => void
+}
+
+const INITIAL_SIDEBAR_MANAGER_DATA: SidebarManagerData = {
+  sidebars: {},
+  activeSidebar: undefined,
+}
+
+const createSidebarManagerState = () => {
+  const state: SidebarManagerState = proxy({
+    ...INITIAL_SIDEBAR_MANAGER_DATA,
+
+    registerSidebar(
+      id: string,
+      component: () => ReactNode | undefined,
+      handlers: SidebarHandlers = {}
+    ) {
+      state.sidebars[id] = {
+        id,
+        component,
+        ...handlers,
+      }
+    },
+
+    unregisterSidebar(id: string) {
+      const panel = state.sidebars[id]
+      if (!panel) return
+
+      delete state.sidebars[id]
+
+      if (state.activeSidebar?.id === id) {
+        state.activeSidebar = undefined
+        panel.onClose?.()
+      }
+    },
+
+    openSidebar(id: string) {
+      const panel = state.sidebars[id]
+      if (!panel) {
+        console.warn(`Sidebar "${id}" is not registered. Register it before opening.`)
+        return
+      }
+
+      if (state.activeSidebar?.id === id) {
+        return
+      }
+
+      if (state.activeSidebar && state.activeSidebar.id !== id) {
+        const previousPanel = state.activeSidebar
+        previousPanel?.onClose?.()
+      }
+
+      state.activeSidebar = panel
+      panel.onOpen?.()
+    },
+
+    toggleSidebar(id: string) {
+      const panel = state.sidebars[id]
+      if (!panel) {
+        console.warn(`Sidebar "${id}" is not registered. Register it before toggling.`)
+        return
+      }
+
+      if (state.activeSidebar?.id === id) {
+        panel.onClose?.()
+        state.activeSidebar = undefined
+        return
+      }
+
+      if (state.activeSidebar && state.activeSidebar.id !== id) {
+        const previousPanel = state.activeSidebar
+        previousPanel?.onClose?.()
+      }
+
+      state.activeSidebar = panel
+      panel.onOpen?.()
+    },
+
+    closeSidebar(id: string) {
+      if (state.activeSidebar?.id !== id) return
+
+      const panel = state.sidebars[id]
+      if (!panel) return
+
+      panel.onClose?.()
+      state.activeSidebar = undefined
+      return
+    },
+
+    isSidebarOpen(id: string) {
+      return state.activeSidebar?.id === id
+    },
+
+    closeActive() {
+      if (!state.activeSidebar) return
+      state.activeSidebar?.onClose?.()
+      state.activeSidebar = undefined
+    },
+  })
+
+  return state
+}
+
+export const sidebarManagerState = createSidebarManagerState()
+
+export const getSidebarManagerSnapshot = () => snapshot(sidebarManagerState)
+
+export const useSidebarManagerSnapshot = (options?: Parameters<typeof useSnapshot>[1]) =>
+  useSnapshot(sidebarManagerState, options)
+
+export const useRegisterSidebar = (
+  id: string,
+  component: () => ReactNode,
+  handlers: SidebarHandlers = {},
+  hotKey?: string
+) => {
+  const [isSidebarHotkeyEnabled] = useLocalStorageQuery<boolean>(
+    LOCAL_STORAGE_KEYS.HOTKEY_SIDEBAR(id),
+    true
+  )
+
+  useEffect(() => {
+    const { registerSidebar, unregisterSidebar } = sidebarManagerState
+
+    registerSidebar(id, component, handlers)
+
+    return () => {
+      unregisterSidebar(id)
+    }
+  }, [id])
+
+  useEffect(() => {
+    if (!hotKey) return
+
+    function hotKeyHandler(e: KeyboardEvent) {
+      if ((e.metaKey || e.ctrlKey) && e.key === hotKey && !e.altKey && !e.shiftKey) {
+        sidebarManagerState.toggleSidebar(id)
+      }
+    }
+
+    if (isSidebarHotkeyEnabled) {
+      window.addEventListener('keydown', hotKeyHandler)
+      return () => {
+        window.removeEventListener('keydown', hotKeyHandler)
+      }
+    }
+  }, [id, hotKey, isSidebarHotkeyEnabled])
+}
diff --git a/apps/studio/types/base.ts b/apps/studio/types/base.ts
index 04847b64c66f5..1c477202c4cd5 100644
--- a/apps/studio/types/base.ts
+++ b/apps/studio/types/base.ts
@@ -89,12 +89,20 @@ export class ResponseError extends Error {
   code?: number
   requestId?: string
   retryAfter?: number
+  requestPathname?: string
 
-  constructor(message: string | undefined, code?: number, requestId?: string, retryAfter?: number) {
+  constructor(
+    message: string | undefined,
+    code?: number,
+    requestId?: string,
+    retryAfter?: number,
+    requestPathname?: string
+  ) {
     super(message || 'API error happened while trying to communicate with the server.')
     this.code = code
     this.requestId = requestId
     this.retryAfter = retryAfter
+    this.requestPathname = requestPathname
   }
 }
 
diff --git a/packages/api-types/types/api.d.ts b/packages/api-types/types/api.d.ts
index 2f259388f73e2..1985673d9ae9f 100644
--- a/packages/api-types/types/api.d.ts
+++ b/packages/api-types/types/api.d.ts
@@ -256,6 +256,28 @@ export interface paths {
     patch?: never
     trace?: never
   }
+  '/v1/organizations/{slug}/projects': {
+    parameters: {
+      query?: never
+      header?: never
+      path?: never
+      cookie?: never
+    }
+    /**
+     * Gets all projects for the given organization
+     * @description Returns a paginated list of projects for the specified organization.
+     *
+     *         This endpoint uses offset-based pagination. Use the `offset` parameter to skip a number of projects and the `limit` parameter to control the number of projects returned per page.
+     */
+    get: operations['v1-get-all-projects-for-organization']
+    put?: never
+    post?: never
+    delete?: never
+    options?: never
+    head?: never
+    patch?: never
+    trace?: never
+  }
   '/v1/projects': {
     parameters: {
       query?: never
@@ -2973,6 +2995,89 @@ export interface components {
         ref: string
       }
     }
+    OrganizationProjectsResponse: {
+      pagination: {
+        /** @description Total number of projects. Use this to calculate the total number of pages. */
+        count: number
+        /** @description Maximum number of projects per page */
+        limit: number
+        /** @description Number of projects skipped in this response */
+        offset: number
+      }
+      projects: {
+        cloud_provider: string
+        databases: {
+          cloud_provider: string
+          disk_last_modified_at?: string
+          disk_throughput_mbps?: number
+          /** @enum {string} */
+          disk_type?: 'gp3' | 'io2'
+          disk_volume_size_gb?: number
+          identifier: string
+          /** @enum {string} */
+          infra_compute_size?:
+            | 'pico'
+            | 'nano'
+            | 'micro'
+            | 'small'
+            | 'medium'
+            | 'large'
+            | 'xlarge'
+            | '2xlarge'
+            | '4xlarge'
+            | '8xlarge'
+            | '12xlarge'
+            | '16xlarge'
+            | '24xlarge'
+            | '24xlarge_optimized_memory'
+            | '24xlarge_optimized_cpu'
+            | '24xlarge_high_memory'
+            | '48xlarge'
+            | '48xlarge_optimized_memory'
+            | '48xlarge_optimized_cpu'
+            | '48xlarge_high_memory'
+          region: string
+          /** @enum {string} */
+          status:
+            | 'ACTIVE_HEALTHY'
+            | 'ACTIVE_UNHEALTHY'
+            | 'COMING_UP'
+            | 'GOING_DOWN'
+            | 'INIT_FAILED'
+            | 'REMOVED'
+            | 'RESTORING'
+            | 'UNKNOWN'
+            | 'INIT_READ_REPLICA'
+            | 'INIT_READ_REPLICA_FAILED'
+            | 'RESTARTING'
+            | 'RESIZING'
+          /** @enum {string} */
+          type: 'PRIMARY' | 'READ_REPLICA'
+        }[]
+        inserted_at: string
+        is_branch: boolean
+        name: string
+        ref: string
+        region: string
+        /** @enum {string} */
+        status:
+          | 'INACTIVE'
+          | 'ACTIVE_HEALTHY'
+          | 'ACTIVE_UNHEALTHY'
+          | 'COMING_UP'
+          | 'UNKNOWN'
+          | 'GOING_DOWN'
+          | 'INIT_FAILED'
+          | 'REMOVED'
+          | 'RESTORING'
+          | 'UPGRADING'
+          | 'PAUSING'
+          | 'RESTORE_FAILED'
+          | 'RESTARTING'
+          | 'PAUSE_FAILED'
+          | 'RESIZING'
+      }[]
+    }
     OrganizationResponseV1: {
       id: string
       name: string
@@ -2982,6 +3087,7 @@ export interface components {
     }
     PostgresConfigResponse: {
       effective_cache_size?: string
+      hot_standby_feedback?: boolean
       logical_decoding_work_mem?: string
       maintenance_work_mem?: string
       max_connections?: number
@@ -3620,6 +3726,7 @@ export interface components {
     }
     UpdatePostgresConfigBody: {
       effective_cache_size?: string
+      hot_standby_feedback?: boolean
       logical_decoding_work_mem?: string
       maintenance_work_mem?: string
       max_connections?: number
@@ -3956,6 +4063,54 @@ export interface components {
       name?: string
       version: string
     }[]
+    V1ListProjectsPaginatedResponse: {
+      pagination: {
+        /** @description Total number of projects. Use this to calculate the total number of pages. */
+        count: number
+        /** @description Maximum number of projects per page (actual number may be less) */
+        limit: number
+        /** @description Number of projects skipped in this response */
+        offset: number
+      }
+      projects: {
+        cloud_provider: string
+        disk_volume_size_gb?: number
+        id: number
+        /** @enum {string} */
+        infra_compute_size?:
+          | 'pico'
+          | 'nano'
+          | 'micro'
+          | 'small'
+          | 'medium'
+          | 'large'
+          | 'xlarge'
+          | '2xlarge'
+          | '4xlarge'
+          | '8xlarge'
+          | '12xlarge'
+          | '16xlarge'
+          | '24xlarge'
+          | '24xlarge_optimized_memory'
+          | '24xlarge_optimized_cpu'
+          | '24xlarge_high_memory'
+          | '48xlarge'
+          | '48xlarge_optimized_memory'
+          | '48xlarge_optimized_cpu'
+          | '48xlarge_high_memory'
+        inserted_at: string | null
+        is_branch_enabled: boolean
+        is_physical_backups_enabled: boolean | null
+        name: string
+        organization_id: number
+        organization_slug: string
+        preview_branch_refs: string[]
+        ref: string
+        region: string
+        status: string
+        subscription_id: string | null
+      }[]
+    }
     V1OrganizationMemberResponse: {
       email?: string
       mfa_enabled: boolean
@@ -4146,6 +4301,7 @@ export interface components {
       status: 'AVAILABLE' | 'PENDING' | 'REMOVED'
     }
     V1RunQueryBody: {
+      parameters?: unknown[]
       query: string
       read_only?: boolean
     }
@@ -4164,6 +4320,9 @@ export interface components {
             db_connected: boolean
             healthy: boolean
           }
+        | {
+            db_schema: string
+          }
       /** @enum {string} */
       name:
         | 'auth'
@@ -4770,6 +4929,48 @@ export interface operations {
       }
     }
   }
+  'v1-get-all-projects-for-organization': {
+    parameters: {
+      query?: {
+        /** @description Number of projects to return per page */
+        limit?: number
+        /** @description Number of projects to skip */
+        offset?: number
+        /** @description Search projects by name */
+        search?: string
+        /** @description Sort order for projects */
+        sort?: 'name_asc' | 'name_desc' | 'created_asc' | 'created_desc'
+        /** @description A comma-separated list of project statuses to filter by.
+         *
+         *     The following values are supported: `ACTIVE_HEALTHY`, `INACTIVE`. */
+        statuses?: string
+      }
+      header?: never
+      path: {
+        /** @description Organization slug */
+        slug: string
+      }
+      cookie?: never
+    }
+    requestBody?: never
+    responses: {
+      200: {
+        headers: {
+          [name: string]: unknown
+        }
+        content: {
+          'application/json': components['schemas']['OrganizationProjectsResponse']
+        }
+      }
+      /** @description Failed to retrieve projects */
+      500: {
+        headers: {
+          [name: string]: unknown
+        }
+        content?: never
+      }
+    }
+  }
   'v1-list-all-projects': {
     parameters: {
       query?: never
diff --git a/packages/api-types/types/platform.d.ts b/packages/api-types/types/platform.d.ts
index d8a7dbb1c9009..bbc76eb612cf3 100644
--- a/packages/api-types/types/platform.d.ts
+++ b/packages/api-types/types/platform.d.ts
@@ -1763,35 +1763,13 @@ export interface paths {
     /** Retrieve column privileges */
     get: operations['ColumnPrivilegesController_getColumnPrivileges']
     put?: never
-    /** Grant column privileges */
-    post: operations['ColumnPrivilegesController_grantColumnPrivileges']
-    /** Revoke column privileges */
-    delete: operations['ColumnPrivilegesController_revokeColumnPrivileges']
+    post?: never
+    delete?: never
     options?: never
     head?: never
     patch?: never
     trace?: never
   }
-  '/platform/pg-meta/{ref}/columns': {
-    parameters: {
-      query?: never
-      header?: never
-      path?: never
-      cookie?: never
-    }
-    /** Gets project pg.columns */
-    get: operations['ColumnsController_getColumns']
-    put?: never
-    /** Creates project pg.column */
-    post: operations['ColumnsController_createColumn']
-    /** Deletes project pg.column with the given ID */
-    delete: operations['ColumnsController_deleteColumn']
-    options?: never
-    head?: never
-    /** Updates project pg.column with the given ID */
-    patch: operations['ColumnsController_updateColumn']
-    trace?: never
-  }
   '/platform/pg-meta/{ref}/extensions': {
     parameters: {
       query?: never
@@ -1802,10 +1780,8 @@ export interface paths {
     /** Gets project pg.extensions */
     get: operations['ExtensionsController_getExtensions']
     put?: never
-    /** Creates project pg.extension */
-    post: operations['ExtensionsController_createExtension']
-    /** Deletes project pg.extension with the given ID */
-    delete: operations['ExtensionsController_deleteExtension']
+    post?: never
+    delete?: never
     options?: never
     head?: never
     patch?: never
@@ -1828,26 +1804,6 @@ export interface paths {
     patch?: never
     trace?: never
   }
-  '/platform/pg-meta/{ref}/functions': {
-    parameters: {
-      query?: never
-      header?: never
-      path?: never
-      cookie?: never
-    }
-    /** Gets project pg.functions */
-    get: operations['FunctionsController_getFunctions']
-    put?: never
-    /** Creates project pg.function */
-    post: operations['FunctionsController_createFunction']
-    /** Deletes project pg.function with the given ID */
-    delete: operations['FunctionsController_deleteFunction']
-    options?: never
-    head?: never
-    /** Updates project pg.function with the given ID */
-    patch: operations['FunctionsController_updateFunction']
-    trace?: never
-  }
   '/platform/pg-meta/{ref}/materialized-views': {
     parameters: {
       query?: never
@@ -1875,14 +1831,11 @@ export interface paths {
     /** Gets project pg.policies */
     get: operations['PoliciesController_getPolicies']
     put?: never
-    /** Creates project pg.policy */
-    post: operations['PoliciesController_createPolicy']
-    /** Deletes project pg.policy with the given ID */
-    delete: operations['PoliciesController_deletePolicy']
+    post?: never
+    delete?: never
     options?: never
     head?: never
-    /** Updates project pg.policy with the given ID */
-    patch: operations['PoliciesController_updatePolicy']
+    patch?: never
     trace?: never
   }
   '/platform/pg-meta/{ref}/publications': {
@@ -1895,14 +1848,11 @@ export interface paths {
     /** Gets project pg.publications */
     get: operations['PublicationsController_getPublications']
     put?: never
-    /** Creates project pg.publication */
-    post: operations['PublicationsController_createPublication']
-    /** Deletes project pg.publication with the given ID */
-    delete: operations['PublicationsController_deletePublication']
+    post?: never
+    delete?: never
     options?: never
     head?: never
-    /** Updates project pg.publication with the given ID */
-    patch: operations['PublicationsController_updatePublication']
+    patch?: never
     trace?: never
   }
   '/platform/pg-meta/{ref}/query': {
@@ -1922,60 +1872,6 @@ export interface paths {
     patch?: never
     trace?: never
   }
-  '/platform/pg-meta/{ref}/query/format': {
-    parameters: {
-      query?: never
-      header?: never
-      path?: never
-      cookie?: never
-    }
-    get?: never
-    put?: never
-    /** Format sql query */
-    post: operations['QueryController_formatQuery']
-    delete?: never
-    options?: never
-    head?: never
-    patch?: never
-    trace?: never
-  }
-  '/platform/pg-meta/{ref}/query/validate': {
-    parameters: {
-      query?: never
-      header?: never
-      path?: never
-      cookie?: never
-    }
-    get?: never
-    put?: never
-    /** Validate sql query */
-    post: operations['QueryController_validateQuery']
-    delete?: never
-    options?: never
-    head?: never
-    patch?: never
-    trace?: never
-  }
-  '/platform/pg-meta/{ref}/schemas': {
-    parameters: {
-      query?: never
-      header?: never
-      path?: never
-      cookie?: never
-    }
-    /** Gets project pg.schemas */
-    get: operations['SchemasController_getSchemas']
-    put?: never
-    /** Creates project pg.schema */
-    post: operations['SchemasController_createSchema']
-    /** Deletes project pg.schema with the given ID */
-    delete: operations['SchemasController_deleteSchema']
-    options?: never
-    head?: never
-    /** Updates project pg.schema with the given ID */
-    patch: operations['SchemasController_updateSchema']
-    trace?: never
-  }
   '/platform/pg-meta/{ref}/tables': {
     parameters: {
       query?: never
@@ -1986,14 +1882,11 @@ export interface paths {
     /** Gets project pg.tables or pg.table with the given ID */
     get: operations['TablesController_getTables']
     put?: never
-    /** Creates project pg.table */
-    post: operations['TablesController_createTable']
-    /** Deletes project pg.table with the given ID */
-    delete: operations['TablesController_deleteTable']
+    post?: never
+    delete?: never
     options?: never
     head?: never
-    /** Updates project pg.table with the given ID */
-    patch: operations['TablesController_updateTable']
+    patch?: never
     trace?: never
   }
   '/platform/pg-meta/{ref}/triggers': {
@@ -2006,14 +1899,11 @@ export interface paths {
     /** Gets project pg.triggers */
     get: operations['TriggersController_getTriggers']
     put?: never
-    /** Creates project pg.trigger */
-    post: operations['TriggersController_createTrigger']
-    /** Deletes project pg.trigger with the given ID */
-    delete: operations['TriggersController_deleteTrigger']
+    post?: never
+    delete?: never
     options?: never
     head?: never
-    /** Updates project pg.trigger with the given ID */
-    patch: operations['TriggersController_updateTrigger']
+    patch?: never
     trace?: never
   }
   '/platform/pg-meta/{ref}/types': {
@@ -4117,6 +4007,23 @@ export interface paths {
     patch?: never
     trace?: never
   }
+  '/platform/storage/{ref}/buckets/{id}/objects/list-v2': {
+    parameters: {
+      query?: never
+      header?: never
+      path?: never
+      cookie?: never
+    }
+    get?: never
+    put?: never
+    /** Gets list of objects with the given bucket */
+    post: operations['StorageObjectsController_getObjectsV2']
+    delete?: never
+    options?: never
+    head?: never
+    patch?: never
+    trace?: never
+  }
   '/platform/storage/{ref}/buckets/{id}/objects/move': {
     parameters: {
       query?: never
@@ -4779,7 +4686,16 @@ export interface components {
       description?: string
       name: string
       /** @enum {string} */
-      type: 'postgres' | 'bigquery' | 'webhook' | 'datadog' | 'elastic' | 'loki'
+      type:
+        | 'postgres'
+        | 'bigquery'
+        | 'clickhouse'
+        | 'webhook'
+        | 'datadog'
+        | 'elastic'
+        | 'loki'
+        | 'sentry'
+        | 's3'
     }
     CreateCliLoginSessionBody: {
       public_key: string
@@ -4791,22 +4707,6 @@ export interface components {
       name: string
       retention_days: number
     }
-    CreateColumnBody: {
-      check?: string
-      comment?: string
-      defaultValue?: unknown
-      /** @enum {string} */
-      defaultValueFormat?: 'expression' | 'literal'
-      /** @enum {string} */
-      identityGeneration?: 'BY DEFAULT' | 'ALWAYS'
-      isIdentity?: boolean
-      isNullable?: boolean
-      isPrimaryKey?: boolean
-      isUnique?: boolean
-      name: string
-      tableId: number
-      type: string
-    }
     CreateContentBody: {
       content?: {
         [key: string]: unknown
@@ -4858,26 +4758,6 @@ export interface components {
       name: string
       status: string
     }
-    CreateExtensionBody: {
-      cascade: boolean
-      name: string
-      schema: string
-      version: string
-    }
-    CreateFunctionBody: {
-      args: string[]
-      /** @enum {string} */
-      behavior: 'VOLATILE' | 'STABLE' | 'IMMUTABLE'
-      config_params?: {
-        [key: string]: string
-      }
-      definition: string
-      language: string
-      name: string
-      return_type: string
-      schema: string
-      security_definer: boolean
-    }
     CreateGitHubAuthorizationBody: {
       code: string
     }
@@ -5078,18 +4958,6 @@ export interface components {
        */
       id: number
     }
-    CreatePolicyBody: {
-      /** @enum {string} */
-      action?: 'PERMISSIVE' | 'RESTRICTIVE'
-      check?: string
-      /** @enum {string} */
-      command?: 'SELECT' | 'INSERT' | 'UPDATE' | 'DELETE' | 'ALL'
-      definition?: string
-      name: string
-      roles?: string[]
-      schema?: string
-      table: string
-    }
     CreateProjectBody: {
       auth_site_url?: string
       /** @enum {string} */
@@ -5204,15 +5072,6 @@ export interface components {
       status: string
       subscription_id: string | null
     }
-    CreatePublicationBody: {
-      name: string
-      owner?: string
-      publish_delete?: boolean
-      publish_insert?: boolean
-      publish_truncate?: boolean
-      publish_update?: boolean
-      tables?: string[] | null
-    }
     CreateReplicationDestinationBody: {
       /** @description Destination configuration */
       config:
@@ -5444,10 +5303,6 @@ export interface components {
         schema: string
       }[]
     }
-    CreateSchemaBody: {
-      name: string
-      owner: string
-    }
     CreateScopedAccessTokenBody: {
       /** Format: date-time */
       expires_at?: string
@@ -5608,11 +5463,6 @@ export interface components {
       id: string
       secret_key: string
     }
-    CreateTableBody: {
-      comment?: string
-      name: string
-      schema?: string
-    }
     CreateTaxIdBody: {
       country?: string
       type: string
@@ -5630,22 +5480,6 @@ export interface components {
        */
       tenant_id: string
     }
-    CreateTriggerBody: {
-      /** @enum {string} */
-      activation: 'AFTER' | 'BEFORE'
-      /** @enum {string} */
-      enabled_mode: 'ORIGIN' | 'REPLICA' | 'ALWAYS' | 'DISABLED'
-      events: ('INSERT' | 'UPDATE' | 'DELETE')[]
-      function_args?: string[]
-      function_name: string
-      function_schema: string
-      name: string
-      /** @enum {string} */
-      orientation: 'ROW' | 'STATEMENT'
-      schema: string
-      table: string
-      table_id?: number
-    }
     CreateUserBody: {
       email: string
       email_confirm: boolean
@@ -5976,9 +5810,6 @@ export interface components {
       scope?: string
       token_endpoint_auth_method?: string
     }
-    FormatQueryBody: {
-      query: string
-    }
     GetArchiveResponse: {
       archive_empty: boolean
       file_url: string
@@ -6107,6 +5938,19 @@ export interface components {
       }
       path: string
     }
+    GetObjectsV2Body: {
+      cursor?: string
+      /** @default 1000 */
+      limit?: number
+      prefix?: string
+      sortBy?: {
+        /** @enum {string} */
+        column: 'name' | 'updated_at' | 'created_at'
+        /** @enum {string} */
+        order?: 'asc' | 'desc'
+      }
+      with_delimiter?: boolean
+    }
     GetOrganizationByFlyOrganizationIdResponse: {
       slug: string
     }
@@ -6844,13 +6688,6 @@ export interface components {
       SMTP_USER: string
       URI_ALLOW_LIST: string
     }
-    GrantColumnPrivilegesBody: {
-      column_id: string
-      grantee: string
-      is_grantable?: boolean
-      /** @enum {string} */
-      privilege_type: 'ALL' | 'SELECT' | 'INSERT' | 'UPDATE' | 'REFERENCES'
-    }[]
     InvitationByTokenResponse: {
       authorized_user: boolean
       email_match: boolean
@@ -6942,7 +6779,16 @@ export interface components {
       name: string
       token: string
       /** @enum {string} */
-      type: 'postgres' | 'bigquery' | 'webhook' | 'datadog' | 'elastic' | 'loki'
+      type:
+        | 'postgres'
+        | 'bigquery'
+        | 'clickhouse'
+        | 'webhook'
+        | 'datadog'
+        | 'elastic'
+        | 'loki'
+        | 'sentry'
+        | 's3'
       user_id: number
     }
     LFEndpoint: {
@@ -7654,27 +7500,6 @@ export interface components {
     PointInTimeRestoreBody: {
       recovery_time_target_unix: number
     }
-    PostgresColumn: {
-      check: string | null
-      comment: string | null
-      data_type: string
-      default_value: (string | number) | null
-      enums: string[]
-      format: string
-      id: string
-      /** @enum {string|null} */
-      identity_generation: 'BY DEFAULT' | 'ALWAYS' | null
-      is_generated: boolean
-      is_identity: boolean
-      is_nullable: boolean
-      is_unique: boolean
-      is_updatable: boolean
-      name: string
-      ordinal_position: number
-      schema: string
-      table: string
-      table_id: number
-    }
     PostgresColumnPrivileges: {
       column_id: string
       column_name: string
@@ -7690,6 +7515,7 @@ export interface components {
     }
     PostgresConfigResponse: {
       effective_cache_size?: string
+      hot_standby_feedback?: boolean
       logical_decoding_work_mem?: string
       maintenance_work_mem?: string
       max_connections?: number
@@ -7748,23 +7574,6 @@ export interface components {
       name: string
       schema: string
     }
-    PostgresFunction: {
-      argument_types: string
-      /** @enum {string} */
-      behavior: 'VOLATILE' | 'STABLE' | 'IMMUTABLE'
-      complete_statement: string
-      config_params: {
-        [key: string]: string
-      } | null
-      definition: string
-      id: number
-      identity_argument_types: string
-      language: string
-      name: string
-      return_type: string
-      schema: string
-      security_definer: boolean
-    }
     PostgresMaterializedView: {
       columns?: {
         check: string | null
@@ -7823,11 +7632,6 @@ export interface components {
           }[]
         | null
     }
-    PostgresSchema: {
-      id: number
-      name: string
-      owner: string
-    }
     PostgresTable: {
       bytes: number
       columns?: {
@@ -8961,12 +8765,6 @@ export interface components {
       name: string
       website: string
     }
-    RevokeColumnPrivilegesBody: {
-      column_id: string
-      grantee: string
-      /** @enum {string} */
-      privilege_type: 'ALL' | 'SELECT' | 'INSERT' | 'UPDATE' | 'REFERENCES'
-    }[]
     RollbackTableStateBody: {
       /**
        * @description Rollback type
@@ -9091,6 +8889,7 @@ export interface components {
     RunQueryBody: {
       /** @default false */
       disable_statement_timeout?: boolean
+      parameters?: unknown[]
       query: string
     }
     SendDocsFeedbackBody: {
@@ -9198,6 +8997,33 @@ export interface components {
       /** Format: int64 */
       fileSizeLimit: number
     }
+    StorageListResponseV2: {
+      folders: {
+        created_at: string
+        key: string
+        name: string
+        updated_at: string
+      }[]
+      hasNext: boolean
+      nextCursor?: string
+      objects: {
+        created_at: string
+        id: string
+        key: string
+        last_accessed_at: string
+        metadata: {
+          cacheControl?: string | null
+          contentLength?: number | null
+          eTag?: string | null
+          httpStatusCode?: number | null
+          lastModified?: string | null
+          mimetype?: string | null
+          size?: number | null
+        }
+        name: string
+        updated_at: string
+      }[]
+    }
     StorageObject: {
       bucket_id: string
       buckets: {
@@ -9577,22 +9403,6 @@ export interface components {
       name: string
       retention_days: number
     }
-    UpdateColumnBody: {
-      check?: string
-      comment?: string
-      defaultValue?: unknown
-      /** @enum {string} */
-      defaultValueFormat?: 'expression' | 'literal'
-      dropDefault?: boolean
-      id?: number
-      /** @enum {string} */
-      identityGeneration?: 'BY DEFAULT' | 'ALWAYS'
-      isIdentity?: boolean
-      isNullable?: boolean
-      isUnique?: boolean
-      name?: string
-      type?: string
-    }
     UpdateContentFolderBody: {
       name: string
     }
@@ -9616,21 +9426,6 @@ export interface components {
     UpdateEmailBody: {
       newEmail: string
     }
-    UpdateFunctionBody: {
-      args?: string[]
-      /** @enum {string} */
-      behavior?: 'VOLATILE' | 'STABLE' | 'IMMUTABLE'
-      config_params?: {
-        [key: string]: string
-      }
-      definition?: string
-      id?: number
-      language?: string
-      name?: string
-      return_type?: string
-      schema?: string
-      security_definer?: boolean
-    }
     UpdateGitHubConnectionBody: {
       branch_limit?: number
       new_branch_per_pr?: boolean
@@ -9968,13 +9763,6 @@ export interface components {
       server_idle_timeout?: number
       server_lifetime?: number
     }
-    UpdatePolicyBody: {
-      check?: string
-      definition?: string
-      id?: number
-      name?: string
-      roles?: string[]
-    }
     UpdatePoolingConfigResponse: {
       default_pool_size?: number
       ignore_startup_parameters: string
@@ -9993,6 +9781,7 @@ export interface components {
     }
     UpdatePostgresConfigBody: {
       effective_cache_size?: string
+      hot_standby_feedback?: boolean
       logical_decoding_work_mem?: string
       maintenance_work_mem?: string
       max_connections?: number
@@ -10046,16 +9835,6 @@ export interface components {
     UpdateProjectBody: {
       name: string
     }
-    UpdatePublicationBody: {
-      id?: number
-      name?: string
-      owner?: string
-      publish_delete?: boolean
-      publish_insert?: boolean
-      publish_truncate?: boolean
-      publish_update?: boolean
-      tables?: string[] | null
-    }
     UpdateRealtimeConfigBody: {
       /** @description Sets connection pool size for Realtime Authorization */
       connection_pool?: number
@@ -10296,10 +10075,6 @@ export interface components {
        */
       version_id: number
     }
-    UpdateSchemaBody: {
-      name?: string
-      owner?: string
-    }
     UpdateSecretsConfigBody: {
       change_tracking_id: string
       jwt_secret: string
@@ -10421,34 +10196,6 @@ export interface components {
       default_pool_size: number | null
       pool_mode: string
     }
-    UpdateTableBody: {
-      comment?: string
-      id?: number
-      name?: string
-      /** @enum {string} */
-      replica_identity?: 'DEFAULT' | 'INDEX' | 'FULL' | 'NOTHING'
-      replica_identity_index?: string
-      rls_enabled?: boolean
-      rls_forced?: boolean
-      schema?: string
-    }
-    UpdateTriggerBody: {
-      /** @enum {string} */
-      activation?: 'AFTER' | 'BEFORE'
-      /** @enum {string} */
-      enabled_mode?: 'ORIGIN' | 'REPLICA' | 'ALWAYS' | 'DISABLED'
-      events?: ('INSERT' | 'UPDATE' | 'DELETE')[]
-      function_args?: string[]
-      function_name?: string
-      function_schema?: string
-      id?: number
-      name?: string
-      /** @enum {string} */
-      orientation?: 'ROW' | 'STATEMENT'
-      schema?: string
-      table?: string
-      table_id?: number
-    }
     UpdateUserBody: {
       ban_duration?: string
     }
@@ -10582,12 +10329,6 @@ export interface components {
       /** @enum {string} */
       visibility: 'user' | 'project' | 'org' | 'public'
     }
-    ValidateQueryBody: {
-      query: string
-    }
-    ValidateQueryResponse: {
-      valid: boolean
-    }
     ValidateSpamBody: {
       content: string
       subject: string
@@ -16272,7 +16013,7 @@ export interface operations {
       }
     }
   }
-  ColumnPrivilegesController_grantColumnPrivileges: {
+  ExtensionsController_getExtensions: {
     parameters: {
       query?: never
       header: {
@@ -16286,18 +16027,14 @@ export interface operations {
       }
       cookie?: never
     }
-    requestBody: {
-      content: {
-        'application/json': components['schemas']['GrantColumnPrivilegesBody']
-      }
-    }
+    requestBody?: never
     responses: {
-      201: {
+      200: {
         headers: {
           [name: string]: unknown
         }
         content: {
-          'application/json': components['schemas']['PostgresColumnPrivileges'][]
+          'application/json': components['schemas']['PostgresExtension'][]
         }
       }
       /** @description Unauthorized */
@@ -16321,7 +16058,7 @@ export interface operations {
         }
         content?: never
       }
-      /** @description Failed to grant column privileges */
+      /** @description Failed to get pg.extensions */
       500: {
         headers: {
           [name: string]: unknown
@@ -16330,9 +16067,14 @@ export interface operations {
       }
     }
   }
-  ColumnPrivilegesController_revokeColumnPrivileges: {
+  ForeignTablesController_getForeignTables: {
     parameters: {
-      query?: never
+      query?: {
+        id?: string
+        include_columns?: string
+        limit?: string
+        offset?: string
+      }
       header: {
         'x-connection-encrypted': string
         /** @description PostgreSQL connection application name */
@@ -16344,18 +16086,14 @@ export interface operations {
       }
       cookie?: never
     }
-    requestBody: {
-      content: {
-        'application/json': components['schemas']['RevokeColumnPrivilegesBody']
-      }
-    }
+    requestBody?: never
     responses: {
       200: {
         headers: {
           [name: string]: unknown
         }
         content: {
-          'application/json': components['schemas']['PostgresColumnPrivileges'][]
+          'application/json': components['schemas']['PostgresForeignTable'][]
         }
       }
       /** @description Unauthorized */
@@ -16379,7 +16117,7 @@ export interface operations {
         }
         content?: never
       }
-      /** @description Failed to revoke column privileges */
+      /** @description Failed to retrieve database foreign tables */
       500: {
         headers: {
           [name: string]: unknown
@@ -16388,1609 +16126,7 @@ export interface operations {
       }
     }
   }
-  ColumnsController_getColumns: {
-    parameters: {
-      query?: {
-        excluded_schemas?: string
-        included_schemas?: string
-      }
-      header: {
-        'x-connection-encrypted': string
-        /** @description PostgreSQL connection application name */
-        'x-pg-application-name'?: string
-      }
-      path: {
-        /** @description Project ref */
-        ref: string
-      }
-      cookie?: never
-    }
-    requestBody?: never
-    responses: {
-      200: {
-        headers: {
-          [name: string]: unknown
-        }
-        content: {
-          'application/json': components['schemas']['PostgresColumn'][]
-        }
-      }
-      /** @description Unauthorized */
-      401: {
-        headers: {
-          [name: string]: unknown
-        }
-        content?: never
-      }
-      /** @description Forbidden action */
-      403: {
-        headers: {
-          [name: string]: unknown
-        }
-        content?: never
-      }
-      /** @description Rate limit exceeded */
-      429: {
-        headers: {
-          [name: string]: unknown
-        }
-        content?: never
-      }
-      /** @description Failed to get pg.columns */
-      500: {
-        headers: {
-          [name: string]: unknown
-        }
-        content?: never
-      }
-    }
-  }
-  ColumnsController_createColumn: {
-    parameters: {
-      query?: never
-      header: {
-        'x-connection-encrypted': string
-        /** @description PostgreSQL connection application name */
-        'x-pg-application-name'?: string
-      }
-      path: {
-        /** @description Project ref */
-        ref: string
-      }
-      cookie?: never
-    }
-    requestBody: {
-      content: {
-        'application/json': components['schemas']['CreateColumnBody']
-      }
-    }
-    responses: {
-      201: {
-        headers: {
-          [name: string]: unknown
-        }
-        content: {
-          'application/json': components['schemas']['PostgresColumn']
-        }
-      }
-      /** @description Unauthorized */
-      401: {
-        headers: {
-          [name: string]: unknown
-        }
-        content?: never
-      }
-      /** @description Forbidden action */
-      403: {
-        headers: {
-          [name: string]: unknown
-        }
-        content?: never
-      }
-      /** @description Rate limit exceeded */
-      429: {
-        headers: {
-          [name: string]: unknown
-        }
-        content?: never
-      }
-      /** @description Failed to create pg.column */
-      500: {
-        headers: {
-          [name: string]: unknown
-        }
-        content?: never
-      }
-    }
-  }
-  ColumnsController_deleteColumn: {
-    parameters: {
-      query: {
-        /** @description Boolean string, true or false */
-        cascade?: boolean
-        id: string
-      }
-      header: {
-        'x-connection-encrypted': string
-        /** @description PostgreSQL connection application name */
-        'x-pg-application-name'?: string
-      }
-      path: {
-        /** @description Project ref */
-        ref: string
-      }
-      cookie?: never
-    }
-    requestBody?: never
-    responses: {
-      200: {
-        headers: {
-          [name: string]: unknown
-        }
-        content: {
-          'application/json': components['schemas']['PostgresColumn']
-        }
-      }
-      /** @description Unauthorized */
-      401: {
-        headers: {
-          [name: string]: unknown
-        }
-        content?: never
-      }
-      /** @description Forbidden action */
-      403: {
-        headers: {
-          [name: string]: unknown
-        }
-        content?: never
-      }
-      /** @description Rate limit exceeded */
-      429: {
-        headers: {
-          [name: string]: unknown
-        }
-        content?: never
-      }
-      /** @description Failed to delete pg.column with the given ID */
-      500: {
-        headers: {
-          [name: string]: unknown
-        }
-        content?: never
-      }
-    }
-  }
-  ColumnsController_updateColumn: {
-    parameters: {
-      query: {
-        id: string
-      }
-      header: {
-        'x-connection-encrypted': string
-        /** @description PostgreSQL connection application name */
-        'x-pg-application-name'?: string
-      }
-      path: {
-        /** @description Project ref */
-        ref: string
-      }
-      cookie?: never
-    }
-    requestBody: {
-      content: {
-        'application/json': components['schemas']['UpdateColumnBody']
-      }
-    }
-    responses: {
-      200: {
-        headers: {
-          [name: string]: unknown
-        }
-        content: {
-          'application/json': components['schemas']['PostgresColumn']
-        }
-      }
-      /** @description Unauthorized */
-      401: {
-        headers: {
-          [name: string]: unknown
-        }
-        content?: never
-      }
-      /** @description Forbidden action */
-      403: {
-        headers: {
-          [name: string]: unknown
-        }
-        content?: never
-      }
-      /** @description Rate limit exceeded */
-      429: {
-        headers: {
-          [name: string]: unknown
-        }
-        content?: never
-      }
-      /** @description Failed to update pg.column with the given ID */
-      500: {
-        headers: {
-          [name: string]: unknown
-        }
-        content?: never
-      }
-    }
-  }
-  ExtensionsController_getExtensions: {
-    parameters: {
-      query?: never
-      header: {
-        'x-connection-encrypted': string
-        /** @description PostgreSQL connection application name */
-        'x-pg-application-name'?: string
-      }
-      path: {
-        /** @description Project ref */
-        ref: string
-      }
-      cookie?: never
-    }
-    requestBody?: never
-    responses: {
-      200: {
-        headers: {
-          [name: string]: unknown
-        }
-        content: {
-          'application/json': components['schemas']['PostgresExtension'][]
-        }
-      }
-      /** @description Unauthorized */
-      401: {
-        headers: {
-          [name: string]: unknown
-        }
-        content?: never
-      }
-      /** @description Forbidden action */
-      403: {
-        headers: {
-          [name: string]: unknown
-        }
-        content?: never
-      }
-      /** @description Rate limit exceeded */
-      429: {
-        headers: {
-          [name: string]: unknown
-        }
-        content?: never
-      }
-      /** @description Failed to get pg.extensions */
-      500: {
-        headers: {
-          [name: string]: unknown
-        }
-        content?: never
-      }
-    }
-  }
-  ExtensionsController_createExtension: {
-    parameters: {
-      query?: never
-      header: {
-        'x-connection-encrypted': string
-        /** @description PostgreSQL connection application name */
-        'x-pg-application-name'?: string
-      }
-      path: {
-        /** @description Project ref */
-        ref: string
-      }
-      cookie?: never
-    }
-    requestBody: {
-      content: {
-        'application/json': components['schemas']['CreateExtensionBody']
-      }
-    }
-    responses: {
-      201: {
-        headers: {
-          [name: string]: unknown
-        }
-        content: {
-          'application/json': components['schemas']['PostgresExtension']
-        }
-      }
-      /** @description Unauthorized */
-      401: {
-        headers: {
-          [name: string]: unknown
-        }
-        content?: never
-      }
-      /** @description Forbidden action */
-      403: {
-        headers: {
-          [name: string]: unknown
-        }
-        content?: never
-      }
-      /** @description Rate limit exceeded */
-      429: {
-        headers: {
-          [name: string]: unknown
-        }
-        content?: never
-      }
-      /** @description Failed to create pg.extension */
-      500: {
-        headers: {
-          [name: string]: unknown
-        }
-        content?: never
-      }
-    }
-  }
-  ExtensionsController_deleteExtension: {
-    parameters: {
-      query: {
-        id: string
-      }
-      header: {
-        'x-connection-encrypted': string
-        /** @description PostgreSQL connection application name */
-        'x-pg-application-name'?: string
-      }
-      path: {
-        /** @description Project ref */
-        ref: string
-      }
-      cookie?: never
-    }
-    requestBody?: never
-    responses: {
-      200: {
-        headers: {
-          [name: string]: unknown
-        }
-        content: {
-          'application/json': components['schemas']['PostgresExtension']
-        }
-      }
-      /** @description Unauthorized */
-      401: {
-        headers: {
-          [name: string]: unknown
-        }
-        content?: never
-      }
-      /** @description Forbidden action */
-      403: {
-        headers: {
-          [name: string]: unknown
-        }
-        content?: never
-      }
-      /** @description Rate limit exceeded */
-      429: {
-        headers: {
-          [name: string]: unknown
-        }
-        content?: never
-      }
-      /** @description Failed to delete pg.extension with the given ID */
-      500: {
-        headers: {
-          [name: string]: unknown
-        }
-        content?: never
-      }
-    }
-  }
-  ForeignTablesController_getForeignTables: {
-    parameters: {
-      query?: {
-        id?: string
-        include_columns?: string
-        limit?: string
-        offset?: string
-      }
-      header: {
-        'x-connection-encrypted': string
-        /** @description PostgreSQL connection application name */
-        'x-pg-application-name'?: string
-      }
-      path: {
-        /** @description Project ref */
-        ref: string
-      }
-      cookie?: never
-    }
-    requestBody?: never
-    responses: {
-      200: {
-        headers: {
-          [name: string]: unknown
-        }
-        content: {
-          'application/json': components['schemas']['PostgresForeignTable'][]
-        }
-      }
-      /** @description Unauthorized */
-      401: {
-        headers: {
-          [name: string]: unknown
-        }
-        content?: never
-      }
-      /** @description Forbidden action */
-      403: {
-        headers: {
-          [name: string]: unknown
-        }
-        content?: never
-      }
-      /** @description Rate limit exceeded */
-      429: {
-        headers: {
-          [name: string]: unknown
-        }
-        content?: never
-      }
-      /** @description Failed to retrieve database foreign tables */
-      500: {
-        headers: {
-          [name: string]: unknown
-        }
-        content?: never
-      }
-    }
-  }
-  FunctionsController_getFunctions: {
-    parameters: {
-      query?: {
-        excluded_schemas?: string
-        included_schemas?: string
-      }
-      header: {
-        'x-connection-encrypted': string
-        /** @description PostgreSQL connection application name */
-        'x-pg-application-name'?: string
-      }
-      path: {
-        /** @description Project ref */
-        ref: string
-      }
-      cookie?: never
-    }
-    requestBody?: never
-    responses: {
-      200: {
-        headers: {
-          [name: string]: unknown
-        }
-        content: {
-          'application/json': components['schemas']['PostgresFunction'][]
-        }
-      }
-      /** @description Unauthorized */
-      401: {
-        headers: {
-          [name: string]: unknown
-        }
-        content?: never
-      }
-      /** @description Forbidden action */
-      403: {
-        headers: {
-          [name: string]: unknown
-        }
-        content?: never
-      }
-      /** @description Rate limit exceeded */
-      429: {
-        headers: {
-          [name: string]: unknown
-        }
-        content?: never
-      }
-      /** @description Failed to get pg.functions */
-      500: {
-        headers: {
-          [name: string]: unknown
-        }
-        content?: never
-      }
-    }
-  }
-  FunctionsController_createFunction: {
-    parameters: {
-      query?: never
-      header: {
-        'x-connection-encrypted': string
-        /** @description PostgreSQL connection application name */
-        'x-pg-application-name'?: string
-      }
-      path: {
-        /** @description Project ref */
-        ref: string
-      }
-      cookie?: never
-    }
-    requestBody: {
-      content: {
-        'application/json': components['schemas']['CreateFunctionBody']
-      }
-    }
-    responses: {
-      201: {
-        headers: {
-          [name: string]: unknown
-        }
-        content: {
-          'application/json': components['schemas']['PostgresFunction']
-        }
-      }
-      /** @description Unauthorized */
-      401: {
-        headers: {
-          [name: string]: unknown
-        }
-        content?: never
-      }
-      /** @description Forbidden action */
-      403: {
-        headers: {
-          [name: string]: unknown
-        }
-        content?: never
-      }
-      /** @description Rate limit exceeded */
-      429: {
-        headers: {
-          [name: string]: unknown
-        }
-        content?: never
-      }
-      /** @description Failed to create pg.function */
-      500: {
-        headers: {
-          [name: string]: unknown
-        }
-        content?: never
-      }
-    }
-  }
-  FunctionsController_deleteFunction: {
-    parameters: {
-      query: {
-        id: number
-      }
-      header: {
-        'x-connection-encrypted': string
-        /** @description PostgreSQL connection application name */
-        'x-pg-application-name'?: string
-      }
-      path: {
-        /** @description Project ref */
-        ref: string
-      }
-      cookie?: never
-    }
-    requestBody?: never
-    responses: {
-      200: {
-        headers: {
-          [name: string]: unknown
-        }
-        content: {
-          'application/json': components['schemas']['PostgresFunction']
-        }
-      }
-      /** @description Unauthorized */
-      401: {
-        headers: {
-          [name: string]: unknown
-        }
-        content?: never
-      }
-      /** @description Forbidden action */
-      403: {
-        headers: {
-          [name: string]: unknown
-        }
-        content?: never
-      }
-      /** @description Rate limit exceeded */
-      429: {
-        headers: {
-          [name: string]: unknown
-        }
-        content?: never
-      }
-      /** @description Failed to delete pg.function with the given ID */
-      500: {
-        headers: {
-          [name: string]: unknown
-        }
-        content?: never
-      }
-    }
-  }
-  FunctionsController_updateFunction: {
-    parameters: {
-      query: {
-        id: number
-      }
-      header: {
-        'x-connection-encrypted': string
-        /** @description PostgreSQL connection application name */
-        'x-pg-application-name'?: string
-      }
-      path: {
-        /** @description Project ref */
-        ref: string
-      }
-      cookie?: never
-    }
-    requestBody: {
-      content: {
-        'application/json': components['schemas']['UpdateFunctionBody']
-      }
-    }
-    responses: {
-      200: {
-        headers: {
-          [name: string]: unknown
-        }
-        content: {
-          'application/json': components['schemas']['PostgresFunction']
-        }
-      }
-      /** @description Unauthorized */
-      401: {
-        headers: {
-          [name: string]: unknown
-        }
-        content?: never
-      }
-      /** @description Forbidden action */
-      403: {
-        headers: {
-          [name: string]: unknown
-        }
-        content?: never
-      }
-      /** @description Rate limit exceeded */
-      429: {
-        headers: {
-          [name: string]: unknown
-        }
-        content?: never
-      }
-      /** @description Failed to update pg.function with the given ID */
-      500: {
-        headers: {
-          [name: string]: unknown
-        }
-        content?: never
-      }
-    }
-  }
-  MaterializedViewsController_getMaterializedViews: {
-    parameters: {
-      query?: {
-        excluded_schemas?: string
-        id?: string
-        include_columns?: string
-        include_system_schemas?: string
-        included_schemas?: string
-        limit?: string
-        offset?: string
-      }
-      header: {
-        'x-connection-encrypted': string
-        /** @description PostgreSQL connection application name */
-        'x-pg-application-name'?: string
-      }
-      path: {
-        /** @description Project ref */
-        ref: string
-      }
-      cookie?: never
-    }
-    requestBody?: never
-    responses: {
-      200: {
-        headers: {
-          [name: string]: unknown
-        }
-        content: {
-          'application/json': components['schemas']['PostgresMaterializedView'][]
-        }
-      }
-      /** @description Unauthorized */
-      401: {
-        headers: {
-          [name: string]: unknown
-        }
-        content?: never
-      }
-      /** @description Forbidden action */
-      403: {
-        headers: {
-          [name: string]: unknown
-        }
-        content?: never
-      }
-      /** @description Rate limit exceeded */
-      429: {
-        headers: {
-          [name: string]: unknown
-        }
-        content?: never
-      }
-      /** @description Failed to retrieve database materialized views */
-      500: {
-        headers: {
-          [name: string]: unknown
-        }
-        content?: never
-      }
-    }
-  }
-  PoliciesController_getPolicies: {
-    parameters: {
-      query?: {
-        excluded_schemas?: string
-        included_schemas?: string
-      }
-      header: {
-        'x-connection-encrypted': string
-        /** @description PostgreSQL connection application name */
-        'x-pg-application-name'?: string
-      }
-      path: {
-        /** @description Project ref */
-        ref: string
-      }
-      cookie?: never
-    }
-    requestBody?: never
-    responses: {
-      200: {
-        headers: {
-          [name: string]: unknown
-        }
-        content: {
-          'application/json': components['schemas']['PostgresPolicy'][]
-        }
-      }
-      /** @description Unauthorized */
-      401: {
-        headers: {
-          [name: string]: unknown
-        }
-        content?: never
-      }
-      /** @description Forbidden action */
-      403: {
-        headers: {
-          [name: string]: unknown
-        }
-        content?: never
-      }
-      /** @description Rate limit exceeded */
-      429: {
-        headers: {
-          [name: string]: unknown
-        }
-        content?: never
-      }
-      /** @description Failed to get pg.policies */
-      500: {
-        headers: {
-          [name: string]: unknown
-        }
-        content?: never
-      }
-    }
-  }
-  PoliciesController_createPolicy: {
-    parameters: {
-      query?: never
-      header: {
-        'x-connection-encrypted': string
-        /** @description PostgreSQL connection application name */
-        'x-pg-application-name'?: string
-      }
-      path: {
-        /** @description Project ref */
-        ref: string
-      }
-      cookie?: never
-    }
-    requestBody: {
-      content: {
-        'application/json': components['schemas']['CreatePolicyBody']
-      }
-    }
-    responses: {
-      201: {
-        headers: {
-          [name: string]: unknown
-        }
-        content: {
-          'application/json': components['schemas']['PostgresPolicy']
-        }
-      }
-      /** @description Unauthorized */
-      401: {
-        headers: {
-          [name: string]: unknown
-        }
-        content?: never
-      }
-      /** @description Forbidden action */
-      403: {
-        headers: {
-          [name: string]: unknown
-        }
-        content?: never
-      }
-      /** @description Rate limit exceeded */
-      429: {
-        headers: {
-          [name: string]: unknown
-        }
-        content?: never
-      }
-      /** @description Failed to create pg.policy */
-      500: {
-        headers: {
-          [name: string]: unknown
-        }
-        content?: never
-      }
-    }
-  }
-  PoliciesController_deletePolicy: {
-    parameters: {
-      query: {
-        id: number
-      }
-      header: {
-        'x-connection-encrypted': string
-        /** @description PostgreSQL connection application name */
-        'x-pg-application-name'?: string
-      }
-      path: {
-        /** @description Project ref */
-        ref: string
-      }
-      cookie?: never
-    }
-    requestBody?: never
-    responses: {
-      200: {
-        headers: {
-          [name: string]: unknown
-        }
-        content: {
-          'application/json': components['schemas']['PostgresPolicy']
-        }
-      }
-      /** @description Unauthorized */
-      401: {
-        headers: {
-          [name: string]: unknown
-        }
-        content?: never
-      }
-      /** @description Forbidden action */
-      403: {
-        headers: {
-          [name: string]: unknown
-        }
-        content?: never
-      }
-      /** @description Rate limit exceeded */
-      429: {
-        headers: {
-          [name: string]: unknown
-        }
-        content?: never
-      }
-      /** @description Failed to delete pg.policy with the given ID */
-      500: {
-        headers: {
-          [name: string]: unknown
-        }
-        content?: never
-      }
-    }
-  }
-  PoliciesController_updatePolicy: {
-    parameters: {
-      query: {
-        id: number
-      }
-      header: {
-        'x-connection-encrypted': string
-        /** @description PostgreSQL connection application name */
-        'x-pg-application-name'?: string
-      }
-      path: {
-        /** @description Project ref */
-        ref: string
-      }
-      cookie?: never
-    }
-    requestBody: {
-      content: {
-        'application/json': components['schemas']['UpdatePolicyBody']
-      }
-    }
-    responses: {
-      200: {
-        headers: {
-          [name: string]: unknown
-        }
-        content: {
-          'application/json': components['schemas']['PostgresPolicy']
-        }
-      }
-      /** @description Unauthorized */
-      401: {
-        headers: {
-          [name: string]: unknown
-        }
-        content?: never
-      }
-      /** @description Forbidden action */
-      403: {
-        headers: {
-          [name: string]: unknown
-        }
-        content?: never
-      }
-      /** @description Rate limit exceeded */
-      429: {
-        headers: {
-          [name: string]: unknown
-        }
-        content?: never
-      }
-      /** @description Failed to update pg.policy with the given ID */
-      500: {
-        headers: {
-          [name: string]: unknown
-        }
-        content?: never
-      }
-    }
-  }
-  PublicationsController_getPublications: {
-    parameters: {
-      query?: never
-      header: {
-        'x-connection-encrypted': string
-        /** @description PostgreSQL connection application name */
-        'x-pg-application-name'?: string
-      }
-      path: {
-        /** @description Project ref */
-        ref: string
-      }
-      cookie?: never
-    }
-    requestBody?: never
-    responses: {
-      200: {
-        headers: {
-          [name: string]: unknown
-        }
-        content: {
-          'application/json': components['schemas']['PostgresPublication'][]
-        }
-      }
-      /** @description Unauthorized */
-      401: {
-        headers: {
-          [name: string]: unknown
-        }
-        content?: never
-      }
-      /** @description Forbidden action */
-      403: {
-        headers: {
-          [name: string]: unknown
-        }
-        content?: never
-      }
-      /** @description Rate limit exceeded */
-      429: {
-        headers: {
-          [name: string]: unknown
-        }
-        content?: never
-      }
-      /** @description Failed to get pg.publications */
-      500: {
-        headers: {
-          [name: string]: unknown
-        }
-        content?: never
-      }
-    }
-  }
-  PublicationsController_createPublication: {
-    parameters: {
-      query?: never
-      header: {
-        'x-connection-encrypted': string
-        /** @description PostgreSQL connection application name */
-        'x-pg-application-name'?: string
-      }
-      path: {
-        /** @description Project ref */
-        ref: string
-      }
-      cookie?: never
-    }
-    requestBody: {
-      content: {
-        'application/json': components['schemas']['CreatePublicationBody']
-      }
-    }
-    responses: {
-      201: {
-        headers: {
-          [name: string]: unknown
-        }
-        content: {
-          'application/json': components['schemas']['PostgresPublication']
-        }
-      }
-      /** @description Unauthorized */
-      401: {
-        headers: {
-          [name: string]: unknown
-        }
-        content?: never
-      }
-      /** @description Forbidden action */
-      403: {
-        headers: {
-          [name: string]: unknown
-        }
-        content?: never
-      }
-      /** @description Rate limit exceeded */
-      429: {
-        headers: {
-          [name: string]: unknown
-        }
-        content?: never
-      }
-      /** @description Failed to create pg.publication */
-      500: {
-        headers: {
-          [name: string]: unknown
-        }
-        content?: never
-      }
-    }
-  }
-  PublicationsController_deletePublication: {
-    parameters: {
-      query: {
-        id: number
-      }
-      header: {
-        'x-connection-encrypted': string
-        /** @description PostgreSQL connection application name */
-        'x-pg-application-name'?: string
-      }
-      path: {
-        /** @description Project ref */
-        ref: string
-      }
-      cookie?: never
-    }
-    requestBody?: never
-    responses: {
-      200: {
-        headers: {
-          [name: string]: unknown
-        }
-        content: {
-          'application/json': components['schemas']['PostgresPublication']
-        }
-      }
-      /** @description Unauthorized */
-      401: {
-        headers: {
-          [name: string]: unknown
-        }
-        content?: never
-      }
-      /** @description Forbidden action */
-      403: {
-        headers: {
-          [name: string]: unknown
-        }
-        content?: never
-      }
-      /** @description Rate limit exceeded */
-      429: {
-        headers: {
-          [name: string]: unknown
-        }
-        content?: never
-      }
-      /** @description Failed to delete pg.publication with the given ID */
-      500: {
-        headers: {
-          [name: string]: unknown
-        }
-        content?: never
-      }
-    }
-  }
-  PublicationsController_updatePublication: {
-    parameters: {
-      query: {
-        id: number
-      }
-      header: {
-        'x-connection-encrypted': string
-        /** @description PostgreSQL connection application name */
-        'x-pg-application-name'?: string
-      }
-      path: {
-        /** @description Project ref */
-        ref: string
-      }
-      cookie?: never
-    }
-    requestBody: {
-      content: {
-        'application/json': components['schemas']['UpdatePublicationBody']
-      }
-    }
-    responses: {
-      200: {
-        headers: {
-          [name: string]: unknown
-        }
-        content: {
-          'application/json': components['schemas']['PostgresPublication']
-        }
-      }
-      /** @description Unauthorized */
-      401: {
-        headers: {
-          [name: string]: unknown
-        }
-        content?: never
-      }
-      /** @description Forbidden action */
-      403: {
-        headers: {
-          [name: string]: unknown
-        }
-        content?: never
-      }
-      /** @description Rate limit exceeded */
-      429: {
-        headers: {
-          [name: string]: unknown
-        }
-        content?: never
-      }
-      /** @description Failed to update pg.publication with the given ID */
-      500: {
-        headers: {
-          [name: string]: unknown
-        }
-        content?: never
-      }
-    }
-  }
-  QueryController_runQuery: {
-    parameters: {
-      query?: never
-      header: {
-        'x-connection-encrypted': string
-        /** @description PostgreSQL connection application name */
-        'x-pg-application-name'?: string
-      }
-      path: {
-        /** @description Project ref */
-        ref: string
-      }
-      cookie?: never
-    }
-    requestBody: {
-      content: {
-        'application/json': components['schemas']['RunQueryBody']
-      }
-    }
-    responses: {
-      201: {
-        headers: {
-          [name: string]: unknown
-        }
-        content?: never
-      }
-      /** @description Unauthorized */
-      401: {
-        headers: {
-          [name: string]: unknown
-        }
-        content?: never
-      }
-      /** @description Forbidden action */
-      403: {
-        headers: {
-          [name: string]: unknown
-        }
-        content?: never
-      }
-      /** @description Rate limit exceeded */
-      429: {
-        headers: {
-          [name: string]: unknown
-        }
-        content?: never
-      }
-      /** @description Failed to run sql query */
-      500: {
-        headers: {
-          [name: string]: unknown
-        }
-        content?: never
-      }
-    }
-  }
-  QueryController_formatQuery: {
-    parameters: {
-      query?: never
-      header?: never
-      path: {
-        /** @description Project ref */
-        ref: string
-      }
-      cookie?: never
-    }
-    requestBody: {
-      content: {
-        'application/json': components['schemas']['FormatQueryBody']
-      }
-    }
-    responses: {
-      201: {
-        headers: {
-          [name: string]: unknown
-        }
-        content?: never
-      }
-      /** @description Unauthorized */
-      401: {
-        headers: {
-          [name: string]: unknown
-        }
-        content?: never
-      }
-      /** @description Forbidden action */
-      403: {
-        headers: {
-          [name: string]: unknown
-        }
-        content?: never
-      }
-      /** @description Rate limit exceeded */
-      429: {
-        headers: {
-          [name: string]: unknown
-        }
-        content?: never
-      }
-      /** @description Failed to format sql query */
-      500: {
-        headers: {
-          [name: string]: unknown
-        }
-        content?: never
-      }
-    }
-  }
-  QueryController_validateQuery: {
-    parameters: {
-      query?: never
-      header?: never
-      path: {
-        /** @description Project ref */
-        ref: string
-      }
-      cookie?: never
-    }
-    requestBody: {
-      content: {
-        'application/json': components['schemas']['ValidateQueryBody']
-      }
-    }
-    responses: {
-      201: {
-        headers: {
-          [name: string]: unknown
-        }
-        content: {
-          'application/json': components['schemas']['ValidateQueryResponse']
-        }
-      }
-      /** @description Unauthorized */
-      401: {
-        headers: {
-          [name: string]: unknown
-        }
-        content?: never
-      }
-      /** @description Forbidden action */
-      403: {
-        headers: {
-          [name: string]: unknown
-        }
-        content?: never
-      }
-      /** @description Rate limit exceeded */
-      429: {
-        headers: {
-          [name: string]: unknown
-        }
-        content?: never
-      }
-      /** @description Failed to validate sql query */
-      500: {
-        headers: {
-          [name: string]: unknown
-        }
-        content?: never
-      }
-    }
-  }
-  SchemasController_getSchemas: {
-    parameters: {
-      query?: never
-      header: {
-        'x-connection-encrypted': string
-        /** @description PostgreSQL connection application name */
-        'x-pg-application-name'?: string
-      }
-      path: {
-        /** @description Project ref */
-        ref: string
-      }
-      cookie?: never
-    }
-    requestBody?: never
-    responses: {
-      200: {
-        headers: {
-          [name: string]: unknown
-        }
-        content: {
-          'application/json': components['schemas']['PostgresSchema'][]
-        }
-      }
-      /** @description Unauthorized */
-      401: {
-        headers: {
-          [name: string]: unknown
-        }
-        content?: never
-      }
-      /** @description Forbidden action */
-      403: {
-        headers: {
-          [name: string]: unknown
-        }
-        content?: never
-      }
-      /** @description Rate limit exceeded */
-      429: {
-        headers: {
-          [name: string]: unknown
-        }
-        content?: never
-      }
-      /** @description Failed to get pg.schemas */
-      500: {
-        headers: {
-          [name: string]: unknown
-        }
-        content?: never
-      }
-    }
-  }
-  SchemasController_createSchema: {
-    parameters: {
-      query?: never
-      header: {
-        'x-connection-encrypted': string
-        /** @description PostgreSQL connection application name */
-        'x-pg-application-name'?: string
-      }
-      path: {
-        /** @description Project ref */
-        ref: string
-      }
-      cookie?: never
-    }
-    requestBody: {
-      content: {
-        'application/json': components['schemas']['CreateSchemaBody']
-      }
-    }
-    responses: {
-      201: {
-        headers: {
-          [name: string]: unknown
-        }
-        content: {
-          'application/json': components['schemas']['PostgresSchema']
-        }
-      }
-      /** @description Unauthorized */
-      401: {
-        headers: {
-          [name: string]: unknown
-        }
-        content?: never
-      }
-      /** @description Forbidden action */
-      403: {
-        headers: {
-          [name: string]: unknown
-        }
-        content?: never
-      }
-      /** @description Rate limit exceeded */
-      429: {
-        headers: {
-          [name: string]: unknown
-        }
-        content?: never
-      }
-      /** @description Failed to create pg.schema */
-      500: {
-        headers: {
-          [name: string]: unknown
-        }
-        content?: never
-      }
-    }
-  }
-  SchemasController_deleteSchema: {
-    parameters: {
-      query: {
-        id: number
-      }
-      header: {
-        'x-connection-encrypted': string
-        /** @description PostgreSQL connection application name */
-        'x-pg-application-name'?: string
-      }
-      path: {
-        /** @description Project ref */
-        ref: string
-      }
-      cookie?: never
-    }
-    requestBody?: never
-    responses: {
-      200: {
-        headers: {
-          [name: string]: unknown
-        }
-        content: {
-          'application/json': components['schemas']['PostgresSchema']
-        }
-      }
-      /** @description Unauthorized */
-      401: {
-        headers: {
-          [name: string]: unknown
-        }
-        content?: never
-      }
-      /** @description Forbidden action */
-      403: {
-        headers: {
-          [name: string]: unknown
-        }
-        content?: never
-      }
-      /** @description Rate limit exceeded */
-      429: {
-        headers: {
-          [name: string]: unknown
-        }
-        content?: never
-      }
-      /** @description Failed to delete pg.schema with the given ID */
-      500: {
-        headers: {
-          [name: string]: unknown
-        }
-        content?: never
-      }
-    }
-  }
-  SchemasController_updateSchema: {
-    parameters: {
-      query: {
-        id: number
-      }
-      header: {
-        'x-connection-encrypted': string
-        /** @description PostgreSQL connection application name */
-        'x-pg-application-name'?: string
-      }
-      path: {
-        /** @description Project ref */
-        ref: string
-      }
-      cookie?: never
-    }
-    requestBody: {
-      content: {
-        'application/json': components['schemas']['UpdateSchemaBody']
-      }
-    }
-    responses: {
-      200: {
-        headers: {
-          [name: string]: unknown
-        }
-        content: {
-          'application/json': components['schemas']['PostgresSchema']
-        }
-      }
-      /** @description Unauthorized */
-      401: {
-        headers: {
-          [name: string]: unknown
-        }
-        content?: never
-      }
-      /** @description Forbidden action */
-      403: {
-        headers: {
-          [name: string]: unknown
-        }
-        content?: never
-      }
-      /** @description Rate limit exceeded */
-      429: {
-        headers: {
-          [name: string]: unknown
-        }
-        content?: never
-      }
-      /** @description Failed to update pg.schema with the given ID */
-      500: {
-        headers: {
-          [name: string]: unknown
-        }
-        content?: never
-      }
-    }
-  }
-  TablesController_getTables: {
+  MaterializedViewsController_getMaterializedViews: {
     parameters: {
       query?: {
         excluded_schemas?: string
@@ -18019,65 +16155,7 @@ export interface operations {
           [name: string]: unknown
         }
         content: {
-          'application/json': components['schemas']['PostgresTable'][]
-        }
-      }
-      /** @description Unauthorized */
-      401: {
-        headers: {
-          [name: string]: unknown
-        }
-        content?: never
-      }
-      /** @description Forbidden action */
-      403: {
-        headers: {
-          [name: string]: unknown
-        }
-        content?: never
-      }
-      /** @description Rate limit exceeded */
-      429: {
-        headers: {
-          [name: string]: unknown
-        }
-        content?: never
-      }
-      /** @description Failed to get pg.tables or pg.table with the given ID */
-      500: {
-        headers: {
-          [name: string]: unknown
-        }
-        content?: never
-      }
-    }
-  }
-  TablesController_createTable: {
-    parameters: {
-      query?: never
-      header: {
-        'x-connection-encrypted': string
-        /** @description PostgreSQL connection application name */
-        'x-pg-application-name'?: string
-      }
-      path: {
-        /** @description Project ref */
-        ref: string
-      }
-      cookie?: never
-    }
-    requestBody: {
-      content: {
-        'application/json': components['schemas']['CreateTableBody']
-      }
-    }
-    responses: {
-      201: {
-        headers: {
-          [name: string]: unknown
-        }
-        content: {
-          'application/json': components['schemas']['PostgresTable']
+          'application/json': components['schemas']['PostgresMaterializedView'][]
         }
       }
       /** @description Unauthorized */
@@ -18101,7 +16179,7 @@ export interface operations {
         }
         content?: never
       }
-      /** @description Failed to create pg.table */
+      /** @description Failed to retrieve database materialized views */
       500: {
         headers: {
           [name: string]: unknown
@@ -18110,12 +16188,11 @@ export interface operations {
       }
     }
   }
-  TablesController_deleteTable: {
+  PoliciesController_getPolicies: {
     parameters: {
-      query: {
-        /** @description Boolean string, true or false */
-        cascade?: boolean
-        id: number
+      query?: {
+        excluded_schemas?: string
+        included_schemas?: string
       }
       header: {
         'x-connection-encrypted': string
@@ -18135,67 +16212,7 @@ export interface operations {
           [name: string]: unknown
         }
         content: {
-          'application/json': components['schemas']['PostgresTable']
-        }
-      }
-      /** @description Unauthorized */
-      401: {
-        headers: {
-          [name: string]: unknown
-        }
-        content?: never
-      }
-      /** @description Forbidden action */
-      403: {
-        headers: {
-          [name: string]: unknown
-        }
-        content?: never
-      }
-      /** @description Rate limit exceeded */
-      429: {
-        headers: {
-          [name: string]: unknown
-        }
-        content?: never
-      }
-      /** @description Failed to delete pg.table with the given ID */
-      500: {
-        headers: {
-          [name: string]: unknown
-        }
-        content?: never
-      }
-    }
-  }
-  TablesController_updateTable: {
-    parameters: {
-      query: {
-        id: number
-      }
-      header: {
-        'x-connection-encrypted': string
-        /** @description PostgreSQL connection application name */
-        'x-pg-application-name'?: string
-      }
-      path: {
-        /** @description Project ref */
-        ref: string
-      }
-      cookie?: never
-    }
-    requestBody: {
-      content: {
-        'application/json': components['schemas']['UpdateTableBody']
-      }
-    }
-    responses: {
-      200: {
-        headers: {
-          [name: string]: unknown
-        }
-        content: {
-          'application/json': components['schemas']['PostgresTable']
+          'application/json': components['schemas']['PostgresPolicy'][]
         }
       }
       /** @description Unauthorized */
@@ -18219,7 +16236,7 @@ export interface operations {
         }
         content?: never
       }
-      /** @description Failed to update pg.table with the given ID */
+      /** @description Failed to get pg.policies */
       500: {
         headers: {
           [name: string]: unknown
@@ -18228,12 +16245,9 @@ export interface operations {
       }
     }
   }
-  TriggersController_getTriggers: {
+  PublicationsController_getPublications: {
     parameters: {
-      query?: {
-        excluded_schemas?: string
-        included_schemas?: string
-      }
+      query?: never
       header: {
         'x-connection-encrypted': string
         /** @description PostgreSQL connection application name */
@@ -18252,7 +16266,7 @@ export interface operations {
           [name: string]: unknown
         }
         content: {
-          'application/json': components['schemas']['PostgresTrigger'][]
+          'application/json': components['schemas']['PostgresPublication'][]
         }
       }
       /** @description Unauthorized */
@@ -18276,7 +16290,7 @@ export interface operations {
         }
         content?: never
       }
-      /** @description Failed to get pg.triggers */
+      /** @description Failed to get pg.publications */
       500: {
         headers: {
           [name: string]: unknown
@@ -18285,7 +16299,7 @@ export interface operations {
       }
     }
   }
-  TriggersController_createTrigger: {
+  QueryController_runQuery: {
     parameters: {
       query?: never
       header: {
@@ -18301,7 +16315,7 @@ export interface operations {
     }
     requestBody: {
       content: {
-        'application/json': components['schemas']['CreateTriggerBody']
+        'application/json': components['schemas']['RunQueryBody']
       }
     }
     responses: {
@@ -18309,9 +16323,7 @@ export interface operations {
         headers: {
           [name: string]: unknown
         }
-        content: {
-          'application/json': components['schemas']['PostgresTrigger']
-        }
+        content?: never
       }
       /** @description Unauthorized */
       401: {
@@ -18334,7 +16346,7 @@ export interface operations {
         }
         content?: never
       }
-      /** @description Failed to create pg.trigger */
+      /** @description Failed to run sql query */
       500: {
         headers: {
           [name: string]: unknown
@@ -18343,10 +16355,16 @@ export interface operations {
       }
     }
   }
-  TriggersController_deleteTrigger: {
+  TablesController_getTables: {
     parameters: {
-      query: {
-        id: number
+      query?: {
+        excluded_schemas?: string
+        id?: string
+        include_columns?: string
+        include_system_schemas?: string
+        included_schemas?: string
+        limit?: string
+        offset?: string
       }
       header: {
         'x-connection-encrypted': string
@@ -18366,7 +16384,7 @@ export interface operations {
           [name: string]: unknown
         }
         content: {
-          'application/json': components['schemas']['PostgresTrigger']
+          'application/json': components['schemas']['PostgresTable'][]
         }
       }
       /** @description Unauthorized */
@@ -18390,7 +16408,7 @@ export interface operations {
         }
         content?: never
       }
-      /** @description Failed to delete pg.trigger with the given ID */
+      /** @description Failed to get pg.tables or pg.table with the given ID */
       500: {
         headers: {
           [name: string]: unknown
@@ -18399,10 +16417,11 @@ export interface operations {
       }
     }
   }
-  TriggersController_updateTrigger: {
+  TriggersController_getTriggers: {
     parameters: {
-      query: {
-        id: number
+      query?: {
+        excluded_schemas?: string
+        included_schemas?: string
       }
       header: {
         'x-connection-encrypted': string
@@ -18415,18 +16434,14 @@ export interface operations {
       }
       cookie?: never
     }
-    requestBody: {
-      content: {
-        'application/json': components['schemas']['UpdateTriggerBody']
-      }
-    }
+    requestBody?: never
     responses: {
       200: {
         headers: {
           [name: string]: unknown
         }
         content: {
-          'application/json': components['schemas']['PostgresTrigger']
+          'application/json': components['schemas']['PostgresTrigger'][]
         }
       }
       /** @description Unauthorized */
@@ -18450,7 +16465,7 @@ export interface operations {
         }
         content?: never
       }
-      /** @description Failed to update pg.trigger with the given ID */
+      /** @description Failed to get pg.triggers */
       500: {
         headers: {
           [name: string]: unknown
@@ -26466,6 +24481,62 @@ export interface operations {
       }
     }
   }
+  StorageObjectsController_getObjectsV2: {
+    parameters: {
+      query?: never
+      header?: never
+      path: {
+        /** @description Storage bucket id */
+        id: string
+        /** @description Project ref */
+        ref: string
+      }
+      cookie?: never
+    }
+    requestBody: {
+      content: {
+        'application/json': components['schemas']['GetObjectsV2Body']
+      }
+    }
+    responses: {
+      201: {
+        headers: {
+          [name: string]: unknown
+        }
+        content: {
+          'application/json': components['schemas']['StorageListResponseV2']
+        }
+      }
+      /** @description Unauthorized */
+      401: {
+        headers: {
+          [name: string]: unknown
+        }
+        content?: never
+      }
+      /** @description Forbidden action */
+      403: {
+        headers: {
+          [name: string]: unknown
+        }
+        content?: never
+      }
+      /** @description Rate limit exceeded */
+      429: {
+        headers: {
+          [name: string]: unknown
+        }
+        content?: never
+      }
+      /** @description Failed to get list of objects with the given bucket */
+      500: {
+        headers: {
+          [name: string]: unknown
+        }
+        content?: never
+      }
+    }
+  }
   StorageObjectsController_moveObject: {
     parameters: {
       query?: never
diff --git a/packages/common/constants/local-storage.ts b/packages/common/constants/local-storage.ts
index 26ad2f83d50e5..1cfda8d9b9512 100644
--- a/packages/common/constants/local-storage.ts
+++ b/packages/common/constants/local-storage.ts
@@ -78,7 +78,9 @@ export const LOCAL_STORAGE_KEYS = {
 
   HOTKEY_INLINE_EDITOR: 'supabase-dashboard-hotkey-inline-editor',
   HOTKEY_COMMAND_MENU: 'supabase-dashboard-hotkey-command-menu',
-  HOTKEY_AI_ASSISTANT: 'supabase-dashboard-hotkey-ai-assistant',
+
+  // Project sidebar hotkeys
+  HOTKEY_SIDEBAR: (sidebarId: string) => `supabase-dashboard-hotkey-sidebar-${sidebarId}`,
 
   /**
    * COMMON