diff --git a/client-v3/package-lock.json b/client-v3/package-lock.json
index d6128830f..a4365db64 100644
--- a/client-v3/package-lock.json
+++ b/client-v3/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "client-v3",
-  "version": "0.33.0",
+  "version": "0.34.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "client-v3",
-      "version": "0.33.0",
+      "version": "0.34.0",
       "dependencies": {
         "@vuelidate/core": "^2.0.3",
         "@vuelidate/validators": "^2.0.4",
@@ -27,7 +27,7 @@
         "pinia": "^3.0.4",
         "pinia-plugin-persistedstate": "^4.7.1",
         "splitpanes": "^4.1.2",
-        "vue": "^3.5.38",
+        "vue": "^3.5.39",
         "vue-multiselect": "^3.5.0",
         "vue-router": "^5.1.0",
         "vue-toast-notification": "^3.1.3"
@@ -45,14 +45,14 @@
         "@vitejs/plugin-vue": "^6.0.7",
         "@vitest/ui": "^4.1.9",
         "@vue/test-utils": "^2.4.11",
-        "eslint": "^10.5.0",
+        "eslint": "^10.6.0",
         "eslint-config-prettier": "^10.1.8",
         "eslint-plugin-prettier": "^5.5.6",
         "eslint-plugin-vue": "^10.9.2",
         "globals": "^17.7.0",
         "jiti": "^2.7.0",
         "jsdom": "^29.1.1",
-        "prettier": "^3.8.4",
+        "prettier": "^3.9.0",
         "sass": "1.101.0",
         "typescript": "^6.0.3",
         "typescript-eslint": "^8.62.0",
@@ -255,9 +255,9 @@
       }
     },
     "node_modules/@csstools/color-helpers": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/@csstools/color-helpers/-/color-helpers-6.0.2.tgz",
-      "integrity": "sha512-LMGQLS9EuADloEFkcTBR3BwV/CGHV7zyDxVRtVDTwdI2Ca4it0CCVTT9wCkxSgokjE5Ho41hEPgb8OEUwoXr6Q==",
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/@csstools/color-helpers/-/color-helpers-6.1.0.tgz",
+      "integrity": "sha512-064IFJdjTfUqnjpCVpMOdbr8FLQBhinbZj6yRv2An2E41O/pLEXqfFRWqGq/SxlE5PEUYTlvWsG2r8MswAVvkg==",
       "dev": true,
       "funding": [
         {
@@ -299,9 +299,9 @@
       }
     },
     "node_modules/@csstools/css-color-parser": {
-      "version": "4.1.8",
-      "resolved": "https://registry.npmjs.org/@csstools/css-color-parser/-/css-color-parser-4.1.8.tgz",
-      "integrity": "sha512-3chWb7PRLijpJpPIKkDxdu6IBeO5MrFACND57On0j8OPpc0wZibcGc3xAHrSEbOx/KDRyMHoIxGn0w1PhXMYHw==",
+      "version": "4.1.9",
+      "resolved": "https://registry.npmjs.org/@csstools/css-color-parser/-/css-color-parser-4.1.9.tgz",
+      "integrity": "sha512-paQcIaOO53Rk5+YrBaBjm/SgrV4INImjo2BT1DtQRYr+XeTRbeAYlS+jxXp9drqvKmtFnWRJKIalDLhZZDu42A==",
       "dev": true,
       "funding": [
         {
@@ -315,7 +315,7 @@
       ],
       "license": "MIT",
       "dependencies": {
-        "@csstools/color-helpers": "^6.0.2",
+        "@csstools/color-helpers": "^6.1.0",
         "@csstools/css-calc": "^3.2.1"
       },
       "engines": {
@@ -783,14 +783,14 @@
       }
     },
     "node_modules/@napi-rs/wasm-runtime": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/@napi-rs/wasm-runtime/-/wasm-runtime-1.1.5.tgz",
-      "integrity": "sha512-AWPoBRJ9tsnVhor4sjO7rkni+7p+2IAEFj6cx06UgP10jkQHqay/36uRV/bFkgrh18D9vb4cr8Q0Pthskgzy+Q==",
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/@napi-rs/wasm-runtime/-/wasm-runtime-1.1.6.tgz",
+      "integrity": "sha512-ZLv/JdUfkvOy9eCnnBaGfiO+XimbjebAeO+MRQqD/B+FR1tnRN0tpKSJHRbE8sFfS6aqsXZ67TQjfwfsxULVbg==",
       "dev": true,
       "license": "MIT",
       "optional": true,
       "dependencies": {
-        "@tybys/wasm-util": "^0.10.2"
+        "@tybys/wasm-util": "^0.10.3"
       },
       "funding": {
         "type": "github",
@@ -1176,9 +1176,9 @@
       }
     },
     "node_modules/@rolldown/binding-android-arm64": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@rolldown/binding-android-arm64/-/binding-android-arm64-1.1.2.tgz",
-      "integrity": "sha512-2cZ+7xRS+DBcuJBJKnfzsbleumJhBqSlJVpuzHC0nTqfd3QQ7Vx2/x5YR/D7cBamKSeWplwo82Fn9lqYUDEMfA==",
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/@rolldown/binding-android-arm64/-/binding-android-arm64-1.1.3.tgz",
+      "integrity": "sha512-DT6Z3PhvioeHMvxo+xHc3KtqggrI7CCTXCmC2h/5zUlp5jVitv7XEy+9q5/7v8IolhlioawpMo8Kg0EEBy7J0g==",
       "cpu": [
         "arm64"
       ],
@@ -1193,9 +1193,9 @@
       }
     },
     "node_modules/@rolldown/binding-darwin-arm64": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@rolldown/binding-darwin-arm64/-/binding-darwin-arm64-1.1.2.tgz",
-      "integrity": "sha512-RkPMJnygxsgOYdkfqgpwY0/Fzm8d0VQe6HGU2/B00Xa9eqdLbrII+DOKAodbJAn3ZL1AJxGHkZRPYazgGY6Ljw==",
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/@rolldown/binding-darwin-arm64/-/binding-darwin-arm64-1.1.3.tgz",
+      "integrity": "sha512-0NwgwsjM7LrsuVnXMK3koTpagBNOhloc/BNjKqZjv4V5zI5r13qx69uVhRx+o5Z0yy4Hzq+lpy7TAgUG/ocvrw==",
       "cpu": [
         "arm64"
       ],
@@ -1210,9 +1210,9 @@
       }
     },
     "node_modules/@rolldown/binding-darwin-x64": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@rolldown/binding-darwin-x64/-/binding-darwin-x64-1.1.2.tgz",
-      "integrity": "sha512-Uiczh6vFhwyfd7WNe7Q7mCA4KxAiLdz7jPE/WGizfRpIieoyFuNVMmM8HqZ9HwudTkY6/AeMQwlNJ9NJijguWw==",
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/@rolldown/binding-darwin-x64/-/binding-darwin-x64-1.1.3.tgz",
+      "integrity": "sha512-YtiBp4disu6V560loT6PjMdiRaWmVvDNrUunAalbiFx2ggeJwxdAsgZMcoGP17uyAsTwAj5V1niksxlHnVQ1Sw==",
       "cpu": [
         "x64"
       ],
@@ -1227,9 +1227,9 @@
       }
     },
     "node_modules/@rolldown/binding-freebsd-x64": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@rolldown/binding-freebsd-x64/-/binding-freebsd-x64-1.1.2.tgz",
-      "integrity": "sha512-+TpdtTRgHiJFjCVFbw311SuLk3KfytPOQQn+VlAEv+gBxYPtL7E6JS9e/tk+8CwxhIZvemJKo4rTKgfWNsKkkA==",
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/@rolldown/binding-freebsd-x64/-/binding-freebsd-x64-1.1.3.tgz",
+      "integrity": "sha512-yD3EkEdXk2LypPxnf/kSZHirarsI8gcPzc62SukhR9VJTyvV+F9Q/GxWNuCojc7sXyuVC4DxRGhdDK4X8VSsbw==",
       "cpu": [
         "x64"
       ],
@@ -1244,9 +1244,9 @@
       }
     },
     "node_modules/@rolldown/binding-linux-arm-gnueabihf": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-arm-gnueabihf/-/binding-linux-arm-gnueabihf-1.1.2.tgz",
-      "integrity": "sha512-4lv1/tkmi7ueIVHnyreaOeUpiZP26BH9rRy6hoYfR9310A2B9nUEVRDvBx69vx64Nr3eTPPRkyciqJJs+j9Jmw==",
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-arm-gnueabihf/-/binding-linux-arm-gnueabihf-1.1.3.tgz",
+      "integrity": "sha512-c+8vieQbsD7HNAHKIA34w0GJ9FedFFuJGD+7E6vz7Q3uqAIugL5p45fhlsj4UaAsHpcmlqugBWMhA0/j7o0sIg==",
       "cpu": [
         "arm"
       ],
@@ -1261,9 +1261,9 @@
       }
     },
     "node_modules/@rolldown/binding-linux-arm64-gnu": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-arm64-gnu/-/binding-linux-arm64-gnu-1.1.2.tgz",
-      "integrity": "sha512-gBSUVO0eaWgw1JMjK3gB8BMlX2Mk148s2lTiVT3e9vjVxbl7UDfMWWY8CfIaaqiXuM9fVTMxIpUz6CAo/B6Vlw==",
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-arm64-gnu/-/binding-linux-arm64-gnu-1.1.3.tgz",
+      "integrity": "sha512-50jD0uUwLvur7Zz9LHz17kaAdTPjn5wN93hEgjvmYFRZwiR7ZJYovTd5ipyWJDAnXKvZ+wgc+/Ika6dwSF5OcA==",
       "cpu": [
         "arm64"
       ],
@@ -1278,9 +1278,9 @@
       }
     },
     "node_modules/@rolldown/binding-linux-arm64-musl": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-arm64-musl/-/binding-linux-arm64-musl-1.1.2.tgz",
-      "integrity": "sha512-LjQP/iZLBu8o8PjIfk4x3At0/mT6h282pvz8Z5LAyhGbu/kDezyO7ea62rF5uoqmgnIYqbN/MqJ3Si3Aymi7xQ==",
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-arm64-musl/-/binding-linux-arm64-musl-1.1.3.tgz",
+      "integrity": "sha512-BO9+oPL8K9poZJBfYPsXNtYjPE5uM3qeehT3aFcW4LITOl+iSqhp0abzjR2nWBUNjIZeKXjAEWBZ64WjNoHd6w==",
       "cpu": [
         "arm64"
       ],
@@ -1295,9 +1295,9 @@
       }
     },
     "node_modules/@rolldown/binding-linux-ppc64-gnu": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-ppc64-gnu/-/binding-linux-ppc64-gnu-1.1.2.tgz",
-      "integrity": "sha512-X/7bVLWelEsbyWDUSXt7zVsTniLLPIY2n1rH58qr78l9i7MNbbxBWD8gI2vRfBWf4NUXJCUuQnfZDsp32LqsfQ==",
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-ppc64-gnu/-/binding-linux-ppc64-gnu-1.1.3.tgz",
+      "integrity": "sha512-f3VpLB1vQ0Eo6ecr/6cekLnvYMFF4YBFoVGkfkvPLq1bAkbAwHYQPZKoAmG6OJyTcxxoC+AvezGx/S1obNC0Mw==",
       "cpu": [
         "ppc64"
       ],
@@ -1312,9 +1312,9 @@
       }
     },
     "node_modules/@rolldown/binding-linux-s390x-gnu": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-s390x-gnu/-/binding-linux-s390x-gnu-1.1.2.tgz",
-      "integrity": "sha512-gb6dYKW/1KDorGXyy48glEBJs/sxVSC5pcVrox/pFGV4mvwSFeg2sK5L2tRkVsVlh7kueqOgg4GEcuipJcGuKg==",
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-s390x-gnu/-/binding-linux-s390x-gnu-1.1.3.tgz",
+      "integrity": "sha512-AmurZ26Pqx/RI9N1gzEOCklkKXl927yjfXWUUS0O7Puh8ARM/Ob8qfrD3qnWksScdw6cSrW5PSHE9DyLu7+PtA==",
       "cpu": [
         "s390x"
       ],
@@ -1329,9 +1329,9 @@
       }
     },
     "node_modules/@rolldown/binding-linux-x64-gnu": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-x64-gnu/-/binding-linux-x64-gnu-1.1.2.tgz",
-      "integrity": "sha512-JY4w85pU3iAiJVMh5nuk4/Mh9GjMsupe8MrIN53rwxAZW64GKrWeJBuN6SxQg9QTU5uB1cxyhDzW8jqRn1EABw==",
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-x64-gnu/-/binding-linux-x64-gnu-1.1.3.tgz",
+      "integrity": "sha512-JJpqs8bRGITDOdbkNKnlojzBabbOHrqjSvDr0IVsZObE1lBcPjxItUEY9eWIDbxaJ3cGrXPWGfGkIxFijg/URg==",
       "cpu": [
         "x64"
       ],
@@ -1346,9 +1346,9 @@
       }
     },
     "node_modules/@rolldown/binding-linux-x64-musl": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-x64-musl/-/binding-linux-x64-musl-1.1.2.tgz",
-      "integrity": "sha512-xvpA7o5KCYLB0Rwscmuylb1/zHHSUx4g4xilm4prC5jP76pEUlzBmMbgpbh7bVDbId4NcfT96gN5i6mE6UDaiw==",
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-x64-musl/-/binding-linux-x64-musl-1.1.3.tgz",
+      "integrity": "sha512-rSJcdjPxzA/by/6/rYs+v+bXU7UjvnbUWz8MJb6kh6+knqB1dCrtHg0uu7C/4haqJvqdkYHQ5IGn+tCH9GLW/g==",
       "cpu": [
         "x64"
       ],
@@ -1363,9 +1363,9 @@
       }
     },
     "node_modules/@rolldown/binding-openharmony-arm64": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@rolldown/binding-openharmony-arm64/-/binding-openharmony-arm64-1.1.2.tgz",
-      "integrity": "sha512-p/ts6KBLjuk49Bp21XH77poQGt02iNz7ChgHep7tudPOaLinR/De/RHdxF8w8Yj4r/bF/bqXwH6PZrB2sA+Nvw==",
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/@rolldown/binding-openharmony-arm64/-/binding-openharmony-arm64-1.1.3.tgz",
+      "integrity": "sha512-hQ3/PYkDJICgevvyNcVrihVeqq7k1Pp3VZ9lY+dauAYUJKO+auqApvANhvR1An9BhmqYKvW2Mu1F9u4DXSMLxQ==",
       "cpu": [
         "arm64"
       ],
@@ -1380,9 +1380,9 @@
       }
     },
     "node_modules/@rolldown/binding-wasm32-wasi": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@rolldown/binding-wasm32-wasi/-/binding-wasm32-wasi-1.1.2.tgz",
-      "integrity": "sha512-VMu/wmrZ9hJzYlRhbw7jK5PODlugyKZ5mOdX78+lS8OvuFkWNQdz1pFLrI2p3P0pjXOmUZ7B48o5VnMH9QOGtg==",
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/@rolldown/binding-wasm32-wasi/-/binding-wasm32-wasi-1.1.3.tgz",
+      "integrity": "sha512-Elcv/BtML9lXrV6JuKITc/grN2kYV9gjsQpW8Jfw4ioK0TOkjBjye0nnyqQNy9STNaI20lXNaQBRrD5gSgR0Yg==",
       "cpu": [
         "wasm32"
       ],
@@ -1392,16 +1392,16 @@
       "dependencies": {
         "@emnapi/core": "1.11.1",
         "@emnapi/runtime": "1.11.1",
-        "@napi-rs/wasm-runtime": "^1.1.5"
+        "@napi-rs/wasm-runtime": "^1.1.6"
       },
       "engines": {
         "node": "^20.19.0 || >=22.12.0"
       }
     },
     "node_modules/@rolldown/binding-win32-arm64-msvc": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@rolldown/binding-win32-arm64-msvc/-/binding-win32-arm64-msvc-1.1.2.tgz",
-      "integrity": "sha512-xtUJqs8qEkuSviS0n1tsohaPuz3a1SPhZywOji4Oo+sgrJs8daEDMZ0QtqL0OS7dx8PoVpg2J/ZZycPY5I2+Zg==",
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/@rolldown/binding-win32-arm64-msvc/-/binding-win32-arm64-msvc-1.1.3.tgz",
+      "integrity": "sha512-2DrEfhluH9yhiaFApmsjsjwrSYbNcY1oFTzYSP1a535jDbV98zCFanA/96TBUd0iDFcxGmw9QRExwGCXz3U+/g==",
       "cpu": [
         "arm64"
       ],
@@ -1416,9 +1416,9 @@
       }
     },
     "node_modules/@rolldown/binding-win32-x64-msvc": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@rolldown/binding-win32-x64-msvc/-/binding-win32-x64-msvc-1.1.2.tgz",
-      "integrity": "sha512-85YiLQqjUKgSO/Zjnf9e0XIn5Ymrh1fLDWBeAkZqpuBR/3R8TpfoHXuyblqyQrftSSgWO9qpcHN8mkyKsLraoA==",
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/@rolldown/binding-win32-x64-msvc/-/binding-win32-x64-msvc-1.1.3.tgz",
+      "integrity": "sha512-OL4OMk7UPXOeVGGd3qo5zJyPIljf4AFgk5QAkPPS+OoLuOOozhuaQGC18MxVTnw/06q93gShAJzlwnSCY9YtqA==",
       "cpu": [
         "x64"
       ],
@@ -1456,9 +1456,9 @@
       }
     },
     "node_modules/@tanstack/virtual-core": {
-      "version": "3.17.1",
-      "resolved": "https://registry.npmjs.org/@tanstack/virtual-core/-/virtual-core-3.17.1.tgz",
-      "integrity": "sha512-VZyW2Uiml5tmBZwPGrSD3Sz73OxzljQMCmzYHsUTPEuTsERf5xwa+uWb01xEzkz3ZSYTjj8NEb/mKHvgKxyZdA==",
+      "version": "3.17.2",
+      "resolved": "https://registry.npmjs.org/@tanstack/virtual-core/-/virtual-core-3.17.2.tgz",
+      "integrity": "sha512-w43MvWvmShpb6kIC9MOoLyUkLmRTLPjt61bHWs+X29hACSpX+n8DvgZ3qM7cUfflKlRRcHR9KVJE6TmcqnQvcA==",
       "license": "MIT",
       "funding": {
         "type": "github",
@@ -1466,12 +1466,12 @@
       }
     },
     "node_modules/@tanstack/vue-virtual": {
-      "version": "3.13.29",
-      "resolved": "https://registry.npmjs.org/@tanstack/vue-virtual/-/vue-virtual-3.13.29.tgz",
-      "integrity": "sha512-MWb9tNHjpar3sP34b8+3A4I5j9akveoPXIYqqp7/ipyWd49a/kso+1S1LqEmAVR/+g/k1WWTJC4ktvdCGWgXYQ==",
+      "version": "3.13.30",
+      "resolved": "https://registry.npmjs.org/@tanstack/vue-virtual/-/vue-virtual-3.13.30.tgz",
+      "integrity": "sha512-5IpTZf5US81z9CHaRm2imVC44WDU1V/pd8mN1OIvIerRmo6C179UN+vnzlO/dx9Fpt9X7Rjl7fyvolPhPgtfqg==",
       "license": "MIT",
       "dependencies": {
-        "@tanstack/virtual-core": "3.17.1"
+        "@tanstack/virtual-core": "3.17.2"
       },
       "funding": {
         "type": "github",
@@ -1545,9 +1545,9 @@
       "license": "MIT"
     },
     "node_modules/@types/node": {
-      "version": "26.0.0",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-26.0.0.tgz",
-      "integrity": "sha512-vf2YFi1iY9lHGwNJMs01biZFbKJkrZR1T6/MlzjhJLPdntOHLhTrDSnSVcdtvjihi4VQNlrFRIxLsDBlQpAipA==",
+      "version": "26.0.1",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-26.0.1.tgz",
+      "integrity": "sha512-fc3KiUoBt6kie0N9bIW3E47vZsuaMf0PM2AaUpLCLT0s/LvX1nxAim6Fc049cNxODPpGm6qRAuUOB86SkRuPQw==",
       "dev": true,
       "license": "MIT",
       "peer": true,
@@ -1993,40 +1993,40 @@
       }
     },
     "node_modules/@vue/compiler-core": {
-      "version": "3.5.38",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.5.38.tgz",
-      "integrity": "sha512-s99aGxWYig9ErHbct27KXEGhrBYlRI6c4MwAgXErOAbX9xiW37/uMa+XUDO69zLz83dng8UUZ70CTOJrLrYrEQ==",
+      "version": "3.5.39",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.5.39.tgz",
+      "integrity": "sha512-16KBTEXAJCpDr0mwlw+AZyhu8iyC7R3S2vBwsI7QnWJU6X3WKc9VKeNEZpiMdZ569qWhz9574L3vV55qRL0Vtw==",
       "license": "MIT",
       "dependencies": {
         "@babel/parser": "^7.29.7",
-        "@vue/shared": "3.5.38",
+        "@vue/shared": "3.5.39",
         "entities": "^7.0.1",
         "estree-walker": "^2.0.2",
         "source-map-js": "^1.2.1"
       }
     },
     "node_modules/@vue/compiler-dom": {
-      "version": "3.5.38",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.5.38.tgz",
-      "integrity": "sha512-JTqp25l8aFfJYF7/KmsXZjAxJz7T+SjmTJLoXVjHtc2BrSgSiW2n9Aem/cWq1OPe68A8JL06B3eVdhlP0H4TVw==",
+      "version": "3.5.39",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.5.39.tgz",
+      "integrity": "sha512-oQPigALqYbNxTNPvNgSOe+czwVExfbVF02lz8jP0S3AXJiu3jxYDygNUiqSep4ezzW8XgnubqH63My2A7JR/vg==",
       "license": "MIT",
       "peer": true,
       "dependencies": {
-        "@vue/compiler-core": "3.5.38",
-        "@vue/shared": "3.5.38"
+        "@vue/compiler-core": "3.5.39",
+        "@vue/shared": "3.5.39"
       }
     },
     "node_modules/@vue/compiler-sfc": {
-      "version": "3.5.38",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.5.38.tgz",
-      "integrity": "sha512-DuA2GiZawSEW442iw/9+Fkol8hTgb4Ke5KkhmSry65QA7YuyMbIdy8p0XZRMvNwJdgRz307W8g1CSzdvS4nuNg==",
+      "version": "3.5.39",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.5.39.tgz",
+      "integrity": "sha512-d0ki86iOyN8LoZPBmk5SJWNwHP19CnDDCfuo//+2WJa2g5Ke0Jay983PIBIcSSzldC68I8DrD5GrHV3OSDfodg==",
       "license": "MIT",
       "dependencies": {
         "@babel/parser": "^7.29.7",
-        "@vue/compiler-core": "3.5.38",
-        "@vue/compiler-dom": "3.5.38",
-        "@vue/compiler-ssr": "3.5.38",
-        "@vue/shared": "3.5.38",
+        "@vue/compiler-core": "3.5.39",
+        "@vue/compiler-dom": "3.5.39",
+        "@vue/compiler-ssr": "3.5.39",
+        "@vue/shared": "3.5.39",
         "estree-walker": "^2.0.2",
         "magic-string": "^0.30.21",
         "postcss": "^8.5.15",
@@ -2034,31 +2034,31 @@
       }
     },
     "node_modules/@vue/compiler-ssr": {
-      "version": "3.5.38",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.5.38.tgz",
-      "integrity": "sha512-7s+W5Gc42FGxZMcuwl8H5B29T8BJPMdBT7KHFE+BbAuZ/iTEdTtv7z2XiMjiaUUw4w3ZcCEdHs36RuYJ2VA7bA==",
+      "version": "3.5.39",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.5.39.tgz",
+      "integrity": "sha512-Ce7/wvwMHai74bdszfXExdazFigYnlF9zgCmEQUcM1j0fOymlouZ7XilTYNo8oUjhlnjYOZbGrcYKuqjz89Ucw==",
       "license": "MIT",
       "dependencies": {
-        "@vue/compiler-dom": "3.5.38",
-        "@vue/shared": "3.5.38"
+        "@vue/compiler-dom": "3.5.39",
+        "@vue/shared": "3.5.39"
       }
     },
     "node_modules/@vue/devtools-api": {
-      "version": "7.7.9",
-      "resolved": "https://registry.npmjs.org/@vue/devtools-api/-/devtools-api-7.7.9.tgz",
-      "integrity": "sha512-kIE8wvwlcZ6TJTbNeU2HQNtaxLx3a84aotTITUuL/4bzfPxzajGBOoqjMhwZJ8L9qFYDU/lAYMEEm11dnZOD6g==",
+      "version": "7.7.10",
+      "resolved": "https://registry.npmjs.org/@vue/devtools-api/-/devtools-api-7.7.10.tgz",
+      "integrity": "sha512-KxtEpUOOpFz/qOGRrAwA36QF7DqIA+FXgCYit9mk9wjbaZt0sXOFz81ElOZtKA4HbWHUdwNjZHBFsFFyp5BZiA==",
       "license": "MIT",
       "dependencies": {
-        "@vue/devtools-kit": "^7.7.9"
+        "@vue/devtools-kit": "^7.7.10"
       }
     },
     "node_modules/@vue/devtools-kit": {
-      "version": "7.7.9",
-      "resolved": "https://registry.npmjs.org/@vue/devtools-kit/-/devtools-kit-7.7.9.tgz",
-      "integrity": "sha512-PyQ6odHSgiDVd4hnTP+aDk2X4gl2HmLDfiyEnn3/oV+ckFDuswRs4IbBT7vacMuGdwY/XemxBoh302ctbsptuA==",
+      "version": "7.7.10",
+      "resolved": "https://registry.npmjs.org/@vue/devtools-kit/-/devtools-kit-7.7.10.tgz",
+      "integrity": "sha512-3WNi2Kq4tbpVbmhml7RiphmAt0279oh3fKNeWMQIrltfX8Q91b4i5PL8DtyNKdwmcsGrV4fg+erwWOmD05CLIw==",
       "license": "MIT",
       "dependencies": {
-        "@vue/devtools-shared": "^7.7.9",
+        "@vue/devtools-shared": "^7.7.10",
         "birpc": "^2.3.0",
         "hookable": "^5.5.3",
         "mitt": "^3.0.1",
@@ -2068,63 +2068,63 @@
       }
     },
     "node_modules/@vue/devtools-shared": {
-      "version": "7.7.9",
-      "resolved": "https://registry.npmjs.org/@vue/devtools-shared/-/devtools-shared-7.7.9.tgz",
-      "integrity": "sha512-iWAb0v2WYf0QWmxCGy0seZNDPdO3Sp5+u78ORnyeonS6MT4PC7VPrryX2BpMJrwlDeaZ6BD4vP4XKjK0SZqaeA==",
+      "version": "7.7.10",
+      "resolved": "https://registry.npmjs.org/@vue/devtools-shared/-/devtools-shared-7.7.10.tgz",
+      "integrity": "sha512-wOPslzB8vTvpxwdaOcR2qAbwmuSP0L+rhpoC6Cf56V3Jip+HWb7PQQXOUPgBNQARpXsbQX/+mvi8kKucmBGRwQ==",
       "license": "MIT",
       "dependencies": {
         "rfdc": "^1.4.1"
       }
     },
     "node_modules/@vue/reactivity": {
-      "version": "3.5.38",
-      "resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.5.38.tgz",
-      "integrity": "sha512-pG6LV/NDNRbKizcUjFFLAfjaL8mcv4DmR9avNcUw2gDHBzZneuS2TWCmp633ynzxz9YYKNeEPK2I8Wraqy2HUQ==",
+      "version": "3.5.39",
+      "resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.5.39.tgz",
+      "integrity": "sha512-TpsuBJ9gGlZa5d23XcM2y8EXanz9dZeVDQBXRwzy46ItgvM+rWpzs+UVM0wcRLxGvcav0HE5jz2gNL53xlRAog==",
       "license": "MIT",
       "dependencies": {
-        "@vue/shared": "3.5.38"
+        "@vue/shared": "3.5.39"
       }
     },
     "node_modules/@vue/runtime-core": {
-      "version": "3.5.38",
-      "resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.5.38.tgz",
-      "integrity": "sha512-iyW8WVfF1CpCXxncZY5Ei6rSd6oZr5DgEom//fUjRBRl56AXPD+s9ATvukRt77ZFTuYlnVA1bxY+dJB94tWVYw==",
+      "version": "3.5.39",
+      "resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.5.39.tgz",
+      "integrity": "sha512-9GLtNyRvPAUMbX+7ono0RC2j0guo2LXVi8LvcmAooImACUKm0oFf0jjwbX8/H0AE/t1nxhAkn8RSl9PMCzzxZw==",
       "license": "MIT",
       "dependencies": {
-        "@vue/reactivity": "3.5.38",
-        "@vue/shared": "3.5.38"
+        "@vue/reactivity": "3.5.39",
+        "@vue/shared": "3.5.39"
       }
     },
     "node_modules/@vue/runtime-dom": {
-      "version": "3.5.38",
-      "resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.5.38.tgz",
-      "integrity": "sha512-apX2wt9sdfDshS+a2xueFZLVpt0GkRJZSoPmrW/SA4yzXTznhfcMVW59gr7h4YQeY0vJhdJkk2rsIDwgfFgC5A==",
+      "version": "3.5.39",
+      "resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.5.39.tgz",
+      "integrity": "sha512-7Y6aAGboKcXAZ3ECuUy7RrS5yy2r47dhTp2SKaJmYxjopImaVFaNa5Ne66NwGovsrxVAl5S5rwc7m22UG7Lmww==",
       "license": "MIT",
       "dependencies": {
-        "@vue/reactivity": "3.5.38",
-        "@vue/runtime-core": "3.5.38",
-        "@vue/shared": "3.5.38",
+        "@vue/reactivity": "3.5.39",
+        "@vue/runtime-core": "3.5.39",
+        "@vue/shared": "3.5.39",
         "csstype": "^3.2.3"
       }
     },
     "node_modules/@vue/server-renderer": {
-      "version": "3.5.38",
-      "resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.5.38.tgz",
-      "integrity": "sha512-vue8vbf2QlV4quHqzwmJy6dWfmRhP1J8l4wtZg60CL6VoKqcPY2oe7may3+1d9qfpedjK5PRLFqd5k3Isj9mUw==",
+      "version": "3.5.39",
+      "resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.5.39.tgz",
+      "integrity": "sha512-yZSakiAGw85rZfG7UM8akMnIF+FmeiNk47uvHf2nVBBSe+dIKUhZuZq9+XgJhbV3nS5Z4ALH23/MpXofW+mbcw==",
       "license": "MIT",
       "peer": true,
       "dependencies": {
-        "@vue/compiler-ssr": "3.5.38",
-        "@vue/shared": "3.5.38"
+        "@vue/compiler-ssr": "3.5.39",
+        "@vue/shared": "3.5.39"
       },
       "peerDependencies": {
-        "vue": "3.5.38"
+        "vue": "3.5.39"
       }
     },
     "node_modules/@vue/shared": {
-      "version": "3.5.38",
-      "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.5.38.tgz",
-      "integrity": "sha512-FTW0AFZNaK5/mOqvGBwVfUlNLU38TiQn4+DQgIFUnrBBJQ1crMJ82yeGQLV5jyKFsO8yRukpbuP7x+nRbH6aug==",
+      "version": "3.5.39",
+      "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.5.39.tgz",
+      "integrity": "sha512-l1rrBtBfTnmxvtsvdQDXltUUy8S1Y+ZaqdfUzmAnJkTd8Z8rv5v/ytW+TKiqEOWyHPoqtPlNFSs0lhRmYVSHVA==",
       "license": "MIT"
     },
     "node_modules/@vue/test-utils": {
@@ -2923,9 +2923,9 @@
       }
     },
     "node_modules/eslint": {
-      "version": "10.5.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-10.5.0.tgz",
-      "integrity": "sha512-1y+7C+vi12bUK1IpZeaV3gsH9fHLBmPvYmPx42pvT/E9yG0IC8g3PUZZgp0+JLJl7ZDK0flc2gc+Aw9dpCvIsQ==",
+      "version": "10.6.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-10.6.0.tgz",
+      "integrity": "sha512-6lVbcqSodALYo+4ELD0heG6lFiFxnLMuLkiMi2qV8LMp54N8tE8FT1GMH+ev4Ti00nFjNze2+Su6DsV5OQW3Dg==",
       "dev": true,
       "license": "MIT",
       "peer": true,
@@ -3201,9 +3201,9 @@
       }
     },
     "node_modules/expect-type": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/expect-type/-/expect-type-1.3.0.tgz",
-      "integrity": "sha512-knvyeauYhqjOYvQ66MznSMs83wmHrCycNEN6Ao+2AeYEfxUIkuiVxdEa1qlGEPK+We3n0THiDciYSsCcgW/DoA==",
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/expect-type/-/expect-type-1.4.0.tgz",
+      "integrity": "sha512-KfYbmpRm0VbLjEvVa9yGwCi9GI34xvi7A/HXYWQO65CSD2u3MczUJSuwXKFIxlGsgBQizV9q5J9NHj4VG0n+pA==",
       "dev": true,
       "license": "Apache-2.0",
       "engines": {
@@ -3421,9 +3421,9 @@
       }
     },
     "node_modules/immutable": {
-      "version": "5.1.7",
-      "resolved": "https://registry.npmjs.org/immutable/-/immutable-5.1.7.tgz",
-      "integrity": "sha512-47Xb+LFbZ/ZIjQMj6Q5J3IfK7PJFuqRdFOC9FpGgRTK6U2dAEVmkR9hp58qU4FpYux5YXpneDwkj2EP6lppzFA==",
+      "version": "5.1.8",
+      "resolved": "https://registry.npmjs.org/immutable/-/immutable-5.1.8.tgz",
+      "integrity": "sha512-TM5YqrGeTsVIPPpILzeqZ8D2Zc2TvNgSDi88zPF2a4cyqQdWV/wVWBDRDbNzzrLeRWScrFcOX9lW2iX6GOtUDw==",
       "dev": true,
       "license": "MIT"
     },
@@ -4489,9 +4489,9 @@
       }
     },
     "node_modules/prettier": {
-      "version": "3.8.4",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.8.4.tgz",
-      "integrity": "sha512-N2MylSdi48+5N/6S5j+maeHbUSIzzZ5uOcX5Hm4QpV8Dkb1HFjfAKTKX6yNPJQD9AhcT3ifHNB66tWTTJDi11Q==",
+      "version": "3.9.0",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.9.0.tgz",
+      "integrity": "sha512-LjIqSIC5VYLzs9WedVmJ2ljNAGnU+DteIClbahu4L/DBeWjZ6iT/k1lAYyu9JUh+1xINxWadaPw/Pl63y/agAw==",
       "dev": true,
       "license": "MIT",
       "peer": true,
@@ -4565,9 +4565,9 @@
       }
     },
     "node_modules/reka-ui": {
-      "version": "2.10.0",
-      "resolved": "https://registry.npmjs.org/reka-ui/-/reka-ui-2.10.0.tgz",
-      "integrity": "sha512-HIUVfSBM/AyGkcUI7aiOxxMc4N+0UD2ZEun8dcrT0H4fveotEoeDdvzyZu97eeEvEa1H9oGHoOpApkfxlgnC7g==",
+      "version": "2.10.1",
+      "resolved": "https://registry.npmjs.org/reka-ui/-/reka-ui-2.10.1.tgz",
+      "integrity": "sha512-drcOQ4rQtDYAcGCsyQBqQg8QQ+H3B+zDaMJU0h8KPEPMa7g9BHu3zcOi4OB39XJSWizceFoNO0Z9tctSGLOXqg==",
       "license": "MIT",
       "dependencies": {
         "@floating-ui/dom": "^1.6.13",
@@ -4606,11 +4606,12 @@
       "license": "MIT"
     },
     "node_modules/rolldown": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/rolldown/-/rolldown-1.1.2.tgz",
-      "integrity": "sha512-x0CrQQqCXWGeI8dTvFfN/Dnv3yMKT9hv5jFjlOreKAx9wqLq9wz7VvLLHyaAXC90/CpggTu9SisSbsJJTPSjNQ==",
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/rolldown/-/rolldown-1.1.3.tgz",
+      "integrity": "sha512-1F1eEtUBtFvcGm1HQ9TiUIUHPQG7mSAODrhIzjxoUEFuo8OcbrGLiVLkevNgj84TE4lnHvnumwFjhJO5Eu135g==",
       "devOptional": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@oxc-project/types": "=0.137.0",
         "@rolldown/pluginutils": "^1.0.0"
@@ -4622,21 +4623,21 @@
         "node": "^20.19.0 || >=22.12.0"
       },
       "optionalDependencies": {
-        "@rolldown/binding-android-arm64": "1.1.2",
-        "@rolldown/binding-darwin-arm64": "1.1.2",
-        "@rolldown/binding-darwin-x64": "1.1.2",
-        "@rolldown/binding-freebsd-x64": "1.1.2",
-        "@rolldown/binding-linux-arm-gnueabihf": "1.1.2",
-        "@rolldown/binding-linux-arm64-gnu": "1.1.2",
-        "@rolldown/binding-linux-arm64-musl": "1.1.2",
-        "@rolldown/binding-linux-ppc64-gnu": "1.1.2",
-        "@rolldown/binding-linux-s390x-gnu": "1.1.2",
-        "@rolldown/binding-linux-x64-gnu": "1.1.2",
-        "@rolldown/binding-linux-x64-musl": "1.1.2",
-        "@rolldown/binding-openharmony-arm64": "1.1.2",
-        "@rolldown/binding-wasm32-wasi": "1.1.2",
-        "@rolldown/binding-win32-arm64-msvc": "1.1.2",
-        "@rolldown/binding-win32-x64-msvc": "1.1.2"
+        "@rolldown/binding-android-arm64": "1.1.3",
+        "@rolldown/binding-darwin-arm64": "1.1.3",
+        "@rolldown/binding-darwin-x64": "1.1.3",
+        "@rolldown/binding-freebsd-x64": "1.1.3",
+        "@rolldown/binding-linux-arm-gnueabihf": "1.1.3",
+        "@rolldown/binding-linux-arm64-gnu": "1.1.3",
+        "@rolldown/binding-linux-arm64-musl": "1.1.3",
+        "@rolldown/binding-linux-ppc64-gnu": "1.1.3",
+        "@rolldown/binding-linux-s390x-gnu": "1.1.3",
+        "@rolldown/binding-linux-x64-gnu": "1.1.3",
+        "@rolldown/binding-linux-x64-musl": "1.1.3",
+        "@rolldown/binding-openharmony-arm64": "1.1.3",
+        "@rolldown/binding-wasm32-wasi": "1.1.3",
+        "@rolldown/binding-win32-arm64-msvc": "1.1.3",
+        "@rolldown/binding-win32-x64-msvc": "1.1.3"
       }
     },
     "node_modules/sass": {
@@ -5113,18 +5114,58 @@
       }
     },
     "node_modules/unplugin-vue-components/node_modules/unplugin": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/unplugin/-/unplugin-3.0.0.tgz",
-      "integrity": "sha512-0Mqk3AT2TZCXWKdcoaufeXNukv2mTrEZExeXlHIOZXdqYoHHr4n51pymnwV8x2BOVxwXbK2HLlI7usrqMpycdg==",
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/unplugin/-/unplugin-3.2.0.tgz",
+      "integrity": "sha512-6nGlT7EHsS+tTcTdAkYFqXIUwDrMJyJvHFNYGSr4x2/2ySIcV4f5e1RAJUeDyfOJPR8TF0auE8l+82PLhKjqsA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@jridgewell/remapping": "^2.3.5",
-        "picomatch": "^4.0.3",
+        "picomatch": "^4.0.4",
         "webpack-virtual-modules": "^0.6.2"
       },
       "engines": {
         "node": "^20.19.0 || >=22.12.0"
+      },
+      "peerDependencies": {
+        "@farmfe/core": "*",
+        "@rspack/core": "*",
+        "bun-types-no-globals": "*",
+        "esbuild": "*",
+        "rolldown": "*",
+        "rollup": "*",
+        "unloader": "*",
+        "vite": "*",
+        "webpack": "*"
+      },
+      "peerDependenciesMeta": {
+        "@farmfe/core": {
+          "optional": true
+        },
+        "@rspack/core": {
+          "optional": true
+        },
+        "bun-types-no-globals": {
+          "optional": true
+        },
+        "esbuild": {
+          "optional": true
+        },
+        "rolldown": {
+          "optional": true
+        },
+        "rollup": {
+          "optional": true
+        },
+        "unloader": {
+          "optional": true
+        },
+        "vite": {
+          "optional": true
+        },
+        "webpack": {
+          "optional": true
+        }
       }
     },
     "node_modules/uri-js": {
@@ -5330,17 +5371,17 @@
       }
     },
     "node_modules/vue": {
-      "version": "3.5.38",
-      "resolved": "https://registry.npmjs.org/vue/-/vue-3.5.38.tgz",
-      "integrity": "sha512-vAMKHfImQlYSy0C+PBue4s3ERZ2xGKfgZg5GXAsLInq1dyh2H78ILVP5sK0KPFPVW4kv+OGCIvBEondcjpZp7A==",
+      "version": "3.5.39",
+      "resolved": "https://registry.npmjs.org/vue/-/vue-3.5.39.tgz",
+      "integrity": "sha512-xmZCYabFGcirU8r0fTuvl/LICc1OU620rnqepaJDL/a141ZigkG7AyaxQLdqJ02ZRYzWe6YPaDHeQx7MfknQfA==",
       "license": "MIT",
       "peer": true,
       "dependencies": {
-        "@vue/compiler-dom": "3.5.38",
-        "@vue/compiler-sfc": "3.5.38",
-        "@vue/runtime-dom": "3.5.38",
-        "@vue/server-renderer": "3.5.38",
-        "@vue/shared": "3.5.38"
+        "@vue/compiler-dom": "3.5.39",
+        "@vue/compiler-sfc": "3.5.39",
+        "@vue/runtime-dom": "3.5.39",
+        "@vue/server-renderer": "3.5.39",
+        "@vue/shared": "3.5.39"
       },
       "peerDependencies": {
         "typescript": "*"
@@ -5457,30 +5498,30 @@
       }
     },
     "node_modules/vue-router/node_modules/@vue/devtools-api": {
-      "version": "8.1.3",
-      "resolved": "https://registry.npmjs.org/@vue/devtools-api/-/devtools-api-8.1.3.tgz",
-      "integrity": "sha512-73NMCvxXh8Hyozc/jiwqTFWVcCMyi11U1zmrq4DoukQJnuo8JHt6FsNu4HdeUDa8SpIp5vb7Q22GWgIq0efsXg==",
+      "version": "8.1.4",
+      "resolved": "https://registry.npmjs.org/@vue/devtools-api/-/devtools-api-8.1.4.tgz",
+      "integrity": "sha512-zphdXRe0VxWfUWH2KLcNV4xWUMxjxASyxCjFS/wRHVYfJCMBulq1ce3RHGkYRxghoVBqwCzOw1TWIIfvIWCY1w==",
       "license": "MIT",
       "dependencies": {
-        "@vue/devtools-kit": "^8.1.3"
+        "@vue/devtools-kit": "^8.1.4"
       }
     },
     "node_modules/vue-router/node_modules/@vue/devtools-kit": {
-      "version": "8.1.3",
-      "resolved": "https://registry.npmjs.org/@vue/devtools-kit/-/devtools-kit-8.1.3.tgz",
-      "integrity": "sha512-cRn7GXiCQkMYU2Z3h3pM4YO/ndbx9FY1yLDAqIqPLcmIq4H6zAOJHein6tvZU3AfPwgrodqLiPBEF+YQaS8AxA==",
+      "version": "8.1.4",
+      "resolved": "https://registry.npmjs.org/@vue/devtools-kit/-/devtools-kit-8.1.4.tgz",
+      "integrity": "sha512-+GLBwY63hZ46sqTlgXgvd8IcZTpWe0PZzbJgs63ii/8uTYVwg1q9bdIR9xx8ReKcrdWS01RGCbC971jYPvjRCA==",
       "license": "MIT",
       "dependencies": {
-        "@vue/devtools-shared": "^8.1.3",
+        "@vue/devtools-shared": "^8.1.4",
         "birpc": "^2.6.1",
         "hookable": "^5.5.3",
         "perfect-debounce": "^2.0.0"
       }
     },
     "node_modules/vue-router/node_modules/@vue/devtools-shared": {
-      "version": "8.1.3",
-      "resolved": "https://registry.npmjs.org/@vue/devtools-shared/-/devtools-shared-8.1.3.tgz",
-      "integrity": "sha512-CM3uIPL+v+lrJUk33+pxspYo0MhuMWlCvf7zC9fybifvCPyM2jUbYRPwoYEJgYbwRqPikm5HozbUhp60MF2QuA==",
+      "version": "8.1.4",
+      "resolved": "https://registry.npmjs.org/@vue/devtools-shared/-/devtools-shared-8.1.4.tgz",
+      "integrity": "sha512-Earc/zrg0w0Md4KdrvgRR1vC5F17Zn+VzqTNI7PXYXz0fPJDVWENe7fv6NHi6Ja9Sq6Ce6SYUdc2FlXU0OMkjQ==",
       "license": "MIT"
     },
     "node_modules/vue-router/node_modules/perfect-debounce": {
@@ -5490,17 +5531,57 @@
       "license": "MIT"
     },
     "node_modules/vue-router/node_modules/unplugin": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/unplugin/-/unplugin-3.0.0.tgz",
-      "integrity": "sha512-0Mqk3AT2TZCXWKdcoaufeXNukv2mTrEZExeXlHIOZXdqYoHHr4n51pymnwV8x2BOVxwXbK2HLlI7usrqMpycdg==",
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/unplugin/-/unplugin-3.2.0.tgz",
+      "integrity": "sha512-6nGlT7EHsS+tTcTdAkYFqXIUwDrMJyJvHFNYGSr4x2/2ySIcV4f5e1RAJUeDyfOJPR8TF0auE8l+82PLhKjqsA==",
       "license": "MIT",
       "dependencies": {
         "@jridgewell/remapping": "^2.3.5",
-        "picomatch": "^4.0.3",
+        "picomatch": "^4.0.4",
         "webpack-virtual-modules": "^0.6.2"
       },
       "engines": {
         "node": "^20.19.0 || >=22.12.0"
+      },
+      "peerDependencies": {
+        "@farmfe/core": "*",
+        "@rspack/core": "*",
+        "bun-types-no-globals": "*",
+        "esbuild": "*",
+        "rolldown": "*",
+        "rollup": "*",
+        "unloader": "*",
+        "vite": "*",
+        "webpack": "*"
+      },
+      "peerDependenciesMeta": {
+        "@farmfe/core": {
+          "optional": true
+        },
+        "@rspack/core": {
+          "optional": true
+        },
+        "bun-types-no-globals": {
+          "optional": true
+        },
+        "esbuild": {
+          "optional": true
+        },
+        "rolldown": {
+          "optional": true
+        },
+        "rollup": {
+          "optional": true
+        },
+        "unloader": {
+          "optional": true
+        },
+        "vite": {
+          "optional": true
+        },
+        "webpack": {
+          "optional": true
+        }
       }
     },
     "node_modules/vue-toast-notification": {
diff --git a/client-v3/package.json b/client-v3/package.json
index 256c770da..987d85237 100644
--- a/client-v3/package.json
+++ b/client-v3/package.json
@@ -1,6 +1,6 @@
 {
   "name": "client-v3",
-  "version": "0.33.0",
+  "version": "0.34.0",
   "description": "DigiScript front end (Vue 3)",
   "author": "DreamTeamProd",
   "private": true,
@@ -50,7 +50,7 @@
     "pinia": "^3.0.4",
     "pinia-plugin-persistedstate": "^4.7.1",
     "splitpanes": "^4.1.2",
-    "vue": "^3.5.38",
+    "vue": "^3.5.39",
     "vue-multiselect": "^3.5.0",
     "vue-router": "^5.1.0",
     "vue-toast-notification": "^3.1.3"
@@ -67,14 +67,14 @@
     "@vitejs/plugin-vue": "^6.0.7",
     "@vitest/ui": "^4.1.9",
     "@vue/test-utils": "^2.4.11",
-    "eslint": "^10.5.0",
+    "eslint": "^10.6.0",
     "eslint-config-prettier": "^10.1.8",
     "eslint-plugin-prettier": "^5.5.6",
     "eslint-plugin-vue": "^10.9.2",
     "globals": "^17.7.0",
     "jiti": "^2.7.0",
     "jsdom": "^29.1.1",
-    "prettier": "^3.8.4",
+    "prettier": "^3.9.0",
     "sass": "1.101.0",
     "typescript": "^6.0.3",
     "typescript-eslint": "^8.62.0",
diff --git a/client-v3/src/components/show/config/cast/CastLineStats.vue b/client-v3/src/components/show/config/cast/CastLineStats.vue
index c23fbb9d4..8509bb7e0 100644
--- a/client-v3/src/components/show/config/cast/CastLineStats.vue
+++ b/client-v3/src/components/show/config/cast/CastLineStats.vue
@@ -84,8 +84,7 @@ async function getStats(): Promise<void> {
 
 function getLineCountForCast(castId: number, actId: number | null, sceneId: number): number {
   const lineCounts = (castStats.value as Record<string, unknown>).line_counts as
-    | Record<string, Record<string, Record<string, number>>>
-    | undefined;
+    Record<string, Record<string, Record<string, number>>> | undefined;
   if (!lineCounts) return 0;
   return lineCounts[castId]?.[actId ?? '']?.[sceneId] ?? 0;
 }
diff --git a/client-v3/src/components/show/config/characters/CharacterLineStats.vue b/client-v3/src/components/show/config/characters/CharacterLineStats.vue
index 0bbeb020b..f46b6319c 100644
--- a/client-v3/src/components/show/config/characters/CharacterLineStats.vue
+++ b/client-v3/src/components/show/config/characters/CharacterLineStats.vue
@@ -89,8 +89,7 @@ function getLineCountForCharacter(
   sceneId: number
 ): number {
   const lineCounts = (characterStats.value as Record<string, unknown>).line_counts as
-    | Record<string, Record<string, Record<string, number>>>
-    | undefined;
+    Record<string, Record<string, Record<string, number>>> | undefined;
   if (!lineCounts) return 0;
   return lineCounts[characterId]?.[actId ?? '']?.[sceneId] ?? 0;
 }
diff --git a/client-v3/src/components/show/config/cues/CueCountStats.vue b/client-v3/src/components/show/config/cues/CueCountStats.vue
index 2193462f8..6f9cb06eb 100644
--- a/client-v3/src/components/show/config/cues/CueCountStats.vue
+++ b/client-v3/src/components/show/config/cues/CueCountStats.vue
@@ -83,8 +83,7 @@ async function getStats(): Promise<void> {
 
 function getCountForCueType(cueTypeId: number, actId: number | null, sceneId: number): number {
   const cueCounts = (cueStats.value as Record<string, unknown>).cue_counts as
-    | Record<string, Record<string, Record<string, number>>>
-    | undefined;
+    Record<string, Record<string, Record<string, number>>> | undefined;
   if (!cueCounts) return 0;
   return cueCounts[cueTypeId]?.[actId ?? '']?.[sceneId] ?? 0;
 }
diff --git a/client-v3/src/components/show/config/cues/ScriptLineCueEditor.vue b/client-v3/src/components/show/config/cues/ScriptLineCueEditor.vue
index ed65da230..69871236a 100644
--- a/client-v3/src/components/show/config/cues/ScriptLineCueEditor.vue
+++ b/client-v3/src/components/show/config/cues/ScriptLineCueEditor.vue
@@ -22,32 +22,35 @@
         <BCol cols="3" class="cue-column">
           <template v-if="line.line_type !== LINE_TYPES.SPACING">
             <BButtonGroup>
-              <BButton
-                v-for="cue in individualCues"
-                :key="cue.id"
-                class="cue-button"
-                :disabled="!systemStore.isCueEditor"
-                :style="{
-                  backgroundColor: cueBackgroundColour(cue),
-                  color: contrastColor(cueBackgroundColour(cue)),
-                }"
-                @click.stop="openEditForm(cue)"
-              >
-                {{ cueLabel(cue) }}
-              </BButton>
-              <BButton
-                v-for="grp in lineGroups"
-                :key="`group_${grp.group.id}`"
-                class="cue-button cue-group-btn"
-                :disabled="!systemStore.isCueEditor"
-                :style="{
-                  backgroundColor: cueGroupBackgroundColour(grp.group),
-                  color: contrastColor(cueGroupBackgroundColour(grp.group)),
-                }"
-                @click.stop="openEditGroup(grp.group, grp.cues)"
+              <template
+                v-for="slot in mergedCueSlots"
+                :key="slot.type === 'individual' ? slot.cue.id : `group_${slot.group.id}`"
               >
-                {{ cueGroupLabel(grp.group, grp.cues) }}
-              </BButton>
+                <BButton
+                  v-if="slot.type === 'individual'"
+                  class="cue-button"
+                  :disabled="!systemStore.isCueEditor"
+                  :style="{
+                    backgroundColor: cueBackgroundColour(slot.cue),
+                    color: contrastColor(cueBackgroundColour(slot.cue)),
+                  }"
+                  @click.stop="openEditForm(slot.cue)"
+                >
+                  {{ cueLabel(slot.cue) }}
+                </BButton>
+                <BButton
+                  v-else
+                  class="cue-button cue-group-btn"
+                  :disabled="!systemStore.isCueEditor"
+                  :style="{
+                    backgroundColor: cueGroupBackgroundColour(slot.group),
+                    color: contrastColor(cueGroupBackgroundColour(slot.group)),
+                  }"
+                  @click.stop="openEditGroup(slot.group, slot.cues)"
+                >
+                  {{ cueGroupLabel(slot.group, slot.cues) }}
+                </BButton>
+              </template>
               <BButton
                 v-if="systemStore.isCueEditor"
                 class="cue-button add-cue-btn"
@@ -384,8 +387,7 @@ const sceneLabel = computed(
 
 const isLineCut = computed(() => isWholeLineCut(props.line, props.cuts));
 
-const individualCues = computed(() => props.cues.filter((c) => c.group_id == null));
-const lineGroups = computed(() => scriptStore.groupedCuesForLine(props.line.id).groups);
+const mergedCueSlots = computed(() => scriptStore.groupedCuesForLine(props.line.id).merged);
 
 // RBAC-filtered cue type options: admins see all, others only see types they can write
 const cueTypeOptions = computed(() => {
diff --git a/client-v3/src/components/show/config/stage/CrewTimeline.vue b/client-v3/src/components/show/config/stage/CrewTimeline.vue
index 1ea25079e..419b7698d 100644
--- a/client-v3/src/components/show/config/stage/CrewTimeline.vue
+++ b/client-v3/src/components/show/config/stage/CrewTimeline.vue
@@ -151,13 +151,11 @@ const scenes = computed(() => showStore.orderedScenes);
 const rows = computed((): TimelineRow[] =>
   stageStore.crewList
     .filter((c) => (stageStore.crewAssignmentsByCrew[c.id] ?? []).length > 0)
-    .map(
-      (c): TimelineRow => ({
-        id: c.id,
-        name: [c.first_name, c.last_name].filter(Boolean).join(' '),
-        type: 'crew',
-      })
-    )
+    .map((c): TimelineRow => ({
+      id: c.id,
+      name: [c.first_name, c.last_name].filter(Boolean).join(' '),
+      type: 'crew',
+    }))
 );
 
 const {
diff --git a/client-v3/src/components/show/live/ScriptLineViewer.vue b/client-v3/src/components/show/live/ScriptLineViewer.vue
index 39b91d349..05e2017ac 100644
--- a/client-v3/src/components/show/live/ScriptLineViewer.vue
+++ b/client-v3/src/components/show/live/ScriptLineViewer.vue
@@ -130,28 +130,31 @@
           </template>
           <BCol cols="3" :class="['cue-column-right', { 'first-row': isFirstRowContent }]">
             <BButtonGroup>
-              <BButton
-                v-for="cue in individualCues"
-                :key="cue.id"
-                class="cue-button"
-                :style="{
-                  backgroundColor: cueBackgroundColour(cue),
-                  color: contrastColor(cueBackgroundColour(cue)),
-                }"
+              <template
+                v-for="slot in mergedCueSlots"
+                :key="slot.type === 'individual' ? slot.cue.id : `group_${slot.group.id}`"
               >
-                {{ cueLabel(cue) }}
-              </BButton>
-              <BButton
-                v-for="grp in lineGroups"
-                :key="`group_${grp.group.id}`"
-                class="cue-button cue-group-btn"
-                :style="{
-                  backgroundColor: cueGroupBackgroundColour(grp.group),
-                  color: contrastColor(cueGroupBackgroundColour(grp.group)),
-                }"
-              >
-                {{ cueGroupLabel(grp.group, grp.cues) }}
-              </BButton>
+                <BButton
+                  v-if="slot.type === 'individual'"
+                  class="cue-button"
+                  :style="{
+                    backgroundColor: cueBackgroundColour(slot.cue),
+                    color: contrastColor(cueBackgroundColour(slot.cue)),
+                  }"
+                >
+                  {{ cueLabel(slot.cue) }}
+                </BButton>
+                <BButton
+                  v-else
+                  class="cue-button cue-group-btn"
+                  :style="{
+                    backgroundColor: cueGroupBackgroundColour(slot.group),
+                    color: contrastColor(cueGroupBackgroundColour(slot.group)),
+                  }"
+                >
+                  {{ cueGroupLabel(slot.group, slot.cues) }}
+                </BButton>
+              </template>
             </BButtonGroup>
             <BButton
               v-if="cueAddMode"
@@ -167,28 +170,31 @@
         <template v-else>
           <BCol cols="3" :class="['cue-column', { 'first-row': isFirstRowContent }]">
             <BButtonGroup>
-              <BButton
-                v-for="cue in individualCues"
-                :key="cue.id"
-                class="cue-button"
-                :style="{
-                  backgroundColor: cueBackgroundColour(cue),
-                  color: contrastColor(cueBackgroundColour(cue)),
-                }"
+              <template
+                v-for="slot in mergedCueSlots"
+                :key="slot.type === 'individual' ? slot.cue.id : `group_${slot.group.id}`"
               >
-                {{ cueLabel(cue) }}
-              </BButton>
-              <BButton
-                v-for="grp in lineGroups"
-                :key="`group_${grp.group.id}`"
-                class="cue-button cue-group-btn"
-                :style="{
-                  backgroundColor: cueGroupBackgroundColour(grp.group),
-                  color: contrastColor(cueGroupBackgroundColour(grp.group)),
-                }"
-              >
-                {{ cueGroupLabel(grp.group, grp.cues) }}
-              </BButton>
+                <BButton
+                  v-if="slot.type === 'individual'"
+                  class="cue-button"
+                  :style="{
+                    backgroundColor: cueBackgroundColour(slot.cue),
+                    color: contrastColor(cueBackgroundColour(slot.cue)),
+                  }"
+                >
+                  {{ cueLabel(slot.cue) }}
+                </BButton>
+                <BButton
+                  v-else
+                  class="cue-button cue-group-btn"
+                  :style="{
+                    backgroundColor: cueGroupBackgroundColour(slot.group),
+                    color: contrastColor(cueGroupBackgroundColour(slot.group)),
+                  }"
+                >
+                  {{ cueGroupLabel(slot.group, slot.cues) }}
+                </BButton>
+              </template>
             </BButtonGroup>
             <BButton
               v-if="cueAddMode"
@@ -314,8 +320,7 @@ const {
 const { cueLabel, cueBackgroundColour, cueGroupLabel, cueGroupBackgroundColour, contrastColor } =
   useCueDisplay();
 
-const individualCues = computed(() => props.cues.filter((c) => c.group_id == null));
-const lineGroups = computed(() => scriptStore.groupedCuesForLine(props.line.id).groups);
+const mergedCueSlots = computed(() => scriptStore.groupedCuesForLine(props.line.id).merged);
 
 const lineContainer = ref<HTMLElement | null>(null);
 let observer: MutationObserver | null = null;
diff --git a/client-v3/src/components/show/live/ScriptLineViewerCompact.vue b/client-v3/src/components/show/live/ScriptLineViewerCompact.vue
index 74ef25fca..1a30f6938 100644
--- a/client-v3/src/components/show/live/ScriptLineViewerCompact.vue
+++ b/client-v3/src/components/show/live/ScriptLineViewerCompact.vue
@@ -32,52 +32,56 @@
         </BCol>
         <BCol v-if="cueAddMode" cols="1" class="cue-add-column" />
       </BRow>
-      <BRow v-for="(cue, cueIndex) in individualCues" :key="`cue_${cue.id}`">
-        <BCol
-          cols="2"
-          :class="[
-            'cue-column',
-            'line-part',
-            'text-end',
-            'fw-bold',
-            'cue',
-            { 'first-row': isFirstRowCues && cueIndex === 0 },
-          ]"
-          :style="{ color: cueBackgroundColour(cue) }"
-        >
-          <span>{{ cuePrefix(cue) }}</span>
-        </BCol>
-        <BCol
-          :cols="cueAddMode ? 9 : 10"
-          class="line-part text-start fw-bold cue"
-          :style="{ color: cueBackgroundColour(cue) }"
-        >
-          <span>{{ cue.ident }}</span>
-        </BCol>
-        <BCol v-if="cueAddMode" cols="1" class="cue-add-column" />
-      </BRow>
-      <BRow v-for="(grp, groupIndex) in lineGroups" :key="`group_${grp.group.id}`">
-        <BCol
-          cols="2"
-          :class="[
-            'cue-column',
-            'line-part',
-            'text-end',
-            'fw-bold',
-            'cue',
-            { 'first-row': isFirstRowCues && individualCues.length === 0 && groupIndex === 0 },
-          ]"
-          :style="{ color: cueGroupBackgroundColour(grp.group) }"
-        >
-          <span>{{ cueGroupPrefix(grp.group) }}</span>
-        </BCol>
-        <BCol
-          :cols="cueAddMode ? 9 : 10"
-          class="line-part text-start fw-bold cue"
-          :style="{ color: cueGroupBackgroundColour(grp.group) }"
-        >
-          <span>{{ cueGroupIdentLabel(grp.group, grp.cues) }}</span>
-        </BCol>
+      <BRow
+        v-for="(slot, slotIndex) in mergedCueSlots"
+        :key="slot.type === 'individual' ? `cue_${slot.cue.id}` : `group_${slot.group.id}`"
+      >
+        <template v-if="slot.type === 'individual'">
+          <BCol
+            cols="2"
+            :class="[
+              'cue-column',
+              'line-part',
+              'text-end',
+              'fw-bold',
+              'cue',
+              { 'first-row': isFirstRowCues && slotIndex === 0 },
+            ]"
+            :style="{ color: cueBackgroundColour(slot.cue) }"
+          >
+            <span>{{ cuePrefix(slot.cue) }}</span>
+          </BCol>
+          <BCol
+            :cols="cueAddMode ? 9 : 10"
+            class="line-part text-start fw-bold cue"
+            :style="{ color: cueBackgroundColour(slot.cue) }"
+          >
+            <span>{{ slot.cue.ident }}</span>
+          </BCol>
+        </template>
+        <template v-else>
+          <BCol
+            cols="2"
+            :class="[
+              'cue-column',
+              'line-part',
+              'text-end',
+              'fw-bold',
+              'cue',
+              { 'first-row': isFirstRowCues && slotIndex === 0 },
+            ]"
+            :style="{ color: cueGroupBackgroundColour(slot.group) }"
+          >
+            <span>{{ cueGroupPrefix(slot.group) }}</span>
+          </BCol>
+          <BCol
+            :cols="cueAddMode ? 9 : 10"
+            class="line-part text-start fw-bold cue"
+            :style="{ color: cueGroupBackgroundColour(slot.group) }"
+          >
+            <span>{{ cueGroupIdentLabel(slot.group, slot.cues) }}</span>
+          </BCol>
+        </template>
         <BCol v-if="cueAddMode" cols="1" class="cue-add-column" />
       </BRow>
       <BRow class="line-row">
@@ -212,8 +216,7 @@ const {
   cueGroupIdentLabel,
 } = useCueDisplay();
 
-const individualCues = computed(() => props.cues.filter((c) => c.group_id == null));
-const lineGroups = computed(() => scriptStore.groupedCuesForLine(props.line.id).groups);
+const mergedCueSlots = computed(() => scriptStore.groupedCuesForLine(props.line.id).merged);
 
 const lineContainer = ref<HTMLElement | null>(null);
 let observer: MutationObserver | null = null;
@@ -260,7 +263,7 @@ const isTaggedStageDirection = computed(() => {
 });
 
 const isLineCut = computed(() => isWholeLineCut(props.line, props.cuts));
-const hasAnyCues = computed(() => individualCues.value.length > 0 || lineGroups.value.length > 0);
+const hasAnyCues = computed(() => mergedCueSlots.value.length > 0);
 const isFirstRowActScene = computed(() => needsActSceneLabel.value);
 const isFirstRowCues = computed(() => !needsActSceneLabel.value && hasAnyCues.value);
 const isFirstRowContent = computed(() => !needsActSceneLabel.value && !hasAnyCues.value);
diff --git a/client-v3/src/js/logger.ts b/client-v3/src/js/logger.ts
index 64c385057..fbcc197e1 100644
--- a/client-v3/src/js/logger.ts
+++ b/client-v3/src/js/logger.ts
@@ -106,8 +106,7 @@ export function initRemoteLogging(): void {
   setInterval(() => {
     const userStore = useUserStore();
     const consoleLevel = (userStore.userSettings as Record<string, unknown>)?.console_log_level as
-      | string
-      | undefined;
+      string | undefined;
     if (consoleLevel) log.setLevel(consoleLevel.toLowerCase() as log.LogLevelDesc, false);
   }, 5000);
 
diff --git a/client-v3/src/js/mruSortUtils.ts b/client-v3/src/js/mruSortUtils.ts
index a90d1f6fc..da6b63d56 100644
--- a/client-v3/src/js/mruSortUtils.ts
+++ b/client-v3/src/js/mruSortUtils.ts
@@ -4,8 +4,7 @@ type ScriptLine = { line_parts?: LinePart[] };
 type TmpScript = Record<string, ScriptLine[]>;
 export type SelectOption = { value: number | null; text: string };
 export type CombinedSelectOption =
-  | { value: null; text: string }
-  | { label: string; options: { value: string; text: string }[] };
+  { value: null; text: string } | { label: string; options: { value: string; text: string }[] };
 
 function countOccurrences(
   tmpScript: TmpScript,
diff --git a/client-v3/src/stores/script.ts b/client-v3/src/stores/script.ts
index 3ae02b7ad..11cc42d31 100644
--- a/client-v3/src/stores/script.ts
+++ b/client-v3/src/stores/script.ts
@@ -43,8 +43,15 @@ export const useScriptStore = defineStore('script', {
       (state) =>
       (
         lineId: number | null
-      ): { individual: Cue[]; groups: { group: CueGroup; cues: Cue[] }[] } => {
-        if (lineId == null) return { individual: [], groups: [] };
+      ): {
+        individual: Cue[];
+        groups: { group: CueGroup; cues: Cue[] }[];
+        merged: (
+          | { type: 'individual'; cue: Cue; line_position: number | null }
+          | { type: 'group'; group: CueGroup; cues: Cue[]; line_position: number | null }
+        )[];
+      } => {
+        if (lineId == null) return { individual: [], groups: [], merged: [] };
         const allCues = state.cues[String(lineId)] ?? [];
         const individual = allCues.filter((c) => c.group_id == null);
         const groupMap = new Map<number, Cue[]>();
@@ -62,7 +69,29 @@ export const useScriptStore = defineStore('script', {
             groups.push({ group, cues: sorted });
           }
         }
-        return { individual, groups };
+        const merged: (
+          | { type: 'individual'; cue: Cue; line_position: number | null }
+          | { type: 'group'; group: CueGroup; cues: Cue[]; line_position: number | null }
+        )[] = [
+          ...individual.map((c) => ({
+            type: 'individual' as const,
+            cue: c,
+            line_position: c.line_position,
+          })),
+          ...groups.map((g) => ({
+            type: 'group' as const,
+            group: g.group,
+            cues: g.cues,
+            line_position: g.cues[0]?.line_position ?? null,
+          })),
+        ];
+        merged.sort((a, b) => {
+          if (a.line_position == null && b.line_position == null) return 0;
+          if (a.line_position == null) return 1;
+          if (b.line_position == null) return -1;
+          return a.line_position - b.line_position;
+        });
+        return { individual, groups, merged };
       },
   },
 
diff --git a/client-v3/src/types/api/cues.ts b/client-v3/src/types/api/cues.ts
index b2dbdb003..fe069ab18 100644
--- a/client-v3/src/types/api/cues.ts
+++ b/client-v3/src/types/api/cues.ts
@@ -18,4 +18,5 @@ export interface Cue {
   ident: string | null;
   group_id: number | null;
   sort_order: number | null;
+  line_position: number | null;
 }
diff --git a/client-v3/src/views/electron/ServerSelector.vue b/client-v3/src/views/electron/ServerSelector.vue
index c0173090c..a287282a0 100644
--- a/client-v3/src/views/electron/ServerSelector.vue
+++ b/client-v3/src/views/electron/ServerSelector.vue
@@ -440,8 +440,7 @@ async function discoverServers(): Promise<void> {
 async function checkServerStatus(connection: ElectronConnection): Promise<ServerStatus> {
   try {
     const result = (await window.electronAPI?.checkVersion?.(connection.url)) as
-      | ElectronVersionCheckResult
-      | undefined;
+      ElectronVersionCheckResult | undefined;
     if (!result || result.error || !result.serverVersion) {
       return {
         available: false,
diff --git a/client/package-lock.json b/client/package-lock.json
index 253482836..9131534b2 100644
--- a/client/package-lock.json
+++ b/client/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "client",
-  "version": "0.33.0",
+  "version": "0.34.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "client",
-      "version": "0.33.0",
+      "version": "0.34.0",
       "dependencies": {
         "bootstrap": "4.6.2",
         "bootstrap-vue": "2.23.1",
@@ -50,7 +50,7 @@
         "globals": "^15.14.0",
         "jiti": "^2.7.0",
         "jsdom": "^27.4.0",
-        "prettier": "^3.8.4",
+        "prettier": "^3.9.0",
         "sass": "1.101.0",
         "typescript": "^6.0.3",
         "typescript-eslint": "^8.62.0",
@@ -151,9 +151,9 @@
       }
     },
     "node_modules/@csstools/color-helpers": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/@csstools/color-helpers/-/color-helpers-6.0.2.tgz",
-      "integrity": "sha512-LMGQLS9EuADloEFkcTBR3BwV/CGHV7zyDxVRtVDTwdI2Ca4it0CCVTT9wCkxSgokjE5Ho41hEPgb8OEUwoXr6Q==",
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/@csstools/color-helpers/-/color-helpers-6.1.0.tgz",
+      "integrity": "sha512-064IFJdjTfUqnjpCVpMOdbr8FLQBhinbZj6yRv2An2E41O/pLEXqfFRWqGq/SxlE5PEUYTlvWsG2r8MswAVvkg==",
       "dev": true,
       "funding": [
         {
@@ -195,9 +195,9 @@
       }
     },
     "node_modules/@csstools/css-color-parser": {
-      "version": "4.1.8",
-      "resolved": "https://registry.npmjs.org/@csstools/css-color-parser/-/css-color-parser-4.1.8.tgz",
-      "integrity": "sha512-3chWb7PRLijpJpPIKkDxdu6IBeO5MrFACND57On0j8OPpc0wZibcGc3xAHrSEbOx/KDRyMHoIxGn0w1PhXMYHw==",
+      "version": "4.1.9",
+      "resolved": "https://registry.npmjs.org/@csstools/css-color-parser/-/css-color-parser-4.1.9.tgz",
+      "integrity": "sha512-paQcIaOO53Rk5+YrBaBjm/SgrV4INImjo2BT1DtQRYr+XeTRbeAYlS+jxXp9drqvKmtFnWRJKIalDLhZZDu42A==",
       "dev": true,
       "funding": [
         {
@@ -211,7 +211,7 @@
       ],
       "license": "MIT",
       "dependencies": {
-        "@csstools/color-helpers": "^6.0.2",
+        "@csstools/color-helpers": "^6.1.0",
         "@csstools/css-calc": "^3.2.1"
       },
       "engines": {
@@ -291,9 +291,9 @@
       }
     },
     "node_modules/@esbuild/aix-ppc64": {
-      "version": "0.27.7",
-      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.27.7.tgz",
-      "integrity": "sha512-EKX3Qwmhz1eMdEJokhALr0YiD0lhQNwDqkPYyPhiSwKrh7/4KRjQc04sZ8db+5DVVnZ1LmbNDI1uAMPEUBnQPg==",
+      "version": "0.28.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.28.1.tgz",
+      "integrity": "sha512-Svl7tq8k/08+p6CXPpRjQ1fKX+1odH/BQbb48fV6fj3CWHhsoIOoY87w1oHXm0qEpkIK3ZfVgp0hed3XBXzXMQ==",
       "cpu": [
         "ppc64"
       ],
@@ -308,9 +308,9 @@
       }
     },
     "node_modules/@esbuild/android-arm": {
-      "version": "0.27.7",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.27.7.tgz",
-      "integrity": "sha512-jbPXvB4Yj2yBV7HUfE2KHe4GJX51QplCN1pGbYjvsyCZbQmies29EoJbkEc+vYuU5o45AfQn37vZlyXy4YJ8RQ==",
+      "version": "0.28.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.28.1.tgz",
+      "integrity": "sha512-0k2F129Xdio1TdJfzJ8sy1Q47vUD2NnwdhiAf7drUN1EBTfPf4hsFCtmMgu/6m8JSzsBrlmVjudMBQqOfG8usQ==",
       "cpu": [
         "arm"
       ],
@@ -325,9 +325,9 @@
       }
     },
     "node_modules/@esbuild/android-arm64": {
-      "version": "0.27.7",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.27.7.tgz",
-      "integrity": "sha512-62dPZHpIXzvChfvfLJow3q5dDtiNMkwiRzPylSCfriLvZeq0a1bWChrGx/BbUbPwOrsWKMn8idSllklzBy+dgQ==",
+      "version": "0.28.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.28.1.tgz",
+      "integrity": "sha512-34EGEbCIAgosYz6goLcopX6Mo7NyGv9tfwEM2/7Ce2VcVRk568iSvniGWcUXIy7wEDR1wzolcxcriFVrWYcwBg==",
       "cpu": [
         "arm64"
       ],
@@ -342,9 +342,9 @@
       }
     },
     "node_modules/@esbuild/android-x64": {
-      "version": "0.27.7",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.27.7.tgz",
-      "integrity": "sha512-x5VpMODneVDb70PYV2VQOmIUUiBtY3D3mPBG8NxVk5CogneYhkR7MmM3yR/uMdITLrC1ml/NV1rj4bMJuy9MCg==",
+      "version": "0.28.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.28.1.tgz",
+      "integrity": "sha512-dbwY7ltSMDWsRatcRpCnES4F+im88OCUgGZjy52shC7GqHRE/cYlxNbB4Z4UpJswpcc4Qxd2oE/ufM0p61IKng==",
       "cpu": [
         "x64"
       ],
@@ -359,9 +359,9 @@
       }
     },
     "node_modules/@esbuild/darwin-arm64": {
-      "version": "0.27.7",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.27.7.tgz",
-      "integrity": "sha512-5lckdqeuBPlKUwvoCXIgI2D9/ABmPq3Rdp7IfL70393YgaASt7tbju3Ac+ePVi3KDH6N2RqePfHnXkaDtY9fkw==",
+      "version": "0.28.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.28.1.tgz",
+      "integrity": "sha512-TZbWkQY7kvTAXbXUT7uVACR5cMHsDiSz9z7ZKAX/RTq/WJEk3QyRr0wZpNhBDX+/0CtdqUIJlOiodQcta6tY3Q==",
       "cpu": [
         "arm64"
       ],
@@ -376,9 +376,9 @@
       }
     },
     "node_modules/@esbuild/darwin-x64": {
-      "version": "0.27.7",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.27.7.tgz",
-      "integrity": "sha512-rYnXrKcXuT7Z+WL5K980jVFdvVKhCHhUwid+dDYQpH+qu+TefcomiMAJpIiC2EM3Rjtq0sO3StMV/+3w3MyyqQ==",
+      "version": "0.28.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.28.1.tgz",
+      "integrity": "sha512-zfdzgK9ACBNZLI/CyHTOx81SyNbM6YXn7rxSgX97VjyiPl9W1i4Ka4fgKECEoFCKGpvBj5qArWIGgQjOwkgskQ==",
       "cpu": [
         "x64"
       ],
@@ -393,9 +393,9 @@
       }
     },
     "node_modules/@esbuild/freebsd-arm64": {
-      "version": "0.27.7",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.27.7.tgz",
-      "integrity": "sha512-B48PqeCsEgOtzME2GbNM2roU29AMTuOIN91dsMO30t+Ydis3z/3Ngoj5hhnsOSSwNzS+6JppqWsuhTp6E82l2w==",
+      "version": "0.28.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.28.1.tgz",
+      "integrity": "sha512-wG2EA8ENdEI0qhkSZMjfqrdY+ziCYCPMmtZjjIwOmXFjmyzEHn+UUxk5of+SYsjtfs3VpnlC7QLzSI5hY/rOAw==",
       "cpu": [
         "arm64"
       ],
@@ -410,9 +410,9 @@
       }
     },
     "node_modules/@esbuild/freebsd-x64": {
-      "version": "0.27.7",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.27.7.tgz",
-      "integrity": "sha512-jOBDK5XEjA4m5IJK3bpAQF9/Lelu/Z9ZcdhTRLf4cajlB+8VEhFFRjWgfy3M1O4rO2GQ/b2dLwCUGpiF/eATNQ==",
+      "version": "0.28.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.28.1.tgz",
+      "integrity": "sha512-i7dZ9vQgnvSCzi/rYCXNgtF/U+eKZNJBzu3eTQbRgHnM7tNSizLOkRFAl3qzVc/Op/u5YkHHa4pf/3DOYHthLQ==",
       "cpu": [
         "x64"
       ],
@@ -427,9 +427,9 @@
       }
     },
     "node_modules/@esbuild/linux-arm": {
-      "version": "0.27.7",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.27.7.tgz",
-      "integrity": "sha512-RkT/YXYBTSULo3+af8Ib0ykH8u2MBh57o7q/DAs3lTJlyVQkgQvlrPTnjIzzRPQyavxtPtfg0EopvDyIt0j1rA==",
+      "version": "0.28.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.28.1.tgz",
+      "integrity": "sha512-qVXBOHQS+d5Y722GwJzJUtOLlX7km3CraOaGormF1pDtPd2C/l1SHRPgjLunLGe51Sh5YYWKMFDyV4SxgMQYTQ==",
       "cpu": [
         "arm"
       ],
@@ -444,9 +444,9 @@
       }
     },
     "node_modules/@esbuild/linux-arm64": {
-      "version": "0.27.7",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.27.7.tgz",
-      "integrity": "sha512-RZPHBoxXuNnPQO9rvjh5jdkRmVizktkT7TCDkDmQ0W2SwHInKCAV95GRuvdSvA7w4VMwfCjUiPwDi0ZO6Nfe9A==",
+      "version": "0.28.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.28.1.tgz",
+      "integrity": "sha512-yHs+0uc8+nvEAfAfxrWQKK5peSNzBc4PegcMO0EJ2hT71uA7vB8Ihg2e77R2P7SG5uYjPbHlLLmve4LLLRCf0g==",
       "cpu": [
         "arm64"
       ],
@@ -461,9 +461,9 @@
       }
     },
     "node_modules/@esbuild/linux-ia32": {
-      "version": "0.27.7",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.27.7.tgz",
-      "integrity": "sha512-GA48aKNkyQDbd3KtkplYWT102C5sn/EZTY4XROkxONgruHPU72l+gW+FfF8tf2cFjeHaRbWpOYa/uRBz/Xq1Pg==",
+      "version": "0.28.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.28.1.tgz",
+      "integrity": "sha512-d1z4ZuP0ajrfz/FhGT4vv278rX8KnPPJx8i5+AtK7TYbx9Le9F1hyzurZpkEyjkGa9dUGhQow4C1NmeGvqxN2w==",
       "cpu": [
         "ia32"
       ],
@@ -478,9 +478,9 @@
       }
     },
     "node_modules/@esbuild/linux-loong64": {
-      "version": "0.27.7",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.27.7.tgz",
-      "integrity": "sha512-a4POruNM2oWsD4WKvBSEKGIiWQF8fZOAsycHOt6JBpZ+JN2n2JH9WAv56SOyu9X5IqAjqSIPTaJkqN8F7XOQ5Q==",
+      "version": "0.28.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.28.1.tgz",
+      "integrity": "sha512-M5sRjUVZrkm1OAPR3dlOYzNmN+loZKGVi1VUQGrwuqLcbR6qeAz+famMhjASeH3YVKvZz+zT1jlh/keC3Rj/lg==",
       "cpu": [
         "loong64"
       ],
@@ -495,9 +495,9 @@
       }
     },
     "node_modules/@esbuild/linux-mips64el": {
-      "version": "0.27.7",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.27.7.tgz",
-      "integrity": "sha512-KabT5I6StirGfIz0FMgl1I+R1H73Gp0ofL9A3nG3i/cYFJzKHhouBV5VWK1CSgKvVaG4q1RNpCTR2LuTVB3fIw==",
+      "version": "0.28.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.28.1.tgz",
+      "integrity": "sha512-mRObBZeHh2OxcBFPWE/FjylkRgZdYuiTR3vaTozquCGOH14iP9oN4x4Ge81CoIDYQrXmIxpFumJBu5MtZpnQJQ==",
       "cpu": [
         "mips64el"
       ],
@@ -512,9 +512,9 @@
       }
     },
     "node_modules/@esbuild/linux-ppc64": {
-      "version": "0.27.7",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.27.7.tgz",
-      "integrity": "sha512-gRsL4x6wsGHGRqhtI+ifpN/vpOFTQtnbsupUF5R5YTAg+y/lKelYR1hXbnBdzDjGbMYjVJLJTd2OFmMewAgwlQ==",
+      "version": "0.28.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.28.1.tgz",
+      "integrity": "sha512-slScBsMAb3GFDcdrCgLwZtPYRoH2H/youv10QiZyRjmsP48fznoveWytSgCI/R0ZcUgpc0ZhIUEx6LHts8yrfQ==",
       "cpu": [
         "ppc64"
       ],
@@ -529,9 +529,9 @@
       }
     },
     "node_modules/@esbuild/linux-riscv64": {
-      "version": "0.27.7",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.27.7.tgz",
-      "integrity": "sha512-hL25LbxO1QOngGzu2U5xeXtxXcW+/GvMN3ejANqXkxZ/opySAZMrc+9LY/WyjAan41unrR3YrmtTsUpwT66InQ==",
+      "version": "0.28.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.28.1.tgz",
+      "integrity": "sha512-kw0owk1o0GFETUJyW0jc0G4Yzs0BHZn0JDZ8JRT088vjJYX777BAs1fDGxAC+q831qOs2DTC96mNsG2opdfyyQ==",
       "cpu": [
         "riscv64"
       ],
@@ -546,9 +546,9 @@
       }
     },
     "node_modules/@esbuild/linux-s390x": {
-      "version": "0.27.7",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.27.7.tgz",
-      "integrity": "sha512-2k8go8Ycu1Kb46vEelhu1vqEP+UeRVj2zY1pSuPdgvbd5ykAw82Lrro28vXUrRmzEsUV0NzCf54yARIK8r0fdw==",
+      "version": "0.28.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.28.1.tgz",
+      "integrity": "sha512-/lAIjX8aYFRByhh6L5rYtPEDRqa9de/4V/juOXcta5frjvzXO4/sqEtyytse0g3zZFuWu5cDN0MkLz2qRDD2Ag==",
       "cpu": [
         "s390x"
       ],
@@ -563,9 +563,9 @@
       }
     },
     "node_modules/@esbuild/linux-x64": {
-      "version": "0.27.7",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.27.7.tgz",
-      "integrity": "sha512-hzznmADPt+OmsYzw1EE33ccA+HPdIqiCRq7cQeL1Jlq2gb1+OyWBkMCrYGBJ+sxVzve2ZJEVeePbLM2iEIZSxA==",
+      "version": "0.28.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.28.1.tgz",
+      "integrity": "sha512-u/anNYF2mmVOEDwLtnQ1wOr3EZ9sTNGLWrsYGYwHWzGA3Si84IOkHXlbWTD1NB+9/1lcnweYKO54uhxZydNzfA==",
       "cpu": [
         "x64"
       ],
@@ -580,9 +580,9 @@
       }
     },
     "node_modules/@esbuild/netbsd-arm64": {
-      "version": "0.27.7",
-      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.27.7.tgz",
-      "integrity": "sha512-b6pqtrQdigZBwZxAn1UpazEisvwaIDvdbMbmrly7cDTMFnw/+3lVxxCTGOrkPVnsYIosJJXAsILG9XcQS+Yu6w==",
+      "version": "0.28.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.28.1.tgz",
+      "integrity": "sha512-oks0DYbLwWMmaakTsCb+zL4E+aHRVLom9IJZOAthMQEPiQmydXHkziYEsGYRx0uNV/IjEKGAV941JzH02pflqw==",
       "cpu": [
         "arm64"
       ],
@@ -597,9 +597,9 @@
       }
     },
     "node_modules/@esbuild/netbsd-x64": {
-      "version": "0.27.7",
-      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.27.7.tgz",
-      "integrity": "sha512-OfatkLojr6U+WN5EDYuoQhtM+1xco+/6FSzJJnuWiUw5eVcicbyK3dq5EeV/QHT1uy6GoDhGbFpprUiHUYggrw==",
+      "version": "0.28.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.28.1.tgz",
+      "integrity": "sha512-aeL6lAnN89Hz43Mlh1G8ARasbuoYvSITDEx0tHh5b7jJnHcssqgjy9Yx430GDpmCa6OyrKoS0aNRjKundRizGg==",
       "cpu": [
         "x64"
       ],
@@ -614,9 +614,9 @@
       }
     },
     "node_modules/@esbuild/openbsd-arm64": {
-      "version": "0.27.7",
-      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.27.7.tgz",
-      "integrity": "sha512-AFuojMQTxAz75Fo8idVcqoQWEHIXFRbOc1TrVcFSgCZtQfSdc1RXgB3tjOn/krRHENUB4j00bfGjyl2mJrU37A==",
+      "version": "0.28.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.28.1.tgz",
+      "integrity": "sha512-MEFJe5C3R8pwXdZ5Y21oo6m7ePiS0d9pWucn99O/wvyJZChoIQKrQDxKrGeW8F5+T0okTHesAmDeiHDTIq0V/Q==",
       "cpu": [
         "arm64"
       ],
@@ -631,9 +631,9 @@
       }
     },
     "node_modules/@esbuild/openbsd-x64": {
-      "version": "0.27.7",
-      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.27.7.tgz",
-      "integrity": "sha512-+A1NJmfM8WNDv5CLVQYJ5PshuRm/4cI6WMZRg1by1GwPIQPCTs1GLEUHwiiQGT5zDdyLiRM/l1G0Pv54gvtKIg==",
+      "version": "0.28.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.28.1.tgz",
+      "integrity": "sha512-i/ZLIOafE0Z8cI/XANJAixoJL/uRAoS2xOA3rb0xN+KK0K177cMAsQYkzHtBrtMXAKuAc7HGgcWiZ/sRC1Nxgw==",
       "cpu": [
         "x64"
       ],
@@ -648,9 +648,9 @@
       }
     },
     "node_modules/@esbuild/openharmony-arm64": {
-      "version": "0.27.7",
-      "resolved": "https://registry.npmjs.org/@esbuild/openharmony-arm64/-/openharmony-arm64-0.27.7.tgz",
-      "integrity": "sha512-+KrvYb/C8zA9CU/g0sR6w2RBw7IGc5J2BPnc3dYc5VJxHCSF1yNMxTV5LQ7GuKteQXZtspjFbiuW5/dOj7H4Yw==",
+      "version": "0.28.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/openharmony-arm64/-/openharmony-arm64-0.28.1.tgz",
+      "integrity": "sha512-ge+Z7EXFNt2BO1oAMsVpiQ8EwndV9i1xXerAeTIK7AtPs3bKFXQM7nlRxDSIUIMeueR1CNXxqztLzdNeReKBJg==",
       "cpu": [
         "arm64"
       ],
@@ -665,9 +665,9 @@
       }
     },
     "node_modules/@esbuild/sunos-x64": {
-      "version": "0.27.7",
-      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.27.7.tgz",
-      "integrity": "sha512-ikktIhFBzQNt/QDyOL580ti9+5mL/YZeUPKU2ivGtGjdTYoqz6jObj6nOMfhASpS4GU4Q/Clh1QtxWAvcYKamA==",
+      "version": "0.28.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.28.1.tgz",
+      "integrity": "sha512-BEjgtECkL3vY+SaSQ6nzVfiALUeFxpawyp8Jmf5PtYhf1Ug40N1h/hxlhts+f1FvSvarEigdxS3BlSMI2PJLcQ==",
       "cpu": [
         "x64"
       ],
@@ -682,9 +682,9 @@
       }
     },
     "node_modules/@esbuild/win32-arm64": {
-      "version": "0.27.7",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.27.7.tgz",
-      "integrity": "sha512-7yRhbHvPqSpRUV7Q20VuDwbjW5kIMwTHpptuUzV+AA46kiPze5Z7qgt6CLCK3pWFrHeNfDd1VKgyP4O+ng17CA==",
+      "version": "0.28.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.28.1.tgz",
+      "integrity": "sha512-lCv9eK/H6ZJWbE7bh2nw54CZ9M2nupBxJcTsdk/QQnWkdSjKGuxmmH8/GWrlT1eMmZfn4dGcCjRte397WqfQXA==",
       "cpu": [
         "arm64"
       ],
@@ -699,9 +699,9 @@
       }
     },
     "node_modules/@esbuild/win32-ia32": {
-      "version": "0.27.7",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.27.7.tgz",
-      "integrity": "sha512-SmwKXe6VHIyZYbBLJrhOoCJRB/Z1tckzmgTLfFYOfpMAx63BJEaL9ExI8x7v0oAO3Zh6D/Oi1gVxEYr5oUCFhw==",
+      "version": "0.28.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.28.1.tgz",
+      "integrity": "sha512-zvb/mB2bSCoJOpoCBgYKKpX6YM6mJBlBUVUtVj41DlZJVEB6/0CKlRYxP5wWl1C1ILiCoAU5wZZ4q1P3qeS6Eg==",
       "cpu": [
         "ia32"
       ],
@@ -716,9 +716,9 @@
       }
     },
     "node_modules/@esbuild/win32-x64": {
-      "version": "0.27.7",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.27.7.tgz",
-      "integrity": "sha512-56hiAJPhwQ1R4i+21FVF7V8kSD5zZTdHcVuRFMW0hn753vVfQN8xlx4uOPT4xoGH0Z/oVATuR82AiqSTDIpaHg==",
+      "version": "0.28.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.28.1.tgz",
+      "integrity": "sha512-bm4Mowrv+GXMlpWX++EcXw/iLyd1o3+bJkC2DkWXYVvgZCqD/bSj9ctZeAMC3cIxgjRVR2Dufaiu4YPxr5gW1A==",
       "cpu": [
         "x64"
       ],
@@ -2975,9 +2975,9 @@
       "license": "MIT"
     },
     "node_modules/esbuild": {
-      "version": "0.27.7",
-      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.27.7.tgz",
-      "integrity": "sha512-IxpibTjyVnmrIQo5aqNpCgoACA/dTKLTlhMHihVHhdkxKyPO1uBBthumT0rdHmcsk9uMonIWS0m4FljWzILh3w==",
+      "version": "0.28.1",
+      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.28.1.tgz",
+      "integrity": "sha512-HrJrvZv5ayxBzPfwphOoNzkzOIIlifzk0KJrGK2c8R4+LKpMtpYLQeUdjnwjWv/LZlkH2laZk+4w78pi99D4Vw==",
       "dev": true,
       "hasInstallScript": true,
       "license": "MIT",
@@ -2988,32 +2988,32 @@
         "node": ">=18"
       },
       "optionalDependencies": {
-        "@esbuild/aix-ppc64": "0.27.7",
-        "@esbuild/android-arm": "0.27.7",
-        "@esbuild/android-arm64": "0.27.7",
-        "@esbuild/android-x64": "0.27.7",
-        "@esbuild/darwin-arm64": "0.27.7",
-        "@esbuild/darwin-x64": "0.27.7",
-        "@esbuild/freebsd-arm64": "0.27.7",
-        "@esbuild/freebsd-x64": "0.27.7",
-        "@esbuild/linux-arm": "0.27.7",
-        "@esbuild/linux-arm64": "0.27.7",
-        "@esbuild/linux-ia32": "0.27.7",
-        "@esbuild/linux-loong64": "0.27.7",
-        "@esbuild/linux-mips64el": "0.27.7",
-        "@esbuild/linux-ppc64": "0.27.7",
-        "@esbuild/linux-riscv64": "0.27.7",
-        "@esbuild/linux-s390x": "0.27.7",
-        "@esbuild/linux-x64": "0.27.7",
-        "@esbuild/netbsd-arm64": "0.27.7",
-        "@esbuild/netbsd-x64": "0.27.7",
-        "@esbuild/openbsd-arm64": "0.27.7",
-        "@esbuild/openbsd-x64": "0.27.7",
-        "@esbuild/openharmony-arm64": "0.27.7",
-        "@esbuild/sunos-x64": "0.27.7",
-        "@esbuild/win32-arm64": "0.27.7",
-        "@esbuild/win32-ia32": "0.27.7",
-        "@esbuild/win32-x64": "0.27.7"
+        "@esbuild/aix-ppc64": "0.28.1",
+        "@esbuild/android-arm": "0.28.1",
+        "@esbuild/android-arm64": "0.28.1",
+        "@esbuild/android-x64": "0.28.1",
+        "@esbuild/darwin-arm64": "0.28.1",
+        "@esbuild/darwin-x64": "0.28.1",
+        "@esbuild/freebsd-arm64": "0.28.1",
+        "@esbuild/freebsd-x64": "0.28.1",
+        "@esbuild/linux-arm": "0.28.1",
+        "@esbuild/linux-arm64": "0.28.1",
+        "@esbuild/linux-ia32": "0.28.1",
+        "@esbuild/linux-loong64": "0.28.1",
+        "@esbuild/linux-mips64el": "0.28.1",
+        "@esbuild/linux-ppc64": "0.28.1",
+        "@esbuild/linux-riscv64": "0.28.1",
+        "@esbuild/linux-s390x": "0.28.1",
+        "@esbuild/linux-x64": "0.28.1",
+        "@esbuild/netbsd-arm64": "0.28.1",
+        "@esbuild/netbsd-x64": "0.28.1",
+        "@esbuild/openbsd-arm64": "0.28.1",
+        "@esbuild/openbsd-x64": "0.28.1",
+        "@esbuild/openharmony-arm64": "0.28.1",
+        "@esbuild/sunos-x64": "0.28.1",
+        "@esbuild/win32-arm64": "0.28.1",
+        "@esbuild/win32-ia32": "0.28.1",
+        "@esbuild/win32-x64": "0.28.1"
       }
     },
     "node_modules/escape-string-regexp": {
@@ -3347,9 +3347,9 @@
       }
     },
     "node_modules/expect-type": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/expect-type/-/expect-type-1.3.0.tgz",
-      "integrity": "sha512-knvyeauYhqjOYvQ66MznSMs83wmHrCycNEN6Ao+2AeYEfxUIkuiVxdEa1qlGEPK+We3n0THiDciYSsCcgW/DoA==",
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/expect-type/-/expect-type-1.4.0.tgz",
+      "integrity": "sha512-KfYbmpRm0VbLjEvVa9yGwCi9GI34xvi7A/HXYWQO65CSD2u3MczUJSuwXKFIxlGsgBQizV9q5J9NHj4VG0n+pA==",
       "dev": true,
       "license": "Apache-2.0",
       "engines": {
@@ -3647,9 +3647,9 @@
       }
     },
     "node_modules/immutable": {
-      "version": "5.1.7",
-      "resolved": "https://registry.npmjs.org/immutable/-/immutable-5.1.7.tgz",
-      "integrity": "sha512-47Xb+LFbZ/ZIjQMj6Q5J3IfK7PJFuqRdFOC9FpGgRTK6U2dAEVmkR9hp58qU4FpYux5YXpneDwkj2EP6lppzFA==",
+      "version": "5.1.8",
+      "resolved": "https://registry.npmjs.org/immutable/-/immutable-5.1.8.tgz",
+      "integrity": "sha512-TM5YqrGeTsVIPPpILzeqZ8D2Zc2TvNgSDi88zPF2a4cyqQdWV/wVWBDRDbNzzrLeRWScrFcOX9lW2iX6GOtUDw==",
       "dev": true,
       "license": "MIT"
     },
@@ -3796,9 +3796,9 @@
       "license": "MIT"
     },
     "node_modules/js-yaml": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.2.0.tgz",
-      "integrity": "sha512-ePWsvanv0DWuDRsW8dnt+R4jQ31SCRCQ7hhNcPXZPsoBZiemuZNYGf7adZdqX2D86j6rvKp3RpCxVTSb8WQlOw==",
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.3.0.tgz",
+      "integrity": "sha512-1td788aAnnZ5qs7V2QIRl1owjtYpbKt749Y3xauqQgwIIGF/xXWz1wMTEBx5O3LK3lXLVuqXPdPxj2BoFHaW9Q==",
       "dev": true,
       "funding": [
         {
@@ -4381,9 +4381,9 @@
       }
     },
     "node_modules/prettier": {
-      "version": "3.8.4",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.8.4.tgz",
-      "integrity": "sha512-N2MylSdi48+5N/6S5j+maeHbUSIzzZ5uOcX5Hm4QpV8Dkb1HFjfAKTKX6yNPJQD9AhcT3ifHNB66tWTTJDi11Q==",
+      "version": "3.9.0",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.9.0.tgz",
+      "integrity": "sha512-LjIqSIC5VYLzs9WedVmJ2ljNAGnU+DteIClbahu4L/DBeWjZ6iT/k1lAYyu9JUh+1xINxWadaPw/Pl63y/agAw==",
       "dev": true,
       "license": "MIT",
       "bin": {
@@ -5009,13 +5009,13 @@
       "license": "MIT"
     },
     "node_modules/vite": {
-      "version": "7.3.5",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-7.3.5.tgz",
-      "integrity": "sha512-KuOaNhcnGFN2zIPGA7wRmzF+lJA1sea7rHq17aiJ++9lzY1WWG6Jpwqwe1KNbRVPIqHmr8GLYx7jbrQcN/7/ww==",
+      "version": "7.3.6",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-7.3.6.tgz",
+      "integrity": "sha512-4XP60spRGjSZFf1qYH+dJIkK2znL3zQfl9KkOV9MkkRR/3Dls0dxaBsQPTloEc5BLXWPL9vsOxopxyKoMmDueg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "esbuild": "^0.27.0",
+        "esbuild": "^0.27.0 || ^0.28.0",
         "fdir": "^6.5.0",
         "picomatch": "^4.0.3",
         "postcss": "^8.5.6",
diff --git a/client/package.json b/client/package.json
index 3089496df..0d48410e7 100644
--- a/client/package.json
+++ b/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "client",
-  "version": "0.33.0",
+  "version": "0.34.0",
   "description": "DigiScript front end",
   "author": "DreamTeamProd",
   "private": true,
@@ -69,7 +69,7 @@
     "globals": "^15.14.0",
     "jiti": "^2.7.0",
     "jsdom": "^27.4.0",
-    "prettier": "^3.8.4",
+    "prettier": "^3.9.0",
     "sass": "1.101.0",
     "typescript": "^6.0.3",
     "typescript-eslint": "^8.62.0",
diff --git a/client/src/js/mruSortUtils.ts b/client/src/js/mruSortUtils.ts
index a0ecf3bb5..26679b2c3 100644
--- a/client/src/js/mruSortUtils.ts
+++ b/client/src/js/mruSortUtils.ts
@@ -4,8 +4,7 @@ type ScriptLine = { line_parts?: LinePart[] };
 type TmpScript = Record<string, ScriptLine[]>;
 export type SelectOption = { value: number | null; text: string };
 export type CombinedSelectOption =
-  | { value: null; text: string }
-  | { label: string; options: { value: string; text: string }[] };
+  { value: null; text: string } | { label: string; options: { value: string; text: string }[] };
 
 function countOccurrences(
   tmpScript: TmpScript,
diff --git a/client/src/store/modules/script.ts b/client/src/store/modules/script.ts
index 3196141af..97cef7642 100644
--- a/client/src/store/modules/script.ts
+++ b/client/src/store/modules/script.ts
@@ -436,8 +436,15 @@ const module: Module<ScriptState, RootState> = {
       (state: ScriptState) =>
       (
         lineId: number | null
-      ): { individual: Cue[]; groups: { group: CueGroup; cues: Cue[] }[] } => {
-        if (lineId == null) return { individual: [], groups: [] };
+      ): {
+        individual: Cue[];
+        groups: { group: CueGroup; cues: Cue[] }[];
+        merged: (
+          | { type: 'individual'; cue: Cue; line_position: number | null }
+          | { type: 'group'; group: CueGroup; cues: Cue[]; line_position: number | null }
+        )[];
+      } => {
+        if (lineId == null) return { individual: [], groups: [], merged: [] };
         const allCues = state.cues[String(lineId)] ?? [];
         const individual = allCues.filter((c) => c.group_id == null);
         const groupMap = new Map<number, Cue[]>();
@@ -455,7 +462,29 @@ const module: Module<ScriptState, RootState> = {
             groups.push({ group, cues: sorted });
           }
         }
-        return { individual, groups };
+        const merged: (
+          | { type: 'individual'; cue: Cue; line_position: number | null }
+          | { type: 'group'; group: CueGroup; cues: Cue[]; line_position: number | null }
+        )[] = [
+          ...individual.map((c) => ({
+            type: 'individual' as const,
+            cue: c,
+            line_position: c.line_position,
+          })),
+          ...groups.map((g) => ({
+            type: 'group' as const,
+            group: g.group,
+            cues: g.cues,
+            line_position: g.cues[0]?.line_position ?? null,
+          })),
+        ];
+        merged.sort((a, b) => {
+          if (a.line_position == null && b.line_position == null) return 0;
+          if (a.line_position == null) return 1;
+          if (b.line_position == null) return -1;
+          return a.line_position - b.line_position;
+        });
+        return { individual, groups, merged };
       },
     SCRIPT_CUTS(state: ScriptState) {
       return state.cuts;
diff --git a/client/src/types/api/cues.ts b/client/src/types/api/cues.ts
index b2dbdb003..fe069ab18 100644
--- a/client/src/types/api/cues.ts
+++ b/client/src/types/api/cues.ts
@@ -18,4 +18,5 @@ export interface Cue {
   ident: string | null;
   group_id: number | null;
   sort_order: number | null;
+  line_position: number | null;
 }
diff --git a/client/src/vue_components/show/config/cues/ScriptLineCueEditor.vue b/client/src/vue_components/show/config/cues/ScriptLineCueEditor.vue
index e7c244e09..3d1beaea5 100644
--- a/client/src/vue_components/show/config/cues/ScriptLineCueEditor.vue
+++ b/client/src/vue_components/show/config/cues/ScriptLineCueEditor.vue
@@ -12,32 +12,34 @@
     >
       <b-col cols="3" class="cue-column" style="text-align: right">
         <b-button-group v-if="line.line_type !== LINE_TYPES.SPACING">
-          <b-button
-            v-for="cue in individualCues"
-            :key="cue.id"
-            :disabled="!IS_CUE_EDITOR"
-            class="cue-button"
-            :style="{
-              backgroundColor: cueBackgroundColour(cue),
-              color: contrastColor({ bgColor: cueBackgroundColour(cue) }),
-            }"
-            @click.stop="openEditForm(cue)"
-          >
-            {{ cueLabel(cue) }}
-          </b-button>
-          <b-button
-            v-for="grp in lineGroups"
-            :key="`group_${grp.group.id}`"
-            :disabled="!IS_CUE_EDITOR"
-            class="cue-button cue-group-btn"
-            :style="{
-              backgroundColor: cueGroupBackgroundColour(grp.group),
-              color: contrastColor({ bgColor: cueGroupBackgroundColour(grp.group) }),
-            }"
-            @click.stop="openEditGroup(grp.group, grp.cues)"
-          >
-            {{ cueGroupLabel(grp.group, grp.cues) }}
-          </b-button>
+          <template v-for="slot in mergedCueSlots">
+            <b-button
+              v-if="slot.type === 'individual'"
+              :key="slot.cue.id"
+              :disabled="!IS_CUE_EDITOR"
+              class="cue-button"
+              :style="{
+                backgroundColor: cueBackgroundColour(slot.cue),
+                color: contrastColor({ bgColor: cueBackgroundColour(slot.cue) }),
+              }"
+              @click.stop="openEditForm(slot.cue)"
+            >
+              {{ cueLabel(slot.cue) }}
+            </b-button>
+            <b-button
+              v-else
+              :key="`group_${slot.group.id}`"
+              :disabled="!IS_CUE_EDITOR"
+              class="cue-button cue-group-btn"
+              :style="{
+                backgroundColor: cueGroupBackgroundColour(slot.group),
+                color: contrastColor({ bgColor: cueGroupBackgroundColour(slot.group) }),
+              }"
+              @click.stop="openEditGroup(slot.group, slot.cues)"
+            >
+              {{ cueGroupLabel(slot.group, slot.cues) }}
+            </b-button>
+          </template>
           <b-button
             v-if="IS_CUE_EDITOR"
             class="cue-button add-cue-btn"
@@ -455,11 +457,8 @@ export default defineComponent({
       'CUE_COLOUR_OVERRIDES',
       'GROUPED_CUES_FOR_LINE',
     ]),
-    individualCues(): any[] {
-      return (this.cues as any[]).filter((c: any) => c.group_id == null);
-    },
-    lineGroups(): { group: any; cues: any[] }[] {
-      return (this as any).GROUPED_CUES_FOR_LINE((this.line as any).id).groups;
+    mergedCueSlots(): any[] {
+      return (this as any).GROUPED_CUES_FOR_LINE((this.line as any).id).merged;
     },
     cueTypeOptions(): unknown[] {
       if ((this as any).IS_ADMIN_USER) {
diff --git a/client/src/vue_components/show/live/ScriptLineViewer.vue b/client/src/vue_components/show/live/ScriptLineViewer.vue
index f0a312349..e8a4ac4d5 100644
--- a/client/src/vue_components/show/live/ScriptLineViewer.vue
+++ b/client/src/vue_components/show/live/ScriptLineViewer.vue
@@ -138,28 +138,30 @@
         </template>
         <b-col cols="3" :class="['cue-column-right', { 'first-row': isFirstRowContent }]">
           <b-button-group>
-            <b-button
-              v-for="cue in individualCues"
-              :key="cue.id"
-              class="cue-button"
-              :style="{
-                backgroundColor: cueBackgroundColour(cue),
-                color: contrastColor({ bgColor: cueBackgroundColour(cue) }),
-              }"
-            >
-              {{ cueLabel(cue) }}
-            </b-button>
-            <b-button
-              v-for="grp in lineGroups"
-              :key="`group_${grp.group.id}`"
-              class="cue-button cue-group-btn"
-              :style="{
-                backgroundColor: cueGroupBackgroundColour(grp.group),
-                color: contrastColor({ bgColor: cueGroupBackgroundColour(grp.group) }),
-              }"
-            >
-              {{ cueGroupLabel(grp.group, grp.cues) }}
-            </b-button>
+            <template v-for="slot in mergedCueSlots">
+              <b-button
+                v-if="slot.type === 'individual'"
+                :key="slot.cue.id"
+                class="cue-button"
+                :style="{
+                  backgroundColor: cueBackgroundColour(slot.cue),
+                  color: contrastColor({ bgColor: cueBackgroundColour(slot.cue) }),
+                }"
+              >
+                {{ cueLabel(slot.cue) }}
+              </b-button>
+              <b-button
+                v-else
+                :key="`group_${slot.group.id}`"
+                class="cue-button cue-group-btn"
+                :style="{
+                  backgroundColor: cueGroupBackgroundColour(slot.group),
+                  color: contrastColor({ bgColor: cueGroupBackgroundColour(slot.group) }),
+                }"
+              >
+                {{ cueGroupLabel(slot.group, slot.cues) }}
+              </b-button>
+            </template>
             <b-button
               v-if="cueAddMode"
               class="cue-button add-cue-btn"
@@ -174,28 +176,30 @@
       <template v-else>
         <b-col cols="3" :class="['cue-column', { 'first-row': isFirstRowContent }]">
           <b-button-group>
-            <b-button
-              v-for="cue in individualCues"
-              :key="cue.id"
-              class="cue-button"
-              :style="{
-                backgroundColor: cueBackgroundColour(cue),
-                color: contrastColor({ bgColor: cueBackgroundColour(cue) }),
-              }"
-            >
-              {{ cueLabel(cue) }}
-            </b-button>
-            <b-button
-              v-for="grp in lineGroups"
-              :key="`group_${grp.group.id}`"
-              class="cue-button cue-group-btn"
-              :style="{
-                backgroundColor: cueGroupBackgroundColour(grp.group),
-                color: contrastColor({ bgColor: cueGroupBackgroundColour(grp.group) }),
-              }"
-            >
-              {{ cueGroupLabel(grp.group, grp.cues) }}
-            </b-button>
+            <template v-for="slot in mergedCueSlots">
+              <b-button
+                v-if="slot.type === 'individual'"
+                :key="slot.cue.id"
+                class="cue-button"
+                :style="{
+                  backgroundColor: cueBackgroundColour(slot.cue),
+                  color: contrastColor({ bgColor: cueBackgroundColour(slot.cue) }),
+                }"
+              >
+                {{ cueLabel(slot.cue) }}
+              </b-button>
+              <b-button
+                v-else
+                :key="`group_${slot.group.id}`"
+                class="cue-button cue-group-btn"
+                :style="{
+                  backgroundColor: cueGroupBackgroundColour(slot.group),
+                  color: contrastColor({ bgColor: cueGroupBackgroundColour(slot.group) }),
+                }"
+              >
+                {{ cueGroupLabel(slot.group, slot.cues) }}
+              </b-button>
+            </template>
             <b-button
               v-if="cueAddMode"
               class="cue-button add-cue-btn"
@@ -368,11 +372,8 @@ export default defineComponent({
     isFirstRowContent(): boolean {
       return !(this as any).needsIntervalBanner && !(this as any).needsActSceneLabel;
     },
-    individualCues(): any[] {
-      return (this.cues as any[]).filter((c: any) => c.group_id == null);
-    },
-    lineGroups(): { group: any; cues: any[] }[] {
-      return (this as any).GROUPED_CUES_FOR_LINE((this.line as any).id).groups;
+    mergedCueSlots(): any[] {
+      return (this as any).GROUPED_CUES_FOR_LINE((this.line as any).id).merged;
     },
     ...mapGetters(['USER_SETTINGS', 'GROUPED_CUES_FOR_LINE']),
   },
diff --git a/client/src/vue_components/show/live/ScriptLineViewerCompact.vue b/client/src/vue_components/show/live/ScriptLineViewerCompact.vue
index b5ced3581..7179775a6 100644
--- a/client/src/vue_components/show/live/ScriptLineViewerCompact.vue
+++ b/client/src/vue_components/show/live/ScriptLineViewerCompact.vue
@@ -40,57 +40,54 @@
       </b-col>
       <b-col v-if="cueAddMode" cols="1" class="cue-add-column" />
     </b-row>
-    <template v-for="(cue, cueIndex) in individualCues">
-      <b-row :key="`cue_${cue.id}`">
-        <b-col
-          cols="2"
-          :class="[
-            'cue-column',
-            'line-part',
-            'text-right',
-            'font-weight-bold',
-            'cue',
-            { 'first-row': isFirstRowCues && cueIndex === 0 },
-          ]"
-          :style="{ color: cueBackgroundColour(cue) }"
-        >
-          <span>{{ cuePrefix(cue) }}</span>
-        </b-col>
-        <b-col
-          :cols="cueAddMode ? 9 : 10"
-          class="line-part text-left font-weight-bold cue"
-          :style="{ color: cueBackgroundColour(cue) }"
-        >
-          <span>{{ cue.ident }}</span>
-        </b-col>
-        <b-col v-if="cueAddMode" cols="1" class="cue-add-column" />
-      </b-row>
-    </template>
-    <template v-for="(grp, groupIndex) in lineGroups">
-      <b-row :key="`group_${grp.group.id}`">
-        <b-col
-          cols="2"
-          :class="[
-            'cue-column',
-            'line-part',
-            'text-right',
-            'font-weight-bold',
-            'cue',
-            {
-              'first-row': isFirstRowCues && individualCues.length === 0 && groupIndex === 0,
-            },
-          ]"
-          :style="{ color: cueGroupBackgroundColour(grp.group) }"
-        >
-          <span>{{ cueGroupPrefix(grp.group) }}</span>
-        </b-col>
-        <b-col
-          :cols="cueAddMode ? 9 : 10"
-          class="line-part text-left font-weight-bold cue"
-          :style="{ color: cueGroupBackgroundColour(grp.group) }"
-        >
-          <span>{{ cueGroupIdentLabel(grp.group, grp.cues) }}</span>
-        </b-col>
+    <template v-for="(slot, slotIndex) in mergedCueSlots">
+      <b-row :key="slot.type === 'individual' ? `cue_${slot.cue.id}` : `group_${slot.group.id}`">
+        <template v-if="slot.type === 'individual'">
+          <b-col
+            cols="2"
+            :class="[
+              'cue-column',
+              'line-part',
+              'text-right',
+              'font-weight-bold',
+              'cue',
+              { 'first-row': isFirstRowCues && slotIndex === 0 },
+            ]"
+            :style="{ color: cueBackgroundColour(slot.cue) }"
+          >
+            <span>{{ cuePrefix(slot.cue) }}</span>
+          </b-col>
+          <b-col
+            :cols="cueAddMode ? 9 : 10"
+            class="line-part text-left font-weight-bold cue"
+            :style="{ color: cueBackgroundColour(slot.cue) }"
+          >
+            <span>{{ slot.cue.ident }}</span>
+          </b-col>
+        </template>
+        <template v-else>
+          <b-col
+            cols="2"
+            :class="[
+              'cue-column',
+              'line-part',
+              'text-right',
+              'font-weight-bold',
+              'cue',
+              { 'first-row': isFirstRowCues && slotIndex === 0 },
+            ]"
+            :style="{ color: cueGroupBackgroundColour(slot.group) }"
+          >
+            <span>{{ cueGroupPrefix(slot.group) }}</span>
+          </b-col>
+          <b-col
+            :cols="cueAddMode ? 9 : 10"
+            class="line-part text-left font-weight-bold cue"
+            :style="{ color: cueGroupBackgroundColour(slot.group) }"
+          >
+            <span>{{ cueGroupIdentLabel(slot.group, slot.cues) }}</span>
+          </b-col>
+        </template>
         <b-col v-if="cueAddMode" cols="1" class="cue-add-column" />
       </b-row>
     </template>
@@ -280,14 +277,11 @@ export default defineComponent({
     isFirstRowActScene(): boolean {
       return (this as any).needsActSceneLabel;
     },
-    individualCues(): any[] {
-      return (this.cues as any[]).filter((c: any) => c.group_id == null);
-    },
-    lineGroups(): { group: any; cues: any[] }[] {
-      return (this as any).GROUPED_CUES_FOR_LINE((this.line as any).id).groups;
+    mergedCueSlots(): any[] {
+      return (this as any).GROUPED_CUES_FOR_LINE((this.line as any).id).merged;
     },
     hasAnyCues(): boolean {
-      return (this as any).individualCues.length > 0 || (this as any).lineGroups.length > 0;
+      return (this as any).mergedCueSlots.length > 0;
     },
     isFirstRowCues(): boolean {
       return !(this as any).needsActSceneLabel && (this as any).hasAnyCues;
diff --git a/electron/package-lock.json b/electron/package-lock.json
index bd0e39dc3..4664a25b8 100644
--- a/electron/package-lock.json
+++ b/electron/package-lock.json
@@ -1,15 +1,15 @@
 {
   "name": "digiscript-electron",
-  "version": "0.33.0",
+  "version": "0.34.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "digiscript-electron",
-      "version": "0.33.0",
+      "version": "0.34.0",
       "license": "GPL-3.0",
       "dependencies": {
-        "bonjour-service": "^1.4.1",
+        "bonjour-service": "^1.4.2",
         "electron-store": "^11.0.2"
       },
       "devDependencies": {
@@ -27,7 +27,7 @@
         "eslint-config-prettier": "^10.1.8",
         "eslint-plugin-prettier": "^5.5.6",
         "globals": "^17.7.0",
-        "prettier": "^3.8.4",
+        "prettier": "^3.9.0",
         "typescript": "^6.0.3"
       },
       "engines": {
@@ -2288,9 +2288,9 @@
       "license": "MIT"
     },
     "node_modules/baseline-browser-mapping": {
-      "version": "2.10.38",
-      "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.10.38.tgz",
-      "integrity": "sha512-31/02mVB4yuQU6adKk5SlY6m+mxDwUq5KZkyYgnLrrKl7TEm1+3PyDtDBz2kOv/wxZz41GHsvV1A/u6RmiyBvw==",
+      "version": "2.10.40",
+      "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.10.40.tgz",
+      "integrity": "sha512-BSSLZ9/Cjjv7Gtj5B68ZzXcXUg8iOf3fme+FCuh8rC/Go+Kmh8cox7M3A8dolou16s64QjLPOSdngh7GxXvkSw==",
       "dev": true,
       "license": "Apache-2.0",
       "bin": {
@@ -2320,9 +2320,9 @@
       "license": "MIT"
     },
     "node_modules/bonjour-service": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/bonjour-service/-/bonjour-service-1.4.1.tgz",
-      "integrity": "sha512-9KM4QMPKnaJqaja1v7gYO/+TXZGLtzPA05NmUTqDAJjcsWeVoOXKMvU9g0gfuuoYTQqJZ924hivICd5R/bCJbA==",
+      "version": "1.4.2",
+      "resolved": "https://registry.npmjs.org/bonjour-service/-/bonjour-service-1.4.2.tgz",
+      "integrity": "sha512-lMskhnsW70yWHr4PhPeh2rvaIkLSaDpp+nmtbXBZaNKTXwxL73QOkW6HhbzqTImXjevn9TreGT4GACGBCGP9nQ==",
       "license": "MIT",
       "dependencies": {
         "fast-deep-equal": "^3.1.3",
@@ -3567,9 +3567,9 @@
       }
     },
     "node_modules/electron-to-chromium": {
-      "version": "1.5.378",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.378.tgz",
-      "integrity": "sha512-VinvOAuuPmdD1guEgGv5f2Qp7/vlfqOrUOMYNnOD4wj3pit8kRsQHzfIf6teyUGWo15Tg5+bOJaRunvyltpVWQ==",
+      "version": "1.5.380",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.380.tgz",
+      "integrity": "sha512-W6d5AbuEoRayO447cqrg6lKJIlscgRnnxOZl/08kfV71BQDoEBC7Wwis68z87LjyK6f4kWyTaubuDbhHKrZkbA==",
       "dev": true,
       "license": "ISC"
     },
@@ -3728,9 +3728,9 @@
       }
     },
     "node_modules/enhanced-resolve": {
-      "version": "5.24.0",
-      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.24.0.tgz",
-      "integrity": "sha512-SkE2t82KlkkxQRVMVLAGKxLfORGQfrkx5dkj+vlgXRVNEdPc4eZcR+J/Fvj8C+yKSFH5L0q3NFlyufOVQnCcYQ==",
+      "version": "5.24.1",
+      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.24.1.tgz",
+      "integrity": "sha512-7DdUaTjmNwMcH2gLr1qycesKII3BK4RLy/mdAb7x10Lq7bR4aNKHt1BR1ZALSv0rPM/hF5wYF0PhGop/rJm8vw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -4652,13 +4652,6 @@
         "node": ">=10.13.0"
       }
     },
-    "node_modules/glob-to-regexp": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz",
-      "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==",
-      "dev": true,
-      "license": "BSD-2-Clause"
-    },
     "node_modules/global-agent": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/global-agent/-/global-agent-3.0.0.tgz",
@@ -5184,9 +5177,9 @@
       }
     },
     "node_modules/js-yaml": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.2.0.tgz",
-      "integrity": "sha512-ePWsvanv0DWuDRsW8dnt+R4jQ31SCRCQ7hhNcPXZPsoBZiemuZNYGf7adZdqX2D86j6rvKp3RpCxVTSb8WQlOw==",
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.3.0.tgz",
+      "integrity": "sha512-1td788aAnnZ5qs7V2QIRl1owjtYpbKt749Y3xauqQgwIIGF/xXWz1wMTEBx5O3LK3lXLVuqXPdPxj2BoFHaW9Q==",
       "dev": true,
       "funding": [
         {
@@ -5746,6 +5739,67 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/minimizer-webpack-plugin": {
+      "version": "5.6.1",
+      "resolved": "https://registry.npmjs.org/minimizer-webpack-plugin/-/minimizer-webpack-plugin-5.6.1.tgz",
+      "integrity": "sha512-DoeAZz8Q1C1znwsUzej1fdoi4jCf7/+Em27ouLqfK/+3m8G+D7yDhUwrc3CNhjSzGUN1kn7Iv4sWmjflQHenpw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jridgewell/trace-mapping": "^0.3.25",
+        "jest-worker": "^27.4.5",
+        "schema-utils": "^4.3.0",
+        "terser": "^5.31.1"
+      },
+      "engines": {
+        "node": ">= 10.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "webpack": "^5.1.0"
+      },
+      "peerDependenciesMeta": {
+        "@minify-html/node": {
+          "optional": true
+        },
+        "@swc/core": {
+          "optional": true
+        },
+        "@swc/css": {
+          "optional": true
+        },
+        "@swc/html": {
+          "optional": true
+        },
+        "clean-css": {
+          "optional": true
+        },
+        "cssnano": {
+          "optional": true
+        },
+        "csso": {
+          "optional": true
+        },
+        "esbuild": {
+          "optional": true
+        },
+        "html-minifier-terser": {
+          "optional": true
+        },
+        "lightningcss": {
+          "optional": true
+        },
+        "postcss": {
+          "optional": true
+        },
+        "uglify-js": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/minipass": {
       "version": "3.3.6",
       "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
@@ -5962,9 +6016,9 @@
       }
     },
     "node_modules/node-releases": {
-      "version": "2.0.48",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.48.tgz",
-      "integrity": "sha512-1uz8041X6LoI6ZSdZacM9lVY28vuzDlSKitnpbSNK0RfKoIJkX29NBPVEFXhnuSuEOA9Ww0xnPJ+ILWbGAv8DA==",
+      "version": "2.0.50",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.50.tgz",
+      "integrity": "sha512-J6l92tKHX6w8Jy5nO1Vuc01NoIiRGi/d6qBKVxh+IQ8Cr3b6HbVNfKiF8ZpFKufTwpwxMmce2W3iQZ861ZRyTg==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -6460,9 +6514,9 @@
       }
     },
     "node_modules/prettier": {
-      "version": "3.8.4",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.8.4.tgz",
-      "integrity": "sha512-N2MylSdi48+5N/6S5j+maeHbUSIzzZ5uOcX5Hm4QpV8Dkb1HFjfAKTKX6yNPJQD9AhcT3ifHNB66tWTTJDi11Q==",
+      "version": "3.9.0",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.9.0.tgz",
+      "integrity": "sha512-LjIqSIC5VYLzs9WedVmJ2ljNAGnU+DteIClbahu4L/DBeWjZ6iT/k1lAYyu9JUh+1xINxWadaPw/Pl63y/agAw==",
       "dev": true,
       "license": "MIT",
       "peer": true,
@@ -7535,67 +7589,6 @@
         "node": ">=10"
       }
     },
-    "node_modules/terser-webpack-plugin": {
-      "version": "5.6.1",
-      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.6.1.tgz",
-      "integrity": "sha512-201R5j+sJpK8nFWwKVyNfZot8FaJbLZDq5evriVzbV1wDtSXDjRUDRfJzHpAaxFDMEhsZL1QkeqM61wgsS3KaQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@jridgewell/trace-mapping": "^0.3.25",
-        "jest-worker": "^27.4.5",
-        "schema-utils": "^4.3.0",
-        "terser": "^5.31.1"
-      },
-      "engines": {
-        "node": ">= 10.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      },
-      "peerDependencies": {
-        "webpack": "^5.1.0"
-      },
-      "peerDependenciesMeta": {
-        "@minify-html/node": {
-          "optional": true
-        },
-        "@swc/core": {
-          "optional": true
-        },
-        "@swc/css": {
-          "optional": true
-        },
-        "@swc/html": {
-          "optional": true
-        },
-        "clean-css": {
-          "optional": true
-        },
-        "cssnano": {
-          "optional": true
-        },
-        "csso": {
-          "optional": true
-        },
-        "esbuild": {
-          "optional": true
-        },
-        "html-minifier-terser": {
-          "optional": true
-        },
-        "lightningcss": {
-          "optional": true
-        },
-        "postcss": {
-          "optional": true
-        },
-        "uglify-js": {
-          "optional": true
-        }
-      }
-    },
     "node_modules/terser/node_modules/commander": {
       "version": "2.20.3",
       "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
@@ -7968,9 +7961,9 @@
       "license": "BSD-2-Clause"
     },
     "node_modules/webpack": {
-      "version": "5.107.2",
-      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.107.2.tgz",
-      "integrity": "sha512-v7RhXaJbpMlV0D7hC7lb2EbnxkoeUqf9qhKr6lozx3Q48pmFrqqNRmZFUEGmi7pSwm6fCQ2H1IjvCkHqdpVdjQ==",
+      "version": "5.108.1",
+      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.108.1.tgz",
+      "integrity": "sha512-UUCihHQK3O7483Woa0SulNLDeAiOhHI2PN2PAPU4fVWJqbzhv04EJ8FaWtB9WWh3i8fRt28543U7VfuJTOrpgQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -7983,19 +7976,18 @@
         "acorn-import-phases": "^1.0.3",
         "browserslist": "^4.28.1",
         "chrome-trace-event": "^1.0.2",
-        "enhanced-resolve": "^5.22.0",
+        "enhanced-resolve": "^5.22.2",
         "es-module-lexer": "^2.1.0",
         "eslint-scope": "5.1.1",
         "events": "^3.2.0",
-        "glob-to-regexp": "^0.4.1",
         "graceful-fs": "^4.2.11",
         "loader-runner": "^4.3.2",
         "mime-db": "^1.54.0",
+        "minimizer-webpack-plugin": "^5.6.1",
         "neo-async": "^2.6.2",
         "schema-utils": "^4.3.3",
         "tapable": "^2.3.0",
-        "terser-webpack-plugin": "^5.5.0",
-        "watchpack": "^2.5.1",
+        "watchpack": "^2.5.2",
         "webpack-sources": "^3.5.0"
       },
       "bin": {
diff --git a/electron/package.json b/electron/package.json
index 76ebb9983..bd940c392 100644
--- a/electron/package.json
+++ b/electron/package.json
@@ -1,6 +1,6 @@
 {
   "name": "digiscript-electron",
-  "version": "0.33.0",
+  "version": "0.34.0",
   "description": "DigiScript Electron Desktop Application",
   "author": "DreamTeamProd",
   "license": "GPL-3.0",
@@ -27,7 +27,7 @@
   },
   "dependencies": {
     "electron-store": "^11.0.2",
-    "bonjour-service": "^1.4.1"
+    "bonjour-service": "^1.4.2"
   },
   "devDependencies": {
     "electron": "^40.6.1",
@@ -44,7 +44,7 @@
     "eslint-config-prettier": "^10.1.8",
     "eslint-plugin-prettier": "^5.5.6",
     "globals": "^17.7.0",
-    "prettier": "^3.8.4",
+    "prettier": "^3.9.0",
     "typescript": "^6.0.3"
   },
   "config": {
diff --git a/server/alembic_config/versions/d11cd9306d4b_add_line_position_to_cue_association.py b/server/alembic_config/versions/d11cd9306d4b_add_line_position_to_cue_association.py
new file mode 100644
index 000000000..b6a63956e
--- /dev/null
+++ b/server/alembic_config/versions/d11cd9306d4b_add_line_position_to_cue_association.py
@@ -0,0 +1,58 @@
+"""add_line_position_to_cue_association
+
+Revision ID: d11cd9306d4b
+Revises: 863020cc72da
+Create Date: 2026-06-27 13:42:07.205049
+
+"""
+
+from typing import Sequence, Union
+
+import sqlalchemy as sa
+from alembic import op
+
+
+# revision identifiers, used by Alembic.
+revision: str = "d11cd9306d4b"
+down_revision: Union[str, None] = "863020cc72da"
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+
+def upgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table("script_cue_association", schema=None) as batch_op:
+        batch_op.add_column(sa.Column("line_position", sa.Integer(), nullable=True))
+
+    # ### end Alembic commands ###
+
+    # Backfill existing data: use cue_id as a creation-order proxy.
+    # Individual cues and group member cues all live in the same auto-increment
+    # table, so cue_id reflects approximate insertion order across both types.
+    op.execute(
+        "UPDATE script_cue_association SET line_position = cue_id WHERE group_id IS NULL"
+    )
+    # All members of a group on the same (revision, line) share the same
+    # line_position — use MIN(cue_id) for that group so the group's position
+    # approximates when it was created relative to other cues on the line.
+    op.execute(
+        """
+        UPDATE script_cue_association
+        SET line_position = (
+            SELECT MIN(sub.cue_id)
+            FROM script_cue_association sub
+            WHERE sub.group_id = script_cue_association.group_id
+              AND sub.line_id = script_cue_association.line_id
+              AND sub.revision_id = script_cue_association.revision_id
+        )
+        WHERE group_id IS NOT NULL
+        """
+    )
+
+
+def downgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table("script_cue_association", schema=None) as batch_op:
+        batch_op.drop_column("line_position")
+
+    # ### end Alembic commands ###
diff --git a/server/controllers/api/v1/show/cues.py b/server/controllers/api/v1/show/cues.py
index 2cfaf4fb4..ea5154fa9 100644
--- a/server/controllers/api/v1/show/cues.py
+++ b/server/controllers/api/v1/show/cues.py
@@ -268,6 +268,7 @@ def get(self):
                     cue_data = cue_schema.dump(association.cue)
                     cue_data["group_id"] = association.group_id
                     cue_data["sort_order"] = association.sort_order
+                    cue_data["line_position"] = association.line_position
                     cues[association.line_id].append(cue_data)
                     if association.group_id and association.group_id not in groups_seen:
                         groups_seen[association.group_id] = association.group
@@ -346,9 +347,22 @@ async def post(self):
                 session.add(cue)
                 session.flush()
 
+                existing_assocs = session.scalars(
+                    select(CueAssociation).where(
+                        CueAssociation.revision_id == revision.id,
+                        CueAssociation.line_id == line_id,
+                    )
+                ).all()
+                next_pos = (
+                    max((a.line_position or 0 for a in existing_assocs), default=0) + 1
+                )
+
                 session.add(
                     CueAssociation(
-                        revision_id=revision.id, line_id=line_id, cue_id=cue.id
+                        revision_id=revision.id,
+                        line_id=line_id,
+                        cue_id=cue.id,
+                        line_position=next_pos,
                     )
                 )
                 session.commit()
@@ -808,6 +822,16 @@ async def post(self):
             session.add(group)
             session.flush()
 
+            existing_assocs = session.scalars(
+                select(CueAssociation).where(
+                    CueAssociation.revision_id == revision.id,
+                    CueAssociation.line_id == line_id,
+                )
+            ).all()
+            group_line_pos = (
+                max((a.line_position or 0 for a in existing_assocs), default=0) + 1
+            )
+
             for cue_entry in cues_data:
                 ident: str = cue_entry.get("ident", "")
                 sort_order: int = cue_entry.get("sortOrder", 0)
@@ -821,6 +845,7 @@ async def post(self):
                         cue_id=cue.id,
                         group_id=group.id,
                         sort_order=sort_order,
+                        line_position=group_line_pos,
                     )
                 )
 
diff --git a/server/models/cue.py b/server/models/cue.py
index c170b19e1..50275445c 100644
--- a/server/models/cue.py
+++ b/server/models/cue.py
@@ -82,6 +82,7 @@ class CueAssociation(db.Model, DeleteMixin):
         Integer, ForeignKey("cue_groups.id"), nullable=True, index=True
     )
     sort_order: Mapped[int | None] = mapped_column(Integer, nullable=True)
+    line_position: Mapped[int | None] = mapped_column(Integer, nullable=True)
 
     revision: Mapped[ScriptRevision] = relationship(
         foreign_keys=[revision_id], back_populates="cue_associations"
diff --git a/server/pyproject.toml b/server/pyproject.toml
index 9b3a43fdf..13351e28c 100644
--- a/server/pyproject.toml
+++ b/server/pyproject.toml
@@ -11,7 +11,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "digiscript-server"
-version = "0.33.0"
+version = "0.34.0"
 description = "DigiScript server - Digital script management for theatrical shows"
 readme = "../README.md"
 requires-python = ">=3.13"
diff --git a/server/requirements.txt b/server/requirements.txt
index cc14b8194..a37a9077d 100644
--- a/server/requirements.txt
+++ b/server/requirements.txt
@@ -5,10 +5,10 @@ marshmallow-sqlalchemy>=1.5.0
 tornado-prometheus==0.1.2
 bcrypt==5.0.0
 anytree==2.13.0
-alembic==1.18.4
+alembic==1.18.5
 marshmallow>=4.3.0,<5
 pyjwt[crypto]==2.13.0
 setuptools==82.0.1
 xkcdpass==1.30.0
 zeroconf==0.150.0
-python-jsonpath==2.0.2
\ No newline at end of file
+python-jsonpath==2.1.0
\ No newline at end of file
diff --git a/server/test/controllers/api/v1/show/test_cues.py b/server/test/controllers/api/v1/show/test_cues.py
index 9f500770d..2c39afe06 100644
--- a/server/test/controllers/api/v1/show/test_cues.py
+++ b/server/test/controllers/api/v1/show/test_cues.py
@@ -1633,3 +1633,191 @@ def test_patch_and_delete_require_no_live_session(self):
                 if ss:
                     session.delete(ss)
                 session.commit()
+
+
+class TestCueLinePositionOrdering(DigiScriptTestCase):
+    """Tests that individual cues and cue groups are ordered by line_position."""
+
+    def setUp(self):
+        super().setUp()
+        with self._app.get_db().sessionmaker() as session:
+            show = Show(name="Test Show", script_mode=ShowScriptType.FULL)
+            session.add(show)
+            session.flush()
+            self.show_id = show.id
+
+            script = Script(show_id=show.id)
+            session.add(script)
+            session.flush()
+
+            revision = ScriptRevision(
+                script_id=script.id, revision=1, description="Initial"
+            )
+            session.add(revision)
+            session.flush()
+            self.revision_id = revision.id
+            script.current_revision = revision.id
+
+            act = Act(show_id=show.id, name="Act 1")
+            session.add(act)
+            session.flush()
+
+            scene = Scene(show_id=show.id, act_id=act.id, name="Scene 1")
+            session.add(scene)
+            session.flush()
+
+            line = ScriptLine(
+                act_id=act.id,
+                scene_id=scene.id,
+                page=1,
+                line_type=ScriptLineType.DIALOGUE,
+            )
+            session.add(line)
+            session.flush()
+            self.line_id = line.id
+
+            assoc = ScriptLineRevisionAssociation(
+                revision_id=revision.id, line_id=line.id
+            )
+            session.add(assoc)
+
+            cue_type = CueType(
+                show_id=show.id, prefix="LX", description="Lighting", colour="#ff0000"
+            )
+            session.add(cue_type)
+            session.flush()
+            self.cue_type_id = cue_type.id
+
+            admin = User(username="admin", is_admin=True, password="test")
+            session.add(admin)
+            session.flush()
+            self.user_id = admin.id
+
+            session.commit()
+
+        self._app.digi_settings.settings["current_show"].set_value(self.show_id)
+        self.token = self._app.jwt_service.create_access_token(
+            data={"user_id": self.user_id}
+        )
+
+    def _post_individual_cue(self, ident="Q1"):
+        """Create an individual cue on the test line."""
+        return self.fetch(
+            "/api/v1/show/cues",
+            method="POST",
+            body=tornado.escape.json_encode(
+                {"cueType": self.cue_type_id, "ident": ident, "lineId": self.line_id}
+            ),
+            headers={"Authorization": f"Bearer {self.token}"},
+        )
+
+    def _post_group(self, idents=None):
+        """Create a cue group on the test line."""
+        if idents is None:
+            idents = ["G1"]
+        cues = [{"ident": ident, "sortOrder": i} for i, ident in enumerate(idents)]
+        return self.fetch(
+            "/api/v1/show/cues/groups",
+            method="POST",
+            body=tornado.escape.json_encode(
+                {
+                    "cueTypeId": self.cue_type_id,
+                    "lineId": self.line_id,
+                    "cues": cues,
+                }
+            ),
+            headers={"Authorization": f"Bearer {self.token}"},
+        )
+
+    def _get_cues_for_line(self):
+        """Return the cue list for self.line_id from GET /api/v1/show/cues."""
+        response = self.fetch("/api/v1/show/cues")
+        self.assertEqual(200, response.code)
+        body = tornado.escape.json_decode(response.body)
+        return body["cues"].get(str(self.line_id), [])
+
+    def test_individual_then_group_order(self):
+        """Creating I then G → GET returns [I, G] by line_position."""
+        self.assertEqual(200, self._post_individual_cue("I1").code)
+        self.assertEqual(200, self._post_group(["G1"]).code)
+
+        cues = self._get_cues_for_line()
+        self.assertEqual(2, len(cues))
+        # Individual cue was created first so has a lower line_position
+        self.assertIsNone(cues[0]["group_id"])
+        self.assertIsNotNone(cues[1]["group_id"])
+        self.assertLess(cues[0]["line_position"], cues[1]["line_position"])
+
+    def test_group_then_individual_order(self):
+        """Creating G then I → GET returns [G, I] by line_position."""
+        self.assertEqual(200, self._post_group(["G1"]).code)
+        self.assertEqual(200, self._post_individual_cue("I1").code)
+
+        cues = self._get_cues_for_line()
+        self.assertEqual(2, len(cues))
+        # Group was created first so has a lower line_position
+        self.assertIsNotNone(cues[0]["group_id"])
+        self.assertIsNone(cues[1]["group_id"])
+        self.assertLess(cues[0]["line_position"], cues[1]["line_position"])
+
+    def test_group_individual_group_order(self):
+        """Creating G, I, G → GET returns [G, I, G] by line_position."""
+        self.assertEqual(200, self._post_group(["G1"]).code)
+        self.assertEqual(200, self._post_individual_cue("I1").code)
+        self.assertEqual(200, self._post_group(["G2"]).code)
+
+        cues = self._get_cues_for_line()
+        self.assertEqual(3, len(cues))
+
+        # Sort by line_position to verify ordering
+        sorted_cues = sorted(cues, key=lambda c: c["line_position"])
+        self.assertIsNotNone(sorted_cues[0]["group_id"])
+        self.assertIsNone(sorted_cues[1]["group_id"])
+        self.assertIsNotNone(sorted_cues[2]["group_id"])
+        # Two groups must have distinct line_positions
+        self.assertNotEqual(sorted_cues[0]["group_id"], sorted_cues[2]["group_id"])
+
+    def test_all_cues_in_group_share_line_position(self):
+        """All member cues in a single group share the same line_position."""
+        self.assertEqual(200, self._post_group(["G1", "G2", "G3"]).code)
+
+        cues = self._get_cues_for_line()
+        self.assertEqual(3, len(cues))
+        positions = {c["line_position"] for c in cues}
+        self.assertEqual(
+            1, len(positions), "All group members must share one line_position"
+        )
+
+    def test_line_position_stable_after_patch(self):
+        """Editing a cue via PATCH does not change its line_position."""
+        # Create: group first, then individual
+        grp_resp = self._post_group(["G1"])
+        self.assertEqual(200, grp_resp.code)
+        self.assertEqual(200, self._post_individual_cue("I1").code)
+
+        cues_before = self._get_cues_for_line()
+        individual_before = next(c for c in cues_before if c["group_id"] is None)
+        pos_before = individual_before["line_position"]
+
+        # Edit the individual cue (cueType is required by PATCH handler)
+        patch_resp = self.fetch(
+            "/api/v1/show/cues",
+            method="PATCH",
+            body=tornado.escape.json_encode(
+                {
+                    "cueId": individual_before["id"],
+                    "cueType": self.cue_type_id,
+                    "lineId": self.line_id,
+                    "ident": "I1-edited",
+                }
+            ),
+            headers={"Authorization": f"Bearer {self.token}"},
+        )
+        self.assertEqual(200, patch_resp.code)
+
+        cues_after = self._get_cues_for_line()
+        individual_after = next(c for c in cues_after if c["group_id"] is None)
+        self.assertEqual(pos_before, individual_after["line_position"])
+        # Group must still come before the individual cue
+        group_after = next(c for c in cues_after if c["group_id"] is not None)
+        self.assertLess(group_after["line_position"], individual_after["line_position"])
diff --git a/server/test_requirements.txt b/server/test_requirements.txt
index 20e7a1f59..760a58424 100644
--- a/server/test_requirements.txt
+++ b/server/test_requirements.txt
@@ -1,3 +1,3 @@
 pytest<9.2
 pytest-asyncio>=1.4.0
-ruff==0.15.18
\ No newline at end of file
+ruff==0.15.20
\ No newline at end of file