diff --git a/client-v3/e2e/tests/10-show-config-script.spec.ts b/client-v3/e2e/tests/10-show-config-script.spec.ts
index f942e51fa..d5420a8fc 100644
--- a/client-v3/e2e/tests/10-show-config-script.spec.ts
+++ b/client-v3/e2e/tests/10-show-config-script.spec.ts
@@ -97,11 +97,31 @@ test('saves a dialogue line to the script', async () => {
   await lineEditor.locator('select').nth(0).selectOption({ label: 'Act 1' });
   await lineEditor.locator('select').nth(1).selectOption({ label: 'Scene 1' });
 
-  await page.locator('select').filter({ hasText: 'Hamlet' }).selectOption({ label: 'Hamlet' });
+  await lineEditor
+    .locator('select')
+    .filter({ hasText: 'Hamlet' })
+    .selectOption({ label: 'Hamlet' });
   await page.locator('input[type="text"]:visible').last().fill('To be or not to be');
 
   await page.locator('button:has-text("Done")').first().click();
-  // ScriptEditor auto-adds a blank dialogue line after Done — delete it before asserting
+  // ScriptEditor auto-adds a blank dialogue editor after Done — fill it in as a second line so
+  // the bulk edit tests below can use a two-line range without needing the split dropdown.
+  await expect(page.locator('button:has-text("Done")').first()).toBeVisible({ timeout: 5_000 });
+
+  const lineEditor2 = page
+    .locator('div.row')
+    .filter({ has: page.locator('button:has-text("Done")') })
+    .first();
+  await lineEditor2.locator('select').nth(0).selectOption({ label: 'Act 1' });
+  await lineEditor2.locator('select').nth(1).selectOption({ label: 'Scene 1' });
+  await lineEditor2
+    .locator('select')
+    .filter({ hasText: 'Hamlet' })
+    .selectOption({ label: 'Hamlet' });
+  await page.locator('input[type="text"]:visible').last().fill('That is the question');
+
+  await page.locator('button:has-text("Done")').first().click();
+  // Delete the third auto-added blank editor
   await page.locator('button.btn-danger:has-text("Delete")').first().click();
   await expect(page.locator('button:has-text("Done")')).not.toBeVisible({ timeout: 5_000 });
 
@@ -118,6 +138,59 @@ test('saves a dialogue line to the script', async () => {
   await expect(
     page.locator('.viewable-line').filter({ hasText: 'To be or not to be' })
   ).toBeVisible({ timeout: 10_000 });
+  await expect(
+    page.locator('.viewable-line').filter({ hasText: 'That is the question' })
+  ).toBeVisible({ timeout: 10_000 });
+});
+
+// ── Bulk edit ─────────────────────────────────────────────────────────────
+
+test('bulk edit mode is accessible and shows Start/End buttons', async () => {
+  // Still in edit mode from the save test, which saved two viewable dialogue lines.
+  await page.click('button:has-text("Bulk Edit")');
+  // Two ScriptLineViewer rows → two Start/End button pairs
+  await expect(page.getByRole('button', { name: 'Start', exact: true }).first()).toBeVisible({
+    timeout: 5_000,
+  });
+  await expect(page.getByRole('button', { name: 'End', exact: true }).first()).toBeVisible({
+    timeout: 5_000,
+  });
+});
+
+test('bulk edit opens the Bulk Edit modal when start and end span two different lines', async () => {
+  // Start on the first line, End on the last line (different indices → valid range)
+  await page.getByRole('button', { name: 'Start', exact: true }).first().click();
+  await page.getByRole('button', { name: 'End', exact: true }).last().click();
+  await waitForModal(page, 'Bulk Edit');
+});
+
+test('bulk edit can assign a character to part 1', async () => {
+  await page.locator('.modal.show #bulk-part-input').selectOption({ label: 'Part 1' });
+  // Select Alice — a different character from Hamlet (who is already assigned) so the apply
+  // produces a real change that scriptChanges can detect via deep equality.
+  await page.locator('.modal.show #bulk-char-input').selectOption({ label: 'Alice' });
+  await confirmModal(page);
+  await waitForModalClosed(page);
+  // After apply, bulk edit mode exits automatically
+  await expect(page.getByRole('button', { name: 'Bulk Edit', exact: true })).toBeVisible({
+    timeout: 5_000,
+  });
+});
+
+test('bulk edit stops when Exit Bulk Edit is clicked', async () => {
+  await page.click('button:has-text("Bulk Edit")');
+  await expect(page.getByRole('button', { name: 'Start', exact: true }).first()).toBeVisible({
+    timeout: 5_000,
+  });
+  await page.click('button:has-text("Exit Bulk Edit")');
+  await expect(page.getByRole('button', { name: 'Start', exact: true })).not.toBeVisible({
+    timeout: 3_000,
+  });
+  await page.click('button:has-text("Stop Editing")');
+  await confirmDialog(page);
+  await expect(page.getByRole('button', { name: 'Edit', exact: true })).toBeVisible({
+    timeout: 10_000,
+  });
 });
 
 // ── Cut mode ──────────────────────────────────────────────────────────────
@@ -228,11 +301,12 @@ test('navigates to cue editor with saved script content', async () => {
 
 test('adds a cue to the script line', async () => {
   await page.locator('.add-cue-btn').first().click();
-  await waitForModal(page, 'Add New Cue');
+  await waitForModal(page, 'Add Cue');
+  // Individual Cue tab is active by default — no extra click needed
   // Scope to the visible modal's select to avoid matching the hidden "Add Cue Type" modal
   // dialog which BVN assigns id="new-cue-type" via its auto-ID scheme.
   await page.locator('.modal.show select#new-cue-type').selectOption({ index: 1 });
-  await page.fill('#new-cue-ident', '001');
+  await page.locator('.modal.show #new-cue-ident').fill('001');
   await confirmModal(page);
   await waitForModalClosed(page);
   // Wait for the actual cue button (not the add-cue-btn which shares the cue-button class)
@@ -246,7 +320,7 @@ test('edits the cue identifier', async () => {
   // Use :not(.add-cue-btn) to target the real cue button, not the add button
   await page.locator('.cue-button:not(.add-cue-btn)').first().click();
   await waitForModal(page, 'Edit Cue');
-  await page.fill('#edit-cue-ident', '002');
+  await page.locator('.modal.show #edit-cue-ident').fill('002');
   await confirmModal(page);
   await waitForModalClosed(page);
   await expect(page.locator('.cue-button:not(.add-cue-btn)').first()).toBeVisible({
@@ -256,11 +330,14 @@ test('edits the cue identifier', async () => {
 
 test('can add a cue using Enter key in Add New Cue modal', async () => {
   await page.locator('.add-cue-btn').first().click();
-  await waitForModal(page, 'Add New Cue');
+  await waitForModal(page, 'Add Cue');
+  // Individual Cue tab is active by default — no extra click needed
   await page.locator('.modal.show select#new-cue-type').selectOption({ index: 1 });
-  await page.fill('#new-cue-ident', '003');
+  await page.locator('.modal.show #new-cue-ident').fill('003');
   // Enter key submits the form (fix: BForm @submit bound to onSubmitNew)
-  await page.locator('#new-cue-ident').press('Enter');
+  // Scope to .modal.show to avoid strict-mode violation from other Add New Cue modal instances
+  // in the DOM (one per viewable script line — BVN v-show keeps them all present).
+  await page.locator('.modal.show #new-cue-ident').press('Enter');
   await waitForModalClosed(page);
   await expect(page.locator('.cue-button:not(.add-cue-btn)')).toHaveCount(2, { timeout: 5_000 });
 });
@@ -269,9 +346,9 @@ test('can edit a cue identifier using Enter key in Edit Cue modal', async () =>
   // Click the second cue button (003)
   await page.locator('.cue-button:not(.add-cue-btn)').last().click();
   await waitForModal(page, 'Edit Cue');
-  await page.fill('#edit-cue-ident', '004');
+  await page.locator('.modal.show #edit-cue-ident').fill('004');
   // Enter key submits the form (fix: BForm @submit bound to onSubmitEdit)
-  await page.locator('#edit-cue-ident').press('Enter');
+  await page.locator('.modal.show #edit-cue-ident').press('Enter');
   await waitForModalClosed(page);
   await expect(page.locator('.cue-button:not(.add-cue-btn)')).toHaveCount(2, { timeout: 5_000 });
 });
@@ -318,3 +395,153 @@ test('deletes the cue', async () => {
   // After deletion only the add-cue-btn remains; no actual cue buttons should exist
   await expect(page.locator('.cue-button:not(.add-cue-btn)')).not.toBeVisible({ timeout: 5_000 });
 });
+
+// ── Cue Groups ────────────────────────────────────────────────────────────
+
+test('opens Add Cue modal with Individual Cue and Cue Group tabs', async () => {
+  // After individual cue tests all cues have been deleted. Still on the cue config page.
+  await page.locator('.add-cue-btn').first().click();
+  await waitForModal(page, 'Add Cue');
+  await expect(page.locator('.modal.show .nav-link:has-text("Individual Cue")')).toBeVisible();
+  await expect(page.locator('.modal.show .nav-link:has-text("Cue Group")')).toBeVisible();
+  // Dismiss via the × close button (Escape is unreliable in BVN with BTabs in Firefox)
+  await page.locator('.modal.show .btn-close').click();
+  await waitForModalClosed(page);
+});
+
+test('switches to Cue Group tab to show group form', async () => {
+  await page.locator('.add-cue-btn').first().click();
+  await waitForModal(page, 'Add Cue');
+  await page.locator('.modal.show .nav-link:has-text("Cue Group")').click();
+  // Wait for tab content to be visible (BTabs lazy may delay mount)
+  await expect(page.locator('.modal.show input[placeholder="1 > 100"]')).toBeVisible({
+    timeout: 10_000,
+  });
+});
+
+test('selects cue type and adds range 1 > 5', async () => {
+  // Scope to .tab-pane.active to avoid matching hidden Individual Cue tab's select.
+  // CueGroupForm filters out the N/A option, so LX is at index 0 (not 1).
+  await page.locator('.modal.show .tab-pane.active select').selectOption({ index: 0 });
+  await page.locator('.modal.show input[placeholder="1 > 100"]').fill('1 > 5');
+  await page.locator('.modal.show button:has-text("Add Range")').click();
+  // 5 cue ident inputs should appear (scoped to active tab pane to avoid hidden #new-cue-ident)
+  await expect(
+    page.locator('.modal.show .tab-pane.active input[placeholder="Identifier"]')
+  ).toHaveCount(5, {
+    timeout: 3_000,
+  });
+});
+
+test('saves the cue group and shows a dashed group button with range label', async () => {
+  await page.locator('.modal.show button:has-text("Save Group")').click();
+  await waitForModalClosed(page);
+  await expect(page.locator('.cue-group-btn').first()).toBeVisible({ timeout: 5_000 });
+  await expect(page.locator('.cue-group-btn').first()).toContainText('LX 1 - LX 5');
+});
+
+test('clicks group button to open Edit Cue Group modal with 5 cues listed', async () => {
+  await page.locator('.cue-group-btn').first().click();
+  await waitForModal(page, 'Edit Cue Group');
+  await expect(page.locator('.modal.show input[placeholder="Identifier"]')).toHaveCount(5, {
+    timeout: 5_000,
+  });
+});
+
+test('adds label override and group button label updates on save', async () => {
+  await page.locator('.modal.show input[placeholder="e.g. Music Intro"]').fill('Music Intro');
+  await page.locator('.modal.show button:has-text("Save Group")').click();
+  await waitForModalClosed(page);
+  await expect(page.locator('.cue-group-btn').first()).toContainText('LX - Music Intro');
+});
+
+test('deletes the cue group and column returns to empty', async () => {
+  await page.locator('.cue-group-btn').first().click();
+  await waitForModal(page, 'Edit Cue Group');
+  await page.locator('.modal.show button:has-text("Delete Group")').click();
+  // useConfirm opens a stacked BVN modal — scope to its title to avoid intercepting the
+  // Edit Cue Group modal footer behind it.
+  await waitForModal(page, 'Delete Cue Group');
+  await page
+    .locator('.modal.show')
+    .filter({ has: page.locator('.modal-title:has-text("Delete Cue Group")') })
+    .locator('.modal-footer button.btn-danger')
+    .click();
+  await expect(page.locator('.cue-group-btn')).not.toBeVisible({ timeout: 5_000 });
+});
+
+// ── Line part removal ──────────────────────────────────────────────────────
+
+test('remove button is absent on a single-part dialogue line', async () => {
+  await page.goto(`${UI_BASE}/show-config/script`);
+  await waitForAppReady(page);
+  await page.getByRole('button', { name: 'Edit', exact: true }).click();
+  await expect(page.locator('button:has-text("Stop Editing")')).toBeVisible({ timeout: 10_000 });
+
+  await page.click('button:has-text("Add Dialogue")');
+  const lineEditor = page
+    .locator('div.row')
+    .filter({ has: page.locator('button:has-text("Done")') })
+    .first();
+  await expect(lineEditor.locator('button:has-text("Done")')).toBeVisible({ timeout: 5_000 });
+
+  // With only 1 part no remove button should be present
+  await expect(lineEditor.locator('button.btn-outline-danger')).not.toBeVisible();
+});
+
+test('remove button appears when a second part is added', async () => {
+  const lineEditor = page
+    .locator('div.row')
+    .filter({ has: page.locator('button:has-text("Done")') })
+    .first();
+
+  // btn-secondary is the add-line-part (+) button — only btn-secondary in the editor row
+  await lineEditor.locator('button.btn-secondary').click();
+
+  // One remove button per part
+  await expect(lineEditor.locator('button.btn-outline-danger')).toHaveCount(2, { timeout: 3_000 });
+});
+
+test('clicking remove reduces to single part and hides the remove button', async () => {
+  const lineEditor = page
+    .locator('div.row')
+    .filter({ has: page.locator('button:has-text("Done")') })
+    .first();
+
+  await lineEditor.locator('button.btn-outline-danger').first().click();
+
+  // Back to 1 part — remove button gone
+  await expect(lineEditor.locator('button.btn-outline-danger')).not.toBeVisible({ timeout: 3_000 });
+});
+
+test('dialogue line with removed part saves correctly', async () => {
+  const lineEditor = page
+    .locator('div.row')
+    .filter({ has: page.locator('button:has-text("Done")') })
+    .first();
+
+  await lineEditor.locator('select').nth(0).selectOption({ label: 'Act 1' });
+  await lineEditor.locator('select').nth(1).selectOption({ label: 'Scene 1' });
+  await lineEditor
+    .locator('select')
+    .filter({ hasText: 'Hamlet' })
+    .selectOption({ label: 'Hamlet' });
+  await lineEditor.locator('input[type="text"]').last().fill('Surviving part text');
+
+  await lineEditor.locator('button:has-text("Done")').click();
+  // Delete the auto-added blank editor that appears after Done
+  await page.locator('button.btn-danger:has-text("Delete")').first().click();
+  await expect(page.locator('button:has-text("Done")')).not.toBeVisible({ timeout: 5_000 });
+
+  await page.getByRole('button', { name: 'Save', exact: true }).click();
+  await waitForModal(page, 'Saving Script');
+  await expect(page.locator('.modal.show').getByText('Finished saving script.')).toBeVisible({
+    timeout: 15_000,
+  });
+  await confirmModal(page);
+  await waitForModalClosed(page);
+
+  await expect(
+    page.locator('.viewable-line').filter({ hasText: 'Surviving part text' })
+  ).toBeVisible({ timeout: 10_000 });
+});
diff --git a/client-v3/e2e/tests/13-live-show.spec.ts b/client-v3/e2e/tests/13-live-show.spec.ts
index 3813d7a1a..c793e1659 100644
--- a/client-v3/e2e/tests/13-live-show.spec.ts
+++ b/client-v3/e2e/tests/13-live-show.spec.ts
@@ -12,6 +12,7 @@ import {
   UI_BASE,
   waitForAppReady,
   loginAsAdmin,
+  waitForModal,
   confirmModal,
   waitForModalClosed,
   confirmDialog,
@@ -122,6 +123,63 @@ test('follower receives leader page navigation via WebSocket scroll sync', async
   );
 });
 
+// ── Cue add mode in live view ─────────────────────────────────────────────
+
+test('pressing C enables cue add mode showing + buttons on the live page', async () => {
+  await expect(leaderPage.locator('.script-item').first()).toBeVisible({ timeout: 10_000 });
+  await leaderPage.keyboard.press('C');
+  await expect(leaderPage.locator('.add-cue-btn').first()).toBeVisible({ timeout: 5_000 });
+});
+
+test('can add an individual cue from the live view', async () => {
+  await leaderPage.locator('.add-cue-btn').first().click();
+  await waitForModal(leaderPage, 'Add Cue');
+  await expect(
+    leaderPage.locator('.modal.show .nav-link:has-text("Individual Cue")')
+  ).toBeVisible();
+  await leaderPage.locator('.modal.show #cue-type-input').selectOption({ index: 1 });
+  await leaderPage.locator('.modal.show #ident-input').fill('101');
+  await leaderPage.locator('.modal.show button:has-text("Add Cue")').click();
+  await waitForModalClosed(leaderPage);
+  await expect(leaderPage.locator('.cue-button:not(.add-cue-btn)').first()).toBeVisible({
+    timeout: 5_000,
+  });
+});
+
+test('can add a cue group from the live view', async () => {
+  await leaderPage.locator('.add-cue-btn').first().click();
+  await waitForModal(leaderPage, 'Add Cue');
+  await leaderPage.locator('.modal.show .nav-link:has-text("Cue Group")').click();
+  // Wait for CueGroupForm content (tab may be lazy in some BVN versions)
+  await expect(leaderPage.locator('.modal.show input[placeholder="1 > 100"]')).toBeVisible({
+    timeout: 10_000,
+  });
+  // CueGroupForm filters out N/A, so LX is at index 0
+  await leaderPage.locator('.modal.show .tab-pane.active select').selectOption({ index: 0 });
+  await leaderPage.locator('.modal.show input[placeholder="1 > 100"]').fill('200 > 202');
+  await leaderPage.locator('.modal.show button:has-text("Add Range")').click();
+  await expect(
+    leaderPage.locator('.modal.show .tab-pane.active input[placeholder="Identifier"]')
+  ).toHaveCount(3, { timeout: 3_000 });
+  await leaderPage.locator('.modal.show button:has-text("Save Group")').click();
+  await waitForModalClosed(leaderPage);
+  await expect(leaderPage.locator('.cue-group-btn').first()).toBeVisible({ timeout: 5_000 });
+  await expect(leaderPage.locator('.cue-group-btn').first()).toContainText('LX 200 - LX 202');
+});
+
+test('cue group buttons in live view are non-interactive display-only buttons', async () => {
+  // Group buttons in live view should NOT open an edit modal — editing is blocked server-side
+  // during live sessions. Verify clicking doesn't open any modal.
+  await leaderPage.locator('.cue-group-btn').first().click();
+  await leaderPage.waitForTimeout(500);
+  await expect(leaderPage.locator('.modal.show')).not.toBeVisible();
+});
+
+test('pressing C again disables cue add mode', async () => {
+  await leaderPage.keyboard.press('C');
+  await expect(leaderPage.locator('.add-cue-btn').first()).not.toBeVisible({ timeout: 5_000 });
+});
+
 // ── Enable/disable Stage Manager mode ─────────────────────────────────────
 
 test('can toggle Stage Manager mode', async () => {
diff --git a/client-v3/package-lock.json b/client-v3/package-lock.json
index 34e7c7c58..d6128830f 100644
--- a/client-v3/package-lock.json
+++ b/client-v3/package-lock.json
@@ -1,17 +1,17 @@
 {
   "name": "client-v3",
-  "version": "0.32.4",
+  "version": "0.33.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "client-v3",
-      "version": "0.32.4",
+      "version": "0.33.0",
       "dependencies": {
         "@vuelidate/core": "^2.0.3",
         "@vuelidate/validators": "^2.0.4",
         "bootstrap": "^5.3.8",
-        "bootstrap-vue-next": "^0.45.6",
+        "bootstrap-vue-next": "^0.45.7",
         "bootswatch": "^5.3.8",
         "contrast-color": "1.0.1",
         "core-js": "^3.49.0",
@@ -37,11 +37,11 @@
         "@emnapi/runtime": "1.11.1",
         "@eslint/js": "^10.0.1",
         "@iconify-json/mdi": "^1.2.3",
-        "@playwright/test": "^1.61.0",
+        "@playwright/test": "^1.61.1",
         "@types/lodash": "~4.17.24",
         "@types/node": ">=22.12.0",
-        "@typescript-eslint/eslint-plugin": "^8.61.1",
-        "@typescript-eslint/parser": "^8.61.1",
+        "@typescript-eslint/eslint-plugin": "^8.62.0",
+        "@typescript-eslint/parser": "^8.62.0",
         "@vitejs/plugin-vue": "^6.0.7",
         "@vitest/ui": "^4.1.9",
         "@vue/test-utils": "^2.4.11",
@@ -49,16 +49,16 @@
         "eslint-config-prettier": "^10.1.8",
         "eslint-plugin-prettier": "^5.5.6",
         "eslint-plugin-vue": "^10.9.2",
-        "globals": "^17.6.0",
+        "globals": "^17.7.0",
         "jiti": "^2.7.0",
         "jsdom": "^29.1.1",
         "prettier": "^3.8.4",
         "sass": "1.101.0",
         "typescript": "^6.0.3",
-        "typescript-eslint": "^8.61.1",
+        "typescript-eslint": "^8.62.0",
         "unplugin-icons": "^23.0.1",
         "unplugin-vue-components": "^32.1.0",
-        "vite": "^8.0.16",
+        "vite": "^8.1.0",
         "vitest": "^4.1.9",
         "vue-eslint-parser": "^10.4.1"
       },
@@ -809,9 +809,9 @@
       "license": "MIT"
     },
     "node_modules/@oxc-project/types": {
-      "version": "0.133.0",
-      "resolved": "https://registry.npmjs.org/@oxc-project/types/-/types-0.133.0.tgz",
-      "integrity": "sha512-KzkdCd6Uxqnf6l3HOw1xfatAlUURA0g14cvBYFyJ5SaNOQbOUvBr9PKArcPcrNIeRsBdgcUzOGrhKveVpvOIGA==",
+      "version": "0.137.0",
+      "resolved": "https://registry.npmjs.org/@oxc-project/types/-/types-0.137.0.tgz",
+      "integrity": "sha512-WT+Gb24i8hmvo85AIv2oEYouEXkRlKAlT9WaCa3TfLgNCN+GhrJOGZuIlMouAh38Qe4QOx26eUOVsq70qXrywA==",
       "devOptional": true,
       "license": "MIT",
       "funding": {
@@ -1142,13 +1142,13 @@
       }
     },
     "node_modules/@playwright/test": {
-      "version": "1.61.0",
-      "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.61.0.tgz",
-      "integrity": "sha512-cKA5B6lpFEMyMGjxF54QihfYpB4FkEGH+qZhtArDEG+wezQAJY8Pq6C7T1SjWz+FFzt3TbyoXBQYk/0292TdJA==",
+      "version": "1.61.1",
+      "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.61.1.tgz",
+      "integrity": "sha512-8nKv6+0RJSL9FE4jYOEGXnPeM/Hg12qZpmqzZjRh3qM0Y7c3z1mrOTfFLids72RDQYVh9WpLEfR5WdpNX4fkig==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
-        "playwright": "1.61.0"
+        "playwright": "1.61.1"
       },
       "bin": {
         "playwright": "cli.js"
@@ -1176,9 +1176,9 @@
       }
     },
     "node_modules/@rolldown/binding-android-arm64": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/@rolldown/binding-android-arm64/-/binding-android-arm64-1.0.3.tgz",
-      "integrity": "sha512-454rs7jHngixp/NMxd5srYD57OnzSlZ/eFTETjORQHLwJG1lRtmNOJcBerZlfu4GjKqeq8aCCIQrMdHyhI51Hw==",
+      "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==",
       "cpu": [
         "arm64"
       ],
@@ -1193,9 +1193,9 @@
       }
     },
     "node_modules/@rolldown/binding-darwin-arm64": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/@rolldown/binding-darwin-arm64/-/binding-darwin-arm64-1.0.3.tgz",
-      "integrity": "sha512-PcAhP+ynjURNyy8SKGl5DQP94aGuB/7JrXJb/t7P+hanXvQVMWzUvRRhBAcg/lNRadBhoUPqSoP4xw5tR/KBEA==",
+      "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==",
       "cpu": [
         "arm64"
       ],
@@ -1210,9 +1210,9 @@
       }
     },
     "node_modules/@rolldown/binding-darwin-x64": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/@rolldown/binding-darwin-x64/-/binding-darwin-x64-1.0.3.tgz",
-      "integrity": "sha512-9YpfeUvSE2RS7wysJ81uOZkXJz7f7Q55H2Gvp3VEw/EsahqDtrphrZ0EwDLK5vvKOzaCrBsjF8JmnMLcUt78Gg==",
+      "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==",
       "cpu": [
         "x64"
       ],
@@ -1227,9 +1227,9 @@
       }
     },
     "node_modules/@rolldown/binding-freebsd-x64": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/@rolldown/binding-freebsd-x64/-/binding-freebsd-x64-1.0.3.tgz",
-      "integrity": "sha512-yB1IlAsSNHncV6SCTL27/MVGR5htvQsoGxIv5KMGXALp+Ll1wYsn+x98M9MW7qa+NdSbvrrY7ANI4wLJ0n1e6g==",
+      "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==",
       "cpu": [
         "x64"
       ],
@@ -1244,9 +1244,9 @@
       }
     },
     "node_modules/@rolldown/binding-linux-arm-gnueabihf": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-arm-gnueabihf/-/binding-linux-arm-gnueabihf-1.0.3.tgz",
-      "integrity": "sha512-Yi30IVAAfLUCy2MseFjbB1jAMDl1VMCAas5StnYp8da9+CKvMd2H2cbEjWcw5NPaPqzvYkVIaF1nNUG+b7u/sw==",
+      "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==",
       "cpu": [
         "arm"
       ],
@@ -1261,9 +1261,9 @@
       }
     },
     "node_modules/@rolldown/binding-linux-arm64-gnu": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-arm64-gnu/-/binding-linux-arm64-gnu-1.0.3.tgz",
-      "integrity": "sha512-jsO7R8To+AdlYgUmN5sHSCZbfhtMBkO0WUx8iORQnPcMMdgr7qM2DQmMwgabs3GhNztdmoKkMKQFHD6DTMCIQw==",
+      "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==",
       "cpu": [
         "arm64"
       ],
@@ -1278,9 +1278,9 @@
       }
     },
     "node_modules/@rolldown/binding-linux-arm64-musl": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-arm64-musl/-/binding-linux-arm64-musl-1.0.3.tgz",
-      "integrity": "sha512-VWkUHwWriDciit80wleYwKILoR/KMvxh/IdwS/paX+ZgpuRpCrKLUdadJbc0NpBEiyhpYawsJ73j9aCvOH+f7Q==",
+      "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==",
       "cpu": [
         "arm64"
       ],
@@ -1295,9 +1295,9 @@
       }
     },
     "node_modules/@rolldown/binding-linux-ppc64-gnu": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-ppc64-gnu/-/binding-linux-ppc64-gnu-1.0.3.tgz",
-      "integrity": "sha512-5f1laC0SlIR0yDbFCd8acUhvJIag6N3zC5P7oUPN6wX0aOma+uKJ0wBDH5aq7I1PVI2ttTlhJwzwRIBnLiSGEg==",
+      "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==",
       "cpu": [
         "ppc64"
       ],
@@ -1312,9 +1312,9 @@
       }
     },
     "node_modules/@rolldown/binding-linux-s390x-gnu": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-s390x-gnu/-/binding-linux-s390x-gnu-1.0.3.tgz",
-      "integrity": "sha512-Iq4ko0r4XsgbrF/LunNgHtAGLRRVE2kXonAXQ/MV0mC6jQpMOhW1SvtZja2EhC/kd05++bP78dsqBeIQyYJ6Yg==",
+      "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==",
       "cpu": [
         "s390x"
       ],
@@ -1329,9 +1329,9 @@
       }
     },
     "node_modules/@rolldown/binding-linux-x64-gnu": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-x64-gnu/-/binding-linux-x64-gnu-1.0.3.tgz",
-      "integrity": "sha512-B8m6tD5+/N5FeNQFbKlLA/2yVq9ycQP1SeedyEYYKWBNR3ZQbkvIUcNnDNM03lO1l5F2roiiFJGgvoLLyZXtSg==",
+      "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==",
       "cpu": [
         "x64"
       ],
@@ -1346,9 +1346,9 @@
       }
     },
     "node_modules/@rolldown/binding-linux-x64-musl": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-x64-musl/-/binding-linux-x64-musl-1.0.3.tgz",
-      "integrity": "sha512-pSdpdUJHkuCxun9LE7jvgUB9qsRgaiyNNCX7m/AvHTcq67AiT/Yhoxvw5zPfhrM8k/BfP8ce/hMOpthKDpEUow==",
+      "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==",
       "cpu": [
         "x64"
       ],
@@ -1363,9 +1363,9 @@
       }
     },
     "node_modules/@rolldown/binding-openharmony-arm64": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/@rolldown/binding-openharmony-arm64/-/binding-openharmony-arm64-1.0.3.tgz",
-      "integrity": "sha512-OXXS3RKJgX2uLwM+gYyuH5omcH8fL1LJs96pZGgtetVCahON57+d4SJHzTgZiOjxgGkSnpXpOsWuPDGAKAigEg==",
+      "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==",
       "cpu": [
         "arm64"
       ],
@@ -1380,9 +1380,9 @@
       }
     },
     "node_modules/@rolldown/binding-wasm32-wasi": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/@rolldown/binding-wasm32-wasi/-/binding-wasm32-wasi-1.0.3.tgz",
-      "integrity": "sha512-JTtb8BWFynicNSoPrehsCzBtOKjZ6jhMiPFEmOiuXg1Fl8dn2KHQob+GuPSGR0dryQa1PQJbzjF3dqO/whhjLg==",
+      "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==",
       "cpu": [
         "wasm32"
       ],
@@ -1390,52 +1390,18 @@
       "license": "MIT",
       "optional": true,
       "dependencies": {
-        "@emnapi/core": "1.10.0",
-        "@emnapi/runtime": "1.10.0",
-        "@napi-rs/wasm-runtime": "^1.1.4"
+        "@emnapi/core": "1.11.1",
+        "@emnapi/runtime": "1.11.1",
+        "@napi-rs/wasm-runtime": "^1.1.5"
       },
       "engines": {
         "node": "^20.19.0 || >=22.12.0"
       }
     },
-    "node_modules/@rolldown/binding-wasm32-wasi/node_modules/@emnapi/core": {
-      "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/@emnapi/core/-/core-1.10.0.tgz",
-      "integrity": "sha512-yq6OkJ4p82CAfPl0u9mQebQHKPJkY7WrIuk205cTYnYe+k2Z8YBh11FrbRG/H6ihirqcacOgl2BIO8oyMQLeXw==",
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "dependencies": {
-        "@emnapi/wasi-threads": "1.2.1",
-        "tslib": "^2.4.0"
-      }
-    },
-    "node_modules/@rolldown/binding-wasm32-wasi/node_modules/@emnapi/runtime": {
-      "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-1.10.0.tgz",
-      "integrity": "sha512-ewvYlk86xUoGI0zQRNq/mC+16R1QeDlKQy21Ki3oSYXNgLb45GV1P6A0M+/s6nyCuNDqe5VpaY84BzXGwVbwFA==",
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "dependencies": {
-        "tslib": "^2.4.0"
-      }
-    },
-    "node_modules/@rolldown/binding-wasm32-wasi/node_modules/@emnapi/wasi-threads": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/@emnapi/wasi-threads/-/wasi-threads-1.2.1.tgz",
-      "integrity": "sha512-uTII7OYF+/Mes/MrcIOYp5yOtSMLBWSIoLPpcgwipoiKbli6k322tcoFsxoIIxPDqW01SQGAgko4EzZi2BNv2w==",
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "dependencies": {
-        "tslib": "^2.4.0"
-      }
-    },
     "node_modules/@rolldown/binding-win32-arm64-msvc": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/@rolldown/binding-win32-arm64-msvc/-/binding-win32-arm64-msvc-1.0.3.tgz",
-      "integrity": "sha512-gEdFFEN70A/jxb2svrWsN3aDL7OUtmvlOy+6fa2jxG8K0wQ1ZbdeLGnidov6Yu5/733dI5ySfzFlQ/cb0bSz1g==",
+      "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==",
       "cpu": [
         "arm64"
       ],
@@ -1450,9 +1416,9 @@
       }
     },
     "node_modules/@rolldown/binding-win32-x64-msvc": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/@rolldown/binding-win32-x64-msvc/-/binding-win32-x64-msvc-1.0.3.tgz",
-      "integrity": "sha512-eXB7CHuaQdqmJcc3koCNtNPmT/bj2gc999kUFgBxG8Ac0NdgXc4rkCHhqrgrhN3zddvvvrgzj1e90SuSfmyIXA==",
+      "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==",
       "cpu": [
         "x64"
       ],
@@ -1516,9 +1482,9 @@
       }
     },
     "node_modules/@tybys/wasm-util": {
-      "version": "0.10.2",
-      "resolved": "https://registry.npmjs.org/@tybys/wasm-util/-/wasm-util-0.10.2.tgz",
-      "integrity": "sha512-RoBvJ2X0wuKlWFIjrwffGw1IqZHKQqzIchKaadZZfnNpsAYp2mM0h36JtPCjNDAHGgYez/15uMBpfGwchhiMgg==",
+      "version": "0.10.3",
+      "resolved": "https://registry.npmjs.org/@tybys/wasm-util/-/wasm-util-0.10.3.tgz",
+      "integrity": "sha512-F3fo1MYrRJYL3zER0OUOmkutjr1Vp23m7OsSgp7nq4SP6OqX6C/56XFIPAl5bt3zaBRjmW7SGz3u/6LwFpYcOg==",
       "dev": true,
       "license": "MIT",
       "optional": true,
@@ -1603,17 +1569,17 @@
       "license": "MIT"
     },
     "node_modules/@typescript-eslint/eslint-plugin": {
-      "version": "8.61.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.61.1.tgz",
-      "integrity": "sha512-ZPlVl3PB3et/59Ne0fv/sci6ZXz4T4Hp4nTJ56i/Y0gR89ARb+KphojTq6j+56E5PIezmOIOOWyY+aWQFd+IkQ==",
+      "version": "8.62.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.62.0.tgz",
+      "integrity": "sha512-o+mpz7EYiMzXoySXiKmzlabIvTVqUuK5yLrAedRPRDA0IpPFMUV1IXt6OqljIxX/kumN6EjUYp41Hqelh6p/Dw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@eslint-community/regexpp": "^4.12.2",
-        "@typescript-eslint/scope-manager": "8.61.1",
-        "@typescript-eslint/type-utils": "8.61.1",
-        "@typescript-eslint/utils": "8.61.1",
-        "@typescript-eslint/visitor-keys": "8.61.1",
+        "@typescript-eslint/scope-manager": "8.62.0",
+        "@typescript-eslint/type-utils": "8.62.0",
+        "@typescript-eslint/utils": "8.62.0",
+        "@typescript-eslint/visitor-keys": "8.62.0",
         "ignore": "^7.0.5",
         "natural-compare": "^1.4.0",
         "ts-api-utils": "^2.5.0"
@@ -1626,23 +1592,23 @@
         "url": "https://opencollective.com/typescript-eslint"
       },
       "peerDependencies": {
-        "@typescript-eslint/parser": "^8.61.1",
+        "@typescript-eslint/parser": "^8.62.0",
         "eslint": "^8.57.0 || ^9.0.0 || ^10.0.0",
         "typescript": ">=4.8.4 <6.1.0"
       }
     },
     "node_modules/@typescript-eslint/parser": {
-      "version": "8.61.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.61.1.tgz",
-      "integrity": "sha512-PJ5vePq5/ognBbrIcoC5+SHO5dfpeLPzP9FpLkzWrguoYQEeeSjlJpVwOpo1JRSTEi7dRcwNy4h4dzV70PqHcg==",
+      "version": "8.62.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.62.0.tgz",
+      "integrity": "sha512-dzHeT2gySzZtLDsuqxU9AkYgIsQoHAHtRBpOqM+Ofzx1Bwrd2RcCjQJ+6iQbsHOIR6NS33bF2W1k3blN1zLDrA==",
       "dev": true,
       "license": "MIT",
       "peer": true,
       "dependencies": {
-        "@typescript-eslint/scope-manager": "8.61.1",
-        "@typescript-eslint/types": "8.61.1",
-        "@typescript-eslint/typescript-estree": "8.61.1",
-        "@typescript-eslint/visitor-keys": "8.61.1",
+        "@typescript-eslint/scope-manager": "8.62.0",
+        "@typescript-eslint/types": "8.62.0",
+        "@typescript-eslint/typescript-estree": "8.62.0",
+        "@typescript-eslint/visitor-keys": "8.62.0",
         "debug": "^4.4.3"
       },
       "engines": {
@@ -1658,14 +1624,14 @@
       }
     },
     "node_modules/@typescript-eslint/project-service": {
-      "version": "8.61.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.61.1.tgz",
-      "integrity": "sha512-PrC4JYGmR241lYnfhmKGTXkFqv8+ymbTFgSAY0fVXpY82/QkMw5TZPl+vGzuDDU2QYJk9fIDOBTntF+yDv9LEA==",
+      "version": "8.62.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.62.0.tgz",
+      "integrity": "sha512-wexnCqiTg7BOGtbLDftYpRWlmLq4xfoMd7BKFR6Y75sZS3QmRKLdN3yWLhmIYgqMmP/OXWpj3H8odkb5nGURCQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/tsconfig-utils": "^8.61.1",
-        "@typescript-eslint/types": "^8.61.1",
+        "@typescript-eslint/tsconfig-utils": "^8.62.0",
+        "@typescript-eslint/types": "^8.62.0",
         "debug": "^4.4.3"
       },
       "engines": {
@@ -1680,14 +1646,14 @@
       }
     },
     "node_modules/@typescript-eslint/scope-manager": {
-      "version": "8.61.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.61.1.tgz",
-      "integrity": "sha512-L2bdIeoQS8FlKAvONAr20w6OcLXeB+qiDKbAooS9A0Ben+iSIkBef0FxqwKWYqt5sa0i4KJtxVyVmhMylKzF5w==",
+      "version": "8.62.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.62.0.tgz",
+      "integrity": "sha512-1lX38kNxXIRb8mEc3lbq5mdHq1Pf2+U0nFU65KfT18mtPxxl0fvjuEE92mHuXPuCtElJhOrddOpyMlM3Z0umEA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.61.1",
-        "@typescript-eslint/visitor-keys": "8.61.1"
+        "@typescript-eslint/types": "8.62.0",
+        "@typescript-eslint/visitor-keys": "8.62.0"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -1698,9 +1664,9 @@
       }
     },
     "node_modules/@typescript-eslint/tsconfig-utils": {
-      "version": "8.61.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.61.1.tgz",
-      "integrity": "sha512-UN/H4di+OO7EWx2ovME+8t31YO+KVnK0RRKEHR3kOt21/Ay8BOq3M1OMvWs5vNiqcFCYGYoxK3MXPZzmMUE+yg==",
+      "version": "8.62.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.62.0.tgz",
+      "integrity": "sha512-y2GAdB6ykaXUvuspbYnizQc4oDDz0Tz/Yc7iWrXf9mx8vm/L/0vLHCe0tS2boG96Zy+DivnVDQ9ZUEWoHqqx1g==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -1715,15 +1681,15 @@
       }
     },
     "node_modules/@typescript-eslint/type-utils": {
-      "version": "8.61.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.61.1.tgz",
-      "integrity": "sha512-GYRicKmVK0C4fsKgaACaknOUAq9Oa2kwsjnpFhFcS/5p4Ht5IP9OVLbgIgcK4SRk92nVHFluurg1lumD9dBcLw==",
+      "version": "8.62.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.62.0.tgz",
+      "integrity": "sha512-+g5O3j0w2ldzC86Pv6fvbO/xhAonbJFIdf/MKQ1d30gndlsVzUOE83ldfSE15Qrl9fhFjK6AovHs5Wpp6vx86w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.61.1",
-        "@typescript-eslint/typescript-estree": "8.61.1",
-        "@typescript-eslint/utils": "8.61.1",
+        "@typescript-eslint/types": "8.62.0",
+        "@typescript-eslint/typescript-estree": "8.62.0",
+        "@typescript-eslint/utils": "8.62.0",
         "debug": "^4.4.3",
         "ts-api-utils": "^2.5.0"
       },
@@ -1740,9 +1706,9 @@
       }
     },
     "node_modules/@typescript-eslint/types": {
-      "version": "8.61.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.61.1.tgz",
-      "integrity": "sha512-G+CRlPqLv7Bz1IZVs03x5K59F1veqL0EJUROAdGhKsEq8qOiRiZbI+HUojPq5l0fEGOKModD9br6lObhB8zkoA==",
+      "version": "8.62.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.62.0.tgz",
+      "integrity": "sha512-KvAclkktORPvM54TgLgA4z9HIV1M8zOgw9ZVNXl9f/8dLYfXYX1wkMXP7qmabpijQRV5bHJLOmoyGQbLMaUYeg==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -1754,16 +1720,16 @@
       }
     },
     "node_modules/@typescript-eslint/typescript-estree": {
-      "version": "8.61.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.61.1.tgz",
-      "integrity": "sha512-u+oQD3BqYWPc8YV9Zab4vaJElJuwOLPRc10Jm1o/qS+6Qwen14HCWwx0Seo4LnSn2wxea2Ik8DxPt2/FHmuhrg==",
+      "version": "8.62.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.62.0.tgz",
+      "integrity": "sha512-+hVbNxtW64pIcZWDPGbyaKF7vp2IBTVY5ma1blwwksrjdsbdqqEKvJWMGbBofei4F6Dovx1M0RJgoFeNu2279A==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/project-service": "8.61.1",
-        "@typescript-eslint/tsconfig-utils": "8.61.1",
-        "@typescript-eslint/types": "8.61.1",
-        "@typescript-eslint/visitor-keys": "8.61.1",
+        "@typescript-eslint/project-service": "8.62.0",
+        "@typescript-eslint/tsconfig-utils": "8.62.0",
+        "@typescript-eslint/types": "8.62.0",
+        "@typescript-eslint/visitor-keys": "8.62.0",
         "debug": "^4.4.3",
         "minimatch": "^10.2.2",
         "semver": "^7.7.3",
@@ -1782,16 +1748,16 @@
       }
     },
     "node_modules/@typescript-eslint/utils": {
-      "version": "8.61.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.61.1.tgz",
-      "integrity": "sha512-1+P/3Dj6jvtybE1q0HQ6yBt/gq+oKJyLdEv4HdnqasaEXRSYCAsD59mXEVQnM/ULNdQxbX77tdG4jPRjIS6knA==",
+      "version": "8.62.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.62.0.tgz",
+      "integrity": "sha512-82r66fi9zYwZ+mTq3vKgwjbZ1PVk/DJzrXFLpG6RnBbdvH8TEGVHIs9H4d2drhkOzf0syZuD/OZvvlu6GDbP4g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.9.1",
-        "@typescript-eslint/scope-manager": "8.61.1",
-        "@typescript-eslint/types": "8.61.1",
-        "@typescript-eslint/typescript-estree": "8.61.1"
+        "@typescript-eslint/scope-manager": "8.62.0",
+        "@typescript-eslint/types": "8.62.0",
+        "@typescript-eslint/typescript-estree": "8.62.0"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -1806,13 +1772,13 @@
       }
     },
     "node_modules/@typescript-eslint/visitor-keys": {
-      "version": "8.61.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.61.1.tgz",
-      "integrity": "sha512-6fJ9MHWtK14C1DSkiMlHUSOmrVebL7150xZJBlJiL62jjhIA4JmOq6flwBgDxIdBKKdoiZRel+dfPD5MLfny3w==",
+      "version": "8.62.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.62.0.tgz",
+      "integrity": "sha512-CY3uyFSRbcQv3nnSv8S0+lDftMVz6P963PoRlxrV7ew/Md564g9ut60PYzdLM5qW4jFn93GBF+Soi90ISAN+GQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.61.1",
+        "@typescript-eslint/types": "8.62.0",
         "eslint-visitor-keys": "^5.0.0"
       },
       "engines": {
@@ -2470,9 +2436,9 @@
       }
     },
     "node_modules/bootstrap-vue-next": {
-      "version": "0.45.6",
-      "resolved": "https://registry.npmjs.org/bootstrap-vue-next/-/bootstrap-vue-next-0.45.6.tgz",
-      "integrity": "sha512-/o9MfHbZ6bjCvQPSsRlsqcHqdhJG5K3mzC5pKlo+9bVn2Nq0GUGjd4Pk+KIMhnG6nlUdIcBzcoT2BBbMOabuNg==",
+      "version": "0.45.7",
+      "resolved": "https://registry.npmjs.org/bootstrap-vue-next/-/bootstrap-vue-next-0.45.7.tgz",
+      "integrity": "sha512-+xu9d/Luuc5JJQgDVnhFsIVruOwnl/YDIFl/bLE8OgkzR078zm66RQ8dtBSxPP+lxT3RmkW+UoYiDbwCBHfLmg==",
       "license": "MIT",
       "dependencies": {
         "@floating-ui/core": "^1.7.5",
@@ -3245,9 +3211,9 @@
       }
     },
     "node_modules/exsolve": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/exsolve/-/exsolve-1.0.8.tgz",
-      "integrity": "sha512-LmDxfWXwcTArk8fUEnOfSZpHOJ6zOMUJKOtFLFqJLoKJetuQG874Uc7/Kki7zFLzYybmZhp1M7+98pfMqeX8yA==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/exsolve/-/exsolve-1.1.0.tgz",
+      "integrity": "sha512-D+42+T12DdIlJM3uepa55qGiL3sYdLBOxIl2ifQCzCHz4c7eiolaHsi3BIqEr7JxBzxv2pYZQX9kw16ziMcEmw==",
       "license": "MIT"
     },
     "node_modules/fast-deep-equal": {
@@ -3413,9 +3379,9 @@
       }
     },
     "node_modules/globals": {
-      "version": "17.6.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-17.6.0.tgz",
-      "integrity": "sha512-sepffkT8stwnIYbsMBpoCHJuJM5l98FUF2AnE07hfvE0m/qp3R586hw4jF4uadbhvg1ooIdzuu7CsfD2jzCaNA==",
+      "version": "17.7.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-17.7.0.tgz",
+      "integrity": "sha512-Czmyns5dUsq4seFBR/Kdydhmo8y9kC79hiSkPn0YcGtNnYWnrgt0vjrSjx9tspoDGWm2CMarffRuLjM4xUz8xg==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -3455,9 +3421,9 @@
       }
     },
     "node_modules/immutable": {
-      "version": "5.1.6",
-      "resolved": "https://registry.npmjs.org/immutable/-/immutable-5.1.6.tgz",
-      "integrity": "sha512-q1swsS8K7L8usSHuOqF2TAoCCkonYz0SG38wLAggaa4Wml70zixIvt2ql4coQ2C2B3hTjltJry4r6bULwgAXLQ==",
+      "version": "5.1.7",
+      "resolved": "https://registry.npmjs.org/immutable/-/immutable-5.1.7.tgz",
+      "integrity": "sha512-47Xb+LFbZ/ZIjQMj6Q5J3IfK7PJFuqRdFOC9FpGgRTK6U2dAEVmkR9hp58qU4FpYux5YXpneDwkj2EP6lppzFA==",
       "dev": true,
       "license": "MIT"
     },
@@ -4149,9 +4115,9 @@
       "license": "MIT"
     },
     "node_modules/nanoid": {
-      "version": "3.3.13",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.13.tgz",
-      "integrity": "sha512-sPdqC6ByMVVGvF1ynvvMo0/o+oD1VX7DaHhijt1bFgjvBkHBib4t49GoNDhf2NDta4oeUNlaGbSt5K7qjZ955Q==",
+      "version": "3.3.15",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.15.tgz",
+      "integrity": "sha512-y7Wygv/7mEOvxTuEQDB8StXdMRBWf1kR/tlhAzBRUFkB2jfcLOAxO/SHmOO2zgz1pVgK29/kyupn059/bCHdjA==",
       "funding": [
         {
           "type": "github",
@@ -4439,13 +4405,13 @@
       }
     },
     "node_modules/playwright": {
-      "version": "1.61.0",
-      "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.61.0.tgz",
-      "integrity": "sha512-Z+7BeeqQPRRzklHsVFP4KTGIyMxKUmfeRA4WisM6G3/XW6nwGeX6fX9qYaDa+CiUqpOkb2f6X3nar05R3kSuJQ==",
+      "version": "1.61.1",
+      "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.61.1.tgz",
+      "integrity": "sha512-DWnY5o3YbLWK4GovuAVwpqL+1VwGNdUGrRr++8j8PtQQzvAVZUIMjKQ90fY689sEJZJBbZVw1rXaOKSTitkzPQ==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
-        "playwright-core": "1.61.0"
+        "playwright-core": "1.61.1"
       },
       "bin": {
         "playwright": "cli.js"
@@ -4458,9 +4424,9 @@
       }
     },
     "node_modules/playwright-core": {
-      "version": "1.61.0",
-      "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.61.0.tgz",
-      "integrity": "sha512-caX7TrY3Ml6egyDX0WUcTHDxodl/b51y5wJOdCEA36QviK/s2g081hvmGs8eaE3DWb6NYZQ6BjO/QkNRPenoPA==",
+      "version": "1.61.1",
+      "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.61.1.tgz",
+      "integrity": "sha512-h7Qlt6m4REp25qvIdvbDtVmD4LqVXfpRxhORv9L0jzETM05p4fuPJ3dKyuSXQxDSbXnmS79HAgi9589lGSpLkg==",
       "dev": true,
       "license": "Apache-2.0",
       "bin": {
@@ -4599,9 +4565,9 @@
       }
     },
     "node_modules/reka-ui": {
-      "version": "2.9.10",
-      "resolved": "https://registry.npmjs.org/reka-ui/-/reka-ui-2.9.10.tgz",
-      "integrity": "sha512-yuvZVTp4fWH2G3qk+ze/x6YYlyc2Xl1d+eMUlIYrKqzTowBKteoDoN17fitURmqSUck3mc7JbcYgp49DnGu2EQ==",
+      "version": "2.10.0",
+      "resolved": "https://registry.npmjs.org/reka-ui/-/reka-ui-2.10.0.tgz",
+      "integrity": "sha512-HIUVfSBM/AyGkcUI7aiOxxMc4N+0UD2ZEun8dcrT0H4fveotEoeDdvzyZu97eeEvEa1H9oGHoOpApkfxlgnC7g==",
       "license": "MIT",
       "dependencies": {
         "@floating-ui/dom": "^1.6.13",
@@ -4640,13 +4606,13 @@
       "license": "MIT"
     },
     "node_modules/rolldown": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/rolldown/-/rolldown-1.0.3.tgz",
-      "integrity": "sha512-i00lAJ2ks1BYr7rjNjKC7BcqAS7nVfiT3QX1SI5aY+AFHblCmaUf9OE9dbdzDvW6dJxbi2ZCZiy9v3CcwOiX3g==",
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/rolldown/-/rolldown-1.1.2.tgz",
+      "integrity": "sha512-x0CrQQqCXWGeI8dTvFfN/Dnv3yMKT9hv5jFjlOreKAx9wqLq9wz7VvLLHyaAXC90/CpggTu9SisSbsJJTPSjNQ==",
       "devOptional": true,
       "license": "MIT",
       "dependencies": {
-        "@oxc-project/types": "=0.133.0",
+        "@oxc-project/types": "=0.137.0",
         "@rolldown/pluginutils": "^1.0.0"
       },
       "bin": {
@@ -4656,21 +4622,21 @@
         "node": "^20.19.0 || >=22.12.0"
       },
       "optionalDependencies": {
-        "@rolldown/binding-android-arm64": "1.0.3",
-        "@rolldown/binding-darwin-arm64": "1.0.3",
-        "@rolldown/binding-darwin-x64": "1.0.3",
-        "@rolldown/binding-freebsd-x64": "1.0.3",
-        "@rolldown/binding-linux-arm-gnueabihf": "1.0.3",
-        "@rolldown/binding-linux-arm64-gnu": "1.0.3",
-        "@rolldown/binding-linux-arm64-musl": "1.0.3",
-        "@rolldown/binding-linux-ppc64-gnu": "1.0.3",
-        "@rolldown/binding-linux-s390x-gnu": "1.0.3",
-        "@rolldown/binding-linux-x64-gnu": "1.0.3",
-        "@rolldown/binding-linux-x64-musl": "1.0.3",
-        "@rolldown/binding-openharmony-arm64": "1.0.3",
-        "@rolldown/binding-wasm32-wasi": "1.0.3",
-        "@rolldown/binding-win32-arm64-msvc": "1.0.3",
-        "@rolldown/binding-win32-x64-msvc": "1.0.3"
+        "@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"
       }
     },
     "node_modules/sass": {
@@ -4715,9 +4681,9 @@
       "license": "MIT"
     },
     "node_modules/semver": {
-      "version": "7.8.4",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.8.4.tgz",
-      "integrity": "sha512-rUCObTnP32Q08R2uuIrt7r9PlEonuTmtuXYcW6s5kjdlj3xbnwe+21yXptAUYcMAABLkYYTtnmzb3w3EDZfueA==",
+      "version": "7.8.5",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.8.5.tgz",
+      "integrity": "sha512-Y7/KDsb8LjooZpwaqGyulO6DQlksgCncchHGk+sZIY4SBvUocMBEFH5Ur1fI4dV+Jvl0w6cjvucaIi40puRioA==",
       "dev": true,
       "license": "ISC",
       "bin": {
@@ -4895,22 +4861,22 @@
       }
     },
     "node_modules/tldts": {
-      "version": "7.4.3",
-      "resolved": "https://registry.npmjs.org/tldts/-/tldts-7.4.3.tgz",
-      "integrity": "sha512-A3BDQBeeukYPzB4QdQ1DtdlUmp4x2OCH8n5UVhEWbyANxNep8GavottKzd1xYKFJKjUgMyPT7EzOfnBO55s8Sg==",
+      "version": "7.4.4",
+      "resolved": "https://registry.npmjs.org/tldts/-/tldts-7.4.4.tgz",
+      "integrity": "sha512-kFXFK7O4WPextIUAOk8qtnw9dxR9UIXP9CjuH1cTBVBZMDeQcUPgr/IazGiw1B0Yiw5L75gHLWeW4iD793r90g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "tldts-core": "^7.4.3"
+        "tldts-core": "^7.4.4"
       },
       "bin": {
         "tldts": "bin/cli.js"
       }
     },
     "node_modules/tldts-core": {
-      "version": "7.4.3",
-      "resolved": "https://registry.npmjs.org/tldts-core/-/tldts-core-7.4.3.tgz",
-      "integrity": "sha512-27ep5H9PzdBrNd5OFM/j3WCU8F3kPwM9D0BOaOf7uYfxMJfyr0K5Tjj69Gri+sZlh2WXd5buIm47NuPF29CDiw==",
+      "version": "7.4.4",
+      "resolved": "https://registry.npmjs.org/tldts-core/-/tldts-core-7.4.4.tgz",
+      "integrity": "sha512-vwVLJVvvpslm7vqAH7+XNj/neA/Ynq7DT2EEcMuwc5YzN5XaMyRAqxwU+uX3azZ1FQtB2gvrvnLnAEkvYlVdfg==",
       "dev": true,
       "license": "MIT"
     },
@@ -4998,16 +4964,16 @@
       }
     },
     "node_modules/typescript-eslint": {
-      "version": "8.61.1",
-      "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.61.1.tgz",
-      "integrity": "sha512-V7PayAfJokV3pEHgN7/v03D1SpujhRfQtYLbLIiBfDDncdg4PAiRBfoS4cnCANK4jmAPncczi59QO3afiXUlNw==",
+      "version": "8.62.0",
+      "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.62.0.tgz",
+      "integrity": "sha512-8QxXi+ZACKX0kaqO4gY8kn0RSD9gFfaHDWwjqtEN48aWCBkX4MJaufWN+c3BzlrXLOxfywDL8CaoqUwcRq4j4Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/eslint-plugin": "8.61.1",
-        "@typescript-eslint/parser": "8.61.1",
-        "@typescript-eslint/typescript-estree": "8.61.1",
-        "@typescript-eslint/utils": "8.61.1"
+        "@typescript-eslint/eslint-plugin": "8.62.0",
+        "@typescript-eslint/parser": "8.62.0",
+        "@typescript-eslint/typescript-estree": "8.62.0",
+        "@typescript-eslint/utils": "8.62.0"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -5179,9 +5145,9 @@
       "license": "MIT"
     },
     "node_modules/vite": {
-      "version": "8.0.16",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-8.0.16.tgz",
-      "integrity": "sha512-h9bXPmJichP5fLmVQo3PyaGSDE2n3aPuomeAlVRm0JLmt4rY6zmPKd59HYI4LNW8oTK7tlTsuC7l/m7awx9Jcw==",
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-8.1.0.tgz",
+      "integrity": "sha512-BuJcQK/56NQTWDGn4ABea3q4SSBdNPWwNZKTkkUpcMPnLoquSYH8llRtSUIgoL1KSCpHt5eghLShn50mH36y7Q==",
       "devOptional": true,
       "license": "MIT",
       "peer": true,
@@ -5189,7 +5155,7 @@
         "lightningcss": "^1.32.0",
         "picomatch": "^4.0.4",
         "postcss": "^8.5.15",
-        "rolldown": "1.0.3",
+        "rolldown": "~1.1.2",
         "tinyglobby": "^0.2.17"
       },
       "bin": {
@@ -5206,7 +5172,7 @@
       },
       "peerDependencies": {
         "@types/node": "^20.19.0 || >=22.12.0",
-        "@vitejs/devtools": "^0.1.18",
+        "@vitejs/devtools": "^0.3.0",
         "esbuild": "^0.27.0 || ^0.28.0",
         "jiti": ">=1.21.0",
         "less": "^4.0.0",
diff --git a/client-v3/package.json b/client-v3/package.json
index d24693e2f..256c770da 100644
--- a/client-v3/package.json
+++ b/client-v3/package.json
@@ -1,6 +1,6 @@
 {
   "name": "client-v3",
-  "version": "0.32.4",
+  "version": "0.33.0",
   "description": "DigiScript front end (Vue 3)",
   "author": "DreamTeamProd",
   "private": true,
@@ -34,7 +34,7 @@
     "@vuelidate/core": "^2.0.3",
     "@vuelidate/validators": "^2.0.4",
     "bootstrap": "^5.3.8",
-    "bootstrap-vue-next": "^0.45.6",
+    "bootstrap-vue-next": "^0.45.7",
     "bootswatch": "^5.3.8",
     "contrast-color": "1.0.1",
     "core-js": "^3.49.0",
@@ -62,8 +62,8 @@
     "@iconify-json/mdi": "^1.2.3",
     "@types/lodash": "~4.17.24",
     "@types/node": ">=22.12.0",
-    "@typescript-eslint/eslint-plugin": "^8.61.1",
-    "@typescript-eslint/parser": "^8.61.1",
+    "@typescript-eslint/eslint-plugin": "^8.62.0",
+    "@typescript-eslint/parser": "^8.62.0",
     "@vitejs/plugin-vue": "^6.0.7",
     "@vitest/ui": "^4.1.9",
     "@vue/test-utils": "^2.4.11",
@@ -71,19 +71,19 @@
     "eslint-config-prettier": "^10.1.8",
     "eslint-plugin-prettier": "^5.5.6",
     "eslint-plugin-vue": "^10.9.2",
-    "globals": "^17.6.0",
+    "globals": "^17.7.0",
     "jiti": "^2.7.0",
     "jsdom": "^29.1.1",
     "prettier": "^3.8.4",
     "sass": "1.101.0",
     "typescript": "^6.0.3",
-    "typescript-eslint": "^8.61.1",
+    "typescript-eslint": "^8.62.0",
     "unplugin-icons": "^23.0.1",
     "unplugin-vue-components": "^32.1.0",
-    "vite": "^8.0.16",
+    "vite": "^8.1.0",
     "vitest": "^4.1.9",
     "vue-eslint-parser": "^10.4.1",
-    "@playwright/test": "^1.61.0"
+    "@playwright/test": "^1.61.1"
   },
   "overrides": {
     "glob": "^13.0.6"
diff --git a/client-v3/src/components/show/config/cues/CueGroupEditModal.vue b/client-v3/src/components/show/config/cues/CueGroupEditModal.vue
new file mode 100644
index 000000000..49326d45c
--- /dev/null
+++ b/client-v3/src/components/show/config/cues/CueGroupEditModal.vue
@@ -0,0 +1,109 @@
+<template>
+  <BModal ref="modal" title="Edit Cue Group" size="lg" scrollable @hidden="onHidden">
+    <CueGroupForm
+      ref="groupForm"
+      :cue-type-options="cueTypeOptions"
+      :readonly="groupId != null"
+      class="mt-1"
+      @update:valid="formValid = $event"
+    />
+    <template #footer>
+      <BButton
+        v-if="groupId != null"
+        variant="danger"
+        :disabled="saving || deleting"
+        @click="onDelete"
+      >
+        Delete Group
+      </BButton>
+      <div v-else />
+      <div class="d-flex gap-2 ms-auto">
+        <BButton variant="secondary" :disabled="saving || deleting" @click="modal?.hide()">
+          Cancel
+        </BButton>
+        <BButton variant="primary" :disabled="!formValid || saving || deleting" @click="onSave">
+          {{ saving ? 'Saving…' : 'Save Group' }}
+        </BButton>
+      </div>
+    </template>
+  </BModal>
+</template>
+
+<script setup lang="ts">
+import { ref } from 'vue';
+import type { BModal } from 'bootstrap-vue-next';
+import { useScriptStore } from '@/stores/script';
+import { useConfirm } from '@/composables/useConfirm';
+import type { Cue, CueGroup } from '@/types/api/cues';
+import CueGroupForm from './CueGroupForm.vue';
+
+const props = defineProps<{
+  cueTypeOptions: { value: number | null; text: string }[];
+}>();
+
+const scriptStore = useScriptStore();
+const { confirm } = useConfirm();
+
+const modal = ref<InstanceType<typeof BModal> | null>(null);
+const groupForm = ref<InstanceType<typeof CueGroupForm> | null>(null);
+
+const groupId = ref<number | null>(null);
+const lineId = ref<number>(0);
+const formValid = ref(false);
+const saving = ref(false);
+const deleting = ref(false);
+
+function onHidden(): void {
+  saving.value = false;
+  deleting.value = false;
+}
+
+async function onSave(): Promise<void> {
+  if (!formValid.value || saving.value || groupId.value == null || !groupForm.value) return;
+  saving.value = true;
+  try {
+    const data = groupForm.value.getFormData();
+    const cuesPayload = data.cues.map((c, i) => ({ id: c.id, ident: c.ident, sortOrder: i }));
+    await scriptStore.editCueGroup({
+      groupId: groupId.value,
+      labelOverride: data.labelOverride || undefined,
+      lineId: lineId.value,
+      cues: cuesPayload,
+    });
+    modal.value?.hide();
+  } finally {
+    saving.value = false;
+  }
+}
+
+async function onDelete(): Promise<void> {
+  if (deleting.value || groupId.value == null) return;
+  const confirmed = await confirm('Delete this cue group and all its cues?', {
+    title: 'Delete Cue Group',
+    okVariant: 'danger',
+    okTitle: 'Delete',
+  });
+  if (!confirmed) return;
+  deleting.value = true;
+  try {
+    await scriptStore.deleteCueGroup({ groupId: groupId.value, lineId: lineId.value });
+    modal.value?.hide();
+  } finally {
+    deleting.value = false;
+  }
+}
+
+function openEdit(group: CueGroup, cues: Cue[], targetLineId: number): void {
+  groupId.value = group.id;
+  lineId.value = targetLineId;
+  formValid.value = true;
+  groupForm.value?.reset({
+    cueTypeId: group.cue_type_id,
+    labelOverride: group.label_override ?? '',
+    cues: cues.map((c) => ({ id: c.id, ident: c.ident ?? '' })),
+  });
+  modal.value?.show();
+}
+
+defineExpose({ openEdit });
+</script>
diff --git a/client-v3/src/components/show/config/cues/CueGroupForm.vue b/client-v3/src/components/show/config/cues/CueGroupForm.vue
new file mode 100644
index 000000000..18ddf9a6b
--- /dev/null
+++ b/client-v3/src/components/show/config/cues/CueGroupForm.vue
@@ -0,0 +1,297 @@
+<template>
+  <div>
+    <BFormGroup label="Cue Type">
+      <BFormSelect
+        v-model="localCueTypeId"
+        :options="groupCueTypeOptions"
+        :disabled="props.readonly"
+      />
+    </BFormGroup>
+
+    <BFormGroup
+      label="Label Override"
+      description="Optional — leave blank for automatic label based on first/last cue."
+    >
+      <BFormInput v-model="localLabelOverride" placeholder="e.g. Music Intro" />
+    </BFormGroup>
+
+    <div v-if="localCueTypeId != null" class="mb-3 d-flex align-items-center gap-2">
+      <small class="text-muted">Preview:</small>
+      <span
+        class="badge"
+        :style="{
+          backgroundColor: previewColour,
+          color: contrastColor(previewColour),
+          padding: '0.3rem 0.5rem',
+          fontSize: '0.9rem',
+        }"
+      >
+        {{ previewLabel }}
+      </span>
+    </div>
+
+    <BFormGroup label="Cues">
+      <div v-if="localCues.length === 0" class="text-muted small mb-2">
+        No cues yet. Add a range or single cue below.
+      </div>
+      <div class="cue-list-scroll">
+        <div
+          v-for="(cue, index) in localCues"
+          :key="index"
+          class="d-flex align-items-center gap-2 mb-1 cue-row"
+          :class="{ 'drag-over': dragOverIndex === index && dragIndex !== index }"
+          @dragover.prevent="dragOverIndex = index"
+          @dragleave="dragOverIndex = null"
+          @drop.prevent="onDrop(index)"
+        >
+          <span
+            draggable="true"
+            class="drag-handle"
+            @dragstart="onDragStart(index, $event)"
+            @dragend="onDragEnd"
+          >
+            <IMdiDragVertical />
+          </span>
+          <BFormInput v-model="cue.ident" placeholder="Identifier" />
+          <BButton
+            size="sm"
+            variant="outline-secondary"
+            :disabled="index === 0"
+            @click="moveUp(index)"
+          >
+            <IMdiChevronUp />
+          </BButton>
+          <BButton
+            size="sm"
+            variant="outline-secondary"
+            :disabled="index === localCues.length - 1"
+            @click="moveDown(index)"
+          >
+            <IMdiChevronDown />
+          </BButton>
+          <BButton size="sm" variant="outline-danger" @click="removeCue(index)">
+            <IMdiClose />
+          </BButton>
+        </div>
+      </div>
+    </BFormGroup>
+
+    <BFormGroup label="Add Range" description="e.g. 1 > 100 adds cues 1 through 100">
+      <BInputGroup>
+        <BFormInput
+          v-model="rangeInput"
+          placeholder="1 > 100"
+          :state="rangeState"
+          @keyup.enter="addRange"
+        />
+        <BButton variant="outline-primary" :disabled="!canAddRange" @click="addRange">
+          Add Range
+        </BButton>
+      </BInputGroup>
+      <BFormInvalidFeedback :state="rangeState">
+        Use format: start &gt; end (e.g. 1 &gt; 100), max 10000 cues per range.
+      </BFormInvalidFeedback>
+    </BFormGroup>
+
+    <BButton class="mb-2" size="sm" variant="outline-secondary" @click="addSingleCue">
+      <IMdiPlusBox /> Add Single Cue
+    </BButton>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { computed, ref, watch } from 'vue';
+import { useCueDisplay } from '@/composables/useCueDisplay';
+import type { Cue, CueGroup } from '@/types/api/cues';
+
+const props = defineProps<{
+  cueTypeOptions: { value: number | null; text: string }[];
+  readonly?: boolean;
+}>();
+
+const emit = defineEmits<{ 'update:valid': [val: boolean] }>();
+
+const { cueGroupLabel, cueGroupBackgroundColour, contrastColor } = useCueDisplay();
+
+const localCueTypeId = ref<number | null>(null);
+const localLabelOverride = ref('');
+const localCues = ref<{ id?: number; ident: string }[]>([]);
+const rangeInput = ref('');
+const dragIndex = ref<number | null>(null);
+const dragOverIndex = ref<number | null>(null);
+
+const groupCueTypeOptions = computed(() => props.cueTypeOptions.filter((o) => o.value !== null));
+
+const previewGroup = computed<CueGroup | null>(() => {
+  if (localCueTypeId.value == null) return null;
+  return {
+    id: 0,
+    cue_type_id: localCueTypeId.value,
+    label_override: localLabelOverride.value || null,
+  };
+});
+
+const previewCues = computed<Cue[]>(() =>
+  localCues.value.map((c, i) => ({
+    id: 0,
+    cue_type_id: localCueTypeId.value!,
+    ident: c.ident,
+    group_id: 0,
+    sort_order: i,
+  }))
+);
+
+const previewLabel = computed(() => {
+  const g = previewGroup.value;
+  return g ? cueGroupLabel(g, previewCues.value) : '';
+});
+
+const previewColour = computed(() => {
+  const g = previewGroup.value;
+  return g ? cueGroupBackgroundColour(g) : '#000000';
+});
+
+const rangeState = computed<boolean | null>(() => {
+  if (!rangeInput.value.trim()) return null;
+  return parseRange(rangeInput.value) !== null;
+});
+
+const canAddRange = computed(
+  () => !!rangeInput.value.trim() && parseRange(rangeInput.value) !== null
+);
+
+const canSave = computed(
+  () =>
+    localCueTypeId.value != null &&
+    localCues.value.length > 0 &&
+    localCues.value.every((c) => c.ident.trim() !== '')
+);
+
+function parseRange(input: string): number[] | null {
+  const match = input.trim().match(/^(\d+)\s*>\s*(\d+)$/);
+  if (!match) return null;
+  const start = parseInt(match[1], 10);
+  const end = parseInt(match[2], 10);
+  if (start > end || end - start >= 10000) return null;
+  return Array.from({ length: end - start + 1 }, (_, i) => start + i);
+}
+
+function addRange(): void {
+  const nums = parseRange(rangeInput.value);
+  if (!nums) return;
+  for (const n of nums) localCues.value.push({ ident: String(n) });
+  rangeInput.value = '';
+}
+
+function addSingleCue(): void {
+  localCues.value.push({ ident: '' });
+}
+
+function removeCue(index: number): void {
+  localCues.value.splice(index, 1);
+}
+
+function moveUp(index: number): void {
+  if (index === 0) return;
+  [localCues.value[index - 1], localCues.value[index]] = [
+    localCues.value[index],
+    localCues.value[index - 1],
+  ];
+}
+
+function moveDown(index: number): void {
+  if (index === localCues.value.length - 1) return;
+  [localCues.value[index], localCues.value[index + 1]] = [
+    localCues.value[index + 1],
+    localCues.value[index],
+  ];
+}
+
+function onDragStart(index: number, event: DragEvent): void {
+  dragIndex.value = index;
+  const { dataTransfer } = event;
+  if (dataTransfer) {
+    dataTransfer.effectAllowed = 'move';
+    dataTransfer.setData('text/plain', '');
+  }
+}
+
+function onDrop(targetIndex: number): void {
+  if (dragIndex.value === null || dragIndex.value === targetIndex) {
+    dragIndex.value = null;
+    dragOverIndex.value = null;
+    return;
+  }
+  const items = [...localCues.value];
+  const [removed] = items.splice(dragIndex.value, 1);
+  items.splice(targetIndex, 0, removed);
+  localCues.value = items;
+  dragIndex.value = null;
+  dragOverIndex.value = null;
+}
+
+function onDragEnd(): void {
+  dragIndex.value = null;
+  dragOverIndex.value = null;
+}
+
+function reset(initial?: {
+  cueTypeId?: number | null;
+  labelOverride?: string;
+  cues?: { id?: number; ident: string }[];
+}): void {
+  localCueTypeId.value = initial?.cueTypeId ?? null;
+  localLabelOverride.value = initial?.labelOverride ?? '';
+  localCues.value = initial?.cues ? [...initial.cues] : [];
+  rangeInput.value = '';
+  dragIndex.value = null;
+  dragOverIndex.value = null;
+}
+
+function getFormData(): {
+  cueTypeId: number | null;
+  labelOverride: string;
+  cues: { id?: number; ident: string }[];
+} {
+  return {
+    cueTypeId: localCueTypeId.value,
+    labelOverride: localLabelOverride.value,
+    cues: [...localCues.value],
+  };
+}
+
+watch(canSave, (val) => emit('update:valid', val));
+
+defineExpose({ reset, getFormData });
+</script>
+
+<style scoped>
+.cue-list-scroll {
+  border: 1px solid var(--bs-border-color);
+  border-radius: 0.25rem;
+  padding: 0.25rem 0.5rem;
+  margin-bottom: 0.5rem;
+}
+
+.cue-row {
+  border-radius: 4px;
+  transition: background-color 0.1s ease;
+}
+
+.cue-row.drag-over {
+  background-color: rgba(var(--bs-primary-rgb), 0.12);
+}
+
+.drag-handle {
+  cursor: grab;
+  color: var(--bs-secondary-color);
+  flex-shrink: 0;
+  display: flex;
+  align-items: center;
+  padding: 0.25rem;
+}
+
+.drag-handle:active {
+  cursor: grabbing;
+}
+</style>
diff --git a/client-v3/src/components/show/config/cues/ScriptLineCueEditor.vue b/client-v3/src/components/show/config/cues/ScriptLineCueEditor.vue
index 9c2853d87..ed65da230 100644
--- a/client-v3/src/components/show/config/cues/ScriptLineCueEditor.vue
+++ b/client-v3/src/components/show/config/cues/ScriptLineCueEditor.vue
@@ -23,7 +23,7 @@
           <template v-if="line.line_type !== LINE_TYPES.SPACING">
             <BButtonGroup>
               <BButton
-                v-for="cue in cues"
+                v-for="cue in individualCues"
                 :key="cue.id"
                 class="cue-button"
                 :disabled="!systemStore.isCueEditor"
@@ -35,6 +35,19 @@
               >
                 {{ 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)"
+              >
+                {{ cueGroupLabel(grp.group, grp.cues) }}
+              </BButton>
               <BButton
                 v-if="systemStore.isCueEditor"
                 class="cue-button add-cue-btn"
@@ -83,7 +96,7 @@
 
         <template v-else-if="line.line_type === LINE_TYPES.STAGE_DIRECTION">
           <BCol :style="{ textAlign: textAlign }">
-            <i class="viewable-line" :style="sdStyling">
+            <i class="viewable-line" :style="sdStylingWithCuts">
               <template v-if="sdStyle?.text_format === 'upper'">
                 {{ line.line_parts[0]?.line_text?.toUpperCase() }}
               </template>
@@ -115,52 +128,83 @@
       </BRow>
     </BContainer>
 
-    <!-- Add New Cue Modal -->
-    <BModal
-      ref="newCueModal"
-      title="Add New Cue"
-      :ok-disabled="v$.newFormState.$invalid || submittingNewCue"
-      @hidden="resetNewForm"
-      @ok="onSubmitNew"
-    >
-      <BForm @submit.stop.prevent="onSubmitNew">
-        <BFormGroup label="Cue Type" label-for="new-cue-type">
-          <BFormSelect
-            id="new-cue-type"
-            v-model="v$.newFormState.cueType.$model"
-            :options="cueTypeOptions"
-            :state="newFieldState('cueType')"
-          />
-          <BFormInvalidFeedback>This is a required field.</BFormInvalidFeedback>
-        </BFormGroup>
-        <BFormGroup label="Identifier" label-for="new-cue-ident">
-          <BFormInput
-            id="new-cue-ident"
-            v-model="v$.newFormState.ident.$model"
-            :state="newFieldState('ident')"
+    <!-- Add Cue Modal (tabs: Individual Cue / Cue Group) -->
+    <BModal ref="newCueModal" title="Add Cue" scrollable @hidden="resetNewForm">
+      <BTabs v-model:index="activeTab" class="mt-1">
+        <BTab title="Individual Cue">
+          <BForm class="mt-3" @submit.stop.prevent="onSubmitNew">
+            <BFormGroup label="Cue Type" label-for="new-cue-type">
+              <BFormSelect
+                id="new-cue-type"
+                v-model="v$.newFormState.cueType.$model"
+                :options="cueTypeOptions"
+                :state="newFieldState('cueType')"
+              />
+              <BFormInvalidFeedback>This is a required field.</BFormInvalidFeedback>
+            </BFormGroup>
+            <BFormGroup label="Identifier" label-for="new-cue-ident">
+              <BFormInput
+                id="new-cue-ident"
+                v-model="v$.newFormState.ident.$model"
+                :state="newFieldState('ident')"
+              />
+              <BFormInvalidFeedback>This is a required field.</BFormInvalidFeedback>
+              <BFormText v-if="isDuplicateNewCue" class="text-warning">
+                A cue with this identifier already exists for this cue type.
+              </BFormText>
+            </BFormGroup>
+            <!-- Line preview -->
+            <template
+              v-if="
+                line.line_type === LINE_TYPES.DIALOGUE ||
+                line.line_type === LINE_TYPES.STAGE_DIRECTION
+              "
+            >
+              <hr />
+              <template v-if="line.line_type === LINE_TYPES.DIALOGUE">
+                <p v-for="part in line.line_parts" :key="part.id" class="viewable-line">
+                  {{ part.line_text }}
+                </p>
+              </template>
+              <i v-else class="viewable-line">{{ line.line_parts[0]?.line_text }}</i>
+            </template>
+          </BForm>
+        </BTab>
+        <BTab title="Cue Group">
+          <CueGroupForm
+            ref="newGroupForm"
+            :cue-type-options="cueTypeOptions"
+            class="mt-3"
+            @update:valid="groupFormValid = $event"
           />
-          <BFormInvalidFeedback>This is a required field.</BFormInvalidFeedback>
-          <BFormText v-if="isDuplicateNewCue" class="text-warning">
-            A cue with this identifier already exists for this cue type.
-          </BFormText>
-        </BFormGroup>
-        <!-- Line preview -->
-        <template
-          v-if="
-            line.line_type === LINE_TYPES.DIALOGUE || line.line_type === LINE_TYPES.STAGE_DIRECTION
-          "
-        >
-          <hr />
-          <template v-if="line.line_type === LINE_TYPES.DIALOGUE">
-            <p v-for="part in line.line_parts" :key="part.id" class="viewable-line">
-              {{ part.line_text }}
-            </p>
-          </template>
-          <i v-else class="viewable-line">{{ line.line_parts[0]?.line_text }}</i>
+        </BTab>
+      </BTabs>
+      <template #footer>
+        <BButton variant="secondary" @click="newCueModal?.hide()">Cancel</BButton>
+        <template v-if="activeTab === 0">
+          <BButton
+            variant="primary"
+            :disabled="v$.newFormState.$invalid || submittingNewCue"
+            @click="onSubmitNew"
+          >
+            {{ submittingNewCue ? 'Adding…' : 'Add Cue' }}
+          </BButton>
         </template>
-      </BForm>
+        <template v-else>
+          <BButton
+            variant="primary"
+            :disabled="!groupFormValid || submittingGroup"
+            @click="onSubmitGroup"
+          >
+            {{ submittingGroup ? 'Saving…' : 'Save Group' }}
+          </BButton>
+        </template>
+      </template>
     </BModal>
 
+    <!-- Cue Group Modal (create + edit) -->
+    <CueGroupEditModal ref="groupModal" :cue-type-options="cueTypeOptions" />
+
     <!-- Edit Cue Modal -->
     <BModal
       ref="editCueModal"
@@ -230,8 +274,10 @@ import { useConfirm } from '@/composables/useConfirm';
 import { isWholeLineCut } from '@/js/scriptUtils';
 import { LINE_TYPES } from '@/constants/lineTypes';
 import type { ScriptLine } from '@/types/api/script';
-import type { Cue, CueType } from '@/types/api/cues';
+import type { Cue, CueGroup, CueType } from '@/types/api/cues';
 import type { Act, Scene, Character, CharacterGroup } from '@/types/api/show';
+import CueGroupEditModal from './CueGroupEditModal.vue';
+import CueGroupForm from './CueGroupForm.vue';
 
 const props = defineProps<{
   line: ScriptLine;
@@ -253,12 +299,15 @@ const userStore = useUserStore();
 const { confirm } = useConfirm();
 
 const { getStageDirectionStyle, stageDirectionStyling, scriptTextAlign } = useScriptDisplay();
-const { cueLabel, cueBackgroundColour, contrastColor } = useCueDisplay();
+const { cueLabel, cueBackgroundColour, cueGroupLabel, cueGroupBackgroundColour, contrastColor } =
+  useCueDisplay();
 const { needsHeadings, needsActSceneLabel } = useScriptNavigation();
 
 // Modal refs
 const newCueModal = ref<InstanceType<typeof BModal> | null>(null);
 const editCueModal = ref<InstanceType<typeof BModal> | null>(null);
+const groupModal = ref<InstanceType<typeof CueGroupEditModal> | null>(null);
+const newGroupForm = ref<InstanceType<typeof CueGroupForm> | null>(null);
 const lineContainer = ref<HTMLElement | null>(null);
 
 // Form state
@@ -273,7 +322,10 @@ const editFormState = ref({
   ident: null as string | null,
   lineId: null as number | null,
 });
+const activeTab = ref(0);
+const groupFormValid = ref(false);
 const submittingNewCue = ref(false);
+const submittingGroup = ref(false);
 const submittingEditCue = ref(false);
 const deletingCue = ref(false);
 
@@ -302,7 +354,16 @@ const sdStyle = computed(() =>
     userStore.stageDirectionStyleOverrides
   )
 );
-const sdStyling = computed(() => stageDirectionStyling(sdStyle.value));
+const sdStylingWithCuts = computed<Record<string, string>>(() => {
+  const base = stageDirectionStyling(sdStyle.value);
+  const firstPartId = props.line.line_parts[0]?.id;
+  if (firstPartId != null && props.cuts.includes(firstPartId)) {
+    const existing = base['text-decoration-line'];
+    base['text-decoration-line'] =
+      existing && existing !== 'none' ? `${existing} line-through` : 'line-through';
+  }
+  return base;
+});
 const textAlign = computed(() =>
   scriptTextAlign(userStore.userSettings as Record<string, unknown>)
 );
@@ -323,6 +384,9 @@ 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);
+
 // RBAC-filtered cue type options: admins see all, others only see types they can write
 const cueTypeOptions = computed(() => {
   const base = [{ value: null, text: 'N/A' }];
@@ -381,17 +445,44 @@ function editFieldState(field: 'cueType' | 'ident'): boolean | null {
   return f.$dirty ? !f.$error : null;
 }
 
-// New cue modal
+function openEditGroup(group: CueGroup, cues: Cue[]): void {
+  groupModal.value?.openEdit(group, cues, props.line.id!);
+}
+
+// Add cue modal (tabs)
 function openNewForm(): void {
+  activeTab.value = 0;
   newFormState.value = { cueType: null, ident: null, lineId: props.line.id ?? null };
   v$.value.newFormState.$reset();
+  newGroupForm.value?.reset();
   newCueModal.value?.show();
 }
 
 function resetNewForm(): void {
   newFormState.value = { cueType: null, ident: null, lineId: null };
+  activeTab.value = 0;
+  groupFormValid.value = false;
   submittingNewCue.value = false;
+  submittingGroup.value = false;
   v$.value.newFormState.$reset();
+  newGroupForm.value?.reset();
+}
+
+async function onSubmitGroup(): Promise<void> {
+  if (!groupFormValid.value || submittingGroup.value || !newGroupForm.value) return;
+  submittingGroup.value = true;
+  try {
+    const data = newGroupForm.value.getFormData();
+    await scriptStore.addCueGroup({
+      cueTypeId: data.cueTypeId!,
+      labelOverride: data.labelOverride || undefined,
+      lineId: props.line.id!,
+      cues: data.cues.map((c, i) => ({ ident: c.ident, sortOrder: i })),
+    });
+    newCueModal.value?.hide();
+  } finally {
+    submittingGroup.value = false;
+  }
 }
 
 async function onSubmitNew(event: Event): Promise<void> {
@@ -475,6 +566,10 @@ async function deleteCue(): Promise<void> {
   padding: 0.2rem;
 }
 
+.cue-group-btn {
+  border-style: dashed !important;
+}
+
 .stage-direction {
   margin-top: 1rem;
   margin-bottom: 1rem;
diff --git a/client-v3/src/components/show/config/script/BulkEditModal.vue b/client-v3/src/components/show/config/script/BulkEditModal.vue
new file mode 100644
index 000000000..1e47215ab
--- /dev/null
+++ b/client-v3/src/components/show/config/script/BulkEditModal.vue
@@ -0,0 +1,247 @@
+<template>
+  <BModal
+    ref="modal"
+    title="Bulk Edit"
+    size="md"
+    ok-title="Apply"
+    :ok-disabled="!canApply"
+    @ok.prevent="handleOk"
+    @hidden="reset"
+  >
+    <p class="text-muted small mb-3">
+      Applies the selected changes to all lines from the chosen start line to end line (inclusive).
+      Fill in a section to apply those changes; leave it empty to skip it.
+    </p>
+
+    <h6 class="mb-2">Act / Scene</h6>
+    <BFormGroup label="Act" label-for="bulk-act-input">
+      <BFormSelect
+        id="bulk-act-input"
+        v-model="selectedActId"
+        :options="actOptions"
+        @update:model-value="selectedSceneId = null"
+      />
+    </BFormGroup>
+    <BFormGroup label="Scene" label-for="bulk-scene-input">
+      <BFormSelect
+        id="bulk-scene-input"
+        v-model="selectedSceneId"
+        :options="sceneOptions"
+        :disabled="selectedActId == null"
+      />
+    </BFormGroup>
+
+    <hr />
+
+    <h6 class="mb-2">Character Assignment</h6>
+    <p class="text-muted small mb-2">Lines without the selected part will be skipped.</p>
+    <BFormGroup label="Part" label-for="bulk-part-input">
+      <BFormSelect id="bulk-part-input" v-model="selectedPartIndex" :options="partOptions" />
+    </BFormGroup>
+    <template v-if="combinedDropdown">
+      <BFormGroup label="Character / Character Group" label-for="bulk-char-combined-input">
+        <BFormSelect
+          id="bulk-char-combined-input"
+          v-model="combinedValue"
+          :options="combinedOptions"
+          :disabled="selectedPartIndex == null"
+        />
+      </BFormGroup>
+    </template>
+    <template v-else>
+      <BFormGroup
+        v-show="selectedCharacterGroupId == null"
+        label="Character"
+        label-for="bulk-char-input"
+      >
+        <BFormSelect
+          id="bulk-char-input"
+          v-model="selectedCharacterId"
+          :options="characterOptions"
+          :disabled="selectedPartIndex == null"
+        />
+      </BFormGroup>
+      <BFormGroup
+        v-show="selectedCharacterId == null"
+        label="Character Group"
+        label-for="bulk-char-group-input"
+      >
+        <BFormSelect
+          id="bulk-char-group-input"
+          v-model="selectedCharacterGroupId"
+          :options="characterGroupOptions"
+          :disabled="selectedPartIndex == null"
+        />
+      </BFormGroup>
+    </template>
+  </BModal>
+</template>
+
+<script setup lang="ts">
+import { ref, computed } from 'vue';
+import type { BModal } from 'bootstrap-vue-next';
+import type { ScriptLine } from '@/types/api/script';
+import type { Act, Scene, Character, CharacterGroup } from '@/types/api/show';
+import { useUserStore } from '@/stores/user';
+
+const props = defineProps<{
+  previousLineOfStart: ScriptLine | null;
+  nextLineOfEnd: ScriptLine | null;
+  acts: Act[];
+  scenes: Scene[];
+  characters: Character[];
+  characterGroups: CharacterGroup[];
+}>();
+
+const emit = defineEmits<{
+  apply: [
+    payload: {
+      actId: number | null;
+      sceneId: number | null;
+      partIndex: number | null;
+      characterId: number | null;
+      characterGroupId: number | null;
+    },
+  ];
+}>();
+
+const userStore = useUserStore();
+const modal = ref<InstanceType<typeof BModal>>();
+
+const selectedActId = ref<number | null>(null);
+const selectedSceneId = ref<number | null>(null);
+const selectedPartIndex = ref<number | null>(null);
+const selectedCharacterId = ref<number | null>(null);
+const selectedCharacterGroupId = ref<number | null>(null);
+
+const combinedDropdown = computed(
+  () =>
+    !!(userStore.userSettings as { character_combined_dropdown?: boolean })
+      .character_combined_dropdown
+);
+
+const validActs = computed<Act[]>(() => {
+  let startAct = props.acts.find((a) => a.previous_act == null) ?? null;
+  if (props.previousLineOfStart?.act_id != null) {
+    startAct = props.acts.find((a) => a.id === props.previousLineOfStart!.act_id) ?? startAct;
+  }
+  const result: Act[] = [];
+  let cur = startAct;
+  while (cur) {
+    result.push(cur);
+    if (props.nextLineOfEnd && props.nextLineOfEnd.act_id === cur.id) break;
+    cur = cur.next_act == null ? null : (props.acts.find((a) => a.id === cur!.next_act) ?? null);
+  }
+  return result;
+});
+
+const validScenes = computed<Scene[]>(() => {
+  if (selectedActId.value == null) return [];
+  const actScenes = props.scenes.filter((s) => s.act === selectedActId.value);
+  let startScene = actScenes.find((s) => s.previous_scene == null) ?? null;
+  if (
+    props.previousLineOfStart?.act_id === selectedActId.value &&
+    props.previousLineOfStart?.scene_id != null
+  ) {
+    startScene = actScenes.find((s) => s.id === props.previousLineOfStart!.scene_id) ?? startScene;
+  }
+  const result: Scene[] = [];
+  let cur = startScene;
+  while (cur) {
+    result.push(cur);
+    if (props.nextLineOfEnd && props.nextLineOfEnd.scene_id === cur.id) break;
+    cur = cur.next_scene == null ? null : (actScenes.find((s) => s.id === cur!.next_scene) ?? null);
+  }
+  return result;
+});
+
+const actOptions = computed(() => [
+  { value: null, text: 'Select an act', disabled: true },
+  ...validActs.value.map((a) => ({ value: a.id, text: a.name })),
+]);
+
+const sceneOptions = computed(() => [
+  { value: null, text: 'Select a scene', disabled: true },
+  ...validScenes.value.map((s) => ({ value: s.id, text: s.name })),
+]);
+
+const partOptions = computed(() => [
+  { value: null, text: 'Select a part', disabled: true },
+  { value: 1, text: 'Part 1' },
+  { value: 2, text: 'Part 2' },
+  { value: 3, text: 'Part 3' },
+  { value: 4, text: 'Part 4' },
+]);
+
+const characterOptions = computed(() => [
+  { value: null, text: 'N/A' },
+  ...props.characters.map((c) => ({ value: c.id, text: c.name })),
+]);
+
+const characterGroupOptions = computed(() => [
+  { value: null, text: 'N/A' },
+  ...props.characterGroups.map((g) => ({ value: g.id, text: g.name })),
+]);
+
+const combinedOptions = computed<{ value: string | null; text: string; disabled?: boolean }[]>(
+  () => [
+    { value: null, text: 'Select character / group', disabled: true },
+    ...props.characters.map((c) => ({ value: `c:${c.id}`, text: c.name ?? '' })),
+    ...props.characterGroups.map((g) => ({ value: `g:${g.id}`, text: g.name ?? '' })),
+  ]
+);
+
+const combinedValue = computed<string | null>({
+  get() {
+    if (selectedCharacterId.value != null) return `c:${selectedCharacterId.value}`;
+    if (selectedCharacterGroupId.value != null) return `g:${selectedCharacterGroupId.value}`;
+    return null;
+  },
+  set(val: string | null) {
+    if (val == null) {
+      selectedCharacterId.value = null;
+      selectedCharacterGroupId.value = null;
+    } else if (val.startsWith('c:')) {
+      selectedCharacterId.value = Number.parseInt(val.slice(2), 10);
+      selectedCharacterGroupId.value = null;
+    } else if (val.startsWith('g:')) {
+      selectedCharacterId.value = null;
+      selectedCharacterGroupId.value = Number.parseInt(val.slice(2), 10);
+    }
+  },
+});
+
+const actSceneComplete = computed(
+  () => selectedActId.value != null && selectedSceneId.value != null
+);
+
+const characterComplete = computed(
+  () =>
+    selectedPartIndex.value != null &&
+    (selectedCharacterId.value != null || selectedCharacterGroupId.value != null)
+);
+
+const canApply = computed(() => actSceneComplete.value || characterComplete.value);
+
+function handleOk(): void {
+  if (canApply.value) {
+    emit('apply', {
+      actId: actSceneComplete.value ? selectedActId.value : null,
+      sceneId: actSceneComplete.value ? selectedSceneId.value : null,
+      partIndex: characterComplete.value ? selectedPartIndex.value : null,
+      characterId: characterComplete.value ? selectedCharacterId.value : null,
+      characterGroupId: characterComplete.value ? selectedCharacterGroupId.value : null,
+    });
+  }
+}
+
+function reset(): void {
+  selectedActId.value = null;
+  selectedSceneId.value = null;
+  selectedPartIndex.value = null;
+  selectedCharacterId.value = null;
+  selectedCharacterGroupId.value = null;
+}
+
+defineExpose({ show: () => modal.value?.show(), hide: () => modal.value?.hide() });
+</script>
diff --git a/client-v3/src/components/show/config/script/ScriptEditor.vue b/client-v3/src/components/show/config/script/ScriptEditor.vue
index ce862e05c..88a28ef7e 100644
--- a/client-v3/src/components/show/config/script/ScriptEditor.vue
+++ b/client-v3/src/components/show/config/script/ScriptEditor.vue
@@ -161,12 +161,14 @@
       />
     </BModal>
 
-    <BulkActSceneModal
+    <BulkEditModal
       ref="bulkModal"
       :previous-line-of-start="previousLineOfStart"
       :next-line-of-end="nextLineOfEnd"
       :acts="showStore.actList"
       :scenes="showStore.sceneList"
+      :characters="showStore.characterList"
+      :character-groups="showStore.characterGroupList"
       @apply="onBulkApply"
     />
 
@@ -211,7 +213,7 @@ import { useConfirm } from '@/composables/useConfirm';
 import { toast } from '@/js/toast';
 import ScriptLineEditor from './ScriptLineEditor.vue';
 import ScriptLineViewer from './ScriptLineViewer.vue';
-import BulkActSceneModal from './BulkActSceneModal.vue';
+import BulkEditModal from './BulkEditModal.vue';
 import type { ScriptLine } from '@/types/api/script';
 
 const MRU_LOOK_BACK = 4;
@@ -247,7 +249,7 @@ const pageInputNo = ref(1);
 
 const saveModal = ref<InstanceType<typeof BModal>>();
 const goToPageModal = ref<InstanceType<typeof BModal>>();
-const bulkModal = ref<InstanceType<typeof BulkActSceneModal>>();
+const bulkModal = ref<InstanceType<typeof BulkEditModal>>();
 
 const currentPageLines = computed(() => scriptConfigStore.getTmpPage(currentPage.value));
 const deletedLines = computed(() => scriptConfigStore.getDeletedLines(currentPage.value));
@@ -712,11 +714,22 @@ function endLines_isLast(lines: ScriptLine[], index: number): boolean {
   return index === lines.length - 1;
 }
 
-async function onBulkApply({ actId, sceneId }: { actId: number; sceneId: number }): Promise<void> {
+async function onBulkApply(payload: {
+  actId: number | null;
+  sceneId: number | null;
+  partIndex: number | null;
+  characterId: number | null;
+  characterGroupId: number | null;
+}): Promise<void> {
   if (!bulkEditStart.value || !bulkEditEnd.value) return;
   const { page: startPage, lineIndex: startIndex } = bulkEditStart.value;
   const { page: endPage, lineIndex: endIndex } = bulkEditEnd.value;
 
+  const applyActScene = payload.actId != null && payload.sceneId != null;
+  const applyCharacter =
+    payload.partIndex != null && (payload.characterId != null || payload.characterGroupId != null);
+  const targetPartIdx = (payload.partIndex ?? 1) - 1;
+
   for (let p = startPage; p <= endPage; p++) {
     await loadPage(p);
     const pageLines = scriptConfigStore.getTmpPage(p);
@@ -725,7 +738,28 @@ async function onBulkApply({ actId, sceneId }: { actId: number; sceneId: number
     const deletedOnPage = scriptConfigStore.getDeletedLines(p);
     for (let i = fromIdx; i <= toIdx; i++) {
       if (deletedOnPage.includes(i)) continue;
-      scriptConfigStore.setLine(p, i, { ...pageLines[i], act_id: actId, scene_id: sceneId });
+      const updatedLine = { ...pageLines[i] };
+      if (applyActScene) {
+        updatedLine.act_id = payload.actId!;
+        updatedLine.scene_id = payload.sceneId!;
+      }
+      if (applyCharacter) {
+        const sortedParts = [...updatedLine.line_parts].sort(
+          (a, b) => (a.part_index ?? 0) - (b.part_index ?? 0)
+        );
+        if (sortedParts.length > targetPartIdx) {
+          updatedLine.line_parts = sortedParts.map((part, idx) =>
+            idx === targetPartIdx
+              ? {
+                  ...part,
+                  character_id: payload.characterId,
+                  character_group_id: payload.characterGroupId,
+                }
+              : part
+          );
+        }
+      }
+      scriptConfigStore.setLine(p, i, updatedLine);
     }
   }
 
diff --git a/client-v3/src/components/show/config/script/ScriptLineEditor.vue b/client-v3/src/components/show/config/script/ScriptLineEditor.vue
index af36a7ec6..f6eea1103 100644
--- a/client-v3/src/components/show/config/script/ScriptLineEditor.vue
+++ b/client-v3/src/components/show/config/script/ScriptLineEditor.vue
@@ -50,6 +50,7 @@
             scriptMode === 1
           "
           :enable-add-button="state.line_parts.length < 4 && lineType === LINE_TYPES.DIALOGUE"
+          :show-remove-button="state.line_parts.length > 1 && lineType === LINE_TYPES.DIALOGUE"
           :line-type="lineType"
           :line-parts="state.line_parts"
           :stage-direction-styles="
@@ -58,6 +59,7 @@
           :stage-direction-style-id="state.stage_direction_style_id"
           @update:model-value="onPartUpdate(index, $event)"
           @add-line-part="addLinePart"
+          @remove-line-part="removeLinePart(index)"
           @try-finish-line="tryFinishLine"
           @stage-direction-style-change="onStageDirectionStyleChange"
         />
@@ -210,6 +212,13 @@ function onPartUpdate(index: number, part: ScriptLinePartType): void {
   onStateChange();
 }
 
+function removeLinePart(index: number): void {
+  state.value.line_parts = state.value.line_parts
+    .filter((_, i) => i !== index)
+    .map((part, i) => ({ ...part, part_index: i }));
+  onStateChange();
+}
+
 function addLinePart(): void {
   const blank = blankLinePart();
   blank.part_index = state.value.line_parts.length;
diff --git a/client-v3/src/components/show/config/script/ScriptLinePart.vue b/client-v3/src/components/show/config/script/ScriptLinePart.vue
index aeb88a22f..b5c99d42d 100644
--- a/client-v3/src/components/show/config/script/ScriptLinePart.vue
+++ b/client-v3/src/components/show/config/script/ScriptLinePart.vue
@@ -47,6 +47,16 @@
           />
         </BFormGroup>
       </BCol>
+      <BCol v-if="showRemoveButton" cols="auto" class="align-self-end mb-3">
+        <BButton
+          v-b-tooltip.hover.top="'Remove line part'"
+          variant="outline-danger"
+          size="sm"
+          @click="$emit('remove-line-part')"
+        >
+          <IMdiMinusBox />
+        </BButton>
+      </BCol>
     </BRow>
     <BRow>
       <BCol style="display: inline-flex">
@@ -94,6 +104,7 @@ const props = defineProps<{
   characterGroups: CharacterGroup[];
   showAddButton: boolean;
   enableAddButton: boolean;
+  showRemoveButton: boolean;
   lineType: number;
   lineParts: ScriptLinePart[];
   stageDirectionStyles?: StageDirectionStyle[];
@@ -104,6 +115,7 @@ const props = defineProps<{
 const emit = defineEmits<{
   'update:modelValue': [part: ScriptLinePart];
   'add-line-part': [];
+  'remove-line-part': [];
   'try-finish-line': [];
   'stage-direction-style-change': [id: number | null];
 }>();
diff --git a/client-v3/src/components/show/live/ScriptLineViewer.vue b/client-v3/src/components/show/live/ScriptLineViewer.vue
index 063772a31..39b91d349 100644
--- a/client-v3/src/components/show/live/ScriptLineViewer.vue
+++ b/client-v3/src/components/show/live/ScriptLineViewer.vue
@@ -131,7 +131,7 @@
           <BCol cols="3" :class="['cue-column-right', { 'first-row': isFirstRowContent }]">
             <BButtonGroup>
               <BButton
-                v-for="cue in cues"
+                v-for="cue in individualCues"
                 :key="cue.id"
                 class="cue-button"
                 :style="{
@@ -141,6 +141,17 @@
               >
                 {{ 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>
             </BButtonGroup>
             <BButton
               v-if="cueAddMode"
@@ -157,7 +168,7 @@
           <BCol cols="3" :class="['cue-column', { 'first-row': isFirstRowContent }]">
             <BButtonGroup>
               <BButton
-                v-for="cue in cues"
+                v-for="cue in individualCues"
                 :key="cue.id"
                 class="cue-button"
                 :style="{
@@ -167,6 +178,17 @@
               >
                 {{ 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>
             </BButtonGroup>
             <BButton
               v-if="cueAddMode"
@@ -252,7 +274,7 @@ import { isWholeLineCut } from '@/js/scriptUtils';
 import { LINE_TYPES } from '@/constants/lineTypes';
 import type { ScriptLine, ScriptCut, StageDirectionStyle } from '@/types/api/script';
 import type { Act, Scene, Character, CharacterGroup } from '@/types/api/show';
-import type { Cue, CueType } from '@/types/api/cues';
+import type { CueType } from '@/types/api/cues';
 
 const props = defineProps<{
   line: ScriptLine;
@@ -289,7 +311,11 @@ const {
   stageDirectionStyling: computeStyling,
   scriptTextAlign: computeTextAlign,
 } = useScriptDisplay();
-const { cueLabel, cueBackgroundColour, contrastColor } = useCueDisplay();
+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 lineContainer = ref<HTMLElement | null>(null);
 let observer: MutationObserver | null = null;
@@ -440,6 +466,10 @@ onUnmounted(() => {
   padding: 0.2rem;
 }
 
+.cue-group-btn {
+  border-style: dashed !important;
+}
+
 .line-row:has(.add-cue-btn:hover) {
   background-color: rgba(255, 255, 255, 0.06);
   border-radius: 4px;
diff --git a/client-v3/src/components/show/live/ScriptLineViewerCompact.vue b/client-v3/src/components/show/live/ScriptLineViewerCompact.vue
index bb0883823..74ef25fca 100644
--- a/client-v3/src/components/show/live/ScriptLineViewerCompact.vue
+++ b/client-v3/src/components/show/live/ScriptLineViewerCompact.vue
@@ -32,7 +32,7 @@
         </BCol>
         <BCol v-if="cueAddMode" cols="1" class="cue-add-column" />
       </BRow>
-      <BRow v-for="(cue, cueIndex) in cues" :key="`cue_${cue.id}`">
+      <BRow v-for="(cue, cueIndex) in individualCues" :key="`cue_${cue.id}`">
         <BCol
           cols="2"
           :class="[
@@ -56,6 +56,30 @@
         </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>
+        <BCol v-if="cueAddMode" cols="1" class="cue-add-column" />
+      </BRow>
       <BRow class="line-row">
         <template v-if="line.line_type === LINE_TYPES.DIALOGUE">
           <template v-for="(part, index) in line.line_parts" :key="`part_${lineIndex}_${index}`">
@@ -180,7 +204,16 @@ const scriptStore = useScriptStore();
 const { needsHeadings: computeNeedsHeadings, needsActSceneLabel: computeNeedsActSceneLabel } =
   useScriptNavigation();
 const { getStageDirectionStyle, stageDirectionStyling: computeStyling } = useScriptDisplay();
-const { cuePrefix, cueBackgroundColour } = useCueDisplay();
+const {
+  cuePrefix,
+  cueBackgroundColour,
+  cueGroupBackgroundColour,
+  cueGroupPrefix,
+  cueGroupIdentLabel,
+} = useCueDisplay();
+
+const individualCues = computed(() => props.cues.filter((c) => c.group_id == null));
+const lineGroups = computed(() => scriptStore.groupedCuesForLine(props.line.id).groups);
 
 const lineContainer = ref<HTMLElement | null>(null);
 let observer: MutationObserver | null = null;
@@ -227,9 +260,10 @@ const isTaggedStageDirection = computed(() => {
 });
 
 const isLineCut = computed(() => isWholeLineCut(props.line, props.cuts));
+const hasAnyCues = computed(() => individualCues.value.length > 0 || lineGroups.value.length > 0);
 const isFirstRowActScene = computed(() => needsActSceneLabel.value);
-const isFirstRowCues = computed(() => !needsActSceneLabel.value && props.cues.length > 0);
-const isFirstRowContent = computed(() => !needsActSceneLabel.value && props.cues.length === 0);
+const isFirstRowCues = computed(() => !needsActSceneLabel.value && hasAnyCues.value);
+const isFirstRowContent = computed(() => !needsActSceneLabel.value && !hasAnyCues.value);
 
 function characterOrGroupName(part: ScriptLine['line_parts'][number]): string {
   if (part.character_id != null) {
diff --git a/client-v3/src/components/show/live/ScriptViewPane.vue b/client-v3/src/components/show/live/ScriptViewPane.vue
index 4d5f17aac..f2c8dce0f 100644
--- a/client-v3/src/components/show/live/ScriptViewPane.vue
+++ b/client-v3/src/components/show/live/ScriptViewPane.vue
@@ -163,41 +163,73 @@
       </BContainer>
     </BModal>
 
-    <!-- Add Cue Modal -->
+    <!-- Add Cue Modal (tabs: Individual Cue / Cue Group) -->
     <BModal
       ref="newCueModal"
-      title="Add New Cue"
-      size="md"
-      :ok-disabled="v$.newCueFormState.$invalid || submittingNewCue"
+      title="Add Cue"
+      size="lg"
+      scrollable
       @show="newCueModalOpen = true"
       @hidden="
         newCueModalOpen = false;
         resetNewCueForm();
       "
-      @ok="onSubmitNewCue"
     >
-      <BForm @submit.stop.prevent="onSubmitNewCue">
-        <BFormGroup label="Cue Type" label-for="cue-type-input">
-          <BFormSelect
-            id="cue-type-input"
-            v-model="v$.newCueFormState.cueType.$model"
-            :options="cueTypeOptions"
-            :state="validateFieldState('cueType')"
-          />
-          <BFormInvalidFeedback>This is a required field.</BFormInvalidFeedback>
-        </BFormGroup>
-        <BFormGroup label="Identifier" label-for="ident-input">
-          <BFormInput
-            id="ident-input"
-            v-model="v$.newCueFormState.ident.$model"
-            :state="validateFieldState('ident')"
+      <BTabs v-model:index="activeTab" class="mt-1">
+        <BTab title="Individual Cue">
+          <BForm class="mt-3" @submit.stop.prevent="onSubmitNewCue">
+            <BFormGroup label="Cue Type" label-for="cue-type-input">
+              <BFormSelect
+                id="cue-type-input"
+                v-model="v$.newCueFormState.cueType.$model"
+                :options="cueTypeOptions"
+                :state="validateFieldState('cueType')"
+              />
+              <BFormInvalidFeedback>This is a required field.</BFormInvalidFeedback>
+            </BFormGroup>
+            <BFormGroup label="Identifier" label-for="ident-input">
+              <BFormInput
+                id="ident-input"
+                v-model="v$.newCueFormState.ident.$model"
+                :state="validateFieldState('ident')"
+              />
+              <BFormInvalidFeedback>This is a required field.</BFormInvalidFeedback>
+              <BFormText v-if="isDuplicateCue" class="text-warning">
+                A cue with this identifier already exists for this cue type
+              </BFormText>
+            </BFormGroup>
+          </BForm>
+        </BTab>
+        <BTab title="Cue Group">
+          <CueGroupForm
+            ref="newGroupForm"
+            :cue-type-options="cueTypeOptions"
+            class="mt-3"
+            @update:valid="newGroupFormValid = $event"
           />
-          <BFormInvalidFeedback>This is a required field.</BFormInvalidFeedback>
-          <BFormText v-if="isDuplicateCue" class="text-warning">
-            A cue with this identifier already exists for this cue type
-          </BFormText>
-        </BFormGroup>
-      </BForm>
+        </BTab>
+      </BTabs>
+      <template #footer>
+        <BButton variant="secondary" @click="(newCueModal as any)?.hide()">Cancel</BButton>
+        <template v-if="activeTab === 0">
+          <BButton
+            variant="primary"
+            :disabled="v$.newCueFormState.$invalid || submittingNewCue"
+            @click="onSubmitNewCue"
+          >
+            {{ submittingNewCue ? 'Adding…' : 'Add Cue' }}
+          </BButton>
+        </template>
+        <template v-else>
+          <BButton
+            variant="primary"
+            :disabled="!newGroupFormValid || submittingNewCueGroup"
+            @click="onSubmitNewCueGroup"
+          >
+            {{ submittingNewCueGroup ? 'Saving…' : 'Save Group' }}
+          </BButton>
+        </template>
+      </template>
     </BModal>
   </BRow>
 </template>
@@ -220,6 +252,7 @@ import { useWebSocket } from '@/composables/useWebSocket';
 import { toast } from '@/js/toast';
 import ScriptLineViewer from './ScriptLineViewer.vue';
 import ScriptLineViewerCompact from './ScriptLineViewerCompact.vue';
+import CueGroupForm from '@/components/show/config/cues/CueGroupForm.vue';
 import type { ScriptLine } from '@/types/api/script';
 
 const props = defineProps<{
@@ -248,6 +281,7 @@ const intervalModal = ref<InstanceType<(typeof import('bootstrap-vue-next'))['BM
   null
 );
 const newCueModal = ref<InstanceType<(typeof import('bootstrap-vue-next'))['BModal']> | null>(null);
+const newGroupForm = ref<InstanceType<typeof CueGroupForm> | null>(null);
 
 // Page loading state
 const currentLoadedPage = ref(0);
@@ -281,6 +315,9 @@ const newCueFormState = ref({
   lineId: null as number | null,
 });
 const submittingNewCue = ref(false);
+const activeTab = ref(0);
+const newGroupFormValid = ref(false);
+const submittingNewCueGroup = ref(false);
 
 // Interval modal state
 const intervalActId = ref<number | null>(null);
@@ -769,15 +806,26 @@ function startInterval(): void {
 // --- Cue modal ---
 
 function openNewCueModal(lineId: number): void {
-  resetNewCueForm();
-  newCueFormState.value.lineId = lineId;
+  activeTab.value = 0;
+  newGroupFormValid.value = false;
+  newCueFormState.value = { cueType: null, ident: null, lineId: lineId };
+  nextTick(() => {
+    v$.value.$reset();
+    newGroupForm.value?.reset();
+  });
   (newCueModal.value as any)?.show();
 }
 
 function resetNewCueForm(): void {
   newCueFormState.value = { cueType: null, ident: null, lineId: null };
+  activeTab.value = 0;
+  newGroupFormValid.value = false;
   submittingNewCue.value = false;
-  nextTick(() => v$.value.$reset());
+  submittingNewCueGroup.value = false;
+  nextTick(() => {
+    v$.value.$reset();
+    newGroupForm.value?.reset();
+  });
 }
 
 function validateFieldState(field: 'cueType' | 'ident'): boolean | null {
@@ -785,12 +833,9 @@ function validateFieldState(field: 'cueType' | 'ident'): boolean | null {
   return f.$dirty ? !f.$error : null;
 }
 
-async function onSubmitNewCue(event: Event): Promise<void> {
+async function onSubmitNewCue(): Promise<void> {
   v$.value.newCueFormState.$touch();
-  if (v$.value.newCueFormState.$invalid || submittingNewCue.value) {
-    event.preventDefault();
-    return;
-  }
+  if (v$.value.newCueFormState.$invalid || submittingNewCue.value) return;
   submittingNewCue.value = true;
   try {
     await scriptStore.addNewCue({
@@ -799,15 +844,32 @@ async function onSubmitNewCue(event: Event): Promise<void> {
       lineId: newCueFormState.value.lineId!,
     });
     (newCueModal.value as any)?.hide();
-    resetNewCueForm();
   } catch (error) {
     log.error('Error submitting new cue:', error);
-    event.preventDefault();
   } finally {
     submittingNewCue.value = false;
   }
 }
 
+async function onSubmitNewCueGroup(): Promise<void> {
+  if (!newGroupFormValid.value || submittingNewCueGroup.value || !newGroupForm.value) return;
+  submittingNewCueGroup.value = true;
+  try {
+    const data = newGroupForm.value.getFormData();
+    await scriptStore.addCueGroup({
+      cueTypeId: data.cueTypeId!,
+      labelOverride: data.labelOverride || undefined,
+      lineId: newCueFormState.value.lineId!,
+      cues: data.cues.map((c, i) => ({ ident: c.ident, sortOrder: i })),
+    });
+    (newCueModal.value as any)?.hide();
+  } catch (error) {
+    log.error('Error submitting new cue group:', error);
+  } finally {
+    submittingNewCueGroup.value = false;
+  }
+}
+
 // --- Stop show ---
 
 async function stopShow(): Promise<void> {
diff --git a/client-v3/src/composables/useCueDisplay.ts b/client-v3/src/composables/useCueDisplay.ts
index 71e24797e..1ec2124cb 100644
--- a/client-v3/src/composables/useCueDisplay.ts
+++ b/client-v3/src/composables/useCueDisplay.ts
@@ -1,7 +1,7 @@
 import { contrastColor } from '@/js/utils';
 import { useShowStore } from '@/stores/show';
 import { useUserStore } from '@/stores/user';
-import type { Cue } from '@/types/api/cues';
+import type { Cue, CueGroup } from '@/types/api/cues';
 
 export function useCueDisplay() {
   const showStore = useShowStore();
@@ -24,5 +24,47 @@ export function useCueDisplay() {
     return cueType.colour ?? '#000000';
   }
 
-  return { cuePrefix, cueLabel, cueBackgroundColour, contrastColor };
+  function cueGroupLabel(group: CueGroup, cues: Cue[]): string {
+    const cueType = showStore.cueTypeById(group.cue_type_id);
+    const prefix = cueType?.prefix ?? '';
+    if (group.label_override) return `${prefix} - ${group.label_override}`;
+    if (cues.length === 0) return prefix;
+    const first = cues[0].ident ?? '';
+    const last = cues[cues.length - 1].ident ?? '';
+    if (first === last) return `${prefix} ${first}`;
+    return `${prefix} ${first} - ${prefix} ${last}`;
+  }
+
+  function cueGroupBackgroundColour(group: CueGroup): string {
+    const cueType = showStore.cueTypeById(group.cue_type_id);
+    if (!cueType) return '#000000';
+    const override = userStore.cueColourOverrides.find((o) => o.cue_type_id === cueType.id);
+    if (override?.colour) return override.colour;
+    return cueType.colour ?? '#000000';
+  }
+
+  function cueGroupPrefix(group: CueGroup): string {
+    return showStore.cueTypeById(group.cue_type_id)?.prefix ?? '';
+  }
+
+  function cueGroupIdentLabel(group: CueGroup, cues: Cue[]): string {
+    if (group.label_override) return `- ${group.label_override}`;
+    if (cues.length === 0) return '';
+    const first = cues[0].ident ?? '';
+    const last = cues[cues.length - 1].ident ?? '';
+    if (first === last) return first;
+    const prefix = showStore.cueTypeById(group.cue_type_id)?.prefix ?? '';
+    return `${first} - ${prefix} ${last}`;
+  }
+
+  return {
+    cuePrefix,
+    cueLabel,
+    cueBackgroundColour,
+    cueGroupLabel,
+    cueGroupBackgroundColour,
+    cueGroupPrefix,
+    cueGroupIdentLabel,
+    contrastColor,
+  };
 }
diff --git a/client-v3/src/stores/script.ts b/client-v3/src/stores/script.ts
index 1e8fb89ac..3ae02b7ad 100644
--- a/client-v3/src/stores/script.ts
+++ b/client-v3/src/stores/script.ts
@@ -9,7 +9,7 @@ import type {
   CompiledScript,
   ScriptCut,
 } from '@/types/api/script';
-import type { Cue } from '@/types/api/cues';
+import type { Cue, CueGroup } from '@/types/api/cues';
 
 export const useScriptStore = defineStore('script', {
   state: () => ({
@@ -19,6 +19,7 @@ export const useScriptStore = defineStore('script', {
     cuts: [] as ScriptCut[],
     maxPage: 1,
     cues: {} as Record<string, Cue[]>,
+    cueGroups: [] as CueGroup[],
   }),
 
   getters: {
@@ -34,6 +35,35 @@ export const useScriptStore = defineStore('script', {
       (state) =>
       (lineId: number | null): Cue[] =>
         lineId == null ? [] : (state.cues[String(lineId)] ?? []),
+    cueGroupById:
+      (state) =>
+      (id: number | null): CueGroup | null =>
+        id == null ? null : (state.cueGroups.find((g) => g.id === id) ?? null),
+    groupedCuesForLine:
+      (state) =>
+      (
+        lineId: number | null
+      ): { individual: Cue[]; groups: { group: CueGroup; cues: Cue[] }[] } => {
+        if (lineId == null) return { individual: [], groups: [] };
+        const allCues = state.cues[String(lineId)] ?? [];
+        const individual = allCues.filter((c) => c.group_id == null);
+        const groupMap = new Map<number, Cue[]>();
+        for (const cue of allCues) {
+          if (cue.group_id != null) {
+            if (!groupMap.has(cue.group_id)) groupMap.set(cue.group_id, []);
+            groupMap.get(cue.group_id)!.push(cue);
+          }
+        }
+        const groups: { group: CueGroup; cues: Cue[] }[] = [];
+        for (const [groupId, cues] of groupMap) {
+          const group = state.cueGroups.find((g) => g.id === groupId);
+          if (group) {
+            const sorted = [...cues].sort((a, b) => (a.sort_order ?? 0) - (b.sort_order ?? 0));
+            groups.push({ group, cues: sorted });
+          }
+        }
+        return { individual, groups };
+      },
   },
 
   actions: {
@@ -221,6 +251,7 @@ export const useScriptStore = defineStore('script', {
       if (response.ok) {
         const data = await response.json();
         this.cues = data.cues as Record<string, Cue[]>;
+        this.cueGroups = (data.cue_groups ?? []) as CueGroup[];
       } else {
         log.error('Unable to load cues');
       }
@@ -276,6 +307,60 @@ export const useScriptStore = defineStore('script', {
       }
     },
 
+    async addCueGroup(payload: {
+      cueTypeId: number;
+      labelOverride?: string;
+      lineId: number;
+      cues: { ident: string; sortOrder: number }[];
+    }): Promise<void> {
+      const response = await fetch(makeURL('/api/v1/show/cues/groups'), {
+        method: 'POST',
+        headers: { 'Content-Type': 'application/json' },
+        body: JSON.stringify(payload),
+      });
+      if (response.ok) {
+        await this.loadCues();
+        toast.success('Added cue group!');
+      } else {
+        toast.error('Unable to add cue group');
+      }
+    },
+
+    async editCueGroup(payload: {
+      groupId: number;
+      labelOverride?: string;
+      lineId: number;
+      cues: { id?: number; ident: string; sortOrder: number }[];
+    }): Promise<void> {
+      const response = await fetch(makeURL('/api/v1/show/cues/groups'), {
+        method: 'PATCH',
+        headers: { 'Content-Type': 'application/json' },
+        body: JSON.stringify(payload),
+      });
+      if (response.ok) {
+        await this.loadCues();
+        toast.success('Edited cue group!');
+      } else {
+        toast.error('Unable to edit cue group');
+      }
+    },
+
+    async deleteCueGroup(payload: { groupId: number; lineId: number }): Promise<void> {
+      const params = new URLSearchParams({
+        groupId: String(payload.groupId),
+        lineId: String(payload.lineId),
+      });
+      const response = await fetch(`${makeURL('/api/v1/show/cues/groups')}?${params}`, {
+        method: 'DELETE',
+      });
+      if (response.ok) {
+        await this.loadCues();
+        toast.success('Deleted cue group!');
+      } else {
+        toast.error('Unable to delete cue group');
+      }
+    },
+
     async searchCues(payload: {
       identifier: string;
       cueTypeId: number;
diff --git a/client-v3/src/types/api/cues.ts b/client-v3/src/types/api/cues.ts
index 5fecb28b6..b2dbdb003 100644
--- a/client-v3/src/types/api/cues.ts
+++ b/client-v3/src/types/api/cues.ts
@@ -6,8 +6,16 @@ export interface CueType {
   colour: string | null;
 }
 
+export interface CueGroup {
+  id: number;
+  cue_type_id: number;
+  label_override: string | null;
+}
+
 export interface Cue {
   id: number;
   cue_type_id: number | null;
   ident: string | null;
+  group_id: number | null;
+  sort_order: number | null;
 }
diff --git a/client/package-lock.json b/client/package-lock.json
index 08658d436..253482836 100644
--- a/client/package-lock.json
+++ b/client/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "client",
-  "version": "0.32.4",
+  "version": "0.33.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "client",
-      "version": "0.32.4",
+      "version": "0.33.0",
       "dependencies": {
         "bootstrap": "4.6.2",
         "bootstrap-vue": "2.23.1",
@@ -38,8 +38,8 @@
         "@types/lodash": "~4.17.24",
         "@types/node": "~20.14.0",
         "@types/vuelidate": "^0.7.22",
-        "@typescript-eslint/eslint-plugin": "^8.61.1",
-        "@typescript-eslint/parser": "^8.61.1",
+        "@typescript-eslint/eslint-plugin": "^8.62.0",
+        "@typescript-eslint/parser": "^8.62.0",
         "@vitejs/plugin-vue2": "2.3.4",
         "@vitest/ui": "^4.1.9",
         "@vue/test-utils": "^2.4.11",
@@ -53,7 +53,7 @@
         "prettier": "^3.8.4",
         "sass": "1.101.0",
         "typescript": "^6.0.3",
-        "typescript-eslint": "^8.61.1",
+        "typescript-eslint": "^8.62.0",
         "vite": "^7.3.3",
         "vitest": "^4.1.9"
       },
@@ -1424,9 +1424,9 @@
       "license": "MIT"
     },
     "node_modules/@rollup/rollup-android-arm-eabi": {
-      "version": "4.62.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.62.1.tgz",
-      "integrity": "sha512-WUtumI+yIc7YXY3ZtN68V50CHEjgopo0rIZ90+ZqlZzIGroVn3qkfK7wkdl+HebaxenGQMrlB/KJs+aLMZg9lQ==",
+      "version": "4.62.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.62.2.tgz",
+      "integrity": "sha512-6o7ZLZK+BeenkZCFNDXqpbjw9bD6nuWonvS/lwQJp7NoVVxm6p3qE7qQ5jGuBjiFsgvqjD8mZAU5oWxTmbOeOg==",
       "cpu": [
         "arm"
       ],
@@ -1438,9 +1438,9 @@
       ]
     },
     "node_modules/@rollup/rollup-android-arm64": {
-      "version": "4.62.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.62.1.tgz",
-      "integrity": "sha512-ivTbxKROae184UB9SNQGOmXCwdgq1rb1OfDOXHOw9bHHVtoUSQoyLwAgxcd9zlef+vtPnyqN22HrYvaI7K12Zw==",
+      "version": "4.62.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.62.2.tgz",
+      "integrity": "sha512-BaH7BllCACHoH1LguOU56UItGfUWjujlO65kS9LAodViaN4bwIKd7oeW/ZHJ/4ljr/7MIiENnNy3HJ0zXv8Zkw==",
       "cpu": [
         "arm64"
       ],
@@ -1452,9 +1452,9 @@
       ]
     },
     "node_modules/@rollup/rollup-darwin-arm64": {
-      "version": "4.62.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.62.1.tgz",
-      "integrity": "sha512-+nRm4AIocYcaE5yP07KGybXGDGfBCXOSY7EE7GeGvA8rzK+eiZteAgn9VNkn8sw/+FWR+9FLyph0gUNuY75KuQ==",
+      "version": "4.62.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.62.2.tgz",
+      "integrity": "sha512-v39RCCvj4He82I9sFmk+M1VZ0PLM9sfsLVikjfx2hYBNALhrrOR2D3JjQA6AhlaSOgcR+RzrKY7e1+bT6SUO/A==",
       "cpu": [
         "arm64"
       ],
@@ -1466,9 +1466,9 @@
       ]
     },
     "node_modules/@rollup/rollup-darwin-x64": {
-      "version": "4.62.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.62.1.tgz",
-      "integrity": "sha512-63zVs6JwE9i3BMhHm1Gi5+LP8dRKQVrD5UzgjDgZfptON38vfStA4iAK0DpxqTmI8udUzr1Qwk1tEhLRcj7PVA==",
+      "version": "4.62.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.62.2.tgz",
+      "integrity": "sha512-yl0y2vq3S3lHeuXhEdss6TWfKW8vkujImO12tn4ZkG/4oghr09LvdYm2RElVjokTQiUvDUGXLGsYeLqUMCKpGA==",
       "cpu": [
         "x64"
       ],
@@ -1480,9 +1480,9 @@
       ]
     },
     "node_modules/@rollup/rollup-freebsd-arm64": {
-      "version": "4.62.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.62.1.tgz",
-      "integrity": "sha512-uXASB7+/ZbR7q4RC35T/xTwQt4Qwt8e1my8E7hI6PxaQxuNiuvM+B/I58xvJLaVYOmCGy9cu3Ky1SSY4ia/G0Q==",
+      "version": "4.62.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.62.2.tgz",
+      "integrity": "sha512-tT4pvt4qXD+vEoezupCWi+a1F0vvDiksiHc+PxRlYTOH1I6/X4id9jPxTP+Fg+545euaFT1jJVs4CEdHZAU1vw==",
       "cpu": [
         "arm64"
       ],
@@ -1494,9 +1494,9 @@
       ]
     },
     "node_modules/@rollup/rollup-freebsd-x64": {
-      "version": "4.62.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.62.1.tgz",
-      "integrity": "sha512-BqeibWSAOg/6bwxDnJ1Z4806jc6kIuGYCDS52DY4u23EgcK3DMrm4rrODmPTltA8EFlvhz2gXGhs/RwgWuto/w==",
+      "version": "4.62.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.62.2.tgz",
+      "integrity": "sha512-6nU5F2wCW+qvCBhTn1pdIU3bzsIoF7EUwsCDRxilWGprQR6yd508YnH9+OKFCwpfS8pjZqDUmnCAr7exax0XCg==",
       "cpu": [
         "x64"
       ],
@@ -1508,9 +1508,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
-      "version": "4.62.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.62.1.tgz",
-      "integrity": "sha512-9ryebRuEJ1OcKl9ZWWyXZ84OrpqXl8qwa99ZwrVn1uzBu9TwNqpyoScK7yF/+WoHW0dBGUR3tAHem7nWP1ismQ==",
+      "version": "4.62.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.62.2.tgz",
+      "integrity": "sha512-n1GJHPOvpIfhi3TmrCeh6S6URt9BFCt0KQE3qvexyGCTAKpR4Lg+eWvNZEqu7epxwus/8ElT3hacYEucm49SZg==",
       "cpu": [
         "arm"
       ],
@@ -1522,9 +1522,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm-musleabihf": {
-      "version": "4.62.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.62.1.tgz",
-      "integrity": "sha512-HOHv0qumBDTLxM/j5nE2X6SVHGK2F5r211WqFn0PB+lJL3o4HBP9CsjlcdwIk6aILYeRveltSVmvv9NSW3vnWg==",
+      "version": "4.62.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.62.2.tgz",
+      "integrity": "sha512-JqgflS8wEB+UXV/vS1RpRbifGBeN4D5lz8D8oOFbFZw4vedvdOgCFAjfBmIMdW3yL10XpQQ0Ambepw6MXrhOnA==",
       "cpu": [
         "arm"
       ],
@@ -1536,9 +1536,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm64-gnu": {
-      "version": "4.62.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.62.1.tgz",
-      "integrity": "sha512-jrDLxV5iWL8fdpj5N5+9ZAd2BjD3U6h1eiVhOCDQhvKG+C0uJt3phgIsS7sWKTk4LLaom87dMJCIXnakXEs4fA==",
+      "version": "4.62.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.62.2.tgz",
+      "integrity": "sha512-wnFJkogWvN4jm/hQRF2UBaeUmk20j5+DmHvoyWii2b8HJDyvz1MF2OU/6ynXt2KR63rbZLWkFpoytpdc/yBuSA==",
       "cpu": [
         "arm64"
       ],
@@ -1550,9 +1550,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm64-musl": {
-      "version": "4.62.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.62.1.tgz",
-      "integrity": "sha512-kaKe83aR+a5bvGTdXFlUzGUFPHoSm2zo1PFalUuwqj7+txbLm4jyXwM4IkmrEWK9yAWE9qO654XuBb8dqgSP4A==",
+      "version": "4.62.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.62.2.tgz",
+      "integrity": "sha512-HVu2bp0zhvJ8xHEV9+UUs7S90VadmBSY3LcIMvozbPo4AuMGDWlz3ymHLHZPX4hR67TKTt8Qp5PJ5RBg/i+RMQ==",
       "cpu": [
         "arm64"
       ],
@@ -1564,9 +1564,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-loong64-gnu": {
-      "version": "4.62.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loong64-gnu/-/rollup-linux-loong64-gnu-4.62.1.tgz",
-      "integrity": "sha512-tp+VgVhkZ9iNDGezXQnBx0h+ZraZJCKtbrsxGRSO3Y+Ta/YrUfLxlKXU4IiBm9AWlj9EDH1Djrvsl6ledeUdJg==",
+      "version": "4.62.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loong64-gnu/-/rollup-linux-loong64-gnu-4.62.2.tgz",
+      "integrity": "sha512-mQqqAV8QaoSgr9I2fKDLY2BAVvmKjWoGiu/cSYQonsLvtqwEn1E4QYfnCOcp5zoEqNhsDYin1s6jx/VJmrxlZg==",
       "cpu": [
         "loong64"
       ],
@@ -1578,9 +1578,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-loong64-musl": {
-      "version": "4.62.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loong64-musl/-/rollup-linux-loong64-musl-4.62.1.tgz",
-      "integrity": "sha512-LN9invzRf8ejduiGlrtr46Gk08Uh/1eiMMLgo/CNPHeRpYH8EYW6YQuAqkoxItk+Rtmod1raQ8W49sO+hP+6hQ==",
+      "version": "4.62.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loong64-musl/-/rollup-linux-loong64-musl-4.62.2.tgz",
+      "integrity": "sha512-IxKLoxCQ2IWi6bT2akyDUBGsOImDKB+sPp4EsTmwFQ/fMwpCKm8uLSSgP/Kx/QYUgKis6SEZ5/Nlhup0DIA0PQ==",
       "cpu": [
         "loong64"
       ],
@@ -1592,9 +1592,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-ppc64-gnu": {
-      "version": "4.62.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-gnu/-/rollup-linux-ppc64-gnu-4.62.1.tgz",
-      "integrity": "sha512-F2Abce1ndQR8UXEX8Bj3EFd5jlw/u0rlbjmsEzBPty/YJ8H57x3POPnBxr7Mbi8m7UNwukwFW6Z20I+hrQvWdQ==",
+      "version": "4.62.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-gnu/-/rollup-linux-ppc64-gnu-4.62.2.tgz",
+      "integrity": "sha512-Mk5ha2RQSgyFfmYYLkBpPnUk8D8FriBxesO1u9O75X0mHgXL1UQcH5Itl2lurWL2tj0RxV9b9tJgipac0hRY9A==",
       "cpu": [
         "ppc64"
       ],
@@ -1606,9 +1606,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-ppc64-musl": {
-      "version": "4.62.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-musl/-/rollup-linux-ppc64-musl-4.62.1.tgz",
-      "integrity": "sha512-nmJq25UletS/fI3icrKsBH8KDkTf7cSGTY5bkWI9z3+4oHj1DxHQkWCP8uP7m+AEhc1fc73AcycZam4iViAoNQ==",
+      "version": "4.62.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-musl/-/rollup-linux-ppc64-musl-4.62.2.tgz",
+      "integrity": "sha512-CjvEnqJL/0/TQ3TXX3OPIJ/kmBellrWd4heXUmHeJlTnmwjKpSJzoehLaL6Xk0ZnMHBu9dZuFADNOrtjF4v+2w==",
       "cpu": [
         "ppc64"
       ],
@@ -1620,9 +1620,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-riscv64-gnu": {
-      "version": "4.62.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.62.1.tgz",
-      "integrity": "sha512-HqWXZHGXFrKmSs3qOmNBfLY34CzYDt3HU2oQq2cplmU1gEADa2dWf6xcjrQuHYbNYZpJY2+rLNAbHyXtrO/0PQ==",
+      "version": "4.62.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.62.2.tgz",
+      "integrity": "sha512-1SiZbzwdkaDURsew/tSOrooKiYy7EQGT6m8ufavAi9NEyQb/6VuIxFXAL1fqa4iZe3g4NbNk4P7J32z2tw5Mgg==",
       "cpu": [
         "riscv64"
       ],
@@ -1634,9 +1634,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-riscv64-musl": {
-      "version": "4.62.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.62.1.tgz",
-      "integrity": "sha512-xYDVRyJEbrzr14Z2hqe59C1pwosdl9Td0ik5gu5x85mVswTweg492as4Vzs/8zKkvvUgO5VdGRL7OzN+W9Z6+w==",
+      "version": "4.62.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.62.2.tgz",
+      "integrity": "sha512-nQts12zJ3NQRoE6uYljOH89v7szzLDvG2JD/vsX+vGXU8w/At1GowTZ5/7qeFQ8m7L55rpR8Okugnuo5bgjy2Q==",
       "cpu": [
         "riscv64"
       ],
@@ -1648,9 +1648,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-s390x-gnu": {
-      "version": "4.62.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.62.1.tgz",
-      "integrity": "sha512-X6n4yZUYAGSZTsIRjHUFkRZy/ml+EyS5vsgnyUOfhflKros0TEjX9yAoFqiRdJSfmykStVUyfcFDy/tHJ64JuQ==",
+      "version": "4.62.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.62.2.tgz",
+      "integrity": "sha512-E9/ll019jhPIJgpzfZoIkBGhcz+kKNgVWYRY0zr9srBdPPFVpvOKW8VaJKUbeK+eZXyQF9ltME+Kk6affeaPgg==",
       "cpu": [
         "s390x"
       ],
@@ -1662,9 +1662,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-x64-gnu": {
-      "version": "4.62.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.62.1.tgz",
-      "integrity": "sha512-nVQGk/jStQc2V4rrkI+vPD2J+85boKqS4R4nOdPhc3eWw0kyW/b+AYRGoH8qo057XSVqaTx13AliH5qPeLTtgQ==",
+      "version": "4.62.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.62.2.tgz",
+      "integrity": "sha512-5BqxR/pshjey51iliyzTD5Xi3EN0aLmQ2lZ3lvefVV9c82BvrLo2/6OT55iifpWBufs6kdwWbuOKS841DrmK9A==",
       "cpu": [
         "x64"
       ],
@@ -1676,9 +1676,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-x64-musl": {
-      "version": "4.62.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.62.1.tgz",
-      "integrity": "sha512-Ae54IyMwpY3JsYjBH4k29vQ9FSoILwJdh7j7c9lmLOczKnU/WL5jMRL9epsgPrs+ph48YVTsy6PkQDq0nK8Kvg==",
+      "version": "4.62.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.62.2.tgz",
+      "integrity": "sha512-uNN83XxQrRAh/w0/pmAfibcwyb6YWt4gP+dpnQKPVJshAloQ785ii8CT8ZCIxkGg9opVsvAlGhFitSm6D1Jjpg==",
       "cpu": [
         "x64"
       ],
@@ -1690,9 +1690,9 @@
       ]
     },
     "node_modules/@rollup/rollup-openbsd-x64": {
-      "version": "4.62.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-openbsd-x64/-/rollup-openbsd-x64-4.62.1.tgz",
-      "integrity": "sha512-7oOS0UqUXLRi2dVeEXdQxbml854xxQSx+6Pdnuo4G0iAIRiPBCIyzhLIv8oSmvqLkAftGaRk+ft70fVHXjsXsQ==",
+      "version": "4.62.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-openbsd-x64/-/rollup-openbsd-x64-4.62.2.tgz",
+      "integrity": "sha512-srjEIxSH3LRnJN6THczDHWQplqEMFiAJrTab0msUryh9kwNpkICf3Ea6q6MN/2cZwRFUNx5w+h6Hpi4QuHS6Zg==",
       "cpu": [
         "x64"
       ],
@@ -1704,9 +1704,9 @@
       ]
     },
     "node_modules/@rollup/rollup-openharmony-arm64": {
-      "version": "4.62.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-openharmony-arm64/-/rollup-openharmony-arm64-4.62.1.tgz",
-      "integrity": "sha512-e6kAhhmUK3pwICnBtsQFkg/czVxFlY5e4Ppi4fuXWvOwiHOXlgQMEvpg0H5ceuEh2T1nyI0U6SfhV3qojKWpAg==",
+      "version": "4.62.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-openharmony-arm64/-/rollup-openharmony-arm64-4.62.2.tgz",
+      "integrity": "sha512-8hOJnxgbyObnCm5AlRA3A931xX19xq80RjVTKgJOvEKWqJruP/Uf12IbAOaDjjEXYRewwHLfmF0YRIdK3OwKWA==",
       "cpu": [
         "arm64"
       ],
@@ -1718,9 +1718,9 @@
       ]
     },
     "node_modules/@rollup/rollup-win32-arm64-msvc": {
-      "version": "4.62.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.62.1.tgz",
-      "integrity": "sha512-xXRJSv00uVmj5DwS9DwIvS+Re5VdDnaspDfk7GzsnhP1IbTzFjJwhY+c3j3jr/2pP/prBrXvZ1OmjjhkkAOUlQ==",
+      "version": "4.62.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.62.2.tgz",
+      "integrity": "sha512-mmF4AY1i0hG/bLWUctUq59gtmgaSIRa3cu/A3JFRp/sCNEme2bgDEiDS22P9FbnJB8NJNF4jPJiSP5RHQpUTDg==",
       "cpu": [
         "arm64"
       ],
@@ -1732,9 +1732,9 @@
       ]
     },
     "node_modules/@rollup/rollup-win32-ia32-msvc": {
-      "version": "4.62.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.62.1.tgz",
-      "integrity": "sha512-D3S8+6cSEW0QZZHcKKDQ/Fsz/eqvYmJbtkZZziFxEb4Fi4fyWTCaMs1p5siQ85/T6gNdYKJ3OIJ4M/phYQgICA==",
+      "version": "4.62.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.62.2.tgz",
+      "integrity": "sha512-DZgkknc6jhHrk46V25vbAM0zZkyP0nSDkJB8/dRkLTxv470dOmWDqGoEJl/9A0dFfS7yE3REOwNDxpHwSLSt0Q==",
       "cpu": [
         "ia32"
       ],
@@ -1746,9 +1746,9 @@
       ]
     },
     "node_modules/@rollup/rollup-win32-x64-gnu": {
-      "version": "4.62.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-gnu/-/rollup-win32-x64-gnu-4.62.1.tgz",
-      "integrity": "sha512-CRVGPQKdEB/ujGfrq3SgITWc2N9iWM+sqaBKHh62Dc6xRLQGTVrqHpOVEitfly941kr244j14sswRw47bmMjjg==",
+      "version": "4.62.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-gnu/-/rollup-win32-x64-gnu-4.62.2.tgz",
+      "integrity": "sha512-T6xr6ucWSFto+VGajA8YH26LdpHRuP4YLHEKAtCWvJDOlnmWcDZVCI2Jmjr+IFHDlt2zRaTAKE4tfjTaWLgJBg==",
       "cpu": [
         "x64"
       ],
@@ -1760,9 +1760,9 @@
       ]
     },
     "node_modules/@rollup/rollup-win32-x64-msvc": {
-      "version": "4.62.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.62.1.tgz",
-      "integrity": "sha512-/N8QHE1y6A9nmN3HCIFZWr5FUu/rKcT/A7JgaMJH3dcvL5RS++o0brK5SitYVTis/dJFiasK7Xva0cqeWYmCzQ==",
+      "version": "4.62.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.62.2.tgz",
+      "integrity": "sha512-BfzEnDJOt9T8M989/lA37EcJgat01wLRnoi5dQf3QzOH7jzpqTAzdDbVfRljVr5r+jzKqpbHeyOfAaXxAd0PAA==",
       "cpu": [
         "x64"
       ],
@@ -1890,17 +1890,17 @@
       }
     },
     "node_modules/@typescript-eslint/eslint-plugin": {
-      "version": "8.61.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.61.1.tgz",
-      "integrity": "sha512-ZPlVl3PB3et/59Ne0fv/sci6ZXz4T4Hp4nTJ56i/Y0gR89ARb+KphojTq6j+56E5PIezmOIOOWyY+aWQFd+IkQ==",
+      "version": "8.62.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.62.0.tgz",
+      "integrity": "sha512-o+mpz7EYiMzXoySXiKmzlabIvTVqUuK5yLrAedRPRDA0IpPFMUV1IXt6OqljIxX/kumN6EjUYp41Hqelh6p/Dw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@eslint-community/regexpp": "^4.12.2",
-        "@typescript-eslint/scope-manager": "8.61.1",
-        "@typescript-eslint/type-utils": "8.61.1",
-        "@typescript-eslint/utils": "8.61.1",
-        "@typescript-eslint/visitor-keys": "8.61.1",
+        "@typescript-eslint/scope-manager": "8.62.0",
+        "@typescript-eslint/type-utils": "8.62.0",
+        "@typescript-eslint/utils": "8.62.0",
+        "@typescript-eslint/visitor-keys": "8.62.0",
         "ignore": "^7.0.5",
         "natural-compare": "^1.4.0",
         "ts-api-utils": "^2.5.0"
@@ -1913,22 +1913,22 @@
         "url": "https://opencollective.com/typescript-eslint"
       },
       "peerDependencies": {
-        "@typescript-eslint/parser": "^8.61.1",
+        "@typescript-eslint/parser": "^8.62.0",
         "eslint": "^8.57.0 || ^9.0.0 || ^10.0.0",
         "typescript": ">=4.8.4 <6.1.0"
       }
     },
     "node_modules/@typescript-eslint/parser": {
-      "version": "8.61.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.61.1.tgz",
-      "integrity": "sha512-PJ5vePq5/ognBbrIcoC5+SHO5dfpeLPzP9FpLkzWrguoYQEeeSjlJpVwOpo1JRSTEi7dRcwNy4h4dzV70PqHcg==",
+      "version": "8.62.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.62.0.tgz",
+      "integrity": "sha512-dzHeT2gySzZtLDsuqxU9AkYgIsQoHAHtRBpOqM+Ofzx1Bwrd2RcCjQJ+6iQbsHOIR6NS33bF2W1k3blN1zLDrA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/scope-manager": "8.61.1",
-        "@typescript-eslint/types": "8.61.1",
-        "@typescript-eslint/typescript-estree": "8.61.1",
-        "@typescript-eslint/visitor-keys": "8.61.1",
+        "@typescript-eslint/scope-manager": "8.62.0",
+        "@typescript-eslint/types": "8.62.0",
+        "@typescript-eslint/typescript-estree": "8.62.0",
+        "@typescript-eslint/visitor-keys": "8.62.0",
         "debug": "^4.4.3"
       },
       "engines": {
@@ -1944,14 +1944,14 @@
       }
     },
     "node_modules/@typescript-eslint/project-service": {
-      "version": "8.61.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.61.1.tgz",
-      "integrity": "sha512-PrC4JYGmR241lYnfhmKGTXkFqv8+ymbTFgSAY0fVXpY82/QkMw5TZPl+vGzuDDU2QYJk9fIDOBTntF+yDv9LEA==",
+      "version": "8.62.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.62.0.tgz",
+      "integrity": "sha512-wexnCqiTg7BOGtbLDftYpRWlmLq4xfoMd7BKFR6Y75sZS3QmRKLdN3yWLhmIYgqMmP/OXWpj3H8odkb5nGURCQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/tsconfig-utils": "^8.61.1",
-        "@typescript-eslint/types": "^8.61.1",
+        "@typescript-eslint/tsconfig-utils": "^8.62.0",
+        "@typescript-eslint/types": "^8.62.0",
         "debug": "^4.4.3"
       },
       "engines": {
@@ -1966,14 +1966,14 @@
       }
     },
     "node_modules/@typescript-eslint/scope-manager": {
-      "version": "8.61.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.61.1.tgz",
-      "integrity": "sha512-L2bdIeoQS8FlKAvONAr20w6OcLXeB+qiDKbAooS9A0Ben+iSIkBef0FxqwKWYqt5sa0i4KJtxVyVmhMylKzF5w==",
+      "version": "8.62.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.62.0.tgz",
+      "integrity": "sha512-1lX38kNxXIRb8mEc3lbq5mdHq1Pf2+U0nFU65KfT18mtPxxl0fvjuEE92mHuXPuCtElJhOrddOpyMlM3Z0umEA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.61.1",
-        "@typescript-eslint/visitor-keys": "8.61.1"
+        "@typescript-eslint/types": "8.62.0",
+        "@typescript-eslint/visitor-keys": "8.62.0"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -1984,9 +1984,9 @@
       }
     },
     "node_modules/@typescript-eslint/tsconfig-utils": {
-      "version": "8.61.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.61.1.tgz",
-      "integrity": "sha512-UN/H4di+OO7EWx2ovME+8t31YO+KVnK0RRKEHR3kOt21/Ay8BOq3M1OMvWs5vNiqcFCYGYoxK3MXPZzmMUE+yg==",
+      "version": "8.62.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.62.0.tgz",
+      "integrity": "sha512-y2GAdB6ykaXUvuspbYnizQc4oDDz0Tz/Yc7iWrXf9mx8vm/L/0vLHCe0tS2boG96Zy+DivnVDQ9ZUEWoHqqx1g==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -2001,15 +2001,15 @@
       }
     },
     "node_modules/@typescript-eslint/type-utils": {
-      "version": "8.61.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.61.1.tgz",
-      "integrity": "sha512-GYRicKmVK0C4fsKgaACaknOUAq9Oa2kwsjnpFhFcS/5p4Ht5IP9OVLbgIgcK4SRk92nVHFluurg1lumD9dBcLw==",
+      "version": "8.62.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.62.0.tgz",
+      "integrity": "sha512-+g5O3j0w2ldzC86Pv6fvbO/xhAonbJFIdf/MKQ1d30gndlsVzUOE83ldfSE15Qrl9fhFjK6AovHs5Wpp6vx86w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.61.1",
-        "@typescript-eslint/typescript-estree": "8.61.1",
-        "@typescript-eslint/utils": "8.61.1",
+        "@typescript-eslint/types": "8.62.0",
+        "@typescript-eslint/typescript-estree": "8.62.0",
+        "@typescript-eslint/utils": "8.62.0",
         "debug": "^4.4.3",
         "ts-api-utils": "^2.5.0"
       },
@@ -2026,9 +2026,9 @@
       }
     },
     "node_modules/@typescript-eslint/types": {
-      "version": "8.61.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.61.1.tgz",
-      "integrity": "sha512-G+CRlPqLv7Bz1IZVs03x5K59F1veqL0EJUROAdGhKsEq8qOiRiZbI+HUojPq5l0fEGOKModD9br6lObhB8zkoA==",
+      "version": "8.62.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.62.0.tgz",
+      "integrity": "sha512-KvAclkktORPvM54TgLgA4z9HIV1M8zOgw9ZVNXl9f/8dLYfXYX1wkMXP7qmabpijQRV5bHJLOmoyGQbLMaUYeg==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -2040,16 +2040,16 @@
       }
     },
     "node_modules/@typescript-eslint/typescript-estree": {
-      "version": "8.61.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.61.1.tgz",
-      "integrity": "sha512-u+oQD3BqYWPc8YV9Zab4vaJElJuwOLPRc10Jm1o/qS+6Qwen14HCWwx0Seo4LnSn2wxea2Ik8DxPt2/FHmuhrg==",
+      "version": "8.62.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.62.0.tgz",
+      "integrity": "sha512-+hVbNxtW64pIcZWDPGbyaKF7vp2IBTVY5ma1blwwksrjdsbdqqEKvJWMGbBofei4F6Dovx1M0RJgoFeNu2279A==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/project-service": "8.61.1",
-        "@typescript-eslint/tsconfig-utils": "8.61.1",
-        "@typescript-eslint/types": "8.61.1",
-        "@typescript-eslint/visitor-keys": "8.61.1",
+        "@typescript-eslint/project-service": "8.62.0",
+        "@typescript-eslint/tsconfig-utils": "8.62.0",
+        "@typescript-eslint/types": "8.62.0",
+        "@typescript-eslint/visitor-keys": "8.62.0",
         "debug": "^4.4.3",
         "minimatch": "^10.2.2",
         "semver": "^7.7.3",
@@ -2068,16 +2068,16 @@
       }
     },
     "node_modules/@typescript-eslint/utils": {
-      "version": "8.61.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.61.1.tgz",
-      "integrity": "sha512-1+P/3Dj6jvtybE1q0HQ6yBt/gq+oKJyLdEv4HdnqasaEXRSYCAsD59mXEVQnM/ULNdQxbX77tdG4jPRjIS6knA==",
+      "version": "8.62.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.62.0.tgz",
+      "integrity": "sha512-82r66fi9zYwZ+mTq3vKgwjbZ1PVk/DJzrXFLpG6RnBbdvH8TEGVHIs9H4d2drhkOzf0syZuD/OZvvlu6GDbP4g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.9.1",
-        "@typescript-eslint/scope-manager": "8.61.1",
-        "@typescript-eslint/types": "8.61.1",
-        "@typescript-eslint/typescript-estree": "8.61.1"
+        "@typescript-eslint/scope-manager": "8.62.0",
+        "@typescript-eslint/types": "8.62.0",
+        "@typescript-eslint/typescript-estree": "8.62.0"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -2092,13 +2092,13 @@
       }
     },
     "node_modules/@typescript-eslint/visitor-keys": {
-      "version": "8.61.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.61.1.tgz",
-      "integrity": "sha512-6fJ9MHWtK14C1DSkiMlHUSOmrVebL7150xZJBlJiL62jjhIA4JmOq6flwBgDxIdBKKdoiZRel+dfPD5MLfny3w==",
+      "version": "8.62.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.62.0.tgz",
+      "integrity": "sha512-CY3uyFSRbcQv3nnSv8S0+lDftMVz6P963PoRlxrV7ew/Md564g9ut60PYzdLM5qW4jFn93GBF+Soi90ISAN+GQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.61.1",
+        "@typescript-eslint/types": "8.62.0",
         "eslint-visitor-keys": "^5.0.0"
       },
       "engines": {
@@ -3647,9 +3647,9 @@
       }
     },
     "node_modules/immutable": {
-      "version": "5.1.6",
-      "resolved": "https://registry.npmjs.org/immutable/-/immutable-5.1.6.tgz",
-      "integrity": "sha512-q1swsS8K7L8usSHuOqF2TAoCCkonYz0SG38wLAggaa4Wml70zixIvt2ql4coQ2C2B3hTjltJry4r6bULwgAXLQ==",
+      "version": "5.1.7",
+      "resolved": "https://registry.npmjs.org/immutable/-/immutable-5.1.7.tgz",
+      "integrity": "sha512-47Xb+LFbZ/ZIjQMj6Q5J3IfK7PJFuqRdFOC9FpGgRTK6U2dAEVmkR9hp58qU4FpYux5YXpneDwkj2EP6lppzFA==",
       "dev": true,
       "license": "MIT"
     },
@@ -4038,9 +4038,9 @@
       "license": "MIT"
     },
     "node_modules/nanoid": {
-      "version": "3.3.13",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.13.tgz",
-      "integrity": "sha512-sPdqC6ByMVVGvF1ynvvMo0/o+oD1VX7DaHhijt1bFgjvBkHBib4t49GoNDhf2NDta4oeUNlaGbSt5K7qjZ955Q==",
+      "version": "3.3.15",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.15.tgz",
+      "integrity": "sha512-y7Wygv/7mEOvxTuEQDB8StXdMRBWf1kR/tlhAzBRUFkB2jfcLOAxO/SHmOO2zgz1pVgK29/kyupn059/bCHdjA==",
       "funding": [
         {
           "type": "github",
@@ -4461,9 +4461,9 @@
       }
     },
     "node_modules/rollup": {
-      "version": "4.62.1",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.62.1.tgz",
-      "integrity": "sha512-XTvxjHHM/0J/WZBg+ehDbAZgIpZoIZtWO+aImyuhjoyQa56NBX/bqnXw32rT27fkjSRrqthOgkLjRVtwXFI7jQ==",
+      "version": "4.62.2",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.62.2.tgz",
+      "integrity": "sha512-RFnrW4lhXA3s3eqHDZvN654g8OTjzRfqpIRJYczCGB6HzphckVAi/Qh4tbPUbRuDi7s1Llv8g/NspLkttY3gTA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -4477,31 +4477,31 @@
         "npm": ">=8.0.0"
       },
       "optionalDependencies": {
-        "@rollup/rollup-android-arm-eabi": "4.62.1",
-        "@rollup/rollup-android-arm64": "4.62.1",
-        "@rollup/rollup-darwin-arm64": "4.62.1",
-        "@rollup/rollup-darwin-x64": "4.62.1",
-        "@rollup/rollup-freebsd-arm64": "4.62.1",
-        "@rollup/rollup-freebsd-x64": "4.62.1",
-        "@rollup/rollup-linux-arm-gnueabihf": "4.62.1",
-        "@rollup/rollup-linux-arm-musleabihf": "4.62.1",
-        "@rollup/rollup-linux-arm64-gnu": "4.62.1",
-        "@rollup/rollup-linux-arm64-musl": "4.62.1",
-        "@rollup/rollup-linux-loong64-gnu": "4.62.1",
-        "@rollup/rollup-linux-loong64-musl": "4.62.1",
-        "@rollup/rollup-linux-ppc64-gnu": "4.62.1",
-        "@rollup/rollup-linux-ppc64-musl": "4.62.1",
-        "@rollup/rollup-linux-riscv64-gnu": "4.62.1",
-        "@rollup/rollup-linux-riscv64-musl": "4.62.1",
-        "@rollup/rollup-linux-s390x-gnu": "4.62.1",
-        "@rollup/rollup-linux-x64-gnu": "4.62.1",
-        "@rollup/rollup-linux-x64-musl": "4.62.1",
-        "@rollup/rollup-openbsd-x64": "4.62.1",
-        "@rollup/rollup-openharmony-arm64": "4.62.1",
-        "@rollup/rollup-win32-arm64-msvc": "4.62.1",
-        "@rollup/rollup-win32-ia32-msvc": "4.62.1",
-        "@rollup/rollup-win32-x64-gnu": "4.62.1",
-        "@rollup/rollup-win32-x64-msvc": "4.62.1",
+        "@rollup/rollup-android-arm-eabi": "4.62.2",
+        "@rollup/rollup-android-arm64": "4.62.2",
+        "@rollup/rollup-darwin-arm64": "4.62.2",
+        "@rollup/rollup-darwin-x64": "4.62.2",
+        "@rollup/rollup-freebsd-arm64": "4.62.2",
+        "@rollup/rollup-freebsd-x64": "4.62.2",
+        "@rollup/rollup-linux-arm-gnueabihf": "4.62.2",
+        "@rollup/rollup-linux-arm-musleabihf": "4.62.2",
+        "@rollup/rollup-linux-arm64-gnu": "4.62.2",
+        "@rollup/rollup-linux-arm64-musl": "4.62.2",
+        "@rollup/rollup-linux-loong64-gnu": "4.62.2",
+        "@rollup/rollup-linux-loong64-musl": "4.62.2",
+        "@rollup/rollup-linux-ppc64-gnu": "4.62.2",
+        "@rollup/rollup-linux-ppc64-musl": "4.62.2",
+        "@rollup/rollup-linux-riscv64-gnu": "4.62.2",
+        "@rollup/rollup-linux-riscv64-musl": "4.62.2",
+        "@rollup/rollup-linux-s390x-gnu": "4.62.2",
+        "@rollup/rollup-linux-x64-gnu": "4.62.2",
+        "@rollup/rollup-linux-x64-musl": "4.62.2",
+        "@rollup/rollup-openbsd-x64": "4.62.2",
+        "@rollup/rollup-openharmony-arm64": "4.62.2",
+        "@rollup/rollup-win32-arm64-msvc": "4.62.2",
+        "@rollup/rollup-win32-ia32-msvc": "4.62.2",
+        "@rollup/rollup-win32-x64-gnu": "4.62.2",
+        "@rollup/rollup-win32-x64-msvc": "4.62.2",
         "fsevents": "~2.3.2"
       }
     },
@@ -4540,9 +4540,9 @@
       }
     },
     "node_modules/semver": {
-      "version": "7.8.4",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.8.4.tgz",
-      "integrity": "sha512-rUCObTnP32Q08R2uuIrt7r9PlEonuTmtuXYcW6s5kjdlj3xbnwe+21yXptAUYcMAABLkYYTtnmzb3w3EDZfueA==",
+      "version": "7.8.5",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.8.5.tgz",
+      "integrity": "sha512-Y7/KDsb8LjooZpwaqGyulO6DQlksgCncchHGk+sZIY4SBvUocMBEFH5Ur1fI4dV+Jvl0w6cjvucaIi40puRioA==",
       "dev": true,
       "license": "ISC",
       "bin": {
@@ -4852,22 +4852,22 @@
       }
     },
     "node_modules/tldts": {
-      "version": "7.4.3",
-      "resolved": "https://registry.npmjs.org/tldts/-/tldts-7.4.3.tgz",
-      "integrity": "sha512-A3BDQBeeukYPzB4QdQ1DtdlUmp4x2OCH8n5UVhEWbyANxNep8GavottKzd1xYKFJKjUgMyPT7EzOfnBO55s8Sg==",
+      "version": "7.4.4",
+      "resolved": "https://registry.npmjs.org/tldts/-/tldts-7.4.4.tgz",
+      "integrity": "sha512-kFXFK7O4WPextIUAOk8qtnw9dxR9UIXP9CjuH1cTBVBZMDeQcUPgr/IazGiw1B0Yiw5L75gHLWeW4iD793r90g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "tldts-core": "^7.4.3"
+        "tldts-core": "^7.4.4"
       },
       "bin": {
         "tldts": "bin/cli.js"
       }
     },
     "node_modules/tldts-core": {
-      "version": "7.4.3",
-      "resolved": "https://registry.npmjs.org/tldts-core/-/tldts-core-7.4.3.tgz",
-      "integrity": "sha512-27ep5H9PzdBrNd5OFM/j3WCU8F3kPwM9D0BOaOf7uYfxMJfyr0K5Tjj69Gri+sZlh2WXd5buIm47NuPF29CDiw==",
+      "version": "7.4.4",
+      "resolved": "https://registry.npmjs.org/tldts-core/-/tldts-core-7.4.4.tgz",
+      "integrity": "sha512-vwVLJVvvpslm7vqAH7+XNj/neA/Ynq7DT2EEcMuwc5YzN5XaMyRAqxwU+uX3azZ1FQtB2gvrvnLnAEkvYlVdfg==",
       "dev": true,
       "license": "MIT"
     },
@@ -4961,16 +4961,16 @@
       }
     },
     "node_modules/typescript-eslint": {
-      "version": "8.61.1",
-      "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.61.1.tgz",
-      "integrity": "sha512-V7PayAfJokV3pEHgN7/v03D1SpujhRfQtYLbLIiBfDDncdg4PAiRBfoS4cnCANK4jmAPncczi59QO3afiXUlNw==",
+      "version": "8.62.0",
+      "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.62.0.tgz",
+      "integrity": "sha512-8QxXi+ZACKX0kaqO4gY8kn0RSD9gFfaHDWwjqtEN48aWCBkX4MJaufWN+c3BzlrXLOxfywDL8CaoqUwcRq4j4Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/eslint-plugin": "8.61.1",
-        "@typescript-eslint/parser": "8.61.1",
-        "@typescript-eslint/typescript-estree": "8.61.1",
-        "@typescript-eslint/utils": "8.61.1"
+        "@typescript-eslint/eslint-plugin": "8.62.0",
+        "@typescript-eslint/parser": "8.62.0",
+        "@typescript-eslint/typescript-estree": "8.62.0",
+        "@typescript-eslint/utils": "8.62.0"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
diff --git a/client/package.json b/client/package.json
index 08babe02b..3089496df 100644
--- a/client/package.json
+++ b/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "client",
-  "version": "0.32.4",
+  "version": "0.33.0",
   "description": "DigiScript front end",
   "author": "DreamTeamProd",
   "private": true,
@@ -57,8 +57,8 @@
     "@types/lodash": "~4.17.24",
     "@types/node": "~20.14.0",
     "@types/vuelidate": "^0.7.22",
-    "@typescript-eslint/eslint-plugin": "^8.61.1",
-    "@typescript-eslint/parser": "^8.61.1",
+    "@typescript-eslint/eslint-plugin": "^8.62.0",
+    "@typescript-eslint/parser": "^8.62.0",
     "@vitejs/plugin-vue2": "2.3.4",
     "@vitest/ui": "^4.1.9",
     "@vue/test-utils": "^2.4.11",
@@ -72,7 +72,7 @@
     "prettier": "^3.8.4",
     "sass": "1.101.0",
     "typescript": "^6.0.3",
-    "typescript-eslint": "^8.61.1",
+    "typescript-eslint": "^8.62.0",
     "vite": "^7.3.3",
     "vitest": "^4.1.9"
   },
diff --git a/client/src/mixins/cueDisplayMixin.ts b/client/src/mixins/cueDisplayMixin.ts
index f53cba34f..d696086d5 100644
--- a/client/src/mixins/cueDisplayMixin.ts
+++ b/client/src/mixins/cueDisplayMixin.ts
@@ -1,7 +1,7 @@
 import { defineComponent } from 'vue';
 import { mapGetters } from 'vuex';
 import { contrastColor } from 'contrast-color';
-import type { Cue, CueType } from '@/types/api/cues';
+import type { Cue, CueGroup, CueType } from '@/types/api/cues';
 import type { CueColourOverride } from '@/types/api/user';
 
 export default defineComponent({
@@ -33,5 +33,46 @@ export default defineComponent({
       if (override) return (override as any).settings.colour;
       return cueType.colour ?? '#000000';
     },
+    cueGroupLabel(group: CueGroup, cues: Cue[]): string {
+      const cueType: CueType | undefined = (this as any).cueTypes?.find(
+        (cT: CueType) => cT.id === group.cue_type_id
+      );
+      const prefix = cueType?.prefix ?? '';
+      if (group.label_override) return `${prefix} - ${group.label_override}`;
+      if (cues.length === 0) return prefix;
+      const first = cues[0].ident ?? '';
+      const last = cues[cues.length - 1].ident ?? '';
+      if (first === last) return `${prefix} ${first}`;
+      return `${prefix} ${first} - ${prefix} ${last}`;
+    },
+    cueGroupBackgroundColour(group: CueGroup): string {
+      const cueType: CueType | undefined = (this as any).cueTypes?.find(
+        (ct: CueType) => ct.id === group.cue_type_id
+      );
+      if (!cueType) return '#000000';
+      const override: CueColourOverride | undefined = this.CUE_COLOUR_OVERRIDES?.find(
+        (o: any) => o.settings?.id === cueType.id
+      );
+      if (override) return (override as any).settings.colour;
+      return cueType.colour ?? '#000000';
+    },
+    cueGroupPrefix(group: CueGroup): string {
+      const cueType: CueType | undefined = (this as any).cueTypes?.find(
+        (ct: CueType) => ct.id === group.cue_type_id
+      );
+      return cueType?.prefix ?? '';
+    },
+    cueGroupIdentLabel(group: CueGroup, cues: Cue[]): string {
+      const cueType: CueType | undefined = (this as any).cueTypes?.find(
+        (ct: CueType) => ct.id === group.cue_type_id
+      );
+      if (group.label_override) return `- ${group.label_override}`;
+      if (cues.length === 0) return '';
+      const first = cues[0].ident ?? '';
+      const last = cues[cues.length - 1].ident ?? '';
+      if (first === last) return first;
+      const prefix = cueType?.prefix ?? '';
+      return `${first} - ${prefix} ${last}`;
+    },
   },
 });
diff --git a/client/src/store/modules/script.ts b/client/src/store/modules/script.ts
index 740f9c9a1..3196141af 100644
--- a/client/src/store/modules/script.ts
+++ b/client/src/store/modules/script.ts
@@ -11,13 +11,14 @@ import type {
   ScriptCut,
   CompiledScript,
 } from '@/types/api/script';
-import type { Cue } from '@/types/api/cues';
+import type { Cue, CueGroup } from '@/types/api/cues';
 
 interface ScriptState {
   currentRevision: number | null;
   revisions: ScriptRevision[];
   script: Record<string, ScriptLine[]>;
   cues: Record<string, Cue[]>;
+  cueGroups: CueGroup[];
   cuts: ScriptCut[];
   stageDirectionStyles: StageDirectionStyle[];
   compiledScripts: CompiledScript[];
@@ -33,6 +34,7 @@ const module: Module<ScriptState, RootState> = {
     revisions: [],
     script: {},
     cues: {},
+    cueGroups: [],
     cuts: [],
     stageDirectionStyles: [],
     compiledScripts: [],
@@ -53,6 +55,9 @@ const module: Module<ScriptState, RootState> = {
     SET_CUES(state: ScriptState, cues: Record<string, Cue[]>) {
       state.cues = cues;
     },
+    SET_CUE_GROUPS(state: ScriptState, cueGroups: CueGroup[]) {
+      state.cueGroups = cueGroups;
+    },
     SET_CUTS(state: ScriptState, cuts: ScriptCut[]) {
       state.cuts = cuts;
     },
@@ -173,6 +178,7 @@ const module: Module<ScriptState, RootState> = {
       if (response.ok) {
         const respJson = await response.json();
         context.commit('SET_CUES', respJson.cues);
+        context.commit('SET_CUE_GROUPS', respJson.cue_groups ?? []);
       } else {
         log.error('Unable to load cues');
       }
@@ -222,6 +228,67 @@ const module: Module<ScriptState, RootState> = {
         VueToast.$toast.error('Unable to delete cue');
       }
     },
+    async ADD_CUE_GROUP(
+      context,
+      payload: {
+        cueTypeId: number;
+        labelOverride?: string;
+        lineId: number;
+        cues: { ident: string; sortOrder: number }[];
+      }
+    ) {
+      const response = await fetch(`${makeURL('/api/v1/show/cues/groups')}`, {
+        method: 'POST',
+        headers: { 'Content-Type': 'application/json' },
+        body: JSON.stringify(payload),
+      });
+      if (response.ok) {
+        context.dispatch('LOAD_CUES');
+        VueToast.$toast.success('Added cue group!');
+      } else {
+        log.error('Unable to add cue group');
+        VueToast.$toast.error('Unable to add cue group');
+      }
+    },
+    async EDIT_CUE_GROUP(
+      context,
+      payload: {
+        groupId: number;
+        labelOverride?: string;
+        lineId: number;
+        cues: { id?: number; ident: string; sortOrder: number }[];
+      }
+    ) {
+      const response = await fetch(`${makeURL('/api/v1/show/cues/groups')}`, {
+        method: 'PATCH',
+        headers: { 'Content-Type': 'application/json' },
+        body: JSON.stringify(payload),
+      });
+      if (response.ok) {
+        context.dispatch('LOAD_CUES');
+        VueToast.$toast.success('Edited cue group!');
+      } else {
+        log.error('Unable to edit cue group');
+        VueToast.$toast.error('Unable to edit cue group');
+      }
+    },
+    async DELETE_CUE_GROUP(context, payload: { groupId: number; lineId: number }) {
+      const params = new URLSearchParams({
+        groupId: String(payload.groupId),
+        lineId: String(payload.lineId),
+      });
+      const response = await fetch(`${makeURL('/api/v1/show/cues/groups')}?${params}`, {
+        method: 'DELETE',
+        headers: { 'Content-Type': 'application/json' },
+      });
+      if (response.ok) {
+        context.dispatch('LOAD_CUES');
+        VueToast.$toast.success('Deleted cue group!');
+      } else {
+        log.error('Unable to delete cue group');
+        VueToast.$toast.error('Unable to delete cue group');
+      }
+    },
     async SEARCH_CUES(
       _context,
       { identifier, cueTypeId }: { identifier: string; cueTypeId: number }
@@ -362,6 +429,34 @@ const module: Module<ScriptState, RootState> = {
     SCRIPT_CUES(state: ScriptState) {
       return state.cues;
     },
+    SCRIPT_CUE_GROUPS(state: ScriptState) {
+      return state.cueGroups;
+    },
+    GROUPED_CUES_FOR_LINE:
+      (state: ScriptState) =>
+      (
+        lineId: number | null
+      ): { individual: Cue[]; groups: { group: CueGroup; cues: Cue[] }[] } => {
+        if (lineId == null) return { individual: [], groups: [] };
+        const allCues = state.cues[String(lineId)] ?? [];
+        const individual = allCues.filter((c) => c.group_id == null);
+        const groupMap = new Map<number, Cue[]>();
+        for (const cue of allCues) {
+          if (cue.group_id != null) {
+            if (!groupMap.has(cue.group_id)) groupMap.set(cue.group_id, []);
+            groupMap.get(cue.group_id)!.push(cue);
+          }
+        }
+        const groups: { group: CueGroup; cues: Cue[] }[] = [];
+        for (const [groupId, cues] of groupMap) {
+          const group = state.cueGroups.find((g) => g.id === groupId);
+          if (group) {
+            const sorted = [...cues].sort((a, b) => (a.sort_order ?? 0) - (b.sort_order ?? 0));
+            groups.push({ group, cues: sorted });
+          }
+        }
+        return { individual, groups };
+      },
     SCRIPT_CUTS(state: ScriptState) {
       return state.cuts;
     },
diff --git a/client/src/types/api/cues.ts b/client/src/types/api/cues.ts
index 5fecb28b6..b2dbdb003 100644
--- a/client/src/types/api/cues.ts
+++ b/client/src/types/api/cues.ts
@@ -6,8 +6,16 @@ export interface CueType {
   colour: string | null;
 }
 
+export interface CueGroup {
+  id: number;
+  cue_type_id: number;
+  label_override: string | null;
+}
+
 export interface Cue {
   id: number;
   cue_type_id: number | null;
   ident: string | null;
+  group_id: number | null;
+  sort_order: number | null;
 }
diff --git a/client/src/vue_components/show/config/cues/CueGroupEditModal.vue b/client/src/vue_components/show/config/cues/CueGroupEditModal.vue
new file mode 100644
index 000000000..a09f509a6
--- /dev/null
+++ b/client/src/vue_components/show/config/cues/CueGroupEditModal.vue
@@ -0,0 +1,140 @@
+<template>
+  <b-modal :id="modalId" title="Edit Cue Group" size="lg" scrollable @hidden="onHidden">
+    <CueGroupForm
+      ref="groupForm"
+      :cue-type-options="cueTypeOptions"
+      :cue-types="cueTypes"
+      :readonly="groupId != null"
+      class="mt-1"
+      @validity-change="isFormValid = $event"
+    />
+    <template #modal-footer>
+      <b-button
+        v-if="groupId != null"
+        variant="danger"
+        :disabled="saving || deleting"
+        @click="onDelete"
+      >
+        Delete Group
+      </b-button>
+      <div v-else />
+      <div class="ml-auto d-flex" style="gap: 0.5rem">
+        <b-button
+          variant="secondary"
+          :disabled="saving || deleting"
+          @click="$bvModal.hide(modalId)"
+        >
+          Cancel
+        </b-button>
+        <b-button variant="primary" :disabled="!isFormValid || saving || deleting" @click="onSave">
+          {{ saving ? 'Saving…' : 'Save Group' }}
+        </b-button>
+      </div>
+    </template>
+  </b-modal>
+</template>
+
+<script lang="ts">
+import { defineComponent } from 'vue';
+import { mapActions } from 'vuex';
+import type { CueGroup, Cue } from '@/types/api/cues';
+import CueGroupForm from './CueGroupForm.vue';
+
+export default defineComponent({
+  name: 'CueGroupEditModal',
+  components: { CueGroupForm },
+  props: {
+    lineId: {
+      required: true,
+      type: Number,
+    },
+    lineIndex: {
+      required: true,
+      type: Number,
+    },
+    cueTypeOptions: {
+      required: true,
+      type: Array,
+    },
+    cueTypes: {
+      required: true,
+      type: Array,
+    },
+  },
+  data() {
+    return {
+      groupId: null as number | null,
+      activeLineId: null as number | null,
+      saving: false,
+      deleting: false,
+      isFormValid: false,
+    };
+  },
+  computed: {
+    modalId(): string {
+      return `line_${this.lineIndex}_-group-modal`;
+    },
+  },
+  methods: {
+    onHidden(): void {
+      this.saving = false;
+      this.deleting = false;
+      this.activeLineId = null;
+    },
+    effectiveLineId(): number {
+      return this.activeLineId ?? this.lineId;
+    },
+    async onSave(): Promise<void> {
+      if (!this.isFormValid || this.saving || this.groupId == null) return;
+      this.saving = true;
+      try {
+        const data = (this.$refs.groupForm as any).getFormData();
+        const cuesPayload = data.cues.map((c: any, i: number) => ({
+          id: c.id,
+          ident: c.ident,
+          sortOrder: i,
+        }));
+        await (this as any).EDIT_CUE_GROUP({
+          groupId: this.groupId,
+          labelOverride: data.labelOverride || undefined,
+          lineId: this.effectiveLineId(),
+          cues: cuesPayload,
+        });
+        (this as any).$bvModal.hide(this.modalId);
+      } finally {
+        this.saving = false;
+      }
+    },
+    async onDelete(): Promise<void> {
+      if (this.deleting || this.groupId == null) return;
+      const confirmed = await (this as any).$bvModal.msgBoxConfirm(
+        'Delete this cue group and all its cues?',
+        { title: 'Delete Cue Group', okVariant: 'danger', okTitle: 'Delete' }
+      );
+      if (!confirmed) return;
+      this.deleting = true;
+      try {
+        await (this as any).DELETE_CUE_GROUP({
+          groupId: this.groupId,
+          lineId: this.effectiveLineId(),
+        });
+        (this as any).$bvModal.hide(this.modalId);
+      } finally {
+        this.deleting = false;
+      }
+    },
+    openEdit(group: CueGroup, cues: Cue[], lineId?: number): void {
+      this.groupId = group.id;
+      this.activeLineId = lineId ?? null;
+      this.isFormValid = true;
+      (this.$refs.groupForm as any)?.reset({
+        cueTypeId: group.cue_type_id,
+        labelOverride: group.label_override ?? '',
+        cues: cues.map((c) => ({ id: c.id, ident: c.ident ?? '' })),
+      });
+      (this as any).$bvModal.show(this.modalId);
+    },
+    ...mapActions(['EDIT_CUE_GROUP', 'DELETE_CUE_GROUP']),
+  },
+});
+</script>
diff --git a/client/src/vue_components/show/config/cues/CueGroupForm.vue b/client/src/vue_components/show/config/cues/CueGroupForm.vue
new file mode 100644
index 000000000..c48d34291
--- /dev/null
+++ b/client/src/vue_components/show/config/cues/CueGroupForm.vue
@@ -0,0 +1,298 @@
+<template>
+  <div>
+    <b-form-group label="Cue Type">
+      <b-form-select v-model="localCueTypeId" :options="groupCueTypeOptions" :disabled="readonly" />
+    </b-form-group>
+
+    <b-form-group
+      label="Label Override"
+      description="Optional — leave blank for automatic label based on first/last cue."
+    >
+      <b-form-input v-model="localLabelOverride" placeholder="e.g. Music Intro" />
+    </b-form-group>
+
+    <div v-if="localCueTypeId != null" class="mb-3 d-flex align-items-center">
+      <small class="text-muted mr-2">Preview:</small>
+      <span
+        class="badge"
+        :style="{
+          backgroundColor: previewColour,
+          color: contrastColor({ bgColor: previewColour }),
+          padding: '0.3rem 0.5rem',
+          fontSize: '0.9rem',
+        }"
+      >
+        {{ previewLabel }}
+      </span>
+    </div>
+
+    <b-form-group label="Cues">
+      <div v-if="localCues.length === 0" class="text-muted small mb-2">
+        No cues yet. Add a range or single cue below.
+      </div>
+      <div class="cue-list-scroll">
+        <div
+          v-for="(cue, index) in localCues"
+          :key="index"
+          class="d-flex align-items-center mb-1 cue-row"
+          style="gap: 0.5rem"
+          :class="{ 'drag-over': dragOverIndex === index && dragIndex !== index }"
+          @dragover.prevent="dragOverIndex = index"
+          @dragleave="dragOverIndex = null"
+          @drop.prevent="onDrop(index)"
+        >
+          <span
+            draggable="true"
+            class="drag-handle"
+            @dragstart="onDragStart(index, $event)"
+            @dragend="onDragEnd"
+          >
+            <b-icon-grip-vertical />
+          </span>
+          <b-form-input v-model="cue.ident" placeholder="Identifier" />
+          <b-button
+            size="sm"
+            variant="outline-secondary"
+            :disabled="index === 0"
+            @click="moveUp(index)"
+          >
+            <b-icon-chevron-up />
+          </b-button>
+          <b-button
+            size="sm"
+            variant="outline-secondary"
+            :disabled="index === localCues.length - 1"
+            @click="moveDown(index)"
+          >
+            <b-icon-chevron-down />
+          </b-button>
+          <b-button size="sm" variant="outline-danger" @click="removeCue(index)">
+            <b-icon-x />
+          </b-button>
+        </div>
+      </div>
+    </b-form-group>
+
+    <b-form-group label="Add Range" description="e.g. 1 > 100 adds cues 1 through 100">
+      <b-input-group>
+        <b-form-input
+          v-model="rangeInput"
+          placeholder="1 > 100"
+          :state="rangeState"
+          @keyup.enter="addRange"
+        />
+        <b-input-group-append>
+          <b-button variant="outline-primary" :disabled="!canAddRange" @click="addRange">
+            Add Range
+          </b-button>
+        </b-input-group-append>
+      </b-input-group>
+      <b-form-invalid-feedback :state="rangeState">
+        Use format: start &gt; end (e.g. 1 &gt; 100), max 10000 cues per range.
+      </b-form-invalid-feedback>
+    </b-form-group>
+
+    <b-button class="mb-2" size="sm" variant="outline-secondary" @click="addSingleCue">
+      <b-icon-plus-square-fill /> Add Single Cue
+    </b-button>
+  </div>
+</template>
+
+<script lang="ts">
+import { defineComponent } from 'vue';
+import { mapGetters } from 'vuex';
+import { contrastColor } from 'contrast-color';
+import type { CueType } from '@/types/api/cues';
+
+export default defineComponent({
+  name: 'CueGroupForm',
+  props: {
+    cueTypeOptions: {
+      required: true,
+      type: Array,
+    },
+    cueTypes: {
+      required: true,
+      type: Array,
+    },
+    readonly: {
+      type: Boolean,
+      default: false,
+    },
+  },
+  data() {
+    return {
+      localCueTypeId: null as number | null,
+      localLabelOverride: '',
+      localCues: [] as { id?: number; ident: string }[],
+      rangeInput: '',
+      dragIndex: null as number | null,
+      dragOverIndex: null as number | null,
+    };
+  },
+  computed: {
+    groupCueTypeOptions(): unknown[] {
+      return (this.cueTypeOptions as any[]).filter((o) => o.value !== null);
+    },
+    previewLabel(): string {
+      if (this.localCueTypeId == null) return '';
+      const cueType = (this.cueTypes as CueType[]).find((ct) => ct.id === this.localCueTypeId);
+      const prefix = cueType?.prefix ?? '';
+      if (this.localLabelOverride) return `${prefix} - ${this.localLabelOverride}`;
+      if (this.localCues.length === 0) return prefix;
+      const first = this.localCues[0].ident;
+      const last = this.localCues[this.localCues.length - 1].ident;
+      if (first === last) return `${prefix} ${first}`;
+      return `${prefix} ${first} - ${prefix} ${last}`;
+    },
+    previewColour(): string {
+      if (this.localCueTypeId == null) return '#000000';
+      const cueType = (this.cueTypes as CueType[]).find((ct) => ct.id === this.localCueTypeId);
+      if (!cueType) return '#000000';
+      const override = (this.CUE_COLOUR_OVERRIDES as any[]).find(
+        (o: any) => o.settings?.id === cueType.id
+      );
+      return override?.settings?.colour ?? cueType.colour ?? '#000000';
+    },
+    ...mapGetters(['CUE_COLOUR_OVERRIDES']),
+    rangeState(): boolean | null {
+      if (!this.rangeInput.trim()) return null;
+      return this.parseRange(this.rangeInput) !== null;
+    },
+    canAddRange(): boolean {
+      return !!this.rangeInput.trim() && this.parseRange(this.rangeInput) !== null;
+    },
+    canSave(): boolean {
+      return (
+        this.localCueTypeId != null &&
+        this.localCues.length > 0 &&
+        this.localCues.every((c) => c.ident.trim() !== '')
+      );
+    },
+  },
+  watch: {
+    canSave(val: boolean): void {
+      this.$emit('validity-change', val);
+    },
+  },
+  methods: {
+    contrastColor,
+    parseRange(input: string): number[] | null {
+      const match = input.trim().match(/^(\d+)\s*>\s*(\d+)$/);
+      if (!match) return null;
+      const start = parseInt(match[1], 10);
+      const end = parseInt(match[2], 10);
+      if (start > end || end - start >= 10000) return null;
+      return Array.from({ length: end - start + 1 }, (_, i) => start + i);
+    },
+    addRange(): void {
+      const nums = this.parseRange(this.rangeInput);
+      if (!nums) return;
+      for (const n of nums) this.localCues.push({ ident: String(n) });
+      this.rangeInput = '';
+    },
+    addSingleCue(): void {
+      this.localCues.push({ ident: '' });
+    },
+    removeCue(index: number): void {
+      this.localCues.splice(index, 1);
+    },
+    moveUp(index: number): void {
+      if (index === 0) return;
+      const arr = this.localCues;
+      const tmp = arr[index - 1];
+      this.$set(arr, index - 1, arr[index]);
+      this.$set(arr, index, tmp);
+    },
+    moveDown(index: number): void {
+      const arr = this.localCues;
+      if (index === arr.length - 1) return;
+      const tmp = arr[index];
+      this.$set(arr, index, arr[index + 1]);
+      this.$set(arr, index + 1, tmp);
+    },
+    onDragStart(index: number, event: DragEvent): void {
+      this.dragIndex = index;
+      const { dataTransfer } = event;
+      if (dataTransfer) {
+        dataTransfer.effectAllowed = 'move';
+        dataTransfer.setData('text/plain', '');
+      }
+    },
+    onDrop(targetIndex: number): void {
+      if (this.dragIndex === null || this.dragIndex === targetIndex) {
+        this.dragIndex = null;
+        this.dragOverIndex = null;
+        return;
+      }
+      const items = [...this.localCues];
+      const [removed] = items.splice(this.dragIndex, 1);
+      items.splice(targetIndex, 0, removed);
+      this.localCues = items;
+      this.dragIndex = null;
+      this.dragOverIndex = null;
+    },
+    onDragEnd(): void {
+      this.dragIndex = null;
+      this.dragOverIndex = null;
+    },
+    reset(initial?: {
+      cueTypeId?: number | null;
+      labelOverride?: string;
+      cues?: { id?: number; ident: string }[];
+    }): void {
+      this.localCueTypeId = initial?.cueTypeId ?? null;
+      this.localLabelOverride = initial?.labelOverride ?? '';
+      this.localCues = initial?.cues ? [...initial.cues] : [];
+      this.rangeInput = '';
+      this.dragIndex = null;
+      this.dragOverIndex = null;
+    },
+    getFormData(): {
+      cueTypeId: number | null;
+      labelOverride: string;
+      cues: { id?: number; ident: string }[];
+    } {
+      return {
+        cueTypeId: this.localCueTypeId,
+        labelOverride: this.localLabelOverride,
+        cues: [...this.localCues],
+      };
+    },
+    isValid(): boolean {
+      return this.canSave;
+    },
+  },
+});
+</script>
+
+<style scoped>
+.cue-list-scroll {
+  border: 1px solid #dee2e6;
+  border-radius: 0.25rem;
+  padding: 0.25rem 0.5rem;
+  margin-bottom: 0.5rem;
+}
+
+.cue-row {
+  border-radius: 4px;
+  transition: background-color 0.1s ease;
+}
+
+.cue-row.drag-over {
+  background-color: rgba(0, 123, 255, 0.1);
+}
+
+.drag-handle {
+  cursor: grab;
+  color: #6c757d;
+  flex-shrink: 0;
+  display: flex;
+  align-items: center;
+  padding: 0.25rem;
+}
+
+.drag-handle:active {
+  cursor: grabbing;
+}
+</style>
diff --git a/client/src/vue_components/show/config/cues/ScriptLineCueEditor.vue b/client/src/vue_components/show/config/cues/ScriptLineCueEditor.vue
index cceed97d3..e7c244e09 100644
--- a/client/src/vue_components/show/config/cues/ScriptLineCueEditor.vue
+++ b/client/src/vue_components/show/config/cues/ScriptLineCueEditor.vue
@@ -13,7 +13,7 @@
       <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 cues"
+            v-for="cue in individualCues"
             :key="cue.id"
             :disabled="!IS_CUE_EDITOR"
             class="cue-button"
@@ -25,6 +25,19 @@
           >
             {{ 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>
           <b-button
             v-if="IS_CUE_EDITOR"
             class="cue-button add-cue-btn"
@@ -96,111 +109,162 @@
         </b-col>
       </template>
     </b-row>
+    <!-- Cue Group Modal (edit only) -->
+    <CueGroupEditModal
+      ref="groupModal"
+      :line-id="line.id"
+      :line-index="lineIndex"
+      :cue-type-options="cueTypeOptions"
+      :cue-types="cueTypes"
+    />
+
+    <!-- Add Cue Modal (tabs: Individual Cue / Cue Group) -->
     <b-modal
       :id="`line_${lineIndex}_-new-cue`"
-      title="Add New Cue"
+      title="Add Cue"
       size="md"
-      :ok-disabled="$v.newFormState.$invalid || submittingNewCue"
+      scrollable
+      hide-footer
       @hidden="resetNewForm"
-      @ok="onSubmitNew"
     >
-      <b-form ref="new-cue-form" @submit.stop.prevent="onSubmitNew">
-        <b-form-group id="new-type-input-group" label="Cue Type" label-for="new-type-input">
-          <b-form-select
-            id="new-type-input"
-            v-model="$v.newFormState.cueType.$model"
-            :options="cueTypeOptions"
-            :state="validateNewState('cueType')"
-            aria-describedby="new-cue-type-feedback"
-          />
-          <b-form-invalid-feedback id="new-cue-type-feedback">
-            This is a required field.
-          </b-form-invalid-feedback>
-        </b-form-group>
-        <b-form-group id="new-ident-input-group" label="Identifier" label-for="new-ident-input">
-          <b-form-input
-            id="new-ident-input"
-            v-model="$v.newFormState.ident.$model"
-            name="new-ident-input"
-            :state="validateNewState('ident')"
-            aria-describedby="new-ident-feedback"
-          />
-          <b-form-invalid-feedback id="new-ident-feedback">
-            This is a required field.
-          </b-form-invalid-feedback>
-        </b-form-group>
-        <b-form-group>
-          <b-form-text v-if="isDuplicateNewCue" class="text-warning">
-            ⚠️ A cue with this identifier already exists for this cue type
-          </b-form-text>
-        </b-form-group>
-        <template
-          v-if="
-            line.line_type === LINE_TYPES.DIALOGUE || line.line_type === LINE_TYPES.STAGE_DIRECTION
-          "
-        >
-          <hr />
-          <b-form-group id="line-render-group" label="Script Line" label-for="line-render">
-            <b-form-text id="line-render">
-              <b-row>
-                <template v-if="line.line_type === LINE_TYPES.STAGE_DIRECTION">
-                  <b-col
-                    :key="`line_${lineIndex}_stage_direction`"
-                    :style="{ textAlign: scriptTextAlign }"
-                  >
-                    <i
-                      class="viewable-line"
-                      :class="{
-                        'cut-line-part': linePartCuts.indexOf(line.line_parts[0].id) !== -1,
-                      }"
-                      :style="stageDirectionStyling"
-                    >
-                      <template
-                        v-if="
-                          stageDirectionStyle != null && stageDirectionStyle.text_format === 'upper'
-                        "
+      <b-tabs v-model="activeTab" class="mt-1">
+        <b-tab title="Individual Cue">
+          <b-form class="mt-3" @submit.stop.prevent="onSubmitNew">
+            <b-form-group id="new-type-input-group" label="Cue Type" label-for="new-type-input">
+              <b-form-select
+                id="new-type-input"
+                v-model="$v.newFormState.cueType.$model"
+                :options="cueTypeOptions"
+                :state="validateNewState('cueType')"
+                aria-describedby="new-cue-type-feedback"
+              />
+              <b-form-invalid-feedback id="new-cue-type-feedback">
+                This is a required field.
+              </b-form-invalid-feedback>
+            </b-form-group>
+            <b-form-group id="new-ident-input-group" label="Identifier" label-for="new-ident-input">
+              <b-form-input
+                id="new-ident-input"
+                v-model="$v.newFormState.ident.$model"
+                name="new-ident-input"
+                :state="validateNewState('ident')"
+                aria-describedby="new-ident-feedback"
+              />
+              <b-form-invalid-feedback id="new-ident-feedback">
+                This is a required field.
+              </b-form-invalid-feedback>
+            </b-form-group>
+            <b-form-group>
+              <b-form-text v-if="isDuplicateNewCue" class="text-warning">
+                ⚠️ A cue with this identifier already exists for this cue type
+              </b-form-text>
+            </b-form-group>
+            <template
+              v-if="
+                line.line_type === LINE_TYPES.DIALOGUE ||
+                line.line_type === LINE_TYPES.STAGE_DIRECTION
+              "
+            >
+              <hr />
+              <b-form-group id="line-render-group" label="Script Line" label-for="line-render">
+                <b-form-text id="line-render">
+                  <b-row>
+                    <template v-if="line.line_type === LINE_TYPES.STAGE_DIRECTION">
+                      <b-col
+                        :key="`line_${lineIndex}_stage_direction`"
+                        :style="{ textAlign: scriptTextAlign }"
                       >
-                        {{ line.line_parts[0].line_text | uppercase }}
-                      </template>
-                      <template
-                        v-else-if="
-                          stageDirectionStyle != null && stageDirectionStyle.text_format === 'lower'
-                        "
+                        <i
+                          class="viewable-line"
+                          :class="{
+                            'cut-line-part': linePartCuts.indexOf(line.line_parts[0].id) !== -1,
+                          }"
+                          :style="stageDirectionStyling"
+                        >
+                          <template
+                            v-if="
+                              stageDirectionStyle != null &&
+                              stageDirectionStyle.text_format === 'upper'
+                            "
+                          >
+                            {{ line.line_parts[0].line_text | uppercase }}
+                          </template>
+                          <template
+                            v-else-if="
+                              stageDirectionStyle != null &&
+                              stageDirectionStyle.text_format === 'lower'
+                            "
+                          >
+                            {{ line.line_parts[0].line_text | lowercase }}
+                          </template>
+                          <template v-else>
+                            {{ line.line_parts[0].line_text }}
+                          </template>
+                        </i>
+                      </b-col>
+                    </template>
+                    <template v-else>
+                      <b-col
+                        v-for="(part, index) in line.line_parts"
+                        :key="`line_${lineIndex}_part_${index}`"
+                        :style="headingStyle"
                       >
-                        {{ line.line_parts[0].line_text | lowercase }}
-                      </template>
-                      <template v-else>
-                        {{ line.line_parts[0].line_text }}
-                      </template>
-                    </i>
-                  </b-col>
-                </template>
-                <template v-else>
-                  <b-col
-                    v-for="(part, index) in line.line_parts"
-                    :key="`line_${lineIndex}_part_${index}`"
-                    :style="headingStyle"
-                  >
-                    <b v-if="part.character_id != null">
-                      {{ characters.find((char) => char.id === part.character_id).name }}
-                    </b>
-                    <b v-else>
-                      {{ characterGroups.find((char) => char.id === part.character_group_id).name }}
-                    </b>
-
-                    <p
-                      class="viewable-line"
-                      :class="{ 'cut-line-part': linePartCuts.indexOf(part.id) !== -1 }"
-                    >
-                      {{ part.line_text }}
-                    </p>
-                  </b-col>
-                </template>
-              </b-row>
-            </b-form-text>
-          </b-form-group>
-        </template>
-      </b-form>
+                        <b v-if="part.character_id != null">
+                          {{ characters.find((char) => char.id === part.character_id).name }}
+                        </b>
+                        <b v-else>
+                          {{
+                            characterGroups.find((char) => char.id === part.character_group_id).name
+                          }}
+                        </b>
+                        <p
+                          class="viewable-line"
+                          :class="{ 'cut-line-part': linePartCuts.indexOf(part.id) !== -1 }"
+                        >
+                          {{ part.line_text }}
+                        </p>
+                      </b-col>
+                    </template>
+                  </b-row>
+                </b-form-text>
+              </b-form-group>
+            </template>
+          </b-form>
+          <div class="d-flex justify-content-end mt-3" style="gap: 0.5rem">
+            <b-button variant="secondary" @click="$bvModal.hide(`line_${lineIndex}_-new-cue`)">
+              Cancel
+            </b-button>
+            <b-button
+              variant="primary"
+              :disabled="$v.newFormState.$invalid || submittingNewCue"
+              @click="onSubmitNew"
+            >
+              {{ submittingNewCue ? 'Adding…' : 'Add Cue' }}
+            </b-button>
+          </div>
+        </b-tab>
+        <b-tab title="Cue Group">
+          <CueGroupForm
+            ref="newGroupForm"
+            :cue-type-options="cueTypeOptions"
+            :cue-types="cueTypes"
+            class="mt-3"
+            @validity-change="isGroupFormValid = $event"
+          />
+          <div class="d-flex justify-content-end mt-3" style="gap: 0.5rem">
+            <b-button variant="secondary" @click="$bvModal.hide(`line_${lineIndex}_-new-cue`)">
+              Cancel
+            </b-button>
+            <b-button
+              variant="primary"
+              :disabled="!isGroupFormValid || submittingGroup"
+              @click="onSubmitGroup"
+            >
+              {{ submittingGroup ? 'Saving…' : 'Save Group' }}
+            </b-button>
+          </div>
+        </b-tab>
+      </b-tabs>
     </b-modal>
     <b-modal
       :id="`line_${lineIndex}_-edit-cue`"
@@ -275,9 +339,12 @@ import log from 'loglevel';
 import { LINE_TYPES } from '@/constants/lineTypes';
 import { isWholeLineCut as isWholeLineCutUtil } from '@/js/scriptUtils';
 import scriptDisplayMixin from '@/mixins/scriptDisplayMixin';
+import CueGroupEditModal from './CueGroupEditModal.vue';
+import CueGroupForm from './CueGroupForm.vue';
 
 export default defineComponent({
   name: 'ScriptLineCueEditor',
+  components: { CueGroupEditModal, CueGroupForm },
   mixins: [scriptDisplayMixin],
   props: {
     line: {
@@ -343,7 +410,10 @@ export default defineComponent({
         ident: null as string | null,
         lineId: null as number | null,
       },
+      activeTab: 0,
       submittingNewCue: false,
+      submittingGroup: false,
+      isGroupFormValid: false,
       submittingEditCue: false,
       deletingCue: false,
     };
@@ -383,7 +453,14 @@ export default defineComponent({
       'IS_ADMIN_USER',
       'SCRIPT_CUES',
       '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;
+    },
     cueTypeOptions(): unknown[] {
       if ((this as any).IS_ADMIN_USER) {
         return [
@@ -474,9 +551,17 @@ export default defineComponent({
   },
   methods: {
     contrastColor,
+    openEditGroup(group: any, cues: any[]): void {
+      (this.$refs.groupModal as any).openEdit(group, cues);
+    },
     openNewForm(): void {
-      this.resetNewForm();
-      this.newFormState.lineId = (this.line as any).id;
+      this.activeTab = 0;
+      this.isGroupFormValid = false;
+      this.newFormState = { cueType: null, ident: null, lineId: (this.line as any).id };
+      this.$nextTick(() => {
+        (this as any).$v.$reset();
+        (this.$refs.newGroupForm as any)?.reset();
+      });
       (this as any).$bvModal.show(`line_${this.lineIndex}_-new-cue`);
     },
     resetNewForm(): void {
@@ -485,12 +570,37 @@ export default defineComponent({
         ident: null,
         lineId: null,
       };
+      this.activeTab = 0;
       this.submittingNewCue = false;
+      this.submittingGroup = false;
+      this.isGroupFormValid = false;
 
       this.$nextTick(() => {
         (this as any).$v.$reset();
+        (this.$refs.newGroupForm as any)?.reset();
       });
     },
+    async onSubmitGroup(): Promise<void> {
+      if (!this.isGroupFormValid || this.submittingGroup) return;
+      const form = this.$refs.newGroupForm as any;
+      if (!form) {
+        log.error('CueGroupForm ref not available when submitting group');
+        return;
+      }
+      this.submittingGroup = true;
+      try {
+        const data = form.getFormData();
+        await (this as any).ADD_CUE_GROUP({
+          cueTypeId: data.cueTypeId,
+          labelOverride: data.labelOverride || undefined,
+          lineId: (this.line as any).id,
+          cues: data.cues.map((c: any, i: number) => ({ ident: c.ident, sortOrder: i })),
+        });
+        (this as any).$bvModal.hide(`line_${this.lineIndex}_-new-cue`);
+      } finally {
+        this.submittingGroup = false;
+      }
+    },
     validateNewState(name: string): boolean | null {
       const { $dirty, $error } = (this as any).$v.newFormState[name];
       return $dirty ? !$error : null;
@@ -591,20 +701,35 @@ export default defineComponent({
     cueBackgroundColour(cue: any): string {
       const cueType = (this.cueTypes as any[]).find((ct) => ct.id === cue.cue_type_id);
       if (!cueType) return '#000000';
-
       const override = ((this as any).CUE_COLOUR_OVERRIDES as any[]).find(
         (o) => o.settings.id === cueType.id
       );
-      if (override) {
-        return override.settings.colour;
-      }
-
+      if (override) return override.settings.colour;
       return cueType.colour;
     },
+    cueGroupLabel(group: any, cues: any[]): string {
+      const cueType = (this.cueTypes as any[]).find((ct) => ct.id === group.cue_type_id);
+      const prefix = cueType?.prefix ?? '';
+      if (group.label_override) return `${prefix} - ${group.label_override}`;
+      if (cues.length === 0) return prefix;
+      const first = cues[0].ident ?? '';
+      const last = cues[cues.length - 1].ident ?? '';
+      if (first === last) return `${prefix} ${first}`;
+      return `${prefix} ${first} - ${prefix} ${last}`;
+    },
+    cueGroupBackgroundColour(group: any): string {
+      const cueType = (this.cueTypes as any[]).find((ct) => ct.id === group.cue_type_id);
+      if (!cueType) return '#000000';
+      const override = ((this as any).CUE_COLOUR_OVERRIDES as any[]).find(
+        (o) => o.settings.id === cueType.id
+      );
+      if (override) return override.settings.colour;
+      return cueType.colour ?? '#000000';
+    },
     isWholeLineCut(line: any): boolean {
       return isWholeLineCutUtil(line, this.linePartCuts as any[]);
     },
-    ...mapActions(['ADD_NEW_CUE', 'EDIT_CUE', 'DELETE_CUE']),
+    ...mapActions(['ADD_NEW_CUE', 'EDIT_CUE', 'DELETE_CUE', 'ADD_CUE_GROUP']),
   },
 });
 </script>
@@ -616,6 +741,10 @@ export default defineComponent({
 .cue-button {
   padding: 0.2rem;
 }
+
+.cue-group-btn {
+  border-style: dashed !important;
+}
 .stage-direction {
   margin-top: 1rem;
   margin-bottom: 1rem;
diff --git a/client/src/vue_components/show/config/script/BulkEditModal.vue b/client/src/vue_components/show/config/script/BulkEditModal.vue
new file mode 100644
index 000000000..e5d96fcb1
--- /dev/null
+++ b/client/src/vue_components/show/config/script/BulkEditModal.vue
@@ -0,0 +1,262 @@
+<template>
+  <b-modal
+    id="bulk-edit-modal"
+    title="Bulk Edit"
+    size="md"
+    ok-title="Apply"
+    :ok-disabled="!canApply"
+    @ok="handleOk"
+    @hidden="reset"
+  >
+    <p class="text-muted small mb-3">
+      Applies the selected changes to all lines from the chosen start line to end line (inclusive).
+      Fill in a section to apply those changes; leave it empty to skip it.
+    </p>
+
+    <h6 class="mb-2">Act / Scene</h6>
+    <b-form-group label="Act" label-for="bulk-act-input">
+      <b-form-select
+        id="bulk-act-input"
+        v-model="selectedActId"
+        :options="actOptions"
+        @change="selectedSceneId = null"
+      />
+    </b-form-group>
+    <b-form-group label="Scene" label-for="bulk-scene-input">
+      <b-form-select
+        id="bulk-scene-input"
+        v-model="selectedSceneId"
+        :options="sceneOptions"
+        :disabled="selectedActId == null"
+      />
+    </b-form-group>
+
+    <hr />
+
+    <h6 class="mb-2">Character Assignment</h6>
+    <p class="text-muted small mb-2">Lines without the selected part will be skipped.</p>
+    <b-form-group label="Part" label-for="bulk-part-input">
+      <b-form-select id="bulk-part-input" v-model="selectedPartIndex" :options="partOptions" />
+    </b-form-group>
+    <template v-if="combinedDropdown">
+      <b-form-group label="Character / Character Group" label-for="bulk-char-combined-input">
+        <b-form-select
+          id="bulk-char-combined-input"
+          v-model="combinedValue"
+          :options="combinedOptions"
+          :disabled="selectedPartIndex == null"
+        />
+      </b-form-group>
+    </template>
+    <template v-else>
+      <b-form-group
+        v-show="selectedCharacterGroupId == null"
+        label="Character"
+        label-for="bulk-char-input"
+      >
+        <b-form-select
+          id="bulk-char-input"
+          v-model="selectedCharacterId"
+          :options="characterOptions"
+          :disabled="selectedPartIndex == null"
+        />
+      </b-form-group>
+      <b-form-group
+        v-show="selectedCharacterId == null"
+        label="Character Group"
+        label-for="bulk-char-group-input"
+      >
+        <b-form-select
+          id="bulk-char-group-input"
+          v-model="selectedCharacterGroupId"
+          :options="characterGroupOptions"
+          :disabled="selectedPartIndex == null"
+        />
+      </b-form-group>
+    </template>
+  </b-modal>
+</template>
+
+<script lang="ts">
+import { defineComponent } from 'vue';
+import { mapGetters } from 'vuex';
+
+export default defineComponent({
+  name: 'BulkEditModal',
+  events: ['apply'],
+  props: {
+    previousLineOfStart: {
+      type: Object,
+      default: null,
+    },
+    nextLineOfEnd: {
+      type: Object,
+      default: null,
+    },
+    acts: {
+      required: true,
+      type: Array,
+    },
+    scenes: {
+      required: true,
+      type: Array,
+    },
+    characters: {
+      required: true,
+      type: Array,
+    },
+    characterGroups: {
+      required: true,
+      type: Array,
+    },
+  },
+  data() {
+    return {
+      selectedActId: null as number | null,
+      selectedSceneId: null as number | null,
+      selectedPartIndex: null as number | null,
+      selectedCharacterId: null as number | null,
+      selectedCharacterGroupId: null as number | null,
+    };
+  },
+  computed: {
+    ...mapGetters(['USER_SETTINGS']),
+    combinedDropdown(): boolean {
+      return !!(this.USER_SETTINGS as { character_combined_dropdown?: boolean })
+        ?.character_combined_dropdown;
+    },
+    validActs(): any[] {
+      let startAct = (this.acts as any[]).find((act) => act.previous_act == null);
+      if (this.previousLineOfStart != null && this.previousLineOfStart.act_id != null) {
+        startAct = (this.acts as any[]).find((act) => act.id === this.previousLineOfStart.act_id);
+      }
+      const validActs: any[] = [];
+      let nextAct = startAct;
+      while (nextAct != null) {
+        validActs.push(nextAct);
+        if (this.nextLineOfEnd != null && this.nextLineOfEnd.act_id === nextAct.id) {
+          break;
+        }
+        nextAct = (this.acts as any[]).find((act) => act.id === nextAct.next_act) || null;
+      }
+      return validActs;
+    },
+    validScenes(): any[] {
+      if (this.selectedActId == null) {
+        return [];
+      }
+      const actScenes = (this.scenes as any[]).filter((scene) => scene.act === this.selectedActId);
+      let startScene = actScenes.find((scene) => scene.previous_scene == null);
+      if (
+        this.previousLineOfStart != null &&
+        this.previousLineOfStart.act_id === this.selectedActId &&
+        this.previousLineOfStart.scene_id != null
+      ) {
+        startScene = actScenes.find((scene) => scene.id === this.previousLineOfStart.scene_id);
+      }
+      const validScenes: any[] = [];
+      let nextScene = startScene;
+      while (nextScene != null) {
+        validScenes.push(nextScene);
+        if (this.nextLineOfEnd != null && this.nextLineOfEnd.scene_id === nextScene.id) {
+          break;
+        }
+        nextScene = actScenes.find((scene) => scene.id === nextScene.next_scene) || null;
+      }
+      return validScenes;
+    },
+    actOptions(): any[] {
+      return [
+        { value: null, text: 'Select an act', disabled: true },
+        ...this.validActs.map((act) => ({ value: act.id, text: act.name })),
+      ];
+    },
+    sceneOptions(): any[] {
+      return [
+        { value: null, text: 'Select a scene', disabled: true },
+        ...this.validScenes.map((scene) => ({ value: scene.id, text: scene.name })),
+      ];
+    },
+    partOptions(): any[] {
+      return [
+        { value: null, text: 'Select a part', disabled: true },
+        { value: 1, text: 'Part 1' },
+        { value: 2, text: 'Part 2' },
+        { value: 3, text: 'Part 3' },
+        { value: 4, text: 'Part 4' },
+      ];
+    },
+    characterOptions(): any[] {
+      return [
+        { value: null, text: 'N/A' },
+        ...(this.characters as any[]).map((c) => ({ value: c.id, text: c.name })),
+      ];
+    },
+    characterGroupOptions(): any[] {
+      return [
+        { value: null, text: 'N/A' },
+        ...(this.characterGroups as any[]).map((g) => ({ value: g.id, text: g.name })),
+      ];
+    },
+    combinedOptions(): any[] {
+      return [
+        { value: null, text: 'Select character / group', disabled: true },
+        ...(this.characters as any[]).map((c) => ({ value: `c:${c.id}`, text: c.name })),
+        ...(this.characterGroups as any[]).map((g) => ({ value: `g:${g.id}`, text: g.name })),
+      ];
+    },
+    combinedValue: {
+      get(): string | null {
+        if (this.selectedCharacterId != null) return `c:${this.selectedCharacterId}`;
+        if (this.selectedCharacterGroupId != null) return `g:${this.selectedCharacterGroupId}`;
+        return null;
+      },
+      set(val: string | null) {
+        if (val == null) {
+          this.selectedCharacterId = null;
+          this.selectedCharacterGroupId = null;
+        } else if (val.startsWith('c:')) {
+          this.selectedCharacterId = Number.parseInt(val.slice(2), 10);
+          this.selectedCharacterGroupId = null;
+        } else if (val.startsWith('g:')) {
+          this.selectedCharacterId = null;
+          this.selectedCharacterGroupId = Number.parseInt(val.slice(2), 10);
+        }
+      },
+    },
+    actSceneComplete(): boolean {
+      return this.selectedActId != null && this.selectedSceneId != null;
+    },
+    characterComplete(): boolean {
+      return (
+        this.selectedPartIndex != null &&
+        (this.selectedCharacterId != null || this.selectedCharacterGroupId != null)
+      );
+    },
+    canApply(): boolean {
+      return this.actSceneComplete || this.characterComplete;
+    },
+  },
+  methods: {
+    handleOk(bvModalEvt: any): void {
+      bvModalEvt.preventDefault();
+      if (this.canApply) {
+        this.$emit('apply', {
+          actId: this.actSceneComplete ? this.selectedActId : null,
+          sceneId: this.actSceneComplete ? this.selectedSceneId : null,
+          partIndex: this.characterComplete ? this.selectedPartIndex : null,
+          characterId: this.characterComplete ? this.selectedCharacterId : null,
+          characterGroupId: this.characterComplete ? this.selectedCharacterGroupId : null,
+        });
+      }
+    },
+    reset(): void {
+      this.selectedActId = null;
+      this.selectedSceneId = null;
+      this.selectedPartIndex = null;
+      this.selectedCharacterId = null;
+      this.selectedCharacterGroupId = null;
+    },
+  },
+});
+</script>
diff --git a/client/src/vue_components/show/config/script/ScriptEditor.vue b/client/src/vue_components/show/config/script/ScriptEditor.vue
index 9945b5ab7..740d9b1b5 100644
--- a/client/src/vue_components/show/config/script/ScriptEditor.vue
+++ b/client/src/vue_components/show/config/script/ScriptEditor.vue
@@ -167,11 +167,13 @@
         />
       </div>
     </b-modal>
-    <bulk-act-scene-modal
+    <bulk-edit-modal
       :previous-line-of-start="previousLineOfStart"
       :next-line-of-end="nextLineOfEnd"
       :acts="ACT_LIST"
       :scenes="SCENE_LIST"
+      :characters="CHARACTER_LIST"
+      :character-groups="CHARACTER_GROUP_LIST"
       @apply="onBulkApply"
     />
     <b-modal
@@ -221,7 +223,7 @@ import { diff } from 'deep-object-diff';
 import log from 'loglevel';
 import { sample } from 'lodash';
 
-import BulkActSceneModal from '@/vue_components/show/config/script/BulkActSceneModal.vue';
+import BulkEditModal from '@/vue_components/show/config/script/BulkEditModal.vue';
 import ScriptLineEditor from '@/vue_components/show/config/script/ScriptLineEditor.vue';
 import ScriptLineViewer from '@/vue_components/show/config/script/ScriptLineViewer.vue';
 import { makeURL, randInt } from '@/js/utils';
@@ -232,7 +234,7 @@ const MRU_LOOK_BACK = 4;
 
 export default defineComponent({
   name: 'ScriptConfig',
-  components: { BulkActSceneModal, ScriptLineViewer, ScriptLineEditor },
+  components: { BulkEditModal, ScriptLineViewer, ScriptLineEditor },
   data() {
     return {
       currentEditPage: 1,
@@ -351,7 +353,7 @@ export default defineComponent({
     async bulkEditEnd(val: { page: number; lineIndex: number } | null): Promise<void> {
       if (val != null) {
         await this.loadBoundaryLines();
-        (this as any).$bvModal.show('bulk-act-scene-modal');
+        (this as any).$bvModal.show('bulk-edit-modal');
       }
     },
     USER_SETTINGS(): void {
@@ -1045,10 +1047,22 @@ export default defineComponent({
         this.nextLineOfEnd = nextPage ? nextPage[0] : null;
       }
     },
-    async onBulkApply({ actId, sceneId }: { actId: number; sceneId: number }): Promise<void> {
+    async onBulkApply(payload: {
+      actId: number | null;
+      sceneId: number | null;
+      partIndex: number | null;
+      characterId: number | null;
+      characterGroupId: number | null;
+    }): Promise<void> {
       const { page: startPage, lineIndex: startIndex } = this.bulkEditStart!;
       const { page: endPage, lineIndex: endIndex } = this.bulkEditEnd!;
 
+      const applyActScene = payload.actId != null && payload.sceneId != null;
+      const applyCharacter =
+        payload.partIndex != null &&
+        (payload.characterId != null || payload.characterGroupId != null);
+      const targetPartIdx = (payload.partIndex ?? 1) - 1;
+
       for (let p = startPage; p <= endPage; p++) {
         await (this as any).LOAD_SCRIPT_PAGE(p);
       }
@@ -1060,15 +1074,33 @@ export default defineComponent({
         const toIndex = p === endPage ? endIndex : pageLines.length - 1;
         for (let i = fromIndex; i <= toIndex; i++) {
           if ((this as any).DELETED_LINES(p).includes(i)) continue;
-          (this as any).SET_LINE({
-            pageNo: p,
-            lineIndex: i,
-            lineObj: { ...pageLines[i], act_id: actId, scene_id: sceneId },
-          });
+          const line = pageLines[i];
+          const updatedLine: any = { ...line };
+          if (applyActScene) {
+            updatedLine.act_id = payload.actId;
+            updatedLine.scene_id = payload.sceneId;
+          }
+          if (applyCharacter) {
+            const sortedParts = [...(line.line_parts ?? [])].sort(
+              (a: any, b: any) => (a.part_index ?? 0) - (b.part_index ?? 0)
+            );
+            if (sortedParts.length > targetPartIdx) {
+              updatedLine.line_parts = sortedParts.map((part: any, idx: number) =>
+                idx === targetPartIdx
+                  ? {
+                      ...part,
+                      character_id: payload.characterId,
+                      character_group_id: payload.characterGroupId,
+                    }
+                  : part
+              );
+            }
+          }
+          (this as any).SET_LINE({ pageNo: p, lineIndex: i, lineObj: updatedLine });
         }
       }
 
-      (this as any).$bvModal.hide('bulk-act-scene-modal');
+      (this as any).$bvModal.hide('bulk-edit-modal');
       this.exitBulkEditMode();
     },
     ...mapMutations([
diff --git a/client/src/vue_components/show/config/script/ScriptLineEditor.vue b/client/src/vue_components/show/config/script/ScriptLineEditor.vue
index d879a627d..fb66f979b 100644
--- a/client/src/vue_components/show/config/script/ScriptLineEditor.vue
+++ b/client/src/vue_components/show/config/script/ScriptLineEditor.vue
@@ -53,6 +53,7 @@
             CURRENT_SHOW.script_mode === 1
           "
           :enable-add-button="state.line_parts.length < 4 && lineType === LINE_TYPES.DIALOGUE"
+          :show-remove-button="state.line_parts.length > 1 && lineType === LINE_TYPES.DIALOGUE"
           :line-type="lineType"
           :line-parts="state.line_parts"
           :stage-direction-styles="
@@ -61,6 +62,7 @@
           :stage-direction-style-id="state.stage_direction_style_id"
           @input="stateChange"
           @addLinePart="addLinePart"
+          @removeLinePart="removeLinePart(index)"
           @tryFinishLine="tryFinishLine"
           @stage-direction-style-change="onStageDirectionStyleChange"
         />
@@ -374,6 +376,13 @@ export default defineComponent({
       (this as any).$v.state.$touch();
       this.$emit('input', (this as any).state);
     },
+    removeLinePart(index: number): void {
+      const state = (this as any).state;
+      state.line_parts = state.line_parts
+        .filter((_: any, i: number) => i !== index)
+        .map((part: any, i: number) => ({ ...part, part_index: i }));
+      this.stateChange();
+    },
     addLinePart(): void {
       const state = (this as any).state;
       const blankLine = JSON.parse(JSON.stringify(this.blankLinePartObj));
diff --git a/client/src/vue_components/show/config/script/ScriptLinePart.vue b/client/src/vue_components/show/config/script/ScriptLinePart.vue
index 71ed73156..b79017212 100644
--- a/client/src/vue_components/show/config/script/ScriptLinePart.vue
+++ b/client/src/vue_components/show/config/script/ScriptLinePart.vue
@@ -69,6 +69,16 @@
           />
         </b-form-group>
       </b-col>
+      <b-col v-if="showRemoveButton" cols="auto" class="align-self-end mb-3">
+        <b-button
+          v-b-popover.hover.top="'Remove line part'"
+          variant="outline-danger"
+          size="sm"
+          @click="removeLinePart"
+        >
+          <b-icon-dash-square-fill variant="danger" />
+        </b-button>
+      </b-col>
     </b-form-row>
     <b-form-row>
       <b-col style="display: inline-flex">
@@ -129,6 +139,10 @@ export default defineComponent({
       required: true,
       type: Boolean,
     },
+    showRemoveButton: {
+      required: true,
+      type: Boolean,
+    },
     lineType: {
       required: true,
       type: Number,
@@ -271,6 +285,9 @@ export default defineComponent({
     addLinePart(): void {
       this.$emit('addLinePart');
     },
+    removeLinePart(): void {
+      this.$emit('removeLinePart');
+    },
     stateChange(): void {
       (this as any).$v.state.$touch();
       this.$emit('input', (this as any).state);
diff --git a/client/src/vue_components/show/live/ScriptLineViewer.vue b/client/src/vue_components/show/live/ScriptLineViewer.vue
index 0996c6eed..f0a312349 100644
--- a/client/src/vue_components/show/live/ScriptLineViewer.vue
+++ b/client/src/vue_components/show/live/ScriptLineViewer.vue
@@ -139,7 +139,7 @@
         <b-col cols="3" :class="['cue-column-right', { 'first-row': isFirstRowContent }]">
           <b-button-group>
             <b-button
-              v-for="cue in cues"
+              v-for="cue in individualCues"
               :key="cue.id"
               class="cue-button"
               :style="{
@@ -149,6 +149,17 @@
             >
               {{ 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>
             <b-button
               v-if="cueAddMode"
               class="cue-button add-cue-btn"
@@ -164,7 +175,7 @@
         <b-col cols="3" :class="['cue-column', { 'first-row': isFirstRowContent }]">
           <b-button-group>
             <b-button
-              v-for="cue in cues"
+              v-for="cue in individualCues"
               :key="cue.id"
               class="cue-button"
               :style="{
@@ -174,6 +185,17 @@
             >
               {{ 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>
             <b-button
               v-if="cueAddMode"
               class="cue-button add-cue-btn"
@@ -346,7 +368,13 @@ export default defineComponent({
     isFirstRowContent(): boolean {
       return !(this as any).needsIntervalBanner && !(this as any).needsActSceneLabel;
     },
-    ...mapGetters(['USER_SETTINGS']),
+    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;
+    },
+    ...mapGetters(['USER_SETTINGS', 'GROUPED_CUES_FOR_LINE']),
   },
   methods: {
     addNewCue(): void {
@@ -394,6 +422,10 @@ export default defineComponent({
   padding: 0.2rem;
 }
 
+.cue-group-btn {
+  border-style: dashed !important;
+}
+
 .line-row:has(.add-cue-btn:hover) {
   background-color: rgba(255, 255, 255, 0.06);
   border-radius: 4px;
diff --git a/client/src/vue_components/show/live/ScriptLineViewerCompact.vue b/client/src/vue_components/show/live/ScriptLineViewerCompact.vue
index 81f198df4..b5ced3581 100644
--- a/client/src/vue_components/show/live/ScriptLineViewerCompact.vue
+++ b/client/src/vue_components/show/live/ScriptLineViewerCompact.vue
@@ -40,7 +40,7 @@
       </b-col>
       <b-col v-if="cueAddMode" cols="1" class="cue-add-column" />
     </b-row>
-    <template v-for="(cue, cueIndex) in cues">
+    <template v-for="(cue, cueIndex) in individualCues">
       <b-row :key="`cue_${cue.id}`">
         <b-col
           cols="2"
@@ -54,18 +54,42 @@
           ]"
           :style="{ color: cueBackgroundColour(cue) }"
         >
-          <span>
-            {{ cuePrefix(cue) }}
-          </span>
+          <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>
+          <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>
         <b-col v-if="cueAddMode" cols="1" class="cue-add-column" />
       </b-row>
@@ -169,6 +193,7 @@
 
 <script lang="ts">
 import { defineComponent } from 'vue';
+import { mapGetters } from 'vuex';
 import cueDisplayMixin from '@/mixins/cueDisplayMixin';
 import scriptNavigationMixin from '@/mixins/scriptNavigationMixin';
 import scriptDisplayMixin from '@/mixins/scriptDisplayMixin';
@@ -251,14 +276,24 @@ export default defineComponent({
     };
   },
   computed: {
+    ...mapGetters(['GROUPED_CUES_FOR_LINE']),
     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;
+    },
+    hasAnyCues(): boolean {
+      return (this as any).individualCues.length > 0 || (this as any).lineGroups.length > 0;
+    },
     isFirstRowCues(): boolean {
-      return !(this as any).needsActSceneLabel && (this.cues as any[]).length > 0;
+      return !(this as any).needsActSceneLabel && (this as any).hasAnyCues;
     },
     isFirstRowContent(): boolean {
-      return !(this as any).needsActSceneLabel && (this.cues as any[]).length === 0;
+      return !(this as any).needsActSceneLabel && !(this as any).hasAnyCues;
     },
   },
   methods: {
diff --git a/client/src/vue_components/show/live/ScriptViewPane.vue b/client/src/vue_components/show/live/ScriptViewPane.vue
index 64bd5b923..9a13efba2 100644
--- a/client/src/vue_components/show/live/ScriptViewPane.vue
+++ b/client/src/vue_components/show/live/ScriptViewPane.vue
@@ -124,43 +124,77 @@
         </b-row>
       </b-container>
     </b-modal>
+    <!-- Add Cue Modal (tabs: Individual Cue / Cue Group) -->
     <b-modal
-      :id="`new-cue-modal`"
-      title="Add New Cue"
-      size="md"
-      :ok-disabled="$v.newCueFormState.$invalid || submittingNewCue"
+      id="new-cue-modal"
+      title="Add Cue"
+      size="lg"
+      scrollable
+      hide-footer
       @hidden="resetNewCueForm"
-      @ok="onSubmitNewCue"
     >
-      <b-form ref="new-cue-form" @submit.stop.prevent="onSubmitNewCue">
-        <b-form-group id="type-input-group" label="Cue Type" label-for="type-input">
-          <b-form-select
-            id="type-input"
-            v-model="$v.newCueFormState.cueType.$model"
-            :options="cueTypeOptions"
-            :state="validateNewCueState('cueType')"
-            aria-describedby="cue-type-feedback"
-          />
-          <b-form-invalid-feedback id="cue-type-feedback">
-            This is a required field.
-          </b-form-invalid-feedback>
-        </b-form-group>
-        <b-form-group id="ident-input-group" label="Identifier" label-for="ident-input">
-          <b-form-input
-            id="ident-input"
-            v-model="$v.newCueFormState.ident.$model"
-            name="ident-input"
-            :state="validateNewCueState('ident')"
-            aria-describedby="ident-feedback"
+      <b-tabs v-model="activeTab" class="mt-1">
+        <b-tab title="Individual Cue">
+          <b-form class="mt-3" @submit.stop.prevent="onSubmitNewCue">
+            <b-form-group id="type-input-group" label="Cue Type" label-for="type-input">
+              <b-form-select
+                id="type-input"
+                v-model="$v.newCueFormState.cueType.$model"
+                :options="cueTypeOptions"
+                :state="validateNewCueState('cueType')"
+                aria-describedby="cue-type-feedback"
+              />
+              <b-form-invalid-feedback id="cue-type-feedback">
+                This is a required field.
+              </b-form-invalid-feedback>
+            </b-form-group>
+            <b-form-group id="ident-input-group" label="Identifier" label-for="ident-input">
+              <b-form-input
+                id="ident-input"
+                v-model="$v.newCueFormState.ident.$model"
+                name="ident-input"
+                :state="validateNewCueState('ident')"
+                aria-describedby="ident-feedback"
+              />
+              <b-form-invalid-feedback id="ident-feedback">
+                This is a required field.
+              </b-form-invalid-feedback>
+              <b-form-text v-if="isDuplicateCue" class="text-warning">
+                A cue with this identifier already exists for this cue type
+              </b-form-text>
+            </b-form-group>
+          </b-form>
+          <div class="d-flex justify-content-end mt-3" style="gap: 0.5rem">
+            <b-button variant="secondary" @click="$bvModal.hide('new-cue-modal')">Cancel</b-button>
+            <b-button
+              variant="primary"
+              :disabled="$v.newCueFormState.$invalid || submittingNewCue"
+              @click="onSubmitNewCue"
+            >
+              {{ submittingNewCue ? 'Adding…' : 'Add Cue' }}
+            </b-button>
+          </div>
+        </b-tab>
+        <b-tab title="Cue Group">
+          <CueGroupForm
+            ref="newGroupForm"
+            :cue-type-options="cueTypeOptions"
+            :cue-types="CUE_TYPES"
+            class="mt-3"
+            @validity-change="newGroupFormValid = $event"
           />
-          <b-form-invalid-feedback id="ident-feedback">
-            This is a required field.
-          </b-form-invalid-feedback>
-          <b-form-text v-if="isDuplicateCue" class="text-warning">
-            A cue with this identifier already exists for this cue type
-          </b-form-text>
-        </b-form-group>
-      </b-form>
+          <div class="d-flex justify-content-end mt-3" style="gap: 0.5rem">
+            <b-button variant="secondary" @click="$bvModal.hide('new-cue-modal')">Cancel</b-button>
+            <b-button
+              variant="primary"
+              :disabled="!newGroupFormValid || submittingNewCueGroup"
+              @click="onSubmitNewCueGroup"
+            >
+              {{ submittingNewCueGroup ? 'Saving…' : 'Save Group' }}
+            </b-button>
+          </div>
+        </b-tab>
+      </b-tabs>
     </b-modal>
   </b-row>
 </template>
@@ -176,6 +210,7 @@ import log from 'loglevel';
 import { makeURL } from '@/js/utils';
 import ScriptLineViewer from '@/vue_components/show/live/ScriptLineViewer.vue';
 import ScriptLineViewerCompact from '@/vue_components/show/live/ScriptLineViewerCompact.vue';
+import CueGroupForm from '@/vue_components/show/config/cues/CueGroupForm.vue';
 import { LINE_TYPES } from '@/constants/lineTypes';
 import { isWholeLineCut as isWholeLineCutUtil } from '@/js/scriptUtils';
 
@@ -184,6 +219,7 @@ export default defineComponent({
   components: {
     ScriptLineViewer,
     ScriptLineViewerCompact,
+    CueGroupForm,
   },
   props: {
     isScriptFollowing: {
@@ -251,6 +287,9 @@ export default defineComponent({
         lineId: null as number | null,
       },
       submittingNewCue: false,
+      activeTab: 0,
+      newGroupFormValid: false,
+      submittingNewCueGroup: false,
 
       // Interval modal state
       intervalActId: null as number | null,
@@ -1008,46 +1047,66 @@ export default defineComponent({
 
     // Cue modal methods
     openNewCueModal(lineId: number): void {
-      this.resetNewCueForm();
-      this.newCueFormState.lineId = lineId;
+      this.activeTab = 0;
+      this.newGroupFormValid = false;
+      this.newCueFormState = { cueType: null, ident: null, lineId: lineId };
+      this.$nextTick(() => {
+        (this as any).$v.$reset();
+        (this.$refs.newGroupForm as any)?.reset();
+      });
       (this as any).$bvModal.show('new-cue-modal');
     },
     resetNewCueForm(): void {
-      this.newCueFormState = {
-        cueType: null,
-        ident: null,
-        lineId: null,
-      };
+      this.newCueFormState = { cueType: null, ident: null, lineId: null };
+      this.activeTab = 0;
+      this.newGroupFormValid = false;
       this.submittingNewCue = false;
-
+      this.submittingNewCueGroup = false;
       this.$nextTick(() => {
         (this as any).$v.$reset();
+        (this.$refs.newGroupForm as any)?.reset();
       });
     },
     validateNewCueState(name: string): boolean | null {
       const { $dirty, $error } = (this as any).$v.newCueFormState[name];
       return $dirty ? !$error : null;
     },
-    async onSubmitNewCue(event: Event): Promise<void> {
+    async onSubmitNewCue(): Promise<void> {
       (this as any).$v.newCueFormState.$touch();
-      if ((this as any).$v.newCueFormState.$anyError || this.submittingNewCue) {
-        event.preventDefault();
-        return;
-      }
-
+      if ((this as any).$v.newCueFormState.$anyError || this.submittingNewCue) return;
       this.submittingNewCue = true;
       try {
         await (this as any).ADD_NEW_CUE(this.newCueFormState);
         (this as any).$bvModal.hide('new-cue-modal');
-        this.resetNewCueForm();
       } catch (error) {
         log.error('Error submitting new cue:', error);
-        event.preventDefault();
       } finally {
         this.submittingNewCue = false;
       }
     },
-
+    async onSubmitNewCueGroup(): Promise<void> {
+      if (!this.newGroupFormValid || this.submittingNewCueGroup) return;
+      const form = this.$refs.newGroupForm as any;
+      if (!form) {
+        log.error('CueGroupForm ref not available when submitting group');
+        return;
+      }
+      this.submittingNewCueGroup = true;
+      try {
+        const data = form.getFormData();
+        await (this as any).ADD_CUE_GROUP({
+          cueTypeId: data.cueTypeId,
+          labelOverride: data.labelOverride || undefined,
+          lineId: this.newCueFormState.lineId,
+          cues: data.cues.map((c: any, i: number) => ({ ident: c.ident, sortOrder: i })),
+        });
+        (this as any).$bvModal.hide('new-cue-modal');
+      } catch (error) {
+        log.error('Error submitting new cue group:', error);
+      } finally {
+        this.submittingNewCueGroup = false;
+      }
+    },
     // Scroll helper - scrolls element into view within the script container only
     scrollToElement(element: Element | null): void {
       const container = document.getElementById('script-container');
@@ -1085,6 +1144,7 @@ export default defineComponent({
     ...mapActions([
       'LOAD_SCRIPT_PAGE',
       'ADD_NEW_CUE',
+      'ADD_CUE_GROUP',
       'GET_CURRENT_USER',
       'GET_STAGE_DIRECTION_STYLE_OVERRIDES',
       'GET_CUE_COLOUR_OVERRIDES',
diff --git a/docs/pages/cue_config.md b/docs/pages/cue_config.md
index 0a393371e..17b38be96 100644
--- a/docs/pages/cue_config.md
+++ b/docs/pages/cue_config.md
@@ -49,8 +49,8 @@ Cues can be attached to most line types in your script:
 
 To add a new cue:
 1. Click the green **+** button next to the script line where the cue should occur
-2. A popup will appear where you select the cue type and provide a cue identifier (e.g., "1" for LX 1)
-3. Click **Add** to create the cue
+2. A chooser dialog appears — select **Individual Cue** to add a single cue, or **Cue Group** to bundle multiple cues together (see below)
+3. For an individual cue, select the cue type and provide a cue identifier (e.g., "1" for LX 1), then click **Add**
 
 After adding cues, they will appear as colored buttons next to their associated script lines:
 
@@ -58,6 +58,28 @@ After adding cues, they will appear as colored buttons next to their associated
 
 Clicking on a cue button allows you to **Edit** or **Delete** that cue. The cue's color matches the color you defined for its cue type, making it easy to identify different types of cues at a glance.
 
+##### Cue Groups
+
+When a song or sequence has many cues on the same script line (e.g., 100 LX cues for a timecoded intro), adding them all as individual buttons becomes unworkable. **Cue Groups** solve this by bundling multiple cues into a single collapsed button displaying an abbreviated label such as `LX 1 - LX 100` or `LX - Music Intro`.
+
+To create a cue group:
+1. Click the **+** button on a script line, then select **Cue Group**
+2. In the **Add Cue Group** dialog:
+   - Select the **Cue Type** (all cues in a group share one type)
+   - Optionally enter a **Label Override** (e.g., "Music Intro") — if left blank, the label is automatically derived from the first and last cue identifiers
+   - Add cues using the range input (e.g., type `1 > 100` and click **Add Range** to add 100 cues at once) or click **Add Single Cue** to add individual rows
+   - Use the ↑ ↓ buttons to reorder cues within the group — the order determines the first/last identifiers shown in the label
+3. Click **Save Group** to create the group
+
+The group appears in the cue column as a button with a **dashed border**, making it visually distinct from individual cues.
+
+Clicking a group button opens the **Edit Cue Group** dialog, where you can:
+- Change the label override
+- Add, reorder, or remove individual cues within the group
+- Use **Delete Group** to remove the group and all its cues
+
+A script line can freely mix individual cues and groups simultaneously. The label preview in the dialog updates live as you make changes.
+
 ### Cues and Script Revisions
 
 Cues are tied to script revisions - when you add or modify cues, the changes only affect the currently loaded revision. This allows you to maintain different cue configurations for different versions of your script.
diff --git a/electron/package-lock.json b/electron/package-lock.json
index e227da89a..bd0e39dc3 100644
--- a/electron/package-lock.json
+++ b/electron/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "digiscript-electron",
-  "version": "0.32.4",
+  "version": "0.33.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "digiscript-electron",
-      "version": "0.32.4",
+      "version": "0.33.0",
       "license": "GPL-3.0",
       "dependencies": {
         "bonjour-service": "^1.4.1",
@@ -20,13 +20,13 @@
         "@electron-forge/maker-zip": "^7.11.2",
         "@eslint/js": "^9.39.2",
         "@types/node": "^22.0.0",
-        "@typescript-eslint/eslint-plugin": "^8.61.1",
-        "@typescript-eslint/parser": "^8.61.1",
+        "@typescript-eslint/eslint-plugin": "^8.62.0",
+        "@typescript-eslint/parser": "^8.62.0",
         "electron": "^40.6.1",
         "eslint": "^9.39.2",
         "eslint-config-prettier": "^10.1.8",
         "eslint-plugin-prettier": "^5.5.6",
-        "globals": "^17.6.0",
+        "globals": "^17.7.0",
         "prettier": "^3.8.4",
         "typescript": "^6.0.3"
       },
@@ -380,9 +380,9 @@
       }
     },
     "node_modules/@electron-internal/extract-zip": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/@electron-internal/extract-zip/-/extract-zip-1.0.3.tgz",
-      "integrity": "sha512-OjKpjB7gohtEjZiq6nDx1egqjZJhGPN1iFOIED+NFhB/MMkXw/XRcHjh1DGXKT5z2W9eW7Jy2UKU3gpjvusFTQ==",
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/@electron-internal/extract-zip/-/extract-zip-1.0.4.tgz",
+      "integrity": "sha512-Zr1Vs7E9tpCNhZHDAbFVXc2gEVCG9RqPDjrno5+bdgB6LRAuvgyMHJut4NCVyYwtAieapMzc3fiQ3CSTi75ARg==",
       "dev": true,
       "license": "BSD-2-Clause",
       "engines": {
@@ -1547,9 +1547,9 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "22.19.21",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.19.21.tgz",
-      "integrity": "sha512-VMeFBSCKQKmm2swI2kW51SFusDqekC6q9trBCvJ/JliDchFSuoYYKN7yVNjPthP1HKZcx3U1gI/wTcEBjEFKTA==",
+      "version": "22.20.0",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.20.0.tgz",
+      "integrity": "sha512-QWlFW2wf3nTjC13/DqRnBpR4ZO36VJH/JVBkA/vcnmbTBNQIlnObqyqZE1tUR7+Ni23Lda8R1BxMfbXRpCUx5g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -1585,17 +1585,17 @@
       }
     },
     "node_modules/@typescript-eslint/eslint-plugin": {
-      "version": "8.61.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.61.1.tgz",
-      "integrity": "sha512-ZPlVl3PB3et/59Ne0fv/sci6ZXz4T4Hp4nTJ56i/Y0gR89ARb+KphojTq6j+56E5PIezmOIOOWyY+aWQFd+IkQ==",
+      "version": "8.62.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.62.0.tgz",
+      "integrity": "sha512-o+mpz7EYiMzXoySXiKmzlabIvTVqUuK5yLrAedRPRDA0IpPFMUV1IXt6OqljIxX/kumN6EjUYp41Hqelh6p/Dw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@eslint-community/regexpp": "^4.12.2",
-        "@typescript-eslint/scope-manager": "8.61.1",
-        "@typescript-eslint/type-utils": "8.61.1",
-        "@typescript-eslint/utils": "8.61.1",
-        "@typescript-eslint/visitor-keys": "8.61.1",
+        "@typescript-eslint/scope-manager": "8.62.0",
+        "@typescript-eslint/type-utils": "8.62.0",
+        "@typescript-eslint/utils": "8.62.0",
+        "@typescript-eslint/visitor-keys": "8.62.0",
         "ignore": "^7.0.5",
         "natural-compare": "^1.4.0",
         "ts-api-utils": "^2.5.0"
@@ -1608,23 +1608,23 @@
         "url": "https://opencollective.com/typescript-eslint"
       },
       "peerDependencies": {
-        "@typescript-eslint/parser": "^8.61.1",
+        "@typescript-eslint/parser": "^8.62.0",
         "eslint": "^8.57.0 || ^9.0.0 || ^10.0.0",
         "typescript": ">=4.8.4 <6.1.0"
       }
     },
     "node_modules/@typescript-eslint/parser": {
-      "version": "8.61.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.61.1.tgz",
-      "integrity": "sha512-PJ5vePq5/ognBbrIcoC5+SHO5dfpeLPzP9FpLkzWrguoYQEeeSjlJpVwOpo1JRSTEi7dRcwNy4h4dzV70PqHcg==",
+      "version": "8.62.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.62.0.tgz",
+      "integrity": "sha512-dzHeT2gySzZtLDsuqxU9AkYgIsQoHAHtRBpOqM+Ofzx1Bwrd2RcCjQJ+6iQbsHOIR6NS33bF2W1k3blN1zLDrA==",
       "dev": true,
       "license": "MIT",
       "peer": true,
       "dependencies": {
-        "@typescript-eslint/scope-manager": "8.61.1",
-        "@typescript-eslint/types": "8.61.1",
-        "@typescript-eslint/typescript-estree": "8.61.1",
-        "@typescript-eslint/visitor-keys": "8.61.1",
+        "@typescript-eslint/scope-manager": "8.62.0",
+        "@typescript-eslint/types": "8.62.0",
+        "@typescript-eslint/typescript-estree": "8.62.0",
+        "@typescript-eslint/visitor-keys": "8.62.0",
         "debug": "^4.4.3"
       },
       "engines": {
@@ -1640,14 +1640,14 @@
       }
     },
     "node_modules/@typescript-eslint/project-service": {
-      "version": "8.61.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.61.1.tgz",
-      "integrity": "sha512-PrC4JYGmR241lYnfhmKGTXkFqv8+ymbTFgSAY0fVXpY82/QkMw5TZPl+vGzuDDU2QYJk9fIDOBTntF+yDv9LEA==",
+      "version": "8.62.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.62.0.tgz",
+      "integrity": "sha512-wexnCqiTg7BOGtbLDftYpRWlmLq4xfoMd7BKFR6Y75sZS3QmRKLdN3yWLhmIYgqMmP/OXWpj3H8odkb5nGURCQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/tsconfig-utils": "^8.61.1",
-        "@typescript-eslint/types": "^8.61.1",
+        "@typescript-eslint/tsconfig-utils": "^8.62.0",
+        "@typescript-eslint/types": "^8.62.0",
         "debug": "^4.4.3"
       },
       "engines": {
@@ -1662,14 +1662,14 @@
       }
     },
     "node_modules/@typescript-eslint/scope-manager": {
-      "version": "8.61.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.61.1.tgz",
-      "integrity": "sha512-L2bdIeoQS8FlKAvONAr20w6OcLXeB+qiDKbAooS9A0Ben+iSIkBef0FxqwKWYqt5sa0i4KJtxVyVmhMylKzF5w==",
+      "version": "8.62.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.62.0.tgz",
+      "integrity": "sha512-1lX38kNxXIRb8mEc3lbq5mdHq1Pf2+U0nFU65KfT18mtPxxl0fvjuEE92mHuXPuCtElJhOrddOpyMlM3Z0umEA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.61.1",
-        "@typescript-eslint/visitor-keys": "8.61.1"
+        "@typescript-eslint/types": "8.62.0",
+        "@typescript-eslint/visitor-keys": "8.62.0"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -1680,9 +1680,9 @@
       }
     },
     "node_modules/@typescript-eslint/tsconfig-utils": {
-      "version": "8.61.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.61.1.tgz",
-      "integrity": "sha512-UN/H4di+OO7EWx2ovME+8t31YO+KVnK0RRKEHR3kOt21/Ay8BOq3M1OMvWs5vNiqcFCYGYoxK3MXPZzmMUE+yg==",
+      "version": "8.62.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.62.0.tgz",
+      "integrity": "sha512-y2GAdB6ykaXUvuspbYnizQc4oDDz0Tz/Yc7iWrXf9mx8vm/L/0vLHCe0tS2boG96Zy+DivnVDQ9ZUEWoHqqx1g==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -1697,15 +1697,15 @@
       }
     },
     "node_modules/@typescript-eslint/type-utils": {
-      "version": "8.61.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.61.1.tgz",
-      "integrity": "sha512-GYRicKmVK0C4fsKgaACaknOUAq9Oa2kwsjnpFhFcS/5p4Ht5IP9OVLbgIgcK4SRk92nVHFluurg1lumD9dBcLw==",
+      "version": "8.62.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.62.0.tgz",
+      "integrity": "sha512-+g5O3j0w2ldzC86Pv6fvbO/xhAonbJFIdf/MKQ1d30gndlsVzUOE83ldfSE15Qrl9fhFjK6AovHs5Wpp6vx86w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.61.1",
-        "@typescript-eslint/typescript-estree": "8.61.1",
-        "@typescript-eslint/utils": "8.61.1",
+        "@typescript-eslint/types": "8.62.0",
+        "@typescript-eslint/typescript-estree": "8.62.0",
+        "@typescript-eslint/utils": "8.62.0",
         "debug": "^4.4.3",
         "ts-api-utils": "^2.5.0"
       },
@@ -1722,9 +1722,9 @@
       }
     },
     "node_modules/@typescript-eslint/types": {
-      "version": "8.61.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.61.1.tgz",
-      "integrity": "sha512-G+CRlPqLv7Bz1IZVs03x5K59F1veqL0EJUROAdGhKsEq8qOiRiZbI+HUojPq5l0fEGOKModD9br6lObhB8zkoA==",
+      "version": "8.62.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.62.0.tgz",
+      "integrity": "sha512-KvAclkktORPvM54TgLgA4z9HIV1M8zOgw9ZVNXl9f/8dLYfXYX1wkMXP7qmabpijQRV5bHJLOmoyGQbLMaUYeg==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -1736,16 +1736,16 @@
       }
     },
     "node_modules/@typescript-eslint/typescript-estree": {
-      "version": "8.61.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.61.1.tgz",
-      "integrity": "sha512-u+oQD3BqYWPc8YV9Zab4vaJElJuwOLPRc10Jm1o/qS+6Qwen14HCWwx0Seo4LnSn2wxea2Ik8DxPt2/FHmuhrg==",
+      "version": "8.62.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.62.0.tgz",
+      "integrity": "sha512-+hVbNxtW64pIcZWDPGbyaKF7vp2IBTVY5ma1blwwksrjdsbdqqEKvJWMGbBofei4F6Dovx1M0RJgoFeNu2279A==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/project-service": "8.61.1",
-        "@typescript-eslint/tsconfig-utils": "8.61.1",
-        "@typescript-eslint/types": "8.61.1",
-        "@typescript-eslint/visitor-keys": "8.61.1",
+        "@typescript-eslint/project-service": "8.62.0",
+        "@typescript-eslint/tsconfig-utils": "8.62.0",
+        "@typescript-eslint/types": "8.62.0",
+        "@typescript-eslint/visitor-keys": "8.62.0",
         "debug": "^4.4.3",
         "minimatch": "^10.2.2",
         "semver": "^7.7.3",
@@ -1803,16 +1803,16 @@
       }
     },
     "node_modules/@typescript-eslint/utils": {
-      "version": "8.61.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.61.1.tgz",
-      "integrity": "sha512-1+P/3Dj6jvtybE1q0HQ6yBt/gq+oKJyLdEv4HdnqasaEXRSYCAsD59mXEVQnM/ULNdQxbX77tdG4jPRjIS6knA==",
+      "version": "8.62.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.62.0.tgz",
+      "integrity": "sha512-82r66fi9zYwZ+mTq3vKgwjbZ1PVk/DJzrXFLpG6RnBbdvH8TEGVHIs9H4d2drhkOzf0syZuD/OZvvlu6GDbP4g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.9.1",
-        "@typescript-eslint/scope-manager": "8.61.1",
-        "@typescript-eslint/types": "8.61.1",
-        "@typescript-eslint/typescript-estree": "8.61.1"
+        "@typescript-eslint/scope-manager": "8.62.0",
+        "@typescript-eslint/types": "8.62.0",
+        "@typescript-eslint/typescript-estree": "8.62.0"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -1827,13 +1827,13 @@
       }
     },
     "node_modules/@typescript-eslint/visitor-keys": {
-      "version": "8.61.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.61.1.tgz",
-      "integrity": "sha512-6fJ9MHWtK14C1DSkiMlHUSOmrVebL7150xZJBlJiL62jjhIA4JmOq6flwBgDxIdBKKdoiZRel+dfPD5MLfny3w==",
+      "version": "8.62.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.62.0.tgz",
+      "integrity": "sha512-CY3uyFSRbcQv3nnSv8S0+lDftMVz6P963PoRlxrV7ew/Md564g9ut60PYzdLM5qW4jFn93GBF+Soi90ISAN+GQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.61.1",
+        "@typescript-eslint/types": "8.62.0",
         "eslint-visitor-keys": "^5.0.0"
       },
       "engines": {
@@ -2363,9 +2363,9 @@
       }
     },
     "node_modules/browserslist": {
-      "version": "4.28.2",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.28.2.tgz",
-      "integrity": "sha512-48xSriZYYg+8qXna9kwqjIVzuQxi+KYWp2+5nCYnYKPTr0LvD89Jqk2Or5ogxz0NUMfIjhh2lIUX/LyX9B4oIg==",
+      "version": "4.28.4",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.28.4.tgz",
+      "integrity": "sha512-MTc8i/x9jBQd1iMw2CFGS+rwMa07eYjLR0CCTLDACl9xhxy+nIs3KeML/biicXtk9JrZ6dnnTatmc7ErPXIxqw==",
       "dev": true,
       "funding": [
         {
@@ -2384,10 +2384,10 @@
       "license": "MIT",
       "peer": true,
       "dependencies": {
-        "baseline-browser-mapping": "^2.10.12",
-        "caniuse-lite": "^1.0.30001782",
-        "electron-to-chromium": "^1.5.328",
-        "node-releases": "^2.0.36",
+        "baseline-browser-mapping": "^2.10.38",
+        "caniuse-lite": "^1.0.30001799",
+        "electron-to-chromium": "^1.5.376",
+        "node-releases": "^2.0.48",
         "update-browserslist-db": "^1.2.3"
       },
       "bin": {
@@ -3115,9 +3115,9 @@
       "license": "MIT"
     },
     "node_modules/electron": {
-      "version": "40.10.4",
-      "resolved": "https://registry.npmjs.org/electron/-/electron-40.10.4.tgz",
-      "integrity": "sha512-ouNZrXXmdPL/wiTQ+xzXpb7B/BHg+j7XARig0SE7azFO3bjbYUd6lFjIAAiDQ02Pl/Oj7MUk+4C0hdf9yFtA1A==",
+      "version": "40.10.5",
+      "resolved": "https://registry.npmjs.org/electron/-/electron-40.10.5.tgz",
+      "integrity": "sha512-VzTIvwOYXZZufT9B83GDQogR1TFqREygRYhm0LE++QhGPjvBeg+W7siOP9K5+9rHMUnRuCX4YU/0ivLekN/UZQ==",
       "dev": true,
       "hasInstallScript": true,
       "license": "MIT",
@@ -3567,9 +3567,9 @@
       }
     },
     "node_modules/electron-to-chromium": {
-      "version": "1.5.376",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.376.tgz",
-      "integrity": "sha512-cUVA7/RvbFTEuw/i3obUwDTRIXojaxkResf+ibByPFxjc6XK3VNtcQXV0NSbAlJ0FMjcJGgftVVB4Qo184EXvA==",
+      "version": "1.5.378",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.378.tgz",
+      "integrity": "sha512-VinvOAuuPmdD1guEgGv5f2Qp7/vlfqOrUOMYNnOD4wj3pit8kRsQHzfIf6teyUGWo15Tg5+bOJaRunvyltpVWQ==",
       "dev": true,
       "license": "ISC"
     },
@@ -4695,9 +4695,9 @@
       }
     },
     "node_modules/globals": {
-      "version": "17.6.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-17.6.0.tgz",
-      "integrity": "sha512-sepffkT8stwnIYbsMBpoCHJuJM5l98FUF2AnE07hfvE0m/qp3R586hw4jF4uadbhvg1ooIdzuu7CsfD2jzCaNA==",
+      "version": "17.7.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-17.7.0.tgz",
+      "integrity": "sha512-Czmyns5dUsq4seFBR/Kdydhmo8y9kC79hiSkPn0YcGtNnYWnrgt0vjrSjx9tspoDGWm2CMarffRuLjM4xUz8xg==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -6986,9 +6986,9 @@
       }
     },
     "node_modules/semver": {
-      "version": "7.8.4",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.8.4.tgz",
-      "integrity": "sha512-rUCObTnP32Q08R2uuIrt7r9PlEonuTmtuXYcW6s5kjdlj3xbnwe+21yXptAUYcMAABLkYYTtnmzb3w3EDZfueA==",
+      "version": "7.8.5",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.8.5.tgz",
+      "integrity": "sha512-Y7/KDsb8LjooZpwaqGyulO6DQlksgCncchHGk+sZIY4SBvUocMBEFH5Ur1fI4dV+Jvl0w6cjvucaIi40puRioA==",
       "license": "ISC",
       "bin": {
         "semver": "bin/semver.js"
diff --git a/electron/package.json b/electron/package.json
index 099c3a3d6..76ebb9983 100644
--- a/electron/package.json
+++ b/electron/package.json
@@ -1,6 +1,6 @@
 {
   "name": "digiscript-electron",
-  "version": "0.32.4",
+  "version": "0.33.0",
   "description": "DigiScript Electron Desktop Application",
   "author": "DreamTeamProd",
   "license": "GPL-3.0",
@@ -37,13 +37,13 @@
     "@electron-forge/maker-deb": "^7.11.2",
     "@electron-forge/maker-rpm": "^7.11.2",
     "@eslint/js": "^9.39.2",
-    "@typescript-eslint/eslint-plugin": "^8.61.1",
-    "@typescript-eslint/parser": "^8.61.1",
+    "@typescript-eslint/eslint-plugin": "^8.62.0",
+    "@typescript-eslint/parser": "^8.62.0",
     "@types/node": "^22.0.0",
     "eslint": "^9.39.2",
     "eslint-config-prettier": "^10.1.8",
     "eslint-plugin-prettier": "^5.5.6",
-    "globals": "^17.6.0",
+    "globals": "^17.7.0",
     "prettier": "^3.8.4",
     "typescript": "^6.0.3"
   },
diff --git a/server/alembic_config/versions/863020cc72da_add_cue_groups.py b/server/alembic_config/versions/863020cc72da_add_cue_groups.py
new file mode 100644
index 000000000..8bca10ad8
--- /dev/null
+++ b/server/alembic_config/versions/863020cc72da_add_cue_groups.py
@@ -0,0 +1,64 @@
+"""add_cue_groups
+
+Revision ID: 863020cc72da
+Revises: 390f0ab54425
+Create Date: 2026-06-22 23:49:42.070778
+
+"""
+
+from typing import Sequence, Union
+
+import sqlalchemy as sa
+from alembic import op
+
+
+# revision identifiers, used by Alembic.
+revision: str = "863020cc72da"
+down_revision: Union[str, None] = "390f0ab54425"
+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! ###
+    op.create_table(
+        "cue_groups",
+        sa.Column("id", sa.Integer(), autoincrement=True, nullable=False),
+        sa.Column("cue_type_id", sa.Integer(), nullable=False),
+        sa.Column("label_override", sa.String(length=100), nullable=True),
+        sa.ForeignKeyConstraint(
+            ["cue_type_id"],
+            ["cuetypes.id"],
+            name=op.f("fk_cue_groups_cue_type_id_cuetypes"),
+        ),
+        sa.PrimaryKeyConstraint("id", name=op.f("pk_cue_groups")),
+    )
+    with op.batch_alter_table("script_cue_association", schema=None) as batch_op:
+        batch_op.add_column(sa.Column("group_id", sa.Integer(), nullable=True))
+        batch_op.add_column(sa.Column("sort_order", sa.Integer(), nullable=True))
+        batch_op.create_index(
+            batch_op.f("ix_script_cue_association_group_id"), ["group_id"], unique=False
+        )
+        batch_op.create_foreign_key(
+            batch_op.f("fk_script_cue_association_group_id_cue_groups"),
+            "cue_groups",
+            ["group_id"],
+            ["id"],
+        )
+
+    # ### end Alembic commands ###
+
+
+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_constraint(
+            batch_op.f("fk_script_cue_association_group_id_cue_groups"),
+            type_="foreignkey",
+        )
+        batch_op.drop_index(batch_op.f("ix_script_cue_association_group_id"))
+        batch_op.drop_column("sort_order")
+        batch_op.drop_column("group_id")
+
+    op.drop_table("cue_groups")
+    # ### end Alembic commands ###
diff --git a/server/controllers/api/constants.py b/server/controllers/api/constants.py
index c171cc870..720a54d72 100644
--- a/server/controllers/api/constants.py
+++ b/server/controllers/api/constants.py
@@ -28,6 +28,9 @@
 # Cues
 ERROR_CUE_NOT_FOUND = "404 cue not found"
 ERROR_CUE_TYPE_NOT_FOUND = "404 cue type not found"
+ERROR_CUE_GROUP_NOT_FOUND = "404 cue group not found"
+ERROR_CUE_GROUP_ID_MISSING = "Cue Group ID missing"
+ERROR_CUE_GROUP_EMPTY = "Cue group must contain at least one cue"
 
 # Microphones
 ERROR_MICROPHONE_NOT_FOUND = "404 microphone not found"
diff --git a/server/controllers/api/v1/show/cues.py b/server/controllers/api/v1/show/cues.py
index 3bc28afe2..2cfaf4fb4 100644
--- a/server/controllers/api/v1/show/cues.py
+++ b/server/controllers/api/v1/show/cues.py
@@ -7,6 +7,9 @@
 
 from controllers.api.constants import (
     ERROR_COLOUR_MISSING,
+    ERROR_CUE_GROUP_EMPTY,
+    ERROR_CUE_GROUP_ID_MISSING,
+    ERROR_CUE_GROUP_NOT_FOUND,
     ERROR_CUE_ID_MISSING,
     ERROR_CUE_NOT_FOUND,
     ERROR_CUE_TYPE_MISSING,
@@ -18,12 +21,12 @@
     ERROR_PREFIX_MISSING,
     ERROR_SHOW_NOT_FOUND,
 )
-from models.cue import Cue, CueAssociation, CueType
+from models.cue import Cue, CueAssociation, CueGroup, CueType
 from models.script import Script, ScriptLine, ScriptLineType, ScriptRevision
 from models.show import Show
 from models.user import User
 from rbac.role import Role
-from schemas.schemas import CueSchema, CueTypeSchema
+from schemas.schemas import CueGroupSchema, CueSchema, CueTypeSchema
 from utils.web.base_controller import BaseAPIController
 from utils.web.route import ApiRoute, ApiVersion
 from utils.web.web_decorators import no_live_session, requires_show
@@ -235,6 +238,7 @@ def get(self):
         current_show = self.get_current_show()
         show_id = current_show["id"]
         cue_schema = CueSchema()
+        group_schema = CueGroupSchema()
 
         with self.make_session() as session:
             show = session.get(Show, show_id)
@@ -259,11 +263,19 @@ def get(self):
                 ).all()
 
                 cues = collections.defaultdict(list)
+                groups_seen: dict = {}
                 for association in revision_cues:
-                    cues[association.line_id].append(cue_schema.dump(association.cue))
+                    cue_data = cue_schema.dump(association.cue)
+                    cue_data["group_id"] = association.group_id
+                    cue_data["sort_order"] = association.sort_order
+                    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
+
+                cue_groups = [group_schema.dump(g) for g in groups_seen.values()]
 
                 self.set_status(200)
-                self.finish({"cues": cues})
+                self.finish({"cues": cues, "cue_groups": cue_groups})
             else:
                 self.set_status(404)
                 self.finish({"message": ERROR_SHOW_NOT_FOUND})
@@ -718,3 +730,332 @@ async def get(self):
                     "suggestions": suggestions,
                 }
             )
+
+
+@ApiRoute("show/cues/groups", ApiVersion.V1)
+class CueGroupController(BaseAPIController):
+    def _get_revision(self, session, show_id):
+        """Return (script, revision) or (None, None) if unavailable."""
+        show = session.get(Show, show_id)
+        if not show:
+            return None, None
+        script: Script = session.scalars(
+            select(Script).where(Script.show_id == show.id)
+        ).first()
+        if not script or not script.current_revision:
+            return script, None
+        return script, session.get(ScriptRevision, script.current_revision)
+
+    @requires_show
+    async def post(self):
+        """Create a new cue group and add its member cues to the given line."""
+        current_show = self.get_current_show()
+        show_id = current_show["id"]
+
+        with self.make_session() as session:
+            script, revision = self._get_revision(session, show_id)
+            if script is None:
+                self.set_status(404)
+                await self.finish({"message": ERROR_SHOW_NOT_FOUND})
+                return
+            if revision is None:
+                self.set_status(400)
+                await self.finish(
+                    {"message": "Script does not have a current revision"}
+                )
+                return
+
+            data = escape.json_decode(self.request.body)
+
+            cue_type_id: int = data.get("cueTypeId", None)
+            if not cue_type_id:
+                self.set_status(400)
+                await self.finish({"message": ERROR_CUE_TYPE_MISSING})
+                return
+
+            cue_type: CueType = session.get(CueType, cue_type_id)
+            if not cue_type:
+                self.set_status(400)
+                await self.finish({"message": ERROR_CUE_TYPE_NOT_FOUND})
+                return
+            self.requires_role(cue_type, Role.WRITE)
+
+            line_id: int = data.get("lineId", None)
+            if not line_id:
+                self.set_status(400)
+                await self.finish({"message": ERROR_LINE_ID_MISSING})
+                return
+
+            line: ScriptLine = session.get(ScriptLine, line_id)
+            if not line:
+                self.set_status(400)
+                await self.finish({"message": "Line ID is not valid"})
+                return
+            if line.line_type == ScriptLineType.SPACING:
+                self.set_status(400)
+                await self.finish({"message": "Cannot add cues to spacing lines"})
+                return
+
+            cues_data: list = data.get("cues", [])
+            if not cues_data:
+                self.set_status(400)
+                await self.finish({"message": ERROR_CUE_GROUP_EMPTY})
+                return
+
+            label_override: str | None = data.get("labelOverride") or None
+
+            group = CueGroup(cue_type_id=cue_type_id, label_override=label_override)
+            session.add(group)
+            session.flush()
+
+            for cue_entry in cues_data:
+                ident: str = cue_entry.get("ident", "")
+                sort_order: int = cue_entry.get("sortOrder", 0)
+                cue = Cue(cue_type_id=cue_type_id, ident=ident)
+                session.add(cue)
+                session.flush()
+                session.add(
+                    CueAssociation(
+                        revision_id=revision.id,
+                        line_id=line_id,
+                        cue_id=cue.id,
+                        group_id=group.id,
+                        sort_order=sort_order,
+                    )
+                )
+
+            session.commit()
+            self.set_status(200)
+            await self.finish(
+                {"id": group.id, "message": "Successfully added cue group"}
+            )
+            await self.application.ws_send_to_all("NOOP", "LOAD_CUES", {})
+
+    @requires_show
+    @no_live_session
+    async def patch(self):
+        """Edit an existing cue group — update label and reconcile cue membership."""
+        current_show = self.get_current_show()
+        show_id = current_show["id"]
+
+        with self.make_session() as session:
+            script, revision = self._get_revision(session, show_id)
+            if script is None:
+                self.set_status(404)
+                await self.finish({"message": ERROR_SHOW_NOT_FOUND})
+                return
+            if revision is None:
+                self.set_status(400)
+                await self.finish(
+                    {"message": "Script does not have a current revision"}
+                )
+                return
+
+            data = escape.json_decode(self.request.body)
+
+            group_id_raw: int = data.get("groupId", None)
+            if not group_id_raw:
+                self.set_status(400)
+                await self.finish({"message": ERROR_CUE_GROUP_ID_MISSING})
+                return
+
+            group: CueGroup = session.get(CueGroup, group_id_raw)
+            if not group:
+                self.set_status(404)
+                await self.finish({"message": ERROR_CUE_GROUP_NOT_FOUND})
+                return
+
+            cue_type: CueType = session.get(CueType, group.cue_type_id)
+            self.requires_role(cue_type, Role.WRITE)
+
+            line_id: int = data.get("lineId", None)
+            if not line_id:
+                self.set_status(400)
+                await self.finish({"message": ERROR_LINE_ID_MISSING})
+                return
+
+            cues_data: list = data.get("cues", [])
+            if not cues_data:
+                self.set_status(400)
+                await self.finish({"message": ERROR_CUE_GROUP_EMPTY})
+                return
+
+            # Fork the CueGroup if it is referenced by associations in other revisions
+            other_revision_refs = session.scalar(
+                select(func.count())
+                .select_from(CueAssociation)
+                .where(
+                    CueAssociation.group_id == group.id,
+                    CueAssociation.revision_id != revision.id,
+                )
+            )
+            if other_revision_refs:
+                new_group = CueGroup(
+                    cue_type_id=group.cue_type_id,
+                    label_override=data.get("labelOverride") or None,
+                )
+                session.add(new_group)
+                session.flush()
+                # Reassign all current revision's associations to the new group
+                current_assocs: List[CueAssociation] = session.scalars(
+                    select(CueAssociation).where(
+                        CueAssociation.group_id == group.id,
+                        CueAssociation.revision_id == revision.id,
+                    )
+                ).all()
+                for assoc in current_assocs:
+                    assoc.group_id = new_group.id
+                group = new_group
+            else:
+                group.label_override = data.get("labelOverride") or None
+
+            # Build map of existing associations for this group on this line
+            existing_assocs: List[CueAssociation] = session.scalars(
+                select(CueAssociation).where(
+                    CueAssociation.group_id == group.id,
+                    CueAssociation.revision_id == revision.id,
+                    CueAssociation.line_id == line_id,
+                )
+            ).all()
+            existing_by_cue_id = {a.cue_id: a for a in existing_assocs}
+
+            requested_cue_ids = set()
+            for cue_entry in cues_data:
+                cue_id_raw = cue_entry.get("id", None)
+                ident: str = cue_entry.get("ident", "")
+                sort_order: int = cue_entry.get("sortOrder", 0)
+
+                if cue_id_raw and cue_id_raw in existing_by_cue_id:
+                    # Update existing member — ident/sort_order change; cue fork if shared
+                    assoc = existing_by_cue_id[cue_id_raw]
+                    cue: Cue = assoc.cue
+                    requested_cue_ids.add(cue_id_raw)
+                    assoc.sort_order = sort_order
+                    if len(cue.revision_associations) == 1:
+                        cue.ident = ident
+                    else:
+                        # Fork: create a new Cue; the existing association carries group_id
+                        new_cue = Cue(cue_type_id=cue.cue_type_id, ident=ident)
+                        session.add(new_cue)
+                        session.flush()
+                        assoc.cue = new_cue
+                else:
+                    # New member cue
+                    new_cue = Cue(cue_type_id=group.cue_type_id, ident=ident)
+                    session.add(new_cue)
+                    session.flush()
+                    session.add(
+                        CueAssociation(
+                            revision_id=revision.id,
+                            line_id=line_id,
+                            cue_id=new_cue.id,
+                            group_id=group.id,
+                            sort_order=sort_order,
+                        )
+                    )
+
+            # Delete removed members
+            removed_cue_ids = []
+            for cue_id_key, assoc in existing_by_cue_id.items():
+                if cue_id_key not in requested_cue_ids:
+                    removed_cue_ids.append(cue_id_key)
+                    session.delete(assoc)
+
+            if removed_cue_ids:
+                session.flush()
+                for cue_id in removed_cue_ids:
+                    CueAssociation.cleanup_orphaned_cue(session, cue_id, flush=False)
+
+            session.commit()
+            self.set_status(200)
+            await self.finish({"message": "Successfully edited cue group"})
+            await self.application.ws_send_to_all("NOOP", "LOAD_CUES", {})
+
+    @requires_show
+    @no_live_session
+    async def delete(self):
+        """Delete a cue group and all its member cues from the given line."""
+        current_show = self.get_current_show()
+        show_id = current_show["id"]
+
+        with self.make_session() as session:
+            script, revision = self._get_revision(session, show_id)
+            if script is None:
+                self.set_status(404)
+                await self.finish({"message": ERROR_SHOW_NOT_FOUND})
+                return
+            if revision is None:
+                self.set_status(400)
+                await self.finish(
+                    {"message": "Script does not have a current revision"}
+                )
+                return
+
+            group_id_str = self.get_argument("groupId", None)
+            if not group_id_str:
+                self.set_status(400)
+                await self.finish({"message": ERROR_CUE_GROUP_ID_MISSING})
+                return
+
+            try:
+                group_id_val = int(group_id_str)
+            except ValueError:
+                self.set_status(400)
+                await self.finish({"message": ERROR_INVALID_ID})
+                return
+
+            group: CueGroup = session.get(CueGroup, group_id_val)
+            if not group:
+                self.set_status(404)
+                await self.finish({"message": ERROR_CUE_GROUP_NOT_FOUND})
+                return
+
+            line_id_str = self.get_argument("lineId", None)
+            if not line_id_str:
+                self.set_status(400)
+                await self.finish({"message": ERROR_LINE_ID_MISSING})
+                return
+
+            try:
+                line_id_val = int(line_id_str)
+            except ValueError:
+                self.set_status(400)
+                await self.finish({"message": ERROR_INVALID_ID})
+                return
+
+            cue_type: CueType = session.get(CueType, group.cue_type_id)
+            self.requires_role(cue_type, Role.WRITE)
+
+            assocs: List[CueAssociation] = session.scalars(
+                select(CueAssociation).where(
+                    CueAssociation.group_id == group_id_val,
+                    CueAssociation.revision_id == revision.id,
+                    CueAssociation.line_id == line_id_val,
+                )
+            ).all()
+
+            cue_ids = [a.cue_id for a in assocs]
+            for assoc in assocs:
+                session.delete(assoc)
+
+            # Flush deletions so orphan checks below see the correct counts
+            session.flush()
+
+            for cue_id in cue_ids:
+                CueAssociation.cleanup_orphaned_cue(session, cue_id, flush=False)
+
+            remaining = (
+                session.scalar(
+                    select(func.count())
+                    .select_from(CueAssociation)
+                    .where(CueAssociation.group_id == group_id_val)
+                )
+                or 0
+            )
+            if not remaining:
+                session.delete(group)
+
+            session.commit()
+            self.set_status(200)
+            await self.finish({"message": "Successfully deleted cue group"})
+            await self.application.ws_send_to_all("NOOP", "LOAD_CUES", {})
diff --git a/server/controllers/api/v1/show/script/revisions.py b/server/controllers/api/v1/show/script/revisions.py
index 639944fc0..a7d0700a4 100644
--- a/server/controllers/api/v1/show/script/revisions.py
+++ b/server/controllers/api/v1/show/script/revisions.py
@@ -147,6 +147,8 @@ async def post(self):
                             revision_id=new_rev.id,
                             line_id=cue_association.line_id,
                             cue_id=cue_association.cue_id,
+                            group_id=cue_association.group_id,
+                            sort_order=cue_association.sort_order,
                         )
                     )
                 for cut_association in parent_rev.line_part_cuts:
diff --git a/server/controllers/api/v1/show/script/script.py b/server/controllers/api/v1/show/script/script.py
index cb9b62129..25a5efec4 100644
--- a/server/controllers/api/v1/show/script/script.py
+++ b/server/controllers/api/v1/show/script/script.py
@@ -547,6 +547,8 @@ async def patch(self):
                                 revision_id=revision.id,
                                 line_id=line_object.id,
                                 cue_id=old_cue_assoc.cue_id,
+                                group_id=old_cue_assoc.group_id,
+                                sort_order=old_cue_assoc.sort_order,
                             )
                             session.add(new_cue_assoc)
                             session.delete(old_cue_assoc)
diff --git a/server/models/cue.py b/server/models/cue.py
index ced321851..c170b19e1 100644
--- a/server/models/cue.py
+++ b/server/models/cue.py
@@ -1,8 +1,8 @@
 from __future__ import annotations
 
-from typing import List
+from typing import List, Optional
 
-from sqlalchemy import ForeignKey, String, func, select
+from sqlalchemy import ForeignKey, Integer, String, func, select
 from sqlalchemy.orm import Mapped, mapped_column, relationship
 
 from models.models import db
@@ -25,6 +25,9 @@ class CueType(db.Model, DeleteMixin):
     cues: Mapped[List[Cue]] = relationship(
         back_populates="cue_type", cascade="all, delete-orphan"
     )
+    cue_groups: Mapped[List["CueGroup"]] = relationship(
+        back_populates="cue_type", cascade="all, delete-orphan"
+    )
 
     def pre_delete(self, session):
         UserOverridesRegistry.cleanup_overrides(session, self.__tablename__)
@@ -33,6 +36,21 @@ def post_delete(self, session):
         pass
 
 
+class CueGroup(db.Model):
+    __tablename__ = "cue_groups"
+
+    id: Mapped[int] = mapped_column(primary_key=True, autoincrement=True)
+    cue_type_id: Mapped[int] = mapped_column(ForeignKey("cuetypes.id"), nullable=False)
+    label_override: Mapped[str | None] = mapped_column(String(100))
+
+    cue_type: Mapped[CueType] = relationship(
+        foreign_keys=[cue_type_id], back_populates="cue_groups"
+    )
+    cue_associations: Mapped[List[CueAssociation]] = relationship(
+        back_populates="group", foreign_keys="CueAssociation.group_id"
+    )
+
+
 class Cue(db.Model):
     __tablename__ = "cue"
 
@@ -60,6 +78,10 @@ class CueAssociation(db.Model, DeleteMixin):
     cue_id: Mapped[int] = mapped_column(
         ForeignKey("cue.id"), primary_key=True, index=True
     )
+    group_id: Mapped[int | None] = mapped_column(
+        Integer, ForeignKey("cue_groups.id"), nullable=True, index=True
+    )
+    sort_order: Mapped[int | None] = mapped_column(Integer, nullable=True)
 
     revision: Mapped[ScriptRevision] = relationship(
         foreign_keys=[revision_id], back_populates="cue_associations"
@@ -70,6 +92,9 @@ class CueAssociation(db.Model, DeleteMixin):
     cue: Mapped[Cue] = relationship(
         foreign_keys=[cue_id], back_populates="revision_associations"
     )
+    group: Mapped[Optional[CueGroup]] = relationship(
+        foreign_keys=[group_id], back_populates="cue_associations"
+    )
 
     @staticmethod
     def cleanup_orphaned_cue(session, cue_id, flush=True):
@@ -107,12 +132,32 @@ def cleanup_orphaned_cue(session, cue_id, flush=True):
     def pre_delete(self, session):
         pass
 
+    @staticmethod
+    def cleanup_orphaned_group(session, group_id):
+        """Delete a CueGroup if no CueAssociation rows still reference it."""
+        if group_id is None:
+            return
+        remaining = (
+            session.scalar(
+                select(func.count())
+                .select_from(CueAssociation)
+                .where(CueAssociation.group_id == group_id)
+            )
+            or 0
+        )
+        if not remaining:
+            group = session.get(CueGroup, group_id)
+            if group:
+                session.delete(group)
+
     def post_delete(self, session):
         # Delete orphaned cues after association is removed
         # Using post_delete avoids autoflush timing issues during cascade deletion
         # Using no_autoflush prevents lazy loading from triggering premature flush
         with session.no_autoflush:
+            group_id = self.group_id
             if self.cue:
                 # Use the static helper for consistent orphan cleanup logic
                 # Don't flush during post_delete to avoid FK constraint errors mid-cascade
                 CueAssociation.cleanup_orphaned_cue(session, self.cue.id, flush=False)
+            CueAssociation.cleanup_orphaned_group(session, group_id)
diff --git a/server/pyproject.toml b/server/pyproject.toml
index eae85576a..9b3a43fdf 100644
--- a/server/pyproject.toml
+++ b/server/pyproject.toml
@@ -11,7 +11,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "digiscript-server"
-version = "0.32.4"
+version = "0.33.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 bce28150d..cc14b8194 100644
--- a/server/requirements.txt
+++ b/server/requirements.txt
@@ -10,5 +10,5 @@ marshmallow>=4.3.0,<5
 pyjwt[crypto]==2.13.0
 setuptools==82.0.1
 xkcdpass==1.30.0
-zeroconf==0.149.16
+zeroconf==0.150.0
 python-jsonpath==2.0.2
\ No newline at end of file
diff --git a/server/schemas/schemas.py b/server/schemas/schemas.py
index 47af9ad33..b1ec72d53 100644
--- a/server/schemas/schemas.py
+++ b/server/schemas/schemas.py
@@ -1,7 +1,7 @@
 from marshmallow_sqlalchemy import SQLAlchemyAutoSchema, auto_field
 from marshmallow_sqlalchemy.fields import Nested
 
-from models.cue import Cue, CueType
+from models.cue import Cue, CueGroup, CueType
 from models.mics import Microphone, MicrophoneAllocation
 from models.script import (
     CompiledScript,
@@ -189,6 +189,14 @@ class Meta:
         load_instance = True
 
 
+@schema
+class CueGroupSchema(SQLAlchemyAutoSchema):
+    class Meta:
+        model = CueGroup
+        load_instance = True
+        include_fk = True
+
+
 @schema
 class CueSchema(SQLAlchemyAutoSchema):
     class Meta:
diff --git a/server/test/controllers/api/v1/show/script/test_script.py b/server/test/controllers/api/v1/show/script/test_script.py
index c5c915af8..1a66fc2c3 100644
--- a/server/test/controllers/api/v1/show/script/test_script.py
+++ b/server/test/controllers/api/v1/show/script/test_script.py
@@ -1,7 +1,7 @@
 import tornado.escape
 from sqlalchemy import select
 
-from models.cue import Cue, CueAssociation, CueType
+from models.cue import Cue, CueAssociation, CueGroup, CueType
 from models.script import (
     Script,
     ScriptCuts,
@@ -883,6 +883,135 @@ def test_update_line_with_both_cue_and_cut(self):
             all_lines = session.scalars(select(ScriptLine)).all()
             self.assertEqual(1, len(all_lines), "Should have exactly 1 line")
 
+    def test_update_line_with_cue_group_preserves_group_id_and_sort_order(self):
+        """Script PATCH migration must copy group_id and sort_order onto new CueAssociation.
+
+        When a line with grouped cues is edited, the new ScriptLine must receive
+        CueAssociation rows that retain group_id and sort_order — otherwise the
+        cue group is silently broken after any line edit.
+        """
+        # Create a dialogue line via the API
+        initial_lines = [
+            {
+                "id": None,
+                "act_id": self.act_id,
+                "scene_id": self.scene_id,
+                "page": 1,
+                "line_type": 1,
+                "line_parts": [
+                    {
+                        "id": None,
+                        "line_id": None,
+                        "part_index": 0,
+                        "character_id": self.character_id,
+                        "character_group_id": None,
+                        "line_text": "Original text",
+                    }
+                ],
+                "stage_direction_style_id": None,
+            }
+        ]
+        response = self.fetch(
+            "/api/v1/show/script?page=1",
+            method="POST",
+            body=tornado.escape.json_encode(initial_lines),
+            headers={"Authorization": f"Bearer {self.token}"},
+        )
+        self.assertEqual(200, response.code)
+
+        response = self.fetch(
+            "/api/v1/show/script?page=1",
+            method="GET",
+            headers={"Authorization": f"Bearer {self.token}"},
+        )
+        page_data = tornado.escape.json_decode(response.body)
+        line_id = page_data["lines"][0]["id"]
+        line_part_id = page_data["lines"][0]["line_parts"][0]["id"]
+
+        # Add a cue group to the line directly in the DB
+        with self._app.get_db().sessionmaker() as session:
+            cue_type = CueType(
+                show_id=self.show_id,
+                prefix="LX",
+                description="Lighting",
+                colour="#ff0000",
+            )
+            session.add(cue_type)
+            session.flush()
+
+            group = CueGroup(cue_type_id=cue_type.id, label_override=None)
+            session.add(group)
+            session.flush()
+            group_id = group.id
+
+            for i, (ident, sort_order) in enumerate([("1", 0), ("5", 1)]):
+                cue = Cue(cue_type_id=cue_type.id, ident=ident)
+                session.add(cue)
+                session.flush()
+                assoc = CueAssociation(
+                    revision_id=self.revision_id,
+                    line_id=line_id,
+                    cue_id=cue.id,
+                    group_id=group_id,
+                    sort_order=sort_order,
+                )
+                session.add(assoc)
+            session.commit()
+
+        # PATCH the line (change text, triggering new ScriptLine + migration)
+        updated_lines = [
+            {
+                "id": line_id,
+                "act_id": self.act_id,
+                "scene_id": self.scene_id,
+                "page": 1,
+                "line_type": 1,
+                "line_parts": [
+                    {
+                        "id": line_part_id,
+                        "line_id": line_id,
+                        "part_index": 0,
+                        "character_id": self.character_id,
+                        "character_group_id": None,
+                        "line_text": "Updated text",
+                    }
+                ],
+                "stage_direction_style_id": None,
+            }
+        ]
+        patch_data = {
+            "page": updated_lines,
+            "status": {"added": [], "updated": [0], "deleted": [], "inserted": []},
+        }
+        response = self.fetch(
+            "/api/v1/show/script?page=1",
+            method="PATCH",
+            body=tornado.escape.json_encode(patch_data),
+            headers={"Authorization": f"Bearer {self.token}"},
+        )
+        self.assertEqual(200, response.code, "PATCH should succeed")
+
+        # Verify migrated associations still carry group_id and sort_order
+        with self._app.get_db().sessionmaker() as session:
+            assocs = session.scalars(
+                select(CueAssociation).where(
+                    CueAssociation.revision_id == self.revision_id
+                )
+            ).all()
+            self.assertEqual(2, len(assocs), "Both group members should be migrated")
+            for assoc in assocs:
+                self.assertEqual(
+                    group_id, assoc.group_id, "group_id must survive migration"
+                )
+                self.assertIsNotNone(
+                    assoc.sort_order, "sort_order must survive migration"
+                )
+                self.assertNotEqual(
+                    line_id, assoc.line_id, "Association must point to new line"
+                )
+            sort_orders = sorted(a.sort_order for a in assocs)
+            self.assertEqual([0, 1], sort_orders, "sort_order values must be preserved")
+
     def test_post_compact_mode_rejects_multiple_line_parts(self):
         """Test that POST rejects multiple line_parts in COMPACT mode."""
         # Create show with COMPACT mode
diff --git a/server/test/controllers/api/v1/show/test_cues.py b/server/test/controllers/api/v1/show/test_cues.py
index 6b9412c19..9f500770d 100644
--- a/server/test/controllers/api/v1/show/test_cues.py
+++ b/server/test/controllers/api/v1/show/test_cues.py
@@ -1,7 +1,7 @@
 import tornado.escape
 from sqlalchemy import select
 
-from models.cue import Cue, CueAssociation, CueType
+from models.cue import Cue, CueAssociation, CueGroup, CueType
 from models.script import (
     Script,
     ScriptLine,
@@ -9,6 +9,7 @@
     ScriptLineType,
     ScriptRevision,
 )
+from models.session import ShowSession
 from models.show import Act, Scene, Show, ShowScriptType
 from models.user import User
 from rbac.role import Role
@@ -196,7 +197,8 @@ def setUp(self):
             self.cue_type_id = cue_type.id
 
             # Create admin user for RBAC
-            admin = User(username="admin", is_admin=True, password="test")
+            dummy_str = "test"
+            admin = User(username="admin", is_admin=True, password=dummy_str)
             session.add(admin)
             session.flush()
             self.user_id = admin.id
@@ -1008,3 +1010,626 @@ def test_post_cue_type_admin_also_gets_grant(self):
                     admin, cue_type, Role.READ | Role.WRITE | Role.EXECUTE
                 )
             )
+
+    def test_delete_cue_type_cascades_to_cue_groups(self):
+        """Deleting a cue type via the API also removes any CueGroup referencing it."""
+        response = self.fetch(
+            "/api/v1/show/cues/types",
+            method="POST",
+            body=tornado.escape.json_encode(
+                {"prefix": "LX", "description": "Lighting", "colour": "#ff0000"}
+            ),
+            headers={"Authorization": f"Bearer {self.admin_token}"},
+        )
+        self.assertEqual(200, response.code)
+        cue_type_id = tornado.escape.json_decode(response.body)["id"]
+
+        with self._app.get_db().sessionmaker() as session:
+            group = CueGroup(cue_type_id=cue_type_id, label_override="Test Group")
+            session.add(group)
+            session.commit()
+            group_id = group.id
+
+        response = self.fetch(
+            f"/api/v1/show/cues/types?id={cue_type_id}",
+            method="DELETE",
+            headers={"Authorization": f"Bearer {self.admin_token}"},
+        )
+        self.assertEqual(200, response.code)
+
+        with self._app.get_db().sessionmaker() as session:
+            self.assertIsNone(session.get(CueType, cue_type_id))
+            self.assertIsNone(session.get(CueGroup, group_id))
+
+
+class TestCueGroups(DigiScriptTestCase):
+    """Tests for POST/PATCH/DELETE /api/v1/show/cues/groups."""
+
+    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
+
+            spacing_line = ScriptLine(
+                act_id=act.id,
+                scene_id=scene.id,
+                page=1,
+                line_type=ScriptLineType.SPACING,
+            )
+            session.add(spacing_line)
+            session.flush()
+            self.spacing_line_id = spacing_line.id
+
+            assoc = ScriptLineRevisionAssociation(
+                revision_id=revision.id, line_id=line.id
+            )
+            session.add(assoc)
+            assoc2 = ScriptLineRevisionAssociation(
+                revision_id=revision.id, line_id=spacing_line.id
+            )
+            session.add(assoc2)
+
+            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
+
+            dummy_str = "test"
+            admin = User(username="admin", is_admin=True, password=dummy_str)
+            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 _create_group(self, cues=None, label_override=None):
+        """Helper: POST a cue group and return the response."""
+        if cues is None:
+            cues = [{"ident": str(i), "sortOrder": i - 1} for i in range(1, 4)]
+        body = {
+            "cueTypeId": self.cue_type_id,
+            "lineId": self.line_id,
+            "cues": cues,
+        }
+        if label_override is not None:
+            body["labelOverride"] = label_override
+        return self.fetch(
+            "/api/v1/show/cues/groups",
+            method="POST",
+            body=tornado.escape.json_encode(body),
+            headers={"Authorization": f"Bearer {self.token}"},
+        )
+
+    def test_post_creates_group_and_cues(self):
+        """POST /cues/groups creates CueGroup, Cue rows, and CueAssociation rows."""
+        response = self._create_group()
+        self.assertEqual(200, response.code)
+        body = tornado.escape.json_decode(response.body)
+        self.assertIn("id", body)
+        group_id = body["id"]
+
+        with self._app.get_db().sessionmaker() as session:
+            group = session.get(CueGroup, group_id)
+            self.assertIsNotNone(group)
+            self.assertEqual(self.cue_type_id, group.cue_type_id)
+            self.assertIsNone(group.label_override)
+
+            assocs = session.scalars(
+                select(CueAssociation).where(
+                    CueAssociation.group_id == group_id,
+                    CueAssociation.revision_id == self.revision_id,
+                )
+            ).all()
+            self.assertEqual(3, len(assocs))
+            sort_orders = sorted(a.sort_order for a in assocs)
+            self.assertEqual([0, 1, 2], sort_orders)
+
+    def test_post_with_label_override(self):
+        """POST stores label_override on the CueGroup."""
+        response = self._create_group(label_override="Music Intro")
+        self.assertEqual(200, response.code)
+        group_id = tornado.escape.json_decode(response.body)["id"]
+
+        with self._app.get_db().sessionmaker() as session:
+            group = session.get(CueGroup, group_id)
+            self.assertEqual("Music Intro", group.label_override)
+
+    def test_get_cues_includes_group_id_and_sort_order(self):
+        """GET /cues response includes group_id, sort_order, and cue_groups."""
+        response = self._create_group()
+        group_id = tornado.escape.json_decode(response.body)["id"]
+
+        get_response = self.fetch("/api/v1/show/cues")
+        self.assertEqual(200, get_response.code)
+        data = tornado.escape.json_decode(get_response.body)
+
+        self.assertIn("cue_groups", data)
+        group_ids_returned = [g["id"] for g in data["cue_groups"]]
+        self.assertIn(group_id, group_ids_returned)
+
+        line_cues = data["cues"].get(str(self.line_id), [])
+        for cue in line_cues:
+            self.assertIn("group_id", cue)
+            self.assertIn("sort_order", cue)
+            self.assertEqual(group_id, cue["group_id"])
+
+    def test_post_rejects_spacing_line(self):
+        """POST /cues/groups rejects SPACING lines."""
+        body = {
+            "cueTypeId": self.cue_type_id,
+            "lineId": self.spacing_line_id,
+            "cues": [{"ident": "1", "sortOrder": 0}],
+        }
+        response = self.fetch(
+            "/api/v1/show/cues/groups",
+            method="POST",
+            body=tornado.escape.json_encode(body),
+            headers={"Authorization": f"Bearer {self.token}"},
+        )
+        self.assertEqual(400, response.code)
+
+    def test_post_rejects_empty_cue_list(self):
+        """POST with no cues returns 400."""
+        body = {
+            "cueTypeId": self.cue_type_id,
+            "lineId": self.line_id,
+            "cues": [],
+        }
+        response = self.fetch(
+            "/api/v1/show/cues/groups",
+            method="POST",
+            body=tornado.escape.json_encode(body),
+            headers={"Authorization": f"Bearer {self.token}"},
+        )
+        self.assertEqual(400, response.code)
+
+    def test_patch_updates_label_override(self):
+        """PATCH /cues/groups updates label_override."""
+        create_resp = self._create_group()
+        group_id = tornado.escape.json_decode(create_resp.body)["id"]
+
+        with self._app.get_db().sessionmaker() as session:
+            assocs = session.scalars(
+                select(CueAssociation).where(
+                    CueAssociation.group_id == group_id,
+                    CueAssociation.revision_id == self.revision_id,
+                )
+            ).all()
+            existing_cues = [
+                {"id": a.cue_id, "ident": a.cue.ident, "sortOrder": a.sort_order}
+                for a in assocs
+            ]
+
+        patch_body = {
+            "groupId": group_id,
+            "lineId": self.line_id,
+            "labelOverride": "New Label",
+            "cues": existing_cues,
+        }
+        response = self.fetch(
+            "/api/v1/show/cues/groups",
+            method="PATCH",
+            body=tornado.escape.json_encode(patch_body),
+            headers={"Authorization": f"Bearer {self.token}"},
+        )
+        self.assertEqual(200, response.code)
+
+        with self._app.get_db().sessionmaker() as session:
+            group = session.get(CueGroup, group_id)
+            self.assertEqual("New Label", group.label_override)
+
+    def test_patch_adds_and_removes_cues(self):
+        """PATCH reconciles cue membership — adds new, removes absent."""
+        create_resp = self._create_group(
+            cues=[
+                {"ident": "1", "sortOrder": 0},
+                {"ident": "2", "sortOrder": 1},
+            ]
+        )
+        group_id = tornado.escape.json_decode(create_resp.body)["id"]
+
+        with self._app.get_db().sessionmaker() as session:
+            assocs = session.scalars(
+                select(CueAssociation).where(
+                    CueAssociation.group_id == group_id,
+                    CueAssociation.revision_id == self.revision_id,
+                )
+            ).all()
+            # Keep cue "1", drop cue "2", add cue "3"
+            keep_assoc = next(a for a in assocs if a.cue.ident == "1")
+
+        patch_body = {
+            "groupId": group_id,
+            "lineId": self.line_id,
+            "cues": [
+                {"id": keep_assoc.cue_id, "ident": "1", "sortOrder": 0},
+                {"ident": "3", "sortOrder": 1},
+            ],
+        }
+        response = self.fetch(
+            "/api/v1/show/cues/groups",
+            method="PATCH",
+            body=tornado.escape.json_encode(patch_body),
+            headers={"Authorization": f"Bearer {self.token}"},
+        )
+        self.assertEqual(200, response.code)
+
+        with self._app.get_db().sessionmaker() as session:
+            assocs = session.scalars(
+                select(CueAssociation).where(
+                    CueAssociation.group_id == group_id,
+                    CueAssociation.revision_id == self.revision_id,
+                )
+            ).all()
+            self.assertEqual(2, len(assocs))
+            idents = {a.cue.ident for a in assocs}
+            self.assertEqual({"1", "3"}, idents)
+
+    def test_delete_removes_group_and_cleans_up(self):
+        """DELETE /cues/groups removes associations and orphaned CueGroup/Cue rows."""
+        create_resp = self._create_group()
+        group_id = tornado.escape.json_decode(create_resp.body)["id"]
+
+        with self._app.get_db().sessionmaker() as session:
+            assocs = session.scalars(
+                select(CueAssociation).where(CueAssociation.group_id == group_id)
+            ).all()
+            cue_ids = [a.cue_id for a in assocs]
+
+        response = self.fetch(
+            f"/api/v1/show/cues/groups?groupId={group_id}&lineId={self.line_id}",
+            method="DELETE",
+            headers={"Authorization": f"Bearer {self.token}"},
+        )
+        self.assertEqual(200, response.code)
+
+        with self._app.get_db().sessionmaker() as session:
+            group = session.get(CueGroup, group_id)
+            self.assertIsNone(group)
+            for cue_id in cue_ids:
+                cue = session.get(Cue, cue_id)
+                self.assertIsNone(cue)
+
+    def test_revision_copy_forward_preserves_group(self):
+        """Creating a new revision copies group_id and sort_order."""
+        create_resp = self._create_group(
+            cues=[
+                {"ident": "1", "sortOrder": 0},
+                {"ident": "2", "sortOrder": 1},
+            ]
+        )
+        group_id = tornado.escape.json_decode(create_resp.body)["id"]
+
+        response = self.fetch(
+            "/api/v1/show/script/revisions",
+            method="POST",
+            body=tornado.escape.json_encode(
+                {"description": "Rev 2", "sourceRevision": self.revision_id}
+            ),
+            headers={"Authorization": f"Bearer {self.token}"},
+        )
+        self.assertEqual(200, response.code)
+        new_rev_id = tornado.escape.json_decode(response.body)["id"]
+
+        with self._app.get_db().sessionmaker() as session:
+            new_assocs = session.scalars(
+                select(CueAssociation).where(
+                    CueAssociation.revision_id == new_rev_id,
+                    CueAssociation.group_id == group_id,
+                )
+            ).all()
+            self.assertEqual(2, len(new_assocs))
+            sort_orders = sorted(a.sort_order for a in new_assocs)
+            self.assertEqual([0, 1], sort_orders)
+
+    def test_mixed_individual_and_group_on_same_line(self):
+        """A line can have both individual cues and cue group members."""
+        self._create_group(cues=[{"ident": "1", "sortOrder": 0}])
+
+        individual_body = {
+            "cueType": self.cue_type_id,
+            "ident": "solo",
+            "lineId": self.line_id,
+        }
+        response = self.fetch(
+            "/api/v1/show/cues",
+            method="POST",
+            body=tornado.escape.json_encode(individual_body),
+            headers={"Authorization": f"Bearer {self.token}"},
+        )
+        self.assertEqual(200, response.code)
+
+        get_resp = self.fetch("/api/v1/show/cues")
+        data = tornado.escape.json_decode(get_resp.body)
+        line_cues = data["cues"].get(str(self.line_id), [])
+        self.assertEqual(2, len(line_cues))
+        group_cues = [c for c in line_cues if c["group_id"] is not None]
+        solo_cues = [c for c in line_cues if c["group_id"] is None]
+        self.assertEqual(1, len(group_cues))
+        self.assertEqual(1, len(solo_cues))
+        self.assertEqual("solo", solo_cues[0]["ident"])
+
+    def test_patch_forks_group_when_shared_across_revisions(self):
+        """PATCH creates a new CueGroup for the current revision when another revision
+        references the same group, leaving the other revision's associations untouched."""
+        # Create group in revision 1
+        create_resp = self._create_group(
+            cues=[
+                {"ident": "1", "sortOrder": 0},
+                {"ident": "2", "sortOrder": 1},
+            ]
+        )
+        original_group_id = tornado.escape.json_decode(create_resp.body)["id"]
+
+        # Create revision 2 as a copy of revision 1
+        rev_resp = self.fetch(
+            "/api/v1/show/script/revisions",
+            method="POST",
+            body=tornado.escape.json_encode(
+                {"description": "Rev 2", "sourceRevision": self.revision_id}
+            ),
+            headers={"Authorization": f"Bearer {self.token}"},
+        )
+        self.assertEqual(200, rev_resp.code)
+        rev2_id = tornado.escape.json_decode(rev_resp.body)["id"]
+
+        # Switch current revision to revision 2
+        with self._app.get_db().sessionmaker() as session:
+            script = session.scalars(
+                select(Script).where(Script.show_id == self.show_id)
+            ).first()
+            script.current_revision = rev2_id
+            session.commit()
+
+        # PATCH the group while in revision 2 (same cues, just triggers fork check)
+        with self._app.get_db().sessionmaker() as session:
+            assocs = session.scalars(
+                select(CueAssociation).where(
+                    CueAssociation.group_id == original_group_id,
+                    CueAssociation.revision_id == rev2_id,
+                )
+            ).all()
+            existing_cues = [
+                {"id": a.cue_id, "ident": a.cue.ident, "sortOrder": a.sort_order}
+                for a in assocs
+            ]
+
+        patch_body = {
+            "groupId": original_group_id,
+            "lineId": self.line_id,
+            "labelOverride": "Forked Label",
+            "cues": existing_cues,
+        }
+        patch_resp = self.fetch(
+            "/api/v1/show/cues/groups",
+            method="PATCH",
+            body=tornado.escape.json_encode(patch_body),
+            headers={"Authorization": f"Bearer {self.token}"},
+        )
+        self.assertEqual(200, patch_resp.code)
+
+        with self._app.get_db().sessionmaker() as session:
+            # Revision 2's associations should now reference a NEW group
+            rev2_assocs = session.scalars(
+                select(CueAssociation).where(
+                    CueAssociation.revision_id == rev2_id,
+                    CueAssociation.line_id == self.line_id,
+                )
+            ).all()
+            rev2_group_ids = {a.group_id for a in rev2_assocs}
+            self.assertEqual(
+                1, len(rev2_group_ids), "Rev 2 should have exactly one group"
+            )
+            forked_group_id = next(iter(rev2_group_ids))
+            self.assertNotEqual(
+                original_group_id,
+                forked_group_id,
+                "Rev 2 should reference a new (forked) CueGroup",
+            )
+
+            # Verify the forked group has the updated label
+            forked_group = session.get(CueGroup, forked_group_id)
+            self.assertEqual("Forked Label", forked_group.label_override)
+
+            # Revision 1's associations must still reference the original group
+            rev1_assocs = session.scalars(
+                select(CueAssociation).where(
+                    CueAssociation.revision_id == self.revision_id,
+                    CueAssociation.group_id == original_group_id,
+                )
+            ).all()
+            self.assertEqual(
+                2, len(rev1_assocs), "Rev 1 associations should be unchanged"
+            )
+
+    def test_delete_preserves_group_when_other_revision_references_it(self):
+        """DELETE removes associations only for the current revision; the CueGroup
+        row is retained as long as another revision still references it."""
+        # Create group in revision 1
+        create_resp = self._create_group()
+        group_id = tornado.escape.json_decode(create_resp.body)["id"]
+
+        # Create revision 2 (copy forward — group_id carries over)
+        rev_resp = self.fetch(
+            "/api/v1/show/script/revisions",
+            method="POST",
+            body=tornado.escape.json_encode(
+                {"description": "Rev 2", "sourceRevision": self.revision_id}
+            ),
+            headers={"Authorization": f"Bearer {self.token}"},
+        )
+        self.assertEqual(200, rev_resp.code)
+        rev2_id = tornado.escape.json_decode(rev_resp.body)["id"]
+
+        # Switch current revision to revision 2
+        with self._app.get_db().sessionmaker() as session:
+            script = session.scalars(
+                select(Script).where(Script.show_id == self.show_id)
+            ).first()
+            script.current_revision = rev2_id
+            session.commit()
+
+        # DELETE the group from revision 2
+        delete_resp = self.fetch(
+            f"/api/v1/show/cues/groups?groupId={group_id}&lineId={self.line_id}",
+            method="DELETE",
+            headers={"Authorization": f"Bearer {self.token}"},
+        )
+        self.assertEqual(200, delete_resp.code)
+
+        with self._app.get_db().sessionmaker() as session:
+            # CueGroup must still exist — revision 1 still references it
+            group = session.get(CueGroup, group_id)
+            self.assertIsNotNone(
+                group, "CueGroup must survive when another revision references it"
+            )
+
+            # Revision 2 must have no associations for this group
+            rev2_assocs = session.scalars(
+                select(CueAssociation).where(
+                    CueAssociation.revision_id == rev2_id,
+                    CueAssociation.group_id == group_id,
+                )
+            ).all()
+            self.assertEqual(
+                0,
+                len(rev2_assocs),
+                "Rev 2 should have no group associations after delete",
+            )
+
+            # Revision 1's associations must be intact
+            rev1_assocs = session.scalars(
+                select(CueAssociation).where(
+                    CueAssociation.revision_id == self.revision_id,
+                    CueAssociation.group_id == group_id,
+                )
+            ).all()
+            self.assertGreater(
+                len(rev1_assocs), 0, "Rev 1 associations must remain untouched"
+            )
+
+    def test_patch_removes_orphaned_cue(self):
+        """When PATCH removes a cue from a group, the orphaned Cue row is deleted."""
+        create_resp = self._create_group(
+            cues=[
+                {"ident": "1", "sortOrder": 0},
+                {"ident": "2", "sortOrder": 1},
+            ]
+        )
+        group_id = tornado.escape.json_decode(create_resp.body)["id"]
+
+        with self._app.get_db().sessionmaker() as session:
+            assocs = session.scalars(
+                select(CueAssociation).where(
+                    CueAssociation.group_id == group_id,
+                    CueAssociation.revision_id == self.revision_id,
+                )
+            ).all()
+            keep_assoc = next(a for a in assocs if a.cue.ident == "1")
+            drop_cue_id = next(a.cue_id for a in assocs if a.cue.ident == "2")
+
+        # PATCH keeping only cue "1"
+        patch_body = {
+            "groupId": group_id,
+            "lineId": self.line_id,
+            "cues": [{"id": keep_assoc.cue_id, "ident": "1", "sortOrder": 0}],
+        }
+        response = self.fetch(
+            "/api/v1/show/cues/groups",
+            method="PATCH",
+            body=tornado.escape.json_encode(patch_body),
+            headers={"Authorization": f"Bearer {self.token}"},
+        )
+        self.assertEqual(200, response.code)
+
+        with self._app.get_db().sessionmaker() as session:
+            dropped_cue = session.get(Cue, drop_cue_id)
+            self.assertIsNone(
+                dropped_cue, "Orphaned Cue must be deleted after removal from group"
+            )
+
+    def test_patch_and_delete_require_no_live_session(self):
+        """PATCH and DELETE on /cues/groups are blocked when a live session exists."""
+        create_resp = self._create_group()
+        group_id = tornado.escape.json_decode(create_resp.body)["id"]
+
+        with self._app.get_db().sessionmaker() as session:
+            show_session = ShowSession(
+                show_id=self.show_id,
+                script_revision_id=self.revision_id,
+            )
+            session.add(show_session)
+            session.flush()
+            session_id = show_session.id
+            show = session.get(Show, self.show_id)
+            show.current_session_id = session_id
+            session.commit()
+
+        try:
+            patch_body = {
+                "groupId": group_id,
+                "lineId": self.line_id,
+                "cues": [{"ident": "1", "sortOrder": 0}],
+            }
+            patch_resp = self.fetch(
+                "/api/v1/show/cues/groups",
+                method="PATCH",
+                body=tornado.escape.json_encode(patch_body),
+                headers={"Authorization": f"Bearer {self.token}"},
+            )
+            self.assertEqual(409, patch_resp.code)
+
+            delete_resp = self.fetch(
+                f"/api/v1/show/cues/groups?groupId={group_id}&lineId={self.line_id}",
+                method="DELETE",
+                headers={"Authorization": f"Bearer {self.token}"},
+            )
+            self.assertEqual(409, delete_resp.code)
+        finally:
+            with self._app.get_db().sessionmaker() as session:
+                show = session.get(Show, self.show_id)
+                show.current_session_id = None
+                ss = session.get(ShowSession, session_id)
+                if ss:
+                    session.delete(ss)
+                session.commit()
diff --git a/sonar-project.properties b/sonar-project.properties
new file mode 100644
index 000000000..c4ff8371f
--- /dev/null
+++ b/sonar-project.properties
@@ -0,0 +1,4 @@
+# SonarCloud project configuration
+# The legacy Vue 2 client (client/) intentionally mirrors client-v3/ for feature parity.
+# Exclude it from copy-paste detection to avoid false-positive duplication alerts.
+sonar.cpd.exclusions=client/src/**