From 16bb5187c971890f1e6174eb5affa0662cc603d9 Mon Sep 17 00:00:00 2001
From: Ignacio Dobronich <ignacio@dobronich.com>
Date: Tue, 22 Jul 2025 08:25:36 -0300
Subject: [PATCH 1/8] docs: credit top ups pay outstanding invoices (#37255)

---
 apps/docs/content/guides/platform/credits.mdx                 | 2 ++
 .../interfaces/Organization/BillingSettings/CreditTopUp.tsx   | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/apps/docs/content/guides/platform/credits.mdx b/apps/docs/content/guides/platform/credits.mdx
index 04ced3dae40e8..a71d1574de0c7 100644
--- a/apps/docs/content/guides/platform/credits.mdx
+++ b/apps/docs/content/guides/platform/credits.mdx
@@ -29,6 +29,8 @@ As an example, if you start a Pro Plan subscription on January 1 and downgrade t
 
 You can top up credits at any time, with a maximum of <Price price="999" /> per top-up. These credits do not expire and are non-refundable.
 
+If you have any outstanding invoices, we’ll automatically use your credits to pay them off. Any remaining credits will be applied to future invoices.
+
 You may want to consider this option to avoid issues with recurring payments, gain more control over how often your credit card is charged, and potentially make things easier for your accounting department.
 
 <Admonition type="note">
diff --git a/apps/studio/components/interfaces/Organization/BillingSettings/CreditTopUp.tsx b/apps/studio/components/interfaces/Organization/BillingSettings/CreditTopUp.tsx
index b33f047760d0e..341df59773789 100644
--- a/apps/studio/components/interfaces/Organization/BillingSettings/CreditTopUp.tsx
+++ b/apps/studio/components/interfaces/Organization/BillingSettings/CreditTopUp.tsx
@@ -227,8 +227,8 @@ export const CreditTopUp = ({ slug }: { slug: string | undefined }) => {
             <DialogTitle>Top Up Credits</DialogTitle>
             <DialogDescription>
               On successful payment, an invoice will be issued and you'll be granted credits.
-              Credits will be applied to future invoices only and are not refundable. The topped up
-              credits do not expire.
+              Credits will be applied to outstanding and future invoices and are not refundable. The
+              topped up credits do not expire.
             </DialogDescription>
           </DialogHeader>
 

From 008cca006d6ddbdd468ec5947d12434db45c0c0e Mon Sep 17 00:00:00 2001
From: Joshen Lim <joshenlimek@gmail.com>
Date: Tue, 22 Jul 2025 19:47:07 +0800
Subject: [PATCH 2/8] Refactor custom domain verification (#37349)

* Refactor custom domain verification

* Add success toast when cancelling custom domain

* Update toast success for other delete custom domain calls

* Revert unnecessary change

* Update copy

* Update copy
---
 .../CustomDomainActivate.tsx                  |  8 ++-
 .../CustomDomainConfig/CustomDomainConfig.tsx | 25 ++++++----
 .../CustomDomainConfig/CustomDomainDelete.tsx |  4 +-
 .../CustomDomainConfig/CustomDomainVerify.tsx | 50 +++++++++++--------
 4 files changed, 53 insertions(+), 34 deletions(-)

diff --git a/apps/studio/components/interfaces/Settings/General/CustomDomainConfig/CustomDomainActivate.tsx b/apps/studio/components/interfaces/Settings/General/CustomDomainConfig/CustomDomainActivate.tsx
index c471cd494385c..ef87d4d509dda 100644
--- a/apps/studio/components/interfaces/Settings/General/CustomDomainConfig/CustomDomainActivate.tsx
+++ b/apps/studio/components/interfaces/Settings/General/CustomDomainConfig/CustomDomainActivate.tsx
@@ -30,7 +30,13 @@ const CustomDomainActivate = ({ projectRef, customDomain }: CustomDomainActivate
       },
     }
   )
-  const { mutate: deleteCustomDomain, isLoading: isDeleting } = useCustomDomainDeleteMutation()
+  const { mutate: deleteCustomDomain, isLoading: isDeleting } = useCustomDomainDeleteMutation({
+    onSuccess: () => {
+      toast.success(
+        'Custom domain setup cancelled successfully. It may take a few seconds before your custom domain is fully removed, so you may need to refresh your browser.'
+      )
+    },
+  })
 
   const endpoint = settings?.app_config?.endpoint
 
diff --git a/apps/studio/components/interfaces/Settings/General/CustomDomainConfig/CustomDomainConfig.tsx b/apps/studio/components/interfaces/Settings/General/CustomDomainConfig/CustomDomainConfig.tsx
index 6a7e80b13f0e8..aa2391f660b4c 100644
--- a/apps/studio/components/interfaces/Settings/General/CustomDomainConfig/CustomDomainConfig.tsx
+++ b/apps/studio/components/interfaces/Settings/General/CustomDomainConfig/CustomDomainConfig.tsx
@@ -27,10 +27,10 @@ const CustomDomainConfig = () => {
   const hasCustomDomainAddon = !!addons?.selected_addons.find((x) => x.type === 'custom_domain')
 
   const {
+    data: customDomainData,
     isLoading: isCustomDomainsLoading,
     isError,
     isSuccess,
-    data,
   } = useCustomDomainsQuery(
     { projectRef: ref },
     {
@@ -45,6 +45,8 @@ const CustomDomainConfig = () => {
     }
   )
 
+  const { status, customDomain } = customDomainData || {}
+
   return (
     <section id="custom-domains">
       <FormHeader title="Custom Domains" description="Present a branded experience to your users" />
@@ -94,24 +96,25 @@ const CustomDomainConfig = () => {
             </div>
           </Panel.Content>
         </Panel>
-      ) : data?.status === '0_no_hostname_configured' ? (
+      ) : status === '0_no_hostname_configured' ? (
         <CustomDomainsConfigureHostname />
       ) : (
         <Panel>
           {isSuccess && (
             <div className="flex flex-col">
-              {(data.status === '1_not_started' ||
-                data.status === '2_initiated' ||
-                data.status === '3_challenge_verified') && (
-                <CustomDomainVerify customDomain={data.customDomain} />
-              )}
+              {(status === '1_not_started' ||
+                status === '2_initiated' ||
+                status === '3_challenge_verified') && <CustomDomainVerify />}
 
-              {data.status === '4_origin_setup_completed' && (
-                <CustomDomainActivate projectRef={ref} customDomain={data.customDomain} />
+              {customDomainData.status === '4_origin_setup_completed' && (
+                <CustomDomainActivate
+                  projectRef={ref}
+                  customDomain={customDomainData.customDomain}
+                />
               )}
 
-              {data.status === '5_services_reconfigured' && (
-                <CustomDomainDelete projectRef={ref} customDomain={data.customDomain} />
+              {customDomainData.status === '5_services_reconfigured' && (
+                <CustomDomainDelete projectRef={ref} customDomain={customDomainData.customDomain} />
               )}
             </div>
           )}
diff --git a/apps/studio/components/interfaces/Settings/General/CustomDomainConfig/CustomDomainDelete.tsx b/apps/studio/components/interfaces/Settings/General/CustomDomainConfig/CustomDomainDelete.tsx
index a029d8a1817f7..4ec3c26444264 100644
--- a/apps/studio/components/interfaces/Settings/General/CustomDomainConfig/CustomDomainDelete.tsx
+++ b/apps/studio/components/interfaces/Settings/General/CustomDomainConfig/CustomDomainDelete.tsx
@@ -18,7 +18,9 @@ const CustomDomainDelete = ({ projectRef, customDomain }: CustomDomainDeleteProp
   const [isDeleteConfirmModalVisible, setIsDeleteConfirmModalVisible] = useState(false)
   const { mutate: deleteCustomDomain } = useCustomDomainDeleteMutation({
     onSuccess: () => {
-      toast.success(`Successfully deleted custom domain`)
+      toast.success(
+        `Successfully deleted custom domain. It may take a few seconds before your custom domain is fully removed, hence you may need to refresh your browser.`
+      )
       setIsDeleteConfirmModalVisible(false)
     },
   })
diff --git a/apps/studio/components/interfaces/Settings/General/CustomDomainConfig/CustomDomainVerify.tsx b/apps/studio/components/interfaces/Settings/General/CustomDomainConfig/CustomDomainVerify.tsx
index 9d97d93a1577b..2e83375d731b4 100644
--- a/apps/studio/components/interfaces/Settings/General/CustomDomainConfig/CustomDomainVerify.tsx
+++ b/apps/studio/components/interfaces/Settings/General/CustomDomainConfig/CustomDomainVerify.tsx
@@ -1,13 +1,14 @@
 import { AlertCircle, HelpCircle, RefreshCw } from 'lucide-react'
 import Link from 'next/link'
 import { useState } from 'react'
+import { toast } from 'sonner'
 
 import { useParams } from 'common'
 import { DocsButton } from 'components/ui/DocsButton'
 import Panel from 'components/ui/Panel'
 import { useProjectSettingsV2Query } from 'data/config/project-settings-v2-query'
 import { useCustomDomainDeleteMutation } from 'data/custom-domains/custom-domains-delete-mutation'
-import type { CustomDomainResponse } from 'data/custom-domains/custom-domains-query'
+import { useCustomDomainsQuery } from 'data/custom-domains/custom-domains-query'
 import { useCustomDomainReverifyMutation } from 'data/custom-domains/custom-domains-reverify-mutation'
 import { useInterval } from 'hooks/misc/useInterval'
 import {
@@ -20,16 +21,17 @@ import {
 import DNSRecord from './DNSRecord'
 import { DNSTableHeaders } from './DNSTableHeaders'
 
-export type CustomDomainVerifyProps = {
-  customDomain: CustomDomainResponse
-}
-
-const CustomDomainVerify = ({ customDomain }: CustomDomainVerifyProps) => {
+const CustomDomainVerify = () => {
   const { ref: projectRef } = useParams()
   const [isNotVerifiedYet, setIsNotVerifiedYet] = useState(false)
 
   const { data: settings } = useProjectSettingsV2Query({ projectRef })
 
+  const { data: customDomainData } = useCustomDomainsQuery({ projectRef })
+  const customDomain = customDomainData?.customDomain
+  const isSSLCertificateDeploying =
+    customDomain?.ssl.status !== undefined && customDomain.ssl.txt_name === undefined
+
   const { mutate: reverifyCustomDomain, isLoading: isReverifyLoading } =
     useCustomDomainReverifyMutation({
       onSuccess: (res) => {
@@ -37,13 +39,19 @@ const CustomDomainVerify = ({ customDomain }: CustomDomainVerifyProps) => {
       },
     })
 
-  const { mutate: deleteCustomDomain, isLoading: isDeleting } = useCustomDomainDeleteMutation()
+  const { mutate: deleteCustomDomain, isLoading: isDeleting } = useCustomDomainDeleteMutation({
+    onSuccess: () => {
+      toast.success(
+        'Custom domain setup cancelled successfully. It may take a few seconds before your custom domain is fully removed, so you may need to refresh your browser.'
+      )
+    },
+  })
 
-  const hasCAAErrors = customDomain.ssl.validation_errors?.reduce(
+  const hasCAAErrors = customDomain?.ssl.validation_errors?.reduce(
     (acc, error) => acc || error.message.includes('caa_error'),
     false
   )
-  const isValidating = (customDomain.ssl.txt_name ?? '') === ''
+  const isValidating = (customDomain?.ssl.txt_name ?? '') === ''
 
   const onReverifyCustomDomain = () => {
     if (!projectRef) return console.error('Project ref is required')
@@ -53,7 +61,7 @@ const CustomDomainVerify = ({ customDomain }: CustomDomainVerifyProps) => {
   useInterval(
     onReverifyCustomDomain,
     // Poll every 5 seconds if the SSL certificate is being deployed
-    customDomain.ssl.status !== undefined && customDomain.ssl.txt_name === undefined ? 5000 : false
+    isSSLCertificateDeploying && !isDeleting ? 5000 : false
   )
 
   const onCancelCustomDomain = async () => {
@@ -67,7 +75,7 @@ const CustomDomainVerify = ({ customDomain }: CustomDomainVerifyProps) => {
         <div>
           <h4 className="text-foreground mb-2">
             Configure TXT verification for your custom domain{' '}
-            <code className="text-sm">{customDomain.hostname}</code>
+            <code className="text-sm">{customDomain?.hostname}</code>
           </h4>
           <p className="text-sm text-foreground-light">
             Set the following TXT record(s) in your DNS provider, then click verify to confirm your
@@ -102,7 +110,7 @@ const CustomDomainVerify = ({ customDomain }: CustomDomainVerifyProps) => {
                       <Link
                         target="_blank"
                         rel="noreferrer"
-                        href={`https://whatsmydns.net/#TXT/${customDomain.hostname}`}
+                        href={`https://whatsmydns.net/#TXT/${customDomain?.hostname}`}
                         className="text-brand"
                       >
                         here
@@ -131,13 +139,13 @@ const CustomDomainVerify = ({ customDomain }: CustomDomainVerifyProps) => {
             </AlertTitle_Shadcn_>
             <AlertDescription_Shadcn_>
               Please add a CAA record allowing "digicert.com" to issue certificates for{' '}
-              <code className="text-xs">{customDomain.hostname}</code>. For example:{' '}
+              <code className="text-xs">{customDomain?.hostname}</code>. For example:{' '}
               <code className="text-xs">0 issue "digicert.com"</code>
             </AlertDescription_Shadcn_>
           </Alert_Shadcn_>
         )}
 
-        {customDomain.ssl.status === 'validation_timed_out' ? (
+        {customDomain?.ssl.status === 'validation_timed_out' ? (
           <Alert_Shadcn_>
             <WarningIcon />
             <AlertTitle_Shadcn_>Validation timed out</AlertTitle_Shadcn_>
@@ -147,27 +155,27 @@ const CustomDomainVerify = ({ customDomain }: CustomDomainVerifyProps) => {
           </Alert_Shadcn_>
         ) : (
           <div className="space-y-2">
-            <DNSTableHeaders display={customDomain.ssl.txt_name ?? ''} />
+            <DNSTableHeaders display={customDomain?.ssl.txt_name ?? ''} />
 
-            {customDomain.verification_errors?.includes(
+            {customDomain?.verification_errors?.includes(
               'custom hostname does not CNAME to this zone.'
             ) && (
               <DNSRecord
                 type="CNAME"
-                name={customDomain.hostname}
+                name={customDomain?.hostname}
                 value={settings?.app_config?.endpoint ?? 'Loading...'}
               />
             )}
 
-            {!isValidating && customDomain.ssl.status === 'pending_validation' && (
+            {!isValidating && customDomain?.ssl.status === 'pending_validation' && (
               <DNSRecord
                 type="TXT"
-                name={customDomain.ssl.txt_name ?? 'Loading...'}
-                value={customDomain.ssl.txt_value ?? 'Loading...'}
+                name={customDomain?.ssl.txt_name ?? 'Loading...'}
+                value={customDomain?.ssl.txt_value ?? 'Loading...'}
               />
             )}
 
-            {customDomain.ssl.status === 'pending_deployment' && (
+            {customDomain?.ssl.status === 'pending_deployment' && (
               <div className="flex items-center justify-center space-x-2 py-8">
                 <AlertCircle size={16} strokeWidth={1.5} />
                 <p className="text-sm text-foreground-light">

From f9e330f3ca3db7bfa92d0825cbd5f3438eb1e586 Mon Sep 17 00:00:00 2001
From: Pamela Chia <pamelachiamayyee@gmail.com>
Date: Tue, 22 Jul 2025 20:51:08 +0800
Subject: [PATCH 3/8] Chore/track branching 2 (#37350)

* add review branch w ai

* track create branch

* track update push branch event

* track create merge request

* track create and close merge request

* track merge attempts and results

* add delete branch event

* combine handle update

* fix lint
---
 .../BranchManagement/CreateBranchModal.tsx    |  15 +
 .../BranchManagement/OutOfDateNotice.tsx      |  37 +-
 .../BranchManagement/ReviewWithAI.tsx         |  13 +
 .../LayoutHeader/MergeRequestButton.tsx       |  16 +
 .../pages/project/[ref]/branches/index.tsx    |  15 +
 .../project/[ref]/branches/merge-requests.tsx |  43 ++
 apps/studio/pages/project/[ref]/merge.tsx     |  70 +++
 packages/common/telemetry-constants.ts        | 433 +++++++++---------
 8 files changed, 428 insertions(+), 214 deletions(-)

diff --git a/apps/studio/components/interfaces/BranchManagement/CreateBranchModal.tsx b/apps/studio/components/interfaces/BranchManagement/CreateBranchModal.tsx
index 93c82251740c0..a23bf75eb81ed 100644
--- a/apps/studio/components/interfaces/BranchManagement/CreateBranchModal.tsx
+++ b/apps/studio/components/interfaces/BranchManagement/CreateBranchModal.tsx
@@ -22,6 +22,7 @@ import { useCheckGithubBranchValidity } from 'data/integrations/github-branch-ch
 import { useGitHubConnectionsQuery } from 'data/integrations/github-connections-query'
 import { projectKeys } from 'data/projects/keys'
 import { useProjectAddonsQuery } from 'data/subscriptions/project-addons-query'
+import { useSendEventMutation } from 'data/telemetry/send-event-mutation'
 import { useSelectedOrganization } from 'hooks/misc/useSelectedOrganization'
 import { useSelectedProject } from 'hooks/misc/useSelectedProject'
 import { BASE_PATH, IS_PLATFORM } from 'lib/constants'
@@ -83,12 +84,26 @@ export const CreateBranchModal = () => {
       onError: () => {},
     })
 
+  const { mutate: sendEvent } = useSendEventMutation()
+
   const { mutate: createBranch, isLoading: isCreating } = useBranchCreateMutation({
     onSuccess: async (data) => {
       toast.success(`Successfully created preview branch "${data.name}"`)
       if (projectRef) {
         await Promise.all([queryClient.invalidateQueries(projectKeys.detail(projectRef))])
       }
+      sendEvent({
+        action: 'branch_create_button_clicked',
+        properties: {
+          branchType: data.persistent ? 'persistent' : 'preview',
+          gitlessBranching,
+        },
+        groups: {
+          project: ref ?? 'Unknown',
+          organization: selectedOrg?.slug ?? 'Unknown',
+        },
+      })
+
       setShowCreateBranchModal(false)
       router.push(`/project/${data.project_ref}`)
     },
diff --git a/apps/studio/components/interfaces/BranchManagement/OutOfDateNotice.tsx b/apps/studio/components/interfaces/BranchManagement/OutOfDateNotice.tsx
index 73444da1e93ec..c90b7f991662a 100644
--- a/apps/studio/components/interfaces/BranchManagement/OutOfDateNotice.tsx
+++ b/apps/studio/components/interfaces/BranchManagement/OutOfDateNotice.tsx
@@ -13,6 +13,9 @@ import {
 } from 'ui'
 import { GitBranchIcon } from 'lucide-react'
 import { Admonition } from 'ui-patterns'
+import { useSendEventMutation } from 'data/telemetry/send-event-mutation'
+import { useSelectedOrganization } from 'hooks/misc/useSelectedOrganization'
+import { useSelectedProject } from 'hooks/misc/useSelectedProject'
 
 interface OutOfDateNoticeProps {
   isBranchOutOfDateMigrations: boolean
@@ -41,6 +44,12 @@ export const OutOfDateNotice = ({
 }: OutOfDateNoticeProps) => {
   const [isDialogOpen, setIsDialogOpen] = useState(false)
   const hasOutdatedMigrations = isBranchOutOfDateMigrations && missingMigrationsCount > 0
+  const selectedOrg = useSelectedOrganization()
+  const project = useSelectedProject()
+  const { mutate: sendEvent } = useSendEventMutation()
+
+  const isBranch = project?.parent_project_ref !== undefined
+  const parentProjectRef = isBranch ? project?.parent_project_ref : project?.ref
 
   const getTitle = () => {
     if (hasOutdatedMigrations && (hasMissingFunctions || hasOutOfDateFunctions)) {
@@ -57,12 +66,24 @@ export const OutOfDateNotice = ({
     return 'Update this branch to get the latest changes from the production branch.'
   }
 
-  const handleUpdateClick = () => {
-    onPush()
-  }
+  const handleUpdate = (shouldCloseDialog = false) => {
+    if (shouldCloseDialog) {
+      setIsDialogOpen(false)
+    }
+
+    // Track branch update
+    sendEvent({
+      action: 'branch_updated',
+      properties: {
+        modifiedEdgeFunctions: hasEdgeFunctionModifications,
+        source: 'out_of_date_notice',
+      },
+      groups: {
+        project: parentProjectRef ?? 'Unknown',
+        organization: selectedOrg?.slug ?? 'Unknown',
+      },
+    })
 
-  const handleConfirmUpdate = () => {
-    setIsDialogOpen(false)
     onPush()
   }
 
@@ -98,7 +119,9 @@ export const OutOfDateNotice = ({
               </AlertDialogHeader>
               <AlertDialogFooter>
                 <AlertDialogCancel>Cancel</AlertDialogCancel>
-                <AlertDialogAction onClick={handleConfirmUpdate}>Update anyway</AlertDialogAction>
+                <AlertDialogAction onClick={() => handleUpdate(true)}>
+                  Update anyway
+                </AlertDialogAction>
               </AlertDialogFooter>
             </AlertDialogContent>
           </AlertDialog>
@@ -106,7 +129,7 @@ export const OutOfDateNotice = ({
           <Button
             type="default"
             loading={isPushing}
-            onClick={handleUpdateClick}
+            onClick={() => handleUpdate()}
             icon={<GitBranchIcon size={16} strokeWidth={1.5} />}
             className="shrink-0"
           >
diff --git a/apps/studio/components/interfaces/BranchManagement/ReviewWithAI.tsx b/apps/studio/components/interfaces/BranchManagement/ReviewWithAI.tsx
index 03d76c85a6736..59d87fbf04aca 100644
--- a/apps/studio/components/interfaces/BranchManagement/ReviewWithAI.tsx
+++ b/apps/studio/components/interfaces/BranchManagement/ReviewWithAI.tsx
@@ -5,6 +5,8 @@ import { useAiAssistantStateSnapshot } from 'state/ai-assistant-state'
 import { Branch } from 'data/branches/branches-query'
 import { tablesToSQL } from 'lib/helpers'
 import { ButtonTooltip } from 'components/ui/ButtonTooltip'
+import { useSendEventMutation } from 'data/telemetry/send-event-mutation'
+import { useSelectedOrganization } from 'hooks/misc/useSelectedOrganization'
 
 interface ReviewWithAIProps {
   currentBranch?: Branch
@@ -22,6 +24,8 @@ export const ReviewWithAI = ({
   disabled = false,
 }: ReviewWithAIProps) => {
   const aiSnap = useAiAssistantStateSnapshot()
+  const selectedOrg = useSelectedOrganization()
+  const { mutate: sendEvent } = useSendEventMutation()
 
   // Get parent project for production schema
   const parentProject = useProjectByRef(parentProjectRef)
@@ -40,6 +44,15 @@ export const ReviewWithAI = ({
   const handleReviewWithAssistant = () => {
     if (!currentBranch || !mainBranch) return
 
+    // Track review with assistant button pressed
+    sendEvent({
+      action: 'branch_review_with_assistant_clicked',
+      groups: {
+        project: parentProjectRef ?? 'Unknown',
+        organization: selectedOrg?.slug ?? 'Unknown',
+      },
+    })
+
     // Prepare diff content for the assistant
     const sqlSnippets = []
 
diff --git a/apps/studio/components/layouts/ProjectLayout/LayoutHeader/MergeRequestButton.tsx b/apps/studio/components/layouts/ProjectLayout/LayoutHeader/MergeRequestButton.tsx
index ec88c81611570..977dd1bf517c1 100644
--- a/apps/studio/components/layouts/ProjectLayout/LayoutHeader/MergeRequestButton.tsx
+++ b/apps/studio/components/layouts/ProjectLayout/LayoutHeader/MergeRequestButton.tsx
@@ -3,19 +3,24 @@ import { GitMerge } from 'lucide-react'
 import { useBranchesQuery } from 'data/branches/branches-query'
 import { useParams } from 'common'
 import { useSelectedProject } from 'hooks/misc/useSelectedProject'
+import { useSelectedOrganization } from 'hooks/misc/useSelectedOrganization'
 import { useRouter } from 'next/router'
 import { useBranchUpdateMutation } from 'data/branches/branch-update-mutation'
+import { useSendEventMutation } from 'data/telemetry/send-event-mutation'
 import { toast } from 'sonner'
 
 export const MergeRequestButton = () => {
   const { ref } = useParams()
   const router = useRouter()
   const projectDetails = useSelectedProject()
+  const selectedOrg = useSelectedOrganization()
 
   const projectRef = projectDetails?.parent_project_ref || ref
 
   const { data: branches } = useBranchesQuery({ projectRef }, { enabled: Boolean(projectDetails) })
 
+  const { mutate: sendEvent } = useSendEventMutation()
+
   const { mutate: updateBranch, isLoading: isUpdating } = useBranchUpdateMutation({
     onError: () => {
       toast.error(`Failed to open merge request`)
@@ -44,6 +49,17 @@ export const MergeRequestButton = () => {
           onSuccess: () => {
             toast.success('Merge request created')
             router.push(`/project/${selectedBranch.project_ref}/merge`)
+            sendEvent({
+              action: 'branch_create_merge_request_button_clicked',
+              properties: {
+                branchType: selectedBranch.persistent ? 'persistent' : 'preview',
+                origin: 'header',
+              },
+              groups: {
+                project: projectRef ?? 'Unknown',
+                organization: selectedOrg?.slug ?? 'Unknown',
+              },
+            })
           },
         }
       )
diff --git a/apps/studio/pages/project/[ref]/branches/index.tsx b/apps/studio/pages/project/[ref]/branches/index.tsx
index 975d6b9e3a12f..3902c17937eb1 100644
--- a/apps/studio/pages/project/[ref]/branches/index.tsx
+++ b/apps/studio/pages/project/[ref]/branches/index.tsx
@@ -18,6 +18,7 @@ import NoPermission from 'components/ui/NoPermission'
 import { useBranchDeleteMutation } from 'data/branches/branch-delete-mutation'
 import { Branch, useBranchesQuery } from 'data/branches/branches-query'
 import { useGitHubConnectionsQuery } from 'data/integrations/github-connections-query'
+import { useSendEventMutation } from 'data/telemetry/send-event-mutation'
 import { useCheckPermissions } from 'hooks/misc/useCheckPermissions'
 import { useSelectedOrganization } from 'hooks/misc/useSelectedOrganization'
 import { useSelectedProject } from 'hooks/misc/useSelectedProject'
@@ -35,6 +36,8 @@ const BranchesPage: NextPageWithLayout = () => {
 
   const [selectedBranchToDelete, setSelectedBranchToDelete] = useState<Branch>()
 
+  const { mutate: sendEvent } = useSendEventMutation()
+
   const isBranch = project?.parent_project_ref !== undefined
   const projectRef =
     project !== undefined ? (isBranch ? project.parent_project_ref : ref) : undefined
@@ -95,6 +98,18 @@ const BranchesPage: NextPageWithLayout = () => {
           if (selectedBranchToDelete.project_ref === ref) {
             router.push(`/project/${selectedBranchToDelete.parent_project_ref}/branches`)
           }
+          // Track delete button click
+          sendEvent({
+            action: 'branch_delete_button_clicked',
+            properties: {
+              branchType: selectedBranchToDelete.persistent ? 'persistent' : 'preview',
+              origin: 'branches_page',
+            },
+            groups: {
+              project: projectRef ?? 'Unknown',
+              organization: selectedOrg?.slug ?? 'Unknown',
+            },
+          })
         },
       }
     )
diff --git a/apps/studio/pages/project/[ref]/branches/merge-requests.tsx b/apps/studio/pages/project/[ref]/branches/merge-requests.tsx
index 1ee8c0bc86c52..056a3e1c0b3fd 100644
--- a/apps/studio/pages/project/[ref]/branches/merge-requests.tsx
+++ b/apps/studio/pages/project/[ref]/branches/merge-requests.tsx
@@ -23,6 +23,7 @@ import NoPermission from 'components/ui/NoPermission'
 import { useBranchUpdateMutation } from 'data/branches/branch-update-mutation'
 import { Branch, useBranchesQuery } from 'data/branches/branches-query'
 import { useGitHubConnectionsQuery } from 'data/integrations/github-connections-query'
+import { useSendEventMutation } from 'data/telemetry/send-event-mutation'
 import { useCheckPermissions } from 'hooks/misc/useCheckPermissions'
 import { useSelectedOrganization } from 'hooks/misc/useSelectedOrganization'
 import { useSelectedProject } from 'hooks/misc/useSelectedProject'
@@ -83,6 +84,8 @@ const MergeRequestsPage: NextPageWithLayout = () => {
 
   const isError = isErrorConnections || isErrorBranches
 
+  const { mutate: sendEvent } = useSendEventMutation()
+
   const { mutate: updateBranch, isLoading: isUpdating } = useBranchUpdateMutation({
     onError: () => {
       toast.error(`Failed to update the branch`)
@@ -100,6 +103,20 @@ const MergeRequestsPage: NextPageWithLayout = () => {
         {
           onSuccess: () => {
             toast.success('Merge request created')
+
+            // Track merge request creation
+            sendEvent({
+              action: 'branch_create_merge_request_button_clicked',
+              properties: {
+                branchType: branch.persistent ? 'persistent' : 'preview',
+                origin: 'merge_page',
+              },
+              groups: {
+                project: projectRef ?? 'Unknown',
+                organization: selectedOrg?.slug ?? 'Unknown',
+              },
+            })
+
             router.push(`/project/${branch.project_ref}/merge`)
           },
         }
@@ -118,6 +135,15 @@ const MergeRequestsPage: NextPageWithLayout = () => {
         {
           onSuccess: () => {
             toast.success('Merge request closed')
+
+            // Track merge request closed
+            sendEvent({
+              action: 'branch_close_merge_request_button_clicked',
+              groups: {
+                project: projectRef ?? 'Unknown',
+                organization: selectedOrg?.slug ?? 'Unknown',
+              },
+            })
           },
         }
       )
@@ -282,6 +308,7 @@ const MergeRequestsPageWrapper = ({ children }: PropsWithChildren<{}>) => {
   const router = useRouter()
   const { ref } = useParams()
   const project = useSelectedProject()
+  const selectedOrg = useSelectedOrganization()
   const gitlessBranching = useIsBranching2Enabled()
 
   const isBranch = project?.parent_project_ref !== undefined
@@ -291,6 +318,8 @@ const MergeRequestsPageWrapper = ({ children }: PropsWithChildren<{}>) => {
   const { data: branches } = useBranchesQuery({ projectRef })
   const previewBranches = (branches || []).filter((b) => !b.is_default)
 
+  const { mutate: sendEvent } = useSendEventMutation()
+
   const { mutate: updateBranch, isLoading: isUpdating } = useBranchUpdateMutation({
     onError: () => {
       toast.error(`Failed to update the branch`)
@@ -308,6 +337,20 @@ const MergeRequestsPageWrapper = ({ children }: PropsWithChildren<{}>) => {
         {
           onSuccess: () => {
             toast.success('Merge request created')
+
+            // Track merge request creation
+            sendEvent({
+              action: 'branch_create_merge_request_button_clicked',
+              properties: {
+                branchType: branch.persistent ? 'persistent' : 'preview',
+                origin: 'branch_selector',
+              },
+              groups: {
+                project: projectRef ?? 'Unknown',
+                organization: selectedOrg?.slug ?? 'Unknown',
+              },
+            })
+
             router.push(`/project/${branch.project_ref}/merge`)
           },
         }
diff --git a/apps/studio/pages/project/[ref]/merge.tsx b/apps/studio/pages/project/[ref]/merge.tsx
index de80a26e713c4..0d175d2bfa3fd 100644
--- a/apps/studio/pages/project/[ref]/merge.tsx
+++ b/apps/studio/pages/project/[ref]/merge.tsx
@@ -22,9 +22,11 @@ import { useBranchMergeMutation } from 'data/branches/branch-merge-mutation'
 import { useBranchPushMutation } from 'data/branches/branch-push-mutation'
 import { useBranchUpdateMutation } from 'data/branches/branch-update-mutation'
 import { useBranchesQuery } from 'data/branches/branches-query'
+import { useSendEventMutation } from 'data/telemetry/send-event-mutation'
 import { useBranchMergeDiff } from 'hooks/branches/useBranchMergeDiff'
 import { useWorkflowManagement } from 'hooks/branches/useWorkflowManagement'
 import { useProjectByRef, useSelectedProject } from 'hooks/misc/useSelectedProject'
+import { useSelectedOrganization } from 'hooks/misc/useSelectedOrganization'
 import type { NextPageWithLayout } from 'types'
 import {
   Badge,
@@ -43,6 +45,7 @@ const MergePage: NextPageWithLayout = () => {
   const router = useRouter()
   const { ref } = useParams()
   const project = useSelectedProject()
+  const selectedOrg = useSelectedOrganization()
 
   const [isSubmitting, setIsSubmitting] = useState(false)
   const [workflowFinalStatus, setWorkflowFinalStatus] = useState<string | null>(null)
@@ -192,18 +195,44 @@ const MergePage: NextPageWithLayout = () => {
       if (data?.workflow_run_id) {
         addWorkflowRun(data.workflow_run_id)
       }
+
+      // Track branch update
+      sendEvent({
+        action: 'branch_updated',
+        properties: {
+          source: 'merge_page',
+        },
+        groups: {
+          project: parentProjectRef ?? 'Unknown',
+          organization: selectedOrg?.slug ?? 'Unknown',
+        },
+      })
     },
     onError: (error) => {
       toast.error(`Failed to update branch: ${error.message}`)
     },
   })
 
+  const { mutate: sendEvent } = useSendEventMutation()
+
   const { mutate: mergeBranch, isLoading: isMerging } = useBranchMergeMutation({
     onSuccess: (data) => {
       setIsSubmitting(false)
       if (data.workflowRunId) {
         toast.success('Branch merge initiated!')
         addWorkflowRun(data.workflowRunId)
+
+        // Track successful merge
+        sendEvent({
+          action: 'branch_merge_succeeded',
+          properties: {
+            branchType: currentBranch?.persistent ? 'persistent' : 'preview',
+          },
+          groups: {
+            project: parentProjectRef ?? 'Unknown',
+            organization: selectedOrg?.slug ?? 'Unknown',
+          },
+        })
       } else {
         toast.info('No changes to merge')
       }
@@ -211,6 +240,19 @@ const MergePage: NextPageWithLayout = () => {
     onError: (error) => {
       setIsSubmitting(false)
       toast.error(`Failed to merge branch: ${error.message}`)
+
+      // Track failed merge
+      sendEvent({
+        action: 'branch_merge_failed',
+        properties: {
+          branchType: currentBranch?.persistent ? 'persistent' : 'preview',
+          error: error.message,
+        },
+        groups: {
+          project: parentProjectRef ?? 'Unknown',
+          organization: selectedOrg?.slug ?? 'Unknown',
+        },
+      })
     },
   })
 
@@ -218,6 +260,17 @@ const MergePage: NextPageWithLayout = () => {
     onSuccess: () => {
       toast.success('Branch closed successfully')
       router.push(`/project/${parentProjectRef}/branches`)
+      // Track delete button click
+      sendEvent({
+        action: 'branch_delete_button_clicked',
+        properties: {
+          origin: 'merge_page',
+        },
+        groups: {
+          project: parentProjectRef ?? 'Unknown',
+          organization: selectedOrg?.slug ?? 'Unknown',
+        },
+      })
     },
     onError: (error) => {
       toast.error(`Failed to close branch: ${error.message}`)
@@ -243,6 +296,16 @@ const MergePage: NextPageWithLayout = () => {
   const handleMerge = () => {
     if (!currentBranch?.id || !parentProjectRef || !ref) return
     setIsSubmitting(true)
+
+    // Track merge attempt
+    sendEvent({
+      action: 'branch_merge_submitted',
+      groups: {
+        project: parentProjectRef ?? 'Unknown',
+        organization: selectedOrg?.slug ?? 'Unknown',
+      },
+    })
+
     mergeBranch({
       id: currentBranch.id,
       branchProjectRef: ref,
@@ -381,6 +444,13 @@ const MergePage: NextPageWithLayout = () => {
                   onSuccess: () => {
                     toast.success('Successfully closed merge request')
                     router.push(`/project/${project?.ref}/branches?tab=prs`)
+                    sendEvent({
+                      action: 'branch_close_merge_request_button_clicked',
+                      groups: {
+                        project: parentProjectRef ?? 'Unknown',
+                        organization: selectedOrg?.slug ?? 'Unknown',
+                      },
+                    })
                   },
                 }
               )
diff --git a/packages/common/telemetry-constants.ts b/packages/common/telemetry-constants.ts
index 9417d17b7b483..44c2f1db80637 100644
--- a/packages/common/telemetry-constants.ts
+++ b/packages/common/telemetry-constants.ts
@@ -9,6 +9,11 @@
  * @module telemetry-frontend
  */
 
+type TelemetryGroups = {
+  project: string
+  organization: string
+}
+
 /**
  * Triggered when a user signs up. When signing up with Email and Password, this is only triggered once user confirms their email.
  *
@@ -66,10 +71,7 @@ export interface ConnectionStringCopiedEvent {
      */
     connectionMethod: 'direct' | 'transaction_pooler' | 'session_pooler'
   }
-  groups: {
-    project: string
-    organization: string
-  }
+  groups: TelemetryGroups
 }
 
 /**
@@ -91,10 +93,7 @@ export interface CronJobCreatedEvent {
      */
     schedule: string
   }
-  groups: {
-    project: string
-    organization: string
-  }
+  groups: TelemetryGroups
 }
 
 /**
@@ -116,10 +115,7 @@ export interface CronJobUpdatedEvent {
      */
     schedule: string
   }
-  groups: {
-    project: string
-    organization: string
-  }
+  groups: TelemetryGroups
 }
 
 /**
@@ -131,10 +127,7 @@ export interface CronJobUpdatedEvent {
  */
 export interface CronJobDeletedEvent {
   action: 'cron_job_deleted'
-  groups: {
-    project: string
-    organization: string
-  }
+  groups: TelemetryGroups
 }
 
 /**
@@ -146,10 +139,7 @@ export interface CronJobDeletedEvent {
  */
 export interface CronJobCreateClickedEvent {
   action: 'cron_job_create_clicked'
-  groups: {
-    project: string
-    organization: string
-  }
+  groups: TelemetryGroups
 }
 
 /**
@@ -161,10 +151,7 @@ export interface CronJobCreateClickedEvent {
  */
 export interface CronJobUpdateClickedEvent {
   action: 'cron_job_update_clicked'
-  groups: {
-    project: string
-    organization: string
-  }
+  groups: TelemetryGroups
 }
 
 /**
@@ -176,10 +163,7 @@ export interface CronJobUpdateClickedEvent {
  */
 export interface CronJobDeleteClickedEvent {
   action: 'cron_job_delete_clicked'
-  groups: {
-    project: string
-    organization: string
-  }
+  groups: TelemetryGroups
 }
 
 /**
@@ -191,10 +175,7 @@ export interface CronJobDeleteClickedEvent {
  */
 export interface CronJobHistoryClickedEvent {
   action: 'cron_job_history_clicked'
-  groups: {
-    project: string
-    organization: string
-  }
+  groups: TelemetryGroups
 }
 
 /**
@@ -213,10 +194,7 @@ export interface FeaturePreviewEnabledEvent {
      */
     feature: string
   }
-  groups: {
-    project: string
-    organization: string
-  }
+  groups: TelemetryGroups
 }
 
 /**
@@ -235,10 +213,7 @@ export interface FeaturePreviewDisabledEvent {
      */
     feature: string
   }
-  groups: {
-    project: string
-    organization: string
-  }
+  groups: TelemetryGroups
 }
 
 /**
@@ -256,10 +231,7 @@ export interface ProjectCreationSimpleVersionSubmittedEvent {
   properties: {
     instanceSize: string
   }
-  groups: {
-    project: string
-    organization: string
-  }
+  groups: TelemetryGroups
 }
 
 /**
@@ -277,9 +249,7 @@ export interface ProjectCreationSimpleVersionConfirmModalOpenedEvent {
   properties: {
     instanceSize: string
   }
-  groups: {
-    organization: string
-  }
+  groups: Omit<TelemetryGroups, 'project'>
 }
 
 /**
@@ -357,10 +327,7 @@ export interface ProjectCreationSecondStepSubmittedEvent {
  */
 export interface RealtimeInspectorListenChannelClickedEvent {
   action: 'realtime_inspector_listen_channel_clicked'
-  groups: {
-    project: string
-    organization: string
-  }
+  groups: TelemetryGroups
 }
 
 /**
@@ -372,10 +339,7 @@ export interface RealtimeInspectorListenChannelClickedEvent {
  */
 export interface RealtimeInspectorBroadcastSentEvent {
   action: 'realtime_inspector_broadcast_sent'
-  groups: {
-    project: string
-    organization: string
-  }
+  groups: TelemetryGroups
 }
 
 /**
@@ -387,10 +351,7 @@ export interface RealtimeInspectorBroadcastSentEvent {
  */
 export interface RealtimeInspectorMessageClickedEvent {
   action: 'realtime_inspector_message_clicked'
-  groups: {
-    project: string
-    organization: string
-  }
+  groups: TelemetryGroups
 }
 
 /**
@@ -402,10 +363,7 @@ export interface RealtimeInspectorMessageClickedEvent {
  */
 export interface RealtimeInspectorCopyMessageClickedEvent {
   action: 'realtime_inspector_copy_message_clicked'
-  groups: {
-    project: string
-    organization: string
-  }
+  groups: TelemetryGroups
 }
 
 /**
@@ -417,10 +375,7 @@ export interface RealtimeInspectorCopyMessageClickedEvent {
  */
 export interface RealtimeInspectorFiltersAppliedEvent {
   action: 'realtime_inspector_filters_applied'
-  groups: {
-    project: string
-    organization: string
-  }
+  groups: TelemetryGroups
 }
 
 /**
@@ -432,10 +387,7 @@ export interface RealtimeInspectorFiltersAppliedEvent {
  */
 export interface RealtimeInspectorDatabaseRoleUpdatedEvent {
   action: 'realtime_inspector_database_role_updated'
-  groups: {
-    project: string
-    organization: string
-  }
+  groups: TelemetryGroups
 }
 
 /**
@@ -457,10 +409,7 @@ export interface RealtimeToggleTableClickedEvent {
      */
     origin: 'tableSidePanel' | 'tableGridHeader'
   }
-  groups: {
-    project: string
-    organization: string
-  }
+  groups: TelemetryGroups
 }
 
 /**
@@ -478,10 +427,7 @@ export interface SqlEditorQuickstartClickedEvent {
      */
     quickstartName: string
   }
-  groups: {
-    project: string
-    organization: string
-  }
+  groups: TelemetryGroups
 }
 
 /**
@@ -499,10 +445,7 @@ export interface SqlEditorTemplateClickedEvent {
      */
     templateName: string
   }
-  groups: {
-    project: string
-    organization: string
-  }
+  groups: TelemetryGroups
 }
 
 /**
@@ -514,10 +457,7 @@ export interface SqlEditorTemplateClickedEvent {
  */
 export interface SqlEditorResultDownloadCsvClickedEvent {
   action: 'sql_editor_result_download_csv_clicked'
-  groups: {
-    project: string
-    organization: string
-  }
+  groups: TelemetryGroups
 }
 
 /**
@@ -529,10 +469,7 @@ export interface SqlEditorResultDownloadCsvClickedEvent {
  */
 export interface SqlEditorResultCopyMarkdownClickedEvent {
   action: 'sql_editor_result_copy_markdown_clicked'
-  groups: {
-    project: string
-    organization: string
-  }
+  groups: TelemetryGroups
 }
 
 /**
@@ -544,10 +481,7 @@ export interface SqlEditorResultCopyMarkdownClickedEvent {
  */
 export interface SqlEditorResultCopyJsonClickedEvent {
   action: 'sql_editor_result_copy_json_clicked'
-  groups: {
-    project: string
-    organization: string
-  }
+  groups: TelemetryGroups
 }
 
 /**
@@ -558,10 +492,7 @@ export interface SqlEditorResultCopyJsonClickedEvent {
  */
 export interface AssistantPromptSubmittedEvent {
   action: 'assistant_prompt_submitted'
-  groups: {
-    project: string
-    organization: string
-  }
+  groups: TelemetryGroups
 }
 
 /**
@@ -572,10 +503,7 @@ export interface AssistantPromptSubmittedEvent {
  */
 export interface AssistantDebugSubmittedEvent {
   action: 'assistant_debug_submitted'
-  groups: {
-    project: string
-    organization: string
-  }
+  groups: TelemetryGroups
 }
 
 /**
@@ -593,10 +521,7 @@ export interface AssistantSuggestionRunQueryClickedEvent {
     queryType: string
     category?: string
   }
-  groups: {
-    project: string
-    organization: string
-  }
+  groups: TelemetryGroups
 }
 
 /**
@@ -617,10 +542,7 @@ export interface AssistantSqlDiffHandlerEvaluatedEvent {
      */
     handlerAccepted: boolean
   }
-  groups: {
-    project: string
-    organization: string
-  }
+  groups: TelemetryGroups
 }
 
 /**
@@ -638,10 +560,7 @@ export interface AssistantEditInSqlEditorClickedEvent {
     isInSQLEditor: boolean
     isInNewSnippet: boolean
   }
-  groups: {
-    project: string
-    organization: string
-  }
+  groups: TelemetryGroups
 }
 
 /**
@@ -653,10 +572,7 @@ export interface AssistantEditInSqlEditorClickedEvent {
  */
 export interface CustomReportAddSQLBlockClicked {
   action: 'custom_report_add_sql_block_clicked'
-  groups: {
-    project: string
-    organization: string
-  }
+  groups: TelemetryGroups
 }
 
 /**
@@ -668,10 +584,7 @@ export interface CustomReportAddSQLBlockClicked {
  */
 export interface CustomReportAssistantSQLBlockAddedEvent {
   action: 'custom_report_assistant_sql_block_added'
-  groups: {
-    project: string
-    organization: string
-  }
+  groups: TelemetryGroups
 }
 
 /**
@@ -941,10 +854,7 @@ export interface SignInButtonClickedEvent {
  */
 export interface HelpButtonClickedEvent {
   action: 'help_button_clicked'
-  groups: {
-    project?: string
-    organization?: string
-  }
+  groups: Partial<TelemetryGroups>
 }
 
 /**
@@ -955,10 +865,7 @@ export interface HelpButtonClickedEvent {
  */
 export interface SendFeedbackButtonClickedEvent {
   action: 'send_feedback_button_clicked'
-  groups: {
-    project?: string
-    organization?: string
-  }
+  groups: Partial<TelemetryGroups>
 }
 
 /**
@@ -976,10 +883,7 @@ export interface ExampleProjectCardClickedEvent {
      */
     cardTitle: string
   }
-  groups: {
-    project: string
-    organization: string
-  }
+  groups: TelemetryGroups
 }
 
 /**
@@ -999,10 +903,7 @@ export interface ImportDataButtonClickedEvent {
      */
     tableType: 'New Table' | 'Existing Table'
   }
-  groups: {
-    project: string
-    organization: string
-  }
+  groups: TelemetryGroups
 }
 
 /**
@@ -1014,10 +915,7 @@ export interface ImportDataButtonClickedEvent {
  */
 export interface ImportDataAddedEvent {
   action: 'import_data_added'
-  groups: {
-    project: string
-    organization: string
-  }
+  groups: TelemetryGroups
 }
 
 /**
@@ -1029,10 +927,7 @@ export interface ImportDataAddedEvent {
  */
 export interface SqlEditorQueryRunButtonClickedEvent {
   action: 'sql_editor_query_run_button_clicked'
-  groups: {
-    project: string
-    organization: string
-  }
+  groups: TelemetryGroups
 }
 
 /**
@@ -1054,7 +949,7 @@ export interface StudioPricingPlanCtaClickedEvent {
      */
     currentPlan?: string
   }
-  groups: { organization: string }
+  groups: Omit<TelemetryGroups, 'project'>
 }
 
 /**
@@ -1073,7 +968,7 @@ export interface StudioPricingSidePanelOpenedEvent {
      */
     origin?: string
   }
-  groups: { organization: string }
+  groups: Omit<TelemetryGroups, 'project'>
 }
 
 /**
@@ -1085,10 +980,7 @@ export interface StudioPricingSidePanelOpenedEvent {
  */
 export interface ReportsDatabaseGrafanaBannerClickedEvent {
   action: 'reports_database_grafana_banner_clicked'
-  groups: {
-    project: string
-    organization: string
-  }
+  groups: TelemetryGroups
 }
 
 /**
@@ -1108,10 +1000,7 @@ export interface EdgeFunctionDeployButtonClickedEvent {
      */
     origin: 'functions_editor' | 'functions_ai_assistant'
   }
-  groups: {
-    project: string
-    organization: string
-  }
+  groups: TelemetryGroups
 }
 
 /**
@@ -1123,10 +1012,7 @@ export interface EdgeFunctionDeployButtonClickedEvent {
  */
 export interface EdgeFunctionDeployUpdatesConfirmClickedEvent {
   action: 'edge_function_deploy_updates_confirm_clicked'
-  groups: {
-    project: string
-    organization: string
-  }
+  groups: TelemetryGroups
 }
 
 /**
@@ -1147,10 +1033,7 @@ export interface EdgeFunctionAiAssistantButtonClickedEvent {
      */
     origin: 'no_functions_block' | 'secondary_action' | 'functions_editor_chat'
   }
-  groups: {
-    project: string
-    organization: string
-  }
+  groups: TelemetryGroups
 }
 
 /**
@@ -1170,10 +1053,7 @@ export interface EdgeFunctionViaEditorButtonClickedEvent {
      */
     origin: 'no_functions_block' | 'secondary_action'
   }
-  groups: {
-    project: string
-    organization: string
-  }
+  groups: TelemetryGroups
 }
 
 /**
@@ -1194,10 +1074,7 @@ export interface EdgeFunctionTemplateClickedEvent {
      */
     origin: 'functions_page' | 'editor_page'
   }
-  groups: {
-    project: string
-    organization: string
-  }
+  groups: TelemetryGroups
 }
 
 /**
@@ -1217,10 +1094,7 @@ export interface EdgeFunctionViaCliButtonClickedEvent {
      */
     origin: 'no_functions_block' | 'secondary_action'
   }
-  groups: {
-    project: string
-    organization: string
-  }
+  groups: TelemetryGroups
 }
 
 /**
@@ -1232,10 +1106,7 @@ export interface EdgeFunctionViaCliButtonClickedEvent {
  */
 export interface EdgeFunctionDeployUpdatesButtonClickedEvent {
   action: 'edge_function_deploy_updates_button_clicked'
-  groups: {
-    project: string
-    organization: string
-  }
+  groups: TelemetryGroups
 }
 
 /**
@@ -1253,10 +1124,7 @@ export interface EdgeFunctionTestSendButtonClickedEvent {
      */
     httpMethod: string
   }
-  groups: {
-    project: string
-    organization: string
-  }
+  groups: TelemetryGroups
 }
 
 /**
@@ -1268,10 +1136,7 @@ export interface EdgeFunctionTestSendButtonClickedEvent {
  */
 export interface EdgeFunctionTestSidePanelOpenedEvent {
   action: 'edge_function_test_side_panel_opened'
-  groups: {
-    project: string
-    organization: string
-  }
+  groups: TelemetryGroups
 }
 
 /**
@@ -1286,10 +1151,7 @@ export interface SupportTicketSubmittedEvent {
   properties: {
     ticketCategory: string
   }
-  groups: {
-    project?: string
-    organization?: string
-  }
+  groups: Partial<TelemetryGroups>
 }
 
 /**
@@ -1302,10 +1164,7 @@ export interface SupportTicketSubmittedEvent {
  */
 export interface AiAssistantInSupportFormClickedEvent {
   action: 'ai_assistant_in_support_form_clicked'
-  groups: {
-    project?: string
-    organization?: string
-  }
+  groups: Partial<TelemetryGroups>
 }
 
 /**
@@ -1337,9 +1196,7 @@ export interface OrganizationMfaEnforcementUpdated {
   properties: {
     mfaEnforced: boolean
   }
-  groups: {
-    organization: string
-  }
+  groups: Omit<TelemetryGroups, 'project'>
 }
 
 /**
@@ -1357,10 +1214,7 @@ export interface ForeignDataWrapperCreatedEvent {
      */
     wrapperType: string
   }
-  groups: {
-    project: string
-    organization: string
-  }
+  groups: TelemetryGroups
 }
 
 /**
@@ -1378,10 +1232,166 @@ export interface StorageBucketCreatedEvent {
      */
     bucketType?: string
   }
-  groups: {
-    project: string
-    organization: string
+  groups: TelemetryGroups
+}
+
+/**
+ * Triggered when a new branch is created.
+ *
+ * @group Events
+ * @source studio
+ * @page /dashboard/project/{ref}/branches
+ */
+export interface BranchCreateButtonClickedEvent {
+  action: 'branch_create_button_clicked'
+  properties: {
+    /**
+     * The type of branch created, e.g. preview, persistent
+     */
+    branchType: 'preview' | 'persistent'
+    /**
+     * Whether the branch was created with a git branch association
+     */
+    gitlessBranching: boolean
   }
+  groups: TelemetryGroups
+}
+
+/**
+ * Triggered when a branch delete button is clicked.
+ *
+ * @group Events
+ * @source studio
+ * @page /dashboard/project/{ref}/branches
+ */
+export interface BranchDeleteButtonClickedEvent {
+  action: 'branch_delete_button_clicked'
+  properties: {
+    /**
+     * The type of branch being deleted, e.g. preview, persistent
+     */
+    branchType?: 'preview' | 'persistent'
+    /**
+     * Where the delete action was initiated from
+     */
+    origin: 'branches_page' | 'merge_page'
+  }
+  groups: TelemetryGroups
+}
+
+/**
+ * Triggered when a create merge request is clicked for a branch.
+ *
+ * @group Events
+ * @source studio
+ * @page /dashboard/project/{ref}/branches
+ */
+export interface BranchCreateMergeRequestButtonClickedEvent {
+  action: 'branch_create_merge_request_button_clicked'
+  properties: {
+    /**
+     * The type of branch being merged, e.g. preview, persistent
+     */
+    branchType: 'preview' | 'persistent'
+    origin: 'header' | 'merge_page' | 'branch_selector'
+  }
+  groups: TelemetryGroups
+}
+
+/**
+ * Triggered when a merge request is closed.
+ *
+ * @group Events
+ * @source studio
+ * @page /dashboard/project/{ref}/branches/merge-requests
+ */
+export interface BranchCloseMergeRequestButtonClickedEvent {
+  action: 'branch_close_merge_request_button_clicked'
+  groups: TelemetryGroups
+}
+
+/**
+ * Triggered when a user clicks the merge button successfully to attempt merging a branch.
+ *
+ * @group Events
+ * @source studio
+ * @page /dashboard/project/{ref}/merge
+ */
+export interface BranchMergeSubmittedEvent {
+  action: 'branch_merge_submitted'
+  groups: TelemetryGroups
+}
+
+/**
+ * Triggered when a branch merge is successful.
+ *
+ * @group Events
+ * @source studio
+ * @page /dashboard/project/{ref}/merge
+ */
+export interface BranchMergeSucceededEvent {
+  action: 'branch_merge_succeeded'
+  properties: {
+    /**
+     * The type of branch being merged, e.g. preview, persistent
+     */
+    branchType: 'preview' | 'persistent'
+  }
+  groups: TelemetryGroups
+}
+
+/**
+ * Triggered when a branch merge fails.
+ *
+ * @group Events
+ * @source studio
+ * @page /dashboard/project/{ref}/merge
+ */
+export interface BranchMergeFailedEvent {
+  action: 'branch_merge_failed'
+  properties: {
+    /**
+     * The type of branch being merged, e.g. preview, persistent
+     */
+    branchType: 'preview' | 'persistent'
+    /**
+     * The error message or reason for failure
+     */
+    error?: string
+  }
+  groups: TelemetryGroups
+}
+
+/**
+ * Triggered when a branch is updated on push with latest changes from production.
+ * Does not include renaming and linking to GitHub branch.
+ *
+ * @group Events
+ * @source studio
+ * @page /dashboard/project/{ref}/merge
+ */
+export interface BranchUpdatedEvent {
+  action: 'branch_updated'
+  properties: {
+    /**
+     * The source of the update action
+     */
+    source: 'merge_page' | 'out_of_date_notice'
+    modifiedEdgeFunctions?: boolean
+  }
+  groups: TelemetryGroups
+}
+
+/**
+ * Triggered when a user clicks the review with assistant button for a merge.
+ *
+ * @group Events
+ * @source studio
+ * @page /dashboard/project/{ref}/merge
+ */
+export interface BranchReviewWithAssistantClickedEvent {
+  action: 'branch_review_with_assistant_clicked'
+  groups: TelemetryGroups
 }
 
 /**
@@ -1465,3 +1475,12 @@ export type TelemetryEvent =
   | OrganizationMfaEnforcementUpdated
   | ForeignDataWrapperCreatedEvent
   | StorageBucketCreatedEvent
+  | BranchCreateButtonClickedEvent
+  | BranchDeleteButtonClickedEvent
+  | BranchCreateMergeRequestButtonClickedEvent
+  | BranchCloseMergeRequestButtonClickedEvent
+  | BranchMergeSubmittedEvent
+  | BranchMergeSucceededEvent
+  | BranchMergeFailedEvent
+  | BranchUpdatedEvent
+  | BranchReviewWithAssistantClickedEvent

From 72659051ddb7dc310820498481f0621170dab6f9 Mon Sep 17 00:00:00 2001
From: Leonardo Santiago <leonardo.ribeiro.santiago@gmail.com>
Date: Tue, 22 Jul 2025 10:25:43 -0300
Subject: [PATCH 4/8] Update humans.txt (#36643)

add myself.

Co-authored-by: felipe stival <14948182+v0idpwn@users.noreply.github.com>
---
 apps/docs/public/humans.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apps/docs/public/humans.txt b/apps/docs/public/humans.txt
index c4c3855972b6b..810fce67a7b6d 100644
--- a/apps/docs/public/humans.txt
+++ b/apps/docs/public/humans.txt
@@ -72,6 +72,7 @@ Lakshan Perera
 Laura C
 Laurence Isla
 Lenny Urbanowski
+Leonardo Santiago
 Long Hoang
 Luca Forstner
 Łukasz Niemier

From 8dd43c0b071d415179f40226a0c0a4195443c771 Mon Sep 17 00:00:00 2001
From: Manan Gupta <guptamanan100@gmail.com>
Date: Tue, 22 Jul 2025 20:05:57 +0530
Subject: [PATCH 5/8] Add me and Deepthi to humans.txt (#37369)

---
 apps/docs/public/humans.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/apps/docs/public/humans.txt b/apps/docs/public/humans.txt
index 810fce67a7b6d..4aa7b3c146983 100644
--- a/apps/docs/public/humans.txt
+++ b/apps/docs/public/humans.txt
@@ -32,6 +32,7 @@ Danny White
 Darren Cunningham
 Dave Wilson
 David A. Ventimiglia
+Deepthi Sigireddi
 Deji I
 Div Arora
 Divit D
@@ -76,6 +77,7 @@ Leonardo Santiago
 Long Hoang
 Luca Forstner
 Łukasz Niemier
+Manan Gupta
 Margarita Sandomirskaia
 Mark Burggraf
 Monica Khoury

From ef4e6f8e4dfbbfdf207e7fed0e4f004566849c6b Mon Sep 17 00:00:00 2001
From: Joshen Lim <joshenlimek@gmail.com>
Date: Tue, 22 Jul 2025 22:43:00 +0800
Subject: [PATCH 6/8] Add guard in storage explorer to not render store if api
 key is undefined (#37379)

* add guard

* Fix Storage Explorer empty view if no perms to read API keys
---
 .../StorageExplorer/FileExplorerColumn.tsx        | 11 ++++++++++-
 .../project/[ref]/storage/buckets/[bucketId].tsx  |  1 +
 apps/studio/state/storage-explorer.tsx            | 15 ++++++---------
 3 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/apps/studio/components/to-be-cleaned/Storage/StorageExplorer/FileExplorerColumn.tsx b/apps/studio/components/to-be-cleaned/Storage/StorageExplorer/FileExplorerColumn.tsx
index 7d76865392393..84167c8d27107 100644
--- a/apps/studio/components/to-be-cleaned/Storage/StorageExplorer/FileExplorerColumn.tsx
+++ b/apps/studio/components/to-be-cleaned/Storage/StorageExplorer/FileExplorerColumn.tsx
@@ -1,11 +1,14 @@
 import { Transition } from '@headlessui/react'
+import { PermissionAction } from '@supabase/shared-types/out/constants'
 import { get, noop, sum } from 'lodash'
 import { Upload } from 'lucide-react'
 import { useEffect, useRef, useState } from 'react'
 import { useContextMenu } from 'react-contexify'
+import { toast } from 'sonner'
 
 import InfiniteList from 'components/ui/InfiniteList'
 import ShimmeringLoader from 'components/ui/ShimmeringLoader'
+import { useCheckPermissions } from 'hooks/misc/useCheckPermissions'
 import { BASE_PATH } from 'lib/constants'
 import { formatBytes } from 'lib/helpers'
 import { useStorageExplorerStateSnapshot } from 'state/storage-explorer'
@@ -82,6 +85,7 @@ const FileExplorerColumn = ({
   const fileExplorerColumnRef = useRef<any>(null)
 
   const snap = useStorageExplorerStateSnapshot()
+  const canUpdateStorage = useCheckPermissions(PermissionAction.STORAGE_WRITE, '*')
 
   useEffect(() => {
     if (fileExplorerColumnRef) {
@@ -126,7 +130,12 @@ const FileExplorerColumn = ({
 
   const onDrop = (event: any) => {
     onDragOver(event)
-    onFilesUpload(event, index)
+
+    if (!canUpdateStorage) {
+      toast('You need additional permissions to upload files to this project')
+    } else {
+      onFilesUpload(event, index)
+    }
   }
 
   const SelectAllCheckbox = () => (
diff --git a/apps/studio/pages/project/[ref]/storage/buckets/[bucketId].tsx b/apps/studio/pages/project/[ref]/storage/buckets/[bucketId].tsx
index 39cf2671d820f..16a7286508654 100644
--- a/apps/studio/pages/project/[ref]/storage/buckets/[bucketId].tsx
+++ b/apps/studio/pages/project/[ref]/storage/buckets/[bucketId].tsx
@@ -16,6 +16,7 @@ const PageLayout: NextPageWithLayout = () => {
   const { projectRef } = useStorageExplorerStateSnapshot()
   const { bucket, error, isSuccess, isError } = useSelectedBucket()
 
+  // [Joshen] Checking against projectRef from storage explorer to check if the store has initialized
   if (!project || !projectRef) return null
 
   return (
diff --git a/apps/studio/state/storage-explorer.tsx b/apps/studio/state/storage-explorer.tsx
index 373423eb11b79..500954c26f348 100644
--- a/apps/studio/state/storage-explorer.tsx
+++ b/apps/studio/state/storage-explorer.tsx
@@ -1758,14 +1758,11 @@ export const StorageExplorerStateContextProvider = ({ children }: PropsWithChild
     const isDifferentProject = snap.projectRef !== project?.ref
     const isDifferentResumableUploadUrl = snap.resumableUploadUrl !== resumableUploadUrl
 
-    if (
-      !isPaused &&
-      hasDataReady &&
-      (isDifferentProject || isDifferentResumableUploadUrl) &&
-      serviceKey
-    ) {
+    const serviceApiKey = serviceKey?.api_key ?? 'unknown'
+
+    if (!isPaused && hasDataReady && (isDifferentProject || isDifferentResumableUploadUrl)) {
       const clientEndpoint = `${IS_PLATFORM ? 'https' : protocol}://${endpoint}`
-      const supabaseClient = createClient(clientEndpoint, serviceKey.api_key, {
+      const supabaseClient = createClient(clientEndpoint, serviceApiKey, {
         auth: {
           persistSession: false,
           autoRefreshToken: false,
@@ -1785,11 +1782,11 @@ export const StorageExplorerStateContextProvider = ({ children }: PropsWithChild
           projectRef: project?.ref ?? '',
           supabaseClient,
           resumableUploadUrl,
-          serviceKey: serviceKey.api_key,
+          serviceKey: serviceApiKey,
         })
       )
     }
-  }, [project?.ref, stateRef, serviceKey, isPaused, protocol, endpoint])
+  }, [project?.ref, stateRef, serviceKey?.api_key, isPaused, protocol, endpoint])
 
   return (
     <StorageExplorerStateContext.Provider value={state}>

From a26f96570ec8e1417f652193949fcdfb7e0041ee Mon Sep 17 00:00:00 2001
From: Joshen Lim <joshenlimek@gmail.com>
Date: Tue, 22 Jul 2025 22:51:28 +0800
Subject: [PATCH 7/8] Fix missing x axis labels in reports (#37378)

* Fix missing x axis labels in reports

* Improve guard
---
 .../components/ui/Charts/ComposedChart.tsx    | 12 ++++++++----
 .../ui/Charts/ComposedChartHandler.tsx        | 19 +++++++++++++------
 2 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/apps/studio/components/ui/Charts/ComposedChart.tsx b/apps/studio/components/ui/Charts/ComposedChart.tsx
index 3dd9ae6aa3b03..78e1e45a09c7b 100644
--- a/apps/studio/components/ui/Charts/ComposedChart.tsx
+++ b/apps/studio/components/ui/Charts/ComposedChart.tsx
@@ -1,12 +1,14 @@
 'use client'
 
 import dayjs from 'dayjs'
+import { formatBytes } from 'lib/helpers'
 import { useTheme } from 'next-themes'
 import { ComponentProps, useEffect, useState } from 'react'
 import {
   Area,
   Bar,
   CartesianGrid,
+  Label,
   Line,
   ComposedChart as RechartComposedChart,
   ReferenceArea,
@@ -14,7 +16,6 @@ import {
   Tooltip,
   XAxis,
   YAxis,
-  Label,
 } from 'recharts'
 import { CategoricalChartState } from 'recharts/types/chart/types'
 import { cn } from 'ui'
@@ -28,11 +29,14 @@ import {
 } from './Charts.constants'
 import { CommonChartProps, Datum } from './Charts.types'
 import { numberFormatter, useChartSize } from './Charts.utils'
-import { calculateTotalChartAggregate, CustomLabel, CustomTooltip } from './ComposedChart.utils'
+import {
+  calculateTotalChartAggregate,
+  CustomLabel,
+  CustomTooltip,
+  MultiAttribute,
+} from './ComposedChart.utils'
 import NoDataPlaceholder from './NoDataPlaceholder'
-import { MultiAttribute } from './ComposedChart.utils'
 import { ChartHighlight } from './useChartHighlight'
-import { formatBytes } from 'lib/helpers'
 
 export interface ComposedChartProps<D = Datum> extends CommonChartProps<D> {
   attributes: MultiAttribute[]
diff --git a/apps/studio/components/ui/Charts/ComposedChartHandler.tsx b/apps/studio/components/ui/Charts/ComposedChartHandler.tsx
index 25ab41228ebb3..400a7a40afc70 100644
--- a/apps/studio/components/ui/Charts/ComposedChartHandler.tsx
+++ b/apps/studio/components/ui/Charts/ComposedChartHandler.tsx
@@ -1,21 +1,22 @@
-import React, { PropsWithChildren, useState, useMemo, useEffect, useRef } from 'react'
-import { useRouter } from 'next/router'
 import { Loader2 } from 'lucide-react'
+import { useRouter } from 'next/router'
+import React, { PropsWithChildren, useEffect, useMemo, useRef, useState } from 'react'
 import { cn, WarningIcon } from 'ui'
 
 import Panel from 'components/ui/Panel'
 import ComposedChart from './ComposedChart'
 
 import { AnalyticsInterval, DataPoint } from 'data/analytics/constants'
-import { InfraMonitoringAttribute } from 'data/analytics/infra-monitoring-query'
 import { useInfraMonitoringQueries } from 'data/analytics/infra-monitoring-queries'
-import { ProjectDailyStatsAttribute } from 'data/analytics/project-daily-stats-query'
+import { InfraMonitoringAttribute } from 'data/analytics/infra-monitoring-query'
 import { useProjectDailyStatsQueries } from 'data/analytics/project-daily-stats-queries'
+import { ProjectDailyStatsAttribute } from 'data/analytics/project-daily-stats-query'
 import { useDatabaseSelectorStateSnapshot } from 'state/database-selector'
 import { useChartHighlight } from './useChartHighlight'
 
-import type { ChartData } from './Charts.types'
+import dayjs from 'dayjs'
 import type { UpdateDateRange } from 'pages/project/[ref]/reports/database'
+import type { ChartData } from './Charts.types'
 import { MultiAttribute } from './ComposedChart.utils'
 
 export interface ComposedChartHandlerProps {
@@ -199,7 +200,12 @@ const ComposedChartHandler = ({
           point[attr] = value
         })
 
-        return point as DataPoint
+        const formattedDataPoint: DataPoint =
+          !('period_start' in point) && 'timestamp' in point
+            ? { ...point, period_start: dayjs.utc(point.timestamp).unix() * 1000 }
+            : point
+
+        return formattedDataPoint
       })
 
     return combined as DataPoint[]
@@ -275,6 +281,7 @@ const ComposedChartHandler = ({
           attributes={attributes}
           data={combinedData as DataPoint[]}
           format={format}
+          // [Joshen] This is where it's messing up
           xAxisKey="period_start"
           yAxisKey={attributes[0].attribute}
           highlightedValue={_highlightedValue}

From 57cd26ac7719ec589a87dbd548469de6b6f6c13a Mon Sep 17 00:00:00 2001
From: Drake Costa <drake@saeris.io>
Date: Tue, 22 Jul 2025 08:48:20 -0700
Subject: [PATCH 8/8] Move non-layout `Storage` components to
 `components/interfaces` (#37381)

* Update studio testing setup files

Improves API mocking type safety and polyfills browser APIs necessary to run tests with framer-motion components

* fix missing listen call for msw, resolve test type error

* fix imports

* Update studio testing setup files

Improves API mocking type safety and polyfills browser APIs necessary to run tests with framer-motion components

* fix missing listen call for msw, resolve test type error

* fix imports

* Move non-layout Storage related components to `components/interfaces`

* Fix paths

---------

Co-authored-by: Joshen Lim <joshenlimek@gmail.com>
---
 .../AnalyticBucketDetails/CopyEnvButton.tsx   |  0
 .../DecryptedReadOnlyInput.tsx                |  0
 .../AnalyticBucketDetails/NamespaceRow.tsx    |  0
 .../SimpleConfigurationDetails.tsx            |  0
 .../AnalyticBucketDetails/constants.ts        |  0
 .../Storage/AnalyticBucketDetails/index.tsx   |  0
 .../useIcebergWrapper.tsx                     |  0
 .../Storage}/BucketRow.tsx                    |  0
 .../interfaces/Storage/CreateBucketModal.tsx  |  6 +-
 .../Storage/DeleteBucketModal.tsx             |  0
 .../interfaces/Storage/EditBucketModal.tsx    |  4 +-
 .../Storage/EmptyBucketModal.tsx              |  0
 .../Storage}/Storage.Commands.tsx             |  0
 .../Storage/Storage.constants.ts              |  0
 .../interfaces/Storage/Storage.types.ts       | 36 ++++++++
 .../Storage/Storage.utils.ts                  |  2 +-
 .../Storage}/StorageBucketsError.tsx          |  0
 .../StorageExplorer/ColumnContextMenu.tsx     |  0
 .../StorageExplorer/ConfirmDeleteModal.tsx    |  0
 .../StorageExplorer/CustomExpiryModal.tsx     |  0
 .../Storage/StorageExplorer/FileExplorer.tsx  |  0
 .../StorageExplorer/FileExplorerColumn.tsx    |  0
 .../StorageExplorer/FileExplorerHeader.tsx    |  0
 .../FileExplorerHeaderSelection.tsx           |  0
 .../StorageExplorer/FileExplorerRow.tsx       |  0
 .../FileExplorerRowEditing.tsx                |  0
 .../StorageExplorer/FolderContextMenu.tsx     |  0
 .../StorageExplorer/ItemContextMenu.tsx       |  0
 .../StorageExplorer/MoveItemsModal.tsx        |  0
 .../Storage/StorageExplorer/PreviewPane.tsx   |  0
 .../StorageExplorer/StorageExplorer.tsx       |  0
 .../StorageExplorer/StorageExplorer.utils.tsx |  0
 .../Storage/StorageExplorer/useCopyUrl.tsx    |  0
 .../StorageExplorer/useFetchFileUrlQuery.tsx  |  0
 .../StorageExplorer/useSelectedBucket.ts      |  0
 .../Storage}/StorageMenu.tsx                  |  4 +-
 .../StoragePolicies.constants.ts              |  0
 .../StoragePolicies/StoragePolicies.tsx       |  0
 .../StoragePoliciesBucketRow.tsx              |  0
 .../StoragePoliciesEditPolicyModal.tsx        |  0
 .../StoragePolicies/StoragePoliciesEditor.tsx |  0
 .../StoragePoliciesPlaceholder.tsx            |  0
 .../StoragePolicies/StoragePoliciesReview.tsx |  0
 .../StorageSettings/CreateCredentialModal.tsx |  0
 .../StorageSettings/RevokeCredentialModal.tsx |  0
 .../Storage/StorageSettings/S3Connection.tsx  |  0
 .../StorageSettings/StorageCredItem.tsx       |  0
 .../StorageSettings.constants.ts              |  0
 .../StorageSettings/StorageSettings.tsx       |  0
 .../StorageSettings/StorageSettings.utils.ts  |  0
 .../Storage/index.ts                          |  0
 .../layouts/StorageLayout/StorageLayout.tsx   |  2 +-
 .../layouts/useLayoutNavCommands.ts           |  2 +-
 .../to-be-cleaned/Storage/Storage.types.ts    | 36 --------
 .../iceberg-wrapper-create-mutation.ts        |  8 +-
 apps/studio/package.json                      |  1 +
 .../pages/project/[ref]/settings/storage.tsx  |  4 +-
 .../[ref]/storage/buckets/[bucketId].tsx      |  8 +-
 .../project/[ref]/storage/buckets/index.tsx   |  2 +-
 .../pages/project/[ref]/storage/policies.tsx  |  2 +-
 apps/studio/state/storage-explorer.tsx        |  8 +-
 .../Storage/StorageSettings.utils.test.ts     |  4 +-
 .../features/logs/LogsPreviewer.test.tsx      |  2 +-
 apps/studio/tests/lib/msw.ts                  | 59 ++++++++++--
 apps/studio/tests/setup/polyfills.js          | 13 ---
 apps/studio/tests/setup/polyfills.ts          | 37 ++++++++
 apps/studio/tests/vitestSetup.ts              | 17 +---
 apps/studio/vitest.config.ts                  | 10 +--
 pnpm-lock.yaml                                | 89 ++++++++++++++-----
 69 files changed, 226 insertions(+), 130 deletions(-)
 rename apps/studio/components/{to-be-cleaned => interfaces}/Storage/AnalyticBucketDetails/CopyEnvButton.tsx (100%)
 rename apps/studio/components/{to-be-cleaned => interfaces}/Storage/AnalyticBucketDetails/DecryptedReadOnlyInput.tsx (100%)
 rename apps/studio/components/{to-be-cleaned => interfaces}/Storage/AnalyticBucketDetails/NamespaceRow.tsx (100%)
 rename apps/studio/components/{to-be-cleaned => interfaces}/Storage/AnalyticBucketDetails/SimpleConfigurationDetails.tsx (100%)
 rename apps/studio/components/{to-be-cleaned => interfaces}/Storage/AnalyticBucketDetails/constants.ts (100%)
 rename apps/studio/components/{to-be-cleaned => interfaces}/Storage/AnalyticBucketDetails/index.tsx (100%)
 rename apps/studio/components/{to-be-cleaned => interfaces}/Storage/AnalyticBucketDetails/useIcebergWrapper.tsx (100%)
 rename apps/studio/components/{layouts/StorageLayout => interfaces/Storage}/BucketRow.tsx (100%)
 rename apps/studio/components/{to-be-cleaned => interfaces}/Storage/DeleteBucketModal.tsx (100%)
 rename apps/studio/components/{to-be-cleaned => interfaces}/Storage/EmptyBucketModal.tsx (100%)
 rename apps/studio/components/{layouts/StorageLayout => interfaces/Storage}/Storage.Commands.tsx (100%)
 rename apps/studio/components/{to-be-cleaned => interfaces}/Storage/Storage.constants.ts (100%)
 rename apps/studio/components/{to-be-cleaned => interfaces}/Storage/Storage.utils.ts (98%)
 rename apps/studio/components/{layouts/StorageLayout => interfaces/Storage}/StorageBucketsError.tsx (100%)
 rename apps/studio/components/{to-be-cleaned => interfaces}/Storage/StorageExplorer/ColumnContextMenu.tsx (100%)
 rename apps/studio/components/{to-be-cleaned => interfaces}/Storage/StorageExplorer/ConfirmDeleteModal.tsx (100%)
 rename apps/studio/components/{to-be-cleaned => interfaces}/Storage/StorageExplorer/CustomExpiryModal.tsx (100%)
 rename apps/studio/components/{to-be-cleaned => interfaces}/Storage/StorageExplorer/FileExplorer.tsx (100%)
 rename apps/studio/components/{to-be-cleaned => interfaces}/Storage/StorageExplorer/FileExplorerColumn.tsx (100%)
 rename apps/studio/components/{to-be-cleaned => interfaces}/Storage/StorageExplorer/FileExplorerHeader.tsx (100%)
 rename apps/studio/components/{to-be-cleaned => interfaces}/Storage/StorageExplorer/FileExplorerHeaderSelection.tsx (100%)
 rename apps/studio/components/{to-be-cleaned => interfaces}/Storage/StorageExplorer/FileExplorerRow.tsx (100%)
 rename apps/studio/components/{to-be-cleaned => interfaces}/Storage/StorageExplorer/FileExplorerRowEditing.tsx (100%)
 rename apps/studio/components/{to-be-cleaned => interfaces}/Storage/StorageExplorer/FolderContextMenu.tsx (100%)
 rename apps/studio/components/{to-be-cleaned => interfaces}/Storage/StorageExplorer/ItemContextMenu.tsx (100%)
 rename apps/studio/components/{to-be-cleaned => interfaces}/Storage/StorageExplorer/MoveItemsModal.tsx (100%)
 rename apps/studio/components/{to-be-cleaned => interfaces}/Storage/StorageExplorer/PreviewPane.tsx (100%)
 rename apps/studio/components/{to-be-cleaned => interfaces}/Storage/StorageExplorer/StorageExplorer.tsx (100%)
 rename apps/studio/components/{to-be-cleaned => interfaces}/Storage/StorageExplorer/StorageExplorer.utils.tsx (100%)
 rename apps/studio/components/{to-be-cleaned => interfaces}/Storage/StorageExplorer/useCopyUrl.tsx (100%)
 rename apps/studio/components/{to-be-cleaned => interfaces}/Storage/StorageExplorer/useFetchFileUrlQuery.tsx (100%)
 rename apps/studio/components/{to-be-cleaned => interfaces}/Storage/StorageExplorer/useSelectedBucket.ts (100%)
 rename apps/studio/components/{layouts/StorageLayout => interfaces/Storage}/StorageMenu.tsx (98%)
 rename apps/studio/components/{to-be-cleaned => interfaces}/Storage/StoragePolicies/StoragePolicies.constants.ts (100%)
 rename apps/studio/components/{to-be-cleaned => interfaces}/Storage/StoragePolicies/StoragePolicies.tsx (100%)
 rename apps/studio/components/{to-be-cleaned => interfaces}/Storage/StoragePolicies/StoragePoliciesBucketRow.tsx (100%)
 rename apps/studio/components/{to-be-cleaned => interfaces}/Storage/StoragePolicies/StoragePoliciesEditPolicyModal.tsx (100%)
 rename apps/studio/components/{to-be-cleaned => interfaces}/Storage/StoragePolicies/StoragePoliciesEditor.tsx (100%)
 rename apps/studio/components/{to-be-cleaned => interfaces}/Storage/StoragePolicies/StoragePoliciesPlaceholder.tsx (100%)
 rename apps/studio/components/{to-be-cleaned => interfaces}/Storage/StoragePolicies/StoragePoliciesReview.tsx (100%)
 rename apps/studio/components/{to-be-cleaned => interfaces}/Storage/StorageSettings/CreateCredentialModal.tsx (100%)
 rename apps/studio/components/{to-be-cleaned => interfaces}/Storage/StorageSettings/RevokeCredentialModal.tsx (100%)
 rename apps/studio/components/{to-be-cleaned => interfaces}/Storage/StorageSettings/S3Connection.tsx (100%)
 rename apps/studio/components/{to-be-cleaned => interfaces}/Storage/StorageSettings/StorageCredItem.tsx (100%)
 rename apps/studio/components/{to-be-cleaned => interfaces}/Storage/StorageSettings/StorageSettings.constants.ts (100%)
 rename apps/studio/components/{to-be-cleaned => interfaces}/Storage/StorageSettings/StorageSettings.tsx (100%)
 rename apps/studio/components/{to-be-cleaned => interfaces}/Storage/StorageSettings/StorageSettings.utils.ts (100%)
 rename apps/studio/components/{to-be-cleaned => interfaces}/Storage/index.ts (100%)
 delete mode 100644 apps/studio/components/to-be-cleaned/Storage/Storage.types.ts
 delete mode 100644 apps/studio/tests/setup/polyfills.js
 create mode 100644 apps/studio/tests/setup/polyfills.ts

diff --git a/apps/studio/components/to-be-cleaned/Storage/AnalyticBucketDetails/CopyEnvButton.tsx b/apps/studio/components/interfaces/Storage/AnalyticBucketDetails/CopyEnvButton.tsx
similarity index 100%
rename from apps/studio/components/to-be-cleaned/Storage/AnalyticBucketDetails/CopyEnvButton.tsx
rename to apps/studio/components/interfaces/Storage/AnalyticBucketDetails/CopyEnvButton.tsx
diff --git a/apps/studio/components/to-be-cleaned/Storage/AnalyticBucketDetails/DecryptedReadOnlyInput.tsx b/apps/studio/components/interfaces/Storage/AnalyticBucketDetails/DecryptedReadOnlyInput.tsx
similarity index 100%
rename from apps/studio/components/to-be-cleaned/Storage/AnalyticBucketDetails/DecryptedReadOnlyInput.tsx
rename to apps/studio/components/interfaces/Storage/AnalyticBucketDetails/DecryptedReadOnlyInput.tsx
diff --git a/apps/studio/components/to-be-cleaned/Storage/AnalyticBucketDetails/NamespaceRow.tsx b/apps/studio/components/interfaces/Storage/AnalyticBucketDetails/NamespaceRow.tsx
similarity index 100%
rename from apps/studio/components/to-be-cleaned/Storage/AnalyticBucketDetails/NamespaceRow.tsx
rename to apps/studio/components/interfaces/Storage/AnalyticBucketDetails/NamespaceRow.tsx
diff --git a/apps/studio/components/to-be-cleaned/Storage/AnalyticBucketDetails/SimpleConfigurationDetails.tsx b/apps/studio/components/interfaces/Storage/AnalyticBucketDetails/SimpleConfigurationDetails.tsx
similarity index 100%
rename from apps/studio/components/to-be-cleaned/Storage/AnalyticBucketDetails/SimpleConfigurationDetails.tsx
rename to apps/studio/components/interfaces/Storage/AnalyticBucketDetails/SimpleConfigurationDetails.tsx
diff --git a/apps/studio/components/to-be-cleaned/Storage/AnalyticBucketDetails/constants.ts b/apps/studio/components/interfaces/Storage/AnalyticBucketDetails/constants.ts
similarity index 100%
rename from apps/studio/components/to-be-cleaned/Storage/AnalyticBucketDetails/constants.ts
rename to apps/studio/components/interfaces/Storage/AnalyticBucketDetails/constants.ts
diff --git a/apps/studio/components/to-be-cleaned/Storage/AnalyticBucketDetails/index.tsx b/apps/studio/components/interfaces/Storage/AnalyticBucketDetails/index.tsx
similarity index 100%
rename from apps/studio/components/to-be-cleaned/Storage/AnalyticBucketDetails/index.tsx
rename to apps/studio/components/interfaces/Storage/AnalyticBucketDetails/index.tsx
diff --git a/apps/studio/components/to-be-cleaned/Storage/AnalyticBucketDetails/useIcebergWrapper.tsx b/apps/studio/components/interfaces/Storage/AnalyticBucketDetails/useIcebergWrapper.tsx
similarity index 100%
rename from apps/studio/components/to-be-cleaned/Storage/AnalyticBucketDetails/useIcebergWrapper.tsx
rename to apps/studio/components/interfaces/Storage/AnalyticBucketDetails/useIcebergWrapper.tsx
diff --git a/apps/studio/components/layouts/StorageLayout/BucketRow.tsx b/apps/studio/components/interfaces/Storage/BucketRow.tsx
similarity index 100%
rename from apps/studio/components/layouts/StorageLayout/BucketRow.tsx
rename to apps/studio/components/interfaces/Storage/BucketRow.tsx
diff --git a/apps/studio/components/interfaces/Storage/CreateBucketModal.tsx b/apps/studio/components/interfaces/Storage/CreateBucketModal.tsx
index b9b58052e7bce..1523c488ee8c7 100644
--- a/apps/studio/components/interfaces/Storage/CreateBucketModal.tsx
+++ b/apps/studio/components/interfaces/Storage/CreateBucketModal.tsx
@@ -9,12 +9,12 @@ import { toast } from 'sonner'
 import z from 'zod'
 
 import { useParams } from 'common'
-import { useIcebergWrapperExtension } from 'components/to-be-cleaned/Storage/AnalyticBucketDetails/useIcebergWrapper'
-import { StorageSizeUnits } from 'components/to-be-cleaned/Storage/StorageSettings/StorageSettings.constants'
+import { useIcebergWrapperExtension } from 'components/interfaces/Storage/AnalyticBucketDetails/useIcebergWrapper'
+import { StorageSizeUnits } from 'components/interfaces/Storage/StorageSettings/StorageSettings.constants'
 import {
   convertFromBytes,
   convertToBytes,
-} from 'components/to-be-cleaned/Storage/StorageSettings/StorageSettings.utils'
+} from 'components/interfaces/Storage/StorageSettings/StorageSettings.utils'
 import { useProjectStorageConfigQuery } from 'data/config/project-storage-config-query'
 import { useBucketCreateMutation } from 'data/storage/bucket-create-mutation'
 import { useIcebergWrapperCreateMutation } from 'data/storage/iceberg-wrapper-create-mutation'
diff --git a/apps/studio/components/to-be-cleaned/Storage/DeleteBucketModal.tsx b/apps/studio/components/interfaces/Storage/DeleteBucketModal.tsx
similarity index 100%
rename from apps/studio/components/to-be-cleaned/Storage/DeleteBucketModal.tsx
rename to apps/studio/components/interfaces/Storage/DeleteBucketModal.tsx
diff --git a/apps/studio/components/interfaces/Storage/EditBucketModal.tsx b/apps/studio/components/interfaces/Storage/EditBucketModal.tsx
index 5abb63cd4d582..5a9ff0ea2a949 100644
--- a/apps/studio/components/interfaces/Storage/EditBucketModal.tsx
+++ b/apps/studio/components/interfaces/Storage/EditBucketModal.tsx
@@ -5,11 +5,11 @@ import { useEffect, useState } from 'react'
 import { toast } from 'sonner'
 import { Button, Collapsible, Form, Input, Listbox, Modal, Toggle, cn } from 'ui'
 
-import { StorageSizeUnits } from 'components/to-be-cleaned/Storage/StorageSettings/StorageSettings.constants'
+import { StorageSizeUnits } from 'components/interfaces/Storage/StorageSettings/StorageSettings.constants'
 import {
   convertFromBytes,
   convertToBytes,
-} from 'components/to-be-cleaned/Storage/StorageSettings/StorageSettings.utils'
+} from 'components/interfaces/Storage/StorageSettings/StorageSettings.utils'
 import { InlineLink } from 'components/ui/InlineLink'
 import { useProjectStorageConfigQuery } from 'data/config/project-storage-config-query'
 import { useBucketUpdateMutation } from 'data/storage/bucket-update-mutation'
diff --git a/apps/studio/components/to-be-cleaned/Storage/EmptyBucketModal.tsx b/apps/studio/components/interfaces/Storage/EmptyBucketModal.tsx
similarity index 100%
rename from apps/studio/components/to-be-cleaned/Storage/EmptyBucketModal.tsx
rename to apps/studio/components/interfaces/Storage/EmptyBucketModal.tsx
diff --git a/apps/studio/components/layouts/StorageLayout/Storage.Commands.tsx b/apps/studio/components/interfaces/Storage/Storage.Commands.tsx
similarity index 100%
rename from apps/studio/components/layouts/StorageLayout/Storage.Commands.tsx
rename to apps/studio/components/interfaces/Storage/Storage.Commands.tsx
diff --git a/apps/studio/components/to-be-cleaned/Storage/Storage.constants.ts b/apps/studio/components/interfaces/Storage/Storage.constants.ts
similarity index 100%
rename from apps/studio/components/to-be-cleaned/Storage/Storage.constants.ts
rename to apps/studio/components/interfaces/Storage/Storage.constants.ts
diff --git a/apps/studio/components/interfaces/Storage/Storage.types.ts b/apps/studio/components/interfaces/Storage/Storage.types.ts
index 8de8a32625ee4..c9943befe0157 100644
--- a/apps/studio/components/interfaces/Storage/Storage.types.ts
+++ b/apps/studio/components/interfaces/Storage/Storage.types.ts
@@ -1,4 +1,5 @@
 import type { PolicyFormField } from 'components/interfaces/Auth/Policies/Policies.types'
+import { STORAGE_ROW_STATUS, STORAGE_ROW_TYPES } from './Storage.constants'
 
 export interface StoragePolicyFormField extends PolicyFormField {
   allowedOperations: string[]
@@ -14,3 +15,38 @@ export interface BucketCreatePayload extends BucketUpdatePayload {
   id: string
   name?: string
 }
+
+export interface StorageColumn {
+  id: string | null
+  name: string
+  status: string
+  items: StorageItem[]
+  hasMoreItems?: boolean
+  isLoadingMoreItems?: boolean
+}
+
+export interface StorageItem {
+  id: string | null
+  name: string
+  type: STORAGE_ROW_TYPES
+  status: STORAGE_ROW_STATUS
+  metadata: StorageItemMetadata | null
+  created_at: string | null
+  updated_at: string | null
+  last_accessed_at: string | null
+  // UI specific properties, not from API
+  isCorrupted: boolean
+  path?: string
+}
+
+export type StorageItemWithColumn = StorageItem & { columnIndex: number }
+
+export interface StorageItemMetadata {
+  cacheControl: string
+  contentLength: number
+  size: number
+  httpStatusCode: number
+  eTag: string
+  lastModified: string
+  mimetype: string
+}
diff --git a/apps/studio/components/to-be-cleaned/Storage/Storage.utils.ts b/apps/studio/components/interfaces/Storage/Storage.utils.ts
similarity index 98%
rename from apps/studio/components/to-be-cleaned/Storage/Storage.utils.ts
rename to apps/studio/components/interfaces/Storage/Storage.utils.ts
index 5a50eab4ec476..36f64ef075fd3 100644
--- a/apps/studio/components/to-be-cleaned/Storage/Storage.utils.ts
+++ b/apps/studio/components/interfaces/Storage/Storage.utils.ts
@@ -1,6 +1,6 @@
 import { groupBy, difference } from 'lodash'
 import { STORAGE_CLIENT_LIBRARY_MAPPINGS } from './Storage.constants'
-import type { StoragePolicyFormField } from 'components/interfaces/Storage/Storage.types'
+import type { StoragePolicyFormField } from './Storage.types'
 
 const shortHash = (str: string) => {
   let hash = 0
diff --git a/apps/studio/components/layouts/StorageLayout/StorageBucketsError.tsx b/apps/studio/components/interfaces/Storage/StorageBucketsError.tsx
similarity index 100%
rename from apps/studio/components/layouts/StorageLayout/StorageBucketsError.tsx
rename to apps/studio/components/interfaces/Storage/StorageBucketsError.tsx
diff --git a/apps/studio/components/to-be-cleaned/Storage/StorageExplorer/ColumnContextMenu.tsx b/apps/studio/components/interfaces/Storage/StorageExplorer/ColumnContextMenu.tsx
similarity index 100%
rename from apps/studio/components/to-be-cleaned/Storage/StorageExplorer/ColumnContextMenu.tsx
rename to apps/studio/components/interfaces/Storage/StorageExplorer/ColumnContextMenu.tsx
diff --git a/apps/studio/components/to-be-cleaned/Storage/StorageExplorer/ConfirmDeleteModal.tsx b/apps/studio/components/interfaces/Storage/StorageExplorer/ConfirmDeleteModal.tsx
similarity index 100%
rename from apps/studio/components/to-be-cleaned/Storage/StorageExplorer/ConfirmDeleteModal.tsx
rename to apps/studio/components/interfaces/Storage/StorageExplorer/ConfirmDeleteModal.tsx
diff --git a/apps/studio/components/to-be-cleaned/Storage/StorageExplorer/CustomExpiryModal.tsx b/apps/studio/components/interfaces/Storage/StorageExplorer/CustomExpiryModal.tsx
similarity index 100%
rename from apps/studio/components/to-be-cleaned/Storage/StorageExplorer/CustomExpiryModal.tsx
rename to apps/studio/components/interfaces/Storage/StorageExplorer/CustomExpiryModal.tsx
diff --git a/apps/studio/components/to-be-cleaned/Storage/StorageExplorer/FileExplorer.tsx b/apps/studio/components/interfaces/Storage/StorageExplorer/FileExplorer.tsx
similarity index 100%
rename from apps/studio/components/to-be-cleaned/Storage/StorageExplorer/FileExplorer.tsx
rename to apps/studio/components/interfaces/Storage/StorageExplorer/FileExplorer.tsx
diff --git a/apps/studio/components/to-be-cleaned/Storage/StorageExplorer/FileExplorerColumn.tsx b/apps/studio/components/interfaces/Storage/StorageExplorer/FileExplorerColumn.tsx
similarity index 100%
rename from apps/studio/components/to-be-cleaned/Storage/StorageExplorer/FileExplorerColumn.tsx
rename to apps/studio/components/interfaces/Storage/StorageExplorer/FileExplorerColumn.tsx
diff --git a/apps/studio/components/to-be-cleaned/Storage/StorageExplorer/FileExplorerHeader.tsx b/apps/studio/components/interfaces/Storage/StorageExplorer/FileExplorerHeader.tsx
similarity index 100%
rename from apps/studio/components/to-be-cleaned/Storage/StorageExplorer/FileExplorerHeader.tsx
rename to apps/studio/components/interfaces/Storage/StorageExplorer/FileExplorerHeader.tsx
diff --git a/apps/studio/components/to-be-cleaned/Storage/StorageExplorer/FileExplorerHeaderSelection.tsx b/apps/studio/components/interfaces/Storage/StorageExplorer/FileExplorerHeaderSelection.tsx
similarity index 100%
rename from apps/studio/components/to-be-cleaned/Storage/StorageExplorer/FileExplorerHeaderSelection.tsx
rename to apps/studio/components/interfaces/Storage/StorageExplorer/FileExplorerHeaderSelection.tsx
diff --git a/apps/studio/components/to-be-cleaned/Storage/StorageExplorer/FileExplorerRow.tsx b/apps/studio/components/interfaces/Storage/StorageExplorer/FileExplorerRow.tsx
similarity index 100%
rename from apps/studio/components/to-be-cleaned/Storage/StorageExplorer/FileExplorerRow.tsx
rename to apps/studio/components/interfaces/Storage/StorageExplorer/FileExplorerRow.tsx
diff --git a/apps/studio/components/to-be-cleaned/Storage/StorageExplorer/FileExplorerRowEditing.tsx b/apps/studio/components/interfaces/Storage/StorageExplorer/FileExplorerRowEditing.tsx
similarity index 100%
rename from apps/studio/components/to-be-cleaned/Storage/StorageExplorer/FileExplorerRowEditing.tsx
rename to apps/studio/components/interfaces/Storage/StorageExplorer/FileExplorerRowEditing.tsx
diff --git a/apps/studio/components/to-be-cleaned/Storage/StorageExplorer/FolderContextMenu.tsx b/apps/studio/components/interfaces/Storage/StorageExplorer/FolderContextMenu.tsx
similarity index 100%
rename from apps/studio/components/to-be-cleaned/Storage/StorageExplorer/FolderContextMenu.tsx
rename to apps/studio/components/interfaces/Storage/StorageExplorer/FolderContextMenu.tsx
diff --git a/apps/studio/components/to-be-cleaned/Storage/StorageExplorer/ItemContextMenu.tsx b/apps/studio/components/interfaces/Storage/StorageExplorer/ItemContextMenu.tsx
similarity index 100%
rename from apps/studio/components/to-be-cleaned/Storage/StorageExplorer/ItemContextMenu.tsx
rename to apps/studio/components/interfaces/Storage/StorageExplorer/ItemContextMenu.tsx
diff --git a/apps/studio/components/to-be-cleaned/Storage/StorageExplorer/MoveItemsModal.tsx b/apps/studio/components/interfaces/Storage/StorageExplorer/MoveItemsModal.tsx
similarity index 100%
rename from apps/studio/components/to-be-cleaned/Storage/StorageExplorer/MoveItemsModal.tsx
rename to apps/studio/components/interfaces/Storage/StorageExplorer/MoveItemsModal.tsx
diff --git a/apps/studio/components/to-be-cleaned/Storage/StorageExplorer/PreviewPane.tsx b/apps/studio/components/interfaces/Storage/StorageExplorer/PreviewPane.tsx
similarity index 100%
rename from apps/studio/components/to-be-cleaned/Storage/StorageExplorer/PreviewPane.tsx
rename to apps/studio/components/interfaces/Storage/StorageExplorer/PreviewPane.tsx
diff --git a/apps/studio/components/to-be-cleaned/Storage/StorageExplorer/StorageExplorer.tsx b/apps/studio/components/interfaces/Storage/StorageExplorer/StorageExplorer.tsx
similarity index 100%
rename from apps/studio/components/to-be-cleaned/Storage/StorageExplorer/StorageExplorer.tsx
rename to apps/studio/components/interfaces/Storage/StorageExplorer/StorageExplorer.tsx
diff --git a/apps/studio/components/to-be-cleaned/Storage/StorageExplorer/StorageExplorer.utils.tsx b/apps/studio/components/interfaces/Storage/StorageExplorer/StorageExplorer.utils.tsx
similarity index 100%
rename from apps/studio/components/to-be-cleaned/Storage/StorageExplorer/StorageExplorer.utils.tsx
rename to apps/studio/components/interfaces/Storage/StorageExplorer/StorageExplorer.utils.tsx
diff --git a/apps/studio/components/to-be-cleaned/Storage/StorageExplorer/useCopyUrl.tsx b/apps/studio/components/interfaces/Storage/StorageExplorer/useCopyUrl.tsx
similarity index 100%
rename from apps/studio/components/to-be-cleaned/Storage/StorageExplorer/useCopyUrl.tsx
rename to apps/studio/components/interfaces/Storage/StorageExplorer/useCopyUrl.tsx
diff --git a/apps/studio/components/to-be-cleaned/Storage/StorageExplorer/useFetchFileUrlQuery.tsx b/apps/studio/components/interfaces/Storage/StorageExplorer/useFetchFileUrlQuery.tsx
similarity index 100%
rename from apps/studio/components/to-be-cleaned/Storage/StorageExplorer/useFetchFileUrlQuery.tsx
rename to apps/studio/components/interfaces/Storage/StorageExplorer/useFetchFileUrlQuery.tsx
diff --git a/apps/studio/components/to-be-cleaned/Storage/StorageExplorer/useSelectedBucket.ts b/apps/studio/components/interfaces/Storage/StorageExplorer/useSelectedBucket.ts
similarity index 100%
rename from apps/studio/components/to-be-cleaned/Storage/StorageExplorer/useSelectedBucket.ts
rename to apps/studio/components/interfaces/Storage/StorageExplorer/useSelectedBucket.ts
diff --git a/apps/studio/components/layouts/StorageLayout/StorageMenu.tsx b/apps/studio/components/interfaces/Storage/StorageMenu.tsx
similarity index 98%
rename from apps/studio/components/layouts/StorageLayout/StorageMenu.tsx
rename to apps/studio/components/interfaces/Storage/StorageMenu.tsx
index 094cbc5013dd5..152fa8ed73545 100644
--- a/apps/studio/components/layouts/StorageLayout/StorageMenu.tsx
+++ b/apps/studio/components/interfaces/Storage/StorageMenu.tsx
@@ -8,8 +8,8 @@ import { useState } from 'react'
 import { useParams } from 'common'
 import CreateBucketModal from 'components/interfaces/Storage/CreateBucketModal'
 import EditBucketModal from 'components/interfaces/Storage/EditBucketModal'
-import { DeleteBucketModal } from 'components/to-be-cleaned/Storage'
-import { EmptyBucketModal } from 'components/to-be-cleaned/Storage/EmptyBucketModal'
+import { DeleteBucketModal } from 'components/interfaces/Storage'
+import { EmptyBucketModal } from 'components/interfaces/Storage/EmptyBucketModal'
 import { ButtonTooltip } from 'components/ui/ButtonTooltip'
 import ShimmeringLoader from 'components/ui/ShimmeringLoader'
 import { Bucket, useBucketsQuery } from 'data/storage/buckets-query'
diff --git a/apps/studio/components/to-be-cleaned/Storage/StoragePolicies/StoragePolicies.constants.ts b/apps/studio/components/interfaces/Storage/StoragePolicies/StoragePolicies.constants.ts
similarity index 100%
rename from apps/studio/components/to-be-cleaned/Storage/StoragePolicies/StoragePolicies.constants.ts
rename to apps/studio/components/interfaces/Storage/StoragePolicies/StoragePolicies.constants.ts
diff --git a/apps/studio/components/to-be-cleaned/Storage/StoragePolicies/StoragePolicies.tsx b/apps/studio/components/interfaces/Storage/StoragePolicies/StoragePolicies.tsx
similarity index 100%
rename from apps/studio/components/to-be-cleaned/Storage/StoragePolicies/StoragePolicies.tsx
rename to apps/studio/components/interfaces/Storage/StoragePolicies/StoragePolicies.tsx
diff --git a/apps/studio/components/to-be-cleaned/Storage/StoragePolicies/StoragePoliciesBucketRow.tsx b/apps/studio/components/interfaces/Storage/StoragePolicies/StoragePoliciesBucketRow.tsx
similarity index 100%
rename from apps/studio/components/to-be-cleaned/Storage/StoragePolicies/StoragePoliciesBucketRow.tsx
rename to apps/studio/components/interfaces/Storage/StoragePolicies/StoragePoliciesBucketRow.tsx
diff --git a/apps/studio/components/to-be-cleaned/Storage/StoragePolicies/StoragePoliciesEditPolicyModal.tsx b/apps/studio/components/interfaces/Storage/StoragePolicies/StoragePoliciesEditPolicyModal.tsx
similarity index 100%
rename from apps/studio/components/to-be-cleaned/Storage/StoragePolicies/StoragePoliciesEditPolicyModal.tsx
rename to apps/studio/components/interfaces/Storage/StoragePolicies/StoragePoliciesEditPolicyModal.tsx
diff --git a/apps/studio/components/to-be-cleaned/Storage/StoragePolicies/StoragePoliciesEditor.tsx b/apps/studio/components/interfaces/Storage/StoragePolicies/StoragePoliciesEditor.tsx
similarity index 100%
rename from apps/studio/components/to-be-cleaned/Storage/StoragePolicies/StoragePoliciesEditor.tsx
rename to apps/studio/components/interfaces/Storage/StoragePolicies/StoragePoliciesEditor.tsx
diff --git a/apps/studio/components/to-be-cleaned/Storage/StoragePolicies/StoragePoliciesPlaceholder.tsx b/apps/studio/components/interfaces/Storage/StoragePolicies/StoragePoliciesPlaceholder.tsx
similarity index 100%
rename from apps/studio/components/to-be-cleaned/Storage/StoragePolicies/StoragePoliciesPlaceholder.tsx
rename to apps/studio/components/interfaces/Storage/StoragePolicies/StoragePoliciesPlaceholder.tsx
diff --git a/apps/studio/components/to-be-cleaned/Storage/StoragePolicies/StoragePoliciesReview.tsx b/apps/studio/components/interfaces/Storage/StoragePolicies/StoragePoliciesReview.tsx
similarity index 100%
rename from apps/studio/components/to-be-cleaned/Storage/StoragePolicies/StoragePoliciesReview.tsx
rename to apps/studio/components/interfaces/Storage/StoragePolicies/StoragePoliciesReview.tsx
diff --git a/apps/studio/components/to-be-cleaned/Storage/StorageSettings/CreateCredentialModal.tsx b/apps/studio/components/interfaces/Storage/StorageSettings/CreateCredentialModal.tsx
similarity index 100%
rename from apps/studio/components/to-be-cleaned/Storage/StorageSettings/CreateCredentialModal.tsx
rename to apps/studio/components/interfaces/Storage/StorageSettings/CreateCredentialModal.tsx
diff --git a/apps/studio/components/to-be-cleaned/Storage/StorageSettings/RevokeCredentialModal.tsx b/apps/studio/components/interfaces/Storage/StorageSettings/RevokeCredentialModal.tsx
similarity index 100%
rename from apps/studio/components/to-be-cleaned/Storage/StorageSettings/RevokeCredentialModal.tsx
rename to apps/studio/components/interfaces/Storage/StorageSettings/RevokeCredentialModal.tsx
diff --git a/apps/studio/components/to-be-cleaned/Storage/StorageSettings/S3Connection.tsx b/apps/studio/components/interfaces/Storage/StorageSettings/S3Connection.tsx
similarity index 100%
rename from apps/studio/components/to-be-cleaned/Storage/StorageSettings/S3Connection.tsx
rename to apps/studio/components/interfaces/Storage/StorageSettings/S3Connection.tsx
diff --git a/apps/studio/components/to-be-cleaned/Storage/StorageSettings/StorageCredItem.tsx b/apps/studio/components/interfaces/Storage/StorageSettings/StorageCredItem.tsx
similarity index 100%
rename from apps/studio/components/to-be-cleaned/Storage/StorageSettings/StorageCredItem.tsx
rename to apps/studio/components/interfaces/Storage/StorageSettings/StorageCredItem.tsx
diff --git a/apps/studio/components/to-be-cleaned/Storage/StorageSettings/StorageSettings.constants.ts b/apps/studio/components/interfaces/Storage/StorageSettings/StorageSettings.constants.ts
similarity index 100%
rename from apps/studio/components/to-be-cleaned/Storage/StorageSettings/StorageSettings.constants.ts
rename to apps/studio/components/interfaces/Storage/StorageSettings/StorageSettings.constants.ts
diff --git a/apps/studio/components/to-be-cleaned/Storage/StorageSettings/StorageSettings.tsx b/apps/studio/components/interfaces/Storage/StorageSettings/StorageSettings.tsx
similarity index 100%
rename from apps/studio/components/to-be-cleaned/Storage/StorageSettings/StorageSettings.tsx
rename to apps/studio/components/interfaces/Storage/StorageSettings/StorageSettings.tsx
diff --git a/apps/studio/components/to-be-cleaned/Storage/StorageSettings/StorageSettings.utils.ts b/apps/studio/components/interfaces/Storage/StorageSettings/StorageSettings.utils.ts
similarity index 100%
rename from apps/studio/components/to-be-cleaned/Storage/StorageSettings/StorageSettings.utils.ts
rename to apps/studio/components/interfaces/Storage/StorageSettings/StorageSettings.utils.ts
diff --git a/apps/studio/components/to-be-cleaned/Storage/index.ts b/apps/studio/components/interfaces/Storage/index.ts
similarity index 100%
rename from apps/studio/components/to-be-cleaned/Storage/index.ts
rename to apps/studio/components/interfaces/Storage/index.ts
diff --git a/apps/studio/components/layouts/StorageLayout/StorageLayout.tsx b/apps/studio/components/layouts/StorageLayout/StorageLayout.tsx
index 4b0eb1d68bdcb..5e32ed53df1e8 100644
--- a/apps/studio/components/layouts/StorageLayout/StorageLayout.tsx
+++ b/apps/studio/components/layouts/StorageLayout/StorageLayout.tsx
@@ -2,7 +2,7 @@ import { ReactNode } from 'react'
 
 import { withAuth } from 'hooks/misc/withAuth'
 import ProjectLayout from '../ProjectLayout/ProjectLayout'
-import StorageMenu from './StorageMenu'
+import StorageMenu from '../../interfaces/Storage/StorageMenu'
 
 export interface StorageLayoutProps {
   title: string
diff --git a/apps/studio/components/layouts/useLayoutNavCommands.ts b/apps/studio/components/layouts/useLayoutNavCommands.ts
index 1957bcc72781b..0ce1cf08c0be2 100644
--- a/apps/studio/components/layouts/useLayoutNavCommands.ts
+++ b/apps/studio/components/layouts/useLayoutNavCommands.ts
@@ -9,7 +9,7 @@ import { useLogsGotoCommands } from './LogsLayout/Logs.Commands'
 import { useProjectSettingsGotoCommands } from './ProjectSettingsLayout/ProjectSettings.Commands'
 import { useReportsGotoCommands } from './ReportsLayout/Reports.Commands'
 import { useSqlEditorGotoCommands } from './SQLEditorLayout/SqlEditor.Commands'
-import { useStorageGotoCommands } from './StorageLayout/Storage.Commands'
+import { useStorageGotoCommands } from '../interfaces/Storage/Storage.Commands'
 import { useTableEditorGotoCommands } from './TableEditorLayout/TableEditor.Commands'
 
 export function useLayoutNavCommands() {
diff --git a/apps/studio/components/to-be-cleaned/Storage/Storage.types.ts b/apps/studio/components/to-be-cleaned/Storage/Storage.types.ts
deleted file mode 100644
index b29ce67266960..0000000000000
--- a/apps/studio/components/to-be-cleaned/Storage/Storage.types.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-import { STORAGE_ROW_STATUS, STORAGE_ROW_TYPES } from './Storage.constants'
-
-export interface StorageColumn {
-  id: string | null
-  name: string
-  status: string
-  items: StorageItem[]
-  hasMoreItems?: boolean
-  isLoadingMoreItems?: boolean
-}
-
-export interface StorageItem {
-  id: string | null
-  name: string
-  type: STORAGE_ROW_TYPES
-  status: STORAGE_ROW_STATUS
-  metadata: StorageItemMetadata | null
-  created_at: string | null
-  updated_at: string | null
-  last_accessed_at: string | null
-  // UI specific properties, not from API
-  isCorrupted: boolean
-  path?: string
-}
-
-export type StorageItemWithColumn = StorageItem & { columnIndex: number }
-
-export interface StorageItemMetadata {
-  cacheControl: string
-  contentLength: number
-  size: number
-  httpStatusCode: number
-  eTag: string
-  lastModified: string
-  mimetype: string
-}
diff --git a/apps/studio/data/storage/iceberg-wrapper-create-mutation.ts b/apps/studio/data/storage/iceberg-wrapper-create-mutation.ts
index 95cac1e501b16..50e1c1713a898 100644
--- a/apps/studio/data/storage/iceberg-wrapper-create-mutation.ts
+++ b/apps/studio/data/storage/iceberg-wrapper-create-mutation.ts
@@ -1,14 +1,14 @@
 import { PermissionAction } from '@supabase/shared-types/out/constants'
 
 import { WRAPPERS } from 'components/interfaces/Integrations/Wrappers/Wrappers.constants'
+import {
+  getCatalogURI,
+  getConnectionURL,
+} from 'components/interfaces/Storage/StorageSettings/StorageSettings.utils'
 import {
   useIsProjectActive,
   useProjectContext,
 } from 'components/layouts/ProjectLayout/ProjectContext'
-import {
-  getCatalogURI,
-  getConnectionURL,
-} from 'components/to-be-cleaned/Storage/StorageSettings/StorageSettings.utils'
 import { getKeys, useAPIKeysQuery } from 'data/api-keys/api-keys-query'
 import { useProjectSettingsV2Query } from 'data/config/project-settings-v2-query'
 import { useProjectStorageConfigQuery } from 'data/config/project-storage-config-query'
diff --git a/apps/studio/package.json b/apps/studio/package.json
index c485159f62263..3085a3d6de7f8 100644
--- a/apps/studio/package.json
+++ b/apps/studio/package.json
@@ -189,6 +189,7 @@
     "eslint-plugin-barrel-files": "^2.0.7",
     "graphql-ws": "5.14.1",
     "import-in-the-middle": "^1.13.1",
+    "jsdom-testing-mocks": "^1.13.1",
     "msw": "^2.3.0",
     "next-router-mock": "^0.9.13",
     "postcss": "^8.5.3",
diff --git a/apps/studio/pages/project/[ref]/settings/storage.tsx b/apps/studio/pages/project/[ref]/settings/storage.tsx
index 2d489c4836265..b07d9931f5ba2 100644
--- a/apps/studio/pages/project/[ref]/settings/storage.tsx
+++ b/apps/studio/pages/project/[ref]/settings/storage.tsx
@@ -6,8 +6,8 @@ import {
   ScaffoldHeader,
   ScaffoldTitle,
 } from 'components/layouts/Scaffold'
-import { StorageSettings } from 'components/to-be-cleaned/Storage'
-import { S3Connection } from 'components/to-be-cleaned/Storage/StorageSettings/S3Connection'
+import { StorageSettings } from 'components/interfaces/Storage'
+import { S3Connection } from 'components/interfaces/Storage/StorageSettings/S3Connection'
 import type { NextPageWithLayout } from 'types'
 
 const PageLayout: NextPageWithLayout = () => {
diff --git a/apps/studio/pages/project/[ref]/storage/buckets/[bucketId].tsx b/apps/studio/pages/project/[ref]/storage/buckets/[bucketId].tsx
index 16a7286508654..0e2c5031023bc 100644
--- a/apps/studio/pages/project/[ref]/storage/buckets/[bucketId].tsx
+++ b/apps/studio/pages/project/[ref]/storage/buckets/[bucketId].tsx
@@ -2,11 +2,11 @@ import { useParams } from 'common'
 
 import DefaultLayout from 'components/layouts/DefaultLayout'
 import { useProjectContext } from 'components/layouts/ProjectLayout/ProjectContext'
-import StorageBucketsError from 'components/layouts/StorageLayout/StorageBucketsError'
+import StorageBucketsError from 'components/interfaces/Storage/StorageBucketsError'
 import StorageLayout from 'components/layouts/StorageLayout/StorageLayout'
-import { StorageExplorer } from 'components/to-be-cleaned/Storage'
-import { AnalyticBucketDetails } from 'components/to-be-cleaned/Storage/AnalyticBucketDetails'
-import { useSelectedBucket } from 'components/to-be-cleaned/Storage/StorageExplorer/useSelectedBucket'
+import { StorageExplorer } from 'components/interfaces/Storage'
+import { AnalyticBucketDetails } from 'components/interfaces/Storage/AnalyticBucketDetails'
+import { useSelectedBucket } from 'components/interfaces/Storage/StorageExplorer/useSelectedBucket'
 import { useStorageExplorerStateSnapshot } from 'state/storage-explorer'
 import type { NextPageWithLayout } from 'types'
 
diff --git a/apps/studio/pages/project/[ref]/storage/buckets/index.tsx b/apps/studio/pages/project/[ref]/storage/buckets/index.tsx
index 85ee54975229b..08680ac7113a0 100644
--- a/apps/studio/pages/project/[ref]/storage/buckets/index.tsx
+++ b/apps/studio/pages/project/[ref]/storage/buckets/index.tsx
@@ -1,7 +1,7 @@
 import { useParams } from 'common'
 
 import { useProjectContext } from 'components/layouts/ProjectLayout/ProjectContext'
-import StorageBucketsError from 'components/layouts/StorageLayout/StorageBucketsError'
+import StorageBucketsError from 'components/interfaces/Storage/StorageBucketsError'
 import StorageLayout from 'components/layouts/StorageLayout/StorageLayout'
 import DefaultLayout from 'components/layouts/DefaultLayout'
 import ProductEmptyState from 'components/to-be-cleaned/ProductEmptyState'
diff --git a/apps/studio/pages/project/[ref]/storage/policies.tsx b/apps/studio/pages/project/[ref]/storage/policies.tsx
index d2daedb89251a..fe93cf7bc3547 100644
--- a/apps/studio/pages/project/[ref]/storage/policies.tsx
+++ b/apps/studio/pages/project/[ref]/storage/policies.tsx
@@ -1,6 +1,6 @@
 import StorageLayout from 'components/layouts/StorageLayout/StorageLayout'
 import DefaultLayout from 'components/layouts/DefaultLayout'
-import { StoragePolicies } from 'components/to-be-cleaned/Storage'
+import { StoragePolicies } from 'components/interfaces/Storage'
 import type { NextPageWithLayout } from 'types'
 
 const StoragePoliciesPage: NextPageWithLayout = () => {
diff --git a/apps/studio/state/storage-explorer.tsx b/apps/studio/state/storage-explorer.tsx
index 500954c26f348..ffe8907e4412a 100644
--- a/apps/studio/state/storage-explorer.tsx
+++ b/apps/studio/state/storage-explorer.tsx
@@ -14,13 +14,13 @@ import {
   STORAGE_SORT_BY,
   STORAGE_SORT_BY_ORDER,
   STORAGE_VIEWS,
-} from 'components/to-be-cleaned/Storage/Storage.constants'
+} from 'components/interfaces/Storage/Storage.constants'
 import {
   StorageColumn,
   StorageItem,
   StorageItemMetadata,
   StorageItemWithColumn,
-} from 'components/to-be-cleaned/Storage/Storage.types'
+} from 'components/interfaces/Storage/Storage.types'
 import {
   calculateTotalRemainingTime,
   downloadFile,
@@ -28,8 +28,8 @@ import {
   formatFolderItems,
   formatTime,
   getFilesDataTransferItems,
-} from 'components/to-be-cleaned/Storage/StorageExplorer/StorageExplorer.utils'
-import { convertFromBytes } from 'components/to-be-cleaned/Storage/StorageSettings/StorageSettings.utils'
+} from 'components/interfaces/Storage/StorageExplorer/StorageExplorer.utils'
+import { convertFromBytes } from 'components/interfaces/Storage/StorageSettings/StorageSettings.utils'
 import { InlineLink } from 'components/ui/InlineLink'
 import { getKeys, useAPIKeysQuery } from 'data/api-keys/api-keys-query'
 import { configKeys } from 'data/config/keys'
diff --git a/apps/studio/tests/components/Storage/StorageSettings.utils.test.ts b/apps/studio/tests/components/Storage/StorageSettings.utils.test.ts
index cdfc5f97e06a8..82bf4350f1d54 100644
--- a/apps/studio/tests/components/Storage/StorageSettings.utils.test.ts
+++ b/apps/studio/tests/components/Storage/StorageSettings.utils.test.ts
@@ -1,8 +1,8 @@
-import { StorageSizeUnits } from 'components/to-be-cleaned/Storage/StorageSettings/StorageSettings.constants'
+import { StorageSizeUnits } from 'components/interfaces/Storage/StorageSettings/StorageSettings.constants'
 import {
   convertFromBytes,
   convertToBytes,
-} from 'components/to-be-cleaned/Storage/StorageSettings/StorageSettings.utils'
+} from 'components/interfaces/Storage/StorageSettings/StorageSettings.utils'
 import { describe, test, expect } from 'vitest'
 
 describe('StorageSettings.utils: convertFromBytes', () => {
diff --git a/apps/studio/tests/features/logs/LogsPreviewer.test.tsx b/apps/studio/tests/features/logs/LogsPreviewer.test.tsx
index cc7051267e8ca..af44a42a9501b 100644
--- a/apps/studio/tests/features/logs/LogsPreviewer.test.tsx
+++ b/apps/studio/tests/features/logs/LogsPreviewer.test.tsx
@@ -32,7 +32,7 @@ vi.mock('lib/gotrue', async (importOriginal) => ({
 beforeEach(() => {
   addAPIMock({
     method: 'get',
-    path: '/platform/projects/default/analytics/endpoints/logs.all',
+    path: '/platform/projects/:ref/analytics/endpoints/logs.all',
     response: LOGS_API_MOCKS,
   })
 })
diff --git a/apps/studio/tests/lib/msw.ts b/apps/studio/tests/lib/msw.ts
index 5d473acce0e4c..383df91d8c8df 100644
--- a/apps/studio/tests/lib/msw.ts
+++ b/apps/studio/tests/lib/msw.ts
@@ -1,25 +1,66 @@
 import { setupServer } from 'msw/node'
 import { GlobalAPIMocks } from './msw-global-api-mocks'
-import { http, HttpResponse } from 'msw'
+import { http, HttpResponse, HttpResponseResolver } from 'msw'
 import { API_URL } from 'lib/constants'
+import type { paths } from '../../data/api'
 
 export const mswServer = setupServer(...GlobalAPIMocks)
 
-export const addAPIMock = ({
+mswServer.events.on('request:start', ({ request }) => {
+  console.log('[MSW] Outgoing:', request.method, request.url)
+})
+
+// Recursively changes params in an endpoint path segment from {param}
+// format to :param format which is expected by Mock Service Worker
+type RemapParams<T extends string> = T extends `${infer Before}{${infer Param}}${infer After}`
+  ? `${Before}:${Param}${RemapParams<After>}`
+  : T
+
+type TrimQueryParams<T extends string> = T extends `${infer Endpoint}?${string}` ? Endpoint : T
+
+// We need to remap all keys from our openapi-typescript generated types
+// so that they follow MSW's parameter formatting
+type RemapPaths = {
+  [K in keyof paths as RemapParams<K>]: paths[K]
+}
+
+type Endpoints = keyof RemapPaths
+type Methods = Exclude<keyof typeof http, 'all'>
+
+// Extract either the 200 or 201 response object
+type SuccessResponse<P extends Endpoints, M extends Methods> = RemapPaths[P][M] extends {
+  responses: { 200: { content: { 'application/json': infer R200 } } }
+}
+  ? R200
+  : RemapPaths[P][M] extends {
+        responses: { 201: { content: { 'application/json': infer R201 } } }
+      }
+    ? R201
+    : never
+
+const isResponseResolver = (val: unknown): val is HttpResponseResolver => typeof val === `function`
+
+export const addAPIMock = <P extends Endpoints | `${Endpoints}?${string}`, M extends Methods>({
   method,
   path,
   response,
 }: {
-  method: keyof typeof http
-  path: string
-  response: any
+  method: M
+  path: P
+  response: SuccessResponse<TrimQueryParams<P>, M> | HttpResponseResolver
 }) => {
   const fullPath = `${API_URL}${path}`
-  console.log('[MSW] Adding mock:', method, fullPath)
+  console.log('[MSW] Adding mock:', method.toUpperCase(), fullPath)
 
   mswServer.use(
-    http[method](fullPath, () => {
-      return HttpResponse.json(response)
-    })
+    http[method](
+      fullPath,
+      isResponseResolver(response)
+        ? response
+        : ({ request }) => {
+            console.log('[MSW] Handling request:', request.method, request.url, response)
+            return HttpResponse.json(response ?? null)
+          }
+    )
   )
 }
diff --git a/apps/studio/tests/setup/polyfills.js b/apps/studio/tests/setup/polyfills.js
deleted file mode 100644
index d80798f25fe1d..0000000000000
--- a/apps/studio/tests/setup/polyfills.js
+++ /dev/null
@@ -1,13 +0,0 @@
-const { TextDecoder, TextEncoder } = require('node:util')
-
-Object.defineProperties(globalThis, {
-  TextDecoder: { value: TextDecoder },
-  TextEncoder: { value: TextEncoder },
-  CSS: {
-    value: {
-      supports: (k, v) => false,
-      escape: (v) => v,
-    },
-  },
-  TransformStream: { value: null },
-})
diff --git a/apps/studio/tests/setup/polyfills.ts b/apps/studio/tests/setup/polyfills.ts
new file mode 100644
index 0000000000000..f8702bb7e714b
--- /dev/null
+++ b/apps/studio/tests/setup/polyfills.ts
@@ -0,0 +1,37 @@
+import { TextDecoder, TextEncoder } from 'node:util'
+import { ReadableStream, TransformStream } from 'node:stream/web'
+import { vi } from 'vitest'
+import { configMocks } from 'jsdom-testing-mocks'
+import { act } from '@testing-library/react'
+
+configMocks({ act })
+
+// Warning: `restoreMocks: true` in vitest.config.ts will
+// cause this global mockImplementation to be **reset**
+// before any tests are run!
+Object.defineProperty(window, 'matchMedia', {
+  writable: true,
+  value: vi.fn().mockImplementation((query) => ({
+    matches: false,
+    media: query,
+    onchange: null,
+    addListener: vi.fn(), // deprecated
+    removeListener: vi.fn(), // deprecated
+    addEventListener: vi.fn(),
+    removeEventListener: vi.fn(),
+    dispatchEvent: vi.fn(),
+  })),
+})
+
+Object.defineProperties(globalThis, {
+  TextDecoder: { value: TextDecoder },
+  TextEncoder: { value: TextEncoder },
+  CSS: {
+    value: {
+      supports: (_k: any, _v: any) => false,
+      escape: (v: any) => v,
+    },
+  },
+  ReadableStream: { value: ReadableStream },
+  TransformStream: { value: TransformStream },
+})
diff --git a/apps/studio/tests/vitestSetup.ts b/apps/studio/tests/vitestSetup.ts
index 23c1903adfaaa..00ac0696c074a 100644
--- a/apps/studio/tests/vitestSetup.ts
+++ b/apps/studio/tests/vitestSetup.ts
@@ -5,22 +5,6 @@ import { afterAll, afterEach, beforeAll, vi } from 'vitest'
 import { routerMock } from './lib/route-mock'
 import { mswServer } from './lib/msw'
 
-mswServer.listen({ onUnhandledRequest: 'error' })
-
-Object.defineProperty(window, 'matchMedia', {
-  writable: true,
-  value: vi.fn().mockImplementation((query) => ({
-    matches: false,
-    media: query,
-    onchange: null,
-    addListener: vi.fn(), // deprecated
-    removeListener: vi.fn(), // deprecated
-    addEventListener: vi.fn(),
-    removeEventListener: vi.fn(),
-    dispatchEvent: vi.fn(),
-  })),
-})
-
 // Uncomment this if HTML in errors are being annoying.
 //
 // configure({
@@ -32,6 +16,7 @@ Object.defineProperty(window, 'matchMedia', {
 // })
 
 beforeAll(() => {
+  mswServer.listen({ onUnhandledRequest: `error` })
   vi.mock('next/router', () => require('next-router-mock'))
   vi.mock('next/navigation', async () => {
     const actual = await vi.importActual('next/navigation')
diff --git a/apps/studio/vitest.config.ts b/apps/studio/vitest.config.ts
index 9ed6851ec8e57..1f45347020853 100644
--- a/apps/studio/vitest.config.ts
+++ b/apps/studio/vitest.config.ts
@@ -1,8 +1,8 @@
+import { resolve } from 'node:path'
+import { fileURLToPath } from 'node:url'
+import { defineConfig } from 'vitest/config'
 import react from '@vitejs/plugin-react'
-import path, { resolve } from 'path'
-import { fileURLToPath } from 'url'
 import tsconfigPaths from 'vite-tsconfig-paths'
-import { defineConfig } from 'vitest/config'
 
 // Some tools like Vitest VSCode extensions, have trouble with resolving relative paths,
 // as they use the directory of the test file as `cwd`, which makes them believe that
@@ -18,14 +18,12 @@ export default defineConfig({
   ],
   resolve: {
     alias: {
-      '@ui': path.resolve(__dirname, './../../packages/ui/src'),
+      '@ui': resolve(__dirname, './../../packages/ui/src'),
     },
   },
   test: {
     globals: true,
     environment: 'jsdom', // TODO(kamil): This should be set per test via header in .tsx files only
-    include: [resolve(dirname, './**/*.test.{ts,tsx}')],
-    restoreMocks: true,
     setupFiles: [
       resolve(dirname, './tests/vitestSetup.ts'),
       resolve(dirname, './tests/setup/polyfills.js'),
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index fb38e65784442..6f2a902f58768 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -189,7 +189,7 @@ importers:
         version: 15.3.1(@babel/core@7.26.10(supports-color@8.1.1))(@opentelemetry/api@1.9.0)(@playwright/test@1.53.0)(babel-plugin-macros@3.1.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(sass@1.77.4)
       next-contentlayer2:
         specifier: 0.4.6
-        version: 0.4.6(contentlayer2@0.4.6(esbuild@0.25.2)(markdown-wasm@1.2.0)(supports-color@8.1.1))(esbuild@0.25.2)(markdown-wasm@1.2.0)(next@15.3.1(@babel/core@7.26.10(supports-color@8.1.1))(@opentelemetry/api@1.9.0)(@playwright/test@1.53.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(sass@1.77.4))(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(supports-color@8.1.1)
+        version: 0.4.6(contentlayer2@0.4.6(esbuild@0.25.2)(markdown-wasm@1.2.0)(supports-color@8.1.1))(esbuild@0.25.2)(markdown-wasm@1.2.0)(next@15.3.1(@babel/core@7.26.10(supports-color@8.1.1))(@opentelemetry/api@1.9.0)(@playwright/test@1.53.0)(babel-plugin-macros@3.1.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(sass@1.77.4))(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(supports-color@8.1.1)
       next-themes:
         specifier: ^0.3.0
         version: 0.3.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
@@ -1132,6 +1132,9 @@ importers:
       import-in-the-middle:
         specifier: ^1.13.1
         version: 1.13.1
+      jsdom-testing-mocks:
+        specifier: ^1.13.1
+        version: 1.13.1
       msw:
         specifier: ^2.3.0
         version: 2.4.11(typescript@5.5.2)
@@ -1308,13 +1311,13 @@ importers:
         version: 15.3.1(@babel/core@7.26.10(supports-color@8.1.1))(@opentelemetry/api@1.9.0)(@playwright/test@1.53.0)(babel-plugin-macros@3.1.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(sass@1.77.4)
       next-contentlayer2:
         specifier: 0.4.6
-        version: 0.4.6(contentlayer2@0.4.6(esbuild@0.25.2)(markdown-wasm@1.2.0)(supports-color@8.1.1))(esbuild@0.25.2)(markdown-wasm@1.2.0)(next@15.3.1(@babel/core@7.26.10(supports-color@8.1.1))(@opentelemetry/api@1.9.0)(@playwright/test@1.53.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(sass@1.77.4))(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(supports-color@8.1.1)
+        version: 0.4.6(contentlayer2@0.4.6(esbuild@0.25.2)(markdown-wasm@1.2.0)(supports-color@8.1.1))(esbuild@0.25.2)(markdown-wasm@1.2.0)(next@15.3.1(@babel/core@7.26.10(supports-color@8.1.1))(@opentelemetry/api@1.9.0)(@playwright/test@1.53.0)(babel-plugin-macros@3.1.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(sass@1.77.4))(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(supports-color@8.1.1)
       next-themes:
         specifier: ^0.3.0
         version: 0.3.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
       openai:
         specifier: ^5.9.0
-        version: 5.9.0(ws@8.18.1)(zod@3.23.8)
+        version: 5.9.0(ws@8.18.3)(zod@3.23.8)
       openapi-fetch:
         specifier: 0.12.4
         version: 0.12.4
@@ -9680,6 +9683,9 @@ packages:
     peerDependencies:
       ajv: 4.11.8 - 8
 
+  bezier-easing@2.1.0:
+    resolution: {integrity: sha512-gbIqZ/eslnUFC1tjEvtz0sgx+xTK20wDnYMIA27VA04R7w6xxXQPZDbibjA9DTWZRA2CXtwHykkVzlCaAJAZig==}
+
   big-integer@1.6.51:
     resolution: {integrity: sha512-GPEid2Y9QU1Exl1rpO9B2IPJGHPSupF5GnVIP0blYvNOMer2bTvSWs1jGOUg04hTmu67nmLsQ9TBo1puaotBHg==}
     engines: {node: '>=0.6'}
@@ -10373,6 +10379,9 @@ packages:
   css-in-js-utils@3.1.0:
     resolution: {integrity: sha512-fJAcud6B3rRu+KHYk+Bwf+WFL2MDCJJ1XG9x137tJQ0xYxor7XziQtuGFbWNdqrvF4Tk26O3H73nfVqXt/fW1A==}
 
+  css-mediaquery@0.1.2:
+    resolution: {integrity: sha512-COtn4EROW5dBGlE/4PiKnh6rZpAPxDeFLaEEwt4i10jpDMFt2EhQGS79QmmrO+iKCHv0PU/HrOWEhijFd1x99Q==}
+
   css-select@5.1.0:
     resolution: {integrity: sha512-nwoRF1rvRRnnCqqY7updORDsuqKzqYJ28+oSMaJMMgOauh3fvwHqMS7EZpIPqK8GL+g9mKxF1vP/ZjSeNjEVHg==}
 
@@ -13119,6 +13128,10 @@ packages:
   jsbn@1.1.0:
     resolution: {integrity: sha512-4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A==}
 
+  jsdom-testing-mocks@1.13.1:
+    resolution: {integrity: sha512-8BAsnuoO4DLGTf7LDbSm8fcx5CUHSv4h+bdUbwyt6rMYAXWjeHLRx9f8sYiSxoOTXy3S1e06pe87KER39o1ckA==}
+    engines: {node: '>=14'}
+
   jsdom@20.0.3:
     resolution: {integrity: sha512-SYhBvTh89tTfCD/CRdSOm13mOBa42iTaTyfyEWBdKcGdPxPtLFBXuHR8XHb33YNYaP+lLbmSvBTsnoesCNJEsQ==}
     engines: {node: '>=14'}
@@ -18200,6 +18213,18 @@ packages:
       utf-8-validate:
         optional: true
 
+  ws@8.18.3:
+    resolution: {integrity: sha512-PEIGCY5tSlUt50cqyMXfCzX+oOPqN0vuGqWzbcJ2xvnkzkq46oOpz7dQaTDBdfICb4N14+GARUDw2XV2N4tvzg==}
+    engines: {node: '>=10.0.0'}
+    peerDependencies:
+      bufferutil: ^4.0.1
+      utf-8-validate: '>=5.0.2'
+    peerDependenciesMeta:
+      bufferutil:
+        optional: true
+      utf-8-validate:
+        optional: true
+
   xml-lexer@0.2.2:
     resolution: {integrity: sha512-G0i98epIwiUEiKmMcavmVdhtymW+pCAohMRgybyIME9ygfVu8QheIi+YoQh3ngiThsT0SQzJT4R0sKDEv8Ou0w==}
 
@@ -21387,10 +21412,10 @@ snapshots:
       '@graphql-tools/utils': 10.8.6(graphql@16.10.0)
       '@whatwg-node/disposablestack': 0.0.6
       graphql: 16.10.0
-      graphql-ws: 6.0.4(graphql@16.10.0)(ws@8.18.1)
-      isomorphic-ws: 5.0.0(ws@8.18.1)
+      graphql-ws: 6.0.4(graphql@16.10.0)(ws@8.18.3)
+      isomorphic-ws: 5.0.0(ws@8.18.3)
       tslib: 2.8.1
-      ws: 8.18.1
+      ws: 8.18.3
     transitivePeerDependencies:
       - '@fastify/websocket'
       - bufferutil
@@ -21403,10 +21428,10 @@ snapshots:
       '@graphql-tools/utils': 10.8.6(graphql@16.11.0)
       '@whatwg-node/disposablestack': 0.0.6
       graphql: 16.11.0
-      graphql-ws: 6.0.4(graphql@16.11.0)(ws@8.18.1)
-      isomorphic-ws: 5.0.0(ws@8.18.1)
+      graphql-ws: 6.0.4(graphql@16.11.0)(ws@8.18.3)
+      isomorphic-ws: 5.0.0(ws@8.18.3)
       tslib: 2.8.1
-      ws: 8.18.1
+      ws: 8.18.3
     transitivePeerDependencies:
       - '@fastify/websocket'
       - bufferutil
@@ -21448,9 +21473,9 @@ snapshots:
       '@graphql-tools/utils': 10.8.6(graphql@16.10.0)
       '@types/ws': 8.5.10
       graphql: 16.10.0
-      isomorphic-ws: 5.0.0(ws@8.18.1)
+      isomorphic-ws: 5.0.0(ws@8.18.3)
       tslib: 2.8.1
-      ws: 8.18.1
+      ws: 8.18.3
     transitivePeerDependencies:
       - bufferutil
       - utf-8-validate
@@ -21460,9 +21485,9 @@ snapshots:
       '@graphql-tools/utils': 10.8.6(graphql@16.11.0)
       '@types/ws': 8.5.10
       graphql: 16.11.0
-      isomorphic-ws: 5.0.0(ws@8.18.1)
+      isomorphic-ws: 5.0.0(ws@8.18.3)
       tslib: 2.8.1
-      ws: 8.18.1
+      ws: 8.18.3
     transitivePeerDependencies:
       - bufferutil
       - utf-8-validate
@@ -26940,7 +26965,7 @@ snapshots:
       '@supabase/node-fetch': 2.6.15
       '@types/phoenix': 1.6.4
       '@types/ws': 8.5.10
-      ws: 8.18.1
+      ws: 8.18.3
     transitivePeerDependencies:
       - bufferutil
       - utf-8-validate
@@ -26950,7 +26975,7 @@ snapshots:
       '@supabase/node-fetch': 2.6.15
       '@types/phoenix': 1.6.4
       '@types/ws': 8.5.10
-      ws: 8.18.1
+      ws: 8.18.3
     transitivePeerDependencies:
       - bufferutil
       - utf-8-validate
@@ -29238,6 +29263,8 @@ snapshots:
       jsonpointer: 5.0.1
       leven: 3.1.0
 
+  bezier-easing@2.1.0: {}
+
   big-integer@1.6.51: {}
 
   big.js@5.2.2: {}
@@ -30029,6 +30056,8 @@ snapshots:
     dependencies:
       hyphenate-style-name: 1.0.4
 
+  css-mediaquery@0.1.2: {}
+
   css-select@5.1.0:
     dependencies:
       boolbase: 1.0.0
@@ -32057,12 +32086,19 @@ snapshots:
       graphql: 16.10.0
     optionalDependencies:
       ws: 8.18.1
+    optional: true
 
-  graphql-ws@6.0.4(graphql@16.11.0)(ws@8.18.1):
+  graphql-ws@6.0.4(graphql@16.10.0)(ws@8.18.3):
+    dependencies:
+      graphql: 16.10.0
+    optionalDependencies:
+      ws: 8.18.3
+
+  graphql-ws@6.0.4(graphql@16.11.0)(ws@8.18.3):
     dependencies:
       graphql: 16.11.0
     optionalDependencies:
-      ws: 8.18.1
+      ws: 8.18.3
 
   graphql@16.10.0: {}
 
@@ -33038,6 +33074,10 @@ snapshots:
     dependencies:
       ws: 8.18.1
 
+  isomorphic-ws@5.0.0(ws@8.18.3):
+    dependencies:
+      ws: 8.18.3
+
   isomorphic.js@0.2.5: {}
 
   istanbul-lib-coverage@3.2.2: {}
@@ -33159,6 +33199,11 @@ snapshots:
 
   jsbn@1.1.0: {}
 
+  jsdom-testing-mocks@1.13.1:
+    dependencies:
+      bezier-easing: 2.1.0
+      css-mediaquery: 0.1.2
+
   jsdom@20.0.3(supports-color@8.1.1):
     dependencies:
       abab: 2.0.6
@@ -33185,7 +33230,7 @@ snapshots:
       whatwg-encoding: 2.0.0
       whatwg-mimetype: 3.0.0
       whatwg-url: 11.0.0
-      ws: 8.18.1
+      ws: 8.18.3
       xml-name-validator: 4.0.0
     transitivePeerDependencies:
       - bufferutil
@@ -34975,7 +35020,7 @@ snapshots:
 
   neo-async@2.6.2: {}
 
-  next-contentlayer2@0.4.6(contentlayer2@0.4.6(esbuild@0.25.2)(markdown-wasm@1.2.0)(supports-color@8.1.1))(esbuild@0.25.2)(markdown-wasm@1.2.0)(next@15.3.1(@babel/core@7.26.10(supports-color@8.1.1))(@opentelemetry/api@1.9.0)(@playwright/test@1.53.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(sass@1.77.4))(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(supports-color@8.1.1):
+  next-contentlayer2@0.4.6(contentlayer2@0.4.6(esbuild@0.25.2)(markdown-wasm@1.2.0)(supports-color@8.1.1))(esbuild@0.25.2)(markdown-wasm@1.2.0)(next@15.3.1(@babel/core@7.26.10(supports-color@8.1.1))(@opentelemetry/api@1.9.0)(@playwright/test@1.53.0)(babel-plugin-macros@3.1.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(sass@1.77.4))(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(supports-color@8.1.1):
     dependencies:
       '@contentlayer2/core': 0.4.3(esbuild@0.25.2)(markdown-wasm@1.2.0)(supports-color@8.1.1)
       '@contentlayer2/utils': 0.4.3
@@ -35545,9 +35590,9 @@ snapshots:
     transitivePeerDependencies:
       - encoding
 
-  openai@5.9.0(ws@8.18.1)(zod@3.23.8):
+  openai@5.9.0(ws@8.18.3)(zod@3.23.8):
     optionalDependencies:
-      ws: 8.18.1
+      ws: 8.18.3
       zod: 3.23.8
 
   openapi-fetch@0.12.4:
@@ -40030,6 +40075,8 @@ snapshots:
 
   ws@8.18.1: {}
 
+  ws@8.18.3: {}
+
   xml-lexer@0.2.2:
     dependencies:
       eventemitter3: 2.0.3