diff --git a/.secrets.baseline b/.secrets.baseline
index 616cd472bae..3b8c7a446a9 100644
--- a/.secrets.baseline
+++ b/.secrets.baseline
@@ -287,14 +287,14 @@
         "filename": "press/api/tests/test_marketplace.py",
         "hashed_secret": "1e2a4c3be8ec693658961500ff918de4c188b4f1",
         "is_verified": false,
-        "line_number": 63
+        "line_number": 61
       },
       {
         "type": "Hex High Entropy String",
         "filename": "press/api/tests/test_marketplace.py",
         "hashed_secret": "a6362a1031d1d2039364ea6b51694151bf388a40",
         "is_verified": false,
-        "line_number": 71
+        "line_number": 69
       }
     ],
     "press/auth.py": [
@@ -547,5 +547,5 @@
       }
     ]
   },
-  "generated_at": "2026-03-17T02:42:49Z"
+  "generated_at": "2026-04-15T16:58:31Z"
 }
diff --git a/dashboard/package.json b/dashboard/package.json
index 2dc4045f592..91ffa25cd21 100644
--- a/dashboard/package.json
+++ b/dashboard/package.json
@@ -11,8 +11,7 @@
 		"lint": "eslint src",
 		"test:e2e": "playwright test",
 		"test:e2e:headed": "playwright test --headed",
-		"test:e2e:report": "playwright show-report",
-		"postinstall": "patch-package"
+		"test:e2e:report": "playwright show-report"
 	},
 	"dependencies": {
 		"@codemirror/autocomplete": "^6.18.1",
@@ -32,14 +31,13 @@
 		"echarts": "^5.4.3",
 		"feather-icons": "^4.26.0",
 		"frappe-charts": "2.0.0-rc22",
-		"frappe-ui": "0.1.238",
+    "frappe-ui": "0.1.277",
 		"fuse.js": "6.6.2",
 		"libarchive.js": "^1.3.0",
 		"lodash": "^4.17.19",
 		"luxon": "^1.22.0",
 		"markdown-it": "^12.3.2",
 		"papaparse": "^5.4.1",
-		"patch-package": "^8.0.1",
 		"qrcode": "^1.5.4",
 		"register-service-worker": "^1.6.2",
 		"socket.io-client": "^4.5.1",
@@ -53,14 +51,13 @@
 		"vue-sonner": "^1.2.5"
 	},
 	"devDependencies": {
-		"@iconify/json": "^2.2.123",
 		"@playwright/test": "^1.54.2",
 		"@tailwindcss/forms": "^0.4.0",
 		"@tailwindcss/postcss7-compat": "^2.0.2",
 		"@tailwindcss/typography": "^0.5.1",
 		"@vitejs/plugin-legacy": "^4.1.1",
-		"@vitejs/plugin-vue": "^5.0.3",
-		"@vitejs/plugin-vue-jsx": "^3.1.0",
+		"@vitejs/plugin-vue": "^6.0.5",
+		"@vitejs/plugin-vue-jsx": "^5.1.5",
 		"@vue/compiler-sfc": "^3.1.0",
 		"@vue/eslint-config-prettier": "^6.0.0",
 		"@vue/test-utils": "^2.0.0-rc.19",
@@ -82,7 +79,7 @@
 		"tailwindcss": "^3.4",
 		"typescript": "^5.4.3",
 		"unplugin-vue-components": "^0.25.2",
-		"vite": "5.4.20",
+		"vite": "8.0.1",
 		"vite-plugin-rewrite-all": "^1.0.1",
 		"vitest": "^0.9.3",
 		"vue-tsc": "^2.0.7",
diff --git a/dashboard/patches/frappe-ui+0.1.238.patch b/dashboard/patches/frappe-ui+0.1.238.patch
deleted file mode 100644
index 72e24752ed0..00000000000
--- a/dashboard/patches/frappe-ui+0.1.238.patch
+++ /dev/null
@@ -1,213 +0,0 @@
-diff --git a/node_modules/frappe-ui/package.json b/node_modules/frappe-ui/package.json
-index 4a652de..826f0a0 100644
---- a/node_modules/frappe-ui/package.json
-+++ b/node_modules/frappe-ui/package.json
-@@ -4,6 +4,7 @@
-   "description": "A set of components and utilities for rapid UI development",
-   "type": "module",
-   "sideEffects": false,
-+  "main": "./src/index.ts",
-   "scripts": {
-     "test": "vitest --run",
-     "type-check": "tsc --noEmit",
-@@ -17,32 +18,6 @@
-     "story:build": "histoire build && cp 404.html .histoire/dist",
-     "story:preview": "histoire preview"
-   },
--  "exports": {
--    ".": {
--      "import": "./src/index.ts",
--      "types": "./src/index.ts"
--    },
--    "./frappe": {
--      "import": "./frappe/index.js"
--    },
--    "./icons": {
--      "import": "./icons/index.ts"
--    },
--    "./tailwind": {
--      "import": "./src/tailwind/preset.js",
--      "default": "./src/tailwind/preset.js"
--    },
--    "./vite": {
--      "import": "./vite/index.js"
--    },
--    "./style.css": {
--      "import": "./src/style.css"
--    },
--    "./tsconfig.base.json": {
--      "default": "./tsconfig.base.json",
--      "types": "./tsconfig.base.json"
--    }
--  },
-   "files": [
-     "frappe",
-     "src",
-diff --git a/node_modules/frappe-ui/src/components/Combobox/Combobox.vue b/node_modules/frappe-ui/src/components/Combobox/Combobox.vue
-index f594512..6b140c9 100644
---- a/node_modules/frappe-ui/src/components/Combobox/Combobox.vue
-+++ b/node_modules/frappe-ui/src/components/Combobox/Combobox.vue
-@@ -35,6 +35,7 @@ import type {
- const props = withDefaults(defineProps<ComboboxProps>(), {
-   variant: 'subtle',
-   options: () => [],
-+  allowCustomValue: false,
- })
- const emit = defineEmits([
-   'update:modelValue',
-@@ -234,15 +235,23 @@ const filteredOptions = computed(() => {
- 
- const handleInputChange = (event: Event) => {
-   const target = event.target as HTMLInputElement
--  searchTerm.value = target.value
--  lastSearchTerm.value = target.value
-+  const value = target.value
-+  
-+  searchTerm.value = value
-+  lastSearchTerm.value = value
-   userHasTyped.value = true
- 
-   if (searchTerm.value === '') {
-     internalModelValue.value = null
-     emit('update:modelValue', null)
-+    emit('update:selectedOption', null)
-+  } else if (props.allowCustomValue) {
-+    internalModelValue.value = value
-+    emit('update:modelValue', value)
-+    emit('update:selectedOption', null)
-   }
--  emit('input', searchTerm.value)
-+
-+  emit('input', value)
- }
- 
- const handleOpenChange = (open: boolean) => {
-@@ -291,6 +300,23 @@ const variantClasses = computed(() => {
-   }[props.variant]
- })
- 
-+const hasExactMatch = computed(() => {
-+  if (!searchTerm.value) return false
-+  return allOptionsFlat.value.some(
-+    (opt) => getValue(opt) === searchTerm.value,
-+  )
-+})
-+
-+const isFreeCustomValue = computed(() => {
-+  if (!props.allowCustomValue) return false
-+
-+  return (
-+    searchTerm.value &&
-+    !hasExactMatch.value &&
-+    filteredOptions.value.length === 0
-+  )
-+})
-+
- defineExpose({
-   reset,
- })
-@@ -344,9 +370,22 @@ defineExpose({
-             :class="{ 'px-1.5 pt-1.5': !isGroup(filteredOptions[0]) }"
-           >
-             <ComboboxEmpty
--              class="text-ink-gray-5 text-base text-center py-1.5 px-2.5"
-+              class="py-1.5 px-2.5"
-             >
--              No results found for "{{ searchTerm }}"
-+              <div
-+                v-if="isFreeCustomValue"
-+                class="text-base text-ink-gray-7 flex items-center gap-2"
-+              >
-+                <span class="text-ink-gray-5">Custom value</span>
-+                <span class="font-medium">"{{ searchTerm }}"</span>
-+              </div>
-+
-+              <div
-+                v-else
-+                class="text-ink-gray-5 text-base text-center"
-+              >
-+                No results found for "{{ searchTerm }}"
-+              </div>
-             </ComboboxEmpty>
-             <template
-               v-for="(optionOrGroup, index) in filteredOptions"
-diff --git a/node_modules/frappe-ui/src/components/Combobox/types.ts b/node_modules/frappe-ui/src/components/Combobox/types.ts
-index e775982..f20eb9c 100644
---- a/node_modules/frappe-ui/src/components/Combobox/types.ts
-+++ b/node_modules/frappe-ui/src/components/Combobox/types.ts
-@@ -36,4 +36,5 @@ export interface ComboboxProps {
-   openOnFocus?: boolean
-   openOnClick?: boolean
-   placement?: 'start' | 'center' | 'end'
-+  allowCustomValue?: boolean
- }
-diff --git a/node_modules/frappe-ui/src/components/ListView/ListRow.vue b/node_modules/frappe-ui/src/components/ListView/ListRow.vue
-index 3259022..f351998 100644
---- a/node_modules/frappe-ui/src/components/ListView/ListRow.vue
-+++ b/node_modules/frappe-ui/src/components/ListView/ListRow.vue
-@@ -23,6 +23,10 @@
-     >
-       <div
-         class="grid items-center space-x-4 px-2"
-+        :class="{
-+          'cursor-not-allowed': props.row.__disabled,
-+          'opacity-50': props.row.__disabled,
-+        }"
-         :style="{
-           height: rowHeight,
-           gridTemplateColumns: getGridTemplateColumns(
-@@ -40,6 +44,7 @@
-           <Checkbox
-             :modelValue="isSelected"
-             class="cursor-pointer duration-300"
-+            :disabled="props.row.__disabled"
-             @click.stop="handleCheckboxClick"
-           />
-         </div>
-@@ -168,9 +173,11 @@ const handleCheckboxClick = (event) => {
-     const start = Math.min(lastIndex, curIndex)
-     const end = Math.max(lastIndex, curIndex)
-     for (let i = start; i <= end; i++) {
-+      if (rows[i].__disabled) continue
-       list.value.selections.add(rows[i][list.value.rowKey])
-     }
-   } else {
-+    if (props.row.__disabled) return
-     list.value.toggleRow(value)
-   }
- }
-diff --git a/node_modules/frappe-ui/src/components/ListView/ListView.vue b/node_modules/frappe-ui/src/components/ListView/ListView.vue
-index 7f50517..b75275a 100644
---- a/node_modules/frappe-ui/src/components/ListView/ListView.vue
-+++ b/node_modules/frappe-ui/src/components/ListView/ListView.vue
-@@ -123,7 +123,7 @@ let showGroupedRows = computed(() => {
- })
- 
- function toggleRow(row) {
--  if (!selections.delete(row)) {
-+  if (!selections.delete(row) && !row.__disabled) {
-     selections.add(row)
-   }
- }
-@@ -135,11 +135,19 @@ function toggleAllRows(select) {
-   }
-   if (showGroupedRows.value) {
-     props.rows.forEach((row) => {
--      row.rows.forEach((r) => selections.add(r[props.rowKey]))
-+      row.rows.forEach((r) => {
-+        if (!r.__disabled) {
-+          selections.add(r[props.rowKey])
-+        }
-+      })
-     })
-     return
-   }
--  props.rows.forEach((row) => selections.add(row[props.rowKey]))
-+  props.rows.forEach((row) => {
-+    if (!row.__disabled) {
-+      selections.add(row[props.rowKey])
-+    }
-+  })
- }
- 
- provide(
diff --git a/dashboard/src/assets/style.css b/dashboard/src/assets/style.css
index 69794bb42f4..8871dbf9c77 100644
--- a/dashboard/src/assets/style.css
+++ b/dashboard/src/assets/style.css
@@ -1,4 +1,4 @@
-@import 'frappe-ui/src/style.css';
+@import 'frappe-ui/style.css';
 
 @layer components {
 	/* Works on Firefox */
diff --git a/dashboard/src/components/AddressableErrorDialog.vue b/dashboard/src/components/AddressableErrorDialog.vue
index 69ab9cb7c84..c069b672cdd 100644
--- a/dashboard/src/components/AddressableErrorDialog.vue
+++ b/dashboard/src/components/AddressableErrorDialog.vue
@@ -97,11 +97,11 @@ export default {
 			setTimeout(() => (this.copied = false), 4000);
 		},
 		async done() {
-			if (this.doc.assistance_url && !this.helpViewed) {
-				this.error =
-					'Please follow the steps mentioned in <i>Help</i> before clicking Done';
-				return;
-			}
+			// if (this.doc.assistance_url && !this.helpViewed) {
+			// 	this.error =
+			// 		'Please follow the steps mentioned in <i>Help</i> before clicking Done';
+			// 	return;
+			// }
 
 			await this.$resources.notification.markAsAddressed.submit();
 			this.show = false;
diff --git a/dashboard/src/components/AlertBanner.vue b/dashboard/src/components/AlertBanner.vue
index d1178e2547f..01849e8e587 100644
--- a/dashboard/src/components/AlertBanner.vue
+++ b/dashboard/src/components/AlertBanner.vue
@@ -1,21 +1,17 @@
 <template>
 	<div
-		:class="`flex items-center justify-between rounded-md border border-${color}-200 bg-${color}-100 px-3.5 py-2.5`"
+		:class="`flex items-center justify-between rounded-md border border-${color}-300 bg-${color}-100 p-2`"
 	>
-		<div class="flex items-center">
+		<div class="flex items-center gap-2.5">
 			<lucide-alert-triangle
 				v-if="showIcon && (type === 'error' || type === 'warning')"
-				:class="`h-4 w-8 text-${color}-600`"
+				:class="`ml-1 size-4 text-${color}-600 shrink-0`"
 			/>
 			<lucide-info
 				v-if="showIcon && type === 'info'"
-				:class="`h-4 w-8 text-${color}-600`"
-			/>
-			<div
-				:class="{ 'ml-3': showIcon }"
-				class="text-p-base font-medium text-gray-800"
-				v-html="title"
+				:class="`ml-1 size-4 text-${color}-600 shrink-0`"
 			/>
+			<div class="prose-sm font-medium text-gray-800" v-html="title" />
 		</div>
 
 		<div class="flex items-center">
diff --git a/dashboard/src/components/BackupFilesUploader.vue b/dashboard/src/components/BackupFilesUploader.vue
index 438564e1fae..042f260a383 100644
--- a/dashboard/src/components/BackupFilesUploader.vue
+++ b/dashboard/src/components/BackupFilesUploader.vue
@@ -145,7 +145,7 @@ export default {
 
 			if (file.size > 5 * 1024 * 1024 * 1024) {
 				throw new Error(
-					'File size exceeds the limit of 5 GiB. Please try the <a href="https://docs.frappe.io/cloud/sites/migrate-an-existing-site#migrate-using-python-script" class=underline>migrate</a> script.',
+					'File size exceeds the limit of 5 GiB. Please try the <a href="https://docs.frappe.io/cloud/sites/migrate-an-existing-site#migrate-using-fc-restore-cli" class=underline>CLI tool</a>.',
 				);
 			}
 
diff --git a/dashboard/src/components/ClickToCopyField.vue b/dashboard/src/components/ClickToCopyField.vue
index 035177527f4..67616b37026 100644
--- a/dashboard/src/components/ClickToCopyField.vue
+++ b/dashboard/src/components/ClickToCopyField.vue
@@ -4,7 +4,7 @@
 			<pre
 				:class="{
 					'whitespace-pre-wrap': breakLines,
-					'overflow-x-auto': !breakLines
+					'overflow-x-auto': !breakLines,
 				}"
 				:style="
 					!breakLines
@@ -15,8 +15,7 @@
 			>
 		</div>
 		<button
-			class="absolute right-2 top-2 rounded-sm border border-gray-200 bg-white p-1 text-xs text-gray-600"
-			variant="outline"
+			class="absolute right-2 top-2 rounded-sm p-1 text-xs text-gray-600"
 			@click="copyTextContentToClipboard"
 		>
 			{{ copied ? 'copied' : 'copy' }}
@@ -31,16 +30,16 @@ export default {
 	props: {
 		textContent: {
 			type: String,
-			required: true
+			required: true,
 		},
 		breakLines: {
 			type: Boolean,
-			default: true
-		}
+			default: true,
+		},
 	},
 	data() {
 		return {
-			copied: false
+			copied: false,
 		};
 	},
 	methods: {
@@ -53,7 +52,7 @@ export default {
 				}, 4000);
 				toast.success('Copied to clipboard!');
 			});
-		}
-	}
+		},
+	},
 };
 </script>
diff --git a/dashboard/src/components/FilterControl.vue b/dashboard/src/components/FilterControl.vue
index 625680956e9..1fce282ca18 100644
--- a/dashboard/src/components/FilterControl.vue
+++ b/dashboard/src/components/FilterControl.vue
@@ -28,7 +28,6 @@
 </template>
 
 <script setup>
-import { DatePicker, TabButtons, DateTimePicker } from 'frappe-ui';
+import { DatePicker, TabButtons, DateTimePicker, FormControl } from 'frappe-ui';
 import LinkControl from './LinkControl.vue';
-import FormControl from 'frappe-ui/src/components/FormControl/FormControl.vue';
 </script>
diff --git a/dashboard/src/components/GitHubAppSelector.vue b/dashboard/src/components/GitHubAppSelector.vue
index e85c2a068ad..b74162cc8ed 100644
--- a/dashboard/src/components/GitHubAppSelector.vue
+++ b/dashboard/src/components/GitHubAppSelector.vue
@@ -16,7 +16,7 @@
 			variant="solid"
 			icon-left="github"
 			label="Connect To GitHub"
-			:link="options.installation_url + '?state=' + state"
+			:link="installationLink"
 		/>
 	</div>
 	<div v-else class="space-y-4">
@@ -58,10 +58,7 @@
 		</FormControl>
 		<span class="text-sm text-gray-600">
 			Don't see your organization?
-			<Link
-				:href="options.installation_url + '?state=' + state"
-				class="font-medium"
-			>
+			<Link :href="installationLink" class="font-medium">
 				Add from GitHub
 			</Link>
 		</span>
@@ -173,6 +170,11 @@ export default {
 		options() {
 			return {
 				url: 'press.api.github.options',
+				makeParams() {
+					return {
+						redirect_url: window.location.href,
+					};
+				},
 				auto: true,
 			};
 		},
@@ -184,16 +186,33 @@ export default {
 		clearAccessToken() {
 			return {
 				url: 'press.api.github.clear_token_and_get_installation_url',
-				onSuccess(installation_url) {
-					window.location.href = installation_url + '?state=' + this.state;
+				makeParams() {
+					return {
+						redirect_url: window.location.href,
+					};
+				},
+				onSuccess(installationData) {
+					window.location.href = this.getInstallationLink(installationData);
 				},
 			};
 		},
 	},
+	methods: {
+		getInstallationLink(installationData) {
+			if (!installationData?.installation_url || !installationData?.state) {
+				return null;
+			}
+
+			return `${installationData.installation_url}?state=${installationData.state}`;
+		},
+	},
 	computed: {
 		options() {
 			return this.$resources.options.data;
 		},
+		installationLink() {
+			return this.getInstallationLink(this.options);
+		},
 		appOwner() {
 			return this.selectedGithubUser?.login;
 		},
@@ -225,11 +244,6 @@ export default {
 				msg.includes('Bad credentials'),
 			);
 		},
-		state() {
-			let location = window.location.href;
-			let state = { team: this.$team.name, url: location };
-			return btoa(JSON.stringify(state));
-		},
 	},
 	created() {
 		this.onChangeBranchDebounce = debounce((val) => {
diff --git a/dashboard/src/components/ObjectListFilters.vue b/dashboard/src/components/ObjectListFilters.vue
index 5d90cf8508b..e0366fa12b0 100644
--- a/dashboard/src/components/ObjectListFilters.vue
+++ b/dashboard/src/components/ObjectListFilters.vue
@@ -6,10 +6,7 @@
 	</Button>
 	<component :is="$isMobile ? 'DialogWrapper' : 'div'" v-bind="wrapperProps">
 		<div
-			:class="[
-				'flex',
-				$isMobile ? 'flex-col gap-y-4' : 'items-center gap-4 pl-2',
-			]"
+			:class="['flex', $isMobile ? 'flex-col gap-y-4' : 'items-center gap-4']"
 		>
 			<template v-for="control in filterControls" :key="control.fieldname">
 				<component
diff --git a/dashboard/src/components/billing/BillingDetails.vue b/dashboard/src/components/billing/BillingDetails.vue
index 46ccba77634..793b19560da 100644
--- a/dashboard/src/components/billing/BillingDetails.vue
+++ b/dashboard/src/components/billing/BillingDetails.vue
@@ -9,7 +9,8 @@
 		/>
 		<NewAddressForm
 			ref="addressFormRef"
-			v-model="billingInformation"
+			:model-value="billingInformation"
+			@update:model-value="Object.assign(billingInformation, $event)"
 			@success="() => emit('success')"
 		/>
 		<ErrorMessage class="mt-2" :message="errorMessage" />
diff --git a/dashboard/src/components/billing/CardForm.vue b/dashboard/src/components/billing/CardForm.vue
index 504838d0b17..ada64977672 100644
--- a/dashboard/src/components/billing/CardForm.vue
+++ b/dashboard/src/components/billing/CardForm.vue
@@ -27,7 +27,8 @@
 				<NewAddressForm
 					ref="addressFormRef"
 					class="mt-5"
-					v-model="billingInformation"
+					:model-value="billingInformation"
+					@update:model-value="Object.assign(billingInformation, $event)"
 					:disable-form="props.disableAddressForm"
 					@success="console.log('Address form submitted')"
 				/>
diff --git a/dashboard/src/components/devtools/database/BinlogBrowserChart.vue b/dashboard/src/components/devtools/database/BinlogBrowserChart.vue
index 0e1f8da61ec..67131634bf6 100644
--- a/dashboard/src/components/devtools/database/BinlogBrowserChart.vue
+++ b/dashboard/src/components/devtools/database/BinlogBrowserChart.vue
@@ -1,182 +1,189 @@
 <template>
-    <div ref="chartDiv" v-show="!error" class="h-full w-full min-w-[300px] md:min-w-[400px] min-h-[300px]"></div>
-    <div v-show="error" class="flex h-full w-full items-center justify-center text-center text-red-500">
-        Error: {{ error }}
-    </div>
+	<div
+		ref="chartDiv"
+		v-show="!error"
+		class="h-full w-full min-w-[300px] md:min-w-[400px] min-h-[300px]"
+	></div>
+	<div
+		v-show="error"
+		class="flex h-full w-full items-center justify-center text-center text-red-500"
+	>
+		Error: {{ error }}
+	</div>
 </template>
 
 <script setup>
 import { init } from 'echarts';
 import {
-    computed,
-    ref,
-    onMounted,
-    onBeforeUnmount,
-    watch,
-    nextTick,
+	computed,
+	ref,
+	onMounted,
+	onBeforeUnmount,
+	watch,
+	nextTick,
 } from 'vue';
-import useAxisChartOptions from 'frappe-ui/src/components/Charts/axisChartOptions';
+import { useAxisChartOptions } from 'frappe-ui';
 
 const props = defineProps({
-    data: {
-        type: Array,
-        required: true,
-    },
-    onZoomEvent: {
-        type: Function,
-        required: false,
-    },
+	data: {
+		type: Array,
+		required: true,
+	},
+	onZoomEvent: {
+		type: Function,
+		required: false,
+	},
 });
 
 const error = ref('');
 const options = computed(() => {
-    try {
-        return useAxisChartOptions({
-            data: props.data,
-            xAxis: {
-                key: 'timestamp',
-                type: 'time',
-                title: 'Day',
-                timeGrain: 'minute',
-            },
-            yAxis: {
-                title: 'Count',
-            },
-            stacked: true,
-            series: [
-                { name: 'INSERT', type: 'bar' },
-                { name: 'UPDATE', type: 'bar' },
-                { name: 'DELETE', type: 'bar' },
-                { name: 'SELECT', type: 'bar' },
-                { name: 'OTHER', type: 'bar' },
-            ],
-            echartOptions: {
-                legend: { show: true },
-                toolbox: {
-                    show: true,
-
-                    feature: {
-                        dataZoom: {
-                            show: true,
-                            yAxisIndex: 'none',
-                            title: {
-                                zoom: 'Zoom',
-                            },
-                            icon: {
-                                zoom: 'image://data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIyNCIgaGVpZ2h0PSIyNCIgdmlld0JveD0iMCAwIDI0IDI0IiBmaWxsPSJub25lIiBzdHJva2U9IiMwMDAwMDAiIHN0cm9rZS13aWR0aD0iMiIgc3Ryb2tlLWxpbmVjYXA9InJvdW5kIiBzdHJva2UtbGluZWpvaW49InJvdW5kIiBjbGFzcz0ibHVjaWRlIGx1Y2lkZS16b29tLWluLWljb24gbHVjaWRlLXpvb20taW4iPjxjaXJjbGUgY3g9IjExIiBjeT0iMTEiIHI9IjgiLz48bGluZSB4MT0iMjEiIHgyPSIxNi42NSIgeTE9IjIxIiB5Mj0iMTYuNjUiLz48bGluZSB4MT0iMTEiIHgyPSIxMSIgeTE9IjgiIHkyPSIxNCIvPjxsaW5lIHgxPSI4IiB4Mj0iMTQiIHkxPSIxMSIgeTI9IjExIi8+PC9zdmc+',
-                                back: 'none',
-                            },
-                        },
-                        restore: {
-                            show: false, // This hides the reset/restore button
-                        },
-                    },
-                }
-            },
-        });
-    } catch (e) {
-        error.value = e.message;
-        return {};
-    }
+	try {
+		return useAxisChartOptions({
+			data: props.data,
+			xAxis: {
+				key: 'timestamp',
+				type: 'time',
+				title: 'Day',
+				timeGrain: 'minute',
+			},
+			yAxis: {
+				title: 'Count',
+			},
+			stacked: true,
+			series: [
+				{ name: 'INSERT', type: 'bar' },
+				{ name: 'UPDATE', type: 'bar' },
+				{ name: 'DELETE', type: 'bar' },
+				{ name: 'SELECT', type: 'bar' },
+				{ name: 'OTHER', type: 'bar' },
+			],
+			echartOptions: {
+				legend: { show: true },
+				toolbox: {
+					show: true,
+
+					feature: {
+						dataZoom: {
+							show: true,
+							yAxisIndex: 'none',
+							title: {
+								zoom: 'Zoom',
+							},
+							icon: {
+								zoom: 'image://data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIyNCIgaGVpZ2h0PSIyNCIgdmlld0JveD0iMCAwIDI0IDI0IiBmaWxsPSJub25lIiBzdHJva2U9IiMwMDAwMDAiIHN0cm9rZS13aWR0aD0iMiIgc3Ryb2tlLWxpbmVjYXA9InJvdW5kIiBzdHJva2UtbGluZWpvaW49InJvdW5kIiBjbGFzcz0ibHVjaWRlIGx1Y2lkZS16b29tLWluLWljb24gbHVjaWRlLXpvb20taW4iPjxjaXJjbGUgY3g9IjExIiBjeT0iMTEiIHI9IjgiLz48bGluZSB4MT0iMjEiIHgyPSIxNi42NSIgeTE9IjIxIiB5Mj0iMTYuNjUiLz48bGluZSB4MT0iMTEiIHgyPSIxMSIgeTE9IjgiIHkyPSIxNCIvPjxsaW5lIHgxPSI4IiB4Mj0iMTQiIHkxPSIxMSIgeTI9IjExIi8+PC9zdmc+',
+								back: 'none',
+							},
+						},
+						restore: {
+							show: false, // This hides the reset/restore button
+						},
+					},
+				},
+			},
+		});
+	} catch (e) {
+		error.value = e.message;
+		return {};
+	}
 });
 
 let chart;
 const chartDiv = ref();
 
 function debounce(func, wait) {
-    let timeout;
-    return function executedFunction(...args) {
-        const later = () => {
-            clearTimeout(timeout);
-            func(...args);
-        };
-        clearTimeout(timeout);
-        timeout = setTimeout(later, wait);
-    };
+	let timeout;
+	return function executedFunction(...args) {
+		const later = () => {
+			clearTimeout(timeout);
+			func(...args);
+		};
+		clearTimeout(timeout);
+		timeout = setTimeout(later, wait);
+	};
 }
 
 function onZoomEventHandler(event) {
-    if (!props.onZoomEvent) return;
-    if (!props.data || props.data.length < 2) return;
+	if (!props.onZoomEvent) return;
+	if (!props.data || props.data.length < 2) return;
 
-    const info = event.batch?.[0] || event;
+	const info = event.batch?.[0] || event;
 
-    let startValue, endValue;
+	let startValue, endValue;
 
-    if ('startValue' in info) {
-        startValue = info.startValue;
-        endValue = info.endValue;
-    } else {
-        const data = props.data;
-        const len = data.length;
+	if ('startValue' in info) {
+		startValue = info.startValue;
+		endValue = info.endValue;
+	} else {
+		const data = props.data;
+		const len = data.length;
 
-        const startIndex = Math.floor((info.start / 100) * (len - 1));
-        const endIndex = Math.floor((info.end / 100) * (len - 1));
+		const startIndex = Math.floor((info.start / 100) * (len - 1));
+		const endIndex = Math.floor((info.end / 100) * (len - 1));
 
-        startValue = data[startIndex].timestamp;
-        endValue = data[endIndex].timestamp;
-    }
+		startValue = data[startIndex].timestamp;
+		endValue = data[endIndex].timestamp;
+	}
 
-    // Find actual matching data entries
-    const data = props.data;
-    const startItem = data.find((d) => d.timestamp >= startValue) || data[0];
-    const endItem =
-        data.find((d) => d.timestamp >= endValue) || data[data.length - 1];
+	// Find actual matching data entries
+	const data = props.data;
+	const startItem = data.find((d) => d.timestamp >= startValue) || data[0];
+	const endItem =
+		data.find((d) => d.timestamp >= endValue) || data[data.length - 1];
 
-    props.onZoomEvent(startItem, endItem);
+	props.onZoomEvent(startItem, endItem);
 }
 
 const onZoomEventHandlerDebounced = debounce(onZoomEventHandler, 1000);
 
 function enableDataZoomSelectAutomatically() {
-    if (!chart) return;
-
-    const zr = chart.getZr();
-    zr.on('mousemove', function handler() {
-        chart.dispatchAction({
-            type: 'takeGlobalCursor',
-            key: 'dataZoomSelect',
-            dataZoomSelectActive: true,
-        });
-        zr.off('mousemove', handler); // Remove after trigerring the event
-    });
+	if (!chart) return;
+
+	const zr = chart.getZr();
+	zr.on('mousemove', function handler() {
+		chart.dispatchAction({
+			type: 'takeGlobalCursor',
+			key: 'dataZoomSelect',
+			dataZoomSelectActive: true,
+		});
+		zr.off('mousemove', handler); // Remove after trigerring the event
+	});
 }
 
 onMounted(() => {
-    if (!chartDiv.value) return;
-
-    chart = init(chartDiv.value, 'light', { renderer: 'svg' });
-    chart.setOption({ ...options.value }, true);
-
-    nextTick(() => {
-        enableDataZoomSelectAutomatically();
-    });
-
-    chart.on('datazoom', function (zoom) {
-        onZoomEventHandlerDebounced(zoom);
-    });
-
-    const resizeDebounce = debounce(() => {
-        chart.resize({
-            animation: {
-                duration: 300,
-            },
-        });
-    }, 250);
-
-    let resizeObserver = new ResizeObserver(resizeDebounce);
-    setTimeout(() => resizeObserver.observe(chartDiv.value), 500);
-    onBeforeUnmount(() => resizeObserver.unobserve(chartDiv.value));
+	if (!chartDiv.value) return;
+
+	chart = init(chartDiv.value, 'light', { renderer: 'svg' });
+	chart.setOption({ ...options.value }, true);
+
+	nextTick(() => {
+		enableDataZoomSelectAutomatically();
+	});
+
+	chart.on('datazoom', function (zoom) {
+		onZoomEventHandlerDebounced(zoom);
+	});
+
+	const resizeDebounce = debounce(() => {
+		chart.resize({
+			animation: {
+				duration: 300,
+			},
+		});
+	}, 250);
+
+	let resizeObserver = new ResizeObserver(resizeDebounce);
+	setTimeout(() => resizeObserver.observe(chartDiv.value), 500);
+	onBeforeUnmount(() => resizeObserver.unobserve(chartDiv.value));
 });
 
 watch(
-    () => options.value,
-    (newOptions) => {
-        if (chart) {
-            chart.setOption(newOptions, true);
-            enableDataZoomSelectAutomatically();
-        }
-    },
-    { deep: true },
+	() => options.value,
+	(newOptions) => {
+		if (chart) {
+			chart.setOption(newOptions, true);
+			enableDataZoomSelectAutomatically();
+		}
+	},
+	{ deep: true },
 );
 </script>
diff --git a/dashboard/src/components/group/UpdateReleaseGroupDialog.vue b/dashboard/src/components/group/UpdateReleaseGroupDialog.vue
index 24c8e7ce444..637f6eae1c7 100644
--- a/dashboard/src/components/group/UpdateReleaseGroupDialog.vue
+++ b/dashboard/src/components/group/UpdateReleaseGroupDialog.vue
@@ -23,6 +23,16 @@
 				title="A few commits have been yanked, <a href='https://docs.frappe.io/cloud/benches/updating_a_bench#yanked-app-releases' target='_blank' style='font-weight: bold;'>click here</a> to know more."
 				type="info"
 			/>
+			<AlertBanner
+				v-if="
+					benchDocResource.doc.deploy_information.apps.some((app) =>
+						app.releases.some((release) => release.is_mandatory),
+					)
+				"
+				class="mb-4"
+				title="A mandatory update is available. Please select the update to proceed."
+				type="info"
+			/>
 			<!-- Update Steps -->
 			<div class="space-y-4">
 				<!-- Select Apps Step -->
@@ -186,7 +196,7 @@ export default {
 
 			appData.forEach((app) => {
 				if (!app.releases?.length) {
-					app.__disabled = true;
+					app.disabled = true;
 				}
 			});
 
@@ -246,6 +256,7 @@ export default {
 										value: release.name,
 										timestamp: release.timestamp,
 										is_yanked: release.is_yanked,
+										is_mandatory: release.is_mandatory,
 									};
 								});
 							}
@@ -537,13 +548,16 @@ export default {
 					}
 				},
 				onSuccess(candidate) {
-					this.$router.push({
-						name: 'Deploy Candidate',
-						params: {
-							id: candidate,
-							name: this.bench,
-						},
-					});
+					// Backward compatibility in case we switch to the older deploy flow which returns a candidate
+					if (candidate) {
+						this.$router.push({
+							name: 'Deploy Candidate',
+							params: {
+								id: candidate,
+								name: this.bench,
+							},
+						});
+					}
 					this.show = false;
 					this.$emit('success', null);
 				},
diff --git a/dashboard/src/components/marketplace/AppListingStepsDialog.vue b/dashboard/src/components/marketplace/AppListingStepsDialog.vue
index 4ce29044e0b..0c791151edc 100644
--- a/dashboard/src/components/marketplace/AppListingStepsDialog.vue
+++ b/dashboard/src/components/marketplace/AppListingStepsDialog.vue
@@ -7,7 +7,7 @@
 		}"
 	>
 		<template #body-content>
-			<div v-if="appDoc.doc.review_stage === 'Ready for Review'">
+			<div v-if="appDoc.doc.status === 'In Review'">
 				<p class="text-p-base text-gray-700">
 					Your app is sent for review to our team. Please wait for the review to
 					be completed.
@@ -15,7 +15,7 @@
 			</div>
 			<ObjectList v-else :options="listOptions" />
 		</template>
-		<template #actions v-if="appDoc.doc.review_stage !== 'Ready for Review'">
+		<template #actions v-if="appDoc.doc.status !== 'In Review'">
 			<Button
 				class="w-full"
 				variant="solid"
diff --git a/dashboard/src/components/marketplace/CodeReview.vue b/dashboard/src/components/marketplace/CodeReview.vue
deleted file mode 100644
index d648fd85d8d..00000000000
--- a/dashboard/src/components/marketplace/CodeReview.vue
+++ /dev/null
@@ -1,297 +0,0 @@
-<template>
-	<Dialog
-		v-model="show"
-		:options="{
-			title: 'Code Review',
-			size: '6xl',
-		}"
-	>
-		<template v-if="getResults" #body-content>
-			<div class="container mx-auto px-4">
-				<div class="grid gap-3">
-					<div class="flex items-center mb-2">
-						<div class="flex items-center">
-							<span class="text-lg font-medium text-gray-700 mr-2"
-								>Status:</span
-							>
-							<Badge
-								:variant="'subtle'"
-								size="lg"
-								:label="$resources.codeScreening.doc.status"
-								:theme="getBadgeTheme"
-							/>
-						</div>
-						<!-- <Button
-							iconLeft="check"
-							v-if="
-								isSystemUser && $resources.codeScreening.doc.status == 'Open'
-							"
-							:variant="'subtle'"
-							theme="gray"
-							size="sm"
-							class="mr-4 ml-auto"
-							@click="approveRelease"
-						>
-							Approve Release
-						</Button>
-						<Button
-							iconLeft="x"
-							v-if="
-								isSystemUser && $resources.codeScreening.doc.status == 'Open'
-							"
-							:variant="'subtle'"
-							theme="gray"
-							size="sm"
-							class="mr-4"
-							@click="showRejectReleaseDialog = true"
-						>
-							Reject Release
-						</Button> -->
-					</div>
-					<Dialog
-						v-model="showRejectReleaseDialog"
-						:options="{
-							title: 'Confirm',
-							size: 'xl',
-							actions: [
-								{
-									label: 'Reject Release',
-									variant: 'solid',
-									onClick: rejectRelease,
-								},
-							],
-						}"
-					>
-						<template #body-content>
-							<FormControl
-								:type="'textarea'"
-								size="sm"
-								variant="subtle"
-								placeholder="Enter your reasons for rejection"
-								:disabled="false"
-								v-model="rejectionReason"
-							/>
-						</template>
-					</Dialog>
-
-					<div
-						class="card bg-white shadow-md rounded-md overflow-hidden"
-						v-for="file in getResults"
-						:key="file.name"
-					>
-						<div class="card-header bg-gray-200 p-3">
-							<h2 class="text-md font-semibold text-gray-800">
-								{{ file.name }} - {{ file.score }} issues
-							</h2>
-						</div>
-						<div class="p-4">
-							<div
-								class="issues space-y-4"
-								v-for="line in file.lines"
-								:key="line.context.line_number"
-							>
-								<div
-									class="issue-item p-4 mb-4"
-									v-for="issue in line.issues"
-									:key="issue.violation"
-								>
-									<div class="flex items-center mb-3">
-										<span class="text-red-600 mr-2">{{ issue.severity }}</span>
-										<span class="text-gray-800">({{ issue.violation }})</span>
-										<span class="text-orange-500 font-semibold pl-2">
-											- {{ issue.match }}</span
-										>
-									</div>
-									<div class="border border-gray-400 p-2 rounded-md">
-										<div
-											style="background-color: #d1f8d9"
-											class="border rounded-md"
-										>
-											<div
-												v-for="(lineText, i) in line.context.lines"
-												:key="i"
-												:class="{
-													'bg-yellow-200 border rounded-md':
-														lineText.includes(issue.match) &&
-														line.context.line_range[i] ===
-															line.context.line_number,
-												}"
-											>
-												<code class="p-2 text-sm whitespace-pre-wrap">
-													<span>{{ line.context.line_range[i] }}:</span>
-													{{ lineText }}
-												</code>
-											</div>
-										</div>
-										<div
-											v-if="
-												getCommentsForLine(file.name, line.context.line_number)
-													.length
-											"
-										>
-											<hr class="h-2 mt-2" />
-											<div
-												class="comment-item mt-2 p-2"
-												v-for="comment in getCommentsForLine(
-													file.name,
-													line.context.line_number,
-												)"
-												:key="comment.name"
-											>
-												<div class="flex items-center">
-													<Avatar
-														:shape="'circle'"
-														:image="null"
-														:label="comment.commented_by"
-														size="md"
-													/>
-
-													<strong class="text-gray-900 pl-2 pr-2 text-lg">
-														{{ comment.commented_by }}
-													</strong>
-													<Tooltip
-														:text="formatTime(comment.time)"
-														:placement="'top'"
-													>
-														<span class="text-gray-600 text-sm">
-															{{ $dayjs(comment.time).fromNow() }}
-														</span>
-													</Tooltip>
-												</div>
-												<p class="text-gray-800 text-base p-2 ml-6">
-													{{ comment.comment }}
-												</p>
-											</div>
-										</div>
-										<hr class="h-2 mt-2" />
-										<NewComment
-											v-if="$resources.codeScreening.doc.status == 'Open'"
-											:approval_request_name="row.approval_request_name"
-											:filename="file.name"
-											:line_number="line.context.line_number"
-											@comment-submitted="handleCommentSubmitted"
-										/>
-									</div>
-								</div>
-							</div>
-						</div>
-					</div>
-				</div>
-			</div>
-		</template>
-	</Dialog>
-</template>
-
-<script>
-import NewComment from './NewComment.vue';
-import { toast } from 'vue-sonner';
-
-export default {
-	components: {
-		NewComment,
-	},
-	props: ['row', 'app', 'isSystemUser'],
-	data() {
-		return {
-			show: true,
-			showRejectReleaseDialog: false,
-			rejectionReason: '',
-		};
-	},
-	computed: {
-		getResults() {
-			if (this.$resources.codeScreening.doc) {
-				const results = JSON.parse(this.$resources.codeScreening.doc.result);
-				return results;
-			}
-		},
-		getComments() {
-			if (this.$resources.codeScreening.doc) {
-				const results = this.$resources.codeScreening.doc.code_comments;
-				return results;
-			}
-		},
-		getBadgeTheme() {
-			const status = this.$resources.codeScreening.doc.status.toLowerCase();
-			if (status === 'open') {
-				return 'blue';
-			} else if (status === 'approved') {
-				return 'green';
-			} else {
-				return 'red';
-			}
-		},
-	},
-	methods: {
-		getCommentsForLine(filename, lineNumber) {
-			// Filter comments by matching filename and line number
-			let filteredComments = this.getComments.filter(
-				(comment) =>
-					comment.filename === filename && comment.line_number === lineNumber,
-			);
-
-			// Sort comments by time in descending order (latest first)
-			filteredComments.sort((a, b) => new Date(a.time) - new Date(b.time));
-
-			return filteredComments;
-		},
-		formatTime(time) {
-			const date = new Date(time);
-			return date.toLocaleString('en-US', {
-				year: 'numeric',
-				month: 'short',
-				day: 'numeric',
-				hour: '2-digit',
-				minute: '2-digit',
-				second: '2-digit',
-				hour12: true,
-			});
-		},
-		handleCommentSubmitted() {
-			// DB write takes sometime. Instant reload wont be able to reflect changes so quickly. Ideally the cache should be updadted client side
-			setTimeout(() => {
-				this.$resources.codeScreening.reload();
-			}, 1200);
-		},
-		approveRelease() {
-			this.$resources.codeScreening.setValue.submit({
-				status: 'Approved',
-				reviewed_by: this.$team?.doc?.user,
-			});
-		},
-		rejectRelease() {
-			// Check if the rejection reason is empty
-			if (!this.rejectionReason) {
-				toast.error('Reason for rejection is mandatory');
-				return;
-			}
-			// Proceed with the rejection if the reason is provided
-			this.$resources.codeScreening.setValue.submit({
-				status: 'Rejected',
-				reason_for_rejection: this.rejectionReason,
-				reviewed_by: this.$team?.doc?.user,
-			});
-			this.showRejectReleaseDialog = false;
-		},
-	},
-	resources: {
-		codeScreening() {
-			return {
-				type: 'document',
-				doctype: 'App Release Approval Request',
-				name: this.row.approval_request_name,
-				fields: [
-					'name',
-					'marketplace_app',
-					'screening_status',
-					'app_release',
-					'status',
-					'result',
-					'code_comments',
-				],
-				auto: true,
-			};
-		},
-	},
-};
-</script>
diff --git a/dashboard/src/components/marketplace/NewComment.vue b/dashboard/src/components/marketplace/NewComment.vue
deleted file mode 100644
index 9384c5f455f..00000000000
--- a/dashboard/src/components/marketplace/NewComment.vue
+++ /dev/null
@@ -1,57 +0,0 @@
-<template>
-	<div v-if="show" class="p-2">
-		<FormControl
-			:type="'textarea'"
-			size="sm"
-			variant="subtle"
-			placeholder="Enter your comments here"
-			:disabled="false"
-			label="Comment"
-			v-model="newComment"
-		/>
-		<div class="flex justify-end mt-2">
-			<Button
-				:variant="'solid'"
-				theme="gray"
-				size="sm"
-				@click="submitComment"
-				:disabled="!newComment.trim()"
-			>
-				Comment
-			</Button>
-		</div>
-	</div>
-</template>
-
-<script>
-export default {
-	props: ['approval_request_name', 'filename', 'line_number'],
-	data() {
-		return {
-			show: true,
-			newComment: '',
-		};
-	},
-	methods: {
-		submitComment() {
-			const commentData = {
-				name: this.approval_request_name,
-				filename: this.filename,
-				line_number: this.line_number,
-				comment: this.newComment,
-			};
-			this.$resources.addComment.submit(commentData);
-			this.newComment = '';
-			this.$emit('comment-submitted');
-		},
-	},
-	resources: {
-		addComment() {
-			return {
-				url: 'press.api.marketplace.add_code_review_comment',
-				method: 'POST',
-			};
-		},
-	},
-};
-</script>
diff --git a/dashboard/src/components/navigation/search/utils.ts b/dashboard/src/components/navigation/search/utils.ts
index c20c256cf3e..8bd13d51fff 100644
--- a/dashboard/src/components/navigation/search/utils.ts
+++ b/dashboard/src/components/navigation/search/utils.ts
@@ -31,11 +31,16 @@ export const filterLabels = (data, query) => {
 };
 
 export const useSearch = async () => {
-	const { meta_k } = useMagicKeys();
-
-	whenever(meta_k, (n) => {
-		if (n) searchModalOpen.value = true;
+	const { meta_k, ctrl_k } = useMagicKeys({
+		passive: false,
+		onEventFired(e) {
+			if (e.key === 'k' && (e.metaKey || e.ctrlKey) && e.type === 'keydown')
+				e.preventDefault();
+		},
 	});
 
+	whenever(meta_k, (n) => { if (n) searchModalOpen.value = true; });
+	whenever(ctrl_k, (n) => { if (n) searchModalOpen.value = true; });
+
 	addIntegrations();
 };
diff --git a/dashboard/src/components/navigation/sidebar/Item.vue b/dashboard/src/components/navigation/sidebar/Item.vue
index 4744257a210..a9cad3515ac 100644
--- a/dashboard/src/components/navigation/sidebar/Item.vue
+++ b/dashboard/src/components/navigation/sidebar/Item.vue
@@ -10,9 +10,9 @@ let props = defineProps({
 <template>
 	<router-link
 		:to="item.route"
-		class="flex items-center rounded px-3 py-2 text-ink-gray-6 transition gap-2"
+		class="flex items-center rounded px-2 py-1.5 text-ink-gray-6 transition gap-2"
 		:class="[
-			item.isActive ? 'bg-white shadow-sm' : 'hover:bg-surface-gray-3',
+			item.isActive ? 'bg-white shadow-sm' : 'hover:bg-surface-gray-2',
 			item.disabled ? 'pointer-events-none opacity-50' : '',
 			$attrs.class,
 		]"
diff --git a/dashboard/src/components/navigation/sidebar/ItemGroup.vue b/dashboard/src/components/navigation/sidebar/ItemGroup.vue
index 9f90c053516..98aa89fb099 100644
--- a/dashboard/src/components/navigation/sidebar/ItemGroup.vue
+++ b/dashboard/src/components/navigation/sidebar/ItemGroup.vue
@@ -28,7 +28,7 @@ watch(
 <template>
 	<div
 		@click="toggle"
-		class="mt-0.5 flex cursor-pointer select-none items-center rounded px-3 py-2 text-ink-gray-6 transition hover:bg-gray-100"
+		class="flex cursor-pointer select-none items-center rounded px-2.5 py-1.5 text-ink-gray-6 transition hover:bg-surface-gray-2"
 		:class="[
 			item.disabled ? 'pointer-events-none opacity-50' : '',
 			$attrs.class,
@@ -49,7 +49,7 @@ watch(
 	</div>
 	<CollapseTransition>
 		<div v-if="isOpened">
-			<div class="ml-5 py-1">
+			<div class="ml-5 flex flex-col gap-1">
 				<Item
 					v-for="(subItem, i) in item.children"
 					:class="{ 'mt-0.5': i !== 0 }"
diff --git a/dashboard/src/components/navigation/sidebar/NavList.vue b/dashboard/src/components/navigation/sidebar/NavList.vue
index 1ee71fa5429..c48adffe44c 100644
--- a/dashboard/src/components/navigation/sidebar/NavList.vue
+++ b/dashboard/src/components/navigation/sidebar/NavList.vue
@@ -63,7 +63,7 @@ const navigation = computed(() => {
 			name: 'Sites',
 			icon: PanelTopInactive,
 			route: '/sites',
-			class: 'mt-2',
+			class: 'mt-1.5',
 			isActive:
 				['Site List', 'Site Detail', 'New Site'].includes(routeName) ||
 				routeName.startsWith('Site Detail'),
diff --git a/dashboard/src/components/navigation/sidebar/Notifications.vue b/dashboard/src/components/navigation/sidebar/Notifications.vue
index 03e5ea89361..05b610807ec 100644
--- a/dashboard/src/components/navigation/sidebar/Notifications.vue
+++ b/dashboard/src/components/navigation/sidebar/Notifications.vue
@@ -190,14 +190,14 @@ const tabs = [
 <template>
 	<Popover
 		:placement="$isMobile ? 'top-start' : 'right-start'"
-		popover-class="fixed -mt-[16%]"
+		popover-class="-mt-[16%] md:-mt-2"
 	>
 		<!-- sidebar item -->
 		<template #target="{ togglePopover }">
 			<button
 				aria-label="Notifications btn"
 				@click="togglePopover"
-				class="flex items-center rounded px-2.5 py-1.5 md:px-3 md:py-2 text-ink-gray-6 transition gap-2 hover:bg-surface-gray-3 w-full"
+				class="flex items-center rounded px-2 py-1.5 text-ink-gray-6 transition gap-2 hover:bg-surface-gray-2 w-full"
 				:class="[
 					item.disabled ? 'pointer-events-none opacity-50' : '',
 					$attrs.class,
@@ -229,7 +229,7 @@ const tabs = [
 		<!-- floating drawer  -->
 		<template #body="{ togglePopover }">
 			<div
-				class="text-ink-gray-9 bg-white h-screen w-screen md:ml-2 shadow-xl md:w-[430px] flex flex-col"
+				class="text-ink-gray-9 bg-white h-screen -ml-2.5 w-screen md:ml-2 shadow-xl md:w-[430px] flex flex-col"
 			>
 				<!-- header -->
 				<div class="text-base flex items-center py-2 pl-4 pr-2 border-b">
diff --git a/dashboard/src/components/navigation/sidebar/SearchItem.vue b/dashboard/src/components/navigation/sidebar/SearchItem.vue
index 4ce94780aba..9b61db45c52 100644
--- a/dashboard/src/components/navigation/sidebar/SearchItem.vue
+++ b/dashboard/src/components/navigation/sidebar/SearchItem.vue
@@ -1,18 +1,16 @@
 <script setup lang="ts">
 import LucideSearch from '~icons/lucide/search';
-import LucideCommand from '~icons/lucide/command';
 import { searchModalOpen } from '@/data/ui';
+import { isMac } from '@/utils/device';
 </script>
 
 <template>
 	<button
-		class="flex items-center rounded px-2.5 py-1.5 md:px-3 md:py-2 text-ink-gray-6 transition gap-2 text-sm w-full mt-1 hover:bg-surface-gray-3"
+		class="flex items-center rounded px-2 py-1.5 text-ink-gray-6 transition gap-1 text-sm w-full md:mt-1 hover:bg-surface-gray-2"
 		@click="() => (searchModalOpen = true)"
 	>
-		<LucideSearch class="size-4 text-ink-gray-6" />
-		<span class="text-left mr-auto"> Search</span>
-
-		<LucideCommand class="size-3.5 text-ink-gray-6" />
-		<span class="text-xs">K</span>
+		<LucideSearch class="size-4 text-ink-gray-6 mr-1" />
+		<span class="text-left mr-auto">Search</span>
+		<span class="text-xs"> {{ isMac() ? '⌘ K' : 'Ctrl+K' }}</span>
 	</button>
 </template>
diff --git a/dashboard/src/components/navigation/sidebar/Sidebar.vue b/dashboard/src/components/navigation/sidebar/Sidebar.vue
index 9a5342f40bf..2411b04e857 100644
--- a/dashboard/src/components/navigation/sidebar/Sidebar.vue
+++ b/dashboard/src/components/navigation/sidebar/Sidebar.vue
@@ -41,7 +41,7 @@ const releaseNotes = () => {
 
 <template>
 	<div
-		class="relative flex min-h-screen w-[220px] flex-col border-r bg-gray-50 p-2"
+		class="relative flex min-h-screen w-[220px] flex-col gap-1 border-r bg-gray-50 p-2"
 	>
 		<Dropdown
 			:options="[
@@ -62,7 +62,7 @@ const releaseNotes = () => {
 		>
 			<template v-slot="{ open }">
 				<button
-					class="flex w-[204px] items-center rounded-md p-2 text-left"
+					class="flex items-center rounded-md p-1 text-left"
 					:class="open ? 'bg-white shadow-sm' : 'hover:bg-gray-200'"
 				>
 					<FCLogo class="mb-1 h-8 w-8 shrink-0 rounded" />
diff --git a/dashboard/src/components/partners/LeadDetailsDialog.vue b/dashboard/src/components/partners/LeadDetailsDialog.vue
index 333445e5c27..de9b1da0210 100644
--- a/dashboard/src/components/partners/LeadDetailsDialog.vue
+++ b/dashboard/src/components/partners/LeadDetailsDialog.vue
@@ -1,7 +1,11 @@
 <template>
 	<Dialog v-model="show" :options="{ title: 'Lead Details', size: '2xl' }">
 		<template #body-content>
-			<LeadDetailsForm @success="() => emit('success')" v-model="leadInfo" />
+			<LeadDetailsForm
+				@success="() => emit('success')"
+				:model-value="leadInfo"
+				@update:model-value="Object.assign(leadInfo, $event)"
+			/>
 		</template>
 	</Dialog>
 </template>
diff --git a/dashboard/src/components/partners/LinkCertificate.vue b/dashboard/src/components/partners/LinkCertificate.vue
index ddcfed047ea..4199c1edfa5 100644
--- a/dashboard/src/components/partners/LinkCertificate.vue
+++ b/dashboard/src/components/partners/LinkCertificate.vue
@@ -61,8 +61,8 @@ import { createResource, frappeRequest, debounce } from 'frappe-ui';
 import { toast } from 'vue-sonner';
 
 const courseTypes = [
-	{ label: 'Framework', value: 'frappe-developer-certification' },
-	{ label: 'ERPNext', value: 'erpnext-distribution' },
+	{ label: 'Framework', value: 'frappe' },
+	{ label: 'ERPNext', value: 'erpnext' },
 ];
 const show = ref(true);
 
@@ -99,7 +99,7 @@ const emailChange = debounce(async () => {
 		url: 'press.api.partner.check_certificate_exists',
 		params: {
 			email: userEmail.value,
-			type: certificateType.value,
+			certificate_type: certificateType.value,
 		},
 	});
 	if (response > 0) {
diff --git a/dashboard/src/components/partners/PartnerOverview.vue b/dashboard/src/components/partners/PartnerOverview.vue
index 6edd3f06510..f5ed5348347 100644
--- a/dashboard/src/components/partners/PartnerOverview.vue
+++ b/dashboard/src/components/partners/PartnerOverview.vue
@@ -136,22 +136,43 @@
 		>
 			<template #body-content>
 				<p
-					class="text-base leading-relaxed text-red-800 bg-red-50 border border-red-500 rounded p-4"
+					class="text-base leading-relaxed align-center tracking-wide text-gray-700"
 				>
-					Your current MRR does not meet the minimum requirement for Partnership
-					renewal.
+					<LucideAlertTriangle class="inline h-4 w-4 text-red-500" />
+					You do not meet the Partnership renewal criteria.
 				</p>
-				<div class="flex gap-4 my-4">
-					<div class="flex-1 flex-col border-2 rounded bg-surface-gray-1 p-4">
-						<div class="text-base text-gray-600 mb-2">Current MRR</div>
-						<div class="text-xl font-semibold text-red-600">
-							{{ formatCurrency(mrr) }}
+				<div class="flex my-4 gap-4">
+					<div
+						class="flex-1 justify-center text-left p-5 rounded-md bg-gray-50"
+					>
+						<div class="flex flex-col gap-2">
+							<p>
+								<span class="font-semibold text-3xl">{{
+									formatCurrency(mrr)
+								}}</span
+								><span class="text-base text-gray-600">
+									/
+									{{
+										formatCurrency(team.doc.currency === 'USD' ? 100 : 10000)
+									}}</span
+								>
+							</p>
+							<div class="font-normal text-gray-700 tracking-wide">MRR</div>
 						</div>
 					</div>
-					<div class="flex-1 flex-col border-2 rounded bg-surface-gray-1 p-4">
-						<div class="text-base text-gray-600 mb-2">Required MRR</div>
-						<div class="text-xl font-semibold text-gray-900">
-							{{ formatCurrency(team.doc.currency === 'USD' ? 100 : 10000) }}
+					<div
+						class="flex-1 justify-center text-left p-5 rounded-md bg-gray-50"
+					>
+						<div class="flex flex-col gap-2">
+							<p>
+								<span class="font-semibold text-3xl">{{
+									partnerDetails.data?.custom_number_of_certified_members || 0
+								}}</span
+								><span class="text-base text-gray-600"> / 2</span>
+							</p>
+							<div class="font-normal text-gray-700 tracking-wide">
+								Certifications
+							</div>
 						</div>
 					</div>
 				</div>
@@ -260,8 +281,9 @@ const partnerMRR = createResource({
 function canRenew() {
 	// Allow renewal if mrr is greater than $100 or 10000 INR
 	if (
-		(team.doc.currency === 'USD' && mrr.value >= 100) ||
-		(team.doc.currency === 'INR' && mrr.value >= 10000)
+		((team.doc.currency === 'USD' && mrr.value >= 100) ||
+			(team.doc.currency === 'INR' && mrr.value >= 10000)) &&
+		partnerDetails.data?.custom_number_of_certified_members >= 2
 	) {
 		showRenewalConfirmationDialog.value = true;
 	} else {
@@ -394,7 +416,7 @@ const formatCurrency = (amount) => {
 	return new Intl.NumberFormat('en-US', {
 		style: 'currency',
 		currency: team.doc.currency,
-		maximumFractionDigits: 2,
+		maximumFractionDigits: 1,
 	}).format(amount);
 };
 
diff --git a/dashboard/src/components/server/ConfigureAutomatedScaling.vue b/dashboard/src/components/server/ConfigureAutomatedScaling.vue
index df1c9282008..d0bee438102 100644
--- a/dashboard/src/components/server/ConfigureAutomatedScaling.vue
+++ b/dashboard/src/components/server/ConfigureAutomatedScaling.vue
@@ -62,7 +62,7 @@
 
 <script>
 import { getCachedDocumentResource } from 'frappe-ui';
-import Button from 'frappe-ui/src/components/Button/Button.vue';
+import { Button } from 'frappe-ui';
 import { h } from 'vue';
 import { toast } from 'vue-sonner';
 import { confirmDialog } from '../../utils/components';
diff --git a/dashboard/src/components/settings/RoleList.vue b/dashboard/src/components/settings/RoleList.vue
index f63388d8a0a..b083ae5d3c6 100644
--- a/dashboard/src/components/settings/RoleList.vue
+++ b/dashboard/src/components/settings/RoleList.vue
@@ -17,7 +17,8 @@
 		<Switch
 			v-model="relaxedPermissions"
 			label="Relaxed Permissions"
-			description="Users without a role can access resources without restrictions if this feature is enabled. Use with caution. This will be deprecated in the future and removed eventually. Please prefer creating roles and assigning users to them for better access control."
+			description="Users without a role can access resources without restrictions if this feature is enabled.
+      Use with caution. <br/> This will be deprecated in the future and removed eventually. Please prefer creating roles and assigning users to them for better access control."
 			class="border rounded px-5 py-4 bg-yellow-50"
 		/>
 		<div class="grid grid-cols-3 gap-4 text-base">
@@ -31,7 +32,7 @@
 				}"
 			>
 				<div
-					class="px-5 py-4 space-y-3 rounded shadow cursor-pointer hover:shadow-lg transition"
+					class="p-4 space-y-3 rounded shadow cursor-pointer hover:shadow-lg transition"
 				>
 					<div class="font-medium h-6">{{ role.title }}</div>
 					<div class="h-6 flex flex-wrap gap-1">
diff --git a/dashboard/src/components/settings/profile/AccountPartner.vue b/dashboard/src/components/settings/profile/AccountPartner.vue
index 6720a86976e..dbfbdd42918 100644
--- a/dashboard/src/components/settings/profile/AccountPartner.vue
+++ b/dashboard/src/components/settings/profile/AccountPartner.vue
@@ -49,27 +49,34 @@
 			v-model="showAddPartnerCodeDialog"
 		>
 			<template v-slot:body-content>
-				<p class="pb-2 text-p-base">
+				<p class="mb-4 text-p-base">
 					Enter the partner code provided by your Partner
 				</p>
-				<div class="rounded border border-gray-200 bg-gray-100 p-2 mb-4">
-					<span class="text-sm leading-[1.5] text-gray-700">
+
+				<div
+					class="rounded bg-gray-100 p-4 mb-4 pb-2 prose prose-sm text-gray-700"
+				>
+					<p>
 						<strong>Note</strong>: After linking with Partner, following details
 						shall be shared with your partner team:
-						<br />
+					</p>
+
+					<ul class="list-disc pl-5">
 						<li>Billing name</li>
 						<li>Monthly billing amount</li>
-					</span>
+					</ul>
 				</div>
 				<FormControl
 					placeholder="e.g. rGjw3hJ81b"
 					v-model="code"
 					@input="referralCodeChange"
 				/>
-				<div class="mt-1">
-					<div v-if="partnerExists" class="text-sm text-green-600" role="alert">
-						Referral Code {{ code }} belongs to {{ partner }}
-					</div>
+				<div
+					v-if="partnerExists"
+					class="mt-3 text-sm text-green-600"
+					role="alert"
+				>
+					Referral Code {{ code }} belongs to {{ partner }}
 				</div>
 			</template>
 		</Dialog>
@@ -94,7 +101,7 @@
 				<div class="text-p-base pb-2">
 					This will remove the Partner associated with your account. Are you
 					sure you want to remove the Partner? <br /><br />
-					<div class="text-gray-800 bg-gray-200 p-2 rounded-md">
+					<div class="text-gray-800 bg-gray-200 p-3 rounded-md">
 						Your partner will no longer have access to your sites and servers
 						and will be removed as team member from your team.
 					</div>
diff --git a/dashboard/src/components/settings/profile/AccountProfile.vue b/dashboard/src/components/settings/profile/AccountProfile.vue
index 5df308eeeb6..350c1b34059 100644
--- a/dashboard/src/components/settings/profile/AccountProfile.vue
+++ b/dashboard/src/components/settings/profile/AccountProfile.vue
@@ -60,6 +60,7 @@
 				</template>
 			</ListItem>
 			<ListItem
+				class="border-t"
 				:title="user.is_2fa_enabled ? 'Disable 2FA' : 'Enable 2FA'"
 				:subtitle="
 					user.is_2fa_enabled
diff --git a/dashboard/src/components/site/SiteAnalytics.vue b/dashboard/src/components/site/SiteAnalytics.vue
index 9f88bc9a63e..9e152cbb39e 100644
--- a/dashboard/src/components/site/SiteAnalytics.vue
+++ b/dashboard/src/components/site/SiteAnalytics.vue
@@ -93,8 +93,11 @@
 
 			<AnalyticsCard title="Uptime" @share-card="shareDashboard">
 				<SiteUptime
+					:site="name"
+					:timegrain="$resources.analytics?.data?.timegrain"
 					:data="$resources.analytics?.data?.uptime"
 					:loading="$resources.analytics.loading"
+					@datazoom="handleDataZoom"
 					class="h-[15.55rem] p-2 pb-3"
 				/>
 			</AnalyticsCard>
diff --git a/dashboard/src/components/site/SiteLogs.vue b/dashboard/src/components/site/SiteLogs.vue
index 810975d6299..83fb60aa17e 100644
--- a/dashboard/src/components/site/SiteLogs.vue
+++ b/dashboard/src/components/site/SiteLogs.vue
@@ -1,5 +1,5 @@
 <template>
-	<ObjectList class="p-5" :options="logsOptions" />
+	<ObjectList class="p-3" :options="logsOptions" />
 </template>
 
 <script>
diff --git a/dashboard/src/components/site/SiteMigration.vue b/dashboard/src/components/site/SiteMigration.vue
index 6911e6393ed..14caa7877ee 100644
--- a/dashboard/src/components/site/SiteMigration.vue
+++ b/dashboard/src/components/site/SiteMigration.vue
@@ -255,10 +255,14 @@
 	</Dialog>
 </template>
 <script>
-import { getCachedDocumentResource, Select, Checkbox } from 'frappe-ui';
+import {
+	getCachedDocumentResource,
+	Select,
+	Checkbox,
+	FormControl,
+} from 'frappe-ui';
 import AlertBanner from '../AlertBanner.vue';
 import GenericList from '../GenericList.vue';
-import FormControl from 'frappe-ui/src/components/FormControl/FormControl.vue';
 import { dayjsIST } from '../../utils/dayjs';
 
 export default {
diff --git a/dashboard/src/components/site/SiteUptime.vue b/dashboard/src/components/site/SiteUptime.vue
index 2cf85d8760f..e62a1cbd66e 100644
--- a/dashboard/src/components/site/SiteUptime.vue
+++ b/dashboard/src/components/site/SiteUptime.vue
@@ -19,14 +19,10 @@
 								class="contrast-75 font-bold"
 								:class="hoveringOn.colour || []"
 							>
-								{{
-									(hoveringOn.value * 100).toFixed(
-										hoveringOn.value === 0 || hoveringOn.value === 1 ? 0 : 2,
-									)
-								}}%
+								{{ hoveringOn.percentValue }}%
 							</span>
 							<span class="opacity-30">&#x2022;</span>
-							{{ hoveringOn.prettyDate }}
+							{{ hoveringOn.endDate }}
 						</template>
 					</div>
 					<div class="text-[11px] whitespace-nowrap flex gap-1 items-center">
@@ -72,8 +68,8 @@
 								:style="`width: ${barWidth};`"
 								:class="[
 									'hover:brightness-[110%] border-r border-white',
-									d.value === undefined
-										? 'bg-gray-100'
+									Date.parse(d.date) < Date.parse(siteCreation || new Date(0))
+										? 'bg-gray-300'
 										: d.value === 1
 											? 'bg-green-500'
 											: d.value === 0
@@ -83,9 +79,14 @@
 							>
 								<Tooltip
 									placement="bottom"
-									:text="`${hoveringOn.percentValue}% aggregated for ~${interval} (until ${hoveringOn.prettyDate})`"
+									:text="`${hoveringOn.percentValue}% avg. uptime for ${interval} from ${hoveringOn.startDate} to ${hoveringOn.endDate})`"
 								>
-									<div class="h-full w-full" />
+									<div
+										:data-start-date="hoveringOn.startDate"
+										:data-end-date="hoveringOn.endDate"
+										@click="updateTsFilter"
+										class="h-full w-full"
+									/>
 								</Tooltip>
 							</div>
 						</div>
@@ -125,17 +126,18 @@
 <script>
 import dayjs from '../../utils/dayjs';
 import { icon } from '../../utils/components';
-import { Tooltip, debounce } from 'frappe-ui';
+import { Tooltip, getCachedDocumentResource } from 'frappe-ui';
 import { uuid4 } from '@sentry/core';
 
 export default {
 	name: 'SiteUptime',
-	props: ['data', 'loading'],
+	props: ['data', 'loading', 'timegrain', 'site'],
 	components: {
 		Help: icon('help-circle'),
 		Right: icon('arrow-right'),
 		Left: icon('arrow-left'),
 	},
+	emits: ['datazoom'],
 	data() {
 		return {
 			carouselId: uuid4(),
@@ -146,15 +148,18 @@ export default {
 				key: null, // (== date)
 				value: null,
 				percentValue: null,
-				prettyDate: null,
+				endDate: null,
+				startDate: null,
 				colour: null,
 			},
 			highlightDates: false,
 			firstRender: true,
+			siteCreation: null,
 		};
 	},
-	mounted() {
-		setTimeout(() => {}, 2000);
+	created() {
+		const site = getCachedDocumentResource('Site', this.site);
+		this.siteCreation = site?.doc?.creation;
 	},
 	beforeUnmount() {
 		const el = this.$refs.scrollContainer;
@@ -167,7 +172,11 @@ export default {
 			for (; i < this.filteredData.length; i++) {
 				// there could be empty objects at the end of the array
 				// so we don't have to count them
-				if (typeof this.filteredData[i].value !== 'number') break;
+				if (
+					typeof this.filteredData[i].value !== 'number' ||
+					this.filteredData[i].value === -1
+				)
+					continue;
 
 				total += this.filteredData[i].value;
 			}
@@ -176,18 +185,18 @@ export default {
 			return !isNaN(average) ? `${average}% Overall Uptime` : '';
 		},
 		interval() {
-			if (!this.filteredData || this.filteredData.length < 2) return '';
+			if (
+				!this.filteredData ||
+				typeof this.timegrain != 'number' ||
+				this.filteredData.length < 2
+			)
+				return '';
 
-			const first = dayjs(this.filteredData[0].date);
-			const second = dayjs(this.filteredData[1].date);
-
-			const diffMs = second.diff(first);
-
-			return dayjs.duration(diffMs).humanize();
+			return dayjs.duration(this.timegrain * 1000).humanize();
 		},
 		filteredData() {
 			if (!this.data?.length) return [];
-			const filtered = this.data.filter((obj) => !!obj.value);
+			const filtered = this.data.filter((obj) => typeof obj.value == 'number');
 			this.chunkSize = this.getOptimalChunkSizeFromDataLength(filtered.length);
 			return filtered;
 		},
@@ -224,20 +233,34 @@ export default {
 		},
 	},
 	methods: {
+		updateTsFilter(evt) {
+			const { startDate, endDate } = evt.target.dataset;
+			this.$emit('datazoom', { startDate, endDate });
+		},
 		formatDate(date) {
 			return dayjs(date).format('ddd, D MMM YYYY, hh:mm a');
 		},
 		inspectBar({ date, value }) {
-			const prettyDate = this.formatDate(date);
-			const percentValue = (value * 100).toFixed(2);
+			const endDate = this.formatDate(date);
+			const startDate = this.formatDate(new Date(date) - this.timegrain * 1000);
+			const percentValue = value !== -1 ? (value * 100).toFixed(2) : '0.00';
 			const colour =
-				value === 1
-					? 'text-green-500'
-					: value === 0
-						? 'text-red-500'
-						: 'text-yellow-500';
+				Date.parse(date) < Date.parse(this.siteCreation)
+					? ''
+					: value === 1
+						? 'text-green-500'
+						: value > 0
+							? 'text-yellow-500'
+							: 'text-red-500';
 
-			this.hoveringOn = { key: date, value, percentValue, prettyDate, colour };
+			this.hoveringOn = {
+				key: date,
+				value,
+				percentValue,
+				endDate,
+				startDate,
+				colour,
+			};
 		},
 		getUptimeChunkId(chunkIndex) {
 			return `uptime-${this.carouselId}-${chunkIndex}`;
@@ -246,7 +269,9 @@ export default {
 			this.hoveringOn = {
 				key: null,
 				value: null,
-				prettyDate: null,
+				endDate: null,
+				percentValue: null,
+				startDate: null,
 				colour: null,
 			};
 		},
diff --git a/dashboard/src/components/site/SiteVersionUpgradeDialog.vue b/dashboard/src/components/site/SiteVersionUpgradeDialog.vue
index f694cbb1af9..6b329319a05 100644
--- a/dashboard/src/components/site/SiteVersionUpgradeDialog.vue
+++ b/dashboard/src/components/site/SiteVersionUpgradeDialog.vue
@@ -311,11 +311,7 @@
 import { getCachedDocumentResource, LoadingIndicator } from 'frappe-ui';
 import { toast } from 'vue-sonner';
 import AlertBanner from '../AlertBanner.vue';
-import DateTimePicker from 'frappe-ui/src/components/DatePicker/DateTimePicker.vue';
-import dayjs from '../../utils/dayjs';
-
-const PICKER_DATETIME_FORMAT = 'YYYY-MM-DD h:mm a';
-const IST_TIMEZONE = 'Asia/Calcutta';
+import { DateTimePicker } from 'frappe-ui';
 
 export default {
 	name: 'SiteVersionUpgradeDialog',
diff --git a/dashboard/src/components/utils/CommitChooser.vue b/dashboard/src/components/utils/CommitChooser.vue
index 259e719417b..ec942ea2ca5 100644
--- a/dashboard/src/components/utils/CommitChooser.vue
+++ b/dashboard/src/components/utils/CommitChooser.vue
@@ -75,6 +75,12 @@
 							>
 								{{ option.label }}
 							</span>
+							<span
+								v-if="option.is_mandatory"
+								class="text-xs text-blue-500 font-medium"
+							>
+								Mandatory
+							</span>
 							<span
 								v-if="option.is_yanked"
 								class="text-xs text-red-500 font-medium"
@@ -96,8 +102,7 @@
 </template>
 
 <script>
-import { Popover, Button, debounce } from 'frappe-ui';
-import FormControl from 'frappe-ui/src/components/FormControl/FormControl.vue';
+import { Popover, Button, debounce, FormControl } from 'frappe-ui';
 import { nextTick } from 'vue';
 
 export default {
diff --git a/dashboard/src/objects/group.js b/dashboard/src/objects/group.js
index ef38d2e52b3..b0a1539bc60 100644
--- a/dashboard/src/objects/group.js
+++ b/dashboard/src/objects/group.js
@@ -1,4 +1,4 @@
-import { LoadingIndicator, Tooltip } from 'frappe-ui';
+import { LoadingIndicator, Tooltip, frappeRequest } from 'frappe-ui';
 import { defineAsyncComponent, h } from 'vue';
 import { toast } from 'vue-sonner';
 import LucideAppWindow from '~icons/lucide/app-window';
@@ -16,6 +16,51 @@ import { getJobsTab } from './common/jobs';
 import { getPatchesTab } from './common/patches';
 import { tagTab } from './common/tags';
 
+const pollingGroups = new Set();
+
+function pollReleasePipelineValidationStatus(group) {
+	if (pollingGroups.has(group.doc.name)) return; // already polling
+	if (!group.doc.deploy_information.has_running_release_pipeline) return;
+
+	pollingGroups.add(group.doc.name);
+
+	function poll() {
+		frappeRequest({
+			url: 'press.api.bench.deploy_status',
+			params: { name: group.name },
+		})
+			.then(({ is_validating, is_deploy_in_progress, candidate }) => {
+				if (!group.doc.deploy_information.has_running_release_pipeline) {
+					pollingGroups.delete(group.doc.name);
+					return;
+				}
+
+				group.doc.deploy_information.deploy_in_progress = Boolean(
+					is_deploy_in_progress,
+				);
+
+				if (candidate) {
+					group.doc.deploy_information.last_deploy = {
+						name: candidate,
+					};
+				}
+
+				if (is_validating) {
+					setTimeout(poll, 2000); // still validating, keep polling
+				} else {
+					// Validation done
+					group.doc.deploy_information.has_running_release_pipeline = false;
+					pollingGroups.delete(group.doc.name);
+				}
+			})
+			.catch(() => {
+				pollingGroups.delete(group.doc.name);
+			});
+	}
+
+	poll();
+}
+
 export default {
 	doctype: 'Release Group',
 	whitelistedMethods: {
@@ -111,18 +156,6 @@ export default {
 				},
 			};
 		},
-		banner({ listResource: groups }) {
-			if (!groups.data?.length) {
-				return {
-					title: 'Learn how to create a new private bench and sites',
-					button: {
-						label: 'Read docs',
-						variant: 'outline',
-						link: 'https://docs.frappe.io/cloud/benches/create-new',
-					},
-				};
-			}
-		},
 	},
 	detail: {
 		titleField: 'title',
@@ -525,6 +558,7 @@ export default {
 													group.doc.deploy_information.last_deploy.name =
 														candidate;
 												}
+												pollReleasePipelineValidationStatus(group);
 											},
 										}),
 									);
@@ -888,6 +922,13 @@ export default {
 			let { documentResource: group } = context;
 			let team = getTeam();
 
+			if (
+				group.doc?.deploy_information?.has_running_release_pipeline &&
+				!group.doc?.deploy_information?.deploy_in_progress
+			) {
+				pollReleasePipelineValidationStatus(group);
+			}
+
 			return [
 				{
 					label: 'Impersonate Group Owner',
@@ -926,14 +967,15 @@ export default {
 								bench: group.name,
 								lastDeploy: group.doc?.deploy_information?.last_deploy,
 								onSuccess(candidate) {
-									// group.doc.deploy_information.has_running_release_pipeline = true;
-									group.doc.deploy_information.deploy_in_progress = true;
+									group.doc.deploy_information.has_running_release_pipeline = true;
 									group.doc.deploy_information.update_available = false;
+
 									if (candidate) {
 										group.doc.deploy_information.last_deploy = {
 											name: candidate,
 										};
 									}
+									pollReleasePipelineValidationStatus(group);
 								},
 							}),
 						);
diff --git a/dashboard/src/objects/marketplace.js b/dashboard/src/objects/marketplace.js
index 3b234cd0f96..41455176b71 100644
--- a/dashboard/src/objects/marketplace.js
+++ b/dashboard/src/objects/marketplace.js
@@ -4,7 +4,6 @@ import { toast } from 'vue-sonner';
 import ChangeAppBranchDialog from '../components/marketplace/ChangeAppBranchDialog.vue';
 import { confirmDialog, icon, renderDialog } from '../utils/components';
 import PlansDialog from '../components/marketplace/PlansDialog.vue';
-import CodeReview from '../components/marketplace/CodeReview.vue';
 import GenericDialog from '../components/GenericDialog.vue';
 import ObjectList from '../components/ObjectList.vue';
 import { userCurrency, currency } from '../utils/format';
@@ -581,27 +580,21 @@ function showReleases(row, app) {
 									align: 'center',
 								},
 								{
-									label: 'Code Screening',
+									label: 'Audit',
 									type: 'Component',
 									width: 0.15,
 									align: 'center',
-									component: ({ row, listResource: releases, app }) => {
-										if (
-											(row.status === 'Awaiting Approval' ||
-												row.status === 'Rejected') &&
-											row.screening_status === 'Complete'
-										) {
-											return h(Button, {
-												label: 'Code Review',
-												variant: 'subtle',
-												theme: 'blue',
-												size: 'sm',
-												onClick: () =>
-													codeReview(row, app, window.is_system_user),
-											});
-										}
+									component: ({ row }) => {
+										const theme = {
+											Pass: 'green',
+											'Needs Improvement': 'orange',
+											Warn: 'orange',
+											Fail: 'red',
+											Inconclusive: 'gray',
+										};
 										return h(Badge, {
-											label: row.screening_status || 'Not Started',
+											label: row.audit_result || 'Pending',
+											theme: theme[row.audit_result] || 'gray',
 										});
 									},
 								},
@@ -682,13 +675,3 @@ function showReleases(row, app) {
 		),
 	);
 }
-
-function codeReview(row, app, isSystemUser) {
-	renderDialog(
-		h(CodeReview, {
-			row: row,
-			app: app,
-			isSystemUser: isSystemUser,
-		}),
-	);
-}
diff --git a/dashboard/src/objects/server.js b/dashboard/src/objects/server.js
index 214fd4bd972..8f07a9ac62b 100644
--- a/dashboard/src/objects/server.js
+++ b/dashboard/src/objects/server.js
@@ -130,18 +130,6 @@ export default {
 				},
 			};
 		},
-		banner({ listResource: servers }) {
-			if (!servers.data?.length) {
-				return {
-					title: 'Learn how to create a new dedicated server',
-					button: {
-						label: 'Read docs',
-						variant: 'outline',
-						link: 'https://docs.frappe.io/cloud/servers/new',
-					},
-				};
-			}
-		},
 	},
 	detail: {
 		titleField: 'name',
@@ -663,9 +651,7 @@ export default {
 									h(
 										defineAsyncComponent(
 											() =>
-												import(
-													'../components/server/ServerNewSnapshotDialog.vue'
-												),
+												import('../components/server/ServerNewSnapshotDialog.vue'),
 										),
 										{
 											server: server.name,
@@ -685,9 +671,7 @@ export default {
 								onClick() {
 									let ServerSnapshotDetailsDialog = defineAsyncComponent(
 										() =>
-											import(
-												'../components/server/ServerSnapshotDetailsDialog.vue'
-											),
+											import('../components/server/ServerSnapshotDetailsDialog.vue'),
 									);
 									renderDialog(
 										h(ServerSnapshotDetailsDialog, {
@@ -702,9 +686,7 @@ export default {
 								onClick() {
 									let ServerSnapshotRecoverSitesDialog = defineAsyncComponent(
 										() =>
-											import(
-												'../components/server/ServerSnapshotRecoverSitesDialog.vue'
-											),
+											import('../components/server/ServerSnapshotRecoverSitesDialog.vue'),
 									);
 									renderDialog(
 										h(ServerSnapshotRecoverSitesDialog, {
diff --git a/dashboard/src/pages/NewReleaseGroup.vue b/dashboard/src/pages/NewReleaseGroup.vue
index 92cdbe663ce..f1cf71ce737 100644
--- a/dashboard/src/pages/NewReleaseGroup.vue
+++ b/dashboard/src/pages/NewReleaseGroup.vue
@@ -158,12 +158,11 @@
 	</div>
 </template>
 <script>
-import Summary from '../components/Summary.vue';
-import Header from '../components/Header.vue';
-import { DashboardError } from '../utils/error';
-import { h } from 'vue';
 import { Badge } from 'frappe-ui';
+import Header from '../components/Header.vue';
 import ObjectList from '../components/ObjectList.vue';
+import Summary from '../components/Summary.vue';
+import { DashboardError } from '../utils/error';
 
 export default {
 	name: 'NewReleaseGroup',
@@ -182,11 +181,15 @@ export default {
 		};
 	},
 	resources: {
-		preInstalledApps() {
+		releaseGroupPolicyApps() {
 			return {
-				url: 'press.api.bench.get_default_apps',
-				initialData: {},
-				auto: true,
+				url: 'press.api.bench.get_release_group_policy_for_bench',
+				makeParams() {
+					return {
+						version: this.benchVersion,
+					};
+				},
+				auto: !!this.benchVersion,
 			};
 		},
 		options() {
@@ -236,10 +239,9 @@ export default {
 					source: app.source.name,
 				};
 			});
-
-			// add default apps
+			// add policy apps
 			apps.push(
-				...this.preInstalledApps[this.benchVersion].map((app) => {
+				...this.releaseGroupPolicyApps.map((app) => {
 					return {
 						name: app.app,
 						source: app.source,
@@ -253,31 +255,8 @@ export default {
 		options() {
 			return this.$resources.options.data;
 		},
-		preInstalledApps() {
-			return this.$resources.preInstalledApps.data;
-		},
-		preInstalledAppsList() {
-			return {
-				data: () => this.preInstalledApps,
-				columns: [
-					{
-						label: 'Default Apps',
-						fieldname: 'app_title',
-						type: 'Component',
-						component: ({ row }) => {
-							return h(
-								'a',
-								{
-									class: 'flex items-center text-sm',
-									href: `${row.route}`,
-									target: '_blank',
-								},
-								[h('span', { class: 'ml-2' }, row.app_title)],
-							);
-						},
-					},
-				],
-			};
+		releaseGroupPolicyApps() {
+			return this.$resources.releaseGroupPolicyApps.data?.policies || [];
 		},
 		summaryOptions() {
 			return [
@@ -285,13 +264,6 @@ export default {
 					label: 'Frappe Framework Version',
 					value: this.benchVersion,
 				},
-				{
-					label: 'Preinstalled Apps',
-					value: this.preInstalledApps[this.benchVersion]
-						.map((app) => app.title)
-						.join(', '),
-					condition: () => this.preInstalledApps[this.benchVersion].length,
-				},
 				{
 					label: 'Region',
 					value: this.benchRegion,
diff --git a/dashboard/src/pages/devtools/database/BinlogBrowser.vue b/dashboard/src/pages/devtools/database/BinlogBrowser.vue
index 821de807241..53d63f6a9b1 100644
--- a/dashboard/src/pages/devtools/database/BinlogBrowser.vue
+++ b/dashboard/src/pages/devtools/database/BinlogBrowser.vue
@@ -340,8 +340,8 @@ import {
 	FeatherIcon,
 	Spinner,
 	TextInput,
+	DateTimePicker,
 } from 'frappe-ui';
-import DateTimePicker from './extras/DateTimePicker.vue';
 import { formatValue } from '../../../utils/format';
 import LinkControl from '../../../components/LinkControl.vue';
 import BinlogResultTable from '../../../components/devtools/database/BinlogResultTable.vue';
diff --git a/dashboard/src/pages/devtools/database/DatabaseAnalyzer.vue b/dashboard/src/pages/devtools/database/DatabaseAnalyzer.vue
index ed3fb95a2ff..511536a9075 100644
--- a/dashboard/src/pages/devtools/database/DatabaseAnalyzer.vue
+++ b/dashboard/src/pages/devtools/database/DatabaseAnalyzer.vue
@@ -197,6 +197,54 @@
 				</template>
 			</ToggleContent>
 
+			<!-- Database Locks -->
+			<ToggleContent
+				class="mt-3"
+				label="Database Locks"
+				subLabel="Analyze the lock waits of the database"
+			>
+				<template #actions>
+					<div class="flex flex-row items-center gap-4">
+						<div
+							class="flex flex-row items-center gap-2"
+							@click.stop="() => {}"
+						>
+							<Switch v-model="autoRefreshDatabaseLocks" />
+							<p class="text-base text-gray-700">Auto Refresh</p>
+						</div>
+						<Button
+							:loading="this.$resources.databaseLocks.loading"
+							loading-text="Refreshing"
+							icon-left="rotate-ccw"
+							@click.stop="this.$resources.databaseLocks.submit()"
+							>Refresh</Button
+						>
+					</div>
+				</template>
+				<template #default>
+					<div
+						v-if="
+							this.$resources.databaseLocks.loading &&
+							!databaseLocks?.data?.length
+						"
+						class="flex h-60 w-full items-center justify-center gap-2 text-base text-gray-700"
+					>
+						<Spinner class="w-4" /> Loading Database Locks
+					</div>
+					<ResultTable
+						v-else
+						class="mt-2"
+						:columns="databaseLocks.columns"
+						:data="databaseLocks.data"
+						:alignColumns="alignColumns"
+						:cellFormatters="cellFormatters"
+						:fullViewFormatters="fullViewFormatters"
+						:enableCSVExport="false"
+						:borderLess="true"
+					/>
+				</template>
+			</ToggleContent>
+
 			<!-- Queries Information -->
 			<ToggleContent
 				class="mt-3"
@@ -346,7 +394,7 @@
 </template>
 <script>
 import Header from '../../../components/Header.vue';
-import { Tabs, Breadcrumbs } from 'frappe-ui';
+import { Tabs, Breadcrumbs, Switch } from 'frappe-ui';
 import LinkControl from '../../../components/LinkControl.vue';
 import ObjectList from '../../../components/ObjectList.vue';
 import { h, markRaw } from 'vue';
@@ -360,6 +408,7 @@ import DatabaseTableSchemaSizeDetailsDialog from '../../../components/devtools/d
 import DatabaseAddIndexButton from '../../../components/devtools/database/DatabaseAddIndexButton.vue';
 import DatabasePerformanceSchemaDisabledNotice from '../../../components/devtools/database/DatabasePerformanceSchemaDisabledNotice.vue';
 import { confirmDialog } from '../../../utils/components';
+import { set } from '@vueuse/core';
 
 export default {
 	name: 'DatabaseAnalyzer',
@@ -375,6 +424,7 @@ export default {
 		DatabaseTableSchemaSizeDetailsDialog,
 		DatabaseProcessKillButton,
 		DatabasePerformanceSchemaDisabledNotice,
+		Switch,
 	},
 	data() {
 		return {
@@ -383,6 +433,7 @@ export default {
 			isIndexSuggestionTriggered: false,
 			queryTabIndex: 0,
 			dbIndexTabIndex: 0,
+			autoRefreshDatabaseLocks: false,
 			showTableSchemaSizeDetailsDialog: false,
 			preSelectedSchemaForSchemaDialog: null,
 			showTableSchemasDialog: false,
@@ -399,6 +450,7 @@ export default {
 		if (site_name) {
 			this.site = site_name;
 		}
+		this.autoRefreshDatabaseLocksInBackground();
 	},
 	watch: {
 		site(site_name) {
@@ -425,6 +477,11 @@ export default {
 				dn: site_name,
 				method: 'fetch_database_processes',
 			});
+			this.$resources.databaseLocks.submit({
+				dt: 'Site',
+				dn: site_name,
+				method: 'fetch_database_locks',
+			});
 		},
 	},
 	resources: {
@@ -538,6 +595,20 @@ export default {
 				auto: false,
 			};
 		},
+		databaseLocks() {
+			return {
+				url: 'press.api.client.run_doc_method',
+				initialData: {},
+				makeParams: () => {
+					return {
+						dt: 'Site',
+						dn: this.site,
+						method: 'fetch_database_locks',
+					};
+				},
+				auto: false,
+			};
+		},
 		refreshDatabaseUsage() {
 			return {
 				url: 'press.api.client.run_doc_method',
@@ -799,6 +870,40 @@ export default {
 				}),
 			};
 		},
+		databaseLocks() {
+			if (!this.isRequiredInformationReceived) return null;
+			// 		fields = ["lock_id", "trx_id", "trx_query", "lock_mode", "lock_type", "lock_table", "lock_index", "trx_state", "trx_operation_state", "trx_started", "trx_rows_locked", "trx_rows_modified"]
+
+			const result = this.$resources.databaseLocks.data?.message ?? [];
+			return {
+				columns: [
+					'ID',
+					'Type',
+					'Mode',
+					'Table',
+					'Index',
+					'State',
+					'Started',
+					'Query',
+					'Rows Locked',
+					'Rows Modified',
+				],
+				data: result.map((e) => {
+					return [
+						e['trx_id'],
+						e['lock_type'],
+						e['lock_mode'],
+						e['lock_table'],
+						e['lock_index'],
+						e['trx_state'],
+						this.formatTrxStarted(e['trx_started']),
+						e['trx_query'],
+						e['trx_rows_locked'],
+						e['trx_rows_modified'],
+					];
+				}),
+			};
+		},
 		cellFormatters() {
 			return {
 				'Rows Examined': (v) => formatValue(v, 'commaSeperatedNumber'),
@@ -885,6 +990,22 @@ export default {
 			this.refreshingDatabaseUsage = true;
 			this.$resources.refreshDatabaseUsage.submit();
 		},
+		autoRefreshDatabaseLocksInBackground() {
+			setInterval(() => {
+				if (this.autoRefreshDatabaseLocks && this.site) {
+					this.$resources.databaseLocks.submit();
+				}
+			}, 5000);
+		},
+		formatTrxStarted(value) {
+			if (!value) return '';
+			try {
+				const diff = parseInt((new Date() - new Date(value)) / 1000);
+				return this.$format.formatSeconds(diff) + ' ago';
+			} catch (error) {
+				return value;
+			}
+		},
 	},
 };
 </script>
diff --git a/dashboard/src/pages/devtools/database/extras/DateTimePicker.vue b/dashboard/src/pages/devtools/database/extras/DateTimePicker.vue
deleted file mode 100644
index 75e3162f2fe..00000000000
--- a/dashboard/src/pages/devtools/database/extras/DateTimePicker.vue
+++ /dev/null
@@ -1,623 +0,0 @@
-<template>
-	<Popover
-		class="inline-block"
-		:placement="placement"
-		@open="initFromValue"
-		@close="handleClose"
-	>
-		<template #target="{ togglePopover, isOpen }">
-			<slot
-				name="target"
-				v-bind="{ togglePopover, isOpen, displayLabel, inputValue }"
-			>
-				<TextInput
-					v-model="inputValue"
-					type="text"
-					class="cursor-text w-full caret-transparent"
-					:class="props.inputClass"
-					:label="props.label"
-					:variant="props.variant"
-					:placeholder="props.placeholder || 'Select date & time'"
-					:disabled="props.disabled"
-					:readonly="
-						props.disableTextInput || props.readonly || !props.allowCustom
-					"
-					@focus="activateInput(isOpen, togglePopover)"
-					@click="activateInput(isOpen, togglePopover)"
-					@blur="onBlur"
-					@keydown.enter.prevent="onEnter(togglePopover)"
-				>
-					<template v-if="$slots.prefix" #prefix>
-						<slot
-							name="prefix"
-							v-bind="{ togglePopover, isOpen, displayLabel, inputValue }"
-						/>
-					</template>
-					<template #suffix>
-						<slot
-							name="suffix"
-							v-bind="{ togglePopover, isOpen, displayLabel, inputValue }"
-						>
-							<FeatherIcon
-								name="chevron-down"
-								class="h-4 w-4 cursor-pointer"
-								@mousedown.prevent="togglePopover"
-							/>
-						</slot>
-					</template>
-				</TextInput>
-			</slot>
-		</template>
-
-		<template #body="{ togglePopover }">
-			<div
-				ref="popoverContentRef"
-				class="w-fit min-w-60 select-none text-base text-ink-gray-9 rounded-lg bg-surface-modal shadow-2xl ring-1 ring-black ring-opacity-5 mt-2"
-			>
-				<!-- Header (Month/Year navigation) -->
-				<div class="flex items-center justify-between p-2 pb-0 gap-1">
-					<Button
-						variant="ghost"
-						size="sm"
-						class="text-sm font-medium text-ink-gray-7"
-						@click="cycleView"
-					>
-						<span v-if="view === 'date'"
-							>{{ months[currentMonth] }} {{ currentYear }}</span
-						>
-						<span v-else-if="view === 'month'">{{ currentYear }}</span>
-						<span v-else>{{ yearRangeStart }} - {{ yearRangeStart + 11 }}</span>
-					</Button>
-					<div class="flex items-center">
-						<Button
-							variant="ghost"
-							icon="chevron-left"
-							class="size-7"
-							@click="prev"
-						/>
-						<Button
-							v-if="!clearable"
-							variant="ghost"
-							class="text-xs"
-							:label="'Now'"
-							@click="() => handleNowClick(togglePopover)"
-						/>
-						<Button
-							variant="ghost"
-							icon="chevron-right"
-							class="size-7"
-							@click="next"
-						/>
-					</div>
-				</div>
-
-				<!-- Calendar -->
-				<div class="p-2">
-					<div v-if="view === 'date'" role="grid" aria-label="Calendar dates">
-						<div
-							class="flex items-center text-xs font-medium uppercase text-ink-gray-4 mb-1"
-						>
-							<div
-								v-for="d in ['S', 'M', 'T', 'W', 'T', 'F', 'S']"
-								:key="d"
-								class="flex h-6 w-8 items-center justify-center"
-							>
-								{{ d }}
-							</div>
-						</div>
-						<div v-for="(week, wi) in weeks" :key="wi" class="flex" role="row">
-							<button
-								v-for="dateObj in week"
-								type="button"
-								:key="dateObj.key"
-								class="flex h-8 w-8 items-center justify-center rounded cursor-pointer text-sm focus:outline-none focus:ring-2 focus:ring-outline-gray-2"
-								:class="[
-									dateObj.inMonth ? 'text-ink-gray-8' : 'text-ink-gray-3',
-									dateObj.isToday ? 'font-extrabold text-ink-gray-9' : '',
-									dateObj.disabled
-										? 'opacity-30 cursor-not-allowed hover:bg-transparent'
-										: dateObj.isSelected
-											? 'bg-surface-gray-6 text-ink-white hover:bg-surface-gray-6'
-											: 'hover:bg-surface-gray-2',
-								]"
-								role="gridcell"
-								:aria-selected="dateObj.isSelected ? 'true' : 'false'"
-								:aria-label="
-									dateObj.date.format('YYYY-MM-DD') +
-									(dateObj.isToday ? ' (Today)' : '')
-								"
-								:disabled="dateObj.disabled"
-								@click="
-									!dateObj.disabled &&
-									handleDateCellClick(dateObj.date, togglePopover)
-								"
-							>
-								{{ dateObj.date.date() }}
-							</button>
-						</div>
-					</div>
-					<div
-						v-else-if="view === 'month'"
-						class="grid grid-cols-3 gap-1"
-						role="grid"
-						aria-label="Select month"
-					>
-						<button
-							v-for="(m, i) in months"
-							type="button"
-							:key="m"
-							class="py-2 text-sm rounded cursor-pointer text-center hover:bg-surface-gray-2 focus:outline-none focus:ring-2 focus:ring-brand-6"
-							:class="{
-								'bg-surface-gray-6 text-ink-white hover:bg-surface-gray-6':
-									i === currentMonth,
-							}"
-							:aria-selected="i === currentMonth ? 'true' : 'false'"
-							@click="selectMonth(i)"
-						>
-							{{ m.slice(0, 3) }}
-						</button>
-					</div>
-					<div
-						v-else
-						class="grid grid-cols-3 gap-1"
-						role="grid"
-						aria-label="Select year"
-					>
-						<button
-							v-for="y in yearRange"
-							type="button"
-							:key="y"
-							class="py-2 text-sm rounded cursor-pointer text-center hover:bg-surface-gray-2 focus:outline-none focus:ring-2 focus:ring-brand-6"
-							:class="{
-								'bg-surface-gray-6 text-ink-white hover:bg-surface-gray-6':
-									y === currentYear,
-							}"
-							:aria-selected="y === currentYear ? 'true' : 'false'"
-							@click="selectYear(y)"
-						>
-							{{ y }}
-						</button>
-					</div>
-				</div>
-
-				<!-- Time Picker Section -->
-				<div class="flex flex-col gap-2 p-2 pt-0">
-					<TimePicker
-						:value="timeValue"
-						:allowCustom="props.allowCustomTime"
-						:placement="'bottom-start'"
-						placeholder="Select time"
-						:minTime="computedMinTime"
-						:maxTime="computedMaxTime"
-						@change="(v) => onTimeChange(v, togglePopover)"
-					/>
-				</div>
-
-				<!-- Footer Actions (clearable variant) -->
-				<div
-					v-if="props.clearable"
-					class="flex items-center justify-between gap-1 p-2 border-t"
-				>
-					<div class="flex gap-1">
-						<Button
-							variant="outline"
-							:label="'Now'"
-							@click="() => handleNowClick(togglePopover)"
-						/>
-						<Button
-							variant="outline"
-							:label="'Tomorrow'"
-							@click="() => handleTomorrowClick()"
-						/>
-					</div>
-					<Button
-						v-if="selectedDate"
-						size="sm"
-						variant="outline"
-						:label="'Clear'"
-						@click="() => handleClearClick(togglePopover)"
-					/>
-				</div>
-			</div>
-		</template>
-	</Popover>
-</template>
-
-<script setup>
-import { ref, computed, watch, toRefs } from 'vue';
-import {
-	Popover,
-	Button,
-	TextInput,
-	FeatherIcon,
-	dayjs,
-	dayjsLocal,
-} from 'frappe-ui';
-import { dayjsSystem } from 'frappe-ui/src/utils/dayjs';
-
-import TimePicker from './TimePicker.vue';
-import { months, monthStart, generateWeeks, getDateValue } from './utils.js';
-
-/*
-Added a props disableTextInput
-When true, the text input becomes readonly, preventing manual typing.
-*/
-
-const props = defineProps({
-	value: {
-		type: String,
-		default: '',
-	},
-	modelValue: {
-		type: String,
-		default: '',
-	},
-	placement: {
-		type: String,
-		default: 'bottom-start',
-	},
-	variant: {
-		type: String,
-		default: 'subtle',
-	},
-	placeholder: {
-		type: String,
-		default: 'Select date & time',
-	},
-	disableTextInput: {
-		type: Boolean,
-		default: false,
-	},
-	readonly: {
-		type: Boolean,
-		default: false,
-	},
-	allowCustom: {
-		type: Boolean,
-		default: true,
-	},
-	autoClose: {
-		type: Boolean,
-		default: true,
-	},
-	disabled: {
-		type: Boolean,
-		default: false,
-	},
-	clearable: {
-		type: Boolean,
-		default: true,
-	},
-	allowCustomTime: {
-		type: Boolean,
-		default: true,
-	},
-	format: {
-		type: String,
-		default: '',
-	},
-	minDateTime: {
-		type: String,
-		default: '',
-	},
-	maxDateTime: {
-		type: String,
-		default: '',
-	},
-	label: {
-		type: String,
-		default: '',
-	},
-	inputClass: {
-		type: String,
-		default: '',
-	},
-});
-const emit = defineEmits(['update:modelValue', 'change', 'open', 'close']);
-
-const { autoClose } = toRefs(props);
-
-const view = ref('date');
-const currentYear = ref(dayjs().year());
-const currentMonth = ref(dayjs().month());
-const DATE_FORMAT = 'YYYY-MM-DD';
-const DATE_TIME_FORMAT = 'YYYY-MM-DD h:mm a';
-
-const selectedDate = ref(''); // YYYY-MM-DD
-const timeValue = ref(''); // HH:mm:ss
-
-const initialValue = ref(props.modelValue || props.value || '');
-
-function coerceDateTime(val) {
-	if (!val) return null;
-	const raw = String(val).trim();
-	if (!raw) return null;
-
-	if (props.format) {
-		const dStrict = dayjs(raw, props.format, true);
-		if (dStrict.isValid()) return dStrict;
-	}
-
-	const dLoose = dayjsLocal(raw);
-	if (dLoose.isValid()) return dLoose;
-
-	const normalized = getDateValue(raw);
-	if (normalized) {
-		const dNorm = dayjsLocal(normalized);
-		if (dNorm.isValid()) return dNorm;
-	}
-	return null;
-}
-
-function syncFromValue(val) {
-	if (!val) {
-		if (!props.clearable) {
-			const now = dayjsLocal();
-			currentYear.value = now.year();
-			currentMonth.value = now.month();
-			selectedDate.value = now.format(DATE_FORMAT);
-			timeValue.value = now.format('HH:mm:ss');
-		} else {
-			selectedDate.value = '';
-			timeValue.value = '';
-		}
-		return;
-	}
-	const d = coerceDateTime(val);
-	if (!d) {
-		selectedDate.value = '';
-		timeValue.value = '';
-		return;
-	}
-	currentYear.value = d.year();
-	currentMonth.value = d.month();
-	selectedDate.value = d.format(DATE_FORMAT);
-	timeValue.value = d.format('HH:mm:ss');
-}
-
-syncFromValue(initialValue.value);
-
-function initFromValue() {
-	syncFromValue(props.modelValue || props.value);
-}
-
-watch(
-	() => [props.modelValue, props.value],
-	([m, v]) => {
-		const val = m || v;
-		syncFromValue(val);
-	},
-);
-
-const combinedValue = computed(() => {
-	if (!selectedDate.value) return '';
-	const base = `${selectedDate.value} ${timeValue.value || '00:00:00'}`;
-	const local = dayjs(base);
-	if (!local.isValid()) return '';
-	return local.format(DATE_TIME_FORMAT);
-});
-
-const displayLabel = computed(() => {
-	if (!combinedValue.value) return '';
-	if (props.format) return dayjs(combinedValue.value).format(props.format);
-	return combinedValue.value;
-});
-
-const inputValue = ref(displayLabel.value);
-const isTyping = ref(false);
-watch(displayLabel, (val) => {
-	if (!isTyping.value) inputValue.value = val;
-});
-
-function maybeClose(togglePopover, condition = true) {
-	if (condition && autoClose.value && togglePopover) togglePopover();
-}
-
-function clearSelection() {
-	if (!selectedDate.value && !timeValue.value) return;
-	selectedDate.value = '';
-	timeValue.value = '';
-	emit('update:modelValue', '');
-	emit('change', '');
-	initialValue.value = '';
-	inputValue.value = '';
-}
-
-function commitInput(close = false, togglePopover) {
-	const raw = inputValue.value.trim();
-	if (!raw) {
-		if (!props.clearable) {
-			const now = dayjsLocal();
-			selectDate(now);
-			timeValue.value = now.format('HH:mm:ss');
-			emitChange();
-			maybeClose(togglePopover, close);
-		} else {
-			clearSelection();
-			maybeClose(togglePopover, close);
-		}
-		return;
-	}
-	const parsed = coerceDateTime(raw);
-	if (parsed) {
-		selectDate(parsed);
-		timeValue.value = parsed.format('HH:mm:ss');
-		emitChange();
-		maybeClose(togglePopover, close);
-	}
-}
-
-const popoverContentRef = ref(null);
-function onBlur(e) {
-	const next = e.relatedTarget;
-	if (next && popoverContentRef.value?.contains(next)) return;
-	commitInput();
-	isTyping.value = false;
-}
-function onEnter(togglePopover) {
-	commitInput(true, togglePopover);
-	isTyping.value = false;
-}
-function activateInput(isOpen, togglePopover) {
-	if (!props.disableTextInput) {
-		isTyping.value = true;
-	}
-
-	if (!isOpen) togglePopover();
-}
-
-const minDT = computed(() =>
-	props.minDateTime ? coerceDateTime(props.minDateTime) : null,
-);
-const maxDT = computed(() =>
-	props.maxDateTime ? coerceDateTime(props.maxDateTime) : null,
-);
-
-function dateDisabled(d) {
-	if (minDT.value && d.endOf('day').isBefore(minDT.value)) return true;
-	if (maxDT.value && d.startOf('day').isAfter(maxDT.value)) return true;
-	return false;
-}
-
-const weeks = computed(() => {
-	const base = generateWeeks(
-		currentYear.value,
-		currentMonth.value,
-		selectedDate.value,
-	);
-	return base.map((week) =>
-		week.map((obj) => ({ ...obj, disabled: dateDisabled(obj.date) })),
-	);
-});
-
-const computedMinTime = computed(() => {
-	if (!minDT.value || !selectedDate.value) return '';
-	if (dayjs(selectedDate.value).isSame(minDT.value, 'day'))
-		return minDT.value.format('HH:mm:ss');
-	return '';
-});
-const computedMaxTime = computed(() => {
-	if (!maxDT.value || !selectedDate.value) return '';
-	if (dayjs(selectedDate.value).isSame(maxDT.value, 'day'))
-		return maxDT.value.format('HH:mm:ss');
-	return '';
-});
-
-watch([computedMinTime, computedMaxTime, timeValue, selectedDate], () => {
-	if (!selectedDate.value || !timeValue.value) return;
-	const cur = dayjs(`${selectedDate.value} ${timeValue.value}`);
-	if (minDT.value && cur.isBefore(minDT.value))
-		timeValue.value = computedMinTime.value || timeValue.value;
-	if (maxDT.value && cur.isAfter(maxDT.value))
-		timeValue.value = computedMaxTime.value || timeValue.value;
-});
-
-function selectDate(date) {
-	const d = dayjs(date);
-	if (!d.isValid()) return;
-	if (dateDisabled(d)) return;
-	selectedDate.value = d.format(DATE_FORMAT);
-	currentYear.value = d.year();
-	currentMonth.value = d.month();
-}
-function selectMonth(i) {
-	currentMonth.value = i;
-	view.value = 'date';
-}
-function selectYear(y) {
-	currentYear.value = y;
-	view.value = 'month';
-}
-function prev() {
-	if (view.value === 'date') {
-		const m = monthStart(currentYear.value, currentMonth.value).subtract(
-			1,
-			'month',
-		);
-		currentYear.value = m.year();
-		currentMonth.value = m.month();
-	} else if (view.value === 'month') currentYear.value -= 1;
-	else currentYear.value -= 12;
-}
-function next() {
-	if (view.value === 'date') {
-		const m = monthStart(currentYear.value, currentMonth.value).add(1, 'month');
-		currentYear.value = m.year();
-		currentMonth.value = m.month();
-	} else if (view.value === 'month') currentYear.value += 1;
-	else currentYear.value += 12;
-}
-function handleDateCellClick(date, togglePopover) {
-	selectDate(date);
-	emitChange(true, togglePopover);
-	isTyping.value = false;
-	view.value = 'date';
-}
-
-function onTimeChange(val, togglePopover) {
-	timeValue.value = val;
-	isTyping.value = false;
-	if (selectedDate.value) emitChange(true, togglePopover);
-}
-
-function emitChange(close = false, togglePopover) {
-	if (!selectedDate.value) {
-		clearSelection();
-		return;
-	}
-
-	const localDateTime = combinedValue.value;
-	const systemDateTime = dayjsSystem(localDateTime).format(DATE_TIME_FORMAT);
-
-	if (systemDateTime !== initialValue.value) {
-		emit('update:modelValue', systemDateTime);
-		emit('change', systemDateTime);
-		initialValue.value = systemDateTime;
-	}
-
-	if (!isTyping.value) inputValue.value = displayLabel.value;
-	maybeClose(togglePopover, close);
-}
-
-function handleNowClick(togglePopover) {
-	const now = dayjsLocal();
-	selectDate(now);
-	timeValue.value = now.format('HH:mm:ss');
-	emitChange(true, togglePopover);
-	isTyping.value = false;
-}
-function handleTomorrowClick() {
-	const tomorrow = dayjsLocal().add(1, 'day');
-	selectDate(tomorrow);
-	// keep current time value if any, else set to now's time
-	if (!timeValue.value) timeValue.value = dayjsLocal().format('HH:mm:ss');
-	emitChange();
-	isTyping.value = false;
-}
-function handleClearClick(togglePopover) {
-	clearSelection();
-	maybeClose(togglePopover);
-	isTyping.value = false;
-	view.value = 'date';
-}
-
-function cycleView() {
-	if (view.value === 'date') view.value = 'month';
-	else if (view.value === 'month') view.value = 'year';
-	else view.value = 'date';
-}
-function handleClose() {
-	view.value = 'date';
-	if (isTyping.value) {
-		commitInput();
-		isTyping.value = false;
-	}
-}
-
-const yearRangeStart = computed(
-	() => currentYear.value - (currentYear.value % 12),
-);
-const yearRange = computed(() =>
-	Array.from({ length: 12 }, (_, i) => yearRangeStart.value + i),
-);
-</script>
diff --git a/dashboard/src/pages/devtools/database/extras/TimePicker.vue b/dashboard/src/pages/devtools/database/extras/TimePicker.vue
deleted file mode 100644
index 2240b1e6162..00000000000
--- a/dashboard/src/pages/devtools/database/extras/TimePicker.vue
+++ /dev/null
@@ -1,588 +0,0 @@
-<template>
-	<Popover
-		v-model:show="showOptions"
-		transition="default"
-		:placement="placement"
-	>
-		<template #target="{ togglePopover, isOpen }">
-			<TextInput
-				ref="inputRef"
-				v-model="displayValue"
-				:variant="variant"
-				type="text"
-				class="text-sm w-full cursor-text"
-				:placeholder="placeholder"
-				:disabled="disabled"
-				:readonly="!props.allowCustom"
-				@focus="onFocus"
-				@click="onClickInput(isOpen, togglePopover)"
-				@keydown.enter.prevent="onEnter"
-				@blur="onBlur"
-				@keydown.down.prevent="onArrowDown(togglePopover, isOpen)"
-				@keydown.up.prevent="onArrowUp(togglePopover, isOpen)"
-				@keydown.esc.prevent="onEscape"
-			>
-				<template v-if="$slots.prefix" #prefix>
-					<slot name="prefix" />
-				</template>
-				<template #suffix>
-					<slot name="suffix" v-bind="{ togglePopover, isOpen }">
-						<FeatherIcon
-							name="chevron-down"
-							class="h-4 w-4 cursor-pointer"
-							@mousedown.prevent="togglePopover"
-						/>
-					</slot>
-				</template>
-			</TextInput>
-		</template>
-		<template #body="{ isOpen }">
-			<div
-				v-show="isOpen"
-				ref="panelRef"
-				class="mt-2 max-h-48 w-44 overflow-y-auto rounded-lg bg-surface-modal p-1 text-base shadow-2xl ring-1 ring-black ring-opacity-5 focus:outline-none"
-				role="listbox"
-				:aria-activedescendant="activeDescendantId"
-			>
-				<button
-					v-for="(opt, idx) in displayedOptions"
-					:key="opt.value"
-					:data-value="opt.value"
-					:data-index="idx"
-					type="button"
-					class="group flex h-7 w-full items-center rounded px-2 text-left"
-					:class="buttonClasses(opt, idx)"
-					@click="select(opt.value)"
-					@mouseenter="highlightIndex = idx"
-					role="option"
-					:id="optionId(idx)"
-					:aria-selected="internalValue === opt.value"
-				>
-					<span class="truncate">{{ opt.label }}</span>
-				</button>
-			</div>
-		</template>
-	</Popover>
-</template>
-
-<script setup>
-import { Popover, TextInput, FeatherIcon } from 'frappe-ui';
-import { ref, computed, watch, nextTick } from 'vue';
-
-const props = defineProps({
-	value: {
-		type: String,
-		default: '',
-	},
-	modelValue: {
-		type: String,
-		default: '',
-	},
-	interval: {
-		type: Number,
-		default: 15,
-	},
-	options: {
-		type: Array,
-		default: () => [],
-	},
-	placement: {
-		type: String,
-		default: 'bottom-start',
-	},
-	placeholder: {
-		type: String,
-		default: 'Select time',
-	},
-	variant: {
-		type: String,
-		default: 'subtle',
-	},
-	allowCustom: {
-		type: Boolean,
-		default: true,
-	},
-	autoClose: {
-		type: Boolean,
-		default: true,
-	},
-	use12Hour: {
-		type: Boolean,
-		default: true,
-	},
-	disabled: {
-		type: Boolean,
-		default: false,
-	},
-	scrollMode: {
-		type: String,
-		default: 'center',
-	},
-	minTime: {
-		type: String,
-		default: '',
-	},
-	maxTime: {
-		type: String,
-		default: '',
-	},
-});
-
-const emit = defineEmits([
-	'update:modelValue',
-	'change',
-	'open',
-	'close',
-	'input-invalid',
-	'invalid-change',
-]);
-
-const panelRef = ref(null);
-const isFocused = ref(false);
-const showOptions = ref(false);
-const highlightIndex = ref(-1);
-const hasSelectedOnFirstClick = ref(false);
-const isTyping = ref(false);
-let navUpdating = false;
-let invalidState = false;
-
-const inputRef = ref(null);
-const initial = props.modelValue || props.value || '';
-const internalValue = ref(initial);
-const displayValue = ref('');
-displayValue.value = formatDisplay(internalValue.value);
-const uid = Math.random().toString(36).slice(2, 9);
-const activeDescendantId = computed(() =>
-	highlightIndex.value > -1 ? optionId(highlightIndex.value) : undefined,
-);
-function optionId(idx) {
-	return `tp-${uid}-${idx}`;
-}
-
-function minutesFromHHMM(str) {
-	if (!str) return null;
-	if (!/^\d{2}:\d{2}(:\d{2})?$/.test(str)) return null;
-	const [h, m] = str.split(':').map((n) => parseInt(n));
-	if (h > 23 || m > 59) return null;
-	return h * 60 + m;
-}
-const minMinutes = computed(() => minutesFromHHMM(props.minTime));
-const maxMinutes = computed(() => minutesFromHHMM(props.maxTime));
-
-const displayedOptions = computed(() => {
-	if (props.options?.length) {
-		return props.options.map((o) => {
-			const value = normalize24(o.value);
-			return {
-				value,
-				label: o.label || formatDisplay(value),
-			};
-		});
-	}
-	const out = [];
-	for (let m = 0; m < 1440; m += props.interval) {
-		if (minMinutes.value != null && m < minMinutes.value) continue;
-		if (maxMinutes.value != null && m > maxMinutes.value) continue;
-		const hh = Math.floor(m / 60)
-			.toString()
-			.padStart(2, '0');
-		const mm = (m % 60).toString().padStart(2, '0');
-		const val = `${hh}:${mm}`;
-		out.push({
-			value: val,
-			label: formatDisplay(val),
-		});
-	}
-	return out;
-});
-
-watch(
-	() => [props.modelValue, props.value],
-	([m, v]) => {
-		const nv = m || v || '';
-		if (nv && nv !== internalValue.value) {
-			internalValue.value = normalize24(nv);
-			displayValue.value = formatDisplay(internalValue.value);
-		} else if (!nv) {
-			internalValue.value = '';
-			displayValue.value = '';
-		}
-	},
-);
-
-function normalize24(raw) {
-	if (!raw) return '';
-	if (/^\d{2}:\d{2}$/.test(raw)) return raw;
-	if (/^\d{2}:\d{2}:\d{2}$/.test(raw)) return raw; // keep seconds if present
-	const parsed = parseFlexibleTime(raw);
-	if (!parsed.valid) return '';
-	return parsed.ss
-		? `${parsed.hh24}:${parsed.mm}:${parsed.ss}`
-		: `${parsed.hh24}:${parsed.mm}`;
-}
-
-function formatDisplay(val24) {
-	if (!val24) return '';
-	const segs = val24.split(':');
-	const h = parseInt(segs[0]);
-	const m = parseInt(segs[1]);
-	const s = segs[2];
-	const base24 = `${h.toString().padStart(2, '0')}:${m
-		.toString()
-		.padStart(2, '0')}${s ? `:${s}` : ''}`;
-	if (!props.use12Hour) return base24;
-	const am = h < 12;
-	const hour12 = h % 12 === 0 ? 12 : h % 12;
-	return `${hour12}:${m.toString().padStart(2, '0')}${s ? `:${s}` : ''} ${
-		am ? 'am' : 'pm'
-	}`;
-}
-
-function parseFlexibleTime(input) {
-	if (!input) return { valid: false };
-	let s = input.trim().toLowerCase();
-	s = s.replace(/\./g, '');
-	s = s.replace(/(\d)(am|pm)$/, '$1 $2');
-	const re = /^(\d{1,2})(?::(\d{1,2}))?(?::(\d{1,2}))?\s*([ap]m)?$/;
-	const m = s.match(re);
-	if (!m) return { valid: false };
-	let [, hhStr, mmStr, ssStr, ap] = m;
-	let hh = parseInt(hhStr);
-	if (isNaN(hh) || hh < 0 || hh > 23) return { valid: false };
-	if (ssStr && !mmStr) return { valid: false };
-	let mm = mmStr != null && mmStr !== '' ? parseInt(mmStr) : 0;
-	if (isNaN(mm) || mm < 0 || mm > 59) return { valid: false };
-	let ss;
-	if (ssStr) {
-		ss = parseInt(ssStr);
-		if (isNaN(ss) || ss < 0 || ss > 59) return { valid: false };
-	}
-	if (ap) {
-		if (hh < 1 || hh > 12) return { valid: false };
-		if (hh === 12 && ap === 'am') hh = 0;
-		else if (hh < 12 && ap === 'pm') hh += 12;
-	}
-	return {
-		valid: true,
-		hh24: hh.toString().padStart(2, '0'),
-		mm: mm.toString().padStart(2, '0'),
-		ss: ss != null ? ss.toString().padStart(2, '0') : undefined,
-		total: hh * 60 + mm,
-	};
-}
-
-function findNearestIndex(targetMinutes, list) {
-	if (!list.length) return -1;
-	const minutesArr = list.map((o) => {
-		const [hh, mm] = o.value.split(':').map(Number);
-		return hh * 60 + mm;
-	});
-	let lo = 0,
-		hi = minutesArr.length - 1;
-	while (lo <= hi) {
-		const mid = (lo + hi) >> 1;
-		const val = minutesArr[mid];
-		if (val === targetMinutes) return mid;
-		if (val < targetMinutes) lo = mid + 1;
-		else hi = mid - 1;
-	}
-	const candidates = [];
-	if (lo < minutesArr.length) candidates.push(lo);
-	if (lo - 1 >= 0) candidates.push(lo - 1);
-	if (!candidates.length) return -1;
-	return candidates.sort(
-		(a, b) =>
-			Math.abs(minutesArr[a] - targetMinutes) -
-			Math.abs(minutesArr[b] - targetMinutes),
-	)[0];
-}
-
-function isOutOfRange(totalMinutes) {
-	if (minMinutes.value != null && totalMinutes < minMinutes.value) return true;
-	if (maxMinutes.value != null && totalMinutes > maxMinutes.value) return true;
-	return false;
-}
-
-function applyValue(val24, commit = false) {
-	const prev = internalValue.value;
-	internalValue.value = val24;
-	displayValue.value = formatDisplay(val24);
-	if (commit || !isFocused.value) emit('update:modelValue', val24);
-	if (commit && val24 !== prev) emit('change', val24);
-	setInvalid(false);
-}
-
-function commitInput() {
-	const raw = displayValue.value;
-	const parsed = parseFlexibleTime(raw);
-	if (!raw) {
-		const prev = internalValue.value;
-		internalValue.value = '';
-		if (!isFocused.value) emit('update:modelValue', '');
-		if (prev && prev !== '') emit('change', '');
-		setInvalid(false);
-		return;
-	}
-	if (!parsed.valid || isOutOfRange(parsed.total)) {
-		emit('input-invalid', raw);
-		setInvalid(true);
-		return;
-	}
-	const normalized = parsed.ss
-		? `${parsed.hh24}:${parsed.mm}:${parsed.ss}`
-		: `${parsed.hh24}:${parsed.mm}`;
-	if (
-		!props.allowCustom &&
-		!displayedOptions.value.some((o) => {
-			const base =
-				normalized.length === 8 ? normalized.slice(0, 5) : normalized;
-			return o.value === base;
-		})
-	) {
-		const nearestIdx = findNearestIndex(parsed.total, displayedOptions.value);
-		if (nearestIdx > -1) {
-			const nearestVal = displayedOptions.value[nearestIdx].value;
-			const committed =
-				normalized.length === 8 && nearestVal.length === 5
-					? `${nearestVal}${normalized.slice(5)}`
-					: nearestVal;
-			applyValue(committed, true);
-			return;
-		}
-	}
-	applyValue(normalized, true);
-}
-
-function select(val, forceChange = false) {
-	const prev = internalValue.value;
-	applyValue(val, true);
-	if (forceChange && prev === internalValue.value) {
-		emit('change', internalValue.value);
-	}
-	if (props.autoClose) showOptions.value = false;
-}
-
-const selectedAndNearest = computed(() => {
-	const list = displayedOptions.value;
-	if (!list.length) return { selected: null, nearest: null };
-	const parsedTyped = parseFlexibleTime(displayValue.value);
-	const candidate =
-		isTyping.value && parsedTyped.valid
-			? parsedTyped.ss
-				? `${parsedTyped.hh24}:${parsedTyped.mm}:${parsedTyped.ss}`
-				: `${parsedTyped.hh24}:${parsedTyped.mm}`
-			: internalValue.value || null;
-	if (!candidate) return { selected: null, nearest: null };
-	const candidateCompare =
-		candidate && candidate.length === 8 ? candidate.slice(0, 5) : candidate;
-	const selected = list.find((o) => o.value === candidateCompare) || null;
-	if (selected) return { selected, nearest: null };
-	const parsed = parseFlexibleTime(candidate);
-	if (!parsed.valid) return { selected: null, nearest: null };
-	const idx = findNearestIndex(parsed.total, list);
-	return { selected: null, nearest: idx > -1 ? list[idx] : null };
-});
-
-function buttonClasses(opt, idx) {
-	if (idx === highlightIndex.value) return 'bg-surface-gray-3 text-ink-gray-8';
-	const { selected, nearest } = selectedAndNearest.value;
-	if (isTyping.value && !selected) {
-		if (nearest && nearest.value === opt.value)
-			return 'text-ink-gray-7 italic bg-surface-gray-2';
-		return 'text-ink-gray-6 hover:bg-surface-gray-2 hover:text-ink-gray-8';
-	}
-	if (selected && selected.value === opt.value)
-		return 'bg-surface-gray-3 text-ink-gray-8';
-	if (nearest && nearest.value === opt.value)
-		return 'text-ink-gray-7 italic bg-surface-gray-2';
-	return 'text-ink-gray-6 hover:bg-surface-gray-2 hover:text-ink-gray-8';
-}
-
-watch(
-	() => displayedOptions.value,
-	() => scheduleScroll(),
-);
-
-function scheduleScroll() {
-	nextTick(() => {
-		if (!panelRef.value || !showOptions.value) return;
-		let targetEl = null;
-		if (highlightIndex.value > -1) {
-			targetEl = panelRef.value.querySelector(
-				`[data-index="${highlightIndex.value}"]`,
-			);
-		} else {
-			const { selected, nearest } = selectedAndNearest.value;
-			const target = selected || nearest;
-			if (target)
-				targetEl = panelRef.value.querySelector(
-					`[data-value="${target.value}"]`,
-				);
-		}
-		if (!targetEl) return;
-		targetEl.scrollIntoView({
-			block:
-				props.scrollMode === 'center'
-					? 'center'
-					: props.scrollMode === 'start'
-						? 'start'
-						: 'nearest',
-		});
-	});
-}
-
-watch(showOptions, (open) => {
-	if (open) {
-		emit('open');
-		initHighlight();
-		scheduleScroll();
-	} else {
-		emit('close');
-	}
-});
-
-watch(
-	() => displayValue.value,
-	() => {
-		if (navUpdating) return;
-		if (showOptions.value) scheduleScroll();
-		isTyping.value = true;
-		highlightIndex.value = -1;
-	},
-);
-
-function initHighlight() {
-	const { selected, nearest } = selectedAndNearest.value;
-	const target = selected || nearest;
-	if (!target) {
-		highlightIndex.value = -1;
-		return;
-	}
-	const idx = displayedOptions.value.findIndex((o) => o.value === target.value);
-	highlightIndex.value = idx;
-}
-
-function moveHighlight(delta) {
-	const list = displayedOptions.value;
-	if (!list.length) return;
-	if (highlightIndex.value === -1) initHighlight();
-	else
-		highlightIndex.value =
-			(highlightIndex.value + delta + list.length) % list.length;
-	const opt = list[highlightIndex.value];
-	if (opt) {
-		navUpdating = true;
-		const val =
-			internalValue.value.length === 8 && opt.value.length === 5
-				? `${opt.value}${internalValue.value.slice(5)}`
-				: opt.value;
-		applyValue(val, false);
-		nextTick(() => {
-			navUpdating = false;
-		});
-	}
-	isTyping.value = false;
-	scheduleScroll();
-}
-
-function onArrowDown(togglePopover, isOpen) {
-	if (!isOpen) togglePopover();
-	else moveHighlight(1);
-}
-function onArrowUp(togglePopover, isOpen) {
-	if (!isOpen) togglePopover();
-	else moveHighlight(-1);
-}
-
-function onEnter() {
-	if (!showOptions.value) {
-		commitInput();
-		blurInput();
-		return;
-	}
-	const parsed = parseFlexibleTime(displayValue.value);
-	const normalized = parsed.valid
-		? parsed.ss
-			? `${parsed.hh24}:${parsed.mm}:${parsed.ss}`
-			: `${parsed.hh24}:${parsed.mm}`
-		: null;
-	const exists = normalized
-		? displayedOptions.value.some((o) => {
-				const base =
-					normalized.length === 8 ? normalized.slice(0, 5) : normalized;
-				return o.value === base;
-			})
-		: false;
-	if (parsed.valid && (!exists || isTyping.value)) {
-		commitInput();
-		if (props.autoClose) showOptions.value = false;
-		blurInput();
-		return;
-	}
-	if (highlightIndex.value > -1) {
-		const opt = displayedOptions.value[highlightIndex.value];
-		if (opt) select(opt.value, true);
-	} else {
-		commitInput();
-		if (props.autoClose) showOptions.value = false;
-	}
-	blurInput();
-}
-
-function onClickInput(isOpen, togglePopover) {
-	if (!isOpen) togglePopover();
-	if (props.allowCustom) selectAll();
-}
-
-function onFocus() {
-	isFocused.value = true;
-	if (props.allowCustom && !hasSelectedOnFirstClick.value) selectAll();
-}
-
-function onBlur() {
-	if (showOptions.value) {
-		isFocused.value = false;
-		return;
-	}
-	commitInput();
-	isFocused.value = false;
-}
-
-function selectAll() {
-	nextTick(() => {
-		const el = inputRef.value?.el || inputRef.value;
-		if (el && el.querySelector) {
-			const input = el.querySelector('input') || el;
-			input?.select?.();
-		} else if (el?.select) {
-			el.select();
-		}
-		hasSelectedOnFirstClick.value = true;
-	});
-}
-
-function blurInput() {
-	nextTick(() => {
-		const el = inputRef.value?.el || inputRef.value;
-		if (el && el.querySelector) {
-			const input = el.querySelector('input') || el;
-			input?.blur?.();
-		} else if (el?.blur) {
-			el.blur();
-		}
-		isFocused.value = false;
-	});
-}
-
-function onEscape() {
-	if (showOptions.value) showOptions.value = false;
-	blurInput();
-}
-
-function setInvalid(val) {
-	if (invalidState !== val) {
-		invalidState = val;
-		emit('invalid-change', val);
-	}
-}
-</script>
diff --git a/dashboard/src/pages/devtools/database/extras/readme.md b/dashboard/src/pages/devtools/database/extras/readme.md
deleted file mode 100644
index c00bc3ac55d..00000000000
--- a/dashboard/src/pages/devtools/database/extras/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-Once we update to frappe-ui latest version, this components can be removed
diff --git a/dashboard/src/pages/devtools/database/extras/utils.js b/dashboard/src/pages/devtools/database/extras/utils.js
deleted file mode 100644
index 187a2765a7e..00000000000
--- a/dashboard/src/pages/devtools/database/extras/utils.js
+++ /dev/null
@@ -1,102 +0,0 @@
-import { dayjs, dayjsLocal } from 'frappe-ui';
-
-// Constant list of month labels
-export const months = [
-	'Jan',
-	'Feb',
-	'Mar',
-	'Apr',
-	'May',
-	'Jun',
-	'Jul',
-	'Aug',
-	'Sep',
-	'Oct',
-	'Nov',
-	'Dec',
-];
-
-// Start of given month (0-indexed month)
-export function monthStart(year, monthIndex) {
-	return dayjs(`${year}-${monthIndex + 1}-01`);
-}
-
-// Build weeks grid for the calendar
-export function generateWeeks(year, monthIndex, selected) {
-	const start = monthStart(year, monthIndex).startOf('week');
-	const end = monthStart(year, monthIndex).endOf('month').endOf('week');
-	const days = [];
-	let d = start;
-	while (d.isBefore(end) || d.isSame(end)) {
-		const inMonth = d.month() === monthIndex;
-		const sel = dayjs(selected);
-		days.push({
-			date: d,
-			key: d.format('YYYY-MM-DD'),
-			inMonth,
-			isToday: d.isSame(dayjsLocal().format('YYYY-MM-DD'), 'day'),
-			isSelected: sel.isValid() && d.isSame(sel, 'day'),
-		});
-		d = d.add(1, 'day');
-	}
-	const chunked = [];
-	for (let i = 0; i < days.length; i += 7) chunked.push(days.slice(i, i + 7));
-	return chunked;
-}
-
-function getDate(...args) {
-	return new Date(...args);
-}
-
-function getDateValue(date) {
-	if (!date || date.toString() === 'Invalid Date') return '';
-
-	return dayjs(date)
-		.set('hour', 0)
-		.set('minute', 0)
-		.set('second', 0)
-		.set('millisecond', 0)
-		.format('YYYY-MM-DD');
-}
-
-function getDatesAfter(date, count) {
-	let incrementer = 1;
-	if (count < 0) {
-		incrementer = -1;
-		count = Math.abs(count);
-	}
-	const dates = [];
-
-	while (count) {
-		date = getDate(
-			date.getFullYear(),
-			date.getMonth(),
-			date.getDate() + incrementer,
-		);
-		dates.push(date);
-		count--;
-	}
-
-	if (incrementer === -1) {
-		return dates.reverse();
-	}
-	return dates;
-}
-
-function getDaysInMonth(monthIndex, year) {
-	const daysInMonthMap = [31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31];
-	const daysInMonth = daysInMonthMap[monthIndex];
-	if (monthIndex === 1 && isLeapYear(year)) {
-		return 29;
-	}
-	return daysInMonth;
-}
-
-function isLeapYear(year) {
-	if (year % 400 === 0) return true;
-	if (year % 100 === 0) return false;
-	if (year % 4 === 0) return true;
-	return false;
-}
-
-export { getDate, getDateValue, getDatesAfter, getDaysInMonth, isLeapYear };
diff --git a/dashboard/src/utils/device.ts b/dashboard/src/utils/device.ts
index ec0aebc10fd..825fafc230b 100644
--- a/dashboard/src/utils/device.ts
+++ b/dashboard/src/utils/device.ts
@@ -17,3 +17,7 @@ export function getPlatform(): Platform {
 export function isMobile(): boolean {
 	return window.innerWidth < 640;
 }
+
+export function isMac(): boolean {
+	return getPlatform() === 'mac';
+}
diff --git a/dashboard/tailwind.config.js b/dashboard/tailwind.config.js
index eecd5b0d9e9..50a4a123dbe 100644
--- a/dashboard/tailwind.config.js
+++ b/dashboard/tailwind.config.js
@@ -1,5 +1,5 @@
 import plugin from 'tailwindcss/plugin';
-import frappeUIPreset from 'frappe-ui/src/tailwind/preset';
+import frappeUIPreset from 'frappe-ui/tailwind';
 import containerQueries from '@tailwindcss/container-queries';
 
 export default {
diff --git a/dashboard/tests-e2e/tests/dashboard/coverage.fixture.ts b/dashboard/tests-e2e/tests/dashboard/coverage.fixture.ts
index 13bf5200bcb..945803d7d47 100644
--- a/dashboard/tests-e2e/tests/dashboard/coverage.fixture.ts
+++ b/dashboard/tests-e2e/tests/dashboard/coverage.fixture.ts
@@ -12,11 +12,22 @@ const test = base.extend({
     
     const coverage = await page.coverage.stopJSCoverage();
 
-    const pathToSource = path.join(
+    const assetsDir = path.join(
       process.cwd(),
-      "../../../sites/assets/press/dashboard/assets/index-",
+      "../../../sites/assets/press/dashboard/assets",
     );
 
+    // Dynamically find the entry file
+    const entryFile = fs
+      .readdirSync(assetsDir)
+      .find((f) => f.startsWith("index-") && f.endsWith(".js"));
+
+    if (!entryFile) {
+      throw new Error(`Cant find entry JS file in ${assetsDir}`);
+    }
+
+    const pathToSource = path.join(assetsDir, entryFile);
+
     for (const entry of coverage) {
       const converter = v8ToIstanbul(
         pathToSource,
diff --git a/dashboard/yarn.lock b/dashboard/yarn.lock
index 72e600f2928..631b56b70d1 100644
--- a/dashboard/yarn.lock
+++ b/dashboard/yarn.lock
@@ -41,7 +41,7 @@
   resolved "https://registry.yarnpkg.com/@antfu/utils/-/utils-8.1.1.tgz#95b1947d292a9a2efffba2081796dcaa05ecedfb"
   integrity sha512-Mex9nXf9vR6AhcXmMrlz/HVgYYZpVGJ6YlPgwl7UnaFpnshXs6EK/oa5Gpf3CzENMjkvEx2tQtntGnb7UtSTOQ==
 
-"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.26.2", "@babel/code-frame@^7.27.1":
+"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.27.1":
   version "7.27.1"
   resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.27.1.tgz#200f715e66d52a23b221a9435534a91cc13ad5be"
   integrity sha512-cjQ7ZlQ0Mv3b47hABuTevyTuYN4i+loJKGeV9flcCgIK37cCXRh+L1bd3iBHlynerhQ7BhCkn2BPbQUL+rGqFg==
@@ -50,12 +50,26 @@
     js-tokens "^4.0.0"
     picocolors "^1.1.1"
 
+"@babel/code-frame@^7.28.6", "@babel/code-frame@^7.29.0":
+  version "7.29.0"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.29.0.tgz#7cd7a59f15b3cc0dcd803038f7792712a7d0b15c"
+  integrity sha512-9NhCeYjq9+3uxgdtp20LSiJXJvN0FeCtNGpJxuMFZ1Kv3cWUNb6DOhJwUvcVCzKGR66cw4njwM6hrJLqgOwbcw==
+  dependencies:
+    "@babel/helper-validator-identifier" "^7.28.5"
+    js-tokens "^4.0.0"
+    picocolors "^1.1.1"
+
 "@babel/compat-data@^7.22.6", "@babel/compat-data@^7.27.2":
   version "7.27.2"
   resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.27.2.tgz#4183f9e642fd84e74e3eea7ffa93a412e3b102c9"
   integrity sha512-TUtMJYRPyUb/9aU8f3K0mjmjf6M9N5Woshn2CS6nqJSeJtTtQcpLUXjGt9vbF8ZGff0El99sWkLgzwW3VXnxZQ==
 
-"@babel/core@^7.18.5", "@babel/core@^7.22.9", "@babel/core@^7.23.3":
+"@babel/compat-data@^7.28.6":
+  version "7.29.0"
+  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.29.0.tgz#00d03e8c0ac24dd9be942c5370990cbe1f17d88d"
+  integrity sha512-T1NCJqT/j9+cn8fvkt7jtwbLBfLC/1y1c7NtCeXFRgzGTsafi68MRv8yzkYSapBnFA6L3U2VSc02ciDzoAJhJg==
+
+"@babel/core@^7.18.5", "@babel/core@^7.22.9":
   version "7.27.1"
   resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.27.1.tgz#89de51e86bd12246003e3524704c49541b16c3e6"
   integrity sha512-IaaGWsQqfsQWVLqMn9OB92MNN7zukfVA4s7KKAI0KfrrDsZ0yhi5uV4baBuLuN7n3vsZpwP8asPPcVwApxvjBQ==
@@ -76,6 +90,27 @@
     json5 "^2.2.3"
     semver "^6.3.1"
 
+"@babel/core@^7.29.0":
+  version "7.29.0"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.29.0.tgz#5286ad785df7f79d656e88ce86e650d16ca5f322"
+  integrity sha512-CGOfOJqWjg2qW/Mb6zNsDm+u5vFQ8DxXfbM09z69p5Z6+mE1ikP2jUXw+j42Pf1XTYED2Rni5f95npYeuwMDQA==
+  dependencies:
+    "@babel/code-frame" "^7.29.0"
+    "@babel/generator" "^7.29.0"
+    "@babel/helper-compilation-targets" "^7.28.6"
+    "@babel/helper-module-transforms" "^7.28.6"
+    "@babel/helpers" "^7.28.6"
+    "@babel/parser" "^7.29.0"
+    "@babel/template" "^7.28.6"
+    "@babel/traverse" "^7.29.0"
+    "@babel/types" "^7.29.0"
+    "@jridgewell/remapping" "^2.3.5"
+    convert-source-map "^2.0.0"
+    debug "^4.1.0"
+    gensync "^1.0.0-beta.2"
+    json5 "^2.2.3"
+    semver "^6.3.1"
+
 "@babel/generator@^7.27.1":
   version "7.27.1"
   resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.27.1.tgz#862d4fad858f7208edd487c28b58144036b76230"
@@ -87,6 +122,17 @@
     "@jridgewell/trace-mapping" "^0.3.25"
     jsesc "^3.0.2"
 
+"@babel/generator@^7.29.0":
+  version "7.29.1"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.29.1.tgz#d09876290111abbb00ef962a7b83a5307fba0d50"
+  integrity sha512-qsaF+9Qcm2Qv8SRIMMscAvG4O3lJ0F1GuMo5HR/Bp02LopNgnZBC/EkbevHFeGs4ls/oPz9v+Bsmzbkbe+0dUw==
+  dependencies:
+    "@babel/parser" "^7.29.0"
+    "@babel/types" "^7.29.0"
+    "@jridgewell/gen-mapping" "^0.3.12"
+    "@jridgewell/trace-mapping" "^0.3.28"
+    jsesc "^3.0.2"
+
 "@babel/helper-annotate-as-pure@^7.27.1":
   version "7.27.1"
   resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.27.1.tgz#4345d81a9a46a6486e24d069469f13e60445c05d"
@@ -94,6 +140,13 @@
   dependencies:
     "@babel/types" "^7.27.1"
 
+"@babel/helper-annotate-as-pure@^7.27.3":
+  version "7.27.3"
+  resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.27.3.tgz#f31fd86b915fc4daf1f3ac6976c59be7084ed9c5"
+  integrity sha512-fXSwMQqitTGeHLBC08Eq5yXz2m37E4pJX1qAU1+2cNedz/ifv/bVXft90VeSav5nFO61EcNgwr0aJxbyPaWBPg==
+  dependencies:
+    "@babel/types" "^7.27.3"
+
 "@babel/helper-compilation-targets@^7.22.6", "@babel/helper-compilation-targets@^7.27.1", "@babel/helper-compilation-targets@^7.27.2":
   version "7.27.2"
   resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.27.2.tgz#46a0f6efab808d51d29ce96858dd10ce8732733d"
@@ -105,6 +158,17 @@
     lru-cache "^5.1.1"
     semver "^6.3.1"
 
+"@babel/helper-compilation-targets@^7.28.6":
+  version "7.28.6"
+  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.28.6.tgz#32c4a3f41f12ed1532179b108a4d746e105c2b25"
+  integrity sha512-JYtls3hqi15fcx5GaSNL7SCTJ2MNmjrkHXg4FSpOA/grxK8KwyZ5bubHsCq8FXCkua6xhuaaBit+3b7+VZRfcA==
+  dependencies:
+    "@babel/compat-data" "^7.28.6"
+    "@babel/helper-validator-option" "^7.27.1"
+    browserslist "^4.24.0"
+    lru-cache "^5.1.1"
+    semver "^6.3.1"
+
 "@babel/helper-create-class-features-plugin@^7.27.1":
   version "7.27.1"
   resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.27.1.tgz#5bee4262a6ea5ddc852d0806199eb17ca3de9281"
@@ -118,6 +182,19 @@
     "@babel/traverse" "^7.27.1"
     semver "^6.3.1"
 
+"@babel/helper-create-class-features-plugin@^7.28.6":
+  version "7.28.6"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.28.6.tgz#611ff5482da9ef0db6291bcd24303400bca170fb"
+  integrity sha512-dTOdvsjnG3xNT9Y0AUg1wAl38y+4Rl4sf9caSQZOXdNqVn+H+HbbJ4IyyHaIqNR6SW9oJpA/RuRjsjCw2IdIow==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.27.3"
+    "@babel/helper-member-expression-to-functions" "^7.28.5"
+    "@babel/helper-optimise-call-expression" "^7.27.1"
+    "@babel/helper-replace-supers" "^7.28.6"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.27.1"
+    "@babel/traverse" "^7.28.6"
+    semver "^6.3.1"
+
 "@babel/helper-create-regexp-features-plugin@^7.18.6", "@babel/helper-create-regexp-features-plugin@^7.27.1":
   version "7.27.1"
   resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.27.1.tgz#05b0882d97ba1d4d03519e4bce615d70afa18c53"
@@ -138,6 +215,11 @@
     lodash.debounce "^4.0.8"
     resolve "^1.14.2"
 
+"@babel/helper-globals@^7.28.0":
+  version "7.28.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-globals/-/helper-globals-7.28.0.tgz#b9430df2aa4e17bc28665eadeae8aa1d985e6674"
+  integrity sha512-+W6cISkXFa1jXsDEdYA8HeevQT/FULhxzR99pxphltZcVaugps53THCeiWA8SguxxpSp3gKPiuYfSWopkLQ4hw==
+
 "@babel/helper-member-expression-to-functions@^7.27.1":
   version "7.27.1"
   resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.27.1.tgz#ea1211276be93e798ce19037da6f06fbb994fa44"
@@ -146,7 +228,15 @@
     "@babel/traverse" "^7.27.1"
     "@babel/types" "^7.27.1"
 
-"@babel/helper-module-imports@^7.25.9", "@babel/helper-module-imports@^7.27.1":
+"@babel/helper-member-expression-to-functions@^7.28.5":
+  version "7.28.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.28.5.tgz#f3e07a10be37ed7a63461c63e6929575945a6150"
+  integrity sha512-cwM7SBRZcPCLgl8a7cY0soT1SptSzAlMH39vwiRpOQkJlh53r5hdHwLSCZpQdVLT39sZt+CRpNwYG4Y2v77atg==
+  dependencies:
+    "@babel/traverse" "^7.28.5"
+    "@babel/types" "^7.28.5"
+
+"@babel/helper-module-imports@^7.27.1":
   version "7.27.1"
   resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.27.1.tgz#7ef769a323e2655e126673bb6d2d6913bbead204"
   integrity sha512-0gSFWUPNXNopqtIPQvlD5WgXYI5GY2kP2cCvoT8kczjbfcfuIljTbcWrulD1CIPIX2gt1wghbDy08yE1p+/r3w==
@@ -154,6 +244,14 @@
     "@babel/traverse" "^7.27.1"
     "@babel/types" "^7.27.1"
 
+"@babel/helper-module-imports@^7.28.6":
+  version "7.28.6"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.28.6.tgz#60632cbd6ffb70b22823187201116762a03e2d5c"
+  integrity sha512-l5XkZK7r7wa9LucGw9LwZyyCUscb4x37JWTPz7swwFE/0FMQAGpiWUZn8u9DzkSBWEcK25jmvubfpw2dnAMdbw==
+  dependencies:
+    "@babel/traverse" "^7.28.6"
+    "@babel/types" "^7.28.6"
+
 "@babel/helper-module-transforms@^7.27.1":
   version "7.27.1"
   resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.27.1.tgz#e1663b8b71d2de948da5c4fb2a20ca4f3ec27a6f"
@@ -163,6 +261,15 @@
     "@babel/helper-validator-identifier" "^7.27.1"
     "@babel/traverse" "^7.27.1"
 
+"@babel/helper-module-transforms@^7.28.6":
+  version "7.28.6"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.28.6.tgz#9312d9d9e56edc35aeb6e95c25d4106b50b9eb1e"
+  integrity sha512-67oXFAYr2cDLDVGLXTEABjdBJZ6drElUSI7WKp70NrpyISso3plG9SAGEF6y7zbha/wOzUByWWTJvEDVNIUGcA==
+  dependencies:
+    "@babel/helper-module-imports" "^7.28.6"
+    "@babel/helper-validator-identifier" "^7.28.5"
+    "@babel/traverse" "^7.28.6"
+
 "@babel/helper-optimise-call-expression@^7.27.1":
   version "7.27.1"
   resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.27.1.tgz#c65221b61a643f3e62705e5dd2b5f115e35f9200"
@@ -170,11 +277,16 @@
   dependencies:
     "@babel/types" "^7.27.1"
 
-"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.18.6", "@babel/helper-plugin-utils@^7.22.5", "@babel/helper-plugin-utils@^7.26.5", "@babel/helper-plugin-utils@^7.27.1":
+"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.18.6", "@babel/helper-plugin-utils@^7.22.5", "@babel/helper-plugin-utils@^7.27.1":
   version "7.27.1"
   resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.27.1.tgz#ddb2f876534ff8013e6c2b299bf4d39b3c51d44c"
   integrity sha512-1gn1Up5YXka3YYAHGKpbideQ5Yjf1tDa9qYcgysz+cNCXukyLl6DjPXhD3VRwSb8c0J9tA4b2+rHEZtc6R0tlw==
 
+"@babel/helper-plugin-utils@^7.28.6":
+  version "7.28.6"
+  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.28.6.tgz#6f13ea251b68c8532e985fd532f28741a8af9ac8"
+  integrity sha512-S9gzZ/bz83GRysI7gAD4wPT/AI3uCnY+9xn+Mx/KPs2JwHJIz1W8PZkg2cqyt3RNOBM8ejcXhV6y8Og7ly/Dug==
+
 "@babel/helper-remap-async-to-generator@^7.27.1":
   version "7.27.1"
   resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.27.1.tgz#4601d5c7ce2eb2aea58328d43725523fcd362ce6"
@@ -193,6 +305,15 @@
     "@babel/helper-optimise-call-expression" "^7.27.1"
     "@babel/traverse" "^7.27.1"
 
+"@babel/helper-replace-supers@^7.28.6":
+  version "7.28.6"
+  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.28.6.tgz#94aa9a1d7423a00aead3f204f78834ce7d53fe44"
+  integrity sha512-mq8e+laIk94/yFec3DxSjCRD2Z0TAjhVbEJY3UQrlwVo15Lmt7C2wAUbK4bjnTs4APkwsYLTahXRraQXhb1WCg==
+  dependencies:
+    "@babel/helper-member-expression-to-functions" "^7.28.5"
+    "@babel/helper-optimise-call-expression" "^7.27.1"
+    "@babel/traverse" "^7.28.6"
+
 "@babel/helper-skip-transparent-expression-wrappers@^7.27.1":
   version "7.27.1"
   resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.27.1.tgz#62bb91b3abba8c7f1fec0252d9dbea11b3ee7a56"
@@ -211,6 +332,11 @@
   resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.27.1.tgz#a7054dcc145a967dd4dc8fee845a57c1316c9df8"
   integrity sha512-D2hP9eA+Sqx1kBZgzxZh0y1trbuU+JoDkiEwqhQ36nodYqJwyEIhPSdMNd7lOm/4io72luTPWH20Yda0xOuUow==
 
+"@babel/helper-validator-identifier@^7.28.5":
+  version "7.28.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.28.5.tgz#010b6938fab7cb7df74aa2bbc06aa503b8fe5fb4"
+  integrity sha512-qSs4ifwzKJSV39ucNjsvc6WVHs6b7S03sOh2OcHF9UHfVPqWWALUsNUVzhSBiItjRZoLHx7nIarVjqKVusUZ1Q==
+
 "@babel/helper-validator-option@^7.27.1":
   version "7.27.1"
   resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.27.1.tgz#fa52f5b1e7db1ab049445b421c4471303897702f"
@@ -233,13 +359,28 @@
     "@babel/template" "^7.27.1"
     "@babel/types" "^7.27.1"
 
-"@babel/parser@^7.26.9", "@babel/parser@^7.27.1", "@babel/parser@^7.27.2", "@babel/parser@^7.7.0":
+"@babel/helpers@^7.28.6":
+  version "7.29.2"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.29.2.tgz#9cfbccb02b8e229892c0b07038052cc1a8709c49"
+  integrity sha512-HoGuUs4sCZNezVEKdVcwqmZN8GoHirLUcLaYVNBK2J0DadGtdcqgr3BCbvH8+XUo4NGjNl3VOtSjEKNzqfFgKw==
+  dependencies:
+    "@babel/template" "^7.28.6"
+    "@babel/types" "^7.29.0"
+
+"@babel/parser@^7.27.1", "@babel/parser@^7.27.2", "@babel/parser@^7.7.0":
   version "7.27.2"
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.27.2.tgz#577518bedb17a2ce4212afd052e01f7df0941127"
   integrity sha512-QYLs8299NA7WM/bZAdp+CviYYkVoYXlDW2rzliy3chxd1PQjej7JORuMJDJXJUb9g0TT+B99EwaVLKmX+sPXWw==
   dependencies:
     "@babel/types" "^7.27.1"
 
+"@babel/parser@^7.28.4", "@babel/parser@^7.28.6", "@babel/parser@^7.29.0", "@babel/parser@^7.29.2":
+  version "7.29.2"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.29.2.tgz#58bd50b9a7951d134988a1ae177a35ef9a703ba1"
+  integrity sha512-4GgRzy/+fsBa72/RZVJmGKPmZu9Byn8o4MoLpmNe1m8ZfYnz5emHLQz3U4gLud6Zwl0RZIcgiLD7Uq7ySFuDLA==
+  dependencies:
+    "@babel/types" "^7.29.0"
+
 "@babel/plugin-bugfix-firefox-class-in-computed-class-key@^7.27.1":
   version "7.27.1"
   resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-firefox-class-in-computed-class-key/-/plugin-bugfix-firefox-class-in-computed-class-key-7.27.1.tgz#61dd8a8e61f7eb568268d1b5f129da3eee364bf9"
@@ -298,19 +439,19 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.27.1"
 
-"@babel/plugin-syntax-jsx@^7.25.9":
-  version "7.27.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.27.1.tgz#2f9beb5eff30fa507c5532d107daac7b888fa34c"
-  integrity sha512-y8YTNIeKoyhGd9O0Jiyzyyqk8gdjnumGTQPsz0xOZOQ2RmkVJeZ1vmmfIvFEKqucBG6axJGBZDE/7iI5suUI/w==
+"@babel/plugin-syntax-jsx@^7.27.1":
+  version "7.28.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.28.6.tgz#f8ca28bbd84883b5fea0e447c635b81ba73997ee"
+  integrity sha512-wgEmr06G6sIpqr8YDwA2dSRTE3bJ+V0IfpzfSY3Lfgd7YWOaAdlykvJi13ZKBt8cZHfgH1IXN+CL656W3uUa4w==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.27.1"
+    "@babel/helper-plugin-utils" "^7.28.6"
 
-"@babel/plugin-syntax-typescript@^7.27.1":
-  version "7.27.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.27.1.tgz#5147d29066a793450f220c63fa3a9431b7e6dd18"
-  integrity sha512-xfYCBMxveHrRMnAWl1ZlPXOZjzkN82THFvLhQhFXFt81Z5HnN+EtUkZhv/zcKpmT3fzmWZB0ywiBrbC3vogbwQ==
+"@babel/plugin-syntax-typescript@^7.28.6":
+  version "7.28.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.28.6.tgz#c7b2ddf1d0a811145b1de800d1abd146af92e3a2"
+  integrity sha512-+nDNmQye7nlnuuHDboPbGm00Vqg3oO8niRRL27/4LYHUsHYh0zJ1xWOz0uRwNFmM1Avzk8wZbc6rdiYhomzv/A==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.27.1"
+    "@babel/helper-plugin-utils" "^7.28.6"
 
 "@babel/plugin-syntax-unicode-sets-regex@^7.18.6":
   version "7.18.6"
@@ -676,16 +817,16 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.27.1"
 
-"@babel/plugin-transform-typescript@^7.23.3":
-  version "7.27.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.27.1.tgz#d3bb65598bece03f773111e88cc4e8e5070f1140"
-  integrity sha512-Q5sT5+O4QUebHdbwKedFBEwRLb02zJ7r4A5Gg2hUoLuU3FjdMcyqcywqUrLCaDsFCxzokf7u9kuy7qz51YUuAg==
+"@babel/plugin-transform-typescript@^7.28.6":
+  version "7.28.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.28.6.tgz#1e93d96da8adbefdfdade1d4956f73afa201a158"
+  integrity sha512-0YWL2RFxOqEm9Efk5PvreamxPME8OyY0wM5wh5lHjF+VtVhdneCWGzZeSqzOfiobVqQaNCd2z0tQvnI9DaPWPw==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.27.1"
-    "@babel/helper-create-class-features-plugin" "^7.27.1"
-    "@babel/helper-plugin-utils" "^7.27.1"
+    "@babel/helper-annotate-as-pure" "^7.27.3"
+    "@babel/helper-create-class-features-plugin" "^7.28.6"
+    "@babel/helper-plugin-utils" "^7.28.6"
     "@babel/helper-skip-transparent-expression-wrappers" "^7.27.1"
-    "@babel/plugin-syntax-typescript" "^7.27.1"
+    "@babel/plugin-syntax-typescript" "^7.28.6"
 
 "@babel/plugin-transform-unicode-escapes@^7.27.1":
   version "7.27.1"
@@ -802,7 +943,7 @@
     "@babel/types" "^7.4.4"
     esutils "^2.0.2"
 
-"@babel/template@^7.26.9", "@babel/template@^7.27.1":
+"@babel/template@^7.27.1":
   version "7.27.2"
   resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.27.2.tgz#fa78ceed3c4e7b63ebf6cb39e5852fca45f6809d"
   integrity sha512-LPDZ85aEJyYSd18/DkjNh4/y1ntkE5KwUHWTiqgRxruuZL2F1yuHligVHLvcHY2vMHXttKFpJn6LwfI7cw7ODw==
@@ -811,7 +952,16 @@
     "@babel/parser" "^7.27.2"
     "@babel/types" "^7.27.1"
 
-"@babel/traverse@^7.26.9", "@babel/traverse@^7.27.1", "@babel/traverse@^7.7.0":
+"@babel/template@^7.27.2", "@babel/template@^7.28.6":
+  version "7.28.6"
+  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.28.6.tgz#0e7e56ecedb78aeef66ce7972b082fce76a23e57"
+  integrity sha512-YA6Ma2KsCdGb+WC6UpBVFJGXL58MDA6oyONbjyF/+5sBgxY/dwkhLogbMT2GXXyU84/IhRw/2D1Os1B/giz+BQ==
+  dependencies:
+    "@babel/code-frame" "^7.28.6"
+    "@babel/parser" "^7.28.6"
+    "@babel/types" "^7.28.6"
+
+"@babel/traverse@^7.27.1", "@babel/traverse@^7.7.0":
   version "7.27.1"
   resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.27.1.tgz#4db772902b133bbddd1c4f7a7ee47761c1b9f291"
   integrity sha512-ZCYtZciz1IWJB4U61UPu4KEaqyfj+r5T1Q5mqPo+IBpcG9kHv30Z0aD8LXPgC1trYa6rK0orRyAhqUgk4MjmEg==
@@ -824,7 +974,20 @@
     debug "^4.3.1"
     globals "^11.1.0"
 
-"@babel/types@^7.26.9", "@babel/types@^7.27.1", "@babel/types@^7.4.4", "@babel/types@^7.7.0":
+"@babel/traverse@^7.28.4", "@babel/traverse@^7.28.5", "@babel/traverse@^7.28.6", "@babel/traverse@^7.29.0":
+  version "7.29.0"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.29.0.tgz#f323d05001440253eead3c9c858adbe00b90310a"
+  integrity sha512-4HPiQr0X7+waHfyXPZpWPfWL/J7dcN1mx9gL6WdQVMbPnF3+ZhSMs8tCxN7oHddJE9fhNE7+lxdnlyemKfJRuA==
+  dependencies:
+    "@babel/code-frame" "^7.29.0"
+    "@babel/generator" "^7.29.0"
+    "@babel/helper-globals" "^7.28.0"
+    "@babel/parser" "^7.29.0"
+    "@babel/template" "^7.28.6"
+    "@babel/types" "^7.29.0"
+    debug "^4.3.1"
+
+"@babel/types@^7.27.1", "@babel/types@^7.4.4", "@babel/types@^7.7.0":
   version "7.27.1"
   resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.27.1.tgz#9defc53c16fc899e46941fc6901a9eea1c9d8560"
   integrity sha512-+EzkxvLNfiUeKMgy/3luqfsCWFRXLb7U6wNQTk60tovuckwB15B191tJWvpp4HjiQWdJkCxO3Wbvc6jlk3Xb2Q==
@@ -832,6 +995,14 @@
     "@babel/helper-string-parser" "^7.27.1"
     "@babel/helper-validator-identifier" "^7.27.1"
 
+"@babel/types@^7.27.3", "@babel/types@^7.28.4", "@babel/types@^7.28.5", "@babel/types@^7.28.6", "@babel/types@^7.29.0":
+  version "7.29.0"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.29.0.tgz#9f5b1e838c446e72cf3cd4b918152b8c605e37c7"
+  integrity sha512-LwdZHpScM4Qz8Xw2iKSzS+cfglZzJGvofQICy7W7v4caru4EaAmyUuO6BGrbyQ2mYV11W0U8j5mBhd14dd3B0A==
+  dependencies:
+    "@babel/helper-string-parser" "^7.27.1"
+    "@babel/helper-validator-identifier" "^7.28.5"
+
 "@bcoe/v8-coverage@^0.2.3":
   version "0.2.3"
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
@@ -915,126 +1086,11 @@
     style-mod "^4.1.0"
     w3c-keyname "^2.2.4"
 
-"@esbuild/aix-ppc64@0.21.5":
-  version "0.21.5"
-  resolved "https://registry.yarnpkg.com/@esbuild/aix-ppc64/-/aix-ppc64-0.21.5.tgz#c7184a326533fcdf1b8ee0733e21c713b975575f"
-  integrity sha512-1SDgH6ZSPTlggy1yI6+Dbkiz8xzpHJEVAlF/AM1tHPLsf5STom9rwtjE4hKAF20FfXXNTFqEYXyJNWh1GiZedQ==
-
-"@esbuild/android-arm64@0.21.5":
-  version "0.21.5"
-  resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.21.5.tgz#09d9b4357780da9ea3a7dfb833a1f1ff439b4052"
-  integrity sha512-c0uX9VAUBQ7dTDCjq+wdyGLowMdtR/GoC2U5IYk/7D1H1JYC0qseD7+11iMP2mRLN9RcCMRcjC4YMclCzGwS/A==
-
-"@esbuild/android-arm@0.21.5":
-  version "0.21.5"
-  resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.21.5.tgz#9b04384fb771926dfa6d7ad04324ecb2ab9b2e28"
-  integrity sha512-vCPvzSjpPHEi1siZdlvAlsPxXl7WbOVUBBAowWug4rJHb68Ox8KualB+1ocNvT5fjv6wpkX6o/iEpbDrf68zcg==
-
-"@esbuild/android-x64@0.21.5":
-  version "0.21.5"
-  resolved "https://registry.yarnpkg.com/@esbuild/android-x64/-/android-x64-0.21.5.tgz#29918ec2db754cedcb6c1b04de8cd6547af6461e"
-  integrity sha512-D7aPRUUNHRBwHxzxRvp856rjUHRFW1SdQATKXH2hqA0kAZb1hKmi02OpYRacl0TxIGz/ZmXWlbZgjwWYaCakTA==
-
-"@esbuild/darwin-arm64@0.21.5":
-  version "0.21.5"
-  resolved "https://registry.yarnpkg.com/@esbuild/darwin-arm64/-/darwin-arm64-0.21.5.tgz#e495b539660e51690f3928af50a76fb0a6ccff2a"
-  integrity sha512-DwqXqZyuk5AiWWf3UfLiRDJ5EDd49zg6O9wclZ7kUMv2WRFr4HKjXp/5t8JZ11QbQfUS6/cRCKGwYhtNAY88kQ==
-
-"@esbuild/darwin-x64@0.21.5":
-  version "0.21.5"
-  resolved "https://registry.yarnpkg.com/@esbuild/darwin-x64/-/darwin-x64-0.21.5.tgz#c13838fa57372839abdddc91d71542ceea2e1e22"
-  integrity sha512-se/JjF8NlmKVG4kNIuyWMV/22ZaerB+qaSi5MdrXtd6R08kvs2qCN4C09miupktDitvh8jRFflwGFBQcxZRjbw==
-
-"@esbuild/freebsd-arm64@0.21.5":
-  version "0.21.5"
-  resolved "https://registry.yarnpkg.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.21.5.tgz#646b989aa20bf89fd071dd5dbfad69a3542e550e"
-  integrity sha512-5JcRxxRDUJLX8JXp/wcBCy3pENnCgBR9bN6JsY4OmhfUtIHe3ZW0mawA7+RDAcMLrMIZaf03NlQiX9DGyB8h4g==
-
-"@esbuild/freebsd-x64@0.21.5":
-  version "0.21.5"
-  resolved "https://registry.yarnpkg.com/@esbuild/freebsd-x64/-/freebsd-x64-0.21.5.tgz#aa615cfc80af954d3458906e38ca22c18cf5c261"
-  integrity sha512-J95kNBj1zkbMXtHVH29bBriQygMXqoVQOQYA+ISs0/2l3T9/kj42ow2mpqerRBxDJnmkUDCaQT/dfNXWX/ZZCQ==
-
-"@esbuild/linux-arm64@0.21.5":
-  version "0.21.5"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-arm64/-/linux-arm64-0.21.5.tgz#70ac6fa14f5cb7e1f7f887bcffb680ad09922b5b"
-  integrity sha512-ibKvmyYzKsBeX8d8I7MH/TMfWDXBF3db4qM6sy+7re0YXya+K1cem3on9XgdT2EQGMu4hQyZhan7TeQ8XkGp4Q==
-
-"@esbuild/linux-arm@0.21.5":
-  version "0.21.5"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-arm/-/linux-arm-0.21.5.tgz#fc6fd11a8aca56c1f6f3894f2bea0479f8f626b9"
-  integrity sha512-bPb5AHZtbeNGjCKVZ9UGqGwo8EUu4cLq68E95A53KlxAPRmUyYv2D6F0uUI65XisGOL1hBP5mTronbgo+0bFcA==
-
-"@esbuild/linux-ia32@0.21.5":
-  version "0.21.5"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-ia32/-/linux-ia32-0.21.5.tgz#3271f53b3f93e3d093d518d1649d6d68d346ede2"
-  integrity sha512-YvjXDqLRqPDl2dvRODYmmhz4rPeVKYvppfGYKSNGdyZkA01046pLWyRKKI3ax8fbJoK5QbxblURkwK/MWY18Tg==
-
 "@esbuild/linux-loong64@0.14.54":
   version "0.14.54"
   resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.14.54.tgz#de2a4be678bd4d0d1ffbb86e6de779cde5999028"
   integrity sha512-bZBrLAIX1kpWelV0XemxBZllyRmM6vgFQQG2GdNb+r3Fkp0FOh1NJSvekXDs7jq70k4euu1cryLMfU+mTXlEpw==
 
-"@esbuild/linux-loong64@0.21.5":
-  version "0.21.5"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.21.5.tgz#ed62e04238c57026aea831c5a130b73c0f9f26df"
-  integrity sha512-uHf1BmMG8qEvzdrzAqg2SIG/02+4/DHB6a9Kbya0XDvwDEKCoC8ZRWI5JJvNdUjtciBGFQ5PuBlpEOXQj+JQSg==
-
-"@esbuild/linux-mips64el@0.21.5":
-  version "0.21.5"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-mips64el/-/linux-mips64el-0.21.5.tgz#e79b8eb48bf3b106fadec1ac8240fb97b4e64cbe"
-  integrity sha512-IajOmO+KJK23bj52dFSNCMsz1QP1DqM6cwLUv3W1QwyxkyIWecfafnI555fvSGqEKwjMXVLokcV5ygHW5b3Jbg==
-
-"@esbuild/linux-ppc64@0.21.5":
-  version "0.21.5"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-ppc64/-/linux-ppc64-0.21.5.tgz#5f2203860a143b9919d383ef7573521fb154c3e4"
-  integrity sha512-1hHV/Z4OEfMwpLO8rp7CvlhBDnjsC3CttJXIhBi+5Aj5r+MBvy4egg7wCbe//hSsT+RvDAG7s81tAvpL2XAE4w==
-
-"@esbuild/linux-riscv64@0.21.5":
-  version "0.21.5"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-riscv64/-/linux-riscv64-0.21.5.tgz#07bcafd99322d5af62f618cb9e6a9b7f4bb825dc"
-  integrity sha512-2HdXDMd9GMgTGrPWnJzP2ALSokE/0O5HhTUvWIbD3YdjME8JwvSCnNGBnTThKGEB91OZhzrJ4qIIxk/SBmyDDA==
-
-"@esbuild/linux-s390x@0.21.5":
-  version "0.21.5"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-s390x/-/linux-s390x-0.21.5.tgz#b7ccf686751d6a3e44b8627ababc8be3ef62d8de"
-  integrity sha512-zus5sxzqBJD3eXxwvjN1yQkRepANgxE9lgOW2qLnmr8ikMTphkjgXu1HR01K4FJg8h1kEEDAqDcZQtbrRnB41A==
-
-"@esbuild/linux-x64@0.21.5":
-  version "0.21.5"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-x64/-/linux-x64-0.21.5.tgz#6d8f0c768e070e64309af8004bb94e68ab2bb3b0"
-  integrity sha512-1rYdTpyv03iycF1+BhzrzQJCdOuAOtaqHTWJZCWvijKD2N5Xu0TtVC8/+1faWqcP9iBCWOmjmhoH94dH82BxPQ==
-
-"@esbuild/netbsd-x64@0.21.5":
-  version "0.21.5"
-  resolved "https://registry.yarnpkg.com/@esbuild/netbsd-x64/-/netbsd-x64-0.21.5.tgz#bbe430f60d378ecb88decb219c602667387a6047"
-  integrity sha512-Woi2MXzXjMULccIwMnLciyZH4nCIMpWQAs049KEeMvOcNADVxo0UBIQPfSmxB3CWKedngg7sWZdLvLczpe0tLg==
-
-"@esbuild/openbsd-x64@0.21.5":
-  version "0.21.5"
-  resolved "https://registry.yarnpkg.com/@esbuild/openbsd-x64/-/openbsd-x64-0.21.5.tgz#99d1cf2937279560d2104821f5ccce220cb2af70"
-  integrity sha512-HLNNw99xsvx12lFBUwoT8EVCsSvRNDVxNpjZ7bPn947b8gJPzeHWyNVhFsaerc0n3TsbOINvRP2byTZ5LKezow==
-
-"@esbuild/sunos-x64@0.21.5":
-  version "0.21.5"
-  resolved "https://registry.yarnpkg.com/@esbuild/sunos-x64/-/sunos-x64-0.21.5.tgz#08741512c10d529566baba837b4fe052c8f3487b"
-  integrity sha512-6+gjmFpfy0BHU5Tpptkuh8+uw3mnrvgs+dSPQXQOv3ekbordwnzTVEb4qnIvQcYXq6gzkyTnoZ9dZG+D4garKg==
-
-"@esbuild/win32-arm64@0.21.5":
-  version "0.21.5"
-  resolved "https://registry.yarnpkg.com/@esbuild/win32-arm64/-/win32-arm64-0.21.5.tgz#675b7385398411240735016144ab2e99a60fc75d"
-  integrity sha512-Z0gOTd75VvXqyq7nsl93zwahcTROgqvuAcYDUr+vOv8uHhNSKROyU961kgtCD1e95IqPKSQKH7tBTslnS3tA8A==
-
-"@esbuild/win32-ia32@0.21.5":
-  version "0.21.5"
-  resolved "https://registry.yarnpkg.com/@esbuild/win32-ia32/-/win32-ia32-0.21.5.tgz#1bfc3ce98aa6ca9a0969e4d2af72144c59c1193b"
-  integrity sha512-SWXFF1CL2RVNMaVs+BBClwtfZSvDgtL//G/smwAc5oVK/UPu2Gu9tIaRgFmYFFKrmg3SyAjSrElf0TiJ1v8fYA==
-
-"@esbuild/win32-x64@0.21.5":
-  version "0.21.5"
-  resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.21.5.tgz#acad351d582d157bb145535db2a6ff53dd514b5c"
-  integrity sha512-tQd/1efJuzPC6rCFwEvLtci/xNFcTZknmXs98FYDfGE4wP9ClFV98nyKrzJKVPMhdDnjzLhdUyMX4PsQAPjwIw==
-
 "@floating-ui/core@^1.7.0":
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/@floating-ui/core/-/core-1.7.0.tgz#1aff27a993ea1b254a586318c29c3b16ea0f4d0a"
@@ -1049,6 +1105,13 @@
   dependencies:
     "@floating-ui/utils" "^0.2.10"
 
+"@floating-ui/core@^1.7.5":
+  version "1.7.5"
+  resolved "https://registry.yarnpkg.com/@floating-ui/core/-/core-1.7.5.tgz#d4af157a03330af5a60e69da7a4692507ada0622"
+  integrity sha512-1Ih4WTWyw0+lKyFMcBHGbb5U5FtuHJuujoyyr5zTaWS5EYMeT6Jb2AuDeftsCsEuchO+mM2ij5+q9crhydzLhQ==
+  dependencies:
+    "@floating-ui/utils" "^0.2.11"
+
 "@floating-ui/dom@^1.0.0", "@floating-ui/dom@^1.6.13", "@floating-ui/dom@^1.6.7":
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/@floating-ui/dom/-/dom-1.7.0.tgz#f9f83ee4fee78ac23ad9e65b128fc11a27857532"
@@ -1065,11 +1128,24 @@
     "@floating-ui/core" "^1.7.3"
     "@floating-ui/utils" "^0.2.10"
 
+"@floating-ui/dom@^1.7.4":
+  version "1.7.6"
+  resolved "https://registry.yarnpkg.com/@floating-ui/dom/-/dom-1.7.6.tgz#f915bba5abbb177e1f227cacee1b4d0634b187bf"
+  integrity sha512-9gZSAI5XM36880PPMm//9dfiEngYoC6Am2izES1FF406YFsjvyBMmeJ2g4SAju3xWwtuynNRFL2s9hgxpLI5SQ==
+  dependencies:
+    "@floating-ui/core" "^1.7.5"
+    "@floating-ui/utils" "^0.2.11"
+
 "@floating-ui/utils@^0.2.10":
   version "0.2.10"
   resolved "https://registry.yarnpkg.com/@floating-ui/utils/-/utils-0.2.10.tgz#a2a1e3812d14525f725d011a73eceb41fef5bc1c"
   integrity sha512-aGTxbpbg8/b5JfU1HXSrbH3wXZuLPJcNEcZQFMxLs3oSzgtVu6nFPkbbGGUvBcUjKV2YyB9Wxxabo+HEH9tcRQ==
 
+"@floating-ui/utils@^0.2.11":
+  version "0.2.11"
+  resolved "https://registry.yarnpkg.com/@floating-ui/utils/-/utils-0.2.11.tgz#a269e055e40e2f45873bae9d1a2fdccbd314ea3f"
+  integrity sha512-RiB/yIh78pcIxl6lLMG0CgBXAZ2Y0eVHqMPYugu+9U0AeT6YBeiJpf7lbdJNIugFP5SIjwNRgo4DhR1Qxi26Gg==
+
 "@floating-ui/utils@^0.2.9":
   version "0.2.9"
   resolved "https://registry.yarnpkg.com/@floating-ui/utils/-/utils-0.2.9.tgz#50dea3616bc8191fb8e112283b49eaff03e78429"
@@ -1091,15 +1167,7 @@
   dependencies:
     "@tanstack/vue-virtual" "^3.0.0-beta.60"
 
-"@iconify/json@^2.2.123":
-  version "2.2.340"
-  resolved "https://registry.yarnpkg.com/@iconify/json/-/json-2.2.340.tgz#58236107ad50378b6829cc323a13dd7cc7f0942d"
-  integrity sha512-pr5oueoKCYmLce5ukSrKihnLDW0CEuQVPIWtrlw8qgx5RBzSxg/aIsuv6Me35ZXrCkBUKxK8h1XLqCLlMB7L6g==
-  dependencies:
-    "@iconify/types" "*"
-    pathe "^1.1.2"
-
-"@iconify/types@*", "@iconify/types@^2.0.0":
+"@iconify/types@^2.0.0":
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/@iconify/types/-/types-2.0.0.tgz#ab0e9ea681d6c8a1214f30cd741fe3a20cc57f57"
   integrity sha512-+wluvCrRhXrhyOmRDJ3q8mux9JkKy5SJ/v8ol2tu4FVjyYvtEzkc/3pK15ET6RKg4b4w4BmTk1+gsCUhf21Ykg==
@@ -1154,6 +1222,14 @@
   resolved "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.3.tgz#e45e384e4b8ec16bce2fd903af78450f6bf7ec98"
   integrity sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==
 
+"@jridgewell/gen-mapping@^0.3.12":
+  version "0.3.13"
+  resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.13.tgz#6342a19f44347518c93e43b1ac69deb3c4656a1f"
+  integrity sha512-2kkt/7niJ6MgEPxF0bYdQ6etZaA+fQvDcLKckhy1yIQOzaoKjBBjSj63/aLVjYE3qhRt5dvM+uUyfCg6UKCBbA==
+  dependencies:
+    "@jridgewell/sourcemap-codec" "^1.5.0"
+    "@jridgewell/trace-mapping" "^0.3.24"
+
 "@jridgewell/gen-mapping@^0.3.2", "@jridgewell/gen-mapping@^0.3.5":
   version "0.3.8"
   resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.8.tgz#4f0e06362e01362f823d348f1872b08f666d8142"
@@ -1186,6 +1262,11 @@
   resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz#3188bcb273a414b0d215fd22a58540b989b9409a"
   integrity sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==
 
+"@jridgewell/sourcemap-codec@^1.5.5":
+  version "1.5.5"
+  resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.5.tgz#6912b00d2c631c0d15ce1a7ab57cd657f2a8f8ba"
+  integrity sha512-cYQ9310grqxueWbl+WuIUIaiUaDcj7WOq5fVhEljNVgRfOUhY9fy2zTvfoqWsnebh8Sl70VScFbICvJnLKB0Og==
+
 "@jridgewell/trace-mapping@^0.3.12", "@jridgewell/trace-mapping@^0.3.24", "@jridgewell/trace-mapping@^0.3.25":
   version "0.3.25"
   resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz#15f190e98895f3fc23276ee14bc76b675c2e50f0"
@@ -1194,6 +1275,14 @@
     "@jridgewell/resolve-uri" "^3.1.0"
     "@jridgewell/sourcemap-codec" "^1.4.14"
 
+"@jridgewell/trace-mapping@^0.3.28":
+  version "0.3.31"
+  resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.31.tgz#db15d6781c931f3a251a3dac39501c98a6082fd0"
+  integrity sha512-zzNR+SdQSDJzc8joaeP8QQoCQr8NuYx2dIIytl1QeBEZHJ9uW6hebsrYgbz8hJwUQao3TWCMtmfV8Nu1twOLAw==
+  dependencies:
+    "@jridgewell/resolve-uri" "^3.1.0"
+    "@jridgewell/sourcemap-codec" "^1.4.14"
+
 "@juggle/resize-observer@^3.4.0":
   version "3.4.0"
   resolved "https://registry.yarnpkg.com/@juggle/resize-observer/-/resize-observer-3.4.0.tgz#08d6c5e20cf7e4cc02fd181c4b0c225cd31dbb60"
@@ -1243,6 +1332,13 @@
     outvariant "^1.2.0"
     strict-event-emitter "^0.2.0"
 
+"@napi-rs/wasm-runtime@^1.1.1":
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/@napi-rs/wasm-runtime/-/wasm-runtime-1.1.3.tgz#1eeb8699770481306e5fcd84471f20fcb6177336"
+  integrity sha512-xK9sGVbJWYb08+mTJt3/YV24WxvxpXcXtP6B172paPZ+Ts69Re9dAr7lKwJoeIx8OoeuimEiRZ7umkiUVClmmQ==
+  dependencies:
+    "@tybys/wasm-util" "^0.10.1"
+
 "@nodelib/fs.scandir@2.1.5":
   version "2.1.5"
   resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz#7619c2eb21b25483f6d167548b4cfd5a7488c3d5"
@@ -1274,6 +1370,11 @@
   resolved "https://registry.yarnpkg.com/@open-draft/until/-/until-1.0.3.tgz#db9cc719191a62e7d9200f6e7bab21c5b848adca"
   integrity sha512-Aq58f5HiWdyDlFffbbSjAlv596h/cOnt2DO1w3DOC7OJ5EHs0hd/nycJfiu9RJbT6Yk6F1knnRRXNSpxoIVZ9Q==
 
+"@oxc-project/types@=0.120.0":
+  version "0.120.0"
+  resolved "https://registry.yarnpkg.com/@oxc-project/types/-/types-0.120.0.tgz#af521b0e689dd0eaa04fe4feef9b68d98b74783d"
+  integrity sha512-k1YNu55DuvAip/MGE1FTsIuU3FUCn6v/ujG9V7Nq5Df/kX2CWb13hhwD0lmJGMGqE+bE1MXvv9SZVnMzEXlWcg==
+
 "@pkgjs/parseargs@^0.11.0":
   version "0.11.0"
   resolved "https://registry.yarnpkg.com/@pkgjs/parseargs/-/parseargs-0.11.0.tgz#a77ea742fab25775145434eb1d2328cf5013ac33"
@@ -1296,6 +1397,98 @@
   resolved "https://registry.yarnpkg.com/@remirror/core-constants/-/core-constants-3.0.0.tgz#96fdb89d25c62e7b6a5d08caf0ce5114370e3b8f"
   integrity sha512-42aWfPrimMfDKDi4YegyS7x+/0tlzaqwPQCULLanv3DMIlu96KTJR0fM5isWX2UViOqlGnX6YFgqWepcX+XMNg==
 
+"@rolldown/binding-android-arm64@1.0.0-rc.10":
+  version "1.0.0-rc.10"
+  resolved "https://registry.yarnpkg.com/@rolldown/binding-android-arm64/-/binding-android-arm64-1.0.0-rc.10.tgz#0bbd3380f49a6d0dc96c9b32fb7dad26ae0dfaa7"
+  integrity sha512-jOHxwXhxmFKuXztiu1ORieJeTbx5vrTkcOkkkn2d35726+iwhrY1w/+nYY/AGgF12thg33qC3R1LMBF5tHTZHg==
+
+"@rolldown/binding-darwin-arm64@1.0.0-rc.10":
+  version "1.0.0-rc.10"
+  resolved "https://registry.yarnpkg.com/@rolldown/binding-darwin-arm64/-/binding-darwin-arm64-1.0.0-rc.10.tgz#a30b051784fbb13635e652ba4041c6ce7a4ce7ab"
+  integrity sha512-gED05Teg/vtTZbIJBc4VNMAxAFDUPkuO/rAIyyxZjTj1a1/s6z5TII/5yMGZ0uLRCifEtwUQn8OlYzuYc0m70w==
+
+"@rolldown/binding-darwin-x64@1.0.0-rc.10":
+  version "1.0.0-rc.10"
+  resolved "https://registry.yarnpkg.com/@rolldown/binding-darwin-x64/-/binding-darwin-x64-1.0.0-rc.10.tgz#2d9dea982d5be90b95b6d8836ff26a4b0959d94b"
+  integrity sha512-rI15NcM1mA48lqrIxVkHfAqcyFLcQwyXWThy+BQ5+mkKKPvSO26ir+ZDp36AgYoYVkqvMcdS8zOE6SeBsR9e8A==
+
+"@rolldown/binding-freebsd-x64@1.0.0-rc.10":
+  version "1.0.0-rc.10"
+  resolved "https://registry.yarnpkg.com/@rolldown/binding-freebsd-x64/-/binding-freebsd-x64-1.0.0-rc.10.tgz#4efc3aca43ae4dfb90729eeca6e84ef6e6b38c4a"
+  integrity sha512-XZRXHdTa+4ME1MuDVp021+doQ+z6Ei4CCFmNc5/sKbqb8YmkiJdj8QKlV3rCI0AJtAeSB5n0WGPuJWNL9p/L2w==
+
+"@rolldown/binding-linux-arm-gnueabihf@1.0.0-rc.10":
+  version "1.0.0-rc.10"
+  resolved "https://registry.yarnpkg.com/@rolldown/binding-linux-arm-gnueabihf/-/binding-linux-arm-gnueabihf-1.0.0-rc.10.tgz#4a19a5d24537e925b25e9583b6cd575b2ad9fa27"
+  integrity sha512-R0SQMRluISSLzFE20sPWYHVmJdDQnRyc/FzSCN72BqQmh2SOZUFG+N3/vBZpR4C6WpEUVYJLrYUXaj43sJsNLA==
+
+"@rolldown/binding-linux-arm64-gnu@1.0.0-rc.10":
+  version "1.0.0-rc.10"
+  resolved "https://registry.yarnpkg.com/@rolldown/binding-linux-arm64-gnu/-/binding-linux-arm64-gnu-1.0.0-rc.10.tgz#01a41e5e905838353ae9a3da10dc8242dcd61453"
+  integrity sha512-Y1reMrV/o+cwpduYhJuOE3OMKx32RMYCidf14y+HssARRmhDuWXJ4yVguDg2R/8SyyGNo+auzz64LnPK9Hq6jg==
+
+"@rolldown/binding-linux-arm64-musl@1.0.0-rc.10":
+  version "1.0.0-rc.10"
+  resolved "https://registry.yarnpkg.com/@rolldown/binding-linux-arm64-musl/-/binding-linux-arm64-musl-1.0.0-rc.10.tgz#bd059e5f83471de29ce35b0ba254995d8091ca40"
+  integrity sha512-vELN+HNb2IzuzSBUOD4NHmP9yrGwl1DVM29wlQvx1OLSclL0NgVWnVDKl/8tEks79EFek/kebQKnNJkIAA4W2g==
+
+"@rolldown/binding-linux-ppc64-gnu@1.0.0-rc.10":
+  version "1.0.0-rc.10"
+  resolved "https://registry.yarnpkg.com/@rolldown/binding-linux-ppc64-gnu/-/binding-linux-ppc64-gnu-1.0.0-rc.10.tgz#fe726a540631015f269a989c0cfb299283190390"
+  integrity sha512-ZqrufYTgzxbHwpqOjzSsb0UV/aV2TFIY5rP8HdsiPTv/CuAgCRjM6s9cYFwQ4CNH+hf9Y4erHW1GjZuZ7WoI7w==
+
+"@rolldown/binding-linux-s390x-gnu@1.0.0-rc.10":
+  version "1.0.0-rc.10"
+  resolved "https://registry.yarnpkg.com/@rolldown/binding-linux-s390x-gnu/-/binding-linux-s390x-gnu-1.0.0-rc.10.tgz#825ced028bad3f1fa9ce83b1f3dac76e0424367f"
+  integrity sha512-gSlmVS1FZJSRicA6IyjoRoKAFK7IIHBs7xJuHRSmjImqk3mPPWbR7RhbnfH2G6bcmMEllCt2vQ/7u9e6bBnByg==
+
+"@rolldown/binding-linux-x64-gnu@1.0.0-rc.10":
+  version "1.0.0-rc.10"
+  resolved "https://registry.yarnpkg.com/@rolldown/binding-linux-x64-gnu/-/binding-linux-x64-gnu-1.0.0-rc.10.tgz#b700dae69274aa3d54a16ca5e00e30f47a089119"
+  integrity sha512-eOCKUpluKgfObT2pHjztnaWEIbUabWzk3qPZ5PuacuPmr4+JtQG4k2vGTY0H15edaTnicgU428XW/IH6AimcQw==
+
+"@rolldown/binding-linux-x64-musl@1.0.0-rc.10":
+  version "1.0.0-rc.10"
+  resolved "https://registry.yarnpkg.com/@rolldown/binding-linux-x64-musl/-/binding-linux-x64-musl-1.0.0-rc.10.tgz#eb875660ad68a2348acab36a7005699e87f6e9dd"
+  integrity sha512-Xdf2jQbfQowJnLcgYfD/m0Uu0Qj5OdxKallD78/IPPfzaiaI4KRAwZzHcKQ4ig1gtg1SuzC7jovNiM2TzQsBXA==
+
+"@rolldown/binding-openharmony-arm64@1.0.0-rc.10":
+  version "1.0.0-rc.10"
+  resolved "https://registry.yarnpkg.com/@rolldown/binding-openharmony-arm64/-/binding-openharmony-arm64-1.0.0-rc.10.tgz#72aa24b412f83025087bcf83ce09634b2bd93c5c"
+  integrity sha512-o1hYe8hLi1EY6jgPFyxQgQ1wcycX+qz8eEbVmot2hFkgUzPxy9+kF0u0NIQBeDq+Mko47AkaFFaChcvZa9UX9Q==
+
+"@rolldown/binding-wasm32-wasi@1.0.0-rc.10":
+  version "1.0.0-rc.10"
+  resolved "https://registry.yarnpkg.com/@rolldown/binding-wasm32-wasi/-/binding-wasm32-wasi-1.0.0-rc.10.tgz#7f3303a96c5dc01d1f4c539b1dcbc16392c6f17d"
+  integrity sha512-Ugv9o7qYJudqQO5Y5y2N2SOo6S4WiqiNOpuQyoPInnhVzCY+wi/GHltcLHypG9DEUYMB0iTB/huJrpadiAcNcA==
+  dependencies:
+    "@napi-rs/wasm-runtime" "^1.1.1"
+
+"@rolldown/binding-win32-arm64-msvc@1.0.0-rc.10":
+  version "1.0.0-rc.10"
+  resolved "https://registry.yarnpkg.com/@rolldown/binding-win32-arm64-msvc/-/binding-win32-arm64-msvc-1.0.0-rc.10.tgz#3419144a04ad12c69c48536b01fc21ac9d87ecf4"
+  integrity sha512-7UODQb4fQUNT/vmgDZBl3XOBAIOutP5R3O/rkxg0aLfEGQ4opbCgU5vOw/scPe4xOqBwL9fw7/RP1vAMZ6QlAQ==
+
+"@rolldown/binding-win32-x64-msvc@1.0.0-rc.10":
+  version "1.0.0-rc.10"
+  resolved "https://registry.yarnpkg.com/@rolldown/binding-win32-x64-msvc/-/binding-win32-x64-msvc-1.0.0-rc.10.tgz#09bee46e6a32c6086beeabc3da12e67be714f882"
+  integrity sha512-PYxKHMVHOb5NJuDL53vBUl1VwUjymDcYI6rzpIni0C9+9mTiJedvUxSk7/RPp7OOAm3v+EjgMu9bIy3N6b408w==
+
+"@rolldown/pluginutils@1.0.0-rc.10":
+  version "1.0.0-rc.10"
+  resolved "https://registry.yarnpkg.com/@rolldown/pluginutils/-/pluginutils-1.0.0-rc.10.tgz#eed997f37f928a3300bbe2161f42687d8a3ae759"
+  integrity sha512-UkVDEFk1w3mveXeKgaTuYfKWtPbvgck1dT8TUG3bnccrH0XtLTuAyfCoks4Q/M5ZGToSVJTIQYCzy2g/atAOeg==
+
+"@rolldown/pluginutils@1.0.0-rc.13":
+  version "1.0.0-rc.13"
+  resolved "https://registry.yarnpkg.com/@rolldown/pluginutils/-/pluginutils-1.0.0-rc.13.tgz#093a01af0cde13552f058544fcadf12e9b522c3b"
+  integrity sha512-3ngTAv6F/Py35BsYbeeLeecvhMKdsKm4AoOETVhAA+Qc8nrA2I0kF7oa93mE9qnIurngOSpMnQ0x2nQY2FPviA==
+
+"@rolldown/pluginutils@^1.0.0-rc.2":
+  version "1.0.0-rc.15"
+  resolved "https://registry.yarnpkg.com/@rolldown/pluginutils/-/pluginutils-1.0.0-rc.15.tgz#e75d7731593e195d23710f9ff49bf5c745c96682"
+  integrity sha512-UromN0peaE53IaBRe9W7CjrZgXl90fqGpK+mIZbA3qSTeYqg3pqpROBdIPvOG3F5ereDHNwoHBI2e50n1BDr1g==
+
 "@rollup/pluginutils@^5.0.2":
   version "5.3.0"
   resolved "https://registry.yarnpkg.com/@rollup/pluginutils/-/pluginutils-5.3.0.tgz#57ba1b0cbda8e7a3c597a4853c807b156e21a7b4"
@@ -1305,116 +1498,6 @@
     estree-walker "^2.0.2"
     picomatch "^4.0.2"
 
-"@rollup/rollup-android-arm-eabi@4.52.0":
-  version "4.52.0"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.52.0.tgz#dfcddfa85a3cba8a0e95483b4a7255ab9e4cdf4d"
-  integrity sha512-VxDYCDqOaR7NXzAtvRx7G1u54d2kEHopb28YH/pKzY6y0qmogP3gG7CSiWsq9WvDFxOQMpNEyjVAHZFXfH3o/A==
-
-"@rollup/rollup-android-arm64@4.52.0":
-  version "4.52.0"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.52.0.tgz#f37b4a8741a7f42d2f2921bd621e7e824a262f0c"
-  integrity sha512-pqDirm8koABIKvzL59YI9W9DWbRlTX7RWhN+auR8HXJxo89m4mjqbah7nJZjeKNTNYopqL+yGg+0mhCpf3xZtQ==
-
-"@rollup/rollup-darwin-arm64@4.52.0":
-  version "4.52.0"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.52.0.tgz#fda8701d38d9888039c1a0e040c026daec908a3f"
-  integrity sha512-YCdWlY/8ltN6H78HnMsRHYlPiKvqKagBP1r+D7SSylxX+HnsgXGCmLiV3Y4nSyY9hW8qr8U9LDUx/Lo7M6MfmQ==
-
-"@rollup/rollup-darwin-x64@4.52.0":
-  version "4.52.0"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.52.0.tgz#c6008839852a33a686080957d296f727af9ca80d"
-  integrity sha512-z4nw6y1j+OOSGzuVbSWdIp1IUks9qNw4dc7z7lWuWDKojY38VMWBlEN7F9jk5UXOkUcp97vA1N213DF+Lz8BRg==
-
-"@rollup/rollup-freebsd-arm64@4.52.0":
-  version "4.52.0"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.52.0.tgz#2b3ee9028493fd58245ded2137de0bc5d6b8f1e4"
-  integrity sha512-Q/dv9Yvyr5rKlK8WQJZVrp5g2SOYeZUs9u/t2f9cQ2E0gJjYB/BWoedXfUT0EcDJefi2zzVfhcOj8drWCzTviw==
-
-"@rollup/rollup-freebsd-x64@4.52.0":
-  version "4.52.0"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.52.0.tgz#32e1ed194ceb3e0ef204efa237c04db13dece948"
-  integrity sha512-kdBsLs4Uile/fbjZVvCRcKB4q64R+1mUq0Yd7oU1CMm1Av336ajIFqNFovByipciuUQjBCPMxwJhCgfG2re3rg==
-
-"@rollup/rollup-linux-arm-gnueabihf@4.52.0":
-  version "4.52.0"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.52.0.tgz#e64b1b7b2744803d7f52701f8bbd2989ae399424"
-  integrity sha512-aL6hRwu0k7MTUESgkg7QHY6CoqPgr6gdQXRJI1/VbFlUMwsSzPGSR7sG5d+MCbYnJmJwThc2ol3nixj1fvI/zQ==
-
-"@rollup/rollup-linux-arm-musleabihf@4.52.0":
-  version "4.52.0"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.52.0.tgz#cef6569f633cacd09ad89189b9a805067141e01f"
-  integrity sha512-BTs0M5s1EJejgIBJhCeiFo7GZZ2IXWkFGcyZhxX4+8usnIo5Mti57108vjXFIQmmJaRyDwmV59Tw64Ap1dkwMw==
-
-"@rollup/rollup-linux-arm64-gnu@4.52.0":
-  version "4.52.0"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.52.0.tgz#358c20dc375f80e20048f99f46b507d6d8063fdf"
-  integrity sha512-uj672IVOU9m08DBGvoPKPi/J8jlVgjh12C9GmjjBxCTQc3XtVmRkRKyeHSmIKQpvJ7fIm1EJieBUcnGSzDVFyw==
-
-"@rollup/rollup-linux-arm64-musl@4.52.0":
-  version "4.52.0"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.52.0.tgz#8141352ddffbf4200b464c1e1957c050f5c0842a"
-  integrity sha512-/+IVbeDMDCtB/HP/wiWsSzduD10SEGzIZX2945KSgZRNi4TSkjHqRJtNTVtVb8IRwhJ65ssI56krlLik+zFWkw==
-
-"@rollup/rollup-linux-loong64-gnu@4.52.0":
-  version "4.52.0"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-loong64-gnu/-/rollup-linux-loong64-gnu-4.52.0.tgz#d92ac6909a29c9f3793e12fdd826d81a0eef0966"
-  integrity sha512-U1vVzvSWtSMWKKrGoROPBXMh3Vwn93TA9V35PldokHGqiUbF6erSzox/5qrSMKp6SzakvyjcPiVF8yB1xKr9Pg==
-
-"@rollup/rollup-linux-ppc64-gnu@4.52.0":
-  version "4.52.0"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-ppc64-gnu/-/rollup-linux-ppc64-gnu-4.52.0.tgz#01aacb8e24c41fc5bed2d592c34c210e92975cd3"
-  integrity sha512-X/4WfuBAdQRH8cK3DYl8zC00XEE6aM472W+QCycpQJeLWVnHfkv7RyBFVaTqNUMsTgIX8ihMjCvFF9OUgeABzw==
-
-"@rollup/rollup-linux-riscv64-gnu@4.52.0":
-  version "4.52.0"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.52.0.tgz#fe3224c04b005a378b22f53f3be718c6c175d782"
-  integrity sha512-xIRYc58HfWDBZoLmWfWXg2Sq8VCa2iJ32B7mqfWnkx5mekekl0tMe7FHpY8I72RXEcUkaWawRvl3qA55og+cwQ==
-
-"@rollup/rollup-linux-riscv64-musl@4.52.0":
-  version "4.52.0"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.52.0.tgz#ff25daa05f99c77f43e4d8eef02d57c231dac6ed"
-  integrity sha512-mbsoUey05WJIOz8U1WzNdf+6UMYGwE3fZZnQqsM22FZ3wh1N887HT6jAOjXs6CNEK3Ntu2OBsyQDXfIjouI4dw==
-
-"@rollup/rollup-linux-s390x-gnu@4.52.0":
-  version "4.52.0"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.52.0.tgz#7afac92ea34b129e1430351f615b9f6a84f6510d"
-  integrity sha512-qP6aP970bucEi5KKKR4AuPFd8aTx9EF6BvutvYxmZuWLJHmnq4LvBfp0U+yFDMGwJ+AIJEH5sIP+SNypauMWzg==
-
-"@rollup/rollup-linux-x64-gnu@4.52.0":
-  version "4.52.0"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.52.0.tgz#214b534701614c7502603e2a083bb9f072ae8500"
-  integrity sha512-nmSVN+F2i1yKZ7rJNKO3G7ZzmxJgoQBQZ/6c4MuS553Grmr7WqR7LLDcYG53Z2m9409z3JLt4sCOhLdbKQ3HmA==
-
-"@rollup/rollup-linux-x64-musl@4.52.0":
-  version "4.52.0"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.52.0.tgz#8bdc313319fb097795b9213782354afeb8452658"
-  integrity sha512-2d0qRo33G6TfQVjaMR71P+yJVGODrt5V6+T0BDYH4EMfGgdC/2HWDVjSSFw888GSzAZUwuska3+zxNUCDco6rQ==
-
-"@rollup/rollup-openharmony-arm64@4.52.0":
-  version "4.52.0"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-openharmony-arm64/-/rollup-openharmony-arm64-4.52.0.tgz#3a6050fc85143f14039c2e8f8f6e90e9e60a392c"
-  integrity sha512-A1JalX4MOaFAAyGgpO7XP5khquv/7xKzLIyLmhNrbiCxWpMlnsTYr8dnsWM7sEeotNmxvSOEL7F65j0HXFcFsw==
-
-"@rollup/rollup-win32-arm64-msvc@4.52.0":
-  version "4.52.0"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.52.0.tgz#7a57e55beeb598b7a27786e95142f39fff5daddb"
-  integrity sha512-YQugafP/rH0eOOHGjmNgDURrpYHrIX0yuojOI8bwCyXwxC9ZdTd3vYkmddPX0oHONLXu9Rb1dDmT0VNpjkzGGw==
-
-"@rollup/rollup-win32-ia32-msvc@4.52.0":
-  version "4.52.0"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.52.0.tgz#a7a7a1b5d53bd3fdddf494106961c018a39f6f77"
-  integrity sha512-zYdUYhi3Qe2fndujBqL5FjAFzvNeLxtIqfzNEVKD1I7C37/chv1VxhscWSQHTNfjPCrBFQMnynwA3kpZpZ8w4A==
-
-"@rollup/rollup-win32-x64-gnu@4.52.0":
-  version "4.52.0"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-x64-gnu/-/rollup-win32-x64-gnu-4.52.0.tgz#45040d6623b0db5dd3b9ee0054708ba8b25cd787"
-  integrity sha512-fGk03kQylNaCOQ96HDMeT7E2n91EqvCDd3RwvT5k+xNdFCeMGnj5b5hEgTGrQuyidqSsD3zJDQ21QIaxXqTBJw==
-
-"@rollup/rollup-win32-x64-msvc@4.52.0":
-  version "4.52.0"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.52.0.tgz#79bc6c361bd80134402274e7c4a6bb36c88d50c2"
-  integrity sha512-6iKDCVSIUQ8jPMoIV0OytRKniaYyy5EbY/RRydmLW8ZR3cEBhxbWl5ro0rkUNe0ef6sScvhbY79HrjRm8i3vDQ==
-
 "@samverschueren/stream-to-observable@^0.3.0":
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/@samverschueren/stream-to-observable/-/stream-to-observable-0.3.1.tgz#a21117b19ee9be70c379ec1877537ef2e1c63301"
@@ -1673,226 +1756,204 @@
   dependencies:
     "@tanstack/virtual-core" "3.13.9"
 
-"@tiptap/core@^2.26.1":
-  version "2.26.1"
-  resolved "https://registry.yarnpkg.com/@tiptap/core/-/core-2.26.1.tgz#8f97c223629972221d4175e4779f6ee955c41a37"
-  integrity sha512-fymyd/XZvYiHjBoLt1gxs024xP/LY26d43R1vluYq7AHBL/7DE3ywzy+1GEsGyAv5Je2L0KBhNIR/izbq3Kaqg==
-
-"@tiptap/core@^2.27.1":
-  version "2.27.1"
-  resolved "https://registry.yarnpkg.com/@tiptap/core/-/core-2.27.1.tgz#0a91346952b8314cd6bbe5cda0c32a6e7e24f432"
-  integrity sha512-nkerkl8syHj44ZzAB7oA2GPmmZINKBKCa79FuNvmGJrJ4qyZwlkDzszud23YteFZEytbc87kVd/fP76ROS6sLg==
+"@tiptap/core@^3.11.0", "@tiptap/core@^3.22.3":
+  version "3.22.3"
+  resolved "https://registry.yarnpkg.com/@tiptap/core/-/core-3.22.3.tgz#89cd6d3d374f5f757bcb5e18e70c346a9eb9b2cd"
+  integrity sha512-Dv9MKK5BDWCF0N2l6/Pxv3JNCce2kwuWf2cKMBc2bEetx0Pn6o7zlFmSxMvYK4UtG1Tw9Yg/ZHi6QOFWK0Zm9Q==
 
-"@tiptap/extension-blockquote@^2.27.1":
-  version "2.27.1"
-  resolved "https://registry.yarnpkg.com/@tiptap/extension-blockquote/-/extension-blockquote-2.27.1.tgz#52384b3e0fd0ea3d2ca44bf9b45c40d49807831e"
-  integrity sha512-QrUX3muElDrNjKM3nqCSAtm3H3pT33c6ON8kwRiQboOAjT/9D57Cs7XEVY7r6rMaJPeKztrRUrNVF9w/w/6B0A==
+"@tiptap/extension-blockquote@^3.22.3":
+  version "3.22.3"
+  resolved "https://registry.yarnpkg.com/@tiptap/extension-blockquote/-/extension-blockquote-3.22.3.tgz#f444a9630b6305d7799201fc272c7be65323fc0e"
+  integrity sha512-IaUx3zh7yLHXzIXKL+fw/jzFhsIImdhJyw0lMhe8FfYrefFqXJFYW/sey6+L/e8B3AWvTksPA6VBwefzbH77JA==
 
-"@tiptap/extension-bold@^2.27.1":
-  version "2.27.1"
-  resolved "https://registry.yarnpkg.com/@tiptap/extension-bold/-/extension-bold-2.27.1.tgz#d5603263209f59c362900b6f1855a0da4abfa4db"
-  integrity sha512-g4l4p892x/r7mhea8syp3fNYODxsDrimgouQ+q4DKXIgQmm5+uNhyuEPexP3I8TFNXqQ4DlMNFoM9yCqk97etQ==
+"@tiptap/extension-bold@^3.22.3":
+  version "3.22.3"
+  resolved "https://registry.yarnpkg.com/@tiptap/extension-bold/-/extension-bold-3.22.3.tgz#77c554c4ca0cd3f27c41d0d7acb9f128e14cc435"
+  integrity sha512-tysipHla2zCWr8XNIWRaW9O+7i7/SoEqnRqSRUUi2ailcJjlia+RBy3RykhkgyThrQDStu5KGBS/UvrXwA+O1A==
 
-"@tiptap/extension-bubble-menu@^2.27.1":
-  version "2.27.1"
-  resolved "https://registry.yarnpkg.com/@tiptap/extension-bubble-menu/-/extension-bubble-menu-2.27.1.tgz#51c26f47e1a10499c7198cc8e0e5a9ea6889b2b3"
-  integrity sha512-ki1R27VsSvY2tT9Q2DIlcATwLOoEjf5DsN+5sExarQ8S/ZxT/tvIjRxB8Dx7lb2a818W5f/NER26YchGtmHfpg==
+"@tiptap/extension-bubble-menu@^3.11.0", "@tiptap/extension-bubble-menu@^3.22.3":
+  version "3.22.3"
+  resolved "https://registry.yarnpkg.com/@tiptap/extension-bubble-menu/-/extension-bubble-menu-3.22.3.tgz#f94a3ac119b8576d040dc458d44b4200ad03e27b"
+  integrity sha512-Y6zQjh0ypDg32HWgICEvmPSKjGLr39k3aDxxt/H0uQEZSfw4smT0hxUyyyjVjx68C6t6MTnwdfz0hPI5lL68vQ==
   dependencies:
-    tippy.js "^6.3.7"
-
-"@tiptap/extension-bullet-list@^2.27.1":
-  version "2.27.1"
-  resolved "https://registry.yarnpkg.com/@tiptap/extension-bullet-list/-/extension-bullet-list-2.27.1.tgz#d463f9cd0e660b508fa500886dfb75eb4454c316"
-  integrity sha512-5FmnfXkJ76wN4EbJNzBhAlmQxho8yEMIJLchTGmXdsD/n/tsyVVtewnQYaIOj/Z7naaGySTGDmjVtLgTuQ+Sxw==
-
-"@tiptap/extension-code-block-lowlight@^2.26.1":
-  version "2.27.1"
-  resolved "https://registry.yarnpkg.com/@tiptap/extension-code-block-lowlight/-/extension-code-block-lowlight-2.27.1.tgz#827d67063517e46085b4516ff418778fcbd07e51"
-  integrity sha512-Ijg9724uX/l4LXLELEeztZIgg+bDE/jJCkgS1+mavkRA/qtidpQkHo7L/Ry22fmj/ktCtZLjPXE5JAPAoRU6zA==
-
-"@tiptap/extension-code-block@^2.26.1":
-  version "2.26.1"
-  resolved "https://registry.yarnpkg.com/@tiptap/extension-code-block/-/extension-code-block-2.26.1.tgz#dd6f9ec59440844f8e0ab0b33a75ff8ab6b6669f"
-  integrity sha512-/TDDOwONl0qEUc4+B6V9NnWtSjz95eg7/8uCb8Y8iRbGvI9vT4/znRKofFxstvKmW4URu/H74/g0ywV57h0B+A==
-
-"@tiptap/extension-code-block@^2.27.1":
-  version "2.27.1"
-  resolved "https://registry.yarnpkg.com/@tiptap/extension-code-block/-/extension-code-block-2.27.1.tgz#e23502e256a66c74df1b52799ce879764680ea51"
-  integrity sha512-wCI5VIOfSAdkenCWFvh4m8FFCJ51EOK+CUmOC/PWUjyo2Dgn8QC8HMi015q8XF7886T0KvYVVoqxmxJSUDAYNg==
-
-"@tiptap/extension-code@^2.26.1":
-  version "2.26.1"
-  resolved "https://registry.yarnpkg.com/@tiptap/extension-code/-/extension-code-2.26.1.tgz#ed289955423da20faa6ef4c81472835ac5fe1574"
-  integrity sha512-GU9deB1A/Tr4FMPu71CvlcjGKwRhGYz60wQ8m4aM+ELZcVIcZRa1ebR8bExRIEWnvRztQuyRiCQzw2N0xQJ1QQ==
-
-"@tiptap/extension-code@^2.27.1":
-  version "2.27.1"
-  resolved "https://registry.yarnpkg.com/@tiptap/extension-code/-/extension-code-2.27.1.tgz#fdfc8b3c90fb09761dc4b9a955df282d68757b52"
-  integrity sha512-i65wUGJevzBTIIUBHBc1ggVa27bgemvGl/tY1/89fEuS/0Xmre+OQjw8rCtSLevoHSiYYLgLRlvjtUSUhE4kgg==
-
-"@tiptap/extension-color@^2.26.1":
-  version "2.27.1"
-  resolved "https://registry.yarnpkg.com/@tiptap/extension-color/-/extension-color-2.27.1.tgz#3936a5b8e2e95126bcd20130c18c72061dc331f8"
-  integrity sha512-raYRsdG2tZvVvY1LV/VTZnDG44Y0xRBwo5CZEat0OUqdx34dfvCtYm8HIOTyWBwr7OOW+yR4O1Vc2zFkmfthZw==
-
-"@tiptap/extension-document@^2.27.1":
-  version "2.27.1"
-  resolved "https://registry.yarnpkg.com/@tiptap/extension-document/-/extension-document-2.27.1.tgz#8c7ccb5f52e560a2a55b3519d87ca5bad5c1dd83"
-  integrity sha512-NtJzJY7Q/6XWjpOm5OXKrnEaofrcc1XOTYlo/SaTwl8k2bZo918Vl0IDBWhPVDsUN7kx767uHwbtuQZ+9I82hA==
-
-"@tiptap/extension-dropcursor@^2.27.1":
-  version "2.27.1"
-  resolved "https://registry.yarnpkg.com/@tiptap/extension-dropcursor/-/extension-dropcursor-2.27.1.tgz#344f30c748b014e8502e964c00cfdb9f27ab931f"
-  integrity sha512-3MBQRGHHZ0by3OT0CWbLKS7J3PH9PpobrXjmIR7kr0nde7+bHqxXiVNuuIf501oKU9rnEUSedipSHkLYGkmfsA==
-
-"@tiptap/extension-floating-menu@^2.27.1":
-  version "2.27.1"
-  resolved "https://registry.yarnpkg.com/@tiptap/extension-floating-menu/-/extension-floating-menu-2.27.1.tgz#137408c4d6c74da4cd99e9825bdcfa38b84b891b"
-  integrity sha512-nUk/8DbiXO69l6FDwkWso94BTf52IBoWALo+YGWT6o+FO6cI9LbUGghEX2CdmQYXCvSvwvISF2jXeLQWNZvPZQ==
-  dependencies:
-    tippy.js "^6.3.7"
+    "@floating-ui/dom" "^1.0.0"
 
-"@tiptap/extension-gapcursor@^2.27.1":
-  version "2.27.1"
-  resolved "https://registry.yarnpkg.com/@tiptap/extension-gapcursor/-/extension-gapcursor-2.27.1.tgz#eb591586c8c9a4d7ac7947668209f35834a395d8"
-  integrity sha512-A9e1jr+jGhDWzNSXtIO6PYVYhf5j/udjbZwMja+wCE/3KvZU9V3IrnGKz1xNW+2Q2BDOe1QO7j5uVL9ElR6nTA==
-
-"@tiptap/extension-hard-break@^2.27.1":
-  version "2.27.1"
-  resolved "https://registry.yarnpkg.com/@tiptap/extension-hard-break/-/extension-hard-break-2.27.1.tgz#823337a3b04abfee7000eb9f3677cb8e80253868"
-  integrity sha512-W4hHa4Io6QCTwpyTlN6UAvqMIQ7t56kIUByZhyY9EWrg/+JpbfpxE1kXFLPB4ZGgwBknFOw+e4bJ1j3oAbTJFw==
-
-"@tiptap/extension-heading@^2.26.1":
-  version "2.26.1"
-  resolved "https://registry.yarnpkg.com/@tiptap/extension-heading/-/extension-heading-2.26.1.tgz#49d1e8f2d10eb1c06bf348d7cb9d131097d65f78"
-  integrity sha512-KSzL8WZV3pjJG9ke4RaU70+B5UlYR2S6olNt5UCAawM+fi11mobVztiBoC19xtpSVqIXC1AmXOqUgnuSvmE4ZA==
-
-"@tiptap/extension-heading@^2.27.1":
-  version "2.27.1"
-  resolved "https://registry.yarnpkg.com/@tiptap/extension-heading/-/extension-heading-2.27.1.tgz#bb912f1ea0ae7b48856bd071d09a326a95e32f0b"
-  integrity sha512-6xoC7igZlW1EmnQ5WVH9IL7P1nCQb3bBUaIDLvk7LbweEogcTUECI4Xg1vxMOVmj9tlDe1I4BsgfcKpB5KEsZw==
-
-"@tiptap/extension-highlight@^2.26.1":
-  version "2.27.1"
-  resolved "https://registry.yarnpkg.com/@tiptap/extension-highlight/-/extension-highlight-2.27.1.tgz#50282546e21f502e62a4ef608f54ba1ea83938e3"
-  integrity sha512-ntuYX09tvHQE/R/8WbTOxbFuQhRr2jhTkKz/gLwDD2o8IhccSy3f0nm+mVmVamKQnbsBBbLohojd5IGOnX9f1A==
-
-"@tiptap/extension-history@^2.27.1":
-  version "2.27.1"
-  resolved "https://registry.yarnpkg.com/@tiptap/extension-history/-/extension-history-2.27.1.tgz#cbf6534648d0d7be441f170c34a915f9114cbe74"
-  integrity sha512-K8PHC9gegSAt0wzSlsd4aUpoEyIJYOmVVeyniHr1P1mIblW1KYEDbRGbDlrLALTyUEfMcBhdIm8zrB9X2Nihvg==
-
-"@tiptap/extension-horizontal-rule@^2.27.1":
-  version "2.27.1"
-  resolved "https://registry.yarnpkg.com/@tiptap/extension-horizontal-rule/-/extension-horizontal-rule-2.27.1.tgz#9c42939e62bde0bfb745baca329d61a6318eb794"
-  integrity sha512-WxXWGEEsqDmGIF2o9av+3r9Qje4CKrqrpeQY6aRO5bxvWX9AabQCfasepayBok6uwtvNzh3Xpsn9zbbSk09dNA==
-
-"@tiptap/extension-image@^2.26.1":
-  version "2.27.1"
-  resolved "https://registry.yarnpkg.com/@tiptap/extension-image/-/extension-image-2.27.1.tgz#d3aa9a6decf504608b7f4e071b944645085b06f3"
-  integrity sha512-wu3vMKDYWJwKS6Hrw5PPCKBO2RxyHNeFLiA/uDErEV7axzNpievK/U9DyaDXmtK3K/h1XzJAJz19X+2d/pY68w==
-
-"@tiptap/extension-italic@^2.27.1":
-  version "2.27.1"
-  resolved "https://registry.yarnpkg.com/@tiptap/extension-italic/-/extension-italic-2.27.1.tgz#a18694fbf2c9247a2e868f9786a786fd06ae338e"
-  integrity sha512-rcm0GyniWW0UhcNI9+1eIK64GqWQLyIIrWGINslvqSUoBc+WkfocLvv4CMpRkzKlfsAxwVIBuH2eLxHKDtAREA==
-
-"@tiptap/extension-link@^2.26.1":
-  version "2.27.1"
-  resolved "https://registry.yarnpkg.com/@tiptap/extension-link/-/extension-link-2.27.1.tgz#a57345a8a124a4fd4de1929c31ccf9b92d0a2619"
-  integrity sha512-cCwWPZsnVh9MXnGOqSIRXPPuUixRDK8eMN2TvqwbxUBb1TU7b/HtNvfMU4tAOqAuMRJ0aJkFuf3eB0Gi8LVb1g==
+"@tiptap/extension-bullet-list@^3.22.3":
+  version "3.22.3"
+  resolved "https://registry.yarnpkg.com/@tiptap/extension-bullet-list/-/extension-bullet-list-3.22.3.tgz#acf4b2e050b7909d9f54fad620e9ff458631eb67"
+  integrity sha512-xOmW/b1hgECIE6r3IeZvKn4VVlG3+dfTjCWE6lnnyLaqdNkNhKS1CwUmDZdYNLUS2ryIUtgz5ID1W/8A3PhbiA==
+
+"@tiptap/extension-code-block-lowlight@^3.11.0":
+  version "3.22.3"
+  resolved "https://registry.yarnpkg.com/@tiptap/extension-code-block-lowlight/-/extension-code-block-lowlight-3.22.3.tgz#b83598eb603a6e9320ef337b1467aee57f6318eb"
+  integrity sha512-NGFuD9zb1QfnCgD2zW4XaUEdQvd/ydm9FmXXh8eawx/+C8xt3p21DIKRERvxWrCvvVNzIUEpZRRYehPOJiD1eg==
+
+"@tiptap/extension-code-block@^3.11.0", "@tiptap/extension-code-block@^3.22.3":
+  version "3.22.3"
+  resolved "https://registry.yarnpkg.com/@tiptap/extension-code-block/-/extension-code-block-3.22.3.tgz#c8f5f02e0a1b4d4b06823b2aedd9be1ec4e8691f"
+  integrity sha512-RiQtEjDAPrHpdo6sw6b7fOw/PijqgFIsozKKkGcSeBgWHQuFg7q9OxJTj+l0e60rVwSu/5gmKEEobzM9bX+t2Q==
+
+"@tiptap/extension-code@^3.11.0", "@tiptap/extension-code@^3.22.3":
+  version "3.22.3"
+  resolved "https://registry.yarnpkg.com/@tiptap/extension-code/-/extension-code-3.22.3.tgz#2d4d40e3b0b2b318f469e1504b2ebd738dca537d"
+  integrity sha512-wafWTDQOuMKtXpZEuk1PFQmzopabBciNLryL90MB9S03MNLaQQZYLnmYkDBlzAaLAbgF5QiC+2XZQEBQuTVjFQ==
+
+"@tiptap/extension-color@^3.11.0":
+  version "3.22.3"
+  resolved "https://registry.yarnpkg.com/@tiptap/extension-color/-/extension-color-3.22.3.tgz#9b1801f2d99606d2f017dead5034a1bef062dde6"
+  integrity sha512-eZtOc4Zp5jnlZh4+gvr3JmOa3kPlIU8IbTByDMgXEMdVGZ5cOk+H4TMIlhU0j7j1TMWm8+r1WYtrU9E9ooz9hQ==
+
+"@tiptap/extension-document@^3.22.3":
+  version "3.22.3"
+  resolved "https://registry.yarnpkg.com/@tiptap/extension-document/-/extension-document-3.22.3.tgz#5f0754b193023ccdddda2973f92b45b11fdd944a"
+  integrity sha512-MCSr1PFPtTd++lA3H1RNgqAczAE59XXJ5wUFIQf2F+/0DPY5q2SU4g5QsNJVxPPft5mrNT4C6ty8xBPrALFEdA==
+
+"@tiptap/extension-dropcursor@^3.22.3":
+  version "3.22.3"
+  resolved "https://registry.yarnpkg.com/@tiptap/extension-dropcursor/-/extension-dropcursor-3.22.3.tgz#33a571f63ed599bca0fbac48b17703c3787e4d52"
+  integrity sha512-taXq9Tl5aybdFbptJtFRHX9LFJzbXphAbPp4/vutFyTrBu5meXDxuS+B9pEmE+Or0XcolTlW2nDZB0Tqnr18JQ==
+
+"@tiptap/extension-floating-menu@^3.22.3":
+  version "3.22.3"
+  resolved "https://registry.yarnpkg.com/@tiptap/extension-floating-menu/-/extension-floating-menu-3.22.3.tgz#c9a911b7784cb45d6f8e7260d77bf2015066e5a4"
+  integrity sha512-0f8b4KZ3XKai8GXWseIYJGdOfQr3evtFbBo3U08zy2aYzMMXWG0zEF7qe5/oiYp2aZ95edjjITnEceviTsZkIg==
+
+"@tiptap/extension-gapcursor@^3.22.3":
+  version "3.22.3"
+  resolved "https://registry.yarnpkg.com/@tiptap/extension-gapcursor/-/extension-gapcursor-3.22.3.tgz#4a8865728c5e9ae19c3aa7f8acbb250ba2aee0c4"
+  integrity sha512-L/Px4UeQEVG/D9WIlcAOIej+4wyIBCMUSYicSR+hW68UsObe4rxVbUas1QgidQKm6DOhoT7U7D4KQHA/Gdg/7A==
+
+"@tiptap/extension-hard-break@^3.22.3":
+  version "3.22.3"
+  resolved "https://registry.yarnpkg.com/@tiptap/extension-hard-break/-/extension-hard-break-3.22.3.tgz#3637f724f5f4ad0f531093d860b4b7c5140519af"
+  integrity sha512-J0v8I99y9tbvVmgKYKzKP/JYNsWaZYS7avn4rzLft2OhnyTfwt3OoY8DtpHmmi6apSUaCtoWHWta/TmoEfK1nQ==
+
+"@tiptap/extension-heading@^3.11.0", "@tiptap/extension-heading@^3.22.3":
+  version "3.22.3"
+  resolved "https://registry.yarnpkg.com/@tiptap/extension-heading/-/extension-heading-3.22.3.tgz#13a15da1ea93c577d9b0abc5341be64bee15a363"
+  integrity sha512-XBHuhiEV2EEhZHpOLcplLqAmBIhJciU3I6AtwmqeEqDC0P114uMEfAO7JGlbBZdCYotNer26PKnu44TBTeNtkw==
+
+"@tiptap/extension-highlight@^3.11.0":
+  version "3.22.3"
+  resolved "https://registry.yarnpkg.com/@tiptap/extension-highlight/-/extension-highlight-3.22.3.tgz#27148fc95244d81bf40b80b3fb886c649e36d01d"
+  integrity sha512-iGDzQ3IuVQpfQcWsMEQ0B8q3R83bZZH6l6O2MuCmWbzm/p7mMi5vQwRCMLAbM9xFELq8KjDMHOWeER4fozp/Sg==
+
+"@tiptap/extension-horizontal-rule@^3.22.3":
+  version "3.22.3"
+  resolved "https://registry.yarnpkg.com/@tiptap/extension-horizontal-rule/-/extension-horizontal-rule-3.22.3.tgz#0b65140bf1793b478e49adb32a12d98254c8a590"
+  integrity sha512-wI2bFzScs+KgWeBH/BtypcVKeYelCyqV0RG8nxsZMWtPrBhqixzNd0Oi3gEKtjSjKUqMQ/kjJAIRuESr5UzlHA==
+
+"@tiptap/extension-image@^3.11.0":
+  version "3.22.3"
+  resolved "https://registry.yarnpkg.com/@tiptap/extension-image/-/extension-image-3.22.3.tgz#44fc06eea14cc792f098570c4aa6801baa4f92c2"
+  integrity sha512-Qpp8c5LOQaNpHrzjqZtoxtIR+8sSqJ7k8v+8anmYw3nxjvt2kpfT28Vd7aWMX55ZS43LaxMx+MkZqbmgUmMP0w==
+
+"@tiptap/extension-italic@^3.22.3":
+  version "3.22.3"
+  resolved "https://registry.yarnpkg.com/@tiptap/extension-italic/-/extension-italic-3.22.3.tgz#a8f459e976d06aeb9b17c74f773f45e22fa47070"
+  integrity sha512-LteA4cb4EGCiUtrK2JHvDF/Zg0/YqV4DUyHhAAho+oGEQDupZlsS6m0ia5wQcclkiTLzsoPrwcSNu6RDGQ16wQ==
+
+"@tiptap/extension-link@^3.11.0", "@tiptap/extension-link@^3.22.3":
+  version "3.22.3"
+  resolved "https://registry.yarnpkg.com/@tiptap/extension-link/-/extension-link-3.22.3.tgz#42284faeda98034d22645a62d854507a6e71a4ff"
+  integrity sha512-S8/P2o9pv6B3kqLjH2TRWwSAximGbciNc6R8/QcN6HWLYxp0N0JoqN3rZHl9VWIBAGRWc4zkt80dhqrl2xmgfQ==
   dependencies:
     linkifyjs "^4.3.2"
 
-"@tiptap/extension-list-item@^2.27.1":
-  version "2.27.1"
-  resolved "https://registry.yarnpkg.com/@tiptap/extension-list-item/-/extension-list-item-2.27.1.tgz#59db919133413be2ba33718f52265cc1885d5db8"
-  integrity sha512-dtsxvtzxfwOJP6dKGf0vb2MJAoDF2NxoiWzpq0XTvo7NGGYUHfuHjX07Zp0dYqb4seaDXjwsi5BIQUOp3+WMFQ==
-
-"@tiptap/extension-mention@^2.26.1":
-  version "2.27.1"
-  resolved "https://registry.yarnpkg.com/@tiptap/extension-mention/-/extension-mention-2.27.1.tgz#956878cbf09b526a3b436428739a2b112c03d1ff"
-  integrity sha512-8qwPIum0rMK/7BaHEN0+M/VkUn00LqhqyRO8JdC/EBVrUBgxKTQsUhIhSstgVAYzD1w7cCUfTFX4bYu9lcFMEQ==
-
-"@tiptap/extension-ordered-list@^2.27.1":
-  version "2.27.1"
-  resolved "https://registry.yarnpkg.com/@tiptap/extension-ordered-list/-/extension-ordered-list-2.27.1.tgz#60a450773552450c8183dc0344c7c82bd4b76d9d"
-  integrity sha512-U1/sWxc2TciozQsZjH35temyidYUjvroHj3PUPzPyh19w2fwKh1NSbFybWuoYs6jS3XnMSwnM2vF52tOwvfEmA==
-
-"@tiptap/extension-paragraph@^2.27.1":
-  version "2.27.1"
-  resolved "https://registry.yarnpkg.com/@tiptap/extension-paragraph/-/extension-paragraph-2.27.1.tgz#e7b0428dfaacd114401768fde6ffcb4d95f78ab6"
-  integrity sha512-R3QdrHcUdFAsdsn2UAIvhY0yWyHjqGyP/Rv8RRdN0OyFiTKtwTPqreKMHKJOflgX4sMJl/OpHTpNG1Kaf7Lo2A==
-
-"@tiptap/extension-placeholder@^2.26.1":
-  version "2.27.1"
-  resolved "https://registry.yarnpkg.com/@tiptap/extension-placeholder/-/extension-placeholder-2.27.1.tgz#0edbcbc9b0e2b1464f03920831d41c79131263aa"
-  integrity sha512-UbXaibHHFE+lOTlw/vs3jPzBoj1sAfbXuTAhXChjgYIcTTY5Cr6yxwcymLcimbQ79gf04Xkua2FCN3YsJxIFmw==
-
-"@tiptap/extension-strike@^2.27.1":
-  version "2.27.1"
-  resolved "https://registry.yarnpkg.com/@tiptap/extension-strike/-/extension-strike-2.27.1.tgz#1a2d3db5a33820e2d986a6cf8bc248612bacc020"
-  integrity sha512-S9I//K8KPgfFTC5I5lorClzXk0g4lrAv9y5qHzHO5EOWt7AFl0YTg2oN8NKSIBK4bHRnPIrjJJKv+dDFnUp5jQ==
-
-"@tiptap/extension-table-cell@^2.26.1":
-  version "2.27.1"
-  resolved "https://registry.yarnpkg.com/@tiptap/extension-table-cell/-/extension-table-cell-2.27.1.tgz#9684f8e34a79b0de99fd981ec4847ac236099983"
-  integrity sha512-VowNmz1kub2qfntWkU8jGA6DoCl9xjJBWSypuQIeiN/IRId3BMrJodT26pTNJ3ChDMtYaanWaUvYqckRxgTC2A==
-
-"@tiptap/extension-table-header@^2.26.1":
-  version "2.27.1"
-  resolved "https://registry.yarnpkg.com/@tiptap/extension-table-header/-/extension-table-header-2.27.1.tgz#8bbad70a3fc8b04cbc6bd5ddac78090af27e4673"
-  integrity sha512-lSbGB6kBp/sTVzAWl4v7v7ztL5XU3aTdlS7FhfGjpdsxd4zPKYG8kx+Uxgq25W9/BlCbnqHnO0poAMfOlspDQw==
-
-"@tiptap/extension-table-row@^2.26.1":
-  version "2.27.1"
-  resolved "https://registry.yarnpkg.com/@tiptap/extension-table-row/-/extension-table-row-2.27.1.tgz#cc248d757f0976f3ecd0ccfc3a940f6663021231"
-  integrity sha512-3xtlmZ6NWDi5a42gK0qQQTeBUpJ2j1o7qyXTFkhQaJAeIFEqsemgSRhgXZxbwSmQQZsPJ/86KWBNVkT0FaRFDw==
-
-"@tiptap/extension-table@^2.26.1":
-  version "2.27.1"
-  resolved "https://registry.yarnpkg.com/@tiptap/extension-table/-/extension-table-2.27.1.tgz#3fdfad6aa243608aac94b04c32e9a23bb856e88c"
-  integrity sha512-iOoOo0vYFzAogAZlw36DgmFfNM5vOkLqnApm81soO/YWpqtKAvBn+TMY4ss4OMDsOefUzBa6xqOJ0gJR5ZygjA==
-
-"@tiptap/extension-task-item@^2.26.1":
-  version "2.27.1"
-  resolved "https://registry.yarnpkg.com/@tiptap/extension-task-item/-/extension-task-item-2.27.1.tgz#03555f12f1c2fb74163cadecd01b9b4dec9b0b6a"
-  integrity sha512-vaEtdos+9jApD6yRfD6F/xShikiZFHi7I0nswAmGKT/kE1wmHCUxme8OFMe7642e2OK0lqgHsUaOLxP/0nZJ5A==
-
-"@tiptap/extension-task-list@^2.26.1":
-  version "2.27.1"
-  resolved "https://registry.yarnpkg.com/@tiptap/extension-task-list/-/extension-task-list-2.27.1.tgz#b0a03de1b6a92b07df2ddb47e1d9af757dd0c250"
-  integrity sha512-KRlYOZ6kdURvAspUrLVsC7mLkVW2DYhpj+7QxH7gVDZuAuoPUEmpJVcBVPq7GhPF9PccaRLru+n1Ege5VqvZ+Q==
-
-"@tiptap/extension-text-align@^2.26.1":
-  version "2.27.1"
-  resolved "https://registry.yarnpkg.com/@tiptap/extension-text-align/-/extension-text-align-2.27.1.tgz#5363d2dff9e97bc41c616bcf5f0969e0efe130e5"
-  integrity sha512-D7dLPk7y5mDn9ZNANQ4K2gCq4vy+Emm5AdeWOGzNeqJsYrBotiQYXd9rb1QYjdup2kzAoKduMTUXV92ujo5cEg==
-
-"@tiptap/extension-text-style@^2.26.1":
-  version "2.26.1"
-  resolved "https://registry.yarnpkg.com/@tiptap/extension-text-style/-/extension-text-style-2.26.1.tgz#a6be329ff881df9da37d9a8c353b2b2e7b8508b3"
-  integrity sha512-t9Nc/UkrbCfnSHEUi1gvUQ2ZPzvfdYFT5TExoV2DTiUCkhG6+mecT5bTVFGW3QkPmbToL+nFhGn4ZRMDD0SP3Q==
-
-"@tiptap/extension-text-style@^2.27.1":
-  version "2.27.1"
-  resolved "https://registry.yarnpkg.com/@tiptap/extension-text-style/-/extension-text-style-2.27.1.tgz#11c0038905d644dc827fd5ff749936285b2dc6da"
-  integrity sha512-NagQ9qLk0Ril83gfrk+C65SvTqPjL3WVnLF2arsEVnCrxcx3uDOvdJW67f/K5HEwEHsoqJ4Zq9Irco/koXrOXA==
-
-"@tiptap/extension-text@^2.27.1":
-  version "2.27.1"
-  resolved "https://registry.yarnpkg.com/@tiptap/extension-text/-/extension-text-2.27.1.tgz#9b9b1efcf236104fbc2aa121430abb2eae3f1b76"
-  integrity sha512-a4GCT+GZ9tUwl82F4CEum9/+WsuW0/De9Be/NqrMmi7eNfAwbUTbLCTFU0gEvv25WMHCoUzaeNk/qGmzeVPJ1Q==
-
-"@tiptap/extension-typography@^2.26.1":
-  version "2.27.1"
-  resolved "https://registry.yarnpkg.com/@tiptap/extension-typography/-/extension-typography-2.27.1.tgz#446139add71a400325f50384b63e443c0a090bab"
-  integrity sha512-jAZU5IuWH9CtZlolQ1gRhV+bT75s19SXjadQwkk18gMMiapcaIVVTxUDWY6ycv9ge4cjRoaP3lqBviW3cGqhOA==
-
-"@tiptap/pm@^2.26.1":
-  version "2.26.1"
-  resolved "https://registry.yarnpkg.com/@tiptap/pm/-/pm-2.26.1.tgz#5e4bd79e60fe698fa12770b2845e5133b3333d06"
-  integrity sha512-8aF+mY/vSHbGFqyG663ds84b+vca5Lge3tHdTMTKazxCnhXR9dn2oQJMnZ78YZvdRbkPkMJJHti9h3K7u2UQvw==
+"@tiptap/extension-list-item@^3.22.3":
+  version "3.22.3"
+  resolved "https://registry.yarnpkg.com/@tiptap/extension-list-item/-/extension-list-item-3.22.3.tgz#f70dc68d1130f8a217d975e19a08f8c70ef353e5"
+  integrity sha512-80CNf4oO5y8+LdckT4CyMe1t01EyhpRrQC9H45JW20P7559Nrchp5my3vvMtIAJbpTPPZtcB7LwdzWGKsG5drg==
+
+"@tiptap/extension-list-keymap@^3.22.3":
+  version "3.22.3"
+  resolved "https://registry.yarnpkg.com/@tiptap/extension-list-keymap/-/extension-list-keymap-3.22.3.tgz#3cd3ae50d9fc2cfc5b6cc48b46d503d58a61cbe2"
+  integrity sha512-pKuyj5llu35zd/s2u/H9aydKZjmPRAIK5P1q/YXULhhCNln2RnmuRfQ5NklAqTD3yGciQ2lxDwwf7J6iw3ergA==
+
+"@tiptap/extension-list@^3.11.0", "@tiptap/extension-list@^3.22.3":
+  version "3.22.3"
+  resolved "https://registry.yarnpkg.com/@tiptap/extension-list/-/extension-list-3.22.3.tgz#8df343dbfa6404c79394795bc5c82c658f889ec0"
+  integrity sha512-rqvv/dtqwbX+8KnPv0eMYp6PnBcuhPMol5cv1GlS8Nq/Cxt68EWGUHBuTFesw+hdnRQLmKwzoO1DlRn7PhxYRQ==
+
+"@tiptap/extension-mention@^3.11.0":
+  version "3.22.3"
+  resolved "https://registry.yarnpkg.com/@tiptap/extension-mention/-/extension-mention-3.22.3.tgz#495f1dcbaa1b61025b5f615d86224b717c0f525a"
+  integrity sha512-wJmpjU6WqZgbMJUwGQKhwnzCdN/DtsFGRsExCvncuQxFKgsMzhW+NWwmzgrGJDyS8BMKzqwyKlSc1dcMOYzgJQ==
+
+"@tiptap/extension-node-range@^3.11.0":
+  version "3.22.3"
+  resolved "https://registry.yarnpkg.com/@tiptap/extension-node-range/-/extension-node-range-3.22.3.tgz#70cf2fe07f66203b853e3cdb16023e53571662ec"
+  integrity sha512-BVtT/2c7W5Iy9SHR5wWtq1KHMsbBMSW8mqdP8B8Dv+6tg1o+EE9T+VZXZET0/N5s/r/hj+rgHJussoGpkX7Xzw==
+
+"@tiptap/extension-ordered-list@^3.22.3":
+  version "3.22.3"
+  resolved "https://registry.yarnpkg.com/@tiptap/extension-ordered-list/-/extension-ordered-list-3.22.3.tgz#bfad1148afdd3819088cf5dc2fa08bdd64b42aed"
+  integrity sha512-orAghtmd+K4Euu4BgI1hG+iZDXBYOyl5YTwiLBc2mQn+pqtZ9LqaH2us4ETwEwNP3/IWXGSAimUZ19nuL+eM2w==
+
+"@tiptap/extension-paragraph@^3.22.3":
+  version "3.22.3"
+  resolved "https://registry.yarnpkg.com/@tiptap/extension-paragraph/-/extension-paragraph-3.22.3.tgz#1620e09816ea5c4fefd271217ca4965100531044"
+  integrity sha512-oO7rhfyhEuwm+50s9K3GZPjYyEEEvFAvm1wXopvZnhbkBLydIWImBfrZoC5IQh4/sRDlTIjosV2C+ji5y0tUSg==
+
+"@tiptap/extension-placeholder@^3.11.0":
+  version "3.22.3"
+  resolved "https://registry.yarnpkg.com/@tiptap/extension-placeholder/-/extension-placeholder-3.22.3.tgz#bc49b51d0c79d0e5bb169ae3519f28f9dbc169c1"
+  integrity sha512-7vbtlDVO00odqCnsMSmA4b6wjL5PFdfExFsdsDO0K0VemqHZ/doIRx/tosNUD1VYSOyKQd8U7efUjkFyVoIPlg==
+
+"@tiptap/extension-strike@^3.22.3":
+  version "3.22.3"
+  resolved "https://registry.yarnpkg.com/@tiptap/extension-strike/-/extension-strike-3.22.3.tgz#3c1213887089be0d86b79bcdbc09ebef2ef32dea"
+  integrity sha512-jY2InoUlKkuk5KHoIDGdML1OCA2n6PRHAtxwHNkAmiYh0Khf0zaVPGFpx4dgQrN7W5Q1WE6oBZnjrvy6qb7w0g==
+
+"@tiptap/extension-table@^3.11.0":
+  version "3.22.3"
+  resolved "https://registry.yarnpkg.com/@tiptap/extension-table/-/extension-table-3.22.3.tgz#e71a77f42de197b995d979fde2804fa4d2f81e6a"
+  integrity sha512-inbQSusJad7H0T++L1APg/anfL5d15cNGp2YG3vwo6TQr71nn2c9pepvmz3xuAIt8eygZDRba+4GT/COP1f9QA==
+
+"@tiptap/extension-task-item@^3.11.0":
+  version "3.22.3"
+  resolved "https://registry.yarnpkg.com/@tiptap/extension-task-item/-/extension-task-item-3.22.3.tgz#e92c0fb4f765536c502c318b5be97b5b748bc106"
+  integrity sha512-bUxP6fmlrF4sbpHnkm0nTKNVmtQXNnhrbWsUt0MCnvAd9y5Nq3ohpOzMOCL71AEHfmeV1kEkPbpdwKb1R7XDbg==
+
+"@tiptap/extension-task-list@^3.11.0":
+  version "3.22.3"
+  resolved "https://registry.yarnpkg.com/@tiptap/extension-task-list/-/extension-task-list-3.22.3.tgz#a63d8753cc2162b834eb9b906c98fac950697fcf"
+  integrity sha512-ze/DNj7Uq/Xjo+t8UuumnvJcmGVrVvLar11nFxobgpij21ja6XiUNMZ+BywvFurWbh5NrHeSYV07vFOWWf5Cpg==
+
+"@tiptap/extension-text-align@^3.11.0":
+  version "3.22.3"
+  resolved "https://registry.yarnpkg.com/@tiptap/extension-text-align/-/extension-text-align-3.22.3.tgz#e6a7665ef3e5341c0368328f494d21edffba2b47"
+  integrity sha512-dG1NHE0yGf7fYiOdabCJuecI2IJ1uogyY/QvZqvPNaxRjZDoXYuGlMtz9jEDiIdQSaPED2MSsS7KkuNFQIEMGg==
+
+"@tiptap/extension-text-style@^3.11.0":
+  version "3.22.3"
+  resolved "https://registry.yarnpkg.com/@tiptap/extension-text-style/-/extension-text-style-3.22.3.tgz#86870af794aa721366a506e460b9f8084f2ee300"
+  integrity sha512-JKmWAogM/LX9ZJmXJQalpcR77wWVtVXdRFgvHGsFomW9WFhZqcnIEDWR2sbpZHWtu8dml6eBQGhdLppJmxeFfA==
+
+"@tiptap/extension-text@^3.22.3":
+  version "3.22.3"
+  resolved "https://registry.yarnpkg.com/@tiptap/extension-text/-/extension-text-3.22.3.tgz#283aba1f5d9f4a99989646a29d032d97416e6daa"
+  integrity sha512-Q9R7JsTdomP5uUjtPjNKxHT1xoh/i9OJZnmgJLe7FcgZEaPOQ3bWxmKZoLZQfDfZjyB8BtH+Hc7nUvhCMOePxw==
+
+"@tiptap/extension-typography@^3.11.0":
+  version "3.22.3"
+  resolved "https://registry.yarnpkg.com/@tiptap/extension-typography/-/extension-typography-3.22.3.tgz#a891e3701df8dd0b00e3b853f0db2be181cee017"
+  integrity sha512-QQv1KUHsr3LTGhtPIG/ZP15Cj5VmI5ChgK4Q7UZ7JZBppBKAeMnyAnOcO2ith+qZ8qp5s+UiQ7Unp0zP1VSYkg==
+
+"@tiptap/extension-underline@^3.22.3":
+  version "3.22.3"
+  resolved "https://registry.yarnpkg.com/@tiptap/extension-underline/-/extension-underline-3.22.3.tgz#e19f9579456595da7bd50948cda8259f9f98e20f"
+  integrity sha512-Ch6CBWRa5w90yYSPUW6x9Py9JdrXMqk3pZ9OIlMYD8A7BqyZGfiHerX7XDMYDS09KjyK3U9XH60/zxYOzXdDLA==
+
+"@tiptap/extensions@^3.11.0", "@tiptap/extensions@^3.22.3":
+  version "3.22.3"
+  resolved "https://registry.yarnpkg.com/@tiptap/extensions/-/extensions-3.22.3.tgz#d37c36feec7b2e982f9e1c38781bbc2c3829f131"
+  integrity sha512-s5eiMq0m5N6N+W7dU6rd60KgZyyCD7FvtPNNswISfPr12EQwJBfbjWwTqd0UKNzA4fNrhQEERXnzORkykttPeA==
+
+"@tiptap/pm@^3.11.0", "@tiptap/pm@^3.22.3":
+  version "3.22.3"
+  resolved "https://registry.yarnpkg.com/@tiptap/pm/-/pm-3.22.3.tgz#e911150e900d52b2e5ccd596b32187da46f924d6"
+  integrity sha512-NjfWjZuvrqmpICT+GZWNIjtOdhPyqFKDMtQy7tsQ5rErM9L2ZQdy/+T/BKSO1JdTeBhdg9OP+0yfsqoYp2aT6A==
   dependencies:
     prosemirror-changeset "^2.3.0"
     prosemirror-collab "^1.3.1"
@@ -1904,84 +1965,70 @@
     prosemirror-keymap "^1.2.2"
     prosemirror-markdown "^1.13.1"
     prosemirror-menu "^1.2.4"
-    prosemirror-model "^1.23.0"
+    prosemirror-model "^1.24.1"
     prosemirror-schema-basic "^1.2.3"
-    prosemirror-schema-list "^1.4.1"
+    prosemirror-schema-list "^1.5.0"
     prosemirror-state "^1.4.3"
     prosemirror-tables "^1.6.4"
     prosemirror-trailing-node "^3.0.0"
     prosemirror-transform "^1.10.2"
-    prosemirror-view "^1.37.0"
-
-"@tiptap/pm@^2.27.1":
-  version "2.27.1"
-  resolved "https://registry.yarnpkg.com/@tiptap/pm/-/pm-2.27.1.tgz#d643627d03a74a2c10d21695ee509d9db8e6bd2f"
-  integrity sha512-ijKo3+kIjALthYsnBmkRXAuw2Tswd9gd7BUR5OMfIcjGp8v576vKxOxrRfuYiUM78GPt//P0sVc1WV82H5N0PQ==
-  dependencies:
-    prosemirror-changeset "^2.3.0"
-    prosemirror-collab "^1.3.1"
-    prosemirror-commands "^1.6.2"
-    prosemirror-dropcursor "^1.8.1"
-    prosemirror-gapcursor "^1.3.2"
-    prosemirror-history "^1.4.1"
-    prosemirror-inputrules "^1.4.0"
-    prosemirror-keymap "^1.2.2"
-    prosemirror-markdown "^1.13.1"
-    prosemirror-menu "^1.2.4"
-    prosemirror-model "^1.23.0"
-    prosemirror-schema-basic "^1.2.3"
-    prosemirror-schema-list "^1.4.1"
-    prosemirror-state "^1.4.3"
-    prosemirror-tables "^1.6.4"
-    prosemirror-trailing-node "^3.0.0"
-    prosemirror-transform "^1.10.2"
-    prosemirror-view "^1.37.0"
-
-"@tiptap/starter-kit@^2.26.1":
-  version "2.27.1"
-  resolved "https://registry.yarnpkg.com/@tiptap/starter-kit/-/starter-kit-2.27.1.tgz#a947c8cbf33c391809b9a8736f97e95a092014fc"
-  integrity sha512-uQQlP0Nmn9eq19qm8YoOeloEfmcGbPpB1cujq54Q6nPgxaBozR7rE7tXbFTinxRW2+Hr7XyNWhpjB7DMNkdU2Q==
-  dependencies:
-    "@tiptap/core" "^2.27.1"
-    "@tiptap/extension-blockquote" "^2.27.1"
-    "@tiptap/extension-bold" "^2.27.1"
-    "@tiptap/extension-bullet-list" "^2.27.1"
-    "@tiptap/extension-code" "^2.27.1"
-    "@tiptap/extension-code-block" "^2.27.1"
-    "@tiptap/extension-document" "^2.27.1"
-    "@tiptap/extension-dropcursor" "^2.27.1"
-    "@tiptap/extension-gapcursor" "^2.27.1"
-    "@tiptap/extension-hard-break" "^2.27.1"
-    "@tiptap/extension-heading" "^2.27.1"
-    "@tiptap/extension-history" "^2.27.1"
-    "@tiptap/extension-horizontal-rule" "^2.27.1"
-    "@tiptap/extension-italic" "^2.27.1"
-    "@tiptap/extension-list-item" "^2.27.1"
-    "@tiptap/extension-ordered-list" "^2.27.1"
-    "@tiptap/extension-paragraph" "^2.27.1"
-    "@tiptap/extension-strike" "^2.27.1"
-    "@tiptap/extension-text" "^2.27.1"
-    "@tiptap/extension-text-style" "^2.27.1"
-    "@tiptap/pm" "^2.27.1"
-
-"@tiptap/suggestion@^2.26.1":
-  version "2.27.1"
-  resolved "https://registry.yarnpkg.com/@tiptap/suggestion/-/suggestion-2.27.1.tgz#9e3de78ef12d335e1051e37dbc559d948b311221"
-  integrity sha512-yTy75ZMYgVWM18cl7YxLqMJ7TorQTGysSd1aKmBA9qd8uzYlvLMmHKE9qBDxM9HXODBz1DA/BLLm9esv2enmFw==
-
-"@tiptap/vue-3@^2.26.1":
-  version "2.27.1"
-  resolved "https://registry.yarnpkg.com/@tiptap/vue-3/-/vue-3-2.27.1.tgz#c43986457f93bde997efb67d1c868067c3e3e407"
-  integrity sha512-1D0gTlGBeDmrl+APm/JKoNs/KnW5PecpD1PbQmg2GEHVxVZNeIUpG48D/V5uTIiRwJsDx3PMd8AmsZs1QS6GLw==
-  dependencies:
-    "@tiptap/extension-bubble-menu" "^2.27.1"
-    "@tiptap/extension-floating-menu" "^2.27.1"
+    prosemirror-view "^1.38.1"
+
+"@tiptap/starter-kit@^3.11.0":
+  version "3.22.3"
+  resolved "https://registry.yarnpkg.com/@tiptap/starter-kit/-/starter-kit-3.22.3.tgz#5054300253640e4add7967655e80d6dd56b6ad13"
+  integrity sha512-vdW/Oo1fdwTL1VOQ5YYbTov00ANeHLquBVEZyL/EkV7Xv5io9rXQsCysJfTSHhiQlyr2MtWFB4+CPGuwXjQWOQ==
+  dependencies:
+    "@tiptap/core" "^3.22.3"
+    "@tiptap/extension-blockquote" "^3.22.3"
+    "@tiptap/extension-bold" "^3.22.3"
+    "@tiptap/extension-bullet-list" "^3.22.3"
+    "@tiptap/extension-code" "^3.22.3"
+    "@tiptap/extension-code-block" "^3.22.3"
+    "@tiptap/extension-document" "^3.22.3"
+    "@tiptap/extension-dropcursor" "^3.22.3"
+    "@tiptap/extension-gapcursor" "^3.22.3"
+    "@tiptap/extension-hard-break" "^3.22.3"
+    "@tiptap/extension-heading" "^3.22.3"
+    "@tiptap/extension-horizontal-rule" "^3.22.3"
+    "@tiptap/extension-italic" "^3.22.3"
+    "@tiptap/extension-link" "^3.22.3"
+    "@tiptap/extension-list" "^3.22.3"
+    "@tiptap/extension-list-item" "^3.22.3"
+    "@tiptap/extension-list-keymap" "^3.22.3"
+    "@tiptap/extension-ordered-list" "^3.22.3"
+    "@tiptap/extension-paragraph" "^3.22.3"
+    "@tiptap/extension-strike" "^3.22.3"
+    "@tiptap/extension-text" "^3.22.3"
+    "@tiptap/extension-underline" "^3.22.3"
+    "@tiptap/extensions" "^3.22.3"
+    "@tiptap/pm" "^3.22.3"
+
+"@tiptap/suggestion@^3.11.0":
+  version "3.22.3"
+  resolved "https://registry.yarnpkg.com/@tiptap/suggestion/-/suggestion-3.22.3.tgz#268e08b57a17f275b2d85233b2f4dc059c87cfc4"
+  integrity sha512-m2c+5gDj2vW7UI1J4JHCKehQUVE12qBhgF+DC+WEWUU8ZrFNf5OEYWQHDNsopa5RRpilfKfhPNbMtXgvGOsk6g==
+
+"@tiptap/vue-3@^3.11.0":
+  version "3.22.3"
+  resolved "https://registry.yarnpkg.com/@tiptap/vue-3/-/vue-3-3.22.3.tgz#ca484ca1612490828f89527bba95abd11989dd77"
+  integrity sha512-wOGZiBwIJYCZXts5VWWGgseGCRMc8tO46tgaOXNyMLVl2h2cO6/CNEcPO2pgtuoLIHoV4KYvfpw6n+XqR9cqbA==
+  optionalDependencies:
+    "@tiptap/extension-bubble-menu" "^3.22.3"
+    "@tiptap/extension-floating-menu" "^3.22.3"
 
 "@tootallnate/once@2":
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-2.0.0.tgz#f544a148d3ab35801c1f633a7441fd87c2e484bf"
   integrity sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==
 
+"@tybys/wasm-util@^0.10.1":
+  version "0.10.1"
+  resolved "https://registry.yarnpkg.com/@tybys/wasm-util/-/wasm-util-0.10.1.tgz#ecddd3205cf1e2d5274649ff0eedd2991ed7f414"
+  integrity sha512-9tTaPJLSiejZKx+Bmog4uSubteqTvFrVrURwkmHixBo0G4seD0zUxp98E1DzUBJxLQ3NPwXrGKDiVjwx/DpPsg==
+  dependencies:
+    tslib "^2.4.0"
+
 "@types/chai-subset@^1.3.3":
   version "1.3.6"
   resolved "https://registry.yarnpkg.com/@types/chai-subset/-/chai-subset-1.3.6.tgz#fc50f637ebd038ed58700f826d7bab2caa8a8d7e"
@@ -1997,11 +2044,6 @@
   resolved "https://registry.yarnpkg.com/@types/cookie/-/cookie-0.4.1.tgz#bfd02c1f2224567676c1545199f87c3a861d878d"
   integrity sha512-XW/Aa8APYr6jSVVA1y/DEIZX0/GMKLEVekNG727R8cs56ahETkRAy/3DR7+fJyh7oUgGwNQaRfXCun0+KbWY7Q==
 
-"@types/estree@1.0.8":
-  version "1.0.8"
-  resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.8.tgz#958b91c991b1867ced318bedea0e215ee050726e"
-  integrity sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w==
-
 "@types/estree@^1.0.0":
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.7.tgz#4158d3105276773d5b7695cd4834b1722e4f37a8"
@@ -2136,19 +2178,23 @@
     regenerator-runtime "^0.13.11"
     systemjs "^6.14.1"
 
-"@vitejs/plugin-vue-jsx@^3.1.0":
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/@vitejs/plugin-vue-jsx/-/plugin-vue-jsx-3.1.0.tgz#9953fd9456539e1f0f253bf0fcd1289e66c67cd1"
-  integrity sha512-w9M6F3LSEU5kszVb9An2/MmXNxocAnUb3WhRr8bHlimhDrXNt6n6D2nJQR3UXpGlZHh/EsgouOHCsM8V3Ln+WA==
+"@vitejs/plugin-vue-jsx@^5.1.5":
+  version "5.1.5"
+  resolved "https://registry.yarnpkg.com/@vitejs/plugin-vue-jsx/-/plugin-vue-jsx-5.1.5.tgz#23b9aa23e55fc81c40b3dab81728339c1f0d177f"
+  integrity sha512-jIAsvHOEtWpslLOI2MeElGFxH7M8pM83BU/Tor4RLyiwH0FM4nUW3xdvbw20EeU9wc5IspQwMq225K3CMnJEpA==
   dependencies:
-    "@babel/core" "^7.23.3"
-    "@babel/plugin-transform-typescript" "^7.23.3"
-    "@vue/babel-plugin-jsx" "^1.1.5"
+    "@babel/core" "^7.29.0"
+    "@babel/plugin-syntax-typescript" "^7.28.6"
+    "@babel/plugin-transform-typescript" "^7.28.6"
+    "@rolldown/pluginutils" "^1.0.0-rc.2"
+    "@vue/babel-plugin-jsx" "^2.0.1"
 
-"@vitejs/plugin-vue@^5.0.3":
-  version "5.2.4"
-  resolved "https://registry.yarnpkg.com/@vitejs/plugin-vue/-/plugin-vue-5.2.4.tgz#9e8a512eb174bfc2a333ba959bbf9de428d89ad8"
-  integrity sha512-7Yx/SXSOcQq5HiiV3orevHUFn+pmMB4cgbEkDYgnkUWb0WfeQ/wa2yFv6D5ICiCQOVpjA7vYDXrC7AGO8yjDHA==
+"@vitejs/plugin-vue@^6.0.5":
+  version "6.0.6"
+  resolved "https://registry.yarnpkg.com/@vitejs/plugin-vue/-/plugin-vue-6.0.6.tgz#4d8a3a7941382cf2760ac5593364bea6856ae7b2"
+  integrity sha512-u9HHgfrq3AjXlysn0eINFnWQOJQLO9WN6VprZ8FXl7A2bYisv3Hui9Ij+7QZ41F/WYWarHjwBbXtD7dKg3uxbg==
+  dependencies:
+    "@rolldown/pluginutils" "1.0.0-rc.13"
 
 "@volar/language-core@2.4.14", "@volar/language-core@~2.4.11":
   version "2.4.14"
@@ -2171,36 +2217,36 @@
     path-browserify "^1.0.1"
     vscode-uri "^3.0.8"
 
-"@vue/babel-helper-vue-transform-on@1.4.0":
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/@vue/babel-helper-vue-transform-on/-/babel-helper-vue-transform-on-1.4.0.tgz#616020488692a9c42a613280d62ed1b727045d95"
-  integrity sha512-mCokbouEQ/ocRce/FpKCRItGo+013tHg7tixg3DUNS+6bmIchPt66012kBMm476vyEIJPafrvOf4E5OYj3shSw==
+"@vue/babel-helper-vue-transform-on@2.0.1":
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/@vue/babel-helper-vue-transform-on/-/babel-helper-vue-transform-on-2.0.1.tgz#3cadaa769fda53b61f193ab63668ccc5c7dfe244"
+  integrity sha512-uZ66EaFbnnZSYqYEyplWvn46GhZ1KuYSThdT68p+am7MgBNbQ3hphTL9L+xSIsWkdktwhPYLwPgVWqo96jDdRA==
 
-"@vue/babel-plugin-jsx@^1.1.5":
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/@vue/babel-plugin-jsx/-/babel-plugin-jsx-1.4.0.tgz#c155c795ce980edf46aa6feceed93945a95ca658"
-  integrity sha512-9zAHmwgMWlaN6qRKdrg1uKsBKHvnUU+Py+MOCTuYZBoZsopa90Di10QRjB+YPnVss0BZbG/H5XFwJY1fTxJWhA==
-  dependencies:
-    "@babel/helper-module-imports" "^7.25.9"
-    "@babel/helper-plugin-utils" "^7.26.5"
-    "@babel/plugin-syntax-jsx" "^7.25.9"
-    "@babel/template" "^7.26.9"
-    "@babel/traverse" "^7.26.9"
-    "@babel/types" "^7.26.9"
-    "@vue/babel-helper-vue-transform-on" "1.4.0"
-    "@vue/babel-plugin-resolve-type" "1.4.0"
-    "@vue/shared" "^3.5.13"
-
-"@vue/babel-plugin-resolve-type@1.4.0":
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/@vue/babel-plugin-resolve-type/-/babel-plugin-resolve-type-1.4.0.tgz#4d357a81fb0cc9cad0e8c81b118115bda2c51543"
-  integrity sha512-4xqDRRbQQEWHQyjlYSgZsWj44KfiF6D+ktCuXyZ8EnVDYV3pztmXJDf1HveAjUAXxAnR8daCQT51RneWWxtTyQ==
+"@vue/babel-plugin-jsx@^2.0.1":
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/@vue/babel-plugin-jsx/-/babel-plugin-jsx-2.0.1.tgz#5ee72f05d89d82dc8030df6d826c1efd54d3604b"
+  integrity sha512-a8CaLQjD/s4PVdhrLD/zT574ZNPnZBOY+IhdtKWRB4HRZ0I2tXBi5ne7d9eCfaYwp5gU5+4KIyFTV1W1YL9xZA==
+  dependencies:
+    "@babel/helper-module-imports" "^7.27.1"
+    "@babel/helper-plugin-utils" "^7.27.1"
+    "@babel/plugin-syntax-jsx" "^7.27.1"
+    "@babel/template" "^7.27.2"
+    "@babel/traverse" "^7.28.4"
+    "@babel/types" "^7.28.4"
+    "@vue/babel-helper-vue-transform-on" "2.0.1"
+    "@vue/babel-plugin-resolve-type" "2.0.1"
+    "@vue/shared" "^3.5.22"
+
+"@vue/babel-plugin-resolve-type@2.0.1":
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/@vue/babel-plugin-resolve-type/-/babel-plugin-resolve-type-2.0.1.tgz#4a191a0139a1bc106dae560abebf342bdeef5639"
+  integrity sha512-ybwgIuRGRRBhOU37GImDoWQoz+TlSqap65qVI6iwg/J7FfLTLmMf97TS7xQH9I7Qtr/gp161kYVdhr1ZMraSYQ==
   dependencies:
-    "@babel/code-frame" "^7.26.2"
-    "@babel/helper-module-imports" "^7.25.9"
-    "@babel/helper-plugin-utils" "^7.26.5"
-    "@babel/parser" "^7.26.9"
-    "@vue/compiler-sfc" "^3.5.13"
+    "@babel/code-frame" "^7.27.1"
+    "@babel/helper-module-imports" "^7.27.1"
+    "@babel/helper-plugin-utils" "^7.27.1"
+    "@babel/parser" "^7.28.4"
+    "@vue/compiler-sfc" "^3.5.22"
 
 "@vue/compiler-core@3.5.14":
   version "3.5.14"
@@ -2224,6 +2270,17 @@
     estree-walker "^2.0.2"
     source-map-js "^1.2.1"
 
+"@vue/compiler-core@3.5.32":
+  version "3.5.32"
+  resolved "https://registry.yarnpkg.com/@vue/compiler-core/-/compiler-core-3.5.32.tgz#5115ca099b04fedd8f623f93b522d914c376cbeb"
+  integrity sha512-4x74Tbtqnda8s/NSD6e1Dr5p1c8HdMU5RWSjMSUzb8RTcUQqevDCxVAitcLBKT+ie3o0Dl9crc/S/opJM7qBGQ==
+  dependencies:
+    "@babel/parser" "^7.29.2"
+    "@vue/shared" "3.5.32"
+    entities "^7.0.1"
+    estree-walker "^2.0.2"
+    source-map-js "^1.2.1"
+
 "@vue/compiler-dom@3.5.14", "@vue/compiler-dom@^3.5.0":
   version "3.5.14"
   resolved "https://registry.yarnpkg.com/@vue/compiler-dom/-/compiler-dom-3.5.14.tgz#bbf27421f80f7b8873000edceecd817c4abf438a"
@@ -2240,7 +2297,15 @@
     "@vue/compiler-core" "3.5.16"
     "@vue/shared" "3.5.16"
 
-"@vue/compiler-sfc@3.5.14", "@vue/compiler-sfc@^3.1.0", "@vue/compiler-sfc@^3.5.13":
+"@vue/compiler-dom@3.5.32":
+  version "3.5.32"
+  resolved "https://registry.yarnpkg.com/@vue/compiler-dom/-/compiler-dom-3.5.32.tgz#6069eae2f0d1a38263e9445f3c1da1a06e5f6534"
+  integrity sha512-ybHAu70NtiEI1fvAUz3oXZqkUYEe5J98GjMDpTGl5iHb0T15wQYLR4wE3h9xfuTNA+Cm2f4czfe8B4s+CCH57Q==
+  dependencies:
+    "@vue/compiler-core" "3.5.32"
+    "@vue/shared" "3.5.32"
+
+"@vue/compiler-sfc@3.5.14", "@vue/compiler-sfc@^3.1.0":
   version "3.5.14"
   resolved "https://registry.yarnpkg.com/@vue/compiler-sfc/-/compiler-sfc-3.5.14.tgz#fc3db30a1c744139d41bb57bb451d783415fce4b"
   integrity sha512-9T6m/9mMr81Lj58JpzsiSIjBgv2LiVoWjIVa7kuXHICUi8LiDSIotMpPRXYJsXKqyARrzjT24NAwttrMnMaCXA==
@@ -2270,6 +2335,21 @@
     postcss "^8.5.3"
     source-map-js "^1.2.1"
 
+"@vue/compiler-sfc@^3.5.22":
+  version "3.5.32"
+  resolved "https://registry.yarnpkg.com/@vue/compiler-sfc/-/compiler-sfc-3.5.32.tgz#1f4bef6d4fbfc0cb8278a08d08c05a3afddbd2c8"
+  integrity sha512-8UYUYo71cP/0YHMO814TRZlPuUUw3oifHuMR7Wp9SNoRSrxRQnhMLNlCeaODNn6kNTJsjFoQ/kqIj4qGvya4Xg==
+  dependencies:
+    "@babel/parser" "^7.29.2"
+    "@vue/compiler-core" "3.5.32"
+    "@vue/compiler-dom" "3.5.32"
+    "@vue/compiler-ssr" "3.5.32"
+    "@vue/shared" "3.5.32"
+    estree-walker "^2.0.2"
+    magic-string "^0.30.21"
+    postcss "^8.5.8"
+    source-map-js "^1.2.1"
+
 "@vue/compiler-ssr@3.5.14":
   version "3.5.14"
   resolved "https://registry.yarnpkg.com/@vue/compiler-ssr/-/compiler-ssr-3.5.14.tgz#013174ee6bbf3ee291a6df247a3feb6eb43d808b"
@@ -2286,6 +2366,14 @@
     "@vue/compiler-dom" "3.5.16"
     "@vue/shared" "3.5.16"
 
+"@vue/compiler-ssr@3.5.32":
+  version "3.5.32"
+  resolved "https://registry.yarnpkg.com/@vue/compiler-ssr/-/compiler-ssr-3.5.32.tgz#5632a0934cb58cf88dcff1404ecf06b5a16f6816"
+  integrity sha512-Gp4gTs22T3DgRotZ8aA/6m2jMR+GMztvBXUBEUOYOcST+giyGWJ4WvFd7QLHBkzTxkfOt8IELKNdpzITLbA2rw==
+  dependencies:
+    "@vue/compiler-dom" "3.5.32"
+    "@vue/shared" "3.5.32"
+
 "@vue/compiler-vue2@^2.7.16":
   version "2.7.16"
   resolved "https://registry.yarnpkg.com/@vue/compiler-vue2/-/compiler-vue2-2.7.16.tgz#2ba837cbd3f1b33c2bc865fbe1a3b53fb611e249"
@@ -2386,7 +2474,7 @@
     "@vue/compiler-ssr" "3.5.16"
     "@vue/shared" "3.5.16"
 
-"@vue/shared@3.5.14", "@vue/shared@^3.5.0", "@vue/shared@^3.5.13":
+"@vue/shared@3.5.14", "@vue/shared@^3.5.0":
   version "3.5.14"
   resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.5.14.tgz#8fcdc6c69661a1163c173cafb6129c3f8ad01122"
   integrity sha512-oXTwNxVfc9EtP1zzXAlSlgARLXNC84frFYkS0HHz0h3E4WZSP9sywqjqzGCP9Y34M8ipNmd380pVgmMuwELDyQ==
@@ -2396,6 +2484,11 @@
   resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.5.16.tgz#d5ea7671182742192938a4b4cbf86ef12bef7418"
   integrity sha512-c/0fWy3Jw6Z8L9FmTyYfkpM5zklnqqa9+a6dz3DvONRKW2NEbh46BP0FHuLFSWi2TnQEtp91Z6zOWNrU6QiyPg==
 
+"@vue/shared@3.5.32", "@vue/shared@^3.5.22":
+  version "3.5.32"
+  resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.5.32.tgz#dd8ba0d709bf3f758c324a81c8897bad5e1540cf"
+  integrity sha512-ksNyrmRQzWJJ8n3cRDuSF7zNNontuJg1YHnmWRJd2AMu8Ij2bqwiiri2lH5rHtYPZjj4STkNcgcmiQqlOjiYGg==
+
 "@vue/test-utils@^2.0.0-rc.19":
   version "2.4.6"
   resolved "https://registry.yarnpkg.com/@vue/test-utils/-/test-utils-2.4.6.tgz#7d534e70c4319d2a587d6a3b45a39e9695ade03c"
@@ -2462,11 +2555,6 @@
   resolved "https://registry.yarnpkg.com/@xmldom/xmldom/-/xmldom-0.7.13.tgz#ff34942667a4e19a9f4a0996a76814daac364cf3"
   integrity sha512-lm2GW5PkosIzccsaZIz7tp8cPADSIlIHWDFTR1N0SzfinhhYgeIQjFMz4rYzanCScr3DqQLeomUDArp6MWKm+g==
 
-"@yarnpkg/lockfile@^1.1.0":
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz#e77a97fbd345b76d83245edcd17d393b1b41fb31"
-  integrity sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ==
-
 abab@^2.0.5, abab@^2.0.6:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.6.tgz#41b80f2c871d19686216b82309231cfd3cb3d291"
@@ -2837,7 +2925,7 @@ c8@^7.11.0:
     yargs "^16.2.0"
     yargs-parser "^20.2.9"
 
-call-bind-apply-helpers@^1.0.0, call-bind-apply-helpers@^1.0.1, call-bind-apply-helpers@^1.0.2:
+call-bind-apply-helpers@^1.0.1, call-bind-apply-helpers@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz#4b5428c222be985d79c3d82657479dbe0b59b2d6"
   integrity sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==
@@ -2845,24 +2933,6 @@ call-bind-apply-helpers@^1.0.0, call-bind-apply-helpers@^1.0.1, call-bind-apply-
     es-errors "^1.3.0"
     function-bind "^1.1.2"
 
-call-bind@^1.0.8:
-  version "1.0.8"
-  resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.8.tgz#0736a9660f537e3388826f440d5ec45f744eaa4c"
-  integrity sha512-oKlSFMcMwpUg2ednkhQ454wfWiU/ul3CkJe/PEHcTKuiX6RpbehUiFMXu13HalGZxfUwCQzZG747YXBn1im9ww==
-  dependencies:
-    call-bind-apply-helpers "^1.0.0"
-    es-define-property "^1.0.0"
-    get-intrinsic "^1.2.4"
-    set-function-length "^1.2.2"
-
-call-bound@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/call-bound/-/call-bound-1.0.4.tgz#238de935d2a2a692928c538c7ccfa91067fd062a"
-  integrity sha512-+ys997U96po4Kx/ABpBCqhA9EuxJaQWDQg7295H4hBphv3IZg0boBKuwYpt4YXp6MZ5AmZQnU/tyMTlRpaSejg==
-  dependencies:
-    call-bind-apply-helpers "^1.0.2"
-    get-intrinsic "^1.3.0"
-
 caller-callsite@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/caller-callsite/-/caller-callsite-2.0.0.tgz#847e0fce0a223750a9a027c54b33731ad3154134"
@@ -2983,11 +3053,6 @@ ci-info@^1.5.0:
   resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-1.6.0.tgz#2ca20dbb9ceb32d4524a683303313f0304b1e497"
   integrity sha512-vsGdkwSCDpWmP80ncATX7iea5DWQemg1UgCW5J8tqjU3lYw4FBYuj89J0CTVomA7BEfvSZd84GmHko+MxFQU2A==
 
-ci-info@^3.7.0:
-  version "3.9.0"
-  resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.9.0.tgz#4279a62028a7b1f262f3473fc9605f5e218c59b4"
-  integrity sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==
-
 classnames@^2.2.5:
   version "2.5.1"
   resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.5.1.tgz#ba774c614be0f016da105c858e7159eae8e7687b"
@@ -3366,15 +3431,6 @@ defaults@^1.0.3:
   dependencies:
     clone "^1.0.2"
 
-define-data-property@^1.1.4:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/define-data-property/-/define-data-property-1.1.4.tgz#894dc141bb7d3060ae4366f6a0107e68fbe48c5e"
-  integrity sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==
-  dependencies:
-    es-define-property "^1.0.0"
-    es-errors "^1.3.0"
-    gopd "^1.0.1"
-
 defined@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/defined/-/defined-1.0.1.tgz#c0b9db27bfaffd95d6f61399419b893df0f91ebf"
@@ -3409,6 +3465,11 @@ dequal@^2.0.0:
   resolved "https://registry.yarnpkg.com/dequal/-/dequal-2.0.3.tgz#2644214f1997d39ed0ee0ece72335490a7ac67be"
   integrity sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA==
 
+detect-libc@^2.0.3:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-2.1.2.tgz#689c5dcdc1900ef5583a4cb9f6d7b473742074ad"
+  integrity sha512-Btj2BOOO83o3WyH59e8MgXsxEQVcarkUOpEYrubB0urwnN10yQ364rsiByU11nZlqWYZm05i/of7io4mzihBtQ==
+
 detective@^5.2.0:
   version "5.2.1"
   resolved "https://registry.yarnpkg.com/detective/-/detective-5.2.1.tgz#6af01eeda11015acb0e73f933242b70f24f91034"
@@ -3568,6 +3629,11 @@ entities@^4.4.0, entities@^4.5.0:
   resolved "https://registry.yarnpkg.com/entities/-/entities-4.5.0.tgz#5d268ea5e7113ec74c4d033b79ea5a35a488fb48"
   integrity sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==
 
+entities@^7.0.1:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/entities/-/entities-7.0.1.tgz#26e8a88889db63417dcb9a1e79a3f1bc92b5976b"
+  integrity sha512-TWrgLOFUQTH994YUyl1yT4uyavY5nNB5muff+RtWaqNVCAK408b5ZnnbNAUEWLTCpum9w6arT70i1XdQ4UeOPA==
+
 entities@~2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/entities/-/entities-2.1.0.tgz#992d3129cf7df6870b96c57858c249a120f8b8b5"
@@ -3580,7 +3646,7 @@ error-ex@^1.3.1:
   dependencies:
     is-arrayish "^0.2.1"
 
-es-define-property@^1.0.0, es-define-property@^1.0.1:
+es-define-property@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/es-define-property/-/es-define-property-1.0.1.tgz#983eb2f9a6724e9303f61addf011c72e09e0b0fa"
   integrity sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==
@@ -3734,35 +3800,6 @@ esbuild@^0.14.27:
     esbuild-windows-64 "0.14.54"
     esbuild-windows-arm64 "0.14.54"
 
-esbuild@^0.21.3:
-  version "0.21.5"
-  resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.21.5.tgz#9ca301b120922959b766360d8ac830da0d02997d"
-  integrity sha512-mg3OPMV4hXywwpoDxu3Qda5xCKQi+vCTZq8S9J/EpkhB2HzKXq4SNFZE3+NK93JYxc8VMSep+lOUSC/RVKaBqw==
-  optionalDependencies:
-    "@esbuild/aix-ppc64" "0.21.5"
-    "@esbuild/android-arm" "0.21.5"
-    "@esbuild/android-arm64" "0.21.5"
-    "@esbuild/android-x64" "0.21.5"
-    "@esbuild/darwin-arm64" "0.21.5"
-    "@esbuild/darwin-x64" "0.21.5"
-    "@esbuild/freebsd-arm64" "0.21.5"
-    "@esbuild/freebsd-x64" "0.21.5"
-    "@esbuild/linux-arm" "0.21.5"
-    "@esbuild/linux-arm64" "0.21.5"
-    "@esbuild/linux-ia32" "0.21.5"
-    "@esbuild/linux-loong64" "0.21.5"
-    "@esbuild/linux-mips64el" "0.21.5"
-    "@esbuild/linux-ppc64" "0.21.5"
-    "@esbuild/linux-riscv64" "0.21.5"
-    "@esbuild/linux-s390x" "0.21.5"
-    "@esbuild/linux-x64" "0.21.5"
-    "@esbuild/netbsd-x64" "0.21.5"
-    "@esbuild/openbsd-x64" "0.21.5"
-    "@esbuild/sunos-x64" "0.21.5"
-    "@esbuild/win32-arm64" "0.21.5"
-    "@esbuild/win32-ia32" "0.21.5"
-    "@esbuild/win32-x64" "0.21.5"
-
 escalade@^3.1.1, escalade@^3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.2.0.tgz#011a3f69856ba189dffa7dc8fcce99d2a87903e5"
@@ -4045,6 +4082,11 @@ fdir@^6.4.4:
   resolved "https://registry.yarnpkg.com/fdir/-/fdir-6.4.4.tgz#1cfcf86f875a883e19a8fab53622cfe992e8d2f9"
   integrity sha512-1NZP+GK4GfuAv3PqKvxQRDMjdSRZjnkq7KfhlNrCNNlZ0ygQFpebfrnfnq/W7fpUnAv9aGWmY1zKx7FYL3gwhg==
 
+fdir@^6.5.0:
+  version "6.5.0"
+  resolved "https://registry.yarnpkg.com/fdir/-/fdir-6.5.0.tgz#ed2ab967a331ade62f18d077dae192684d50d350"
+  integrity sha512-tIbYtZbucOs0BRGqPJkshJUYdL+SDH7dVM8gjy+ERp3WAUjLEFJE+02kanyHtwjWOnwrKYBiwAmM0p4kLJAnXg==
+
 feather-icons@^4.26.0, feather-icons@^4.28.0:
   version "4.29.2"
   resolved "https://registry.yarnpkg.com/feather-icons/-/feather-icons-4.29.2.tgz#b03a47588a1c400f215e884504db1c18860d89f8"
@@ -4113,13 +4155,6 @@ find-up@^5.0.0:
     locate-path "^6.0.0"
     path-exists "^4.0.0"
 
-find-yarn-workspace-root@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/find-yarn-workspace-root/-/find-yarn-workspace-root-2.0.0.tgz#f47fb8d239c900eb78179aa81b66673eac88f7bd"
-  integrity sha512-1IMnbjt4KzsQfnhnzNd8wUEgXZ44IzZaZmnLYx7D5FZlaHt2gW20Cri8Q+E/t5tIj4+epTBub+2Zxu/vNILzqQ==
-  dependencies:
-    micromatch "^4.0.2"
-
 flat-cache@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-2.0.1.tgz#5d296d6f04bda44a4630a301413bdbc2ec085ec0"
@@ -4177,41 +4212,43 @@ frappe-charts@2.0.0-rc22:
   resolved "https://registry.yarnpkg.com/frappe-charts/-/frappe-charts-2.0.0-rc22.tgz#9a5a747febdc381a1d4d7af96e89cf519dfba8c0"
   integrity sha512-N7f/8979wJCKjusOinaUYfMxB80YnfuVLrSkjpj4LtyqS0BGS6SuJxUnb7Jl4RWUFEIs7zEhideIKnyLeFZF4Q==
 
-frappe-ui@0.1.238:
-  version "0.1.238"
-  resolved "https://registry.yarnpkg.com/frappe-ui/-/frappe-ui-0.1.238.tgz#6a36faa7c60a0613155ca4e70aa6777500313eab"
-  integrity sha512-xk0eWB0bxZ55lX8yYzQD4+dn6Pzp0Pfwmh/TsAOPCOscj641qyRiwVXtvsFMmcbpOnCYn41/5xnkf8N2k67cBQ==
+frappe-ui@0.1.277:
+  version "0.1.277"
+  resolved "https://registry.yarnpkg.com/frappe-ui/-/frappe-ui-0.1.277.tgz#84b9804e60b8a815b79ef64fafe2cfa228474363"
+  integrity sha512-Lqh0WX9BkKlOxLBVr557xhGsyyKlysxsxbxqsMMRoOgKAEI48MWTSXtO9CcIdUZjR+Y3jQzLDdcr/GmCBmXjew==
   dependencies:
+    "@floating-ui/dom" "^1.7.4"
     "@floating-ui/vue" "^1.1.6"
     "@headlessui/vue" "^1.7.14"
     "@popperjs/core" "^2.11.2"
     "@tailwindcss/forms" "^0.5.3"
     "@tailwindcss/line-clamp" "^0.4.4"
     "@tailwindcss/typography" "^0.5.16"
-    "@tiptap/core" "^2.26.1"
-    "@tiptap/extension-code" "^2.26.1"
-    "@tiptap/extension-code-block" "^2.26.1"
-    "@tiptap/extension-code-block-lowlight" "^2.26.1"
-    "@tiptap/extension-color" "^2.26.1"
-    "@tiptap/extension-heading" "^2.26.1"
-    "@tiptap/extension-highlight" "^2.26.1"
-    "@tiptap/extension-image" "^2.26.1"
-    "@tiptap/extension-link" "^2.26.1"
-    "@tiptap/extension-mention" "^2.26.1"
-    "@tiptap/extension-placeholder" "^2.26.1"
-    "@tiptap/extension-table" "^2.26.1"
-    "@tiptap/extension-table-cell" "^2.26.1"
-    "@tiptap/extension-table-header" "^2.26.1"
-    "@tiptap/extension-table-row" "^2.26.1"
-    "@tiptap/extension-task-item" "^2.26.1"
-    "@tiptap/extension-task-list" "^2.26.1"
-    "@tiptap/extension-text-align" "^2.26.1"
-    "@tiptap/extension-text-style" "^2.26.1"
-    "@tiptap/extension-typography" "^2.26.1"
-    "@tiptap/pm" "^2.26.1"
-    "@tiptap/starter-kit" "^2.26.1"
-    "@tiptap/suggestion" "^2.26.1"
-    "@tiptap/vue-3" "^2.26.1"
+    "@tiptap/core" "^3.11.0"
+    "@tiptap/extension-bubble-menu" "^3.11.0"
+    "@tiptap/extension-code" "^3.11.0"
+    "@tiptap/extension-code-block" "^3.11.0"
+    "@tiptap/extension-code-block-lowlight" "^3.11.0"
+    "@tiptap/extension-color" "^3.11.0"
+    "@tiptap/extension-heading" "^3.11.0"
+    "@tiptap/extension-highlight" "^3.11.0"
+    "@tiptap/extension-image" "^3.11.0"
+    "@tiptap/extension-link" "^3.11.0"
+    "@tiptap/extension-list" "^3.11.0"
+    "@tiptap/extension-mention" "^3.11.0"
+    "@tiptap/extension-node-range" "^3.11.0"
+    "@tiptap/extension-placeholder" "^3.11.0"
+    "@tiptap/extension-table" "^3.11.0"
+    "@tiptap/extension-task-item" "^3.11.0"
+    "@tiptap/extension-task-list" "^3.11.0"
+    "@tiptap/extension-text-align" "^3.11.0"
+    "@tiptap/extension-text-style" "^3.11.0"
+    "@tiptap/extension-typography" "^3.11.0"
+    "@tiptap/extensions" "^3.11.0"
+    "@tiptap/pm" "^3.11.0"
+    "@tiptap/starter-kit" "^3.11.0"
+    "@tiptap/suggestion" "^3.11.0"
+    "@tiptap/vue-3" "^3.11.0"
     "@vueuse/core" "^10.4.1"
     dayjs "^1.11.13"
     dompurify "^3.2.6"
@@ -4221,12 +4258,14 @@ frappe-ui@0.1.238:
     highlight.js "^11.11.1"
     idb-keyval "^6.2.0"
     lowlight "^3.3.0"
-    lucide-static "^0.535.0"
+    lucide-static "^0.545.0"
     marked "^15.0.12"
     ora "5.4.1"
     prettier "^3.3.2"
+    prosemirror-tables "^1.8.1"
     radix-vue "^1.5.3"
     reka-ui "^2.5.0"
+    slugify "^1.6.6"
     socket.io-client "^4.5.1"
     tippy.js "^6.3.7"
     typescript "^5.0.2"
@@ -4288,7 +4327,7 @@ get-func-name@^2.0.1, get-func-name@^2.0.2:
   resolved "https://registry.yarnpkg.com/get-func-name/-/get-func-name-2.0.2.tgz#0d7cf20cd13fda808669ffa88f4ffc7a3943fc41"
   integrity sha512-8vXOvuE167CtIc3OyItco7N/dpRtBbYOsPsXCz7X/PMnlGjYjSGuZJgM1Y7mmew7BKf9BqvLX2tnOVy1BBUsxQ==
 
-get-intrinsic@^1.2.4, get-intrinsic@^1.2.6, get-intrinsic@^1.3.0:
+get-intrinsic@^1.2.6:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.3.0.tgz#743f0e3b6964a93a5491ed1bffaae054d7f98d01"
   integrity sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==
@@ -4429,12 +4468,12 @@ globby@^6.1.0:
     pify "^2.0.0"
     pinkie-promise "^2.0.0"
 
-gopd@^1.0.1, gopd@^1.2.0:
+gopd@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/gopd/-/gopd-1.2.0.tgz#89f56b8217bdbc8802bd299df6d7f1081d7e51a1"
   integrity sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==
 
-graceful-fs@^4.1.11, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.2:
+graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.2:
   version "4.2.11"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3"
   integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==
@@ -4470,13 +4509,6 @@ has-flag@^4.0.0:
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b"
   integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==
 
-has-property-descriptors@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz#963ed7d071dc7bf5f084c5bfbe0d1b6222586854"
-  integrity sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==
-  dependencies:
-    es-define-property "^1.0.0"
-
 has-symbols@^1.0.3, has-symbols@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.1.0.tgz#fc9c6a783a084951d0b971fe1018de813707a338"
@@ -4743,11 +4775,6 @@ is-directory@^0.3.1:
   resolved "https://registry.yarnpkg.com/is-directory/-/is-directory-0.3.1.tgz#61339b6f2475fc772fd9c9d83f5c8575dc154ae1"
   integrity sha512-yVChGzahRFvbkscn2MlwGismPO12i9+znNruC5gVEntG3qu0xQMzsGg/JFbrsqDOHtHFPci+V5aP5T9I+yeKqw==
 
-is-docker@^2.0.0:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.2.1.tgz#33eeabe23cfe86f14bde4408a02c0cfb853acdaa"
-  integrity sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==
-
 is-extglob@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
@@ -4844,18 +4871,6 @@ is-unicode-supported@^0.1.0:
   resolved "https://registry.yarnpkg.com/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz#3f26c76a809593b52bfa2ecb5710ed2779b522a7"
   integrity sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==
 
-is-wsl@^2.1.1:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-2.2.0.tgz#74a4c76e77ca9fd3f932f290c17ea326cd157271"
-  integrity sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==
-  dependencies:
-    is-docker "^2.0.0"
-
-isarray@^2.0.5:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/isarray/-/isarray-2.0.5.tgz#8af1e4c1221244cc62459faf38940d4e644a5723"
-  integrity sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==
-
 isexe@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
@@ -4999,17 +5014,6 @@ json-stable-stringify-without-jsonify@^1.0.1:
   resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651"
   integrity sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==
 
-json-stable-stringify@^1.0.2:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/json-stable-stringify/-/json-stable-stringify-1.3.0.tgz#8903cfac42ea1a0f97f35d63a4ce0518f0cc6a70"
-  integrity sha512-qtYiSSFlwot9XHtF9bD9c7rwKjr+RecWT//ZnPvSmEjpV5mmPOCN4j8UjY5hbjNkOwZ/jQv3J6R1/pL7RwgMsg==
-  dependencies:
-    call-bind "^1.0.8"
-    call-bound "^1.0.4"
-    isarray "^2.0.5"
-    jsonify "^0.0.1"
-    object-keys "^1.1.1"
-
 json5@^2.2.3:
   version "2.2.3"
   resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.3.tgz#78cd6f1a19bdc12b73db5ad0c61efd66c1e29283"
@@ -5024,18 +5028,6 @@ jsonfile@^6.0.1:
   optionalDependencies:
     graceful-fs "^4.1.6"
 
-jsonify@^0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.1.tgz#2aa3111dae3d34a0f151c63f3a45d995d9420978"
-  integrity sha512-2/Ki0GcmuqSrgFyelQq9M05y7PS0mEwuIzrf3f1fPqkVDVRvZrPZtVSMHxdgo8Aq0sxAOb/cr2aqqA3LeWHVPg==
-
-klaw-sync@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/klaw-sync/-/klaw-sync-6.0.0.tgz#1fd2cfd56ebb6250181114f0a581167099c2b28c"
-  integrity sha512-nIeuVSzdCCs6TDPTqI8w1Yre34sSq7AkZ4B3sfOBbI2CgVSB4Du4aLQijFU2+lhAFCwt9+42Hel6lQNIv6AntQ==
-  dependencies:
-    graceful-fs "^4.1.11"
-
 kolorist@^1.8.0:
   version "1.8.0"
   resolved "https://registry.yarnpkg.com/kolorist/-/kolorist-1.8.0.tgz#edddbbbc7894bc13302cdf740af6374d4a04743c"
@@ -5054,6 +5046,80 @@ libarchive.js@^1.3.0:
   resolved "https://registry.yarnpkg.com/libarchive.js/-/libarchive.js-1.3.0.tgz#18c42c6b4ce727a02359c90769e4e454cf3743cd"
   integrity sha512-EkQfRXt9DhWwj6BnEA2TNpOf4jTnzSTUPGgE+iFxcdNqjktY8GitbDeHnx8qZA0/IukNyyBUR3oQKRdYkO+HFg==
 
+lightningcss-android-arm64@1.32.0:
+  version "1.32.0"
+  resolved "https://registry.yarnpkg.com/lightningcss-android-arm64/-/lightningcss-android-arm64-1.32.0.tgz#f033885116dfefd9c6f54787523e3514b61e1968"
+  integrity sha512-YK7/ClTt4kAK0vo6w3X+Pnm0D2cf2vPHbhOXdoNti1Ga0al1P4TBZhwjATvjNwLEBCnKvjJc2jQgHXH0NEwlAg==
+
+lightningcss-darwin-arm64@1.32.0:
+  version "1.32.0"
+  resolved "https://registry.yarnpkg.com/lightningcss-darwin-arm64/-/lightningcss-darwin-arm64-1.32.0.tgz#50b71871b01c8199584b649e292547faea7af9b5"
+  integrity sha512-RzeG9Ju5bag2Bv1/lwlVJvBE3q6TtXskdZLLCyfg5pt+HLz9BqlICO7LZM7VHNTTn/5PRhHFBSjk5lc4cmscPQ==
+
+lightningcss-darwin-x64@1.32.0:
+  version "1.32.0"
+  resolved "https://registry.yarnpkg.com/lightningcss-darwin-x64/-/lightningcss-darwin-x64-1.32.0.tgz#35f3e97332d130b9ca181e11b568ded6aebc6d5e"
+  integrity sha512-U+QsBp2m/s2wqpUYT/6wnlagdZbtZdndSmut/NJqlCcMLTWp5muCrID+K5UJ6jqD2BFshejCYXniPDbNh73V8w==
+
+lightningcss-freebsd-x64@1.32.0:
+  version "1.32.0"
+  resolved "https://registry.yarnpkg.com/lightningcss-freebsd-x64/-/lightningcss-freebsd-x64-1.32.0.tgz#9777a76472b64ed6ff94342ad64c7bafd794a575"
+  integrity sha512-JCTigedEksZk3tHTTthnMdVfGf61Fky8Ji2E4YjUTEQX14xiy/lTzXnu1vwiZe3bYe0q+SpsSH/CTeDXK6WHig==
+
+lightningcss-linux-arm-gnueabihf@1.32.0:
+  version "1.32.0"
+  resolved "https://registry.yarnpkg.com/lightningcss-linux-arm-gnueabihf/-/lightningcss-linux-arm-gnueabihf-1.32.0.tgz#13ae652e1ab73b9135d7b7da172f666c410ad53d"
+  integrity sha512-x6rnnpRa2GL0zQOkt6rts3YDPzduLpWvwAF6EMhXFVZXD4tPrBkEFqzGowzCsIWsPjqSK+tyNEODUBXeeVHSkw==
+
+lightningcss-linux-arm64-gnu@1.32.0:
+  version "1.32.0"
+  resolved "https://registry.yarnpkg.com/lightningcss-linux-arm64-gnu/-/lightningcss-linux-arm64-gnu-1.32.0.tgz#417858795a94592f680123a1b1f9da8a0e1ef335"
+  integrity sha512-0nnMyoyOLRJXfbMOilaSRcLH3Jw5z9HDNGfT/gwCPgaDjnx0i8w7vBzFLFR1f6CMLKF8gVbebmkUN3fa/kQJpQ==
+
+lightningcss-linux-arm64-musl@1.32.0:
+  version "1.32.0"
+  resolved "https://registry.yarnpkg.com/lightningcss-linux-arm64-musl/-/lightningcss-linux-arm64-musl-1.32.0.tgz#6be36692e810b718040802fd809623cffe732133"
+  integrity sha512-UpQkoenr4UJEzgVIYpI80lDFvRmPVg6oqboNHfoH4CQIfNA+HOrZ7Mo7KZP02dC6LjghPQJeBsvXhJod/wnIBg==
+
+lightningcss-linux-x64-gnu@1.32.0:
+  version "1.32.0"
+  resolved "https://registry.yarnpkg.com/lightningcss-linux-x64-gnu/-/lightningcss-linux-x64-gnu-1.32.0.tgz#0b7803af4eb21cfd38dd39fe2abbb53c7dd091f6"
+  integrity sha512-V7Qr52IhZmdKPVr+Vtw8o+WLsQJYCTd8loIfpDaMRWGUZfBOYEJeyJIkqGIDMZPwPx24pUMfwSxxI8phr/MbOA==
+
+lightningcss-linux-x64-musl@1.32.0:
+  version "1.32.0"
+  resolved "https://registry.yarnpkg.com/lightningcss-linux-x64-musl/-/lightningcss-linux-x64-musl-1.32.0.tgz#88dc8ba865ddddb1ac5ef04b0f161804418c163b"
+  integrity sha512-bYcLp+Vb0awsiXg/80uCRezCYHNg1/l3mt0gzHnWV9XP1W5sKa5/TCdGWaR/zBM2PeF/HbsQv/j2URNOiVuxWg==
+
+lightningcss-win32-arm64-msvc@1.32.0:
+  version "1.32.0"
+  resolved "https://registry.yarnpkg.com/lightningcss-win32-arm64-msvc/-/lightningcss-win32-arm64-msvc-1.32.0.tgz#4f30ba3fa5e925f5b79f945e8cc0d176c3b1ab38"
+  integrity sha512-8SbC8BR40pS6baCM8sbtYDSwEVQd4JlFTOlaD3gWGHfThTcABnNDBda6eTZeqbofalIJhFx0qKzgHJmcPTnGdw==
+
+lightningcss-win32-x64-msvc@1.32.0:
+  version "1.32.0"
+  resolved "https://registry.yarnpkg.com/lightningcss-win32-x64-msvc/-/lightningcss-win32-x64-msvc-1.32.0.tgz#141aa5605645064928902bb4af045fa7d9f4220a"
+  integrity sha512-Amq9B/SoZYdDi1kFrojnoqPLxYhQ4Wo5XiL8EVJrVsB8ARoC1PWW6VGtT0WKCemjy8aC+louJnjS7U18x3b06Q==
+
+lightningcss@^1.32.0:
+  version "1.32.0"
+  resolved "https://registry.yarnpkg.com/lightningcss/-/lightningcss-1.32.0.tgz#b85aae96486dcb1bf49a7c8571221273f4f1e4a9"
+  integrity sha512-NXYBzinNrblfraPGyrbPoD19C1h9lfI/1mzgWYvXUTe414Gz/X1FD2XBZSZM7rRTrMA8JL3OtAaGifrIKhQ5yQ==
+  dependencies:
+    detect-libc "^2.0.3"
+  optionalDependencies:
+    lightningcss-android-arm64 "1.32.0"
+    lightningcss-darwin-arm64 "1.32.0"
+    lightningcss-darwin-x64 "1.32.0"
+    lightningcss-freebsd-x64 "1.32.0"
+    lightningcss-linux-arm-gnueabihf "1.32.0"
+    lightningcss-linux-arm64-gnu "1.32.0"
+    lightningcss-linux-arm64-musl "1.32.0"
+    lightningcss-linux-x64-gnu "1.32.0"
+    lightningcss-linux-x64-musl "1.32.0"
+    lightningcss-win32-arm64-msvc "1.32.0"
+    lightningcss-win32-x64-msvc "1.32.0"
+
 lilconfig@^2.0.5:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/lilconfig/-/lilconfig-2.1.0.tgz#78e23ac89ebb7e1bfbf25b18043de756548e7f52"
@@ -5285,10 +5351,10 @@ lru-cache@^5.1.1:
   dependencies:
     yallist "^3.0.2"
 
-lucide-static@^0.535.0:
-  version "0.535.0"
-  resolved "https://registry.yarnpkg.com/lucide-static/-/lucide-static-0.535.0.tgz#3d8ad25360d166a4f584d97f2c08fd9b24be30d7"
-  integrity sha512-wlYTSPpeyMjLjQ5jgSAENQwVfURVf2XHV5TDp8YPCJBEyWz+FJGuGB5LYBgOFvWIDOMW+AIoiA8sNd8My/nxlw==
+lucide-static@^0.545.0:
+  version "0.545.0"
+  resolved "https://registry.yarnpkg.com/lucide-static/-/lucide-static-0.545.0.tgz#69dad91d1bbd53b70df6c21f0877c16a1e69cea0"
+  integrity sha512-2i81WNw3y+sN17gG75DKZbd43pGJREyoAQRK5IG8djCWhISoK6Ri1ovbKwOjFR+St2LHTQhu+EJygmUIWMotew==
 
 luxon@^1.22.0:
   version "1.28.1"
@@ -5309,6 +5375,13 @@ magic-string@^0.30.1, magic-string@^0.30.17:
   dependencies:
     "@jridgewell/sourcemap-codec" "^1.5.0"
 
+magic-string@^0.30.21:
+  version "0.30.21"
+  resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.30.21.tgz#56763ec09a0fa8091df27879fd94d19078c00d91"
+  integrity sha512-vd2F4YUyEXKGcLHoq+TEyCjxueSeHnFxyyjNp80yg0XV4vUhnDer/lvvlqM/arB5bXQN5K2/3oinyCRyx8T2CQ==
+  dependencies:
+    "@jridgewell/sourcemap-codec" "^1.5.5"
+
 make-dir@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-4.0.0.tgz#c3c2307a771277cd9638305f915c29ae741b614e"
@@ -5660,11 +5733,6 @@ object-hash@^3.0.0:
   resolved "https://registry.yarnpkg.com/object-hash/-/object-hash-3.0.0.tgz#73f97f753e7baffc0e2cc9d6e079079744ac82e9"
   integrity sha512-RSn9F68PjH9HqtltsSnqYC1XXoWe9Bju5+213R98cNGttag9q9yAOTzdbsqvIa7aNm5WffBZFpWYr2aWrklWAw==
 
-object-keys@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"
-  integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==
-
 ohash@^2.0.11:
   version "2.0.11"
   resolved "https://registry.yarnpkg.com/ohash/-/ohash-2.0.11.tgz#60b11e8cff62ca9dee88d13747a5baa145f5900b"
@@ -5691,14 +5759,6 @@ onetime@^5.1.0, onetime@^5.1.2:
   dependencies:
     mimic-fn "^2.1.0"
 
-open@^7.4.2:
-  version "7.4.2"
-  resolved "https://registry.yarnpkg.com/open/-/open-7.4.2.tgz#b8147e26dcf3e426316c730089fd71edd29c2321"
-  integrity sha512-MVHddDVweXZF3awtlAS+6pgKLlm/JgxZ90+/NBurBoQctVOOB/zDdVjcyPzQ+0laDGbsWgrRkflI65sQeOgT9Q==
-  dependencies:
-    is-docker "^2.0.0"
-    is-wsl "^2.1.1"
-
 optionator@^0.8.3:
   version "0.8.3"
   resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz#84fa1d036fe9d3c7e21d99884b601167ec8fb495"
@@ -5841,26 +5901,6 @@ parse5@6.0.1:
   resolved "https://registry.yarnpkg.com/parse5/-/parse5-6.0.1.tgz#e1a1c085c569b3dc08321184f19a39cc27f7c30b"
   integrity sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==
 
-patch-package@^8.0.1:
-  version "8.0.1"
-  resolved "https://registry.yarnpkg.com/patch-package/-/patch-package-8.0.1.tgz#79d02f953f711e06d1f8949c8a13e5d3d7ba1a60"
-  integrity sha512-VsKRIA8f5uqHQ7NGhwIna6Bx6D9s/1iXlA1hthBVBEbkq+t4kXD0HHt+rJhf/Z+Ci0F/HCB2hvn0qLdLG+Qxlw==
-  dependencies:
-    "@yarnpkg/lockfile" "^1.1.0"
-    chalk "^4.1.2"
-    ci-info "^3.7.0"
-    cross-spawn "^7.0.3"
-    find-yarn-workspace-root "^2.0.0"
-    fs-extra "^10.0.0"
-    json-stable-stringify "^1.0.2"
-    klaw-sync "^6.0.0"
-    minimist "^1.2.6"
-    open "^7.4.2"
-    semver "^7.5.3"
-    slash "^2.0.0"
-    tmp "^0.2.4"
-    yaml "^2.2.2"
-
 path-browserify@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/path-browserify/-/path-browserify-1.0.1.tgz#d98454a9c3753d5790860f16f68867b9e46be1fd"
@@ -5909,11 +5949,6 @@ path-type@^4.0.0:
   resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b"
   integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==
 
-pathe@^1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/pathe/-/pathe-1.1.2.tgz#6c4cb47a945692e48a1ddd6e4094d170516437ec"
-  integrity sha512-whLdWMYL2TwI08hn8/ZqAbrVemu0LNaNNJZX73O6qaIdCTfXutsLhMkjdENX0qhsQ9uIimo4/aQOmXkoon2nDQ==
-
 pathe@^2.0.1, pathe@^2.0.2, pathe@^2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/pathe/-/pathe-2.0.3.tgz#3ecbec55421685b70a9da872b2cff3e1cbed1716"
@@ -5949,6 +5984,11 @@ picomatch@^4.0.3:
   resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-4.0.3.tgz#796c76136d1eead715db1e7bad785dedd695a042"
   integrity sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==
 
+picomatch@^4.0.4:
+  version "4.0.4"
+  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-4.0.4.tgz#fd6f5e00a143086e074dffe4c924b8fb293b0589"
+  integrity sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==
+
 pify@^2.0.0, pify@^2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
@@ -6159,7 +6199,7 @@ postcss@^7, postcss@^7.0.18, postcss@^7.0.32:
     picocolors "^0.2.1"
     source-map "^0.6.1"
 
-postcss@^8.3.5, postcss@^8.4.13, postcss@^8.4.43, postcss@^8.4.47, postcss@^8.4.6, postcss@^8.5.3:
+postcss@^8.3.5, postcss@^8.4.13, postcss@^8.4.47, postcss@^8.4.6, postcss@^8.5.3:
   version "8.5.6"
   resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.5.6.tgz#2825006615a619b4f62a9e7426cc120b349a8f3c"
   integrity sha512-3Ybi1tAuwAP9s0r1UQ2J4n5Y0G05bJkpUIO0/bI9MhwmD70S5aTWbXGBwxHrelT+XM1k6dM0pk+SwNkpTRN7Pg==
@@ -6168,6 +6208,15 @@ postcss@^8.3.5, postcss@^8.4.13, postcss@^8.4.43, postcss@^8.4.47, postcss@^8.4.
     picocolors "^1.1.1"
     source-map-js "^1.2.1"
 
+postcss@^8.5.8:
+  version "8.5.9"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.5.9.tgz#f6ee9e0b94f0f19c97d2f172bfbd7fc71fe1cca4"
+  integrity sha512-7a70Nsot+EMX9fFU3064K/kdHWZqGVY+BADLyXc8Dfv+mTLLVl6JzJpPaCZ2kQL9gIJvKXSLMHhqdRRjwQeFtw==
+  dependencies:
+    nanoid "^3.3.11"
+    picocolors "^1.1.1"
+    source-map-js "^1.2.1"
+
 prelude-ls@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
@@ -6265,7 +6314,7 @@ prosemirror-inputrules@^1.4.0:
     prosemirror-state "^1.0.0"
     prosemirror-transform "^1.0.0"
 
-prosemirror-keymap@^1.0.0, prosemirror-keymap@^1.2.2:
+prosemirror-keymap@^1.0.0, prosemirror-keymap@^1.2.2, prosemirror-keymap@^1.2.3:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/prosemirror-keymap/-/prosemirror-keymap-1.2.3.tgz#c0f6ab95f75c0b82c97e44eb6aaf29cbfc150472"
   integrity sha512-4HucRlpiLd1IPQQXNqeo81BGtkY8Ai5smHhKW9jjPKRc2wQIxksg7Hl1tTI2IfT2B/LgX6bfYvXxEpJl7aKYKw==
@@ -6292,13 +6341,20 @@ prosemirror-menu@^1.2.4:
     prosemirror-history "^1.0.0"
     prosemirror-state "^1.0.0"
 
-prosemirror-model@^1.0.0, prosemirror-model@^1.20.0, prosemirror-model@^1.21.0, prosemirror-model@^1.23.0, prosemirror-model@^1.25.0:
+prosemirror-model@^1.0.0, prosemirror-model@^1.20.0, prosemirror-model@^1.21.0, prosemirror-model@^1.25.0:
   version "1.25.1"
   resolved "https://registry.yarnpkg.com/prosemirror-model/-/prosemirror-model-1.25.1.tgz#aeae9f1ec79fcaa76f6fc619800d91fbcf726870"
   integrity sha512-AUvbm7qqmpZa5d9fPKMvH1Q5bqYQvAZWOGRvxsB6iFLyycvC9MwNemNVjHVrWgjaoxAfY8XVg7DbvQ/qxvI9Eg==
   dependencies:
     orderedmap "^2.0.0"
 
+prosemirror-model@^1.24.1, prosemirror-model@^1.25.4:
+  version "1.25.4"
+  resolved "https://registry.yarnpkg.com/prosemirror-model/-/prosemirror-model-1.25.4.tgz#8ebfbe29ecbee9e5e2e4048c4fe8e363fcd56e7c"
+  integrity sha512-PIM7E43PBxKce8OQeezAs9j4TP+5yDpZVbuurd1h5phUxEKIu+G2a+EUZzIC5nS1mJktDJWzbqS23n1tsAf5QA==
+  dependencies:
+    orderedmap "^2.0.0"
+
 prosemirror-schema-basic@^1.2.3:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/prosemirror-schema-basic/-/prosemirror-schema-basic-1.2.4.tgz#389ce1ec09b8a30ea9bbb92c58569cb690c2d695"
@@ -6306,7 +6362,7 @@ prosemirror-schema-basic@^1.2.3:
   dependencies:
     prosemirror-model "^1.25.0"
 
-prosemirror-schema-list@^1.4.1:
+prosemirror-schema-list@^1.5.0:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/prosemirror-schema-list/-/prosemirror-schema-list-1.5.1.tgz#5869c8f749e8745c394548bb11820b0feb1e32f5"
   integrity sha512-927lFx/uwyQaGwJxLWCZRkjXG0p48KpMj6ueoYiu4JX05GGuGcgzAy62dfiV8eFZftgyBUvLx76RsMe20fJl+Q==
@@ -6324,6 +6380,15 @@ prosemirror-state@^1.0.0, prosemirror-state@^1.2.2, prosemirror-state@^1.4.3:
     prosemirror-transform "^1.0.0"
     prosemirror-view "^1.27.0"
 
+prosemirror-state@^1.4.4:
+  version "1.4.4"
+  resolved "https://registry.yarnpkg.com/prosemirror-state/-/prosemirror-state-1.4.4.tgz#72b5e926f9e92dcee12b62a05fcc8a2de3bf5b39"
+  integrity sha512-6jiYHH2CIGbCfnxdHbXZ12gySFY/fz/ulZE333G6bPqIZ4F+TXo9ifiR86nAHpWnfoNjOb3o5ESi7J8Uz1jXHw==
+  dependencies:
+    prosemirror-model "^1.0.0"
+    prosemirror-transform "^1.0.0"
+    prosemirror-view "^1.27.0"
+
 prosemirror-tables@^1.6.4:
   version "1.7.1"
   resolved "https://registry.yarnpkg.com/prosemirror-tables/-/prosemirror-tables-1.7.1.tgz#df2507f285c6c7563097b4904cb7c4b9e0cd724b"
@@ -6335,6 +6400,17 @@ prosemirror-tables@^1.6.4:
     prosemirror-transform "^1.10.3"
     prosemirror-view "^1.39.1"
 
+prosemirror-tables@^1.8.1:
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/prosemirror-tables/-/prosemirror-tables-1.8.5.tgz#104427012e5a5da1d2a38c122efee8d66bdd5104"
+  integrity sha512-V/0cDCsHKHe/tfWkeCmthNUcEp1IVO3p6vwN8XtwE9PZQLAZJigbw3QoraAdfJPir4NKJtNvOB8oYGKRl+t0Dw==
+  dependencies:
+    prosemirror-keymap "^1.2.3"
+    prosemirror-model "^1.25.4"
+    prosemirror-state "^1.4.4"
+    prosemirror-transform "^1.10.5"
+    prosemirror-view "^1.41.4"
+
 prosemirror-trailing-node@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/prosemirror-trailing-node/-/prosemirror-trailing-node-3.0.0.tgz#5bc223d4fc1e8d9145e4079ec77a932b54e19e04"
@@ -6350,7 +6426,14 @@ prosemirror-transform@^1.0.0, prosemirror-transform@^1.1.0, prosemirror-transfor
   dependencies:
     prosemirror-model "^1.21.0"
 
-prosemirror-view@^1.0.0, prosemirror-view@^1.1.0, prosemirror-view@^1.27.0, prosemirror-view@^1.31.0, prosemirror-view@^1.37.0, prosemirror-view@^1.39.1:
+prosemirror-transform@^1.10.5:
+  version "1.12.0"
+  resolved "https://registry.yarnpkg.com/prosemirror-transform/-/prosemirror-transform-1.12.0.tgz#0239288d0e98d91e6af3dd269a8968466be406d7"
+  integrity sha512-GxboyN4AMIsoHNtz5uf2r2Ru551i5hWeCMD6E2Ib4Eogqoub0NflniaBPVQ4MrGE5yZ8JV9tUHg9qcZTTrcN4w==
+  dependencies:
+    prosemirror-model "^1.21.0"
+
+prosemirror-view@^1.0.0, prosemirror-view@^1.1.0, prosemirror-view@^1.27.0, prosemirror-view@^1.31.0, prosemirror-view@^1.39.1:
   version "1.39.3"
   resolved "https://registry.yarnpkg.com/prosemirror-view/-/prosemirror-view-1.39.3.tgz#54fa4b8ab4fd75ad0075dc6dc0be1745429d5a5c"
   integrity sha512-bY/7kg0LzRE7ytR0zRdSMWX3sknEjw68l836ffLPMh0OG3OYnNuBDUSF3v0vjvnzgYjgY9ZH/RypbARURlcMFA==
@@ -6359,6 +6442,15 @@ prosemirror-view@^1.0.0, prosemirror-view@^1.1.0, prosemirror-view@^1.27.0, pros
     prosemirror-state "^1.0.0"
     prosemirror-transform "^1.1.0"
 
+prosemirror-view@^1.38.1, prosemirror-view@^1.41.4:
+  version "1.41.8"
+  resolved "https://registry.yarnpkg.com/prosemirror-view/-/prosemirror-view-1.41.8.tgz#bfb48d9dc328f1aa2a0eea1600b0828818be03f1"
+  integrity sha512-TnKDdohEatgyZNGCDWIdccOHXhYloJwbwU+phw/a23KBvJIR9lWQWW7WHHK3vBdOLDNuF7TaX98GObUZOWkOnA==
+  dependencies:
+    prosemirror-model "^1.20.0"
+    prosemirror-state "^1.0.0"
+    prosemirror-transform "^1.1.0"
+
 proto-list@~1.2.1:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/proto-list/-/proto-list-1.2.4.tgz#212d5bfe1318306a420f6402b8e26ff39647a849"
@@ -6664,6 +6756,30 @@ rimraf@^3.0.0, rimraf@^3.0.2:
   dependencies:
     glob "^7.1.3"
 
+rolldown@1.0.0-rc.10:
+  version "1.0.0-rc.10"
+  resolved "https://registry.yarnpkg.com/rolldown/-/rolldown-1.0.0-rc.10.tgz#41c55e52d833c52c90131973047250548e35f2bf"
+  integrity sha512-q7j6vvarRFmKpgJUT8HCAUljkgzEp4LAhPlJUvQhA5LA1SUL36s5QCysMutErzL3EbNOZOkoziSx9iZC4FddKA==
+  dependencies:
+    "@oxc-project/types" "=0.120.0"
+    "@rolldown/pluginutils" "1.0.0-rc.10"
+  optionalDependencies:
+    "@rolldown/binding-android-arm64" "1.0.0-rc.10"
+    "@rolldown/binding-darwin-arm64" "1.0.0-rc.10"
+    "@rolldown/binding-darwin-x64" "1.0.0-rc.10"
+    "@rolldown/binding-freebsd-x64" "1.0.0-rc.10"
+    "@rolldown/binding-linux-arm-gnueabihf" "1.0.0-rc.10"
+    "@rolldown/binding-linux-arm64-gnu" "1.0.0-rc.10"
+    "@rolldown/binding-linux-arm64-musl" "1.0.0-rc.10"
+    "@rolldown/binding-linux-ppc64-gnu" "1.0.0-rc.10"
+    "@rolldown/binding-linux-s390x-gnu" "1.0.0-rc.10"
+    "@rolldown/binding-linux-x64-gnu" "1.0.0-rc.10"
+    "@rolldown/binding-linux-x64-musl" "1.0.0-rc.10"
+    "@rolldown/binding-openharmony-arm64" "1.0.0-rc.10"
+    "@rolldown/binding-wasm32-wasi" "1.0.0-rc.10"
+    "@rolldown/binding-win32-arm64-msvc" "1.0.0-rc.10"
+    "@rolldown/binding-win32-x64-msvc" "1.0.0-rc.10"
+
 "rollup@>=2.59.0 <2.78.0":
   version "2.77.3"
   resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.77.3.tgz#8f00418d3a2740036e15deb653bed1a90ee0cc12"
@@ -6671,37 +6787,6 @@ rimraf@^3.0.0, rimraf@^3.0.2:
   optionalDependencies:
     fsevents "~2.3.2"
 
-rollup@^4.20.0:
-  version "4.52.0"
-  resolved "https://registry.yarnpkg.com/rollup/-/rollup-4.52.0.tgz#5a906bf98f7c7a2c08d2b18fbfa52955552423d7"
-  integrity sha512-+IuescNkTJQgX7AkIDtITipZdIGcWF0pnVvZTWStiazUmcGA2ag8dfg0urest2XlXUi9kuhfQ+qmdc5Stc3z7g==
-  dependencies:
-    "@types/estree" "1.0.8"
-  optionalDependencies:
-    "@rollup/rollup-android-arm-eabi" "4.52.0"
-    "@rollup/rollup-android-arm64" "4.52.0"
-    "@rollup/rollup-darwin-arm64" "4.52.0"
-    "@rollup/rollup-darwin-x64" "4.52.0"
-    "@rollup/rollup-freebsd-arm64" "4.52.0"
-    "@rollup/rollup-freebsd-x64" "4.52.0"
-    "@rollup/rollup-linux-arm-gnueabihf" "4.52.0"
-    "@rollup/rollup-linux-arm-musleabihf" "4.52.0"
-    "@rollup/rollup-linux-arm64-gnu" "4.52.0"
-    "@rollup/rollup-linux-arm64-musl" "4.52.0"
-    "@rollup/rollup-linux-loong64-gnu" "4.52.0"
-    "@rollup/rollup-linux-ppc64-gnu" "4.52.0"
-    "@rollup/rollup-linux-riscv64-gnu" "4.52.0"
-    "@rollup/rollup-linux-riscv64-musl" "4.52.0"
-    "@rollup/rollup-linux-s390x-gnu" "4.52.0"
-    "@rollup/rollup-linux-x64-gnu" "4.52.0"
-    "@rollup/rollup-linux-x64-musl" "4.52.0"
-    "@rollup/rollup-openharmony-arm64" "4.52.0"
-    "@rollup/rollup-win32-arm64-msvc" "4.52.0"
-    "@rollup/rollup-win32-ia32-msvc" "4.52.0"
-    "@rollup/rollup-win32-x64-gnu" "4.52.0"
-    "@rollup/rollup-win32-x64-msvc" "4.52.0"
-    fsevents "~2.3.2"
-
 rope-sequence@^1.3.0:
   version "1.3.4"
   resolved "https://registry.yarnpkg.com/rope-sequence/-/rope-sequence-1.3.4.tgz#df85711aaecd32f1e756f76e43a415171235d425"
@@ -6785,18 +6870,6 @@ set-cookie-parser@^2.4.6:
   resolved "https://registry.yarnpkg.com/set-cookie-parser/-/set-cookie-parser-2.7.1.tgz#3016f150072202dfbe90fadee053573cc89d2943"
   integrity sha512-IOc8uWeOZgnb3ptbCURJWNjWUPcO3ZnTTdzsurqERrP6nPyv+paC55vJM0LpOlT2ne+Ix+9+CRG1MNLlyZ4GjQ==
 
-set-function-length@^1.2.2:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/set-function-length/-/set-function-length-1.2.2.tgz#aac72314198eaed975cf77b2c3b6b880695e5449"
-  integrity sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==
-  dependencies:
-    define-data-property "^1.1.4"
-    es-errors "^1.3.0"
-    function-bind "^1.1.2"
-    get-intrinsic "^1.2.4"
-    gopd "^1.0.1"
-    has-property-descriptors "^1.0.2"
-
 shebang-command@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea"
@@ -6838,11 +6911,6 @@ simple-swizzle@^0.2.2:
   dependencies:
     is-arrayish "^0.3.1"
 
-slash@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/slash/-/slash-2.0.0.tgz#de552851a1759df3a8f206535442f5ec4ddeab44"
-  integrity sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==
-
 slash@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634"
@@ -6862,6 +6930,11 @@ slice-ansi@^2.1.0:
     astral-regex "^1.0.0"
     is-fullwidth-code-point "^2.0.0"
 
+slugify@^1.6.6:
+  version "1.6.9"
+  resolved "https://registry.yarnpkg.com/slugify/-/slugify-1.6.9.tgz#610957dea21e56b65e3a153215ef7b265715c8e8"
+  integrity sha512-vZ7rfeehZui7wQs438JXBckYLkIIdfHOXsaVEUMyS5fHo1483l1bMdo0EDSWYclY0yZKFOipDy4KHuKs6ssvdg==
+
 socket.io-client@^4.5.1:
   version "4.8.1"
   resolved "https://registry.yarnpkg.com/socket.io-client/-/socket.io-client-4.8.1.tgz#1941eca135a5490b94281d0323fe2a35f6f291cb"
@@ -7199,6 +7272,14 @@ tinyglobby@^0.2.12:
     fdir "^6.4.4"
     picomatch "^4.0.2"
 
+tinyglobby@^0.2.15:
+  version "0.2.16"
+  resolved "https://registry.yarnpkg.com/tinyglobby/-/tinyglobby-0.2.16.tgz#1c3b7eb953fce42b226bc5a1ee06428281aff3d6"
+  integrity sha512-pn99VhoACYR8nFHhxqix+uvsbXineAasWm5ojXoN8xEwK5Kd3/TrhNn1wByuD52UxWRLy8pu+kRMniEi6Eq9Zg==
+  dependencies:
+    fdir "^6.5.0"
+    picomatch "^4.0.4"
+
 tinypool@^0.1.2:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/tinypool/-/tinypool-0.1.3.tgz#b5570b364a1775fd403de5e7660b325308fee26b"
@@ -7228,11 +7309,6 @@ tmp@^0.2.1:
   resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.2.3.tgz#eb783cc22bc1e8bebd0671476d46ea4eb32a79ae"
   integrity sha512-nZD7m9iCPC5g0pYmcaxogYKggSfLsdxl8of3Q/oIbqCqLLIO9IAF0GWjX1z9NZRHPiXv8Wex4yDCaZsgEw0Y8w==
 
-tmp@^0.2.4:
-  version "0.2.5"
-  resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.2.5.tgz#b06bcd23f0f3c8357b426891726d16015abfd8f8"
-  integrity sha512-voyz6MApa1rQGUxT3E+BK7/ROe8itEx7vD8/HEvt4xwXucvQ5G5oeEiHkmHZJuBO21RpOf+YYm9MOivj709jow==
-
 to-regex-range@^5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4"
@@ -7277,7 +7353,7 @@ tslib@^1.9.0:
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
   integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==
 
-tslib@^2.0.0, tslib@^2.1.0, tslib@^2.6.2, tslib@^2.8.0:
+tslib@^2.0.0, tslib@^2.1.0, tslib@^2.4.0, tslib@^2.6.2, tslib@^2.8.0:
   version "2.8.1"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.8.1.tgz#612efe4ed235d567e8aba5f2a5fab70280ade83f"
   integrity sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==
@@ -7547,14 +7623,16 @@ vite-plugin-rewrite-all@^1.0.1:
   dependencies:
     connect-history-api-fallback "^1.6.0"
 
-vite@5.4.20:
-  version "5.4.20"
-  resolved "https://registry.yarnpkg.com/vite/-/vite-5.4.20.tgz#3267a5e03f21212f44edfd72758138e8fcecd76a"
-  integrity sha512-j3lYzGC3P+B5Yfy/pfKNgVEg4+UtcIJcVRt2cDjIOmhLourAqPqf8P7acgxeiSgUB7E3p2P8/3gNIgDLpwzs4g==
+vite@8.0.1:
+  version "8.0.1"
+  resolved "https://registry.yarnpkg.com/vite/-/vite-8.0.1.tgz#015cef9a747c07c0cf9cf553f37571885504e9d3"
+  integrity sha512-wt+Z2qIhfFt85uiyRt5LPU4oVEJBXj8hZNWKeqFG4gRG/0RaRGJ7njQCwzFVjO+v4+Ipmf5CY7VdmZRAYYBPHw==
   dependencies:
-    esbuild "^0.21.3"
-    postcss "^8.4.43"
-    rollup "^4.20.0"
+    lightningcss "^1.32.0"
+    picomatch "^4.0.3"
+    postcss "^8.5.8"
+    rolldown "1.0.0-rc.10"
+    tinyglobby "^0.2.15"
   optionalDependencies:
     fsevents "~2.3.3"
 
@@ -7910,11 +7988,6 @@ yaml@^1.10.0, yaml@^1.10.2:
   resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b"
   integrity sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==
 
-yaml@^2.2.2:
-  version "2.8.2"
-  resolved "https://registry.yarnpkg.com/yaml/-/yaml-2.8.2.tgz#5694f25eca0ce9c3e7a9d9e00ce0ddabbd9e35c5"
-  integrity sha512-mplynKqc1C2hTVYxd0PU2xQAc22TI1vShAYGksCCfxbn/dFwnHTNi1bvYsBTkhdUNtGIf5xNOg938rrSSYvS9A==
-
 yaml@^2.3.4:
   version "2.8.0"
   resolved "https://registry.yarnpkg.com/yaml/-/yaml-2.8.0.tgz#15f8c9866211bdc2d3781a0890e44d4fa1a5fff6"
diff --git a/mypy.ini b/mypy.ini
index a3c370930ef..cf9de4c743f 100644
--- a/mypy.ini
+++ b/mypy.ini
@@ -5,6 +5,8 @@ exclude = libs/|tests/
 warn_no_return = false
 disable_error_code = annotation-unchecked
 python_version=3.10
+[mypy-packaging.*]
+ignore_missing_imports = true
 [mypy-frappe.*]
 ignore_missing_imports = true
 [mypy-pypika.*]
@@ -39,5 +41,11 @@ ignore_missing_imports = true
 ignore_missing_imports = true
 [mypy-cssutils.*]
 ignore_missing_imports = true
+[mypy-sqlparse.*]
+ignore_missing_imports = true
+[mypy-elasticsearch_dsl.*]
+ignore_missing_imports = true
+[mypy-PIL.*]
+ignore_missing_imports = true
 [mypy-playwright.*]
-ignore_missing_imports = true
\ No newline at end of file
+ignore_missing_imports = true
diff --git a/press/agent.py b/press/agent.py
index d3ccce996aa..a0b05ea2d49 100644
--- a/press/agent.py
+++ b/press/agent.py
@@ -1440,6 +1440,16 @@ def fetch_database_processes(self, site):
 			},
 		)
 
+	def fetch_database_locks(self, site):
+		database_server: DatabaseServer = frappe.get_doc("Database Server", self.server)
+		return self.post(
+			"database/locks",
+			data={
+				"private_ip": database_server.private_ip,
+				"mariadb_root_password": get_mariadb_root_password(site),
+			},
+		)
+
 	def kill_database_process(self, site, id):
 		return self.post(
 			f"benches/{site.bench}/sites/{site.name}/database/kill-process/{id}",
diff --git a/press/api/analytics.py b/press/api/analytics.py
index b856442497a..6703cde644f 100644
--- a/press/api/analytics.py
+++ b/press/api/analytics.py
@@ -7,7 +7,7 @@
 from contextlib import suppress
 from datetime import datetime, timedelta
 from enum import Enum
-from typing import TYPE_CHECKING, ClassVar, Final, TypedDict
+from typing import TYPE_CHECKING, Any, ClassVar, Final, TypedDict, cast
 
 import frappe
 import frappe.utils
@@ -44,13 +44,14 @@
 	from elasticsearch_dsl.response.aggs import FieldBucket, FieldBucketData
 
 	from press.press.doctype.press_settings.press_settings import PressSettings
+	from press.press.doctype.site.site import Site
 
 	class Dataset(TypedDict):
 		"""Single element of list of Datasets returned for stacked histogram chart"""
 
 		path: str
-		values: list[float | int]  # List of values for each timestamp [43.0, 0, 0...]
-		stack: Final[str]
+		values: list[float | int | None]  # List of values for each timestamp [43.0, 0, 0...]
+		stack: str
 
 	class HistBucket(FieldBucket):
 		key_as_string: str
@@ -71,6 +72,37 @@ class MetricType(TypedDict):
 		value: float
 
 
+class PrometheusMetric(TypedDict):
+	name: str
+
+
+class PrometheusResult(TypedDict):
+	metric: PrometheusMetric
+	values: list[tuple[float, str]]
+
+
+class PrometheusData(TypedDict):
+	result: list[PrometheusResult]
+
+
+class PrometheusResponse(TypedDict):
+	data: PrometheusData
+
+
+class UsagePoint(TypedDict):
+	date: datetime
+	count: float
+	duration: float
+	max: float
+
+
+class RequestLogData(TypedDict, total=False):
+	timestamp: str | datetime | None
+	request: dict[str, Any]
+	state: str
+	query: str
+
+
 class ResourceType(Enum):
 	SITE = "site"
 	SERVER = "server"
@@ -137,6 +169,12 @@ def auto_timespan_timegrain(start: datetime, end: datetime, target_points: int =
 	return (total_seconds, interval)
 
 
+def parse_iso_datetime(value: str | datetime) -> datetime:
+	if isinstance(value, datetime):
+		return value
+	return datetime.fromisoformat(value.replace("Z", "+00:00"))
+
+
 class StackedGroupByChart:
 	search: Search
 	to_s_divisor: float = 1e6
@@ -277,7 +315,7 @@ def get_histogram_chart(
 		path_bucket: PathBucket,
 		labels: list[datetime],
 	):
-		path_data = {
+		path_data: Dataset = {
 			"path": path_bucket.key,
 			"values": [None] * len(labels),
 			"stack": "path",
@@ -509,11 +547,13 @@ def run(self):
 		return res
 
 
-def _query_prometheus(query: dict[str, str]) -> dict[str, float | str]:
+def _query_prometheus(
+	query: dict[str, str | float],
+) -> PrometheusResponse:
 	monitor_server = frappe.db.get_single_value("Press Settings", "monitor_server")
 	url = f"https://{monitor_server}/prometheus/api/v1/query_range"
 	password = get_decrypted_password("Monitor Server", monitor_server, "grafana_password")
-	return requests.get(url, params=query, auth=("frappe", password)).json()
+	return cast("PrometheusResponse", requests.get(url, params=query, auth=("frappe", password)).json())
 
 
 def _parse_datetime_in_metrics(timestamp: float, timezone: str) -> str:
@@ -526,7 +566,7 @@ def _get_cadvisor_data(promql_query: str, timezone: str, timespan: int, timegrai
 	datasets = []
 	labels = []
 
-	query = {
+	query: dict[str, str | float] = {
 		"query": promql_query,
 		"start": start.timestamp(),
 		"end": end.timestamp(),
@@ -546,7 +586,7 @@ def _get_cadvisor_data(promql_query: str, timezone: str, timespan: int, timegrai
 			}
 		)
 
-	for metric in res["values"]:
+	for metric in result[0]["values"]:
 		labels.append(_parse_datetime_in_metrics(metric[0], timezone))
 
 	return datasets, labels
@@ -667,13 +707,13 @@ def get_cpu_usage(name: str, timezone: str, duration: str = "24h"):
 @frappe.whitelist()
 @protected("Site")
 @redis_cache(ttl=15 * 60)
-def get(name, timezone, start, end):
-	start = datetime.fromisoformat(start.replace("Z", "+00:00"))
-	end = datetime.fromisoformat(end.replace("Z", "+00:00"))
-	_, timegrain = auto_timespan_timegrain(start, end)
+def get(name: str, timezone: str, start: str, end: str):
+	start_dt = parse_iso_datetime(start)
+	end_dt = parse_iso_datetime(end)
+	_, timegrain = auto_timespan_timegrain(start_dt, end_dt)
 
-	request_data = get_usage(name, "request", timezone, start, end, timegrain)
-	uptime_data = get_uptime(name, timezone, start, end, timegrain)
+	request_data = get_usage(name, "request", timezone, start_dt, end_dt, timegrain)
+	uptime_data = get_uptime(name, timezone, start_dt, end_dt, timegrain)
 
 	plan = frappe.get_cached_doc("Site", name).plan
 	plan_limit = get_plan_config(plan).get("rate_limit", {}).get("limit") if plan else 0
@@ -684,11 +724,20 @@ def get(name, timezone, start, end):
 		"request_cpu_time": [{"value": r.duration, "date": r.date} for r in request_data],
 		"uptime": uptime_data,
 		"plan_limit": plan_limit,
+		"timegrain": timegrain,
 	}
 
 
 def add_commonly_slow_path_to_reports(
-	reports: dict, path: str, name: str, timezone, start, end, timespan, timegrain, max_no_of_paths
+	reports: dict[str, Any],
+	path: str,
+	name: str,
+	timezone: str,
+	start: datetime,
+	end: datetime,
+	timespan: int,
+	timegrain: int,
+	max_no_of_paths: int,
 ):
 	for slow_path in COMMONLY_SLOW_PATHS + COMMONLY_SLOW_JOBS:
 		if slow_path["path"] == path:
@@ -706,10 +755,17 @@ def add_commonly_slow_path_to_reports(
 
 
 def get_additional_duration_reports(
-	request_duration_by_path, name: str, timezone, start, end, timespan, timegrain, max_no_of_paths
+	request_duration_by_path: dict[str, Any],
+	name: str,
+	timezone: str,
+	start: datetime,
+	end: datetime,
+	timespan: int,
+	timegrain: int,
+	max_no_of_paths: int,
 ):
 	"""Get additional reports for the request duration by path"""
-	reports = {}
+	reports: dict[str, Any] = {}
 	for path_data in request_duration_by_path["datasets"][:4]:  # top 4 paths
 		add_commonly_slow_path_to_reports(
 			reports,
@@ -727,20 +783,21 @@ def get_additional_duration_reports(
 
 
 @frappe.whitelist()
-@protected("Site")
-def get_advanced_analytics(name, timezone, start, end, max_no_of_paths=MAX_NO_OF_PATHS):
+def get_advanced_analytics(
+	name: str, timezone: str, start: str, end: str, max_no_of_paths: int = MAX_NO_OF_PATHS
+):
 	start = datetime.fromisoformat(start.replace("Z", "+00:00"))
 	end = datetime.fromisoformat(end.replace("Z", "+00:00"))
 	timespan, timegrain = auto_timespan_timegrain(start, end)
 
-	job_data = get_usage(name, "job", timezone, start, end, timegrain)
+	job_data = get_usage(name, "job", timezone, start_dt, end_dt, timegrain)
 
 	request_duration_by_path = get_request_by_(
 		name,
 		"duration",
 		timezone,
-		start,
-		end,
+		start_dt,
+		end_dt,
 		timespan,
 		timegrain,
 		ResourceType.SITE,
@@ -751,8 +808,8 @@ def get_advanced_analytics(name, timezone, start, end, max_no_of_paths=MAX_NO_OF
 		name,
 		"duration",
 		timezone,
-		start,
-		end,
+		start_dt,
+		end_dt,
 		timespan,
 		timegrain,
 		ResourceType.SITE,
@@ -765,8 +822,8 @@ def get_advanced_analytics(name, timezone, start, end, max_no_of_paths=MAX_NO_OF
 				name,
 				"count",
 				timezone,
-				start,
-				end,
+				start_dt,
+				end_dt,
 				timespan,
 				timegrain,
 				ResourceType.SITE,
@@ -777,22 +834,22 @@ def get_advanced_analytics(name, timezone, start, end, max_no_of_paths=MAX_NO_OF
 				name,
 				"average_duration",
 				timezone,
-				start,
-				end,
+				start_dt,
+				end_dt,
 				timespan,
 				timegrain,
 				ResourceType.SITE,
 				max_no_of_paths,
 			),
 			"request_count_by_ip": get_nginx_request_by_(
-				name, "count", timezone, start, end, timespan, timegrain, max_no_of_paths
+				name, "count", timezone, start_dt, end_dt, timespan, timegrain, max_no_of_paths
 			),
 			"background_job_count_by_method": get_background_job_by_(
 				name,
 				"count",
 				timezone,
-				start,
-				end,
+				start_dt,
+				end_dt,
 				timespan,
 				timegrain,
 				ResourceType.SITE,
@@ -803,8 +860,8 @@ def get_advanced_analytics(name, timezone, start, end, max_no_of_paths=MAX_NO_OF
 				name,
 				"average_duration",
 				timezone,
-				start,
-				end,
+				start_dt,
+				end_dt,
 				timespan,
 				timegrain,
 				ResourceType.SITE,
@@ -817,8 +874,8 @@ def get_advanced_analytics(name, timezone, start, end, max_no_of_paths=MAX_NO_OF
 			request_duration_by_path,
 			name,
 			timezone,
-			start,
-			end,
+			start_dt,
+			end_dt,
 			timespan,
 			timegrain,
 			max_no_of_paths,
@@ -827,8 +884,8 @@ def get_advanced_analytics(name, timezone, start, end, max_no_of_paths=MAX_NO_OF
 			background_job_duration_by_method,
 			name,
 			timezone,
-			start,
-			end,
+			start_dt,
+			end_dt,
 			timespan,
 			timegrain,
 			max_no_of_paths,
@@ -839,7 +896,7 @@ def get_advanced_analytics(name, timezone, start, end, max_no_of_paths=MAX_NO_OF
 @frappe.whitelist()
 @protected("Site")
 @redis_cache(ttl=15 * 60)
-def daily_usage(name, timezone):
+def daily_usage(name: str, timezone: str):
 	timespan = 7 * 24 * 60 * 60
 	timegrain = 24 * 60 * 60
 
@@ -863,7 +920,7 @@ def daily_usage(name, timezone):
 	}
 
 
-def rounded_time(dt: datetime | None = None, round_to=60):
+def rounded_time(dt: datetime | None = None, round_to: int = 60):
 	"""Round a datetime object to any time lapse in seconds
 	dt : datetime.datetime object, default now.
 	round_to : Closest number of seconds to round to, default 1 minute.
@@ -888,7 +945,7 @@ def get_rounded_boundaries(timespan: int, timegrain: int, timezone: str = "UTC")
 
 
 @redis_cache(ttl=15 * 60)
-def get_rounded_boundary(dt: datetime, timegrain=60):
+def get_rounded_boundary(dt: datetime, timegrain: int = 60):
 	"""
 	Floor a datetime to the previous interval boundary.
 
@@ -908,7 +965,7 @@ def get_rounded_boundary(dt: datetime, timegrain=60):
 	return datetime.fromtimestamp(floored_ts, tz=dt.tzinfo)
 
 
-def get_uptime(site, timezone, start: datetime, end: datetime, timegrain):
+def get_uptime(site: str, timezone: str, start: datetime, end: datetime, timegrain: int):
 	monitor_server = frappe.db.get_single_value("Press Settings", "monitor_server")
 	if not monitor_server:
 		return []
@@ -926,9 +983,9 @@ def get_uptime(site, timezone, start: datetime, end: datetime, timegrain):
 			hour=0, minute=0, second=0, microsecond=0
 		) + timedelta(days=1)
 
-	query = {
+	query: dict[str, str | float] = {
 		"query": (
-			f'sum(sum_over_time(probe_success{{job="site", instance="{site}"}}[{timegrain}s])) by (instance) / sum(count_over_time(probe_success{{job="site", instance="{site}"}}[{timegrain}s])) by (instance)'
+			f'avg_over_time(probe_success{{job="site", instance="{site}"}}[{timegrain}s]) or on() vector(0)'
 		),
 		"start": start.timestamp(),
 		"end": end.timestamp(),
@@ -940,7 +997,9 @@ def get_uptime(site, timezone, start: datetime, end: datetime, timegrain):
 	buckets = []
 	if not response["data"]["result"]:
 		return []
-	for timestamp, value in response["data"]["result"][0]["values"]:
+	for timestamp, value in sorted(
+		{ts: val for r in response["data"]["result"] for ts, val in r["values"]}.items()
+	):
 		buckets.append(
 			frappe._dict(
 				{
@@ -954,7 +1013,7 @@ def get_uptime(site, timezone, start: datetime, end: datetime, timegrain):
 
 def normalize_datasets(datasets: list[Dataset]) -> list[Dataset]:
 	"""Merge similar queries and sum their durations/counts"""
-	n_datasets = {}
+	n_datasets: dict[str, Dataset] = {}
 	for data_dict in datasets:
 		n_query = normalize_query(data_dict["path"])
 		if n_datasets.get(n_query):
@@ -970,15 +1029,15 @@ def normalize_datasets(datasets: list[Dataset]) -> list[Dataset]:
 
 @redis_cache(ttl=15 * 60)
 def get_request_by_(
-	name,
+	name: str,
 	agg_type: AggType,
 	timezone: str,
 	start: datetime,
 	end: datetime,
 	timespan: int,
 	timegrain: int,
-	resource_type=ResourceType.SITE,
-	max_no_of_paths=MAX_NO_OF_PATHS,
+	resource_type: ResourceType = ResourceType.SITE,
+	max_no_of_paths: int = MAX_NO_OF_PATHS,
 ):
 	"""
 	:param name: site/server name depending on resource_type
@@ -995,7 +1054,7 @@ def get_request_by_(
 
 @redis_cache(ttl=15 * 60)
 def get_nginx_request_by_(
-	name,
+	name: str,
 	agg_type: AggType,
 	timezone: str,
 	start: datetime,
@@ -1019,15 +1078,15 @@ def get_nginx_request_by_(
 
 @redis_cache(ttl=15 * 60)
 def get_background_job_by_(
-	site,
-	agg_type,
-	timezone,
-	start,
-	end,
-	timespan,
-	timegrain,
-	resource_type=ResourceType.SITE,
-	max_no_of_paths=MAX_NO_OF_PATHS,
+	site: str,
+	agg_type: AggType,
+	timezone: str,
+	start: datetime,
+	end: datetime,
+	timespan: int,
+	timegrain: int,
+	resource_type: ResourceType = ResourceType.SITE,
+	max_no_of_paths: int = MAX_NO_OF_PATHS,
 ):
 	return BackgroundJobGroupByChart(
 		site, agg_type, timezone, start, end, timespan, timegrain, resource_type, max_no_of_paths
@@ -1045,16 +1104,16 @@ def get_slow_logs_by_query(
 	normalize: bool = False,
 	max_no_of_paths: int = MAX_QUERIES,
 ):
-	start = datetime.fromisoformat(start.replace("Z", "+00:00"))
-	end = datetime.fromisoformat(end.replace("Z", "+00:00"))
-	timespan, timegrain = auto_timespan_timegrain(start, end)
+	start_dt = parse_iso_datetime(start)
+	end_dt = parse_iso_datetime(end)
+	timespan, timegrain = auto_timespan_timegrain(start_dt, end_dt)
 
 	return get_slow_logs(
 		name,
 		agg_type,
 		timezone,
-		start,
-		end,
+		start_dt,
+		end_dt,
 		timespan,
 		timegrain,
 		ResourceType.SITE,
@@ -1065,16 +1124,16 @@ def get_slow_logs_by_query(
 
 @redis_cache(ttl=15 * 60)
 def get_slow_logs(
-	name,
-	agg_type,
-	timezone,
-	start,
-	end,
-	timespan,
-	timegrain,
-	resource_type=ResourceType.SITE,
-	normalize=False,
-	max_no_of_paths=MAX_NO_OF_PATHS,
+	name: str,
+	agg_type: AggType,
+	timezone: str,
+	start: datetime,
+	end: datetime,
+	timespan: int,
+	timegrain: int,
+	resource_type: ResourceType = ResourceType.SITE,
+	normalize: bool = False,
+	max_no_of_paths: int = MAX_NO_OF_PATHS,
 ):
 	return SlowLogGroupByChart(
 		normalize,
@@ -1255,7 +1314,7 @@ def exclude_top_k_data(self, datasets: list[Dataset]):
 				self.search = self.search.exclude("match_phrase", json__site=path)
 
 
-def get_usage(site, type, timezone, start, end, timegrain):
+def get_usage(site: str, type: str, timezone: str, start: datetime, end: datetime, timegrain: int):
 	log_server = frappe.db.get_single_value("Press Settings", "log_server")
 	if not log_server:
 		return {"datasets": [], "labels": []}
@@ -1298,7 +1357,7 @@ def get_usage(site, type, timezone, start, end, timegrain):
 
 	response = requests.post(url, json=query, auth=("frappe", password)).json()
 
-	buckets = []
+	buckets: list[UsagePoint] = []
 
 	if not response.get("aggregations"):
 		return {"datasets": [], "labels": []}
@@ -1320,7 +1379,7 @@ def get_usage(site, type, timezone, start, end, timegrain):
 	return buckets
 
 
-def get_current_cpu_usage(site):
+def get_current_cpu_usage(site: str):
 	try:
 		log_server = frappe.db.get_single_value("Press Settings", "log_server")
 		if not log_server:
@@ -1351,8 +1410,8 @@ def get_current_cpu_usage(site):
 		return 0
 
 
-def get_current_cpu_usage_for_sites_on_server(server):
-	result = {}
+def get_current_cpu_usage_for_sites_on_server(server: str):
+	result: dict[str, float] = {}
 	with suppress(Exception):
 		log_server = frappe.db.get_single_value("Press Settings", "log_server")
 		if not log_server:
@@ -1423,8 +1482,8 @@ def get_current_cpu_usage_for_sites_on_server(server):
 @frappe.whitelist()
 @protected("Site")
 @site.feature("monitor_access")
-def request_logs(site, timezone, date, sort=None, start=0):
-	result = []
+def request_logs(site: str, timezone: str, date: str, sort: str | None = None, start: int = 0):
+	result: list[RequestLogData] = []
 	log_server = frappe.db.get_single_value("Press Settings", "log_server")
 	if not log_server:
 		frappe.log_error("Log server not configured")
@@ -1442,7 +1501,8 @@ def request_logs(site, timezone, date, sort=None, start=0):
 		"Time (Descending)": {"@timestamp": "desc"},
 		"CPU Time (Descending)": {"json.duration": "desc"},
 	}
-	sort_value = sort_options.get(sort, sort_options["CPU Time (Descending)"])
+	sort_key = sort if sort is not None else "CPU Time (Descending)"
+	sort_value = sort_options.get(sort_key, sort_options["CPU Time (Descending)"])
 
 	query = {
 		"query": {
@@ -1472,7 +1532,7 @@ def request_logs(site, timezone, date, sort=None, start=0):
 		return result
 
 	for hit in data_json.get("hits", {}).get("hits", []):
-		data = hit.get("_source", {}).get("json", {})
+		data = cast("RequestLogData", hit.get("_source", {}).get("json", {}))
 		if not data:
 			continue
 		try:
@@ -1491,7 +1551,9 @@ def request_logs(site, timezone, date, sort=None, start=0):
 @frappe.whitelist()
 @protected("Site")
 @site.feature("monitor_access")
-def binary_logs(site, start_time, end_time, pattern: str = ".*", max_lines: int = 4000):
+def binary_logs(
+	site: str, start_time: datetime, end_time: datetime, pattern: str = ".*", max_lines: int = 4000
+):
 	filters = frappe._dict(
 		site=site,
 		database=frappe.db.get_value("Site", site, "database_name"),
@@ -1507,10 +1569,10 @@ def binary_logs(site, start_time, end_time, pattern: str = ".*", max_lines: int
 @frappe.whitelist()
 @protected("Site")
 @site.feature("monitor_access")
-def mariadb_processlist(site):
-	site = frappe.get_doc("Site", site)
-	agent = Agent(site.server)
-	rows = agent.fetch_database_processes(site)
+def mariadb_processlist(site: str):
+	site_doc: Site = frappe.get_doc("Site", site)  # type: ignore
+	agent = Agent(site_doc.server)
+	rows = agent.fetch_database_processes(site_doc)
 	for row in rows:
 		row["state"] = row["state"].capitalize()
 		row["query"] = sqlparse.format((row["query"] or "").strip(), keyword_case="upper", reindent=True)
@@ -1521,13 +1583,13 @@ def mariadb_processlist(site):
 @protected("Site")
 @site.feature("monitor_access")
 def mariadb_slow_queries(
-	site,
-	start_datetime,
-	stop_datetime,
-	max_lines=1000,
-	search_pattern=".*",
-	normalize_queries=True,
-	analyze=False,
+	site: str,
+	start_datetime: str | datetime,
+	stop_datetime: str | datetime,
+	max_lines: int = 1000,
+	search_pattern: str = ".*",
+	normalize_queries: bool = True,
+	analyze: bool = False,
 ):
 	meta = frappe._dict(
 		{
@@ -1547,7 +1609,7 @@ def mariadb_slow_queries(
 @frappe.whitelist()
 @protected("Site")
 @site.feature("monitor_access")
-def deadlock_report(site, start_datetime, stop_datetime, max_log_size=500):
+def deadlock_report(site: str, start_datetime: datetime, stop_datetime: datetime, max_log_size: int = 500):
 	from press.press.report.mariadb_deadlock_browser.mariadb_deadlock_browser import (
 		execute,
 	)
@@ -1567,7 +1629,7 @@ def deadlock_report(site, start_datetime, stop_datetime, max_log_size=500):
 # MARKETPLACE - Plausible
 @frappe.whitelist(allow_guest=True)
 @protected("Marketplace App")
-def plausible_analytics(name):
+def plausible_analytics(name: str):
 	response = {}
 	settings = frappe.get_single("Press Settings")
 	api_endpoints = {
@@ -1619,7 +1681,7 @@ def get_doctype_name(table_name: str) -> str:
 
 @frappe.whitelist()
 @protected("Site")
-def mariadb_add_suggested_index(name, table, column):
+def mariadb_add_suggested_index(name: str, table: str, column: str):
 	record_exists = frappe.db.exists(
 		"Agent Job",
 		{
diff --git a/press/api/bench.py b/press/api/bench.py
index fac26a48b7e..1a972914f94 100644
--- a/press/api/bench.py
+++ b/press/api/bench.py
@@ -15,9 +15,11 @@
 from press.api.github import branches, get_access_token
 from press.api.site import protected
 from press.press.doctype.agent_job.agent_job import job_detail
+from press.press.doctype.app.app import get_app_from_policies
 from press.press.doctype.app_patch.app_patch import create_app_patch
 from press.press.doctype.bench_update.bench_update import get_bench_update
 from press.press.doctype.cluster.cluster import Cluster
+from press.press.doctype.deploy_candidate.deploy_candidate import RESTING_STATES, TRANSITORY_STATES
 from press.press.doctype.deploy_candidate_build.deploy_candidate_build import (
 	fail_and_redeploy as fail_and_redeploy_build,
 )
@@ -200,19 +202,9 @@ def exists(title):
 
 
 @frappe.whitelist()
-def get_default_apps():
-	press_settings = frappe.get_single("Press Settings")
-	default_apps = press_settings.get_default_apps()
-
-	versions, rows = get_app_versions_list()
-
-	version_based_default_apps = {v.version: [] for v in versions}
-
-	for app in default_apps:
-		for row in filter(lambda x: x.app == app, rows):
-			version_based_default_apps[row.version].append(row)
-
-	return version_based_default_apps
+def get_release_group_policy_for_bench(version: str):
+	"""Get the release group policy for a given version"""
+	return {"policies": get_app_from_policies(scope="Frappe Version", target=version, for_creation=True)}
 
 
 def get_app_versions_list(only_frappe=False):
@@ -1278,3 +1270,60 @@ def search_releases(
 	)
 
 	return q.run(as_dict=1)
+
+
+@frappe.whitelist()
+@protected("Release Group")
+def deploy_status(name: str) -> dict[str, bool | str | None]:
+	"""
+	Determine deployment state for a Release Group.
+
+	States:
+	- validating: pipeline exists, but no deploy candidate yet
+	- deploying: candidate exists and is in progress
+	- idle: no active pipeline or deployment finished
+	"""
+
+	ACTIVE_PIPELINE_STATUSES = ("Running", "Pending")
+
+	def response(is_validating=False, is_deploy_in_progress=False, candidate=None):
+		return {
+			"is_validating": is_validating,
+			"is_deploy_in_progress": is_deploy_in_progress,
+			"candidate": candidate,
+		}
+
+	pipeline_creation = frappe.db.get_value(
+		"Release Pipeline",
+		{
+			"release_group": name,
+			"status": ["in", ACTIVE_PIPELINE_STATUSES],
+		},
+		"creation",
+	)
+
+	if not pipeline_creation:
+		return response()
+
+	dc = frappe.db.get_value(
+		"Deploy Candidate Build",
+		{
+			"group": name,
+			"creation": (">", pipeline_creation),
+		},
+		["name", "status"],
+	)
+
+	if not dc:
+		return response(is_validating=True)
+
+	candidate, status = dc
+
+	# 3. Map status → UI state
+	if status in TRANSITORY_STATES:
+		return response(is_deploy_in_progress=True, candidate=candidate)
+
+	if status in RESTING_STATES:
+		return response()
+
+	return response(is_validating=True)
diff --git a/press/api/developer/marketplace.py b/press/api/developer/marketplace.py
index 8c17070a186..afe52104999 100644
--- a/press/api/developer/marketplace.py
+++ b/press/api/developer/marketplace.py
@@ -1,5 +1,3 @@
-from typing import Dict, List
-
 import frappe
 from frappe.utils import get_url
 
@@ -36,7 +34,7 @@ def set_subscription_doc(self):
 	def get_subscription_status(self) -> str:
 		return self.app_subscription_doc.status
 
-	def get_subscription_info(self) -> Dict:
+	def get_subscription_info(self) -> dict:
 		"""Important rule for security: Send info back carefully"""
 		app_subscription_dict = self.app_subscription_doc.as_dict()
 		fields_to_send = [
@@ -46,18 +44,12 @@ def get_subscription_info(self) -> Dict:
 			"site",
 		]
 
-		filtered_dict = {
-			x: app_subscription_dict[x] for x in app_subscription_dict if x in fields_to_send
-		}
-
-		return filtered_dict
+		return {x: app_subscription_dict[x] for x in app_subscription_dict if x in fields_to_send}
 
-	def get_subscription(self) -> Dict:
+	def get_subscription(self) -> dict:
 		team = self.app_subscription_doc.team
 		with SessionManager(team) as _:
-			currency, address = frappe.db.get_value(
-				"Team", team, ["currency", "billing_address"]
-			)
+			currency, address = frappe.db.get_value("Team", team, ["currency", "billing_address"])
 			team_doc = frappe.get_doc("Team", team)
 			response = {
 				"currency": currency,
@@ -73,9 +65,7 @@ def get_subscription(self) -> Dict:
 				"countries": frappe.db.get_all("Country", pluck="name"),
 				"plans": get_site_plans(),
 				"has_billing_info": (
-					team_doc.default_payment_method
-					or team_doc.get_balance() > 0
-					or team_doc.free_account
+					team_doc.default_payment_method or team_doc.get_balance() > 0 or team_doc.free_account
 				),
 				"current_plan": frappe.db.get_value("Site", self.app_subscription_doc.site, "plan"),
 			}
@@ -83,7 +73,7 @@ def get_subscription(self) -> Dict:
 			capture("attempted", "fc_subscribe", team)
 			return response
 
-	def update_billing_info(self, data: Dict) -> str:
+	def update_billing_info(self, data: dict) -> str:
 		team = self.app_subscription_doc.team
 		with SessionManager(team) as _:
 			team_doc = frappe.get_doc("Team", team)
@@ -186,26 +176,19 @@ def get_subscription_status(secret_key: str) -> str:
 
 
 @frappe.whitelist(allow_guest=True)
-def get_subscription_info(secret_key: str) -> Dict:
+def get_subscription_info(secret_key: str) -> dict:
 	api_handler = DeveloperApiHandler(secret_key)
 	return api_handler.get_subscription_info()
 
 
 @frappe.whitelist(allow_guest=True)
-def get_subscription(secret_key: str) -> str:
+def get_subscription(secret_key: str) -> dict:
 	api_handler = DeveloperApiHandler(secret_key)
 	return api_handler.get_subscription()
 
 
 @frappe.whitelist(allow_guest=True)
-def get_plans(secret_key: str, subscription: str) -> List:
-	api_handler = DeveloperApiHandler(secret_key)
-	return api_handler.get_plans(subscription)
-
-
-@frappe.whitelist(allow_guest=True)
-def update_billing_info(secret_key: str, data) -> str:
-	data = frappe.parse_json(data)
+def update_billing_info(secret_key: str, data: dict) -> str:
 	api_handler = DeveloperApiHandler(secret_key)
 	return api_handler.update_billing_info(data)
 
@@ -217,7 +200,7 @@ def get_publishable_key_and_setup_intent(secret_key: str) -> str:
 
 
 @frappe.whitelist(allow_guest=True)
-def setup_intent_success(secret_key: str, setup_intent) -> str:
+def setup_intent_success(secret_key: str, setup_intent: dict) -> str:
 	api_handler = DeveloperApiHandler(secret_key)
 	return api_handler.setup_intent_success(setup_intent)
 
diff --git a/press/api/github.py b/press/api/github.py
index 032330d13f8..1da00d75bfb 100644
--- a/press/api/github.py
+++ b/press/api/github.py
@@ -4,16 +4,21 @@
 from __future__ import annotations
 
 import contextlib
+import hashlib
+import hmac
+import json
 import re
-from base64 import b64decode
+from base64 import b64decode, urlsafe_b64decode, urlsafe_b64encode
 from datetime import datetime, timedelta
 from pathlib import Path
-from typing import TYPE_CHECKING
+from typing import TYPE_CHECKING, TypedDict
+from urllib.parse import urlencode, urlparse
 
 import frappe
 import jwt
 import requests
 import tomli
+from frappe.utils.verified_command import get_secret
 
 from press.utils import get_current_team, log_error
 
@@ -21,6 +26,19 @@
 	from press.press.doctype.github_webhook_log.github_webhook_log import GitHubWebhookLog
 
 
+DEFAULT_GITHUB_REDIRECT_PATH = "/dashboard"
+GITHUB_OAUTH_STATE_MAX_AGE = timedelta(minutes=10)
+
+
+class InvalidGitHubOAuthState(frappe.ValidationError):
+	pass
+
+
+class AppDependencyFetch(TypedDict):
+	frappe_dependencies: dict[str, str]
+	python_version: str | None
+
+
 @frappe.whitelist(allow_guest=True, xss_safe=True)
 def hook(*args, **kwargs):
 	user = frappe.session.user
@@ -53,6 +71,63 @@ def hook(*args, **kwargs):
 		raise Exception from e
 
 
+def get_installation_data(team: str, redirect_url: str | None = None) -> dict[str, str]:
+	public_link = frappe.db.get_single_value("Press Settings", "github_app_public_link")
+	return {
+		"installation_url": f"{public_link}/installations/new",
+		"state": encode_github_oauth_state(team, redirect_url),
+	}
+
+
+def encode_github_oauth_state(team: str, redirect_url: str | None = None) -> str:
+	payload = {
+		"issued_at": int(datetime.now().timestamp()),
+		"redirect_url": get_safe_github_redirect_url(redirect_url),
+		"team": team,
+		"user": frappe.session.user,
+	}
+	encoded_payload = _encode_github_state_payload(payload)
+	return f"{encoded_payload}.{_sign_github_oauth_state(encoded_payload)}"
+
+
+def decode_github_oauth_state(state: str) -> dict[str, str]:
+	try:
+		encoded_payload, signature = state.rsplit(".", 1)
+	except ValueError as exc:
+		raise InvalidGitHubOAuthState("Invalid GitHub authorization state") from exc
+
+	expected_signature = _sign_github_oauth_state(encoded_payload)
+	if not hmac.compare_digest(signature, expected_signature):
+		raise InvalidGitHubOAuthState("Invalid GitHub authorization state")
+
+	try:
+		payload = json.loads(_decode_github_state_payload(encoded_payload))
+	except Exception as exc:
+		raise InvalidGitHubOAuthState("Invalid GitHub authorization state") from exc
+
+	redirect_url = get_safe_github_redirect_url(payload.get("redirect_url"))
+	issued_at = payload.get("issued_at")
+	team = payload.get("team")
+	user = payload.get("user")
+
+	if (
+		not team
+		or not isinstance(team, str)
+		or not user
+		or not isinstance(user, str)
+		or not isinstance(issued_at, int)
+	):
+		raise InvalidGitHubOAuthState("Invalid GitHub authorization state")
+
+	if datetime.now().timestamp() - issued_at > GITHUB_OAUTH_STATE_MAX_AGE.total_seconds():
+		raise InvalidGitHubOAuthState("Invalid GitHub authorization state")
+
+	if user != frappe.session.user:
+		raise InvalidGitHubOAuthState("Invalid GitHub authorization state")
+
+	return {"redirect_url": redirect_url, "team": team}
+
+
 def get_jwt_token():
 	key = frappe.db.get_single_value("Press Settings", "github_app_private_key")
 	app_id = frappe.db.get_single_value("Press Settings", "github_app_id")
@@ -83,30 +158,79 @@ def get_access_token(installation_id: str | None = None):
 
 
 @frappe.whitelist()
-def clear_token_and_get_installation_url():
-	clear_current_team_access_token()
-	public_link = frappe.db.get_single_value("Press Settings", "github_app_public_link")
-	return f"{public_link}/installations/new"
+def clear_token_and_get_installation_url(redirect_url: str | None = None):
+	team = get_current_team()
+	clear_current_team_access_token(team)
+	return get_installation_data(team, redirect_url)
 
 
-def clear_current_team_access_token():
-	team = get_current_team()
+def clear_current_team_access_token(team: str | None = None):
+	team = team or get_current_team()
 	frappe.db.set_value("Team", team, "github_access_token", "")  # clear access token
 
 
 @frappe.whitelist()
-def options():
+def options(redirect_url: str | None = None):
 	team = get_current_team()
 	token = frappe.db.get_value("Team", team, "github_access_token")
-	public_link = frappe.db.get_single_value("Press Settings", "github_app_public_link")
+	installation_data = get_installation_data(team, redirect_url)
 
 	return {
 		"authorized": bool(token),
-		"installation_url": f"{public_link}/installations/new",
+		**installation_data,
 		"installations": installations(token) if token else [],
 	}
 
 
+def get_safe_github_redirect_url(redirect_url: str | None = None) -> str:
+	if not redirect_url:
+		return DEFAULT_GITHUB_REDIRECT_PATH
+
+	parsed_redirect_url = urlparse(redirect_url)
+	if parsed_redirect_url.scheme or parsed_redirect_url.netloc:
+		parsed_site_url = urlparse(frappe.utils.get_url())
+		if (
+			parsed_redirect_url.scheme != parsed_site_url.scheme
+			or parsed_redirect_url.netloc != parsed_site_url.netloc
+		):
+			return DEFAULT_GITHUB_REDIRECT_PATH
+
+	redirect_path = parsed_redirect_url.path or DEFAULT_GITHUB_REDIRECT_PATH
+	if not redirect_path.startswith("/dashboard"):
+		return DEFAULT_GITHUB_REDIRECT_PATH
+
+	if parsed_redirect_url.query:
+		redirect_path = f"{redirect_path}?{parsed_redirect_url.query}"
+
+	if parsed_redirect_url.fragment:
+		redirect_path = f"{redirect_path}#{parsed_redirect_url.fragment}"
+
+	return redirect_path
+
+
+def get_github_callback_login_redirect(code: str | None, state: str | None) -> str:
+	login_url = "/dashboard/login"
+	if not (code and state):
+		return frappe.utils.get_url(login_url)
+
+	callback_url = f"/github/authorize?{urlencode({'code': code, 'state': state})}"
+	return frappe.utils.get_url(f"{login_url}?{urlencode({'redirect': callback_url})}")
+
+
+def _decode_github_state_payload(payload: str) -> str:
+	padding = "=" * (-len(payload) % 4)
+	return urlsafe_b64decode(f"{payload}{padding}").decode()
+
+
+def _encode_github_state_payload(payload: dict[str, str | int]) -> str:
+	encoded_payload = json.dumps(payload, separators=(",", ":"), sort_keys=True).encode()
+	return urlsafe_b64encode(encoded_payload).decode().rstrip("=")
+
+
+def _sign_github_oauth_state(encoded_payload: str) -> str:
+	return hmac.new(get_secret().encode(), encoded_payload.encode(), digestmod=hashlib.sha256).hexdigest()
+
+
 def fetch_installations(token):
 	headers = {
 		"Authorization": f"token {token}",
@@ -420,3 +544,50 @@ def _construct_tree(tree, children, children_map):
 		else:
 			tree[file.name] = None
 	return tree
+
+
+def _get_pyproject_from_commit(app_source: str, commit: str):
+	repository_owner, repository, installation_id = frappe.db.get_value(
+		"App Source", app_source, ["repository_owner", "repository", "github_installation_id"]
+	)
+	headers = get_auth_headers(installation_id)
+	url = f"https://api.github.com/repos/{repository_owner}/{repository}/contents/pyproject.toml"
+
+	response = requests.get(url, params={"ref": commit}, headers=headers)
+
+	if response.status_code == 400:
+		frappe.throw("Pyproject not found at this commit", frappe.ValidationError)
+
+	if not response.ok:
+		frappe.throw("Error fetching app info from github", frappe.ValidationError)
+
+	content = b64decode(response.json().get("content", "")).decode()
+	try:
+		return tomli.loads(content)
+	except tomli.TOMLDecodeError:
+		frappe.throw("Invalid pyproject.toml file found in the app repository.", frappe.ValidationError)
+
+
+def get_dependant_apps_with_versions(app_source: str, commit: str, cache: bool = True) -> AppDependencyFetch:
+	"""Get a list of apps that are required by the given repository and commit."""
+	cache_key = f"app_deps:{app_source}:{commit}"
+
+	if cache:
+		cached_deps = frappe.cache().get_value(cache_key)
+		if cached_deps is not None:
+			return cached_deps
+
+	pyproject = _get_pyproject_from_commit(app_source, commit)
+	frappe_dependencies = pyproject.get("tool", {}).get("bench", {}).get("frappe-dependencies", {})
+	# We can safely remove frappe from the dependencies as it will be added by defult.
+	frappe_dependencies.pop("frappe", None)
+	python_version = pyproject.get("project", {}).get("requires-python")
+
+	dependency_data = AppDependencyFetch(
+		frappe_dependencies=frappe_dependencies,
+		python_version=python_version,
+	)
+
+	frappe.cache().set_value(cache_key, dependency_data, expires_in_sec=60 * 60)
+
+	return dependency_data
diff --git a/press/api/marketplace.py b/press/api/marketplace.py
index b2c30208d2f..3a416b0d935 100644
--- a/press/api/marketplace.py
+++ b/press/api/marketplace.py
@@ -30,7 +30,7 @@
 
 
 @frappe.whitelist()
-def get(app):
+def get(app: str) -> dict:
 	record = frappe.get_doc("Marketplace App", app)
 	return {
 		"name": record.name,
@@ -438,16 +438,22 @@ def profile_image_url(app: str) -> str:
 @frappe.whitelist()
 def update_app_image() -> str:
 	"""Handles App Image Upload"""
+	current_team = get_current_team()
+	app_name = frappe.form_dict.docname
+	app_team = frappe.db.get_value("Marketplace App", app_name, "team")
+	if app_team != current_team:
+		frappe.throw("Not Permitted to update app image", frappe.PermissionError)
+
 	file_content = frappe.local.uploaded_file
+	file_name = frappe.local.uploaded_filename
 
+	validate_uploaded_image(file_content, file_name)
 	validate_app_image_dimensions(file_content)
 
-	file_name = frappe.local.uploaded_filename
-	if file_name.split(".")[-1] in ["png", "jpg", "jpeg"]:
+	if file_name.rsplit(".", 1)[-1].lower() in ("png", "jpg", "jpeg"):
 		file_content = convert_to_webp(file_content)
-		file_name = f"{'.'.join(file_name.split('.')[:-1])}.webp"
+		file_name = f"{file_name.rsplit('.', 1)[0]}.webp"
 
-	app_name = frappe.form_dict.docname
 	_file = frappe.get_doc(
 		{
 			"doctype": "File",
@@ -483,15 +489,23 @@ def convert_to_webp(file_content: bytes) -> bytes:
 
 @frappe.whitelist()
 def add_app_screenshot() -> str:
-	"""Handles App Image Upload"""
-	file_content = frappe.local.uploaded_file
+	"""Handles App Screenshot Upload"""
+	current_team = get_current_team()
 	app_name = frappe.form_dict.docname
-	app_doc = frappe.get_doc("Marketplace App", app_name)
+	app_team = frappe.db.get_value("Marketplace App", app_name, "team")
+	if app_team != current_team:
+		frappe.throw("Not Permitted to add app screenshot", frappe.PermissionError)
 
+	file_content = frappe.local.uploaded_file
 	file_name = frappe.local.uploaded_filename
-	if file_name.split(".")[-1] in ["png", "jpg", "jpeg"]:
+
+	validate_uploaded_image(file_content, file_name)
+
+	app_doc = frappe.get_doc("Marketplace App", app_name)
+
+	if file_name.rsplit(".", 1)[-1].lower() in ("png", "jpg", "jpeg"):
 		file_content = convert_to_webp(file_content)
-		file_name = f"{'.'.join(file_name.split('.')[:-1])}.webp"
+		file_name = f"{file_name.rsplit('.', 1)[0]}.webp"
 
 	_file = frappe.get_doc(
 		{
@@ -519,7 +533,7 @@ def add_app_screenshot() -> str:
 
 @protected("Marketplace App")
 @frappe.whitelist()
-def remove_app_screenshot(name, file):
+def remove_app_screenshot(name: str, file: str):
 	app_doc = frappe.get_doc("Marketplace App", name)
 
 	for i, sc in enumerate(app_doc.screenshots):
@@ -529,6 +543,30 @@ def remove_app_screenshot(name, file):
 	app_doc.save(ignore_permissions=True)
 
 
+ALLOWED_IMAGE_EXTENSIONS = frozenset({"png", "jpg", "jpeg", "webp"})
+
+
+def validate_uploaded_image(file_content: bytes, file_name: str) -> None:
+	"""Validate that the upload is a safe image.
+	1. Rejecting file extensions that browsers execute (svg, html, xml, etc.)
+	2. PIL-decoding the bytes to confirm it's a genuine image
+	"""
+	ext = file_name.rsplit(".", 1)[-1].lower() if "." in file_name else ""
+	if ext not in ALLOWED_IMAGE_EXTENSIONS:
+		frappe.throw(f"Only {', '.join(sorted(ALLOWED_IMAGE_EXTENSIONS))} images are allowed")
+
+	from io import BytesIO
+
+	from PIL import Image, UnidentifiedImageError
+
+	try:
+		Image.open(BytesIO(file_content)).verify()
+	except (UnidentifiedImageError, Exception):
+		frappe.throw(
+			"Uploaded file is not a valid image. Please upload image in PNG, JPG, JPEG or WebP format."
+		)
+
+
 def validate_app_image_dimensions(file_content):
 	"""Throws if image is not a square image, atleast 300x300px in size"""
 	from io import BytesIO
@@ -542,41 +580,12 @@ def validate_app_image_dimensions(file_content):
 
 
 @frappe.whitelist()
-def update_app_title(name: str, title: str) -> MarketplaceApp:
-	"""Update `title` and `category`"""
-	app: MarketplaceApp = frappe.get_doc("Marketplace App", name)
-	app.title = title
-	app.save(ignore_permissions=True)
-
-	return app
-
-
-@frappe.whitelist()
-def update_app_links(name: str, links: dict) -> None:
-	"""Update links related to app"""
-	app: MarketplaceApp = frappe.get_doc("Marketplace App", name)
-	app.update(links)
-	app.save(ignore_permissions=True)
-
-
-@frappe.whitelist()
-def update_app_summary(name: str, summary: str) -> None:
-	"""Update the `description` of Marketplace App `name`"""
-	app: MarketplaceApp = frappe.get_doc("Marketplace App", name)
-	app.description = summary
-	app.save(ignore_permissions=True)
-
-
-@frappe.whitelist()
-def update_app_description(name: str, description: str) -> None:
-	"""Update the `long_description` of Marketplace App `name`"""
-	app: MarketplaceApp = frappe.get_doc("Marketplace App", name)
-	app.long_description = description
-	app.save(ignore_permissions=True)
-
-
-@frappe.whitelist()
-def releases(filters=None, order_by=None, limit_start=None, limit_page_length=None) -> list[dict]:
+def releases(
+	filters: dict | None = None,
+	order_by: str | None = None,
+	limit_start: int | None = None,
+	limit_page_length: int | None = None,
+) -> list[dict]:
 	"""Return list of App Releases for this `app` and `source` in order of creation time"""
 
 	app_releases = frappe.get_all(
@@ -617,7 +626,7 @@ def latest_approved_release(source: None | str) -> AppRelease:
 
 @frappe.whitelist()
 @protected("Marketplace App")
-def create_approval_request(name, app_release: str):
+def create_approval_request(name: str, app_release: str):
 	"""Create a new Approval Request for given `app_release`"""
 	frappe.get_doc("Marketplace App", name).create_approval_request(app_release)
 
@@ -632,9 +641,9 @@ def cancel_approval_request(app_release: str):
 def reason_for_rejection(app_release: str) -> str:
 	"""Return feedback given on a `Rejected` approval request"""
 	approval_request = get_latest_approval_request(app_release)
-	app_release = frappe.get_doc("App Release", app_release)
+	release_doc = frappe.get_doc("App Release", app_release)
 
-	if app_release.status != "Rejected":
+	if release_doc.status != "Rejected":
 		frappe.throw("The request for the given app release was not rejected!")
 
 	return approval_request.reason_for_rejection
@@ -658,7 +667,7 @@ def get_latest_approval_request(app_release: str):
 
 
 @frappe.whitelist()
-def options_for_marketplace_app() -> dict[str, dict]:  # noqa: C901
+def options_for_marketplace_app() -> list[dict]:  # noqa: C901
 	# Get versions (along with apps and associated sources)
 	# which belong to the current team
 	versions = options(only_by_current_team=True)["versions"]
@@ -684,7 +693,7 @@ def options_for_marketplace_app() -> dict[str, dict]:  # noqa: C901
 						source["version"] = version["name"]
 					filtered_apps.append(app)
 
-	aggregated_sources = {}
+	aggregated_sources: dict[str, list] = {}
 
 	for app in filtered_apps:
 		aggregated_sources.setdefault(app["name"], []).extend(app["sources"])
@@ -850,7 +859,7 @@ def get_marketplace_subscriptions_for_site(site: str):
 
 
 @frappe.whitelist()
-def get_app_plans(app: str, include_disabled=True):
+def get_app_plans(app: str, include_disabled: bool = True):
 	return get_plans_for_app(app, include_disabled=include_disabled)
 
 
@@ -860,7 +869,7 @@ def get_app_info(app: str):
 
 
 @frappe.whitelist()
-def get_apps_with_plans(apps, release_group: str):
+def get_apps_with_plans(apps: list[str], release_group: str):
 	if isinstance(apps, str):
 		apps = json.loads(apps)
 
@@ -890,7 +899,7 @@ def get_apps_with_plans(apps, release_group: str):
 
 
 @frappe.whitelist()
-def change_app_plan(subscription, new_plan):
+def change_app_plan(subscription: str, new_plan: str):
 	is_free = frappe.db.get_value("Marketplace App Plan", new_plan, "price_usd") <= 0
 	if not is_free:
 		team = get_current_team(get_doc=True)
@@ -899,10 +908,10 @@ def change_app_plan(subscription, new_plan):
 				"You cannot upgrade to paid plan on Free Credits. Please buy credits before trying to upgrade plan."
 			)
 
-	subscription = frappe.get_doc("Subscription", subscription)
-	subscription.enabled = 1
-	subscription.plan = new_plan
-	subscription.save(ignore_permissions=True)
+	subscription_doc = frappe.get_doc("Subscription", subscription)
+	subscription_doc.enabled = 1
+	subscription_doc.plan = new_plan
+	subscription_doc.save(ignore_permissions=True)
 
 
 @frappe.whitelist()
@@ -923,7 +932,7 @@ def get_publisher_profile_info():
 
 
 @frappe.whitelist()
-def update_publisher_profile(profile_data=None):
+def update_publisher_profile(profile_data: dict | None = None):
 	"""Update if exists, otherwise create"""
 	team = get_current_team()
 
@@ -941,7 +950,7 @@ def update_publisher_profile(profile_data=None):
 
 
 @frappe.whitelist()
-def submit_user_review(title, rating, app, review):
+def submit_user_review(title: str, rating: float, app: str, review: str):
 	return frappe.get_doc(
 		{
 			"doctype": "App User Review",
@@ -955,7 +964,7 @@ def submit_user_review(title, rating, app, review):
 
 
 @frappe.whitelist()
-def submit_developer_reply(review, reply):
+def submit_developer_reply(review: str, reply: str):
 	return frappe.get_doc(
 		{
 			"doctype": "Developer Review Reply",
@@ -1019,7 +1028,7 @@ def create_app_plan(marketplace_app: str, plan_data: dict):
 		}
 	)
 
-	feature_list = plan_data.get("features")
+	feature_list: list[str] = plan_data.get("features") or []
 	reset_features_for_plan(app_plan_doc, feature_list)
 	return app_plan_doc.insert(ignore_permissions=True)
 
@@ -1213,7 +1222,7 @@ def subscriptions():
 
 @protected("App Source")
 @frappe.whitelist()
-def branches(name):
+def branches(name: str):
 	from press.api.github import branches as git_branches
 
 	app_source = frappe.db.get_value(
@@ -1231,14 +1240,14 @@ def branches(name):
 
 @protected("Marketplace App")
 @frappe.whitelist()
-def change_branch(name, source, version, to_branch):
+def change_branch(name: str, source: str, version: str, to_branch: str):
 	app = frappe.get_doc("Marketplace App", name)
 	app.change_branch(source, version, to_branch)
 
 
 @protected("Marketplace App")
 @frappe.whitelist()
-def options_for_version(name):
+def options_for_version(name: str):
 	frappe_version = frappe.get_all("Frappe Version", {"public": True}, pluck="name")
 	added_versions = frappe.get_all("Marketplace App Version", {"parent": name}, pluck="version")
 	app = frappe.db.get_value("Marketplace App", name, "app")
@@ -1252,21 +1261,21 @@ def options_for_version(name):
 
 @protected("Marketplace App")
 @frappe.whitelist()
-def add_version(name, branch, version):
+def add_version(name: str, branch: str, version: str):
 	app = frappe.get_doc("Marketplace App", name)
 	app.add_version(version, branch)
 
 
 @protected("Marketplace App")
 @frappe.whitelist()
-def remove_version(name, version):
+def remove_version(name: str, version: str):
 	app = frappe.get_doc("Marketplace App", name)
 	app.remove_version(version)
 
 
 @protected("Marketplace App")
 @frappe.whitelist()
-def review_steps(name):
+def review_steps(name: str):
 	app = frappe.get_doc("Marketplace App", name)
 	return [
 		{"step": "Add a logo for your app", "completed": bool(app.image)},
@@ -1300,14 +1309,14 @@ def review_steps(name):
 
 @protected("Marketplace App")
 @frappe.whitelist()
-def mark_app_ready_for_review(name):
+def mark_app_ready_for_review(name: str):
 	app = frappe.get_doc("Marketplace App", name)
 	app.mark_app_ready_for_review()
 
 
 @protected("Marketplace App")
 @frappe.whitelist()
-def communication(name):
+def communication(name: str):
 	comm = frappe.qb.DocType("Communication")
 	user = frappe.qb.DocType("User")
 	query = (
@@ -1324,7 +1333,7 @@ def communication(name):
 
 @protected("Marketplace App")
 @frappe.whitelist()
-def add_reply(name, message):
+def add_reply(name: str, message: str):
 	doctype = "Marketplace App"
 	app = frappe.get_doc(doctype, name)
 	recipients = ", ".join(list(app.get_assigned_users()) or [])
@@ -1348,39 +1357,16 @@ def add_reply(name, message):
 
 @protected("Marketplace App")
 @frappe.whitelist()
-def fetch_readme(name):
+def fetch_readme(name: str):
 	app: MarketplaceApp = frappe.get_doc("Marketplace App", name)
 	app.long_description = app.fetch_readme()
 	app.save()
 
 
 @frappe.whitelist(allow_guest=True)
-def get_marketplace_apps():
+def get_marketplace_apps() -> list[dict]:
 	apps = frappe.cache().get_value("marketplace_apps")
 	if not apps:
 		apps = frappe.get_all("Marketplace App", {"status": "Published"}, ["name", "title", "route"])
 		frappe.cache().set_value("marketplace_apps", apps, expires_in_sec=60 * 60 * 24 * 7)
 	return apps
-
-
-@protected("App Source")
-@frappe.whitelist()
-def add_code_review_comment(name, filename, line_number, comment):
-	try:
-		doc = frappe.get_doc("App Release Approval Request", name)
-		# Add a new comment
-		doc.append(
-			"code_comments",
-			{
-				"filename": filename,
-				"line_number": line_number,
-				"comment": comment,
-				"commented_by": frappe.session.user,
-				"time": frappe.utils.now_datetime(),
-			},
-		)
-
-		doc.save()
-		return {"status": "success", "message": "Comment added successfully."}
-	except Exception as e:
-		frappe.throw(f"Unable to add comment. Something went wrong: {e!s}")
diff --git a/press/api/partner.py b/press/api/partner.py
index 7d1bf556acb..a6eb802e3f3 100644
--- a/press/api/partner.py
+++ b/press/api/partner.py
@@ -1,4 +1,5 @@
 import json
+from typing import Any
 
 import frappe
 from frappe.core.utils import find
@@ -13,7 +14,7 @@
 from press.utils import get_current_team
 
 
-def is_lead_team(lead):
+def is_lead_team(lead: str) -> bool:
 	team = get_current_team()
 	if (frappe.db.get_value("Partner Lead", lead, "partner_team") == team) or is_system_user():
 		return True
@@ -22,7 +23,7 @@ def is_lead_team(lead):
 
 @frappe.whitelist()
 @role_guard.api("partner")
-def approve_partner_request(key):
+def approve_partner_request(key: str) -> None:
 	partner_request_doc = frappe.get_doc("Partner Approval Request", {"key": key})
 	if partner_request_doc and partner_request_doc.status == "Pending":
 		if partner_request_doc.approved_by_partner:
@@ -49,13 +50,13 @@ def approve_partner_request(key):
 
 @frappe.whitelist()
 @role_guard.api("partner")
-def get_partner_request_status(team):
+def get_partner_request_status(team: str) -> str | None:
 	return frappe.db.get_value("Partner Approval Request", {"requested_by": team}, "status")
 
 
 @frappe.whitelist()
 @role_guard.api("partner")
-def update_website_info(website_info):
+def update_website_info(website_info: dict[str, Any]) -> None:
 	from press.utils.billing import get_frappe_io_connection, is_frappe_auth_disabled
 
 	if is_frappe_auth_disabled():
@@ -71,7 +72,7 @@ def update_website_info(website_info):
 
 @frappe.whitelist()
 @role_guard.api("partner")
-def get_partner_details(partner_email):
+def get_partner_details(partner_email: str) -> dict | None:
 	from press.utils.billing import get_frappe_io_connection, is_frappe_auth_disabled
 
 	if is_frappe_auth_disabled():
@@ -113,7 +114,7 @@ def get_partner_details(partner_email):
 
 @frappe.whitelist()
 @role_guard.api("partner")
-def send_link_certificate_request(user_email, certificate_type):
+def send_link_certificate_request(user_email: str, certificate_type: str) -> None:
 	if not frappe.db.exists(
 		"Partner Certificate", {"partner_member_email": user_email, "course": certificate_type}
 	):
@@ -133,7 +134,7 @@ def send_link_certificate_request(user_email, certificate_type):
 
 @frappe.whitelist()
 @role_guard.api("partner")
-def approve_certificate_link_request(key):
+def approve_certificate_link_request(key: str) -> None:
 	cert_req_doc = frappe.get_doc("Certificate Link Request", {"key": key})
 	cert_req_doc.status = "Approved"
 	cert_req_doc.save(ignore_permissions=True)
@@ -145,13 +146,13 @@ def approve_certificate_link_request(key):
 
 @frappe.whitelist()
 @role_guard.api("partner")
-def get_resource_url():
+def get_resource_url() -> str | None:
 	return frappe.db.get_value("Press Settings", "Press Settings", "drive_resource_link")
 
 
 @frappe.whitelist()
 @role_guard.api("partner")
-def get_partner_name(partner_email):
+def get_partner_name(partner_email: str) -> str | None:
 	team = get_current_team(get_doc=True)
 	if team.partner_email != partner_email:
 		return None
@@ -164,7 +165,7 @@ def get_partner_name(partner_email):
 
 @frappe.whitelist()
 @role_guard.api("partner")
-def transfer_credits(amount, customer):
+def transfer_credits(amount: float, customer: str) -> float | None:
 	# partner discount map
 	DISCOUNT_MAP = {"Entry": 0.10, "Emerging": 0.10, "Bronze": 0.15, "Silver": 0.20, "Gold": 0.25}
 
@@ -208,7 +209,7 @@ def transfer_credits(amount, customer):
 
 @frappe.whitelist()
 @role_guard.api("partner")
-def get_partner_contribution_list(partner_email):
+def get_partner_contribution_list(partner_email: str) -> list[dict] | None:
 	team = get_current_team(get_doc=True)
 	if team.partner_email != partner_email:
 		return None
@@ -241,7 +242,7 @@ def get_partner_contribution_list(partner_email):
 
 @frappe.whitelist()
 @role_guard.api("partner")
-def get_partner_mrr(partner_email, prev_month=False):
+def get_partner_mrr(partner_email: str, prev_month: bool = False) -> list[dict] | None:
 	team = get_current_team(get_doc=True)
 	if team.partner_email != partner_email:
 		return None
@@ -284,7 +285,7 @@ def get_partner_mrr(partner_email, prev_month=False):
 
 @frappe.whitelist()
 @role_guard.api("partner")
-def get_dashboard_stats():
+def get_dashboard_stats() -> list[dict] | None:
 	team = get_current_team(get_doc=True)
 	Site = frappe.qb.DocType("Site")
 	Team = frappe.qb.DocType("Team")
@@ -302,7 +303,7 @@ def get_dashboard_stats():
 
 @frappe.whitelist()
 @role_guard.api("partner")
-def get_lead_stats():
+def get_lead_stats() -> dict | None:
 	team = get_current_team(get_doc=True)
 	Lead = frappe.qb.DocType("Partner Lead")
 	query = (
@@ -319,15 +320,15 @@ def get_lead_stats():
 	return data[0] if data else {}
 
 
-def get_user_by_name(email):
+def get_user_by_name(email: str) -> str:
 	return frappe.get_cached_value("User", email, "full_name")
 
 
 @frappe.whitelist()
 @role_guard.api("partner")
-def get_lead_activities(name):  # noqa: C901
+def get_lead_activities(name: str) -> list[dict]:  # noqa: C901
 	if not is_lead_team(name):
-		return None
+		return []
 
 	doc = frappe.db.get_values("Partner Lead", name, ["creation", "owner"])[0]
 	get_docinfo("", "Partner Lead", name)
@@ -398,13 +399,13 @@ def get_lead_activities(name):  # noqa: C901
 		}
 		activities.append(activity)
 
-	activities.sort(key=lambda x: x.get("creation"), reverse=False)
+	activities.sort(key=lambda x: x.get("creation") or frappe.utils.now(), reverse=False)
 	activities = handle_multiple_versions(activities)
 
 	return activities  # noqa: RET504
 
 
-def handle_multiple_versions(versions):  # noqa: C901
+def handle_multiple_versions(versions: list[dict]) -> list[dict]:  # noqa: C901
 	activities = []
 	grouped_versions = []
 	old_version = None
@@ -443,7 +444,7 @@ def parse_grouped_versions(versions):
 
 @frappe.whitelist()
 @role_guard.api("partner")
-def get_certification_requests():
+def get_certification_requests() -> list[dict] | None:
 	from frappe.frappeclient import FrappeClient
 
 	team = get_current_team()
@@ -474,7 +475,7 @@ def get_certification_requests():
 
 @frappe.whitelist()
 @role_guard.api("partner")
-def get_partner_invoices(due_date=None, status=None):
+def get_partner_invoices(due_date: str | None = None, status: str | None = None) -> list[dict] | None:
 	partner_email = get_current_team(get_doc=True).partner_email
 
 	filters = {
@@ -498,7 +499,7 @@ def get_partner_invoices(due_date=None, status=None):
 
 @frappe.whitelist()
 @role_guard.api("partner")
-def get_invoice_items(invoice):
+def get_invoice_items(invoice: str) -> list[dict] | None:
 	team = get_current_team(get_doc=True)
 	if team.name != frappe.db.get_value(
 		"Invoice", invoice, "team"
@@ -520,7 +521,7 @@ def get_invoice_items(invoice):
 
 @frappe.whitelist()
 @role_guard.api("partner")
-def get_current_month_partner_contribution(partner_email):
+def get_current_month_partner_contribution(partner_email: str) -> float | None:
 	team = get_current_team(get_doc=True)
 	if team.partner_email != partner_email:
 		return None
@@ -556,7 +557,7 @@ def get_current_month_partner_contribution(partner_email):
 
 @frappe.whitelist()
 @role_guard.api("partner")
-def get_prev_month_partner_contribution(partner_email):
+def get_prev_month_partner_contribution(partner_email: str) -> float | None:
 	team = get_current_team(get_doc=True)
 	if team.partner_email != partner_email:
 		return None
@@ -600,7 +601,7 @@ def get_prev_month_partner_contribution(partner_email):
 
 @frappe.whitelist()
 @role_guard.api("partner")
-def calculate_partner_tier(contribution, currency):
+def calculate_partner_tier(contribution: float, currency: str) -> dict | None:
 	partner_tier = frappe.qb.DocType("Partner Tier")
 	query = frappe.qb.from_(partner_tier).select(partner_tier.name)
 	if currency == "INR":
@@ -613,13 +614,15 @@ def calculate_partner_tier(contribution, currency):
 		)
 
 	tier = query.run(as_dict=True)
-	return tier[0]
+	return tier[0] if tier else None
 
 
 @frappe.whitelist()
 @role_guard.api("partner")
-def add_partner(referral_code: str):
+def add_partner(referral_code: str) -> str | None:
 	team = get_current_team(get_doc=True)
+	year_ago = frappe.utils.add_to_date(years=-1)
+	is_old_team = bool(team.creation > year_ago)
 	partner = frappe.get_doc("Team", {"partner_referral_code": referral_code}).name
 	if frappe.db.exists(
 		"Partner Approval Request",
@@ -633,6 +636,7 @@ def add_partner(referral_code: str):
 			"partner": partner,
 			"requested_by": team.name,
 			"status": "Pending",
+			"approved_by_frappe": 1 if is_old_team else 0,
 			"send_mail": True,
 		}
 	)
@@ -642,7 +646,7 @@ def add_partner(referral_code: str):
 
 @frappe.whitelist()
 @role_guard.api("partner")
-def validate_partner_code(code):
+def validate_partner_code(code: str) -> tuple[bool, str | None]:
 	partner = frappe.db.get_value(
 		"Team",
 		{"enabled": 1, "erpnext_partner": 1, "partner_referral_code": code},
@@ -655,7 +659,7 @@ def validate_partner_code(code):
 
 @frappe.whitelist()
 @role_guard.api("partner")
-def get_partner_customers():
+def get_partner_customers() -> list[dict] | None:
 	team = get_current_team(get_doc=True)
 	customers = frappe.get_all(
 		"Team",
@@ -667,7 +671,13 @@ def get_partner_customers():
 
 @frappe.whitelist()
 @role_guard.api("partner")
-def get_partner_leads(lead_name=None, status=None, source=None, is_starter_pack=None, lead_owner=None):
+def get_partner_leads(
+	lead_name: str | None = None,
+	status: str | None = None,
+	source: str | None = None,
+	is_starter_pack: bool | None = None,
+	lead_owner: str | None = None,
+) -> list[dict] | None:
 	team = get_current_team()
 	filters = {"partner_team": team}
 	if lead_name:
@@ -690,7 +700,7 @@ def get_partner_leads(lead_name=None, status=None, source=None, is_starter_pack=
 
 @frappe.whitelist()
 @role_guard.api("partner")
-def get_lead_owners():
+def get_lead_owners() -> list[dict] | None:
 	PartnerLead = frappe.qb.DocType("Partner Lead")
 	User = frappe.qb.DocType("User")
 	query = (
@@ -707,7 +717,7 @@ def get_lead_owners():
 
 @frappe.whitelist()
 @role_guard.api("partner")
-def create_audit_request(audit_date, audit_type="Online"):
+def create_audit_request(audit_date: str, audit_type: str = "Online") -> None:
 	team = get_current_team(get_doc=True)
 	if not team.erpnext_partner and team.partner_status != "Active":
 		frappe.throw(
@@ -734,7 +744,7 @@ def create_audit_request(audit_date, audit_type="Online"):
 
 @frappe.whitelist()
 @role_guard.api("partner")
-def change_partner(lead_name, partner):
+def change_partner(lead_name: str, partner: str) -> None:
 	doc = frappe.get_doc("Partner Lead", lead_name)
 	if not is_lead_team(lead_name):
 		frappe.throw("You are not allowed to change the partner for this lead")
@@ -746,7 +756,7 @@ def change_partner(lead_name, partner):
 
 @frappe.whitelist()
 @role_guard.api("partner")
-def remove_partner():
+def remove_partner() -> None:
 	team = get_current_team(get_doc=True)
 	if team.payment_mode == "Paid By Partner":
 		frappe.throw(
@@ -765,7 +775,7 @@ def remove_partner():
 
 @frappe.whitelist()
 @role_guard.api("partner")
-def apply_for_certificate(member_name, certificate_type):
+def apply_for_certificate(member_name: str, certificate_type: str) -> None:
 	team = get_current_team(get_doc=True)
 	if not team.erpnext_partner and team.partner_status != "Active":
 		frappe.throw("Only Active Partner team can apply for certificates.")
@@ -788,11 +798,17 @@ def apply_for_certificate(member_name, certificate_type):
 
 @frappe.whitelist()
 @role_guard.api("partner")
-def get_partner_teams(company=None, email=None, country=None, tier=None, active_only=False):
+def get_partner_teams(
+	company: str | None = None,
+	email: str | None = None,
+	country: str | None = None,
+	tier: str | None = None,
+	active_only: bool = False,
+) -> list[dict] | None:
 	if not is_system_user(frappe.session.user):
 		frappe.throw("Only system users can access partner teams.")
 
-	filters = {"enabled": 1, "erpnext_partner": 1}
+	filters: dict[str, Any] = {"enabled": 1, "erpnext_partner": 1}
 	if company:
 		filters["company_name"] = ("like", f"%{company}%")
 	if email:
@@ -814,7 +830,7 @@ def get_partner_teams(company=None, email=None, country=None, tier=None, active_
 
 @frappe.whitelist()
 @role_guard.api("partner")
-def get_local_payment_setup():
+def get_local_payment_setup() -> frappe._dict | None:
 	team = get_current_team()
 	data = frappe._dict()
 	data.mpesa_setup = frappe.db.get_value("Mpesa Setup", {"team": team}, "mpesa_setup_id") or None
@@ -824,7 +840,7 @@ def get_local_payment_setup():
 
 @frappe.whitelist()
 @role_guard.api("partner")
-def get_lead_details(lead_id):
+def get_lead_details(lead_id: str) -> dict | None:
 	if not is_lead_team(lead_id):
 		return None
 	return frappe.get_doc("Partner Lead", lead_id).as_dict()
@@ -832,23 +848,23 @@ def get_lead_details(lead_id):
 
 @frappe.whitelist()
 @role_guard.api("partner")
-def update_lead_details(lead_name, lead_details):
-	lead_details = frappe._dict(lead_details)
+def update_lead_details(lead_name: str, lead_details: dict[str, Any]) -> None:
+	details = frappe._dict(lead_details)
 	doc = frappe.get_doc("Partner Lead", lead_name)
 	if not is_lead_team(lead_name):
 		frappe.throw("You are not allowed to update this lead")
 	doc.update(
 		{
-			"organization_name": lead_details.organization_name,
-			"full_name": lead_details.full_name,
-			"domain": lead_details.domain,
-			"email": lead_details.email,
-			"contact_no": lead_details.contact_no,
-			"state": lead_details.state,
-			"country": lead_details.country,
-			"plan_proposed": lead_details.plan_proposed,
-			"requirement": lead_details.requirement,
-			"probability": lead_details.probability,
+			"organization_name": details.organization_name,
+			"full_name": details.full_name,
+			"domain": details.domain,
+			"email": details.email,
+			"contact_no": details.contact_no,
+			"state": details.state,
+			"country": details.country,
+			"plan_proposed": details.plan_proposed,
+			"requirement": details.requirement,
+			"probability": details.probability,
 		}
 	)
 	doc.save(ignore_permissions=True)
@@ -857,27 +873,28 @@ def update_lead_details(lead_name, lead_details):
 
 @frappe.whitelist()
 @role_guard.api("partner")
-def update_lead_status(lead_name, status, **kwargs):  # noqa: C901
+def update_lead_status(lead_name: str, status: str, **kwargs: str) -> None:  # noqa: C901
 	if not is_lead_team(lead_name):
 		frappe.throw("You are not allowed to update this lead")
 
 	doc = frappe.get_doc("Partner Lead", lead_name)
-	status_dict = {"status": status}
+	status_dict: dict[str, Any] = {"status": status}
 
 	if status in ["Ready to Close", "Proposal/Quotation"]:
 		if kwargs.get("proposed_plan") and kwargs.get("expected_close_date"):
 			status_dict.update(
 				{
-					"plan_proposed": kwargs.get("proposed_plan"),
-					"estimated_closure_date": kwargs.get("expected_close_date"),
+					"plan_proposed": kwargs.get("proposed_plan") or "",
+					"estimated_closure_date": kwargs.get("expected_close_date") or "",
 				}
 			)
 	elif status == "Won":
-		site = kwargs.get("site_url").removeprefix("https://").removeprefix("http://").split("/")[0]
-		server = kwargs.get("server_name")
-		team = kwargs.get("team_name")
+		site_url = kwargs.get("site_url") or ""
+		site = site_url.removeprefix("https://").removeprefix("http://").split("/")[0]
+		server = kwargs.get("server_name") or ""
+		team = kwargs.get("team_name") or ""
 
-		amount = 0
+		amount = 0.0
 
 		if server:
 			Server = frappe.qb.DocType("Server")
@@ -935,8 +952,8 @@ def update_lead_status(lead_name, status, **kwargs):  # noqa: C901
 	elif status == "Lost":
 		status_dict.update(
 			{
-				"lost_reason": kwargs.get("lost_reason"),
-				"lost_reason_specify": kwargs.get("other_reason"),
+				"lost_reason": kwargs.get("lost_reason") or "",
+				"lost_reason_specify": kwargs.get("other_reason") or "",
 			}
 		)
 
@@ -945,7 +962,7 @@ def update_lead_status(lead_name, status, **kwargs):  # noqa: C901
 	doc.reload()
 
 
-def calculate_total_amount(server_name):
+def calculate_total_amount(server_name: str) -> float:
 	if not server_name:
 		return 0
 
@@ -965,7 +982,7 @@ def calculate_total_amount(server_name):
 	return result[0].total_amount if result else 0
 
 
-def calculate_total_team_amount(team_name):
+def calculate_total_team_amount(team_name: str) -> float:
 	subscriptions = frappe.get_all("Subscription", {"team": team_name, "enabled": 1}, ["plan_type", "plan"])
 
 	total_amount = 0
@@ -977,7 +994,7 @@ def calculate_total_team_amount(team_name):
 
 @frappe.whitelist()
 @role_guard.api("partner")
-def fetch_followup_details(id, lead):
+def fetch_followup_details(id: str, lead: str) -> list[dict] | None:
 	if not is_lead_team(lead):
 		return None
 
@@ -999,12 +1016,17 @@ def fetch_followup_details(id, lead):
 
 @frappe.whitelist()
 @role_guard.api("partner")
-def check_certificate_exists(email, type):
-	return frappe.db.count("Partner Certificate", {"partner_member_email": email, "course": type})
+def check_certificate_exists(email: str, certificate_type: str) -> int:
+	cert_options = ["frappe-developer-certification", "app-development-with-frappe-framework"]
+	if certificate_type == "erpnext":
+		cert_options = ["erpnext-distribution", "erpnext-training"]
+	return frappe.db.count(
+		"Partner Certificate", {"partner_member_email": email, "course": ("in", cert_options)}
+	)
 
 
 @frappe.whitelist()
-def get_fc_plans():
+def get_fc_plans() -> list[str]:
 	site_plans = frappe.get_all(
 		"Site Plan", {"enabled": 1, "document_type": "Site", "price_inr": (">", 0)}, pluck="name"
 	)
@@ -1013,32 +1035,32 @@ def get_fc_plans():
 
 @frappe.whitelist()
 @role_guard.api("partner")
-def update_followup_details(id, lead, followup_details):
+def update_followup_details(id: str, lead: str, followup_details: dict[str, Any]) -> None:
 	if not is_lead_team(lead):
 		frappe.throw("You are not allowed to update this followup")
 
-	followup_details = frappe._dict(followup_details)
+	details = frappe._dict(followup_details)
 	doc = frappe.get_doc("Partner Lead", lead)
 	if doc.followup and [row.name for row in doc.followup if row.name == id]:
 		for row in doc.followup:
 			if row.name == id:
-				row.date = frappe.utils.getdate(followup_details.followup_date)
-				row.communication_type = followup_details.communication_type
-				row.followup_by = followup_details.followup_by
-				row.spoke_to = followup_details.spoke_to
-				row.designation = followup_details.designation
-				row.discussion = followup_details.discussion
+				row.date = frappe.utils.getdate(details.followup_date)
+				row.communication_type = details.communication_type
+				row.followup_by = details.followup_by
+				row.spoke_to = details.spoke_to
+				row.designation = details.designation
+				row.discussion = details.discussion
 
 	else:
 		doc.append(
 			"followup",
 			{
-				"date": frappe.utils.getdate(followup_details.followup_date),
-				"communication_type": followup_details.communication_type,
-				"followup_by": followup_details.followup_by,
-				"spoke_to": followup_details.spoke_to,
-				"designation": followup_details.designation,
-				"discussion": followup_details.discussion,
+				"date": frappe.utils.getdate(details.followup_date),
+				"communication_type": details.communication_type,
+				"followup_by": details.followup_by,
+				"spoke_to": details.spoke_to,
+				"designation": details.designation,
+				"discussion": details.discussion,
 			},
 		)
 
@@ -1048,8 +1070,8 @@ def update_followup_details(id, lead, followup_details):
 
 @frappe.whitelist()
 @role_guard.api("partner")
-def add_new_lead(lead_details):
-	lead_details = frappe._dict(lead_details)
+def add_new_lead(lead_details: dict[str, Any]) -> None:
+	details = frappe._dict(lead_details)
 	team = get_current_team(get_doc=True)
 	if not team.erpnext_partner and team.partner_status != "Active":
 		frappe.throw("Only Active Partner team can add new leads.")
@@ -1057,18 +1079,18 @@ def add_new_lead(lead_details):
 	doc = frappe.new_doc("Partner Lead")
 	doc.update(
 		{
-			"organization_name": lead_details.organization_name,
-			"full_name": lead_details.full_name,
-			"domain": lead_details.domain,
-			"email": lead_details.email,
-			"lead_name": lead_details.lead_name,
-			"contact_no": lead_details.contact_no,
-			"state": lead_details.state,
-			"country": lead_details.country,
-			"requirement": lead_details.requirement,
+			"organization_name": details.organization_name,
+			"full_name": details.full_name,
+			"domain": details.domain,
+			"email": details.email,
+			"lead_name": details.lead_name,
+			"contact_no": details.contact_no,
+			"state": details.state,
+			"country": details.country,
+			"requirement": details.requirement,
 			"partner_team": get_current_team(),
-			"lead_source": lead_details.lead_source or "Partner Owned",
-			"lead_type": lead_details.lead_type,
+			"lead_source": details.lead_source or "Partner Owned",
+			"lead_type": details.lead_type,
 			"status": "Open",
 		}
 	)
@@ -1078,7 +1100,7 @@ def add_new_lead(lead_details):
 
 @frappe.whitelist()
 @role_guard.api("partner")
-def can_apply_for_certificate():
+def can_apply_for_certificate() -> dict | None:
 	from press.utils.billing import get_frappe_io_connection
 
 	team = get_current_team(get_doc=True)
@@ -1090,5 +1112,5 @@ def can_apply_for_certificate():
 
 @frappe.whitelist()
 @role_guard.api("partner")
-def delete_followup(id):
+def delete_followup(id: str) -> None:
 	frappe.delete_doc("Lead Followup", id)
diff --git a/press/api/payment.py b/press/api/payment.py
deleted file mode 100644
index f7006b05de6..00000000000
--- a/press/api/payment.py
+++ /dev/null
@@ -1,14 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright (c) 2019, Frappe and contributors
-# For license information, please see license.txt
-
-
-import frappe
-
-
-@frappe.whitelist()
-def all():
-	payments = frappe.get_all(
-		"Payment", fields=["name"], filters={"user": frappe.session.user}
-	)
-	return payments
diff --git a/press/api/site.py b/press/api/site.py
index 2e55b739243..79c005c5617 100644
--- a/press/api/site.py
+++ b/press/api/site.py
@@ -23,6 +23,7 @@
 from press.access.support_access import has_support_access
 from press.guards import role_guard
 from press.press.doctype.agent_job.agent_job import job_detail
+from press.press.doctype.app.app import get_app_from_policies
 from press.press.doctype.marketplace_app.marketplace_app import (
 	get_plans_for_app,
 	get_total_installs_by_app,
@@ -664,8 +665,15 @@ def backups(name):
 @frappe.whitelist()
 @protected("Site")
 def get_backup_link(name, backup, file):
+	if file not in ["database", "public", "private", "config"]:
+		frappe.throw("Invalid file type")  # nosemgrep
+
 	try:
-		remote_file = frappe.db.get_value("Site Backup", backup, f"remote_{file}_file")
+		remote_file = frappe.db.get_value(
+			"Site Backup",
+			{"name": backup, "site": name},
+			f"remote_{file}_file",
+		)
 		return frappe.get_doc("Remote File", remote_file).download_link
 	except ClientError:
 		log_error(title="Offsite Backup Response Exception")
@@ -869,6 +877,35 @@ def _get_team_dedicated_server_info(for_server: str | None = None):
 	}
 
 
+@frappe.whitelist()
+def get_release_group_policies_for_site(version: str | None = None, for_bench: str | None = None):
+	"""Get mandatory apps from polices for a given version
+	If a bench is specified we can get the version from there otherwise we will use the version passed as argument
+	"""
+	from press.press.doctype.bench.bench import get_apps_in_bench
+
+	apps_in_bench = set()
+
+	if not version and not for_bench:
+		frappe.throw("Version or bench must be specified", frappe.ValidationError)
+
+	if not version and for_bench:
+		version = frappe.db.get_value("Release Group", for_bench, "version")
+
+	if for_bench:
+		apps_in_bench = set(get_apps_in_bench(for_bench))
+
+	assert version, "Version must be specified or derived from bench"
+
+	mandatory_apps = {
+		app["app"]
+		for app in get_app_from_policies(scope="Frappe Version", target=version, for_installation=True)
+	}
+	mandatory_apps = mandatory_apps.intersection(apps_in_bench)
+
+	return {"policies": list(mandatory_apps)}
+
+
 @frappe.whitelist()
 def options_for_new(for_bench: str | None = None, for_server: str | None = None):  # noqa: C901
 	from press.press.doctype.cloud_provider.cloud_provider import get_cloud_providers
diff --git a/press/api/tests/test_github.py b/press/api/tests/test_github.py
new file mode 100644
index 00000000000..09cb39e75bd
--- /dev/null
+++ b/press/api/tests/test_github.py
@@ -0,0 +1,239 @@
+from __future__ import annotations
+
+import json
+from base64 import urlsafe_b64decode, urlsafe_b64encode
+from unittest.mock import Mock, patch
+from urllib.parse import urlencode
+
+import frappe
+from frappe.tests.ui_test_helpers import create_test_user
+from frappe.tests.utils import FrappeTestCase
+
+
+class TestGitHubAuthorization(FrappeTestCase):
+	def setUp(self):
+		super().setUp()
+		self.team = self._create_test_team()
+		self._ensure_team_membership(self.team, self.team.user)
+		frappe.set_user(self.team.user)
+		self._set_form_dict()
+
+	def tearDown(self):
+		frappe.set_user("Administrator")
+		frappe.db.rollback()
+
+	def test_encode_github_oauth_state_binds_redirect_and_user(self):
+		state = self._encode_github_oauth_state(
+			self.team.name,
+			f"{frappe.utils.get_url()}/dashboard/sites?tab=apps#new",
+		)
+
+		payload = self._decode_github_oauth_state(state)
+
+		self.assertEqual(payload["team"], self.team.name)
+		self.assertEqual(payload["redirect_url"], "/dashboard/sites?tab=apps#new")
+
+	def test_decode_github_oauth_state_allows_same_user_after_session_change(self):
+		state = self._encode_github_oauth_state(self.team.name, "/dashboard/sites")
+		original_sid = frappe.session.sid
+		frappe.session.sid = frappe.generate_hash(length=10)
+
+		try:
+			payload = self._decode_github_oauth_state(state)
+		finally:
+			frappe.session.sid = original_sid
+
+		self.assertEqual(payload["team"], self.team.name)
+		self.assertEqual(payload["redirect_url"], "/dashboard/sites")
+
+	def test_get_context_redirects_guest_to_login_with_callback(self):
+		state = self._encode_github_oauth_state(self.team.name, "/dashboard/sites")
+		frappe.set_user("Guest")
+		self._set_form_dict(code="oauth-code", state=state)
+		callback_url = f"/github/authorize?{urlencode({'code': 'oauth-code', 'state': state})}"
+		login_url = frappe.utils.get_url(f"/dashboard/login?{urlencode({'redirect': callback_url})}")
+
+		with self.assertRaises(frappe.Redirect):
+			self._get_context()(None)
+
+		self.assertEqual(frappe.flags.redirect_location, login_url)
+
+	def test_get_context_rejects_tampered_state(self):
+		state = self._encode_github_oauth_state(self.team.name, "/dashboard/sites")
+		payload = self._decode_state_payload(state)
+		payload["team"] = self._create_test_team().name
+		tampered_state = self._replace_state_payload(state, payload)
+
+		self._set_form_dict(code="oauth-code", state=tampered_state)
+
+		with (
+			self.assertRaises(frappe.Redirect),
+			patch("press.www.github.authorize.obtain_access_token") as obtain_access_token,
+			patch("press.www.github.authorize.log_error") as log_error,
+			patch("press.www.github.authorize.frappe.db.commit", new=Mock()),
+		):
+			self._get_context()(None)
+
+		obtain_access_token.assert_not_called()
+		log_error.assert_called_once()
+		self.assertNotIn("code", log_error.call_args.kwargs)
+		self.assertEqual(frappe.flags.redirect_location, frappe.utils.get_url("/dashboard"))
+
+	def test_get_context_rejects_team_removed_after_state_was_issued(self):
+		shared_team = self._create_test_team()
+		self._ensure_team_membership(shared_team, shared_team.user)
+		self._ensure_team_membership(shared_team, self.team.user)
+		self.assertIn(
+			shared_team.name,
+			{team_doc["name"] for team_doc in self._get_valid_teams_for_user(self.team.user)},
+		)
+
+		state = self._encode_github_oauth_state(shared_team.name, "/dashboard/sites")
+		self._remove_team_member(shared_team, self.team.user)
+		self._set_form_dict(code="oauth-code", state=state)
+
+		with (
+			self.assertRaises(frappe.Redirect),
+			patch("press.www.github.authorize.obtain_access_token") as obtain_access_token,
+			patch("press.www.github.authorize.log_error") as log_error,
+			patch("press.www.github.authorize.frappe.db.commit", new=Mock()),
+		):
+			self._get_context()(None)
+
+		obtain_access_token.assert_not_called()
+		log_error.assert_called_once()
+		self.assertNotIn("code", log_error.call_args.kwargs)
+		self.assertEqual(frappe.flags.redirect_location, frappe.utils.get_url("/dashboard"))
+
+	def test_obtain_access_token_redacts_oauth_code_and_token_from_logs(self):
+		response = {
+			"access_token": "secret-token",
+			"scope": "repo",
+			"token_type": "bearer",
+		}
+
+		with (
+			patch("press.www.github.authorize.requests.post") as post,
+			patch("press.www.github.authorize.log_error") as log_error,
+			patch(
+				"press.www.github.authorize.frappe.db.get_single_value",
+				side_effect=["client-id", "client-secret"],
+			),
+			patch(
+				"press.www.github.authorize.frappe.db.set_value",
+				side_effect=RuntimeError("db failure"),
+			),
+		):
+			post.return_value.json.return_value = response
+			self._obtain_access_token()("oauth-code", self.team.name)
+
+		log_error.assert_called_once()
+		self.assertNotIn("code", log_error.call_args.kwargs)
+		self.assertEqual(
+			log_error.call_args.kwargs["response"],
+			{
+				"error": None,
+				"error_description": None,
+				"error_uri": None,
+				"has_access_token": True,
+				"scope": "repo",
+				"token_type": "bearer",
+			},
+		)
+
+	def _decode_state_payload(self, state: str) -> dict[str, str]:
+		encoded_payload = state.rsplit(".", 1)[0]
+		padding = "=" * (-len(encoded_payload) % 4)
+		return json.loads(urlsafe_b64decode(f"{encoded_payload}{padding}").decode())
+
+	def _decode_github_oauth_state(self, state: str) -> dict[str, str]:
+		from press.api.github import decode_github_oauth_state
+
+		return decode_github_oauth_state(state)
+
+	def _encode_github_oauth_state(self, team: str, redirect_url: str) -> str:
+		from press.api.github import encode_github_oauth_state
+
+		return encode_github_oauth_state(team, redirect_url)
+
+	def _ensure_team_membership(self, team, user: str):
+		if frappe.db.exists("Team Member", {"parent": team.name, "user": user}):
+			return
+
+		now = frappe.utils.now()
+		frappe.db.sql(
+			"""
+			INSERT INTO `tabTeam Member`
+				(name, creation, modified, modified_by, owner, docstatus, idx, parent, parentfield, parenttype, user)
+			VALUES
+				(%s, %s, %s, %s, %s, 0, 1, %s, %s, %s, %s)
+			""",
+			(
+				frappe.generate_hash(length=10),
+				now,
+				now,
+				"Administrator",
+				"Administrator",
+				team.name,
+				"team_members",
+				"Team",
+				user,
+			),
+		)
+
+	def _create_test_team(self):
+		user = frappe.mock("email")
+		create_test_user(user)
+		now = frappe.utils.now()
+		team = frappe._dict(name=frappe.generate_hash(length=10), user=user)
+		frappe.db.sql(
+			"""
+			INSERT INTO `tabTeam`
+				(name, creation, modified, modified_by, owner, docstatus, idx, enabled, user, country, currency, billing_name)
+			VALUES
+				(%s, %s, %s, %s, %s, 0, 0, 1, %s, %s, %s, %s)
+			""",
+			(
+				team.name,
+				now,
+				now,
+				"Administrator",
+				"Administrator",
+				team.user,
+				"India",
+				"INR",
+				team.user,
+			),
+		)
+		return team
+
+	def _get_context(self):
+		from press.www.github.authorize import get_context
+
+		return get_context
+
+	def _obtain_access_token(self):
+		from press.www.github.authorize import obtain_access_token
+
+		return obtain_access_token
+
+	def _get_valid_teams_for_user(self, user: str):
+		from press.utils import get_valid_teams_for_user
+
+		return get_valid_teams_for_user(user)
+
+	def _remove_team_member(self, team, user: str):
+		frappe.db.delete("Team Member", {"parent": team.name, "user": user})
+
+	def _replace_state_payload(self, state: str, payload: dict[str, str]) -> str:
+		encoded_payload, signature = state.rsplit(".", 1)
+		encoded_payload = (
+			urlsafe_b64encode(json.dumps(payload, separators=(",", ":"), sort_keys=True).encode())
+			.decode()
+			.rstrip("=")
+		)
+		return f"{encoded_payload}.{signature}"
+
+	def _set_form_dict(self, **kwargs):
+		frappe.flags.redirect_location = None
+		frappe.local.form_dict = frappe._dict(kwargs)
diff --git a/press/api/tests/test_marketplace.py b/press/api/tests/test_marketplace.py
index 72bb8f484b8..a44cb95c586 100644
--- a/press/api/tests/test_marketplace.py
+++ b/press/api/tests/test_marketplace.py
@@ -10,6 +10,7 @@
 
 from press.api.marketplace import (
 	add_app,
+	add_app_screenshot,
 	add_version,
 	become_publisher,
 	branches,
@@ -30,11 +31,8 @@
 	remove_version,
 	reset_features_for_plan,
 	subscriptions,
-	update_app_description,
-	update_app_links,
+	update_app_image,
 	update_app_plan,
-	update_app_summary,
-	update_app_title,
 	update_publisher_profile,
 )
 from press.marketplace.doctype.marketplace_app_plan.test_marketplace_app_plan import (
@@ -244,42 +242,6 @@ def test_get_app(self):
 		app = get_app(self.app.name)
 		self.assertEqual(app.name, self.app.name)
 
-	def test_update_app_title(self):
-		frappe.set_user(self.team.user)
-		update_app_title(self.marketplace_app.name, "New Title")
-		self.marketplace_app.reload()
-		self.assertEqual(self.marketplace_app.title, "New Title")
-
-	def test_update_app_links(self):
-		frappe.set_user(self.team.user)
-		update_app_links(
-			self.marketplace_app.name,
-			{
-				"website": "https://github.com",
-				"support": "https://github.com",
-				"documentation": "https://github.com",
-				"privacy_policy": "https://github.com",
-				"terms_of_service": "https://github.com",
-			},
-		)
-		self.marketplace_app.reload()
-		self.assertEqual(self.marketplace_app.website, "https://github.com")
-		self.assertEqual(self.marketplace_app.support, "https://github.com")
-
-	def test_update_app_summary(self):
-		frappe.set_user(self.team.user)
-		summary = frappe.mock("paragraph")[:140]
-		update_app_summary(self.marketplace_app.name, summary)
-		self.marketplace_app.reload()
-		self.assertEqual(self.marketplace_app.description, summary)
-
-	def test_update_app_description(self):
-		frappe.set_user(self.team.user)
-		desc = frappe.mock("paragraph")
-		update_app_description(self.marketplace_app.name, desc)
-		self.marketplace_app.reload()
-		self.assertEqual(self.marketplace_app.long_description, desc)
-
 	def test_releases(self):
 		frappe.set_user(self.team.user)
 		r = releases({"app": self.marketplace_app.name, "source": self.app_source.name})
@@ -370,3 +332,108 @@ def test_branches(self):
 		)
 		results = branches(self.app_source.name)
 		self.assertEqual(len(results), 2)
+
+	def test_update_app_image_by_owner(self):
+		frappe.set_user(self.team.user)
+		_setup_fake_upload(self.marketplace_app.name)
+
+		file_url = update_app_image()
+
+		self.marketplace_app.reload()
+		self.assertTrue(file_url)
+		self.assertEqual(self.marketplace_app.image, file_url)
+
+	def test_update_app_image_blocked_for_non_owner(self):
+		other_team = create_test_press_admin_team()
+		frappe.set_user(other_team.user)
+		_setup_fake_upload(self.marketplace_app.name)
+
+		with self.assertRaises(frappe.PermissionError):
+			update_app_image()
+
+		self.marketplace_app.reload()
+		self.assertFalse(self.marketplace_app.image)
+
+	def test_add_app_screenshot_by_owner(self):
+		frappe.set_user(self.team.user)
+		_setup_fake_upload(self.marketplace_app.name)
+
+		file_url = add_app_screenshot()
+
+		self.marketplace_app.reload()
+		self.assertTrue(file_url)
+		self.assertEqual(len(self.marketplace_app.screenshots), 1)
+		self.assertEqual(self.marketplace_app.screenshots[0].image, file_url)
+
+	def test_add_app_screenshot_blocked_for_non_owner(self):
+		other_team = create_test_press_admin_team()
+		frappe.set_user(other_team.user)
+		_setup_fake_upload(self.marketplace_app.name)
+
+		with self.assertRaises(frappe.PermissionError):
+			add_app_screenshot()
+
+		self.marketplace_app.reload()
+		self.assertEqual(len(self.marketplace_app.screenshots), 0)
+
+	def test_update_app_image_rejects_svg(self):
+		"""SVG files can contain inline <script> tags — reject to prevent stored XSS."""
+		frappe.set_user(self.team.user)
+		_setup_fake_upload(
+			self.marketplace_app.name,
+			content=b'<svg xmlns="http://www.w3.org/2000/svg"><script>alert(1)</script></svg>',
+			filename="evil.svg",
+		)
+
+		with self.assertRaises(frappe.ValidationError):
+			update_app_image()
+
+		self.marketplace_app.reload()
+		self.assertFalse(self.marketplace_app.image)
+
+	def test_add_app_screenshot_rejects_svg(self):
+		"""SVG files can contain inline <script> tags — reject to prevent stored XSS."""
+		frappe.set_user(self.team.user)
+		_setup_fake_upload(
+			self.marketplace_app.name,
+			content=b'<svg xmlns="http://www.w3.org/2000/svg"><script>alert(1)</script></svg>',
+			filename="evil.svg",
+		)
+
+		with self.assertRaises(frappe.ValidationError):
+			add_app_screenshot()
+
+		self.marketplace_app.reload()
+		self.assertEqual(len(self.marketplace_app.screenshots), 0)
+
+	def test_add_app_screenshot_rejects_html(self):
+		"""HTML uploads are equally dangerous — reject any non-image extension."""
+		frappe.set_user(self.team.user)
+		_setup_fake_upload(
+			self.marketplace_app.name,
+			content=b"<html><body><script>alert(1)</script></body></html>",
+			filename="page.html",
+		)
+
+		with self.assertRaises(frappe.ValidationError):
+			add_app_screenshot()
+
+		self.marketplace_app.reload()
+		self.assertEqual(len(self.marketplace_app.screenshots), 0)
+
+
+def _make_test_image(size=300):
+	from io import BytesIO
+
+	from PIL import Image
+
+	buf = BytesIO()
+	Image.new("RGB", (size, size), color="red").save(buf, format="PNG")
+	return buf.getvalue()
+
+
+def _setup_fake_upload(app_name, content=None, filename=None):
+	"""Set frappe.local/form_dict fields to simulate a file upload."""
+	frappe.local.uploaded_file = content or _make_test_image()
+	frappe.local.uploaded_filename = filename or "test_image.png"
+	frappe.form_dict.docname = app_name
diff --git a/press/api/tests/test_site.py b/press/api/tests/test_site.py
index 71af463ac59..63ccfdadba7 100644
--- a/press/api/tests/test_site.py
+++ b/press/api/tests/test_site.py
@@ -32,6 +32,7 @@
 from press.press.doctype.root_domain.test_root_domain import create_test_root_domain
 from press.press.doctype.server.test_server import create_test_server
 from press.press.doctype.site.test_site import create_test_site
+from press.press.doctype.site_backup.test_site_backup import create_test_site_backup
 from press.press.doctype.site_plan.test_site_plan import create_test_plan
 from press.press.doctype.team.test_team import create_test_press_admin_team
 
@@ -470,6 +471,46 @@ def test_available_apps_shows_apps_installed_in_bench_but_not_in_site(self):
 		self.assertEqual(out[0]["name"], group.apps[1].source)
 		self.assertEqual(out[0]["app"], group.apps[1].app)
 
+	def test_get_backup_link_scopes_backup_to_site(self):
+		from press.api.site import get_backup_link
+
+		frappe.set_user("Administrator")
+		attacker_site = create_test_site(team=self.team.name)
+		victim_team = create_test_press_admin_team()
+		victim_site = create_test_site(team=victim_team.name)
+		victim_backup = create_test_site_backup(site=victim_site.name)
+		frappe.set_user(self.team.user)
+
+		def fake_get_doc(doctype, name):
+			self.assertEqual(doctype, "Remote File")
+			if not name:
+				raise frappe.DoesNotExistError
+			return Mock(download_link="http://test.com")
+
+		with (
+			self.assertRaises(frappe.DoesNotExistError),
+			patch("press.api.site.frappe.get_doc", side_effect=fake_get_doc),
+			patch("press.api.site.frappe.db.get_value", wraps=frappe.db.get_value) as mock_get_value,
+		):
+			get_backup_link(attacker_site.name, victim_backup.name, "database")
+
+		mock_get_value.assert_any_call(
+			"Site Backup",
+			{"name": victim_backup.name, "site": attacker_site.name},
+			"remote_database_file",
+		)
+
+	def test_get_backup_link_rejects_invalid_file_type(self):
+		from press.api.site import get_backup_link
+
+		frappe.set_user("Administrator")
+		site = create_test_site(team=self.team.name)
+		backup = create_test_site_backup(site=site.name)
+		frappe.set_user(self.team.user)
+
+		with self.assertRaisesRegex(frappe.ValidationError, "Invalid file type"):
+			get_backup_link(site.name, backup.name, "logs")
+
 	def test_check_dns_(self):
 		pass
 
diff --git a/press/frappe_compute_client/client.py b/press/frappe_compute_client/client.py
index 2c5cf025634..82333448cf3 100644
--- a/press/frappe_compute_client/client.py
+++ b/press/frappe_compute_client/client.py
@@ -81,3 +81,8 @@ def sync_virtual_machine_image(self, image_id: str):
 		return _dict(
 			self.client.get_api("orchestrator.api.virtual_machine_image.sync", {"image_id": image_id})
 		)
+
+	def increase_disk_size(self, volume_id: str, size: int):
+		return self.client.post_api(
+			"orchestrator.api.disk.increase_disk_size", {"volume_id": volume_id, "size": size}
+		)
diff --git a/press/hooks.py b/press/hooks.py
index b6a214b3259..b448fc731cf 100644
--- a/press/hooks.py
+++ b/press/hooks.py
@@ -231,6 +231,7 @@
 		"press.saas.doctype.product_trial_request.product_trial_request.gather_daily_stats",
 		"press.press.doctype.agent_job.agent_job.agent_poll_count_stats_daily",
 		"press.press.doctype.site_backup.site_backup.delete_backups_for_archived_sites_after_retention",
+		"press.press.doctype.site.site.notify_sites_before_archival",
 	],
 	"hourly": [
 		"press.press.doctype.site.backups.cleanup_local",
@@ -279,7 +280,6 @@
 	"all": [
 		"press.auth.flush",
 		"press.press.doctype.site.sync.sync_setup_wizard_status",
-		"press.press.doctype.site.archive.archive_suspended_trial_sites",
 		"press.press.doctype.agent_job.agent_job.flush",
 	],
 	"cron": {
diff --git a/press/marketplace/doctype/app_release_approval_code_comments/app_release_approval_code_comments.json b/press/marketplace/doctype/app_release_approval_code_comments/app_release_approval_code_comments.json
deleted file mode 100644
index 9cee24bc2bd..00000000000
--- a/press/marketplace/doctype/app_release_approval_code_comments/app_release_approval_code_comments.json
+++ /dev/null
@@ -1,65 +0,0 @@
-{
- "actions": [],
- "allow_rename": 1,
- "creation": "2024-08-20 14:44:43.708918",
- "doctype": "DocType",
- "editable_grid": 1,
- "engine": "InnoDB",
- "field_order": [
-  "filename",
-  "line_number",
-  "comment",
-  "time",
-  "commented_by"
- ],
- "fields": [
-  {
-   "fieldname": "filename",
-   "fieldtype": "Small Text",
-   "in_list_view": 1,
-   "label": "File Name",
-   "reqd": 1
-  },
-  {
-   "fieldname": "line_number",
-   "fieldtype": "Int",
-   "in_list_view": 1,
-   "label": "Line Number",
-   "reqd": 1
-  },
-  {
-   "fieldname": "time",
-   "fieldtype": "Datetime",
-   "in_list_view": 1,
-   "label": "Datetime",
-   "reqd": 1
-  },
-  {
-   "fieldname": "commented_by",
-   "fieldtype": "Link",
-   "in_list_view": 1,
-   "label": "Commented By",
-   "options": "User",
-   "reqd": 1
-  },
-  {
-   "fieldname": "comment",
-   "fieldtype": "Small Text",
-   "in_list_view": 1,
-   "label": "Comment",
-   "reqd": 1
-  }
- ],
- "index_web_pages_for_search": 1,
- "istable": 1,
- "links": [],
- "modified": "2024-08-22 23:00:39.858129",
- "modified_by": "Administrator",
- "module": "Marketplace",
- "name": "App Release Approval Code Comments",
- "owner": "Administrator",
- "permissions": [],
- "sort_field": "modified",
- "sort_order": "DESC",
- "states": []
-}
\ No newline at end of file
diff --git a/press/marketplace/doctype/marketplace_app_audit/marketplace_app_audit.js b/press/marketplace/doctype/marketplace_app_audit/marketplace_app_audit.js
index 2a366a01370..6c6381d5c02 100644
--- a/press/marketplace/doctype/marketplace_app_audit/marketplace_app_audit.js
+++ b/press/marketplace/doctype/marketplace_app_audit/marketplace_app_audit.js
@@ -16,6 +16,19 @@ frappe.ui.form.on('Marketplace App Audit', {
 			frappe.show_alert({ message: __('Audit re-queued'), indicator: 'blue' });
 			frm.reload_doc();
 		});
+
+		if (
+			frm.doc.status === 'Completed' &&
+			['Fail', 'Warn', 'Needs Improvement'].includes(frm.doc.audit_result)
+		) {
+			frm.add_custom_button(__('Send Report to Publisher'), async () => {
+				await frm.call('send_report_to_publisher');
+				frappe.show_alert({
+					message: __('Report sent to publisher'),
+					indicator: 'green',
+				});
+			});
+		}
 	},
 });
 
diff --git a/press/marketplace/doctype/marketplace_app_audit/marketplace_app_audit.py b/press/marketplace/doctype/marketplace_app_audit/marketplace_app_audit.py
index 6bbb50783e9..2b46ea4b18e 100644
--- a/press/marketplace/doctype/marketplace_app_audit/marketplace_app_audit.py
+++ b/press/marketplace/doctype/marketplace_app_audit/marketplace_app_audit.py
@@ -1,6 +1,7 @@
 # Copyright (c) 2026, Frappe and contributors
 # For license information, please see license.txt
 
+import json
 from dataclasses import asdict, dataclass
 
 import frappe
@@ -130,6 +131,7 @@ def run_audit(self):
 		finally:
 			self.finished_at = frappe.utils.now_datetime()
 			self.save()
+			self._handle_audit_outcome()
 
 	@frappe.whitelist()
 	def rerun_audit(self):
@@ -266,3 +268,103 @@ def _build_summary(self, tally: dict) -> str:
 				lines.append(f"  {severity}: {s['Fail']} failed, {s['Warn']} warnings")
 
 		return "\n".join(lines)
+
+	def _handle_audit_outcome(self):
+		"""
+		This method will ensure that some action is taken on the audit outcome.
+		"""
+		# first check if enable audit action is enabled in Marketplace settings
+		if not frappe.db.get_single_value("Marketplace Settings", "enable_audit_actions"):
+			return
+
+		if self.audit_result == "Fail":
+			# mark "attention required" status in marketplace app
+			frappe.db.set_value("Marketplace App", self.marketplace_app, "status", "Attention Required")
+			self._yank_release()
+			self._auto_reject_approval_requests()
+
+	def _yank_release(self) -> None:
+		"""
+		Yanks the release to prevent deployment on benches.
+		Creating a yanked app release record will automatically mark the release as yanked in it's after insert hook.
+		"""
+		release = frappe.get_doc("App Release", self.app_release)
+		if release.status in ("Draft", "Approved"):
+			frappe.get_doc(
+				doctype="Yanked App Release",
+				hash=release.hash,
+				parent_app_release=release.name,
+				team=release.team,
+			).insert()
+
+	def _auto_reject_approval_requests(self) -> None:
+		"""
+		Auto rejects all open approval requests for the release.
+		"""
+		open_approval_requests = frappe.get_all(
+			"App Release Approval Request",
+			filters={"app_release": self.app_release, "status": "Open"},
+			pluck="name",
+		)
+		if not open_approval_requests:
+			return
+
+		for approval_request in open_approval_requests:
+			request = frappe.get_doc("App Release Approval Request", approval_request)
+			request.status = "Rejected"
+			request.reason_for_rejection = (
+				f"Automated audit failed.\n\n"
+				f"Result: {str(self.audit_result).strip()}\n"
+				f"Summary: {str(self.audit_summary).strip()}\n\n"
+				f"Please review the audit results and fix the issues pointed."
+			)
+			request.save()
+
+	@frappe.whitelist()
+	def send_report_to_publisher(self):
+		"""Email the app publisher a structured audit report with all failing checks."""
+		marketplace_app_team, marketplace_app_title = frappe.db.get_value(
+			"Marketplace App", self.marketplace_app, ["team", "title"]
+		)
+		publisher_email = frappe.db.get_value("Team", marketplace_app_team, "user")
+
+		cc = []
+		if frappe.db.get_single_value("Marketplace Settings", "send_report_to_reviewer"):
+			reviewer_email = frappe.db.get_value("User", frappe.session.user, "email")
+			cc = [reviewer_email]
+
+		failing_checks = []
+		for check in self.audit_checks:
+			if check.result in ("Fail", "Warn"):
+				details_parsed = None
+				if check.details:
+					try:
+						details_parsed = json.loads(check.details)
+					except (json.JSONDecodeError, TypeError):
+						details_parsed = None
+
+				failing_checks.append(
+					{
+						"severity": check.severity,
+						"check_name": check.check_name,
+						"category": check.category,
+						"result": check.result,
+						"message": check.message,
+						"details": details_parsed,
+						"remediation": check.remediation,
+					}
+				)
+
+		frappe.sendmail(
+			recipients=[publisher_email],
+			cc=cc,
+			subject=f"Marketplace Audit Report: {marketplace_app_title}",
+			args={
+				"app_title": marketplace_app_title,
+				"audit_result": self.audit_result,
+				"audit_summary": self.audit_summary,
+				"failing_checks": failing_checks,
+			},
+			template="marketplace_audit_report",
+		)
+		frappe.msgprint(f"Audit report sent to {publisher_email}")
diff --git a/press/marketplace/doctype/marketplace_settings/marketplace_settings.json b/press/marketplace/doctype/marketplace_settings/marketplace_settings.json
index 4f09805e2f6..e7892f2db46 100644
--- a/press/marketplace/doctype/marketplace_settings/marketplace_settings.json
+++ b/press/marketplace/doctype/marketplace_settings/marketplace_settings.json
@@ -6,6 +6,10 @@
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
+  "general_section",
+  "enable_audit_actions",
+  "column_break_wvgs",
+  "send_report_to_reviewer",
   "featured_apps_section",
   "featured_apps",
   "release_auto_approval_section",
@@ -40,12 +44,35 @@
    "fieldtype": "Table",
    "label": "Auto Release Teams",
    "options": "Auto Release Team"
+  },
+  {
+   "fieldname": "general_section",
+   "fieldtype": "Section Break",
+   "label": "Audit Settings"
+  },
+  {
+   "default": "0",
+   "description": "Feature flag which gives power to the Marketplace Auditor to take actions based on audit results.",
+   "fieldname": "enable_audit_actions",
+   "fieldtype": "Check",
+   "label": "Enable Audit Actions"
+  },
+  {
+   "fieldname": "column_break_wvgs",
+   "fieldtype": "Column Break"
+  },
+  {
+   "default": "0",
+   "description": "Adds reviewer to CC while sending the report.",
+   "fieldname": "send_report_to_reviewer",
+   "fieldtype": "Check",
+   "label": "Send report to reviewer"
   }
  ],
  "index_web_pages_for_search": 1,
  "issingle": 1,
  "links": [],
- "modified": "2025-08-20 20:10:09.572230",
+ "modified": "2026-04-17 11:13:01.764809",
  "modified_by": "Administrator",
  "module": "Marketplace",
  "name": "Marketplace Settings",
diff --git a/press/marketplace/doctype/marketplace_settings/marketplace_settings.py b/press/marketplace/doctype/marketplace_settings/marketplace_settings.py
index 6e838d53e53..ca8c7c29b89 100644
--- a/press/marketplace/doctype/marketplace_settings/marketplace_settings.py
+++ b/press/marketplace/doctype/marketplace_settings/marketplace_settings.py
@@ -6,4 +6,22 @@
 
 
 class MarketplaceSettings(Document):
+	# begin: auto-generated types
+	# This code is auto-generated. Do not modify anything in this block.
+
+	from typing import TYPE_CHECKING
+
+	if TYPE_CHECKING:
+		from frappe.types import DF
+
+		from press.marketplace.doctype.auto_release_team.auto_release_team import AutoReleaseTeam
+		from press.marketplace.doctype.featured_app.featured_app import FeaturedApp
+
+		auto_release_apps: DF.Table[FeaturedApp]
+		auto_release_teams: DF.Table[AutoReleaseTeam]
+		enable_audit_actions: DF.Check
+		featured_apps: DF.Table[FeaturedApp]
+		send_report_to_reviewer: DF.Check
+	# end: auto-generated types
+
 	pass
diff --git a/press/marketplace/patches/cleanup_code_screening_data.py b/press/marketplace/patches/cleanup_code_screening_data.py
new file mode 100644
index 00000000000..20d7d50b10c
--- /dev/null
+++ b/press/marketplace/patches/cleanup_code_screening_data.py
@@ -0,0 +1,36 @@
+import frappe
+
+
+def execute():
+	"""
+	Clean up Code Screening data before bench migrate drops the columns.
+	- Null out screening fields on App Release Approval Request
+	- Null out review_stage on Marketplace App
+	- Delete orphaned App Release Approval Code Comments rows
+	(the child DocType is removed; bench trim-tables will drop the table later)
+	"""
+
+	screening_fields = [
+		"screening_status",
+		"baseline_request",
+		"baseline_result",
+		"baseline_requirements",
+		"result",
+		"result_html",
+		"result_html_rendered",
+		"requirements",
+	]
+
+	for field in screening_fields:
+		if frappe.db.has_column("App Release Approval Request", field):
+			frappe.db.sql(  # nosemgrep
+				f"UPDATE `tabApp Release Approval Request` SET `{field}` = NULL WHERE `{field}` IS NOT NULL"
+			)
+
+	marketplace_app = frappe.qb.DocType("Marketplace App")
+	frappe.qb.update(marketplace_app).set(marketplace_app.review_stage, None).where(
+		marketplace_app.review_stage.isnotnull()
+	).run()
+
+	if frappe.db.table_exists("tabApp Release Approval Code Comments"):
+		frappe.db.sql("DELETE FROM `tabApp Release Approval Code Comments`")  # nosemgrep
diff --git a/press/patches.txt b/press/patches.txt
index b882cbb3da9..ce6b75850f9 100644
--- a/press/patches.txt
+++ b/press/patches.txt
@@ -160,3 +160,5 @@ press.press.doctype.proxy_server.patches.set_use_as_proxy_for_agent_and_metrics_
 press.patches.v0_0_1.cancel_pending_version_upgrades_for_disabled_bench_groups
 press.partner.doctype.partner_lead.patches.merge_engagement_stage_to_status
 press.patches.v0_0_1.add_job_status_index_press_job_step
+press.patches.v0_8_0.set_suspended_at_for_suspended_sites
+press.marketplace.patches.cleanup_code_screening_data
diff --git a/press/patches/v0_8_0/set_suspended_at_for_suspended_sites.py b/press/patches/v0_8_0/set_suspended_at_for_suspended_sites.py
new file mode 100644
index 00000000000..bc9fe1dccce
--- /dev/null
+++ b/press/patches/v0_8_0/set_suspended_at_for_suspended_sites.py
@@ -0,0 +1,23 @@
+import frappe
+
+
+def execute():
+	suspended_sites = frappe.get_all("Site", filters={"status": "Suspended"}, pluck="name")
+
+	if not suspended_sites:
+		return
+
+	site_suspension_activity_records = frappe.get_all(
+		"Site Activity",
+		filters={
+			"action": "Suspend Site",
+			"site": ["in", suspended_sites],
+		},
+		fields=["site", "max(creation) as suspended_at"],
+		group_by="site",
+	)
+
+	for row in site_suspension_activity_records:
+		frappe.db.set_value("Site", row.site, "suspended_at", row.suspended_at, update_modified=False)
+
+	frappe.db.commit()
diff --git a/press/playbooks/downgrade_mariadb_to_10_6.yml b/press/playbooks/downgrade_mariadb_to_10_6.yml
new file mode 100644
index 00000000000..d73b3f844b4
--- /dev/null
+++ b/press/playbooks/downgrade_mariadb_to_10_6.yml
@@ -0,0 +1,8 @@
+---
+- name: Downgrade Mariadb To 10.6
+  hosts: all
+  become: true
+  become_user: root
+  gather_facts: true
+  roles:
+    - role: mariadb_10_11_to_10_6
diff --git a/press/playbooks/extend_frappe_compute_volume.yml b/press/playbooks/extend_frappe_compute_volume.yml
new file mode 100644
index 00000000000..faf7eaa037c
--- /dev/null
+++ b/press/playbooks/extend_frappe_compute_volume.yml
@@ -0,0 +1,8 @@
+---
+- name: Extend Frappe Compute Volume
+  hosts: all
+  become: yes
+  become_user: root
+  gather_facts: yes
+  roles:
+    - role: extend_frappe_compute_volume
diff --git a/press/playbooks/roles/extend_frappe_compute_volume/tasks/main.yml b/press/playbooks/roles/extend_frappe_compute_volume/tasks/main.yml
new file mode 100644
index 00000000000..ccc14df31a3
--- /dev/null
+++ b/press/playbooks/roles/extend_frappe_compute_volume/tasks/main.yml
@@ -0,0 +1,45 @@
+---
+- name: Show Volumes
+  command: df -hT
+
+- name: Show Block Devices
+  command: lsblk
+
+- name: Show Partitions
+  command: 'lsblk --noheadings --output PTTYPE {{ device }}'
+  register: lsblk_output
+
+- name: Set Partition Status
+  set_fact:
+    partitioned_disk: '{{ lsblk_output.stdout.strip() != "" }}'
+
+- name: Extend Partition
+  command: 'growpart {{ device }} 1'
+  register: result
+  until: result.rc == 0
+  retries: 10
+  delay: 10
+  when: partitioned_disk
+
+- name: Show Modified Block Devices
+  command: lsblk
+
+- name: Extend Partitioned Filesystem
+  command: 'resize2fs {{ device }}1'
+  when: partitioned_disk
+
+- name: Extend Un-partitioned Filesystem
+  command: 'resize2fs {{ device }}'
+  when: not partitioned_disk
+
+- name: Add Glass file back
+  command: fallocate -l 200M /root/glass
+
+- name: Show Modified Volumes
+  command: df -h
+
+- name: Restart MariaDB
+  service:
+    name: mysql
+    state: restarted
+  when: restart_mariadb | default(false) | bool
diff --git a/press/playbooks/roles/mariadb_10_11_to_10_6/tasks/main.yml b/press/playbooks/roles/mariadb_10_11_to_10_6/tasks/main.yml
new file mode 100644
index 00000000000..9c2365c72d7
--- /dev/null
+++ b/press/playbooks/roles/mariadb_10_11_to_10_6/tasks/main.yml
@@ -0,0 +1,171 @@
+- name: Get installed MariaDB version
+  ansible.builtin.command: mariadbd --version
+  register: mariadb_10_11_to_10_6_version_cmd
+  changed_when: false
+  failed_when: false
+
+- name: Parse installed MariaDB version
+  ansible.builtin.set_fact:
+    mariadb_10_11_to_10_6_current_version: >-
+      {{ '0.0.0' if mariadb_10_11_to_10_6_version_cmd.rc != 0 else
+         (mariadb_10_11_to_10_6_version_cmd.stdout
+          | regex_search('[0-9]+\.[0-9]+\.[0-9]+(?=-MariaDB)')
+          | default('0.0.0', true)) }}
+
+- name: Set target MariaDB version for downgrade
+  ansible.builtin.set_fact:
+    mariadb_10_11_to_10_6_target_version_prefix: '10.6.'
+    mariadb_10_11_to_10_6_requires_change: "{{ not (mariadb_10_11_to_10_6_current_version is match('^10\\.6\\..*')) }}"
+
+- name: Show detected MariaDB version
+  ansible.builtin.debug:
+    msg: "Detected MariaDB version: {{ mariadb_10_11_to_10_6_current_version }} (target branch is 10.6.x)"
+
+- name: Remove old MariaDB repository files
+  ansible.builtin.shell: rm -f /etc/apt/sources.list.d/*mariadb*.list
+  changed_when: false
+  failed_when: false
+  when: mariadb_10_11_to_10_6_requires_change | bool
+
+- name: Add MariaDB repository key
+  ansible.builtin.apt_key:
+    url: https://mariadb.org/mariadb_release_signing_key.pgp
+    state: present
+  when: mariadb_10_11_to_10_6_requires_change | bool
+
+- name: Add MariaDB 10.6 repository
+  ansible.builtin.apt_repository:
+    repo: deb https://mirror.rackspace.com/mariadb/repo/10.6/ubuntu {{ ansible_distribution_release }} main
+    state: present
+    update_cache: true
+  when: mariadb_10_11_to_10_6_requires_change | bool
+
+- name: Update APT cache
+  ansible.builtin.apt:
+    update_cache: true
+  environment:
+    DEBIAN_FRONTEND: noninteractive
+  when: mariadb_10_11_to_10_6_requires_change | bool
+
+- name: Ensure clean InnoDB shutdown mode before downgrade
+  ansible.builtin.command: mariadb -NBe "SET GLOBAL innodb_fast_shutdown=0;"
+  changed_when: false
+  failed_when: false
+  when: mariadb_10_11_to_10_6_requires_change | bool
+
+- name: Stop MariaDB service
+  ansible.builtin.systemd:
+    name: mariadb
+    state: stopped
+  when: mariadb_10_11_to_10_6_requires_change | bool
+
+- name: Get mariadb-server package candidates
+  ansible.builtin.shell: |
+    apt-cache madison mariadb-server | awk '/10\.6\./ {print $3; exit} END {exit 0}'
+  register: mariadb_10_11_to_10_6_server_10_6_version_cmd
+  changed_when: false
+  failed_when: false
+  when: mariadb_10_11_to_10_6_requires_change | bool
+
+- name: Get mariadb-client package candidates
+  ansible.builtin.shell: |
+    apt-cache madison mariadb-client | awk '/10\.6\./ {print $3; exit} END {exit 0}'
+  register: mariadb_10_11_to_10_6_client_10_6_version_cmd
+  changed_when: false
+  failed_when: false
+  when: mariadb_10_11_to_10_6_requires_change | bool
+
+- name: Set 10.6 package versions from apt-cache output
+  ansible.builtin.set_fact:
+    mariadb_10_11_to_10_6_server_10_6_version: >-
+      {{ mariadb_10_11_to_10_6_server_10_6_version_cmd.stdout | trim }}
+    mariadb_10_11_to_10_6_client_10_6_version: >-
+      {{ mariadb_10_11_to_10_6_client_10_6_version_cmd.stdout | trim }}
+  when: mariadb_10_11_to_10_6_requires_change | bool
+
+- name: Fail when 10.6 package versions are unavailable
+  ansible.builtin.fail:
+    msg: >-
+      Could not find MariaDB 10.6 package versions in APT metadata.
+      server='{{ mariadb_10_11_to_10_6_server_10_6_version | trim }}',
+      client='{{ mariadb_10_11_to_10_6_client_10_6_version | trim }}'.
+  when:
+    - mariadb_10_11_to_10_6_requires_change | bool
+    - mariadb_10_11_to_10_6_server_10_6_version | trim == '' or mariadb_10_11_to_10_6_client_10_6_version | trim == ''
+
+- name: Set MariaDB packages to 10.6 branch
+  ansible.builtin.command:
+    argv:
+      - apt-get
+      - -o
+      - Dpkg::Lock::Timeout=900
+      - -o
+      - Dpkg::Options::=--force-confdef
+      - -o
+      - Dpkg::Options::=--force-confold
+      - -y
+      - --allow-downgrades
+      - install
+      - mariadb-server={{ mariadb_10_11_to_10_6_server_10_6_version | trim }}
+      - mariadb-client={{ mariadb_10_11_to_10_6_client_10_6_version | trim }}
+  environment:
+    DEBIAN_FRONTEND: noninteractive
+    UCF_FORCE_CONFOLD: '1'
+    NEEDRESTART_MODE: a
+  register: mariadb_10_11_to_10_6_install_result
+  changed_when: "'0 upgraded, 0 newly installed' not in (mariadb_10_11_to_10_6_install_result.stdout | default(''))"
+  async: 3600
+  poll: 15
+  when: mariadb_10_11_to_10_6_requires_change | bool
+
+- name: Set open files count limit for MariaDB
+  ansible.builtin.lineinfile:
+    dest: /lib/systemd/system/mariadb.service
+    regexp: '^LimitNOFILE(\s*)=(\s*)\d+'
+    line: 'LimitNOFILE = infinity'
+    insertafter: '\[Service\]'
+    state: present
+  when: mariadb_10_11_to_10_6_requires_change | bool
+
+- name: Start MariaDB service
+  ansible.builtin.systemd:
+    daemon_reload: true
+    name: mariadb
+    state: started
+    enabled: true
+  when: mariadb_10_11_to_10_6_requires_change | bool
+
+- name: Run MariaDB upgrade after package version change
+  ansible.builtin.command: mariadb-upgrade
+  changed_when: false
+  when: mariadb_10_11_to_10_6_requires_change | bool
+
+- name: Get MariaDB version after downgrade
+  ansible.builtin.command: mariadbd --version
+  register: mariadb_10_11_to_10_6_post_version_cmd
+  changed_when: false
+  failed_when: false
+  when: mariadb_10_11_to_10_6_requires_change | bool
+
+- name: Parse MariaDB version after downgrade
+  ansible.builtin.set_fact:
+    mariadb_10_11_to_10_6_post_version: >-
+      {{ '0.0.0' if mariadb_10_11_to_10_6_post_version_cmd.rc != 0 else
+         (mariadb_10_11_to_10_6_post_version_cmd.stdout
+          | regex_search('[0-9]+\.[0-9]+\.[0-9]+(?=-MariaDB)')
+          | default('0.0.0', true)) }}
+  when: mariadb_10_11_to_10_6_requires_change | bool
+
+- name: Fail if MariaDB version is not in 10.6 branch after downgrade
+  ansible.builtin.fail:
+    msg: >-
+      MariaDB move to 10.6 branch did not complete as expected. Detected post-change version:
+      {{ mariadb_10_11_to_10_6_post_version }}
+  when:
+    - mariadb_10_11_to_10_6_requires_change | bool
+    - not (mariadb_10_11_to_10_6_post_version is match('^10\\.6\\..*'))
+
+- name: Skip MariaDB downgrade role when already on 10.6 branch
+  ansible.builtin.debug:
+    msg: "Skipping mariadb_10_11_to_10_6 role because installed version is {{ mariadb_10_11_to_10_6_current_version }}"
+  when: not (mariadb_10_11_to_10_6_requires_change | bool)
diff --git a/press/playbooks/roles/mariadb_10_4_to_10_6/tasks/main.yml b/press/playbooks/roles/mariadb_10_4_to_10_6/tasks/main.yml
index fb4729aa8e3..f5ec2e5c38e 100644
--- a/press/playbooks/roles/mariadb_10_4_to_10_6/tasks/main.yml
+++ b/press/playbooks/roles/mariadb_10_4_to_10_6/tasks/main.yml
@@ -1,85 +1,106 @@
-- name: Remove MariaDB Repository File
-  file:
-    path: /etc/apt/sources.list.d/mariadb.list
-    state: absent
+- name: Get installed MariaDB version
+  command: mariadbd --version
+  register: mariadb_10_4_to_10_6_version_cmd
+  changed_when: false
+  failed_when: false
 
-- name: Add MariaDB Repository Key
-  apt_key:
-    url: https://mariadb.org/mariadb_release_signing_key.pgp
-    state: present
+- name: Parse installed MariaDB version
+  set_fact:
+    mariadb_10_4_to_10_6_current_version: >-
+      {{ '0.0.0' if mariadb_10_4_to_10_6_version_cmd.rc != 0 else
+         (mariadb_10_4_to_10_6_version_cmd.stdout
+          | regex_search('[0-9]+\.[0-9]+\.[0-9]+(?=-MariaDB)')
+          | default('0.0.0', true)) }}
 
-# This seems to be breaking on some database servers
-# TODO: Move to container deployments
-- name: Add NGINX Repository Key
-  apt_key:
-    url: https://nginx.org/keys/nginx_signing.key
-    state: present
+- name: Upgrade MariaDB from 10.4 to 10.6 only when needed
+  when: mariadb_10_4_to_10_6_current_version is version('10.6.0', '<')
+  block:
+    - name: Remove MariaDB Repository File
+      file:
+        path: /etc/apt/sources.list.d/mariadb.list
+        state: absent
 
-- name: Add MariaDB Repository
-  apt_repository:
-    repo: deb https://mirror.rackspace.com/mariadb/repo/10.6/ubuntu {{ ansible_distribution_release }} main
-    state: present
-    update_cache: true
+    - name: Add MariaDB Repository Key
+      apt_key:
+        url: https://mariadb.org/mariadb_release_signing_key.pgp
+        state: present
 
-- name: Update APT Cache
-  apt:
-    update_cache: yes
+    # This seems to be breaking on some database servers
+    # TODO: Move to container deployments
+    - name: Add NGINX Repository Key
+      apt_key:
+        url: https://nginx.org/keys/nginx_signing.key
+        state: present
 
-- name: Use Debian Unattended Package Installation Mode
-  shell: export DEBIAN_FRONTEND=noninteractive
-  changed_when: false
+    - name: Add MariaDB Repository
+      apt_repository:
+        repo: deb https://mirror.rackspace.com/mariadb/repo/10.6/ubuntu {{ ansible_distribution_release }} main
+        state: present
+        update_cache: true
+
+    - name: Update APT Cache
+      apt:
+        update_cache: yes
+
+    - name: Use Debian Unattended Package Installation Mode
+      shell: export DEBIAN_FRONTEND=noninteractive
+      changed_when: false
 
-- name: Stop MariaDB Service
-  systemd:
-    name: mariadb
-    state: stopped
+    - name: Stop MariaDB Service
+      systemd:
+        name: mariadb
+        state: stopped
 
-- name: Install MariaDB
-  apt:
-    pkg:
-      - mariadb-server
-      - mariadb-client
-      - libmariadbclient18
-    state: latest
-  register: result
-  until: result.failed == false
-  retries: 5
-  delay: 120
+    - name: Install MariaDB
+      apt:
+        pkg:
+          - mariadb-server
+          - mariadb-client
+          - libmariadbclient18
+        state: latest
+      register: result
+      until: result.failed == false
+      retries: 5
+      delay: 120
 
-# In Mariadb 10.6, /etc/mysql/mariadb.conf.d/ superseds /etc/mysql/conf.d/. The way to fix it to add !includedir /etc/mysql/conf.d/ to the end of /etc/mysql/my.cnf
-# /etc/mysql/conf.d/ is in the second last line of /etc/mysql/my.cnf. Swapping is the way to go.
-- name: Remove /etc/mysql/conf.d/ from the file
-  lineinfile:
-    path: /etc/mysql/my.cnf
-    regexp: '^(!includedir /etc/mysql/conf.d/)$'
-    state: absent
+    # In Mariadb 10.6, /etc/mysql/mariadb.conf.d/ superseds /etc/mysql/conf.d/. The way to fix it to add !includedir /etc/mysql/conf.d/ to the end of /etc/mysql/my.cnf
+    # /etc/mysql/conf.d/ is in the second last line of /etc/mysql/my.cnf. Swapping is the way to go.
+    - name: Remove /etc/mysql/conf.d/ from the file
+      lineinfile:
+        path: /etc/mysql/my.cnf
+        regexp: '^(!includedir /etc/mysql/conf.d/)$'
+        state: absent
 
-- name: Add /etc/mysql/conf.d/ to the end of the file
-  lineinfile:
-    path: /etc/mysql/my.cnf
-    line: '!includedir /etc/mysql/conf.d/'
+    - name: Add /etc/mysql/conf.d/ to the end of the file
+      lineinfile:
+        path: /etc/mysql/my.cnf
+        line: '!includedir /etc/mysql/conf.d/'
 
-- name: Set Open Files Count Limit for MariaDB
-  lineinfile:
-    dest: /lib/systemd/system/mariadb.service
-    regexp: '^LimitNOFILE(\s*)=(\s*)\d+'
-    line: 'LimitNOFILE = infinity'
-    insertafter: '\[Service\]'
-    state: present
+    - name: Set Open Files Count Limit for MariaDB
+      lineinfile:
+        dest: /lib/systemd/system/mariadb.service
+        regexp: '^LimitNOFILE(\s*)=(\s*)\d+'
+        line: 'LimitNOFILE = infinity'
+        insertafter: '\[Service\]'
+        state: present
 
-- name: Start MariaDB Service
-  systemd:
-    daemon_reload: true
-    name: mariadb
-    state: started
-    enabled: yes
+    - name: Start MariaDB Service
+      systemd:
+        daemon_reload: true
+        name: mariadb
+        state: started
+        enabled: yes
 
-- name: Run MariaDB Upgrade
-  command: mariadb-upgrade
+    - name: Run MariaDB Upgrade
+      command: mariadb-upgrade
 
-- name: Restart MariaDB Service
-  systemd:
-    daemon_reload: true
-    name: mariadb
-    state: restarted
-    enabled: yes
+    - name: Restart MariaDB Service
+      systemd:
+        daemon_reload: true
+        name: mariadb
+        state: restarted
+        enabled: yes
+- name: Skip MariaDB 10.4 to 10.6 role when already upgraded
+  debug:
+    msg: "Skipping mariadb_10_4_to_10_6 role because installed version is {{ mariadb_10_4_to_10_6_current_version }}"
+  when: mariadb_10_4_to_10_6_current_version is version('10.6.0', '>=')
diff --git a/press/playbooks/roles/mariadb_10_6_to_11_8/tasks/main.yml b/press/playbooks/roles/mariadb_10_6_to_11_8/tasks/main.yml
new file mode 100644
index 00000000000..6d592678d86
--- /dev/null
+++ b/press/playbooks/roles/mariadb_10_6_to_11_8/tasks/main.yml
@@ -0,0 +1,112 @@
+- name: Get installed MariaDB version
+  ansible.builtin.command: mariadbd --version
+  register: mariadb_10_6_to_11_8_version_cmd
+  changed_when: false
+  failed_when: false
+
+- name: Parse installed MariaDB version
+  ansible.builtin.set_fact:
+    mariadb_10_6_to_11_8_current_version: >-
+      {{ '0.0.0' if mariadb_10_6_to_11_8_version_cmd.rc != 0 else
+         (mariadb_10_6_to_11_8_version_cmd.stdout
+          | regex_search('[0-9]+\.[0-9]+\.[0-9]+(?=-MariaDB)')
+          | default('0.0.0', true)) }}
+
+- name: Show detected MariaDB version
+  ansible.builtin.debug:
+    msg: "Detected MariaDB version: {{ mariadb_10_6_to_11_8_current_version }} (will upgrade if < 11.8.0)"
+
+- name: Remove all old MariaDB Repository Files from 10.6 and earlier
+  ansible.builtin.shell: rm -f /etc/apt/sources.list.d/*mariadb*.list
+  changed_when: false
+  failed_when: false
+  when: mariadb_10_6_to_11_8_current_version is version('11.8.0', '<')
+
+- name: Add MariaDB Repository Key
+  ansible.builtin.apt_key:
+    url: https://mariadb.org/mariadb_release_signing_key.pgp
+    state: present
+  when: mariadb_10_6_to_11_8_current_version is version('11.8.0', '<')
+
+# This seems to be breaking on some database servers
+# TODO: Move to container deployments
+- name: Add NGINX Repository Key
+  ansible.builtin.apt_key:
+    url: https://nginx.org/keys/nginx_signing.key
+    state: present
+  when: mariadb_10_6_to_11_8_current_version is version('11.8.0', '<')
+
+- name: Add MariaDB Repository
+  ansible.builtin.apt_repository:
+    repo: deb https://mirror.rackspace.com/mariadb/repo/11.8/ubuntu {{ ansible_distribution_release }} main
+    state: present
+    update_cache: true
+  when: mariadb_10_6_to_11_8_current_version is version('11.8.0', '<')
+
+- name: Update APT Cache
+  ansible.builtin.apt:
+    update_cache: true
+  environment:
+    DEBIAN_FRONTEND: noninteractive
+  when: mariadb_10_6_to_11_8_current_version is version('11.8.0', '<')
+
+- name: Ensure clean InnoDB shutdown mode before major upgrade
+  ansible.builtin.command: mariadb -NBe "SET GLOBAL innodb_fast_shutdown=0;"
+  changed_when: false
+  failed_when: false
+  when: mariadb_10_6_to_11_8_current_version is version('11.8.0', '<')
+
+- name: Stop MariaDB Service
+  ansible.builtin.systemd:
+    name: mariadb
+    state: stopped
+  when: mariadb_10_6_to_11_8_current_version is version('11.8.0', '<')
+
+- name: Install MariaDB
+  ansible.builtin.apt:
+    pkg:
+      - mariadb-server
+      - mariadb-client
+    state: latest
+  environment:
+    DEBIAN_FRONTEND: noninteractive
+  register: mariadb_10_6_to_11_8_install_result
+  until: mariadb_10_6_to_11_8_install_result.failed == false
+  retries: 5
+  delay: 120
+  when: mariadb_10_6_to_11_8_current_version is version('11.8.0', '<')
+
+- name: Set Open Files Count Limit for MariaDB
+  ansible.builtin.lineinfile:
+    dest: /lib/systemd/system/mariadb.service
+    regexp: '^LimitNOFILE(\s*)=(\s*)\d+'
+    line: 'LimitNOFILE = infinity'
+    insertafter: '\[Service\]'
+    state: present
+  when: mariadb_10_6_to_11_8_current_version is version('11.8.0', '<')
+
+- name: Start MariaDB Service
+  ansible.builtin.systemd:
+    daemon_reload: true
+    name: mariadb
+    state: started
+    enabled: true
+  when: mariadb_10_6_to_11_8_current_version is version('11.8.0', '<')
+
+- name: Run MariaDB Upgrade
+  ansible.builtin.command: mariadb-upgrade
+  changed_when: false
+  when: mariadb_10_6_to_11_8_current_version is version('11.8.0', '<')
+
+- name: Restart MariaDB Service
+  ansible.builtin.systemd:
+    daemon_reload: true
+    name: mariadb
+    state: restarted
+    enabled: true
+  when: mariadb_10_6_to_11_8_current_version is version('11.8.0', '<')
+
+- name: Skip MariaDB 10.6 to 11.8 role when already upgraded
+  ansible.builtin.debug:
+    msg: "Skipping mariadb_10_6_to_11_8 role because installed version is {{ mariadb_10_6_to_11_8_current_version }}"
+  when: mariadb_10_6_to_11_8_current_version is version('11.8.0', '>=')
diff --git a/press/playbooks/upgrade_mariadb.yml b/press/playbooks/upgrade_mariadb.yml
index 2bbd9aeb862..36ae16a621e 100644
--- a/press/playbooks/upgrade_mariadb.yml
+++ b/press/playbooks/upgrade_mariadb.yml
@@ -1,8 +1,9 @@
 ---
 - name: Upgrade Mariadb
   hosts: all
-  become: yes
+  become: true
   become_user: root
-  gather_facts: yes
+  gather_facts: true
   roles:
     - role: mariadb_10_4_to_10_6
+    - role: mariadb_10_6_to_11_8
diff --git a/press/press/doctype/agent_job/agent_job_notifications.py b/press/press/doctype/agent_job/agent_job_notifications.py
index a2fb2ce93f8..682324f2f3d 100644
--- a/press/press/doctype/agent_job/agent_job_notifications.py
+++ b/press/press/doctype/agent_job/agent_job_notifications.py
@@ -106,6 +106,7 @@ def handlers() -> list[UserAddressableHandlerTuple]:
 		("BrokenPipeError", update_with_broken_pipe_err),
 		("ERROR 2002 (HY000)", update_with_cant_connect_to_mysql_err),
 		("Lost connection to server during query", update_with_lost_conn_to_mysql_err),
+		("Lost connection to MySQL server during query", update_with_lost_conn_to_mysql_err),
 		("gzip: stdin: unexpected end of file", update_with_gzip_tar_err),
 		("tar: Unexpected EOF in archive", update_with_gzip_tar_err),
 		("Unknown command '\\-'.", update_with_unknown_command_hyphen_err),
@@ -284,9 +285,7 @@ def update_with_cant_connect_to_mysql_err(details: Details, job: AgentJob):
 def update_with_lost_conn_to_mysql_err(details: Details, job: AgentJob):
 	details["title"] = "Lost connection to MySQL server during query"
 
-	suggestion = (
-		"If the issue persists, please follow the steps mentioned in <i>Help</i> to rectify this issue"
-	)
+	suggestion = "If the issue persists, please consider upgrading the Database server for more memory. Please follow the steps mentioned in <i>Help</i> for instructions on how to upgrade the database server."
 	if job.on_public_server:
 		suggestion = "Please raise a support ticket if the issue persists."
 
diff --git a/press/press/doctype/app/app.py b/press/press/doctype/app/app.py
index 020a87ed417..ef38d05347e 100644
--- a/press/press/doctype/app/app.py
+++ b/press/press/doctype/app/app.py
@@ -1,25 +1,34 @@
 # Copyright (c) 2019, Frappe and contributors
 # For license information, please see license.txt
 
+from __future__ import annotations
 
 import typing
-from collections.abc import Iterator
 
 import frappe
 import rq
 import semantic_version as sv
 from frappe.model.document import Document
-from semantic_version.base import AllOf, AnyOf
 
 from press.utils.jobs import has_job_timeout_exceeded
 
 if typing.TYPE_CHECKING:
+	from collections.abc import Iterator
+
+	from semantic_version.base import AllOf, AnyOf
+
+	from press.press.doctype.app_release.app_release import AppRelease
 	from press.press.doctype.app_source.app_source import AppSource
 
 
 class VersioningError(Exception): ...
 
 
+class AppPolicyResult(typing.TypedDict):
+	app: str
+	source: str
+
+
 class App(Document):
 	# begin: auto-generated types
 	# This code is auto-generated. Do not modify anything in this block.
@@ -262,3 +271,87 @@ def parse_frappe_version(
 		return set([version_string] if isinstance(version_string, str) else version_string)
 
 	return set(map_frappe_version(version_string, frappe_versions, app_title, ease_versioning_constrains))
+
+
+def get_app_source_from_supported_versions(app: str, supported_versions: set[str]) -> AppSource | None:
+	"""From the provided versions fetch the app source which supports the latest version.
+	In case no app supports the latest version the just get whatever app source supports any of the provided versions.
+	"""
+	version_numbers = frappe.get_all(
+		"Frappe Version", {"name": ("in", supported_versions)}, ["name", "number"]
+	)
+	version_numbers = sorted(version_numbers, key=lambda x: x["number"], reverse=True)
+
+	app_source = frappe.qb.DocType("App Source")
+	app_source_version = frappe.qb.DocType("App Source Version")
+
+	base_query = (
+		frappe.qb.from_(app_source)
+		.join(app_source_version)
+		.on(app_source.name == app_source_version.parent)
+		.where(app_source.app == app)
+		.select(app_source.name)
+		.groupby(app_source.name)
+		.limit(1)
+	)
+
+	highest_priority_query = base_query.where(app_source_version.version == version_numbers[0]["name"])
+	highest_priority_app_source = highest_priority_query.run(pluck=True)
+
+	if highest_priority_app_source:
+		return frappe.get_doc("App Source", highest_priority_app_source[0])
+
+	any_matching_app_source = base_query.where(app_source_version.version.isin(supported_versions))
+	any_matching_app_source = any_matching_app_source.run(pluck=True)
+	return frappe.get_doc("App Source", any_matching_app_source[0]) if any_matching_app_source else None
+
+
+def get_latest_release_of_app_from_source(app_source: AppSource) -> AppRelease | None:
+	app_release_info = frappe.db.get_value(
+		"App Release",
+		{"app": app_source.app, "source": app_source.name},
+		["name", "hash"],
+		order_by="creation",
+	)
+
+	if not app_release_info:
+		return None
+
+	return frappe.get_doc("App Release", app_release_info[0])
+
+
+def get_app_from_policies(
+	scope: typing.Literal["Frappe Version", "Source", "App Release"],
+	target: str,
+	for_creation: bool = False,
+	for_installation: bool = False,
+	for_updates: bool = False,
+) -> list[AppPolicyResult]:
+	"""Get all apps based on the policy results for a given version string"""
+	ReleaseGroupPolicy = frappe.qb.DocType("Release Group Policy")
+	ReleaseGroupPolicyApp = frappe.qb.DocType("Release Group Policy App")
+
+	policy_result = (
+		frappe.qb.from_(ReleaseGroupPolicy)
+		.join(ReleaseGroupPolicyApp)
+		.on(ReleaseGroupPolicyApp.parent == ReleaseGroupPolicy.name)
+		.where(ReleaseGroupPolicy.scope == scope)
+		.where(ReleaseGroupPolicy.target == target)
+		.where(ReleaseGroupPolicy.status == "Active")
+		.select(ReleaseGroupPolicyApp.app, ReleaseGroupPolicyApp.source)
+	)
+
+	if for_creation:
+		policy_result = policy_result.where(
+			ReleaseGroupPolicyApp.add_on_creation == 1,
+		)
+
+	if for_installation:
+		policy_result = policy_result.where(
+			ReleaseGroupPolicyApp.install_on_site_creation == 1,
+		)
+
+	if for_updates:
+		policy_result = policy_result.where(ReleaseGroupPolicyApp.for_updates == 1)
+
+	return policy_result.run(as_dict=True)
diff --git a/press/press/doctype/app_release/app_release.py b/press/press/doctype/app_release/app_release.py
index 2ae1e23706a..2c61d0ed3f4 100644
--- a/press/press/doctype/app_release/app_release.py
+++ b/press/press/doctype/app_release/app_release.py
@@ -72,30 +72,28 @@ class AppRelease(Document):
 	def get_list_query(query, filters=None, **list_args):
 		app_release = frappe.qb.DocType("App Release")
 		release_approve_request = frappe.qb.DocType("App Release Approval Request")
+		marketplace_app_audit = frappe.qb.DocType("Marketplace App Audit")
 
-		# Subquery to get the latest screening_status for each app_release
-		latest_approval_request = (
+		approval_request_name = (
 			frappe.qb.from_(release_approve_request)
-			.select(release_approve_request.screening_status)
+			.select(release_approve_request.name)
 			.where(release_approve_request.app_release == app_release.name)
 			.orderby(release_approve_request.creation, order=frappe.qb.terms.Order.desc)
 			.limit(1)
 		)
 
-		# Subquery to get the latest name for each app_release
-		approval_request_name = (
-			frappe.qb.from_(release_approve_request)
-			.select(release_approve_request.name)
-			.where(release_approve_request.app_release == app_release.name)
-			.orderby(release_approve_request.creation, order=frappe.qb.terms.Order.desc)
+		latest_audit_result = (
+			frappe.qb.from_(marketplace_app_audit)
+			.select(marketplace_app_audit.audit_result)
+			.where(marketplace_app_audit.app_release == app_release.name)
+			.orderby(marketplace_app_audit.creation, order=frappe.qb.terms.Order.desc)
 			.limit(1)
 		)
 
-		# Main query that selects app_release fields and the latest screening_status and name
 		query = query.select(
 			app_release.name,
-			latest_approval_request.as_("screening_status"),
 			approval_request_name.as_("approval_request_name"),
+			latest_audit_result.as_("audit_result"),
 		)
 
 		return query  # noqa
diff --git a/press/press/doctype/app_release_approval_request/app_release_approval_request.html b/press/press/doctype/app_release_approval_request/app_release_approval_request.html
deleted file mode 100644
index 2339e427342..00000000000
--- a/press/press/doctype/app_release_approval_request/app_release_approval_request.html
+++ /dev/null
@@ -1,44 +0,0 @@
-
-{{ styles }}
-<style>
-    td .linenodiv {
-        background-color: #f0f0f0;
-        padding-right: 10px;
-    }
-
-    .highlight {
-        margin-left: 2rem;
-        background: #f8f8f8;
-    }
-
-    .issues {
-        padding-bottom: 1rem;
-        padding-top: 1rem;
-        padding-left: 2rem;
-    }
-</style>
-<div class="accordian" id="result_accordian">
-    {% for file in result %}
-    <div class="card">
-        <div class="card-header" id="heading_{{ file.id }}">
-            <button class="btn btn-link collapsed" data-toggle="collapse" data-parent="#result_accordian"
-                data-target="#collapse_{{ file.id }}">{{ file.name }} - {{ file.score }} issues</button>
-        </div>
-        <div id="collapse_{{ file.id }}" class="collapse" data-parent="#result_accordian">
-            <div class="card-body">
-                {% for line in file.lines %}
-                <div class="issues">
-                    {%for issue in line.issues %}
-                    <div>
-                        <strong>{{ issue.severity }}</strong> - <span>{{ issue.violation }}</span> -
-                        <code>{{ issue.match }}</code>
-                    </div>
-                    {% endfor %}
-                </div>
-                <div class="highlight">{{ line.highlighted_context }}</div>
-                {% endfor %}
-            </div>
-        </div>
-    </div>
-    {% endfor %}
-</div>
diff --git a/press/press/doctype/app_release_approval_request/app_release_approval_request.js b/press/press/doctype/app_release_approval_request/app_release_approval_request.js
index a540782a7f5..2af62df130b 100644
--- a/press/press/doctype/app_release_approval_request/app_release_approval_request.js
+++ b/press/press/doctype/app_release_approval_request/app_release_approval_request.js
@@ -9,18 +9,6 @@ frappe.ui.form.on('App Release Approval Request', {
 				frm.save();
 			});
 		}
-
-		if (!frm.doc.result && frm.doc.screening_status === 'Not Started') {
-			let btn = frm.add_custom_button('Screen Release', () => {
-				frm.call('start_screening');
-				frappe.msgprint('Started Screening');
-			});
-		}
-
-		if (frm.doc.result_html) {
-			let wrapper = frm.get_field('result_html_rendered').$wrapper;
-			wrapper.html(frm.doc.result_html);
-		}
 	},
 	status(frm) {
 		frm.set_value('reviewed_by', frappe.session.user);
diff --git a/press/press/doctype/app_release_approval_request/app_release_approval_request.json b/press/press/doctype/app_release_approval_request/app_release_approval_request.json
index 9c1e170d6de..2ce62b26a3c 100644
--- a/press/press/doctype/app_release_approval_request/app_release_approval_request.json
+++ b/press/press/doctype/app_release_approval_request/app_release_approval_request.json
@@ -13,20 +13,7 @@
   "app",
   "reviewed_by",
   "section_break_8",
-  "reason_for_rejection",
-  "code_screening_tab",
-  "screening_status",
-  "baseline_result_section",
-  "baseline_request",
-  "baseline_result",
-  "baseline_requirements",
-  "result_section",
-  "result",
-  "result_html",
-  "result_html_rendered",
-  "requirements",
-  "comments_tab",
-  "code_comments"
+  "reason_for_rejection"
  ],
  "fields": [
   {
@@ -93,83 +80,11 @@
    "fieldtype": "Link",
    "label": "Reviewed By",
    "options": "User"
-  },
-  {
-   "fieldname": "result",
-   "fieldtype": "Code",
-   "label": "Result",
-   "read_only": 1
-  },
-  {
-   "fieldname": "result_html",
-   "fieldtype": "Code",
-   "label": "Result Html",
-   "read_only": 1
-  },
-  {
-   "fieldname": "code_screening_tab",
-   "fieldtype": "Tab Break",
-   "label": "Code Screening"
-  },
-  {
-   "fieldname": "baseline_result_section",
-   "fieldtype": "Section Break",
-   "label": "Baseline Result"
-  },
-  {
-   "fieldname": "baseline_result",
-   "fieldtype": "Code",
-   "label": "Baseline Result",
-   "read_only": 1
-  },
-  {
-   "fieldname": "baseline_requirements",
-   "fieldtype": "Code",
-   "label": "Baseline Requirements",
-   "read_only": 1
-  },
-  {
-   "fieldname": "result_section",
-   "fieldtype": "Section Break",
-   "label": "Result"
-  },
-  {
-   "fieldname": "result_html_rendered",
-   "fieldtype": "HTML",
-   "label": "Result HTML Rendered"
-  },
-  {
-   "fieldname": "requirements",
-   "fieldtype": "Code",
-   "label": "Requirements"
-  },
-  {
-   "fieldname": "baseline_request",
-   "fieldtype": "Data",
-   "label": "Baseline Request"
-  },
-  {
-   "default": "Not Started",
-   "fieldname": "screening_status",
-   "fieldtype": "Select",
-   "label": "Screening Status",
-   "options": "Not Started\nScreening\nComplete"
-  },
-  {
-   "fieldname": "comments_tab",
-   "fieldtype": "Tab Break",
-   "label": "Comments"
-  },
-  {
-   "fieldname": "code_comments",
-   "fieldtype": "Table",
-   "label": "Code Comments",
-   "options": "App Release Approval Code Comments"
   }
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2025-08-22 22:42:15.984891",
+ "modified": "2026-04-09 17:39:08.003050",
  "modified_by": "Administrator",
  "module": "Press",
  "name": "App Release Approval Request",
diff --git a/press/press/doctype/app_release_approval_request/app_release_approval_request.py b/press/press/doctype/app_release_approval_request/app_release_approval_request.py
index 3f7f3875ebc..95f0197f76f 100644
--- a/press/press/doctype/app_release_approval_request/app_release_approval_request.py
+++ b/press/press/doctype/app_release_approval_request/app_release_approval_request.py
@@ -1,16 +1,9 @@
 # Copyright (c) 2021, Frappe and contributors
 # For license information, please see license.txt
 
-import glob
-import json
-import re
-
 import frappe
 from frappe.model.document import Document
 from frappe.model.naming import make_autoname
-from pygments import highlight
-from pygments.formatters import HtmlFormatter as HF
-from pygments.lexers import PythonLexer as PL
 
 
 class AppReleaseApprovalRequest(Document):
@@ -22,24 +15,11 @@ class AppReleaseApprovalRequest(Document):
 	if TYPE_CHECKING:
 		from frappe.types import DF
 
-		from press.marketplace.doctype.app_release_approval_code_comments.app_release_approval_code_comments import (
-			AppReleaseApprovalCodeComments,
-		)
-		from press.press.doctype.app_release.app_release import AppRelease
-
 		app: DF.Link | None
 		app_release: DF.Link
-		baseline_request: DF.Data | None
-		baseline_requirements: DF.Code | None
-		baseline_result: DF.Code | None
-		code_comments: DF.Table[AppReleaseApprovalCodeComments]
 		marketplace_app: DF.Link
 		reason_for_rejection: DF.TextEditor | None
-		requirements: DF.Code | None
-		result: DF.Code | None
-		result_html: DF.Code | None
 		reviewed_by: DF.Link | None
-		screening_status: DF.Literal["Not Started", "Screening", "Complete"]
 		status: DF.Literal["Open", "Cancelled", "Approved", "Rejected"]
 		team: DF.Link | None
 	# end: auto-generated types
@@ -47,11 +27,8 @@ class AppReleaseApprovalRequest(Document):
 	dashboard_fields = [  # noqa: RUF012
 		"name",
 		"marketplace_app",
-		"screening_status",
 		"app_release",
 		"status",
-		"result",
-		"code_comments",
 	]
 
 	def before_save(self):
@@ -85,6 +62,7 @@ def validate(self):
 	def before_insert(self):
 		self.request_already_exists()
 		self.another_request_awaiting_approval()
+		self.check_release_not_yanked()
 		self.update_release_status()
 
 	def request_already_exists(self):
@@ -194,208 +172,12 @@ def validate_audit_for_approval(self):
 				f"Summary: {audit.audit_summary or 'N/A'}"
 			)
 
-	@frappe.whitelist()
-	def start_screening(self):
-		self.release = frappe.get_doc("App Release", self.app_release, for_update=True)
-		self._set_baseline()
-
-		# Clone the release, if not already
-		self.release._clone()
-
-		self._screen_python_files()
-		self._filter_results()
-		self._render_html()
-
-		self.screening_status = "Complete"
-		self.save()
-
-	def _set_baseline(self):
-		approved_releases = frappe.get_all(
-			"App Release Approval Request",
-			fields=["name", "result", "requirements"],
-			filters={"status": "Approved", "app": self.app, "name": ("!=", self.name)},
-			order_by="creation desc",
-			limit=1,
-		)
-
-		if approved_releases:
-			baseline = approved_releases[0]
-			self.baseline_request = baseline.name
-			self.baseline_result = baseline.result
-			self.baseline_requirements = baseline.requirements
-
-	def _screen_python_files(self):
-		files = glob.glob(self.release.clone_directory + "/**/*.py", recursive=True)
-		result = []
-		for file in files:
-			lines = self._screen_python_file(file)
-			if lines:
-				name = file.replace(self.release.clone_directory, "", 1)[1:]
-				f = {
-					"name": name,
-					"lines": lines,
-					"score": len(lines),
-				}
-				result.append(f)
-		result = sorted(result, key=lambda x: x["score"], reverse=True)
-		self.result = json.dumps(result, indent=2)
-
-	def _screen_python_file(self, filename):
-		def is_commented_line(line):
-			stripped_line = line.strip()
-			return stripped_line.startswith("#")
-
-		with open(filename, "r") as ff:
-			lines = ff.read().splitlines()
-		lines_with_issues = []
-		for index, line in enumerate(lines):
-			if is_commented_line(line):
-				continue
-			issues = []
-			configuration = get_configuration()
-			for severity, violations in configuration.items():
-				for violation, keywords in violations.items():
-					pattern = r"(?:^|\W)({})(?:\W|$)".format("|".join(keywords))
-					regex = re.compile(pattern)
-					search = regex.search(line)
-					if search:
-						issues.append(
-							{
-								"severity": severity,
-								"violation": violation,
-								"match": search.group(1),
-							}
-						)
-			if issues:
-				context = get_context(lines, index)
-				lines_with_issues.append({"issues": issues, "context": context})
-		return lines_with_issues
-
-	def _filter_results(self):
-		result = json.loads(self.result)
-		if self.baseline_request and self.baseline_result:
-			baseline_result = json.loads(self.baseline_result)
-			diff_result = []
-			for file in result:
-				if file not in baseline_result:
-					diff_result.append(file)
-		else:
-			diff_result = result
-		self.diff_result = json.dumps(diff_result, indent=2)
-
-	def _render_html(self):
-		diff_result = json.loads(self.diff_result)
-		formatter = HF()
-		styles = f"<style>{formatter.get_style_defs()}</style>"
-		for file in diff_result:
-			file["id"] = file["name"].replace("/", "_").replace(".", "_")
-			for line in file["lines"]:
-				line["highlighted_context"] = highlight_context(line["context"])
-		html = frappe.render_template(
-			"press/press/doctype/app_release_approval_request/app_release_approval_request.html",
-			{"result": diff_result, "styles": styles},
-		)
-		self.result_html = html
-		self.result_html_rendered = html
-
-
-def get_context(lines, index, size=2):
-	length = len(lines)
-	start = max(0, index - size)
-	end = min(index + size, length)
-	lines = lines[start : end + 1]
-	return {
-		"line_number": index + 1,
-		"line_range": list(range(start + 1, end + 2)),
-		"lines": lines,
-	}
-
-
-def highlight_context(context):
-	line_number = context["line_number"]
-	line_range = context["line_range"]
-	lines = context["lines"]
-	code = "\n".join(lines)
-	formatter = HF(
-		linenos="table",
-		linenostart=line_range[0],
-		hl_lines=[line_number - line_range[0] + 1],
-	)
-	lexer = PL(stripnl=False, tabsize=4)
-	highlighted = highlight(code, lexer, formatter)
-	return highlighted  # noqa: RET504
-
-
-def get_configuration():
-	return {
-		"Critical": {
-			"Arbitrary Command Injection": ["os", "sys", "subprocess", "sysconfig"],
-			"Arbitrary Command Injection - Frappe": ["popen", "execute_in_shell"],
-			"Arbitrary Code Execution": [
-				"exec",
-				"eval",
-				"safe_eval",
-				"safe_exec",
-				"compile",
-				"codeop",
-			],
-			"Runtime Imports": [
-				"__import__",
-				"importlib",
-				"zipimport",
-				"runpy",
-				"pkgutil",
-				"modulefinder",
-			],
-			"Runtime Imports - Frappe": ["get_attr", "get_module"],
-			"Unsafe Serialization": ["pickle", "marshal"],
-			"Template Rendering": ["jinja", "jinja2"],
-			"Foreign Functions Library": ["ctypes"],
-			"Arbitrary Code Injection - Posix": [
-				"signal",
-				"syslog",
-				"pipes",
-				"fcntl",
-				"pty",
-				"tty",
-				"posix",
-				"pwd",
-				"grp",
-				"spwd",
-			],
-		},
-		"Major": {
-			"File Manipulation": [
-				"open",
-				"io",
-				"shutil",
-				"pathlib",
-				"fileinput",
-				"sqlite3",
-				"gzip",
-				"bz2",
-				"lzma",
-				"zipfile",
-			],
-			"File Manipulation - Frappe": ["touch_file", "get_file_json", "read_file"],
-			"Site Access": ["get_site_config", "get_sites"],
-		},
-		"Moderate": {
-			"Potential Screening Bypass": [
-				"globals",
-				"builtins",
-				"__globals__",
-				"__builtins__",
-				"__module__",
-				"__file__",
-				"__func__",
-				"__class__",
-				"__dict__",
-				"__self__",
-			],
-		},
-		"Low": {
-			"Debugging": ["inspect", "breakpoint"],
-			"Multiprocessing": ["multiprocessing", "threading"],
-		},
-	}
+	def check_release_not_yanked(self):
+		"""
+		Prevent approval requests for releases that failed audit and were yanked.
+		"""
+		release_status = frappe.db.get_value("App Release", self.app_release, "status")
+		if release_status == "Yanked":
+			frappe.throw(
+				"Cannot create a approval request for a yanked release. This release was yanked due to audit failure. Please fix the issues and publish a new release."
+			)
diff --git a/press/press/doctype/bench/bench.py b/press/press/doctype/bench/bench.py
index 809ef5d654b..0ca78ef2107 100644
--- a/press/press/doctype/bench/bench.py
+++ b/press/press/doctype/bench/bench.py
@@ -1856,4 +1856,18 @@ def identify_and_kill_zombie_benches(server: str, running_benches: list[str]):
 		frappe.log_error("Failed To Kill Zombie Benches", str(e))
 
 
+def get_apps_in_bench(bench_name: str):
+	"""Get a list of all apps added to the bench (might be quicker than a get_doc)"""
+	Bench = frappe.qb.DocType("Bench")
+	BenchApp = frappe.qb.DocType("Bench App")
+	return (
+		frappe.qb.from_(BenchApp)
+		.join(Bench)
+		.on(BenchApp.parent == Bench.name)
+		.where(Bench.name == bench_name)
+		.select(BenchApp.app)
+		.run(pluck=True)
+	)
+
+
 get_permission_query_conditions = get_permission_query_conditions_for_doctype("Bench")
diff --git a/press/press/doctype/database_server/database_server.js b/press/press/doctype/database_server/database_server.js
index 398160bd9db..9b471179cf0 100644
--- a/press/press/doctype/database_server/database_server.js
+++ b/press/press/doctype/database_server/database_server.js
@@ -108,7 +108,6 @@ frappe.ui.form.on('Database Server', {
 				true,
 				frm.doc.is_server_setup,
 			],
-			[__('Upgrade MariaDB'), 'upgrade_mariadb', true, frm.doc.is_server_setup],
 			[__('Update MariaDB'), 'update_mariadb', true, frm.doc.is_server_setup],
 			[
 				__('Upgrade MariaDB Patched'),
diff --git a/press/press/doctype/database_server/database_server.py b/press/press/doctype/database_server/database_server.py
index 3dd4ac2e62b..f3c3cc04c21 100644
--- a/press/press/doctype/database_server/database_server.py
+++ b/press/press/doctype/database_server/database_server.py
@@ -4,6 +4,7 @@
 
 import contextlib
 import json
+import re
 import subprocess
 from datetime import datetime
 from typing import TYPE_CHECKING, Any, Literal
@@ -564,7 +565,6 @@ def _stop_mariadb(self):
 	def run_upgrade_mariadb_job(self):
 		self.run_press_job("Upgrade MariaDB")
 
-	@frappe.whitelist()
 	def upgrade_mariadb(self):
 		frappe.enqueue_doc(self.doctype, self.name, "_upgrade_mariadb", timeout=1800)
 
@@ -581,6 +581,37 @@ def _upgrade_mariadb(self):
 		play = ansible.run()
 		if play.status == "Failure":
 			log_error("MariaDB Upgrade Error", server=self.name)
+		return play
+
+	def _downgrade_mariadb_to_10_6(self):
+		ansible = Ansible(
+			playbook="downgrade_mariadb_to_10_6.yml",
+			server=self,
+			user=self.ssh_user or "root",
+			port=self.ssh_port or 22,
+			variables={
+				"server": self.name,
+			},
+		)
+		play = ansible.run()
+		if play.status == "Failure":
+			log_error("MariaDB Downgrade Error", server=self.name)
+		return play
+
+	def get_mariadb_version_via_ssh(self) -> str | None:
+		try:
+			result = self.ansible_run("mariadbd --version")
+			version_info = result.get("output", "")
+			if not version_info:
+				return None
+
+			# Parse mariadbd output format, e.g. `10.6.25-MariaDB-...`.
+			version_match = re.search(r"(\d+\.\d+\.\d+)(?=-MariaDB)", version_info)
+			if version_match:
+				return version_match.group(1)
+		except Exception as e:
+			log_error("Error fetching MariaDB version via SSH", error=str(e), server=self.name)
+		return None
 
 	@frappe.whitelist()
 	def update_mariadb(self):
diff --git a/press/marketplace/doctype/app_release_approval_code_comments/__init__.py b/press/press/doctype/mariadb_upgrade/__init__.py
similarity index 100%
rename from press/marketplace/doctype/app_release_approval_code_comments/__init__.py
rename to press/press/doctype/mariadb_upgrade/__init__.py
diff --git a/press/press/doctype/mariadb_upgrade/mariadb_upgrade.js b/press/press/doctype/mariadb_upgrade/mariadb_upgrade.js
new file mode 100644
index 00000000000..309376187fb
--- /dev/null
+++ b/press/press/doctype/mariadb_upgrade/mariadb_upgrade.js
@@ -0,0 +1,46 @@
+// Copyright (c) 2026, Frappe and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('MariaDB Upgrade', {
+	refresh(frm) {
+		if (frm.doc.status == 'Pending') {
+			frm.add_custom_button(
+				'Start Upgrade',
+				() => {
+					frappe.confirm(
+						'Are you sure you want to start the MariaDB Upgrade? Please ensure that you have taken a backup of your data before proceeding.',
+						() => {
+							frm.call('start').then(() => {
+								frappe.msgprint(
+									'MariaDB Upgrade has been started. Please check the workflow for progress.',
+								);
+							});
+						},
+					);
+				},
+				__('Actions'),
+			);
+		}
+
+		if (
+			['Success', 'Recovered', 'Fatal'].includes(frm.doc.status) &&
+			frm.doc.snapshot
+		) {
+			frm.add_custom_button(
+				'Delete Snapshot',
+				() => {
+					frappe.confirm(
+						'Are you sure you want to delete the snapshot? This action cannot be undone.',
+						() => {
+							frm.call('delete_snapshot').then(() => {
+								frappe.msgprint('Snapshot has been deleted successfully.');
+								frm.refresh();
+							});
+						},
+					);
+				},
+				__('Actions'),
+			);
+		}
+	},
+});
diff --git a/press/press/doctype/mariadb_upgrade/mariadb_upgrade.json b/press/press/doctype/mariadb_upgrade/mariadb_upgrade.json
new file mode 100644
index 00000000000..67e1beb358c
--- /dev/null
+++ b/press/press/doctype/mariadb_upgrade/mariadb_upgrade.json
@@ -0,0 +1,140 @@
+{
+ "actions": [],
+ "allow_rename": 1,
+ "creation": "2026-04-10 18:52:28.418185",
+ "doctype": "DocType",
+ "engine": "InnoDB",
+ "field_order": [
+  "database_server",
+  "auto_downgrade_version_in_case_of_failure",
+  "skip_disk_snapshot",
+  "column_break_lfue",
+  "team",
+  "section_break_doik",
+  "snapshot",
+  "is_snapshot_deleted",
+  "column_break_oxgo",
+  "status",
+  "section_break_lmdo",
+  "upgrade_play",
+  "column_break_skvh",
+  "downgrade_play"
+ ],
+ "fields": [
+  {
+   "fieldname": "database_server",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "in_standard_filter": 1,
+   "label": "Database Server",
+   "options": "Database Server",
+   "reqd": 1,
+   "set_only_once": 1
+  },
+  {
+   "fieldname": "column_break_lfue",
+   "fieldtype": "Column Break"
+  },
+  {
+   "fetch_from": "database_server.team",
+   "fieldname": "team",
+   "fieldtype": "Link",
+   "label": "Team",
+   "options": "Team",
+   "set_only_once": 1
+  },
+  {
+   "fieldname": "section_break_doik",
+   "fieldtype": "Section Break"
+  },
+  {
+   "fieldname": "snapshot",
+   "fieldtype": "Link",
+   "label": "Snapshot",
+   "options": "Virtual Disk Snapshot"
+  },
+  {
+   "fieldname": "column_break_oxgo",
+   "fieldtype": "Column Break"
+  },
+  {
+   "default": "Pending",
+   "fieldname": "status",
+   "fieldtype": "Select",
+   "in_list_view": 1,
+   "in_standard_filter": 1,
+   "label": "Status",
+   "options": "Pending\nRunning\nSuccess\nFailure\nRecovering\nRecovered\nFatal",
+   "reqd": 1
+  },
+  {
+   "fieldname": "section_break_lmdo",
+   "fieldtype": "Section Break"
+  },
+  {
+   "fieldname": "upgrade_play",
+   "fieldtype": "Link",
+   "label": "Upgrade Play",
+   "options": "Ansible Play"
+  },
+  {
+   "fieldname": "column_break_skvh",
+   "fieldtype": "Column Break"
+  },
+  {
+   "fieldname": "downgrade_play",
+   "fieldtype": "Link",
+   "label": "Downgrade Play",
+   "options": "Ansible Play"
+  },
+  {
+   "default": "0",
+   "fieldname": "skip_disk_snapshot",
+   "fieldtype": "Check",
+   "label": "Skip Disk Snapshot"
+  },
+  {
+   "default": "1",
+   "fieldname": "auto_downgrade_version_in_case_of_failure",
+   "fieldtype": "Check",
+   "label": "Auto Downgrade Version In Case of Failure"
+  },
+  {
+   "default": "0",
+   "fieldname": "is_snapshot_deleted",
+   "fieldtype": "Check",
+   "label": "Is Snapshot Deleted"
+  }
+ ],
+ "grid_page_length": 50,
+ "index_web_pages_for_search": 1,
+ "links": [
+  {
+   "link_doctype": "Press Workflow",
+   "link_fieldname": "linked_docname"
+  }
+ ],
+ "modified": "2026-04-15 11:20:42.975898",
+ "modified_by": "Administrator",
+ "module": "Press",
+ "name": "MariaDB Upgrade",
+ "owner": "Administrator",
+ "permissions": [
+  {
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "export": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "System Manager",
+   "share": 1,
+   "write": 1
+  }
+ ],
+ "row_format": "Dynamic",
+ "sort_field": "creation",
+ "sort_order": "DESC",
+ "states": []
+}
diff --git a/press/press/doctype/mariadb_upgrade/mariadb_upgrade.py b/press/press/doctype/mariadb_upgrade/mariadb_upgrade.py
new file mode 100644
index 00000000000..99c007657f0
--- /dev/null
+++ b/press/press/doctype/mariadb_upgrade/mariadb_upgrade.py
@@ -0,0 +1,138 @@
+# Copyright (c) 2026, Frappe and contributors
+# For license information, please see license.txt
+
+from typing import TYPE_CHECKING
+
+import frappe
+
+from press.runner import Ansible
+from press.workflow_engine.doctype.press_workflow.decorators import flow, task
+from press.workflow_engine.doctype.press_workflow.workflow_builder import WorkflowBuilder
+
+if TYPE_CHECKING:
+	from press.press.doctype.database_server.database_server import DatabaseServer
+	from press.press.doctype.virtual_disk_snapshot.virtual_disk_snapshot import VirtualDiskSnapshot
+	from press.press.doctype.virtual_machine.virtual_machine import VirtualMachine
+
+
+class MariaDBUpgrade(WorkflowBuilder):
+	# begin: auto-generated types
+	# This code is auto-generated. Do not modify anything in this block.
+
+	from typing import TYPE_CHECKING
+
+	if TYPE_CHECKING:
+		from frappe.types import DF
+
+		auto_downgrade_version_in_case_of_failure: DF.Check
+		database_server: DF.Link
+		downgrade_play: DF.Link | None
+		is_snapshot_deleted: DF.Check
+		skip_disk_snapshot: DF.Check
+		snapshot: DF.Link | None
+		status: DF.Literal["Pending", "Running", "Success", "Failure", "Recovering", "Recovered", "Fatal"]
+		team: DF.Link | None
+		upgrade_play: DF.Link | None
+	# end: auto-generated types
+
+	@property
+	def database_server_doc(self) -> "DatabaseServer":
+		return frappe.get_doc("Database Server", self.database_server)
+
+	def before_insert(self):
+		if self.auto_downgrade_version_in_case_of_failure and self.skip_disk_snapshot:
+			frappe.throw(
+				"Auto downgrade in case of failure is enabled. Please uncheck it or enable skip disk snapshot to proceed without creating a disk snapshot.<br>Please contact support if you need any help.",
+			)
+
+	@frappe.whitelist()
+	def start(self):
+		if self.status != "Pending":
+			frappe.throw(
+				"This job has already been started.<br>Please contact support in case of any issues."
+			)
+		self.run.run_as_workflow()
+
+	@flow
+	def run(self):
+		if self.status == "Pending":
+			self.status = "Running"
+			self.save()
+
+		# Create Disk Snapshot as backup
+		if not self.skip_disk_snapshot:
+			self.create_disk_snapshot()
+
+		# Upgrade MariaDB version
+		self.upgrade_mariadb_version()
+
+		# Downgrade MariaDB version in case of failure
+		if self.auto_downgrade_version_in_case_of_failure and self.status == "Failure":
+			self.downgrade_mariadb_version()
+
+	@task
+	def create_disk_snapshot(self):
+		vm: VirtualMachine = frappe.get_doc("Virtual Machine", self.database_server_doc.virtual_machine)
+		vm.create_snapshots(exclude_boot_volume=True)
+		if len(vm.flags.created_snapshots) == 0:
+			frappe.throw(
+				"Failed to create a snapshot for the database server<br>Please contact support to resolve this issue."
+			)
+		self.snapshot = vm.flags.created_snapshots[0]
+		self.save()
+
+	@task(queue="long", timeout=3600)
+	def upgrade_mariadb_version(self):
+		database_server = self.database_server_doc
+		ansible = Ansible(
+			playbook="upgrade_mariadb.yml",
+			server=database_server,
+			user=database_server.ssh_user or "root",
+			port=database_server.ssh_port or 22,
+			variables={
+				"server": database_server.name,
+			},
+		)
+		assert ansible.play, "Failed to create Ansible play for MariaDB upgrade"
+		self.upgrade_play = ansible.play
+		self.save()
+
+		if not frappe.flags.in_test:
+			frappe.db.commit()
+		play = ansible.run()
+		if play.status == "Success":
+			self.status = "Success"
+		else:
+			self.status = "Failure" if self.auto_downgrade_version_in_case_of_failure else "Fatal"
+		self.save()
+
+	@task(queue="long", timeout=3600)
+	def downgrade_mariadb_version(self):
+		database_server = self.database_server_doc
+		ansible = Ansible(
+			playbook="downgrade_mariadb_to_10_6.yml",
+			server=database_server,
+			user=database_server.ssh_user or "root",
+			port=database_server.ssh_port or 22,
+			variables={
+				"server": database_server.name,
+			},
+		)
+		assert ansible.play, "Failed to create Ansible play for MariaDB downgrade"
+		self.downgrade_play = ansible.play
+		self.save()
+
+		play = ansible.run()
+		if play.status == "Failure":
+			self.status = "Fatal"
+		else:
+			self.status = "Recovered"
+		self.save()
+
+	@frappe.whitelist()
+	def delete_snapshot(self):
+		if self.snapshot:
+			snapshot_doc: VirtualDiskSnapshot = frappe.get_doc("Virtual Disk Snapshot", self.snapshot)
+			snapshot_doc.delete_snapshot()
+			self.is_snapshot_deleted = True
+			self.save()
diff --git a/press/press/doctype/mariadb_upgrade/test_mariadb_upgrade.py b/press/press/doctype/mariadb_upgrade/test_mariadb_upgrade.py
new file mode 100644
index 00000000000..c706ac619ad
--- /dev/null
+++ b/press/press/doctype/mariadb_upgrade/test_mariadb_upgrade.py
@@ -0,0 +1,20 @@
+# Copyright (c) 2026, Frappe and Contributors
+# See license.txt
+
+# import frappe
+from frappe.tests import IntegrationTestCase
+
+# On IntegrationTestCase, the doctype test records and all
+# link-field test record dependencies are recursively loaded
+# Use these module variables to add/remove to/from that list
+EXTRA_TEST_RECORD_DEPENDENCIES: list[str] = []  # eg. ["User"]
+IGNORE_TEST_RECORD_DEPENDENCIES: list[str] = []  # eg. ["User"]
+
+
+class IntegrationTestMariaDBUpgrade(IntegrationTestCase):
+	"""
+	Integration tests for MariaDBUpgrade.
+	Use this class for testing interactions between multiple components.
+	"""
+
+	pass
diff --git a/press/press/doctype/mariadb_upgrade_step/__init__.py b/press/press/doctype/mariadb_upgrade_step/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/press/press/doctype/mariadb_upgrade_step/mariadb_upgrade_step.json b/press/press/doctype/mariadb_upgrade_step/mariadb_upgrade_step.json
new file mode 100644
index 00000000000..42e6c6d756b
--- /dev/null
+++ b/press/press/doctype/mariadb_upgrade_step/mariadb_upgrade_step.json
@@ -0,0 +1,31 @@
+{
+ "actions": [],
+ "allow_rename": 1,
+ "creation": "2026-04-10 18:59:32.824779",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+  "section_break_zl5a"
+ ],
+ "fields": [
+  {
+   "fieldname": "section_break_zl5a",
+   "fieldtype": "Section Break"
+  }
+ ],
+ "grid_page_length": 50,
+ "index_web_pages_for_search": 1,
+ "istable": 1,
+ "links": [],
+ "modified": "2026-04-10 18:59:32.824779",
+ "modified_by": "Administrator",
+ "module": "Press",
+ "name": "MariaDB Upgrade Step",
+ "owner": "Administrator",
+ "permissions": [],
+ "row_format": "Dynamic",
+ "sort_field": "creation",
+ "sort_order": "DESC",
+ "states": []
+}
diff --git a/press/marketplace/doctype/app_release_approval_code_comments/app_release_approval_code_comments.py b/press/press/doctype/mariadb_upgrade_step/mariadb_upgrade_step.py
similarity index 65%
rename from press/marketplace/doctype/app_release_approval_code_comments/app_release_approval_code_comments.py
rename to press/press/doctype/mariadb_upgrade_step/mariadb_upgrade_step.py
index d1390e66c15..12fa1ca439a 100644
--- a/press/marketplace/doctype/app_release_approval_code_comments/app_release_approval_code_comments.py
+++ b/press/press/doctype/mariadb_upgrade_step/mariadb_upgrade_step.py
@@ -1,11 +1,11 @@
-# Copyright (c) 2024, Frappe and contributors
+# Copyright (c) 2026, Frappe and contributors
 # For license information, please see license.txt
 
 # import frappe
 from frappe.model.document import Document
 
 
-class AppReleaseApprovalCodeComments(Document):
+class MariaDBUpgradeStep(Document):
 	# begin: auto-generated types
 	# This code is auto-generated. Do not modify anything in this block.
 
@@ -14,13 +14,9 @@ class AppReleaseApprovalCodeComments(Document):
 	if TYPE_CHECKING:
 		from frappe.types import DF
 
-		comment: DF.SmallText
-		commented_by: DF.Link
-		filename: DF.SmallText
-		line_number: DF.Int
 		parent: DF.Data
 		parentfield: DF.Data
 		parenttype: DF.Data
-		time: DF.Datetime
 	# end: auto-generated types
+
 	pass
diff --git a/press/press/doctype/marketplace_app/events.py b/press/press/doctype/marketplace_app/events.py
index a87a06cd910..84f719b4568 100644
--- a/press/press/doctype/marketplace_app/events.py
+++ b/press/press/doctype/marketplace_app/events.py
@@ -11,7 +11,6 @@ def auto_review_for_missing_steps():
 		"Marketplace App",
 		{
 			"status": ("in", ["Draft", "Attention Required", "In Review"]),
-			"stop_auto_review": False,
 		},
 		pluck="name",
 	):
diff --git a/press/press/doctype/marketplace_app/marketplace_app.json b/press/press/doctype/marketplace_app/marketplace_app.json
index bd351cf9fd5..f95bcf57f26 100644
--- a/press/press/doctype/marketplace_app/marketplace_app.json
+++ b/press/press/doctype/marketplace_app/marketplace_app.json
@@ -59,9 +59,6 @@
   "after_uninstall_script",
   "review_tab",
   "status",
-  "column_break_bcjk",
-  "stop_auto_review",
-  "review_stage",
   "dashboard_tab",
   "onboarding_related_section",
   "show_for_site_creation",
@@ -330,26 +327,12 @@
    "fieldtype": "Tab Break",
    "label": "Review"
   },
-  {
-   "default": "Not Started",
-   "fieldname": "review_stage",
-   "fieldtype": "Select",
-   "in_list_view": 1,
-   "label": "Review Stage",
-   "options": "Not Started\nDescription Missing\nLogo Missing\nApp Release Not Reviewed\nReady for Review\nReady to Publish\nRejected"
-  },
   {
    "default": "0",
    "fieldname": "frappe_approved",
    "fieldtype": "Check",
    "label": "Frappe Approved"
   },
-  {
-   "default": "0",
-   "fieldname": "stop_auto_review",
-   "fieldtype": "Check",
-   "label": "Stop Auto Review"
-  },
   {
    "description": "This keys are added to site config on saas signup",
    "fieldname": "site_config",
@@ -407,10 +390,6 @@
    "fieldtype": "Check",
    "label": "Collect Feedback"
   },
-  {
-   "fieldname": "column_break_bcjk",
-   "fieldtype": "Column Break"
-  },
   {
    "fieldname": "published_on",
    "fieldtype": "Date",
@@ -455,7 +434,7 @@
    "link_fieldname": "marketplace_app"
   }
  ],
- "modified": "2026-03-24 22:23:13.317135",
+ "modified": "2026-04-16 12:40:05.646198",
  "modified_by": "Administrator",
  "module": "Press",
  "name": "Marketplace App",
diff --git a/press/press/doctype/marketplace_app/marketplace_app.py b/press/press/doctype/marketplace_app/marketplace_app.py
index f7c2ad3dc4c..364fbfa7e00 100644
--- a/press/press/doctype/marketplace_app/marketplace_app.py
+++ b/press/press/doctype/marketplace_app/marketplace_app.py
@@ -74,15 +74,6 @@ class MarketplaceApp(WebsiteGenerator):
 		privacy_policy: DF.Data | None
 		published: DF.Check
 		published_on: DF.Date | None
-		review_stage: DF.Literal[
-			"Not Started",
-			"Description Missing",
-			"Logo Missing",
-			"App Release Not Reviewed",
-			"Ready for Review",
-			"Ready to Publish",
-			"Rejected",
-		]
 		route: DF.Data | None
 		run_after_install_script: DF.Check
 		run_after_uninstall_script: DF.Check
@@ -92,7 +83,6 @@ class MarketplaceApp(WebsiteGenerator):
 		site_config: DF.JSON | None
 		sources: DF.Table[MarketplaceAppVersion]
 		status: DF.Literal["Draft", "Published", "In Review", "Attention Required", "Rejected", "Disabled"]
-		stop_auto_review: DF.Check
 		subject: DF.Data | None
 		subscription_type: DF.Literal["Free", "Paid", "Freemium"]
 		subscription_update_hook: DF.Data | None
@@ -108,7 +98,6 @@ class MarketplaceApp(WebsiteGenerator):
 		"title",
 		"status",
 		"description",
-		"review_stage",
 	]
 
 	def autoname(self):
@@ -342,7 +331,7 @@ def change_branch(self, source, version, to_branch):
 		self.save()
 
 	@dashboard_whitelist()
-	def add_version(self, version, branch):
+	def add_version(self, version: str, branch: str):
 		existing_source = frappe.db.exists(
 			"App Source",
 			[
@@ -396,7 +385,7 @@ def add_version(self, version, branch):
 		self.save()
 
 	@dashboard_whitelist()
-	def remove_version(self, version):
+	def remove_version(self, version: str):
 		if self.status == "Published" and len(self.sources) == 1:
 			frappe.throw("Failed to remove. Need at least 1 version for a published app")
 
@@ -696,7 +685,7 @@ def listing_details(self):
 	@dashboard_whitelist()
 	def mark_app_ready_for_review(self):
 		# TODO: Start security check and auto deploy process here
-		self.review_stage = "Ready for Review"
+		self.status = "In Review"
 		self.save()
 
 	@dashboard_whitelist()
diff --git a/press/press/doctype/release_group/release_group.py b/press/press/doctype/release_group/release_group.py
index 063f5470cb4..668a58c6811 100644
--- a/press/press/doctype/release_group/release_group.py
+++ b/press/press/doctype/release_group/release_group.py
@@ -71,6 +71,14 @@ class LastDeployInfo(TypedDict):
 	creation: datetime
 
 
+class MandatoryAppUpgradeInfo(TypedDict):
+	source: str
+	release: str
+
+
+MandatoryAppUpgrade = dict[str, MandatoryAppUpgradeInfo]
+
+
 if TYPE_CHECKING:
 	from press.press.doctype.app.app import App
 	from press.press.doctype.app_release.app_release import AppRelease
@@ -1248,6 +1256,37 @@ def get_app_updates(self, current_apps):
 			)
 		return apps
 
+	def mandatory_app_upgrades(self) -> MandatoryAppUpgrade:
+		"""Returns a map of { app_name: { source, release, hash } } for enforced upgrades."""
+		app_sources = [app.source for app in self.apps]
+
+		# We query the child table directly to find any mandatory rules
+		# linked to 'Active' policies that match our current app sources.
+		# Adjust table names/fields as per your schema.
+		ReleaseGroupPolicy = frappe.qb.DocType("Release Group Policy")
+		ReleaseGroupPolicyApp = frappe.qb.DocType("Release Group Policy App")
+
+		policies = (
+			frappe.qb.from_(ReleaseGroupPolicy)
+			.join(ReleaseGroupPolicyApp)
+			.on(ReleaseGroupPolicyApp.parent == ReleaseGroupPolicy.name)
+			.where(ReleaseGroupPolicy.status == "Active")
+			.where(ReleaseGroupPolicy.scope == "App Source")
+			.where(ReleaseGroupPolicy.target.isin(app_sources))
+			.where(
+				ReleaseGroupPolicyApp.source.notin(app_sources)
+			)  # Only consider policies that target sources different from current ones
+			.select(
+				ReleaseGroupPolicyApp.app,
+				ReleaseGroupPolicyApp.source,
+				ReleaseGroupPolicyApp.release,
+			)
+			.run(as_dict=True)
+		)
+
+		# { 'frappe': {'source': '...', 'release': '...'} }
+		return {p["app"]: {"source": p["source"], "release": p["release"]} for p in policies}
+
 	def get_next_apps(self, current_apps) -> list[frappe._dict[str, str | datetime]]:  # noqa: C901
 		marketplace_app_sources = self.get_marketplace_app_sources()
 		current_team = get_current_team(True)
@@ -1310,7 +1349,34 @@ def get_next_apps(self, current_apps) -> list[frappe._dict[str, str | datetime]]
 			pluck="source",
 		)
 
+		mandatory_upgrades = self.mandatory_app_upgrades()
+
 		for app in self.apps:
+			if app.app in mandatory_upgrades:
+				rule = mandatory_upgrades[app.app]
+				release = frappe.db.get_value(
+					"App Release",
+					rule["release"],
+					["name", "source", "public", "status", "hash", "message", "creation"],
+					as_dict=True,
+				)
+				release["is_yanked"] = False  # Mandatory releases cannot be yanked
+				release["is_mandatory"] = True  # For UI
+				next_apps.append(
+					frappe._dict(
+						{
+							"app": app.app,
+							"source": rule["source"],
+							"release": rule["release"],
+							"hash": release["hash"],
+							"title": app.title,
+							"releases": [release],  # ONLY the mandatory release is shown
+							"is_mandatory": True,
+						}
+					)
+				)
+				continue
+
 			latest_app_release = None
 			latest_app_releases = find_all(latest_releases, lambda x: x.source == app.source)
 
diff --git a/press/press/doctype/release_group_policy/__init__.py b/press/press/doctype/release_group_policy/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/press/press/doctype/release_group_policy/release_group_policy.js b/press/press/doctype/release_group_policy/release_group_policy.js
new file mode 100644
index 00000000000..a1c61c9ba25
--- /dev/null
+++ b/press/press/doctype/release_group_policy/release_group_policy.js
@@ -0,0 +1,8 @@
+// Copyright (c) 2026, Frappe and contributors
+// For license information, please see license.txt
+
+// frappe.ui.form.on("Release Group Policy", {
+// 	refresh(frm) {
+
+// 	},
+// });
diff --git a/press/press/doctype/release_group_policy/release_group_policy.json b/press/press/doctype/release_group_policy/release_group_policy.json
new file mode 100644
index 00000000000..8542587b868
--- /dev/null
+++ b/press/press/doctype/release_group_policy/release_group_policy.json
@@ -0,0 +1,79 @@
+{
+ "actions": [],
+ "allow_rename": 1,
+ "creation": "2026-04-15 18:29:51.218248",
+ "doctype": "DocType",
+ "engine": "InnoDB",
+ "field_order": [
+  "policy_name",
+  "scope",
+  "status",
+  "target",
+  "policies"
+ ],
+ "fields": [
+  {
+   "fieldname": "status",
+   "fieldtype": "Select",
+   "in_list_view": 1,
+   "label": "Status",
+   "options": "Active\nDisabled",
+   "reqd": 1
+  },
+  {
+   "fieldname": "policies",
+   "fieldtype": "Table",
+   "label": "Policies",
+   "options": "Release Group Policy App"
+  },
+  {
+   "fieldname": "policy_name",
+   "fieldtype": "Data",
+   "in_list_view": 1,
+   "label": "Policy Name",
+   "reqd": 1
+  },
+  {
+   "fieldname": "scope",
+   "fieldtype": "Link",
+   "label": "Scope",
+   "options": "DocType",
+   "reqd": 1
+  },
+  {
+   "description": "Release group versions to target",
+   "fieldname": "target",
+   "fieldtype": "Dynamic Link",
+   "in_list_view": 1,
+   "label": "Target",
+   "options": "scope"
+  }
+ ],
+ "grid_page_length": 50,
+ "index_web_pages_for_search": 1,
+ "links": [],
+ "modified": "2026-04-16 13:55:11.029372",
+ "modified_by": "Administrator",
+ "module": "Press",
+ "name": "Release Group Policy",
+ "owner": "Administrator",
+ "permissions": [
+  {
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "export": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "System Manager",
+   "share": 1,
+   "write": 1
+  }
+ ],
+ "row_format": "Dynamic",
+ "rows_threshold_for_grid_search": 20,
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "states": []
+}
\ No newline at end of file
diff --git a/press/press/doctype/release_group_policy/release_group_policy.py b/press/press/doctype/release_group_policy/release_group_policy.py
new file mode 100644
index 00000000000..ec29a14aa6e
--- /dev/null
+++ b/press/press/doctype/release_group_policy/release_group_policy.py
@@ -0,0 +1,27 @@
+# Copyright (c) 2026, Frappe and contributors
+# For license information, please see license.txt
+
+# import frappe
+from frappe.model.document import Document
+
+
+class ReleaseGroupPolicy(Document):
+	# begin: auto-generated types
+	# This code is auto-generated. Do not modify anything in this block.
+
+	from typing import TYPE_CHECKING
+
+	if TYPE_CHECKING:
+		from frappe.types import DF
+
+		from press.press.doctype.release_group_policy_app.release_group_policy_app import (
+			ReleaseGroupPolicyApp,
+		)
+
+		policies: DF.Table[ReleaseGroupPolicyApp]
+		policy_name: DF.Data
+		scope: DF.Link
+		status: DF.Literal["Active", "Disabled"]
+		target: DF.DynamicLink | None
+	# end: auto-generated types
+	pass
diff --git a/press/press/doctype/release_group_policy/test_release_group_policy.py b/press/press/doctype/release_group_policy/test_release_group_policy.py
new file mode 100644
index 00000000000..96931886852
--- /dev/null
+++ b/press/press/doctype/release_group_policy/test_release_group_policy.py
@@ -0,0 +1,91 @@
+# Copyright (c) 2026, Frappe and Contributors
+# See license.txt
+from __future__ import annotations
+
+import typing
+import uuid
+
+import frappe
+from frappe.tests.utils import FrappeTestCase
+
+from press.api.bench import get_release_group_policy_for_bench
+from press.press.doctype.app.test_app import create_test_app
+from press.press.doctype.app_release.test_app_release import create_test_app_release
+from press.press.doctype.app_source.test_app_source import create_test_app_source
+from press.press.doctype.release_group.test_release_group import create_test_release_group
+
+if typing.TYPE_CHECKING:
+	from press.press.doctype.release_group.release_group import ReleaseGroup
+	from press.press.doctype.release_group_policy.release_group_policy import ReleaseGroupPolicy
+
+
+class TestReleaseGroupPolicy(FrappeTestCase):
+	@classmethod
+	def setUpClass(cls):
+		# App creation
+		cls.frappe_app = create_test_app("frappe")
+		cls.erpnext_app = create_test_app("erpnext")
+
+		# App source creation
+		cls.frappe_app_sources_one = create_test_app_source(
+			"Version 16", cls.frappe_app, "https://github.com/frappe/frappe", branch="version-16"
+		)
+		cls.frappe_app_sources_two = create_test_app_source(
+			"Nightly", cls.frappe_app, "https://github.com/frappe/frappe", branch="develop"
+		)
+		cls.erpnext_app_sources_one = create_test_app_source(
+			"Version 16", cls.erpnext_app, "https://github.com/frappe/erpnext", branch="version-16"
+		)
+		cls.erpnext_app_sources_two = create_test_app_source(
+			"Nightly", cls.erpnext_app, "https://github.com/frappe/erpnext", branch="develop"
+		)
+
+		# App release creation with random unique hashes
+		for _ in range(5):  # Generate 5 unique hashes everyone gets 5 releases
+			random_hash = uuid.uuid4().hex
+			create_test_app_release(cls.frappe_app_sources_one, random_hash)
+			create_test_app_release(cls.frappe_app_sources_two, random_hash)
+			create_test_app_release(cls.erpnext_app_sources_one, random_hash)
+			create_test_app_release(cls.erpnext_app_sources_two, random_hash)
+
+	def test_auto_app_addition_from_policies(self):
+		release_group: ReleaseGroup = create_test_release_group(
+			[self.frappe_app], frappe_version="Version 16", app_sources=[self.frappe_app_sources_one.name]
+		)
+
+		# We have no policy set for this release group yet, so it should not have any mandatory apps
+		self.assertEqual(get_release_group_policy_for_bench(release_group.version), {"policies": []})
+
+		# Now we will add a policy for the release group that mandates the erpnext app with specific version and source
+		release_group_policies: ReleaseGroupPolicy = frappe.get_doc(
+			{
+				"doctype": "Release Group Policy",
+				"scope": "Frappe Version",
+				"target": "Version 16",
+				"status": "Active",
+				"policy_name": "Version 16 Bundle Policy",
+			}
+		)
+		release_group_policies.append(
+			"policies",
+			{"app": self.erpnext_app.name, "source": self.erpnext_app_sources_one.name, "add_on_creation": 1},
+		)
+		release_group_policies.insert()
+
+		# Now when we fetch the policies for the release group, it should reflect the newly added policy
+		self.assertEqual(
+			get_release_group_policy_for_bench(release_group.version),
+			{
+				"policies": [
+					{
+						"app": self.erpnext_app.name,
+						"source": self.erpnext_app_sources_one.name,
+					}
+				]
+			},
+		)
+
+		self.assertEqual(
+			get_release_group_policy_for_bench("Version 15"),
+			{"policies": []},
+		)
diff --git a/press/press/doctype/release_group_policy_app/__init__.py b/press/press/doctype/release_group_policy_app/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/press/press/doctype/release_group_policy_app/release_group_policy_app.json b/press/press/doctype/release_group_policy_app/release_group_policy_app.json
new file mode 100644
index 00000000000..d1f969a2c6d
--- /dev/null
+++ b/press/press/doctype/release_group_policy_app/release_group_policy_app.json
@@ -0,0 +1,80 @@
+{
+ "actions": [],
+ "allow_rename": 1,
+ "creation": "2026-04-15 18:36:37.062445",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+  "app",
+  "source",
+  "release",
+  "add_on_creation",
+  "install_on_site_creation",
+  "for_updates"
+ ],
+ "fields": [
+  {
+   "fieldname": "app",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "label": "App",
+   "options": "App",
+   "reqd": 1
+  },
+  {
+   "default": "0",
+   "description": "Add this app on creation of release group",
+   "fieldname": "add_on_creation",
+   "fieldtype": "Check",
+   "in_list_view": 1,
+   "label": "Add On Creation"
+  },
+  {
+   "default": "0",
+   "description": "Install this app on by default on site created on this release group",
+   "fieldname": "install_on_site_creation",
+   "fieldtype": "Check",
+   "in_list_view": 1,
+   "label": "Install on Site Creation"
+  },
+  {
+   "fieldname": "source",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "label": "Source",
+   "options": "App Source",
+   "reqd": 1
+  },
+  {
+   "fieldname": "release",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "label": "Release",
+   "options": "App Release"
+  },
+  {
+   "default": "0",
+   "description": "When checked the app mentioned will be force to update to the source and release mentioned in the next update",
+   "fieldname": "for_updates",
+   "fieldtype": "Check",
+   "in_list_view": 1,
+   "label": "For Updates"
+  }
+ ],
+ "grid_page_length": 50,
+ "index_web_pages_for_search": 1,
+ "istable": 1,
+ "links": [],
+ "modified": "2026-04-16 13:58:26.956320",
+ "modified_by": "Administrator",
+ "module": "Press",
+ "name": "Release Group Policy App",
+ "owner": "Administrator",
+ "permissions": [],
+ "row_format": "Dynamic",
+ "rows_threshold_for_grid_search": 20,
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "states": []
+}
\ No newline at end of file
diff --git a/press/press/doctype/release_group_policy_app/release_group_policy_app.py b/press/press/doctype/release_group_policy_app/release_group_policy_app.py
new file mode 100644
index 00000000000..bfbec7a76fd
--- /dev/null
+++ b/press/press/doctype/release_group_policy_app/release_group_policy_app.py
@@ -0,0 +1,27 @@
+# Copyright (c) 2026, Frappe and contributors
+# For license information, please see license.txt
+
+# import frappe
+from frappe.model.document import Document
+
+
+class ReleaseGroupPolicyApp(Document):
+	# begin: auto-generated types
+	# This code is auto-generated. Do not modify anything in this block.
+
+	from typing import TYPE_CHECKING
+
+	if TYPE_CHECKING:
+		from frappe.types import DF
+
+		add_on_creation: DF.Check
+		app: DF.Link
+		for_updates: DF.Check
+		install_on_site_creation: DF.Check
+		parent: DF.Data
+		parentfield: DF.Data
+		parenttype: DF.Data
+		release: DF.Link | None
+		source: DF.Link
+	# end: auto-generated types
+	pass
diff --git a/press/press/doctype/release_pipeline/release_pipeline.py b/press/press/doctype/release_pipeline/release_pipeline.py
index 407052a5b07..3b1e4a63360 100644
--- a/press/press/doctype/release_pipeline/release_pipeline.py
+++ b/press/press/doctype/release_pipeline/release_pipeline.py
@@ -1,30 +1,44 @@
 # Copyright (c) 2026, Frappe and contributors
 # For license information, please see license.txt
+from __future__ import annotations
+
 import typing
 from functools import cached_property
 from typing import Any, TypedDict
 
 import frappe
+from packaging.specifiers import InvalidSpecifier, SpecifierSet
+from packaging.version import Version
 
+from press.api.github import get_dependant_apps_with_versions
 from press.exceptions import InsufficientSpaceOnServer, ReleasePipelineFailure
+from press.press.doctype.app.app import (
+	get_app_source_from_supported_versions,
+	get_latest_release_of_app_from_source,
+	parse_frappe_version,
+)
 from press.press.doctype.bench_update.bench_update import get_bench_update
 from press.workflow_engine.doctype.press_workflow.decorators import flow, task
 from press.workflow_engine.doctype.press_workflow.exceptions import PressWorkflowTaskEnqueued
-from press.workflow_engine.doctype.press_workflow.press_workflow import PressWorkflow
 from press.workflow_engine.doctype.press_workflow.workflow_builder import WorkflowBuilder
 
 if typing.TYPE_CHECKING:
 	from press.press.doctype.agent_job.agent_job import AgentJob
+	from press.press.doctype.app_release.app_release import AppRelease
+	from press.press.doctype.app_source.app_source import AppSource
 	from press.press.doctype.bench_update.bench_update import BenchUpdate
 	from press.press.doctype.deploy_candidate.deploy_candidate import DeployCandidate
 	from press.press.doctype.deploy_candidate_build.deploy_candidate_build import DeployCandidateBuild
 	from press.press.doctype.release_group.release_group import ReleaseGroup
+	from press.workflow_engine.doctype.press_workflow.press_workflow import PressWorkflow
 
 
 BENCH_TRANSITION_STATES = ["Pending", "Installing", "Updating"]
 # Keeping this here now, will eventually move all notifications logic here.
 SKIP_NOTIFICATIONS_FOR = ["orchestrate_build_monitoring", "monitor_bench_creation"]
 
+KNOWN_PYTHON_VERSIONS = ["3.8", "3.9", "3.10", "3.11", "3.12", "3.13", "3.14"]
+
 
 class FailedBenchJobs(TypedDict):
 	name: str
@@ -36,6 +50,87 @@ class BenchInfo(TypedDict):
 	status: str
 
 
+def _resolve_dependent_app(app: str, version: str) -> tuple[AppSource, AppRelease]:
+	"""Resolve app source and latest release for a dependent app."""
+	supported_versions = parse_frappe_version(
+		version_string=version,
+		app_title=app,
+		ease_versioning_constrains=False,
+	)
+	if not supported_versions:
+		raise ReleasePipelineFailure(
+			f"Failed to parse supported versions for app {app} "
+			f"with version string {version}. Cannot proceed with release. "
+			"Please follow semantic versioning."
+		)
+
+	if not frappe.db.exists("App", app):
+		raise ReleasePipelineFailure(
+			f"Dependent app {app} does not exist in the system. "
+			"Please add this app to your bench group first."
+		)
+
+	app_source = get_app_source_from_supported_versions(
+		app=app,
+		supported_versions=supported_versions,
+	)
+	if not app_source:
+		raise ReleasePipelineFailure(
+			f"Unable to find an app source for dependent app {app} "
+			f"with supported versions {supported_versions}. "
+			"Please add this app to your bench group."
+		)
+
+	app_release = get_latest_release_of_app_from_source(app_source)
+	if not app_release:
+		raise ReleasePipelineFailure(
+			f"Unable to find a release for dependent app {app} "
+			f"from app source {app_source.name}. "
+			"Please add a release for this app in your bench group."
+		)
+
+	return app_source, app_release
+
+
+def _resolve_python_version_conflicts_and_update_group(
+	release_group_name: str, python_versions: dict[str, str | None]
+) -> None:
+	"""Resolve any python version conflicts and update the release group with the final python version requirements.
+	Eg, python_versions - {"app1": "~3.10", "app2": ">=3.11", "app3": ">=3.10"}
+	"""
+	combined_spec = SpecifierSet()
+
+	for app_name, spec_string in python_versions.items():
+		if not spec_string:
+			# App didn't specify any python version requirements.
+			continue
+
+		try:
+			# Combine all the python versions
+			current_app_spec = SpecifierSet(spec_string)
+			combined_spec &= current_app_spec
+		except InvalidSpecifier:
+			raise ReleasePipelineFailure(
+				f"Invalid Python version format for {app_name}: {spec_string}"
+			) from None
+
+	compatible_versions = [Version(v) for v in KNOWN_PYTHON_VERSIONS if Version(v) in combined_spec]
+
+	if not compatible_versions:
+		raise ReleasePipelineFailure(
+			"Python version conflict detected between apps please resolve the python version conflict and retry"
+		)
+
+	highest_compatible_python_version = max(compatible_versions)
+	release_group_doc: ReleaseGroup = frappe.get_doc("Release Group", release_group_name, for_update=True)
+
+	for dependency in release_group_doc.dependencies:
+		if dependency.dependency == "PYTHON_VERSION":
+			dependency.version = str(highest_compatible_python_version)
+			dependency.is_custom = True
+			dependency.save()
+
+
 class ReleasePipeline(WorkflowBuilder):
 	# begin: auto-generated types
 	# This code is auto-generated. Do not modify anything in this block.
@@ -306,6 +401,39 @@ def _get_secondary_build(self, deploy_candidate: str, primary_build: str) -> str
 			"name",
 		)
 
+	def _add_app_to_group_and_candidate(
+		self, deploy_candidate: DeployCandidate, dependant_app_versions: dict[str, str]
+	):
+		"""Helper function to add the dependant apps to the release group and deploy candidate automatically.
+		In case we don't find the app or the app source in press we need to raise, and ask users to add
+		the app in the bench group first.
+		"""
+		if not dependant_app_versions:
+			return
+
+		release_group_doc: ReleaseGroup = frappe.get_doc("Release Group", self.release_group, for_update=True)
+		release_group_apps = {app.app for app in release_group_doc.apps}
+
+		for app, version in dependant_app_versions.items():
+			if app in release_group_apps:
+				continue
+
+			app_source, app_release = _resolve_dependent_app(app, version)
+			deploy_candidate.append(
+				"apps",
+				{
+					"app": app,
+					"source": app_source.name,
+					"release": app_release.name,
+					"hash": app_release.hash,
+				},
+			)
+			release_group_doc.append("apps", {"app": app, "source": app_source.name})
+
+		# Final save
+		deploy_candidate.save()
+		release_group_doc.save()
+
 	@task
 	def run_pre_release_checks(self, apps: list[dict[str, str]]):
 		"""Groups all early-exit validation logic."""
@@ -316,6 +444,42 @@ def run_pre_release_checks(self, apps: list[dict[str, str]]):
 		except (frappe.ValidationError, InsufficientSpaceOnServer) as e:
 			raise ReleasePipelineFailure(str(e)) from e
 
+	@task
+	def add_implicit_app_dependencies(self, deploy_candidate: str):
+		"""Add any implicit dependencies for the apps being deployed."""
+		deploy_candidate_doc: DeployCandidate = frappe.get_doc(
+			"Deploy Candidate", deploy_candidate, for_update=True
+		)
+		for app in deploy_candidate_doc.apps:
+			dependant_app_versions = get_dependant_apps_with_versions(
+				app_source=app.source, commit=app.hash, cache=True
+			)
+			self._add_app_to_group_and_candidate(
+				deploy_candidate_doc,
+				dependant_app_versions=dependant_app_versions["frappe_dependencies"],
+			)
+
+	@task
+	def auto_update_bench_dependency_versions(self, deploy_candidate: str):
+		"""Auto update the versions of the dependencies depending on app requirements.
+		Currently only supports python version upgrades
+		"""
+		deploy_candidate_doc: DeployCandidate = frappe.get_doc(
+			"Deploy Candidate", deploy_candidate, for_update=True
+		)
+		required_python_versions = {}
+
+		for app in deploy_candidate_doc.apps:
+			# Should use the cache from the previous task
+			dependant_app_versions = get_dependant_apps_with_versions(
+				app_source=app.source, commit=app.hash, cache=True
+			)
+			required_python_versions[app.app] = dependant_app_versions["python_version"]
+
+		_resolve_python_version_conflicts_and_update_group(
+			self.release_group_doc.name, required_python_versions
+		)
+
 	@task
 	def prepare_deployment(self, apps, sites, run_will_fail_check) -> tuple[str, str]:
 		"""Creates the candidate and returns the primary build name."""
@@ -326,7 +490,10 @@ def prepare_deployment(self, apps, sites, run_will_fail_check) -> tuple[str, str
 				run_will_fail_check=run_will_fail_check,
 				create_deploy=False,
 			)
+			self.add_implicit_app_dependencies(deploy_candidate)
+			self.auto_update_bench_dependency_versions(deploy_candidate)
 			primary_build = self.initiate_pre_build_validations(deploy_candidate)
+
 			return deploy_candidate, primary_build
 		except frappe.ValidationError as e:
 			raise ReleasePipelineFailure(f"Failed to prepare deployment: {e!s}") from e
@@ -460,4 +627,9 @@ def create_release(
 			self.monitor_bench_creation(primary_build)
 
 		except ReleasePipelineFailure:
+			# Just in case, make sure that we mark the pipeline as failed and notify the frontend to stop listening for deploy updates
+			self.update_pipeline_status("Failure")
+
+		workflow_status = frappe.db.get_value("Press Workflow", self.workflow_name, "status")
+		if workflow_status == "Failure":
 			self.update_pipeline_status("Failure")
diff --git a/press/press/doctype/release_pipeline/test_release_pipeline.py b/press/press/doctype/release_pipeline/test_release_pipeline.py
index a464a20ba8a..e2d7be6eb97 100644
--- a/press/press/doctype/release_pipeline/test_release_pipeline.py
+++ b/press/press/doctype/release_pipeline/test_release_pipeline.py
@@ -4,10 +4,13 @@
 from unittest.mock import Mock, patch
 
 import frappe
+import tomli
 from frappe.database.mariadb.database import MariaDBDatabase
 from frappe.tests.utils import FrappeTestCase
 
 from press.api.bench import deploy_and_update
+from press.api.github import get_dependant_apps_with_versions
+from press.exceptions import ReleasePipelineFailure
 from press.press.doctype.agent_job.agent_job import poll_pending_jobs
 from press.press.doctype.agent_job.test_agent_job import fake_agent_job
 from press.press.doctype.app.test_app import create_test_app
@@ -15,7 +18,11 @@
 from press.press.doctype.app_source.test_app_source import create_test_app_source
 from press.press.doctype.deploy_candidate_build.deploy_candidate_build import DeployCandidateBuild
 from press.press.doctype.release_group.test_release_group import create_test_release_group
-from press.press.doctype.release_pipeline.release_pipeline import ReleasePipeline
+from press.press.doctype.release_pipeline.release_pipeline import (
+	ReleasePipeline,
+	_resolve_dependent_app,
+	_resolve_python_version_conflicts_and_update_group,
+)
 from press.press.doctype.server.test_server import create_test_server
 from press.utils import get_current_team
 
@@ -39,10 +46,42 @@ def mock_bench_monitoring(*args, **kwargs):
 	return
 
 
+def get_mock_pyproject_file(*args, **kwargs):
+	return tomli.loads("""[project]
+		name = "helpdesk"
+		authors = [
+			{ name = "Frappe Technologies Pvt Ltd", email = "hello@frappe.io"}
+		]
+		description = "Open Source Customer Service Software"
+		requires-python = ">=3.10"
+		readme = "README.md"
+		dynamic = ["version"]
+		dependencies = [
+			# Core dependencies
+			"textblob==0.18.0.post0",
+		]
+		[build-system]
+		requires = ["flit_core >=3.4,<4"]
+		build-backend = "flit_core.buildapi"
+
+		[tool.bench.frappe-dependencies]
+		frappe = ">=15.40.4,<17.0.0"
+		telephony = ">=15.0.0,<17.0.0"
+
+		[tool.bench.assets]
+		build_dir = "./desk"
+		out_dir = "./helpdesk/public/desk"
+		index_html_path = "./helpdesk/www/helpdesk/index.html"
+""")
+
+
 @patch.object(MariaDBDatabase, "commit", Mock())
 class TestReleasePipeline(FrappeTestCase):
 	def tearDown(self):
 		frappe.set_user("Administrator")
+		frappe.db.delete("App")
+		frappe.db.delete("App Source")
+		frappe.db.delete("App Release")
 
 	@classmethod
 	def setUpClass(cls):
@@ -129,6 +168,156 @@ def test_release_pipeline_build_creation(self):
 			"Deploy Candidate Build"
 		)  # Just ensure this is created without error since we are mocking the build
 
+	@patch("press.api.github._get_pyproject_from_commit", get_mock_pyproject_file)
+	@patch.object(DeployCandidateBuild, "_upload_build_context", get_mock_context_file)
+	@patch.object(DeployCandidateBuild, "_build", Mock())
+	@patch.object(ReleasePipeline, "monitor_pre_build_validation", mock_pre_build_validation_monitoring)
+	@patch.object(ReleasePipeline, "monitor_build_success", mock_build_monitoring)
+	def test_dynamic_apps_additions_and_bench_dependencies_upgrade(self):
+		parent_hash = frappe.mock("sha1")
+
+		for dep in self.test_release_group.dependencies:
+			if dep.dependency == "PYTHON_VERSION":
+				dep.version = "3.8"
+				dep.save()
+
+		root_app = create_test_app("frappe")
+		root_app_source = create_test_app_source(
+			app=root_app,
+			version="Version 15",
+			repository_url="https://github.com/frappe/frappe",
+			branch="main",
+		)
+		root_app_release = create_test_app_release(root_app_source, parent_hash)
+
+		app_dependencies = get_dependant_apps_with_versions(root_app_source.name, root_app_release.hash).get(
+			"frappe_dependencies"
+		)
+		self.assertEqual(app_dependencies, {"telephony": ">=15.0.0,<17.0.0"})
+
+		# Ensure system can get these!
+		dependency_app = frappe.get_doc(
+			{"doctype": "App", "title": "Telephony", "frappe": 1, "name": "telephony"}
+		).insert()
+
+		correct_source = create_test_app_source(
+			app=dependency_app,
+			version="Version 15",
+			repository_url="https://github.com/frappe/dependency-app",
+			branch="main",
+		)
+
+		correct_hash = frappe.mock("sha1")
+		create_test_app_release(
+			app_source=correct_source,
+			hash=correct_hash,
+		)
+
+		self.assertNotIn(
+			"telephony", [app.app for app in self.test_release_group.apps]
+		)  # Ensure app was added as part of the release pipeline
+
+		for dependency in self.test_release_group.dependencies:
+			if dependency.dependency == "PYTHON_VERSION":
+				self.assertEqual(dependency.version, "3.8")
+
+		with fake_agent_job("Remote Build Job", "Success"):
+			deploy_and_update(
+				self.test_release_group.name,
+				apps=[
+					{
+						"app": root_app.name,
+						"source": root_app_source.name,
+						"release": root_app_release.name,
+						"hash": root_app_release.hash,
+					}
+				],
+			)
+			poll_pending_jobs()
+
+		test_release_group = self.test_release_group.reload()
+		self.assertIn(
+			"telephony", [app.app for app in test_release_group.apps]
+		)  # Ensure app was added as part of the release pipeline
+		for dependency in test_release_group.dependencies:
+			if dependency.dependency == "PYTHON_VERSION":
+				self.assertEqual(
+					dependency.version, "3.14"
+				)  # >=3.10 is updated to 3.14 since we take the highest possible version that fits
+
+		with self.assertRaises(ReleasePipelineFailure):
+			_resolve_python_version_conflicts_and_update_group(
+				self.test_release_group.name, {"frappe": ">=3.10", "erpnext": "<3.10"}
+			)  # This should raise an error since frappe and erpnext have conflicting python version requirements
+
+		_resolve_python_version_conflicts_and_update_group(
+			self.test_release_group.name,
+			{
+				"frappe": ">=3.10",
+				"erpnext": ">=3.10",
+				"telephony": None,  # Some apps might not give their python version requirements.
+			},
+		)
+
+	@patch("press.api.github._get_pyproject_from_commit", get_mock_pyproject_file)
+	def test_implicit_dependency_source_addition(self):
+		parent_hash = frappe.mock("sha1")
+
+		root_app = create_test_app("someapp")
+		root_app_source = create_test_app_source(
+			app=root_app,
+			version="Version 15",
+			repository_url="https://github.com/frappe/test-app",
+			branch="main",
+		)
+		root_app_release = create_test_app_release(root_app_source, parent_hash)
+
+		app_dependencies = get_dependant_apps_with_versions(root_app_source.name, root_app_release.hash).get(
+			"frappe_dependencies"
+		)
+		self.assertEqual(app_dependencies, {"telephony": ">=15.0.0,<17.0.0"})
+
+		app, version = next(iter(app_dependencies.items()))
+
+		# No App doc yet
+		with self.assertRaises(ReleasePipelineFailure):
+			_resolve_dependent_app(app, version)
+
+		dependency_app = frappe.get_doc(
+			{"doctype": "App", "title": "Telephony", "frappe": 1, "name": "telephony"}
+		).insert()
+
+		# App exists, but no matching app source yet
+		with self.assertRaises(ReleasePipelineFailure):
+			_resolve_dependent_app(app, version)
+
+		create_test_app_source(
+			app=dependency_app,
+			version="Version 15",
+			repository_url="https://github.com/frappe/dependency-app",
+			branch="new",
+		)
+
+		correct_source = create_test_app_source(
+			app=dependency_app,
+			version="Version 16",
+			repository_url="https://github.com/frappe/dependency-app",
+			branch="main",
+		)
+
+		correct_hash = frappe.mock("sha1")
+		correct_release = create_test_app_release(
+			app_source=correct_source,
+			hash=correct_hash,
+		)
+
+		resolved_source, resolved_release = _resolve_dependent_app(app, version)
+
+		self.assertEqual(resolved_source.name, correct_source.name)
+		self.assertEqual(resolved_source.app, "telephony")
+		self.assertEqual(resolved_release.name, correct_release.name)
+		self.assertEqual(resolved_release.hash, correct_hash)
+
 	@classmethod
 	def tearDownClass(cls):
 		shutil.rmtree(frappe.db.get_single_value("Press Settings", "build_directory"), ignore_errors=True)
diff --git a/press/press/doctype/server/server.py b/press/press/doctype/server/server.py
index b8f2c758829..676b141b4e9 100644
--- a/press/press/doctype/server/server.py
+++ b/press/press/doctype/server/server.py
@@ -543,6 +543,7 @@ def after_insert(self):
 			if self.doctype not in ["Database Server", "Server", "Proxy Server"] or not self.is_self_hosted:
 				self.create_dns_record()
 				self.update_virtual_machine_name()
+
 		elif (
 			self.private_ip
 			and self.doctype in ["Server", "Database Server"]
@@ -1055,6 +1056,46 @@ def enqueue_extend_ec2_volume(self, device, log):
 			self.doctype, self.name, "extend_ec2_volume", device=device, log=log, at_front=True, queue="long"
 		)
 
+	@frappe.whitelist()
+	def extend_frappe_compute_volume(self, device=None, log: str | None = None):
+		# Copied over from extend_ec2_volume
+		# Restart MariaDB if MariaDB disk is full
+		mountpoint = "/"  # Root only for now
+		restart_mariadb = self.doctype == "Database Server" and self.is_disk_full(
+			mountpoint
+		)  # check before breaking glass to ensure state of mariadb
+		self.break_glass()
+
+		if not device:
+			# Try the best guess. Try extending the data volume
+			volume = self.find_mountpoint_volume(mountpoint)
+			assert volume is not None, "Volume not found"
+			assert volume.volume_id is not None, "Volume ID not found"
+			device = volume.device
+
+		try:
+			ansible = Ansible(
+				playbook="extend_frappe_compute_volume.yml",
+				server=self,
+				user=self._ssh_user(),
+				port=self._ssh_port(),
+				variables={"restart_mariadb": restart_mariadb, "device": device},
+			)
+			ansible.run()
+		except Exception:
+			log_error("Frappe Compute Volume Extend Exception", server=self.as_dict())
+
+	def enqueue_extend_frappe_compute_volume(self, device, log):
+		frappe.enqueue_doc(
+			self.doctype,
+			self.name,
+			"extend_frappe_compute_volume",
+			device=device,
+			log=log,
+			at_front=True,
+			queue="long",
+		)
+
 	@cached_property
 	def time_to_wait_before_updating_volume(self) -> timedelta | int:
 		if self.provider != "AWS EC2":
@@ -1074,7 +1115,7 @@ def time_to_wait_before_updating_volume(self) -> timedelta | int:
 
 	@frappe.whitelist()
 	def increase_disk_size(self, increment=50, mountpoint=None, log: str | None = None):
-		if self.provider not in ("AWS EC2", "OCI"):
+		if self.provider not in ("AWS EC2", "OCI", "Frappe Compute"):
 			return
 		if self.provider == "AWS EC2" and self.time_to_wait_before_updating_volume:
 			frappe.throw(
@@ -1099,6 +1140,9 @@ def increase_disk_size(self, increment=50, mountpoint=None, log: str | None = No
 			# Non-boot volumes might not need resize
 			self.break_glass()
 			self.reboot()
+		elif self.provider == "Frappe Compute":
+			device = self.get_device_from_volume_id(volume.volume_id)
+			self.enqueue_extend_frappe_compute_volume(device, log)
 
 	def guess_data_disk_mountpoint(self) -> str:
 		if not hasattr(self, "has_data_volume") or not self.has_data_volume:
@@ -1140,6 +1184,8 @@ def find_mountpoint_volume(self, mountpoint) -> "VirtualMachineVolume" | None:
 		return find(machine.volumes, lambda v: v.device == "/dev/sda1")
 
 	def update_virtual_machine_name(self):
+		if not self.virtual_machine:
+			return None
 		virtual_machine = frappe.get_doc("Virtual Machine", self.virtual_machine)
 		return virtual_machine.update_name_tag(self.name)
 
@@ -1767,6 +1813,12 @@ def set_mount_properties(self):
 	def get_device_from_volume_id(self, volume_id):
 		if self.provider == "Hetzner":
 			return f"/dev/disk/by-id/scsi-0HC_Volume_{volume_id}"
+
+		if self.provider == "Frappe Compute":
+			virtual_machine = frappe.get_doc("Virtual Machine", self.virtual_machine)
+			volume = find(virtual_machine.volumes, lambda i: i.volume_id == volume_id)
+			return volume.device
+
 		stripped_id = volume_id.replace("-", "")
 		return f"/dev/disk/by-id/nvme-Amazon_Elastic_Block_Store_{stripped_id}"
 
diff --git a/press/press/doctype/site/archive.py b/press/press/doctype/site/archive.py
deleted file mode 100644
index c56a1cd8e36..00000000000
--- a/press/press/doctype/site/archive.py
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright (c) 2024, Frappe and contributors
-# For license information, please see license.txt
-
-from typing import TYPE_CHECKING
-
-import frappe
-
-from press.utils import log_error
-
-if TYPE_CHECKING:
-	from press.press.doctype.site.site import Site
-
-
-def archive_suspended_trial_sites():
-	ARCHIVE_AFTER_DAYS = 21
-	ARCHIVE_AT_ONCE = 10
-
-	filters = [
-		["status", "=", "Suspended"],
-		["trial_end_date", "is", "set"],
-		[
-			"trial_end_date",
-			"<",
-			frappe.utils.add_to_date(None, days=-(ARCHIVE_AFTER_DAYS + 1)),
-		],  # Don't look at sites that are unlikely to be archived
-	]
-
-	sites = frappe.get_all(
-		"Site",
-		filters=filters,
-		fields=["name", "team", "trial_end_date"],
-		order_by="creation asc",
-	)
-
-	archived_now = 0
-	for site in sites:
-		if archived_now > ARCHIVE_AT_ONCE:
-			break
-		try:
-			suspension_date = frappe.get_all(
-				"Site Activity",
-				filters={"site": site.name, "action": "Suspend Site"},
-				pluck="creation",
-				order_by="creation desc",
-				limit=1,
-			)[0]
-			suspended_days = frappe.utils.date_diff(frappe.utils.today(), suspension_date)
-
-			if suspended_days > ARCHIVE_AFTER_DAYS:
-				site: Site = frappe.get_doc("Site", site.name, for_update=True)
-				site.archive(reason="Archive suspended trial site")
-				archived_now = archived_now + 1
-				frappe.db.commit()
-		except Exception:
-			log_error("Suspended Site Archive Error")
-			# Without the rollback the transaction will be implicitly committed
-			# So we selectively commit and rollback
-			frappe.db.rollback()
-
-
-def delete_offsite_backups_for_archived_sites():
-	archived_sites = frappe.db.sql(
-		"""
-		SELECT
-			backup.site,
-			COUNT(*) as offsite_backups
-		FROM
-			`tabSite Backup` backup
-		LEFT JOIN
-			`tabSite` site
-		ON
-			backup.site = site.name
-		WHERE
-			site.status = "Archived" AND
-			backup.files_availability = "Available" AND
-			backup.offsite = True
-		GROUP BY
-			backup.site
-		HAVING
-			offsite_backups > 1
-		ORDER BY
-			offsite_backups DESC
-	""",
-		as_dict=True,
-	)
-	for site in archived_sites:
-		try:
-			frappe.get_doc("Site", site.site).delete_offsite_backups()
-			frappe.db.commit()
-		except Exception:
-			frappe.db.rollback()
diff --git a/press/press/doctype/site/site.json b/press/press/doctype/site/site.json
index 79db030e338..c768bda1708 100644
--- a/press/press/doctype/site/site.json
+++ b/press/press/doctype/site/site.json
@@ -12,7 +12,6 @@
   "status_before_update",
   "server",
   "archive_failed",
-  "creation_failed",
   "fatal_site_update",
   "column_break_3",
   "bench",
@@ -21,6 +20,10 @@
   "admin_password",
   "additional_system_user_created",
   "backup_timeout",
+  "section_break_aokd",
+  "creation_failed",
+  "column_break_tfvn",
+  "suspended_at",
   "config_tab",
   "hide_config",
   "host_name",
@@ -756,6 +759,20 @@
    "fieldtype": "Link",
    "label": "Fatal Site Update",
    "options": "Site Update"
+  },
+  {
+   "fieldname": "section_break_aokd",
+   "fieldtype": "Section Break"
+  },
+  {
+   "fieldname": "column_break_tfvn",
+   "fieldtype": "Column Break"
+  },
+  {
+   "fieldname": "suspended_at",
+   "fieldtype": "Datetime",
+   "label": "Suspended At",
+   "read_only": 1
   }
  ],
  "links": [
@@ -840,7 +857,7 @@
    "link_fieldname": "site"
   }
  ],
- "modified": "2026-02-09 16:05:29.084553",
+ "modified": "2026-04-12 12:56:22.557860",
  "modified_by": "Administrator",
  "module": "Press",
  "name": "Site",
diff --git a/press/press/doctype/site/site.py b/press/press/doctype/site/site.py
index ea86532a646..dfb2c220e0a 100644
--- a/press/press/doctype/site/site.py
+++ b/press/press/doctype/site/site.py
@@ -3,6 +3,7 @@
 
 from __future__ import annotations
 
+import contextlib
 import json
 from collections import defaultdict
 from contextlib import suppress
@@ -223,6 +224,7 @@ class Site(Document, TagHelpers):
 		]
 		status_before_update: DF.Data | None
 		subdomain: DF.Data
+		suspended_at: DF.Datetime | None
 		tags: DF.Table[ResourceTag]
 		team: DF.Link
 		timezone: DF.Data | None
@@ -1730,8 +1732,7 @@ def unset_redirect(self, domain: str):
 	@site_action(["Active", "Broken", "Inactive", "Suspended"])
 	def archive(self, site_name=None, reason=None, force=False, create_offsite_backup=True):
 		agent = Agent(self.server)
-		self.status = "Pending"
-		self.save()
+		self.ready_for_move()
 		job = agent.archive_site(self, site_name, force, create_offsite_backup)
 		log_site_activity(self.name, "Archive", reason, job.name)
 
@@ -2773,6 +2774,7 @@ def activate(self):
 	def suspend(self, reason=None, skip_reload=False):
 		log_site_activity(self.name, "Suspend Site", reason)
 		self.status = "Suspended"
+		self.suspended_at = frappe.utils.now_datetime()
 		self.update_site_config({"maintenance_mode": 1})
 		self.update_site_status_on_proxy("suspended", skip_reload=skip_reload)
 		self.deactivate_app_subscriptions()
@@ -2812,6 +2814,7 @@ def reactivate_app_subscriptions(self):
 	def unsuspend(self, reason=None):
 		log_site_activity(self.name, "Unsuspend Site", reason)
 		self.status = "Active"
+		self.suspended_at = None
 		self.update_site_config({"maintenance_mode": 0})
 		self.update_site_status_on_proxy("activated")
 		self.reactivate_app_subscriptions()
@@ -3677,6 +3680,54 @@ def fetch_database_processes(self):
 			return None
 		return agent.fetch_database_processes(self)
 
+	@dashboard_whitelist()
+	def fetch_database_locks(self):
+		agent = Agent(self.database_server_name, "Database Server")
+		# if agent.should_skip_requests():
+		# 	return []
+		results = agent.fetch_database_locks(self)
+		# Filter out results by database name
+		if not self.database_name:
+			with contextlib.suppress(Exception):
+				self.sync_info()
+			return []
+
+		results = [
+			lock for lock in results if str(lock.get("lock_table", "")).startswith(f"`{self.database_name}`.")
+		]
+		fields = [
+			"lock_id",
+			"trx_id",
+			"trx_query",
+			"lock_mode",
+			"lock_type",
+			"lock_table",
+			"lock_index",
+			"trx_state",
+			"trx_operation_state",
+			"trx_started",
+			"trx_rows_locked",
+			"trx_rows_modified",
+		]
+		filtered_results = []
+		for lock in results:
+			filtered_lock = {field: lock.get(field) for field in fields}
+			# Sanitize the lock_table
+			if filtered_lock.get("lock_table"):
+				filtered_lock["lock_table"] = (
+					filtered_lock["lock_table"].replace(f"`{self.database_name}`.", "").replace("`", "")
+				)
+			if filtered_lock.get("lock_mode"):
+				filtered_lock["lock_mode"] = {
+					"X": "Exclusive",
+					"S": "Shared",
+					"IS": "Intention Shared",
+					"IX": "Intention Exclusive",
+					"SIX": "Shared Intention Exclusive",
+				}.get(filtered_lock["lock_mode"], filtered_lock["lock_mode"])
+			filtered_results.append(filtered_lock)
+		return filtered_results
+
 	@dashboard_whitelist()
 	def kill_database_process(self, id):
 		agent = Agent(self.server)
@@ -5054,14 +5105,6 @@ def create_site_status_update_webhook_event(site: str):
 	create_webhook_event("Site Status Update", record, record.team)
 
 
-class SiteToArchive(frappe._dict):
-	name: str
-	plan: str
-	team: str
-	bench: str
-	offsite_backups: DF.Check
-
-
 def get_suspended_time(site: str):
 	return frappe.get_all(
 		"Site Activity",
@@ -5072,52 +5115,64 @@ def get_suspended_time(site: str):
 	)[0].creation
 
 
-def archive_suspended_site(site_dict: SiteToArchive):
-	archive_after_days = ARCHIVE_AFTER_SUSPEND_DAYS
-	suspended_days = frappe.utils.date_diff(frappe.utils.today(), get_suspended_time(site_dict.name))
-
-	if frappe.db.get_value("Bench", site_dict.bench, "managed_database_service"):
-		return
-
-	if suspended_days <= archive_after_days:
-		if suspended_days == archive_after_days - NOTIFY_BEFORE_ARCHIVAL_DAYS:
-			notify_site_scheduled_for_archival(site_dict.name)
-		return
-
-	site = Site("Site", site_dict.name)
-	site.archive(reason="Archive suspended site")
-
-
 def archive_suspended_sites():
-	archive_at_once = 5
+	archive_at_once = 6
+	archive_threshold = frappe.utils.add_to_date(frappe.utils.now(), days=-ARCHIVE_AFTER_SUSPEND_DAYS)
 
-	sites = frappe.qb.DocType("Site")
-	site_plans = frappe.qb.DocType("Site Plan")
+	SiteTable = frappe.qb.DocType("Site")
 
 	sites_to_drop = (
-		frappe.qb.from_(sites)
-		.join(site_plans)
-		.on(sites.plan == site_plans.name)
+		frappe.qb.from_(SiteTable)
 		.where(
-			(sites.status == "Suspended") & (sites.trial_end_date.isnull()) & (site_plans.is_trial_plan == 0)
+			(SiteTable.status == "Suspended")
+			& (SiteTable.suspended_at.isnotnull())
+			& (SiteTable.suspended_at <= archive_threshold)
 		)
-		.select(sites.name, sites.team, sites.plan, sites.bench, site_plans.offsite_backups)
-		.orderby(sites.creation, order=frappe.qb.asc)
+		.select(SiteTable.name, SiteTable.bench)
 		.limit(archive_at_once)
 		.run(as_dict=True)
 	)
 
 	for site_dict in sites_to_drop:
 		try:
-			archive_suspended_site(site_dict)
+			if frappe.db.get_value("Bench", site_dict.bench, "managed_database_service"):
+				continue
+
+			site = Site("Site", site_dict.name)
+			site.archive(reason="Archive suspended site")
 			frappe.db.commit()
 		except (frappe.QueryDeadlockError, frappe.QueryTimeoutError):
 			frappe.db.rollback()
 		except Exception:
-			frappe.log_error(title="Suspended Site Archive Error")
+			frappe.log_error(title="Suspended Site Archival Error")
 			frappe.db.rollback()
 
 
+def notify_sites_before_archival():
+	notify_threshold = frappe.utils.add_to_date(
+		frappe.utils.now(), days=-(ARCHIVE_AFTER_SUSPEND_DAYS - NOTIFY_BEFORE_ARCHIVAL_DAYS)
+	)
+	archive_threshold = frappe.utils.add_to_date(frappe.utils.now(), days=-ARCHIVE_AFTER_SUSPEND_DAYS)
+
+	SiteTable = frappe.qb.DocType("Site")
+	sites_to_notify = (
+		frappe.qb.from_(SiteTable)
+		.where(
+			(SiteTable.status == "Suspended")
+			& (SiteTable.suspended_at.isnotnull())
+			& (SiteTable.suspended_at <= notify_threshold)
+			& (SiteTable.suspended_at > archive_threshold)
+		)
+		.select(SiteTable.name, SiteTable.bench)
+		.run(as_dict=True)
+	)
+
+	for site_dict in sites_to_notify:
+		if frappe.db.get_value("Bench", site_dict.bench, "managed_database_service"):
+			continue
+		notify_site_scheduled_for_archival(site_dict.name)
+
+
 def notify_site_scheduled_for_archival(site_name: str):
 	try:
 		if frappe.db.exists(
diff --git a/press/press/doctype/site/test_site.py b/press/press/doctype/site/test_site.py
index fa66c83a406..7b4bd07a145 100644
--- a/press/press/doctype/site/test_site.py
+++ b/press/press/doctype/site/test_site.py
@@ -31,16 +31,16 @@
 from press.press.doctype.server.server import BaseServer, Server
 from press.press.doctype.site.site import (
 	ARCHIVE_AFTER_SUSPEND_DAYS,
+	NOTIFY_BEFORE_ARCHIVAL_DAYS,
 	Site,
 	archive_suspended_sites,
+	notify_sites_before_archival,
 	process_rename_site_job_update,
 	suspend_sites_exceeding_disk_usage_for_last_14_days,
 )
-from press.press.doctype.site_activity.test_site_activity import create_test_site_activity
 from press.press.doctype.site_plan.test_site_plan import create_test_plan
 from press.press.doctype.team.test_team import create_test_team
 from press.press.doctype.telegram_message.telegram_message import TelegramMessage
-from press.saas.doctype.saas_settings.test_saas_settings import create_test_saas_settings
 from press.utils import get_current_team
 
 if typing.TYPE_CHECKING:
@@ -166,6 +166,7 @@ def create_test_site(
 			}
 		)
 		site.update(kwargs)
+		frappe.clear_document_cache("Site", site.name)
 		site.insert()
 		site.db_set("creation", creation)
 		site.reload()
@@ -527,33 +528,41 @@ def test_apps_are_reordered_to_follow_bench_order(self):
 
 	@patch("press.press.doctype.site.site.frappe.db.commit", new=Mock())
 	@patch("press.press.doctype.site.site.frappe.db.rollback", new=Mock())
-	def test_archive_suspended_sites_archives_only_sites_with_backup_suspended_longer_than_days(self):
-		offsite_backup_plan = create_test_plan(
-			"Site", price_usd=5.0, price_inr=375.0, plan_name="Offsite Backup plan", offsite_backups=True
+	@patch("frappe.sendmail", new=Mock())
+	def test_archive_suspended_sites_and_notify_before_archival(self):
+		site_to_notify_and_archive = create_test_site()
+		site_to_notify_and_archive.db_set("status", "Suspended")
+		site_to_notify_and_archive.db_set(
+			"suspended_at",
+			frappe.utils.add_days(
+				frappe.utils.now_datetime(),
+				-(ARCHIVE_AFTER_SUSPEND_DAYS - NOTIFY_BEFORE_ARCHIVAL_DAYS),
+			),
 		)
-		site = create_test_site(plan=offsite_backup_plan.name)
-		site.db_set("status", "Suspended")
-		site_activity = create_test_site_activity(site.name, "Suspend Site")
-		site_activity.db_set(
-			"creation", frappe.utils.add_days(frappe.utils.now_datetime(), -ARCHIVE_AFTER_SUSPEND_DAYS - 1)
+
+		notify_sites_before_archival()
+		self.assertTrue(
+			frappe.db.exists(
+				"Site Activity",
+				{"site": site_to_notify_and_archive.name, "action": "Archive Notification"},
+			)
 		)
-		site2 = create_test_site(plan=offsite_backup_plan.name)
-		site2.db_set("status", "Suspended")
-		site2_activity = create_test_site_activity(site2.name, "Suspend Site")
-		site2_activity.db_set(
-			"creation", frappe.utils.add_days(frappe.utils.now_datetime(), -ARCHIVE_AFTER_SUSPEND_DAYS + 1)
-		)  # site2 suspended recently
-		site3 = create_test_site(plan=offsite_backup_plan.name)  # active site should not be archived
 
-		create_test_saas_settings(None, [create_test_app(), create_test_app("erpnext", "ERPNext")])
+		site_to_notify_and_archive.db_set(
+			"suspended_at",
+			frappe.utils.add_days(frappe.utils.now_datetime(), -ARCHIVE_AFTER_SUSPEND_DAYS - 1),
+		)
+
+		site_recent = create_test_site()
+		site_recent.db_set("status", "Suspended")
+		site_recent.db_set("suspended_at", frappe.utils.add_days(frappe.utils.now_datetime(), -3))
 
 		archive_suspended_sites()
-		site.reload()
-		site2.reload()
-		site3.reload()
-		self.assertEqual(site.status, "Pending")  # to be archived
-		self.assertEqual(site2.status, "Suspended")
-		self.assertEqual(site3.status, "Active")
+
+		site_to_notify_and_archive.reload()
+		site_recent.reload()
+		self.assertEqual(site_to_notify_and_archive.status, "Pending")  # site is being archived
+		self.assertEqual(site_recent.status, "Suspended")  # Do not archive recently suspended site
 
 	def test_site_usage_exceed_tracking(self):
 		team = create_test_team()
diff --git a/press/press/doctype/site_activity/test_site_activity.py b/press/press/doctype/site_activity/test_site_activity.py
index d5a8fd16b5d..41aeed02ff3 100644
--- a/press/press/doctype/site_activity/test_site_activity.py
+++ b/press/press/doctype/site_activity/test_site_activity.py
@@ -7,8 +7,6 @@
 import frappe
 from frappe.tests.utils import FrappeTestCase
 
-from press.utils import get_current_team
-
 if TYPE_CHECKING:
 	from press.press.doctype.site_activity.site_activity import SiteActivity
 
@@ -19,7 +17,7 @@ def create_test_site_activity(site: str, action: str) -> SiteActivity:
 			"doctype": "Site Activity",
 			"site": site,
 			"action": action,
-			"team": get_current_team(),
+			"team": frappe.db.get_value("Site", site, "team"),
 		}
 	).insert()
 
diff --git a/press/press/doctype/team/team.py b/press/press/doctype/team/team.py
index ef97fb46b9f..28de461d09c 100644
--- a/press/press/doctype/team/team.py
+++ b/press/press/doctype/team/team.py
@@ -397,13 +397,15 @@ def create_new(
 
 	@staticmethod
 	def create_user(first_name=None, last_name=None, email=None, password=None, role=None):
+		# These roles are basic and necessary for every user.
+		basic_roles = ("Press Admin", "Press Member")
 		user = frappe.new_doc("User")
 		user.first_name = first_name
 		user.last_name = last_name
 		user.email = email
 		user.owner = email
 		user.new_password = password
-		user.append_roles(role)
+		user.append_roles(role, *basic_roles)
 		user.flags.no_welcome_mail = True
 		user.save(ignore_permissions=True)
 		return user
diff --git a/press/press/doctype/user_ssh_certificate/user_ssh_certificate.py b/press/press/doctype/user_ssh_certificate/user_ssh_certificate.py
index 116d005fe3f..3f20958991e 100644
--- a/press/press/doctype/user_ssh_certificate/user_ssh_certificate.py
+++ b/press/press/doctype/user_ssh_certificate/user_ssh_certificate.py
@@ -121,7 +121,7 @@ def generate_ssh_command(self):
 			proxy = "<proxy>"
 
 		ssh_port = 22
-		if self.server_type == "Proxy Server":
+		if self.server_type == "Proxy Server" or not proxy:
 			self.ssh_command = f"ssh frappe@{server} -p {ssh_port}"
 		else:
 			self.ssh_command = f"ssh -J frappe@{proxy} frappe@{server} -p {ssh_port}"
@@ -139,7 +139,8 @@ def get_principals(self):
 			self.proxy = frappe.db.get_value(
 				"Server", {"status": "Active", "database_server": self.access_server}, "proxy_server"
 			)
-		return f"{self.proxy},{self.access_server}"
+
+		return f"{self.proxy},{self.access_server}" if self.proxy else self.access_server
 
 
 @frappe.whitelist()
diff --git a/press/press/doctype/virtual_machine/virtual_machine.py b/press/press/doctype/virtual_machine/virtual_machine.py
index 4d8ba8586e0..b5046bb5f00 100644
--- a/press/press/doctype/virtual_machine/virtual_machine.py
+++ b/press/press/doctype/virtual_machine/virtual_machine.py
@@ -992,6 +992,9 @@ def increase_disk_size(self, volume_id=None, increment=50):  # noqa: C901
 				},
 			)
 
+		elif self.cloud_provider == "Frappe Compute":
+			self.client().increase_disk_size(volume_id, volume.size)
+
 		if server := self.get_server():
 			log_server_activity(
 				self.series,
diff --git a/press/saas/api/domain.py b/press/saas/api/domain.py
new file mode 100644
index 00000000000..de27196a779
--- /dev/null
+++ b/press/saas/api/domain.py
@@ -0,0 +1,61 @@
+import frappe
+from frappe.core.utils import find
+
+from press.saas.api import whitelist_saas_api
+from press.utils.dns import check_dns_cname_a
+
+
+@whitelist_saas_api
+def get_domains() -> list:
+	site_name = frappe.local.site_name
+	domains = frappe.get_all(
+		"Site Domain",
+		fields=["name", "domain", "status", "retry_count", "redirect_to_primary"],
+		filters={"site": site_name},
+	)
+	host_name = frappe.db.get_value("Site", site_name, "host_name")
+	primary = find(domains, lambda x: x.domain == host_name)
+	if primary:
+		primary.primary = True
+	domains.sort(key=lambda domain: not domain.get("primary"))
+	return domains
+
+
+@whitelist_saas_api
+def check_dns(domain: str) -> dict:
+	return check_dns_cname_a(frappe.local.site_name, domain)
+
+
+@whitelist_saas_api
+def add_domain(domain: str):
+	frappe.get_doc("Site", frappe.local.site_name).add_domain(domain)
+
+
+@whitelist_saas_api
+def remove_domain(domain: str):
+	frappe.get_doc("Site", frappe.local.site_name).remove_domain(domain)
+
+
+@whitelist_saas_api
+def retry_add_domain(domain: str):
+	frappe.get_doc("Site", frappe.local.site_name).retry_add_domain(domain)
+
+
+@whitelist_saas_api
+def set_host_name(domain: str):
+	frappe.get_doc("Site", frappe.local.site_name).set_host_name(domain)
+
+
+@whitelist_saas_api
+def set_redirect(domain: str):
+	frappe.get_doc("Site", frappe.local.site_name).set_redirect(domain)
+
+
+@whitelist_saas_api
+def unset_redirect(domain: str):
+	frappe.get_doc("Site", frappe.local.site_name).unset_redirect(domain)
+
+
+@whitelist_saas_api
+def get_inbound_ip() -> str:
+	return frappe.get_cached_doc("Site", frappe.local.site_name).inbound_ip
diff --git a/press/templates/emails/marketplace_audit_report.html b/press/templates/emails/marketplace_audit_report.html
new file mode 100644
index 00000000000..fce255dc979
--- /dev/null
+++ b/press/templates/emails/marketplace_audit_report.html
@@ -0,0 +1,165 @@
+{% import "templates/emails/macros.html" as utils %}
+{% extends "templates/emails/base.html" %}
+
+{% set tone = {
+    "Critical":          {"bg": "#FEF2F2", "fg": "#B91C1C", "dot": "#DC2626"},
+    "Major":             {"bg": "#FFF7ED", "fg": "#C2410C", "dot": "#EA580C"},
+    "Minor":             {"bg": "#FEFCE8", "fg": "#A16207", "dot": "#CA8A04"},
+    "Info":              {"bg": "#EFF6FF", "fg": "#1D4ED8", "dot": "#2563EB"},
+    "Fail":              {"bg": "#FEF2F2", "fg": "#B91C1C", "dot": "#DC2626"},
+    "Warn":              {"bg": "#FFF7ED", "fg": "#C2410C", "dot": "#EA580C"},
+    "Needs Improvement": {"bg": "#EFF6FF", "fg": "#1D4ED8", "dot": "#2563EB"},
+    "Pass":              {"bg": "#F0FDF4", "fg": "#15803D", "dot": "#16A34A"},
+    "Inconclusive":      {"bg": "#F9FAFB", "fg": "#4B5563", "dot": "#9CA3AF"}
+} %}
+{% set neutral = {"bg": "#F3F4F6", "fg": "#4B5563", "dot": "#9CA3AF"} %}
+
+{% set result_heading = {
+    "Pass":              "Audit Passed",
+    "Needs Improvement": "Needs Improvement",
+    "Warn":              "Audit Passed with Warnings",
+    "Fail":              "Audit Failed",
+    "Inconclusive":      "Audit Inconclusive"
+} %}
+
+{% set font_stack = "-apple-system, BlinkMacSystemFont, 'Inter', sans-serif" %}
+{% set mono_stack = "ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, monospace" %}
+
+{% set header_tone = tone.get(audit_result, neutral) %}
+{% set issue_count = failing_checks | length %}
+
+{% macro pill(label, scheme) -%}
+    <span style="display: inline-block; padding: 2px 8px; border-radius: 4px;
+                 font-size: 11px; font-weight: 500; letter-spacing: 0.01em;
+                 background: {{ scheme.bg }}; color: {{ scheme.fg }};">{{ label }}</span>
+{%- endmacro %}
+
+{% block content %}
+<td style="font-family: {{ font_stack }}; color: #1F2937;">
+<div style="padding: 32px 8px;">
+
+    <p style="margin: 0 0 6px; font-size: 22px; font-weight: 600; line-height: 1.25;
+              color: {{ header_tone.fg }};">
+        {{ result_heading.get(audit_result, audit_result) }}
+    </p>
+    <p style="margin: 0 0 24px; font-size: 14px; line-height: 1.5; color: #6B7280;">
+        {% if issue_count > 0 -%}
+            {{ issue_count }} issue{{ 's' if issue_count != 1 else '' }} found in
+        {%- else -%}
+            For
+        {%- endif %}
+        <span style="color: #111827; font-weight: 500;">{{ app_title }}</span>
+    </p>
+
+    {% if audit_summary %}
+    <p style="margin: 0 0 20px; font-size: 14px; line-height: 1.65; color: #374151;">
+        {{ audit_summary }}
+    </p>
+    {% endif %}
+
+    {% if issue_count > 0 %}
+    <table width="100%" cellpadding="0" cellspacing="0" role="presentation"
+           style="background: #F9FAFB; border: 1px solid #E5E7EB; border-radius: 6px; margin-bottom: 28px;">
+        <tr>
+            <td style="padding: 14px 16px; font-size: 13px; line-height: 1.65; color: #374151;">
+                Please review and fix the issues listed below, then publish a new release and
+                resubmit for approval. A fresh audit will run automatically on the new release.
+            </td>
+        </tr>
+    </table>
+    {% endif %}
+
+    {# ── Checks ── #}
+    {% for check in failing_checks %}
+    <table width="100%" cellpadding="0" cellspacing="0" role="presentation"
+           style="border: 1px solid #E5E7EB; border-radius: 6px; margin-bottom: 12px;
+                  border-collapse: separate;">
+        <tr>
+            <td style="padding: 16px 18px;">
+
+                {# Check name + severity/category/result pills #}
+                <p style="margin: 0 0 10px; font-size: 14px; font-weight: 600; color: #111827; line-height: 1.4;">
+                    {{ check.check_name }}
+                </p>
+                <div style="margin-bottom: 12px;">
+                    {{ pill(check.severity, tone.get(check.severity, neutral)) }}
+                    {{ pill(check.result, tone.get(check.result, neutral)) }}
+                </div>
+
+                {% if check.message %}
+                <p style="margin: 0 0 12px; font-size: 13px; line-height: 1.65; color: #374151;">
+                    {{ check.message }}
+                </p>
+                {% endif %}
+
+                {# ── Semgrep occurrences — rule-id primary, location secondary ── #}
+                {% if check.details and check.details.occurrences %}
+                <div style="margin-bottom: 14px;">
+                {% for occ in check.details.occurrences %}
+                    <table width="100%" cellpadding="0" cellspacing="0" role="presentation"
+                           style="background: #F9FAFB; border: 1px solid #E5E7EB; border-radius: 4px;
+                                  margin-bottom: 6px;">
+                        <tr>
+                            <td style="padding: 10px 12px;">
+                                {# Primary: rule identifier #}
+                                {% if occ.rule_id %}
+                                <p style="margin: 0 0 2px; font-size: 12px; font-weight: 600; color: #111827;
+                                          font-family: {{ mono_stack }}; line-height: 1.5;">
+                                    {{ occ.rule_id }}
+                                </p>
+                                {% endif %}
+                                {# Secondary: file path and line #}
+                                <p style="margin: 0 0 8px; font-size: 11px; color: #6B7280;
+                                          font-family: {{ mono_stack }}; line-height: 1.5; word-break: break-all;">
+                                    {{ occ.path or '–' }}{% if occ.start and occ.start.line %}<span style="color: #9CA3AF;">&nbsp;&middot;&nbsp;</span>line {{ occ.start.line }}{% endif %}
+                                </p>
+                                {# Body: the actual finding message #}
+                                {% if occ.message %}
+                                <p style="margin: 0; font-size: 12px; line-height: 1.6; color: #374151;">
+                                    {{ occ.message }}
+                                </p>
+                                {% endif %}
+                            </td>
+                        </tr>
+                    </table>
+                {% endfor %}
+                </div>
+                {% endif %}
+
+                {% if check.remediation %}
+                <table width="100%" cellpadding="0" cellspacing="0" role="presentation"
+                       style="border-collapse: collapse;">
+                    <tr>
+                        <td width="3" style="background: #16A34A; border-radius: 2px;"></td>
+                        <td width="12"></td>
+                        <td style="padding: 2px 0;">
+                            <p style="margin: 0 0 3px; font-size: 10px; font-weight: 600;
+                                      color: #16A34A; text-transform: uppercase; letter-spacing: 0.06em;">
+                                How to fix
+                            </p>
+                            <p style="margin: 0; font-size: 13px; line-height: 1.6; color: #374151;">
+                                {{ check.remediation }}
+                            </p>
+                        </td>
+                    </tr>
+                </table>
+                {% endif %}
+
+            </td>
+        </tr>
+    </table>
+    {% endfor %}
+
+    {{ utils.separator() }}
+
+    <p style="margin: 0 0 16px; font-size: 12px; line-height: 1.65; color: #6B7280;">
+        This is an automated report from the Frappe Cloud Marketplace Auditor (beta).
+        If you believe this report is incorrect or need help interpreting it, reach out to
+        {{ utils.link('support.frappe.io', 'https://support.frappe.io') }}.
+    </p>
+
+    {{ utils.signature() }}
+
+</div>
+</td>
+{% endblock %}
diff --git a/press/templates/emails/notify_before_site_archival.html b/press/templates/emails/notify_before_site_archival.html
index 03471934e40..f0a3ec3eccf 100644
--- a/press/templates/emails/notify_before_site_archival.html
+++ b/press/templates/emails/notify_before_site_archival.html
@@ -6,7 +6,7 @@
 <td class="text-base leading-6 text-gray-900">
 	<div class="p-8 bg-white">
 		<p>Hi,</p>
-        <p>This is to inform you that your suspended site <strong>{{site_name}}</strong> will be automatically archived in <strong>{{site_archive_notification_days}} days</strong>. Once archived, the site will no longer be accessible.</p>
+        <p>This is to inform you that your suspended site <strong>{{site_name}}</strong> will be automatically archived within <strong>{{site_archive_notification_days}} days</strong>. Once archived, the site will no longer be accessible.</p>
         <p>A backup of your site will be retained for 6 months in case you want to restore.</p>
 		{{ utils.separator() }}
 		{{ utils.signature() }}
diff --git a/press/workflow_engine/doctype/press_workflow/decorators.py b/press/workflow_engine/doctype/press_workflow/decorators.py
index fa46a01eeec..cd6122359a7 100644
--- a/press/workflow_engine/doctype/press_workflow/decorators.py
+++ b/press/workflow_engine/doctype/press_workflow/decorators.py
@@ -37,12 +37,21 @@ def _in_workflow_execution(instance: WorkflowBuilder | None) -> bool:
 _P = ParamSpec("_P")
 _R = TypeVar("_R")
 _R_co = TypeVar("_R_co", covariant=True)
+_F = TypeVar("_F", bound="Callable[..., Any]")
 
 
 class _BoundTask(Generic[_P, _R_co]):
-	def __init__(self, wrapped: Callable[..., _R_co], instance: WorkflowBuilder) -> None:
+	def __init__(
+		self,
+		wrapped: Callable[..., _R_co],
+		instance: WorkflowBuilder,
+		queue: str | None = None,
+		timeout: int | None = None,
+	) -> None:
 		self._wrapped = wrapped
 		self._instance = instance
+		self._queue = queue
+		self._timeout = timeout
 		self._task_id: str | None = None
 		wraps(wrapped)(self)
 
@@ -51,7 +60,9 @@ def _execute(self, args: tuple, kwargs: dict) -> _R_co:
 			kwargs = {**kwargs, "task_id": self._task_id}
 
 		if _in_workflow_execution(self._instance):
-			return self._instance.run_task(self._wrapped, args, kwargs)  # type: ignore[return-value]
+			return self._instance.run_task(
+				self._wrapped, args, kwargs, queue=self._queue, timeout=self._timeout
+			)  # type: ignore[return-value]
 
 		if not is_func_accept_task_id(self._wrapped):
 			kwargs = {k: v for k, v in kwargs.items() if k != "task_id"}
@@ -61,14 +72,23 @@ def __call__(self, *args: _P.args, **kwargs: _P.kwargs) -> _R_co:
 		return self._execute(args, kwargs)  # type: ignore[arg-type]
 
 	def with_task_id(self, task_id: str) -> "_BoundTask[_P, _R_co]":
-		bound: _BoundTask[_P, _R_co] = _BoundTask(self._wrapped, self._instance)
+		bound: _BoundTask[_P, _R_co] = _BoundTask(
+			self._wrapped, self._instance, queue=self._queue, timeout=self._timeout
+		)
 		bound._task_id = task_id
 		return bound  # type: ignore[return-value]
 
 
 class _TaskDescriptor(Generic[_P, _R_co]):
-	def __init__(self, wrapped: Callable[Concatenate[Any, _P], _R_co]) -> None:
+	def __init__(
+		self,
+		wrapped: Callable[Concatenate[Any, _P], _R_co],
+		queue: str | None = None,
+		timeout: int | None = None,
+	) -> None:
 		self._wrapped = wrapped
+		self._queue = queue
+		self._timeout = timeout
 		wraps(wrapped)(self)  # type: ignore[arg-type]
 
 	def __set_name__(self, owner: type, name: str) -> None:
@@ -83,18 +103,39 @@ def __get__(self, instance: Any, owner: type) -> _BoundTask[_P, _R_co]: ...
 	def __get__(self, instance: Any, owner: type) -> Any:
 		if instance is None:
 			return self
-		return _BoundTask(self._wrapped, instance)
+		return _BoundTask(self._wrapped, instance, queue=self._queue, timeout=self._timeout)
+
+
+@overload
+def task(wrapped: _F) -> _F: ...
+
+
+@overload
+def task(*, queue: str | None = None, timeout: int | None = None) -> "Callable[[_F], _F]": ...
 
 
-def task(wrapped: Callable[Concatenate[Any, _P], _R]) -> _TaskDescriptor[_P, _R]:
+def task(
+	wrapped: "_F | None" = None,
+	*,
+	queue: str | None = None,
+	timeout: int | None = None,
+) -> "_F | Callable[[_F], _F]":
 	"""Mark a method as a workflow task.
 
 	When called inside an active workflow execution, the method is handed off
 	to the workflow engine (enqueued, tracked, retried). Outside a workflow
 	it behaves like a normal method call. Supports `.with_task_id()` to
 	attach an explicit task identifier.
+
+	Can be used as ``@task``, ``@task(queue="long")``, or ``@task(queue="long", timeout=3600)``.
 	"""
-	return _TaskDescriptor(wrapped)
+	if wrapped is not None:
+		return _TaskDescriptor(wrapped)  # type: ignore[return-value]
+
+	def decorator(fn: _F) -> _F:
+		return _TaskDescriptor(fn, queue=queue, timeout=timeout)  # type: ignore[return-value]
+
+	return decorator  # type: ignore[return-value]
 
 
 _Self = TypeVar("_Self")
diff --git a/press/workflow_engine/doctype/press_workflow/workflow_builder.py b/press/workflow_engine/doctype/press_workflow/workflow_builder.py
index 70c5920cadb..a607cf7d57a 100644
--- a/press/workflow_engine/doctype/press_workflow/workflow_builder.py
+++ b/press/workflow_engine/doctype/press_workflow/workflow_builder.py
@@ -51,7 +51,14 @@ class WorkflowBuilder(Document):
 	current_task_signature: str | None = None
 
 	@ensure_to_resolve_context
-	def run_task(self, wrapped: Callable[..., object], args: tuple, kwargs: dict) -> Any:  # noqa: C901 best to keep task execution logic in one place
+	def run_task(  # noqa: C901
+		self,
+		wrapped: Callable[..., object],
+		args: tuple,
+		kwargs: dict,
+		queue: str | None = None,
+		timeout: int | None = None,
+	) -> Any:
 		assert self.workflow_name is not None, "Workflow name must be set to enqueue task"
 
 		signature = generate_function_signature(wrapped, args, kwargs)
@@ -81,6 +88,8 @@ def run_task(self, wrapped: Callable[..., object], args: tuple, kwargs: dict) ->
 			task_doc.args = PressWorkflowObject.store(args) if args else None  # type: ignore
 			task_doc.kwargs = PressWorkflowObject.store(kwargs) if kwargs else None  # type: ignore
 			task_doc.status = "Queued"  # type: ignore
+			task_doc.queue = queue  # type: ignore
+			task_doc.timeout = timeout or 0  # type: ignore
 
 			# If we are currently inside a running task, record it as the parent
 			# so the new task can re-enqueue it when it completes.
diff --git a/press/workflow_engine/doctype/press_workflow_task/press_workflow_task.json b/press/workflow_engine/doctype/press_workflow_task/press_workflow_task.json
index f997c7d37cd..1f9b7c93b29 100644
--- a/press/workflow_engine/doctype/press_workflow_task/press_workflow_task.json
+++ b/press/workflow_engine/doctype/press_workflow_task/press_workflow_task.json
@@ -8,6 +8,8 @@
   "workflow",
   "status",
   "parent_task",
+  "queue",
+  "timeout",
   "column_break_frrn",
   "method_name",
   "method_title",
@@ -162,11 +164,22 @@
    "fieldtype": "Long Text",
    "label": "Stdout",
    "read_only": 1
+  },
+  {
+   "fieldname": "queue",
+   "fieldtype": "Data",
+   "label": "Queue",
+   "set_only_once": 1
+  },
+  {
+   "fieldname": "timeout",
+   "fieldtype": "Int",
+   "label": "Timeout"
   }
  ],
  "grid_page_length": 50,
  "links": [],
- "modified": "2026-03-11 02:26:44.473928",
+ "modified": "2026-04-14 16:25:01.842528",
  "modified_by": "Administrator",
  "module": "Workflow Engine",
  "name": "Press Workflow Task",
diff --git a/press/workflow_engine/doctype/press_workflow_task/press_workflow_task.py b/press/workflow_engine/doctype/press_workflow_task/press_workflow_task.py
index f5dbbdf7c88..5bd5c61d4b9 100644
--- a/press/workflow_engine/doctype/press_workflow_task/press_workflow_task.py
+++ b/press/workflow_engine/doctype/press_workflow_task/press_workflow_task.py
@@ -38,10 +38,12 @@ class PressWorkflowTask(Document):
 		method_title: DF.Data
 		output: DF.Link | None
 		parent_task: DF.Link | None
+		queue: DF.Data | None
 		signature: DF.Data
 		start: DF.Datetime | None
 		status: DF.Literal["Queued", "Running", "Success", "Failure"]
 		stdout: DF.LongText | None
+		timeout: DF.Int
 		workflow: DF.Link
 	# end: auto-generated types
 
@@ -192,12 +194,16 @@ def enqueue_task(task_name: str) -> None:
 
 		foreground_enqueue_task(task_name)
 		return
+	queue = frappe.db.get_value("Press Workflow Task", task_name, "queue") or frappe.conf.get(
+		"press_workflow_task_queue", "default"
+	)
+	timeout = frappe.db.get_value("Press Workflow Task", task_name, "timeout") or 300
 	frappe.enqueue_doc(
 		"Press Workflow Task",
 		task_name,
 		method="run",
-		queue=frappe.conf.get("press_workflow_task_queue", "default"),
-		timeout=3600,
+		queue=queue,
+		timeout=timeout,
 		deduplicate=True,
 		enqueue_after_commit=True,
 		job_id=f"press_workflow_task||{task_name}||run",
diff --git a/press/www/github/authorize.py b/press/www/github/authorize.py
index 257b8c19d93..21be2703b35 100644
--- a/press/www/github/authorize.py
+++ b/press/www/github/authorize.py
@@ -2,25 +2,36 @@
 # For license information, please see license.txt
 
 
-import json
-from base64 import b64decode
-
 import frappe
 import requests
 
-from press.utils import log_error
+from press.api.github import decode_github_oauth_state, get_github_callback_login_redirect
+from press.utils import get_valid_teams_for_user, log_error
 
 
 def get_context(context):
 	code = frappe.form_dict.code
 	state = frappe.form_dict.state
 	redirect_url = frappe.utils.get_url("/dashboard")
+
+	if frappe.session.user == "Guest":
+		frappe.flags.redirect_location = get_github_callback_login_redirect(code, state)
+		raise frappe.Redirect
+
 	if code and state:
-		decoded_state = json.loads(b64decode(state).decode())
-		team = decoded_state["team"]
-		redirect_url = frappe.utils.get_url(decoded_state["url"])
-		obtain_access_token(code, team)
-		frappe.db.commit()
+		try:
+			decoded_state = decode_github_oauth_state(state)
+			team = decoded_state["team"]
+			valid_teams = {team_doc["name"] for team_doc in get_valid_teams_for_user(frappe.session.user)}
+			if team not in valid_teams:
+				raise frappe.PermissionError("Not permitted to update this team's GitHub access token")
+
+			redirect_url = frappe.utils.get_url(decoded_state["redirect_url"])
+			obtain_access_token(code, team)
+			frappe.db.commit()
+		except Exception:
+			log_error("GitHub OAuth Authorization Error")
+
 	frappe.flags.redirect_location = redirect_url
 	raise frappe.Redirect
 
@@ -29,9 +40,7 @@ def obtain_access_token(code, team):
 	response = None
 	try:
 		client_id = frappe.db.get_single_value("Press Settings", "github_app_client_id")
-		client_secret = frappe.db.get_single_value(
-			"Press Settings", "github_app_client_secret"
-		)
+		client_secret = frappe.db.get_single_value("Press Settings", "github_app_client_secret")
 		data = {"client_id": client_id, "client_secret": client_secret, "code": code}
 		headers = {"Accept": "application/json"}
 		response = requests.post(
@@ -39,4 +48,18 @@ def obtain_access_token(code, team):
 		).json()
 		frappe.db.set_value("Team", team, "github_access_token", response["access_token"])
 	except Exception:
-		log_error("Access Token Error", team=team, code=code, response=response)
+		log_error("Access Token Error", team=team, response=summarize_github_token_response(response))
+
+
+def summarize_github_token_response(response):
+	if not response:
+		return None
+
+	return {
+		"error": response.get("error"),
+		"error_description": response.get("error_description"),
+		"error_uri": response.get("error_uri"),
+		"has_access_token": bool(response.get("access_token")),
+		"scope": response.get("scope"),
+		"token_type": response.get("token_type"),
+	}
diff --git a/press/www/github/redirect.py b/press/www/github/redirect.py
index 730275ee39c..9070bcddd33 100644
--- a/press/www/github/redirect.py
+++ b/press/www/github/redirect.py
@@ -30,8 +30,26 @@ def get_context(context):
 			settings.save()
 			frappe.db.commit()
 		except Exception:
-			log_error("GitHub App Creation Error", code=code, response=response)
+			log_error(
+				"GitHub App Creation Error",
+				response=summarize_github_app_creation_response(response),
+			)
 
 	redirect_url = frappe.utils.get_url("/app#Form/Press Settings")
 	frappe.flags.redirect_location = redirect_url
 	raise frappe.Redirect
+
+
+def summarize_github_app_creation_response(response):
+	if not response:
+		return None
+
+	return {
+		"app_id": response.get("id"),
+		"errors": response.get("errors"),
+		"html_url": response.get("html_url"),
+		"has_client_secret": bool(response.get("client_secret")),
+		"has_private_key": bool(response.get("pem")),
+		"has_webhook_secret": bool(response.get("webhook_secret")),
+		"message": response.get("message"),
+	}
diff --git a/pyproject.toml b/pyproject.toml
index 31532051d61..b6c8a71462d 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -55,6 +55,7 @@ dependencies = [
     "playwright==1.49.1",
     "prometheus-api-client==0.6.0",
     "pydo==0.24.0",
+    "semgrep==1.159.0",
 ]
 
 [project.scripts]