diff --git a/.github/workflows/nodelint.yml b/.github/workflows/nodelint.yml
index a5d614130..7492250d1 100644
--- a/.github/workflows/nodelint.yml
+++ b/.github/workflows/nodelint.yml
@@ -41,3 +41,15 @@ jobs:
           node-version: 24
       - run: npm ci
       - run: npm run ci-lint
+  run-typecheck-electron:
+    runs-on: ubuntu-latest
+    defaults:
+      run:
+        working-directory: ./electron
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 24
+      - run: npm ci
+      - run: npm run typecheck
diff --git a/client/eslint.config.ts b/client/eslint.config.ts
index 3e26e78e4..87f23685d 100644
--- a/client/eslint.config.ts
+++ b/client/eslint.config.ts
@@ -5,6 +5,7 @@ import tsParser from '@typescript-eslint/parser';
 import tsPlugin from '@typescript-eslint/eslint-plugin';
 import prettierConfig from 'eslint-config-prettier';
 import prettierPlugin from 'eslint-plugin-prettier';
+import tseslint from 'typescript-eslint';
 
 const sharedRules = {
   'prettier/prettier': 'error',
@@ -23,12 +24,12 @@ const sharedRules = {
 };
 
 const tsRules = {
-  ...tsPlugin.configs.recommended.rules,
+  ...Object.assign({}, ...tseslint.configs.recommended.map((c) => c.rules ?? {})),
   '@typescript-eslint/no-explicit-any': 'off',
   '@typescript-eslint/no-unused-vars': 'off',
   // Vue 2 Options API patterns that are valid in this codebase
   '@typescript-eslint/no-this-alias': 'off',
-  '@typescript-eslint/ban-types': 'off',
+  '@typescript-eslint/no-unsafe-function-type': 'off', // Function prop types are idiomatic in Vue 2
 };
 
 const sharedGlobals = {
diff --git a/client/package-lock.json b/client/package-lock.json
index f6a3892de..934c6a6b2 100644
--- a/client/package-lock.json
+++ b/client/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "client",
-  "version": "0.29.1",
+  "version": "0.29.2",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "client",
-      "version": "0.29.1",
+      "version": "0.29.2",
       "dependencies": {
         "bootstrap": "4.6.2",
         "bootstrap-vue": "2.23.1",
@@ -17,7 +17,7 @@
         "d3-selection": "^3.0.0",
         "d3-zoom": "^3.0.0",
         "deep-object-diff": "1.1.9",
-        "dompurify": "3.4.2",
+        "dompurify": "3.4.3",
         "fuse.js": "7.3.0",
         "jquery": "3.7.1",
         "lodash": "4.18.1",
@@ -38,8 +38,8 @@
         "@types/lodash": "~4.17.24",
         "@types/node": "~20.14.0",
         "@types/vuelidate": "^0.7.22",
-        "@typescript-eslint/eslint-plugin": "~7.18.0",
-        "@typescript-eslint/parser": "~7.18.0",
+        "@typescript-eslint/eslint-plugin": "^8.0.0",
+        "@typescript-eslint/parser": "^8.0.0",
         "@vitejs/plugin-vue2": "2.3.4",
         "@vitest/ui": "^4.1.6",
         "@vue/test-utils": "^2.4.10",
@@ -52,7 +52,8 @@
         "jsdom": "^27.4.0",
         "prettier": "^3.8.3",
         "sass": "1.99.0",
-        "typescript": "~5.4.5",
+        "typescript": "^6.0.0",
+        "typescript-eslint": "^8.0.0",
         "vite": "^7.3.3",
         "vitest": "^4.1.6"
       },
@@ -1017,44 +1018,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/@nodelib/fs.scandir": {
-      "version": "2.1.5",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
-      "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@nodelib/fs.stat": "2.0.5",
-        "run-parallel": "^1.1.9"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/@nodelib/fs.stat": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
-      "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/@nodelib/fs.walk": {
-      "version": "1.2.8",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
-      "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@nodelib/fs.scandir": "2.1.5",
-        "fastq": "^1.6.0"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
     "node_modules/@nuxt/opencollective": {
       "version": "0.3.3",
       "resolved": "https://registry.npmjs.org/@nuxt/opencollective/-/opencollective-0.3.3.tgz",
@@ -1888,122 +1851,159 @@
       }
     },
     "node_modules/@typescript-eslint/eslint-plugin": {
-      "version": "7.18.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-7.18.0.tgz",
-      "integrity": "sha512-94EQTWZ40mzBc42ATNIBimBEDltSJ9RQHCC8vc/PDbxi4k8dVwUAv4o98dk50M1zB+JGFxp43FP7f8+FP8R6Sw==",
+      "version": "8.59.3",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.59.3.tgz",
+      "integrity": "sha512-PwFvSKsXGShKGW6n5bZOhGHEcCZXM8HofLK9fNsEwZXzFRjoY+XT1Vsf1zgyXdwTr0ZYz1/2tkZ0DBTT9jZjhw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@eslint-community/regexpp": "^4.10.0",
-        "@typescript-eslint/scope-manager": "7.18.0",
-        "@typescript-eslint/type-utils": "7.18.0",
-        "@typescript-eslint/utils": "7.18.0",
-        "@typescript-eslint/visitor-keys": "7.18.0",
-        "graphemer": "^1.4.0",
-        "ignore": "^5.3.1",
+        "@eslint-community/regexpp": "^4.12.2",
+        "@typescript-eslint/scope-manager": "8.59.3",
+        "@typescript-eslint/type-utils": "8.59.3",
+        "@typescript-eslint/utils": "8.59.3",
+        "@typescript-eslint/visitor-keys": "8.59.3",
+        "ignore": "^7.0.5",
         "natural-compare": "^1.4.0",
-        "ts-api-utils": "^1.3.0"
+        "ts-api-utils": "^2.5.0"
       },
       "engines": {
-        "node": "^18.18.0 || >=20.0.0"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       },
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/typescript-eslint"
       },
       "peerDependencies": {
-        "@typescript-eslint/parser": "^7.0.0",
-        "eslint": "^8.56.0"
-      },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
+        "@typescript-eslint/parser": "^8.59.3",
+        "eslint": "^8.57.0 || ^9.0.0 || ^10.0.0",
+        "typescript": ">=4.8.4 <6.1.0"
+      }
+    },
+    "node_modules/@typescript-eslint/eslint-plugin/node_modules/ignore": {
+      "version": "7.0.5",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-7.0.5.tgz",
+      "integrity": "sha512-Hs59xBNfUIunMFgWAbGX5cq6893IbWg4KnrjbYwX3tx0ztorVgTDA6B2sxf8ejHJ4wz8BqGUMYlnzNBer5NvGg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 4"
       }
     },
     "node_modules/@typescript-eslint/parser": {
-      "version": "7.18.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-7.18.0.tgz",
-      "integrity": "sha512-4Z+L8I2OqhZV8qA132M4wNL30ypZGYOQVBfMgxDH/K5UX0PNqTu1c6za9ST5r9+tavvHiTWmBnKzpCJ/GlVFtg==",
+      "version": "8.59.3",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.59.3.tgz",
+      "integrity": "sha512-HPwA+hVkfcriajbNvTmZv4VRauibay+cWArYUYq7u7W7PmGShMxbPxLvrwDme55a6d5alG3nrYfhyJ/G28XlLg==",
       "dev": true,
-      "license": "BSD-2-Clause",
+      "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/scope-manager": "7.18.0",
-        "@typescript-eslint/types": "7.18.0",
-        "@typescript-eslint/typescript-estree": "7.18.0",
-        "@typescript-eslint/visitor-keys": "7.18.0",
-        "debug": "^4.3.4"
+        "@typescript-eslint/scope-manager": "8.59.3",
+        "@typescript-eslint/types": "8.59.3",
+        "@typescript-eslint/typescript-estree": "8.59.3",
+        "@typescript-eslint/visitor-keys": "8.59.3",
+        "debug": "^4.4.3"
       },
       "engines": {
-        "node": "^18.18.0 || >=20.0.0"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       },
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/typescript-eslint"
       },
       "peerDependencies": {
-        "eslint": "^8.56.0"
+        "eslint": "^8.57.0 || ^9.0.0 || ^10.0.0",
+        "typescript": ">=4.8.4 <6.1.0"
+      }
+    },
+    "node_modules/@typescript-eslint/project-service": {
+      "version": "8.59.3",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.59.3.tgz",
+      "integrity": "sha512-ECiUWa/KYRGDFUqTNehaRgzDshnJfkTABJxVemHk4ko22gcr0ukloKjWvyQ64g8YCV/UI47kN1dbmjf/GaQYng==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@typescript-eslint/tsconfig-utils": "^8.59.3",
+        "@typescript-eslint/types": "^8.59.3",
+        "debug": "^4.4.3"
       },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "typescript": ">=4.8.4 <6.1.0"
       }
     },
     "node_modules/@typescript-eslint/scope-manager": {
-      "version": "7.18.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-7.18.0.tgz",
-      "integrity": "sha512-jjhdIE/FPF2B7Z1uzc6i3oWKbGcHb87Qw7AWj6jmEqNOfDFbJWtjt/XfwCpvNkpGWlcJaog5vTR+VV8+w9JflA==",
+      "version": "8.59.3",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.59.3.tgz",
+      "integrity": "sha512-t2LvZnoEfzKtnPjgeEu41xw5gxq9mQVfYy4OoZ4Vlt0sk3JwxmhCca/AR7DwOiHrjWgjAj6as4AhRLKSDfvZIA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "7.18.0",
-        "@typescript-eslint/visitor-keys": "7.18.0"
+        "@typescript-eslint/types": "8.59.3",
+        "@typescript-eslint/visitor-keys": "8.59.3"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@typescript-eslint/tsconfig-utils": {
+      "version": "8.59.3",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.59.3.tgz",
+      "integrity": "sha512-PcIJHjmaREXLgIAIzLnSY9VucEzz8FKXsRgFa1DmdGCK/5tJpW03TKJF01Q6VZd1lLdz2sIKPWaDUZN9dp//dw==",
+      "dev": true,
+      "license": "MIT",
       "engines": {
-        "node": "^18.18.0 || >=20.0.0"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       },
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "typescript": ">=4.8.4 <6.1.0"
       }
     },
     "node_modules/@typescript-eslint/type-utils": {
-      "version": "7.18.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-7.18.0.tgz",
-      "integrity": "sha512-XL0FJXuCLaDuX2sYqZUUSOJ2sG5/i1AAze+axqmLnSkNEVMVYLF+cbwlB2w8D1tinFuSikHmFta+P+HOofrLeA==",
+      "version": "8.59.3",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.59.3.tgz",
+      "integrity": "sha512-g71d8QD8UaiHGvrJwyIS1hCX5r63w6Jll+4VEYhEAHXTDIqX1JgxhTAbEHtKntL9kuc4jRo7/GWw5xfCepSccQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/typescript-estree": "7.18.0",
-        "@typescript-eslint/utils": "7.18.0",
-        "debug": "^4.3.4",
-        "ts-api-utils": "^1.3.0"
+        "@typescript-eslint/types": "8.59.3",
+        "@typescript-eslint/typescript-estree": "8.59.3",
+        "@typescript-eslint/utils": "8.59.3",
+        "debug": "^4.4.3",
+        "ts-api-utils": "^2.5.0"
       },
       "engines": {
-        "node": "^18.18.0 || >=20.0.0"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       },
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/typescript-eslint"
       },
       "peerDependencies": {
-        "eslint": "^8.56.0"
-      },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
+        "eslint": "^8.57.0 || ^9.0.0 || ^10.0.0",
+        "typescript": ">=4.8.4 <6.1.0"
       }
     },
     "node_modules/@typescript-eslint/types": {
-      "version": "7.18.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.18.0.tgz",
-      "integrity": "sha512-iZqi+Ds1y4EDYUtlOOC+aUmxnE9xS/yCigkjA7XpTKV6nCBd3Hp/PRGGmdwnfkV2ThMyYldP1wRpm/id99spTQ==",
+      "version": "8.59.3",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.59.3.tgz",
+      "integrity": "sha512-ePFoH0g4ludssdRFqqDxQePCxU4WQyRa9+XVwjm7yLn0FKhMeoetC+qBEEI1Eyb1pGSDveTIT09Bvw2WhlGayg==",
       "dev": true,
       "license": "MIT",
       "engines": {
-        "node": "^18.18.0 || >=20.0.0"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       },
       "funding": {
         "type": "opencollective",
@@ -2011,127 +2011,114 @@
       }
     },
     "node_modules/@typescript-eslint/typescript-estree": {
-      "version": "7.18.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-7.18.0.tgz",
-      "integrity": "sha512-aP1v/BSPnnyhMHts8cf1qQ6Q1IFwwRvAQGRvBFkWlo3/lH29OXA3Pts+c10nxRxIBrDnoMqzhgdwVe5f2D6OzA==",
+      "version": "8.59.3",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.59.3.tgz",
+      "integrity": "sha512-CbRjVRAf7Lr9Kr8RopKcbY45p2VfmmHrm0ygOCYFi7oU8q19m0Fs/6iHS7kNOmwpp+ob07ZVcAqlxUod9lYdmg==",
       "dev": true,
-      "license": "BSD-2-Clause",
+      "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "7.18.0",
-        "@typescript-eslint/visitor-keys": "7.18.0",
-        "debug": "^4.3.4",
-        "globby": "^11.1.0",
-        "is-glob": "^4.0.3",
-        "minimatch": "^9.0.4",
-        "semver": "^7.6.0",
-        "ts-api-utils": "^1.3.0"
+        "@typescript-eslint/project-service": "8.59.3",
+        "@typescript-eslint/tsconfig-utils": "8.59.3",
+        "@typescript-eslint/types": "8.59.3",
+        "@typescript-eslint/visitor-keys": "8.59.3",
+        "debug": "^4.4.3",
+        "minimatch": "^10.2.2",
+        "semver": "^7.7.3",
+        "tinyglobby": "^0.2.15",
+        "ts-api-utils": "^2.5.0"
       },
       "engines": {
-        "node": "^18.18.0 || >=20.0.0"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       },
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/typescript-eslint"
       },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
+      "peerDependencies": {
+        "typescript": ">=4.8.4 <6.1.0"
+      }
+    },
+    "node_modules/@typescript-eslint/typescript-estree/node_modules/balanced-match": {
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-4.0.4.tgz",
+      "integrity": "sha512-BLrgEcRTwX2o6gGxGOCNyMvGSp35YofuYzw9h1IMTRmKqttAZZVU67bdb9Pr2vUHA8+j3i2tJfjO6C6+4myGTA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "18 || 20 || >=22"
       }
     },
     "node_modules/@typescript-eslint/typescript-estree/node_modules/brace-expansion": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.1.0.tgz",
-      "integrity": "sha512-TN1kCZAgdgweJhWWpgKYrQaMNHcDULHkWwQIspdtjV4Y5aurRdZpjAqn6yX3FPqTA9ngHCc4hJxMAMgGfve85w==",
+      "version": "5.0.6",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.6.tgz",
+      "integrity": "sha512-kLpxurY4Z4r9sgMsyG0Z9uzsBlgiU/EFKhj/h91/8yHu0edo7XuixOIH3VcJ8kkxs6/jPzoI6U9Vj3WqbMQ94g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "balanced-match": "^1.0.0"
+        "balanced-match": "^4.0.2"
+      },
+      "engines": {
+        "node": "18 || 20 || >=22"
       }
     },
     "node_modules/@typescript-eslint/typescript-estree/node_modules/minimatch": {
-      "version": "9.0.9",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.9.tgz",
-      "integrity": "sha512-OBwBN9AL4dqmETlpS2zasx+vTeWclWzkblfZk7KTA5j3jeOONz/tRCnZomUyvNg83wL5Zv9Ss6HMJXAgL8R2Yg==",
+      "version": "10.2.5",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.2.5.tgz",
+      "integrity": "sha512-MULkVLfKGYDFYejP07QOurDLLQpcjk7Fw+7jXS2R2czRQzR56yHRveU5NDJEOviH+hETZKSkIk5c+T23GjFUMg==",
       "dev": true,
-      "license": "ISC",
+      "license": "BlueOak-1.0.0",
       "dependencies": {
-        "brace-expansion": "^2.0.2"
+        "brace-expansion": "^5.0.5"
       },
       "engines": {
-        "node": ">=16 || 14 >=14.17"
+        "node": "18 || 20 || >=22"
       },
       "funding": {
         "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "node_modules/@typescript-eslint/typescript-estree/node_modules/semver": {
-      "version": "7.8.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.8.0.tgz",
-      "integrity": "sha512-AcM7dV/5ul4EekoQ29Agm5vri8JNqRyj39o0qpX6vDF2GZrtutZl5RwgD1XnZjiTAfncsJhMI48QQH3sN87YNA==",
-      "dev": true,
-      "license": "ISC",
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
     "node_modules/@typescript-eslint/utils": {
-      "version": "7.18.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-7.18.0.tgz",
-      "integrity": "sha512-kK0/rNa2j74XuHVcoCZxdFBMF+aq/vH83CXAOHieC+2Gis4mF8jJXT5eAfyD3K0sAxtPuwxaIOIOvhwzVDt/kw==",
+      "version": "8.59.3",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.59.3.tgz",
+      "integrity": "sha512-JAvT14goBzRzzzZyqq3P9BLArIxTtQURUtFgQ/V7FO+eU+Gg6ES+5ymOPP1wRxXcxAYeivCk4uS3jCKWI1K8Zg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@eslint-community/eslint-utils": "^4.4.0",
-        "@typescript-eslint/scope-manager": "7.18.0",
-        "@typescript-eslint/types": "7.18.0",
-        "@typescript-eslint/typescript-estree": "7.18.0"
+        "@eslint-community/eslint-utils": "^4.9.1",
+        "@typescript-eslint/scope-manager": "8.59.3",
+        "@typescript-eslint/types": "8.59.3",
+        "@typescript-eslint/typescript-estree": "8.59.3"
       },
       "engines": {
-        "node": "^18.18.0 || >=20.0.0"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       },
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/typescript-eslint"
       },
       "peerDependencies": {
-        "eslint": "^8.56.0"
+        "eslint": "^8.57.0 || ^9.0.0 || ^10.0.0",
+        "typescript": ">=4.8.4 <6.1.0"
       }
     },
     "node_modules/@typescript-eslint/visitor-keys": {
-      "version": "7.18.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-7.18.0.tgz",
-      "integrity": "sha512-cDF0/Gf81QpY3xYyJKDV14Zwdmid5+uuENhjH2EqFaF0ni+yAyq/LzMaIJdhNJXZI7uLzwIlA+V7oWoyn6Curg==",
+      "version": "8.59.3",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.59.3.tgz",
+      "integrity": "sha512-f1UQF7ggd42YiwI5wGrRaPsa+P0CINBlrkLPmGfpq/u/I/oVtecoEIfFR9ag/oa1sLOsRNZ6xehf6qMZhQGBDg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "7.18.0",
-        "eslint-visitor-keys": "^3.4.3"
+        "@typescript-eslint/types": "8.59.3",
+        "eslint-visitor-keys": "^5.0.0"
       },
       "engines": {
-        "node": "^18.18.0 || >=20.0.0"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       },
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/typescript-eslint"
       }
     },
-    "node_modules/@typescript-eslint/visitor-keys/node_modules/eslint-visitor-keys": {
-      "version": "3.4.3",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz",
-      "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/eslint"
-      }
-    },
     "node_modules/@vitejs/plugin-vue2": {
       "version": "2.3.4",
       "resolved": "https://registry.npmjs.org/@vitejs/plugin-vue2/-/plugin-vue2-2.3.4.tgz",
@@ -2407,16 +2394,6 @@
       "dev": true,
       "license": "Python-2.0"
     },
-    "node_modules/array-union": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
-      "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/assertion-error": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-2.0.1.tgz",
@@ -2503,19 +2480,6 @@
         "concat-map": "0.0.1"
       }
     },
-    "node_modules/braces": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
-      "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "fill-range": "^7.1.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/callsites": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
@@ -2917,23 +2881,10 @@
         "node": ">=8"
       }
     },
-    "node_modules/dir-glob": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
-      "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "path-type": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/dompurify": {
-      "version": "3.4.2",
-      "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-3.4.2.tgz",
-      "integrity": "sha512-lHeS9SA/IKeIFFyYciHBr2n0v1VMPlSj843HdLOwjb2OxNwdq9Xykxqhk+FE42MzAdHvInbAolSE4mhahPpjXA==",
+      "version": "3.4.3",
+      "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-3.4.3.tgz",
+      "integrity": "sha512-VVwJidIJcp1hpg2OMXML3ZVRPYSZiq4aX7qBh83BSIpOaRDqI+qxhXjjIWnpzkOXhmp0L81lnoME1mnCc9H48A==",
       "license": "(MPL-2.0 OR Apache-2.0)",
       "optionalDependencies": {
         "@types/trusted-types": "^2.0.7"
@@ -2991,19 +2942,6 @@
         "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "node_modules/editorconfig/node_modules/semver": {
-      "version": "7.7.4",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.4.tgz",
-      "integrity": "sha512-vFKC2IEtQnVhpT78h1Yp8wzwrf8CM+MzKMHGJZfBtzhZNycRFnXsHk6E5TxIkkMsgNS7mdX3AGB7x2QM2di4lA==",
-      "dev": true,
-      "license": "ISC",
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
     "node_modules/emoji-regex": {
       "version": "9.2.2",
       "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
@@ -3232,17 +3170,17 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/eslint-plugin-vue/node_modules/semver": {
-      "version": "7.7.4",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.4.tgz",
-      "integrity": "sha512-vFKC2IEtQnVhpT78h1Yp8wzwrf8CM+MzKMHGJZfBtzhZNycRFnXsHk6E5TxIkkMsgNS7mdX3AGB7x2QM2di4lA==",
+    "node_modules/eslint-visitor-keys": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-5.0.1.tgz",
+      "integrity": "sha512-tD40eHxA35h0PEIZNeIjkHoDR4YjjJp34biM0mDvplBe//mB+IHCqHDGV7pxF+7MklTvighcCPPZC7ynWyjdTA==",
       "dev": true,
-      "license": "ISC",
-      "bin": {
-        "semver": "bin/semver.js"
-      },
+      "license": "Apache-2.0",
       "engines": {
-        "node": ">=10"
+        "node": "^20.19.0 || ^22.13.0 || >=24"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
       }
     },
     "node_modules/eslint/node_modules/eslint-scope": {
@@ -3406,36 +3344,6 @@
       "dev": true,
       "license": "Apache-2.0"
     },
-    "node_modules/fast-glob": {
-      "version": "3.3.3",
-      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.3.tgz",
-      "integrity": "sha512-7MptL8U0cqcFdzIzwOTHoilX9x5BrNqye7Z/LuC7kCMRio1EMSyqRK3BEAUD7sXRq4iT4AzTVuZdhgQ2TCvYLg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@nodelib/fs.stat": "^2.0.2",
-        "@nodelib/fs.walk": "^1.2.3",
-        "glob-parent": "^5.1.2",
-        "merge2": "^1.3.0",
-        "micromatch": "^4.0.8"
-      },
-      "engines": {
-        "node": ">=8.6.0"
-      }
-    },
-    "node_modules/fast-glob/node_modules/glob-parent": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
-      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "is-glob": "^4.0.1"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
     "node_modules/fast-json-stable-stringify": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
@@ -3450,16 +3358,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/fastq": {
-      "version": "1.20.1",
-      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.20.1.tgz",
-      "integrity": "sha512-GGToxJ/w1x32s/D2EKND7kTil4n8OVk/9mycTc4VDza13lOvpUZTGX3mFSCtV9ksdGBVzvsyAVLM6mHFThxXxw==",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "reusify": "^1.0.4"
-      }
-    },
     "node_modules/fdir": {
       "version": "6.5.0",
       "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.5.0.tgz",
@@ -3498,19 +3396,6 @@
         "node": ">=16.0.0"
       }
     },
-    "node_modules/fill-range": {
-      "version": "7.1.1",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
-      "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "to-regex-range": "^5.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/find-up": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
@@ -3668,34 +3553,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/globby": {
-      "version": "11.1.0",
-      "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
-      "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "array-union": "^2.1.0",
-        "dir-glob": "^3.0.1",
-        "fast-glob": "^3.2.9",
-        "ignore": "^5.2.0",
-        "merge2": "^1.4.1",
-        "slash": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/graphemer": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz",
-      "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/has-flag": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
@@ -3830,16 +3687,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/is-number": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.12.0"
-      }
-    },
     "node_modules/is-potential-custom-element-name": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz",
@@ -4097,43 +3944,6 @@
       "dev": true,
       "license": "CC0-1.0"
     },
-    "node_modules/merge2": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
-      "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/micromatch": {
-      "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz",
-      "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "braces": "^3.0.3",
-        "picomatch": "^2.3.1"
-      },
-      "engines": {
-        "node": ">=8.6"
-      }
-    },
-    "node_modules/micromatch/node_modules/picomatch": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.2.tgz",
-      "integrity": "sha512-V7+vQEJ06Z+c5tSye8S+nHUfI51xoXIXjHQ99cQtKUkQqqO1kO/KCJUfZXuB47h/YBlDhah2H3hdUGXn8ie0oA==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8.6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/jonschlinkert"
-      }
-    },
     "node_modules/minimatch": {
       "version": "3.1.5",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.5.tgz",
@@ -4416,16 +4226,6 @@
       "dev": true,
       "license": "ISC"
     },
-    "node_modules/path-type": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
-      "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/pathe": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/pathe/-/pathe-2.0.3.tgz",
@@ -4570,27 +4370,6 @@
         "node": ">=6"
       }
     },
-    "node_modules/queue-microtask": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
-      "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ],
-      "license": "MIT"
-    },
     "node_modules/readdirp": {
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-4.1.2.tgz",
@@ -4625,17 +4404,6 @@
         "node": ">=4"
       }
     },
-    "node_modules/reusify": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.1.0.tgz",
-      "integrity": "sha512-g6QUff04oZpHs0eG5p83rFLhHeV00ug/Yf9nZM6fLeUrPguBTkTQOdpAWWspMh55TZfVQDPaN3NQJfbVRAxdIw==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "iojs": ">=1.0.0",
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/rollup": {
       "version": "4.60.3",
       "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.60.3.tgz",
@@ -4681,30 +4449,6 @@
         "fsevents": "~2.3.2"
       }
     },
-    "node_modules/run-parallel": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
-      "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ],
-      "license": "MIT",
-      "dependencies": {
-        "queue-microtask": "^1.2.2"
-      }
-    },
     "node_modules/sass": {
       "version": "1.99.0",
       "resolved": "https://registry.npmjs.org/sass/-/sass-1.99.0.tgz",
@@ -4739,6 +4483,19 @@
         "node": ">=v12.22.7"
       }
     },
+    "node_modules/semver": {
+      "version": "7.8.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.8.0.tgz",
+      "integrity": "sha512-AcM7dV/5ul4EekoQ29Agm5vri8JNqRyj39o0qpX6vDF2GZrtutZl5RwgD1XnZjiTAfncsJhMI48QQH3sN87YNA==",
+      "dev": true,
+      "license": "ISC",
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
     "node_modules/shebang-command": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
@@ -4804,16 +4561,6 @@
         "node": ">=18"
       }
     },
-    "node_modules/slash": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
-      "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/source-map": {
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
@@ -5068,19 +4815,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/to-regex-range": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
-      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "is-number": "^7.0.0"
-      },
-      "engines": {
-        "node": ">=8.0"
-      }
-    },
     "node_modules/totalist": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/totalist/-/totalist-3.0.1.tgz",
@@ -5118,16 +4852,16 @@
       }
     },
     "node_modules/ts-api-utils": {
-      "version": "1.4.3",
-      "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-1.4.3.tgz",
-      "integrity": "sha512-i3eMG77UTMD0hZhgRS562pv83RC6ukSAC2GMNWc+9dieh/+jDM5u5YG+NHX6VNDRHQcHwmsTHctP9LhbC3WxVw==",
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-2.5.0.tgz",
+      "integrity": "sha512-OJ/ibxhPlqrMM0UiNHJ/0CKQkoKF243/AEmplt3qpRgkW8VG7IfOS41h7V8TjITqdByHzrjcS/2si+y4lIh8NA==",
       "dev": true,
       "license": "MIT",
       "engines": {
-        "node": ">=16"
+        "node": ">=18.12"
       },
       "peerDependencies": {
-        "typescript": ">=4.2.0"
+        "typescript": ">=4.8.4"
       }
     },
     "node_modules/type-check": {
@@ -5157,9 +4891,9 @@
       }
     },
     "node_modules/typescript": {
-      "version": "5.4.5",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.4.5.tgz",
-      "integrity": "sha512-vcI4UpRgg81oIRUFwR0WSIHKt11nJ7SAVlYNIu+QpqeyXP+gpQJy/Z4+F0aGxSE4MqwjyXvW/TzgkLAx2AGHwQ==",
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-6.0.3.tgz",
+      "integrity": "sha512-y2TvuxSZPDyQakkFRPZHKFm+KKVqIisdg9/CZwm9ftvKXLP8NRWj38/ODjNbr43SsoXqNuAisEf1GdCxqWcdBw==",
       "dev": true,
       "license": "Apache-2.0",
       "bin": {
@@ -5170,6 +4904,30 @@
         "node": ">=14.17"
       }
     },
+    "node_modules/typescript-eslint": {
+      "version": "8.59.3",
+      "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.59.3.tgz",
+      "integrity": "sha512-KgusgyDgG4LI8Ih/sWaCtZ06tckLAS5CvT5A4D1Q7bYVoAAyzwiZvE4BmwDHkhRVkvhRBepKeASoFzQetha7Fg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@typescript-eslint/eslint-plugin": "8.59.3",
+        "@typescript-eslint/parser": "8.59.3",
+        "@typescript-eslint/typescript-estree": "8.59.3",
+        "@typescript-eslint/utils": "8.59.3"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "eslint": "^8.57.0 || ^9.0.0 || ^10.0.0",
+        "typescript": ">=4.8.4 <6.1.0"
+      }
+    },
     "node_modules/undici-types": {
       "version": "5.26.5",
       "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
@@ -5460,19 +5218,6 @@
         "node": ">=4.0"
       }
     },
-    "node_modules/vue-eslint-parser/node_modules/semver": {
-      "version": "7.7.4",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.4.tgz",
-      "integrity": "sha512-vFKC2IEtQnVhpT78h1Yp8wzwrf8CM+MzKMHGJZfBtzhZNycRFnXsHk6E5TxIkkMsgNS7mdX3AGB7x2QM2di4lA==",
-      "dev": true,
-      "license": "ISC",
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
     "node_modules/vue-functional-data-merge": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/vue-functional-data-merge/-/vue-functional-data-merge-3.1.0.tgz",
diff --git a/client/package.json b/client/package.json
index 146751ed6..9ae882bbf 100644
--- a/client/package.json
+++ b/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "client",
-  "version": "0.29.1",
+  "version": "0.29.2",
   "description": "DigiScript front end",
   "author": "DreamTeamProd",
   "private": true,
@@ -37,7 +37,7 @@
     "d3-selection": "^3.0.0",
     "d3-zoom": "^3.0.0",
     "deep-object-diff": "1.1.9",
-    "dompurify": "3.4.2",
+    "dompurify": "3.4.3",
     "fuse.js": "7.3.0",
     "jquery": "3.7.1",
     "lodash": "4.18.1",
@@ -58,8 +58,8 @@
     "@types/lodash": "~4.17.24",
     "@types/node": "~20.14.0",
     "@types/vuelidate": "^0.7.22",
-    "@typescript-eslint/eslint-plugin": "~7.18.0",
-    "@typescript-eslint/parser": "~7.18.0",
+    "@typescript-eslint/eslint-plugin": "^8.0.0",
+    "@typescript-eslint/parser": "^8.0.0",
     "@vitejs/plugin-vue2": "2.3.4",
     "@vitest/ui": "^4.1.6",
     "@vue/test-utils": "^2.4.10",
@@ -72,7 +72,8 @@
     "jsdom": "^27.4.0",
     "prettier": "^3.8.3",
     "sass": "1.99.0",
-    "typescript": "~5.4.5",
+    "typescript": "^6.0.0",
+    "typescript-eslint": "^8.0.0",
     "vite": "^7.3.3",
     "vitest": "^4.1.6"
   },
diff --git a/client/src/js/logger.ts b/client/src/js/logger.ts
index 6f369bf57..9df953cd6 100644
--- a/client/src/js/logger.ts
+++ b/client/src/js/logger.ts
@@ -13,7 +13,7 @@ interface LogEntry {
   extra: Record<string, unknown>;
 }
 
-let logQueue: LogEntry[] = [];
+const logQueue: LogEntry[] = [];
 let flushTimer: ReturnType<typeof setTimeout> | null = null;
 
 /**
diff --git a/client/src/mixins/scriptDisplayMixin.ts b/client/src/mixins/scriptDisplayMixin.ts
index 4b9c0b1d4..f2ad3f92a 100644
--- a/client/src/mixins/scriptDisplayMixin.ts
+++ b/client/src/mixins/scriptDisplayMixin.ts
@@ -96,6 +96,18 @@ export default defineComponent({
     needsHeadingsAll(): boolean {
       return (this as any).needsHeadings.every((x: boolean) => x === true);
     },
+    isTaggedStageDirection(): boolean {
+      const line: ScriptLine = (this as any).line;
+      const part = line.line_parts?.[0];
+      return (
+        line.line_type === LINE_TYPES.STAGE_DIRECTION &&
+        (part?.character_id != null || part?.character_group_id != null)
+      );
+    },
+    taggedStageDirectionHeadingName(): string {
+      const part = ((this as any).line as ScriptLine).line_parts?.[0];
+      return part ? (this as any).characterOrGroupName(part) : '';
+    },
     ...mapGetters(['USER_SETTINGS']),
   },
   mounted() {
@@ -122,6 +134,15 @@ export default defineComponent({
     }
   },
   methods: {
+    characterOrGroupName(part: any): string {
+      if (part.character_id != null) {
+        return (this as any).characters?.find((c: any) => c.id === part.character_id)?.name ?? '';
+      }
+      return (
+        (this as any).characterGroups?.find((c: any) => c.id === part.character_group_id)?.name ??
+        ''
+      );
+    },
     onClassChange(classAttrValue: string | null, oldClassAttrValue: string | null): void {
       const classList = classAttrValue?.split(' ') ?? [];
       const oldClassList = oldClassAttrValue?.split(' ') ?? [];
diff --git a/client/src/mixins/scriptNavigationMixin.ts b/client/src/mixins/scriptNavigationMixin.ts
index 618c39403..37c120851 100644
--- a/client/src/mixins/scriptNavigationMixin.ts
+++ b/client/src/mixins/scriptNavigationMixin.ts
@@ -11,7 +11,7 @@ export default defineComponent({
       let lineIndex: number | null = (this as any).previousLineIndex;
       while (
         previousLine != null &&
-        (previousLine.line_type === LINE_TYPES.STAGE_DIRECTION || this.isWholeLineCut(previousLine))
+        (this.checkIsUntaggedStageDirection(previousLine) || this.isWholeLineCut(previousLine))
       ) {
         [lineIndex, previousLine] = this.getPreviousLineForIndex(previousLine.page, lineIndex!);
       }
@@ -61,6 +61,13 @@ export default defineComponent({
       }
       return [null, null];
     },
+    checkIsUntaggedStageDirection(line: ScriptLine): boolean {
+      return (
+        line.line_type === LINE_TYPES.STAGE_DIRECTION &&
+        line.line_parts[0]?.character_id == null &&
+        line.line_parts[0]?.character_group_id == null
+      );
+    },
     isWholeLineCut(line: ScriptLine): boolean {
       return isWholeLineCutUtil(line, (this as any).SCRIPT_CUTS);
     },
diff --git a/client/src/types/shims/vue-shims.d.ts b/client/src/types/shims/vue-shims.d.ts
index a28257dea..bdf60c526 100644
--- a/client/src/types/shims/vue-shims.d.ts
+++ b/client/src/types/shims/vue-shims.d.ts
@@ -17,7 +17,6 @@ declare module 'vue/types/vue' {
 }
 
 declare module 'vue/types/options' {
-  // eslint-disable-next-line no-undef
   interface ComponentOptions<V extends Vue> {
     sockets?: Record<string, (data: unknown) => void>;
   }
diff --git a/client/src/vue_components/show/config/script/ScriptLineEditor.vue b/client/src/vue_components/show/config/script/ScriptLineEditor.vue
index e01df5bd0..d879a627d 100644
--- a/client/src/vue_components/show/config/script/ScriptLineEditor.vue
+++ b/client/src/vue_components/show/config/script/ScriptLineEditor.vue
@@ -55,23 +55,15 @@
           :enable-add-button="state.line_parts.length < 4 && lineType === LINE_TYPES.DIALOGUE"
           :line-type="lineType"
           :line-parts="state.line_parts"
+          :stage-direction-styles="
+            lineType === LINE_TYPES.STAGE_DIRECTION ? stageDirectionStyles : []
+          "
+          :stage-direction-style-id="state.stage_direction_style_id"
           @input="stateChange"
           @addLinePart="addLinePart"
           @tryFinishLine="tryFinishLine"
+          @stage-direction-style-change="onStageDirectionStyleChange"
         />
-        <b-col
-          v-if="lineType === LINE_TYPES.STAGE_DIRECTION && stageDirectionStyles.length > 0"
-          cols="2"
-        >
-          <b-form-select
-            id="stage-direction-style"
-            v-model="$v.state.stage_direction_style_id.$model"
-            name="stage-direction-style"
-            :options="stageDirectionStylesOptions"
-            :state="validateState('stage_direction_style_id')"
-            @change="stateChange"
-          />
-        </b-col>
       </template>
       <b-col v-else cols="10" style="text-align: right">
         <b-button v-b-popover.hover.top="'Add line part'" @click="addLinePart">
@@ -402,6 +394,10 @@ export default defineComponent({
       }
       this.stateChange();
     },
+    onStageDirectionStyleChange(styleId: number | null): void {
+      (this as any).state.stage_direction_style_id = styleId;
+      this.stateChange();
+    },
     deleteLine(): void {
       this.$emit('deleteLine');
     },
diff --git a/client/src/vue_components/show/config/script/ScriptLinePart.vue b/client/src/vue_components/show/config/script/ScriptLinePart.vue
index 9d804da58..71ed73156 100644
--- a/client/src/vue_components/show/config/script/ScriptLinePart.vue
+++ b/client/src/vue_components/show/config/script/ScriptLinePart.vue
@@ -1,6 +1,6 @@
 <template>
   <b-col>
-    <b-form-row v-if="lineType === LINE_TYPES.DIALOGUE">
+    <b-form-row v-if="lineType === LINE_TYPES.DIALOGUE || lineType === LINE_TYPES.STAGE_DIRECTION">
       <template v-if="USER_SETTINGS && USER_SETTINGS.character_combined_dropdown">
         <b-col>
           <b-form-group
@@ -56,6 +56,19 @@
           </b-form-group>
         </b-col>
       </template>
+      <b-col
+        v-if="lineType === LINE_TYPES.STAGE_DIRECTION && stageDirectionStyles.length > 0"
+        cols="3"
+      >
+        <b-form-group label-size="sm" label="Style" label-for="stage-direction-style-part">
+          <b-form-select
+            id="stage-direction-style-part"
+            :value="stageDirectionStyleId"
+            :options="stageDirectionStylesOptions"
+            @change="$emit('stage-direction-style-change', $event)"
+          />
+        </b-form-group>
+      </b-col>
     </b-form-row>
     <b-form-row>
       <b-col style="display: inline-flex">
@@ -124,6 +137,16 @@ export default defineComponent({
       required: true,
       type: Array,
     },
+    stageDirectionStyles: {
+      required: false,
+      type: Array,
+      default: () => [],
+    },
+    stageDirectionStyleId: {
+      required: false,
+      type: Number,
+      default: null,
+    },
     value: {
       required: true,
       type: Object,
@@ -178,6 +201,15 @@ export default defineComponent({
         ...groups.map((g: any) => ({ value: g.id, text: g.name })),
       ];
     },
+    stageDirectionStylesOptions(): { value: number | null; text: string }[] {
+      return [
+        { value: null, text: 'N/A' },
+        ...(this.stageDirectionStyles as any[]).map((s: any) => ({
+          value: s.id,
+          text: s.description,
+        })),
+      ];
+    },
     combinedOptions(): CombinedSelectOption[] {
       return buildCombinedCharacterOptions(
         this.characters as any[],
diff --git a/client/src/vue_components/show/config/script/ScriptLineViewer.vue b/client/src/vue_components/show/config/script/ScriptLineViewer.vue
index bee4d6609..e2751e334 100644
--- a/client/src/vue_components/show/config/script/ScriptLineViewer.vue
+++ b/client/src/vue_components/show/config/script/ScriptLineViewer.vue
@@ -63,6 +63,11 @@
     </template>
     <template v-else-if="line.line_type === LINE_TYPES.STAGE_DIRECTION">
       <b-col :key="`line_${lineIndex}_stage_direction`" :style="{ textAlign: scriptTextAlign }">
+        <b-row v-if="isTaggedStageDirection && needsHeadingsAny" style="margin-bottom: 1rem">
+          <b-col :style="headingStyle">
+            <b>{{ taggedStageDirectionHeadingName }}</b>
+          </b-col>
+        </b-row>
         <i
           v-if="(canEdit && !IS_CUT_MODE) || !canEdit"
           class="viewable-line"
@@ -257,7 +262,12 @@ export default defineComponent({
       const line = this.line as any;
       let previousLine = this.previousLine as any;
       let previousLineIndex = this.lineIndex - 1;
-      while (previousLine != null && previousLine.line_type === LINE_TYPES.STAGE_DIRECTION) {
+      while (
+        previousLine != null &&
+        previousLine.line_type === LINE_TYPES.STAGE_DIRECTION &&
+        previousLine.line_parts[0]?.character_id == null &&
+        previousLine.line_parts[0]?.character_group_id == null
+      ) {
         if (previousLineIndex === 0) {
           break;
         }
diff --git a/client/src/vue_components/show/live/ScriptLineViewer.vue b/client/src/vue_components/show/live/ScriptLineViewer.vue
index 33a551768..a03421972 100644
--- a/client/src/vue_components/show/live/ScriptLineViewer.vue
+++ b/client/src/vue_components/show/live/ScriptLineViewer.vue
@@ -108,6 +108,11 @@
         </template>
         <template v-else-if="line.line_type === LINE_TYPES.STAGE_DIRECTION">
           <b-col :key="`line_${lineIndex}_stage_direction`" :style="{ textAlign: scriptTextAlign }">
+            <b-row v-if="isTaggedStageDirection && needsHeadingsAny" style="margin-bottom: 1rem">
+              <b-col :style="headingStyle">
+                <b>{{ taggedStageDirectionHeadingName }}</b>
+              </b-col>
+            </b-row>
             <i class="viewable-line" :style="stageDirectionStyling">
               <template
                 v-if="stageDirectionStyle != null && stageDirectionStyle.text_format === 'upper'"
@@ -214,6 +219,11 @@
         </template>
         <template v-else-if="line.line_type === LINE_TYPES.STAGE_DIRECTION">
           <b-col :key="`line_${lineIndex}_stage_direction`" :style="{ textAlign: scriptTextAlign }">
+            <b-row v-if="isTaggedStageDirection && needsHeadingsAny" style="margin-bottom: 1rem">
+              <b-col :style="headingStyle">
+                <b>{{ taggedStageDirectionHeadingName }}</b>
+              </b-col>
+            </b-row>
             <i class="viewable-line" :style="stageDirectionStyling">
               <template
                 v-if="stageDirectionStyle != null && stageDirectionStyle.text_format === 'upper'"
diff --git a/client/src/vue_components/show/live/ScriptLineViewerCompact.vue b/client/src/vue_components/show/live/ScriptLineViewerCompact.vue
index 875273083..c447b9b73 100644
--- a/client/src/vue_components/show/live/ScriptLineViewerCompact.vue
+++ b/client/src/vue_components/show/live/ScriptLineViewerCompact.vue
@@ -84,14 +84,7 @@
               'first-row': isFirstRowContent && index === 0,
             }"
           >
-            <p v-if="needsHeadings[index]">
-              <template v-if="part.character_id != null">
-                {{ characters.find((char) => char.id === part.character_id).name }}
-              </template>
-              <template v-else>
-                {{ characterGroups.find((char) => char.id === part.character_group_id).name }}
-              </template>
-            </p>
+            <p v-if="needsHeadings[index]">{{ characterOrGroupName(part) }}</p>
           </b-col>
           <b-col
             :key="`text_${lineIndex}_part_${index}`"
@@ -119,7 +112,9 @@
         </b-col>
       </template>
       <template v-else-if="line.line_type === LINE_TYPES.STAGE_DIRECTION">
-        <b-col cols="2" class="cue-column" />
+        <b-col cols="2" class="cue-column line-part text-right">
+          <p v-if="isTaggedStageDirection">{{ characterOrGroupName(line.line_parts[0]) }}</p>
+        </b-col>
         <b-col
           :key="`line_${lineIndex}_stage_direction`"
           :cols="cueAddMode ? 9 : 10"
diff --git a/client/tsconfig.json b/client/tsconfig.json
index de5717966..4a96c02d3 100644
--- a/client/tsconfig.json
+++ b/client/tsconfig.json
@@ -30,9 +30,8 @@
     // @types/vuelidate) carry incomplete or conflicting .d.ts files.
     "skipLibCheck": true,
     "jsx": "preserve",    // Vue template compiler handles JSX transform
-    "baseUrl": ".",
     "paths": {
-      "@/*": ["src/*"]
+      "@/*": ["./src/*"]
     },
     "types": ["vitest/globals", "node", "vite/client"],
     "isolatedModules": true,      // Required: Vite/esbuild transpiles each file independently
diff --git a/docs/pages/script_config.md b/docs/pages/script_config.md
index 6350439de..4dd28cdfb 100644
--- a/docs/pages/script_config.md
+++ b/docs/pages/script_config.md
@@ -124,14 +124,25 @@ To create a dialogue line:
 ##### Stage Direction Lines
 
 Non-dialogue text for describing actions, movements, or technical directions. Stage direction lines:
-- Contain a single text field (no character assignment)
+- Contain a single text field
 - Display in italic formatting with customizable styling
 - Can be styled with Stage Direction Styles (system-level or user preferences)
+- Optionally tagged to a character or character group (see below)
 
 ![](../images/config_show/script_stage_direction_editing.png)
 
 To create a stage direction, select **Add Stage Direction** from the dropdown menu.
 
+###### Tagged Stage Directions
+
+A stage direction can optionally be tagged to a **Character** or **Character Group**. This is useful when a stage direction is specific to a character and should appear visually under that character's heading in the script — for example, a move or action described directly after a character speaks.
+
+To tag a stage direction:
+1. In the line editor, use the **Character** or **Character Group** dropdown to select who the stage direction belongs to. Leave both as "N/A" for a generic (untagged) stage direction.
+2. Only one of character or character group can be set — not both.
+
+When a tagged stage direction is displayed in the script, a character heading appears above it (just as one does above dialogue) whenever the character has changed since the previous line. In the compact live view, the character name appears in the left-hand character column.
+
 ##### Cue Lines
 
 Special lines designed for placing technical cues without associated dialogue. Cue lines:
diff --git a/electron/eslint.config.mjs b/electron/eslint.config.mjs
index 77b52cb48..979f6116d 100644
--- a/electron/eslint.config.mjs
+++ b/electron/eslint.config.mjs
@@ -2,23 +2,39 @@ import js from '@eslint/js';
 import globals from 'globals';
 import prettierConfig from 'eslint-config-prettier';
 import prettierPlugin from 'eslint-plugin-prettier';
+import tsPlugin from '@typescript-eslint/eslint-plugin';
+import tsParser from '@typescript-eslint/parser';
+
+const sharedRules = {
+  'prettier/prettier': 'error',
+  ...prettierConfig.rules,
+  'max-len': 'off',
+  'no-plusplus': 'off',
+};
+
+const tsRules = {
+  ...sharedRules,
+  '@typescript-eslint/no-explicit-any': 'off',
+  '@typescript-eslint/no-unused-vars': 'warn',
+  // TypeScript handles undefined-variable checks; no-undef causes false positives
+  // on TS-specific constructs (namespaces, declare global, etc.)
+  'no-undef': 'off',
+};
 
 export default [
   {
-    ignores: [
-      '**/node_modules/**',
-      '**/out/**',
-      '**/dist/**',
-      '*.backup',
-    ],
+    ignores: ['**/node_modules/**', '**/out/**', '**/dist/**', '*.backup'],
   },
   js.configs.recommended,
+  // ESM TypeScript files (main process + services)
   {
-    files: ['**/*.js'],
+    files: ['**/*.ts'],
     plugins: {
       prettier: prettierPlugin,
+      '@typescript-eslint': tsPlugin,
     },
     languageOptions: {
+      parser: tsParser,
       ecmaVersion: 2022,
       sourceType: 'module',
       globals: {
@@ -26,28 +42,17 @@ export default [
         ...globals.es2021,
       },
     },
-    rules: {
-      // Prettier integration - runs Prettier as an ESLint rule
-      'prettier/prettier': 'error',
-
-      // Disable formatting rules that conflict with Prettier
-      ...prettierConfig.rules,
-
-      // Let Prettier handle line length (via printWidth config)
-      'max-len': 'off',
-
-      // Custom linting rules (non-formatting)
-      'no-unused-vars': 'warn',
-      'no-plusplus': 'off',
-    },
+    rules: tsRules,
   },
-  // CommonJS files (preload scripts must be CJS when sandbox is enabled)
+  // CommonJS TypeScript files (preload must be CJS when sandbox is enabled)
   {
-    files: ['**/*.cjs'],
+    files: ['**/*.cts'],
     plugins: {
       prettier: prettierPlugin,
+      '@typescript-eslint': tsPlugin,
     },
     languageOptions: {
+      parser: tsParser,
       ecmaVersion: 2022,
       sourceType: 'commonjs',
       globals: {
@@ -55,12 +60,6 @@ export default [
         ...globals.es2021,
       },
     },
-    rules: {
-      'prettier/prettier': 'error',
-      ...prettierConfig.rules,
-      'max-len': 'off',
-      'no-unused-vars': 'warn',
-      'no-plusplus': 'off',
-    },
+    rules: tsRules,
   },
 ];
diff --git a/electron/main.js b/electron/main.ts
similarity index 70%
rename from electron/main.js
rename to electron/main.ts
index 165311597..0f42ede30 100644
--- a/electron/main.js
+++ b/electron/main.ts
@@ -1,9 +1,3 @@
-/**
- * Electron Main Process
- *
- * Handles window creation, IPC communication, and app lifecycle.
- */
-
 import { app, BrowserWindow, ipcMain } from 'electron';
 import path from 'path';
 import url from 'url';
@@ -13,25 +7,16 @@ import { fileURLToPath } from 'url';
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 
-// Services
 import ConnectionManager from './services/ConnectionManager.js';
 import VersionChecker from './services/VersionChecker.js';
 import MDNSDiscovery from './services/MDNSDiscovery.js';
 
-// Determine if running in development mode
 const isDev = process.argv.includes('--dev') || process.env.NODE_ENV === 'development';
 
-// Keep a global reference of the window object
-let mainWindow;
-
-// Initialize services
-let connectionManager;
+let connectionManager: ConnectionManager;
 
-/**
- * Create the main browser window
- */
-function createWindow() {
-  mainWindow = new BrowserWindow({
+function createWindow(): void {
+  const win = new BrowserWindow({
     width: 1200,
     height: 800,
     minWidth: 800,
@@ -42,24 +27,18 @@ function createWindow() {
       contextIsolation: true,
       sandbox: true,
     },
-    show: false, // Don't show until ready
+    show: false,
   });
 
-  // Load the appropriate URL
   if (isDev) {
-    // Development: Load from Vite dev server
-    mainWindow.loadURL('http://localhost:5173');
-
-    // Open DevTools in development
-    mainWindow.webContents.openDevTools();
+    win.loadURL('http://localhost:5173');
+    win.webContents.openDevTools();
   } else {
-    // Production: Load built files from client/dist-electron (Electron-specific build)
-    // In packaged app, extraResource files are in process.resourcesPath
     const staticPath = app.isPackaged
       ? path.join(process.resourcesPath, 'dist-electron')
       : path.join(__dirname, '../client/dist-electron');
 
-    mainWindow.loadURL(
+    win.loadURL(
       url.format({
         pathname: path.join(staticPath, 'index.html'),
         protocol: 'file:',
@@ -68,29 +47,19 @@ function createWindow() {
     );
   }
 
-  // Show window when ready to avoid flicker
-  mainWindow.once('ready-to-show', () => {
-    mainWindow.show();
+  win.once('ready-to-show', () => {
+    win.show();
   });
 
   // Enable DevTools with keyboard shortcut (Cmd/Ctrl+Shift+I) in production
-  mainWindow.webContents.on('before-input-event', (event, input) => {
+  win.webContents.on('before-input-event', (event, input) => {
     if (input.key === 'I' && input.shift && (input.meta || input.control)) {
-      mainWindow.webContents.toggleDevTools();
+      win.webContents.toggleDevTools();
     }
   });
-
-  // Emitted when the window is closed
-  mainWindow.on('closed', () => {
-    mainWindow = null;
-  });
 }
 
-/**
- * Register IPC handlers for renderer communication
- */
-function registerIPCHandlers() {
-  // Connection management
+function registerIPCHandlers(): void {
   ipcMain.handle('connections:getAll', async () => {
     return connectionManager.getAllConnections();
   });
@@ -119,13 +88,11 @@ function registerIPCHandlers() {
     return connectionManager.clearActiveConnection();
   });
 
-  // Server URL synchronous getter (for platform layer)
   ipcMain.on('server:getURLSync', (event) => {
     const activeConnection = connectionManager.getActiveConnection();
     event.returnValue = activeConnection ? activeConnection.url : null;
   });
 
-  // Storage operations (for platform layer)
   ipcMain.handle('storage:get', async (event, key) => {
     return connectionManager.getStorageItem(key);
   });
@@ -142,18 +109,15 @@ function registerIPCHandlers() {
     return connectionManager.clearStorage();
   });
 
-  // App information
   ipcMain.handle('app:getVersion', async () => {
     return app.getVersion();
   });
 
-  // Version checking
   ipcMain.handle('version:check', async (event, serverUrl) => {
     const clientVersion = app.getVersion();
     return VersionChecker.checkVersion(serverUrl, clientVersion);
   });
 
-  // mDNS discovery
   ipcMain.handle('mdns:discover', async (event, timeout = 5000) => {
     return MDNSDiscovery.discoverServers(timeout);
   });
@@ -164,33 +128,24 @@ function registerIPCHandlers() {
   });
 }
 
-// App lifecycle events
 app.whenReady().then(() => {
-  // Initialize services
   connectionManager = new ConnectionManager();
-
-  // Register IPC handlers
   registerIPCHandlers();
-
-  // Create window
   createWindow();
 
   app.on('activate', () => {
-    // On macOS, re-create window when dock icon is clicked and no windows open
     if (BrowserWindow.getAllWindows().length === 0) {
       createWindow();
     }
   });
 });
 
-// Quit when all windows are closed (except on macOS)
 app.on('window-all-closed', () => {
   if (process.platform !== 'darwin') {
     app.quit();
   }
 });
 
-// Handle app errors
 process.on('uncaughtException', (error) => {
   console.error('Uncaught exception:', error);
 });
diff --git a/electron/package-lock.json b/electron/package-lock.json
index 19458f921..48755df8e 100644
--- a/electron/package-lock.json
+++ b/electron/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "digiscript-electron",
-  "version": "0.29.1",
+  "version": "0.29.2",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "digiscript-electron",
-      "version": "0.29.1",
+      "version": "0.29.2",
       "license": "GPL-3.0",
       "dependencies": {
         "bonjour-service": "^1.3.0",
@@ -19,12 +19,16 @@
         "@electron-forge/maker-squirrel": "^7.11.1",
         "@electron-forge/maker-zip": "^7.11.1",
         "@eslint/js": "^9.39.2",
+        "@types/node": "^22.0.0",
+        "@typescript-eslint/eslint-plugin": "^8.0.0",
+        "@typescript-eslint/parser": "^8.0.0",
         "electron": "^40.6.1",
         "eslint": "^9.39.2",
         "eslint-config-prettier": "^10.1.8",
         "eslint-plugin-prettier": "^5.5.5",
         "globals": "^17.6.0",
-        "prettier": "^3.8.3"
+        "prettier": "^3.8.3",
+        "typescript": "^6.0.0"
       },
       "engines": {
         "node": ">=24.0.0 <25",
@@ -356,6 +360,20 @@
         "node": ">= 16.4.0"
       }
     },
+    "node_modules/@electron-forge/template-webpack-typescript/node_modules/typescript": {
+      "version": "5.4.5",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.4.5.tgz",
+      "integrity": "sha512-vcI4UpRgg81oIRUFwR0WSIHKt11nJ7SAVlYNIu+QpqeyXP+gpQJy/Z4+F0aGxSE4MqwjyXvW/TzgkLAx2AGHwQ==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "bin": {
+        "tsc": "bin/tsc",
+        "tsserver": "bin/tsserver"
+      },
+      "engines": {
+        "node": ">=14.17"
+      }
+    },
     "node_modules/@electron-forge/tracer": {
       "version": "7.11.1",
       "resolved": "https://registry.npmjs.org/@electron-forge/tracer/-/tracer-7.11.1.tgz",
@@ -626,9 +644,9 @@
       }
     },
     "node_modules/@electron/packager/node_modules/fs-extra": {
-      "version": "11.3.4",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.3.4.tgz",
-      "integrity": "sha512-CTXd6rk/M3/ULNQj8FBqBWHYBVYybQ3VPBw0xGKFe3tuH7ytT6ACnvzpIQ3UZtB8yvUKC2cXn1a+x+5EVQLovA==",
+      "version": "11.3.5",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.3.5.tgz",
+      "integrity": "sha512-eKpRKAovdpZtR1WopLHxlBWvAgPny3c4gX1G5Jhwmmw4XJj0ifSD5qB5TOo8hmA0wlRKDAOAhEE1yVPgs6Fgcg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -699,9 +717,9 @@
       }
     },
     "node_modules/@electron/universal/node_modules/fs-extra": {
-      "version": "11.3.4",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.3.4.tgz",
-      "integrity": "sha512-CTXd6rk/M3/ULNQj8FBqBWHYBVYybQ3VPBw0xGKFe3tuH7ytT6ACnvzpIQ3UZtB8yvUKC2cXn1a+x+5EVQLovA==",
+      "version": "11.3.5",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.3.5.tgz",
+      "integrity": "sha512-eKpRKAovdpZtR1WopLHxlBWvAgPny3c4gX1G5Jhwmmw4XJj0ifSD5qB5TOo8hmA0wlRKDAOAhEE1yVPgs6Fgcg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -750,9 +768,9 @@
       }
     },
     "node_modules/@electron/windows-sign/node_modules/fs-extra": {
-      "version": "11.3.4",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.3.4.tgz",
-      "integrity": "sha512-CTXd6rk/M3/ULNQj8FBqBWHYBVYybQ3VPBw0xGKFe3tuH7ytT6ACnvzpIQ3UZtB8yvUKC2cXn1a+x+5EVQLovA==",
+      "version": "11.3.5",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.3.5.tgz",
+      "integrity": "sha512-eKpRKAovdpZtR1WopLHxlBWvAgPny3c4gX1G5Jhwmmw4XJj0ifSD5qB5TOo8hmA0wlRKDAOAhEE1yVPgs6Fgcg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -783,19 +801,6 @@
         "eslint": "^6.0.0 || ^7.0.0 || >=8.0.0"
       }
     },
-    "node_modules/@eslint-community/eslint-utils/node_modules/eslint-visitor-keys": {
-      "version": "3.4.3",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz",
-      "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/eslint"
-      }
-    },
     "node_modules/@eslint-community/regexpp": {
       "version": "4.12.2",
       "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.12.2.tgz",
@@ -901,6 +906,16 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/@eslint/eslintrc/node_modules/ignore": {
+      "version": "5.3.2",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz",
+      "integrity": "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 4"
+      }
+    },
     "node_modules/@eslint/eslintrc/node_modules/json-schema-traverse": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
@@ -1500,9 +1515,9 @@
       }
     },
     "node_modules/@types/estree": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.8.tgz",
-      "integrity": "sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w==",
+      "version": "1.0.9",
+      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.9.tgz",
+      "integrity": "sha512-GhdPgy1el4/ImP05X05Uw4cw2/M93BCUmnEvWZNStlCzEKME4Fkk+YpoA5OiHNQmoS7Cafb8Xa3Pya8m1Qrzeg==",
       "dev": true,
       "license": "MIT"
     },
@@ -1552,9 +1567,9 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "22.19.17",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.19.17.tgz",
-      "integrity": "sha512-wGdMcf+vPYM6jikpS/qhg6WiqSV/OhG+jeeHT/KlVqxYfD40iYJf9/AE1uQxVWFvU7MipKRkRv8NSHiCGgPr8Q==",
+      "version": "22.19.19",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.19.19.tgz",
+      "integrity": "sha512-dyh/xO2Fh5bYrfWaaqGrRQQGkNdmYw6AmaAUvYeUMNTWQtvb796ikLdmTchRmOlOiIJ1TDXfWgVx1QkUlQ6Hew==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -1589,6 +1604,279 @@
         "@types/node": "*"
       }
     },
+    "node_modules/@typescript-eslint/eslint-plugin": {
+      "version": "8.59.3",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.59.3.tgz",
+      "integrity": "sha512-PwFvSKsXGShKGW6n5bZOhGHEcCZXM8HofLK9fNsEwZXzFRjoY+XT1Vsf1zgyXdwTr0ZYz1/2tkZ0DBTT9jZjhw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@eslint-community/regexpp": "^4.12.2",
+        "@typescript-eslint/scope-manager": "8.59.3",
+        "@typescript-eslint/type-utils": "8.59.3",
+        "@typescript-eslint/utils": "8.59.3",
+        "@typescript-eslint/visitor-keys": "8.59.3",
+        "ignore": "^7.0.5",
+        "natural-compare": "^1.4.0",
+        "ts-api-utils": "^2.5.0"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "@typescript-eslint/parser": "^8.59.3",
+        "eslint": "^8.57.0 || ^9.0.0 || ^10.0.0",
+        "typescript": ">=4.8.4 <6.1.0"
+      }
+    },
+    "node_modules/@typescript-eslint/parser": {
+      "version": "8.59.3",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.59.3.tgz",
+      "integrity": "sha512-HPwA+hVkfcriajbNvTmZv4VRauibay+cWArYUYq7u7W7PmGShMxbPxLvrwDme55a6d5alG3nrYfhyJ/G28XlLg==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "@typescript-eslint/scope-manager": "8.59.3",
+        "@typescript-eslint/types": "8.59.3",
+        "@typescript-eslint/typescript-estree": "8.59.3",
+        "@typescript-eslint/visitor-keys": "8.59.3",
+        "debug": "^4.4.3"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "eslint": "^8.57.0 || ^9.0.0 || ^10.0.0",
+        "typescript": ">=4.8.4 <6.1.0"
+      }
+    },
+    "node_modules/@typescript-eslint/project-service": {
+      "version": "8.59.3",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.59.3.tgz",
+      "integrity": "sha512-ECiUWa/KYRGDFUqTNehaRgzDshnJfkTABJxVemHk4ko22gcr0ukloKjWvyQ64g8YCV/UI47kN1dbmjf/GaQYng==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@typescript-eslint/tsconfig-utils": "^8.59.3",
+        "@typescript-eslint/types": "^8.59.3",
+        "debug": "^4.4.3"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "typescript": ">=4.8.4 <6.1.0"
+      }
+    },
+    "node_modules/@typescript-eslint/scope-manager": {
+      "version": "8.59.3",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.59.3.tgz",
+      "integrity": "sha512-t2LvZnoEfzKtnPjgeEu41xw5gxq9mQVfYy4OoZ4Vlt0sk3JwxmhCca/AR7DwOiHrjWgjAj6as4AhRLKSDfvZIA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@typescript-eslint/types": "8.59.3",
+        "@typescript-eslint/visitor-keys": "8.59.3"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@typescript-eslint/tsconfig-utils": {
+      "version": "8.59.3",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.59.3.tgz",
+      "integrity": "sha512-PcIJHjmaREXLgIAIzLnSY9VucEzz8FKXsRgFa1DmdGCK/5tJpW03TKJF01Q6VZd1lLdz2sIKPWaDUZN9dp//dw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "typescript": ">=4.8.4 <6.1.0"
+      }
+    },
+    "node_modules/@typescript-eslint/type-utils": {
+      "version": "8.59.3",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.59.3.tgz",
+      "integrity": "sha512-g71d8QD8UaiHGvrJwyIS1hCX5r63w6Jll+4VEYhEAHXTDIqX1JgxhTAbEHtKntL9kuc4jRo7/GWw5xfCepSccQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@typescript-eslint/types": "8.59.3",
+        "@typescript-eslint/typescript-estree": "8.59.3",
+        "@typescript-eslint/utils": "8.59.3",
+        "debug": "^4.4.3",
+        "ts-api-utils": "^2.5.0"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "eslint": "^8.57.0 || ^9.0.0 || ^10.0.0",
+        "typescript": ">=4.8.4 <6.1.0"
+      }
+    },
+    "node_modules/@typescript-eslint/types": {
+      "version": "8.59.3",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.59.3.tgz",
+      "integrity": "sha512-ePFoH0g4ludssdRFqqDxQePCxU4WQyRa9+XVwjm7yLn0FKhMeoetC+qBEEI1Eyb1pGSDveTIT09Bvw2WhlGayg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@typescript-eslint/typescript-estree": {
+      "version": "8.59.3",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.59.3.tgz",
+      "integrity": "sha512-CbRjVRAf7Lr9Kr8RopKcbY45p2VfmmHrm0ygOCYFi7oU8q19m0Fs/6iHS7kNOmwpp+ob07ZVcAqlxUod9lYdmg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@typescript-eslint/project-service": "8.59.3",
+        "@typescript-eslint/tsconfig-utils": "8.59.3",
+        "@typescript-eslint/types": "8.59.3",
+        "@typescript-eslint/visitor-keys": "8.59.3",
+        "debug": "^4.4.3",
+        "minimatch": "^10.2.2",
+        "semver": "^7.7.3",
+        "tinyglobby": "^0.2.15",
+        "ts-api-utils": "^2.5.0"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "typescript": ">=4.8.4 <6.1.0"
+      }
+    },
+    "node_modules/@typescript-eslint/typescript-estree/node_modules/balanced-match": {
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-4.0.4.tgz",
+      "integrity": "sha512-BLrgEcRTwX2o6gGxGOCNyMvGSp35YofuYzw9h1IMTRmKqttAZZVU67bdb9Pr2vUHA8+j3i2tJfjO6C6+4myGTA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "18 || 20 || >=22"
+      }
+    },
+    "node_modules/@typescript-eslint/typescript-estree/node_modules/brace-expansion": {
+      "version": "5.0.6",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.6.tgz",
+      "integrity": "sha512-kLpxurY4Z4r9sgMsyG0Z9uzsBlgiU/EFKhj/h91/8yHu0edo7XuixOIH3VcJ8kkxs6/jPzoI6U9Vj3WqbMQ94g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "balanced-match": "^4.0.2"
+      },
+      "engines": {
+        "node": "18 || 20 || >=22"
+      }
+    },
+    "node_modules/@typescript-eslint/typescript-estree/node_modules/minimatch": {
+      "version": "10.2.5",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.2.5.tgz",
+      "integrity": "sha512-MULkVLfKGYDFYejP07QOurDLLQpcjk7Fw+7jXS2R2czRQzR56yHRveU5NDJEOviH+hETZKSkIk5c+T23GjFUMg==",
+      "dev": true,
+      "license": "BlueOak-1.0.0",
+      "dependencies": {
+        "brace-expansion": "^5.0.5"
+      },
+      "engines": {
+        "node": "18 || 20 || >=22"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/@typescript-eslint/utils": {
+      "version": "8.59.3",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.59.3.tgz",
+      "integrity": "sha512-JAvT14goBzRzzzZyqq3P9BLArIxTtQURUtFgQ/V7FO+eU+Gg6ES+5ymOPP1wRxXcxAYeivCk4uS3jCKWI1K8Zg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@eslint-community/eslint-utils": "^4.9.1",
+        "@typescript-eslint/scope-manager": "8.59.3",
+        "@typescript-eslint/types": "8.59.3",
+        "@typescript-eslint/typescript-estree": "8.59.3"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "eslint": "^8.57.0 || ^9.0.0 || ^10.0.0",
+        "typescript": ">=4.8.4 <6.1.0"
+      }
+    },
+    "node_modules/@typescript-eslint/visitor-keys": {
+      "version": "8.59.3",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.59.3.tgz",
+      "integrity": "sha512-f1UQF7ggd42YiwI5wGrRaPsa+P0CINBlrkLPmGfpq/u/I/oVtecoEIfFR9ag/oa1sLOsRNZ6xehf6qMZhQGBDg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@typescript-eslint/types": "8.59.3",
+        "eslint-visitor-keys": "^5.0.0"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@typescript-eslint/visitor-keys/node_modules/eslint-visitor-keys": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-5.0.1.tgz",
+      "integrity": "sha512-tD40eHxA35h0PEIZNeIjkHoDR4YjjJp34biM0mDvplBe//mB+IHCqHDGV7pxF+7MklTvighcCPPZC7ynWyjdTA==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "engines": {
+        "node": "^20.19.0 || ^22.13.0 || >=24"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
     "node_modules/@vscode/sudo-prompt": {
       "version": "9.3.2",
       "resolved": "https://registry.npmjs.org/@vscode/sudo-prompt/-/sudo-prompt-9.3.2.tgz",
@@ -2020,9 +2308,9 @@
       "license": "MIT"
     },
     "node_modules/baseline-browser-mapping": {
-      "version": "2.10.27",
-      "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.10.27.tgz",
-      "integrity": "sha512-zEs/ufmZoUd7WftKpKyXaT6RFxpQ5Qm9xytKRHvJfxFV9DFJkZph9RvJ1LcOUi0Z1ZVijMte65JbILeV+8QQEA==",
+      "version": "2.10.29",
+      "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.10.29.tgz",
+      "integrity": "sha512-Asa2krT+XTPZINCS+2QcyS8WTkObE77RwkydwF7h6DmnKqbvlalz93m/dnphUyCa6SWSP51VgtEUf2FN+gelFQ==",
       "dev": true,
       "license": "Apache-2.0",
       "bin": {
@@ -2847,9 +3135,9 @@
       "license": "MIT"
     },
     "node_modules/electron": {
-      "version": "40.9.3",
-      "resolved": "https://registry.npmjs.org/electron/-/electron-40.9.3.tgz",
-      "integrity": "sha512-rDcJOT6BBE689Ada+4jD3rVr05pMv9MZOgT0x/rIMVDF9c4ttx4RTb6lVARTyxZC7uqpirttCtcli1eg1DX5qg==",
+      "version": "40.10.0",
+      "resolved": "https://registry.npmjs.org/electron/-/electron-40.10.0.tgz",
+      "integrity": "sha512-e7XVcAfyWoFQGS7ZhgxeNn0AijHaqgRCa6uA6TYOrvBWv8smI6JILvMR/8DYBIn07oqvxDLRC90tu/xa2cJCow==",
       "dev": true,
       "hasInstallScript": true,
       "license": "MIT",
@@ -3299,9 +3587,9 @@
       }
     },
     "node_modules/electron-to-chromium": {
-      "version": "1.5.351",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.351.tgz",
-      "integrity": "sha512-9D7Iqx8RImSvCnOsj86rCH6eQjZFQoM04Jn6HnZVM0Nu/G58/gmKYQ1d12MZTbjQbQSTGI8nwEy07ErsA2slLA==",
+      "version": "1.5.354",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.354.tgz",
+      "integrity": "sha512-JaBHwWcfIdmSAfWM5l3uwjGd431j8YEMikZ+K/2nXVuBqJKyZ0f+2h4n4JY5AyNiZmnY9qQr2RU3v9DxDmHMNg==",
       "dev": true,
       "license": "ISC"
     },
@@ -3388,9 +3676,9 @@
       }
     },
     "node_modules/electron/node_modules/@types/node": {
-      "version": "24.12.2",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-24.12.2.tgz",
-      "integrity": "sha512-A1sre26ke7HDIuY/M23nd9gfB+nrmhtYyMINbjI1zHJxYteKR6qSMX56FsmjMcDb3SMcjJg5BiRRgOCC/yBD0g==",
+      "version": "24.12.4",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-24.12.4.tgz",
+      "integrity": "sha512-GUUEShf+PBCGW2KaXwcIt3Yk+e3pkKwWKb9GSyM9WQVE+ep2jzmHdGsHzu4wgcZy5fN9FBdVzjpBQsYlpfpgLA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -3493,9 +3781,9 @@
       }
     },
     "node_modules/enhanced-resolve": {
-      "version": "5.21.0",
-      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.21.0.tgz",
-      "integrity": "sha512-otxSQPw4lkOZWkHpB3zaEQs6gWYEsmX4xQF68ElXC/TWvGxGMSGOvoNbaLXm6/cS/fSfHtsEdw90y20PCd+sCA==",
+      "version": "5.21.3",
+      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.21.3.tgz",
+      "integrity": "sha512-QyL119InA+XXEkNLNTPCXPugSvOfhwv0JOlGNzvxs0hZaiHLNvXSpudUWsOlsXGWJh8G6ckCScEkVHfX3kw/2Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -3598,6 +3886,7 @@
       "integrity": "sha512-XoMjdBOwe/esVgEvLmNsD3IRHkm7fbKIUGvrleloJXUZgDHig2IPWNniv+GwjyJXzuNqVjlr5+4yVUZjycJwfQ==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.8.0",
         "@eslint-community/regexpp": "^4.12.1",
@@ -3718,13 +4007,13 @@
       }
     },
     "node_modules/eslint-visitor-keys": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.1.tgz",
-      "integrity": "sha512-Uhdk5sfqcee/9H/rCOJikYz67o0a2Tw2hGRPOG2Y1R2dg7brRe1uG0yaNQDHu+TO/uQPF/5eCapvYSmHUjt7JQ==",
+      "version": "3.4.3",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz",
+      "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==",
       "dev": true,
       "license": "Apache-2.0",
       "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       },
       "funding": {
         "url": "https://opencollective.com/eslint"
@@ -3747,6 +4036,29 @@
         "url": "https://github.com/sponsors/epoberezkin"
       }
     },
+    "node_modules/eslint/node_modules/eslint-visitor-keys": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.1.tgz",
+      "integrity": "sha512-Uhdk5sfqcee/9H/rCOJikYz67o0a2Tw2hGRPOG2Y1R2dg7brRe1uG0yaNQDHu+TO/uQPF/5eCapvYSmHUjt7JQ==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
+    "node_modules/eslint/node_modules/ignore": {
+      "version": "5.3.2",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz",
+      "integrity": "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 4"
+      }
+    },
     "node_modules/eslint/node_modules/json-schema-traverse": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
@@ -3772,6 +4084,19 @@
         "url": "https://opencollective.com/eslint"
       }
     },
+    "node_modules/espree/node_modules/eslint-visitor-keys": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.1.tgz",
+      "integrity": "sha512-Uhdk5sfqcee/9H/rCOJikYz67o0a2Tw2hGRPOG2Y1R2dg7brRe1uG0yaNQDHu+TO/uQPF/5eCapvYSmHUjt7JQ==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
     "node_modules/esquery": {
       "version": "1.7.0",
       "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.7.0.tgz",
@@ -4626,9 +4951,9 @@
       "license": "BSD-3-Clause"
     },
     "node_modules/ignore": {
-      "version": "5.3.2",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz",
-      "integrity": "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==",
+      "version": "7.0.5",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-7.0.5.tgz",
+      "integrity": "sha512-Hs59xBNfUIunMFgWAbGX5cq6893IbWg4KnrjbYwX3tx0ztorVgTDA6B2sxf8ejHJ4wz8BqGUMYlnzNBer5NvGg==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -5622,9 +5947,9 @@
       "license": "MIT"
     },
     "node_modules/node-abi": {
-      "version": "3.91.0",
-      "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.91.0.tgz",
-      "integrity": "sha512-B+S7X/GS3Un6wMICtnsNjQD7oSpVBQrZftHE6GZ1Fe9/k3XOOoqbM5DZZ0GO4x3YiSCQfrM28yj1ppplwgIsfg==",
+      "version": "3.92.0",
+      "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.92.0.tgz",
+      "integrity": "sha512-KdHvFWZjEKDf0cakgFjebl371GPsISX2oZHcuyKqM7DtogIsHrqKeLTo8wBHxaXRAQlY2PsPlZmfo+9ZCxEREQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -5666,9 +5991,9 @@
       }
     },
     "node_modules/node-releases": {
-      "version": "2.0.38",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.38.tgz",
-      "integrity": "sha512-3qT/88Y3FbH/Kx4szpQQ4HzUbVrHPKTLVpVocKiLfoYvw9XSGOX2FmD2d6DrXbVYyAQTF2HeF6My8jmzx7/CRw==",
+      "version": "2.0.44",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.44.tgz",
+      "integrity": "sha512-5WUyunoPMsvvEhS8AxHtRzP+oA8UCkJ7YRxatWKjngndhDGLiqEVAQKWjFAiAiuL8zMRGzGSJxFnLetoa43qGQ==",
       "dev": true,
       "license": "MIT"
     },
@@ -6687,9 +7012,9 @@
       }
     },
     "node_modules/semver": {
-      "version": "7.7.4",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.4.tgz",
-      "integrity": "sha512-vFKC2IEtQnVhpT78h1Yp8wzwrf8CM+MzKMHGJZfBtzhZNycRFnXsHk6E5TxIkkMsgNS7mdX3AGB7x2QM2di4lA==",
+      "version": "7.8.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.8.0.tgz",
+      "integrity": "sha512-AcM7dV/5ul4EekoQ29Agm5vri8JNqRyj39o0qpX6vDF2GZrtutZl5RwgD1XnZjiTAfncsJhMI48QQH3sN87YNA==",
       "license": "ISC",
       "bin": {
         "semver": "bin/semver.js"
@@ -6815,9 +7140,9 @@
       }
     },
     "node_modules/socks": {
-      "version": "2.8.8",
-      "resolved": "https://registry.npmjs.org/socks/-/socks-2.8.8.tgz",
-      "integrity": "sha512-NlGELfPrgX2f1TAAcz0WawlLn+0r3FyhhCRpFFK2CemXenPYvzMWWZINv3eDNo9ucdwme7oCHRY0Jnbs4aIkog==",
+      "version": "2.8.9",
+      "resolved": "https://registry.npmjs.org/socks/-/socks-2.8.9.tgz",
+      "integrity": "sha512-LJhUYUvItdQ0LkJTmPeaEObWXAqFyfmP85x0tch/ez9cahmhlBBLbIqDFnvBnUJGagb0JbIQrkBs1wJ+yRYpEw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -7218,9 +7543,9 @@
       }
     },
     "node_modules/terser": {
-      "version": "5.46.2",
-      "resolved": "https://registry.npmjs.org/terser/-/terser-5.46.2.tgz",
-      "integrity": "sha512-uxfo9fPcSgLDYob/w1FuL0c99MWiJDnv+5qXSQc5+Ki5NjVNsYi66INnMFBjf6uFz6OnX12piJQPF4IpjJTNTw==",
+      "version": "5.47.1",
+      "resolved": "https://registry.npmjs.org/terser/-/terser-5.47.1.tgz",
+      "integrity": "sha512-tPbLXTI6ohPASb/1YViL428oEHu6/qv1OxqYnfaonVCFHqx4+wCd95pHrQWsL5X4pl90CTyW9piSAsS2L0VoMw==",
       "dev": true,
       "license": "BSD-2-Clause",
       "dependencies": {
@@ -7237,9 +7562,9 @@
       }
     },
     "node_modules/terser-webpack-plugin": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.5.0.tgz",
-      "integrity": "sha512-UYhptBwhWvfIjKd/UuFo6D8uq9xpGLDK+z8EDsj/zWhrTaH34cKEbrkMKfV5YWqGBvAYA3tlzZbs2R+qYrbQJA==",
+      "version": "5.6.0",
+      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.6.0.tgz",
+      "integrity": "sha512-Eum+5ajkaOhf5KbM26osvv21kLD7BaGqQ1UA4Ami4arYwylmGUQTgHFpHDdmJod1q4QXa66p0to/FBKID+J1vA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -7259,12 +7584,39 @@
         "webpack": "^5.1.0"
       },
       "peerDependenciesMeta": {
+        "@minify-html/node": {
+          "optional": true
+        },
         "@swc/core": {
           "optional": true
         },
+        "@swc/css": {
+          "optional": true
+        },
+        "@swc/html": {
+          "optional": true
+        },
+        "clean-css": {
+          "optional": true
+        },
+        "cssnano": {
+          "optional": true
+        },
+        "csso": {
+          "optional": true
+        },
         "esbuild": {
           "optional": true
         },
+        "html-minifier-terser": {
+          "optional": true
+        },
+        "lightningcss": {
+          "optional": true
+        },
+        "postcss": {
+          "optional": true
+        },
         "uglify-js": {
           "optional": true
         }
@@ -7291,6 +7643,55 @@
       "license": "MIT",
       "optional": true
     },
+    "node_modules/tinyglobby": {
+      "version": "0.2.16",
+      "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.16.tgz",
+      "integrity": "sha512-pn99VhoACYR8nFHhxqix+uvsbXineAasWm5ojXoN8xEwK5Kd3/TrhNn1wByuD52UxWRLy8pu+kRMniEi6Eq9Zg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "fdir": "^6.5.0",
+        "picomatch": "^4.0.4"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/SuperchupuDev"
+      }
+    },
+    "node_modules/tinyglobby/node_modules/fdir": {
+      "version": "6.5.0",
+      "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.5.0.tgz",
+      "integrity": "sha512-tIbYtZbucOs0BRGqPJkshJUYdL+SDH7dVM8gjy+ERp3WAUjLEFJE+02kanyHtwjWOnwrKYBiwAmM0p4kLJAnXg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12.0.0"
+      },
+      "peerDependencies": {
+        "picomatch": "^3 || ^4"
+      },
+      "peerDependenciesMeta": {
+        "picomatch": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/tinyglobby/node_modules/picomatch": {
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.4.tgz",
+      "integrity": "sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/jonschlinkert"
+      }
+    },
     "node_modules/tmp": {
       "version": "0.0.33",
       "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
@@ -7369,6 +7770,19 @@
         "node": ">=0.8.0"
       }
     },
+    "node_modules/ts-api-utils": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-2.5.0.tgz",
+      "integrity": "sha512-OJ/ibxhPlqrMM0UiNHJ/0CKQkoKF243/AEmplt3qpRgkW8VG7IfOS41h7V8TjITqdByHzrjcS/2si+y4lIh8NA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=18.12"
+      },
+      "peerDependencies": {
+        "typescript": ">=4.8.4"
+      }
+    },
     "node_modules/type-check": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
@@ -7396,11 +7810,12 @@
       }
     },
     "node_modules/typescript": {
-      "version": "5.4.5",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.4.5.tgz",
-      "integrity": "sha512-vcI4UpRgg81oIRUFwR0WSIHKt11nJ7SAVlYNIu+QpqeyXP+gpQJy/Z4+F0aGxSE4MqwjyXvW/TzgkLAx2AGHwQ==",
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-6.0.3.tgz",
+      "integrity": "sha512-y2TvuxSZPDyQakkFRPZHKFm+KKVqIisdg9/CZwm9ftvKXLP8NRWj38/ODjNbr43SsoXqNuAisEf1GdCxqWcdBw==",
       "dev": true,
       "license": "Apache-2.0",
+      "peer": true,
       "bin": {
         "tsc": "bin/tsc",
         "tsserver": "bin/tsserver"
diff --git a/electron/package.json b/electron/package.json
index 354eb792a..af37e2165 100644
--- a/electron/package.json
+++ b/electron/package.json
@@ -1,24 +1,25 @@
 {
   "name": "digiscript-electron",
-  "version": "0.29.1",
+  "version": "0.29.2",
   "description": "DigiScript Electron Desktop Application",
   "author": "DreamTeamProd",
   "license": "GPL-3.0",
-  "main": "main.js",
+  "main": "dist/main.js",
   "type": "module",
   "private": true,
   "scripts": {
-    "start": "electron .",
-    "dev": "electron . --dev",
-    "package": "electron-forge package",
-    "make": "electron-forge make",
+    "start": "tsc && electron .",
+    "dev": "tsc && electron . --dev",
+    "typecheck": "tsc --noEmit",
+    "package": "tsc && electron-forge package",
+    "make": "tsc && electron-forge make",
     "build": "cd ../client && BUILD_TARGET=electron npm run build && cd ../electron && npm run make",
     "lint": "npm run format && npm run lint:eslint",
-    "lint:eslint": "eslint '**/*.{js,cjs}' --fix",
+    "lint:eslint": "eslint '**/*.{ts,cts}' --fix",
     "ci-lint": "npm run format:check && npm run lint:eslint-check",
-    "lint:eslint-check": "eslint '**/*.{js,cjs}'",
-    "format": "prettier --write '**/*.{js,cjs,json}'",
-    "format:check": "prettier --check '**/*.{js,cjs,json}'"
+    "lint:eslint-check": "eslint '**/*.{ts,cts}'",
+    "format": "prettier --write '**/*.{ts,cts,json}'",
+    "format:check": "prettier --check '**/*.{ts,cts,json}'"
   },
   "engines": {
     "npm": ">=11.0.0 <12",
@@ -36,11 +37,15 @@
     "@electron-forge/maker-deb": "^7.11.1",
     "@electron-forge/maker-rpm": "^7.11.1",
     "@eslint/js": "^9.39.2",
+    "@typescript-eslint/eslint-plugin": "^8.0.0",
+    "@typescript-eslint/parser": "^8.0.0",
+    "@types/node": "^22.0.0",
     "eslint": "^9.39.2",
     "eslint-config-prettier": "^10.1.8",
     "eslint-plugin-prettier": "^5.5.5",
     "globals": "^17.6.0",
-    "prettier": "^3.8.3"
+    "prettier": "^3.8.3",
+    "typescript": "^6.0.0"
   },
   "config": {
     "forge": {
diff --git a/electron/preload.cjs b/electron/preload.cts
similarity index 53%
rename from electron/preload.cjs
rename to electron/preload.cts
index d1539f2fd..7acc94c6d 100644
--- a/electron/preload.cjs
+++ b/electron/preload.cts
@@ -8,36 +8,36 @@
  * in a special isolated context that doesn't support native ES modules.
  */
 
-const { contextBridge, ipcRenderer } = require('electron');
+const { contextBridge, ipcRenderer } = require('electron') as typeof import('electron');
 
-// Expose protected methods to the renderer process
 contextBridge.exposeInMainWorld('electronAPI', {
   // Connection management
   getAllConnections: () => ipcRenderer.invoke('connections:getAll'),
-  addConnection: (connection) => ipcRenderer.invoke('connections:add', connection),
-  updateConnection: (id, updates) => ipcRenderer.invoke('connections:update', id, updates),
-  deleteConnection: (id) => ipcRenderer.invoke('connections:delete', id),
+  addConnection: (connection: unknown) => ipcRenderer.invoke('connections:add', connection),
+  updateConnection: (id: string, updates: unknown) =>
+    ipcRenderer.invoke('connections:update', id, updates),
+  deleteConnection: (id: string) => ipcRenderer.invoke('connections:delete', id),
   getActiveConnection: () => ipcRenderer.invoke('connections:getActive'),
-  setActiveConnection: (id) => ipcRenderer.invoke('connections:setActive', id),
+  setActiveConnection: (id: string) => ipcRenderer.invoke('connections:setActive', id),
   clearActiveConnection: () => ipcRenderer.invoke('connections:clearActive'),
 
   // Server URL (synchronous for platform layer compatibility)
   getServerURLSync: () => ipcRenderer.sendSync('server:getURLSync'),
 
   // Storage operations (for Vuex persistence)
-  storageGet: (key) => ipcRenderer.invoke('storage:get', key),
-  storageSet: (key, value) => ipcRenderer.invoke('storage:set', key, value),
-  storageDelete: (key) => ipcRenderer.invoke('storage:delete', key),
+  storageGet: (key: string) => ipcRenderer.invoke('storage:get', key),
+  storageSet: (key: string, value: unknown) => ipcRenderer.invoke('storage:set', key, value),
+  storageDelete: (key: string) => ipcRenderer.invoke('storage:delete', key),
   storageClear: () => ipcRenderer.invoke('storage:clear'),
 
   // App information
   getAppVersion: () => ipcRenderer.invoke('app:getVersion'),
 
   // Version checking
-  checkVersion: (serverUrl) => ipcRenderer.invoke('version:check', serverUrl),
+  checkVersion: (serverUrl: string) => ipcRenderer.invoke('version:check', serverUrl),
 
   // mDNS discovery
-  discoverServers: (timeout) => ipcRenderer.invoke('mdns:discover', timeout),
-  discoverServersWithVersionCheck: (timeout) =>
+  discoverServers: (timeout: number) => ipcRenderer.invoke('mdns:discover', timeout),
+  discoverServersWithVersionCheck: (timeout: number) =>
     ipcRenderer.invoke('mdns:discoverWithVersionCheck', timeout),
 });
diff --git a/electron/services/ConnectionManager.js b/electron/services/ConnectionManager.js
deleted file mode 100644
index fa6007f4c..000000000
--- a/electron/services/ConnectionManager.js
+++ /dev/null
@@ -1,223 +0,0 @@
-/**
- * Connection Manager Service
- *
- * Manages server connections using electron-store for persistence.
- * Handles CRUD operations, active connection tracking, and general storage.
- */
-
-import Store from 'electron-store';
-import { randomUUID } from 'crypto';
-
-class ConnectionManager {
-  constructor() {
-    // Initialize electron-store with schema
-    this.store = new Store({
-      name: 'digiscript-connections',
-      schema: {
-        connections: {
-          type: 'array',
-          default: [],
-          items: {
-            type: 'object',
-            properties: {
-              id: { type: 'string' },
-              url: { type: 'string' },
-              nickname: { type: 'string' },
-              lastConnected: { type: ['number', 'null'] },
-              sslEnabled: { type: 'boolean', default: false },
-              // Optional credential storage
-              username: { type: ['string', 'null'], default: null },
-              // Store password hash or use safeStorage in Phase 6
-              passwordHash: { type: ['string', 'null'], default: null },
-            },
-            required: ['id', 'url', 'nickname'],
-          },
-        },
-        activeConnectionId: {
-          type: ['string', 'null'],
-          default: null,
-        },
-      },
-    });
-
-    // Separate store for general app storage (Vuex persistence, etc.)
-    this.appStore = new Store({
-      name: 'digiscript-app-storage',
-    });
-  }
-
-  /**
-   * Get all saved connections
-   * @returns {Array} Array of connection objects
-   */
-  getAllConnections() {
-    return this.store.get('connections', []);
-  }
-
-  /**
-   * Get a connection by ID
-   * @param {string} id - Connection ID
-   * @returns {Object|null} Connection object or null if not found
-   */
-  getConnectionById(id) {
-    const connections = this.getAllConnections();
-    return connections.find((conn) => conn.id === id) || null;
-  }
-
-  /**
-   * Add a new connection
-   * @param {Object} connection - Connection details {url, nickname, sslEnabled?, username?, passwordHash?}
-   * @returns {Object} The created connection with generated ID
-   */
-  addConnection(connection) {
-    const connections = this.getAllConnections();
-
-    // Generate unique ID
-    const newConnection = {
-      id: randomUUID(),
-      url: connection.url,
-      nickname: connection.nickname,
-      lastConnected: null,
-      sslEnabled: connection.sslEnabled || false,
-      username: connection.username || null,
-      passwordHash: connection.passwordHash || null,
-    };
-
-    connections.push(newConnection);
-    this.store.set('connections', connections);
-
-    return newConnection;
-  }
-
-  /**
-   * Update an existing connection
-   * @param {string} id - Connection ID
-   * @param {Object} updates - Fields to update
-   * @returns {Object|null} Updated connection or null if not found
-   */
-  updateConnection(id, updates) {
-    const connections = this.getAllConnections();
-    const index = connections.findIndex((conn) => conn.id === id);
-
-    if (index === -1) {
-      return null;
-    }
-
-    // Update connection (preserve ID and immutable fields)
-    connections[index] = {
-      ...connections[index],
-      ...updates,
-      id, // Ensure ID cannot be changed
-    };
-
-    this.store.set('connections', connections);
-    return connections[index];
-  }
-
-  /**
-   * Delete a connection
-   * @param {string} id - Connection ID
-   * @returns {boolean} True if deleted, false if not found
-   */
-  deleteConnection(id) {
-    const connections = this.getAllConnections();
-    const filtered = connections.filter((conn) => conn.id !== id);
-
-    if (filtered.length === connections.length) {
-      return false; // Connection not found
-    }
-
-    this.store.set('connections', filtered);
-
-    // Clear active connection if it was deleted
-    if (this.store.get('activeConnectionId') === id) {
-      this.store.set('activeConnectionId', null);
-    }
-
-    return true;
-  }
-
-  /**
-   * Get the active connection
-   * @returns {Object|null} Active connection or null
-   */
-  getActiveConnection() {
-    const activeId = this.store.get('activeConnectionId');
-    if (!activeId) {
-      return null;
-    }
-    return this.getConnectionById(activeId);
-  }
-
-  /**
-   * Set the active connection
-   * @param {string} id - Connection ID to activate
-   * @returns {Object|null} Activated connection or null if not found
-   */
-  setActiveConnection(id) {
-    const connection = this.getConnectionById(id);
-    if (!connection) {
-      return null;
-    }
-
-    // Update last connected timestamp
-    this.updateConnection(id, {
-      lastConnected: Date.now(),
-    });
-
-    // Set as active
-    this.store.set('activeConnectionId', id);
-
-    return this.getConnectionById(id); // Return updated connection
-  }
-
-  /**
-   * Clear the active connection (disconnect)
-   * @returns {void}
-   */
-  clearActiveConnection() {
-    this.store.set('activeConnectionId', null);
-  }
-
-  // =============================================================================
-  // General Storage Methods (for Vuex persistence and platform layer)
-  // =============================================================================
-
-  /**
-   * Get a storage item
-   * @param {string} key - Storage key
-   * @returns {any} Stored value or null
-   */
-  getStorageItem(key) {
-    return this.appStore.get(key, null);
-  }
-
-  /**
-   * Set a storage item
-   * @param {string} key - Storage key
-   * @param {any} value - Value to store
-   * @returns {void}
-   */
-  setStorageItem(key, value) {
-    this.appStore.set(key, value);
-  }
-
-  /**
-   * Delete a storage item
-   * @param {string} key - Storage key
-   * @returns {void}
-   */
-  deleteStorageItem(key) {
-    this.appStore.delete(key);
-  }
-
-  /**
-   * Clear all storage items
-   * @returns {void}
-   */
-  clearStorage() {
-    this.appStore.clear();
-  }
-}
-
-export default ConnectionManager;
diff --git a/electron/services/ConnectionManager.ts b/electron/services/ConnectionManager.ts
new file mode 100644
index 000000000..d2a34c48d
--- /dev/null
+++ b/electron/services/ConnectionManager.ts
@@ -0,0 +1,169 @@
+import Store from 'electron-store';
+import { randomUUID } from 'crypto';
+
+export interface Connection {
+  id: string;
+  url: string;
+  nickname: string;
+  lastConnected: number | null;
+  sslEnabled: boolean;
+  username: string | null;
+  passwordHash: string | null;
+}
+
+export interface ConnectionInput {
+  url: string;
+  nickname: string;
+  sslEnabled?: boolean;
+  username?: string | null;
+  passwordHash?: string | null;
+}
+
+interface ConnectionStoreSchema {
+  connections: Connection[];
+  activeConnectionId: string | null;
+}
+
+class ConnectionManager {
+  private store: Store<ConnectionStoreSchema>;
+  private appStore: Store<Record<string, unknown>>;
+
+  constructor() {
+    this.store = new Store<ConnectionStoreSchema>({
+      name: 'digiscript-connections',
+      schema: {
+        connections: {
+          type: 'array',
+          default: [],
+          items: {
+            type: 'object',
+            properties: {
+              id: { type: 'string' },
+              url: { type: 'string' },
+              nickname: { type: 'string' },
+              lastConnected: { type: ['number', 'null'] },
+              sslEnabled: { type: 'boolean', default: false },
+              username: { type: ['string', 'null'], default: null },
+              passwordHash: { type: ['string', 'null'], default: null },
+            },
+            required: ['id', 'url', 'nickname'],
+          },
+        },
+        activeConnectionId: {
+          type: ['string', 'null'],
+          default: null,
+        },
+      },
+    });
+
+    this.appStore = new Store({
+      name: 'digiscript-app-storage',
+    });
+  }
+
+  getAllConnections(): Connection[] {
+    return this.store.get('connections', []);
+  }
+
+  getConnectionById(id: string): Connection | null {
+    const connections = this.getAllConnections();
+    return connections.find((conn) => conn.id === id) || null;
+  }
+
+  addConnection(connection: ConnectionInput): Connection {
+    const connections = this.getAllConnections();
+
+    const newConnection: Connection = {
+      id: randomUUID(),
+      url: connection.url,
+      nickname: connection.nickname,
+      lastConnected: null,
+      sslEnabled: connection.sslEnabled || false,
+      username: connection.username || null,
+      passwordHash: connection.passwordHash || null,
+    };
+
+    connections.push(newConnection);
+    this.store.set('connections', connections);
+
+    return newConnection;
+  }
+
+  updateConnection(id: string, updates: Partial<Omit<Connection, 'id'>>): Connection | null {
+    const connections = this.getAllConnections();
+    const index = connections.findIndex((conn) => conn.id === id);
+
+    if (index === -1) {
+      return null;
+    }
+
+    connections[index] = {
+      ...connections[index],
+      ...updates,
+      id,
+    };
+
+    this.store.set('connections', connections);
+    return connections[index];
+  }
+
+  deleteConnection(id: string): boolean {
+    const connections = this.getAllConnections();
+    const filtered = connections.filter((conn) => conn.id !== id);
+
+    if (filtered.length === connections.length) {
+      return false;
+    }
+
+    this.store.set('connections', filtered);
+
+    if (this.store.get('activeConnectionId') === id) {
+      this.store.set('activeConnectionId', null);
+    }
+
+    return true;
+  }
+
+  getActiveConnection(): Connection | null {
+    const activeId = this.store.get('activeConnectionId');
+    if (!activeId) {
+      return null;
+    }
+    return this.getConnectionById(activeId);
+  }
+
+  setActiveConnection(id: string): Connection | null {
+    const connection = this.getConnectionById(id);
+    if (!connection) {
+      return null;
+    }
+
+    this.updateConnection(id, { lastConnected: Date.now() });
+
+    this.store.set('activeConnectionId', id);
+
+    return this.getConnectionById(id);
+  }
+
+  clearActiveConnection(): void {
+    this.store.set('activeConnectionId', null);
+  }
+
+  getStorageItem(key: string): unknown {
+    return this.appStore.get(key, null);
+  }
+
+  setStorageItem(key: string, value: unknown): void {
+    this.appStore.set(key, value);
+  }
+
+  deleteStorageItem(key: string): void {
+    this.appStore.delete(key);
+  }
+
+  clearStorage(): void {
+    this.appStore.clear();
+  }
+}
+
+export default ConnectionManager;
diff --git a/electron/services/MDNSDiscovery.js b/electron/services/MDNSDiscovery.js
deleted file mode 100644
index 58f27eb59..000000000
--- a/electron/services/MDNSDiscovery.js
+++ /dev/null
@@ -1,111 +0,0 @@
-/**
- * mDNS Discovery Service
- *
- * Discovers DigiScript servers on the local network using mDNS/DNS-SD.
- * Requires servers to advertise themselves via Bonjour/Zeroconf.
- */
-
-import { Bonjour } from 'bonjour-service';
-import VersionChecker from './VersionChecker.js';
-
-class MDNSDiscovery {
-  /**
-   * Discover DigiScript servers on the local network
-   * @param {number} timeout - Discovery timeout in milliseconds (default: 5000)
-   * @returns {Promise<Array>} Array of discovered servers [{name, host, port, url, addresses}]
-   */
-  static async discoverServers(timeout = 5000) {
-    return new Promise((resolve) => {
-      const bonjour = new Bonjour();
-      const servers = [];
-      const seenHosts = new Set(); // Prevent duplicates
-
-      // Browse for DigiScript services
-      // Service type: _digiscript._tcp
-      const browser = bonjour.find({ type: 'digiscript' });
-
-      // Handle discovered services
-      browser.on('up', (service) => {
-        // Create unique identifier for this service
-        const hostId = `${service.host}:${service.port}`;
-
-        // Skip if we've already seen this host/port combination
-        if (seenHosts.has(hostId)) {
-          return;
-        }
-
-        seenHosts.add(hostId);
-
-        // Determine protocol (default to http, check txt records for https)
-        const protocol =
-          service.txt?.ssl === 'true' || service.txt?.https === 'true' ? 'https' : 'http';
-
-        // Extract addresses
-        const addresses = service.addresses || [];
-
-        // Build server object
-        const server = {
-          name: service.name || service.host,
-          host: service.host,
-          port: service.port,
-          url: `${protocol}://${service.host}:${service.port}`,
-          addresses,
-          // Optional: Include additional txt record data
-          metadata: service.txt || {},
-        };
-
-        servers.push(server);
-      });
-
-      // Stop discovery after timeout
-      setTimeout(() => {
-        browser.stop();
-        bonjour.destroy();
-        resolve(servers);
-      }, timeout);
-    });
-  }
-
-  /**
-   * Discover servers and check their versions
-   * @param {string} clientVersion - Client version to check against
-   * @param {number} timeout - Discovery timeout in milliseconds (default: 5000)
-   * @returns {Promise<Array>} Array of servers with version compatibility info
-   */
-  static async discoverServersWithVersionCheck(clientVersion, timeout = 5000) {
-    // First, discover all servers
-    const servers = await MDNSDiscovery.discoverServers(timeout);
-
-    // Then, check version for each discovered server
-    const serversWithVersions = await Promise.all(
-      servers.map(async (server) => {
-        const versionResult = await VersionChecker.checkVersion(server.url, clientVersion);
-
-        return {
-          ...server,
-          compatible: versionResult.compatible,
-          serverVersion: versionResult.serverVersion,
-          versionError: versionResult.error,
-        };
-      })
-    );
-
-    return serversWithVersions;
-  }
-
-  /**
-   * Check if mDNS is available on the system
-   * @returns {boolean} True if mDNS is likely available
-   */
-  static isMDNSAvailable() {
-    // mDNS is typically available on:
-    // - macOS (via Bonjour)
-    // - Windows (if Bonjour service is installed)
-    // - Linux (via Avahi)
-
-    // For now, assume it's available and let errors surface during discovery
-    return true;
-  }
-}
-
-export default MDNSDiscovery;
diff --git a/electron/services/MDNSDiscovery.ts b/electron/services/MDNSDiscovery.ts
new file mode 100644
index 000000000..33490200d
--- /dev/null
+++ b/electron/services/MDNSDiscovery.ts
@@ -0,0 +1,84 @@
+import { Bonjour, Service } from 'bonjour-service';
+import VersionChecker from './VersionChecker.js';
+
+export interface DiscoveredServer {
+  name: string;
+  host: string;
+  port: number;
+  url: string;
+  addresses: string[];
+  metadata: Record<string, string>;
+}
+
+export interface DiscoveredServerWithVersion extends DiscoveredServer {
+  compatible: boolean;
+  serverVersion: string | null;
+  versionError: string | null;
+}
+
+class MDNSDiscovery {
+  static async discoverServers(timeout = 5000): Promise<DiscoveredServer[]> {
+    return new Promise((resolve) => {
+      const bonjour = new Bonjour();
+      const servers: DiscoveredServer[] = [];
+      const seenHosts = new Set<string>();
+
+      const browser = bonjour.find({ type: 'digiscript' });
+
+      browser.on('up', (service: Service) => {
+        const hostId = `${service.host}:${service.port}`;
+
+        if (seenHosts.has(hostId)) {
+          return;
+        }
+
+        seenHosts.add(hostId);
+
+        const txt = service.txt as Record<string, string> | undefined;
+        const protocol = txt?.ssl === 'true' || txt?.https === 'true' ? 'https' : 'http';
+        const addresses = service.addresses || [];
+
+        servers.push({
+          name: service.name || service.host,
+          host: service.host,
+          port: service.port,
+          url: `${protocol}://${service.host}:${service.port}`,
+          addresses,
+          metadata: txt || {},
+        });
+      });
+
+      setTimeout(() => {
+        browser.stop();
+        bonjour.destroy();
+        resolve(servers);
+      }, timeout);
+    });
+  }
+
+  static async discoverServersWithVersionCheck(
+    clientVersion: string,
+    timeout = 5000
+  ): Promise<DiscoveredServerWithVersion[]> {
+    const servers = await MDNSDiscovery.discoverServers(timeout);
+
+    return Promise.all(
+      servers.map(async (server) => {
+        const versionResult = await VersionChecker.checkVersion(server.url, clientVersion);
+
+        return {
+          ...server,
+          compatible: versionResult.compatible,
+          serverVersion: versionResult.serverVersion,
+          versionError: versionResult.error,
+        };
+      })
+    );
+  }
+
+  static isMDNSAvailable(): boolean {
+    return true;
+  }
+}
+
+export default MDNSDiscovery;
diff --git a/electron/services/VersionChecker.js b/electron/services/VersionChecker.ts
similarity index 61%
rename from electron/services/VersionChecker.js
rename to electron/services/VersionChecker.ts
index ffc55faba..e5685fbac 100644
--- a/electron/services/VersionChecker.js
+++ b/electron/services/VersionChecker.ts
@@ -1,19 +1,14 @@
-/**
- * Version Checker Service
- *
- * Validates server compatibility by comparing versions.
- * Requires exact version match between client and server.
- */
+interface VersionCheckResult {
+  compatible: boolean;
+  serverVersion: string | null;
+  clientVersion: string;
+  serverUrl: string;
+  error: string | null;
+}
 
 class VersionChecker {
-  /**
-   * Check if a server is compatible with this client
-   * @param {string} serverUrl - Base URL of the server (e.g., "http://192.168.1.100:8080")
-   * @param {string} clientVersion - Client version (e.g., "0.23.0")
-   * @returns {Promise<Object>} Result object with compatibility info
-   */
-  static async checkVersion(serverUrl, clientVersion) {
-    const result = {
+  static async checkVersion(serverUrl: string, clientVersion: string): Promise<VersionCheckResult> {
+    const result: VersionCheckResult = {
       compatible: false,
       serverVersion: null,
       clientVersion,
@@ -22,12 +17,10 @@ class VersionChecker {
     };
 
     try {
-      // Construct the health endpoint URL
       const healthUrl = `${serverUrl}/api/v1/health`;
 
-      // Fetch server health with timeout using native fetch (Node.js 18+)
       const controller = new AbortController();
-      const timeoutId = setTimeout(() => controller.abort(), 5000); // 5 second timeout
+      const timeoutId = setTimeout(() => controller.abort(), 5000);
 
       const response = await fetch(healthUrl, {
         method: 'GET',
@@ -39,24 +32,19 @@ class VersionChecker {
 
       clearTimeout(timeoutId);
 
-      // Check if request was successful
       if (!response.ok) {
         result.error = `Server returned ${response.status}: ${response.statusText}`;
         return result;
       }
 
-      // Parse JSON response
-      const health = await response.json();
+      const health = (await response.json()) as { version?: string } | null;
 
-      // Extract version from health response
       if (!health || !health.version) {
         result.error = 'Server response does not contain version information';
         return result;
       }
 
       result.serverVersion = health.version;
-
-      // Compare versions (exact match required)
       result.compatible = result.serverVersion === clientVersion;
 
       if (!result.compatible) {
@@ -64,8 +52,8 @@ class VersionChecker {
       }
 
       return result;
-    } catch (error) {
-      // Handle various error types
+    } catch (err: unknown) {
+      const error = err as NodeJS.ErrnoException;
       if (error.name === 'AbortError') {
         result.error = 'Connection timeout: Server did not respond within 5 seconds';
       } else if (error.code === 'ECONNREFUSED') {
@@ -82,12 +70,7 @@ class VersionChecker {
     }
   }
 
-  /**
-   * Validate server URL format
-   * @param {string} url - URL to validate
-   * @returns {boolean} True if valid, false otherwise
-   */
-  static isValidUrl(url) {
+  static isValidUrl(url: string): boolean {
     try {
       const parsed = new URL(url);
       return parsed.protocol === 'http:' || parsed.protocol === 'https:';
@@ -96,16 +79,9 @@ class VersionChecker {
     }
   }
 
-  /**
-   * Normalize server URL (remove trailing slash, ensure protocol)
-   * @param {string} url - URL to normalize
-   * @returns {string} Normalized URL
-   */
-  static normalizeUrl(url) {
-    // Remove trailing slash
+  static normalizeUrl(url: string): string {
     let normalized = url.replace(/\/$/, '');
 
-    // Add protocol if missing
     if (!normalized.startsWith('http://') && !normalized.startsWith('https://')) {
       normalized = `http://${normalized}`;
     }
diff --git a/electron/tsconfig.json b/electron/tsconfig.json
new file mode 100644
index 000000000..e71baa79d
--- /dev/null
+++ b/electron/tsconfig.json
@@ -0,0 +1,30 @@
+{
+  "compilerOptions": {
+    // ── Compilation target ──────────────────────────────────────────────────
+    "target": "ES2022",
+    "module": "NodeNext",
+    "moduleResolution": "NodeNext",
+    "lib": ["ES2022"],
+
+    // ── Strictness ──────────────────────────────────────────────────────────
+    "strict": false,
+    "strictNullChecks": true,
+    "strictFunctionTypes": true,
+
+    // ── Code quality ────────────────────────────────────────────────────────
+    "noImplicitReturns": true,
+    "noFallthroughCasesInSwitch": true,
+    "forceConsistentCasingInFileNames": true,
+
+    // ── Interop & infrastructure ─────────────────────────────────────────────
+    "skipLibCheck": true,
+    "esModuleInterop": true,
+    "resolveJsonModule": true,
+
+    // ── Output ───────────────────────────────────────────────────────────────
+    "outDir": "./dist",
+    "rootDir": "."
+  },
+  "include": ["main.ts", "preload.cts", "services/**/*.ts"],
+  "exclude": ["node_modules", "dist", "out"]
+}
diff --git a/server/pyproject.toml b/server/pyproject.toml
index cef65f48d..312f3af1a 100644
--- a/server/pyproject.toml
+++ b/server/pyproject.toml
@@ -11,7 +11,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "digiscript-server"
-version = "0.29.1"
+version = "0.29.2"
 description = "DigiScript server - Digital script management for theatrical shows"
 readme = "../README.md"
 requires-python = ">=3.13"
diff --git a/server/test/controllers/api/show/script/test_script.py b/server/test/controllers/api/show/script/test_script.py
index e75f0816f..c5c915af8 100644
--- a/server/test/controllers/api/show/script/test_script.py
+++ b/server/test/controllers/api/show/script/test_script.py
@@ -11,7 +11,7 @@
     ScriptLineType,
     ScriptRevision,
 )
-from models.show import Act, Character, Scene, Show, ShowScriptType
+from models.show import Act, Character, CharacterGroup, Scene, Show, ShowScriptType
 from models.user import User
 from test.conftest import DigiScriptTestCase
 
@@ -1368,6 +1368,11 @@ def setUp(self):
             session.flush()
             self.character_id = character.id
 
+            character_group = CharacterGroup(show_id=show.id, name="Test Group")
+            session.add(character_group)
+            session.flush()
+            self.character_group_id = character_group.id
+
             admin = User(username="admin", is_admin=True, password="test")
             session.add(admin)
             session.flush()
@@ -1607,8 +1612,8 @@ def test_post_stage_direction_rejects_multiple_parts(self):
         response_body = tornado.escape.json_decode(response.body)
         self.assertIn("must have exactly 1 line part", response_body["message"])
 
-    def test_post_stage_direction_rejects_with_character(self):
-        """Test STAGE_DIRECTION with character_id returns 400."""
+    def test_post_stage_direction_allows_with_character(self):
+        """Test STAGE_DIRECTION with character_id is accepted."""
         lines = [
             {
                 "id": None,
@@ -1623,6 +1628,38 @@ def test_post_stage_direction_rejects_with_character(self):
                         "part_index": 0,
                         "character_id": self.character_id,
                         "character_group_id": None,
+                        "line_text": "Enter stage left",
+                    }
+                ],
+                "stage_direction_style_id": None,
+            }
+        ]
+
+        response = self.fetch(
+            "/api/v1/show/script?page=1",
+            method="POST",
+            body=tornado.escape.json_encode(lines),
+            headers={"Authorization": f"Bearer {self.token}"},
+        )
+
+        self.assertEqual(200, response.code)
+
+    def test_post_stage_direction_rejects_with_both_character_and_group(self):
+        """Test STAGE_DIRECTION with both character_id and character_group_id returns 400."""
+        lines = [
+            {
+                "id": None,
+                "act_id": self.act_id,
+                "scene_id": self.scene_id,
+                "page": 1,
+                "line_type": 2,
+                "line_parts": [
+                    {
+                        "id": None,
+                        "line_id": None,
+                        "part_index": 0,
+                        "character_id": self.character_id,
+                        "character_group_id": self.character_group_id,
                         "line_text": "Enter",
                     }
                 ],
@@ -1639,7 +1676,9 @@ def test_post_stage_direction_rejects_with_character(self):
 
         self.assertEqual(400, response.code)
         response_body = tornado.escape.json_decode(response.body)
-        self.assertIn("cannot have characters", response_body["message"])
+        self.assertIn(
+            "cannot have both character and character group", response_body["message"]
+        )
 
     def test_post_stage_direction_rejects_empty_text(self):
         """Test STAGE_DIRECTION with empty/whitespace text returns 400."""
diff --git a/server/test/utils/show/test_line_type_validator.py b/server/test/utils/show/test_line_type_validator.py
index 4d296f4d2..58673297b 100644
--- a/server/test/utils/show/test_line_type_validator.py
+++ b/server/test/utils/show/test_line_type_validator.py
@@ -187,25 +187,45 @@ def test_rejects_multiple_parts(self, validator, mock_show):
         assert result.is_valid is False
         assert "must have exactly 1 line part" in result.error_message
 
-    def test_rejects_with_character(self, validator, mock_show):
-        """Test stage direction with character_id is rejected."""
+    def test_allows_with_character(self, validator, mock_show):
+        """Test stage direction with character_id is allowed."""
         line_json = {
             "line_type": 2,
             "line_parts": [{"character_id": 1, "line_text": "Enter stage left"}],
         }
         result = validator.validate(line_json, mock_show)
-        assert result.is_valid is False
-        assert "cannot have characters" in result.error_message
+        assert result.is_valid is True
 
-    def test_rejects_with_character_group(self, validator, mock_show):
-        """Test stage direction with character_group_id is rejected."""
+    def test_allows_with_character_group(self, validator, mock_show):
+        """Test stage direction with character_group_id is allowed."""
         line_json = {
             "line_type": 2,
             "line_parts": [{"character_group_id": 1, "line_text": "Enter stage left"}],
         }
         result = validator.validate(line_json, mock_show)
+        assert result.is_valid is True
+
+    def test_rejects_with_both_character_and_group(self, validator, mock_show):
+        """Test stage direction with both character_id and character_group_id is rejected."""
+        line_json = {
+            "line_type": 2,
+            "line_parts": [
+                {"character_id": 1, "character_group_id": 2, "line_text": "Enter"}
+            ],
+        }
+        result = validator.validate(line_json, mock_show)
         assert result.is_valid is False
-        assert "cannot have character groups" in result.error_message
+        assert "cannot have both character and character group" in result.error_message
+
+    def test_rejects_tagged_with_empty_text(self, validator, mock_show):
+        """Test stage direction tagged to a character but with no text is rejected."""
+        line_json = {
+            "line_type": 2,
+            "line_parts": [{"character_id": 1, "line_text": None}],
+        }
+        result = validator.validate(line_json, mock_show)
+        assert result.is_valid is False
+        assert "must contain text" in result.error_message
 
     def test_rejects_empty_text(self, validator, mock_show):
         """Test stage direction with None text is rejected."""
@@ -350,13 +370,14 @@ def test_stage_direction_validation_fails_correctly(self, registry, mock_show):
             "line_parts": [
                 {
                     "character_id": 1,
+                    "character_group_id": 2,
                     "line_text": "Enter",
-                }  # Invalid: stage direction can't have character
+                }  # Invalid: stage direction can't have both character and group
             ],
         }
         result = registry.validate_line(line_json, mock_show)
         assert result.is_valid is False
-        assert "cannot have characters" in result.error_message
+        assert "cannot have both character and character group" in result.error_message
 
     def test_cue_line_validation_fails_correctly(self, registry, mock_show):
         """Test registry correctly returns validation failure for invalid cue line."""
diff --git a/server/utils/show/line_type_validator.py b/server/utils/show/line_type_validator.py
index 7271f3009..d2daea5f4 100644
--- a/server/utils/show/line_type_validator.py
+++ b/server/utils/show/line_type_validator.py
@@ -94,14 +94,12 @@ def validate(self, line_json: dict, show) -> LineTypeValidationResult:
 
         line_part = line_parts[0]
 
-        if line_part.get("character_id") is not None:
-            return LineTypeValidationResult(
-                is_valid=False, error_message="Stage directions cannot have characters"
-            )
-        if line_part.get("character_group_id") is not None:
+        has_character = line_part.get("character_id") is not None
+        has_group = line_part.get("character_group_id") is not None
+        if has_character and has_group:
             return LineTypeValidationResult(
                 is_valid=False,
-                error_message="Stage directions cannot have character groups",
+                error_message="Stage directions cannot have both character and character group",
             )
 
         line_text = line_part.get("line_text")