lula2 0.6.4 → 0.6.5

package/dist/cli/server/websocketServer.js

@@ -150,8 +150,8 @@ var init_fileStore = __esm({
         if (!this.baseDir || this.baseDir === "." || this.baseDir === process.cwd()) {
           return;
         }
-        const lulaConfigPath = join2(this.baseDir, "lula.yaml");
-        if (!existsSync2(lulaConfigPath)) {
+        const lulaConfigPath2 = join2(this.baseDir, "lula.yaml");
+        if (!existsSync2(lulaConfigPath2)) {
           return;
         }
         if (!existsSync2(this.controlsDir)) {
@@ -309,6 +309,17 @@ var init_fileStore = __esm({
         if (!existsSync2(this.controlsDir)) {
           return [];
         }
+        let controlOrder = null;
+        try {
+          const lulaConfigPath2 = join2(this.baseDir, "lula.yaml");
+          if (existsSync2(lulaConfigPath2)) {
+            const content = readFileSync2(lulaConfigPath2, "utf8");
+            const metadata = yaml2.load(content);
+            controlOrder = metadata?.controlOrder || null;
+          }
+        } catch (error) {
+          console.error(`Failed to load lula.yaml for controlOrder (path: ${lulaConfigPath}):`, error);
+        }
         const entries = readdirSync(this.controlsDir);
         const yamlFiles = entries.filter((file) => file.endsWith(".yaml"));
         if (yamlFiles.length > 0) {
@@ -327,7 +338,11 @@ var init_fileStore = __esm({
             }
           });
           const results2 = await Promise.all(promises);
-          return results2.filter((c) => c !== null);
+          const controls2 = results2.filter((c) => c !== null);
+          if (controlOrder && controlOrder.length > 0) {
+            return this.sortControlsByOrder(controls2, controlOrder);
+          }
+          return controls2;
         }
         const families = entries.filter((name) => {
           const familyPath = join2(this.controlsDir, name);
@@ -350,7 +365,25 @@ var init_fileStore = __esm({
           allPromises.push(...familyPromises);
         }
         const results = await Promise.all(allPromises);
-        return results.filter((c) => c !== null);
+        const controls = results.filter((c) => c !== null);
+        if (controlOrder && controlOrder.length > 0) {
+          return this.sortControlsByOrder(controls, controlOrder);
+        }
+        return controls;
+      }
+      /**
+       * Sort controls based on the provided order array
+       */
+      sortControlsByOrder(controls, controlOrder) {
+        const orderMap = /* @__PURE__ */ new Map();
+        controlOrder.forEach((controlId, index) => {
+          orderMap.set(controlId, index);
+        });
+        return controls.sort((a, b) => {
+          const aIndex = orderMap.get(a.id) ?? Number.MAX_SAFE_INTEGER;
+          const bIndex = orderMap.get(b.id) ?? Number.MAX_SAFE_INTEGER;
+          return aIndex - bIndex;
+        });
       }
       /**
        * Load mappings from mappings directory
@@ -1470,6 +1503,7 @@ function processSpreadsheetData(rawData, headers, startRowIndex, params) {
         continue;
       }
       const family = extractFamilyFromControlId(controlId);
+      control._originalRowIndex = i;
       control.family = family;
       controls.push(control);
       if (!families.has(family)) {
@@ -1592,6 +1626,7 @@ async function createOutputStructure(processedData, fieldSchema, params) {
     params.controlIdField,
     params.namingConvention
   );
+  const controlOrder = controls.sort((a, b) => (a._originalRowIndex || 0) - (b._originalRowIndex || 0)).map((control) => control[controlIdFieldNameClean]);
   const controlSetData = {
     name: params.controlSetName,
     description: params.controlSetDescription,
@@ -1599,12 +1634,16 @@ async function createOutputStructure(processedData, fieldSchema, params) {
     control_id_field: controlIdFieldNameClean,
     controlCount: controls.length,
     families: uniqueFamilies,
+    controlOrder,
     fieldSchema
   };
   writeFileSync2(join4(baseDir, "lula.yaml"), yaml4.dump(controlSetData));
   const controlsDir = join4(baseDir, "controls");
   const mappingsDir = join4(baseDir, "mappings");
-  families.forEach((familyControls, family) => {
+  const sortedFamilies = Array.from(families.entries()).sort(
+    (a, b) => a[0].localeCompare(b[0])
+  );
+  sortedFamilies.forEach(([family, familyControls]) => {
     const familyDir = join4(controlsDir, family);
     const familyMappingsDir = join4(mappingsDir, family);
     if (!existsSync3(familyDir)) {
@@ -1613,7 +1652,10 @@ async function createOutputStructure(processedData, fieldSchema, params) {
     if (!existsSync3(familyMappingsDir)) {
       mkdirSync2(familyMappingsDir, { recursive: true });
     }
-    familyControls.forEach((control) => {
+    const sortedFamilyControls = familyControls.sort(
+      (a, b) => (a._originalRowIndex || 0) - (b._originalRowIndex || 0)
+    );
+    sortedFamilyControls.forEach((control) => {
       const controlId = control[controlIdFieldNameClean];
       if (!controlId) {
         console.error("Missing control ID for control:", control);
@@ -1635,7 +1677,7 @@ async function createOutputStructure(processedData, fieldSchema, params) {
         filteredControl.family = control.family;
       }
       Object.keys(control).forEach((fieldName) => {
-        if (fieldName === "family") return;
+        if (fieldName === "family" || fieldName === "_originalRowIndex") return;
         if (params.justificationFields.includes(fieldName) && control[fieldName] !== void 0 && control[fieldName] !== null) {
           justificationContents.push(control[fieldName]);
         }

package/dist/index.html

@@ -6,28 +6,28 @@
 		<link rel="icon" href="/lula.png" />
 		<meta name="viewport" content="width=device-width, initial-scale=1" />
 		
-		<link rel="modulepreload" href="/_app/immutable/entry/start.BD6MZ_XC.js">
-		<link rel="modulepreload" href="/_app/immutable/chunks/DztCq-9O.js">
-		<link rel="modulepreload" href="/_app/immutable/chunks/DmBJsPtc.js">
-		<link rel="modulepreload" href="/_app/immutable/entry/app.VdrAeFMF.js">
+		<link rel="modulepreload" href="/_app/immutable/entry/start.DCxCYu1M.js">
+		<link rel="modulepreload" href="/_app/immutable/chunks/MY0vM1lA.js">
+		<link rel="modulepreload" href="/_app/immutable/chunks/BnySH2DD.js">
+		<link rel="modulepreload" href="/_app/immutable/entry/app.XAEr8i-M.js">
 		<link rel="modulepreload" href="/_app/immutable/chunks/DsnmJJEf.js">
-		<link rel="modulepreload" href="/_app/immutable/chunks/BaV6jU6m.js">
-		<link rel="modulepreload" href="/_app/immutable/chunks/DBdrJbLi.js">
-		<link rel="modulepreload" href="/_app/immutable/chunks/CynYS-Ma.js">
+		<link rel="modulepreload" href="/_app/immutable/chunks/BDFhLgJd.js">
+		<link rel="modulepreload" href="/_app/immutable/chunks/6cSSDZaX.js">
+		<link rel="modulepreload" href="/_app/immutable/chunks/ipJF3Ffx.js">
 	</head>
 	<body data-sveltekit-preload-data="hover">
 		<div style="display: contents">
 			<script>
 				{
-					__sveltekit_t1ry3i = {
+					__sveltekit_1b7tzml = {
 						base: ""
 					};
 
 					const element = document.currentScript.parentElement;
 
 					Promise.all([
-						import("/_app/immutable/entry/start.BD6MZ_XC.js"),
-						import("/_app/immutable/entry/app.VdrAeFMF.js")
+						import("/_app/immutable/entry/start.DCxCYu1M.js"),
+						import("/_app/immutable/entry/app.XAEr8i-M.js")
 					]).then(([kit, app]) => {
 						kit.start(app, element);
 					});

package/dist/index.js

@@ -1722,8 +1722,8 @@ var init_fileStore = __esm({
         if (!this.baseDir || this.baseDir === "." || this.baseDir === process.cwd()) {
           return;
         }
-        const lulaConfigPath = join2(this.baseDir, "lula.yaml");
-        if (!existsSync2(lulaConfigPath)) {
+        const lulaConfigPath2 = join2(this.baseDir, "lula.yaml");
+        if (!existsSync2(lulaConfigPath2)) {
           return;
         }
         if (!existsSync2(this.controlsDir)) {
@@ -1881,6 +1881,17 @@ var init_fileStore = __esm({
         if (!existsSync2(this.controlsDir)) {
           return [];
         }
+        let controlOrder = null;
+        try {
+          const lulaConfigPath2 = join2(this.baseDir, "lula.yaml");
+          if (existsSync2(lulaConfigPath2)) {
+            const content = readFileSync2(lulaConfigPath2, "utf8");
+            const metadata = yaml2.load(content);
+            controlOrder = metadata?.controlOrder || null;
+          }
+        } catch (error) {
+          console.error(`Failed to load lula.yaml for controlOrder (path: ${lulaConfigPath}):`, error);
+        }
         const entries = readdirSync(this.controlsDir);
         const yamlFiles = entries.filter((file) => file.endsWith(".yaml"));
         if (yamlFiles.length > 0) {
@@ -1899,7 +1910,11 @@ var init_fileStore = __esm({
             }
           });
           const results2 = await Promise.all(promises);
-          return results2.filter((c) => c !== null);
+          const controls2 = results2.filter((c) => c !== null);
+          if (controlOrder && controlOrder.length > 0) {
+            return this.sortControlsByOrder(controls2, controlOrder);
+          }
+          return controls2;
         }
         const families = entries.filter((name) => {
           const familyPath = join2(this.controlsDir, name);
@@ -1922,7 +1937,25 @@ var init_fileStore = __esm({
           allPromises.push(...familyPromises);
         }
         const results = await Promise.all(allPromises);
-        return results.filter((c) => c !== null);
+        const controls = results.filter((c) => c !== null);
+        if (controlOrder && controlOrder.length > 0) {
+          return this.sortControlsByOrder(controls, controlOrder);
+        }
+        return controls;
+      }
+      /**
+       * Sort controls based on the provided order array
+       */
+      sortControlsByOrder(controls, controlOrder) {
+        const orderMap = /* @__PURE__ */ new Map();
+        controlOrder.forEach((controlId, index) => {
+          orderMap.set(controlId, index);
+        });
+        return controls.sort((a, b) => {
+          const aIndex = orderMap.get(a.id) ?? Number.MAX_SAFE_INTEGER;
+          const bIndex = orderMap.get(b.id) ?? Number.MAX_SAFE_INTEGER;
+          return aIndex - bIndex;
+        });
       }
       /**
        * Load mappings from mappings directory
@@ -3042,6 +3075,7 @@ function processSpreadsheetData(rawData, headers, startRowIndex, params) {
         continue;
       }
       const family = extractFamilyFromControlId(controlId);
+      control._originalRowIndex = i;
       control.family = family;
       controls.push(control);
       if (!families.has(family)) {
@@ -3164,6 +3198,7 @@ async function createOutputStructure(processedData, fieldSchema, params) {
     params.controlIdField,
     params.namingConvention
   );
+  const controlOrder = controls.sort((a, b) => (a._originalRowIndex || 0) - (b._originalRowIndex || 0)).map((control) => control[controlIdFieldNameClean]);
   const controlSetData = {
     name: params.controlSetName,
     description: params.controlSetDescription,
@@ -3171,12 +3206,16 @@ async function createOutputStructure(processedData, fieldSchema, params) {
     control_id_field: controlIdFieldNameClean,
     controlCount: controls.length,
     families: uniqueFamilies,
+    controlOrder,
     fieldSchema
   };
   writeFileSync2(join4(baseDir, "lula.yaml"), yaml4.dump(controlSetData));
   const controlsDir = join4(baseDir, "controls");
   const mappingsDir = join4(baseDir, "mappings");
-  families.forEach((familyControls, family) => {
+  const sortedFamilies = Array.from(families.entries()).sort(
+    (a, b) => a[0].localeCompare(b[0])
+  );
+  sortedFamilies.forEach(([family, familyControls]) => {
     const familyDir = join4(controlsDir, family);
     const familyMappingsDir = join4(mappingsDir, family);
     if (!existsSync3(familyDir)) {
@@ -3185,7 +3224,10 @@ async function createOutputStructure(processedData, fieldSchema, params) {
     if (!existsSync3(familyMappingsDir)) {
       mkdirSync2(familyMappingsDir, { recursive: true });
     }
-    familyControls.forEach((control) => {
+    const sortedFamilyControls = familyControls.sort(
+      (a, b) => (a._originalRowIndex || 0) - (b._originalRowIndex || 0)
+    );
+    sortedFamilyControls.forEach((control) => {
       const controlId = control[controlIdFieldNameClean];
       if (!controlId) {
         console.error("Missing control ID for control:", control);
@@ -3207,7 +3249,7 @@ async function createOutputStructure(processedData, fieldSchema, params) {
         filteredControl.family = control.family;
       }
       Object.keys(control).forEach((fieldName) => {
-        if (fieldName === "family") return;
+        if (fieldName === "family" || fieldName === "_originalRowIndex") return;
         if (params.justificationFields.includes(fieldName) && control[fieldName] !== void 0 && control[fieldName] !== null) {
           justificationContents.push(control[fieldName]);
         }

package/package.json

@@ -1,128 +1,128 @@
 {
-  "name": "lula2",
-  "version": "0.6.4",
-  "description": "A tool for managing compliance as code in your GitHub repositories.",
-  "bin": {
-    "lula2": "./dist/lula2"
-  },
-  "main": "dist/index.js",
-  "types": "dist/index.d.ts",
-  "type": "module",
-  "engines": {
-    "node": ">=22.0.0"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/defenseunicorns/lula.git"
-  },
-  "keywords": [
-    "compliance",
-    "devops",
-    "devsecops"
-  ],
-  "author": "Defense Unicorns",
-  "license": "Apache-2.0",
-  "bugs": {
-    "url": "https://github.com/defenseunicorns/lula/issues"
-  },
-  "homepage": "https://github.com/defenseunicorns/lula#readme",
-  "files": [
-    "/src",
-    "/dist",
-    "!src/**/*.test.ts",
-    "!dist/**/*.test.js*",
-    "!dist/**/*.test.d.ts*"
-  ],
-  "scripts": {
-    "dev": "vite dev --port 5173",
-    "dev:api": "tsx --watch index.ts --debug ui --port 3000 --no-open-browser",
-    "dev:full": "concurrently \"npm run dev:api\" \"npm run dev\"",
-    "build": "npm run build:svelte && npm run build:cli && npm run postbuild:cli",
-    "build:svelte": "vite build",
-    "build:cli": "esbuild index.ts cli/**/*.ts --bundle --platform=node --target=node22 --format=esm --outdir=dist --external:express --external:commander --external:js-yaml --external:yaml --external:isomorphic-git --external:glob --external:open --external:ws --external:cors --external:multer --external:@octokit/rest --external:undici --external:xlsx-republish --external:csv-parse",
-    "postbuild:cli": "cp cli-wrapper.mjs dist/lula2 && chmod +x dist/lula2",
-    "preview": "vite preview",
-    "prepare": "svelte-kit sync || echo ''",
-    "check": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json && tsc --noEmit",
-    "check:watch": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json --watch",
-    "format": "prettier --write 'src/**/*.{ts,js,svelte}' 'cli/**/*.ts' 'index.ts' 'tests/**/*.ts'",
-    "format:check": "prettier --check 'src/**/*.{ts,js,svelte}' 'cli/**/*.ts' 'index.ts' 'tests/**/*.ts'",
-    "lint": "prettier --check 'src/**/*.{ts,js,svelte}' 'cli/**/*.ts' 'index.ts' 'tests/**/*.ts' && eslint src cli",
-    "test": "npm run test:unit -- --run --coverage",
-    "test:integration": "vitest --config integration/vitest.config.integration.ts",
-    "test:unit": "vitest"
-  },
-  "dependencies": {
-    "@octokit/rest": "^22.0.0",
-    "@types/ws": "^8.18.1",
-    "commander": "^14.0.0",
-    "cors": "^2.8.5",
-    "csv-parse": "^6.1.0",
-    "express": "^5.1.0",
-    "express-rate-limit": "^8.1.0",
-    "flowbite": "^3.1.2",
-    "glob": "^11.0.3",
-    "isomorphic-git": "^1.33.1",
-    "js-yaml": "^4.1.0",
-    "multer": "^2.0.2",
-    "open": "^10.2.0",
-    "undici": "^7.15.0",
-    "ws": "^8.18.3",
-    "xlsx-republish": "^0.20.3",
-    "yaml": "^2.8.1"
-  },
-  "devDependencies": {
-    "@commitlint/cli": "^20.0.0",
-    "@commitlint/config-conventional": "^20.0.0",
-    "@eslint/compat": "^1.3.2",
-    "@eslint/eslintrc": "^3.3.1",
-    "@eslint/js": "^9.35.0",
-    "@playwright/test": "^1.55.0",
-    "@sveltejs/adapter-static": "^3.0.9",
-    "@sveltejs/kit": "^2.37.1",
-    "@sveltejs/vite-plugin-svelte": "^6.1.4",
-    "@tailwindcss/vite": "^4.1.13",
-    "@types/cors": "^2.8.19",
-    "@types/express": "^5.0.3",
-    "@types/js-yaml": "^4.0.9",
-    "@types/jsdom": "^27.0.0",
-    "@types/multer": "^2.0.0",
-    "@types/node": "^24.4.0",
-    "@typescript-eslint/eslint-plugin": "^8.42.0",
-    "@typescript-eslint/parser": "^8.42.0",
-    "@vitest/browser": "^3.2.4",
-    "@vitest/coverage-v8": "^3.2.4",
-    "carbon-icons-svelte": "^13.5.0",
-    "carbon-preprocess-svelte": "^0.11.11",
-    "concurrently": "^9.2.1",
-    "esbuild": "^0.25.9",
-    "eslint": "^9.35.0",
-    "eslint-config-prettier": "^10.1.8",
-    "eslint-plugin-jsdoc": "^61.0.0",
-    "eslint-plugin-svelte": "^3.12.2",
-    "globals": "^16.3.0",
-    "husky": "^9.1.7",
-    "jsdom": "^27.0.0",
-    "playwright": "^1.55.0",
-    "prettier": "3.6.2",
-    "prettier-plugin-svelte": "^3.4.0",
-    "semantic-release": "^24.2.7",
-    "shellcheck": "^4.1.0",
-    "svelte": "^5.38.7",
-    "svelte-check": "^4.3.1",
-    "tailwind-merge": "^3.3.1",
-    "tailwindcss": "^4.1.13",
-    "tsx": "^4.20.5",
-    "typescript": "5.9.3",
-    "typescript-eslint": "^8.42.0",
-    "vite": "^7.1.4",
-    "vitest": "^3.2.4",
-    "vitest-browser-svelte": "^1.1.0"
-  },
-  "release": {
-    "branches": [
-      "main",
-      "next"
-    ]
-  }
+	"name": "lula2",
+	"version": "0.6.5",
+	"description": "A tool for managing compliance as code in your GitHub repositories.",
+	"bin": {
+		"lula2": "./dist/lula2"
+	},
+	"main": "dist/index.js",
+	"types": "dist/index.d.ts",
+	"type": "module",
+	"engines": {
+		"node": ">=24.0.0"
+	},
+	"repository": {
+		"type": "git",
+		"url": "git+https://github.com/defenseunicorns/lula.git"
+	},
+	"keywords": [
+		"compliance",
+		"devops",
+		"devsecops"
+	],
+	"author": "Defense Unicorns",
+	"license": "Apache-2.0",
+	"bugs": {
+		"url": "https://github.com/defenseunicorns/lula/issues"
+	},
+	"homepage": "https://github.com/defenseunicorns/lula#readme",
+	"files": [
+		"/src",
+		"/dist",
+		"!src/**/*.test.ts",
+		"!dist/**/*.test.js*",
+		"!dist/**/*.test.d.ts*"
+	],
+	"scripts": {
+		"dev": "vite dev --port 5173",
+		"dev:api": "tsx --watch index.ts --debug ui --port 3000 --no-open-browser",
+		"dev:full": "concurrently \"npm run dev:api\" \"npm run dev\"",
+		"build": "npm run build:svelte && npm run build:cli && npm run postbuild:cli",
+		"build:svelte": "vite build",
+		"build:cli": "esbuild index.ts cli/**/*.ts --bundle --platform=node --target=node22 --format=esm --outdir=dist --external:express --external:commander --external:js-yaml --external:yaml --external:isomorphic-git --external:glob --external:open --external:ws --external:cors --external:multer --external:@octokit/rest --external:undici --external:xlsx-republish --external:csv-parse",
+		"postbuild:cli": "cp cli-wrapper.mjs dist/lula2 && chmod +x dist/lula2",
+		"preview": "vite preview",
+		"prepare": "svelte-kit sync || echo ''",
+		"check": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json && tsc --noEmit",
+		"check:watch": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json --watch",
+		"format": "prettier --write 'src/**/*.{ts,js,svelte}' 'cli/**/*.ts' 'index.ts' 'tests/**/*.ts'",
+		"format:check": "prettier --check 'src/**/*.{ts,js,svelte}' 'cli/**/*.ts' 'index.ts' 'tests/**/*.ts'",
+		"lint": "prettier --check 'src/**/*.{ts,js,svelte}' 'cli/**/*.ts' 'index.ts' 'tests/**/*.ts' && eslint src cli",
+		"test": "npm run test:unit -- --run --coverage",
+		"test:integration": "vitest --config integration/vitest.config.integration.ts",
+		"test:unit": "vitest"
+	},
+	"dependencies": {
+		"@octokit/rest": "^22.0.0",
+		"@types/ws": "^8.18.1",
+		"commander": "^14.0.0",
+		"cors": "^2.8.5",
+		"csv-parse": "^6.1.0",
+		"express": "^5.1.0",
+		"express-rate-limit": "^8.1.0",
+		"flowbite": "^3.1.2",
+		"glob": "^11.0.3",
+		"isomorphic-git": "^1.33.1",
+		"js-yaml": "^4.1.0",
+		"multer": "^2.0.2",
+		"open": "^10.2.0",
+		"undici": "^7.15.0",
+		"ws": "^8.18.3",
+		"xlsx-republish": "^0.20.3",
+		"yaml": "^2.8.1"
+	},
+	"devDependencies": {
+		"@commitlint/cli": "^20.0.0",
+		"@commitlint/config-conventional": "^20.0.0",
+		"@eslint/compat": "^1.3.2",
+		"@eslint/eslintrc": "^3.3.1",
+		"@eslint/js": "^9.35.0",
+		"@playwright/test": "^1.55.0",
+		"@sveltejs/adapter-static": "^3.0.9",
+		"@sveltejs/kit": "^2.37.1",
+		"@sveltejs/vite-plugin-svelte": "^6.1.4",
+		"@tailwindcss/vite": "^4.1.13",
+		"@types/cors": "^2.8.19",
+		"@types/express": "^5.0.3",
+		"@types/js-yaml": "^4.0.9",
+		"@types/jsdom": "^27.0.0",
+		"@types/multer": "^2.0.0",
+		"@types/node": "^24.4.0",
+		"@typescript-eslint/eslint-plugin": "^8.42.0",
+		"@typescript-eslint/parser": "^8.42.0",
+		"@vitest/browser": "^3.2.4",
+		"@vitest/coverage-v8": "^3.2.4",
+		"carbon-icons-svelte": "^13.5.0",
+		"carbon-preprocess-svelte": "^0.11.11",
+		"concurrently": "^9.2.1",
+		"esbuild": "^0.25.9",
+		"eslint": "^9.35.0",
+		"eslint-config-prettier": "^10.1.8",
+		"eslint-plugin-jsdoc": "^61.0.0",
+		"eslint-plugin-svelte": "^3.12.2",
+		"globals": "^16.3.0",
+		"husky": "^9.1.7",
+		"jsdom": "^27.0.0",
+		"playwright": "^1.55.0",
+		"prettier": "3.6.2",
+		"prettier-plugin-svelte": "^3.4.0",
+		"semantic-release": "^25.0.0",
+		"shellcheck": "^4.1.0",
+		"svelte": "^5.38.7",
+		"svelte-check": "^4.3.1",
+		"tailwind-merge": "^3.3.1",
+		"tailwindcss": "^4.1.13",
+		"tsx": "^4.20.5",
+		"typescript": "5.9.3",
+		"typescript-eslint": "^8.42.0",
+		"vite": "^7.1.4",
+		"vitest": "^3.2.4",
+		"vitest-browser-svelte": "^1.1.0"
+	},
+	"release": {
+		"branches": [
+			"main",
+			"next"
+		]
+	}
 }

package/src/lib/components/dialogs/ExportColumnDialog.svelte

@@ -43,8 +43,8 @@
 			setTimeout(() => node.focus(), 0);
 		}
 		return {
-			update(newIsOpen: boolean) {
-				if (newIsOpen) {
+			update() {
+				if (isOpen) {
 					setTimeout(() => node.focus(), 0);
 				}
 			}
@@ -62,6 +62,8 @@
 	}
 
 	function handleKeydown(event: KeyboardEvent) {
+		if (!isOpen) return;
+
 		if (event.key === 'Escape') {
 			handleCancel();
 		} else if (event.key === 'Enter') {
@@ -81,7 +83,7 @@
 {#if isOpen}
 	<!-- Modal Backdrop -->
 	<div
-		class="fixed inset-0 bg-gray-700 dark:bg-gray-900 bg-opacity-50 dark:bg-opacity-75 overflow-y-auto h-full w-full z-50 flex items-center justify-center p-4"
+		class="fixed inset-0 bg-opacity-10 backdrop-blur-sm overflow-y-auto h-full w-full z-40 flex items-center justify-center p-4"
 		role="dialog"
 		aria-modal="true"
 		tabindex="-1"
@@ -92,7 +94,7 @@
 		<!-- svelte-ignore a11y_click_events_have_key_events -->
 		<!-- svelte-ignore a11y_no_noninteractive_element_interactions -->
 		<div
-			class="bg-white dark:bg-gray-800 rounded-lg shadow-xl p-6 w-full max-w-md mx-auto"
+			class="bg-white dark:bg-gray-800 rounded-lg shadow-xl p-6 w-full max-w-md mx-auto relative z-50"
 			role="document"
 			onclick={(e) => e.stopPropagation()}
 		>
@@ -125,7 +127,7 @@
 					</label>
 					<select
 						id="column-select"
-						use:focusSelect={isOpen}
+						use:focusSelect
 						bind:value={selectedColumn}
 						class="w-full px-3 py-2 border border-gray-300 dark:border-gray-600 rounded-md shadow-sm bg-white dark:bg-gray-700 text-gray-900 dark:text-white focus:outline-none focus:ring-2 focus:ring-blue-500 focus:border-blue-500"
 					>

package/src/routes/+layout.svelte

@@ -173,7 +173,7 @@
 	{#if $page.url.pathname !== '/setup'}
 		<!-- Fixed Header -->
 		<header
-			class="bg-white dark:bg-gray-900 shadow-sm border-b border-gray-200 dark:border-gray-700 flex-shrink-0"
+			class="bg-white dark:bg-gray-900 shadow-sm border-b border-gray-200 dark:border-gray-700 flex-shrink-0 relative z-40"
 		>
 			<div class="w-full px-6 lg:px-8">
 				<div class="flex justify-between items-center h-16">