From eaefecb00fea3bb00b5f5d85232366ae0d5d284b Mon Sep 17 00:00:00 2001
From: Scott Anderson <662325+scottanderson@users.noreply.github.com>
Date: Sun, 24 Aug 2025 21:01:28 -0400
Subject: [PATCH] Address PR comments

---
 biome.json       | 50 +++++++++++++++++++++++++++++++-----------------
 eslint.config.js |  9 ---------
 2 files changed, 32 insertions(+), 27 deletions(-)

diff --git a/biome.json b/biome.json
index d6feda5c6..d5f38ddd3 100644
--- a/biome.json
+++ b/biome.json
@@ -1,35 +1,49 @@
 {
   "$schema": "https://biomejs.dev/schemas/2.2.2/schema.json",
-  "vcs": {
-    "enabled": false,
-    "clientKind": "git",
-    "useIgnoreFile": true
+  "assist": {
+    "actions": {
+      "source": {
+        "organizeImports": "on"
+      }
+    },
+    "enabled": true
   },
   "files": {
     "ignoreUnknown": false
   },
   "formatter": {
     "enabled": true,
-    "indentWidth": 2,
-    "indentStyle": "space"
-  },
-  "linter": {
-    "enabled": false,
-    "rules": {
-      "recommended": true
-    }
+    "indentStyle": "space",
+    "indentWidth": 2
   },
   "javascript": {
     "formatter": {
       "quoteStyle": "double"
     }
   },
-  "assist": {
-    "enabled": true,
-    "actions": {
-      "source": {
-        "organizeImports": "on"
-      }
+  "linter": {
+    "enabled": false
+  },
+  "overrides": [
+    {
+      "assist": {
+        "actions": {
+          "source": {
+            "useSortedKeys": "on"
+          }
+        }
+      },
+      "includes": [
+        "eslint-plugin-local/**/*.{js,ts,jsx,tsx}",
+        "src/**/*.{js,ts,jsx,tsx}",
+        "**/*.test.{js,ts,jsx,tsx}",
+        "tests/**/*.{js,ts,jsx,tsx}"
+      ]
     }
+  ],
+  "vcs": {
+    "clientKind": "git",
+    "enabled": true,
+    "useIgnoreFile": true
   }
 }
diff --git a/eslint.config.js b/eslint.config.js
index 67ac514c6..65bf69bd7 100644
--- a/eslint.config.js
+++ b/eslint.config.js
@@ -83,7 +83,6 @@ export default [
       "@typescript-eslint/prefer-nullish-coalescing": "error",
       "@typescript-eslint/prefer-readonly": "error",
       eqeqeq: "error",
-      "sort-keys": "error",
       "@typescript-eslint/no-unsafe-argument": "error",
       "@typescript-eslint/no-unsafe-assignment": "error",
       "@typescript-eslint/no-unsafe-member-access": "error",
@@ -153,7 +152,6 @@ export default [
       "@typescript-eslint/no-unsafe-assignment": "off",
       "@typescript-eslint/no-unsafe-member-access": "off",
       "max-len": "off",
-      "sort-keys": "off",
     },
   },
   {
@@ -166,13 +164,6 @@ export default [
     plugins: ["jest"],
     ...jest.configs["flat/style"],
   },
-  {
-    files: ["src/client/**/*.{js,ts,jsx,tsx}"],
-    rules: {
-      // Disabled rules for frontend
-      "sort-keys": "off",
-    },
-  },
   {
     plugins: {
       local: eslintPluginLocal,